diff --git a/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt b/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
index e0da236a7b5beea3a3c0ea317e5ab533011bf514..79f44dd4299094297a34af1ba664973ad1b8a22d 100644
--- a/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
+++ b/AtlasGeometryCommon/BeamPipeGeoModel/CMakeLists.txt
@@ -1,43 +1,27 @@
-################################################################################
-# Package: BeamPipeGeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( BeamPipeGeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelUtilities
- PRIVATE
- Control/SGTools
- Control/StoreGate
- Control/AthenaKernel
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( BeamPipeGeoModelLib
src/*.cxx
PUBLIC_HEADERS BeamPipeGeoModel
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities StoreGateLib
- PRIVATE_LINK_LIBRARIES SGTools AthenaKernel GaudiKernel RDBAccessSvcLib )
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities
+ PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib SGTools StoreGateLib )
atlas_add_component( BeamPipeGeoModel
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities SGTools StoreGateLib GaudiKernel BeamPipeGeoModelLib )
+ LINK_LIBRARIES BeamPipeGeoModelLib )
+# Test(s) in the package:
atlas_add_test( BeamPipeGMConfig_test
SCRIPT test/BeamPipeGMConfig_test.py
PROPERTIES TIMEOUT 300 )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( test/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py b/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
index f4c8be55e0f21374ad6410a2358b1aa301376b12..84c291c30302c07b271904cf7111f7f687d23e78 100755
--- a/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
+++ b/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""Run tests on BeamPipeGeoModel configuration
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
@@ -16,7 +16,6 @@ if __name__ == "__main__":
ConfigFlags.GeoModel.Align.Dynamic = False
ConfigFlags.lock()
- from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
acc = BeamPipeGeometryCfg(ConfigFlags)
f=open('BeamPipeGeometryCfg.pkl','wb')
diff --git a/AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt b/AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt
index a68a99eef304603d9f67ea3e1f209b9e1d262e9e..36874b3a25187abe91abf750d390f836e0ef082f 100644
--- a/AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt
+++ b/AtlasGeometryCommon/CavernInfraGeoModel/CMakeLists.txt
@@ -1,33 +1,20 @@
-################################################################################
-# Package: CavernInfraGeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CavernInfraGeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelUtilities
- PRIVATE
- Control/StoreGate
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( Eigen )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( GeoModelCore )
# Component(s) in the package:
+atlas_add_library( CavernInfraGeoModelLib
+ CavernInfraGeoModel/*.h
+ INTERFACE
+ PUBLIC_HEADERS CavernInfraGeoModel
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel )
+
atlas_add_component( CavernInfraGeoModel
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities StoreGateLib SGtests GaudiKernel RDBAccessSvcLib )
-
-# Install files from the package:
-atlas_install_headers( CavernInfraGeoModel )
-
+ LINK_LIBRARIES CavernInfraGeoModelLib GaudiKernel GeoModelInterfaces GeoModelUtilities RDBAccessSvcLib StoreGateLib )
diff --git a/AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt b/AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt
index 87a6e90f79e8ea6dc74321ffdd436a370c0832e8..6b7cb572c892511ac6d1a9b98f0779083b15efe0 100644
--- a/AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt
+++ b/AtlasGeometryCommon/GeoModelEnvelopes/CMakeLists.txt
@@ -1,28 +1,13 @@
-################################################################################
-# Package: GeoModelEnvelopes
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoModelEnvelopes )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- DetectorDescription/GeoModel/GeoModelUtilities
- PRIVATE
- Control/SGTools
- Control/StoreGate
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel )
-
+# External dependencies:
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( GeoModelEnvelopes
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GeoModelUtilities SGTools StoreGateLib GaudiKernel )
-
-# Install files from the package:
-atlas_install_headers( GeoModelEnvelopes )
-
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GaudiKernel GeoModelInterfaces GeoModelUtilities SGTools StoreGateLib )
diff --git a/AtlasGeometryCommon/Interpreters/CMakeLists.txt b/AtlasGeometryCommon/Interpreters/CMakeLists.txt
index 240f10f29e695758b41a1e32ea0eff11110b77d7..0593e3bbbf43ca71abdb57343b7a711bfc6f56a3 100644
--- a/AtlasGeometryCommon/Interpreters/CMakeLists.txt
+++ b/AtlasGeometryCommon/Interpreters/CMakeLists.txt
@@ -1,10 +1,7 @@
-################################################################################
-# Package: Interpreters
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( Interpreters )
# Install files from the package:
atlas_install_scripts( share/physh share/totalphysh share/athenash.py )
-
diff --git a/AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt b/AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt
index d2a2df6240e8340d22d4e9bb42fa488619dac56f..d186c2168089d1ba473e56aed6f41410e9d0589d 100644
--- a/AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt
+++ b/AtlasGeometryCommon/SubDetectorEnvelopes/CMakeLists.txt
@@ -1,36 +1,22 @@
-################################################################################
-# Package: SubDetectorEnvelopes
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SubDetectorEnvelopes )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/AtlasDetDescr
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+# Component(s) in the package:
atlas_add_library( SubDetectorEnvelopesLib
INTERFACE
PUBLIC_HEADERS SubDetectorEnvelopes
LINK_LIBRARIES GaudiKernel AtlasDetDescr )
-# Component(s) in the package:
atlas_add_component( SubDetectorEnvelopes
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AtlasDetDescr GaudiKernel AthenaBaseComps RDBAccessSvcLib GeoModelInterfaces )
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GeoModelInterfaces RDBAccessSvcLib SubDetectorEnvelopesLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py
index 1ef5aae53aac54a0482b4d1cf4990ea86d3ffc2f..dc5ebc16d704a764146cc85aaaeda1aa327cf140 100644
--- a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py
+++ b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfig.py
@@ -1,17 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
SubDetectorEnvelopes configurations for AtlasGeometryCommon
Elmar Ritsch, 27/09/2013
"""
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getPublicToolClone,\
- getService,getServiceClone,getAlgorithm,getAlgorithmClone
-
-from AthenaCommon.Constants import * # FATAL,ERROR etc.
-from AthenaCommon.SystemOfUnits import *
-from AthenaCommon.DetFlags import DetFlags
-
def getEnvelopeDefSvc(name="AtlasGeometry_EnvelopeDefSvc", **kwargs):
kwargs.setdefault("DBInDetNode" , 'InDetEnvelope' )
kwargs.setdefault("DBBeamPipeNode" , 'BeamPipeEnvelope' )
@@ -273,7 +266,6 @@ def EnvelopeDefSvc(flags, **kwargs):
Cavern.addRZ( 0.0 , 26046.0 ) #
# the outer dimesions differ between collision and cosmics jobs
- from AthenaCommon.BeamFlags import jobproperties
if flags.Beam.Type != 'cosmics':
# -> for collision jobs the 'cavern' envelope is much smaller
Cavern.addRZ( 0.0 , 500000.0 ) # z= +500m
diff --git a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py
index 2e876b0445172293dc1592bd7937713c348380b7..1cd1d7567350c7c6ee2873a0c75af6c18826067b 100644
--- a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py
+++ b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigDb.py
@@ -1,18 +1,11 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
Configuration database for SubDetectorEnvelopes
Elmar Ritsch, 27/09/2013
"""
-from AthenaCommon.CfgGetter import addTool, addToolClone, addService, addAlgorithm, \
- addTypesToExcludeIfDefaultValue, addNamesToExcludeIfDefaultValue, addFullNamesToExcludeIfDefaultValue, \
- addPropertiesToExcludeIfDefault, \
- addTypesToSkipIfNotAvailable, addNamesToSkipIfNotAvailable, addFullNamesToSkipIfNotAvailable, \
- addTypesOnlyToSkip
-
-from AthenaCommon.Constants import * # FATAL,ERROR etc.
-import AthenaCommon.SystemOfUnits as Units
+from AthenaCommon.CfgGetter import addService
# Common tools, services and algorithms used by jobs:
addService("SubDetectorEnvelopes.SubDetectorEnvelopesConfig.getEnvelopeDefSvc", "AtlasGeometry_EnvelopeDefSvc")
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h
index aca6d4c282061c7a85b69f51059ff05aa921c668..23c56db6b82e2d1780fbeb02b495ab8f5632a373 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/DummyLumirangeTool.h
@@ -19,7 +19,7 @@
//<<<<<< INCLUDES >>>>>>
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/WriteHandleKey.h"
#include "DBDataModel/CollectionMetadata.h"
diff --git a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx
index 4690e1a347c5f852ef3c774d8dfd6a2d5712c4b9..7a75fac1b1a77dae949a46c06e7082ead23d4c5c 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolMultiTest/src/EventTagReader.cxx
@@ -12,7 +12,7 @@
#include "EventTagReader.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
#include "CoralBase/AttributeListSpecification.h"
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
index 7b8b914ac8a36a3aaa1a4e8dfc575dc586c099e0..5d0c581411c3c8749a8df8e15b8d0363bfe4d038 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
@@ -36,7 +36,7 @@ function (athenapooltest_run_test testName jo pattern)
@ONLY )
atlas_add_test( ${testName}
SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/athenapooltest_${testName}.sh
- ENVIRONMENT "ATLAS_REFERENCE_TAG=AthenaPoolTest/AthenaPoolTest-01-00-06"
+ ENVIRONMENT "ATLAS_REFERENCE_TAG=AthenaPoolTest/AthenaPoolTest-01-00-08"
POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/post_check_with_select.sh ${testName} ${pattern}"
PROPERTIES TIMEOUT 900
)
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
index 6e3be6c88bc7c6fdee6a469d7b8dc55ff6cb7b6e..4650da8aeb0c6b347c50621bb88fe2d56509f851 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
@@ -545,7 +545,7 @@ AthenaSealSvc.IgnoreNames += [ "IAppMgrUI" ]
AthenaSealSvc.IgnoreNames += [ "IProperty" ]
AthenaSealSvc.IgnoreNames += [ "Property" ]
AthenaSealSvc.IgnoreNames += [ "std::vector<Property*>" ]
-AthenaSealSvc.IgnoreNames += [ "std::vector<const Property*>" ]
+AthenaSealSvc.IgnoreNames += [ "std::vector<const Gaudi::Details::PropertyBase*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<IAlgorithm*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<IService*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<const IFactory*>" ]
@@ -884,7 +884,7 @@ AthenaSealSvc.IgnoreNames += [ "IAppMgrUI" ]
AthenaSealSvc.IgnoreNames += [ "IProperty" ]
AthenaSealSvc.IgnoreNames += [ "Property" ]
AthenaSealSvc.IgnoreNames += [ "std::vector<Property*>" ]
-AthenaSealSvc.IgnoreNames += [ "std::vector<const Property*>" ]
+AthenaSealSvc.IgnoreNames += [ "std::vector<const Gaudi::Details::PropertyBase*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<IAlgorithm*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<IService*>" ]
AthenaSealSvc.IgnoreNames += [ "std::list<const IFactory*>" ]
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h
index b3d69c66c985a401a8ab7bef2d1f3032a86928c1..2983684df675328be5bb2b4ef0c79deefa29a9a4 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TestGaudiProperty.h
@@ -8,7 +8,7 @@
#define ATLASHISTORY_TESTGAUDIPROPERTY_H
//#include "GaudiKernel/HistoryObj.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
@@ -27,17 +27,17 @@ class TestGaudiProperty {
public:
- //typedef std::vector< std::pair<std::string,const Property*> > PropertyList;
- //typedef std::vector< const Property* > PropertyList;
- //typedef const Property* PropertyList;
+ //typedef std::vector< std::pair<std::string,const Gaudi::Details::PropertyBase*> > PropertyList;
+ //typedef std::vector< const Gaudi::Details::PropertyBase* > PropertyList;
+ //typedef const Gaudi::Details::PropertyBase* PropertyList;
private: // data
//PropertyList m_props;
//Property m_p1;
- Property* m_pptr;
- const Property* m_cptr;
- std::vector<Property*> m_ncprops;
+ Gaudi::Details::PropertyBase* m_pptr;
+ const Gaudi::Details::PropertyBase* m_cptr;
+ std::vector<Gaudi::Details::PropertyBase*> m_ncprops;
public: // functions
@@ -47,11 +47,11 @@ public: // functions
// Destructor.
~TestGaudiProperty();
- //void addProperty( const std::string&, const Property* );
- //void addProperty( const Property* );
+ //void addProperty( const std::string&, const Gaudi::Details::PropertyBase* );
+ //void addProperty( const Gaudi::Details::PropertyBase* );
//const PropertyList& properties() const { return m_props; }
- const Property* property() const { return m_cptr; }
+ const Gaudi::Details::PropertyBase* property() const { return m_cptr; }
private:
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx b/AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx
index a7e5ccecc031b05c521b910fd10ba1778985d51c..db91e721a1968c67eac5bb254386101a9c3b3a40 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/src/TestGaudiProperty.cxx
@@ -17,7 +17,7 @@
///////////////////////////////////////////////////////////////////////////
#include "GaudiKernel/System.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaPoolTestData/TestGaudiProperty.h"
#include <cstdlib>
@@ -47,11 +47,11 @@ TestGaudiProperty::~TestGaudiProperty() {
}
/*
void
-//TestGaudiProperty::addProperty(const std::string& client, const Property* prop) {
-TestGaudiProperty::addProperty(const Property* prop) {
+//TestGaudiProperty::addProperty(const std::string& client, const Gaudi::Details::PropertyBase* prop) {
+TestGaudiProperty::addProperty(const Gaudi::Details::PropertyBase* prop) {
// if (m_props.find(prop) == m_props.end()) {
//m_props.push_back( prop);
- //m_ncprops.push_back( const_cast<Property*>(prop));
+ //m_ncprops.push_back( const_cast<Gaudi::Details::PropertyBase*>(prop));
//m_p1 = *prop;
//m_pptr = m_ncprops[0];
m_cptr = prop;
diff --git a/Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx b/Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx
index 38505930effead51b1f7bda54ea0f815df3710f7..3a740a80a776745748046f42f4d49bcee86ef888 100644
--- a/Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx
+++ b/Calorimeter/CaloClusterCorrection/src/CaloRunClusterCorrections.cxx
@@ -22,7 +22,7 @@
#include "AthenaKernel/errorcheck.h"
#include "CxxUtils/Array.h"
#include "AthenaKernel/getMessageSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/IToolSvc.h"
@@ -771,10 +771,10 @@ CaloRunClusterCorrections::orderCorrections ATLAS_NOT_THREAD_SAFE (bool allowMis
// Tool is being initialized from JO. Find the order property from JOS.
tool.order = -1;
std::string fullname = this->name() + "." + tool.name;
- const std::vector<const Property*>* props =
+ const std::vector<const Gaudi::Details::PropertyBase*>* props =
m_jos->getProperties (fullname);
for (size_t iprop = 0; iprop < props->size(); iprop++) {
- const Property& prop = *(*props)[iprop];
+ const Gaudi::Details::PropertyBase& prop = *(*props)[iprop];
if (prop.name() == "order") {
tool.order = std::atoi (prop.toString().c_str());
break;
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
index 54760df0cf5e3182ba963bf45b76b4a3ffe8cf73..71802d794d10d78b1529b1256fce62d8c050cd0b 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
@@ -41,6 +41,8 @@
#include "TileDetDescr/TileDetDescrManager.h"
+#include <GaudiKernel/ThreadLocalContext.h>
+
long int CaloMgrDetDescrCnv::repSvcType() const
{
return storageType();
@@ -71,7 +73,12 @@ StatusCode CaloMgrDetDescrCnv::finalize()
StatusCode CaloMgrDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
{
- MsgStream log(msgSvc(), "CaloMgrDetDescrCnv");
+ // Ensure that this object is created inside the event loop
+ auto ctx = Gaudi::Hive::currentContext();
+ MsgStream log( msgSvc(), "CaloMgrDetDescrCnv" );
+ if ( !ctx.valid() ) {
+ log << MSG::WARNING << "Attempting to create a Calo Detector Manager object outside of the event loop. Geometry may not be aligned." << endmsg;
+ }
log << MSG::INFO << "in createObj: creating a Calo Detector Manager object in the detector store" << endmsg;
bool debug = log.level()<=MSG::DEBUG;
diff --git a/Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test b/Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test
index 09a627154c4eaa402c078b68bcf941b103d31496..ef5d33b8907b0da4e11b25c149bd5774777628e4 100644
--- a/Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test
+++ b/Calorimeter/CaloExample/CaloTests/src/CreateHits.cxx.test
@@ -1,5 +1,5 @@
#include "MyAnalysis/CreateHits.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
diff --git a/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx b/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx
index ed1ed34de97db4048ec31a403a9f5b03145e6761..2756af7f5f52025e156134a99f90d3f063a659e1 100644
--- a/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx
+++ b/Calorimeter/CaloExample/CaloTests/src/MyAnalysis.cxx
@@ -3,7 +3,7 @@
*/
#include "CaloTests/Analysis.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
diff --git a/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx b/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
index d295484870feaaf2d1917ddb378763b9621b1c52..378cdcf0a7cf5bf236d10c5765b012cd167f0ddb 100644
--- a/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
+++ b/Calorimeter/CaloExample/CaloTests/src/MyAnalysisCal.cxx
@@ -3,7 +3,7 @@
*/
#include "CaloTests/AnalysisCal.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
diff --git a/Calorimeter/CaloG4Sim/src/CalibrationDefaultProcessing.cc b/Calorimeter/CaloG4Sim/src/CalibrationDefaultProcessing.cc
index e3cf0942c94e75ca55d49a0d795063407ae516c0..0cc9bcced2e319d62dba0462e148a038db306d96 100644
--- a/Calorimeter/CaloG4Sim/src/CalibrationDefaultProcessing.cc
+++ b/Calorimeter/CaloG4Sim/src/CalibrationDefaultProcessing.cc
@@ -22,7 +22,7 @@
#include "CaloG4Sim/SimulationEnergies.h"
// For the event-level flag
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "G4VSensitiveDetector.hh"
#include "G4SDManager.hh"
@@ -66,12 +66,12 @@ namespace G4UA
if ( m_defaultSD != 0 ) {
// We only want to perform the default processing if no other
// calibration processing has occurred for this step.
- EventInformation* evtInfo = dynamic_cast<EventInformation*>(
+ AtlasG4EventUserInfo* atlasG4EvtUserInfo = dynamic_cast<AtlasG4EventUserInfo*>(
G4RunManager::GetRunManager()->GetCurrentEvent()->GetUserInformation());
auto* track = a_step->GetTrack();
- if ( evtInfo &&
- ( evtInfo->GetLastProcessedBarcode() != track->GetTrackID() ||
- evtInfo->GetLastProcessedStep() != track->GetCurrentStepNumber() ) )
+ if ( atlasG4EvtUserInfo &&
+ ( atlasG4EvtUserInfo->GetLastProcessedBarcode() != track->GetTrackID() ||
+ atlasG4EvtUserInfo->GetLastProcessedStep() != track->GetCurrentStepNumber() ) )
{
// We haven't performed any calibration processing for this
// step (probably there is no sensitive detector for the
@@ -82,8 +82,8 @@ namespace G4UA
m_defaultSD->Hit( const_cast<G4Step*>(a_step) );
// Update the step info
- evtInfo->SetLastProcessedBarcode( track->GetTrackID() );
- evtInfo->SetLastProcessedStep( track->GetCurrentStepNumber() );
+ atlasG4EvtUserInfo->SetLastProcessedBarcode( track->GetTrackID() );
+ atlasG4EvtUserInfo->SetLastProcessedStep( track->GetCurrentStepNumber() );
}
}
diff --git a/Calorimeter/CaloG4Sim/src/SimulationEnergies.cc b/Calorimeter/CaloG4Sim/src/SimulationEnergies.cc
index 2e003a2553861fe57c356be5f18a51da34738d6b..f96ef5d479e0ca6b52f8b70ae2613506de928ad4 100644
--- a/Calorimeter/CaloG4Sim/src/SimulationEnergies.cc
+++ b/Calorimeter/CaloG4Sim/src/SimulationEnergies.cc
@@ -71,7 +71,7 @@
#include "CaloG4Sim/VEscapedEnergyProcessing.h"
#include "CaloG4Sim/EscapedEnergyRegistry.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "G4EventManager.hh"
#include "G4SteppingManager.hh"
@@ -159,12 +159,12 @@ namespace CaloG4
energies.push_back( category.energy[SimulationEnergies::kEscaped] );
// Update the global step information to say that we've dealt with this
- EventInformation* evtInfo = dynamic_cast<EventInformation*>(
+ AtlasG4EventUserInfo* atlasG4EvtUserInfo = dynamic_cast<AtlasG4EventUserInfo*>(
G4RunManager::GetRunManager()->GetCurrentEvent()->GetUserInformation());
- if ( evtInfo ) {
+ if ( atlasG4EvtUserInfo ) {
// Update the step info
- evtInfo->SetLastProcessedBarcode( a_step->GetTrack()->GetTrackID() );
- evtInfo->SetLastProcessedStep( a_step->GetTrack()->GetCurrentStepNumber() );
+ atlasG4EvtUserInfo->SetLastProcessedBarcode( a_step->GetTrack()->GetTrackID() );
+ atlasG4EvtUserInfo->SetLastProcessedStep( a_step->GetTrack()->GetCurrentStepNumber() );
}
}
diff --git a/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.h b/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.h
index 60c51cb6e6422f8efc180800299c42a01802544f..960a3b9ad98157fcd86ca97700206834c29990e5 100644
--- a/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.h
+++ b/Calorimeter/CaloRec/CaloRec/ToolWithConstantsMixin.h
@@ -264,7 +264,7 @@ public:
*
* This version is used by Gaudi as of v19.
*/
- virtual StatusCode setProperty (const Property& p);
+ virtual StatusCode setProperty (const Gaudi::Details::PropertyBase& p);
private:
diff --git a/Calorimeter/CaloRec/share/CaloCellContainerAliasAlg_test.ref b/Calorimeter/CaloRec/share/CaloCellContainerAliasAlg_test.ref
index 9129a6d073bcb0736115844e41f47e3e3905f2db..850bef3e9c1a3ec0a94088aa12750ab91f7d1c92 100644
--- a/Calorimeter/CaloRec/share/CaloCellContainerAliasAlg_test.ref
+++ b/Calorimeter/CaloRec/share/CaloCellContainerAliasAlg_test.ref
@@ -243,7 +243,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
ApplicationMgr INFO Application Manager Started successfully
diff --git a/Calorimeter/CaloRec/share/CaloThinCellsByClusterAlg_test.ref b/Calorimeter/CaloRec/share/CaloThinCellsByClusterAlg_test.ref
index 2d5f7c57003d80b0c8444b1ab3904f1b8c5be33c..15cd1168be860a84582dedca1ca610c3d0c0fda1 100644
--- a/Calorimeter/CaloRec/share/CaloThinCellsByClusterAlg_test.ref
+++ b/Calorimeter/CaloRec/share/CaloThinCellsByClusterAlg_test.ref
@@ -242,7 +242,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
ClassIDSvc INFO getRegistryEntries: read 104 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
diff --git a/Calorimeter/CaloRec/share/CaloThinCellsBySamplingAlg_test.ref b/Calorimeter/CaloRec/share/CaloThinCellsBySamplingAlg_test.ref
index 1f5c562c172235743913c3c02df41a89f9461792..09dd51f6a0d96dd4a233ecea2dac3a467144c0f8 100644
--- a/Calorimeter/CaloRec/share/CaloThinCellsBySamplingAlg_test.ref
+++ b/Calorimeter/CaloRec/share/CaloThinCellsBySamplingAlg_test.ref
@@ -242,7 +242,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
ClassIDSvc INFO getRegistryEntries: read 104 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/OnOffIdMap'
diff --git a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
index 2880871f0ece09cab24d86b6865443af704842b7..112dce5bb51bcfb60002c3855c2fba145aef9ca3 100644
--- a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
+++ b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
@@ -91,7 +91,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/LAR/CellCorrOfl/deadOTX'
ApplicationMgr INFO Application Manager Started successfully
diff --git a/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx b/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
index 076aaeb93cad427180fac2dce26b80352b0f59b8..15d6c679e114d4b8b96e36f57594ec90472d22be 100644
--- a/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
+++ b/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
@@ -18,7 +18,7 @@ PURPOSE: Apply necessary finalising operation to CaloCellContainer
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
index 244221bcc8582963c4c08e8bdd7b988408d61695..ee3957648a4a0508d4eda2f983f0c43c45565131 100644
--- a/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTopoTowerAlgorithm.cxx
@@ -3,7 +3,7 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
index 0ba432ed5354fe4d4b6425f7e1fd8b6cb070103f..e3b9394e36c1aed844e5efb4a7a1b4c0185ffe3b 100644
--- a/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
+++ b/Calorimeter/CaloRec/src/CaloTowerAlgorithm.cxx
@@ -3,7 +3,7 @@
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx b/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
index c51928e24c04f953b90ef4f3f43a63c693c9e4c9..f1417885688cb729544a86b5706f1cd75da49bd7 100755
--- a/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
+++ b/Calorimeter/CaloRec/src/ToolWithConstantsMixin.cxx
@@ -374,7 +374,7 @@ ToolWithConstantsMixin::setProperty (const std::string& propname,
* This version is used by Gaudi as of v19.
*/
StatusCode
-ToolWithConstantsMixin::setProperty (const Property& p)
+ToolWithConstantsMixin::setProperty (const Gaudi::Details::PropertyBase& p)
{
return CaloRec::ToolWithConstantsMixin::setProperty (p.name(), p.toString());
}
diff --git a/Calorimeter/CaloTrackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h b/Calorimeter/CaloTrackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h
index cbe92ee49e9f5f062f1653d1043d4e10842e6502..37e72bf9d3785641c26dfbf27814a999178173df 100755
--- a/Calorimeter/CaloTrackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h
+++ b/Calorimeter/CaloTrackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h
@@ -27,6 +27,8 @@
#include "CaloGeoHelpers/CaloPhiRange.h"
#include "CaloDetDescr/CaloSubdetNames.h"
+#include <mutex>
+
class CaloDetDescrManager;
class ICaloCoordinateTool;
class IMessageSvc;
@@ -143,19 +145,20 @@ public:
private:
// fill cashed surfaces
- void fill_tg_surfaces();
+ void fill_tg_surfaces() const;
// CaloDetDescr usal stuff
//const CaloCell_ID* m_calo_id;
- const CaloDetDescrManager* m_calo_dd;
+ const mutable CaloDetDescrManager* m_calo_dd;
//TileDetDescr stuff
const TileDetDescrManager* m_tile_dd;
// cash the surfaces for TG builder
- mutable std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > m_layerEntries;
- mutable std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > m_layerExits;
-
+ mutable std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > m_layerEntries;
+ mutable std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > m_layerExits;
+ mutable std::once_flag m_fillOnce;
+
// needed to cover TestBeam
// ToolHandle<ICaloCoordinateTool> m_calo_tb_coord;
@@ -173,11 +176,17 @@ private:
//IMessageSvc* m_msgSvc;
};
-inline std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > CaloSurfaceBuilder::entrySurfaces() const
-{ return m_layerEntries; }
+inline std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > CaloSurfaceBuilder::entrySurfaces ATLAS_THREAD_SAFE() const
+{
+ std::call_once( m_fillOnce, [this](){fill_tg_surfaces();} );
+ return m_layerEntries;
+}
-inline std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > CaloSurfaceBuilder::exitSurfaces() const
-{ return m_layerExits; }
+inline std::vector<std::pair<const Trk::Surface*,const Trk::Surface*> > CaloSurfaceBuilder::exitSurfaces ATLAS_THREAD_SAFE() const
+{
+ std::call_once( m_fillOnce, [this](){fill_tg_surfaces();} );
+ return m_layerExits;
+}
#endif // CALOTRACKINGGEOMETRY_CALOSURFACEBUILDER_H
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
index 1fd7d04e27c22b7aab759740a5d809061163d34a..4a995f818392659e1529246b94bcfa8df7e09d7c 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
@@ -10,7 +10,7 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ISvcLocator.h"
@@ -121,19 +121,11 @@ CaloSurfaceBuilder::initialize()
ATH_MSG_DEBUG("Sucessfully retrieved "<< m_tileVolumeBuilder << ".");
*/
- if (detStore()->retrieve(m_calo_dd).isFailure()) {
- ATH_MSG_WARNING("Could not find CaloDetDescriptorManager in DetStore, calling CaloDetDescrManager::instance() instead");
- m_calo_dd = CaloDetDescrManager::instance();
- if (!m_calo_dd) return StatusCode::FAILURE;
- }
-
if (detStore()->retrieve(m_tile_dd).isFailure()){
ATH_MSG_FATAL("Could not find TileDetDescrManager in DetStore" );
return StatusCode::FAILURE;
}
- fill_tg_surfaces();
-
return StatusCode::SUCCESS;
}
@@ -146,16 +138,18 @@ CaloSurfaceBuilder::finalize()
delete m_layerEntries[i].second;
}
- delete m_layerExits[CaloCell_ID::TileBar2].first;
- delete m_layerExits[CaloCell_ID::TileBar2].second;
- delete m_layerExits[CaloCell_ID::TileExt2].first;
- delete m_layerExits[CaloCell_ID::TileExt2].second;
- delete m_layerExits[CaloCell_ID::TileGap2].first;
- delete m_layerExits[CaloCell_ID::TileGap2].second;
- delete m_layerExits[CaloCell_ID::TileGap3].first;
- delete m_layerExits[CaloCell_ID::TileGap3].second;
- delete m_layerExits[CaloCell_ID::HEC3].first;
- delete m_layerExits[CaloCell_ID::HEC3].second;
+ if ( m_layerExits.size() ) {
+ delete m_layerExits[CaloCell_ID::TileBar2].first;
+ delete m_layerExits[CaloCell_ID::TileBar2].second;
+ delete m_layerExits[CaloCell_ID::TileExt2].first;
+ delete m_layerExits[CaloCell_ID::TileExt2].second;
+ delete m_layerExits[CaloCell_ID::TileGap2].first;
+ delete m_layerExits[CaloCell_ID::TileGap2].second;
+ delete m_layerExits[CaloCell_ID::TileGap3].first;
+ delete m_layerExits[CaloCell_ID::TileGap3].second;
+ delete m_layerExits[CaloCell_ID::HEC3].first;
+ delete m_layerExits[CaloCell_ID::HEC3].second;
+ }
StatusCode sc = StatusCode::SUCCESS;
return sc;
@@ -236,9 +230,12 @@ Trk::Surface* CaloSurfaceBuilder:: CreateUserSurface (const CaloCell_ID::CaloSa
const double offset,
const double etaCaloLocal) const
{
+ if (sample == CaloCell_ID::Unknown) return nullptr;
- if (sample == CaloCell_ID::Unknown) return 0;
- if (!m_calo_dd) return 0;
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ if (!m_calo_dd) {
+ if ( detStore()->retrieve(m_calo_dd).isFailure() ) return nullptr;
+ }
// NB: the Transform3D created here belong to the surface,
// and will be deleted by it
@@ -369,7 +366,10 @@ CaloSurfaceBuilder::CreateLastSurface (const CaloCell_ID::CaloSample sample,
{
ATH_MSG_DEBUG( "In CreateLastSurface()" );
- if (!m_calo_dd) return 0;
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ if (!m_calo_dd) {
+ if ( detStore()->retrieve(m_calo_dd).isFailure() ) return nullptr;
+ }
Trk::Surface* surf =0;
@@ -640,7 +640,10 @@ CaloSurfaceBuilder::get_cylinder_surface (CaloCell_ID::CaloSample sample, int si
bool result = false;
- if (!m_calo_dd) return result;
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ if (!m_calo_dd) {
+ if ( detStore()->retrieve(m_calo_dd).isFailure() ) return result;
+ }
// strips are spread on several descriptor, which all have the same
// htrans, radius, hphi, but not the same hlength
@@ -731,7 +734,10 @@ CaloSurfaceBuilder::get_disk_surface (CaloCell_ID::CaloSample sample, int side,
rmin = 999999.;
rmax = 0.;
- if (!m_calo_dd) return result;
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ if (!m_calo_dd) {
+ if ( detStore()->retrieve(m_calo_dd).isFailure() ) return result;
+ }
// strips are spread on several descriptor, which all have the same
// htrans, hphisec, but not the same rmin and rmax
@@ -1037,7 +1043,7 @@ std::vector<const Trk::Surface*> CaloSurfaceBuilder::allHECSurfaces() const
}
//store all the surfaces into a vector
-void CaloSurfaceBuilder::fill_tg_surfaces()
+void CaloSurfaceBuilder::fill_tg_surfaces() const
{
//for (float eta=1.4; eta<3.2; eta+=0.1 ) {
// const Trk::Surface* surf = CreateUserSurface(CaloCell_ID::EME2,0.,eta);
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
index fc31c387ea4fd6b4079c2eebab858a26b4424fb4..7d4ae6c7430f2be52c768ad3c0f84d81d916f7f6 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceHelper.cxx
@@ -10,7 +10,7 @@
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx b/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
index 5d5d2ad779051b530d6bc697c91cc1e8429c53a1..2303f481704e4d48067651be1336fdcfc7c43400 100644
--- a/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
+++ b/Calorimeter/CaloTriggerTool/src/CaloTriggerTowerService.cxx
@@ -8,7 +8,7 @@
#include <fstream>
#include <iostream>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "LArIdentifier/LArIdManager.h"
#include "LArIdentifier/LArOnlineID.h"
#include "LArIdentifier/LArOnlID_Exception.h"
diff --git a/Calorimeter/CaloUtils/CMakeLists.txt b/Calorimeter/CaloUtils/CMakeLists.txt
index 3dfcd9b94bcde61752282d5dc82d606c74d0b523..a7a37b92e2a3a6f56a9e38a00e5eb14df7241c03 100644
--- a/Calorimeter/CaloUtils/CMakeLists.txt
+++ b/Calorimeter/CaloUtils/CMakeLists.txt
@@ -66,7 +66,7 @@ atlas_add_test( CaloTowerStore_test
atlas_add_test( CaloTowerBuilderTool_test
SCRIPT test/CaloTowerBuilderTool_test.sh
LOG_IGNORE_PATTERN "Reading file|Unable to locate catalog|Cache alignment"
- ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-12"
+ ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-13"
PROPERTIES TIMEOUT 500 )
atlas_add_test( ToolWithConstants_test
diff --git a/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h b/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h
index 7dfa8d11030bbbff951f3f3ec08cac6d33df0069..5553571ae5673a06d75e9f8647d5ef931bea470f 100644
--- a/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h
+++ b/Calorimeter/CaloUtils/CaloUtils/CaloTowerBuilderTool.h
@@ -25,7 +25,6 @@
class CaloTower;
class CaloTowerStore;
class CaloTowerContainer;
-class CaloDetDescrManager;
class StoreGateSvc;
class MsgStream;
@@ -104,7 +103,6 @@ private:
// Specific Initialization //
/////////////////////////////
- const CaloDetDescrManager* m_caloDDM;
CaloTowerStore m_cellStore;
virtual StatusCode checkSetup(MsgStream& log);
diff --git a/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h b/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
index ab861b18228f18e13baf567f6839a991d4f6fead..5e1fc1f9a48bb5e4f0544ee4a08530604c1403a6 100644
--- a/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
+++ b/Calorimeter/CaloUtils/CaloUtils/ToolWithConstants.h
@@ -26,7 +26,7 @@
#include "StoreGate/ReadCondHandle.h"
#include "AthenaKernel/errorcheck.h"
#include "CxxUtils/concepts.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <sstream>
#include <type_traits>
diff --git a/Calorimeter/CaloUtils/CaloUtils/xAODClusterCompressor.h b/Calorimeter/CaloUtils/CaloUtils/xAODClusterCompressor.h
index 1d62605758efb05d52c94bdb9fc4bea7da7450d5..2b66e05edbd5b932107d37b667d384154ff2c1a7 100644
--- a/Calorimeter/CaloUtils/CaloUtils/xAODClusterCompressor.h
+++ b/Calorimeter/CaloUtils/CaloUtils/xAODClusterCompressor.h
@@ -13,9 +13,9 @@
#include "AthenaBaseComps/AthService.h"
#include "CaloInterface/IxAODClusterCompressor.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
-#include "xAODCore/tools/FloatCompressor.h"
#include "CxxUtils/checker_macros.h"
+#include "CxxUtils/FloatCompressor.h"
class ATLAS_CHECK_THREAD_SAFETY xAODClusterCompressor :
virtual public IxAODClusterCompressor, public AthService {
@@ -45,8 +45,8 @@ class ATLAS_CHECK_THREAD_SAFETY xAODClusterCompressor :
typedef std::array< xAOD::CaloCluster::MomentType,60> momentList_t;
momentList_t m_allMoments;
- //Use Float compressor from xAODCore
- xAOD::FloatCompressor m_compressor;
+ //Use Float compressor from CxxUtils
+ CxxUtils::FloatCompressor m_compressor;
//JobO-driven flag to turn compression on/off
bool m_isEnabled;
diff --git a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
index e1a355baef8b8ee34aeaa39b12c9659b697a5416..b597552a0de5f775d80f5c35eb038e0b7c555fb4 100644
--- a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
+++ b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
@@ -1,16 +1,16 @@
-Tue Aug 6 20:30:51 CEST 2019
+Wed Aug 5 18:46:10 CEST 2020
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.3] [x86_64-centos7-gcc8-opt] [atlas-work3/da00b53be39] -- built on [2019-08-06T1723]
+Py:Athena INFO using release [WorkDir-22.0.17] [x86_64-centos7-gcc8-opt] [CaloMgrTooEarlyError/1cd056abc58] -- built on [2020-08-05T1835]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
-Py:Athena INFO including file "CaloUtils/CaloTowerStore_test.py"
-SetGeometryVersion.py obtained major release version 22
+Py:Athena INFO including file "CaloTowerStore_test.py"
+Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5520 configurables from 75 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5547 configurables from 23 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.3
+EventInfoMgtInit: Got release version Athena-22.0.17
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
@@ -18,28 +18,25 @@ Py:Athena INFO including file "CaloConditions/LArTTCellMap_ATLAS_jobO
Py:Athena INFO including file "CaloConditions/CaloTTIdMap_ATLAS_jobOptions.py"
Py:Athena INFO including file "TileIdCnv/TileIdCnv_jobOptions.py"
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r0)
- running on lxplus724.cern.ch on Tue Aug 6 20:31:01 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
+ running on 05d0ccd909cb on Wed Aug 5 18:46:19 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3542 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3581 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus724.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://frontier-atlas.lcg.triumf.ca:3128/ATLAS_frontier)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO No specific match for domain found - use default fallback
+DBReplicaSvc INFO Total of 2 servers found for host 05d0ccd909cb [ATLF atlas_dd ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -49,6 +46,7 @@ PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.x
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
IOVDbSvc INFO Cache alignment will be done in 3 slices
@@ -56,6 +54,7 @@ IOVDbSvc INFO Global tag: OFLCOND-SDR-BS14T-IBL-06 set from joboptio
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 7 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
+ClassIDSvc INFO getRegistryEntries: read 1488 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -69,9 +68,9 @@ IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTOn
IOVDbSvc INFO Added taginfo remove for /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/LArCellPositionShift
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
-ClassIDSvc INFO getRegistryEntries: read 2165 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 17 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 287 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 239 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
DetDescrCnvSvc INFO filling proxies for detector managers
@@ -106,8 +105,6 @@ DetDescrCnvSvc INFO filling address for MDTIDHELPER with CLID 4170 and st
DetDescrCnvSvc INFO filling address for CSCIDHELPER with CLID 4171 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for RPCIDHELPER with CLID 4172 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for TGCIDHELPER with CLID 4173 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for STGCIDHELPER with CLID 4174 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for MMIDHELPER with CLID 4175 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for CaloLVL1_ID with CLID 108133391 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 and storage type 68 to detector store
DetDescrCnvSvc INFO filling address for CaloCell_SuperCell_ID with CLID 128365736 and storage type 68 to detector store
@@ -158,7 +155,7 @@ BarrelConstruction INFO Use sagging in geometry ? 0
EMECConstruction INFO multi-layered version of absorbers activated, parameter value is 1
EMECConstruction INFO activating LAr::EMEC::Pos::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Pos::OuterWheel
-ClassIDSvc INFO getRegistryEntries: read 5934 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5947 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a TileTBID helper object in the detector store
TileTBID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -176,7 +173,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -188,9 +185,9 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
@@ -201,9 +198,23 @@ AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version Athe
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
+ApplicationMgr INFO Application Manager Initialized successfully
+ApplicationMgr INFO Application Manager Started successfully
+AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
+EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
+EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
+ClassIDSvc INFO getRegistryEntries: read 2529 CLIDRegistry entries for module ALL
+IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
+IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARAlign-mc11-00 for folder /LAR/Align
+IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
+IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix2 for folder /LAR/Identifier/LArTTCellMapAtlas
+IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
+Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 2409 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 198 CLIDRegistry entries for module ALL
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -220,30 +231,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-08-05T2130/Athena/22.0.3/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-04T2146/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
-HistogramPersis...WARNING Histograms saving not required.
-ApplicationMgr INFO Application Manager Initialized successfully
-ApplicationMgr INFO Application Manager Started successfully
-AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 109 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
-IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARAlign-mc11-00 for folder /LAR/Align
-IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LArCellPositionShift-ideal for folder /LAR/LArCellPositionShift
-IOVDbFolder INFO HVS tag OFLCOND-SDR-BS14T-IBL-06 resolved to LARIdentifierLArTTCellMapAtlas-HadFcalFix2 for folder /LAR/Identifier/LArTTCellMapAtlas
-IOVDbSvc INFO Disconnecting from COOLOFL_LAR/OFLP200
-Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 06C9EAE8-6F5B-E011-BAAA-003048F0E7AC
-Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root
-RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000029.gen.COND/cond09_mc.000029.gen.COND._0002.pool.root File version:52200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
@@ -260,25 +256,25 @@ IncidentProcAlg1 INFO Finalize
CondInputLoader INFO Finalizing CondInputLoader...
IncidentProcAlg2 INFO Finalize
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.04 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 1.07 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.03 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.69 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/0 objs/chan/bytes 1/1/173 (( 0.77 ))s
IOVDbFolder WARNING Folder /LAR/Identifier/LArTTCellMapAtlas is requested but no data retrieved
-IOVDbSvc INFO bytes in (( 0.09 ))s
+IOVDbSvc INFO bytes in (( 2.53 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.09 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 2.53 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 1 nFolders: 3 ReadTime: (( 0.00 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 370 [ms] Ave/Min/Max= 185(+- 175)/ 10/ 360 [ms] #= 2
-cObj_ALL INFO Time User : Tot= 430 [ms] Ave/Min/Max= 215(+- 185)/ 30/ 400 [ms] #= 2
-ChronoStatSvc INFO Time User : Tot= 2.34 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 210 [ms] Ave/Min/Max= 105(+- 105)/ 0/ 210 [ms] #= 2
+cObj_ALL INFO Time User : Tot= 270 [ms] Ave/Min/Max= 135(+- 125)/ 10/ 260 [ms] #= 2
+ChronoStatSvc INFO Time User : Tot= 1.71 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref b/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
index 7e2e703b76ab4bf85884fb9a5da9af9ebba2b0c1..79eed8eb4cc51b59a4bfede411daae9f7dbeff04 100644
--- a/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
+++ b/Calorimeter/CaloUtils/share/ToolWithConstants_test.ref
@@ -31,7 +31,6 @@ ApplicationMgr SUCCESS AthSequencer/AthEndSeq
ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
ApplicationMgr SUCCESS ******************************************************************************
ApplicationMgr INFO Application Manager Started successfully
EventPersistenc... INFO Added successfully Conversion service:McCnvSvc
diff --git a/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx b/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
index 399f602cf0e9f1a0bf78d55518e6ebe5574db0e4..2457a0a5dc91ee5855f65538d1a5d59651127edc 100644
--- a/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloTopoTowerBuilderTool.cxx
@@ -7,7 +7,7 @@
#include "GaudiKernel/AlgTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IToolSvc.h"
//#include "GaudiKernel/IChronoStatSvc.h"
diff --git a/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx b/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
index f55cf88b789af4963969ad7dd3db3f05d0ca71a5..1da262c46bc859d4dacc96a7024ba4e88ca3b6f1 100644
--- a/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
+++ b/Calorimeter/CaloUtils/src/CaloTowerBuilderTool.cxx
@@ -6,7 +6,7 @@
#include "CLHEP/Units/SystemOfUnits.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IToolSvc.h"
//#include "GaudiKernel/IChronoStatSvc.h"
@@ -28,8 +28,7 @@
CaloTowerBuilderTool::CaloTowerBuilderTool(const std::string& name,
const std::string& type,
const IInterface* parent)
- : CaloTowerBuilderToolBase(name,type,parent),
- m_caloDDM(nullptr)
+ : CaloTowerBuilderToolBase(name,type,parent)
// , m_errorCounter(0)
{
declareInterface<ICaloTowerBuilderToolBase>(this);
@@ -52,7 +51,6 @@ CaloTowerBuilderTool::~CaloTowerBuilderTool()
// protected!
StatusCode CaloTowerBuilderTool::initializeTool() {
- ATH_CHECK( detStore()->retrieve (m_caloDDM, "CaloMgr") );
m_caloIndices = parseCalos (m_includedCalos);
return this->checkSetup(msg());
}
@@ -304,7 +302,12 @@ CaloTowerBuilderTool::parseCalos
StatusCode CaloTowerBuilderTool::rebuildLookup()
{
if (towerSeg().neta() != 0 && towerSeg().nphi() != 0) {
- if (m_cellStore.buildLookUp(*m_caloDDM, towerSeg(), m_caloIndices)) {
+
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ const CaloDetDescrManager* caloDDM = nullptr;
+ ATH_CHECK( detStore()->retrieve (caloDDM, "CaloMgr") );
+
+ if (m_cellStore.buildLookUp(*caloDDM, towerSeg(), m_caloIndices)) {
return StatusCode::SUCCESS;
}
}
diff --git a/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.cxx b/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.cxx
index b5bca2b1fd45fcaf7c6bbb0baa17003089c2ecff..0e14584134aae524a0ec8cbb7005a4a5a11b7c4f 100644
--- a/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.cxx
+++ b/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.cxx
@@ -23,22 +23,11 @@
*/
CaloTowerStoreTestAlg::CaloTowerStoreTestAlg (const std::string& name,
ISvcLocator* pSvcLocator)
- : AthAlgorithm (name, pSvcLocator),
- m_caloDDM (nullptr)
+ : AthAlgorithm (name, pSvcLocator)
{
}
-/**
- * @brief Standard Gaudi initialize method.
- */
-StatusCode CaloTowerStoreTestAlg::initialize()
-{
- ATH_CHECK( detStore()->retrieve (m_caloDDM, "CaloMgr") );
- return StatusCode::SUCCESS;
-}
-
-
void
CaloTowerStoreTestAlg::iterate_full (const CaloTowerStore& store,
test_tows_t& tows)
@@ -90,9 +79,14 @@ CaloTowerStoreTestAlg::test_subseg_iter (const CaloTowerStore& store1,
const std::vector<CaloCell_ID::SUBCALO>& calos,
const CaloTowerSeg::SubSeg& subseg)
{
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ const CaloDetDescrManager* caloDDM = nullptr;
+ StatusCode sc = detStore()->retrieve( caloDDM, "CaloMgr" );
+ if ( !sc.isSuccess() ) std::abort();
+
CaloTowerSeg seg = subseg.segmentation();
CaloTowerStore store2;
- if (!store2.buildLookUp (*m_caloDDM, seg, calos)) {
+ if (!store2.buildLookUp (*caloDDM, seg, calos)) {
std::abort();
}
@@ -111,13 +105,19 @@ CaloTowerStoreTestAlg::test_subseg_iter (const CaloTowerStore& store1,
void CaloTowerStoreTestAlg::test1()
{
std::cout << "test1\n";
+
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ const CaloDetDescrManager* caloDDM = nullptr;
+ StatusCode sc = detStore()->retrieve( caloDDM, "CaloMgr" );
+ if ( !sc.isSuccess() ) std::abort();
+
CaloTowerSeg seg (50, 64, -2.5, 2.5);
std::vector<CaloCell_ID::SUBCALO> calos;
calos.push_back (CaloCell_ID::LAREM);
calos.push_back (CaloCell_ID::LARHEC);
calos.push_back (CaloCell_ID::TILE);
CaloTowerStore store;
- if (!store.buildLookUp (*m_caloDDM, seg, calos)) {
+ if (!store.buildLookUp (*caloDDM, seg, calos)) {
std::abort();
}
diff --git a/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h b/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h
index 817e9137a9250aa509b917ebf8c12022d1920fc5..b64cdbfe6c920bf0d643aacdaabe48a531ff562c 100644
--- a/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h
+++ b/Calorimeter/CaloUtils/src/CaloTowerStoreTestAlg.h
@@ -19,7 +19,6 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "CaloUtils/CaloTowerStore.h"
-class CaloDetDescrManager;
class CaloTowerStoreTestAlg
@@ -33,12 +32,6 @@ public:
ISvcLocator* pSvcLocator);
- /**
- * @brief Standard Gaudi initialize method.
- */
- virtual StatusCode initialize() override;
-
-
/**
* @brief Standard Gaudi execute method.
*/
@@ -50,8 +43,6 @@ public:
void dump_tows (const test_tows_t& t);
private:
- const CaloDetDescrManager* m_caloDDM;
-
void iterate_full (const CaloTowerStore& store,
test_tows_t& tows);
void iterate_subseg (const CaloTowerStore& store,
diff --git a/Commission/CommissionRec/src/ComTimeRec.cxx b/Commission/CommissionRec/src/ComTimeRec.cxx
index 0d24ad3a1de03763d8bf02e932d2c4d6c4e32cd1..7d3d63ee31233d69251c61982775b9e214dfce42 100755
--- a/Commission/CommissionRec/src/ComTimeRec.cxx
+++ b/Commission/CommissionRec/src/ComTimeRec.cxx
@@ -6,7 +6,7 @@
#include "CLHEP/Units/SystemOfUnits.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CommissionEvent/ComTime.h"
diff --git a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisAlgorithm.h b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisAlgorithm.h
index a96d7cd6d865d4773cbcd817b373b440c2f7f444..452a448e25c4e715f05625e30dd492431cd9ced9 100644
--- a/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisAlgorithm.h
+++ b/Control/AthAnalysisBaseComps/AthAnalysisBaseComps/AthAnalysisAlgorithm.h
@@ -58,7 +58,7 @@ public:
virtual StatusCode sysExecute(const EventContext&) override;
protected:
- void updateEvtStore(Property& prop);
+ void updateEvtStore(Gaudi::Details::PropertyBase& prop);
/// Function called when first execute is encountered
/// user can read event information with evtStore()
diff --git a/Control/AthAnalysisBaseComps/src/AthAnalysisAlgorithm.cxx b/Control/AthAnalysisBaseComps/src/AthAnalysisAlgorithm.cxx
index 5a3a154d2b7fdb034cb0e0758c7b68277d73187f..efa1033ec7bb7a116daf1c49551787edf80cac67 100644
--- a/Control/AthAnalysisBaseComps/src/AthAnalysisAlgorithm.cxx
+++ b/Control/AthAnalysisBaseComps/src/AthAnalysisAlgorithm.cxx
@@ -42,7 +42,7 @@ AthAnalysisAlgorithm::AthAnalysisAlgorithm( const std::string& name
AthAnalysisAlgorithm::~AthAnalysisAlgorithm() { }
-void AthAnalysisAlgorithm::updateEvtStore(Property& prop) {
+void AthAnalysisAlgorithm::updateEvtStore(Gaudi::Details::PropertyBase& prop) {
evtStore().release().ignore();
evtStore().setTypeAndName(prop.toString());
}
diff --git a/Control/AthCUDA/AthCUDAServices/src/KernelRunnerSvc.h b/Control/AthCUDA/AthCUDAServices/src/KernelRunnerSvc.h
index 77e421fca780249e5ff393c1353ce0acd123e3f2..a08d2d3261f0485f5d7a8ad8d5fdbcddc1c10b39 100644
--- a/Control/AthCUDA/AthCUDAServices/src/KernelRunnerSvc.h
+++ b/Control/AthCUDA/AthCUDAServices/src/KernelRunnerSvc.h
@@ -14,7 +14,7 @@
// Framework include(s).
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
// System include(s).
diff --git a/Control/AthCUDA/AthCUDAServices/src/StreamPoolSvc.h b/Control/AthCUDA/AthCUDAServices/src/StreamPoolSvc.h
index a2cc443540ac259e8b1d82265509b29cc40c9fda..eaf07b97737573ca5ced176a5cfbe742b7bc22d1 100644
--- a/Control/AthCUDA/AthCUDAServices/src/StreamPoolSvc.h
+++ b/Control/AthCUDA/AthCUDAServices/src/StreamPoolSvc.h
@@ -12,7 +12,7 @@
#include "AthCUDAInterfaces/IStreamPoolSvc.h"
// Framework include(s).
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
// System include(s).
diff --git a/Control/AthContainers/AthContainers/tools/copyThinned.icc b/Control/AthContainers/AthContainers/tools/copyThinned.icc
index c510efa4b66590e01af4e538158a45b720632f0c..1a14ebf50585c9af5359be2c415bc316ecc374b8 100644
--- a/Control/AthContainers/AthContainers/tools/copyThinned.icc
+++ b/Control/AthContainers/AthContainers/tools/copyThinned.icc
@@ -122,18 +122,13 @@ copyThinned1 (const CONTAINER& orig,
{
// T->P conversion is done from within copyAuxStoreThinned,
// so we need to call it regardless of whether or not
- // thinning is actually done. Don't call it though if the
- // container is empty.
- // The cast is needed because some xAOD aux store classes
- // declare a data member `size'.
- if (static_cast<const SG::IAuxStore&>(orig).size() > 0)
- {
- auto newcont = std::make_unique<CONTAINER>();
- copyAuxStoreThinned (orig, *newcont, info);
- return newcont;
- }
-
- return std::make_unique<CONTAINER> (orig);
+ // thinning is actually done. Variable selection happens there
+ // as well, so need to call it even if the container is empty.
+ // (Actually, in that case, all dynamic variables will be removed,
+ // but that's ok.)
+ auto newcont = std::make_unique<CONTAINER>();
+ copyAuxStoreThinned (orig, *newcont, info);
+ return newcont;
}
diff --git a/Control/AthLinksSA/CMakeLists.txt b/Control/AthLinksSA/CMakeLists.txt
index 1cc272e6c182fcb637230678ae5fb02c87427cfb..29e3a5247ecb42038b7a9cb359e34623412310a3 100644
--- a/Control/AthLinksSA/CMakeLists.txt
+++ b/Control/AthLinksSA/CMakeLists.txt
@@ -1,14 +1,8 @@
-#
-# Build configuration for the standalone AthLinksSA package.
-#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the name of this package:
atlas_subdir( AthLinks )
-# This package depends on other packages:
-atlas_depends_on_subdirs(
- PUBLIC Control/xAODRootAccessInterfaces )
-
# This package uses ROOT:
find_package( ROOT COMPONENTS Core )
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandle.h b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandle.h
new file mode 100644
index 0000000000000000000000000000000000000000..029456fede58318621bef7000273b05961686966
--- /dev/null
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandle.h
@@ -0,0 +1,261 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+
+/**
+ * @file AsgDataHandles/ReadDecorHandle.h
+ * @author Nils Krumnack <Nils.Erik.Krumnack@cern.h>
+ * @author scott snyder <snyder@bnl.gov> (for original)
+ * @brief Handle class for reading a decoration on an object.
+ */
+
+
+#ifndef ASG_DATA_HANDLES_READ_DECOR_HANDLE_H
+#define ASG_DATA_HANDLES_READ_DECOR_HANDLE_H
+
+#ifndef XAOD_STANDALONE
+#include <StoreGate/ReadDecorHandle.h>
+#else
+
+#include "AsgDataHandles/ReadDecorHandleKey.h"
+#include "AsgDataHandles/ReadHandle.h"
+// #include "AsgDataHandles/tools/DecorKeyHelpers.h"
+// #include "AthContainers/AuxElement.h"
+// #include "GaudiKernel/EventContext.h"
+// #include <type_traits>
+
+
+namespace SG {
+
+
+/**
+ * @brief Handle class for reading a decoration on an object.
+ *
+ * See StoreGate/ReadDecorHandle for details.
+ *
+ * This currently (31 Jul 20) contains a number of commented out
+ * members that were part of the original handle implementation, but
+ * have not yet been implemented in the standalone version. The plan
+ * is to either implement or remove them, depending on what is needed
+ * in AnalysisBase as we add more packages.
+ *
+ */
+template <class T, class D>
+class ReadDecorHandle
+ : public ReadHandle<T>
+{
+public:
+ /// Base class.
+ typedef ReadHandle<T> Base;
+
+ /// Accessor type for aux data.
+ typedef SG::AuxElement::ConstAccessor<D> accessor_t;
+
+ /// Type referencing an aux data item.
+ typedef typename accessor_t::const_reference_type
+ const_reference_type;
+
+ /// Pointer into the vector holding an aux data item.
+ typedef typename accessor_t::const_container_pointer_type
+ const_container_pointer_type;
+
+
+ /**
+ * @brief Constructor from a ReadDecorHandleKey.
+ * @param key The key object holding the clid/key/store/attr.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ */
+ explicit ReadDecorHandle (const ReadDecorHandleKey<T>& key);
+
+
+// /**
+// * @brief Constructor from a ReadDecorHandleKey and an explicit event context.
+// * @param key The key object holding the clid/key.
+// * @param ctx The event context.
+// *
+// * This will raise an exception if the StoreGate key is blank,
+// * or if the event store cannot be found.
+// *
+// * If the default event store has been requested, then the thread-specific
+// * store from the event context will be used.
+// */
+// explicit ReadDecorHandle (const ReadDecorHandleKey<T>& key,
+// const EventContext& ctx);
+
+
+// /**
+// * @brief Copy constructor.
+// */
+// ReadDecorHandle (const ReadDecorHandle& rhs);
+
+
+// /**
+// * @brief Move constructor.
+// */
+// ReadDecorHandle (ReadDecorHandle&& rhs);
+
+
+// /**
+// * @brief Assignment operator.
+// */
+// ReadDecorHandle& operator= (const ReadDecorHandle& rhs);
+
+
+// /**
+// * @brief Move operator.
+// */
+// ReadDecorHandle& operator= (ReadDecorHandle&& rhs);
+
+
+ /**
+ * @brief Is the referenced container present in SG?
+ *
+ * Note that this tests for the presence of the _container_,
+ * not for the decoration.
+ *
+ * Const method; the handle does not change as a result of this.
+ */
+ bool isPresent() const;
+
+
+ /**
+ * @brief Fetch the variable for one element, as a const reference.
+ * @param e The element for which to fetch the variable.
+ */
+ const_reference_type operator() (const AuxElement& e) const;
+
+
+ /**
+ * @brief Fetch the variable for one element, as a const reference.
+ * @param index The index of the desired element.
+ *
+ * This looks up the variable in the object referenced by this handle.
+ * For a standalone object, pass an index of 0.
+ */
+ const_reference_type operator() (size_t index);
+
+
+// /**
+// * @brief Get a pointer to the start of the auxiliary data array,
+// * for the referenced object.
+// */
+// const_container_pointer_type
+// getDataArray();
+
+
+// /**
+// * @brief Test to see if this variable exists in the store,
+// * for the referenced object.
+// */
+// bool isAvailable();
+
+
+// /**
+// * @brief Return the aux id for this variable.
+// */
+// SG::auxid_t auxid() const;
+
+
+private:
+ /**
+ * @brief Return the referenced object as a @c SG::AuxVectorData.
+ * Specialization for the case of a standalone object
+ * (@c T derives from @c SG::AuxElement).
+ */
+ const SG::AuxVectorData* vectorData (std::true_type);
+
+
+ /**
+ * @brief Return the referenced object as a @c SG::AuxVectorData.
+ * Specialization for the case of a container
+ * (@c T does not derive from @c SG::AuxElement).
+ */
+ const SG::AuxVectorData* vectorData (std::false_type);
+
+
+ /**
+ * @brief Return the referenced object as a @c SG::AuxVectorData.
+ *
+ * If @c T is a container object, then this should be the object itself.
+ * But if it is a standalone object, deriving from @c SG::AuxElement,
+ * then we need to call container() on the object.
+ */
+ const SG::AuxVectorData* vectorData();
+
+
+ /// Accessor for the aux data item.
+ accessor_t m_acc;
+};
+
+
+// /**
+// * @brief Return a @c ReadDecorHandle referencing @c key.
+// * @param key The key object holding the clid/key/store.
+// *
+// * This will raise an exception if the StoreGate key is blank,
+// * or if the event store cannot be found.
+// *
+// * The type of the decoration must be included as an explicit template parameter:
+// *
+// *@code
+// * auto handle = SG::makeHandle<float> (key);
+// @endcode
+// *
+// * Note that @c D comes first in the argument list. It's given explicitly,
+// * while @c T is inferred from @c key.
+// */
+// template <class D, class T>
+// ReadDecorHandle<T, D> makeHandle (const ReadDecorHandleKey<T>& key);
+
+
+// /**
+// * @brief Return a @c ReadDecorHandle referencing @c key for an explicit context.
+// * @param key The key object holding the clid/key/store.
+// * @param ctx The event context.
+// *
+// * This will raise an exception if the StoreGate key is blank,
+// * or if the event store cannot be found.
+// *
+// * If the default event store has been requested, then the thread-specific
+// * store from the event context will be used.
+// *
+// * The type of the decoration must be included as an explicit template parameter:
+// *
+// *@code
+// * auto handle = SG::makeHandle<float> (key, ctx);
+// @endcode
+// *
+// * Note that @c D comes first in the argument list. It's given explicitly,
+// * while @c T is inferred from @c key.
+// */
+// template <class D, class T>
+// ReadDecorHandle<T, D> makeHandle (const ReadDecorHandleKey<T>& key,
+// const EventContext& ctx);
+
+
+// /**
+// * @brief These two signatures are to catch cases where the explicit
+// * template argument is omitted from the @c makeHandle call
+// * and give an error tailored to that. Otherwise, the @c makeHandle
+// * call for @c ReadHandle would match, potentially giving a much
+// * more confusing error.
+// */
+// template <class T>
+// void makeHandle (const ReadDecorHandleKey<T>& key);
+// template <class T>
+// void makeHandle (const ReadDecorHandleKey<T>& key,
+// const EventContext& ctx);
+
+
+} // namespace SG
+
+
+#include "AsgDataHandles/ReadDecorHandle.icc"
+
+#endif
+
+#endif // not STOREGATE_READDECORHANDLE_READDECORHANDLE_H
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandle.icc b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandle.icc
new file mode 100644
index 0000000000000000000000000000000000000000..4448a16104b5d71ebb6d873ea64c1d23362737e7
--- /dev/null
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandle.icc
@@ -0,0 +1,317 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+
+/**
+ * @file AsgDataHandles/ReadDecorHandle.icc
+ * @author Nils Krumnack <Nils.Erik.Krumnack@cern.h>
+ * @author scott snyder <snyder@bnl.gov> (for original)
+ * @brief Handle class for reading a decoration on an object.
+ */
+
+
+namespace SG {
+
+inline std::string contKeyFromKey (const std::string& key)
+{
+ const auto split = key.rfind ('.');
+ if (split == std::string::npos)
+ throw std::runtime_error ("decor key does not contain a .: " + key);
+ return key.substr (0, split);
+}
+
+inline std::string decorKeyFromKey (const std::string& key)
+{
+ const auto split = key.rfind ('.');
+ if (split == std::string::npos)
+ throw std::runtime_error ("decor key does not contain a .: " + key);
+ return key.substr (split + 1);
+}
+
+/**
+ * @brief Constructor from a ReadDecorHandleKey.
+ * @param key The key object holding the clid/key/store/attr.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ */
+template <class T, class D>
+ReadDecorHandle<T, D>::ReadDecorHandle (const ReadDecorHandleKey<T>& key)
+ : Base (key),
+ m_acc (SG::decorKeyFromKey (key.key()))
+{
+}
+
+
+// /**
+// * @brief Constructor from a ReadDecorHandleKey and an explicit event context.
+// * @param key The key object holding the clid/key.
+// * @param ctx The event context.
+// *
+// * This will raise an exception if the StoreGate key is blank,
+// * or if the event store cannot be found.
+// *
+// * If the default event store has been requested, then the thread-specific
+// * store from the event context will be used.
+// */
+// template <class T, class D>
+// ReadDecorHandle<T, D>::ReadDecorHandle (const ReadDecorHandleKey<T>& key,
+// const EventContext& ctx)
+// : Base (key, ctx),
+// m_acc (SG::decorKeyFromKey (key.key()))
+// {
+// }
+
+
+// /**
+// * @brief Copy constructor.
+// */
+// template <class T, class D>
+// ReadDecorHandle<T, D>::ReadDecorHandle (const ReadDecorHandle& rhs)
+// : Base (rhs),
+// m_acc (rhs.m_acc)
+// {
+// }
+
+
+// /**
+// * @brief Move constructor.
+// */
+// template <class T, class D>
+// ReadDecorHandle<T, D>::ReadDecorHandle (ReadDecorHandle&& rhs)
+// : Base (std::move (rhs)),
+// m_acc (std::move (rhs.m_acc))
+// {
+// }
+
+
+// /**
+// * @brief Assignment operator.
+// */
+// template <class T, class D>
+// ReadDecorHandle<T, D>& ReadDecorHandle<T, D>::operator= (const ReadDecorHandle& rhs)
+// {
+// if (this != &rhs) {
+// *static_cast<Base*>(this) = rhs;
+// m_acc = rhs.m_acc;
+// }
+// return *this;
+// }
+
+
+// /**
+// * @brief Move operator.
+// */
+// template <class T, class D>
+// ReadDecorHandle<T, D>& ReadDecorHandle<T, D>::operator= (ReadDecorHandle&& rhs)
+// {
+// if (this != &rhs) {
+// *static_cast<Base*>(this) = std::move (rhs);
+// m_acc = std::move (rhs.m_acc);
+// }
+// return *this;
+// }
+
+
+/**
+ * @brief Is the referenced container present in SG?
+ *
+ * Note that this tests for the presence of the _container_,
+ * not for the decoration.
+ *
+ * Const method; the handle does not change as a result of this.
+ */
+template <class T, class D>
+bool ReadDecorHandle<T, D>::isPresent() const
+{
+ return this->isPresent_impl (contKeyFromKey (this->key()));
+}
+
+
+/**
+ * @brief Fetch the variable for one element, as a const reference.
+ * @param e The element for which to fetch the variable.
+ */
+template <class T, class D>
+inline
+typename ReadDecorHandle<T, D>::const_reference_type
+ReadDecorHandle<T, D>::operator() (const AuxElement& e) const
+{
+ return m_acc (e);
+}
+
+
+/**
+ * @brief Fetch the variable for one element, as a const reference.
+ * @param index The index of the desired element.
+ *
+ * This looks up the variable in the object referenced by this handle.
+ * For a standalone object, pass an index of 0.
+ */
+template <class T, class D>
+inline
+typename ReadDecorHandle<T, D>::const_reference_type
+ReadDecorHandle<T, D>::operator() (size_t i)
+{
+ return m_acc (*this->vectorData(), i);
+}
+
+
+// /**
+// * @brief Get a pointer to the start of the auxiliary data array.
+// * for the referenced object.
+// */
+// template <class T, class D>
+// typename ReadDecorHandle<T, D>::const_container_pointer_type
+// ReadDecorHandle<T, D>::getDataArray()
+// {
+// return reinterpret_cast<const_container_pointer_type>
+// (this->vectorData()->getDataArray (m_acc.auxid()));
+// }
+
+
+// /**
+// * @brief Test to see if this variable exists in the store,
+// * for the referenced object.
+// */
+// template <class T, class D>
+// inline
+// bool ReadDecorHandle<T, D>::isAvailable()
+// {
+// const SG::AuxVectorData* vec = this->vectorData();
+// return vec && vec->isAvailable (m_acc.auxid());
+// }
+
+
+// /**
+// * @brief Return the aux id for this variable.
+// */
+// template <class T, class D>
+// inline
+// SG::auxid_t ReadDecorHandle<T, D>::auxid() const
+// {
+// return m_acc.auxid();
+// }
+
+
+/**
+ * @brief Return the referenced object as a @c SG::AuxVectorData.
+ * Specialization for the case of a standalone object
+ * (@c T derives from @c SG::AuxElement).
+ */
+template <class T, class D>
+inline
+const SG::AuxVectorData* ReadDecorHandle<T, D>::vectorData (std::true_type)
+{
+ return (*this)->container();
+}
+
+
+/**
+ * @brief Return the referenced object as a @c SG::AuxVectorData.
+ * Specialization for the case of a container
+ * (@c T does not derive from @c SG::AuxElement).
+ */
+template <class T, class D>
+inline
+const SG::AuxVectorData* ReadDecorHandle<T, D>::vectorData (std::false_type)
+{
+ return this->cptr();
+}
+
+
+/**
+ * @brief Return the referenced object as a @c SG::AuxVectorData.
+ *
+ * If @c T is a container object, then this should be the object itself.
+ * But if it is a standalone object, deriving from @c SG::AuxElement,
+ * then we need to call container() on the object.
+ */
+template <class T, class D>
+inline
+const SG::AuxVectorData* ReadDecorHandle<T, D>::vectorData()
+{
+ // Dispatch to the appropriate specialization, depending on whether or not
+ // @c T derives from @c SG::AuxElement.
+ return vectorData (typename std::is_base_of<SG::AuxElement, T>::type());
+}
+
+
+// /**
+// * @brief Return a @c ReadDecorHandle referencing @c key.
+// * @param key The key object holding the clid/key/store.
+// *
+// * This will raise an exception if the StoreGate key is blank,
+// * or if the event store cannot be found.
+// *
+// * The type of the decoration must be included as an explicit template parameter:
+// *
+// *@code
+// * auto handle = SG::makeHandle<float> (key);
+// @endcode
+// *
+// * Note that @c D comes first in the argument list. It's given explicitly,
+// * while @c T is inferred from @c key.
+// */
+// template <class D, class T>
+// ReadDecorHandle<T, D> makeHandle (const ReadDecorHandleKey<T>& key)
+// {
+// return ReadDecorHandle<T, D> (key);
+// }
+
+
+// /**
+// * @brief Return a @c ReadDecorHandle referencing @c key for an explicit context.
+// * @param key The key object holding the clid/key/store.
+// * @param ctx The event context.
+// *
+// * This will raise an exception if the StoreGate key is blank,
+// * or if the event store cannot be found.
+// *
+// * If the default event store has been requested, then the thread-specific
+// * store from the event context will be used.
+// *
+// * The type of the decoration must be included as an explicit template parameter:
+// *
+// *@code
+// * auto handle = SG::makeHandle<float> (key, ctx);
+// @endcode
+// *
+// * Note that @c D comes first in the argument list. It's given explicitly,
+// * while @c T is inferred from @c key.
+// */
+// template <class D, class T>
+// ReadDecorHandle<T, D> makeHandle (const ReadDecorHandleKey<T>& key,
+// const EventContext& ctx)
+// {
+// return ReadDecorHandle<T, D> (key, ctx);
+// }
+
+
+// /**
+// * @brief These two signatures are to catch cases where the explicit
+// * template argument is omitted from the @c makeHandle call
+// * and give an error tailored to that. Otherwise, the @c makeHandle
+// * call for @c ReadHandle would match, potentially giving a much
+// * more confusing error.
+// */
+// template <class T>
+// void makeHandle (const ReadDecorHandleKey<T>& /*key*/)
+// {
+// // If you see an error from here, you've forgotten the explicit template
+// // argument to @c makeHandle giving the decoration type.
+// // See the examples of @c makeHandle above.
+// return T::makeHandleForDecorationsRequiresExplicitTemplateArgument();
+// }
+// template <class T>
+// void makeHandle (const ReadDecorHandleKey<T>& /*key*/,
+// const EventContext& /*ctx*/)
+// {
+// // If you see an error from here, you've forgotten the explicit template
+// // argument to @c makeHandle giving the decoration type.
+// // See the examples of @c makeHandle above.
+// return T::makeHandleForDecorationsRequiresExplicitTemplateArgument();
+// }
+
+
+} // namespace SG
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandleKey.h b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandleKey.h
new file mode 100644
index 0000000000000000000000000000000000000000..6dad76d54ceb92b6575c298d7b03a4c2190ea46b
--- /dev/null
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandleKey.h
@@ -0,0 +1,105 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+
+/**
+ * @file AsgDataHandles/ReadDecorHandleKey.h
+ * @author Nils Krumnack <Nils.Erik.Krumnack@cern.h>
+ * @author scott snyder <snyder@bnl.gov> (for original)
+ * @brief Property holding a SG store/key/clid/attr name from which a
+ * ReadDecorHandle is made.
+ */
+
+
+#ifndef ASG_DATA_HANDLES_READ_DECOR_HANDLE_KEY_H
+#define ASG_DATA_HANDLES_READ_DECOR_HANDLE_KEY_H
+
+#ifndef XAOD_STANDALONE
+#include <StoreGate/ReadDecorHandleKey.h>
+#else
+
+#include "AsgDataHandles/ReadHandleKey.h"
+
+namespace SG {
+
+/*
+ * @brief Property holding a SG store/key/clid/attr name from which a
+ * ReadDecorHandle is made.
+ *
+ * See StoreGate/ReadDecorHandleKey for details.
+ *
+ * This currently (31 Jul 20) contains a number of commented out
+ * members that were part of the original handle implementation, but
+ * have not yet been implemented in the standalone version. The plan
+ * is to either implement or remove them, depending on what is needed
+ * in AnalysisBase as we add more packages.
+ *
+ */
+template <class T>
+class ReadDecorHandleKey
+ : public ReadHandleKey<T>
+{
+public:
+ /// Base class.
+ typedef ReadHandleKey<T> Base;
+
+// /// Class for which we set the CLID. See above.
+// typedef typename SG::TopBase<T>::type topbase_t;
+
+
+// /**
+// * @brief Constructor.
+// * @param key The StoreGate key for the object.
+// * @param storeName Name to use for the store, if it's not encoded in sgkey.
+// *
+// * The provided key may actually start with the name of the store,
+// * separated by a "+": "MyStore+Obj". If no "+" is present
+// * the store named by @c storeName is used.
+// */
+// ReadDecorHandleKey (const std::string& key = "",
+// const std::string& storeName = StoreID::storeName(StoreID::EVENT_STORE));
+
+
+ /**
+ * @brief auto-declaring Property Constructor.
+ * @param owner Owning component.
+ * @param name name of the Property
+ * @param key default StoreGate key for the object.
+ * @param doc Documentation string.
+ *
+ * will associate the named Property with this RHK via declareProperty
+ *
+ * The provided key may actually start with the name of the store,
+ * separated by a "+": "MyStore+Obj". If no "+" is present
+ * the store named by @c storeName is used.
+ */
+ template <class OWNER, class K>
+ ReadDecorHandleKey( OWNER* owner,
+ const std::string& name,
+ const K& key = {},
+ const std::string& doc = "");
+
+
+// /// Can get this from the base class.
+// using Base::operator=;
+
+
+// /**
+// * @brief Return the class ID for the referenced object.
+// *
+// * Overridden here to return the CLID for @c T instead of @c topbase_t.
+// */
+// CLID clid() const;
+};
+
+
+} // namespace SG
+
+
+#include "AsgDataHandles/ReadDecorHandleKey.icc"
+
+#endif
+
+#endif // not STOREGATE_READDECORHANDLEKEY_H
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandleKey.icc b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandleKey.icc
new file mode 100644
index 0000000000000000000000000000000000000000..457db4d3ade831a0fbe13d13f07c9f4228d61c54
--- /dev/null
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadDecorHandleKey.icc
@@ -0,0 +1,73 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file AsgDataHandles/ReadDecorHandleKey.icc
+ * @author Nils Krumnack <Nils.Erik.Krumnack@cern.h>
+ * @author scott snyder <snyder@bnl.gov> (for original)
+ * @brief Property holding a SG store/key/clid/attr name from which a
+ * ReadDecorHandle is made.
+ */
+
+
+namespace SG {
+
+
+// /**
+// * @brief Constructor.
+// * @param key The StoreGate key for the object.
+// * @param storeName Name to use for the store, if it's not encoded in sgkey.
+// *
+// * The provided key may actually start with the name of the store,
+// * separated by a "+": "MyStore+Obj". If no "+" is present
+// * the store named by @c storeName is used.
+// */
+// template <class T>
+// inline
+// ReadDecorHandleKey<T>::ReadDecorHandleKey (const std::string& key /*= ""*/,
+// const std::string& storeName /*= StoreID::storeName(StoreID::EVENT_STORE)*/)
+// : Base (ClassID_traits<topbase_t>::ID(), key, storeName)
+// {
+// }
+
+
+/**
+ * @brief auto-declaring Property Constructor.
+ * @param owner Owning component.
+ * @param name name of the Property
+ * @param key default StoreGate key for the object.
+ * @param doc Documentation string.
+ *
+ * will associate the named Property with this RHK via declareProperty
+ *
+ * The provided key may actually start with the name of the store,
+ * separated by a "+": "MyStore+Obj". If no "+" is present
+ * the store named by @c storeName is used.
+ */
+template <class T>
+template <class OWNER, class K>
+inline
+ReadDecorHandleKey<T>::ReadDecorHandleKey( OWNER* owner,
+ const std::string& name,
+ const K& key /*={}*/,
+ const std::string& doc /*=""*/)
+ : Base (owner, name, key, doc)
+{
+}
+
+
+// /**
+// * @brief Return the class ID for the referenced object.
+// *
+// * Overridden here to return the CLID for @c T instead of @c topbase_t.
+// */
+// template <class T>
+// inline
+// CLID ReadDecorHandleKey<T>::clid() const
+// {
+// return ClassID_traits<T>::ID();
+// }
+
+
+} // namespace SG
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.h b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.h
index ae9f7e1721087ce68480a5bff361ece79fcd3fe5..de53f22450117dcbb087af8722f5eaa462092699 100644
--- a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.h
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.h
@@ -134,6 +134,15 @@ public:
const_pointer_type get (const EventContext& ctx) const;
+ /**
+ * @brief Is the referenced object present in SG?
+ * @param key SG key to test.
+ *
+ * Const method; the handle does not change as a result of this.
+ */
+ bool isPresent_impl (const std::string& key) const;
+
+
private:
/**
* @brief Helper: dereference the pointer.
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.icc b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.icc
index e3aba5c8546b47db65ae95f8932a8b7cca6180ea..f35c97693e2b7378288eeb824940d6f5870ff352 100644
--- a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.icc
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.icc
@@ -145,8 +145,7 @@ template <class T>
inline
bool ReadHandle<T>::isValid()
{
- const T *result = nullptr;
- return xAOD::TActiveEvent::event()->retrieve (result, key(), true);
+ return isPresent_impl(key());
}
@@ -175,6 +174,20 @@ ReadHandle<T>::get (const EventContext& /*ctx*/) const
}
+/**
+ * @brief Is the referenced object present in SG?
+ * @param key SG key to test.
+ *
+ * Const method; the handle does not change as a result of this.
+ */
+template <class T>
+bool ReadHandle<T>::isPresent_impl (const std::string& key) const
+{
+ const T *result = nullptr;
+ return xAOD::TActiveEvent::event()->retrieve (result, key, true);
+}
+
+
/**
* @brief Helper: dereference the pointer.
* Throws ExcNullReadHandle on failure.
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandle.h b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandle.h
new file mode 100644
index 0000000000000000000000000000000000000000..c9eca0dcfd6881c73cf1282f28be09290bbf74c8
--- /dev/null
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandle.h
@@ -0,0 +1,678 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file AsgDataHandles/WriteHandle.h
+ * @author Nils Krumnack <Nils.Erik.Krumnack@cern.h>
+ * @author S. Binet, P. Calafiura, scott snyder <snyder@bnl.gov> (for original version)
+ * @brief Handle class for recording to StoreGate.
+ */
+
+
+#ifndef ASG_DATA_HANDLES_WRITE_HANDLE_H
+#define ASG_DATA_HANDLES_WRITE_HANDLE_H
+
+#ifndef XAOD_STANDALONE
+#include <StoreGate/WriteHandle.h>
+#else
+
+#include "AsgDataHandles/VarHandleBase.h"
+#include "AsgDataHandles/WriteHandleKey.h"
+#include <string>
+#include <memory> /*unique_ptr*/
+
+
+namespace SG {
+
+
+/**
+ * @class SG::WriteHandle<T>
+ *
+ * See StoreGate/WriteHandle for details.
+ *
+ * This currently (07 Aug 20) contains a number of commented out
+ * members that were part of the original handle implementation, but
+ * have not yet been implemented in the standalone version. The plan
+ * is to either implement or remove them, depending on what is needed
+ * in AnalysisBase as we add more packages.
+ *
+ */
+template <class T>
+class WriteHandle
+ : public SG::VarHandleBase
+{
+public:
+ typedef T* pointer_type; // FIXME: better handling of
+ typedef const T* const_pointer_type; // qualified T type ?
+ typedef T& reference_type;
+ typedef const T& const_reference_type;
+
+
+ //************************************************************************
+ // Constructors, etc.
+ //
+
+
+ // /**
+ // * @brief Default constructor.
+ // *
+ // * The handle will not be usable until a non-blank key is assigned.
+ // */
+ // WriteHandle();
+
+
+ // /**
+ // * @brief Constructor with full arguments.
+ // * @param sgkey StoreGate key of the referenced object.
+ // * @param storename Name of the referenced event store.
+ // */
+ // explicit WriteHandle(const std::string& sgkey,
+ // const std::string& storename = StoreID::storeName(StoreID::EVENT_STORE));
+
+
+ /**
+ * @brief Constructor from a WriteHandleKey.
+ * @param key The key object holding the clid/key/store.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ */
+ explicit WriteHandle (const WriteHandleKey<T>& key);
+
+
+ /**
+ * @brief Constructor from a WriteHandleKey and an explicit event context.
+ * @param key The key object holding the clid/key.
+ * @param ctx The event context.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ *
+ * If the default event store has been requested, then the thread-specific
+ * store from the event context will be used.
+ */
+ explicit WriteHandle (const WriteHandleKey<T>& key, const EventContext& ctx);
+
+
+ /**
+ * @brief Copy constructor.
+ */
+ WriteHandle( const WriteHandle& rhs );
+
+
+ /**
+ * @brief Move constructor.
+ */
+ WriteHandle( WriteHandle&& rhs );
+
+
+ /**
+ * @brief Assignment operator.
+ */
+ WriteHandle& operator=( const WriteHandle& rhs );
+
+
+ /**
+ * @brief Move operator.
+ */
+ WriteHandle& operator=( WriteHandle&& rhs );
+
+
+ /**
+ * @brief Destructor.
+ *
+ * Lock an aux object if m_lockAuxPending is set.
+ */
+ ~WriteHandle();
+
+
+ //************************************************************************
+ // Deference. These all return only the cached pointer.
+ //
+
+
+ // /**
+ // * @brief Dereference the pointer.
+ // * Returns the cached pointer. Throws ExcNullWriteHandle if null.
+ // */
+ // pointer_type operator->();
+
+
+ // /**
+ // * @brief Dereference the pointer.
+ // * Returns the cached pointer. Throws ExcNullWriteHandle if null.
+ // */
+ // reference_type operator*();
+
+
+ // /**
+ // * @brief Dereference the pointer.
+ // * Returns the cached pointer.
+ // */
+ // const_pointer_type cptr() const;
+
+
+ // /**
+ // * @brief Dereference the pointer.
+ // * Returns the cached pointer.
+ // */
+ // pointer_type ptr();
+
+
+ // /**
+ // * @brief Return the cached pointer directly; no lookup.
+ // */
+ // pointer_type cachedPtr();
+
+
+ // /**
+ // * @brief Can the handle be successfully dereferenced?
+ // */
+ // virtual bool isValid() override final;
+
+
+ //************************************************************************
+ // Record.
+ //
+
+
+ // /**
+ // * @brief Record a const object to the store.
+ // * @param data The object to record.
+ // */
+ // StatusCode record (std::unique_ptr<T> data);
+
+
+ // /**
+ // * @brief Record a non-const object to the store.
+ // * @param data The object to record.
+ // */
+ // StatusCode recordNonConst (std::unique_ptr<T> data);
+
+
+ /**
+ * @brief Record a const object and its auxiliary store to the store.
+ * @param data The object to record.
+ * @param auxstore Auxiliary store object.
+ */
+ template <class AUXSTORE>
+ StatusCode record (std::unique_ptr<T> data,
+ std::unique_ptr<AUXSTORE> store);
+
+
+ // /**
+ // * @brief Record a non-const object and its auxiliary store to the store.
+ // * @param data The object to record.
+ // * @param auxstore Auxiliary store object.
+ // */
+ // template <class AUXSTORE>
+ // StatusCode recordNonConst (std::unique_ptr<T> data,
+ // std::unique_ptr<AUXSTORE> store);
+
+
+ // /**
+ // * @brief Record a const shared DataObject to the store.
+ // * @param data The object to record.
+ // *
+ // * The event store takes shared ownership of the object.
+ // */
+ // StatusCode record (SG::DataObjectSharedPtr<T> data);
+
+
+ // /**
+ // * @brief Record a non-const shared DataObject to the store.
+ // * @param data The object to record.
+ // *
+ // * The event store takes shared ownership of the object.
+ // */
+ // StatusCode recordNonConst (SG::DataObjectSharedPtr<T> data);
+
+
+ // /**
+ // * @brief Record an object to the store.
+ // * @param data The object to record.
+ // * @param returnExisting Allow an existing object?
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, unless @c returnExisting is true, in which case
+ // * return success. In either case, @c data is destroyed.
+ // */
+ // const_pointer_type put (std::unique_ptr<T> data,
+ // bool returnExisting = false) const;
+
+
+ // /**
+ // * @brief Record an object to the store.
+ // * @param data The object to record.
+ // * @param returnExisting Allow an existing object?
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, unless @c returnExisting is true, in which case
+ // * return success. In either case, @c data is destroyed.
+ // */
+ // const_pointer_type put (std::unique_ptr<const T> data,
+ // bool returnExisting = false) const;
+
+
+ // /**
+ // * @brief Record an object to the store.
+ // * @param data The object to record.
+ // * @param returnExisting Allow an existing object?
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, unless @c returnExisting is true, in which case
+ // * return success. In either case, @c data is destroyed.
+ // */
+ // const_pointer_type put (std::unique_ptr<const ConstDataVector<T> > data,
+ // bool returnExisting = false) const;
+
+
+ // /**
+ // * @brief Record an object to the store.
+ // * @param ctx The event context to use.
+ // * @param data The object to record.
+ // * @param returnExisting Allow an existing object?
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, unless @c returnExisting is true, in which case
+ // * return success. In either case, @c data is destroyed.
+ // */
+ // const_pointer_type put (const EventContext& ctx,
+ // std::unique_ptr<const ConstDataVector<T> > data,
+ // bool returnExisting = false) const;
+
+
+ // /**
+ // * @brief Record an object to the store.
+ // * @param ctx The event context to use.
+ // * @param data The object to record.
+ // * @param returnExisting Allow an existing object?
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, unless @c returnExisting is true, in which case
+ // * return success. In either case, @c data is destroyed.
+ // */
+ // const_pointer_type put (const EventContext& ctx,
+ // std::unique_ptr<T> data,
+ // bool returnExisting = false) const;
+
+
+ // /**
+ // * @brief Record an object to the store.
+ // * @param ctx The event context to use.
+ // * @param data The object to record.
+ // * @param returnExisting Allow an existing object?
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, unless @c returnExisting is true, in which case
+ // * return success. In either case, @c data is destroyed.
+ // */
+ // const_pointer_type put (const EventContext& ctx,
+ // std::unique_ptr<const T> data,
+ // bool returnExisting = false) const;
+
+
+ // /**
+ // * @brief Record an object to the store.
+ // * @param data The object to record.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // *
+ // * The event store takes shared ownership of the object.
+ // */
+ // const_pointer_type put (SG::DataObjectSharedPtr<T> data) const;
+
+
+ // /**
+ // * @brief Record an object to the store.
+ // * @param ctx The event context to use.
+ // * @param data The object to record.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // *
+ // * The event store takes shared ownership of the object.
+ // */
+ // const_pointer_type put (const EventContext& ctx,
+ // SG::DataObjectSharedPtr<T> data) const;
+
+
+ // /**
+ // * @brief Record an object and its auxiliary store to the store.
+ // * @param data The object to record.
+ // * @param auxstore Auxiliary store object.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, and the objects passed in are destroyed.
+ // */
+ // template <class AUXSTORE>
+ // const_pointer_type
+ // put (std::unique_ptr<T> data,
+ // std::unique_ptr<AUXSTORE> auxstore) const;
+
+
+ // /**
+ // * @brief Record an object and its auxiliary store to the store.
+ // * @param data The object to record.
+ // * @param auxstore Auxiliary store object.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, and the objects passed in are destroyed.
+ // *
+ // * Unlike the version taking unique_ptr<T>, this does not alter the
+ // * store pointer of @c data.
+ // */
+ // template <class AUXSTORE>
+ // const_pointer_type
+ // put (std::unique_ptr<const T> data,
+ // std::unique_ptr<const AUXSTORE> auxstore) const;
+
+
+ // /**
+ // * @brief Record an object and its auxiliary store to the store.
+ // * @param ctx The event context to use.
+ // * @param data The object to record.
+ // * @param auxstore Auxiliary store object.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, and the objects passed in are destroyed.
+ // */
+ // template <class AUXSTORE>
+ // const_pointer_type
+ // put (const EventContext& ctx,
+ // std::unique_ptr<T> data,
+ // std::unique_ptr<AUXSTORE> auxstore) const;
+
+
+ // /**
+ // * @brief Record an object and its auxiliary store to the store.
+ // * @param ctx The event context to use.
+ // * @param data The object to record.
+ // * @param auxstore Auxiliary store object.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, and the objects passed in are destroyed.
+ // *
+ // * Unlike the version taking unique_ptr<T>, this does not alter the
+ // * store pointer of @c data.
+ // */
+ // template <class AUXSTORE>
+ // const_pointer_type
+ // put (const EventContext& ctx,
+ // std::unique_ptr<const T> data,
+ // std::unique_ptr<const AUXSTORE> auxstore) const;
+
+
+ /**
+ * @brief Alternate notation for record. Records a non-const object.
+ * @param data Object to record.
+ *
+ * Throws an exception on failure.
+ */
+ WriteHandle& operator=( std::unique_ptr<T> data );
+
+
+ // /**
+ // * @brief Make an alias.
+ // * @param key Alternate key by which the referenced object should be known.
+ // *
+ // * The current handle should be valid and referencing an object
+ // * (i.e., @c record should have been called on it).
+ // *
+ // * The object will also be known by the name given in @c key.
+ // */
+ // StatusCode alias (const WriteHandleKey<T>& key);
+
+
+ // /**
+ // * @brief Make an explicit link.
+ // * @param key Alternate clid by which the referenced object
+ // * should be known. The SG key must match the key of the
+ // * current handle.
+ // *
+ // * You should generally not be using this!
+ // *
+ // * The current handle should be valid and referencing an object
+ // * (i.e., @c record should have been called on it).
+ // *
+ // * This makes a symlink: the object will be retrievable
+ // * as a different type.
+ // *
+ // * Note that if @c T and @c @U are related via @c SG_BASE and/or
+ // * @c DATAVECTOR_BASE, then you shouldn't need to explicitly make a symlink;
+ // * that should happen automatically.
+ // *
+ // * If a @c U* is not convertable to a @c T* via C++ rules, then you likely
+ // * will be, at best, relying on undefined behavior. You will probably
+ // * get warnings from the undefined behavior sanitizer when if you try
+ // * to dereference the @c U*.
+ // *
+ // * This usage is here mainly to assist in migrating some existing
+ // * patterns to MT. You should think several times before using
+ // * in new code.
+ // */
+ // template <class U>
+ // StatusCode symLink (const WriteHandleKey<U>& key);
+
+
+private:
+ // /**
+ // * @brief Return the cached pointer directly.
+ // *
+ // * If it is null, throw ExcNullWriteHandle.
+ // */
+ // pointer_type checkedCachedPtr();
+
+
+ // /**
+ // * @brief Helper for record.
+ // * @param data The object to record.
+ // * @param isConst If true, record the object as const.
+ // * @param returnExisting Allow an existing object.
+ // */
+ // template <class U>
+ // StatusCode doRecord (U data,
+ // bool isConst,
+ // bool returnExisting);
+
+
+ // /**
+ // * @brief Helper for put.
+ // * @param ctx The event context, or nullptr to use the current context.
+ // * @param data The object to record.
+ // * @param returnExisting Allow an existing object.
+ // * @param[out] store The store being used.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, unless @c returnExisting is true, in which case
+ // * return success. In either case, @c data is destroyed.
+ // */
+ // template <class U>
+ // const_pointer_type doPut (const EventContext* ctx,
+ // U data,
+ // bool returnExisting,
+ // IProxyDict* & store) const;
+
+
+ // /**
+ // * @brief Helper for recording an object and its auxiliary store to the store.
+ // * @param ctx The event context, or nullptr to use the current context.
+ // * @param data The object to record.
+ // * @param auxstore Auxiliary store object.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, and the objects passed in are destroyed.
+ // */
+ // template <class AUXSTORE>
+ // typename WriteHandle<T>::const_pointer_type
+ // doPut (const EventContext* ctx,
+ // std::unique_ptr<T> data,
+ // std::unique_ptr<AUXSTORE> auxstore) const;
+
+
+ // /**
+ // * @brief Helper for recording an object and its auxiliary store to the store.
+ // * @param ctx The event context, or nullptr to use the current context.
+ // * @param data The object to record.
+ // * @param auxstore Auxiliary store object.
+ // *
+ // * Unlike record(), this does not change the handle object.
+ // * That means that one will not be able to get the object back
+ // * by dereferencing the handle.
+ // * Returns the object placed in the store, or nullptr if there
+ // * was an error.
+ // * If there was already an object in the store with the given key,
+ // * then return null, and the objects passed in are destroyed.
+ // */
+ // template <class AUXSTORE>
+ // typename WriteHandle<T>::const_pointer_type
+ // doPut (const EventContext* ctx,
+ // std::unique_ptr<const T> data,
+ // std::unique_ptr<const AUXSTORE> auxstore) const;
+
+
+ // /**
+ // * @brief Record an object and its auxiliary store to the store.
+ // * @param data The object to record.
+ // * @param auxstore Auxiliary store object.
+ // * @param isConst If true, record the objects as const.
+ // */
+ // template <class AUXSTORE>
+ // StatusCode
+ // record (std::unique_ptr<T> data,
+ // std::unique_ptr<AUXSTORE> auxstore,
+ // bool isConst);
+
+
+private:
+ // /// If non-null, then we need to lock the associated aux store object
+ // /// when we're deleted.
+ // ///
+ // /// This is set when we record an object along with the associated aux const
+ // /// with the const flag set (the default). Recall that for a const record,
+ // /// we want to support the semantics that you can get a non-const pointer
+ // /// back from the handle as long as it exists, to finish initialization
+ // /// of the object. For an aux store, though, just getting back a non-const
+ // /// pointer is not sufficient, since the store will have been locked
+ // /// at the time of the record, preventing changes to the store.
+ // ///
+ // /// So if we're meant to record a const aux store object, we don't actually
+ // /// set it const on the record, but instead set this and do the
+ // /// setConst in the destructor.
+ // SG::DataProxy* m_lockAuxPending = nullptr;
+};
+
+
+/**
+ * @brief Return a @c WriteHandle referencing @c key.
+ * @param key The key object holding the clid/key/store.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ */
+template <class T>
+WriteHandle<T> makeHandle (const WriteHandleKey<T>& key);
+
+
+/**
+ * @brief Return a @c WriteHandle referencing @c key for an explicit context.
+ * @param key The key object holding the clid/key/store.
+ * @param ctx The event context.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ *
+ * If the default event store has been requested, then the thread-specific
+ * store from the event context will be used.
+ */
+template <class T>
+WriteHandle<T> makeHandle (const WriteHandleKey<T>& key,
+ const EventContext& ctx);
+
+
+} /* namespace SG */
+
+
+#include "AsgDataHandles/WriteHandle.icc"
+
+
+// #ifndef NO_LEGACY_HANDLES
+// namespace SG {
+// template <class T>
+// using WVar = WriteHandle<T>;
+// }
+// #endif
+
+#endif
+
+#endif
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandle.icc b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandle.icc
new file mode 100644
index 0000000000000000000000000000000000000000..a4df5df2e34646e81522ffc8d1de6d0d4c139b74
--- /dev/null
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandle.icc
@@ -0,0 +1,980 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file AsgDataHandles/WriteHandle.icc
+ * @author Nils Krumnack <Nils.Erik.Krumnack@cern.h>
+ * @author S. Binet, P. Calafiura, scott snyder <snyder@bnl.gov> (for original version)
+ * @brief Handle class for recording to StoreGate.
+ */
+
+#include "xAODRootAccess/TActiveStore.h"
+#include "xAODRootAccess/TStore.h"
+#include <stdexcept>
+
+
+namespace SG {
+
+
+//************************************************************************
+// Constructors, etc.
+//
+
+
+// /**
+// * @brief Default constructor.
+// *
+// * The handle will not be usable until a non-blank key is assigned.
+// */
+// template <class T>
+// inline
+// WriteHandle<T>::WriteHandle()
+// : VarHandleBase(ClassID_traits<T>::ID(), Gaudi::DataHandle::Writer)
+// {
+// }
+
+
+// /**
+// * @brief Constructor with full arguments.
+// * @param sgkey StoreGate key of the referenced object.
+// * @param storename Name of the referenced event store.
+// */
+// template <class T>
+// inline
+// WriteHandle<T>::WriteHandle (const std::string& sgkey,
+// const std::string& storename /* ="StoreGateSvc"*/)
+// : VarHandleBase (ClassID_traits<T>::ID(), sgkey,
+// Gaudi::DataHandle::Writer, storename)
+// {
+// }
+
+
+/**
+ * @brief Constructor from a WriteHandleKey.
+ * @param key The key object holding the clid/key/store.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ */
+template <class T>
+inline
+WriteHandle<T>::WriteHandle (const WriteHandleKey<T>& key)
+ : VarHandleBase (key, nullptr)
+{
+}
+
+
+/**
+ * @brief Constructor from a WriteHandleKey and an explicit event context.
+ * @param key The key object holding the clid/key.
+ * @param ctx The event context.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ *
+ * If the default event store has been requested, then the thread-specific
+ * store from the event context will be used.
+ */
+template <class T>
+inline
+WriteHandle<T>::WriteHandle (const WriteHandleKey<T>& key,
+ const EventContext& ctx)
+ : VarHandleBase (key, &ctx)
+{
+}
+
+
+/**
+ * @brief Copy constructor.
+ */
+template <class T>
+inline
+WriteHandle<T>::WriteHandle(const WriteHandle& h)
+ : VarHandleBase(h)
+{
+}
+
+
+/**
+ * @brief Move constructor.
+ */
+template <class T>
+WriteHandle<T>::WriteHandle(WriteHandle&& h)
+ : VarHandleBase(std::move(h))
+{
+ // m_lockAuxPending = h.m_lockAuxPending;
+ // h.m_lockAuxPending = nullptr;
+}
+
+
+/**
+ * @brief Assignment operator.
+ */
+template <class T>
+inline
+WriteHandle<T>&
+WriteHandle<T>::operator= (const WriteHandle& h)
+{
+ if (this != &h)
+ this->VarHandleBase::operator=(h);
+ return *this;
+}
+
+
+/**
+ * @brief Move operator.
+ */
+template <class T>
+inline
+WriteHandle<T>&
+WriteHandle<T>::operator= (WriteHandle&& h)
+{
+ if (this != &h) {
+ this->VarHandleBase::operator=(std::move(h));
+ // m_lockAuxPending = h.m_lockAuxPending;
+ // h.m_lockAuxPending = nullptr;
+ }
+ return *this;
+}
+
+
+/**
+ * @brief Destructor.
+ *
+ * Lock an aux object if m_lockAuxPending is true.
+ */
+template <class T>
+WriteHandle<T>::~WriteHandle()
+{
+ // if (m_lockAuxPending) {
+ // m_lockAuxPending->setConst();
+ // }
+}
+
+
+//************************************************************************
+// Deference. These all return only the cached pointer.
+//
+
+
+// /**
+// * @brief Dereference the pointer.
+// * Returns the cached pointer. Throws ExcNullWriteHandle if null.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::pointer_type
+// WriteHandle<T>::operator->()
+// {
+// return WriteHandle<T>::checkedCachedPtr();
+// }
+
+
+// /**
+// * @brief Dereference the pointer.
+// * Returns the cached pointer. Throws ExcNullWriteHandle if null.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::reference_type
+// WriteHandle<T>::operator*()
+// {
+// return *WriteHandle<T>::checkedCachedPtr();
+// }
+
+
+// /**
+// * @brief Dereference the pointer.
+// * Returns the cached pointer.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::cptr() const
+// {
+// return reinterpret_cast<pointer_type>(this->m_ptr);
+// }
+
+
+// /**
+// * @brief Dereference the pointer.
+// * Returns the cached pointer.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::pointer_type
+// WriteHandle<T>::ptr()
+// {
+// return cachedPtr();
+// }
+
+
+// /**
+// * @brief Return the cached pointer directly; no lookup.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::pointer_type
+// WriteHandle<T>::cachedPtr()
+// {
+// return reinterpret_cast<pointer_type>(this->m_ptr);
+// }
+
+
+// /**
+// * @brief Can the handle be successfully dereferenced?
+// */
+// template <class T>
+// inline
+// bool WriteHandle<T>::isValid()
+// {
+// return this->m_ptr != nullptr;
+// }
+
+
+//************************************************************************
+// Record.
+
+
+// /**
+// * @brief Record a const object to the store.
+// * @param data The object to record.
+// */
+// template <class T>
+// inline
+// StatusCode
+// WriteHandle<T>::WriteHandle::record (std::unique_ptr<T> data)
+// {
+// return this->doRecord (std::move(data), true, false);
+// }
+
+
+// /**
+// * @brief Record a non-const object to the store.
+// * @param data The object to record.
+// * @param isConst If true, record the object as const.
+// */
+// template <class T>
+// inline
+// StatusCode
+// WriteHandle<T>::WriteHandle::recordNonConst (std::unique_ptr<T> data)
+// {
+// return this->doRecord (std::move(data), false, false);
+// }
+
+
+/**
+ * @brief Record a const object and its auxiliary store to the store.
+ * @param data The object to record.
+ * @param auxstore Auxiliary store object.
+ */
+template <class T>
+template <class AUXSTORE>
+inline
+StatusCode
+WriteHandle<T>::WriteHandle::record (std::unique_ptr<T> data,
+ std::unique_ptr<AUXSTORE> auxstore)
+{
+ if (xAOD::TActiveStore::store()->record (std::move (auxstore), key() + "Aux.").isFailure())
+ return StatusCode::FAILURE;
+ if (xAOD::TActiveStore::store()->record (std::move (data), key()).isFailure())
+ return StatusCode::FAILURE;
+ return StatusCode::SUCCESS;
+}
+
+
+// /**
+// * @brief Record a non-const object and its auxiliary store to the store.
+// * @param data The object to record.
+// * @param auxstore Auxiliary store object.
+// */
+// template <class T>
+// template <class AUXSTORE>
+// inline
+// StatusCode
+// WriteHandle<T>::WriteHandle::recordNonConst (std::unique_ptr<T> data,
+// std::unique_ptr<AUXSTORE> auxstore)
+// {
+// return record (std::move(data), std::move(auxstore), false);
+// }
+
+
+// /**
+// * @brief Record a const shared DataObject to the store.
+// * @param data The object to record.
+// *
+// * The event store takes shared ownership of the object.
+// */
+// template <class T>
+// inline
+// StatusCode
+// WriteHandle<T>::record (SG::DataObjectSharedPtr<T> data)
+// {
+// return this->doRecord (std::move(data), true, false);
+// }
+
+
+// /**
+// * @brief Record a non-const shared DataObject to the store.
+// * @param data The object to record.
+// *
+// * The event store takes shared ownership of the object.
+// */
+// template <class T>
+// inline
+// StatusCode
+// WriteHandle<T>::recordNonConst (SG::DataObjectSharedPtr<T> data)
+// {
+// return this->doRecord (std::move(data), false, false);
+// }
+
+
+// /**
+// * @brief Record an object to the store.
+// * @param data The object to record.
+// * @param returnExisting Allow an existing object?
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, unless @c returnExisting is true, in which case
+// * return success. In either case, @c data is destroyed.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (std::unique_ptr<T> data,
+// bool returnExisting /*= false*/) const
+// {
+// IProxyDict* store = nullptr;
+// return doPut (nullptr, std::move(data), returnExisting, store);
+// }
+
+
+// /**
+// * @brief Record an object to the store.
+// * @param data The object to record.
+// * @param returnExisting Allow an existing object?
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, unless @c returnExisting is true, in which case
+// * return success. In either case, @c data is destroyed.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (std::unique_ptr<const T> data,
+// bool returnExisting /*= false*/) const
+// {
+// IProxyDict* store = nullptr;
+// return doPut (nullptr, std::move(data), returnExisting, store);
+// }
+
+
+// /**
+// * @brief Record an object to the store.
+// * @param data The object to record.
+// * @param returnExisting Allow an existing object?
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, unless @c returnExisting is true, in which case
+// * return success. In either case, @c data is destroyed.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (std::unique_ptr<const ConstDataVector<T> > data,
+// bool returnExisting /*= false*/) const
+// {
+// IProxyDict* store = nullptr;
+// std::unique_ptr<const T> coll (data.release()->asDataVector());
+// return doPut (nullptr, std::move(coll), returnExisting, store);
+// }
+
+
+// /**
+// * @brief Record an object to the store.
+// * @param ctx The event context to use.
+// * @param data The object to record.
+// * @param returnExisting Allow an existing object?
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, unless @c returnExisting is true, in which case
+// * return success. In either case, @c data is destroyed.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (const EventContext& ctx,
+// std::unique_ptr<const ConstDataVector<T> > data,
+// bool returnExisting /*= false*/) const
+// {
+// IProxyDict* store = nullptr;
+// std::unique_ptr<const T> coll (data.release()->asDataVector());
+// return doPut (&ctx, std::move(coll), returnExisting, store);
+// }
+
+
+// /**
+// * @brief Record an object to the store.
+// * @param ctx The event context to use.
+// * @param data The object to record.
+// * @param returnExisting Allow an existing object?
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, unless @c returnExisting is true, in which case
+// * return success. In either case, @c data is destroyed.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (const EventContext& ctx,
+// std::unique_ptr<T> data,
+// bool returnExisting /*= false*/) const
+// {
+// IProxyDict* store = nullptr;
+// return doPut (&ctx, std::move(data), returnExisting, store);
+// }
+
+
+// /**
+// * @brief Record an object to the store.
+// * @param ctx The event context to use.
+// * @param data The object to record.
+// * @param returnExisting Allow an existing object?
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, unless @c returnExisting is true, in which case
+// * return success. In either case, @c data is destroyed.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (const EventContext& ctx,
+// std::unique_ptr<const T> data,
+// bool returnExisting /*= false*/) const
+// {
+// IProxyDict* store = nullptr;
+// return doPut (&ctx, std::move(data), returnExisting, store);
+// }
+
+
+// /**
+// * @brief Record an object to the store.
+// * @param data The object to record.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// *
+// * The event store takes shared ownership of the object.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (SG::DataObjectSharedPtr<T> data) const
+// {
+// IProxyDict* store = nullptr;
+// return doPut (nullptr, std::move(data), false, store);
+// }
+
+
+// /**
+// * @brief Record an object to the store.
+// * @param ctx The event context to use.
+// * @param data The object to record.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// *
+// * The event store takes shared ownership of the object.
+// */
+// template <class T>
+// inline
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (const EventContext& ctx,
+// SG::DataObjectSharedPtr<T> data) const
+// {
+// IProxyDict* store = nullptr;
+// return doPut (&ctx, std::move(data), false, store);
+// }
+
+
+// /**
+// * @brief Record an object and its auxiliary store to the store.
+// * @param data The object to record.
+// * @param auxstore Auxiliary store object.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, and the objects passed in are destroyed.
+// */
+// template <class T>
+// template <class AUXSTORE>
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (std::unique_ptr<T> data,
+// std::unique_ptr<AUXSTORE> auxstore) const
+// {
+// return doPut (nullptr, std::move(data), std::move(auxstore));
+// }
+
+
+
+// /**
+// * @brief Record an object and its auxiliary store to the store.
+// * @param data The object to record.
+// * @param auxstore Auxiliary store object.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, and the objects passed in are destroyed.
+// *
+// * Unlike the version taking unique_ptr<T>, this does not alter the
+// * store pointer of @c data.
+// */
+// template <class T>
+// template <class AUXSTORE>
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (std::unique_ptr<const T> data,
+// std::unique_ptr<const AUXSTORE> auxstore) const
+// {
+// return doPut (nullptr, std::move(data), std::move(auxstore));
+// }
+
+
+// /**
+// * @brief Record an object and its auxiliary store to the store.
+// * @param ctx The event context to use.
+// * @param data The object to record.
+// * @param auxstore Auxiliary store object.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, and the objects passed in are destroyed.
+// */
+// template <class T>
+// template <class AUXSTORE>
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (const EventContext& ctx,
+// std::unique_ptr<T> data,
+// std::unique_ptr<AUXSTORE> auxstore) const
+// {
+// return doPut (&ctx, std::move(data), std::move(auxstore));
+// }
+
+
+// /**
+// * @brief Record an object and its auxiliary store to the store.
+// * @param ctx The event context to use.
+// * @param data The object to record.
+// * @param auxstore Auxiliary store object.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that one will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, and the objects passed in are destroyed.
+// *
+// * Unlike the version taking unique_ptr<T>, this does not alter the
+// * store pointer of @c data.
+// */
+// template <class T>
+// template <class AUXSTORE>
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::put (const EventContext& ctx,
+// std::unique_ptr<const T> data,
+// std::unique_ptr<const AUXSTORE> auxstore) const
+// {
+// return doPut (&ctx, std::move(data), std::move(auxstore));
+// }
+
+
+/**
+ * @brief Alternate notation for record. Records a non-const object.
+ * @param data Object to record.
+ *
+ * Throws an exception on failure.
+ */
+template <class T>
+WriteHandle<T>&
+WriteHandle<T>::operator= (std::unique_ptr<T> data)
+{
+ if (recordNonConst (std::move(data)).isFailure()) {
+ throw std::runtime_error ("WriteHandle<T>::operator=(unique_ptr) Record failed.");
+ }
+ return *this;
+}
+
+
+// /**
+// * @brief Make an alias.
+// * @param key Alternate key by which the referenced object should be known.
+// *
+// * The current handle should be valid and referencing an object
+// * (i.e., @c record should have been called on it).
+// *
+// * The object will also be known by the name given in @c key.
+// */
+// template <class T>
+// StatusCode WriteHandle<T>::alias (const WriteHandleKey<T>& key)
+// {
+// return symLink_impl (this->clid(), key.key());
+// }
+
+
+// /**
+// * @brief Make an explicit link.
+// * @param key Alternate clid by which the referenced object
+// * should be known. The SG key must match the key of the
+// * current handle.
+// *
+// * You should generally not be using this!
+// *
+// * The current handle should be valid and referencing an object
+// * (i.e., @c record should have been called on it).
+// *
+// * This makes a symlink: the object will be retrievable
+// * as a different type.
+// *
+// * Note that if @c T and @c @U are related via @c SG_BASE and/or
+// * @c DATAVECTOR_BASE, then you shouldn't need to explicitly make a symlink;
+// * that should happen automatically.
+// *
+// * If a @c U* is not convertable to a @c T* via C++ rules, then you likely
+// * will be, at best, relying on undefined behavior. You will probably
+// * get warnings from the undefined behavior sanitizer when if you try
+// * to dereference the @c U*.
+// *
+// * This usage is here mainly to assist in migrating some existing
+// * patterns to MT. You should think several times before using
+// * in new code.
+// */
+// template <class T>
+// template <class U>
+// StatusCode WriteHandle<T>::symLink (const WriteHandleKey<U>& other)
+// {
+// if (this->key() != other.key()) {
+// REPORT_ERROR (StatusCode::FAILURE)
+// << "symLink: SG keys do not match: " << other.key() << " vs "
+// << this->key();
+// return StatusCode::FAILURE;
+// }
+// return symLink_impl (other.clid(), other.key());
+// }
+
+
+// /**
+// * @brief Return the cached pointer directly.
+// *
+// * If it is null, throw ExcNullWriteHandle.
+// */
+// template <class T>
+// typename WriteHandle<T>::pointer_type
+// WriteHandle<T>::checkedCachedPtr()
+// {
+// if (!m_ptr)
+// throwExcNullWriteHandle (clid(), key(), store());
+// return cachedPtr();
+// }
+
+
+// /**
+// * @brief Helper for record.
+// * @param data The object to record.
+// * @param isConst If true, record the object as const.
+// * @param returnExisting Allow an existing object.
+// */
+// template <class T>
+// template <class U>
+// StatusCode WriteHandle<T>::doRecord (U data,
+// bool isConst,
+// bool returnExisting)
+// {
+// typedef typename U::element_type elt_t;
+
+// // make sure the BaseInfo(Base) structure is initialized
+// SG::BaseInfo<elt_t>::baseinfo();
+
+// // If s_isConst is set for this type, then we want to automatically
+// // make it const when recorded.
+// bool allowMods = !isConst;
+// if (ClassID_traits<elt_t>::s_isConst)
+// allowMods = false;
+
+// void* dataPtr(data.get());
+// std::unique_ptr<DataObject> dobj (SG::asStorable (std::move (data)));
+// return this->record_impl (std::move(dobj), dataPtr, allowMods, returnExisting);
+// }
+
+
+// /**
+// * @brief Helper for put.
+// * @param ctx The event context, or nullptr to use the current context.
+// * @param data The object to record.
+// * @param returnExisting Allow an existing object.
+// * @param[out] store The store being used.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, unless @c returnExisting is true, in which case
+// * return success. In either case, @c data is destroyed.
+// */
+// template <class T>
+// template <class U>
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::doPut (const EventContext* ctx,
+// U data,
+// bool returnExisting,
+// IProxyDict* & store) const
+// {
+// //typedef typename U::element_type elt_t;
+// typedef T elt_t;
+
+// // make sure the BaseInfo(Base) structure is initialized
+// SG::BaseInfo<elt_t>::baseinfo();
+
+// const void* dataPtr = data.get();
+// std::unique_ptr<DataObject> dobj (SG::asStorable (std::move (data)));
+// return reinterpret_cast<const T*>
+// (this->put_impl (ctx, std::move(dobj), dataPtr, false, returnExisting, store));
+// }
+
+
+// /**
+// * @brief Helper for recording an object and its auxiliary store to the store.
+// * @param ctx The event context, or nullptr to use the current context.
+// * @param data The object to record.
+// * @param auxstore Auxiliary store object.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, and the objects passed in are destroyed.
+// */
+// template <class T>
+// template <class AUXSTORE>
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::doPut (const EventContext* ctx,
+// std::unique_ptr<T> data,
+// std::unique_ptr<AUXSTORE> auxstore) const
+// {
+// T& dref = *data;
+
+// // If there's no store association, do it now.
+// if (data->getStore() == nullptr)
+// data->setStore (auxstore.get());
+
+// IProxyDict* store = nullptr;
+// const T* ptr = this->doPut (ctx, std::move(data), false, store);
+// if (!ptr) return nullptr;
+
+// SG::DataObjectSharedPtr<DataObject> dobj
+// (SG::asStorable (std::move (auxstore)));
+// SG::DataProxy* proxy = store->recordObject (std::move(dobj),
+// this->name() + "Aux.",
+// false,
+// false);
+// if (!proxy) {
+// REPORT_ERROR (StatusCode::FAILURE)
+// << "recordObject of aux store failed";
+
+// // If we've failed here, then the aux store object has been deleted,
+// // but not the primary object. Null out the store pointer to prevent
+// // having a dangling pointer to a deleted object.
+// dref.setStore (static_cast<SG::IConstAuxStore*>(nullptr));
+// return nullptr;
+// }
+
+// return ptr;
+// }
+
+
+// /**
+// * @brief Helper for recording an object and its auxiliary store to the store.
+// * @param ctx The event context, or nullptr to use the current context.
+// * @param data The object to record.
+// * @param auxstore Auxiliary store object.
+// *
+// * Unlike record(), this does not change the handle object.
+// * That means that will not be able to get the object back
+// * by dereferencing the handle.
+// * Returns the object placed in the store, or nullptr if there
+// * was an error.
+// * If there was already an object in the store with the given key,
+// * then return null, and the objects passed in are destroyed.
+// */
+// template <class T>
+// template <class AUXSTORE>
+// typename WriteHandle<T>::const_pointer_type
+// WriteHandle<T>::doPut (const EventContext* ctx,
+// std::unique_ptr<const T> data,
+// std::unique_ptr<const AUXSTORE> auxstore) const
+// {
+// IProxyDict* store = nullptr;
+// const T* ptr = this->doPut (ctx, std::move(data), false, store);
+// if (!ptr) return nullptr;
+
+// SG::DataObjectSharedPtr<DataObject> dobj
+// (SG::asStorable (std::move (auxstore)));
+// SG::DataProxy* proxy = store->recordObject (std::move(dobj),
+// this->name() + "Aux.",
+// false,
+// false);
+// if (!proxy) {
+// REPORT_ERROR (StatusCode::FAILURE)
+// << "recordObject of aux store failed";
+// return nullptr;
+// }
+
+// return ptr;
+// }
+
+
+// /**
+// * @brief Record an object and its auxiliary store to the store.
+// * @param data The object to record.
+// * @param auxstore Auxiliary store object.
+// * @param isConst If true, record the objects as const.
+// */
+// template <class T>
+// template <class AUXSTORE>
+// StatusCode
+// WriteHandle<T>::record (std::unique_ptr<T> data,
+// std::unique_ptr<AUXSTORE> auxstore,
+// bool isConst)
+// {
+// T& dref = *data;
+
+// // If there's no store association, do it now.
+// if (data->getStore() == nullptr)
+// data->setStore (auxstore.get());
+
+// if (isConst) {
+// // Temporarily clear the store association, in order to prevent
+// // the aux store from being locked at this point.
+// IAuxStore* store = dref.getStore();
+// if (store)
+// dref.setStore (static_cast<SG::IAuxStore*>(nullptr));
+// CHECK (this->record(std::move(data)));
+// // Deliberately not using RAII here. If there is an error,
+// // then the object referenced by data will be deleted.
+// dref.setStore (store);
+// }
+// else
+// CHECK (this->recordNonConst(std::move(data)));
+
+// // Store and proxy must be valid if we get to this point.
+
+// SG::DataObjectSharedPtr<DataObject> dobj
+// (SG::asStorable (std::move (auxstore)));
+// SG::DataProxy* proxy = m_store->recordObject (std::move(dobj),
+// this->name() + "Aux.",
+// true,
+// false);
+// if (!proxy) {
+// REPORT_ERROR (StatusCode::FAILURE)
+// << "recordObject of aux store failed";
+
+// // If we've failed here, then the aux store object has been deleted,
+// // but not the primary object. Null out the store pointer to prevent
+// // having a dangling pointer to a deleted object.
+// dref.setStore (static_cast<SG::IConstAuxStore*>(nullptr));
+// return StatusCode::FAILURE;
+// }
+
+// if (m_proxy->isConst())
+// m_lockAuxPending = proxy;
+
+// return StatusCode::SUCCESS;
+// }
+
+
+/**
+ * @brief Return a @c WriteHandle referencing @c key.
+ * @param key The key object holding the clid/key/store.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ */
+template <class T>
+WriteHandle<T> makeHandle (const WriteHandleKey<T>& key)
+{
+ return WriteHandle<T> (key);
+}
+
+
+/**
+ * @brief Return a @c WriteHandle referencing @c key for an explicit context.
+ * @param key The key object holding the clid/key/store.
+ * @param ctx The event context.
+ *
+ * This will raise an exception if the StoreGate key is blank,
+ * or if the event store cannot be found.
+ *
+ * If the default event store has been requested, then the thread-specific
+ * store from the event context will be used.
+ */
+template <class T>
+WriteHandle<T> makeHandle (const WriteHandleKey<T>& key,
+ const EventContext& ctx)
+{
+ return WriteHandle<T> (key, ctx);
+}
+
+
+} /* namespace SG */
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandleKey.h b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandleKey.h
new file mode 100644
index 0000000000000000000000000000000000000000..a6326b09cae00e77f03521bb819e41c358f0e17d
--- /dev/null
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandleKey.h
@@ -0,0 +1,98 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file AsgDataHandles/WriteHandleKey.h
+ * @author Nils Krumnack <Nils.Erik.Krumnack@cern.h>
+ * @author scott snyder <snyder@bnl.gov> (for original version)
+ * @brief Property holding a SG store/key/clid from which a WriteHandle is made.
+ */
+
+
+#ifndef ASG_DATA_HANDLES_WRITE_HANDLE_KEY_H
+#define ASG_DATA_HANDLES_WRITE_HANDLE_KEY_H
+
+#ifndef XAOD_STANDALONE
+#include <StoreGate/WriteHandleKey.h>
+#else
+
+#include "AsgDataHandles/VarHandleKey.h"
+
+
+namespace SG {
+
+
+/**
+ * @brief Property holding a SG store/key/clid from which a WriteHandle is made.
+ *
+ * See StoreGate/WriteHandleKey for details.
+ *
+ * This currently (07 Aug 20) contains a number of commented out
+ * members that were part of the original handle implementation, but
+ * have not yet been implemented in the standalone version. The plan
+ * is to either implement or remove them, depending on what is needed
+ * in AnalysisBase as we add more packages.
+ *
+ */
+template <class T>
+class WriteHandleKey
+ : public VarHandleKey
+{
+public:
+ /**
+ * @brief Constructor.
+ * @param key The StoreGate key for the object.
+ * @param storeName Name to use for the store, if it's not encoded in sgkey.
+ *
+ * The provided key may actually start with the name of the store,
+ * separated by a "+": "MyStore+Obj". If no "+" is present
+ * the store named by @c storeName is used.
+ */
+ WriteHandleKey (const std::string& key = "");
+ // const std::string& storeName = StoreID::storeName(StoreID::EVENT_STORE));
+
+
+ /**
+ * @brief auto-declaring Property Constructor.
+ * @param owner Owning component.
+ * @param name name of the Property
+ * @param key default StoreGate key for the object.
+ * @param doc Documentation string.
+ *
+ * will associate the named Property with this WHK via declareProperty
+ *
+ * The provided key may actually start with the name of the store,
+ * separated by a "+": "MyStore+Obj". If no "+" is present
+ * the store named by @c storeName is used.
+ */
+ template <class OWNER, class K>
+ inline WriteHandleKey (OWNER* owner,
+ std::string name,
+ const K& key={},
+ std::string doc="");
+
+
+ /**
+ * @brief Change the key of the object to which we're referring.
+ * @param sgkey The StoreGate key for the object.
+ *
+ * The provided key may actually start with the name of the store,
+ * separated by a "+": "MyStore+Obj". If no "+" is present,
+ * the store is not changed.
+ */
+ WriteHandleKey& operator= (const std::string& sgkey);
+};
+
+
+} // namespace SG
+
+
+#include "AsgDataHandles/WriteHandleKey.icc"
+
+
+#endif
+
+#endif
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandleKey.icc b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandleKey.icc
new file mode 100644
index 0000000000000000000000000000000000000000..a4d41988cc2125feb16fc42e94924b9dcc8bdf1d
--- /dev/null
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/WriteHandleKey.icc
@@ -0,0 +1,78 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file AsgDataHandles/WriteHandleKey.icc
+ * @author Nils Krumnack <Nils.Erik.Krumnack@cern.h>
+ * @author scott snyder <snyder@bnl.gov> (for original version)
+ * @brief Property holding a SG store/key/clid from which a WriteHandle is made.
+ */
+
+
+namespace SG {
+
+
+/**
+ * @brief Constructor.
+ * @param key The StoreGate key for the object.
+ * @param storeName Name to use for the store, if it's not encoded in sgkey.
+ *
+ * The provided key may actually start with the name of the store,
+ * separated by a "+": "MyStore+Obj". If no "+" is present
+ * the store named by @c storeName is used.
+ */
+template <class T>
+WriteHandleKey<T>::WriteHandleKey (const std::string& key /*= ""*/)
+ // const std::string& storeName /*= "StoreGateSvc"*/)
+ : VarHandleKey (key)
+ // : VarHandleKey (ClassID_traits<T>::ID(), key,
+ // Gaudi::DataHandle::Writer,
+ // storeName)
+{
+}
+
+
+/**
+ * @brief auto-declaring Property Constructor.
+ * @param owner Owning component.
+ * @param name name of the Property
+ * @param key default StoreGate key for the object.
+ * @param doc Documentation string.
+ *
+ * will associate the named Property with this WHK via declareProperty
+ *
+ * The provided key may actually start with the name of the store,
+ * separated by a "+": "MyStore+Obj". If no "+" is present
+ * the store named by @c storeName is used.
+ */
+template <class T>
+template <class OWNER, class K>
+inline
+WriteHandleKey<T>::WriteHandleKey( OWNER* owner,
+ std::string name,
+ const K& key /*= {}*/,
+ std::string doc /*= ""*/)
+ : WriteHandleKey<T> (key)
+{
+ owner->declareProperty(std::move(name), *this, std::move(doc));
+}
+
+
+/**
+ * @brief Change the key of the object to which we're referring.
+ * @param sgkey The StoreGate key for the object.
+ *
+ * The provided key may actually start with the name of the store,
+ * separated by a "+": "MyStore+Obj". If no "+" is present,
+ * the store is not changed.
+ */
+template <class T>
+WriteHandleKey<T>& WriteHandleKey<T>::operator= (const std::string& sgkey)
+{
+ VarHandleKey::operator= (sgkey);
+ return *this;
+}
+
+
+} // namespace SG
diff --git a/Control/AthToolSupport/AsgDataHandles/CMakeLists.txt b/Control/AthToolSupport/AsgDataHandles/CMakeLists.txt
index b4ede025d7f41522e40e237ea4d3b485df206615..704ebcb25f506d05cdb4a121a82cfc3a4e9881de 100644
--- a/Control/AthToolSupport/AsgDataHandles/CMakeLists.txt
+++ b/Control/AthToolSupport/AsgDataHandles/CMakeLists.txt
@@ -1,16 +1,10 @@
-################################################################################
-# Package: AsgDataHandles
-################################################################################
-
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AsgDataHandles )
if( NOT XAOD_STANDALONE )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC Control/StoreGate )
-
# Component(s) in the package:
atlas_add_library( AsgDataHandlesLib INTERFACE
AsgDataHandles/*.h AsgDataHandles/*.icc
@@ -20,11 +14,6 @@ atlas_add_library( AsgDataHandlesLib INTERFACE
else()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC Control/AthToolSupport/AsgMessaging
- Control/xAODRootAccessInterfaces )
-
# Component(s) in the package:
atlas_add_library( AsgDataHandlesLib
AsgDataHandles/*.h AsgDataHandles/*.icc Root/*.cxx
diff --git a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/DataHandleTestTool.h b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/DataHandleTestTool.h
index cf592fab88e8e1a3401199bb5eff994495b19ab4..50ebcd680701cdac544cccac3a5c479b6e147e2d 100644
--- a/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/DataHandleTestTool.h
+++ b/Control/AthToolSupport/AsgExampleTools/AsgExampleTools/DataHandleTestTool.h
@@ -12,6 +12,8 @@
#include <AsgTools/AsgTool.h>
#include <AsgExampleTools/IDataHandleTestTool.h>
#include <AsgDataHandles/ReadHandleKey.h>
+#include <AsgDataHandles/ReadDecorHandleKey.h>
+#include <AsgDataHandles/WriteHandleKey.h>
// AthSimulation doesn't contain the muon-container, so we can't
// really build the tool, but it is simpler to build an empty tool
@@ -49,8 +51,12 @@ namespace asg
public:
#ifndef SIMULATIONBASE
SG::ReadHandleKey<xAOD::MuonContainer> m_readKey {this, "readKey", "Muons", "regular read key"};
+ SG::ReadDecorHandleKey<xAOD::MuonContainer> m_readDecorKey {this, "readDecorKey", "Muons.pt", "read decor key"};
+ SG::WriteHandleKey<xAOD::MuonContainer> m_writeKey {this, "writeKey", "", "regular write key"};
#endif
bool m_readFailure {false};
+ bool m_readDecorFailure {false};
+ std::string m_doWriteName;
};
}
diff --git a/Control/AthToolSupport/AsgExampleTools/CMakeLists.txt b/Control/AthToolSupport/AsgExampleTools/CMakeLists.txt
index cb7fec41ad7ed5cf27731e6677be7f3381e3fe92..96e3f8515f2ee86df5d1de93d6455e6ca0cf38e9 100644
--- a/Control/AthToolSupport/AsgExampleTools/CMakeLists.txt
+++ b/Control/AthToolSupport/AsgExampleTools/CMakeLists.txt
@@ -1,26 +1,14 @@
-################################################################################
-# Package: AsgExampleTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AsgExampleTools )
if (SIMULATIONBASE)
- set (extra_dep )
set (extra_lib )
else()
- set (extra_dep Event/xAOD/xAODMuon)
set (extra_lib xAODMuon)
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgDataHandles
- Control/AthToolSupport/AsgTools
- Control/AthToolSupport/AsgTesting
- ${extra_dep})
-
# External dependencies:
find_package( GTest )
find_package( GMock )
@@ -101,15 +89,22 @@ if( XAOD_STANDALONE )
LINK_LIBRARIES ${GTEST_LIBRARIES} AsgTools AsgExampleToolsLib AsgTestingLib )
set_tests_properties (AsgExampleTools_gt_asgtools_toolhandle_test_ctest PROPERTIES LABELS "AsgTools;AsgExampleTools" )
+endif()
+
+if (NOT SIMULATIONBASE)
+ if (NOT XAOD_STANDALONE)
+ set (extra_libs POOLRootAccessLib)
+ else()
+ set (extra_libs )
+ endif()
+
atlas_add_test( gt_DataHandlesTest
SOURCES test/gt_DataHandlesTest.cxx
INCLUDE_DIRS ${GTEST_INCLUDE_DIRS}
- LINK_LIBRARIES ${GTEST_LIBRARIES} AsgTools AsgExampleToolsLib AsgTestingLib )
+ LINK_LIBRARIES ${GTEST_LIBRARIES} AsgTools AsgExampleToolsLib AsgTestingLib ${extra_libs})
set_tests_properties (AsgExampleTools_gt_DataHandlesTest_ctest PROPERTIES LABELS "AsgDataHandles;AsgExampleTools" )
-
endif()
-
atlas_add_test( gt_AnaCheck
SOURCES test/gt_AnaCheck.cxx
INCLUDE_DIRS ${GTEST_INCLUDE_DIRS}
diff --git a/Control/AthToolSupport/AsgExampleTools/Root/DataHandleTestTool.cxx b/Control/AthToolSupport/AsgExampleTools/Root/DataHandleTestTool.cxx
index 18778a38bad3f6b6bcf1b16326b1a036d45d22a1..8193fd471e4d5dd844297b0619c4f394585b6579 100644
--- a/Control/AthToolSupport/AsgExampleTools/Root/DataHandleTestTool.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/Root/DataHandleTestTool.cxx
@@ -13,10 +13,16 @@
#include <AsgExampleTools/DataHandleTestTool.h>
#include <AsgDataHandles/ReadHandle.h>
+#include <AsgDataHandles/ReadDecorHandle.h>
+#include <AsgDataHandles/WriteHandle.h>
#include <AsgTesting/UnitTest.h>
#include <gtest/gtest.h>
#include <map>
+#ifndef SIMULATIONBASE
+#include <xAODMuon/MuonAuxContainer.h>
+#endif
+
//
// method implementations
//
@@ -28,6 +34,8 @@ namespace asg
: AsgTool (val_name)
{
declareProperty ("readFailure", m_readFailure, "whether to expect a read failure");
+ declareProperty ("readDecorFailure", m_readDecorFailure, "whether to expect a read decoration failure");
+ declareProperty ("doWriteName", m_doWriteName, "if we should write, the name we expect to write to");
}
@@ -44,6 +52,9 @@ namespace asg
{
#ifndef SIMULATIONBASE
ANA_CHECK (m_readKey.initialize ());
+ ANA_CHECK (m_readDecorKey.initialize ());
+ if (!m_writeKey.empty())
+ ANA_CHECK (m_writeKey.initialize ());
#endif
return StatusCode::SUCCESS;
}
@@ -56,12 +67,45 @@ namespace asg
#ifndef SIMULATIONBASE
const xAOD::MuonContainer *muonsStore {nullptr};
ASSERT_SUCCESS (evtStore()->retrieve (muonsStore, "Muons"));
+ ASSERT_NE (0u, muonsStore->size());
+ const xAOD::Muon *testMuon = (*muonsStore)[0];
auto readHandle = makeHandle (m_readKey);
- if (m_readFailure == false)
- EXPECT_EQ (muonsStore, readHandle.get());
- else
+ if (m_readFailure == true)
+ {
EXPECT_EQ (nullptr, readHandle.get());
+ EXPECT_FALSE (readHandle.isValid());
+ } else
+ {
+ EXPECT_EQ (muonsStore, readHandle.get());
+ EXPECT_TRUE (readHandle.isValid());
+ }
+
+ SG::ReadDecorHandle<xAOD::MuonContainer,float> readDecorHandle (m_readDecorKey);
+ if (m_readDecorFailure == true)
+ {
+ EXPECT_ANY_THROW (readDecorHandle (*testMuon));
+ } else
+ {
+ SG::AuxElement::ConstAccessor<float> acc ("pt");
+ EXPECT_EQ (acc (*testMuon), readDecorHandle (*testMuon));
+ }
+
+ if (!m_doWriteName.empty())
+ {
+ auto writeHandle = makeHandle (m_writeKey);
+ auto newMuons = std::make_unique<xAOD::MuonContainer>();
+ auto newAux = std::make_unique<xAOD::MuonAuxContainer>();
+ xAOD::MuonContainer *recordMuons {newMuons.get()};
+ xAOD::MuonAuxContainer *recordAux {newAux.get()};
+ EXPECT_SUCCESS (writeHandle.record (std::move (newMuons), std::move (newAux)));
+ const xAOD::MuonContainer *retrieveMuons {nullptr};
+ EXPECT_SUCCESS (evtStore()->retrieve (retrieveMuons, m_doWriteName));
+ EXPECT_EQ (recordMuons, retrieveMuons);
+ xAOD::MuonAuxContainer *retrieveAux {nullptr};
+ EXPECT_SUCCESS (evtStore()->retrieve (retrieveAux, m_doWriteName + "Aux."));
+ EXPECT_EQ (recordAux, retrieveAux);
+ }
#endif
}
}
diff --git a/Control/AthToolSupport/AsgExampleTools/src/AsgExampleAlgorithm.cxx b/Control/AthToolSupport/AsgExampleTools/src/AsgExampleAlgorithm.cxx
index 915d0e9c3e1187d61b8172bb315b8392bb887cc0..50d2f9fe3ef5db28f9c2b323a799783b757615af 100644
--- a/Control/AthToolSupport/AsgExampleTools/src/AsgExampleAlgorithm.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/src/AsgExampleAlgorithm.cxx
@@ -1,7 +1,7 @@
// AsgExampleAlgorithm.cxx
#include "AsgExampleAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AsgExampleTools/IAsgHelloTool.h"
#include "AsgTools/AsgTool.h"
diff --git a/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx b/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
index 77f01de40de9c531335b74e4336ce8ad7a2a95cb..247f8eedfcc452171fcf7068c646a34a80a21bab 100644
--- a/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/test/gt_AnaToolHandle_test.cxx
@@ -412,7 +412,11 @@ namespace asg
}
// check setProperty<int>()
+#ifdef XAOD_STANDALONE
TEST_F (AnaToolHandleMakeTest, setPropertyInt_failure)
+#else
+ TEST_F (AnaToolHandleMakeTest, DISABLED_setPropertyInt_failure)
+#endif
{
ASSERT_SUCCESS (tool.setProperty<int> ("UNKNOWN_PROPERTY", 42));
ASSERT_FAILURE (tool.initialize ());
@@ -437,7 +441,11 @@ namespace asg
}
// check setProperty(const char*)
+#ifdef XAOD_STANDALONE
TEST_F (AnaToolHandleMakeTest, setPropertyString_failure)
+#else
+ TEST_F (AnaToolHandleMakeTest, DISABLED_setPropertyString_failure)
+#endif
{
ASSERT_SUCCESS (tool.setProperty ("UNKNOWN_PROPERTY", "42"));
ASSERT_FAILURE (tool.initialize ());
@@ -841,7 +849,7 @@ namespace asg
EXPECT_EQ (57, handle->getPropertyInt ());
}
- TEST (AnaToolHandleTest, athena_job_options_misspelled)
+ TEST (AnaToolHandleTest, DISABLED_athena_job_options_misspelled)
{
std::string name = makeUniqueName();
ServiceHandle<IJobOptionsSvc> joSvc("JobOptionsSvc","");
diff --git a/Control/AthToolSupport/AsgExampleTools/test/gt_DataHandlesTest.cxx b/Control/AthToolSupport/AsgExampleTools/test/gt_DataHandlesTest.cxx
index 9b01506da3aa42edef4e7dafa2fc378d0e0f4259..74f2a8e1db31b4d8b5f4415dea2659f795745c11 100644
--- a/Control/AthToolSupport/AsgExampleTools/test/gt_DataHandlesTest.cxx
+++ b/Control/AthToolSupport/AsgExampleTools/test/gt_DataHandlesTest.cxx
@@ -14,13 +14,18 @@
#include <AsgMessaging/MessageCheck.h>
#include <AsgTesting/UnitTest.h>
#include <AsgExampleTools/IDataHandleTestTool.h>
-#include <xAODRootAccess/TEvent.h>
-#include <xAODRootAccess/TStore.h>
#include <TFile.h>
#include <cmath>
#include <gtest/gtest.h>
#include <sstream>
+#ifdef XAOD_STANDALONE
+#include <xAODRootAccess/TEvent.h>
+#include <xAODRootAccess/TStore.h>
+#else
+#include <POOLRootAccess/TEvent.h>
+#endif
+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
//
@@ -39,18 +44,23 @@ namespace asg
ASSERT_NE (nullptr, test_file);
file.reset (TFile::Open (test_file, "READ"));
ASSERT_NE (nullptr, file);
+#ifdef XAOD_STANDALONE
+ event = std::make_unique<xAOD::TEvent>();
+#else
+ event = std::make_unique<POOL::TEvent>();
+#endif
+ ASSERT_SUCCESS (event->readFrom (file.get()));
+ ASSERT_TRUE (event->getEntry (0) >= 0);
}
static void TearDownTestCase ()
{
+ event.reset ();
file.reset ();
}
virtual void SetUp () override
{
- ASSERT_NE (nullptr, file);
- ASSERT_SUCCESS (event.readFrom (file.get()));
- ASSERT_TRUE (event.getEntry (0) >= 0);
}
/// \brief make a unique tool name to be used in unit tests
@@ -63,8 +73,12 @@ namespace asg
}
static inline std::unique_ptr<TFile> file;
- xAOD::TEvent event;
+#ifdef XAOD_STANDALONE
+ static inline std::unique_ptr<xAOD::TEvent> event;
xAOD::TStore store;
+#else
+ static inline std::unique_ptr<POOL::TEvent> event;
+#endif
AsgToolConfig config {"asg::DataHandleTestTool/" + makeUniqueName()};
std::shared_ptr<void> cleanup;
ToolHandle<IDataHandleTestTool> tool;
@@ -89,6 +103,29 @@ namespace asg
ASSERT_SUCCESS (config.makeTool (tool, cleanup));
tool->runTest ();
}
+
+
+
+ // just test that reading unknown objects fails as it should
+ TEST_F (DataHandlesTest, read_decor_failure)
+ {
+ config.setPropertyFromString ("readDecorFailure", "1");
+ config.setPropertyFromString ("readDecorKey", "Muons.MISSING_PROPERTY");
+ ASSERT_SUCCESS (config.makeTool (tool, cleanup));
+ tool->runTest ();
+ }
+
+
+
+ // do a write handle test
+ TEST_F (DataHandlesTest, write_handle)
+ {
+ std::string writeKey = "Muons" + makeUniqueName();
+ config.setPropertyFromString ("writeKey", writeKey);
+ config.setPropertyFromString ("doWriteName", writeKey);
+ ASSERT_SUCCESS (config.makeTool (tool, cleanup));
+ tool->runTest ();
+ }
}
ATLAS_GOOGLE_TEST_MAIN
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgTool.icc b/Control/AthToolSupport/AsgTools/AsgTools/AsgTool.icc
index 095fa4162ca7a511746562f0ad69e89d2c20aee0..6a8a5a8c7c057015024cb1fcc8fbbf3d95ee7ed7 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgTool.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AsgTool.icc
@@ -17,7 +17,7 @@ namespace asg {
const T* AsgTool::getProperty( const std::string& name ) const {
// Get the property object (if it exists):
- const Property* prop = m_properties->getProperty( name );
+ const Property* prop = m_properties->getProperty( name );
if( ! prop ) {
ATH_MSG_WARNING( "Property with name \"" << name << "\" not found" );
return 0;
@@ -43,16 +43,23 @@ namespace asg {
#ifndef XAOD_STANDALONE
// Gaudi/Athena include(s):
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
+using Property = Gaudi::Details::PropertyBase;
+
+template <class TYPE, class VERIFIER = Gaudi::Details::Property::NullVerifier,
+ class HANDLERS = Gaudi::Details::Property::UpdateHandler>
+using PropertyWithValue = Gaudi::Property<TYPE, VERIFIER, HANDLERS>;
+
+
namespace asg {
template< class T >
const T* AsgTool::getProperty( const std::string& name ) const {
// Get the property object (if it exists):
- const Property* prop = Gaudi::Utils::getProperty( this, name );
+ const Gaudi::Details::PropertyBase* prop = Gaudi::Utils::getProperty( this, name );
if( ! prop ) {
ATH_MSG_WARNING( "Property with name \"" << name << "\" not found" );
return 0;
@@ -60,7 +67,7 @@ namespace asg {
// Try to cast it to the required type:
const PropertyWithValue< T >* tprop =
- dynamic_cast< const PropertyWithValue< T >* >( prop );
+ dynamic_cast< const PropertyWithValue< T >* >( prop );
if( ! tprop ) {
ATH_MSG_WARNING( "Property \"" << name << "\" is of type: "
<< System::typeinfoName( *( prop->type_info() ) ) );
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/CurrentContext.h b/Control/AthToolSupport/AsgTools/AsgTools/CurrentContext.h
new file mode 100644
index 0000000000000000000000000000000000000000..9c470378db12e86dc4c13fbb0bde65a549686911
--- /dev/null
+++ b/Control/AthToolSupport/AsgTools/AsgTools/CurrentContext.h
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
+
+
+
+#ifndef ASG_TOOLS__CURRENT_CONTEXT_H
+#define ASG_TOOLS__CURRENT_CONTEXT_H
+
+#ifndef XAOD_STANDALONE
+#include <GaudiKernel/ThreadLocalContext.h>
+#else
+
+class EventContext;
+
+namespace Gaudi
+{
+ namespace Hive
+ {
+ /// \brief the current EventContext
+ ///
+ /// This is mostly meant so that you can call a function requiring
+ /// an `EventContext` even if you yourself got called without one.
+ /// This matches the signature from GaudiHive, but in AnalysisBase
+ /// this just returns a dummy reference (for now).
+
+ const EventContext& currentContext ();
+ }
+}
+
+#endif
+
+#endif
diff --git a/Control/AthToolSupport/AsgTools/CMakeLists.txt b/Control/AthToolSupport/AsgTools/CMakeLists.txt
index 6e0a8e1393c009b4140b4b7d112215dd44fceb50..377bf6bec91a896e5b0a3d5c117c3f933feba265 100644
--- a/Control/AthToolSupport/AsgTools/CMakeLists.txt
+++ b/Control/AthToolSupport/AsgTools/CMakeLists.txt
@@ -1,25 +1,15 @@
-# $Id: CMakeLists.txt 804698 2017-05-11 16:03:27Z krumnack $
-################################################################################
-# Package: AsgTools
-################################################################################
-
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AsgTools )
# Dependencies are taken based on what environment we are in:
if( XAOD_STANDALONE )
- set( deps Control/AthToolSupport/AsgMessaging Control/xAODRootAccessInterfaces Control/xAODRootAccess )
set( libs AsgMessagingLib xAODRootAccessInterfaces xAODRootAccess )
else()
- set( deps Control/AthToolSupport/AsgMessaging Control/xAODRootAccess Control/AthenaBaseComps Control/AthenaKernel
- GaudiKernel )
set( libs AsgMessagingLib AthenaBaseComps AthenaKernel GaudiKernel )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC ${deps} )
-
# Decide which sources to use:
if( XAOD_STANDALONE )
set( sources Root/*.cxx )
diff --git a/Control/AthToolSupport/AsgTools/Root/AsgMetadataTool.cxx b/Control/AthToolSupport/AsgTools/Root/AsgMetadataTool.cxx
index 5907948acfb430e874b1100e546a64ac7ce443f7..9fced6f2a27161935ac07664574fae344167e2b4 100644
--- a/Control/AthToolSupport/AsgTools/Root/AsgMetadataTool.cxx
+++ b/Control/AthToolSupport/AsgTools/Root/AsgMetadataTool.cxx
@@ -140,7 +140,18 @@ namespace asg {
ATH_MSG_VERBOSE( "Callback received with incident: " << inc.type() );
// Call the appropriate member function:
- if( inc.type() == IncidentType::BeginEvent ) {
+ if( inc.type() == IncidentType::BeginInputFile ) {
+ m_beginInputFileCalled = true;
+ if( beginInputFile().isFailure() ) {
+ ATH_MSG_FATAL( "Failed to call beginInputFile()" );
+ throw std::runtime_error( "Couldn't call beginInputFile()" );
+ }
+ } else if( inc.type() == IncidentType::EndInputFile ) {
+ if( endInputFile().isFailure() ) {
+ ATH_MSG_FATAL( "Failed to call endInputFile()" );
+ throw std::runtime_error( "Couldn't call endInputFile()" );
+ }
+ } else if( inc.type() == IncidentType::BeginEvent ) {
// If the tool didn't catch the begin input file incident for the
// first input file of the job, then call the appropriate function
// now.
@@ -156,7 +167,7 @@ namespace asg {
throw std::runtime_error( "Couldn't call beginEvent()" );
}
} else {
- ATH_MSG_WARNING( "Unknown incident type received: " << inc.type() );
+ ATH_MSG_WARNING( "Unknown incident type received in AsgMetaDataTool: " << inc.type() );
}
return;
diff --git a/Control/AthToolSupport/AsgTools/Root/CurrentContext.cxx b/Control/AthToolSupport/AsgTools/Root/CurrentContext.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..43acdbfb55322e5c25055ffc6da036722044da97
--- /dev/null
+++ b/Control/AthToolSupport/AsgTools/Root/CurrentContext.cxx
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/// @author Nils Krumnack
+
+
+
+//
+// includes
+//
+
+#include <AsgTools/CurrentContext.h>
+
+#ifdef XAOD_STANDALONE
+
+//
+// method implementations
+//
+
+namespace Gaudi
+{
+ namespace Hive
+ {
+ const EventContext& currentContext ()
+ {
+ // For now there is no actual EventContext class in AnalysisBase,
+ // so for now we return a null-reference. Since there is
+ // currently no (legal) way to dereference an EventContext in
+ // AnalysisBase, so this is fine, and indeed should catch any case
+ // in which the user might somehow access this anyways.
+ static EventContext *result {nullptr};
+ return *result;
+ }
+ }
+}
+
+#endif
diff --git a/Control/AthViews/src_dflow/DFlowAlg1.cxx b/Control/AthViews/src_dflow/DFlowAlg1.cxx
index 0dc04c3a799b099059f04bdb2e830ec8c8f0d28a..a53e052cf73b96354101c39f6835024f351814ac 100644
--- a/Control/AthViews/src_dflow/DFlowAlg1.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg1.cxx
@@ -16,7 +16,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Control/AthViews/src_dflow/DFlowAlg2.cxx b/Control/AthViews/src_dflow/DFlowAlg2.cxx
index ea4e53ba146d383bf9a241f6d72ed669c190f7d6..a5abe581ee480087bc8d7a5297b88a2126a73181 100644
--- a/Control/AthViews/src_dflow/DFlowAlg2.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg2.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "StoreGate/UpdateHandle.h"
diff --git a/Control/AthViews/src_dflow/DFlowAlg3.cxx b/Control/AthViews/src_dflow/DFlowAlg3.cxx
index 87c2d846043a87d129b185b93787c2013b1cea94..cb4516bf87f6fa0d4bc2c2b5349ab021581e2e96 100644
--- a/Control/AthViews/src_dflow/DFlowAlg3.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg3.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
#include "AthenaKernel/ExtendedEventContext.h"
diff --git a/Control/AthViews/src_dflow/ViewMergeAlg.cxx b/Control/AthViews/src_dflow/ViewMergeAlg.cxx
index 85917cd530fb0901f542fa0122fd109f81f56ba1..bbb334ae75c6bb320df8b2b5812be700620e4662 100644
--- a/Control/AthViews/src_dflow/ViewMergeAlg.cxx
+++ b/Control/AthViews/src_dflow/ViewMergeAlg.cxx
@@ -9,7 +9,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx b/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
index e77052339ecd879f6e43f954f3fb96219605cb00..1c2537c4f912e12a3f88cb7314d19baf868e9ddc 100644
--- a/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
+++ b/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
@@ -4,7 +4,7 @@
#include "ViewSubgraphAlg.h"
#include "AthViews/ViewHelper.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/WriteHandle.h"
namespace AthViews {
@@ -43,6 +43,16 @@ StatusCode ViewSubgraphAlg::execute()
ATH_MSG_DEBUG ("Executing " << name() << "...");
const EventContext& ctx = getContext();
+
+ //Start scheduler profiling
+ auto profileCallback = [this, slot=ctx.slot()]( IScheduler::OccupancySnapshot snap ) -> void {
+ std::string states = "";
+ for ( int const stateTotal : snap.states[slot] ) {
+ states += std::to_string( stateTotal ) + " ";
+ }
+ ATH_MSG_INFO( "Slot " << slot << " snapshot time " << snap.time.time_since_epoch().count() << " states: " << states );
+ };
+ m_scheduler->recordOccupancy( 0, std::move( profileCallback ) );
//Make a vector of dummy data to initialise the views
std::vector<int> viewData;
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.h b/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.h
index cdd63e5d8992b8a82567a24cb087d716073e94ef..73d1a3010cba095a21c6a970faec2529788f9871 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.h
@@ -71,7 +71,7 @@ public:
"retrieve data during the course of the job" );
auto props = this->getProperties();
- for( Property* prop : props ) {
+ for( Gaudi::Details::PropertyBase* prop : props ) {
if (prop->name() == "ExtraOutputs" || prop->name() == "ExtraInputs") {
prop->declareUpdateHandler
(&AthCommonDataStore<PBASE>::extraDeps_update_handler, this);
@@ -150,7 +150,7 @@ public:
//
template <class T>
- Property& declareProperty(Gaudi::Property<T> &t) {
+ Gaudi::Details::PropertyBase& declareProperty(Gaudi::Property<T> &t) {
typedef typename SG::HandleClassifier<T>::type htype;
return AthCommonDataStore<PBASE>::declareGaudiProperty(t, htype());
}
@@ -161,7 +161,7 @@ public:
*
*/
template <class T>
- Property& declareGaudiProperty(Gaudi::Property<T> &hndl,
+ Gaudi::Details::PropertyBase& declareGaudiProperty(Gaudi::Property<T> &hndl,
const SG::VarHandleKeyType&)
{
return *AthCommonDataStore<PBASE>::declareProperty(hndl.name(),
@@ -175,7 +175,7 @@ public:
*
*/
template <class T>
- Property& declareGaudiProperty(Gaudi::Property<T> &hndl,
+ Gaudi::Details::PropertyBase& declareGaudiProperty(Gaudi::Property<T> &hndl,
const SG::VarHandleKeyArrayType&)
{
return *AthCommonDataStore<PBASE>::declareProperty(hndl.name(),
@@ -189,7 +189,7 @@ public:
*
*/
template <class T>
- Property& declareGaudiProperty(Gaudi::Property<T> &hndl,
+ Gaudi::Details::PropertyBase& declareGaudiProperty(Gaudi::Property<T> &hndl,
const SG::VarHandleType&)
{
return *AthCommonDataStore<PBASE>::declareProperty(hndl.name(),
@@ -204,7 +204,7 @@ public:
*
*/
template <class T>
- Property& declareGaudiProperty(Gaudi::Property<T> &t, const SG::NotHandleType&)
+ Gaudi::Details::PropertyBase& declareGaudiProperty(Gaudi::Property<T> &t, const SG::NotHandleType&)
{
return PBASE::declareProperty(t);
}
@@ -226,7 +226,7 @@ public:
* The property value object is put on the input and output lists as
* appropriate; then we forward to the base class.
*/
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
SG::VarHandleKey& hndl,
const std::string& doc,
const SG::VarHandleKeyType&)
@@ -250,7 +250,7 @@ public:
* The property value object is put on the input and output lists as
* appropriate; then we forward to the base class.
*/
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
SG::VarHandleBase& hndl,
const std::string& doc,
const SG::VarHandleType&)
@@ -264,7 +264,7 @@ public:
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
SG::VarHandleKeyArray& hndArr,
const std::string& doc,
const SG::VarHandleKeyArrayType&)
@@ -281,7 +281,7 @@ public:
hndArr.setOwner(this);
m_vhka.push_back(&hndArr);
- Property* p = PBASE::declareProperty(name, hndArr, doc);
+ Gaudi::Details::PropertyBase* p = PBASE::declareProperty(name, hndArr, doc);
if (p != 0) {
p->declareUpdateHandler(&AthCommonDataStore<PBASE>::updateVHKA, this);
} else {
@@ -313,7 +313,7 @@ public:
// to work by overriding those methods and adding in the current contents
// of the arrays.
- void updateVHKA(Property& /*p*/) {
+ void updateVHKA(Gaudi::Details::PropertyBase& /*p*/) {
// debug() << "updateVHKA for property " << p.name() << " " << p.toString()
// << " size: " << m_vhka.size() << endmsg;
for (auto &a : m_vhka) {
@@ -338,7 +338,7 @@ public:
* of @c declareProperty.
*/
template <class T>
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
T& property,
const std::string& doc,
const SG::NotHandleType&)
@@ -357,7 +357,7 @@ public:
* for VarHandle/Key/KeyArray.
*/
template <class T>
- Property* declareProperty(const std::string& name,
+ Gaudi::Details::PropertyBase* declareProperty(const std::string& name,
T& property,
const std::string& doc="none")
{
@@ -396,7 +396,7 @@ protected:
* supplied via the ExtraInputs and ExtraOuputs Properties to add
* the StoreName if it's not explicitly given
*/
- void extraDeps_update_handler( Property& ExtraDeps );
+ void extraDeps_update_handler( Gaudi::Details::PropertyBase& ExtraDeps );
};
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc b/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc
index 450b269cc2fef8ebca0d8a0e3ddacb3bf7d3dae0..db28551c2c57cfd45e53a284de21c483ed8d11ca 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthCommonDataStore.icc
@@ -19,7 +19,7 @@
#include "AthenaBaseComps/AthAlgStartVisitor.h"
template <class PBASE>
-void AthCommonDataStore<PBASE>::extraDeps_update_handler( Property& ExtraDeps )
+void AthCommonDataStore<PBASE>::extraDeps_update_handler( Gaudi::Details::PropertyBase& ExtraDeps )
{
DataObjIDColl newColl;
Gaudi::Property<DataObjIDColl> *prop = dynamic_cast<Gaudi::Property<DataObjIDColl>*> (&ExtraDeps);
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
index f36a3a2964b067719cc8f98baacc0ab7863688e0..7b42e7cb6ad1178ea0e6eef39cdf08e0cb1f0550 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthFilterAlgorithm.h
@@ -91,7 +91,7 @@ class AthFilterAlgorithm
//special case: post-python default value of property FilterDescription sent to ICutFlowSvc only if not explicitly specified before
bool m_resetSelfDescription;
- void doNotResetSelfDescription( Property& );
+ void doNotResetSelfDescription( Gaudi::Details::PropertyBase& );
SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey
{ this, "EventInfoKey", "EventInfo", "" };
@@ -134,7 +134,7 @@ CutIdentifier AthFilterAlgorithm::cutID()
inline
void
-AthFilterAlgorithm::doNotResetSelfDescription( Property& )
+AthFilterAlgorithm::doNotResetSelfDescription( Gaudi::Details::PropertyBase& )
{
m_resetSelfDescription=false;
}
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h b/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
index f7afeada679d36293148117b91156b02654c4499..1982e96201edb96baff6de3ded1c43a649905758 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/AthMessaging.h
@@ -19,7 +19,7 @@
// framework includes
#include "GaudiKernel/IMessageSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthMsgStreamMacros.h"
#include <boost/thread/tss.hpp>
diff --git a/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h b/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
index 2c8e5a00e0efd0b553ceedf9f76246ee2f207425..771586e07a2edbdb24c6e3b937012b2f6c0b5b5e 100644
--- a/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
+++ b/Control/AthenaBaseComps/AthenaBaseComps/FilteredAlgorithm.h
@@ -18,7 +18,7 @@
#include "GaudiKernel/IDataSelector.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IDecisionSvc.h"
diff --git a/Control/AthenaBaseComps/src/AthCnvSvc.cxx b/Control/AthenaBaseComps/src/AthCnvSvc.cxx
index 180c50d10bd67aac374e0bfed721ac6cd756edd5..bb3d9a5a96959f6f86cf655eb20a93af1630522d 100644
--- a/Control/AthenaBaseComps/src/AthCnvSvc.cxx
+++ b/Control/AthenaBaseComps/src/AthCnvSvc.cxx
@@ -12,7 +12,7 @@
// STL includes
// Framework includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/DataObject.h"
#include "GaudiKernel/System.h"
#include "GaudiKernel/IConverter.h"
diff --git a/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx b/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
index 78746db210c617e5652671bdffd4ef1b51881c53..55868f9d79c3c171d3293411f757c449840ba14e 100644
--- a/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/AthFilterAlgorithm.cxx
@@ -17,7 +17,7 @@
// STL includes
// Framework includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
///////////////////////////////////////////////////////////////////
diff --git a/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx b/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
index b590e1b21ba8e7cf8eb995f18f0597ad953f78c1..2e9fd336431465edebda3e624b1eb1dac2face52 100644
--- a/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/AthHistogramAlgorithm.cxx
@@ -17,7 +17,7 @@
#include <map>
// Framework includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx b/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
index 56471016bba342997a21d90dc60a65984750c2d5..dc49753b528d7d1429f53b5576f52f172f2cf960 100644
--- a/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
+++ b/Control/AthenaBaseComps/src/AthHistogramFilterAlgorithm.cxx
@@ -16,7 +16,7 @@
#include <string>
// Framework includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/Control/AthenaCommon/python/AppMgr.py b/Control/AthenaCommon/python/AppMgr.py
index da5b9ac56618e92582a45619114f15062553e9ba..d660fa209a560c251772c83dd6237d0d21428106 100755
--- a/Control/AthenaCommon/python/AppMgr.py
+++ b/Control/AthenaCommon/python/AppMgr.py
@@ -24,7 +24,6 @@ __all__ = [ 'theApp', 'ServiceMgr', 'ToolSvc', 'AuditorSvc', 'theAuditorSvc',
'athCondSeq',
'athAlgSeq', 'topSequence',
'athOutSeq',
- 'athRegSeq',
]
### helpers ------------------------------------------------------------------
@@ -263,7 +262,7 @@ class AthAppMgr( AppMgr ):
def __build_master_sequence (self):
"""helper method to build the top-level AthSequencer from all bits and
- pieces : AthMasterSeq, AthAlgSeq, AthOutSeq, AthRegSeq
+ pieces : AthMasterSeq, AthAlgSeq, AthOutSeq
"""
from . import AlgSequence as _as
from AthenaServices.AthenaServicesConf import AthIncFirerAlg as IFA
@@ -277,7 +276,6 @@ class AthAppMgr( AppMgr ):
athAlgSeq = _as.AthSequencer ("AthAlgSeq",IgnoreFilterPassed=True, StopOverride=True)
athEndSeq = _as.AthSequencer ("AthEndSeq",Sequential=True)
athOutSeq = _as.AthSequencer ("AthOutSeq", StopOverride=True)
- athRegSeq = _as.AthSequencer ("AthRegSeq", StopOverride=True)
athAllAlgSeq = _as.AthSequencer ("AthAllAlgSeq", StopOverride=True)
athAlgEvtSeq = _as.AthSequencer ("AthAlgEvtSeq",Sequential = True, StopOverride=True)
# transfer old TopAlg to new AthAlgSeq
@@ -337,7 +335,6 @@ class AthAppMgr( AppMgr ):
athMasterSeq += athAlgEvtSeq
athMasterSeq += athOutSeq
- athMasterSeq += athRegSeq
Logging.log.debug ("building master sequence... [done]")
return athMasterSeq
@@ -998,12 +995,9 @@ def AuditorSvc(): # backwards compatibility
# +--- athEndSeq
# |
# +--- athOutSeq
-# |
-# +--- athRegSeq
athMasterSeq = AlgSequence.AthSequencer( "AthMasterSeq" )
athCondSeq = AlgSequence.AthSequencer( "AthCondSeq" )
athAlgSeq = AlgSequence.AthSequencer( "AthAlgSeq" )
athOutSeq = AlgSequence.AthSequencer( "AthOutSeq" )
-athRegSeq = AlgSequence.AthSequencer( "AthRegSeq" )
topSequence = AlgSequence.AlgSequence( "TopAlg" ) # for backward compatibility
diff --git a/Control/AthenaCommon/python/ChapPy.py b/Control/AthenaCommon/python/ChapPy.py
index dfa81fd723794888e8fe9f7b2477a8c5b1e3e3d1..2a11b1bf555cf21f8f56f01cd25eea294726dcc0 100755
--- a/Control/AthenaCommon/python/ChapPy.py
+++ b/Control/AthenaCommon/python/ChapPy.py
@@ -32,7 +32,6 @@ def dump( buf, stdout = sys.stdout ):
fname = None
if isinstance(buf, str):
fname = buf
- from builtins import file
if six.PY3:
import io
file = io.IOBase # noqa: F811
diff --git a/Control/AthenaCommon/python/ConfigurationShelve.py b/Control/AthenaCommon/python/ConfigurationShelve.py
index ffbb125095d7a62c28804c4a36a46971443e27ea..9163a2572a8fe2ef6cfd92d64e384545e079a597 100644
--- a/Control/AthenaCommon/python/ConfigurationShelve.py
+++ b/Control/AthenaCommon/python/ConfigurationShelve.py
@@ -110,7 +110,6 @@ class ConfigurationJar( object ):
self.TopSequence = _as.AlgSequence ("TopAlg")
self.athAlgSeq = _as.AthSequencer ("AthAlgSeq")
self.athOutSeq = _as.AthSequencer ("AthOutSeq")
- self.athRegSeq = _as.AthSequencer ("AthRegSeq")
self.AppMgr = theApp
self.ServiceMgr = ServiceMgr # takes care of AuditorSvc & ToolSvc
@@ -131,7 +130,6 @@ class ConfigurationJar( object ):
d[ 'AthAlgSeq' ] = self.athAlgSeq
d[ 'TopSequence' ] = self.TopSequence
d[ 'AthOutSeq' ] = self.athOutSeq
- d[ 'AthRegSeq' ] = self.athRegSeq
d[ 'AppMgr' ] = self.AppMgr
d[ 'Streams' ] = self.AppMgr._streams
d[ 'ServiceMgr' ] = self.ServiceMgr #takes care of {Auditor,Tool}Svc
diff --git a/Control/AthenaCommon/share/GenerateBootstrapTest.ref b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
index 1458f3c147c2978aad06b1d7c4fcc7aaa2e5a99d..5b5ae6824a7ce8f8a9390da74e5a31d04d96fe84 100644
--- a/Control/AthenaCommon/share/GenerateBootstrapTest.ref
+++ b/Control/AthenaCommon/share/GenerateBootstrapTest.ref
@@ -1,16 +1,16 @@
Willing to acquire file bootstrap.pkl from
-/build/mnowak/work/sealsvc/build/x86_64-centos7-gcc8-opt/share/bootstrap.pkl
+/afs/cern.ch/work/s/smh/ol_reggie/bld/x86_64-centos7-gcc8-opt/share/bootstrap.pkl
copy bootstrap.pkl
... Read 2 items from python pickle file: bootstrap.pkl
... Read 2 items from python pickle file: bootstrap_test.pkl
Given list of size 0. Not looking for differences.
-Step 1: reference file #components: 28
-Step 2: file to check #components: 28
+Step 1: reference file #components: 27
+Step 2: file to check #components: 27
Willing to acquire file bootstrap_threaded.pkl from
-/build/mnowak/work/sealsvc/build/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl
+/afs/cern.ch/work/s/smh/ol_reggie/bld/x86_64-centos7-gcc8-opt/share/bootstrap_threaded.pkl
copy bootstrap_threaded.pkl
... Read 2 items from python pickle file: bootstrap_threaded.pkl
... Read 2 items from python pickle file: bootstrap_threaded_test.pkl
Given list of size 0. Not looking for differences.
-Step 1: reference file #components: 34
-Step 2: file to check #components: 34
+Step 1: reference file #components: 33
+Step 2: file to check #components: 33
diff --git a/Control/AthenaCommon/share/bootstrap.pkl b/Control/AthenaCommon/share/bootstrap.pkl
index 1f9067c79c008b22f79765672be3434d59fcda8a..f47ca3833841c2222ba5eff3774e56b02fa40232 100644
Binary files a/Control/AthenaCommon/share/bootstrap.pkl and b/Control/AthenaCommon/share/bootstrap.pkl differ
diff --git a/Control/AthenaCommon/share/bootstrap_threaded.pkl b/Control/AthenaCommon/share/bootstrap_threaded.pkl
index 3de8cc67c8703e88e3f3356f672f32686471e2af..d5cf4a78df80454ca1d06794a68f2994c2bcc026 100644
Binary files a/Control/AthenaCommon/share/bootstrap_threaded.pkl and b/Control/AthenaCommon/share/bootstrap_threaded.pkl differ
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index a6cff972939920241b535b2bd4f4be43ee07f71d..a3ffde4ec5fc150a47c96df5bf3e154ee7e46e59 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -1066,7 +1066,6 @@ def appendCAtoAthena(ca):
preconfigured = [athCondSeq,athOutSeq,athAlgSeq,topSequence]
- #preconfigured = ["AthMasterSeq", "AthCondSeq", "AthAlgSeq", "AthOutSeq", "AthRegSeq"]
for seq in ca._allSequences:
merged = False
diff --git a/Control/AthenaConfiguration/python/DetectorConfigFlags.py b/Control/AthenaConfiguration/python/DetectorConfigFlags.py
index 7ea88fbaaf366d3720467f6182df198ec6e9f807..7e8fa160fb2b1c99fc2f94393caefe2f35f3bb13 100644
--- a/Control/AthenaConfiguration/python/DetectorConfigFlags.py
+++ b/Control/AthenaConfiguration/python/DetectorConfigFlags.py
@@ -137,4 +137,5 @@ def createDetectorConfigFlags():
# TODO: can these replace other (more fine-grained) flags that only turned off subdetector systems for certain tasks (e.g. DCS)?
dcf.addFlag('Detector.PixelOn', True)
dcf.addFlag('Detector.SCTOn', True)
+ dcf.addFlag('Detector.TRTOn', True)
return dcf
diff --git a/Control/AthenaConfiguration/python/MainServicesConfig.py b/Control/AthenaConfiguration/python/MainServicesConfig.py
index 9a9d69b62a55c9f4962ba4218e7b19cbdbc5d6e8..83dacda189f67aef1707a73d0d4c495089d34ae9 100644
--- a/Control/AthenaConfiguration/python/MainServicesConfig.py
+++ b/Control/AthenaConfiguration/python/MainServicesConfig.py
@@ -39,7 +39,6 @@ def MainServicesCfg(cfgFlags):
#Build standard sequences:
cfg.addSequence(AthSequencer('AthAlgEvtSeq',Sequential=True, StopOverride=True),parentName="AthMasterSeq")
cfg.addSequence(AthSequencer('AthOutSeq',StopOverride=True),parentName="AthMasterSeq")
- cfg.addSequence(AthSequencer('AthRegSeq',StopOverride=True),parentName="AthMasterSeq")
cfg.addSequence(AthSequencer('AthBeginSeq',Sequential=True),parentName='AthAlgEvtSeq')
cfg.addSequence(AthSequencer('AthAllAlgSeq',StopOverride=True),parentName='AthAlgEvtSeq')
diff --git a/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.h b/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.h
index f059acf68e8e8c330fe7323293f078f505e3bc38..e5beb63b7851879472af7314fa9d2db9c2528b20 100755
--- a/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.h
+++ b/Control/AthenaExamples/AthExHelloWorld/src/HelloAlg.h
@@ -9,7 +9,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
diff --git a/Control/AthenaExamples/AthExHistNtup/src/Hist.cxx b/Control/AthenaExamples/AthExHistNtup/src/Hist.cxx
index 1adbd7e4c8afa81d048c8305121f220210e99af2..94a423fad74bd9a366b57e266d8468b0baebc0eb 100755
--- a/Control/AthenaExamples/AthExHistNtup/src/Hist.cxx
+++ b/Control/AthenaExamples/AthExHistNtup/src/Hist.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT includes
#include "TH1F.h"
diff --git a/Control/AthenaExamples/AthExHistNtup/src/Ntup.cxx b/Control/AthenaExamples/AthExHistNtup/src/Ntup.cxx
index 190a3bd89d700b172c4b88d654b79fe2c14c83fa..3856936b58f72c5525ed77901cc1c32031735b1e 100755
--- a/Control/AthenaExamples/AthExHistNtup/src/Ntup.cxx
+++ b/Control/AthenaExamples/AthExHistNtup/src/Ntup.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT includes
#include "TTree.h"
diff --git a/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx b/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
index 21a81fbf117f4e7b1ba3e8c3868df1170e09eed2..c7f7cb2b421f303a99d4dbe0c417e5fbb3302eaa 100644
--- a/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/AnotherConcreteSvc.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// AthExJobOptions includes
#include "AnotherConcreteSvc.h"
diff --git a/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx b/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
index 3555f2d01538993e6804c43164f2812ac5881266..bcf16e08e206453285b0284bcf17131369d927cb 100644
--- a/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/ConcreteSvc.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// AthExJobOptions includes
#include "ConcreteSvc.h"
diff --git a/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h b/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h
index c84ce038cf9e4dfc9c5ffe6a83a0309f6a5ed0cf..d0303a5f0fe34604244ff173c893730273ec22bf 100644
--- a/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h
+++ b/Control/AthenaExamples/AthExMonitored/src/MonitoredAlg.h
@@ -6,7 +6,7 @@
#define ATHEXMONITORED_MONITOREDALG_H 1
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg1.cxx b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg1.cxx
index 0a148ca555ca4c42da85d6738928d259d78c355b..3a7cf42e0102ef3332901f5d7fe6d4278fb8efd2 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg1.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg1.cxx
@@ -16,7 +16,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
index 07843671a64e667071f1959045b2db2be5628672..84f9f1a6b2d4dca81e72847aa1ef6b31d7868dfe 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
@@ -16,7 +16,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg3.cxx b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg3.cxx
index 3c25ef9ea6531802c057db2b5b4903d2ef8bdde8..09b8d58b5f308a2e0a68bfc36e78878e8ac3b977 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg3.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg3.cxx
@@ -18,7 +18,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
namespace SG {
template<>
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
index dc888c9f957b9b7ff92ad561959ac7b3be36048a..9d59e4d9a5f6de266966115b6d5a9cb86da9d24a 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/CreateData.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
index 041cd35a1593b3ae4177cc37d3df23cbcc711736..3f12abfedb1203db8d532e95d55d0dad2f042714 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/ReadThinnedData.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
diff --git a/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx b/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
index fd310189da9dd485893c179befbbeb500eeced74..4fee9df108f94e57ce5b3a27871d70bc1b4a33af 100644
--- a/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
+++ b/Control/AthenaExamples/AthExThinning/src_lib/WriteThinnedData.cxx
@@ -15,7 +15,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SystemOfUnits.h"
// StoreGate
diff --git a/Control/AthenaKernel/AthenaKernel/ISecondaryEventSelector.h b/Control/AthenaKernel/AthenaKernel/ISecondaryEventSelector.h
index 24569734d5f3ad278fd80f8c1aa531596eb9af78..fc95e7949533c42df62c6acfe7e2df0767cd16f4 100644
--- a/Control/AthenaKernel/AthenaKernel/ISecondaryEventSelector.h
+++ b/Control/AthenaKernel/AthenaKernel/ISecondaryEventSelector.h
@@ -38,7 +38,7 @@ public:
/// Fill AttributeList with specific items from the selector and a suffix
virtual StatusCode fillAttributeList(coral::AttributeList *attrList, const std::string &suffix, bool copySource) const = 0;
// Disconnect DB if all events from the source FID were processed and the Selector moved to another file
- virtual bool disconnectIfFinished(SG::SourceID fid) const = 0;
+ virtual bool disconnectIfFinished(const SG::SourceID &fid) const = 0;
};
#endif // ATHENAKERNEL_ISECONDARYEVENTSELECTOR_H
diff --git a/Control/AthenaKernel/AthenaKernel/ThinningCache.h b/Control/AthenaKernel/AthenaKernel/ThinningCache.h
index e577bc110c0e7962478b63f697ac2fadfdcb5b68..eed9b3d96cde364b1f6b486d9b9ca1ca7d517197 100644
--- a/Control/AthenaKernel/AthenaKernel/ThinningCache.h
+++ b/Control/AthenaKernel/AthenaKernel/ThinningCache.h
@@ -122,6 +122,14 @@ public:
void setVetoed (const std::string& key,
const CxxUtils::ConcurrentBitset& vetoed);
+ /**
+ * @brief Set lossy float compression information for the object.
+ * @param key SG string key of the object being added.
+ * @param compression Map of compression levels to variables
+ * for this object.
+ */
+ void setCompression(const std::string& key,
+ const ThinningInfo::compression_map_t& compression);
/**
* @brief Return thinning information for @c key.
diff --git a/Control/AthenaKernel/AthenaKernel/ThinningInfo.h b/Control/AthenaKernel/AthenaKernel/ThinningInfo.h
index 5814f94afd63ed59ab1a96039f25f0cfd54607f7..6c4da32f97aada58e08bef44ff4d2f0b6e06315e 100644
--- a/Control/AthenaKernel/AthenaKernel/ThinningInfo.h
+++ b/Control/AthenaKernel/AthenaKernel/ThinningInfo.h
@@ -16,6 +16,7 @@
#include "CxxUtils/ConcurrentBitset.h"
+#include <map>
namespace SG {
@@ -51,6 +52,30 @@ public:
{
return m_vetoed.test (id);
}
+
+ /// This map holds a set of auxids to be lossy compressed
+ /// for each compression level (nmantissa).
+ /// Same comment above for the SG::auxid_set_t applies here.
+ /// Keeping compression level as the key allows us to use
+ /// the set as the value, which eases the look up.
+ /// Maybe it would be more natural to have auxid => compression level
+ /// but that might have complicated things a bit.
+ /// If an auxid exists in multiple compression levels,
+ /// always pick the most strict one (lowest) for space savings.
+ typedef std::map<unsigned int,
+ CxxUtils::ConcurrentBitset> compression_map_t;
+ compression_map_t m_compression;
+
+ /// Test if a variable is asked to be compressed.
+ /// If it is, return the compression level (nmantissa).
+ /// 0 means no compression is asked for.
+ unsigned int compression (size_t id) const
+ {
+ for (const auto &entry : m_compression) {
+ if (entry.second.test(id)) return entry.first;
+ }
+ return 0;
+ }
};
diff --git a/Control/AthenaKernel/src/CloneService.cxx b/Control/AthenaKernel/src/CloneService.cxx
index c104c61139309dba1407467e396c9dce0aa8eb78..f5e720ef20967226b52f2f26f779cfac6779b4d5 100644
--- a/Control/AthenaKernel/src/CloneService.cxx
+++ b/Control/AthenaKernel/src/CloneService.cxx
@@ -73,8 +73,8 @@ namespace CloneService {
}
//now copy parent's properties into child
- std::vector<Property*>::const_iterator iProp(parent->getProperties().begin());
- std::vector<Property*>::const_iterator eProp(parent->getProperties().end());
+ std::vector<Gaudi::Details::PropertyBase*>::const_iterator iProp(parent->getProperties().begin());
+ std::vector<Gaudi::Details::PropertyBase*>::const_iterator eProp(parent->getProperties().end());
while (iProp != eProp &&
(child->setProperty(**iProp)).isSuccess()) ++iProp;
if (iProp != eProp) {
diff --git a/Control/AthenaKernel/src/CloneTool.cxx b/Control/AthenaKernel/src/CloneTool.cxx
index bfbbd0c690999f70b24a3e125aff8e76df0e77b9..b118346cb6333c82cf48c751d24fb86e4904e5ae 100644
--- a/Control/AthenaKernel/src/CloneTool.cxx
+++ b/Control/AthenaKernel/src/CloneTool.cxx
@@ -46,8 +46,8 @@ namespace CloneTool {
}
//now copy cloned's properties into result
- std::vector<Property*>::const_iterator iProp(pCloned->getProperties().begin());
- std::vector<Property*>::const_iterator eProp(pCloned->getProperties().end());
+ std::vector<Gaudi::Details::PropertyBase*>::const_iterator iProp(pCloned->getProperties().begin());
+ std::vector<Gaudi::Details::PropertyBase*>::const_iterator eProp(pCloned->getProperties().end());
AlgTool* aResult=dynamic_cast<AlgTool*>(result);
if (0 == aResult) {
diff --git a/Control/AthenaKernel/src/ThinningCache.cxx b/Control/AthenaKernel/src/ThinningCache.cxx
index d417dd5a62e534263681b296bc75381d6eb87050..37d3ba06de86d0bfa1eed97013bdcede34695a5c 100644
--- a/Control/AthenaKernel/src/ThinningCache.cxx
+++ b/Control/AthenaKernel/src/ThinningCache.cxx
@@ -151,6 +151,17 @@ void ThinningCache::setVetoed (const std::string& key,
m_map[key].m_vetoed = vetoed;
}
+/**
+ * @brief Set lossy float compression information for the object.
+ * @param key SG string key of the object being added.
+ * @param compression Map of compression levels to variables
+ * for this object.
+ */
+void ThinningCache::setCompression(const std::string& key,
+ const ThinningInfo::compression_map_t& compression)
+{
+ m_map[key].m_compression = compression;
+}
/**
* @brief Return thinning information for @c key.
diff --git a/Control/AthenaKernel/test/ThinningCache_test.cxx b/Control/AthenaKernel/test/ThinningCache_test.cxx
index 39d49ae73c02d79f70bbf6e4ef865c3488a47bbf..2991ff96563acd4cd826123a388b1879c985c326 100644
--- a/Control/AthenaKernel/test/ThinningCache_test.cxx
+++ b/Control/AthenaKernel/test/ThinningCache_test.cxx
@@ -116,6 +116,27 @@ void test1()
assert (cache.thinningInfo ("foo")->vetoed(13));
assert (!cache.thinningInfo ("foo")->vetoed(14));
+ assert (cache.thinningInfo ("foo")->m_compression.empty());
+ SG::ThinningInfo::compression_map_t compression1;
+ CxxUtils::ConcurrentBitset cbs1 (64);
+ cbs1.set (13);
+ compression1[7] = cbs1;
+ cache.setCompression("foo", compression1);
+ assert (cache.thinningInfo ("foo")->m_compression == compression1);
+ assert (cache.thinningInfo ("foo")->compression(13) == 7);
+ assert (cache.thinningInfo ("foo")->compression(14) == 0);
+
+ assert (cache.thinningInfo ("bar")->m_compression.empty());
+ SG::ThinningInfo::compression_map_t compression2;
+ CxxUtils::ConcurrentBitset cbs2 (42);
+ cbs2.set (8);
+ compression2[7] = cbs2;
+ compression2[15] = cbs2;
+ cache.setCompression("bar", compression2);
+ assert (cache.thinningInfo ("bar")->m_compression == compression2);
+ assert (cache.thinningInfo ("bar")->compression(8) == 7);
+ assert (cache.thinningInfo ("bar")->compression(8) != 15);
+
cache.clear();
assert (cache.empty());
assert (cache.trigNavigationThinningSvc() == nullptr);
diff --git a/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py b/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
index abccd5fa518486da89e558b26d1878cc84872a5b..38ef6113f109a5f4602102b778d412fbb1d9c58f 100644
--- a/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py
@@ -117,8 +117,8 @@ else:
DQMonFlags.doSCTMon=False
DQMonFlags.doTRTMon=False
DQMonFlags.doTRTElectronMon=False
-# DQMonFlags.doInDetGlobalMon=False
-# DQMonFlags.doInDetAlignMon=False
+ DQMonFlags.doInDetGlobalMon=False
+ DQMonFlags.doInDetAlignMon=False
DQMonFlags.doGlobalMon=False
DQMonFlags.doLVL1CaloMon=False
diff --git a/Control/AthenaMonitoring/src/AthenaMonManager.cxx b/Control/AthenaMonitoring/src/AthenaMonManager.cxx
index 3c2bae6dd60246b55dd85d598220c9bdf8d8564a..9e50504f57eef454d38e6ef6c5803f2289162423 100644
--- a/Control/AthenaMonitoring/src/AthenaMonManager.cxx
+++ b/Control/AthenaMonitoring/src/AthenaMonManager.cxx
@@ -21,7 +21,7 @@
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaMonitoring/IMonitorToolBase.h"
diff --git a/Control/AthenaPython/AthenaPython/PyProperty.h b/Control/AthenaPython/AthenaPython/PyProperty.h
index 9f917c488b673b32cec1daa32dfe5d94173e49c4..94aeff7cb6c4745272b6fca6f45f158582849ea1 100644
--- a/Control/AthenaPython/AthenaPython/PyProperty.h
+++ b/Control/AthenaPython/AthenaPython/PyProperty.h
@@ -18,7 +18,7 @@
#include <typeinfo>
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CxxUtils/checker_macros.h"
// Forward declaration
@@ -50,10 +50,10 @@ class ATLAS_NOT_THREAD_SAFE PyProperty
/// @c Property implementation
///@{
/// export the property value to the destination
- virtual bool load (Property& dest) const override;
+ virtual bool load (Gaudi::Details::PropertyBase& dest) const override;
/// import the property value from source
- virtual bool assign (const Property& src) override;
+ virtual bool assign (const Gaudi::Details::PropertyBase& src) override;
/// export the property value as a @c std::string
virtual std::string toString() const override;
diff --git a/Control/AthenaPython/src/PyComponentMgr.cxx b/Control/AthenaPython/src/PyComponentMgr.cxx
index f7ca99964d74990464ff6e66a7a99f28ae64aec7..893e93d2c9b5b2dceb0f9f16c011d5f387e1a22f 100755
--- a/Control/AthenaPython/src/PyComponentMgr.cxx
+++ b/Control/AthenaPython/src/PyComponentMgr.cxx
@@ -25,7 +25,7 @@ SG_BASES1(PyObject, SG::NoBase);
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaPython/IPyComponent.h"
// PyROOT includes
diff --git a/Control/AthenaPython/src/PyJobOptionsCatalogue.cxx b/Control/AthenaPython/src/PyJobOptionsCatalogue.cxx
index 6967e5cfa9199b68059d68c47ed0c603c6a8c954..1db168f58afab5df39d1cf697ba9315f802d49d2 100644
--- a/Control/AthenaPython/src/PyJobOptionsCatalogue.cxx
+++ b/Control/AthenaPython/src/PyJobOptionsCatalogue.cxx
@@ -80,7 +80,7 @@ PyJobOptionsCatalogue::clients() const
/// add a property to the catalogue
StatusCode
PyJobOptionsCatalogue::add_property (const std::string& client,
- const Property* prop)
+ const Gaudi::Details::PropertyBase* prop)
{
if (!prop) {
return StatusCode::FAILURE;
diff --git a/Control/AthenaPython/src/PyJobOptionsCatalogue.h b/Control/AthenaPython/src/PyJobOptionsCatalogue.h
index ec45f4b917d3f33d6db6993034967860621b7954..af56d70936071ad2bd7d7e241d71abf503f227e1 100644
--- a/Control/AthenaPython/src/PyJobOptionsCatalogue.h
+++ b/Control/AthenaPython/src/PyJobOptionsCatalogue.h
@@ -18,7 +18,7 @@
// Gaudi includes
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CxxUtils/checker_macros.h"
// Forward declaration
@@ -68,7 +68,7 @@ public:
/// add a property to the catalogue
StatusCode
- add_property (const std::string& client, const Property* prop);
+ add_property (const std::string& client, const Gaudi::Details::PropertyBase* prop);
/// remove a property from the catalogue
StatusCode
diff --git a/Control/AthenaPython/src/PyJobOptionsSvc.cxx b/Control/AthenaPython/src/PyJobOptionsSvc.cxx
index 04daac3feaf68817814df76f9e60ae7ce0809b04..cb30ddd2027043b2b61aeade4ac76b27b5e3f86f 100644
--- a/Control/AthenaPython/src/PyJobOptionsSvc.cxx
+++ b/Control/AthenaPython/src/PyJobOptionsSvc.cxx
@@ -19,7 +19,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
// PyRoot
@@ -140,7 +140,7 @@ PyJobOptionsSvc::setMyProperties (const std::string& client,
/// Add a property into the JobOptions catalog
StatusCode
PyJobOptionsSvc::addPropertyToCatalogue (const std::string& client,
- const Property& property)
+ const Gaudi::Details::PropertyBase& property)
{
ATH_MSG_VERBOSE ("::addPropToCat (client=[" << client << "], prop=["
<< property.name() << ", "
@@ -153,7 +153,7 @@ PyJobOptionsSvc::addPropertyToCatalogue (const std::string& client,
return m_catalogue.add_property (client, pyprop->clone());
}
- Property *p = new StringProperty (property.name(), "");
+ Gaudi::Details::PropertyBase *p = new StringProperty (property.name(), "");
if (!property.load (*p)) {
delete p; p = 0;
return StatusCode::FAILURE;
@@ -221,7 +221,7 @@ PyJobOptionsSvc::readOptions (const std::string& file,
// /// IProperty implementation (needed for initialisation)
// StatusCode
-// PyJobOptionsSvc::setProperty(const Property& p)
+// PyJobOptionsSvc::setProperty(const Gaudi::Details::PropertyBase& p)
// {
// return m_pmgr.setProperty (p);
// }
diff --git a/Control/AthenaPython/src/PyJobOptionsSvc.h b/Control/AthenaPython/src/PyJobOptionsSvc.h
index 35ea7306da2f5e8c41a3c121364dbe59a0681e90..83ddc9ae2fb07301dbee12ac01b8df60582149c8 100644
--- a/Control/AthenaPython/src/PyJobOptionsSvc.h
+++ b/Control/AthenaPython/src/PyJobOptionsSvc.h
@@ -22,7 +22,7 @@
// GaudiKernel
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/PropertyHolder.h"
//#include "GaudiKernel/PropertyMgr.h"
@@ -83,7 +83,7 @@ class ATLAS_NOT_THREAD_SAFE PyJobOptionsSvc
/// Add a property into the JobOptions catalog
virtual
StatusCode addPropertyToCatalogue (const std::string& client,
- const Property& property ) override;
+ const Gaudi::Details::PropertyBase& property ) override;
/// Remove a property from the JobOptions catalog
virtual
StatusCode removePropertyFromCatalogue (const std::string& client,
@@ -91,7 +91,7 @@ class ATLAS_NOT_THREAD_SAFE PyJobOptionsSvc
/// Get the properties associated to a given client
virtual
- // const std::vector<const Property*>*
+ // const std::vector<const Gaudi::Details::PropertyBase*>*
const std::vector<const Gaudi::Details::PropertyBase*>*
getProperties (const std::string& client) const override;
@@ -117,7 +117,7 @@ class ATLAS_NOT_THREAD_SAFE PyJobOptionsSvc
///@}
/// IProperty implementation (needed for initialisation)
- // StatusCode setProperty(const Property& p);
+ // StatusCode setProperty(const Gaudi::Details::PropertyBase& p);
// StatusCode getProperty(Property *p) const;
private:
diff --git a/Control/AthenaPython/src/PyProperty.cxx b/Control/AthenaPython/src/PyProperty.cxx
index edcac28adb3b68eb265cf0b605159bee6ac72df3..21c9f33bc720be78f7f3a67fb20f9d5edcf3438f 100644
--- a/Control/AthenaPython/src/PyProperty.cxx
+++ b/Control/AthenaPython/src/PyProperty.cxx
@@ -158,14 +158,14 @@ PyProperty::~PyProperty()
/// export the property value to the destination
bool
-PyProperty::load (Property& dest) const
+PyProperty::load (Gaudi::Details::PropertyBase& dest) const
{
return dest.assign (*this);
}
/// import the property value from source
bool
-PyProperty::assign (const Property& src)
+PyProperty::assign (const Gaudi::Details::PropertyBase& src)
{
const PyProperty *p = dynamic_cast<const PyProperty*> (&src);
if (p) {
diff --git a/Control/AthenaServices/share/AthTPCnvSvc.ref b/Control/AthenaServices/share/AthTPCnvSvc.ref
index 2d8416a38361f7b64e6f89a12dce62a6198587ac..d858d9810301ff63bb06f5c2b1b651fda637d22c 100644
--- a/Control/AthenaServices/share/AthTPCnvSvc.ref
+++ b/Control/AthenaServices/share/AthTPCnvSvc.ref
@@ -42,7 +42,6 @@ Py:Configurable ERROR attempt to add a duplicate (AthAlgEvtSeq.AthAllAlgSeq)
Py:Configurable ERROR attempt to add a duplicate (AthAlgEvtSeq.AthEndSeq) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthAlgEvtSeq) ... dupe ignored
Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthOutSeq) ... dupe ignored
-Py:Configurable ERROR attempt to add a duplicate (AthMasterSeq.AthRegSeq) ... dupe ignored
ClassIDSvc INFO RE-initializing ClassIDSvc
ApplicationMgr INFO Application Manager Reinitialized successfully
ApplicationMgr INFO Application Manager Started successfully
diff --git a/Control/AthenaServices/share/AthenaOutputStream_test.ref b/Control/AthenaServices/share/AthenaOutputStream_test.ref
index a52c1c87c779a786b39432dd15239a424f7db458..77fc1b609ceb35cb2b75de202581443fed081b27 100644
--- a/Control/AthenaServices/share/AthenaOutputStream_test.ref
+++ b/Control/AthenaServices/share/AthenaOutputStream_test.ref
@@ -1,20 +1,24 @@
*** AthenaOutputStream_test starts ***
-Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3h/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
-JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3h/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
+Initializing Gaudi ApplicationMgr using job opts /atlas/scratch0/amete/athena-workspace/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
+JobOptionsSvc INFO # =======> /atlas/scratch0/amete/athena-workspace/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
JobOptionsSvc INFO # (5,1): MessageSvc.OutputLevel = 2
JobOptionsSvc INFO # (6,1): StoreGateSvc.OutputLevel = 2
JobOptionsSvc INFO # (8,1): AthenaOutputStream.OutputLevel = 1
-JobOptionsSvc INFO # (10,1): AthenaOutputStream.ItemList = ["Bar#uno", "Bar#due", "Bar#tre", "8101#*", "Fee#quattro", "Fee!#cinque", "Baz#sei", "BazAuxContainer#seiAux.aaa.ccc", "13#*"]
-JobOptionsSvc INFO # (17,1): AthenaOutputStream.AcceptAlgs = ["AthenaOutputStream", "aSFQS"]
-JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3h/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
+JobOptionsSvc INFO # (10,1): AthenaOutputStream.ItemList = ["Bar#uno", "Bar#due", "Bar#tre", "8101#*", "Fee#quattro", "Fee!#cinque", "Baz#sei", "BazAuxContainer#seiAux.aaa.ccc", "Baz#comp", "BazAuxContainer#compAux.foo.bar.zzz", "13#*"]
+JobOptionsSvc INFO # (20,1): AthenaOutputStream.CompressionBitsHigh = 10
+JobOptionsSvc INFO # (21,1): AthenaOutputStream.CompressionListHigh = ["BazAuxContainer#compAux.foo.bar"]
+JobOptionsSvc INFO # (22,1): AthenaOutputStream.CompressionBitsLow = 16
+JobOptionsSvc INFO # (23,1): AthenaOutputStream.CompressionListLow = ["BazAuxContainer#compAux.zzz"]
+JobOptionsSvc INFO # (25,1): AthenaOutputStream.AcceptAlgs = ["AthenaOutputStream", "aSFQS"]
+JobOptionsSvc INFO Job options successfully read in from /atlas/scratch0/amete/athena-workspace/build/x86_64-centos7-gcc8-opt/jobOptions/AthenaServices/AthenaOutputStream_test.txt
MessageSvc DEBUG Service base class initialized successfully
ApplicationMgr DEBUG Getting my own properties
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus706.cern.ch on Thu Jul 30 17:07:50 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
+ running on atpc002 on Fri Aug 7 15:13:36 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
ServiceManager DEBUG Initializing service AppMgrRunable
@@ -35,23 +39,25 @@ ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
ClassIDSvc DEBUG Service base class initialized successfully
IncidentSvc DEBUG Adding [ModuleLoaded] listener 'ClassIDSvc' with priority 100
-ClassIDSvc INFO getRegistryEntries: read 1579 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1581 CLIDRegistry entries for module ALL
ClassIDSvc FATAL uncheckedSetTypePackageForID: StoreGate-00-00-00 can not set type name <B1> for CLID 8111: Known name for this ID <Baz> It was set by AthenaServices-00-00-00
ClassIDSvc FATAL uncheckedSetTypePackageForID: StoreGate-00-00-00 can not set type name <D1> for CLID 8112: Known name for this ID <BazAuxContainer> It was set by AthenaServices-00-00-00
-ClassIDSvc FATAL uncheckedSetTypePackageForID: AthenaServices-00-00-00 can not set type name <SG::SelectionVetoesRef> for CLID 3789442: Known name for this ID <SG::SelectionVetoes> It was set by AthenaServices-00-00-00
-ClassIDSvc DEBUG processCLIDDB: read 1745 entries from CLIDDB file: /afs/cern.ch/user/s/ssnyder/atlas-work3h/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/share/clid.db
+ClassIDSvc DEBUG processCLIDDB: read 1747 entries from CLIDDB file: /atlas/scratch0/amete/athena-workspace/build/x86_64-centos7-gcc8-opt/share/clid.db
ClassIDSvc FATAL uncheckedSetTypePackageForID: StoreGate-00-00-00 can not set type name <B1> for CLID 8111: Known name for this ID <Baz> It was set by AthenaServices-00-00-00
ClassIDSvc FATAL uncheckedSetTypePackageForID: StoreGate-00-00-00 can not set type name <D1> for CLID 8112: Known name for this ID <BazAuxContainer> It was set by AthenaServices-00-00-00
-ClassIDSvc DEBUG processCLIDDB: read 1745 entries from CLIDDB file: /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-07-28T2136/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/clid.db
+ClassIDSvc DEBUG processCLIDDB: read 1746 entries from CLIDDB file: /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/clid.db
StoreGateSvc DEBUG Service base class initialized successfully
StoreGateSvc DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl
StoreGateSvc_Impl DEBUG Service base class initialized successfully
ProxyProviderSvc DEBUG Service base class initialized successfully
IncidentSvc DEBUG Adding [EndEvent] listener 'StoreGateSvc' with priority 100
IncidentSvc DEBUG Adding [BeginEvent] listener 'StoreGateSvc' with priority 100
-ClassIDSvc INFO getRegistryEntries: read 2385 CLIDRegistry entries for module ALL
-ToolSvc DEBUG Service base class initialized successfully
+ClassIDSvc INFO getRegistryEntries: read 2389 CLIDRegistry entries for module ALL
AthenaOutputStream DEBUG Property update for OutputLevel : new value = 1
+ToolSvc DEBUG Service base class initialized successfully
+AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
+AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
+AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
AthenaOutputStreamVERBOSE ServiceLocatorHelper::service: found service EventDataSvc
TimelineSvc DEBUG Service base class initialized successfully
TimelineSvc DEBUG initialize
@@ -86,8 +92,10 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc DEBUG Service base class initialized successfully
+DBReplicaSvc DEBUG HOSTNAME atpc002 has no domain - try hostname --fqdn
+DBReplicaSvc DEBUG HOSTNAME from fqdn: atpc002.dyndns.cern.ch
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-07-28T2136/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
DBReplicaSvc DEBUG Candidate server ATLF (priority -2700)
DBReplicaSvc DEBUG Candidate server ATLAS_COOLPROD (priority -695)
DBReplicaSvc DEBUG Candidate server atlas_dd (priority -690)
@@ -98,7 +106,7 @@ DBReplicaSvc DEBUG Candidate server ATONR_COOL (priority -670)
DBReplicaSvc DEBUG Candidate server ATONR_CONF (priority -665)
DBReplicaSvc DEBUG Candidate server DEVDB11 (priority -660)
DBReplicaSvc DEBUG Candidate server ATLF (priority -2200)
-DBReplicaSvc INFO Total of 10 servers found for host lxplus706.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -118,48 +126,56 @@ IoComponentMgr DEBUG --> io_hasitem()
AthenaOutputStream INFO I/O reinitialization...
IncidentSvc DEBUG Adding [MetaDataStop] listener 'AthenaOutputStream' with priority 50
AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
-AthenaOutputStreamVERBOSE Both high and low float compression lists are empty. Float compression will NOT be applied.
+AthenaOutputStream INFO Either high or low (or both) float compression lists are defined. Float compression will be applied.
+AthenaOutputStream INFO High compression will use 10 mantissa bits, and low compression will use 16 mantissa bits.
AthenaOutputStream DEBUG End initialize
AthenaOutputStreamVERBOSE ServiceLocatorHelper::service: found service AlgExecStateSvc
AlgExecStateSvc DEBUG preInit: will add Alg AthenaOutputStream later
AthenaOutputStream DEBUG input handles: 0
-AthenaOutputStream DEBUG output handles: 1
+AthenaOutputStream DEBUG output handles: 2
AthenaOutputStream DEBUG Registering all Tools in ToolHandleArray HelperTools
AthenaOutputStream DEBUG Adding private ToolHandle tool AthenaOutputStream.AthenaOutputStreamTool (AthenaOutputStreamTool)
AthenaOutputStream DEBUG Data Deps for AthenaOutputStream
+ INPUT IGNORED ( 'AthenaAttributeList' , '' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_AthenaOutputStream' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_AthenaOutputStream' )
-StoreGateSvc DEBUG Recorded object @0x631dc70 with key uno of type Foo(CLID 8101)
- in DataObject @0x631dd20
+StoreGateSvc DEBUG Recorded object @0x667f4c0 with key uno of type Foo(CLID 8101)
+ in DataObject @0x667f6b0
+ object modifiable when retrieved
+StoreGateSvc DEBUG Recorded object @0x667fc50 with key due of type Foo(CLID 8101)
+ in DataObject @0x667fe00
+ object modifiable when retrieved
+StoreGateSvc DEBUG Recorded object @0x667fbd0 with key uno of type Bar(CLID 8107)
+ in DataObject @0x66800d0
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x631c990 with key due of type Foo(CLID 8101)
- in DataObject @0x631d830
+StoreGateSvc DEBUG Recorded object @0x667fbb0 with key due of type Bar(CLID 8107)
+ in DataObject @0x6680400
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x640ec60 with key uno of type Bar(CLID 8107)
- in DataObject @0x631c8d0
+StoreGateSvc DEBUG Recorded object @0x6680790 with key quattro of type Bar(CLID 8107)
+ in DataObject @0x6680700
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x631c9b0 with key due of type Bar(CLID 8107)
- in DataObject @0x640ef60
+StoreGateSvc DEBUG Recorded object @0x6680b80 with key cinque of type Bar(CLID 8107)
+ in DataObject @0x6680ad0
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x640f2f0 with key quattro of type Bar(CLID 8107)
- in DataObject @0x640f260
+StoreGateSvc DEBUG Recorded object @0x6681120 with key sei of type Baz(CLID 8111)
+ in DataObject @0x6687a40
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x640f650 with key cinque of type Bar(CLID 8107)
- in DataObject @0x640f5a0
+StoreGateSvc DEBUG Recorded object @0x6681150 with key seiAux. of type BazAuxContainer(CLID 8112)
+ in DataObject @0x667f960
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x640fc80 with key sei of type Baz(CLID 8111)
- in DataObject @0x64165a0
+StoreGateSvc DEBUG Recorded object @0x66881a0 with key comp of type Baz(CLID 8111)
+ in DataObject @0x2767290
object modifiable when retrieved
-StoreGateSvc DEBUG Recorded object @0x640fcb0 with key seiAux. of type BazAuxContainer(CLID 8112)
- in DataObject @0x631c820
+StoreGateSvc DEBUG Recorded object @0x6688710 with key compAux. of type BazAuxContainer(CLID 8112)
+ in DataObject @0x6689530
object modifiable when retrieved
-ClassIDSvc INFO getRegistryEntries: read 724 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 714 CLIDRegistry entries for module ALL
AthenaOutputStr...WARNING add: can not find clid 13 in clid db
AthenaOutputStream DEBUG addItemObjects(13,"*") called
AthenaOutputStream DEBUG Key:*
AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
MetaDataSvc DEBUG Service base class initialized successfully
InputMetaDataStore DEBUG Service base class initialized successfully
@@ -184,16 +200,16 @@ IoComponentMgr DEBUG registering IoComponent "MetaDataSvc"
AthenaOutputStream DEBUG Failed to receive proxy iterators from StoreGate for 13,"*". Skipping
AthenaOutputStream DEBUG addItemObjects(8101,"*") called
AthenaOutputStream DEBUG Key:*
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], *, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [, ], *, *)
AthenaOutputStream DEBUG Added object 8101,"due"
AthenaOutputStream DEBUG Added object 8101,"uno"
AthenaOutputStream DEBUG addItemObjects(8107,"due") called
AthenaOutputStream DEBUG Key:due
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], due, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [due], due, *)
AthenaOutputStreamVERBOSE Calling matchKey( [due], cinque)
@@ -208,8 +224,8 @@ AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
AthenaOutputStreamVERBOSE Done calling matchKey( [due], uno) with result: 0
AthenaOutputStream DEBUG addItemObjects(8107,"tre") called
AthenaOutputStream DEBUG Key:tre
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], tre, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [tre], tre, *)
AthenaOutputStreamVERBOSE Calling matchKey( [tre], cinque)
@@ -227,8 +243,8 @@ AthenaOutputStreamVERBOSE Done calling matchKey( [tre], uno) with result: 0
AthenaOutputStream DEBUG No object matching 8107,"tre" found
AthenaOutputStream DEBUG addItemObjects(8107,"uno") called
AthenaOutputStream DEBUG Key:uno
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], uno, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [uno], uno, *)
AthenaOutputStreamVERBOSE Calling matchKey( [uno], cinque)
@@ -243,8 +259,8 @@ AthenaOutputStreamVERBOSE Done calling matchKey( [uno], quattro) with result: 0
AthenaOutputStream DEBUG Added object 8107,"uno"
AthenaOutputStream DEBUG addItemObjects(8108,"cinque") called
AthenaOutputStream DEBUG Key:cinque
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], cinque, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [cinque], cinque, *)
AthenaOutputStream DEBUG Added object 8108,"cinque"
@@ -253,31 +269,64 @@ AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
AthenaOutputStreamVERBOSE Done calling matchKey( [cinque], quattro) with result: 0
AthenaOutputStream DEBUG addItemObjects(8108,"quattro") called
AthenaOutputStream DEBUG Key:quattro
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], quattro, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [quattro], quattro, *)
AthenaOutputStreamVERBOSE Calling matchKey( [quattro], cinque)
AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
AthenaOutputStreamVERBOSE Done calling matchKey( [quattro], cinque) with result: 0
AthenaOutputStream DEBUG Added object 8108,"quattro"
+AthenaOutputStream DEBUG addItemObjects(8111,"comp") called
+AthenaOutputStream DEBUG Key:comp
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
+AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], comp, *)
+AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [comp], comp, *)
+AthenaOutputStream DEBUG Added object 8111,"comp"
+AthenaOutputStreamVERBOSE Calling matchKey( [comp], sei)
+AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
+AthenaOutputStreamVERBOSE Done calling matchKey( [comp], sei) with result: 0
AthenaOutputStream DEBUG addItemObjects(8111,"sei") called
AthenaOutputStream DEBUG Key:sei
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], sei, *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [sei], sei, *)
+AthenaOutputStreamVERBOSE Calling matchKey( [sei], comp)
+AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
+AthenaOutputStreamVERBOSE Done calling matchKey( [sei], comp) with result: 0
AthenaOutputStream DEBUG Added object 8111,"sei"
+AthenaOutputStream DEBUG addItemObjects(8112,"compAux.") called
+AthenaOutputStream DEBUG Key:compAux.
+AthenaOutputStream DEBUG Aux Attr:foo.bar.zzz
+AthenaOutputStream DEBUG Comp Attr High: 2 with 10 mantissa bits.
+AthenaOutputStream DEBUG >> bar
+AthenaOutputStream DEBUG >> foo
+AthenaOutputStream DEBUG Comp Attr Low: 1 with 16 mantissa bits.
+AthenaOutputStream DEBUG >> zzz
+AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], compAux., *)
+AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [compAux.], compAux., *)
+AthenaOutputStream DEBUG Added object 8112,"compAux."
+AthenaOutputStream DEBUG Lossy float compression level 10 contains 1 elements for container comp
+AthenaOutputStream DEBUG Lossy float compression level 16 contains 1 elements for container comp
+AthenaOutputStreamVERBOSE Calling matchKey( [compAux.], seiAux.)
+AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
+AthenaOutputStreamVERBOSE Done calling matchKey( [compAux.], seiAux.) with result: 0
AthenaOutputStream DEBUG addItemObjects(8112,"seiAux.") called
AthenaOutputStream DEBUG Key:seiAux.
AthenaOutputStream DEBUG Aux Attr:aaa.ccc
-AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
-AthenaOutputStr... DEBUG Property update for OutputLevel : new value = 1
-AthenaOutputStream DEBUG Comp Attr High: 0 with 7 mantissa bits.
-AthenaOutputStream DEBUG Comp Attr Low: 0 with 15 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr High: 0 with 10 mantissa bits.
+AthenaOutputStream DEBUG Comp Attr Low: 0 with 16 mantissa bits.
AthenaOutputStreamVERBOSE Calling tokenizeAtStep( [], seiAux., *)
AthenaOutputStreamVERBOSE Done calling tokenizeAtStep( [seiAux.], seiAux., *)
+AthenaOutputStreamVERBOSE Calling matchKey( [seiAux.], compAux.)
+AthenaOutputStreamVERBOSE Couldn't match every sub-string... return: 0
+AthenaOutputStreamVERBOSE Done calling matchKey( [seiAux.], compAux.) with result: 0
AthenaOutputStream DEBUG Added object 8112,"seiAux."
+AthenaOutputStream DEBUG Lossy float compression level 10 contains 0 elements for container sei
+AthenaOutputStream DEBUG Lossy float compression level 16 contains 0 elements for container sei
+8112 compAux.
8112 seiAux.
8101 due
8101 uno
@@ -285,6 +334,8 @@ AthenaOutputStream DEBUG Added object 8112,"seiAux."
8107 uno
8108 cinque
8107 quattro
+8111 comp
8111 sei
StoreGateSvc DEBUG Retrieved const pointer to object SelectionVetoes_AthenaOutputStream of type SG::SelectionVetoes(CLID 3789442)
+StoreGateSvc DEBUG Retrieved const pointer to object CompressionInfo_AthenaOutputStream of type SG::CompressionInfo(CLID 39950991)
*** AthenaOutputStream_test OK ***
diff --git a/Control/AthenaServices/share/AthenaOutputStream_test.txt b/Control/AthenaServices/share/AthenaOutputStream_test.txt
index f93bafc781012ed1152bb328119ffc40d32d933b..e2ea2eac38937f05908ad8733938789dfecbf0ef 100644
--- a/Control/AthenaServices/share/AthenaOutputStream_test.txt
+++ b/Control/AthenaServices/share/AthenaOutputStream_test.txt
@@ -13,5 +13,13 @@ AthenaOutputStream.ItemList={"Bar#uno", "Bar#due", "Bar#tre" ,
"Fee!#cinque",
"Baz#sei",
"BazAuxContainer#seiAux.aaa.ccc",
+ "Baz#comp",
+ "BazAuxContainer#compAux.foo.bar.zzz",
"13#*"};
+
+AthenaOutputStream.CompressionBitsHigh = 10;
+AthenaOutputStream.CompressionListHigh = { "BazAuxContainer#compAux.foo.bar" };
+AthenaOutputStream.CompressionBitsLow = 16;
+AthenaOutputStream.CompressionListLow = { "BazAuxContainer#compAux.zzz" };
+
AthenaOutputStream.AcceptAlgs={"AthenaOutputStream", "aSFQS"};
diff --git a/Control/AthenaServices/share/FPEControlSvc_test.ref b/Control/AthenaServices/share/FPEControlSvc_test.ref
index f7b1bcefc261dd8e900c6c9a4067676ae11d7ef1..be20ec0c2d0b0ebe1f31d9dafdac4b7a54997007 100644
--- a/Control/AthenaServices/share/FPEControlSvc_test.ref
+++ b/Control/AthenaServices/share/FPEControlSvc_test.ref
@@ -13,15 +13,15 @@ ApplicationMgr SUCCESS
====================================================================================================================================
/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 176, which is not a valid value for type 'bool'
ApplicationMgr INFO Successfully loaded modules : AthenaServices
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: divbyzero overflow invalid Disable: (none)
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: divbyzero overflow invalid Disable: (none)
ApplicationMgr INFO Application Manager Configured successfully
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: divbyzero overflow invalid Disable: (none)
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: divbyzero overflow invalid Disable: (none)
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: (none) Disable: divbyzero
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: divbyzero Disable: (none)
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Unknown exception name: fooo
-FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Property&)): Enable: divbyzero Disable: (none)
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: (none) Disable: divbyzero
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: divbyzero Disable: (none)
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Unknown exception name: fooo
+FPEControlSvc INFO FILE:LINE (void FPEControlSvc::prophand(Gaudi::Details::PropertyBase&)): Enable: divbyzero Disable: (none)
diff --git a/Control/AthenaServices/src/AthDictLoaderSvc.cxx b/Control/AthenaServices/src/AthDictLoaderSvc.cxx
index 9d16659fc4e4b8f1f9ae056f87026791f88cd4bd..65dcba79599390dc21c328bd63dc23da185e4301 100644
--- a/Control/AthenaServices/src/AthDictLoaderSvc.cxx
+++ b/Control/AthenaServices/src/AthDictLoaderSvc.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
#include "AthenaKernel/BaseInfo.h"
diff --git a/Control/AthenaServices/src/AthIncFirerAlg.h b/Control/AthenaServices/src/AthIncFirerAlg.h
index e705254e4075e8d33033871dd4fe9f7e4db7afd3..6170c424c2f66528a3f95008f1a144ddfead363f 100644
--- a/Control/AthenaServices/src/AthIncFirerAlg.h
+++ b/Control/AthenaServices/src/AthIncFirerAlg.h
@@ -8,7 +8,7 @@
#include <vector>
#include <string>
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
class IIncidentSvc;
diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
index b43bd47b2991cac8325fdd256d4a62bfa712be9a..f6059f351d5602b581ebf6febdefd60ab99da315 100644
--- a/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaEventLoopMgr.cxx
@@ -210,7 +210,7 @@ StatusCode AthenaEventLoopMgr::initialize()
error() << "Could not dcast HistPersSvc to a Service"
<< endmsg;
} else {
- const Property &prop = s->getProperty("OutputFile");
+ const Gaudi::Details::PropertyBase &prop = s->getProperty("OutputFile");
std::string val;
try {
const StringProperty &sprop = dynamic_cast<const StringProperty&>( prop );
@@ -329,7 +329,7 @@ StatusCode AthenaEventLoopMgr::initialize()
// property handlers
//=========================================================================
void
-AthenaEventLoopMgr::setupTimeKeeper(Property&) {
+AthenaEventLoopMgr::setupTimeKeeper(Gaudi::Details::PropertyBase&) {
const std::string& tkName(m_timeKeeperName.value());
// We do not expect a TimeKeeper necessarily being declared
if( tkName != "NONE" && tkName.length() != 0) {
@@ -342,7 +342,7 @@ AthenaEventLoopMgr::setupTimeKeeper(Property&) {
}
void
-AthenaEventLoopMgr::setClearStorePolicy(Property&) {
+AthenaEventLoopMgr::setClearStorePolicy(Gaudi::Details::PropertyBase&) {
const std::string& policyName = m_clearStorePolicy.value();
if ( policyName != "BeginEvent" &&
@@ -362,7 +362,7 @@ AthenaEventLoopMgr::setClearStorePolicy(Property&) {
}
void
-AthenaEventLoopMgr::setupPreSelectTools(Property&) {
+AthenaEventLoopMgr::setupPreSelectTools(Gaudi::Details::PropertyBase&) {
m_toolInvoke.clear();
m_toolReject.clear();
diff --git a/Control/AthenaServices/src/AthenaEventLoopMgr.h b/Control/AthenaServices/src/AthenaEventLoopMgr.h
index 9301cf1171e8026c4f84989d61496bc79d886544..d1c0b436c1428c163a93830e6cef0fa52e38e6d2 100644
--- a/Control/AthenaServices/src/AthenaEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaEventLoopMgr.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IChronoStatSvc.h"
@@ -109,7 +109,7 @@ protected:
/// @property Name of TimeKeeper to use. NONE or empty string (default) means no time limit control on event loop
StringProperty m_timeKeeperName;
/// @property update handler:sets up the time keeper
- void setupTimeKeeper(Property&);
+ void setupTimeKeeper(Gaudi::Details::PropertyBase&);
/// @property Failure mode
IntegerProperty m_failureMode;
@@ -133,7 +133,7 @@ protected:
bool m_useSecondaryEventNumber;
/// property update handler:sets up the Pre-selection tools
- void setupPreSelectTools(Property&);
+ void setupPreSelectTools(Gaudi::Details::PropertyBase&);
/// @property configure the policy wrt handling of when 'clear-event-store'
/// has to happen: BeginEvent xor EndEvent.
@@ -142,7 +142,7 @@ protected:
/// property update handler:set the clear-store policy value and check its
/// value.
- void setClearStorePolicy(Property& clearStorePolicy);
+ void setClearStorePolicy(Gaudi::Details::PropertyBase& clearStorePolicy);
/// Dump out histograms as needed
virtual StatusCode writeHistograms(bool force=false);
diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
index bb123abf9ed76776b0a3871b084aa6d761352b34..523cb8395831b695ca080e2b26bd72340c41d3b8 100644
--- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.cxx
@@ -32,7 +32,7 @@
#include "GaudiKernel/GaudiException.h"
#include "GaudiKernel/AppReturnCode.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventIDBase.h"
#include "GaudiKernel/ThreadLocalContext.h"
@@ -249,7 +249,7 @@ StatusCode AthenaHiveEventLoopMgr::initialize()
error() << "Could not dcast HistPersSvc to a Service"
<< endmsg;
} else {
- const Property &prop = s->getProperty("OutputFile");
+ const Gaudi::Details::PropertyBase &prop = s->getProperty("OutputFile");
std::string val;
try {
const StringProperty &sprop = dynamic_cast<const StringProperty&>( prop );
@@ -358,7 +358,7 @@ AthenaHiveEventLoopMgr::eventStore() const {
// property handlers
//=========================================================================
void
-AthenaHiveEventLoopMgr::setupTimeKeeper(Property&) {
+AthenaHiveEventLoopMgr::setupTimeKeeper(Gaudi::Details::PropertyBase&) {
const std::string& tkName(m_timeKeeperName.value());
// We do not expect a TimeKeeper necessarily being declared
if( tkName != "NONE" && tkName.length() != 0) {
@@ -371,7 +371,7 @@ AthenaHiveEventLoopMgr::setupTimeKeeper(Property&) {
}
void
-AthenaHiveEventLoopMgr::setClearStorePolicy(Property&) {
+AthenaHiveEventLoopMgr::setClearStorePolicy(Gaudi::Details::PropertyBase&) {
const std::string& policyName = m_clearStorePolicy.value();
if ( policyName != "BeginEvent" &&
@@ -390,7 +390,7 @@ AthenaHiveEventLoopMgr::setClearStorePolicy(Property&) {
}
void
-AthenaHiveEventLoopMgr::setupPreSelectTools(Property&) {
+AthenaHiveEventLoopMgr::setupPreSelectTools(Gaudi::Details::PropertyBase&) {
m_toolInvoke.clear();
m_toolReject.clear();
diff --git a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
index bcf09819ce8213b0a60eef8c445478d8e6d9a035..c9109cf6bc3230a7721672de996ae9860f54861d 100644
--- a/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaHiveEventLoopMgr.h
@@ -15,7 +15,7 @@
#include <vector>
#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/MsgStream.h"
@@ -118,7 +118,7 @@ protected:
/// @property Name of TimeKeeper to use. NONE or empty string (default) means no time limit control on event loop
StringProperty m_timeKeeperName;
/// @property update handler:sets up the time keeper
- void setupTimeKeeper(Property&);
+ void setupTimeKeeper(Gaudi::Details::PropertyBase&);
/// @property Failure mode
IntegerProperty m_failureMode;
@@ -139,7 +139,7 @@ protected:
tool_store m_tools; ///< internal tool store
/// property update handler:sets up the Pre-selection tools
- void setupPreSelectTools(Property&);
+ void setupPreSelectTools(Gaudi::Details::PropertyBase&);
/// @property configure the policy wrt handling of when 'clear-event-store'
/// has to happen: BeginEvent xor EndEvent.
@@ -151,7 +151,7 @@ protected:
/// property update handler:set the clear-store policy value and check its
/// value.
- void setClearStorePolicy(Property& clearStorePolicy);
+ void setClearStorePolicy(Gaudi::Details::PropertyBase& clearStorePolicy);
/// Dump out histograms as needed
virtual StatusCode writeHistograms(bool force=false);
diff --git a/Control/AthenaServices/src/AthenaJobOptionsSvc.cxx b/Control/AthenaServices/src/AthenaJobOptionsSvc.cxx
index 4ae151e7decf462cb58118ff0ce7b2f22f44b052..d240557213aab45edab3d236f53976ba179cc1a6 100644
--- a/Control/AthenaServices/src/AthenaJobOptionsSvc.cxx
+++ b/Control/AthenaServices/src/AthenaJobOptionsSvc.cxx
@@ -18,7 +18,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SmartIF.h"
#include "GaudiKernel/System.h"
#include "GaudiKernel/IAlgTool.h"
@@ -28,7 +28,7 @@
namespace Athena {
- std::string pythonize_value(const Property* prop);
+ std::string pythonize_value(const Gaudi::Details::PropertyBase* prop);
///////////////////////////////////////////////////////////////////
// Public methods:
@@ -173,7 +173,7 @@ JobOptionsSvc::queryInterface(const InterfaceID& riid, void** ppvInterface)
///////////////////////////////////////////////////////////////////
void
-JobOptionsSvc::propertyHandler(Property& p)
+JobOptionsSvc::propertyHandler(Gaudi::Details::PropertyBase& p)
{
if (!m_jobosvc.retrieve().isSuccess()) {
ATH_MSG_ERROR("could not retrieve service ["
@@ -216,8 +216,8 @@ JobOptionsSvc::setMyProperties( const std::string& client, IProperty* me )
fprintf(m_cat_fd, "\n%s'%s' : {\n", _INDENT, client.c_str());
fprintf(m_cat_fd, "%s'props': {\n", _INDENT _INDENT);
- const std::vector<Property*>& props = me->getProperties();
- for ( std::vector<Property*>::const_iterator
+ const std::vector<Gaudi::Details::PropertyBase*>& props = me->getProperties();
+ for ( std::vector<Gaudi::Details::PropertyBase*>::const_iterator
iprop = props.begin(),
iend = props.end();
iprop != iend;
@@ -302,7 +302,7 @@ JobOptionsSvc::setMyProperties( const std::string& client, IProperty* me )
/// Add a property into the JobOptions catalog
StatusCode
JobOptionsSvc::addPropertyToCatalogue( const std::string& client,
- const Property& property )
+ const Gaudi::Details::PropertyBase& property )
{
return m_jobosvc->addPropertyToCatalogue(client, property);
}
@@ -351,7 +351,7 @@ JobOptionsSvc::readOptions( const std::string& file ,
std::string
-pythonize_value(const Property* p)
+pythonize_value(const Gaudi::Details::PropertyBase* p)
{
std::string pvalue = p->toString();
const std::type_info& ti = *p->type_info();
diff --git a/Control/AthenaServices/src/AthenaJobOptionsSvc.h b/Control/AthenaServices/src/AthenaJobOptionsSvc.h
index cb37443d7e48133845112fad4cc529c553f2a51f..8a75ea2d077e87d97889bdd488769fdc351456e9 100644
--- a/Control/AthenaServices/src/AthenaJobOptionsSvc.h
+++ b/Control/AthenaServices/src/AthenaJobOptionsSvc.h
@@ -72,7 +72,7 @@ class JobOptionsSvc
/// Add a property into the JobOptions catalog
virtual StatusCode addPropertyToCatalogue( const std::string& client,
- const Property& property );
+ const Gaudi::Details::PropertyBase& property );
/// Remove a property from the JobOptions catalog
virtual StatusCode removePropertyFromCatalogue( const std::string& client,
const std::string& name );
@@ -118,7 +118,7 @@ class JobOptionsSvc
JobOptionsSvc();
/// Property handler
- void propertyHandler(Property& p);
+ void propertyHandler(Gaudi::Details::PropertyBase& p);
/// handle to the "real" @c IJobOptionsSvc we are proxying
ServiceHandle<IJobOptionsSvc> m_jobosvc;
diff --git a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
index dd0c0420b738cf26063522592afa0a33f865f1f1..fa97ddab83badd89cfbb1b6e17480b489c01c11d 100644
--- a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
+++ b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.cxx
@@ -201,7 +201,7 @@ StatusCode AthenaMtesEventLoopMgr::initialize()
error() << "Could not dcast HistPersSvc to a Service" << endmsg;
}
else {
- const Property &prop = s->getProperty("OutputFile");
+ const Gaudi::Details::PropertyBase &prop = s->getProperty("OutputFile");
std::string val;
try {
const StringProperty &sprop = dynamic_cast<const StringProperty&>(prop);
@@ -309,7 +309,7 @@ AthenaMtesEventLoopMgr::eventStore() const {
// property handlers
//=========================================================================
void
-AthenaMtesEventLoopMgr::setupTimeKeeper(Property&) {
+AthenaMtesEventLoopMgr::setupTimeKeeper(Gaudi::Details::PropertyBase&) {
const std::string& tkName(m_timeKeeperName.value());
// We do not expect a TimeKeeper necessarily being declared
if( tkName != "NONE" && tkName.length() != 0) {
@@ -322,7 +322,7 @@ AthenaMtesEventLoopMgr::setupTimeKeeper(Property&) {
}
void
-AthenaMtesEventLoopMgr::setClearStorePolicy(Property&) {
+AthenaMtesEventLoopMgr::setClearStorePolicy(Gaudi::Details::PropertyBase&) {
const std::string& policyName = m_clearStorePolicy.value();
if ( policyName != "BeginEvent" &&
@@ -341,7 +341,7 @@ AthenaMtesEventLoopMgr::setClearStorePolicy(Property&) {
}
void
-AthenaMtesEventLoopMgr::setupPreSelectTools(Property&) {
+AthenaMtesEventLoopMgr::setupPreSelectTools(Gaudi::Details::PropertyBase&) {
m_toolInvoke.clear();
m_toolReject.clear();
diff --git a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.h b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.h
index 12e7fbaed03b8e3b47fd07015ae45c2acf644bb0..8b6e787d5441a31b5f68199c9be6569cbcbca7e2 100644
--- a/Control/AthenaServices/src/AthenaMtesEventLoopMgr.h
+++ b/Control/AthenaServices/src/AthenaMtesEventLoopMgr.h
@@ -8,7 +8,7 @@
#define ATHENASERVICES_ATHENAMTESEVENTLOOPMGR_H
#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/MinimalEventLoopMgr.h"
@@ -100,7 +100,7 @@ protected:
/// @property Name of TimeKeeper to use. NONE or empty string (default) means no time limit control on event loop
StringProperty m_timeKeeperName;
/// @property update handler:sets up the time keeper
- void setupTimeKeeper(Property&);
+ void setupTimeKeeper(Gaudi::Details::PropertyBase&);
/// @property Failure mode
IntegerProperty m_failureMode;
@@ -121,7 +121,7 @@ protected:
tool_store m_tools; ///< internal tool store
/// property update handler:sets up the Pre-selection tools
- void setupPreSelectTools(Property&);
+ void setupPreSelectTools(Gaudi::Details::PropertyBase&);
/// @property configure the policy wrt handling of when 'clear-event-store'
/// has to happen: BeginEvent xor EndEvent.
@@ -133,7 +133,7 @@ protected:
/// property update handler:set the clear-store policy value and check its
/// value.
- void setClearStorePolicy(Property& clearStorePolicy);
+ void setClearStorePolicy(Gaudi::Details::PropertyBase& clearStorePolicy);
/// Dump out histograms as needed
virtual StatusCode writeHistograms(bool force=false);
diff --git a/Control/AthenaServices/src/AthenaOutputStream.cxx b/Control/AthenaServices/src/AthenaOutputStream.cxx
index 7de904ec9c20a686e6962752026261267e383a35..8771351fa2f623c110efe3fe02510968d013255e 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.cxx
+++ b/Control/AthenaServices/src/AthenaOutputStream.cxx
@@ -29,6 +29,7 @@
#include "SGTools/SGIFolder.h"
#include "AthenaKernel/CLIDRegistry.h"
#include "xAODCore/AuxSelection.h"
+#include "xAODCore/AuxCompression.h"
#include "AthContainersInterfaces/IAuxStore.h"
#include "AthContainersInterfaces/IAuxStoreIO.h"
@@ -290,10 +291,18 @@ StatusCode AthenaOutputStream::initialize() {
}
// Check compression settings and print some information about the configuration
- if(m_compressionBitsHigh < 5) {
+ // Both should be between [5, 23] and high compression should be <= low compression
+ if(m_compressionBitsHigh < 5 || m_compressionBitsHigh > 23) {
ATH_MSG_INFO("Float compression mantissa bits for high compression " <<
- "(" << m_compressionBitsHigh << ") is too low, setting it to 5.");
- m_compressionBitsHigh = 5;
+ "(" << m_compressionBitsHigh << ") is outside the allowed range of [5, 23].");
+ ATH_MSG_INFO("Setting it to the appropriate limit.");
+ m_compressionBitsHigh = m_compressionBitsHigh < 5 ? 5 : 23;
+ }
+ if(m_compressionBitsLow < 5 || m_compressionBitsLow > 23) {
+ ATH_MSG_INFO("Float compression mantissa bits for low compression " <<
+ "(" << m_compressionBitsLow << ") is outside the allowed range of [5, 23].");
+ ATH_MSG_INFO("Setting it to the appropriate limit.");
+ m_compressionBitsLow = m_compressionBitsLow < 5 ? 5 : 23;
}
if(m_compressionBitsLow < m_compressionBitsHigh) {
ATH_MSG_INFO("Float compression mantissa bits for low compression " <<
@@ -319,6 +328,9 @@ StatusCode AthenaOutputStream::initialize() {
m_selVetoesKey = "SelectionVetoes_" + streamName;
ATH_CHECK( m_selVetoesKey.initialize() );
+ m_compInfoKey = "CompressionInfo_" + streamName;
+ ATH_CHECK( m_compInfoKey.initialize() );
+
ATH_MSG_DEBUG("End initialize");
return StatusCode::SUCCESS;
}
@@ -623,13 +635,14 @@ StatusCode AthenaOutputStream::collectAllObjects() {
}
auto vetoes = std::make_unique<SG::SelectionVetoes>();
+ auto compInfo = std::make_unique<SG::CompressionInfo>();
m_p2BWritten->updateItemList(true);
std::vector<CLID> folderclids;
// Collect all objects that need to be persistified:
//FIXME refactor: move this in folder. Treat as composite
for (SG::IFolder::const_iterator i = m_p2BWritten->begin(), iEnd = m_p2BWritten->end(); i != iEnd; i++) {
- addItemObjects(*i, *vetoes);
+ addItemObjects(*i, *vetoes, *compInfo);
folderclids.push_back(i->id());
}
@@ -661,12 +674,18 @@ StatusCode AthenaOutputStream::collectAllObjects() {
ATH_CHECK( SG::makeHandle (m_selVetoesKey).record (std::move (vetoes)) );
}
+ // Store the lossy float compression information in the SG.
+ if (!compInfo->empty()) {
+ ATH_CHECK( SG::makeHandle (m_compInfoKey).record (std::move (compInfo)) );
+ }
+
return StatusCode::SUCCESS;
}
//FIXME refactor: move this in folder. Treat as composite
void AthenaOutputStream::addItemObjects(const SG::FolderItem& item,
- SG::SelectionVetoes& vetoes)
+ SG::SelectionVetoes& vetoes,
+ SG::CompressionInfo& compInfo)
{
// anything after a dot is a list of dynamic Aux attrubutes, separated by dots
size_t dotpos = item.key().find('.');
@@ -912,6 +931,41 @@ void AthenaOutputStream::addItemObjects(const SG::FolderItem& item,
auxcomp->setCompressedAuxIDs( comp_attr );
auxcomp->setCompressionBits( comp_bits );
}
+
+ // New Compression Logic
+ SG::IAuxStore* auxstore( nullptr );
+ try {
+ SG::fromStorable( itemProxy->object(), auxstore, true );
+ } catch( const std::exception& ) {
+ ATH_MSG_DEBUG( "Error in casting object with CLID "
+ << itemProxy->clID() << " to SG::IAuxStore*" );
+ auxstore = nullptr;
+ }
+ if ( auxstore ) {
+ // Get a hold of all AuxIDs for this store (static, dynamic etc.)
+ const SG::auxid_set_t allVars = auxstore->getAuxIDs();
+
+ // Get a handle on the compression information for this store
+ std::string key = item_key;
+ key.erase (key.size()-4, 4);
+ SG::ThinningInfo::compression_map_t& compMap = compInfo[key];
+
+ // Build the compression list, retrieve the relevant AuxIDs and
+ // store it in the relevant map that is going to be inserted into
+ // the ThinningCache later on by the ThinningCacheTool
+ xAOD::AuxCompression compression;
+ compression.setCompressedAuxIDs( comp_attr );
+ compression.setCompressionBits( comp_bits );
+
+ compMap[comp_bits[0]] = compression.getCompressedAuxIDs( allVars, true ); // High
+ compMap[comp_bits[1]] = compression.getCompressedAuxIDs( allVars, false ); // Low
+
+ for(auto& it : compMap) {
+ ATH_MSG_DEBUG( "Lossy float compression level " << it.first <<
+ " contains " << it.second.size() << " elements"
+ " for container " << key );
+ }
+ }
}
added = true;
@@ -993,7 +1047,7 @@ void AthenaOutputStream::handleVariableSelection (SG::IAuxStoreIO& auxio,
}
-void AthenaOutputStream::itemListHandler(Property& /* theProp */) {
+void AthenaOutputStream::itemListHandler(Gaudi::Details::PropertyBase& /* theProp */) {
// Assuming concrete SG::Folder also has an itemList property
IProperty *pAsIProp(nullptr);
if ((m_p2BWritten.retrieve()).isFailure() ||
@@ -1003,7 +1057,7 @@ void AthenaOutputStream::itemListHandler(Property& /* theProp */) {
}
}
-void AthenaOutputStream::excludeListHandler(Property& /* theProp */) {
+void AthenaOutputStream::excludeListHandler(Gaudi::Details::PropertyBase& /* theProp */) {
IProperty *pAsIProp(nullptr);
if ((m_decoder.retrieve()).isFailure() ||
nullptr == (pAsIProp = dynamic_cast<IProperty*>(&*m_decoder)) ||
@@ -1012,7 +1066,7 @@ void AthenaOutputStream::excludeListHandler(Property& /* theProp */) {
}
}
-void AthenaOutputStream::compressionListHandlerHigh(Property& /* theProp */) {
+void AthenaOutputStream::compressionListHandlerHigh(Gaudi::Details::PropertyBase& /* theProp */) {
IProperty *pAsIProp(nullptr);
if ((m_compressionDecoderHigh.retrieve()).isFailure() ||
nullptr == (pAsIProp = dynamic_cast<IProperty*>(&*m_compressionDecoderHigh)) ||
@@ -1021,7 +1075,7 @@ void AthenaOutputStream::compressionListHandlerHigh(Property& /* theProp */) {
}
}
-void AthenaOutputStream::compressionListHandlerLow(Property& /* theProp */) {
+void AthenaOutputStream::compressionListHandlerLow(Gaudi::Details::PropertyBase& /* theProp */) {
IProperty *pAsIProp(nullptr);
if ((m_compressionDecoderLow.retrieve()).isFailure() ||
nullptr == (pAsIProp = dynamic_cast<IProperty*>(&*m_compressionDecoderLow)) ||
diff --git a/Control/AthenaServices/src/AthenaOutputStream.h b/Control/AthenaServices/src/AthenaOutputStream.h
index 21806fcabd02823d7351cebbe091d384434474d5..ae7ad6ae5d8bb5096c6e76c63b2b2e96c6094665 100644
--- a/Control/AthenaServices/src/AthenaOutputStream.h
+++ b/Control/AthenaServices/src/AthenaOutputStream.h
@@ -17,7 +17,7 @@
// Required for inheritance
#include "GaudiKernel/IDataSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -27,6 +27,7 @@
#include "GaudiKernel/IIoComponent.h"
#include "SelectionVetoes.h"
+#include "CompressionInfo.h"
// forward declarations
class IClassIDSvc;
@@ -158,15 +159,20 @@ private:
SG::WriteHandleKey<SG::SelectionVetoes> m_selVetoesKey
{ this, "SelVetoesKey", "" };
+ /// Key used for recording lossy float compressed variable information
+ /// to the event store.
+ SG::WriteHandleKey<SG::CompressionInfo> m_compInfoKey
+ { this, "CompInfoKey", "" };
+
protected:
/// Handler for ItemNames Property
- void itemListHandler(Property& /* theProp */);
+ void itemListHandler(Gaudi::Details::PropertyBase& /* theProp */);
/// Handler for ItemNames Property
- void excludeListHandler(Property& /* theProp */);
+ void excludeListHandler(Gaudi::Details::PropertyBase& /* theProp */);
/// Handler for ItemNames Property
- void compressionListHandlerHigh(Property& /* theProp */);
+ void compressionListHandlerHigh(Gaudi::Details::PropertyBase& /* theProp */);
/// Handler for ItemNames Property
- void compressionListHandlerLow(Property& /* theProp */);
+ void compressionListHandlerLow(Gaudi::Details::PropertyBase& /* theProp */);
public:
typedef std::vector<std::pair<std::string, std::string> > TypeKeyPairs;
@@ -201,7 +207,7 @@ public:
private:
/// Add item data objects to output streamer list
- void addItemObjects(const SG::FolderItem&, SG::SelectionVetoes& vetoes);
+ void addItemObjects(const SG::FolderItem&, SG::SelectionVetoes& vetoes, SG::CompressionInfo& compInfo);
void handleVariableSelection (SG::IAuxStoreIO& auxio,
SG::DataProxy& itemProxy,
diff --git a/Control/AthenaServices/src/CompressionInfo.h b/Control/AthenaServices/src/CompressionInfo.h
new file mode 100644
index 0000000000000000000000000000000000000000..e243be2210d9ffd983b83ea1d101ebe85ab160fb
--- /dev/null
+++ b/Control/AthenaServices/src/CompressionInfo.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+ */
+
+/**
+ * @file AthenaServices/CompressionInfo.h
+ * @author Alaettin Serhan Mete <amete@cern.ch>
+ * @date Aug, 2020
+ * @brief Communicate between AthenaOuptutStream and ThinningCacheTool.
+ *
+ * AthenaOutputStream processes ItemList entries, including the selections
+ * of which static or dynamic variables to be lossy float compressed.
+ * This last information is later used by the ThinningCacheTool to
+ * populate the ThinningCache. To convey this information,
+ * AthenaOutputStream records a CompressionInfo object in the events store
+ * with a key of `CompressionInfo_STREAM`, for stream STREAM.
+ * CompressionInfo then contains a map from object names to
+ * a set of variables to be lossy float compressed and the associated
+ * compression levels (nmantissa).
+ */
+
+#ifndef ATHENASERVICES_COMPRESSIONINFO_H
+#define ATHENASERVICES_COMPRESSIONINFO_H
+
+#include "AthenaKernel/ThinningInfo.h"
+
+#include <string>
+#include <unordered_map>
+
+
+namespace SG {
+
+ /**
+ * @brief Map of compressed variables and their compression levels
+ */
+
+ using CompressionInfo = std::unordered_map<std::string, SG::ThinningInfo::compression_map_t>;
+
+} // namespace SG
+
+CLASS_DEF( SG::CompressionInfo, 39950991, 1)
+
+#endif
diff --git a/Control/AthenaServices/src/CoreDumpSvc.cxx b/Control/AthenaServices/src/CoreDumpSvc.cxx
index a82b0bd65c577e291d8ca237f8a2bd771d085637..e210dd6813128233a24bfb2594ca787fa8aa6294 100644
--- a/Control/AthenaServices/src/CoreDumpSvc.cxx
+++ b/Control/AthenaServices/src/CoreDumpSvc.cxx
@@ -33,7 +33,7 @@
#include "TSystem.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IAlgorithm.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/IAlgContextSvc.h"
@@ -186,7 +186,7 @@ CoreDumpSvc::~CoreDumpSvc()
CoreDumpSvcHandler::coreDumpSvc = nullptr;
}
-void CoreDumpSvc::propertyHandler(Property& p)
+void CoreDumpSvc::propertyHandler(Gaudi::Details::PropertyBase& p)
{
CoreDumpSvcHandler::callOldHandler = m_callOldHandler;
CoreDumpSvcHandler::stackTrace = m_stackTrace;
diff --git a/Control/AthenaServices/src/CoreDumpSvc.h b/Control/AthenaServices/src/CoreDumpSvc.h
index d57e1030466350498a6f1f11cfb1b9284da85554..56dd1ee3d21afbd0e97bf74c2ffd0ec6eb5a0038 100644
--- a/Control/AthenaServices/src/CoreDumpSvc.h
+++ b/Control/AthenaServices/src/CoreDumpSvc.h
@@ -122,7 +122,7 @@ private:
///@}
/// Property handler
- void propertyHandler(Property& p);
+ void propertyHandler(Gaudi::Details::PropertyBase& p);
/// Print core dump records to configured stream
void print();
diff --git a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx
index bddcbdf3bd687bee41dcfcde4b5840c84c3c8016..23a29511087dfbcffaf695a533553b8869e8bd32 100644
--- a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx
+++ b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
*/
@@ -18,7 +18,6 @@
#include "CxxUtils/StrFormat.h"
#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "tbb/task.h"
#include <algorithm>
@@ -32,6 +31,11 @@
#define USE_ASYNC_TASK 0
+#if USE_ASYNC_TASK
+#include "tbb/task.h"
+#endif
+
+
namespace Athena {
diff --git a/Control/AthenaServices/src/EvtIdModifierSvc.cxx b/Control/AthenaServices/src/EvtIdModifierSvc.cxx
index c87c7d397f81a9ee751eb86c4a6551984beb7762..699b0481f1cbd9335d1fd5b3a463a5eaaa379afe 100644
--- a/Control/AthenaServices/src/EvtIdModifierSvc.cxx
+++ b/Control/AthenaServices/src/EvtIdModifierSvc.cxx
@@ -16,7 +16,7 @@
#include <set>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Control/AthenaServices/src/FPEControlSvc.cxx b/Control/AthenaServices/src/FPEControlSvc.cxx
index 18918a7b3de673a8d9870cdcf1b21665e0f4155b..1b6c7e370be0b887e80b609905e4990cfb5aedf6 100644
--- a/Control/AthenaServices/src/FPEControlSvc.cxx
+++ b/Control/AthenaServices/src/FPEControlSvc.cxx
@@ -152,7 +152,7 @@ std::string mask_to_string (int mask)
/**
* @brief Property change handler.
*/
-void FPEControlSvc::prophand (Property& /*prop*/)
+void FPEControlSvc::prophand (Gaudi::Details::PropertyBase& /*prop*/)
{
if (!m_haveEnv) {
// Save the current FP environment.
diff --git a/Control/AthenaServices/src/FPEControlSvc.h b/Control/AthenaServices/src/FPEControlSvc.h
index bc5d7a1e35067b4678d8acabc289c90c84aefdc5..96d42d34abda928ade6e5009ce730d9c75be006d 100644
--- a/Control/AthenaServices/src/FPEControlSvc.h
+++ b/Control/AthenaServices/src/FPEControlSvc.h
@@ -19,7 +19,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ServiceHandle.h"
#include <fenv.h>
@@ -98,7 +98,7 @@ private:
std::string m_feSetRounding;
/// Property change handler.
- void prophand (Property& prop);
+ void prophand (Gaudi::Details::PropertyBase& prop);
};
#endif // not ATHENASERVICES_FPECONTROLSVC_H
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.cxx b/Control/AthenaServices/src/LoggedMessageSvc.cxx
index 28447720999f9f0aade68c4b9e4dc9c1e45060e8..3e2c884f502628548f9585f6c5f17756dffc7a0d 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.cxx
+++ b/Control/AthenaServices/src/LoggedMessageSvc.cxx
@@ -161,7 +161,7 @@ StatusCode LoggedMessageSvc::reinitialize() {
//#############################################################################
-void LoggedMessageSvc::initColors(Property& /*prop*/) {
+void LoggedMessageSvc::initColors(Gaudi::Details::PropertyBase& /*prop*/) {
if (m_color == true) {
@@ -203,7 +203,7 @@ void LoggedMessageSvc::initColors(Property& /*prop*/) {
//#############################################################################
-void LoggedMessageSvc::setupColors(Property& prop) {
+void LoggedMessageSvc::setupColors(Gaudi::Details::PropertyBase& prop) {
if (! m_color) return;
@@ -255,7 +255,7 @@ void LoggedMessageSvc::setupColors(Property& prop) {
}
//#############################################################################
-void LoggedMessageSvc::setupLimits(Property& prop) {
+void LoggedMessageSvc::setupLimits(Gaudi::Details::PropertyBase& prop) {
//int ic = 0;
if (prop.name() == "fatalLimit") {
@@ -292,7 +292,7 @@ void LoggedMessageSvc::setupLimits(Property& prop) {
}
//#############################################################################
-void LoggedMessageSvc::setupThreshold(Property& prop) {
+void LoggedMessageSvc::setupThreshold(Gaudi::Details::PropertyBase& prop) {
int ic = 0;
if (prop.name() == "setFatal") {
@@ -346,7 +346,7 @@ void LoggedMessageSvc::setupThreshold(Property& prop) {
//#############################################################################
-void LoggedMessageSvc::setupInactCount(Property& prop) {
+void LoggedMessageSvc::setupInactCount(Gaudi::Details::PropertyBase& prop) {
if (prop.name() == "countInactive") {
#ifndef NDEBUG
BooleanProperty *p = dynamic_cast<BooleanProperty*>(&prop);
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.h b/Control/AthenaServices/src/LoggedMessageSvc.h
index 6711834a170687748bdedb2559b0080d5a2ca274..9899f6df5935045f1ed233396a3375639074dfb3 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.h
+++ b/Control/AthenaServices/src/LoggedMessageSvc.h
@@ -18,7 +18,7 @@
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IMessageSvc.h"
#include "GaudiKernel/Message.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
#include "AthenaKernel/ILoggedMessageSvc.h"
@@ -188,11 +188,11 @@ private:
typedef std::map<std::string, std::ostream*> LoggedStreamsMap_t;
LoggedStreamsMap_t m_loggedStreams;
- void initColors(Property& prop);
- void setupColors(Property& prop);
- void setupLimits(Property& prop);
- void setupThreshold(Property& prop);
- void setupInactCount(Property& prop);
+ void initColors(Gaudi::Details::PropertyBase& prop);
+ void setupColors(Gaudi::Details::PropertyBase& prop);
+ void setupLimits(Gaudi::Details::PropertyBase& prop);
+ void setupThreshold(Gaudi::Details::PropertyBase& prop);
+ void setupInactCount(Gaudi::Details::PropertyBase& prop);
void setupLogStreams();
diff --git a/Control/AthenaServices/src/MemoryRescueSvc.h b/Control/AthenaServices/src/MemoryRescueSvc.h
index 70cc901f61b0dc6df712d4d1ce14dfea7f80cfc2..85d14207694a9da1b35a0a0c706bff2e2b079987 100644
--- a/Control/AthenaServices/src/MemoryRescueSvc.h
+++ b/Control/AthenaServices/src/MemoryRescueSvc.h
@@ -20,7 +20,7 @@
#endif
#ifndef GAUDIKERNEL_PROPERTY_H
-# include "GaudiKernel/Property.h"
+# include "Gaudi/Property.h"
#endif
diff --git a/Control/AthenaServices/src/MetaDataSvc.cxx b/Control/AthenaServices/src/MetaDataSvc.cxx
index 3a96556106056cd046bfec0976e37bf611a0d3ec..b7a084be19577e80a0c410bd3a1ede02123a8167 100644
--- a/Control/AthenaServices/src/MetaDataSvc.cxx
+++ b/Control/AthenaServices/src/MetaDataSvc.cxx
@@ -146,9 +146,9 @@ StatusCode MetaDataSvc::initialize() {
if (!joSvc.retrieve().isSuccess()) {
ATH_MSG_WARNING("Cannot get JobOptionsSvc.");
} else {
- const std::vector<const Property*>* evtselProps = joSvc->getProperties("EventSelector");
+ const std::vector<const Gaudi::Details::PropertyBase*>* evtselProps = joSvc->getProperties("EventSelector");
if (evtselProps != nullptr) {
- for (std::vector<const Property*>::const_iterator iter = evtselProps->begin(),
+ for (std::vector<const Gaudi::Details::PropertyBase*>::const_iterator iter = evtselProps->begin(),
last = evtselProps->end(); iter != last; iter++) {
if ((*iter)->name() == "InputCollections") {
// Get EventSelector to force in-time initialization and FirstInputFile incident
diff --git a/Control/AthenaServices/src/MetaDataSvc.h b/Control/AthenaServices/src/MetaDataSvc.h
index 2809547d1192ed85117e16e9b3693acf95d4d0c7..5ee9cf87d65d9e0c84b2c8173d62832f3d07066f 100644
--- a/Control/AthenaServices/src/MetaDataSvc.h
+++ b/Control/AthenaServices/src/MetaDataSvc.h
@@ -12,7 +12,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h" // no forward decl: typedef
+#include "Gaudi/Property.h" // no forward decl: typedef
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/IIoComponent.h"
#include "GaudiKernel/IFileMgr.h" // for FILEMGR_CALLBACK_ARGS
diff --git a/Control/AthenaServices/src/MixingEventSelector.cxx b/Control/AthenaServices/src/MixingEventSelector.cxx
index e009192398c2b9b0ac49865332899014fd1004ef..219ec8739eac601a71e7346bda37ad38b33ad516 100644
--- a/Control/AthenaServices/src/MixingEventSelector.cxx
+++ b/Control/AthenaServices/src/MixingEventSelector.cxx
@@ -124,7 +124,7 @@ MixingEventSelector::finalize() {
void
-MixingEventSelector::setUpTriggerList(Property&) {
+MixingEventSelector::setUpTriggerList(Gaudi::Details::PropertyBase&) {
m_trigList = TriggerList();
for_each(m_triggerListProp.value().begin(), m_triggerListProp.value().end(),
bind1st(mem_fun(&MixingEventSelector::decodeTrigger), this));
diff --git a/Control/AthenaServices/src/MixingEventSelector.h b/Control/AthenaServices/src/MixingEventSelector.h
index bf486ec6717ac55225566917c893a84f1e056833..1bbbe3ca5e90a6a6c686ce8d657d2391fde059d3 100644
--- a/Control/AthenaServices/src/MixingEventSelector.h
+++ b/Control/AthenaServices/src/MixingEventSelector.h
@@ -27,7 +27,7 @@
#include "GaudiKernel/IConverter.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h" /*StringArrayProperty*/
class ISvcLocator;
@@ -136,7 +136,7 @@ public:
/// TriggerList property call-back. Decode TriggerList, obtain selector ptrs
/// and store them alongside fractions in m_trigList
- void setUpTriggerList(Property& trigList);
+ void setUpTriggerList(Gaudi::Details::PropertyBase& trigList);
/// functor that creates a Trigger object and adds it to m_trigList
void decodeTrigger(std::string triggDescr);
diff --git a/Control/AthenaServices/src/MultipleEventLoopMgr.h b/Control/AthenaServices/src/MultipleEventLoopMgr.h
index 3f07c7b2ed8aa6d36a98075797d5860f275c2542..a1d1374d2fed42570b35baab2b0e89d3f61c58fe 100644
--- a/Control/AthenaServices/src/MultipleEventLoopMgr.h
+++ b/Control/AthenaServices/src/MultipleEventLoopMgr.h
@@ -14,7 +14,7 @@
#include <string>
#ifndef GAUDIKERNEL_PROPERTY_H
-# include "GaudiKernel/Property.h"
+# include "Gaudi/Property.h"
#endif
#ifndef GAUDIKERNEL_SERVICEHANDLE_H
# include "GaudiKernel/ServiceHandle.h"
diff --git a/Control/AthenaServices/src/OutputStreamSequencerSvc.h b/Control/AthenaServices/src/OutputStreamSequencerSvc.h
index 893bd27b04cf2a830c723103f0dae000a23fb526..f1e74b1a5c4a837e7fee0d264815c7e29cc0c635 100644
--- a/Control/AthenaServices/src/OutputStreamSequencerSvc.h
+++ b/Control/AthenaServices/src/OutputStreamSequencerSvc.h
@@ -11,7 +11,7 @@
**/
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" // no forward decl: typedef
+#include "Gaudi/Property.h" // no forward decl: typedef
#include "GaudiKernel/IIncidentListener.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Control/AthenaServices/src/PageAccessControlSvc.h b/Control/AthenaServices/src/PageAccessControlSvc.h
index 5469bffc30da622ef981f4140fc953e2488f2087..1cd8ab6d2035908806a416aca517fdcac248b0f5 100644
--- a/Control/AthenaServices/src/PageAccessControlSvc.h
+++ b/Control/AthenaServices/src/PageAccessControlSvc.h
@@ -23,7 +23,7 @@
#include "AthenaBaseComps/AthService.h"
#include "CxxUtils/PageAccessControl.h"
#include "CxxUtils/PtrAccessSEGVHandler.h"
-#include "GaudiKernel/Property.h" /*BooleanProperty*/
+#include "Gaudi/Property.h" /*BooleanProperty*/
// Forward declarations
template <class TYPE> class SvcFactory;
diff --git a/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.cxx b/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.cxx
index 2d4326defe214adf8ae58c023f6b986f0499c614..cc78f1de1a1c7b9475709de6e4c880014cfa5e23 100644
--- a/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.cxx
+++ b/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.cxx
@@ -31,7 +31,7 @@ SimplePOSIXTimeKeeperSvc::queryInterface(const InterfaceID& riid,
}
void
-SimplePOSIXTimeKeeperSvc::decodeAllocTime(Property&) {
+SimplePOSIXTimeKeeperSvc::decodeAllocTime(Gaudi::Details::PropertyBase&) {
m_allocTime = 100 * m_allocTimeProp;
}
diff --git a/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.h b/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.h
index 4d8a52527f5b6b10ceefc218fe7b8fad65e0f2f8..f84bbfb6260cfcbd96d66a76c5eadbcb7f22b560 100644
--- a/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.h
+++ b/Control/AthenaServices/src/SimplePOSIXTimeKeeperSvc.h
@@ -10,7 +10,7 @@
#include "AthenaKernel/POSIXTimeKeeper.h"
#endif
#ifndef GAUDIKERNEL_PROPERTY_H
- #include "GaudiKernel/Property.h"
+ #include "Gaudi/Property.h"
#endif
#ifndef ATHENABASECOMPS_ATHSERVICE_H
#include "AthenaBaseComps/AthService.h"
@@ -59,7 +59,7 @@ public:
// Standard Destructor
virtual ~SimplePOSIXTimeKeeperSvc();
private:
- void decodeAllocTime(Property&);
+ void decodeAllocTime(Gaudi::Details::PropertyBase&);
time_t m_allocTime; ///< allocated job cpu time (in 1/100 sec)
IntegerProperty m_allocTimeProp;///< property: alloc job cpu time (in sec)
};
diff --git a/Control/AthenaServices/src/TestRandomSeqAlg.h b/Control/AthenaServices/src/TestRandomSeqAlg.h
index 75f3d23bd24029652967cf0ad8b9e8d32c1e7ab1..83a1eff1a0627d328a3c59bbd5d23aa0552201d2 100644
--- a/Control/AthenaServices/src/TestRandomSeqAlg.h
+++ b/Control/AthenaServices/src/TestRandomSeqAlg.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
namespace CLHEP { class HepRandomEngine; }
/** @class TestRandomSegAlg
diff --git a/Control/AthenaServices/src/ThinningCacheTool.cxx b/Control/AthenaServices/src/ThinningCacheTool.cxx
index f48816028bfd6c0bfe4c211088b46a3dcbd2463f..ed6393832205d18f7ffb6a814fd4a47276d517fc 100644
--- a/Control/AthenaServices/src/ThinningCacheTool.cxx
+++ b/Control/AthenaServices/src/ThinningCacheTool.cxx
@@ -16,7 +16,7 @@
#include "AthenaKernel/ExtendedEventContext.h"
#include "GaudiKernel/ThreadLocalContext.h"
#include "SelectionVetoes.h"
-
+#include "CompressionInfo.h"
namespace Athena {
@@ -106,6 +106,16 @@ StatusCode ThinningCacheTool::preStream()
}
}
+ // Look for any compression info
+ const std::string compInfoKey = "CompressionInfo_" + m_streamName;
+ const SG::CompressionInfo* compInfo = nullptr;
+ if (evtStore()->contains<SG::CompressionInfo> (compInfoKey)) {
+ ATH_CHECK( evtStore()->retrieve (compInfo, compInfoKey) );
+ for (const auto& p : *compInfo) {
+ m_cache.setCompression (p.first, p.second);
+ }
+ }
+
// Set the TrigNavigation thinning tool if needed.
if (!m_trigNavigationThinningSvc.empty()) {
m_cache.setTrigNavigationThinningSvc (m_trigNavigationThinningSvc.get());
diff --git a/Control/AthenaServices/test/AthenaOutputStream_test.cxx b/Control/AthenaServices/test/AthenaOutputStream_test.cxx
index ca384f81d8650c5f29fe0c47b6e19e90025b20be..8425a140a0383d455cfbe52d19212527911f8c43 100644
--- a/Control/AthenaServices/test/AthenaOutputStream_test.cxx
+++ b/Control/AthenaServices/test/AthenaOutputStream_test.cxx
@@ -29,6 +29,7 @@
#include "../src/AthenaOutputStream.h"
#include "../src/SelectionVetoes.h"
+#include "../src/CompressionInfo.h"
#include "TInterpreter.h"
using std::cerr;
@@ -87,6 +88,18 @@ int main() {
assert( (pStore->record(std::move(baz), "sei")).isSuccess() );
assert( (pStore->record(std::move(bazaux), "seiAux.")).isSuccess() );
+ auto baz4lfc = std::make_unique<Baz>();
+ auto bazaux4lfc = std::make_unique<BazAuxContainer>();
+ baz4lfc->setStore (bazaux4lfc.get());
+ SG::AuxElement::Accessor<float> foo ("foo");
+ SG::AuxElement::Accessor<double> bar ("bar");
+ SG::AuxElement::Accessor<std::vector<float>> zzz ("zzz");
+ foo (*baz4lfc);
+ bar (*baz4lfc);
+ zzz (*baz4lfc);
+ assert( (pStore->record(std::move(baz4lfc), "comp")).isSuccess() );
+ assert( (pStore->record(std::move(bazaux4lfc), "compAux.")).isSuccess() );
+
AthenaOutputStream* pStream(dynamic_cast<AthenaOutputStream*>(pAlg));
assert( pStream );
@@ -97,7 +110,7 @@ int main() {
// pStream->selectedObjects()->begin() <<endl;
// verify that we got the right objects in the list
// this of course depends on AthenaOutputStream_test.txt
- assert( 8 == (pStream->selectedObjects()->end() -
+ assert( 10 == (pStream->selectedObjects()->end() -
pStream->selectedObjects()->begin()) );
for (DataObject* obj : *pStream->selectedObjects()) {
@@ -109,13 +122,22 @@ int main() {
const SG::SelectionVetoes* selvetoes = nullptr;
assert (pStore->retrieve (selvetoes, "SelectionVetoes_AthenaOutputStream").isSuccess());
- assert (selvetoes->size() == 1);
+ assert (selvetoes->size() == 2);
auto it = selvetoes->find("sei");
assert (it != selvetoes->end());
assert (!it->second.test (aaa.auxid()));
assert ( it->second.test (bbb.auxid()));
assert (!it->second.test (ccc.auxid()));
-
+
+ const SG::CompressionInfo* compInfo = nullptr;
+ assert (pStore->retrieve (compInfo, "CompressionInfo_AthenaOutputStream").isSuccess());
+ assert (compInfo->size() == 2); // 2 levels of compression as high/low
+ auto val = compInfo->find("comp");
+ assert (val != compInfo->end());
+ assert (val->second.at(10).test(foo.auxid())); // compress foo high
+ assert (!val->second.at(10).test(bar.auxid())); // don't compress bar since it's double
+ assert (val->second.at(16).test(zzz.auxid())); // compress zzz low
+
pStream->clearSelection();
assert( 0 == (pStream->selectedObjects()->end() -
pStream->selectedObjects()->begin()) );
diff --git a/Control/AthenaServices/test/ThinningCacheTool_test.cxx b/Control/AthenaServices/test/ThinningCacheTool_test.cxx
index e16bbf18dcd0cf7a42d1d8d7a2ff9f73009c6285..2045e2d80119d529f299f2db24a873e8077940d3 100644
--- a/Control/AthenaServices/test/ThinningCacheTool_test.cxx
+++ b/Control/AthenaServices/test/ThinningCacheTool_test.cxx
@@ -11,6 +11,7 @@
#undef NDEBUG
#include "../src/SelectionVetoes.h"
+#include "../src/CompressionInfo.h"
#include "StoreGate/StoreGateSvc.h"
#include "AthenaBaseComps/AthService.h"
#include "AthContainers/DataVector.h"
@@ -152,7 +153,47 @@ void test1()
assert (!SG::getThinningInfo ("v3")->vetoed (10));
assert (SG::getThinningInfo ("v3")->vetoed (11));
assert (SG::getThinningInfo ("v3")->vetoed (12));
-
+
+ // Set dummy lossy float compression information
+ auto compInfo = std::make_unique<SG::CompressionInfo>();
+
+ SG::ThinningInfo::compression_map_t compression1;
+ SG::auxid_set_t s4; s4.set(10); s4.set(11);
+ compression1[7] = s4;
+ (*compInfo).emplace ("f1", compression1);
+
+ SG::ThinningInfo::compression_map_t compression2;
+ SG::auxid_set_t s5; s5.set(10); s5.set(11); s5.set(33);
+ compression2[15] = s5;
+ compression2[16] = s5;
+ (*compInfo).emplace ("f2", compression2);
+
+ // Record the compression information in the SG
+ assert (sg->record (std::move (compInfo), "CompressionInfo_MyStream").isSuccess());
+
+ assert (tool->preStream().isSuccess());
+ assert (SG::getThinningCache() != nullptr);
+
+ // Test that we can get the thinning information for the relevant keys
+ assert (SG::getThinningInfo ("f1") != nullptr);
+ assert (SG::getThinningInfo ("f2") != nullptr);
+
+ // Test that we have the correct size of the compression maps for the relevant keys
+ assert (SG::getThinningInfo ("f1")->m_compression.size() == 1); // 1 level
+ assert (SG::getThinningInfo ("f2")->m_compression.size() == 2); // 2 levels
+ // Test that we have the correct size of the AuxIDs for the relevant compression levels
+ assert (SG::getThinningInfo ("f1")->m_compression.at(7).size() == 2); // 2 AuxIDs
+ assert (SG::getThinningInfo ("f2")->m_compression.at(15).size() == 3); // 3 AuxIDs
+ assert (SG::getThinningInfo ("f2")->m_compression.at(16).size() == 3);
+ // Test that we can get the correct compression information overall
+ assert (SG::getThinningInfo ("f1")->compression(10) == 7);
+ assert (SG::getThinningInfo ("f1")->compression(11) == 7);
+ assert (SG::getThinningInfo ("f1")->compression(12) == 0);
+ assert (SG::getThinningInfo ("f2")->compression(10) == 15);
+ assert (SG::getThinningInfo ("f2")->compression(11) == 15);
+ assert (SG::getThinningInfo ("f2")->compression(10) != 16);
+ assert (SG::getThinningInfo ("f2")->compression(33) != 16);
+
assert (tool->postExecute().isSuccess());
assert (SG::getThinningCache() == nullptr);
diff --git a/Control/CxxUtils/CMakeLists.txt b/Control/CxxUtils/CMakeLists.txt
index c585cbf5741a87da9a2041e5523aaffceb147df6..0e1513372308bbd9fa90514ef67f2abcd1408457 100644
--- a/Control/CxxUtils/CMakeLists.txt
+++ b/Control/CxxUtils/CMakeLists.txt
@@ -72,6 +72,10 @@ atlas_add_test( bitscan_test_portable
SOURCES test/bitscan_test.cxx
LINK_LIBRARIES CxxUtils )
+atlas_add_test( ut_cxxutils_floatcompression_test
+ SOURCES test/ut_cxxutils_floatcompression_test.cxx
+ LINK_LIBRARIES CxxUtils )
+
if( TARGET CxxUtils_bitscan_test_portable )
target_compile_definitions(CxxUtils_bitscan_test_portable
PRIVATE "-DTEST_PORTABLE" )
@@ -108,7 +112,7 @@ foreach( test sincos_test ArrayScanner_test Arrayrep_test
atomic_fetch_minmax_test
MurmurHash2_test bitmask_test crc64_test Ring_test
restrict_test vectorize_test get_unaligned_test aligned_vector_test
- vec_test )
+ vec_int_test vec_float_test vec_fb_int_test vec_fb_float_test)
atlas_add_test( ${test}
SOURCES test/${test}.cxx
LOG_IGNORE_PATTERN "no version information available"
diff --git a/Event/xAOD/xAODCore/xAODCore/tools/FloatCompressor.h b/Control/CxxUtils/CxxUtils/FloatCompressor.h
similarity index 90%
rename from Event/xAOD/xAODCore/xAODCore/tools/FloatCompressor.h
rename to Control/CxxUtils/CxxUtils/FloatCompressor.h
index 06f144f2fcec9fb18dd48d3f66f430b249e51bda..472373cb38dcdbf4b0ae1c61abeca431073193de 100644
--- a/Event/xAOD/xAODCore/xAODCore/tools/FloatCompressor.h
+++ b/Control/CxxUtils/CxxUtils/FloatCompressor.h
@@ -5,15 +5,15 @@
*/
// $Id: FloatCompressor.h 789425 2016-12-13 10:50:12Z krasznaa $
-#ifndef XAODCORE_TOOLS_FLOATCOMPRESSOR_H
-#define XAODCORE_TOOLS_FLOATCOMPRESSOR_H
+#ifndef CXXUTILS_FLOATCOMPRESSOR_H
+#define CXXUTILS_FLOATCOMPRESSOR_H
// System include(s):
extern "C" {
# include <stdint.h>
}
-namespace xAOD {
+namespace CxxUtils {
/// Class implementing a lossy float compression
///
@@ -60,6 +60,6 @@ namespace xAOD {
}; // class FloatCompressor
-} // namespace xAOD
+} // namespace CxxUtils
-#endif // XAODCORE_TOOLS_FLOATCOMPRESSOR_H
+#endif // CXXUTILS_FLOATCOMPRESSOR_H
diff --git a/Control/CxxUtils/CxxUtils/get_unaligned.h b/Control/CxxUtils/CxxUtils/get_unaligned.h
index 48a2df6faa82f4ab879cb833e8e012923db3aeaa..02aa49fa19d3a553ec72889faecaa46f617f98cb 100644
--- a/Control/CxxUtils/CxxUtils/get_unaligned.h
+++ b/Control/CxxUtils/CxxUtils/get_unaligned.h
@@ -1,6 +1,6 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ * Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
*/
/**
* @file CxxUtils/get_unaligned.h
@@ -12,7 +12,7 @@
*@code
* char* p = ...;
* int* ip = reinterpret_cast<int*>(p);
- * int i = *ip;
+ * int i = *ip++;
@endif
*
* is undefined if @c p isn't aligned to an int boundary. It further
@@ -50,9 +50,10 @@ namespace CxxUtils {
/**
* @brief Read a 2-byte little-endian value from a possibly unaligned pointer.
- * @param p Pointer from which to read.
+ * @param p Pointer from which to read. Advanced to the next value.
*
- * Reads a little-endian value, regardless of the host byte ordering.
+ * Reads a little-endian value, regardless of the host byte ordering,
+ * and advances the pointer.
* Should not rely on undefined behavior, regardless of the alignment of @c p.
*
* If used in a loop, you'll get better code with a restricted pointer.
@@ -69,9 +70,10 @@ uint16_t get_unaligned16 (const uint8_t* ATH_RESTRICT & p)
/**
* @brief Read a 4-byte little-endian value from a possibly unaligned pointer.
- * @param p Pointer from which to read.
+ * @param p Pointer from which to read. Advanced to the next value.
*
- * Reads a little-endian value, regardless of the host byte ordering.
+ * Reads a little-endian value, regardless of the host byte ordering,
+ * and advances the pointer.
* Should not rely on undefined behavior, regardless of the alignment of @c p.
*
* If used in a loop, you'll get better code with a restricted pointer.
@@ -88,9 +90,10 @@ uint32_t get_unaligned32 (const uint8_t* ATH_RESTRICT & p)
/**
* @brief Read a 8-byte little-endian value from a possibly unaligned pointer.
- * @param p Pointer from which to read.
+ * @param p Pointer from which to read. Advanced to the next value.
*
- * Reads a little-endian value, regardless of the host byte ordering.
+ * Reads a little-endian value, regardless of the host byte ordering,
+ * and advances the pointer.
* Should not rely on undefined behavior, regardless of the alignment of @c p.
*
* If used in a loop, you'll get better code with a restricted pointer.
@@ -107,9 +110,10 @@ uint64_t get_unaligned64 (const uint8_t* ATH_RESTRICT & p)
/**
* @brief Read little-endian float value from a possibly unaligned pointer.
- * @param p Pointer from which to read.
+ * @param p Pointer from which to read. Advanced to the next value.
*
- * Reads a little-endian value, regardless of the host byte ordering.
+ * Reads a little-endian value, regardless of the host byte ordering,
+ * and advances the pointer.
* Should not rely on undefined behavior, regardless of the alignment of @c p.
*
* If used in a loop, you'll get better code with a restricted pointer.
@@ -128,9 +132,10 @@ float get_unaligned_float (const uint8_t* ATH_RESTRICT & p)
/**
* @brief Read little-endian float value from a possibly unaligned pointer.
- * @param p Pointer from which to read.
+ * @param p Pointer from which to read. Advanced to the next value.
*
- * Reads a little-endian value, regardless of the host byte ordering.
+ * Reads a little-endian value, regardless of the host byte ordering,
+ * and advances the pointer.
* Should not rely on undefined behavior, regardless of the alignment of @c p.
*
* If used in a loop, you'll get better code with a restricted pointer.
diff --git a/Control/CxxUtils/CxxUtils/vec.h b/Control/CxxUtils/CxxUtils/vec.h
index 0f536c8d43770204b4e86bdddbc16f66f3a51afb..3efcdbc49c50a12350b6fbc7a868162cb61eaa83 100644
--- a/Control/CxxUtils/CxxUtils/vec.h
+++ b/Control/CxxUtils/CxxUtils/vec.h
@@ -5,6 +5,7 @@
/**
* @file CxxUtils/vec.h
* @author scott snyder <snyder@bnl.gov>
+ * @author Christos Anastopoulos (additional helper methods)
* @date Mar, 2020
* @brief Vectorization helpers.
*
@@ -13,6 +14,7 @@
* that is much easier to read and more portable than one would get
* using intrinsics directly. However, it is still non-standard,
* and there are some operations which are kind of awkward.
+ *
* This file provides some helpers for writing vectorized code
* in C++, as well as a standard-compliant fallback that can be used
* if the vector types are not available.
@@ -24,7 +26,13 @@
* attribute is supported or a fallback C++ class intended to be
* (mostly) functionally equivalent.
*
- * We also support additional operations.
+ *
+ *
+ * The GCC (implemented also in clang) vector types support:
+ * ++, --, +,-,*,/,%, =, &,|,^,~, >>,<<, !, &&, ||,
+ * ==, !=, >, <, >=, <=, =, sizeof, :?
+ *
+ * We also support some additional operations.
*
* Deducing useful types:
* - @c CxxUtils::vec_type_t<VEC> is the element type of @c VEC.
@@ -32,10 +40,12 @@
* operations.
*
* Deducing the num of elements in a vectorized type:
+ *
* - @c CxxUtils::vec_size<VEC>() is the number of elements in @c VEC.
* - @c CxxUtils::vec_size(const VEC&) is the number of elements in @c VEC.
*
- * Methods providing similar functionality to certain x86-64 SIMD intrinics
+ * Methods providing similar functionality to certain x86-64 SIMD intrinsics:
+ *
* - @c CxxUtils::vbroadcast (VEC& v, T x) initializes each element of
* @c v with @c x.
* - @c CxxUtils::vload (VEC& dst, vec_type_t<VEC>* mem_addr)
@@ -45,12 +55,32 @@
* stores elements from @c src
* to @c mem_addr
* - @c CxxUtils::vselect (VEC& dst, const VEC& a, const VEC& b, const
- * mask_type_t<VEC>& mask)
- * copies elements from @c a or @b, depending
- * on the value @c of mask to @c dst.
- * - @c CxxUtils::vmin (VEC& dst, const VEC& a, const VEC& b)
+ * mask_type_t<VEC>& mask) copies elements
+ * from @c a or @c b, depending
+ * on the value of @c mask to @c dst.
+ * dst[i] = mask[i] ? a[i] : b[i]
+ * - @c CxxUtils::vmin (VEC& dst, const VEC& a, const VEC& b)
* copies to @c dst[i] the min(a[i],b[i])
+ * - @c CxxUtils::vmax (VEC& dst, const VEC& a, const VEC& b)
+ * copies to @c dst[i] the max(a[i],b[i])
+ * - @c CxxUtils::vpermute (VEC& dst, const VEC& src,
+ * const mask_type_t<VEC>& mask)
+ * Fills dst with permutation of src
+ * according to
+ * dst[i] = src[mask[i] % N];
+ *
+ *
+ * In terms of expected performance it is advantageous to
+ * use vector types that fit the size of the ISA.
+ * e.g 128 bit wide for SSE, 256 wide for AVX.
*
+ * Consider using Function Multiversioning
+ * (CxxUtils/features.h) if you want to target
+ * multiple ISA.
+ *
+ * Furthemore, for GCC one should 1st/or consider enabling
+ * the auto-vectorization optimizations,
+ * see vectorize.h
*/
#ifndef CXXUTILS_VEC_H
@@ -283,26 +313,21 @@ ivec<T, N> operator|| (const vec_fb<T, N>& a, const vec_fb<T, N>& b)
return c;
}
-
#endif // !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
#if HAVE_VECTOR_SIZE_ATTRIBUTE
-
/// Define a nice alias for a built-in vectorized type.
template <typename T, size_t N>
using vec __attribute__ ((vector_size(N*sizeof(T)))) = T;
-
#else
-
/// Define alias for the vectorized fallback type.
template <typename T, size_t N>
using vec = vec_fb<T, N>;
-
#endif
@@ -375,12 +400,18 @@ template<typename VEC, typename T>
inline void
vbroadcast(VEC& v, T x)
{
+#if !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
// This may look inefficient, but the loop goes away when we
// compile with optimization.
- const size_t N = CxxUtils::vec_size<VEC>();
+ constexpr size_t N = CxxUtils::vec_size<VEC>();
for (size_t i = 0; i < N; i++) {
v[i] = x;
}
+#else
+ // using - to avoid sign conversions.
+ // using + adds extra instructions due to float arithmetic.
+ v = x - VEC{ 0 };
+#endif
}
/*
@@ -408,13 +439,15 @@ vstore(vec_type_t<VEC>* mem_addr, VEC& src)
/*
* @brief select/blend function.
- * Similar _mm_blend X86-64 intrinsics
+ * Similar to _mm_blend X86-64 intrinsics
*/
template<typename VEC>
inline void
vselect(VEC& dst, const VEC& a, const VEC& b, const mask_type_t<VEC>& mask)
{
-#if (defined(__clang__) && (__clang_major__ < 10)) || \
+// clang supports the ternary operator (:?)for GCC vector types
+// only for llvm version 10 and above.
+#if (defined(__clang__) && ((__clang_major__ < 10) || defined(__APPLE__))) || \
!HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
constexpr size_t N = vec_size<VEC>();
for (size_t i = 0; i < N; i++) {
@@ -427,13 +460,13 @@ vselect(VEC& dst, const VEC& a, const VEC& b, const mask_type_t<VEC>& mask)
/*
* @brief vectorized min.
- * Similar to _mm_min intrinsics
+ * Similar to _mm_min X86-64 intrinsics
*/
template<typename VEC>
inline void
vmin(VEC& dst, const VEC& a, const VEC& b)
{
-#if (defined(__clang__) && (__clang_major__ < 10)) || \
+#if (defined(__clang__) && ((__clang_major__ < 10) || defined(__APPLE__))) || \
!HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
constexpr size_t N = vec_size<VEC>();
for (size_t i = 0; i < N; i++) {
@@ -444,6 +477,46 @@ vmin(VEC& dst, const VEC& a, const VEC& b)
#endif
}
+/*
+ * @brief vectorized max.
+ * Similar to _mm_max X86-64 intrinsics
+ */
+template<typename VEC>
+inline void
+vmax(VEC& dst, const VEC& a, const VEC& b)
+{
+#if (defined(__clang__) && ((__clang_major__ < 10) || defined(__APPLE__))) || \
+ !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+ constexpr size_t N = vec_size<VEC>();
+ for (size_t i = 0; i < N; i++) {
+ dst[i] = a[i] > b[i] ? a[i] : b[i];
+ }
+#else
+ dst = a > b ? a : b;
+#endif
+}
+
+/**
+ * @brief vpermute function.
+ * move any element of a vector src into any or multiple position inside dst,
+ * Follows the GCC __builtin_shuffle(vec,mask) conventions,
+ * therefore the elements of mask are considered modulo N
+ */
+template<typename VEC>
+inline void
+vpermute(VEC& dst, const VEC& src, const mask_type_t<VEC>& mask)
+{
+#if defined(__clang__) || !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+ // clang can vectorize this at 02
+ constexpr size_t N = vec_size<VEC>();
+ for (size_t i = 0; i < N; ++i) {
+ dst[i] = src[mask[i] % N];
+ }
+#else // gcc
+ dst = __builtin_shuffle(src, mask);
+#endif
+}
+
} // namespace CxxUtils
diff --git a/Event/xAOD/xAODCore/Root/FloatCompressor.cxx b/Control/CxxUtils/Root/FloatCompressor.cxx
similarity index 97%
rename from Event/xAOD/xAODCore/Root/FloatCompressor.cxx
rename to Control/CxxUtils/Root/FloatCompressor.cxx
index 18e11b7066ec847e5f0a88590988388bbf695d07..f15a1b64cb049484d32f174ce037d24a6d3ae604 100644
--- a/Event/xAOD/xAODCore/Root/FloatCompressor.cxx
+++ b/Control/CxxUtils/Root/FloatCompressor.cxx
@@ -8,9 +8,9 @@
#include <cmath>
// Local include(s):
-#include "xAODCore/tools/FloatCompressor.h"
+#include "CxxUtils/FloatCompressor.h"
-namespace xAOD {
+namespace CxxUtils {
/// Total number of total mantissa bits
static const unsigned int NMANTISSA = 23;
@@ -122,4 +122,4 @@ namespace xAOD {
return fi.fvalue;
}
-} // namespace xAOD
+} // namespace CxxUtils
diff --git a/Control/CxxUtils/share/vec_fb_float_test.ref b/Control/CxxUtils/share/vec_fb_float_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..6a0137c8662f1bce187e746e80dcb28a4946d0be
--- /dev/null
+++ b/Control/CxxUtils/share/vec_fb_float_test.ref
@@ -0,0 +1,2 @@
+CxxUtils/vec_test
+test1 vec_fb for float
diff --git a/Control/CxxUtils/share/vec_fb_int_test.ref b/Control/CxxUtils/share/vec_fb_int_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..e55028518202c4b1e0576e0adddb17eb8b6f255a
--- /dev/null
+++ b/Control/CxxUtils/share/vec_fb_int_test.ref
@@ -0,0 +1,2 @@
+CxxUtils/vec_test
+test1 vec_fb for int
diff --git a/Control/CxxUtils/share/vec_float_test.ref b/Control/CxxUtils/share/vec_float_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..d1842f6ee23db6184c2a1f6cfbb90e18af2872e1
--- /dev/null
+++ b/Control/CxxUtils/share/vec_float_test.ref
@@ -0,0 +1,2 @@
+CxxUtils/vec_test
+test1 vec for float
diff --git a/Control/CxxUtils/share/vec_int_test.ref b/Control/CxxUtils/share/vec_int_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..ef281594d940bacd8b97c0c51d9c4468249abf40
--- /dev/null
+++ b/Control/CxxUtils/share/vec_int_test.ref
@@ -0,0 +1,2 @@
+CxxUtils/vec_test
+test1 vec for int
diff --git a/Control/CxxUtils/share/vec_test.ref b/Control/CxxUtils/share/vec_test.ref
deleted file mode 100644
index d8bbbccb9170b4787ac75c5161a4b851a6154cc2..0000000000000000000000000000000000000000
--- a/Control/CxxUtils/share/vec_test.ref
+++ /dev/null
@@ -1,3 +0,0 @@
-CxxUtils/vec_test
-test1 vec
-test1 vec_fb
diff --git a/Event/xAOD/xAODCore/test/ut_xaodcore_floatcompression_test.cxx b/Control/CxxUtils/test/ut_cxxutils_floatcompression_test.cxx
similarity index 78%
rename from Event/xAOD/xAODCore/test/ut_xaodcore_floatcompression_test.cxx
rename to Control/CxxUtils/test/ut_cxxutils_floatcompression_test.cxx
index 8eaa2b2f4f9ebfd3980e107dc5f9f6e933272b29..883ba8f2b9a288b7e4870f03c3a5097c9b5f6b6e 100644
--- a/Event/xAOD/xAODCore/test/ut_xaodcore_floatcompression_test.cxx
+++ b/Control/CxxUtils/test/ut_cxxutils_floatcompression_test.cxx
@@ -4,7 +4,7 @@
// $Id: ut_xaodcore_floatcompression_test.cxx 789425 2016-12-13 10:50:12Z krasznaa $
//
-// Unit test for the xAOD::FloatCompressor class.
+// Unit test for the CxxUtils::FloatCompressor class.
//
// System include(s):
@@ -12,13 +12,13 @@
#include <iomanip>
// Local include(s):
-#include "xAODCore/tools/FloatCompressor.h"
+#include "CxxUtils/FloatCompressor.h"
/// Helper function printing the results of some compressions
-void testCompression( const xAOD::FloatCompressor& fc, float value ) {
+void testCompression( const CxxUtils::FloatCompressor& fc, float value ) {
std::cout << "Original value: " << std::dec << value << std::endl;
- xAOD::FloatCompressor::floatint_t compressed;
+ CxxUtils::FloatCompressor::floatint_t compressed;
compressed.fvalue = fc.reduceFloatPrecision( value );
std::cout << "Compressed value: " << compressed.fvalue
<< " (hex: " << std::hex << std::setw( 8 ) << std::setfill( '0' )
@@ -29,14 +29,14 @@ void testCompression( const xAOD::FloatCompressor& fc, float value ) {
int main() {
// Create a compressor leaving only 7 mantissa bits:
- const xAOD::FloatCompressor fc1( 7 );
+ const CxxUtils::FloatCompressor fc1( 7 );
// Try to compress some numbers, and see what we get:
testCompression( fc1, 1.2345 );
testCompression( fc1, 3.1415 );
// Now test a compressor leaving 16 mantissa bits:
- const xAOD::FloatCompressor fc2( 16 );
+ const CxxUtils::FloatCompressor fc2( 16 );
// Try some numbers with this as well:
testCompression( fc2, 2.7182 );
@@ -44,7 +44,7 @@ int main() {
// Finally, test that when we use the maximal number of mantissa bits for
// a float, the number doesn't get changed.
- const xAOD::FloatCompressor fc3( 23 );
+ const CxxUtils::FloatCompressor fc3( 23 );
// Look at some numbers with this as well:
testCompression( fc3, 2.3456 );
diff --git a/Control/CxxUtils/test/vec_fb_float_test.cxx b/Control/CxxUtils/test/vec_fb_float_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b48adbfe9d1e762deaddbd99d13baf2b91e35f3c
--- /dev/null
+++ b/Control/CxxUtils/test/vec_fb_float_test.cxx
@@ -0,0 +1,30 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/**
+ * @file CxxUtils/test/vec_fb_float_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Feb, 2020
+ * @brief Unit test for vec_fb for float types.
+ */
+
+
+#define WANT_VECTOR_FALLBACK 1
+#include "vec_test_common.h"
+#include "CxxUtils/vec.h"
+#include <iostream>
+
+void
+test1()
+{
+ std::cout << "test1 vec_fb for float\n";
+ testFloat1<CxxUtils::vec_fb>();
+}
+
+int
+main()
+{
+ std::cout << "CxxUtils/vec_test\n";
+ test1();
+ return 0;
+}
diff --git a/Control/CxxUtils/test/vec_fb_int_test.cxx b/Control/CxxUtils/test/vec_fb_int_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..09d8861f56346cf18e62380c33f62eeb97d45cc2
--- /dev/null
+++ b/Control/CxxUtils/test/vec_fb_int_test.cxx
@@ -0,0 +1,30 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/**
+ * @file CxxUtils/test/vec_fb_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Feb, 2020
+ * @brief Unit test for vec_fb for int types.
+ */
+
+
+#define WANT_VECTOR_FALLBACK 1
+#include "vec_test_common.h"
+#include "CxxUtils/vec.h"
+#include <iostream>
+
+void
+test1()
+{
+ std::cout << "test1 vec_fb for int\n";
+ testInt1<CxxUtils::vec_fb>();
+}
+
+int
+main()
+{
+ std::cout << "CxxUtils/vec_test\n";
+ test1();
+ return 0;
+}
diff --git a/Control/CxxUtils/test/vec_float_test.cxx b/Control/CxxUtils/test/vec_float_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..2bc1171102553f8540d1648d5f315ca1b2498a11
--- /dev/null
+++ b/Control/CxxUtils/test/vec_float_test.cxx
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/**
+ * @file CxxUtils/test/vec_float_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Feb, 2020
+ * @brief Unit test for vec for float types.
+ */
+
+
+#include "vec_test_common.h"
+#include "CxxUtils/vec.h"
+#include <iostream>
+void test1()
+{
+ using CxxUtils::vec;
+ std::cout << "test1 vec for float\n";
+ testFloat1<CxxUtils::vec>();
+}
+
+
+int main()
+{
+ std::cout << "CxxUtils/vec_test\n";
+ test1();
+ return 0;
+}
diff --git a/Control/CxxUtils/test/vec_int_test.cxx b/Control/CxxUtils/test/vec_int_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..106f14680131ba78ded076337db4d67112564175
--- /dev/null
+++ b/Control/CxxUtils/test/vec_int_test.cxx
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/**
+ * @file CxxUtils/test/vec_int_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Feb, 2020
+ * @brief Unit test for vec for int types.
+ */
+
+
+#include "vec_test_common.h"
+#include "CxxUtils/vec.h"
+#include <iostream>
+void test1()
+{
+ using CxxUtils::vec;
+ std::cout << "test1 vec for int\n";
+ testInt1<CxxUtils::vec>();
+}
+
+
+int main()
+{
+ std::cout << "CxxUtils/vec_test\n";
+ test1();
+ return 0;
+}
diff --git a/Control/CxxUtils/test/vec_test.cxx b/Control/CxxUtils/test/vec_test.cxx
deleted file mode 100644
index 1fde7ecb02d3c5011dd2bca7240038c6f4e0dcda..0000000000000000000000000000000000000000
--- a/Control/CxxUtils/test/vec_test.cxx
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-/**
- * @file CxxUtils/test/vec_test.cxx
- * @author scott snyder <snyder@bnl.gov>
- * @date Feb, 2020
- * @brief Unit test for vec.
- */
-
-
-#undef NDEBUG
-#define WANT_VECTOR_FALLBACK 1
-#include "CxxUtils/vec.h"
-#include "CxxUtils/no_sanitize_undefined.h"
-#include "boost/preprocessor/list/for_each.hpp"
-#include "boost/preprocessor/list/first_n.hpp"
-#include "boost/preprocessor/variadic/to_list.hpp"
-#include <cassert>
-#include <iostream>
-#include <typeinfo>
-#include <type_traits>
-#include <limits>
-
-#include <array>
-#include <valarray>
-
-
-template <class VEC, class T>
-void check (const VEC& v, const std::valarray<T>& a)
-{
- const size_t N = CxxUtils::vec_size<VEC>();
- assert (a.size() == N);
- for (size_t i = 0; i < N; i++) {
- if (v[i] != a[i]) {
- std::cerr << "Mismatch " << typeid(VEC).name() << " "
- << typeid(std::valarray<T>).name() << " " << i << "\n";
- for (size_t j = 0; j < N; j++) {
- std::cerr << v[j] << " " << a[j] << "\n";
- }
- std::abort();
- }
- }
-}
-
-
-template <class VEC>
-void check (const VEC& v, const std::valarray<bool>& a)
-{
- const size_t N = CxxUtils::vec_size<VEC>();
- assert (a.size() == N);
- for (size_t i = 0; i < N; i++) {
- assert (bool(v[i]) == a[i]);
- }
-}
-
-
-// Disable ubsan because we get some overflows here.
-template <class VEC>
-void test_arith NO_SANITIZE_UNDEFINED (const VEC& v1)
-{
- using T = CxxUtils::vec_type_t<VEC>;
- size_t N = CxxUtils::vec_size<VEC>();
-
- std::valarray<T> a1 (N);
- for (size_t i = 0; i < N; i++) a1[i] = v1[i];
-
- check (v1, a1);
-
- VEC v2 = v1 * 2;
- std::valarray<T> a2 = a1 * static_cast<T>(2);
- check (v2, a2);
-
-#define TEST(op) \
- do { \
- VEC v3 = v2 op v1; \
- std::valarray<T> a3 = a2 op a1; \
- check (v3, a3); \
- \
- VEC v4 = v3 op 5; \
- std::valarray<T> a4 = a3 op static_cast<T>(5); \
- check (v4, a4); \
- \
- v4 = 6 op v3; \
- a4 = static_cast<T>(6) op a3; \
- check (v4, a4); \
- \
- v4 op ## = v1; \
- a4 op ## = a1; \
- check (v4, a4); \
- \
- v4 op ## = 10; \
- a4 op ## = static_cast<T>(10); \
- check (v4, a4); \
- } while(0)
-
- TEST(+);
- TEST(-);
- TEST(*);
- TEST(/);
-
-#undef TEST
-
- VEC v3 = -v1;
- std::valarray<T> a3 = -a1;
- check (v3, a3);
-}
-
-
-// Disable ubsan because we get some overflows here.
-template <class VEC>
-void test_int NO_SANITIZE_UNDEFINED (const VEC& v1)
-{
- using T = CxxUtils::vec_type_t<VEC>;
- size_t N = CxxUtils::vec_size<VEC>();
-
- std::valarray<T> a1 (N);
- for (size_t i = 0; i < N; i++) a1[i] = v1[i];
-
- check (v1, a1);
-
- VEC v2 = v1 * 3;
- std::valarray<T> a2 = a1 * static_cast<T>(3);
- check (v2, a2);
-
-#define TEST(op, rhs) \
- do { \
- VEC v3 = v1 op rhs(v2); \
- std::valarray<T> a3 = a1 op rhs(a2); \
- check (v3, a3); \
- \
- VEC v4 = v3 op rhs(5); \
- std::valarray<T> a4 = a3 op static_cast<T>(rhs(5)); \
- check (v4, a4); \
- \
- v4 = 6 op rhs(v3); \
- a4 = static_cast<T>(6) op rhs(a3); \
- check (v4, a4); \
- \
- v4 op ## = rhs(v1); \
- a4 op ## = rhs(a1); \
- check (v4, a4); \
- \
- v4 op ## = rhs(3); \
- a4 op ## = static_cast<T>(rhs(3)); \
- check (v4, a4); \
- } while(0)
-
-#define _(x) (x)
-// Ensure shift count is within defined range.
-#define MOD(x) ((x&std::numeric_limits<T>::max())%static_cast<T>(sizeof(T)*8 - (std::is_signed_v<T> ? 1 : 0)))
-
- TEST(^, _);
- TEST(|, _);
- TEST(&, _);
- TEST(%, _);
- if (!std::is_signed_v<T>) {
- // cppcheck-suppress compareBoolExpressionWithInt // false positive
- TEST(<<, MOD);
- }
- // cppcheck-suppress compareBoolExpressionWithInt // false positive
- TEST(>>, MOD);
-
-#undef TEST
-
- VEC v3 = ~v1;
- std::valarray<T> a3 = ~a1;
- check (v3, a3);
-}
-
-
-template <class VEC>
-void test_relops (const VEC& v1)
-{
- using T = CxxUtils::vec_type_t<VEC>;
- size_t N = CxxUtils::vec_size<VEC>();
-
- std::valarray<T> a1 (N);
- for (size_t i = 0; i < N; i++) a1[i] = v1[i];
-
- VEC v2;
- v2[0] = v1[0];
- for (size_t i = 1; i < N; i++) v2[i] = v1[N-i];
-
- std::valarray<T> a2 (N);
- for (size_t i = 0; i < N; i++) a2[i] = v2[i];
-
-#define TEST(op) \
- do { \
- auto v3 = (v1 op v2); \
- std::valarray<bool> a3 = (a1 op a2); \
- check (v3, a3); \
- } while(0)
-
- TEST(==);
- TEST(!=);
- TEST(>);
- TEST(>=);
- TEST(<);
- TEST(<=);
-
-#undef TEST
-}
-
-
-template <class VEC>
-void test_logops (const VEC& v1)
-{
- using T = CxxUtils::vec_type_t<VEC>;
- size_t N = CxxUtils::vec_size<VEC>();
-
- std::valarray<T> a1 (N);
- for (size_t i = 0; i < N; i++) a1[i] = v1[i];
-
- VEC v2;
- for (size_t i = 0; i < N; i++) v2[i] = v1[N-1-i];
-
- std::valarray<T> a2 (N);
- for (size_t i = 0; i < N; i++) a2[i] = v2[i];
-
- {
- auto v3 = v1 && v2;
- std::valarray<bool> a3 = a1 && a2;
- check (v3, a3);
-
- auto v4a = v1 && 1;
- std::valarray<bool> a4a = a1 && static_cast<T>(1);
- check (v4a, a4a);
-
- auto v4b = v1 && 0;
- std::valarray<bool> a4b = a1 && static_cast<T>(0);
- check (v4b, a4b);
-
- auto v5a = v1 && 1;
- std::valarray<bool> a5a = static_cast<T>(1) && a1;
- check (v5a, a5a);
-
- auto v5b = v1 && 0;
- std::valarray<bool> a5b = static_cast<T>(0) && a1;
- check (v5b, a5b);
- }
-
- {
- auto v3 = v1 || v2;
- std::valarray<bool> a3 = a1 || a2;
- check (v3, a3);
- }
-
-// clang doesn't implement this.
-#ifndef __clang__
- {
- auto v3 = !v1;
- std::valarray<bool> a3 = !a1;
- check (v3, a3);
- }
-#endif
-}
-
-
-template <class VEC>
-void test_broadcast (const VEC& v1)
-{
- VEC v2;
- CxxUtils::vbroadcast (v2, v1[0]);
-
- size_t N = CxxUtils::vec_size<VEC>();
- for (size_t i = 0; i < N; i++) {
- assert (v1[i] == v2[i]);
- }
-}
-
-template<class VEC>
-void
-test_storeload(const VEC& v1)
-{
-
- std::array<CxxUtils::vec_type_t<VEC>, CxxUtils::vec_size<VEC>()> buffer{};
- CxxUtils::vec_type_t<VEC>* mem_addr = buffer.data();
-
- CxxUtils::vstore(mem_addr, v1);
- size_t N = CxxUtils::vec_size<VEC>();
- for (size_t i = 0; i < N; i++) {
- assert(v1[i] == mem_addr[i]);
- }
-
- VEC v2;
- CxxUtils::vload(v2, mem_addr);
- for (size_t i = 0; i < N; i++) {
- assert(v2[i] == mem_addr[i]);
- }
-}
-
-template<class VEC>
-void
-test_select(const VEC& v1)
-{
-
- const VEC v2 = 2 * v1;
- CxxUtils::mask_type_t<VEC> greater;
- CxxUtils::mask_type_t<VEC> less;
- size_t N = CxxUtils::vec_size<VEC>();
- for (size_t i = 0; i < N; i++) {
- greater[i] = v1[i] > v2[i];
- less[i] = v1[i] < v2[i];
- }
-
- VEC selectGreater;
- CxxUtils::vselect(selectGreater, v1, v2, greater);
- VEC selectLess;
- CxxUtils::vselect(selectLess, v1, v2, less);
-
- for (size_t i = 0; i < N; i++) {
- assert(selectGreater[i] == v2[i]);
- assert(selectLess[i] == v1[i]);
- }
-}
-
-template<class VEC>
-void
-test_min(const VEC& v1)
-{
-
- const VEC v2 = v1 + 1;
-
- VEC min;
- CxxUtils::vmin(min, v1, v2);
- size_t N = CxxUtils::vec_size<VEC>();
- for (size_t i = 0; i < N; i++) {
- assert(min[i] == v1[i]);
- }
-}
-
-template <template <class T, size_t N> class VEC>
-void test1a()
-{
- static_assert( std::is_same_v <CxxUtils::vec_type_t<VEC<float, 4> >, float> );
- VEC<float, 4> v;
- assert ((CxxUtils::vec_size<VEC<float, 4> >()) == 4);
- assert (CxxUtils::vec_size(v) == 4);
-
-#define ELT(r,data,elem) elem,
-#define INITN(N, ...) { BOOST_PP_LIST_FOR_EACH(ELT, _, BOOST_PP_LIST_FIRST_N(N, BOOST_PP_VARIADIC_TO_LIST(__VA_ARGS__))) }
-
-#define TEST_FLOAT(T, N) \
- do { \
- test_arith (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
- test_relops (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
- test_broadcast (VEC<T, N> INITN(N, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5)); \
- test_storeload (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
- test_select (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
- test_min (VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
- } while(0)
-
- TEST_FLOAT(float, 1);
- TEST_FLOAT(float, 2);
- TEST_FLOAT(float, 4);
- TEST_FLOAT(float, 8);
- TEST_FLOAT(double, 1);
- TEST_FLOAT(double, 2);
- TEST_FLOAT(double, 4);
-
-#undef TEST_FLOAT
-
-#define TEST_INT(T, N) \
- do { \
- test_arith (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
- test_relops (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
- test_broadcast (VEC<T, N> INITN(N, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3)); \
- test_storeload (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
- test_select (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
- test_min (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
- test_int (VEC<T, N> INITN(N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
- test_logops (VEC<T, N> INITN(N, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1)); \
- } while(0)
-
- TEST_INT(signed char, 1);
- TEST_INT(signed char, 2);
- TEST_INT(signed char, 4);
- TEST_INT(signed char, 8);
- TEST_INT(signed char, 16);
- TEST_INT(unsigned char, 1);
- TEST_INT(unsigned char, 2);
- TEST_INT(unsigned char, 4);
- TEST_INT(unsigned char, 8);
- TEST_INT(unsigned char, 16);
- TEST_INT(short, 1);
- TEST_INT(short, 2);
- TEST_INT(short, 4);
- TEST_INT(short, 8);
- TEST_INT(short, 16);
- TEST_INT(unsigned short, 1);
- TEST_INT(unsigned short, 2);
- TEST_INT(unsigned short, 4);
- TEST_INT(unsigned short, 8);
- TEST_INT(unsigned short, 16);
- TEST_INT(int, 1);
- TEST_INT(int, 2);
- TEST_INT(int, 4);
- TEST_INT(int, 8);
- TEST_INT(unsigned int, 1);
- TEST_INT(unsigned int, 2);
- TEST_INT(unsigned int, 4);
- TEST_INT(unsigned int, 8);
- TEST_INT(long, 1);
- TEST_INT(long, 2);
- TEST_INT(long, 4);
- TEST_INT(unsigned long, 1);
- TEST_INT(unsigned long, 2);
- TEST_INT(unsigned long, 4);
-
-#undef TEST_INT
-#undef INITN
-#undef ELT
-}
-
-void test1()
-{
- using CxxUtils::vec;
-
- std::cout << "test1 vec\n";
- test1a<CxxUtils::vec>();
- std::cout << "test1 vec_fb\n";
- test1a<CxxUtils::vec_fb>();
-}
-
-
-int main()
-{
- std::cout << "CxxUtils/vec_test\n";
- test1();
- return 0;
-}
diff --git a/Control/CxxUtils/test/vec_test_common.h b/Control/CxxUtils/test/vec_test_common.h
new file mode 100644
index 0000000000000000000000000000000000000000..b265a607f76834b33fd61d42c90587a49c7ea05c
--- /dev/null
+++ b/Control/CxxUtils/test/vec_test_common.h
@@ -0,0 +1,484 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/**
+ * @file CxxUtils/test/vec_test_common.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Feb, 2020
+ * @brief Common part for vec vec_fb unit tests.
+ *
+ */
+
+#ifndef CXXUTILS_VEC_TEST_COMMON
+#define CXXUTILS_VEC_TEST_COMMON
+#undef NDEBUG
+
+#include "CxxUtils/no_sanitize_undefined.h"
+#include "CxxUtils/vec.h"
+#include "boost/preprocessor/list/first_n.hpp"
+#include "boost/preprocessor/list/for_each.hpp"
+#include "boost/preprocessor/variadic/to_list.hpp"
+#include <cassert>
+#include <cstdint>
+#include <iostream>
+#include <limits>
+#include <type_traits>
+#include <typeinfo>
+
+#include <array>
+#include <valarray>
+
+template<class VEC, class T>
+void
+check(const VEC& v, const std::valarray<T>& a)
+{
+ const size_t N = CxxUtils::vec_size<VEC>();
+ assert(a.size() == N);
+ for (size_t i = 0; i < N; i++) {
+ if (v[i] != a[i]) {
+ std::cerr << "Mismatch " << typeid(VEC).name() << " "
+ << typeid(std::valarray<T>).name() << " " << i << "\n";
+ for (size_t j = 0; j < N; j++) {
+ std::cerr << v[j] << " " << a[j] << "\n";
+ }
+ std::abort();
+ }
+ }
+}
+
+template<class VEC>
+void
+check(const VEC& v, const std::valarray<bool>& a)
+{
+ const size_t N = CxxUtils::vec_size<VEC>();
+ assert(a.size() == N);
+ for (size_t i = 0; i < N; i++) {
+ assert(bool(v[i]) == a[i]);
+ }
+}
+
+// Disable ubsan because we get some overflows here.
+template<class VEC>
+void test_arith
+NO_SANITIZE_UNDEFINED(const VEC& v1)
+{
+ using T = CxxUtils::vec_type_t<VEC>;
+ size_t N = CxxUtils::vec_size<VEC>();
+
+ std::valarray<T> a1(N);
+ for (size_t i = 0; i < N; i++)
+ a1[i] = v1[i];
+
+ check(v1, a1);
+
+ VEC v2 = v1 * 2;
+ std::valarray<T> a2 = a1 * static_cast<T>(2);
+ check(v2, a2);
+
+#define TEST(op) \
+ do { \
+ VEC v3 = v2 op v1; \
+ std::valarray<T> a3 = a2 op a1; \
+ check(v3, a3); \
+ \
+ VEC v4 = v3 op 5; \
+ std::valarray<T> a4 = a3 op static_cast<T>(5); \
+ check(v4, a4); \
+ \
+ v4 = 6 op v3; \
+ a4 = static_cast<T>(6) op a3; \
+ check(v4, a4); \
+ \
+ v4 op## = v1; \
+ a4 op## = a1; \
+ check(v4, a4); \
+ \
+ v4 op## = 10; \
+ a4 op## = static_cast<T>(10); \
+ check(v4, a4); \
+ } while (0)
+
+ TEST(+);
+ TEST(-);
+ TEST(*);
+ TEST(/);
+
+#undef TEST
+
+ VEC v3 = -v1;
+ std::valarray<T> a3 = -a1;
+ check(v3, a3);
+}
+
+// Disable ubsan because we get some overflows here.
+template<class VEC>
+void test_int
+NO_SANITIZE_UNDEFINED(const VEC& v1)
+{
+ using T = CxxUtils::vec_type_t<VEC>;
+ size_t N = CxxUtils::vec_size<VEC>();
+
+ std::valarray<T> a1(N);
+ for (size_t i = 0; i < N; i++)
+ a1[i] = v1[i];
+
+ check(v1, a1);
+
+ VEC v2 = v1 * 3;
+ std::valarray<T> a2 = a1 * static_cast<T>(3);
+ check(v2, a2);
+
+#define TEST(op, rhs) \
+ do { \
+ VEC v3 = v1 op rhs(v2); \
+ std::valarray<T> a3 = a1 op rhs(a2); \
+ check(v3, a3); \
+ \
+ VEC v4 = v3 op rhs(5); \
+ std::valarray<T> a4 = a3 op static_cast<T>(rhs(5)); \
+ check(v4, a4); \
+ \
+ v4 = 6 op rhs(v3); \
+ a4 = static_cast<T>(6) op rhs(a3); \
+ check(v4, a4); \
+ \
+ v4 op## = rhs(v1); \
+ a4 op## = rhs(a1); \
+ check(v4, a4); \
+ \
+ v4 op## = rhs(3); \
+ a4 op## = static_cast<T>(rhs(3)); \
+ check(v4, a4); \
+ } while (0)
+
+#define _(x) (x)
+// Ensure shift count is within defined range.
+#define MOD(x) \
+ ((x & std::numeric_limits<T>::max()) % \
+ static_cast<T>(sizeof(T) * 8 - (std::is_signed_v<T> ? 1 : 0)))
+
+ TEST(^, _);
+ TEST(|, _);
+ TEST(&, _);
+ TEST(%, _);
+ if (!std::is_signed_v<T>) {
+ // cppcheck-suppress compareBoolExpressionWithInt // false positive
+ TEST(<<, MOD);
+ }
+ // cppcheck-suppress compareBoolExpressionWithInt // false positive
+ TEST(>>, MOD);
+
+#undef TEST
+
+ VEC v3 = ~v1;
+ std::valarray<T> a3 = ~a1;
+ check(v3, a3);
+}
+
+template<class VEC>
+void
+test_relops(const VEC& v1)
+{
+ using T = CxxUtils::vec_type_t<VEC>;
+ size_t N = CxxUtils::vec_size<VEC>();
+
+ std::valarray<T> a1(N);
+ for (size_t i = 0; i < N; i++)
+ a1[i] = v1[i];
+
+ VEC v2;
+ v2[0] = v1[0];
+ for (size_t i = 1; i < N; i++)
+ v2[i] = v1[N - i];
+
+ std::valarray<T> a2(N);
+ for (size_t i = 0; i < N; i++)
+ a2[i] = v2[i];
+
+#define TEST(op) \
+ do { \
+ auto v3 = (v1 op v2); \
+ std::valarray<bool> a3 = (a1 op a2); \
+ check(v3, a3); \
+ } while (0)
+
+ TEST(==);
+ TEST(!=);
+ TEST(>);
+ TEST(>=);
+ TEST(<);
+ TEST(<=);
+
+#undef TEST
+}
+
+template<class VEC>
+void
+test_logops(const VEC& v1)
+{
+ using T = CxxUtils::vec_type_t<VEC>;
+ size_t N = CxxUtils::vec_size<VEC>();
+
+ std::valarray<T> a1(N);
+ for (size_t i = 0; i < N; i++)
+ a1[i] = v1[i];
+
+ VEC v2;
+ for (size_t i = 0; i < N; i++)
+ v2[i] = v1[N - 1 - i];
+
+ std::valarray<T> a2(N);
+ for (size_t i = 0; i < N; i++)
+ a2[i] = v2[i];
+
+ {
+ auto v3 = v1 && v2;
+ std::valarray<bool> a3 = a1 && a2;
+ check(v3, a3);
+
+ auto v4a = v1 && 1;
+ std::valarray<bool> a4a = a1 && static_cast<T>(1);
+ check(v4a, a4a);
+
+ auto v4b = v1 && 0;
+ std::valarray<bool> a4b = a1 && static_cast<T>(0);
+ check(v4b, a4b);
+
+ auto v5a = v1 && 1;
+ std::valarray<bool> a5a = static_cast<T>(1) && a1;
+ check(v5a, a5a);
+
+ auto v5b = v1 && 0;
+ std::valarray<bool> a5b = static_cast<T>(0) && a1;
+ check(v5b, a5b);
+ }
+
+ {
+ auto v3 = v1 || v2;
+ std::valarray<bool> a3 = a1 || a2;
+ check(v3, a3);
+ }
+
+// clang doesn't implement this.
+#ifndef __clang__
+ {
+ auto v3 = !v1;
+ std::valarray<bool> a3 = !a1;
+ check(v3, a3);
+ }
+#endif
+}
+
+template<class VEC>
+void
+test_broadcast(const VEC& v1)
+{
+ VEC v2;
+ CxxUtils::vbroadcast(v2, v1[0]);
+
+ size_t N = CxxUtils::vec_size<VEC>();
+ for (size_t i = 0; i < N; i++) {
+ assert(v1[i] == v2[i]);
+ }
+}
+
+template<class VEC>
+void
+test_storeload(const VEC& v1)
+{
+
+ std::array<CxxUtils::vec_type_t<VEC>, CxxUtils::vec_size<VEC>()> buffer{};
+ CxxUtils::vec_type_t<VEC>* mem_addr = buffer.data();
+
+ CxxUtils::vstore(mem_addr, v1);
+ size_t N = CxxUtils::vec_size<VEC>();
+ for (size_t i = 0; i < N; i++) {
+ assert(v1[i] == mem_addr[i]);
+ }
+
+ VEC v2;
+ CxxUtils::vload(v2, mem_addr);
+ for (size_t i = 0; i < N; i++) {
+ assert(v2[i] == mem_addr[i]);
+ }
+}
+
+template<class VEC>
+void
+test_min(const VEC& v1)
+{
+
+ const VEC v2 = v1 + 1;
+ VEC min;
+ CxxUtils::vmin(min, v1, v2);
+ constexpr size_t N = CxxUtils::vec_size<VEC>();
+ for (size_t i = 0; i < N; i++) {
+ assert(min[i] == v1[i]);
+ }
+}
+
+template<class VEC>
+void
+test_max(const VEC& v1)
+{
+
+ const VEC v2 = v1 + 1;
+ VEC max;
+ CxxUtils::vmax(max, v1, v2);
+ constexpr size_t N = CxxUtils::vec_size<VEC>();
+ for (size_t i = 0; i < N; i++) {
+ assert(max[i] == v2[i]);
+ }
+}
+
+template<class VEC>
+void
+test_select(const VEC& v1)
+{
+
+ const VEC v2 = 2 * v1;
+ CxxUtils::mask_type_t<VEC> greater;
+ CxxUtils::mask_type_t<VEC> less;
+ constexpr size_t N = CxxUtils::vec_size<VEC>();
+ for (size_t i = 0; i < N; i++) {
+ greater[i] = v1[i] > v2[i];
+ less[i] = v1[i] < v2[i];
+ }
+
+ VEC selectGreater;
+ CxxUtils::vselect(selectGreater, v1, v2, greater);
+ VEC selectLess;
+ CxxUtils::vselect(selectLess, v1, v2, less);
+
+ for (size_t i = 0; i < N; i++) {
+ assert(selectGreater[i] == v2[i]);
+ assert(selectLess[i] == v1[i]);
+ }
+}
+
+template<class VEC>
+void
+test_permute(const VEC& v1)
+{
+ VEC v2;
+ // Put the element at v1[0] to all the lanes of v2
+ CxxUtils::mask_type_t<VEC> first{ 0 };
+ CxxUtils::vpermute(v2, v1, first);
+ constexpr size_t N = CxxUtils::vec_size<VEC>();
+ for (size_t i = 0; i < N; i++) {
+ assert(v2[i] == v1[0]);
+ }
+}
+
+template<template<class T, size_t N> class VEC>
+void
+testFloat1()
+{
+ static_assert(std::is_same_v<CxxUtils::vec_type_t<VEC<float, 4>>, float>);
+ VEC<float, 4> v;
+ assert((CxxUtils::vec_size<VEC<float, 4>>()) == 4);
+ assert(CxxUtils::vec_size(v) == 4);
+
+#define ELT(r, data, elem) elem,
+#define INITN(N, ...) \
+ { \
+ BOOST_PP_LIST_FOR_EACH( \
+ ELT, \
+ _, \
+ BOOST_PP_LIST_FIRST_N(N, BOOST_PP_VARIADIC_TO_LIST(__VA_ARGS__))) \
+ }
+
+#define TEST_FLOAT(T, N) \
+ do { \
+ test_arith(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+ test_relops(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+ test_broadcast( \
+ VEC<T, N> INITN(N, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); \
+ test_storeload( \
+ VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+ test_select(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+ test_min(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+ test_max(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+ test_permute(VEC<T, N> INITN(N, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5)); \
+ } while (0)
+
+ TEST_FLOAT(float, 4); // 128 bit wide 4 floats
+ TEST_FLOAT(float, 8); // 256 bit wide 8 floats
+
+ TEST_FLOAT(double, 2); // 128 bit wide 2 double
+ TEST_FLOAT(double, 4); // 256 bit wide 4 double
+
+#undef TEST_FLOAT
+#undef INITN
+#undef ELT
+}
+template<template<class T, size_t N> class VEC>
+void
+testInt1()
+{
+ static_assert(std::is_same_v<CxxUtils::vec_type_t<VEC<int, 4>>, int>);
+ VEC<int, 4> v;
+ assert((CxxUtils::vec_size<VEC<int, 4>>()) == 4);
+ assert(CxxUtils::vec_size(v) == 4);
+
+#define ELT(r, data, elem) elem,
+#define INITN(N, ...) \
+ { \
+ BOOST_PP_LIST_FOR_EACH( \
+ ELT, \
+ _, \
+ BOOST_PP_LIST_FIRST_N(N, BOOST_PP_VARIADIC_TO_LIST(__VA_ARGS__))) \
+ }
+
+#define TEST_INT(T, N) \
+ do { \
+ test_arith(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_relops(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_broadcast( \
+ VEC<T, N> INITN(N, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); \
+ test_storeload(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_select(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_min(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_max(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_permute(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_int(VEC<T, N> INITN( \
+ N, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); \
+ test_logops( \
+ VEC<T, N> INITN(N, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1)); \
+ } while (0)
+
+ TEST_INT(int8_t, 16); // 128 bit wide
+
+ TEST_INT(uint8_t, 16); // 128 bit wide
+
+ TEST_INT(int16_t, 8); // 128 bit wide
+ TEST_INT(int16_t, 16); // 256 bit wide
+
+ TEST_INT(uint16_t, 8); // 128 bit wide
+ TEST_INT(uint16_t, 16); // 256 bit wide
+
+ TEST_INT(int32_t, 4); // 128 bit wide
+ TEST_INT(int32_t, 8); // 256 bit wide
+
+ TEST_INT(uint32_t, 4); // 128 bit wide
+ TEST_INT(uint32_t, 8); // 256 bit wide
+
+ TEST_INT(int64_t, 2); // 128 bit wide
+ TEST_INT(int64_t, 4); // 256 bit wide
+
+ TEST_INT(uint64_t, 2); // 128 bit wide
+ TEST_INT(uint64_t, 4); // 256 bit wide
+
+#undef TEST_INT
+#undef INITN
+#undef ELT
+}
+
+#endif
diff --git a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
index 64298519096b798deefc81dff68586cef7633adf..83c89e8eb99b2f50402d1b8c1dca35b5a619a9e2 100644
--- a/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
+++ b/Control/DataModelTest/DataModelRunTests/share/xAODTestRead3MT.ref
@@ -195,7 +195,6 @@ PrecedenceSvc 0 INFO
EndIncFiringAlg [Alg] [n= 0]
IncidentProcAlg2 [Alg] [n= 1] [unclonable]
AthOutSeq [Seq] [Concurrent]
- AthRegSeq [Seq] [Concurrent]
AthenaHiveEventLoopMgr 0 INFO Setup EventSelector service EventSelector
ApplicationMgr 0 INFO Application Manager Initialized successfully
diff --git a/Control/GaudiSequencer/src/AthEventCounter.h b/Control/GaudiSequencer/src/AthEventCounter.h
index 053c86294ae5be701a4233e58891b4bb808030c4..eda3a324da6f4f035e03fb5639dd90bb6ead931e 100644
--- a/Control/GaudiSequencer/src/AthEventCounter.h
+++ b/Control/GaudiSequencer/src/AthEventCounter.h
@@ -12,7 +12,7 @@
#define GAUDISEQUENCER_ATHEVENTCOUNTER_H
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class AthEventCounter : public AthAlgorithm
{
diff --git a/Control/GaudiSequencer/src/AthPrescaler.h b/Control/GaudiSequencer/src/AthPrescaler.h
index d7ac062ef876d1764700b10611d839927cf98cf2..e22d3d270458adeb64c6b2362cc92914de30931f 100644
--- a/Control/GaudiSequencer/src/AthPrescaler.h
+++ b/Control/GaudiSequencer/src/AthPrescaler.h
@@ -13,7 +13,7 @@
#define GAUDISEQUENCER_ATHPRESCALER_H
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class AthPrescaler:public AthAlgorithm
{
diff --git a/Control/GaudiSequencer/src/AthRetrySequencer.cxx b/Control/GaudiSequencer/src/AthRetrySequencer.cxx
index c7a9b0f6d4c353288c75e177171bc33e4a583224..71fe5118daede3a9aca4c7220e394df8ed32e885 100644
--- a/Control/GaudiSequencer/src/AthRetrySequencer.cxx
+++ b/Control/GaudiSequencer/src/AthRetrySequencer.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
diff --git a/Control/GaudiSequencer/src/AthSequencer.cxx b/Control/GaudiSequencer/src/AthSequencer.cxx
index 555f25d1159169b50918575aa015056fe478490d..ae51a3cba431623f452c202d5fda1e8a7b958474 100644
--- a/Control/GaudiSequencer/src/AthSequencer.cxx
+++ b/Control/GaudiSequencer/src/AthSequencer.cxx
@@ -364,7 +364,7 @@ AthSequencer::decodeMemberNames( )
}
void
-AthSequencer::membershipHandler( Property& /* theProp */ )
+AthSequencer::membershipHandler( Gaudi::Details::PropertyBase& /* theProp */ )
{
if ( isInitialized() ) decodeMemberNames().ignore();
}
diff --git a/Control/GaudiSequencer/src/AthSequencer.h b/Control/GaudiSequencer/src/AthSequencer.h
index a78b225c548e78bc218bfe96d6a0a88ef193e521..393633a5331dd417e152094e96c40598ab731940 100644
--- a/Control/GaudiSequencer/src/AthSequencer.h
+++ b/Control/GaudiSequencer/src/AthSequencer.h
@@ -16,7 +16,7 @@
#include "AthenaBaseComps/AthCommonDataStore.h"
#include "AthenaBaseComps/AthCommonMsg.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Gaudi/Sequence.h"
#include <setjmp.h>
@@ -124,13 +124,13 @@ public:
StatusCode decodeMemberNames( );
/// "Members" property handler
- void membershipHandler( Property& theProp );
+ void membershipHandler( Gaudi::Details::PropertyBase& theProp );
/// Decode branch member naem list
StatusCode decodeBranchMemberNames( );
/// "BranchMembers" propertry handler
- void branchMembershipHandler( Property& theProp );
+ void branchMembershipHandler( Gaudi::Details::PropertyBase& theProp );
protected:
diff --git a/Control/IOVSvc/src/CondInputLoader.cxx b/Control/IOVSvc/src/CondInputLoader.cxx
index fceda41da3e96f29da576605a974bd401e0cf2c8..ff3f6acc4d2151a355657bb6ab02bb09284ee72b 100644
--- a/Control/IOVSvc/src/CondInputLoader.cxx
+++ b/Control/IOVSvc/src/CondInputLoader.cxx
@@ -11,7 +11,7 @@
#include "CondInputLoader.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IClassIDSvc.h"
#include "StoreGate/ReadHandle.h"
#include "AthenaKernel/errorcheck.h"
@@ -66,7 +66,7 @@ CondInputLoader::CondInputLoader( const std::string& name,
// Property declaration
//
auto props = getProperties();
- for( Property* prop : props ) {
+ for( Gaudi::Details::PropertyBase* prop : props ) {
if (prop->name() == "ExtraOutputs" || prop->name() == "ExtraInputs") {
prop->declareUpdateHandler
(&CondInputLoader::extraDeps_update_handler, this);
@@ -165,7 +165,7 @@ CondInputLoader::initialize()
// Update the properties, set the ExtraOutputs for Alg deps
- const Property &p = getProperty("Load");
+ const Gaudi::Details::PropertyBase &p = getProperty("Load");
ATH_MSG_DEBUG("setting prop ExtraOutputs to " << p.toString());
if (!setProperty("ExtraOutputs", p).isSuccess()) {
@@ -357,7 +357,7 @@ CondInputLoader::execute()
// need to override the handling of the DataObjIDs that's done by
// AthAlgorithm, so we don't inject the name of the Default Store
void
-CondInputLoader::extraDeps_update_handler( Property& /*ExtraDeps*/ )
+CondInputLoader::extraDeps_update_handler( Gaudi::Details::PropertyBase& /*ExtraDeps*/ )
{
// do nothing
}
diff --git a/Control/IOVSvc/src/CondInputLoader.h b/Control/IOVSvc/src/CondInputLoader.h
index aec51a8ff34c90008863f1caee6dbe396831a144..a02804346a30e7f89a1aa5cfcbdc93bece694dbd 100644
--- a/Control/IOVSvc/src/CondInputLoader.h
+++ b/Control/IOVSvc/src/CondInputLoader.h
@@ -43,7 +43,7 @@ class CondInputLoader
// need to override the ExtraInputs/Outputs property handler
// from AthAlgorithm
- void extraDeps_update_handler(Property&);
+ void extraDeps_update_handler(Gaudi::Details::PropertyBase&);
/// Containers
Gaudi::Property<DataObjIDColl> m_load{this,"Load",{},
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
index 067e3a34a801953f4a30a043d13210d19ce357d9..bcaf76a03d53227c61dec54ff4441c7e048c9728 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/CallGraphBuilderSvc.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonComps includes
#include "CallGraphBuilderSvc.h"
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
index 82c788c2cb3bcb2caca82995e0e0a05326b0d4b3..0d7de4fa4a0d99a10d2d77bc7723f441fb45d8b1 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
@@ -544,9 +544,25 @@ void PerfMonMTSvc::report2JsonFile() {
report2JsonFile_EventLevel(j); // Event-level
}
- // Write
+ // Write and close the JSON file
std::ofstream o(m_jsonFileName);
o << std::setw(4) << j << std::endl;
+ o.close();
+
+ // Compress the JSON file into tar.gz
+ auto cmd = "tar -czf " + m_jsonFileName + ".tar.gz " + m_jsonFileName + ";";
+ int rc = std::system(cmd.c_str());
+ if(rc!=0) {
+ ATH_MSG_WARNING("Couldn't compress the JSON file...");
+ return;
+ }
+
+ // Remove the uncompressed JSON file to save disk-space
+ rc = std::remove(m_jsonFileName.toString().c_str());
+ if(rc!=0) {
+ ATH_MSG_WARNING("Couldn't remove the uncompressed JSON file...");
+ return;
+ }
}
/*
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonStorePayloadMon.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonStorePayloadMon.cxx
index e26148cfe15e0a78c9884f9f24423d3ecd7c54c1..53160ac8bb5722224f600b77f7f4f9f1096fe66c 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonStorePayloadMon.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonStorePayloadMon.cxx
@@ -22,7 +22,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "SGTools/DataProxy.h"
// pmon edm
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
index 1935602067249404a386ea2f573785dc4d94d24f..045b3030ff2634d39d0b5b1ff74da44a100bc1cb 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.cxx
@@ -35,7 +35,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/IChronoStatSvc.h"
@@ -1095,12 +1095,12 @@ void PerfMonSvc::undeclareAll( const IInterface* iowner )
///////////////////////////////////////////////////////////////////
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void PerfMonSvc::setupProfiledAlgList( Property& /*profiledAlgNames*/ )
+void PerfMonSvc::setupProfiledAlgList( Gaudi::Details::PropertyBase& /*profiledAlgNames*/ )
{
return;
}
-void PerfMonSvc::setupIoContainerList( Property& /*ioContainerNames*/ )
+void PerfMonSvc::setupIoContainerList( Gaudi::Details::PropertyBase& /*ioContainerNames*/ )
{
}
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.h b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.h
index 1540aa3a340cf0a05ef1beb058ae50ce76c44832..976f515e8bf61fb3c866b513b8864fddb62b35b9 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.h
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonSvc.h
@@ -221,10 +221,10 @@ private:
PerfMonSvc();
/// callback to synchronize the list of algorithms to be profiled
- void setupProfiledAlgList( Property& profiledAlgNames );
+ void setupProfiledAlgList( Gaudi::Details::PropertyBase& profiledAlgNames );
/// callback to synchronize the list of I/O containers to be monitored
- void setupIoContainerList( Property& ioContainerNames );
+ void setupIoContainerList( Gaudi::Details::PropertyBase& ioContainerNames );
/// loop over user-declared variables (via the @c IMonitorSvc interface)
/// and poll the data
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonUtils.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonUtils.cxx
index b90359deb794e2fbc8ef3aff04d36183d23c472b..abff933e1d3c4a8f031941263d0c3973582ab419 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonUtils.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonUtils.cxx
@@ -15,7 +15,7 @@
// Framework includes
#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SmartIF.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IAuditorSvc.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
index 2fecb7dba4bbd95db98d723b72a8895cda3cc60b..7b7dd67f4042d82cb361c3d98e3e1473b7060add 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PerfMonKernel/IPerfMonSvc.h"
#include "AthenaKernel/CLASS_DEF.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx
index b55394d82222dc6e7c2668d2af1c10119e891421..0af3fbe1080026db655fd1a596dbef46f774e74c 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestCpuCruncherAlg.cxx
@@ -15,7 +15,7 @@
#include <cmath>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
// PerfMonTests includes
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx
index e14ce41e9fecf94950e9ca31b718c95b532eeda5..ae18a8beeebe42b5608d04e902d8ee8645427149 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestErroneousAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonTests includes
#include "PerfMonTestErroneousAlg.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx
index 5c33146b40740daea11804a4f15eeb30e2cb6140..71898701b60039ba0472c73d1f8c4d10446e87ab 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestLeakyAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonTests includes
#include "PerfMonTestLeakyAlg.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx
index 355a8ec75f1f6ed5ab0d9fc8bd021dc74296fbce..e6be77aa4479d29989a83b5d889e30fee590f655 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestMallocAlg.cxx
@@ -14,7 +14,7 @@
#include <vector>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
// CLHEP includes
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx
index c85af253a76f5571ab1e0e01a3d7a25e759460a3..223c1e657ec5f13d043ace891faa3ba3e7a8bcff 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestManyLeaksAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonTests includes
#include "PerfMonTestManyLeaksAlg.h"
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx
index bf53de8b2c228fedbb0cd2560be89c0086607450..1db0085ed69e5358f40b39424d75e5ac438400f8 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestNoopAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// PerfMonTests includes
#include "PerfMonTestNoopAlg.h"
diff --git a/Control/PileUpComps/src/ArrayBM.h b/Control/PileUpComps/src/ArrayBM.h
index 3ad51af3f3ab31080b00e350d1849d343e1f0577..5ba940eabe3a3788d4a470364ef747733ad03caf 100644
--- a/Control/PileUpComps/src/ArrayBM.h
+++ b/Control/PileUpComps/src/ArrayBM.h
@@ -15,7 +15,7 @@
* @author Paolo Calafiura - ATLAS Collaboration
*/
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PileUpTools/IBeamIntensity.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Control/PileUpComps/src/BkgStreamsCache.cxx b/Control/PileUpComps/src/BkgStreamsCache.cxx
index 19c12ac71e410c5bd42229c6af6f0bedcc8f7776..5544502f045bbeacb7d48dc4f6f52a9db1f05731 100644
--- a/Control/PileUpComps/src/BkgStreamsCache.cxx
+++ b/Control/PileUpComps/src/BkgStreamsCache.cxx
@@ -80,7 +80,7 @@ BkgStreamsCache::~BkgStreamsCache()
}
void
-BkgStreamsCache::PileUpEventTypeHandler(Property&)
+BkgStreamsCache::PileUpEventTypeHandler(Gaudi::Details::PropertyBase&)
{
m_pileUpEventType = xAOD::EventInfo::PileUpInt2Type( m_pileUpEventTypeProp.value() );
}
diff --git a/Control/PileUpComps/src/BkgStreamsCache.h b/Control/PileUpComps/src/BkgStreamsCache.h
index da3ba4cd572d7d59b82fc7ffe953d3239f45d585..847f710618e71e31b0944fc9853ba642bf5163ec 100644
--- a/Control/PileUpComps/src/BkgStreamsCache.h
+++ b/Control/PileUpComps/src/BkgStreamsCache.h
@@ -17,7 +17,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PileUpTools/PileUpStream.h"
#include "PileUpTools/IBkgStreamsCache.h"
@@ -123,7 +123,7 @@ private:
Gaudi::Property<std::string> m_randomStreamName;
/// the type of events in this cache
Gaudi::CheckedProperty<unsigned short> m_pileUpEventTypeProp;
- void PileUpEventTypeHandler(Property&);
+ void PileUpEventTypeHandler(Gaudi::Details::PropertyBase&);
/// the type of events in this cache
xAOD::EventInfo::PileUpType m_pileUpEventType;
/// subtract from number of events at bunch xing = 0
diff --git a/Control/PileUpComps/src/FixedArrayBM.h b/Control/PileUpComps/src/FixedArrayBM.h
index cd038f68d06330882ab1baefae60d3fc29123ec0..f2e9976cb9e76b8066fee786696d4d9360fa92a5 100644
--- a/Control/PileUpComps/src/FixedArrayBM.h
+++ b/Control/PileUpComps/src/FixedArrayBM.h
@@ -15,7 +15,7 @@
*
* @author John Chapman - ATLAS Collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PileUpTools/IBeamIntensity.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Control/PileUpComps/src/LumiProfileSvc.h b/Control/PileUpComps/src/LumiProfileSvc.h
index 4596fc73eba488ea6c94bc2d37f753d7d6d0a574..f060ce1423ab8fe5b77bfa0b36de0221c295c90b 100644
--- a/Control/PileUpComps/src/LumiProfileSvc.h
+++ b/Control/PileUpComps/src/LumiProfileSvc.h
@@ -13,7 +13,7 @@
*/
#include "PileUpTools/IBeamLuminosity.h"
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class LumiProfileSvc : public extends<AthService, IBeamLuminosity>
{
diff --git a/Control/PileUpComps/src/NoProfileSvc.h b/Control/PileUpComps/src/NoProfileSvc.h
index 8194fe2541079df40868638a0881dc86f8e347f6..5aef57ec40bd6847be93f8b77b8a49788f6af9fb 100644
--- a/Control/PileUpComps/src/NoProfileSvc.h
+++ b/Control/PileUpComps/src/NoProfileSvc.h
@@ -13,7 +13,7 @@
*/
#include "PileUpTools/IBeamLuminosity.h"
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class NoProfileSvc : public extends<AthService, IBeamLuminosity>
{
diff --git a/Control/PileUpComps/src/PileUpEventLoopMgr.h b/Control/PileUpComps/src/PileUpEventLoopMgr.h
index 0dd7117de5d02df9d2669e9755e233778147e60b..22bceb611061dcd02cdb0551ef46df6171351312 100644
--- a/Control/PileUpComps/src/PileUpEventLoopMgr.h
+++ b/Control/PileUpComps/src/PileUpEventLoopMgr.h
@@ -18,7 +18,7 @@
#include "PileUpTools/PileUpStream.h"
// Gaudi headers
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IAlgExecStateSvc.h"
diff --git a/Control/PileUpComps/src/StepArrayBM.h b/Control/PileUpComps/src/StepArrayBM.h
index 7ade012693b3873a48b0d0df732ff9b5a66a36d8..858e5a33b808c81e1b19eae70fb3ebd112225c9a 100644
--- a/Control/PileUpComps/src/StepArrayBM.h
+++ b/Control/PileUpComps/src/StepArrayBM.h
@@ -15,7 +15,7 @@
* $Id: BkgStreamsStepCache.h,v 1.10 2008-08-28 01:11:06 calaf Exp $
* @author Will Buttinger - ATLAS Collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PileUpTools/IBeamIntensity.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
index e17497eb62a41b457fe416dd2624efe49653657e..9561b3cdd582ba0187c7da2320f92fa564620c26 100755
--- a/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
+++ b/Control/PileUpTools/PileUpTools/PileUpMergeSvc.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/** @file PileUpMergeSvc.h
@@ -20,12 +20,13 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/ClassID.h"
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h" /*StringArrayProperty*/
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthLinks/DataLink.h"
+#include "AthenaKernel/SlotSpecificObj.h"
#include "PileUpTools/IPileUpXingFolder.h"
@@ -34,6 +35,7 @@
#include <list>
#include <map>
#include <utility> /*std::pair*/
+#include <mutex>
class ActiveStoreSvc;
class ISvcLocator;
@@ -123,6 +125,10 @@ private:
ServiceHandle<ActiveStoreSvc> p_activeStore; ///< current active store
ToolHandleArray<IPileUpXingFolder> m_intervals; ///< Property: bunch xing intervals
+ // Protect against multiple threads trying to make EventInfo
+ // for the same slot.
+ mutable SG::SlotSpecificObj<std::mutex> m_slotMutex;
+
template <typename DATA, typename KEY>
bool isLive(const KEY& key, int iXing); ///< is iXing live for DATA/key?
bool isLive(CLID id, const std::string& dataKey, int iXing);
diff --git a/Control/PileUpTools/src/PileUpMergeSvc.cxx b/Control/PileUpTools/src/PileUpMergeSvc.cxx
index e71413a676df0e9f6fbe6d5073cecbbc751a78a9..b5af613ade38f6e56266bc0da338728eb39a4a6d 100755
--- a/Control/PileUpTools/src/PileUpMergeSvc.cxx
+++ b/Control/PileUpTools/src/PileUpMergeSvc.cxx
@@ -146,6 +146,11 @@ const xAOD::EventInfo* PileUpMergeSvc::getPileUpEvent( StoreGateSvc* sg, const s
}
}
} else {
+ // Don't allow more than one thread per slot through here.
+ // Otherwise, we can get errors with multiple threads trying
+ // to record the EventInfo object.
+ std::lock_guard<std::mutex> lock (*m_slotMutex);
+
// Try reading old EventInfo
const EventInfo* pEvent = einame.empty()?
sg->tryConstRetrieve< ::EventInfo >()
diff --git a/Control/RngComps/src/AtDSFMTGenSvc.h b/Control/RngComps/src/AtDSFMTGenSvc.h
index 525a574a795138da357e32bbad1c19d31821b238..5161bb17ced627abc8abaf3ae75e800a8901a1d3 100644
--- a/Control/RngComps/src/AtDSFMTGenSvc.h
+++ b/Control/RngComps/src/AtDSFMTGenSvc.h
@@ -21,7 +21,7 @@
#include "AthenaBaseComps/AthService.h"
#include "CLHEP/Random/RandomEngine.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class IAlgorithm;
class ISvcLocator;
diff --git a/Control/RngComps/src/AtRanluxGenSvc.h b/Control/RngComps/src/AtRanluxGenSvc.h
index 4f05712f3c96c9352f97ab16888e4f59bef275bb..0b247522f6a07c5ebb97a4b74866340c37e79013 100644
--- a/Control/RngComps/src/AtRanluxGenSvc.h
+++ b/Control/RngComps/src/AtRanluxGenSvc.h
@@ -18,7 +18,7 @@
#include "AthenaKernel/IAtRndmGenSvc.h"
#include "GaudiKernel/IIncidentListener.h"
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Random/Ranlux64Engine.h"
diff --git a/Control/SGComps/src/AddressRemappingSvc.h b/Control/SGComps/src/AddressRemappingSvc.h
index 51212b90dce24afff118adf1cf3d693851335039..078fe72b1bd9046193c6ff5146cf937278a873a1 100644
--- a/Control/SGComps/src/AddressRemappingSvc.h
+++ b/Control/SGComps/src/AddressRemappingSvc.h
@@ -15,7 +15,7 @@
#include "GaudiKernel/ClassID.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" // no forward decl: typedef
+#include "Gaudi/Property.h" // no forward decl: typedef
#include "AthenaKernel/IAddressProvider.h"
#include "AthenaKernel/IInputRename.h"
#include "AthenaKernel/RCUObject.h"
diff --git a/Control/SGComps/src/ProxyProviderSvc.cxx b/Control/SGComps/src/ProxyProviderSvc.cxx
index 06a4b847fab8b0d08f892b5b054bc99d37d4be2c..7a433abf7d84f09eb3ee9d1b84a94edc2a6fb70c 100644
--- a/Control/SGComps/src/ProxyProviderSvc.cxx
+++ b/Control/SGComps/src/ProxyProviderSvc.cxx
@@ -294,7 +294,7 @@ const EventContext& ProxyProviderSvc::contextFromStore (IProxyRegistry& ds) cons
void
-ProxyProviderSvc::providerNamesPropertyHandler( Property& /*theProp*/ ) {
+ProxyProviderSvc::providerNamesPropertyHandler( Gaudi::Details::PropertyBase& /*theProp*/ ) {
//add declared providers to the list;
std::vector<std::string>::const_iterator iN(m_providerNames.value().begin());
std::vector<std::string>::const_iterator iEnd(m_providerNames.value().end());
diff --git a/Control/SGComps/src/ProxyProviderSvc.h b/Control/SGComps/src/ProxyProviderSvc.h
index cedefd94c7e050aa043dbacd76cf8657f57c000e..9b5e876f4558f08a6d66ec0b92c54ce730bba438 100644
--- a/Control/SGComps/src/ProxyProviderSvc.h
+++ b/Control/SGComps/src/ProxyProviderSvc.h
@@ -16,7 +16,7 @@
#include "AthenaKernel/IProxyProviderSvc.h"
#include "AthenaKernel/StoreID.h"
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h" /*StringArrayProperty*/
#include "GaudiKernel/StatusCode.h"
#include <cassert>
#include <list>
@@ -103,7 +103,7 @@ private:
StringArrayProperty m_providerNames{this,"ProviderNames",{},
"names of the services to be use as address providers","OrderedSet<std::string>"};
/// the handler for m_providerNames
- void providerNamesPropertyHandler( Property& theProp );
+ void providerNamesPropertyHandler( Gaudi::Details::PropertyBase& theProp );
StatusCode doPreLoadProxies(IProxyRegistry& storeToModify);
diff --git a/Control/SGComps/src/SGFolder.h b/Control/SGComps/src/SGFolder.h
index 011fdc7a76a9db2bca4c760ea43b9bcba285e84b..ab48af801b58908d79bcd83355d4a6409bb45845 100644
--- a/Control/SGComps/src/SGFolder.h
+++ b/Control/SGComps/src/SGFolder.h
@@ -92,7 +92,7 @@ namespace SG {
ServiceHandle<IClassIDSvc> m_pCLIDSvc;
/// property: the list of items (data objects identified by a class name/key pair)
StringArrayProperty m_itemList;
- void decodeItemList(Property&) {
+ void decodeItemList(Gaudi::Details::PropertyBase&) {
const bool DONTCHECKVALIDCLID(false);
updateItemList(DONTCHECKVALIDCLID);
}
diff --git a/Control/SGComps/src/SGInputLoader.cxx b/Control/SGComps/src/SGInputLoader.cxx
index 8e277cc5df3d69c59d62065c11821cf16a516e89..6bc175d0ef462f7fadf8de830c9824c7a9057b98 100644
--- a/Control/SGComps/src/SGInputLoader.cxx
+++ b/Control/SGComps/src/SGInputLoader.cxx
@@ -11,7 +11,7 @@
#include "SGInputLoader.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
#include "StoreGate/VarHandleKey.h"
#include "AthenaKernel/StoreID.h"
@@ -141,7 +141,7 @@ SGInputLoader::execute()
//---------------------------------------------------------------------------------
void
-SGInputLoader::loader(Property& p ) {
+SGInputLoader::loader(Gaudi::Details::PropertyBase& p ) {
ATH_MSG_DEBUG("setting prop ExtraOutputs to " << p.toString());
diff --git a/Control/SGComps/src/SGInputLoader.h b/Control/SGComps/src/SGInputLoader.h
index 7380b6993c858295fe8448a128581c6ef2dcde23..a8a5e043566a3b77d45eca45b541112b3be07de4 100644
--- a/Control/SGComps/src/SGInputLoader.h
+++ b/Control/SGComps/src/SGInputLoader.h
@@ -39,7 +39,7 @@ class SGInputLoader
/// Default constructor:
SGInputLoader();
- void loader(Property&);
+ void loader(Gaudi::Details::PropertyBase&);
bool loadObjs(const DataObjIDColl& objs) const;
/// Properties
diff --git a/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx b/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
index 54c1da1051f8ac2bb951dca6e48a98176e529340..a4bb5a99387753c55547a91d404d6ab828edfe30 100644
--- a/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
+++ b/Control/SGMon/SGAudSvc/src/SGAudSvc.cxx
@@ -18,7 +18,7 @@
#include <utility>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/IAlgContextSvc.h"
diff --git a/Control/SGTools/test/DataProxy_test.cxx b/Control/SGTools/test/DataProxy_test.cxx
index 94b9d08ad4c981c1a7f6d61b7ace201ca8ae1e0b..bcb09cbf455f12740fad967232933d2ff6dc85a7 100644
--- a/Control/SGTools/test/DataProxy_test.cxx
+++ b/Control/SGTools/test/DataProxy_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file DataProxy_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -20,8 +18,11 @@
#include "AthenaKernel/IProxyDict.h"
#include "AthenaKernel/ILockable.h"
#include "AthenaKernel/IResetable.h"
+#include "AthenaKernel/BaseInfo.h"
#include "GaudiKernel/IConversionSvc.h"
#include "GaudiKernel/IOpaqueAddress.h"
+#include "boost/format.hpp"
+#include <chrono>
#include <iostream>
#include <cstdlib>
#include <cassert>
@@ -29,7 +30,9 @@
struct X1
{
- ~X1() {}
+ X1(int x1 = 0) : m_x1(x1) {}
+ virtual ~X1() {}
+ int m_x1;
};
CLASS_DEF(X1, 8011, 1)
@@ -308,8 +311,172 @@ void test5()
}
-int main()
+//***************************************************************************
+// Tests for benchmarking DataProxy pointer conversion operations.
+//
+
+
+struct X2
+ : public X1
+{
+ X2 (int x) : X1(x), m_x2 (x*2) {}
+ int m_x2;
+};
+SG_BASE( X2, X1 );
+CLASS_DEF(X2, 8125, 1)
+
+
+struct X3
+ : public X2
+{
+ X3 (int x) : X2(x), m_x3 (x*3) {}
+ int m_x3;
+};
+SG_BASE( X3, X2 );
+CLASS_DEF(X3, 8126, 1)
+
+
+struct X4
+ : virtual public X1
+{
+ X4 (int x) : X1(x), m_x4 (x*4) {}
+ int m_x4;
+};
+SG_BASE( X4, SG_VIRTUAL(X1) );
+CLASS_DEF(X4, 8127, 1)
+
+
+struct X5
+ : public X4, virtual public X1
+{
+ X5 (int x) : X1(x), X4(x), m_x5 (x*5) {}
+ int m_x5;
+};
+SG_BASES2( X5, X4, SG_VIRTUAL(X1) );
+CLASS_DEF(X5, 8128, 1)
+
+
+template <class TARGET>
+float time_bucket_clid (const int n, DataBucketBase& dbb)
+{
+ CLID clid = ClassID_traits<TARGET>::ID();
+ auto start = std::chrono::steady_clock::now();
+ for (int i=0; i < n; i++) {
+ const TARGET* t = static_cast<const TARGET*> (dbb.cast (clid));
+ assert (t->m_x1 == 10);
+ }
+ auto end = std::chrono::steady_clock::now();
+ std::chrono::duration<float> elapsed = end - start;
+ return elapsed.count() / n * 1e9;
+}
+
+
+template <class TARGET>
+float time_bucket_ti (const int n, DataBucketBase& dbb)
+{
+ const std::type_info& ti = typeid (TARGET);
+ auto start = std::chrono::steady_clock::now();
+ for (int i=0; i < n; i++) {
+ const TARGET* t = static_cast<const TARGET*> (dbb.cast (ti));
+ assert (t->m_x1 == 10);
+ }
+ auto end = std::chrono::steady_clock::now();
+ std::chrono::duration<float> elapsed = end - start;
+ return elapsed.count() / n * 1e9;
+}
+
+
+template <class TARGET>
+float time_storable (const int n, DataBucketBase& dbb, SG::DataProxy& proxy)
+{
+ auto start = std::chrono::steady_clock::now();
+ for (int i=0; i < n; i++) {
+ const TARGET* t = SG::Storable_cast<TARGET> (&dbb, true, &proxy, true);
+ assert (t->m_x1 == 10);
+ }
+ auto end = std::chrono::steady_clock::now();
+ std::chrono::duration<float> elapsed = end - start;
+ return elapsed.count() / n * 1e9;
+}
+
+
+template <class TARGET>
+float time_proxy (const int n, SG::DataProxy& proxy)
+{
+ auto start = std::chrono::steady_clock::now();
+ for (int i=0; i < n; i++) {
+ const TARGET* t = SG::DataProxy_cast<TARGET> (&proxy);
+ assert (t->m_x1 == 10);
+ }
+ auto end = std::chrono::steady_clock::now();
+ std::chrono::duration<float> elapsed = end - start;
+ return elapsed.count() / n * 1e9;
+}
+
+
+float time_access (const int n, SG::DataProxy& proxy)
+{
+ auto start = std::chrono::steady_clock::now();
+ for (int i=0; i < n; i++) {
+ if (proxy.isValid()) proxy.accessData();
+ }
+ auto end = std::chrono::steady_clock::now();
+ std::chrono::duration<float> elapsed = end - start;
+ return elapsed.count() / n * 1e9;
+}
+
+
+template <class SOURCE, class TARGET>
+void perftest1 (const int n)
+{
+ auto x1 = std::make_unique<SOURCE>(10);
+ auto dbb = std::make_unique<SG::DataBucket<SOURCE> > (std::move (x1));
+ auto dbb_ptr = dbb.get();
+ float t_clid = time_bucket_clid<TARGET> (n, *dbb);
+ float t_ti = time_bucket_ti<TARGET> (n, *dbb);
+ SG::TransientAddress taddr (ClassID_traits<X2>::ID(), "foo");
+ SG::DataProxy dp (dbb.release(), std::move (taddr));
+ float t_storable = time_storable<TARGET> (n, *dbb_ptr, dp);
+ float t_dp = time_proxy<TARGET> (n, dp);
+ float t_acc = time_access (n, dp);
+ std::cout << boost::format ("%2s -> %2s %6.2f %6.2f %6.2f %6.2f %6.2f\n")
+ % ClassID_traits<SOURCE>::typeName()
+ % ClassID_traits<TARGET>::typeName()
+ % t_clid
+ % t_ti
+ % t_storable
+ % t_dp
+ % t_acc;
+}
+
+
+void perftest (const int n)
+{
+ std::cout << boost::format (" %6s %6s %6s %6s %6s\n")
+ % "clid" % "ti" % "storab" % "proxy" % "acc";
+
+ perftest1<X1, X1> (n);
+ perftest1<X2, X1> (n);
+ perftest1<X3, X1> (n);
+ perftest1<X4, X1> (n);
+ perftest1<X5, X1> (n);
+}
+
+
+//***************************************************************************
+
+
+int main (int argc, char** argv)
{
+ if (argc >= 2 && std::string (argv[1]) == "--perf") {
+ int n = 1000000;
+ if (argc >= 3) {
+ n = atoi (argv[2]);
+ }
+ perftest(n);
+ return 0;
+ }
+
test1();
test2();
test3();
diff --git a/Control/StoreGate/StoreGate/StoreGateSvc.h b/Control/StoreGate/StoreGate/StoreGateSvc.h
index 8b120b425cc546cbb941cc3f6ec8cbf15a5763a4..f45e3392be30d296cbe4eb7abe2ffe1b57494eef 100644
--- a/Control/StoreGate/StoreGate/StoreGateSvc.h
+++ b/Control/StoreGate/StoreGate/StoreGateSvc.h
@@ -25,7 +25,7 @@
#include <GaudiKernel/ClassID.h> // for CLID
#include <GaudiKernel/IInterface.h> // for InterfaceID
#include <GaudiKernel/IMessageSvc.h> // for Level
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObjID.h"
@@ -921,7 +921,7 @@ private:
void t2pRemove(const void* const pTrans);
/// callback for output level property
- void msg_update_handler(Property& outputLevel);
+ void msg_update_handler(Gaudi::Details::PropertyBase& outputLevel);
/// Add automatically-made symlinks for DP.
void addAutoSymLinks (const std::string& key, CLID clid, SG::DataProxy* dp,
diff --git a/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h b/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
index cd26c7e1b450d373f2f5b64283ee8a5551270558..ddf7b6093a31ddf55a13fffb8c41a594936f00d4 100644
--- a/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
+++ b/Control/StoreGate/StoreGate/VarHandleKeyArrayProperty.h
@@ -15,7 +15,7 @@
#include "StoreGate/VarHandleKeyArray.h"
#include "StoreGate/ReadHandleKeyArray.h"
#include "StoreGate/WriteHandleKeyArray.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <iostream>
namespace Gaudi {
@@ -44,9 +44,9 @@ namespace SG {
VarHandleKeyArrayProperty* clone() const override;
- bool load( Property& destination ) const override;
+ bool load( Gaudi::Details::PropertyBase& destination ) const override;
- bool assign( const Property& source ) override;
+ bool assign( const Gaudi::Details::PropertyBase& source ) override;
std::string toString() const override;
diff --git a/Control/StoreGate/StoreGate/VarHandleKeyProperty.h b/Control/StoreGate/StoreGate/VarHandleKeyProperty.h
index e513c0d32e3b3024bb2c2e9a66a5247bbee99eb9..1f2cd81d32c33f128802672b77067adc2af6ec56 100644
--- a/Control/StoreGate/StoreGate/VarHandleKeyProperty.h
+++ b/Control/StoreGate/StoreGate/VarHandleKeyProperty.h
@@ -29,7 +29,7 @@
#include "StoreGate/UpdateHandleKey.h"
#include "StoreGate/ReadDecorHandleKey.h"
#include "StoreGate/WriteDecorHandleKey.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <iostream>
namespace Gaudi {
@@ -116,7 +116,7 @@ public:
* by converting to a string and back again. Returns true on success,
* false on failure.
*/
- virtual bool load( Property& destination ) const override;
+ virtual bool load( Gaudi::Details::PropertyBase& destination ) const override;
/**
@@ -127,7 +127,7 @@ public:
* by converting to a string and back again. Returns true on success,
* false on failure.
*/
- virtual bool assign( const Property& source ) override;
+ virtual bool assign( const Gaudi::Details::PropertyBase& source ) override;
/**
diff --git a/Control/StoreGate/StoreGate/tools/SGImplSvc.h b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
index 1e144ed229b0076d641aa2ad7082a17d33a9babd..0e6cb93210b6839ce7686c8fe49b6527692484a5 100644
--- a/Control/StoreGate/StoreGate/tools/SGImplSvc.h
+++ b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
@@ -23,7 +23,7 @@
#include <GaudiKernel/IInterface.h> // for InterfaceID
#include <GaudiKernel/IMessageSvc.h> // for Level
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h" /*StringArrayProperty*/
+#include "Gaudi/Property.h"
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/DataObjID.h"
@@ -665,7 +665,7 @@ private:
void t2pRemove(const void* const pTrans);
/// callback for output level property
- void msg_update_handler(Property& outputLevel);
+ void msg_update_handler(Gaudi::Details::PropertyBase& outputLevel);
bool associateAux_impl (SG::AuxVectorBase* ptr,
const std::string& key,
diff --git a/Control/StoreGate/src/SGImplSvc.cxx b/Control/StoreGate/src/SGImplSvc.cxx
index d950f8257e0f4151b0b5add0b603cdf86569ee2b..ed2141f4c4c10925873a29dffb4c7f8d2accac76 100644
--- a/Control/StoreGate/src/SGImplSvc.cxx
+++ b/Control/StoreGate/src/SGImplSvc.cxx
@@ -1341,7 +1341,7 @@ SGImplSvc::t2pRemove(const void* const pTrans)
}
void
-SGImplSvc::msg_update_handler(Property& /*outputLevel*/)
+SGImplSvc::msg_update_handler(Gaudi::Details::PropertyBase& /*outputLevel*/)
{
setUpMessaging();
updateMsgStreamOutputLevel( outputLevel() );
diff --git a/Control/StoreGate/src/StoreGateSvc.cxx b/Control/StoreGate/src/StoreGateSvc.cxx
index 2ad8e4181e8a72be2423d8cfbec564bfd72cb721..91507770becab79731c512d00a7f63ebfa989bea 100644
--- a/Control/StoreGate/src/StoreGateSvc.cxx
+++ b/Control/StoreGate/src/StoreGateSvc.cxx
@@ -123,17 +123,17 @@ StatusCode StoreGateSvc::initialize() {
IProperty* appmgrprop = 0;
appmgr->queryInterface( IProperty::interfaceID(), (void**)&appmgrprop ).ignore();
//all of the above to get the jo svc type
- const Property& prop = appmgrprop->getProperty( "JobOptionsSvcType" );
+ const Gaudi::Details::PropertyBase& prop = appmgrprop->getProperty( "JobOptionsSvcType" );
IJobOptionsSvc* pJOSvc(0);
if ( serviceLocator()->service( prop.toString(), "JobOptionsSvc", pJOSvc ).isFailure() ) {
error() << "Failed to retrieve JobOptionsSvc" << endmsg;
}
//copy our properties to the prototype (default) SGImplSvc
std::string implStoreName = name() + "_Impl";
- const std::vector<const Property*>* props = pJOSvc->getProperties( name() );
+ const std::vector<const Gaudi::Details::PropertyBase*>* props = pJOSvc->getProperties( name() );
if ( props ) {
- std::vector<const Property*>::const_iterator prop(props->begin());
- std::vector<const Property*>::const_iterator pEnd(props->end());
+ std::vector<const Gaudi::Details::PropertyBase*>::const_iterator prop(props->begin());
+ std::vector<const Gaudi::Details::PropertyBase*>::const_iterator pEnd(props->end());
while (prop != pEnd) {
pJOSvc->addPropertyToCatalogue( implStoreName, **prop ).ignore();
++prop;
diff --git a/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx b/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
index 8dd7cf32383ddba130eaa06be71721d6df4c2d64..d116a9d6c0c1e8012a8baea7f906fa82cf67f13a 100644
--- a/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
+++ b/Control/StoreGate/src/VarHandleKeyArrayProperty.cxx
@@ -62,7 +62,7 @@ VarHandleKeyArrayProperty::clone() const
* false on failure.
*/
bool
-VarHandleKeyArrayProperty::load( Property& destination ) const
+VarHandleKeyArrayProperty::load( Gaudi::Details::PropertyBase& destination ) const
{
return destination.assign( *this );
}
@@ -77,7 +77,7 @@ VarHandleKeyArrayProperty::load( Property& destination ) const
* false on failure.
*/
bool
-VarHandleKeyArrayProperty::assign( const Property& source )
+VarHandleKeyArrayProperty::assign( const Gaudi::Details::PropertyBase& source )
{
return fromString( source.toString() ).isSuccess();
}
diff --git a/Control/StoreGate/src/VarHandleKeyProperty.cxx b/Control/StoreGate/src/VarHandleKeyProperty.cxx
index caaace59a506b5187c2d7687ad61cfd0da97cc5f..97f29db2aa857e84b5e680d6e247707438500e53 100644
--- a/Control/StoreGate/src/VarHandleKeyProperty.cxx
+++ b/Control/StoreGate/src/VarHandleKeyProperty.cxx
@@ -121,7 +121,7 @@ VarHandleKeyProperty::clone() const
* false on failure.
*/
bool
-VarHandleKeyProperty::load( Property& destination ) const
+VarHandleKeyProperty::load( Gaudi::Details::PropertyBase& destination ) const
{
return destination.assign( *this );
}
@@ -136,7 +136,7 @@ VarHandleKeyProperty::load( Property& destination ) const
* false on failure.
*/
bool
-VarHandleKeyProperty::assign( const Property& source )
+VarHandleKeyProperty::assign( const Gaudi::Details::PropertyBase& source )
{
return fromString( source.toString() ).isSuccess();
}
diff --git a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
index dd41003f2fae52167f596fa3a2eb1a937df2dcf0..b00304549bba12948bd21ab6ffa706a1d97fb064 100644
--- a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
@@ -193,13 +193,13 @@ public:
{ return mgr.setProperty(n, p); }
virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r ) override
{ return mgr.setPropertyRepr(n,r); }
- virtual StatusCode getProperty( Property* p ) const override
+ virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const override
{ return mgr.getProperty (p); }
- virtual const Property& getProperty( const std::string& name) const override
+ virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name) const override
{ return mgr.getProperty (name); }
virtual StatusCode getProperty( const std::string& n, std::string& v ) const override
{ return mgr.getProperty (n, v); }
- virtual const std::vector<Property*>& getProperties( ) const override
+ virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const override
{ return mgr.getProperties(); }
virtual bool hasProperty(const std::string& name) const override
{ return mgr.hasProperty(name); }
diff --git a/Control/StoreGate/test/VarHandleProperty_test.cxx b/Control/StoreGate/test/VarHandleProperty_test.cxx
index 9736dda12934f07ab2d665ff58496f0ae01caf2d..a170450a6520dae837bd564775f6363e30034215 100644
--- a/Control/StoreGate/test/VarHandleProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleProperty_test.cxx
@@ -56,13 +56,13 @@ public:
{ return mgr.setProperty(n, p); }
virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r ) override
{ return mgr.setPropertyRepr(n,r); }
- virtual StatusCode getProperty( Property* p ) const override
+ virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const override
{ return mgr.getProperty (p); }
- virtual const Property& getProperty( const std::string& name) const override
+ virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name) const override
{ return mgr.getProperty (name); }
virtual StatusCode getProperty( const std::string& n, std::string& v ) const override
{ return mgr.getProperty (n, v); }
- virtual const std::vector<Property*>& getProperties( ) const override
+ virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const override
{ return mgr.getProperties(); }
virtual bool hasProperty(const std::string& name) const override
{ return mgr.hasProperty(name); }
diff --git a/Control/StoreGateTests/src/SgStressConsumer.cxx b/Control/StoreGateTests/src/SgStressConsumer.cxx
index 71d28426e52fc5e059c59b5d9d4585653074f6cc..ab58d5216b4f5663f09a31f9a3d78ff3613f9601 100755
--- a/Control/StoreGateTests/src/SgStressConsumer.cxx
+++ b/Control/StoreGateTests/src/SgStressConsumer.cxx
@@ -14,7 +14,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
diff --git a/Control/StoreGateTests/src/SgStressProducer.cxx b/Control/StoreGateTests/src/SgStressProducer.cxx
index 110b019fd2951aa2dbee81712ffef9fe8613d96c..d08eae45f07183fae7beefe7fc41f2266772f1b8 100755
--- a/Control/StoreGateTests/src/SgStressProducer.cxx
+++ b/Control/StoreGateTests/src/SgStressProducer.cxx
@@ -14,7 +14,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
diff --git a/Control/Valkyrie/src/ValgrindSvc.cxx b/Control/Valkyrie/src/ValgrindSvc.cxx
index 43381e0606fa7b80e2eda85404877e369e01a254..fc514c28548163b418be76833f9fe9f6b2b74b4b 100755
--- a/Control/Valkyrie/src/ValgrindSvc.cxx
+++ b/Control/Valkyrie/src/ValgrindSvc.cxx
@@ -16,7 +16,7 @@
#include "valgrind/callgrind.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/Control/xAODRootAccess/Root/TEvent.cxx b/Control/xAODRootAccess/Root/TEvent.cxx
index 82e5023ffea750f03b5741ccf240fd95f452824a..056528db31f0c969d133bdf78e03355cb943a848 100644
--- a/Control/xAODRootAccess/Root/TEvent.cxx
+++ b/Control/xAODRootAccess/Root/TEvent.cxx
@@ -1109,19 +1109,6 @@ namespace xAOD {
XAOD_MESSAGE( "Internal logic error detected" ) );
return TReturnCode::kFailure;
}
- // Set up the filtering:
- if( filter ) {
- void* io1 = auxMgr->holder()->getAs( typeid( SG::IAuxStoreIO ) );
- SG::IAuxStoreIO* io2 = reinterpret_cast< SG::IAuxStoreIO* >( io1 );
- if( ! io2 ) {
- ::Error( "xAOD::TEvent::copy",
- XAOD_MESSAGE( "Couldn't get SG::IAuxStoreIO pointer to "
- "object: %s" ),
- ( keyToUse + "Aux." ).c_str() );
- return TReturnCode::kFailure;
- }
- io2->selectAux( *filter );
- }
RETURN_CHECK( "xAOD::TEvent::copy",
record( auxMgr->object(),
auxMgr->holder()->getClass()->GetName(),
@@ -3097,16 +3084,17 @@ namespace xAOD {
// Check if we have rules defined for which auxiliary properties
// to write out:
+ xAOD::AuxSelection sel;
if( ! metadata ) {
auto item_itr = m_auxItemList.find( mgr->branch()->GetName() );
if( item_itr != m_auxItemList.end() ) {
- aux->selectAux( item_itr->second );
+ sel.selectAux( item_itr->second );
}
}
// Get the dynamic auxiliary variables held by this object, which
// were selected to be written:
- const SG::auxid_set_t auxids = aux->getSelectedAuxIDs();
+ const SG::auxid_set_t auxids = sel.getSelectedAuxIDs (aux->getSelectedAuxIDs());
// If there are no dynamic auxiliary variables in the object, return
// right away:
diff --git a/DataQuality/DataQualityInterfaces/DataQualityInterfaces/HanConfig.h b/DataQuality/DataQualityInterfaces/DataQualityInterfaces/HanConfig.h
index 8c655f6fed6c2839a143b1732a636003730ed0e9..b0d0d6426017efaa524f13efb8138738a8a91458 100644
--- a/DataQuality/DataQualityInterfaces/DataQualityInterfaces/HanConfig.h
+++ b/DataQuality/DataQualityInterfaces/DataQualityInterfaces/HanConfig.h
@@ -47,7 +47,9 @@ public:
virtual ~HanConfig();
- virtual void AssembleAndSave( std::string infileName, std::string outfileName, std::string connectionString, long runNumber, bool bulk);
+ virtual void AssembleAndSave( std::string infileName, std::string outfileName,
+ std::string connectionString="sqlite://;schema=/afs/cern.ch/user/a/atlasdqm/dqmdisk1/cherrypy-devel/RefDB.db;dbname=REFDB",
+ long runNumber=2147483646, bool bulk=false);
virtual void BuildMonitors( std::string configName, dqm_core::Input& input, HanOutput& output );
#ifndef __CINT__
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
index 5dd8b78c7465387a025128620bd1236ba789e724..a8c03cec08640d098c5d2808da1ce8af68a727ed 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
@@ -1,22 +1,22 @@
-Mon Aug 3 17:11:40 CEST 20?0
+Fri Aug 7 15:15:34 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ConcatJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5545 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5548 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on lxplus706.cern.ch on Mon Aug 3 17:11:48 20?0
+ running on atpc002 on Fri Aug 7 15:15:42 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3312 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3316 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 705 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 581 CLIDRegistry entries for module ALL
@@ -32,8 +32,8 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog1.xml) [ok
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-02T2137/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus706.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -44,7 +44,7 @@ MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-ClassIDSvc INFO getRegistryEntries: read 1147 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1137 CLIDRegistry entries for module ALL
WriteData DEBUG Property update for OutputLevel : new value = 2
WriteData INFO in initialize()
WriteData DEBUG input handles: 0
@@ -82,13 +82,14 @@ Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
-Stream1 DEBUG output handles: 1
+Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
+ INPUT ( 'AthenaAttributeList' , 'StoreGateSvc+SimpleTag' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream1' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream1' )
MakeInputDataHe... INFO Initializing MakeInputDataHeader - package version OutputStreamAthenaPool-00-00-00
MakeInputDataHe... INFO Name of Stream to be made Input: Stream1
@@ -115,13 +116,14 @@ Stream2 INFO I/O reinitialization...
Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
Stream2 DEBUG End initialize
Stream2 DEBUG input handles: 0
-Stream2 DEBUG output handles: 1
+Stream2 DEBUG output handles: 2
Stream2 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2_MakeEventStreamInfo (MakeEventStreamInfo)
Stream2 DEBUG Adding private ToolHandle tool Stream2.ThinningCacheTool_Stream2 (Athena::ThinningCacheTool)
Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2Tool (AthenaOutputStreamTool)
Stream2 DEBUG Data Deps for Stream2
+ INPUT IGNORED ( 'AthenaAttributeList' , '' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream2' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream2' )
EventSelector INFO Enter McEventSelector Initialization
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
@@ -1701,11 +1703,11 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.0513(+- 0.714)/ 0/ 10 [ms] #=390
-commitOutput INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.238(+- 1.52)/ 0/ 10 [ms] #= 42
-cRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.242(+- 1.54)/ 0/ 10 [ms] #=124
-fRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.242(+- 1.54)/ 0/ 10 [ms] #=124
-ChronoStatSvc INFO Time User : Tot= 300 [ms] #= 1
+commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 42
+cRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.161(+- 1.26)/ 0/ 10 [ms] #=124
+cRepR_ALL INFO Time User : Tot= 60 [ms] Ave/Min/Max= 0.154(+- 1.23)/ 0/ 10 [ms] #=390
+fRep_ALL INFO Time User : Tot= 60 [ms] Ave/Min/Max= 0.484(+- 2.15)/ 0/ 10 [ms] #=124
+ChronoStatSvc INFO Time User : Tot= 330 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
index 77923852e2d1d51110981af5389db1aef7ac3a29..36521a79644d0a0921967039a695cb62ea7a46c5 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Copy.ref
@@ -1,22 +1,22 @@
-Mon Aug 3 17:56:12 CEST 20?0
+Fri Aug 7 15:14:55 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_CopyJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5545 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5548 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on lxplus706.cern.ch on Mon Aug 3 17:56:21 20?0
+ running on atpc002 on Fri Aug 7 15:15:03 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3312 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3316 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 609 CLIDRegistry entries for module ALL
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -28,8 +28,8 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog1.xml) [ok
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-02T2137/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus706.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -107,7 +107,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 1652 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1642 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -142,13 +142,14 @@ Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
-Stream1 DEBUG output handles: 1
+Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
+ INPUT ( 'AthenaAttributeList' , 'StoreGateSvc+SimpleTag' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream1' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream1' )
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
@@ -833,13 +834,13 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
+commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
fRep_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.161(+- 1.26)/ 0/ 10 [ms] #= 62
cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.156(+- 1.24)/ 0/ 10 [ms] #= 64
cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.154(+- 1.23)/ 0/ 10 [ms] #= 65
cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.323(+- 1.77)/ 0/ 10 [ms] #= 62
-ChronoStatSvc INFO Time User : Tot= 350 [ms] #= 1
+ChronoStatSvc INFO Time User : Tot= 300 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
index d4f218ec832b3d1bd0f3fb7a13073533260c675f..477a0266fc310e652b88a878141892066b9f23fb 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWrite.ref
@@ -1,22 +1,22 @@
-Mon Aug 3 17:18:44 CEST 20?0
+Fri Aug 7 15:14:35 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_RWJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5545 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5548 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on lxplus706.cern.ch on Mon Aug 3 17:18:52 20?0
+ running on atpc002 on Fri Aug 7 15:14:43 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3312 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3316 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 846 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 344 CLIDRegistry entries for module ALL
@@ -32,8 +32,8 @@ PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-02T2137/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus706.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -114,7 +114,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 1652 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1642 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolFile1... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -164,13 +164,14 @@ Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
-Stream1 DEBUG output handles: 1
+Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
+ INPUT ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream1' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream1' )
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
@@ -1906,13 +1907,13 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
-cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.317(+- 1.75)/ 0/ 10 [ms] #= 63
-cObjR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.303(+- 1.71)/ 0/ 10 [ms] #= 66
-cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.139(+- 1.17)/ 0/ 10 [ms] #=144
-fRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.484(+- 2.15)/ 0/ 10 [ms] #= 62
-ChronoStatSvc INFO Time User : Tot= 310 [ms] #= 1
+commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
+cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.159(+- 1.25)/ 0/ 10 [ms] #= 63
+cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.152(+- 1.22)/ 0/ 10 [ms] #= 66
+cRepR_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.208(+- 1.43)/ 0/ 10 [ms] #=144
+fRep_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max= 0.645(+- 2.46)/ 0/ 10 [ms] #= 62
+ChronoStatSvc INFO Time User : Tot= 290 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
index 19f77965187744cd963e125c6144429618b282f6..24e0640b8edad78541599cf89eb107b33d4b681e 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteAgain.ref
@@ -1,22 +1,22 @@
-Mon Aug 3 17:53:13 CEST 20?0
+Fri Aug 7 15:15:05 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ReWriteAgainJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5545 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5548 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on lxplus706.cern.ch on Mon Aug 3 17:53:22 20?0
+ running on atpc002 on Fri Aug 7 15:15:13 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3312 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3316 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 846 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 344 CLIDRegistry entries for module ALL
@@ -32,8 +32,8 @@ PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-02T2137/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus706.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -108,7 +108,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 1649 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1639 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolRepli... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -158,13 +158,14 @@ Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
-Stream1 DEBUG output handles: 1
+Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
+ INPUT ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream1' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream1' )
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
@@ -1961,13 +1962,13 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
-cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 65
-cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.159(+- 1.25)/ 0/ 10 [ms] #= 63
+fRep_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.161(+- 1.26)/ 0/ 10 [ms] #= 62
cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0694(+- 0.83)/ 0/ 10 [ms] #=144
-fRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.323(+- 1.77)/ 0/ 10 [ms] #= 62
-ChronoStatSvc INFO Time User : Tot= 310 [ms] #= 1
+commitOutput INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.476(+- 2.13)/ 0/ 10 [ms] #= 21
+cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.317(+- 1.75)/ 0/ 10 [ms] #= 63
+cObjR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.308(+- 1.73)/ 0/ 10 [ms] #= 65
+ChronoStatSvc INFO Time User : Tot= 250 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
index 526e9f83ade4a27d72589b2b9777b2efb78ea134..06a2c48dac9800f1649f1822bf0e246f032659b4 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_ReWriteNext.ref
@@ -1,22 +1,22 @@
-Mon Aug 3 17:50:27 CEST 20?0
+Fri Aug 7 15:15:15 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_ReWriteNextJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5545 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5548 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on lxplus706.cern.ch on Mon Aug 3 17:50:36 20?0
+ running on atpc002 on Fri Aug 7 15:15:23 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3312 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3316 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 846 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 344 CLIDRegistry entries for module ALL
@@ -32,8 +32,8 @@ PoolSvc DEBUG Service base class initialized successfully
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-02T2137/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus706.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -114,7 +114,7 @@ MetaDataHdr(Dat... DEBUG Opening
MetaDataHdr(Dat... DEBUG attributes# = 1
MetaDataHdr(Dat... DEBUG Branch container 'DataHeader'
MetaDataHdr(Dat... DEBUG Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
-ClassIDSvc INFO getRegistryEntries: read 1652 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1642 CLIDRegistry entries for module ALL
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
SimplePoolFile3... DEBUG --> Access DbContainer READ [ROOT_Tree] MetaDataHdrForm(DataHeaderForm)
MetaDataHdrForm... DEBUG Opening
@@ -164,13 +164,14 @@ Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
-Stream1 DEBUG output handles: 1
+Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
+ INPUT ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream1' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream1' )
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
ApplicationMgr INFO Application Manager Initialized successfully
@@ -1266,11 +1267,11 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
cRep_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 62
-fRep_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.161(+- 1.26)/ 0/ 10 [ms] #= 62
-cObjR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.154(+- 1.23)/ 0/ 10 [ms] #= 65
-cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0694(+- 0.83)/ 0/ 10 [ms] #=144
+cRepR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #=144
+cObjR_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 65
+fRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.323(+- 1.77)/ 0/ 10 [ms] #= 62
cObj_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.317(+- 1.75)/ 0/ 10 [ms] #= 63
-ChronoStatSvc INFO Time User : Tot= 310 [ms] #= 1
+ChronoStatSvc INFO Time User : Tot= 260 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
index 898cba10a90c0412b7058e0345da860525675d79..0a15f91cbe6a3e96750de24478a980ec023116d2 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
@@ -1,22 +1,22 @@
-Mon Aug 3 16:49:55 CEST 20?0
+Fri Aug 7 15:16:13 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_WMetaJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5545 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5548 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on lxplus706.cern.ch on Mon Aug 3 16:50:04 20?0
+ running on atpc002 on Fri Aug 7 15:16:21 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3312 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3316 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 705 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 344 CLIDRegistry entries for module ALL
@@ -32,8 +32,8 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog2.xml) [ok
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-02T2137/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus706.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -44,7 +44,7 @@ MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-ClassIDSvc INFO getRegistryEntries: read 1147 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1137 CLIDRegistry entries for module ALL
WriteData DEBUG Property update for OutputLevel : new value = 2
WriteData INFO in initialize()
WriteData DEBUG input handles: 0
@@ -76,13 +76,14 @@ Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
-Stream1 DEBUG output handles: 1
+Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
+ INPUT ( 'AthenaAttributeList' , 'StoreGateSvc+SimpleTag' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream1' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream1' )
EventSelector INFO Enter McEventSelector Initialization
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
@@ -983,10 +984,10 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
commitOutput INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 21
-cRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.317(+- 1.75)/ 0/ 10 [ms] #= 63
-cRepR_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.0613(+- 0.781)/ 0/ 10 [ms] #=326
-fRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.476(+- 2.13)/ 0/ 10 [ms] #= 63
-ChronoStatSvc INFO Time User : Tot= 280 [ms] #= 1
+cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0307(+- 0.553)/ 0/ 10 [ms] #=326
+cRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.476(+- 2.78)/ 0/ 20 [ms] #= 63
+fRep_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max= 0.635(+- 2.44)/ 0/ 10 [ms] #= 63
+ChronoStatSvc INFO Time User : Tot= 300 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
index 4d667a510dbd0327241fc2d4301885aa681472ec..166dddac8a761b5d3994fd6c842ef8dde5b09e8b 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
@@ -1,22 +1,22 @@
-Mon Aug 3 19:21:45 CEST 20?0
+Fri Aug 7 15:14:24 CEST 20?0
Preloading tcmalloc_minimal.so
Athena INFO including file "AthenaCommon/Preparation.py"
Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Athena INFO executing ROOT6Setup
Athena INFO including file "AthenaCommon/Execution.py"
Athena INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_WriteJobOptions.py"
-Py:ConfigurableDb INFO Read module info for 5545 configurables from 8 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5548 configurables from 5 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
Athena INFO including file "AthenaCommon/runbatch.py"
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on lxplus706.cern.ch on Mon Aug 3 19:22:04 20?0
+ running on atpc002 on Fri Aug 7 15:14:32 20?0
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3312 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3316 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 705 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 581 CLIDRegistry entries for module ALL
@@ -32,8 +32,8 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:Catalog1.xml) [ok
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-02T2137/Athena/22.0.16/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus706.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/20?0-08-06T2137/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host atpc002.dyndns.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc DEBUG OutputLevel is 2
PoolSvc INFO Setting up APR FileCatalog and Streams
@@ -44,7 +44,7 @@ MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
xAODMaker::Even...WARNING Beam conditions service not available
xAODMaker::Even...WARNING Will not fill beam spot information into xAOD::EventInfo
-ClassIDSvc INFO getRegistryEntries: read 1147 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1137 CLIDRegistry entries for module ALL
WriteData DEBUG Property update for OutputLevel : new value = 2
WriteData INFO in initialize()
WriteData DEBUG input handles: 0
@@ -77,13 +77,14 @@ Stream1 INFO I/O reinitialization...
Stream1.Stream1... DEBUG Property update for OutputLevel : new value = 2
Stream1 DEBUG End initialize
Stream1 DEBUG input handles: 0
-Stream1 DEBUG output handles: 1
+Stream1 DEBUG output handles: 2
Stream1 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1_MakeEventStreamInfo (MakeEventStreamInfo)
Stream1 DEBUG Adding private ToolHandle tool Stream1.ThinningCacheTool_Stream1 (Athena::ThinningCacheTool)
Stream1 DEBUG Adding private ToolHandle tool Stream1.Stream1Tool (AthenaOutputStreamTool)
Stream1 DEBUG Data Deps for Stream1
+ INPUT ( 'AthenaAttributeList' , 'StoreGateSvc+MagicTag' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream1' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream1' )
Stream2 DEBUG Property update for OutputLevel : new value = 2
Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
@@ -108,13 +109,14 @@ Stream2 INFO I/O reinitialization...
Stream2.Stream2... DEBUG Property update for OutputLevel : new value = 2
Stream2 DEBUG End initialize
Stream2 DEBUG input handles: 0
-Stream2 DEBUG output handles: 1
+Stream2 DEBUG output handles: 2
Stream2 DEBUG Registering all Tools in ToolHandleArray HelperTools
Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2_MakeEventStreamInfo (MakeEventStreamInfo)
Stream2 DEBUG Adding private ToolHandle tool Stream2.ThinningCacheTool_Stream2 (Athena::ThinningCacheTool)
Stream2 DEBUG Adding private ToolHandle tool Stream2.Stream2Tool (AthenaOutputStreamTool)
Stream2 DEBUG Data Deps for Stream2
+ INPUT ( 'AthenaAttributeList' , 'StoreGateSvc+RunEventTag' )
+ + OUTPUT ( 'SG::CompressionInfo' , 'StoreGateSvc+CompressionInfo_Stream2' )
+ OUTPUT ( 'SG::SelectionVetoes' , 'StoreGateSvc+SelectionVetoes_Stream2' )
DecisionSvc INFO Inserting stream: Stream3 with no Algs
Stream3.Stream3... INFO Initializing Stream3.Stream3Tool - package version AthenaServices-00-00-00
@@ -1327,11 +1329,11 @@ ToolSvc INFO Removing all tools created by ToolSvc
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-commitOutput INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.233(+- 1.51)/ 0/ 10 [ms] #= 43
-cRepR_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max= 0.0368(+- 0.605)/ 0/ 10 [ms] #=272
-cRep_ALL INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.189(+- 1.36)/ 0/ 10 [ms] #=106
-fRep_ALL INFO Time User : Tot= 60 [ms] Ave/Min/Max= 0.566(+- 2.31)/ 0/ 10 [ms] #=106
-ChronoStatSvc INFO Time User : Tot= 360 [ms] #= 1
+commitOutput INFO Time User : Tot= 20 [ms] Ave/Min/Max= 0.465(+- 2.11)/ 0/ 10 [ms] #= 43
+cRep_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.283(+- 1.66)/ 0/ 10 [ms] #=106
+cRepR_ALL INFO Time User : Tot= 30 [ms] Ave/Min/Max= 0.11(+- 1.04)/ 0/ 10 [ms] #=272
+fRep_ALL INFO Time User : Tot= 40 [ms] Ave/Min/Max= 0.377(+- 1.91)/ 0/ 10 [ms] #=106
+ChronoStatSvc INFO Time User : Tot= 390 [ms] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
index e12e8bdc0510352fbac99513e0904738c828c8b1..bc0811d5a877641dc4a99ee495e0e785454aceeb 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/RequireUniqueEvent.cxx
@@ -11,7 +11,7 @@
// the user data-class defintions
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include "EventInfo/EventInfo.h"
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.h b/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.h
index 2ff110ef64d4e44968dac3827fc3397f82c26a4f..23be195fdf746742ccc8cc929f3545898820f912 100755
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/AthenaPoolAddressProviderSvc.h
@@ -11,7 +11,7 @@
**/
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" // no forward decl: typedef
+#include "Gaudi/Property.h" // no forward decl: typedef
#include "AthenaKernel/IAddressProvider.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h b/Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h
index cc18e4e985ac191ba1387c9e99eda0095599aeef..0f39299504fcb58f037c0d58ff683ed98c221608 100755
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/CondProxyProvider.h
@@ -11,7 +11,7 @@
**/
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "AthenaKernel/IAddressProvider.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
index 7561ce0027e987822832c370be50ad4edf242f94..40b72b28ef6b200ac57c0238f67baab5a128f2fc 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.cxx
@@ -61,7 +61,7 @@ EventSelectorAthenaPool::EventSelectorAthenaPool(const std::string& name, ISvcLo
m_inputCollectionsProp.declareUpdateHandler(&EventSelectorAthenaPool::inputCollectionsHandler, this);
}
//________________________________________________________________________________
-void EventSelectorAthenaPool::inputCollectionsHandler(Property&) {
+void EventSelectorAthenaPool::inputCollectionsHandler(Gaudi::Details::PropertyBase&) {
if (this->FSMState() != Gaudi::StateMachine::OFFLINE) {
this->reinit().ignore();
}
@@ -573,20 +573,13 @@ StatusCode EventSelectorAthenaPool::nextHandleFileTransition(IEvtSelector::Conte
if (m_headerIterator == nullptr || m_headerIterator->next() == 0) {
m_headerIterator = nullptr;
// Close previous collection.
- if (!m_keepInputFilesOpen.value() && m_poolCollectionConverter != nullptr) {
- m_poolCollectionConverter->disconnectDb().ignore();
- }
delete m_poolCollectionConverter; m_poolCollectionConverter = nullptr;
- // Assume that the end of collection file indicates the end of payload file.
- if (m_processMetadata.value()) {
- // Fire EndInputFile incident
- FileIncident endInputFileIncident(name(), "EndInputFile", "FID:" + m_guid.toString(), m_guid.toString());
- m_incidentSvc->fireIncident(endInputFileIncident);
- }
+
// zero the current DB ID (m_guid) before disconnect() to indicate it is no longer in use
- auto old_guid = m_guid;
+ const SG::SourceID old_guid = m_guid.toString();
m_guid = Guid::null();
- disconnectIfFinished( old_guid.toString() );
+ disconnectIfFinished( old_guid );
+
// Open next file from inputCollections list.
m_inputCollectionsIterator++;
// Create PoolCollectionConverter for input file
@@ -616,16 +609,12 @@ StatusCode EventSelectorAthenaPool::nextHandleFileTransition(IEvtSelector::Conte
tech = token.technology();
}
if (guid != m_guid) {
+ // we are starting reading from a new DB. Check if the old one needs to be retired
if (m_guid != Guid::null()) {
- if (m_processMetadata.value()) {
- // Fire EndInputFile incident
- FileIncident endInputFileIncident(name(), "EndInputFile", "FID:" + m_guid.toString(), m_guid.toString());
- m_incidentSvc->fireIncident(endInputFileIncident);
- }
- // zero the current DB ID (m_guid) before disconnect() to indicate it is no longer in use
- auto old_guid = m_guid;
+ // zero the current DB ID (m_guid) before trying disconnect() to indicate it is no longer in use
+ const SG::SourceID old_guid = m_guid.toString();
m_guid = Guid::null();
- disconnectIfFinished(old_guid.toString());
+ disconnectIfFinished( old_guid );
}
m_guid = guid;
// Fire BeginInputFile incident if current InputCollection is a payload file;
@@ -1116,11 +1105,16 @@ void EventSelectorAthenaPool::handle(const Incident& inc)
m_guid is not pointing to it and there are no events from it being processed
(if the EventLoopMgr was not firing Begin/End incidents, this will just close the DB)
*/
-bool EventSelectorAthenaPool::disconnectIfFinished( SG::SourceID fid ) const
+bool EventSelectorAthenaPool::disconnectIfFinished( const SG::SourceID &fid ) const
{
if( m_activeEventsPerSource[fid] <= 0 && m_guid != fid ) {
// Explicitly disconnect file corresponding to old FID to release memory
if( !m_keepInputFilesOpen.value() ) {
+ // Assume that the end of collection file indicates the end of payload file.
+ if (m_processMetadata.value()) {
+ FileIncident endInputFileIncident(name(), "EndInputFile", "FID:" + fid, fid);
+ m_incidentSvc->fireIncident(endInputFileIncident);
+ }
ATH_MSG_INFO("Disconnecting input sourceID: " << fid );
m_athenaPoolCnvSvc->getPoolSvc()->disconnectDb("FID:" + fid, IPoolSvc::kInputStream).ignore();
m_activeEventsPerSource.erase( fid );
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
index ce19c03b5ad0c2be534c36978abe8ca36d298c16..2cfa32f009ea774107de35b1ccdb2ff356fb5737 100644
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/src/EventSelectorAthenaPool.h
@@ -151,7 +151,7 @@ protected:
/// Fill AttributeList with specific items from the selector and a suffix
virtual StatusCode fillAttributeList(coral::AttributeList *attrList, const std::string &suffix, bool copySource) const override;
// Disconnect DB if all events from the source FID were processed and the Selector moved to another file
- virtual bool disconnectIfFinished(SG::SourceID fid) const override;
+ virtual bool disconnectIfFinished(const SG::SourceID &fid) const override;
private: // internal member functions
/// Return pointer to active event SG
@@ -197,7 +197,7 @@ private: // properties
/// InputCollections, vector with names of the input collections.
Gaudi::Property<std::vector<std::string>> m_inputCollectionsProp{this, "InputCollections", {}, ""};
mutable std::vector<std::string>::const_iterator m_inputCollectionsIterator ATLAS_THREAD_SAFE;
- void inputCollectionsHandler(Property&);
+ void inputCollectionsHandler(Gaudi::Details::PropertyBase&);
/// Query, query string.
Gaudi::Property<std::string> m_query{this, "Query", "", ""};
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
index c2de232f2a2a2bb2aa5c89168b91ed423d579036..0434b3db2290afc700c94db4f04791bd1a2c7116 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
@@ -8,6 +8,7 @@
from __future__ import print_function
+from AthenaCommon.AppMgr import theApp
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaServices.AthenaServicesConf import AthenaOutputStream
from AthenaServices.AthenaServicesConf import AthenaOutputStreamTool
@@ -47,9 +48,8 @@ def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
# Tell tool to pick it up
outputStream.WritingTool.AttributeListKey=key
# build eventinfo attribute list
- from .OutputStreamAthenaPoolConf import EventInfoAttListTool, EventInfoTagBuilder
- EventInfoTagBuilder = EventInfoTagBuilder(AttributeList=key, EventInfoKey=eventInfoKey, FilterString=decisionFilter,
- Tool=EventInfoAttListTool())
+ from .OutputStreamAthenaPoolConf import EventInfoAttListTool, EventInfoTagBuilder
+ EventInfoTagBuilder = EventInfoTagBuilder(AttributeList=key, EventInfoKey=eventInfoKey, FilterString=decisionFilter)
from AthenaCommon.GlobalFlags import globalflags
if globalflags.InputFormat() == 'bytestream':
#No event-tag input in bytestream
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
index 6fe12296b36a40303549c6602dad5e8cd2e48abf..c023324e08375d4301559b22fe7a3b6eb9bc3f68 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py
@@ -55,8 +55,8 @@ def OutputStreamCfg(configFlags, streamName, ItemList=[], disableEventTag=False
outputStream.WritingTool.AttributeListKey=key
# build eventinfo attribute list
EventInfoAttListTool, EventInfoTagBuilder=CompFactory.getComps("EventInfoAttListTool","EventInfoTagBuilder",)
- tagBuilder = EventInfoTagBuilder(AttributeList=key,
- Tool=EventInfoAttListTool())
+ result.addPublicTool(EventInfoAttListTool())
+ tagBuilder = EventInfoTagBuilder(AttributeList=key)
result.addEventAlgo(tagBuilder)
# For xAOD output
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoAttListTool.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoAttListTool.cxx
index 0dac118fc55d5130d62a69cbd637df21d39d63c9..072b70256d2e8badf73d7ef6a442923b42372773 100755
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoAttListTool.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoAttListTool.cxx
@@ -14,7 +14,7 @@ Purpose : create a EventInfoAttList - The Tag information associated to the even
#include "EventInfoAttListTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEventInfo/EventInfo.h"
#include "EventInfo/EventInfo.h"
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoTagBuilder.cxx b/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoTagBuilder.cxx
index 84002f72424cb14414ba63ec2782a733cdc58616..0df956aac45afb2191c7abaa8d85d11590e7f1bb 100755
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoTagBuilder.cxx
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoTagBuilder.cxx
@@ -4,77 +4,84 @@
#include "EventInfoTagBuilder.h"
-#include <StoreGate/ReadHandle.h>
-#include <StoreGate/WriteHandle.h>
-
-EventInfoTagBuilder::EventInfoTagBuilder( const std::string& name, ISvcLocator* pSvcLocator )
- : AthAlgorithm(name, pSvcLocator)
-{
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/WriteHandle.h"
+
+EventInfoTagBuilder::EventInfoTagBuilder( const std::string& name, ISvcLocator* pSvcLocator )
+ : AthAlgorithm(name, pSvcLocator),
+ m_tool("EventInfoAttListTool/EventInfoAttListTool",this) {
+ declareProperty("EventInfoKey", m_evtKey = "EventInfo");
+ declareProperty("InputList", m_inputAttList = "Input");
+ declareProperty("AttributeList", m_attributeListName);
+ declareProperty("PropagateInput", m_propInput = true);
+ declareProperty("FilterString", m_filter = "");
}
+EventInfoTagBuilder::~EventInfoTagBuilder()
+{}
-StatusCode EventInfoTagBuilder::initialize()
-{
+StatusCode EventInfoTagBuilder::initialize() {
ATH_MSG_DEBUG( "Initializing " << name() );
- if (m_attributeListName.empty()) {
- ATH_MSG_ERROR("Output attribute list name should not be empty.");
- return StatusCode::FAILURE;
- }
-
ATH_CHECK( m_tool.retrieve() );
ATH_CHECK( m_evtKey.initialize() );
- ATH_CHECK( m_inputAttList.initialize() );
ATH_CHECK( m_attributeListName.initialize() );
+ ATH_CHECK( m_inputAttList.initialize() );
return StatusCode::SUCCESS;
}
-StatusCode EventInfoTagBuilder::execute()
-{
+StatusCode EventInfoTagBuilder::execute() {
ATH_MSG_DEBUG( "Executing " << name() );
+
SG::ReadHandle<xAOD::EventInfo> h_evt(m_evtKey);
- if (!h_evt.isValid()) {
- ATH_MSG_ERROR("Did not find xAOD::EventInfo");
- return StatusCode::FAILURE;
- }
- /** create a EventInfo Tag and ask the tool to fill it */
- std::unique_ptr<AthenaAttributeList> attribList =
- m_tool->getAttributeListPtr( *h_evt );
-
- // Check whether to propagate
- if (m_propInput) {
- SG::ReadHandle<AthenaAttributeList> h_att(m_inputAttList);
- // Check if there is an input to propagate
- if (h_att.isValid()) {
- for (auto it = h_att->specification().begin();
- it!= h_att->specification().end(); ++it) {
- // Only propagate bool properties
- if (it->typeName()=="bool"&&!attribList->exists(it->name())) {
- // Check if there is filtering on the name
- if (m_filter != "") {
- if (it->name().find(m_filter)!=std::string::npos) {
- // Add those bools to the output attribute list
- (*attribList).extend(it->name(),it->type());
- (*attribList)[it->name()].data<bool>() = (*h_att)[it->name()].data<bool>();
+ /** create a EventInfo Tag and ask the tool to fill it */
+ if (h_evt.isValid()) {
+ std::unique_ptr<AthenaAttributeList> attribList =
+ m_tool->getAttributeListPtr( *h_evt );
+
+ // Check whether to propagate
+ if (m_propInput) {
+ SG::ReadHandle<AthenaAttributeList> h_att(m_inputAttList);
+ // Check if there is an input to propagate
+ if (h_att.isValid()) {
+ for (auto it = h_att->specification().begin();
+ it!= h_att->specification().end(); ++it) {
+ // Only propagate bool properties
+ if (it->typeName()=="bool"&&!attribList->exists(it->name())) {
+ // Check if there is filtering on the name
+ if (m_filter != "") {
+ if (it->name().find(m_filter)!=std::string::npos) {
+ // Add those bools to the output attribute list
+ (*attribList).extend(it->name(),it->type());
+ (*attribList)[it->name()].data<bool>() = (*h_att)[it->name()].data<bool>();
+ }
}
- }
- } // take only bools
- } // loop
- } else { // valid input
- ATH_MSG_INFO("No input attribute list");
- }
- } // propagate
-
- /** record attribute list to SG */
- SG::WriteHandle<AthenaAttributeList> wh(m_attributeListName);
- ATH_CHECK( wh.record(std::move(attribList)) );
+ } // take only bools
+ } // loop
+ } else { // valid input
+ ATH_MSG_INFO("No input attribute list");
+ }
+ } // propagate
+
+ /** record attribute list to SG */
+ SG::WriteHandle<AthenaAttributeList> wh(m_attributeListName);
+ ATH_CHECK( wh.record(std::move(attribList)) );
+ } else {
+ ATH_MSG_WARNING("Did not find xAOD::EventInfo");
+ }
ATH_MSG_DEBUG( "Finished " << name() );
return StatusCode::SUCCESS;
}
+
+
+StatusCode EventInfoTagBuilder::finalize()
+{
+ return StatusCode::SUCCESS;
+}
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoTagBuilder.h b/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoTagBuilder.h
index b0b3fb85fc1552c984c37cf571a3812380235c34..5e34bf6bf95dd68c7ec0211560b01e75d529098b 100755
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoTagBuilder.h
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/src/EventInfoTagBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EVENTTAGALGS_EVENTINFOTAGBUILDER_H
@@ -14,8 +14,8 @@ Updated : February 2006
DESCRIPTION:
-Retrieves event tag data from an AOD file, stores this data in an attribute
-list object and records the attribute list object in the TDS for subsequent
+Retrieves event tag data from an AOD file, stores this data in an attribute
+list object and records the attribute list object in the TDS for subsequent
inclusion in an event tag database.
*****************************************************************************/
@@ -27,39 +27,37 @@ inclusion in an event tag database.
*/
-#include <AthenaBaseComps/AthAlgorithm.h>
-#include <GaudiKernel/ToolHandle.h>
-#include <PersistentDataModel/AthenaAttributeList.h>
-#include <StoreGate/ReadHandleKey.h>
-#include <StoreGate/WriteHandleKey.h>
-#include <xAODEventInfo/EventInfo.h>
-
+#include "AthenaBaseComps/AthAlgorithm.h"
#include "EventInfoAttListTool.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/WriteHandleKey.h"
+#include "xAODEventInfo/EventInfo.h"
+#include "PersistentDataModel/AthenaAttributeList.h"
+#include "GaudiKernel/ToolHandle.h"
-class EventInfoTagBuilder : public AthAlgorithm
-{
+class EventInfoTagBuilder : public AthAlgorithm {
public:
/// Standard constructor.
EventInfoTagBuilder(const std::string& name, ISvcLocator* pSvcLocator);
-
+
/// Destructor.
- ~EventInfoTagBuilder() = default;
-
- virtual StatusCode initialize() override;
- virtual StatusCode execute() override;
+ ~EventInfoTagBuilder();
+
+ StatusCode initialize();
+ StatusCode execute();
+ StatusCode finalize();
private:
-
+
/// Global Event Tag Tool
- ToolHandle<EventInfoAttListTool> m_tool{this, "Tool", "EventInfoAttListTool/EventInfoAttListTool", "EventInfoAttListTool used"};
-
- SG::ReadHandleKey<xAOD::EventInfo> m_evtKey{this, "EventInfoKey", "EventInfo", "xAOD::EventInfo ReadHandleKey"};
- SG::ReadHandleKey<AthenaAttributeList> m_inputAttList{this, "InputList", "Input", "Input Athena attribute list ReadHandleKey"};
- SG::WriteHandleKey<AthenaAttributeList> m_attributeListName{this, "AttributeList", "SimpleTag", "Output Athena attribute list WriteHandleKey"};
+ ToolHandle<EventInfoAttListTool> m_tool;
- Gaudi::Property<bool> m_propInput{this, "PropagateInput", true, "Propagate input attribute list to the output"};
- Gaudi::Property<std::string> m_filter{this, "FilterString", "", "Filter input attribute list when propagating to the output"};
+ SG::ReadHandleKey<xAOD::EventInfo> m_evtKey;
+ SG::ReadHandleKey<AthenaAttributeList> m_inputAttList;
+ SG::WriteHandleKey<AthenaAttributeList> m_attributeListName;
+ bool m_propInput;
+ std::string m_filter;
};
diff --git a/Database/AthenaRoot/AthenaRootComps/src/IoSvc.cxx b/Database/AthenaRoot/AthenaRootComps/src/IoSvc.cxx
index a37815afeaeb34969681d6963ac92f03584985af..8a6c01645395ec50b1c288167874637d00241131 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/IoSvc.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/IoSvc.cxx
@@ -16,7 +16,7 @@
#include <limits>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
typedef IIoSvc::Fd Fd;
diff --git a/Database/AthenaRoot/AthenaRootComps/src/NtupleCnvSvc.cxx b/Database/AthenaRoot/AthenaRootComps/src/NtupleCnvSvc.cxx
index 34fb9a46607ad13920a103ad72699b020385fcbc..65eee94823409028aae3f021b38916239ba9771b 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/NtupleCnvSvc.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/NtupleCnvSvc.cxx
@@ -19,7 +19,7 @@
// FrameWork includes
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT includes
#include "TFile.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlg.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlg.cxx
index a9670604dfb512878382e471fad94c51eb609710..cc75dc3533080a35980d45ac67f289837dbeb0a4 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlg.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlg.cxx
@@ -25,7 +25,7 @@
#include <fcntl.h>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// SGTools
#include "SGTools/BuiltinsClids.h" // to put ints,... in evtstore
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlgHandle.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlgHandle.cxx
index 4da79cd79f185d361b4df89b14918efe8155ee31..c507e5c84ee67b0d2d6e8bad77d48c8fabdbeb03 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlgHandle.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootAsciiDumperAlgHandle.cxx
@@ -25,7 +25,7 @@
#include <fcntl.h>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// SGTools
#include "SGTools/BuiltinsClids.h" // to put ints,... in evtstore
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
index 2800ba8b68b7b0225eac4683c19f61e89c274311..7d2a6a64e8c521f1937fac608626220bcb91144e 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.cxx
@@ -856,7 +856,7 @@ RootNtupleEventSelector::updateAddress(StoreID::type /*storeID*/, SG::TransientA
/// callback to synchronize the list of input files
void
-RootNtupleEventSelector::setupInputCollection( Property& /*inputCollectionsName*/ )
+RootNtupleEventSelector::setupInputCollection( Gaudi::Details::PropertyBase& /*inputCollectionsName*/ )
{
// nothing ?
return;
diff --git a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.h b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.h
index 3b6e10db0ddc0bbd12f6bde227c0fd8c9847c9d0..bd523aab90683d258936a0e480dfda72b25b577a 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.h
+++ b/Database/AthenaRoot/AthenaRootComps/src/RootNtupleEventSelector.h
@@ -20,7 +20,7 @@
#include "GaudiKernel/IIoComponent.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
#include "AthenaKernel/IAddressProvider.h"
@@ -139,7 +139,7 @@ class RootNtupleEventSelector :
StatusCode endInputFile (RootNtupleEventContext* rctx) const;
/// callback to synchronize the list of input files
- void setupInputCollection( Property& inputCollectionsName );
+ void setupInputCollection( Gaudi::Details::PropertyBase& inputCollectionsName );
/// helper method to create proxies
StatusCode createRootBranchAddresses(StoreID::type storeID,
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODCnvSvc.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODCnvSvc.cxx
index 86ad292d8f9b4ba3d07aabf4b7c3a1ccc3e2c0a4..a08cefd347a70ef1c6a5b34f0a4d4285f84c791e 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODCnvSvc.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODCnvSvc.cxx
@@ -19,7 +19,7 @@
// FrameWork includes
#include "GaudiKernel/GenericAddress.h"
#include "GaudiKernel/IRegistry.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT includes
#include "TFile.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
index 1171e013c478c80b58054bb133b9e85074194d39..9785f6408b8c79471b23ebb216b47d1eeabf2002 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.cxx
@@ -24,7 +24,7 @@
#include "TKey.h"
#include "TLeaf.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Framework includes
//#include "GaudiKernel/GenericAddress.h"
diff --git a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h
index 32682624250a096b4450a59f3189b87e7169af59..3b8ebe62926e0d11e89cedb1e441646503b3f3d9 100644
--- a/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h
+++ b/Database/AthenaRoot/AthenaRootComps/src/xAODEventSelector.h
@@ -17,7 +17,7 @@
#include "GaudiKernel/IIoComponent.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
#include "AthenaKernel/IAddressProvider.h"
diff --git a/Database/IOVDbSvc/src/IOVDbSvc.cxx b/Database/IOVDbSvc/src/IOVDbSvc.cxx
index b52a16a49ed428e3f4ec34e3af04102adc566e0a..859b92cf94cce3b6fd5ea7a970d546d2847041a4 100644
--- a/Database/IOVDbSvc/src/IOVDbSvc.cxx
+++ b/Database/IOVDbSvc/src/IOVDbSvc.cxx
@@ -35,7 +35,7 @@
namespace {
template<typename Prop_t>
bool
- fetchProp( const std::vector<const Property*>* properties, Prop_t& p ){
+ fetchProp( const std::vector<const Gaudi::Details::PropertyBase*>* properties, Prop_t& p ){
if (properties) {
for ( const auto & pThisProperty: *properties ) {
if ( pThisProperty->name()==p.name() ) {
@@ -776,7 +776,7 @@ StatusCode IOVDbSvc::checkEventSel() {
ATH_MSG_FATAL( "Could not retrieve [" << joSvc.typeAndName() << "]" );
return StatusCode::FAILURE;
}
- typedef std::vector<const Property*> Properties_t;
+ typedef std::vector<const Gaudi::Details::PropertyBase*> Properties_t;
const Properties_t* evtSelProps=joSvc->getProperties("EventSelector");
// do not return FAILURE if the EventSelector cannot be found, as this
// happens online when we have no EventSelector
diff --git a/Database/RDBAccessSvc/src/RDBAccessSvc.h b/Database/RDBAccessSvc/src/RDBAccessSvc.h
index 85103fa8fa7d0aa9a221883a6d955a16b073f82a..1c326c0beef3e8716b48f4e86171767364d83164 100755
--- a/Database/RDBAccessSvc/src/RDBAccessSvc.h
+++ b/Database/RDBAccessSvc/src/RDBAccessSvc.h
@@ -18,7 +18,7 @@
#include "RDBAccessSvc/IRDBAccessSvc.h"
#include "RDBRecordset.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
#include <string>
diff --git a/Database/RegistrationServices/src/RegistrationStream.cxx b/Database/RegistrationServices/src/RegistrationStream.cxx
index 827c43679aebcdfbaa73c0108412f649f95f8f66..375e7b7a478b8fa28a1398d987a3d852cb5ee19c 100755
--- a/Database/RegistrationServices/src/RegistrationStream.cxx
+++ b/Database/RegistrationServices/src/RegistrationStream.cxx
@@ -163,7 +163,7 @@ RegistrationStream::execute()
}
void
-RegistrationStream::itemListHandler( Property& /* theProp */ )
+RegistrationStream::itemListHandler( Gaudi::Details::PropertyBase& /* theProp */ )
{
//assuming concrete SG::Folder also has an itemList property
IProperty *pAsIProp(nullptr);
@@ -175,7 +175,7 @@ RegistrationStream::itemListHandler( Property& /* theProp */ )
}
void
-RegistrationStream::ProvIncludeHandler( Property& )
+RegistrationStream::ProvIncludeHandler( Gaudi::Details::PropertyBase& )
{
std::vector<std::string> list = m_provIncludeList.value();
std::vector<std::string>::const_iterator it = list.begin();
@@ -187,7 +187,7 @@ RegistrationStream::ProvIncludeHandler( Property& )
}
void
-RegistrationStream::ProvExcludeHandler( Property& )
+RegistrationStream::ProvExcludeHandler( Gaudi::Details::PropertyBase& )
{
std::vector<std::string> list = m_provExcludeList.value();
std::vector<std::string>::const_iterator it = list.begin();
diff --git a/Database/RegistrationServices/src/RegistrationStream.h b/Database/RegistrationServices/src/RegistrationStream.h
index 2dc3f23712f379d47298d28d2e56ed4ddd144a77..d1ba005d42366b96571fcba245e8f508bd192f9c 100755
--- a/Database/RegistrationServices/src/RegistrationStream.h
+++ b/Database/RegistrationServices/src/RegistrationStream.h
@@ -19,7 +19,7 @@
#ifndef ATHENAPOOLTEST_REGISTRATIONSVC_H
#define ATHENAPOOLTEST_REGISTRATIONSVC_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/IIoComponent.h"
@@ -69,13 +69,13 @@ private:
/// PRIVATE METHODS
/// Handler for ItemNames Property
- void itemListHandler( Property& );
+ void itemListHandler( Gaudi::Details::PropertyBase& );
/// Handler for ProvNames Property
- void ProvIncludeHandler( Property& );
+ void ProvIncludeHandler( Gaudi::Details::PropertyBase& );
/// Handler for ItemNames Property
- void ProvExcludeHandler( Property& );
+ void ProvExcludeHandler( Gaudi::Details::PropertyBase& );
/// NOTE that the Tools assume this list will be ordered.
/// begin = newest; end = oldest
diff --git a/Database/RegistrationServices/src/RegistrationStreamLCGTool.h b/Database/RegistrationServices/src/RegistrationStreamLCGTool.h
index 644d26909bf6e74a77484fb4bb0419701e62e3d4..d042713195abbef00888216d5d8b5b247496db40 100755
--- a/Database/RegistrationServices/src/RegistrationStreamLCGTool.h
+++ b/Database/RegistrationServices/src/RegistrationStreamLCGTool.h
@@ -22,7 +22,7 @@
//<<<<<< INCLUDES >>>>>>
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IRegistrationStreamTool.h"
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/CMakeLists.txt b/DetectorDescription/AGDD/AGDD2GeoSvc/CMakeLists.txt
index 4aa3c259c299827df0e922b7d0a9b39e05678b8d..bcc473f78cb27f8c484978ba50b1a3c67f75c2f0 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/CMakeLists.txt
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/CMakeLists.txt
@@ -1,27 +1,15 @@
-################################################################################
-# Package: AGDD2GeoSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AGDD2GeoSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/AGDD/AGDDControl
- DetectorDescription/AGDD/AGDDKernel
- GaudiKernel
- PRIVATE
- DetectorDescription/AGDD/AGDDHandlers )
-
atlas_add_library ( AGDD2GeoSvcLib
INTERFACE
PUBLIC_HEADERS AGDD2GeoSvc
- LINK_LIBRARIES GaudiKernel )
+ LINK_LIBRARIES AGDDControl AGDDKernel AthenaBaseComps GaudiKernel )
# Component(s) in the package:
atlas_add_component( AGDD2GeoSvc
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AGDDControl AGDDKernel GaudiKernel AGDDHandlers )
-
+ LINK_LIBRARIES AGDD2GeoSvcLib AGDDHandlers )
diff --git a/DetectorDescription/AGDD/AGDD2GeoSvc/src/DefaultAGDDTool.cxx b/DetectorDescription/AGDD/AGDD2GeoSvc/src/DefaultAGDDTool.cxx
index 29b7a50f30d98a6786ab52e870026bf845a4f19c..bbf3e19e6ad52f5c73cc0265d4aef86a5a8a7a1a 100644
--- a/DetectorDescription/AGDD/AGDD2GeoSvc/src/DefaultAGDDTool.cxx
+++ b/DetectorDescription/AGDD/AGDD2GeoSvc/src/DefaultAGDDTool.cxx
@@ -15,7 +15,7 @@ DefaultAGDDTool::DefaultAGDDTool(const std::string& type, const std::string& nam
StatusCode DefaultAGDDTool::initialize()
{
ATH_MSG_INFO("this is DefaultAGDDTool::initialize()!!!!");
- ATH_MSG_INFO("Default detector "<<m_defaultDetector);
+ ATH_MSG_INFO("Default detector "<<m_defaultDetector.value());
return AGDDToolBase::initialize();
}
@@ -35,8 +35,8 @@ StatusCode DefaultAGDDTool::construct()
if (!m_defaultDetector.empty())
{
- ATH_MSG_INFO(" setting default detector to "<<m_defaultDetector);
- m_controller->UseGeoModelDetector(m_defaultDetector);
+ ATH_MSG_INFO(" setting default detector to "<<m_defaultDetector.value());
+ m_controller->UseGeoModelDetector(m_defaultDetector.value());
}
m_controller->BuildAll();
diff --git a/DetectorDescription/AGDD/AGDDControl/AGDDControl/AGDDToolBase.h b/DetectorDescription/AGDD/AGDDControl/AGDDControl/AGDDToolBase.h
index 357b78efffe85c22ec1330d6ee390c391efc2b9e..148485b13ab60f3232c504bca07c2ad937defd29 100644
--- a/DetectorDescription/AGDD/AGDDControl/AGDDControl/AGDDToolBase.h
+++ b/DetectorDescription/AGDD/AGDDControl/AGDDControl/AGDDToolBase.h
@@ -1,41 +1,39 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef AGDDToolBase_H
-#define AGDDToolBase_H
+#ifndef AGDDCONTROL_AGDDToolBase_H
+#define AGDDCONTROL_AGDDToolBase_H
#include "AGDDControl/IAGDDToolBase.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/StatusCode.h"
-class IInterface;
class AGDDController;
-class AGDDToolBase: public AthAlgTool, virtual public IAGDDToolBase
+class AGDDToolBase: public extends<AthAlgTool, IAGDDToolBase>
{
public:
- AGDDToolBase(const std::string& type, const std::string& name,
- const IInterface* parent);
- virtual StatusCode initialize();
- virtual StatusCode construct() {return StatusCode::SUCCESS;}
+ AGDDToolBase(const std::string& type, const std::string& name,
+ const IInterface* parent);
+ virtual StatusCode initialize();
+ virtual StatusCode construct() {return StatusCode::SUCCESS;}
protected:
- std::vector<std::string> m_xmlFiles;
- std::vector<std::string> m_sectionsToBuild;
- std::vector<std::string> m_volumesToBuild;
- int m_parserVerbosity;
- int m_builderVerbosity;
- bool m_printSections;
- bool m_disableSections;
- bool m_locked;
- bool m_writeDBfile;
- std::string m_outFileName;
- std::string m_defaultDetector;
- std::string m_navigateDetector;
-
- void InitializeAGDD();
-
- AGDDController* m_controller;
+ void InitializeAGDD();
+
+ Gaudi::Property<std::vector<std::string> > m_xmlFiles{this, "XMLFiles", {} };
+ Gaudi::Property<std::vector<std::string> > m_sectionsToBuild{this, "Sections", {} };
+ Gaudi::Property<std::vector<std::string> > m_volumesToBuild{this, "Volumes", {} };
+ Gaudi::Property<int> m_parserVerbosity{this, "ParserVerbosity", 0};
+ Gaudi::Property<int> m_builderVerbosity{this, "BuilderVerbosity", 0};
+ Gaudi::Property<bool> m_printSections{this, "PrintSections", false};
+ Gaudi::Property<bool> m_disableSections{this, "DisableSections", true};
+ Gaudi::Property<bool> m_locked{this, "Locked", false};
+ Gaudi::Property<bool> m_writeDBfile{this, "WriteAGDDFile", false};
+ Gaudi::Property<std::string> m_outFileName{this, "OutAGDDXMLName", "mytest.xml"};
+ Gaudi::Property<std::string> m_defaultDetector{this, "DefaultDetector", "NoDetector"};
+ Gaudi::Property<std::string> m_navigateDetector{this, "NavigateDetector", ""};
+ AGDDController* m_controller {};
};
#endif
diff --git a/DetectorDescription/AGDD/AGDDControl/AGDDControl/ExpressionEvaluator.h b/DetectorDescription/AGDD/AGDDControl/AGDDControl/ExpressionEvaluator.h
index 31afdb6b9826064429664c37cea37054812b4d95..e3be9284eeda9383ed4b85e001e6840c5563a4c6 100644
--- a/DetectorDescription/AGDD/AGDDControl/AGDDControl/ExpressionEvaluator.h
+++ b/DetectorDescription/AGDD/AGDDControl/AGDDControl/ExpressionEvaluator.h
@@ -1,9 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EXPRESSION_EVALUATOR_H
-#define EXPRESSION_EVALUATOR_H 1
+#define EXPRESSION_EVALUATOR_H
#include "CLHEP/Evaluator/Evaluator.h"
@@ -11,9 +11,9 @@
#include <vector>
#include <map>
-typedef std::map< std::string, double > ConstantsTable;
-typedef std::map< std::string, double > PhysicalConstantsTable;
-typedef std::map< std::string, std::string > ExpressionsTable;
+typedef std::map< std::string, double> ConstantsTable;
+typedef std::map< std::string, double> PhysicalConstantsTable;
+typedef std::map< std::string, std::string> ExpressionsTable;
class ExpressionEvaluator
{
diff --git a/DetectorDescription/AGDD/AGDDControl/AGDDControl/IAGDDToolBase.h b/DetectorDescription/AGDD/AGDDControl/AGDDControl/IAGDDToolBase.h
index 45d1a024f4445204a01e20368e201df923157805..49ca8aa412bfc68de023c73a4e3e3a742f8c3bea 100644
--- a/DetectorDescription/AGDD/AGDDControl/AGDDControl/IAGDDToolBase.h
+++ b/DetectorDescription/AGDD/AGDDControl/AGDDControl/IAGDDToolBase.h
@@ -1,24 +1,21 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef IAGDDToolBase_H
-#define IAGDDToolBase_H
+#ifndef AGDDCONTROL_IAGDDToolBase_H
+#define AGDDCONTROL_IAGDDToolBase_H
#include "GaudiKernel/IAlgTool.h"
-static const InterfaceID IID_IAGDDToolBase("IAGDDToolBase",1,0);
-
// Interface to define an AGDD-constructing tool to be used from AGDD2GeoSvc
class IAGDDToolBase: virtual public IAlgTool
{
public:
- static const InterfaceID& interfaceID() {return IID_IAGDDToolBase;}
-
- virtual ~IAGDDToolBase() {}
-
- virtual StatusCode construct() =0;
+ virtual ~IAGDDToolBase() {}
+ DeclareInterfaceID(IAGDDToolBase,1,0);
+
+ virtual StatusCode construct() = 0;
};
#endif
diff --git a/DetectorDescription/AGDD/AGDDControl/CMakeLists.txt b/DetectorDescription/AGDD/AGDDControl/CMakeLists.txt
index c8986c02c8f685c9f1fd7ac01928e6bd6bda951a..23db9a386de32c133bbc63d75c7646317aff33b9 100644
--- a/DetectorDescription/AGDD/AGDDControl/CMakeLists.txt
+++ b/DetectorDescription/AGDD/AGDDControl/CMakeLists.txt
@@ -1,35 +1,19 @@
-################################################################################
-# Package: AGDDControl
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AGDDControl )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/AGDD/AGDDKernel
- PRIVATE
- Control/StoreGate
- DetectorDescription/AGDD/AGDDModel
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tools/PathResolver )
-
# External dependencies:
find_package( CLHEP )
find_package( XercesC )
-find_package( Eigen )
find_package( GeoModelCore )
+find_package( ROOT COMPONENTS Core )
# Component(s) in the package:
atlas_add_library( AGDDControl
src/*.cxx
PUBLIC_HEADERS AGDDControl
- INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIR}
+ INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AGDDKernel StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES AGDDModel GeoModelUtilities GaudiKernel PathResolver )
-
+ LINK_LIBRARIES ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AGDDKernel GaudiKernel
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AGDDModel AthenaKernel GeoModelInterfaces GeoModelUtilities PathResolver StoreGateLib )
diff --git a/DetectorDescription/AGDD/AGDDControl/src/AGDD2GeoModelBuilder.cxx b/DetectorDescription/AGDD/AGDDControl/src/AGDD2GeoModelBuilder.cxx
index f218cb84dca7e7ac083e67a8db58b4eb3dad06c4..e5b6a83a1ae7ce26eeca8e4205e74078757d10b2 100644
--- a/DetectorDescription/AGDD/AGDDControl/src/AGDD2GeoModelBuilder.cxx
+++ b/DetectorDescription/AGDD/AGDDControl/src/AGDD2GeoModelBuilder.cxx
@@ -58,7 +58,6 @@
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/getMessageSvc.h"
#include "GeoModelInterfaces/StoredMaterialManager.h"
-#include "GeoPrimitives/CLHEPtoEigenConverter.h"
#include <iostream>
#include <sstream>
@@ -226,20 +225,20 @@ void AGDD2GeoModelBuilder::CreateSnake(AGDDSnake* v)
static GeoShape *s2=new GeoShapeShift(box1,ttt2);
double radius=v->Radius();
- CLHEP::Hep3Vector axis0(v->GetPoint(0)-v->GetPoint(1));
- CLHEP::Hep3Vector axis(v->GetPoint(1)-v->GetPoint(0));
- CLHEP::Hep3Vector axis1;
- CLHEP::Hep3Vector axis2(v->GetPoint(2)-v->GetPoint(1));
- double length=axis.mag();
+ GeoTrf::Vector3D axis0(v->GetPoint(0)-v->GetPoint(1));
+ GeoTrf::Vector3D axis(v->GetPoint(1)-v->GetPoint(0));
+ GeoTrf::Vector3D axis1 = GeoTrf::Vector3D::Identity();
+ GeoTrf::Vector3D axis2(v->GetPoint(2)-v->GetPoint(1));
+ double length=axis.norm();
double angle1=0;
- double angle2=std::abs(axis.angle(axis2))/2;
+ double angle2=std::abs(std::atan2(axis.cross(axis2).norm(), axis.dot(axis2)))/2;
double delta_l1=0;
double delta_l2=radius*std::tan(angle2);
double lengthnew=length+delta_l2;
GeoShape* solid=new GeoTubs(0.,radius,lengthnew/2.,0.,4*std::asin(1.));
const GeoTrf::Vector3D vt(0.,0.,-lengthnew/2.+delta_l2+2.);
- GeoTrf::Transform3D rrr = GeoTrf::RotateY3D(angle2)*GeoTrf::RotateZ3D(axis2.phi());
+ GeoTrf::Transform3D rrr = GeoTrf::RotateY3D(angle2)*GeoTrf::RotateZ3D(phi(axis2));
GeoShape *ssnew=new GeoShapeShift(s1,GeoTrf::Translation3D(vt)*rrr);
solid = new GeoShapeSubtraction(solid,ssnew);
@@ -247,7 +246,7 @@ void AGDD2GeoModelBuilder::CreateSnake(AGDDSnake* v)
GeoTrf::Vector3D vref(0.,0.,-lengthnew/2.);
GeoTrf::Transform3D tref = GeoTrf::Transform3D::Identity()*GeoTrf::Translation3D(vref);
solid=new GeoShapeShift(solid,tref);
- GeoTrf::Transform3D r1 = GeoTrf::RotateZ3D(axis0.phi())*GeoTrf::RotateY3D(axis0.theta());
+ GeoTrf::Transform3D r1 = GeoTrf::RotateZ3D(phi(axis0))*GeoTrf::RotateY3D(theta(axis0));
GeoTrf::Vector3D vtt(v->GetPoint(0).x(),v->GetPoint(0).y(),v->GetPoint(0).z());
solid=new GeoShapeShift(solid,GeoTrf::Translation3D(vtt)*r1);
@@ -257,17 +256,17 @@ void AGDD2GeoModelBuilder::CreateSnake(AGDDSnake* v)
axis=v->GetPoint(i+1)-v->GetPoint(i);
axis1=v->GetPoint(i)-v->GetPoint(i-1);
- length=axis.mag();
- angle1=std::abs(axis.angle(axis1))/2;
+ length=axis.norm();
+ angle1=std::abs(std::atan2(axis.cross(axis1).norm(), axis.dot(axis1)))/2;
delta_l1=radius*std::tan(angle1);
delta_l2=0;
if (i<(v->NrOfPoints()-2))
{
axis2=v->GetPoint(i+2)-v->GetPoint(i+1);
- angle2=std::abs(axis.angle(axis2))/2;
+ angle2=std::abs(std::atan2(axis.cross(axis2).norm(), axis.dot(axis2)))/2;
delta_l2=radius*std::tan(angle2);
}
- length=axis.mag();
+ length=axis.norm();
lengthnew=length+delta_l1+delta_l2;
GeoTrf::Vector3D vvref(0.,0.,-lengthnew/2+delta_l1);
@@ -277,8 +276,8 @@ void AGDD2GeoModelBuilder::CreateSnake(AGDDSnake* v)
const GeoTrf::Vector3D vt1(0.,0.,+lengthnew/2.-delta_l1-2.);
const GeoTrf::Vector3D vt2(0.,0.,-lengthnew/2.+delta_l2+2.);
- GeoTrf::Transform3D rrr1 = GeoTrf::RotateZ3D(-axis1.phi())*GeoTrf::RotateY3D(angle1);
- GeoTrf::Transform3D rrr2 = GeoTrf::RotateZ3D(axis2.phi())*GeoTrf::RotateY3D(-angle2);
+ GeoTrf::Transform3D rrr1 = GeoTrf::RotateZ3D(-phi(axis1))*GeoTrf::RotateY3D(angle1);
+ GeoTrf::Transform3D rrr2 = GeoTrf::RotateZ3D(phi(axis2))*GeoTrf::RotateY3D(-angle2);
GeoTrf::Transform3D ttt1 = rrr1*GeoTrf::Translation3D(vt1);
GeoTrf::Transform3D ttt2 = rrr2*GeoTrf::Translation3D(vt2);
GeoShape *ssnew1=new GeoShapeShift(s2,ttt1);
@@ -291,7 +290,7 @@ void AGDD2GeoModelBuilder::CreateSnake(AGDDSnake* v)
ss=new GeoShapeShift(ss,ttref);
- GeoTrf::Transform3D rr1 = GeoTrf::RotateZ3D(axis0.phi())*GeoTrf::RotateY3D(axis0.theta());
+ GeoTrf::Transform3D rr1 = GeoTrf::RotateZ3D(phi(axis0))*GeoTrf::RotateY3D(theta(axis0));
const GeoTrf::Vector3D vv(v->GetPoint(i).x(),v->GetPoint(i).y(),v->GetPoint(i).z());
ss=new GeoShapeShift(ss,GeoTrf::Translation3D(vv)*rr1);
solid=new GeoShapeUnion(solid,ss);
@@ -364,14 +363,14 @@ void AGDD2GeoModelBuilder::CreateUnion(AGDDUnion* v)
AGDDVolume *vol=pos->GetVolume();
vol->CreateSolid();
GeoShape *sV=(GeoShape*)(vol->GetSolid());
- sV=new GeoShapeShift(sV,Amg::CLHEPTransformToEigen(pos->Transform()));
+ sV=new GeoShapeShift(sV,pos->Transform());
for (int i=1;i<nPos;i++)
{
AGDDPositioner* pp=v->GetDaughter(i);
AGDDVolume *vv=pp->GetVolume();
vv->CreateSolid();
GeoShape *nsV=(GeoShape*)(vv->GetSolid());
- nsV=new GeoShapeShift(nsV,Amg::CLHEPTransformToEigen(pp->Transform()));
+ nsV=new GeoShapeShift(nsV,pp->Transform());
sV=new GeoShapeUnion(sV,nsV);
}
v->SetMaterial(vol->GetMaterial());
@@ -385,14 +384,14 @@ void AGDD2GeoModelBuilder::CreateIntersection(AGDDIntersection* v)
AGDDVolume *vol=pos->GetVolume();
vol->CreateSolid();
GeoShape *sV=(GeoShape*)(vol->GetSolid());
- sV=new GeoShapeShift(sV,Amg::CLHEPTransformToEigen(pos->Transform()));
+ sV=new GeoShapeShift(sV,pos->Transform());
for (int i=1;i<nPos;i++)
{
AGDDPositioner* pp=v->GetDaughter(i);
AGDDVolume *vv=pp->GetVolume();
vv->CreateSolid();
GeoShape *nsV=(GeoShape*)(vv->GetSolid());
- nsV=new GeoShapeShift(nsV,Amg::CLHEPTransformToEigen(pp->Transform()));
+ nsV=new GeoShapeShift(nsV,pp->Transform());
sV=new GeoShapeIntersection(sV,nsV);
}
v->SetMaterial(vol->GetMaterial());
@@ -405,14 +404,14 @@ void AGDD2GeoModelBuilder::CreateSubtraction(AGDDSubtraction* v)
AGDDVolume *vol=pos->GetVolume();
vol->CreateSolid();
GeoShape *sV=(GeoShape*)(vol->GetSolid());
- sV=new GeoShapeShift(sV,Amg::CLHEPTransformToEigen(pos->Transform()));
+ sV=new GeoShapeShift(sV,pos->Transform());
for (int i=1;i<nPos;i++)
{
AGDDPositioner* pp=v->GetDaughter(i);
AGDDVolume *vv=pp->GetVolume();
vv->CreateSolid();
GeoShape *nsV=(GeoShape*)(vv->GetSolid());
- nsV=new GeoShapeShift(nsV,Amg::CLHEPTransformToEigen(pp->Transform()));
+ nsV=new GeoShapeShift(nsV,pp->Transform());
sV=new GeoShapeSubtraction(sV,nsV);
}
v->SetMaterial(vol->GetMaterial());
@@ -499,7 +498,7 @@ void AGDD2GeoModelBuilder::CreateComposition(AGDDComposition *v)
log<<MSG::WARNING<<"CreateComposition() - AGDDDetectorPositioner is nullptr"<<endmsg;
}
}
- GeoTrf::Transform3D trf=Amg::CLHEPTransformToEigen(pos->Transform());
+ GeoTrf::Transform3D trf=pos->Transform();
GeoTransform *geotrf=new GeoTransform(trf);
void *temp=vol->GetVolume();
diff --git a/DetectorDescription/AGDD/AGDDControl/src/AGDDController.cxx b/DetectorDescription/AGDD/AGDDControl/src/AGDDController.cxx
index 236a138742e799c433cd623c5f0a6afa23a1ce74..307f982b2eeab68cac0ae4f6f0259458308c695e 100644
--- a/DetectorDescription/AGDD/AGDDControl/src/AGDDController.cxx
+++ b/DetectorDescription/AGDD/AGDDControl/src/AGDDController.cxx
@@ -3,6 +3,7 @@
*/
#include "AGDDControl/AGDDController.h"
+
#include "AGDDKernel/AGDDBuilder.h"
#include "AGDDControl/IAGDDParser.h"
#include "AGDDControl/XercesParser.h"
@@ -12,21 +13,21 @@
#include "AGDDKernel/AGDDVolume.h"
#include "AGDDKernel/AGDDPositioner.h"
#include "AGDDKernel/AliasStore.h"
-
#include "GeoModelInterfaces/IGeoModelSvc.h"
#include "GeoModelUtilities/GeoModelExperiment.h"
#include "GeoModelKernel/GeoVDetectorManager.h"
#include "GeoModelKernel/GeoPhysVol.h"
#include "GeoModelKernel/GeoVPhysVol.h"
#include "GeoModelKernel/GeoPVConstLink.h"
-
#include "StoreGate/StoreGateSvc.h"
+
#include <map>
#include <vector>
#include <string>
#include <fstream>
#include <ctime>
#include <TString.h> // for Form
+#include <iostream>
std::vector<const GeoLogVol*> volumeMap;
diff --git a/DetectorDescription/AGDD/AGDDControl/src/AGDDToolBase.cxx b/DetectorDescription/AGDD/AGDDControl/src/AGDDToolBase.cxx
index 3555489ebda4984879e33799723b93bf4d29501d..05c0aec7df6b652535a684984d6ab96e5e004908 100644
--- a/DetectorDescription/AGDD/AGDDControl/src/AGDDToolBase.cxx
+++ b/DetectorDescription/AGDD/AGDDControl/src/AGDDToolBase.cxx
@@ -1,39 +1,22 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AGDDControl/AGDDToolBase.h"
#include "AGDDControl/AGDDController.h"
-AGDDToolBase::AGDDToolBase(const std::string& type, const std::string& name,
- const IInterface* parent):AthAlgTool(type,name,parent),
- m_parserVerbosity(0),m_builderVerbosity(0),
- m_printSections(false),m_locked(false),
- m_defaultDetector("NoDetector"),m_navigateDetector("")
+AGDDToolBase::AGDDToolBase(const std::string& type, const std::string& name,
+ const IInterface* parent)
+ : base_class(type,name,parent)
{
- declareInterface<IAGDDToolBase> (this);
-
- declareProperty( "XMLFiles", m_xmlFiles);
- declareProperty( "Sections", m_sectionsToBuild);
- declareProperty( "Volumes" , m_volumesToBuild);
- declareProperty( "ParserVerbosity", m_parserVerbosity);
- declareProperty( "BuilderVerbosity", m_builderVerbosity);
- declareProperty( "PrintSections", m_printSections);
- declareProperty( "Locked", m_locked);
- declareProperty("DefaultDetector", m_defaultDetector);
- declareProperty("NavigateDetector", m_navigateDetector);
- declareProperty("DisableSections", m_disableSections);
- declareProperty("WriteAGDDFile", m_writeDBfile = false);
- declareProperty("OutAGDDXMLName", m_outFileName = "mytest.xml");
-
- ATH_MSG_DEBUG(" trying to get the controller");
- m_controller =AGDDController::GetController();
+ ATH_MSG_DEBUG(" trying to get the controller");
+ m_controller = AGDDController::GetController();
}
StatusCode AGDDToolBase::initialize()
{
- InitializeAGDD();
- return AlgTool::initialize();
+ InitializeAGDD();
+ return StatusCode::SUCCESS;
}
void AGDDToolBase::InitializeAGDD()
diff --git a/DetectorDescription/AGDD/AGDDControl/src/ExpressionEvaluator.cxx b/DetectorDescription/AGDD/AGDDControl/src/ExpressionEvaluator.cxx
index 7b32e81636873a1ce8f0fa720aa825de5a2b5b54..7b9d4bcaec4ba7d59326cd4cc8efc494f409c230 100644
--- a/DetectorDescription/AGDD/AGDDControl/src/ExpressionEvaluator.cxx
+++ b/DetectorDescription/AGDD/AGDDControl/src/ExpressionEvaluator.cxx
@@ -1,13 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-//
#include "AGDDControl/ExpressionEvaluator.h"
#include "AGDDControl/AGDDTokenizer.h"
-#include "CLHEP/Units/PhysicalConstants.h"
-#include <string>
-#include <vector>
+
#include <cstdlib>
#include <cctype>
#include <cstring>
@@ -15,14 +12,10 @@
#include <sstream>
#include <algorithm>
-namespace CLHEP {}
-using namespace CLHEP;
-
ExpressionEvaluator::ExpressionEvaluator()
{
m_calc.clear();
m_calc.setStdMath(); // set standard constants and functions
- //m_calc.setSystemOfUnits(); // set SI units
// Set Geant4 system of units
m_calc.setSystemOfUnits(1.e+3, 1./1.60217733e-25, 1.e+9, 1./1.60217733e-10,1.0, 1.0, 1.0);
m_fileCurrentlyParsed = "";
@@ -47,7 +40,6 @@ bool ExpressionEvaluator::RegisterConstant( std::string& c, double v )
return false;
}
- //RegisterVariable( c->get_name(), c->get_value() );
RegisterVariable( c, value );
return true;
}
@@ -61,7 +53,6 @@ bool ExpressionEvaluator::RegisterArray( std::string& c, std::vector<double> v)
ss << i;
ss >> index;
std::string name = c+"_"+index+"_";
-// std::cout << "setting variable: " << name << " with value: " << value << std::endl;
RegisterVariable( name, value );
}
return true;
@@ -102,8 +93,6 @@ bool ExpressionEvaluator::is_delimiter(char c)
double ExpressionEvaluator::EvaluateString(const std::string& str)
{
std::string str_mod = str;
-// if(m_fileCurrentlyParsed != "")
-// {
const char* c_str_mod = str.c_str(); //string to be modified with file namespace!
std::vector<int> variable_ends; //variable names to be changed
int cur_variable_end = 0;
@@ -139,7 +128,6 @@ double ExpressionEvaluator::EvaluateString(const std::string& str)
c_str_mod++;
cur_variable_end++;
}
-// }// variable ends stored in vector
std::string::size_type shift = 0;
std::string::size_type ns_length = m_fileCurrentlyParsed.size();
for(unsigned int i=0; i<variable_ends.size(); i++)
@@ -164,10 +152,7 @@ bool ExpressionEvaluator::RegisterPhysConstant( std::string& c, std::string valu
expr += unit;
expr += ")";
- //std::cout << "Expression evaluator:: evaluating string: " << expr << std::endl;
-
double dvalue = EvaluateString( expr );
-// double unit_value = EvaluateString( unit );
if( m_calc.status() != HepTool::Evaluator::OK )
{
@@ -178,7 +163,6 @@ bool ExpressionEvaluator::RegisterPhysConstant( std::string& c, std::string valu
return false;
}
- //RegisterVariable( physc->get_name(), expr );
RegisterVariable( c, dvalue );
return true;
}
@@ -198,7 +182,6 @@ bool ExpressionEvaluator::RegisterExpression( std::string& name, std::string tex
return false;
}
- //RegisterVariable( e->get_name(), e->get_text() );
RegisterVariable( name, value );
return true;
}
@@ -217,9 +200,7 @@ double ExpressionEvaluator::Eval( const char* expr_mod )
while(true)
{
start_index = expr.find('[', start_index);
-// std::cout<<"*** start_index "<<start_index<<" "<<expr<<std::endl;
if(start_index == std::string::npos) break;
-// std::cout << " start index "<<start_index<<std::endl;
std::string::size_type boundary_index = expr.find(']', start_index);
expr.replace(start_index,1,1,'_');
end_index = expr.find(',', start_index);
@@ -228,7 +209,6 @@ double ExpressionEvaluator::Eval( const char* expr_mod )
start_index++;
std::string var1 = expr.substr(start_index, end_index-start_index);
double eval1 = EvaluateString( var1 );
- //std::cout<<"Evaluated "<<var1<<" to: "<<eval1<<std::endl;
std::stringstream ss1;
std::string str1;
ss1 << eval1;
@@ -238,19 +218,16 @@ double ExpressionEvaluator::Eval( const char* expr_mod )
else
{
end_index = boundary_index;
-// std::cout << " end index "<<end_index<<std::endl;
if(end_index != std::string::npos)
{
start_index++;
std::string var1 = expr.substr(start_index, end_index-start_index);
double eval1 = EvaluateString( var1 );
- //std::cout<<"Evaluated "<<var1<<" to: "<<eval1<<std::endl;
std::stringstream ss1;
std::string str1;
ss1 << eval1;
ss1 >> str1;
expr.replace(start_index, end_index-start_index, str1, 0, str1.size());
-// std::cout <<" str1 "<<str1<<std::endl;
}
}
}
@@ -265,7 +242,6 @@ double ExpressionEvaluator::Eval( const char* expr_mod )
start_index++;
std::string var2 = expr.substr(start_index, end_index-start_index);
double eval2 = EvaluateString( var2 );
- //std::cout<<"Evaluated "<<var2<<" to: "<<eval2<<std::endl;
std::stringstream ss2;
std::string str2;
ss2 << eval2;
@@ -280,12 +256,10 @@ double ExpressionEvaluator::Eval( const char* expr_mod )
if(start_index == std::string::npos) break;
expr.replace(start_index,1,1,'_');
}
-// std::cout<<"***************** "<<expr<<std::endl;
double result = EvaluateString( expr );
if( m_calc.status() != HepTool::Evaluator::OK )
{
std::cerr << expr << std::endl;
- //std::cerr << "------";
for (int i=0; i<m_calc.error_position(); i++)
{
std::cerr << "-";
diff --git a/DetectorDescription/AGDD/AGDDHandlers/AGDDHandlers/snake_pointHandler.h b/DetectorDescription/AGDD/AGDDHandlers/AGDDHandlers/snake_pointHandler.h
index 121054a6b1ae050bc4eac0807c4ad6f8e21e52c3..d80b989c691205f65e8ada85f6e00f9fc938d73e 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/AGDDHandlers/snake_pointHandler.h
+++ b/DetectorDescription/AGDD/AGDDHandlers/AGDDHandlers/snake_pointHandler.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef snake_pointHandler_H
@@ -7,7 +7,7 @@
#include "AGDDControl/XMLHandler.h"
-#include "CLHEP/Vector/ThreeVector.h"
+#include "GeoModelKernel/GeoDefinitions.h"
#include <string>
@@ -15,9 +15,9 @@ class snake_pointHandler:public XMLHandler {
public:
snake_pointHandler(std::string);
void ElementHandle();
- static CLHEP::Hep3Vector CurrentPoint() {return s_point;}
+ static GeoTrf::Vector3D CurrentPoint() {return s_point;}
private:
- static CLHEP::Hep3Vector s_point;
+ static GeoTrf::Vector3D s_point;
};
#endif
diff --git a/DetectorDescription/AGDD/AGDDHandlers/CMakeLists.txt b/DetectorDescription/AGDD/AGDDHandlers/CMakeLists.txt
index a4093c7bf8e7d6b15bb5db1b0601b9e19a439526..616d8db2eb9557043f30a5d6a2f28a90e6b200bb 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/CMakeLists.txt
+++ b/DetectorDescription/AGDD/AGDDHandlers/CMakeLists.txt
@@ -5,13 +5,6 @@
# Declare the package name:
atlas_subdir( AGDDHandlers )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/AGDD/AGDDControl
- DetectorDescription/AGDD/AGDDKernel
- PRIVATE
- DetectorDescription/AGDD/AGDDModel )
-
# External dependencies:
find_package( CLHEP )
diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/chamberPositionerHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/chamberPositionerHandler.cxx
index 6e97fea80fe17db1f2e6366a2cd2c2901b134d27..50ec56b22bcf34221dfdf0bb831d38e337f703da 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/src/chamberPositionerHandler.cxx
+++ b/DetectorDescription/AGDD/AGDDHandlers/src/chamberPositionerHandler.cxx
@@ -7,14 +7,11 @@
#include "AGDDKernel/AGDDDetectorPositioner.h"
#include "AGDDKernel/AGDDDetector.h"
#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
#include <iostream>
-#include "CLHEP/Vector/Rotation.h"
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Geometry/Transform3D.h"
-
-
chamberPositionerHandler::chamberPositionerHandler(std::string s):XMLHandler(s)
{
}
@@ -22,14 +19,13 @@ chamberPositionerHandler::chamberPositionerHandler(std::string s):XMLHandler(s)
void chamberPositionerHandler::ElementHandle()
{
std::string volume=getAttributeAsString("volume");
-
- //AGDDVolume* theVol=AGDDVolumeStore::GetVolumeStore()->GetVolume(volume);
-
+
AGDDDetector* mCham=(AGDDDetectorStore::GetDetectorStore())->GetDetector(volume);
std::string subType;
if (!mCham)
{
- std::cout<<"chamberPositionerHandler: something wrong! returning..."<<std::endl;
+ MsgStream log(Athena::getMessageSvc(),"chamberPositionerHandler");
+ log<<MSG::WARNING<<"ElementHandle() - Could not retrieve volume "<<volume<<" from DetectorStore!"<<endmsg;
return;
}
else
@@ -49,35 +45,27 @@ void chamberPositionerHandler::ElementHandle()
int etaIndex=getAttributeAsInt("etaIndex",0);
double dPhi=360./iWedge;
-
if (iSectors.size()!= (unsigned int) iWedge) throw;
-
- // std::cout<<" =============>> this is chamberPositionerHandler::ElementHandle() "<<volume<<" "<<subType<<std::endl;
-
+
for (int i=0;i<iWedge;i++)
{
if (iSectors[i]=='0') continue;
if (zLayout!="Z_NEGATIVE")
{
double Wedge=dPhi*i+phi0;
- CLHEP::Hep3Vector cvec;
- CLHEP::HepRotation crot;
+ GeoTrf::Transform3D crot = GeoTrf::Transform3D::Identity();
if (type=="ENDCAP")
{
// fix to ensure right order of planes
- crot.rotateZ(180.*GeoModelKernelUnits::degree);
- //
- crot.rotateY(90*GeoModelKernelUnits::degree);
- crot.rotateZ(Wedge*GeoModelKernelUnits::degree);
+ crot = crot*GeoTrf::RotateZ3D(Wedge*GeoModelKernelUnits::degree)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::degree)*GeoTrf::RotateZ3D(180.*GeoModelKernelUnits::degree);
}
- else
- crot.rotateZ(Wedge*GeoModelKernelUnits::degree);
- double x=radius*cos(Wedge*GeoModelKernelUnits::degree);
- double y=radius*sin(Wedge*GeoModelKernelUnits::degree);
+ else crot = crot*GeoTrf::RotateZ3D(Wedge*GeoModelKernelUnits::degree);
+ double x=radius*std::cos(Wedge*GeoModelKernelUnits::degree);
+ double y=radius*std::sin(Wedge*GeoModelKernelUnits::degree);
double zpos=zPos;
- cvec=CLHEP::Hep3Vector(x,y,zpos);
+ GeoTrf::Vector3D cvec=GeoTrf::Vector3D(x,y,zpos);
AGDDDetectorPositioner *p __attribute__((__unused__));
- p=new AGDDDetectorPositioner(volume,crot,cvec);
+ p=new AGDDDetectorPositioner(volume,GeoTrf::Translation3D(cvec)*crot);
p->SensitiveDetector(true);
p->ID.phiIndex=i;
p->ID.sideIndex=1;
@@ -95,25 +83,19 @@ void chamberPositionerHandler::ElementHandle()
if (zLayout!="Z_POSITIVE")
{
double Wedge=dPhi*i+phi0;
- CLHEP::Hep3Vector cvec;
- CLHEP::HepRotation crot;
+ GeoTrf::Transform3D crot = GeoTrf::Transform3D::Identity();
if (type=="ENDCAP")
{
// fix to ensure right order of planes
- crot.rotateZ(180.*GeoModelKernelUnits::degree);
- //
- crot.rotateY(90*GeoModelKernelUnits::degree);
- crot.rotateZ(-Wedge*GeoModelKernelUnits::degree);
- crot.rotateX(180.*GeoModelKernelUnits::degree);
+ crot = crot*GeoTrf::RotateX3D(180.*GeoModelKernelUnits::degree)*GeoTrf::RotateZ3D(-Wedge*GeoModelKernelUnits::degree)*GeoTrf::RotateY3D(90*GeoModelKernelUnits::degree)*GeoTrf::RotateZ3D(180.*GeoModelKernelUnits::degree);
}
- else
- crot.rotateZ(Wedge*GeoModelKernelUnits::degree);
- double x=radius*cos(Wedge*GeoModelKernelUnits::degree);
- double y=radius*sin(Wedge*GeoModelKernelUnits::degree);
+ else crot = crot*GeoTrf::RotateZ3D(Wedge*GeoModelKernelUnits::degree);
+ double x=radius*std::cos(Wedge*GeoModelKernelUnits::degree);
+ double y=radius*std::sin(Wedge*GeoModelKernelUnits::degree);
double zpos=zPos;
- cvec=CLHEP::Hep3Vector(x,y,-zpos);
+ GeoTrf::Vector3D cvec=GeoTrf::Vector3D(x,y,-zpos);
AGDDDetectorPositioner *p __attribute__((__unused__));
- p=new AGDDDetectorPositioner(volume,crot,cvec);
+ p=new AGDDDetectorPositioner(volume,GeoTrf::Translation3D(cvec)*crot);
p->SensitiveDetector(true);
p->ID.phiIndex=i;
p->ID.sideIndex=-1;
diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/mposPhiHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/mposPhiHandler.cxx
index e9f4caf82d941a3ba2d9a7c9439673c8dc5930df..2df718c06066d27ca116445a084f3d0568354862 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/src/mposPhiHandler.cxx
+++ b/DetectorDescription/AGDD/AGDDHandlers/src/mposPhiHandler.cxx
@@ -5,14 +5,11 @@
#include "AGDDHandlers/mposPhiHandler.h"
#include "AGDDKernel/AGDDPositioner.h"
#include "GeoModelKernel/Units.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
#include <iostream>
-#include "CLHEP/Vector/Rotation.h"
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Vector/TwoVector.h"
-#include "CLHEP/Geometry/Transform3D.h"
-
mposPhiHandler::mposPhiHandler(std::string s):XMLHandler(s),p(0)
{
}
@@ -33,7 +30,8 @@ void mposPhiHandler::ElementHandle()
dphi=360./icopy;
else
{
- std::cout<<"mposPhiHandler: both icopy and dphi are null!! volume "<<volume<<" cannot continue!"<<std::endl;
+ MsgStream log(Athena::getMessageSvc(),"mposPhiHandler");
+ log<<MSG::WARNING<<"ElementHandle() - both icopy and dphi are nullptr!! volume "<<volume<<" cannot continue!"<<endmsg;
return;
}
}
@@ -52,31 +50,27 @@ void mposPhiHandler::ElementHandle()
zpos=vvv[1];
}
- CLHEP::Hep3Vector cvec;
- CLHEP::HepRotation crot;
+ GeoTrf::Transform3D crot = GeoTrf::Transform3D::Identity();
vvv=getAttributeAsVector("rot",res);
if (res)
{
- crot.rotateX(vvv[0]*GeoModelKernelUnits::degree);
- crot.rotateY(vvv[1]*GeoModelKernelUnits::degree);
- crot.rotateZ(vvv[2]*GeoModelKernelUnits::degree);
+ crot = crot*GeoTrf::RotateZ3D(vvv[2]*GeoModelKernelUnits::degree)*GeoTrf::RotateY3D(vvv[1]*GeoModelKernelUnits::degree)*GeoTrf::RotateX3D(vvv[0]*GeoModelKernelUnits::degree);
}
for (int i=0;i<icopy;i++)
{
- CLHEP::Hep2Vector position(rad,lateral_displacement);
- CLHEP::Hep3Vector cvec;
+ GeoTrf::Vector2D position(rad,lateral_displacement);
double phi=phi0+dphi*i;
- position.rotate(phi*GeoModelKernelUnits::degree);
+ position = Eigen::Rotation2Dd(phi*GeoModelKernelUnits::degree)*position;
double x=position.x();
double y=position.y();
- cvec=CLHEP::Hep3Vector(x,y,zpos);
- if (s!="false"&&i>0) crot.rotateZ(dphi*GeoModelKernelUnits::degree);
- if (s!="false"&&i==0) crot.rotateZ(phi0*GeoModelKernelUnits::degree);
+ GeoTrf::Vector3D cvec=GeoTrf::Vector3D(x,y,zpos);
+ if (s!="false"&&i>0) crot = GeoTrf::RotateZ3D(dphi*GeoModelKernelUnits::degree)*crot;
+ else if (s!="false"&&i==0) crot = GeoTrf::RotateZ3D(phi0*GeoModelKernelUnits::degree)*crot;
- p=new AGDDPositioner(volume,crot,cvec);
+ p=new AGDDPositioner(volume,GeoTrf::Translation3D(cvec)*crot);
}
}
diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/mposWedgeHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/mposWedgeHandler.cxx
index c28ff18092f35800ce3a1c8cda20a4cc9d77ad58..e6ebb99cdaac786cb53cc1177c9c320e4e201f30 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/src/mposWedgeHandler.cxx
+++ b/DetectorDescription/AGDD/AGDDHandlers/src/mposWedgeHandler.cxx
@@ -7,10 +7,7 @@
#include "GeoModelKernel/Units.h"
#include <iostream>
-
-#include "CLHEP/Vector/Rotation.h"
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Geometry/Transform3D.h"
+#include <vector>
mposWedgeHandler::mposWedgeHandler(std::string s):XMLHandler(s),p(0)
{
@@ -22,25 +19,20 @@ void mposWedgeHandler::ElementHandle()
std::string volume=getAttributeAsString("volume",res);
int iWedge=getAttributeAsInt("wedge_number",8);
std::vector<double> iSectors=getAttributeAsVector("sectors",res);
-
+
double dWedge=360./iWedge;
- CLHEP::Hep3Vector cvec;
- CLHEP::HepRotation crot;
-
double radius=0;
for (int i=0;i<iWedge;i++)
{
double Wedge=dWedge*i;
if ((int)iSectors[i]==0) continue;
- CLHEP::Hep3Vector cvec;
- CLHEP::HepRotation crot;
- crot.rotateZ(Wedge*GeoModelKernelUnits::degree);
- double x=radius*cos(Wedge*GeoModelKernelUnits::degree);
- double y=radius*sin(Wedge*GeoModelKernelUnits::degree);
+ GeoTrf::Transform3D crot = GeoTrf::RotateZ3D(Wedge*GeoModelKernelUnits::degree);
+ double x=radius*std::cos(Wedge*GeoModelKernelUnits::degree);
+ double y=radius*std::sin(Wedge*GeoModelKernelUnits::degree);
double zpos=0;
- cvec=CLHEP::Hep3Vector(x,y,zpos);
+ GeoTrf::Vector3D cvec=GeoTrf::Vector3D(x,y,zpos);
- p=new AGDDPositioner(volume,crot,cvec);
+ p=new AGDDPositioner(volume,GeoTrf::Translation3D(cvec)*crot);
}
}
diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/posRPhiZHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/posRPhiZHandler.cxx
index 03769f0c1f5f5fa54609d138ac288ece3a56e203..2e76c3b625c1de8cd7361aa3a23807b6e118676f 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/src/posRPhiZHandler.cxx
+++ b/DetectorDescription/AGDD/AGDDHandlers/src/posRPhiZHandler.cxx
@@ -7,10 +7,7 @@
#include "GeoModelKernel/Units.h"
#include <iostream>
-
-#include "CLHEP/Vector/Rotation.h"
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Geometry/Transform3D.h"
+#include <vector>
posRPhiZHandler::posRPhiZHandler(std::string s):XMLHandler(s),p(0)
{
@@ -18,32 +15,24 @@ posRPhiZHandler::posRPhiZHandler(std::string s):XMLHandler(s),p(0)
void posRPhiZHandler::ElementHandle()
{
- bool res;
+ bool res=false;
std::string volume=getAttributeAsString("volume",res);
std::vector<double> vvv=getAttributeAsVector("R_Phi_Z",res);
-
- double radius,phi,zpos;
-
- radius=vvv[0];
- phi=vvv[1];
- zpos=vvv[2];
-
- CLHEP::Hep3Vector cvec;
- CLHEP::HepRotation crot;
+ double radius=vvv[0];
+ double phi=vvv[1];
+ double zpos=vvv[2];
+ GeoTrf::Transform3D crot = GeoTrf::Transform3D::Identity();
vvv=getAttributeAsVector("rot",res);
if (res)
{
- crot=CLHEP::HepRotation();
- crot.rotateX(vvv[0]*GeoModelKernelUnits::degree);
- crot.rotateY(vvv[1]*GeoModelKernelUnits::degree);
- crot.rotateZ(vvv[2]*GeoModelKernelUnits::degree);
+ crot = crot*GeoTrf::RotateZ3D(vvv[2]*GeoModelKernelUnits::degree)*GeoTrf::RotateY3D(vvv[1]*GeoModelKernelUnits::degree)*GeoTrf::RotateX3D(vvv[0]*GeoModelKernelUnits::degree);
}
- crot.rotateZ(phi*GeoModelKernelUnits::degree);
- double x=radius*cos(phi*GeoModelKernelUnits::degree);
- double y=radius*sin(phi*GeoModelKernelUnits::degree);
- cvec=CLHEP::Hep3Vector(x,y,zpos);
+ crot = GeoTrf::RotateZ3D(phi*GeoModelKernelUnits::degree)*crot;
+ double x=radius*std::cos(phi*GeoModelKernelUnits::degree);
+ double y=radius*std::sin(phi*GeoModelKernelUnits::degree);
+ GeoTrf::Vector3D cvec=GeoTrf::Vector3D(x,y,zpos);
- p=new AGDDPositioner(volume,crot,cvec);
+ p=new AGDDPositioner(volume,GeoTrf::Translation3D(cvec)*crot);
}
diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/posXYZHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/posXYZHandler.cxx
index 86be3de8a991b329d9f15cbc10d24ccd9135b964..6b2a8afd7b476d0cf8c8a3f0dbc96b077683c0f3 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/src/posXYZHandler.cxx
+++ b/DetectorDescription/AGDD/AGDDHandlers/src/posXYZHandler.cxx
@@ -12,6 +12,7 @@
#include "CLHEP/Vector/Rotation.h"
#include "CLHEP/Vector/ThreeVector.h"
#include "CLHEP/Geometry/Transform3D.h"
+#include "GeoPrimitives/CLHEPtoEigenConverter.h"
posXYZHandler::posXYZHandler(std::string s):XMLHandler(s)
{
@@ -45,6 +46,6 @@ void posXYZHandler::ElementHandle()
if (rotRet) std::cout<<" rot= ("<<rot[0]<<";"<<rot[1]<<";"<<rot[2]<<")";
std::cout<<std::endl;
}
- AGDDPositioner *p=new AGDDPositioner(volume,crot,cvec);
+ AGDDPositioner *p=new AGDDPositioner(volume,Amg::CLHEPTransformToEigen(HepGeom::Transform3D(crot,cvec)));
globals::currentPositioner=p;
}
diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/snakeHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/snakeHandler.cxx
index 29d19f4da30731af558aa289f1788aad5bc9064f..1be4ced7c7050fe777ea19f45f635aab75193e85 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/src/snakeHandler.cxx
+++ b/DetectorDescription/AGDD/AGDDHandlers/src/snakeHandler.cxx
@@ -1,32 +1,29 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AGDDHandlers/snakeHandler.h"
#include "AGDDControl/XercesParser.h"
#include "AGDDHandlers/snake_pointHandler.h"
#include "AGDDModel/AGDDSnake.h"
-#include <iostream>
-
-#include "CLHEP/Vector/ThreeVector.h"
+#include <iostream>
#include <vector>
using namespace xercesc;
snakeHandler::snakeHandler(std::string s):XMLHandler(s)
{
-// std::cout<<"Creating handler for snake"<<std::endl;
}
void snakeHandler::ElementHandle()
{
- bool res;
+ bool res=false;
std::string name=getAttributeAsString("name",res);
std::string material=getAttributeAsString("material",res);
double radius=getAttributeAsDouble("radius",res);
- std::vector<CLHEP::Hep3Vector> points;
+ std::vector<GeoTrf::Vector3D> points;
AGDDSnake *vol=new AGDDSnake(name);
vol->SetMaterial(material);
@@ -40,7 +37,7 @@ void snakeHandler::ElementHandle()
{
if (child->getNodeType()==DOMNode::ELEMENT_NODE) {
XercesParser::elementLoop(child);
- CLHEP::Hep3Vector p=snake_pointHandler::CurrentPoint();
+ GeoTrf::Vector3D p=snake_pointHandler::CurrentPoint();
points.push_back(p);
}
}
diff --git a/DetectorDescription/AGDD/AGDDHandlers/src/snake_pointHandler.cxx b/DetectorDescription/AGDD/AGDDHandlers/src/snake_pointHandler.cxx
index e3856df0ce348187da674631259bb12a7d7f2065..b452eda67f899a671df30f50d34b48dba6825db7 100644
--- a/DetectorDescription/AGDD/AGDDHandlers/src/snake_pointHandler.cxx
+++ b/DetectorDescription/AGDD/AGDDHandlers/src/snake_pointHandler.cxx
@@ -1,25 +1,20 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AGDDHandlers/snake_pointHandler.h"
-#include "CLHEP/Vector/ThreeVector.h"
-
#include <iostream>
-CLHEP::Hep3Vector snake_pointHandler::s_point(0.,0.);
+GeoTrf::Vector3D snake_pointHandler::s_point(GeoTrf::Vector3D::Identity());
snake_pointHandler::snake_pointHandler(std::string s):XMLHandler(s)
{
-// std::cout<<"Creating handler for snake_point"<<std::endl;
}
void snake_pointHandler::ElementHandle()
{
- bool res;
+ bool res=false;
std::vector<double> vvv=getAttributeAsVector("X_Y_Z",res);
- s_point.setX(vvv[0]);
- s_point.setY(vvv[1]);
- s_point.setZ(vvv[2]);
+ s_point = GeoTrf::Vector3D(vvv[0], vvv[1], vvv[2]);
}
diff --git a/DetectorDescription/AGDD/AGDDKernel/AGDDKernel/AGDDDetectorPositioner.h b/DetectorDescription/AGDD/AGDDKernel/AGDDKernel/AGDDDetectorPositioner.h
index 0090c8203ca31730834e0e678abdeb4c53873752..e97ec996234fb4b6e6f558539a288a568750904d 100644
--- a/DetectorDescription/AGDD/AGDDKernel/AGDDKernel/AGDDDetectorPositioner.h
+++ b/DetectorDescription/AGDD/AGDDKernel/AGDDKernel/AGDDDetectorPositioner.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef AGDDDetectorPositioner_H
@@ -7,9 +7,6 @@
#include "GeoPrimitives/GeoPrimitives.h"
#include "GeoModelKernel/GeoFullPhysVol.h"
-#include "CLHEP/Geometry/Transform3D.h"
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Vector/Rotation.h"
#include "AGDDKernel/AGDDPositioner.h"
@@ -41,8 +38,8 @@ struct DetectorPositionParameters {
class AGDDDetectorPositioner:public AGDDPositioner {
public:
- AGDDDetectorPositioner(std::string n,HepGeom::Transform3D t);
- AGDDDetectorPositioner(std::string n,CLHEP::HepRotation r,CLHEP::Hep3Vector v);
+ AGDDDetectorPositioner(const std::string& n, GeoTrf::Transform3D t);
+ virtual ~AGDDDetectorPositioner()=default;
Identifiers ID;
diff --git a/DetectorDescription/AGDD/AGDDKernel/AGDDKernel/AGDDPositioner.h b/DetectorDescription/AGDD/AGDDKernel/AGDDKernel/AGDDPositioner.h
index 7368160af8fbb4f10e3d07935c69629c22c5d1d5..2f7148df96a82af3a789815de604ee5a7d736c37 100644
--- a/DetectorDescription/AGDD/AGDDKernel/AGDDKernel/AGDDPositioner.h
+++ b/DetectorDescription/AGDD/AGDDKernel/AGDDKernel/AGDDPositioner.h
@@ -1,34 +1,32 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef AGDDPositioner_H
#define AGDDPositioner_H
-#include "CLHEP/Geometry/Transform3D.h"
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Vector/Rotation.h"
+#include "GeoModelKernel/GeoDefinitions.h"
+
#include <string>
class AGDDVolume;
class AGDDPositioner {
public:
- AGDDPositioner(std::string n,HepGeom::Transform3D t);
- AGDDPositioner(std::string n,CLHEP::HepRotation r,CLHEP::Hep3Vector v);
- virtual ~AGDDPositioner() {;}
- std::string Volume();
- AGDDVolume *GetVolume();
- const HepGeom::Transform3D& Transform();
+ AGDDPositioner(const std::string& n, GeoTrf::Transform3D t);
+ virtual ~AGDDPositioner()=default;
+ std::string Volume();
+ AGDDVolume *GetVolume();
+ const GeoTrf::Transform3D& Transform();
bool IsSensitiveDetector() {return m_isSensitiveDetector;}
- void SensitiveDetector(bool a) {m_isSensitiveDetector=a;}
+ void SensitiveDetector(bool a) {m_isSensitiveDetector=a;}
private:
bool m_isSensitiveDetector;
std::string m_volume;
AGDDVolume *m_theVolume;
- HepGeom::Transform3D m_transform;
+ GeoTrf::Transform3D m_transform;
};
#endif
diff --git a/DetectorDescription/AGDD/AGDDKernel/CMakeLists.txt b/DetectorDescription/AGDD/AGDDKernel/CMakeLists.txt
index b0c239c981327d8fb6a749f90ca240c2fdbeec0e..aef2cb8fb3d55e9fc32ab8fd67c8c422696d9823 100644
--- a/DetectorDescription/AGDD/AGDDKernel/CMakeLists.txt
+++ b/DetectorDescription/AGDD/AGDDKernel/CMakeLists.txt
@@ -1,23 +1,15 @@
-################################################################################
-# Package: AGDDKernel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AGDDKernel )
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives )
-
# External dependencies:
-find_package( CLHEP )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( AGDDKernel
src/*.cxx
PUBLIC_HEADERS AGDDKernel
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES GeoPrimitives ${CLHEP_LIBRARIES} ${GEOMODELCORE_LIBRARIES} )
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES GeoPrimitives ${GEOMODELCORE_LIBRARIES} )
diff --git a/DetectorDescription/AGDD/AGDDKernel/src/AGDDDetectorPositioner.cxx b/DetectorDescription/AGDD/AGDDKernel/src/AGDDDetectorPositioner.cxx
index 4b81f3da7b416a3da78a1fb7129f0df3dcec298e..41e446253894724701c65377a3fbd25a69743490 100644
--- a/DetectorDescription/AGDD/AGDDKernel/src/AGDDDetectorPositioner.cxx
+++ b/DetectorDescription/AGDD/AGDDKernel/src/AGDDDetectorPositioner.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AGDDKernel/AGDDDetectorPositioner.h"
@@ -7,14 +7,8 @@
#include "AGDDKernel/AGDDVolume.h"
#include "AGDDKernel/AGDDVolumeStore.h"
-#include "CLHEP/Geometry/Transform3D.h"
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Vector/Rotation.h"
-
-AGDDDetectorPositioner::AGDDDetectorPositioner(std::string n,HepGeom::Transform3D t):AGDDPositioner(n,t),theDetector(0),theVolume(0)
-{
-}
-AGDDDetectorPositioner::AGDDDetectorPositioner(std::string n,CLHEP::HepRotation r,CLHEP::Hep3Vector v):AGDDPositioner(n,r,v),theDetector(0),theVolume(0)
-{
+AGDDDetectorPositioner::AGDDDetectorPositioner(const std::string& n, GeoTrf::Transform3D t) :
+ AGDDPositioner(n,t),
+ theDetector(nullptr),
+ theVolume(nullptr) {
}
-
diff --git a/DetectorDescription/AGDD/AGDDKernel/src/AGDDPositioner.cxx b/DetectorDescription/AGDD/AGDDKernel/src/AGDDPositioner.cxx
index b83d221e253bb576aca9438afd48d26c20ec7786..c06ad59ea68718db6f3cba879d102a73adf5f667 100644
--- a/DetectorDescription/AGDD/AGDDKernel/src/AGDDPositioner.cxx
+++ b/DetectorDescription/AGDD/AGDDKernel/src/AGDDPositioner.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AGDDKernel/AGDDPositioner.h"
@@ -7,32 +7,23 @@
#include "AGDDKernel/AGDDVolume.h"
#include "AGDDKernel/AGDDVolumeStore.h"
-#include "CLHEP/Geometry/Transform3D.h"
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Vector/Rotation.h"
-
-AGDDPositioner::AGDDPositioner(std::string n,HepGeom::Transform3D t):m_isSensitiveDetector(false),m_volume(n),m_transform(t)
-{
- AGDDPositionerStore::GetPositionerStore()->RegisterPositioner(this);
- m_theVolume=AGDDVolumeStore::GetVolumeStore()->GetVolume(Volume());
-}
-AGDDPositioner::AGDDPositioner(std::string n,CLHEP::HepRotation r,CLHEP::Hep3Vector v):m_isSensitiveDetector(false),m_volume(n)
-{
+AGDDPositioner::AGDDPositioner(const std::string& n, GeoTrf::Transform3D t) :
+ m_isSensitiveDetector(false),
+ m_volume(n),
+ m_transform(t) {
AGDDPositionerStore::GetPositionerStore()->RegisterPositioner(this);
- m_transform=HepGeom::Transform3D(r,v);
m_theVolume=AGDDVolumeStore::GetVolumeStore()->GetVolume(Volume());
}
-std::string AGDDPositioner::Volume()
-{
+
+std::string AGDDPositioner::Volume() {
return m_volume;
}
-const HepGeom::Transform3D& AGDDPositioner::Transform()
-{
+
+const GeoTrf::Transform3D& AGDDPositioner::Transform() {
return m_transform;
}
-AGDDVolume* AGDDPositioner::GetVolume()
-{
+AGDDVolume* AGDDPositioner::GetVolume() {
return m_theVolume;
}
diff --git a/DetectorDescription/AGDD/AGDDModel/AGDDModel/AGDDSnake.h b/DetectorDescription/AGDD/AGDDModel/AGDDModel/AGDDSnake.h
index 84a7677c3c2bc0fec81c70f6902ae923704c32ce..803f0fbc3fda79578132b2678646965ec58d1f51 100644
--- a/DetectorDescription/AGDD/AGDDModel/AGDDModel/AGDDSnake.h
+++ b/DetectorDescription/AGDD/AGDDModel/AGDDModel/AGDDSnake.h
@@ -1,33 +1,32 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef AGDDSnake_H
#define AGDDSnake_H
#include "AGDDKernel/AGDDVolume.h"
+
#include <string>
#include <vector>
#include <iostream>
-#include "CLHEP/Vector/ThreeVector.h"
-
class AGDDSnake: public AGDDVolume {
public:
AGDDSnake(std::string s):AGDDVolume(s),m_radius(0) {}
- void SetPoint(CLHEP::Hep3Vector p)
+ void SetPoint(GeoTrf::Vector3D p)
{
m_points.push_back(p);
}
int NrOfPoints() {return m_points.size();}
double Radius() {return m_radius;}
void Radius(double d) {m_radius=d;}
- CLHEP::Hep3Vector GetPoint(int i) {return m_points[i];}
+ GeoTrf::Vector3D GetPoint(int i) {return m_points[i];}
void CreateVolume();
void CreateSolid();
private:
double m_radius;
- std::vector<CLHEP::Hep3Vector> m_points;
+ std::vector<GeoTrf::Vector3D> m_points;
};
#endif
diff --git a/DetectorDescription/AGDD/AGDDModel/CMakeLists.txt b/DetectorDescription/AGDD/AGDDModel/CMakeLists.txt
index bcae1501378e78f7902b3bd1e056e848554db9bd..85adb2ae41c5443b514bb8b03973ad8bb7f5d45a 100644
--- a/DetectorDescription/AGDD/AGDDModel/CMakeLists.txt
+++ b/DetectorDescription/AGDD/AGDDModel/CMakeLists.txt
@@ -1,22 +1,10 @@
-################################################################################
-# Package: AGDDModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AGDDModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/AGDD/AGDDKernel )
-
-# External dependencies:
-find_package( CLHEP )
-
# Component(s) in the package:
atlas_add_library( AGDDModel
src/*.cxx
PUBLIC_HEADERS AGDDModel
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AGDDKernel )
-
+ LINK_LIBRARIES AGDDKernel )
diff --git a/DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt b/DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt
index b225db4116b1a1a7187c0a0f996abe92be18bf40..546f29964e10227d7bb2dee56284946e56607701 100644
--- a/DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoAdaptors/CMakeLists.txt
@@ -1,30 +1,8 @@
-################################################################################
-# Package: GeoAdaptors
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoAdaptors )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Calorimeter/CaloSimEvent
- Control/StoreGate
- DetectorDescription/Identifier
- DetectorDescription/GeoPrimitives
- InnerDetector/InDetDetDescr/InDetIdentifier
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/PixelReadoutGeometry
- InnerDetector/InDetDetDescr/SCT_ReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
- InnerDetector/InDetSimEvent
- LArCalorimeter/LArSimEvent
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- MuonSpectrometer/MuonSimEvent )
-
# External dependencies:
find_package( CLHEP )
@@ -34,5 +12,4 @@ atlas_add_library( GeoAdaptors
PUBLIC_HEADERS GeoAdaptors
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CaloSimEvent Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry InDetSimEvent LArSimEvent MuonReadoutGeometry MuonPrepRawData MuonSimEvent CaloDetDescrLib StoreGateLib SGtests MuonIdHelpersLib )
-
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloIdentifier CaloSimEvent GeoPrimitives Identifier InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry TRT_ReadoutGeometry InDetSimEvent LArSimEvent MuonReadoutGeometry MuonPrepRawData MuonSimEvent CaloDetDescrLib StoreGateLib MuonIdHelpersLib )
diff --git a/DetectorDescription/GeoModel/GeoModelStandalone/GeoExporter/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelStandalone/GeoExporter/CMakeLists.txt
index f877b8407d79d0cc2bed3198e6b88885c5f64fb6..b8aadde4e722590e1995d2f5dd48bf43d04890af 100644
--- a/DetectorDescription/GeoModel/GeoModelStandalone/GeoExporter/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelStandalone/GeoExporter/CMakeLists.txt
@@ -1,47 +1,20 @@
-################################################################################
-# Package: GeoExporter
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoExporter )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- GaudiKernel
- PRIVATE
- Event/EventInfo
- Tools/PathResolver
- DetectorDescription/GeoModel/GeoModelStandalone/GeoExporter
- DetectorDescription/GeoModel/GeoModelKernel
- DetectorDescription/GeoModel/GeoModelUtilities
- graphics/VP1/VP1Utils
- )
- #DetectorDescription/GeoModel/GeoModelStandalone/GeoWrite
- #DetectorDescription/GeoModel/GeoModelStandalone/GeoModelDBManager
-
# External dependencies:
find_package( Qt5 COMPONENTS Sql Gui PrintSupport )
-find_package( Eigen ) # is it really needed here?
-FIND_PACKAGE( Boost ) # is it really needed here?
-find_package( CLHEP )
-#find_package( GeoModelCore REQUIRED )
+find_package( Boost )
find_package( GeoModelIO REQUIRED )
-#message( "GEOMODELIO_LIBRARIES: ${GEOMODELIO_LIBRARIES}")
# Component(s) in the package:
atlas_add_library( GeoExporter
src/*.cxx
GeoExporter/*.h
PUBLIC_HEADERS GeoExporter
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES Qt5::Sql
- ${GEOMODELIO_LIBRARIES}
- GeoModelUtilities
- VP1Utils
- ${CLHEP_LIBRARIES}
- ${EIGEN_LIBRARIES}
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES Qt5::Sql ${GEOMODELIO_LIBRARIES} GeoModelUtilities VP1Base VP1Utils
)
#NEW SYNTAX TO BE USED SOON: GeoModelIO::GeoModelDBManager GeoModelIO::GeoModelWrite
diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
index 027f82af668a3f0df861e7aa8f3d2314c0b43250..d4cf73251cd1eafd71911f8d48879561ce73dca6 100755
--- a/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
+++ b/DetectorDescription/GeoModel/GeoModelSvc/src/GeoModelSvc.h
@@ -12,7 +12,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthService.h"
#include "StoreGate/StoreGateSvc.h"
#include "EventInfoMgt/ITagInfoMgr.h"
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
index 53d5172ffbaaf85eb8a04f4e18700cd696564880..2ed421cc58b17b85a6a2a74b62eb3928c77eab2c 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: GeoModelUtilities
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoModelUtilities )
@@ -15,8 +13,7 @@ atlas_add_library( GeoModelUtilities
src/*.cxx
PUBLIC_HEADERS GeoModelUtilities
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps SGTools GeoModelInterfaces
- PRIVATE_LINK_LIBRARIES GaudiKernel )
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel GeoModelInterfaces RDBAccessSvcLib )
atlas_add_test( GeoGetIds_test
SOURCES test/GeoGetIds_test.cxx
@@ -28,12 +25,8 @@ atlas_add_test( GeoVisitVolumes_test
endif()
if(BUILDVP1LIGHT)
-# Declare the package's dependencies:
-#atlas_depends_on_subdirs( PUBLIC
-# DetectorDescription/GeoModel/GeoModelKernel )
# External dependencies:
-find_package( CLHEP )
find_package( GeoModelCore )
find_package( Eigen )
@@ -53,7 +46,7 @@ atlas_add_library( GeoModelUtilities
${SOURCES}
PUBLIC_HEADERS GeoModelUtilities
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} )
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} )
endif()
# Code in this file makes heavy use of eigen and runs orders of magnitude
diff --git a/DetectorDescription/GeoModelXml/CMakeLists.txt b/DetectorDescription/GeoModelXml/CMakeLists.txt
index 0bc2cd00b7295feb31b9995930b861349bd10f60..cab5c4759ac92a7166e8855142950bcf8f941308 100644
--- a/DetectorDescription/GeoModelXml/CMakeLists.txt
+++ b/DetectorDescription/GeoModelXml/CMakeLists.txt
@@ -1,18 +1,8 @@
-################################################################################
-# Package: GeoModelXml
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeoModelXml )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- AtlasPolicy
- PRIVATE
- DetectorDescription/GeoModelInterfaces
- Control/StoreGate
- GaudiKernel )
-
# External dependencies:
find_package( XercesC )
find_package( Eigen )
@@ -25,7 +15,7 @@ atlas_add_library( GeoModelXml
src/*.cxx
PUBLIC_HEADERS GeoModelXml
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS} ${GEOMODELTOOLS_INCLUDE_DIRS}
- LINK_LIBRARIES ${XERCESC_LIBRARIES} ${EIGEN_LIBRARIES} ${ZLIB_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${GEOMODELTOOLS_LIBRARIES} StoreGateLib
- PRIVATE_LINK_LIBRARIES GaudiKernel )
+ LINK_LIBRARIES ${XERCESC_LIBRARIES} ${ZLIB_LIBRARIES} ${GEOMODELCORE_LIBRARIES} ${GEOMODELTOOLS_LIBRARIES}
+ PRIVATE_LINK_LIBRARIES ${EIGEN_LIBRARIES} GaudiKernel GeoModelInterfaces StoreGateLib )
atlas_install_runtime( data/*.dtd )
diff --git a/DetectorDescription/GeoPrimitives/CMakeLists.txt b/DetectorDescription/GeoPrimitives/CMakeLists.txt
index b9f1342212eb372089df274be478c69c5cd13fbe..847b560b380a63c2c64bfb21eb3080944e74eb13 100644
--- a/DetectorDescription/GeoPrimitives/CMakeLists.txt
+++ b/DetectorDescription/GeoPrimitives/CMakeLists.txt
@@ -1,17 +1,10 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
# $Id: CMakeLists.txt 744450 2016-05-03 12:38:18Z krasznaa $
-################################################################################
-# Package: GeoPrimitives
-################################################################################
# Declare the package name:
atlas_subdir( GeoPrimitives )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/CxxUtils
- Event/EventPrimitives )
-
# External dependencies:
find_package( CLHEP QUIET )
find_package( Eigen )
diff --git a/DetectorDescription/GeometryDBSvc/CMakeLists.txt b/DetectorDescription/GeometryDBSvc/CMakeLists.txt
index 03aed93c583120a5c4de5f36c501f50103f59f75..61dcc2d2a1b01c9a50f2f1793fb638dda806d4b4 100644
--- a/DetectorDescription/GeometryDBSvc/CMakeLists.txt
+++ b/DetectorDescription/GeometryDBSvc/CMakeLists.txt
@@ -1,30 +1,15 @@
-################################################################################
-# Package: GeometryDBSvc
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( GeometryDBSvc )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/RDBAccessSvc
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-
+# Component(s) in the package:
atlas_add_library( GeometryDBSvcLib
INTERFACE
PUBLIC_HEADERS GeometryDBSvc
LINK_LIBRARIES RDBAccessSvcLib GaudiKernel )
-# Component(s) in the package:
atlas_add_component( GeometryDBSvc
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} GaudiKernel AthenaBaseComps GeometryDBSvcLib )
-
+ LINK_LIBRARIES AthenaBaseComps CxxUtils GeometryDBSvcLib )
diff --git a/DetectorDescription/IdDictDetDescrCnv/src/IdDictCnvTest.cxx b/DetectorDescription/IdDictDetDescrCnv/src/IdDictCnvTest.cxx
index 9a0ccd62123107bc77a3135b44b5623b7c8fe579..00d98c0ac6a1e7e3ab104b2259bb5882ced43c3e 100755
--- a/DetectorDescription/IdDictDetDescrCnv/src/IdDictCnvTest.cxx
+++ b/DetectorDescription/IdDictDetDescrCnv/src/IdDictCnvTest.cxx
@@ -21,7 +21,7 @@
// Athena-related includes
#include "StoreGate/DataHandle.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
index 402982fc97cbef33edc84cb69fb0b0fad9672b17..0e29bb5d56017f2fbcf44db87509127a37ca7b63 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "TestTools/ParallelCallTest.h"
#include "RegSelTestAlg.h"
diff --git a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
index 42a4efa18f7d414dac2fdde78bc0410ebdea9096..0ad022d9fb1836a7593ee998191f94f70e2eb21a 100755
--- a/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
+++ b/DetectorDescription/RegionSelector/src/RegSelSvc.cxx
@@ -2354,10 +2354,10 @@ bool RegSelSvc::GetEnabledROBsFromOKS()
}
// get the data flow config property
- const std::vector<const Property*>* dataFlowProps = p_jobOptionSvc->getProperties("DataFlowConfig");
+ const std::vector<const Gaudi::Details::PropertyBase*>* dataFlowProps = p_jobOptionSvc->getProperties("DataFlowConfig");
// go through looking for the enabled robs
- std::vector<const Property*>::const_iterator propp(dataFlowProps->begin());
+ std::vector<const Gaudi::Details::PropertyBase*>::const_iterator propp(dataFlowProps->begin());
for ( ; propp!=dataFlowProps->end() ; propp++) {
// the enabled ROB list is found
if ( (*propp)->name() == "DF_Enabled_ROB_IDs" ) {
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
index b3ac139d2874d0695feabc32a74c54ff13d6dba0..28deebbc9aa6fcfae4348524efc34afe305524f8 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
@@ -11,7 +11,7 @@
#include "EventStorage/DataReader.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "PersistentDataModel/DataHeader.h"
#include "PersistentDataModel/Token.h"
diff --git a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
index 4c944dc7eaa0038287b99d831b41127542092520..413376e18750ecd976ea1f266709ee57a3047a43 100644
--- a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
+++ b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
@@ -52,7 +52,7 @@ EventSelectorByteStream::EventSelectorByteStream(
/******************************************************************************/
-void EventSelectorByteStream::inputCollectionsHandler(Property&) {
+void EventSelectorByteStream::inputCollectionsHandler(Gaudi::Details::PropertyBase&) {
if (this->FSMState() != Gaudi::StateMachine::OFFLINE) {
this->reinit().ignore();
}
@@ -1014,7 +1014,7 @@ void EventSelectorByteStream::syncEventCount(int count) const
}
//__________________________________________________________________________
-bool EventSelectorByteStream::disconnectIfFinished(SG::SourceID /* fid */) const
+bool EventSelectorByteStream::disconnectIfFinished(const SG::SourceID &/* fid */) const
{
return true;
}
diff --git a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.h b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.h
index 412414862e192bd2f91a7fc0778e3ba6b0ade890..c8e583015f15dc81b76d6148838dc2c192ebcfcb 100644
--- a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.h
+++ b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.h
@@ -135,7 +135,7 @@ protected:
/// Fill AttributeList with specific items from the selector and a suffix
virtual StatusCode fillAttributeList(coral::AttributeList *attrList, const std::string &suffix, bool copySource) const override;
// Disconnect DB if all events from the source FID were processed and the Selector moved to another file
- virtual bool disconnectIfFinished(SG::SourceID fid) const override;
+ virtual bool disconnectIfFinished(const SG::SourceID &fid) const override;
private: // internal member functions
/// Reinitialize the service when a @c fork() occured/was-issued
@@ -163,7 +163,7 @@ private: // properties
ByteStreamInputSvc* m_eventSource{};
Gaudi::Property<std::vector<std::string>> m_inputCollectionsProp{this, "Input", {}, ""};
mutable std::vector<std::string>::const_iterator m_inputCollectionsIterator;
- void inputCollectionsHandler(Property&);
+ void inputCollectionsHandler(Gaudi::Details::PropertyBase&);
ServiceHandle<IIncidentSvc> m_incidentSvc{this, "IncidentSvc", "IncidentSvc", ""};
ServiceHandle<ActiveStoreSvc> m_activeStoreSvc;
diff --git a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
index 778b4ca4a85ff699d5a5ad864567d3279d126201..941fc0a8aeb6da0abe5e5693733aef66a2598a44 100644
--- a/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
+++ b/Event/ByteStreamCnvSvcBase/src/ROBDataProviderMTTest.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <algorithm>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TestTools/ParallelCallTest.h"
#include "TestTools/random.h"
#include "ROBDataProviderMTTest.h"
diff --git a/Event/DumpEventDataToJSON/src/DumpEventDataToJsonAlg.cxx b/Event/DumpEventDataToJSON/src/DumpEventDataToJsonAlg.cxx
index 457b20d8dbfe8938174d206a2db978a3eb92d8bf..7fcc956e0f6d9c90503b8446bc4f79f731058025 100644
--- a/Event/DumpEventDataToJSON/src/DumpEventDataToJsonAlg.cxx
+++ b/Event/DumpEventDataToJSON/src/DumpEventDataToJsonAlg.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Algorithm.h"
#include "DumpEventDataToJsonAlg.h"
diff --git a/Event/EventBookkeeperTools/src/SkimDecisionMultiFilter.cxx b/Event/EventBookkeeperTools/src/SkimDecisionMultiFilter.cxx
index eeccddad454525590012a765ebc6bca93e93df77..f5a9fe805ea47f17ec96bdaa8374295d0b60db84 100644
--- a/Event/EventBookkeeperTools/src/SkimDecisionMultiFilter.cxx
+++ b/Event/EventBookkeeperTools/src/SkimDecisionMultiFilter.cxx
@@ -17,7 +17,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Handy definitions for error checking
#include "AthenaKernel/errorcheck.h"
diff --git a/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h b/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
index e19986c430e8810ce03fc1c8649e1243ba72ec75..284e2798a90cf940cd341af704bf5d26bd964ed0 100755
--- a/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
+++ b/Event/EventCommonAlgs/EventCommonAlgs/INav4MomDumper.h
@@ -68,7 +68,7 @@ class INav4MomDumper : public AthAlgorithm
/// Callback method to configure the output stream into which we'll
/// dump the informations from @c INavigable4MomentumCollection
- void setupOutputStream( Property& outputStreamName );
+ void setupOutputStream( Gaudi::Details::PropertyBase& outputStreamName );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/Event/EventCommonAlgs/src/I4MomDumper.cxx b/Event/EventCommonAlgs/src/I4MomDumper.cxx
index 9cff05b2071aa9516c4432bc4bf36c2a60609209..0a27efd9c5f2a2f37a681f2455bdb89d015a701d 100644
--- a/Event/EventCommonAlgs/src/I4MomDumper.cxx
+++ b/Event/EventCommonAlgs/src/I4MomDumper.cxx
@@ -21,7 +21,7 @@
#include <boost/array.hpp>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INavigable4MomentumCollection.h"
@@ -273,7 +273,7 @@ I4MomDumper::dump( const std::string& collName )
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void I4MomDumper::setupDisplay( Property& /*displayName*/ )
+void I4MomDumper::setupDisplay( Gaudi::Details::PropertyBase& /*displayName*/ )
{
std::string& display = const_cast<std::string&>(m_displayName.value());
@@ -296,7 +296,7 @@ void I4MomDumper::setupDisplay( Property& /*displayName*/ )
return;
}
-void I4MomDumper::setupOutputStream( Property& /*outputStreamName*/ )
+void I4MomDumper::setupOutputStream( Gaudi::Details::PropertyBase& /*outputStreamName*/ )
{
// reset internal state
if ( m_outputStream &&
diff --git a/Event/EventCommonAlgs/src/I4MomDumper.h b/Event/EventCommonAlgs/src/I4MomDumper.h
index 8043507d0f40ef08e65f968f783b77c272b78ef9..72bb3d6df484c0a9dfcb6c7dea1c7798ed62b0eb 100644
--- a/Event/EventCommonAlgs/src/I4MomDumper.h
+++ b/Event/EventCommonAlgs/src/I4MomDumper.h
@@ -81,11 +81,11 @@ class I4MomDumper : public AthAlgorithm
/// Callback method to configure the display property which will tell how to
/// dump the informations from @c I4MomentumCollection
- void setupDisplay( Property& display );
+ void setupDisplay( Gaudi::Details::PropertyBase& display );
/// Callback method to configure the output stream into which we'll
/// dump the informations from @c I4MomentumCollection
- void setupOutputStream( Property& outputStreamName );
+ void setupOutputStream( Gaudi::Details::PropertyBase& outputStreamName );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/Event/EventCommonAlgs/src/INav4MomDumper.cxx b/Event/EventCommonAlgs/src/INav4MomDumper.cxx
index 32e38d823231a7e0f88972173eab86bd8fb303d0..c849efaf83ab04cc761553987267ee11a7762615 100755
--- a/Event/EventCommonAlgs/src/INav4MomDumper.cxx
+++ b/Event/EventCommonAlgs/src/INav4MomDumper.cxx
@@ -18,7 +18,7 @@
#include <set>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INavigable4MomentumCollection.h"
@@ -201,7 +201,7 @@ INav4MomDumper::dump( const std::string& collName )
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void INav4MomDumper::setupOutputStream( Property& /*outputStreamName*/ )
+void INav4MomDumper::setupOutputStream( Gaudi::Details::PropertyBase& /*outputStreamName*/ )
{
// reset internal state
if ( m_outputStream &&
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
index d3bca8642c640e081dd0c7f69077767de98c9a4b..a62ab37b0621cdc53398decb89cc253af89155a2 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/skeleton.BSOverlayFilter_tf.py
@@ -74,7 +74,7 @@ svcMgr.ByteStreamAddressProviderSvc.TypeNames += ["HLT::HLTResult/HLTResult_EF",
"CTP_RDO/CTP_RDO", "CTP_RIO/CTP_RIO"]
# main alg
-from OverlayByteStreamAlgs.OverlayByteStreamAlgsConf import BSFilter
+from OverlayByteStreamUtils.OverlayByteStreamUtilsConf import BSFilter
filAlg = BSFilter("BSFilter")
topSequence += filAlg
if hasattr( runArgs, "triggerBit"):
@@ -101,7 +101,7 @@ else:
BSFilterLog.info( '**** ByteStreamCopyTool configuration' )
if hasattr( runArgs, 'InputLbnMapFile'):
- from OverlayByteStreamAlgs.OverlayByteStreamAlgsConf import ByteStreamMultipleOutputStreamCopyTool
+ from OverlayByteStreamUtils.OverlayByteStreamUtilsConf import ByteStreamMultipleOutputStreamCopyTool
bsCopyTool = ByteStreamMultipleOutputStreamCopyTool("MultipleOutputStreamBSCopyTool")
bsCopyTool.lbn_map_file = runArgs.InputLbnMapFile
if hasattr( runArgs, "inputFilterFile"): bsCopyTool.trigfile = runArgs.inputFilterFile
diff --git a/Event/EventPrimitives/EventPrimitives/AmgMatrixBasePlugin.h b/Event/EventPrimitives/EventPrimitives/AmgMatrixBasePlugin.h
index c214458188497563cf308caa1120ce29ab492675..36f2f2c9c95c68a5e1d7bd53e8729462f2d659f1 100644
--- a/Event/EventPrimitives/EventPrimitives/AmgMatrixBasePlugin.h
+++ b/Event/EventPrimitives/EventPrimitives/AmgMatrixBasePlugin.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -73,14 +73,14 @@
return -std::log(std::tan(this->theta()*.5)); //TODO: slow
} //old method with safeguards, new method is in SymmetricMatrixHelpers.h
- inline Scalar deltaR(const MatrixBase<Derived>& vec){
+ inline Scalar deltaR(const MatrixBase<Derived>& vec) const {
if (this->rows() < 2) return 0.;
double a = this->eta() - vec.eta();
double b = this->deltaPhi(vec);
return std::sqrt ( a*a + b*b );
}
- inline Scalar deltaPhi(const MatrixBase<Derived>& vec){
+ inline Scalar deltaPhi(const MatrixBase<Derived>& vec) const {
if (this->rows() < 2) return 0.;
double dphi = vec.phi() - this->phi();
if ( dphi > M_PI ) {
diff --git a/Event/FourMom/CMakeLists.txt b/Event/FourMom/CMakeLists.txt
index fe670f90168ba96203a46ce5a1f0507b18af7db9..6fdd867d4c71ddb6c9e5f5f3356738a997127de2 100644
--- a/Event/FourMom/CMakeLists.txt
+++ b/Event/FourMom/CMakeLists.txt
@@ -1,80 +1,63 @@
-################################################################################
-# Package: FourMom
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( FourMom )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/EventKernel
- Event/EventPrimitives
- Control/CxxUtils
- PRIVATE
- AtlasTest/TestTools )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( FourMom
src/*.cxx
PUBLIC_HEADERS FourMom
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} EventKernel EventPrimitives CxxUtils
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} TestTools )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} EventKernel EventPrimitives CxxUtils
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} )
atlas_add_dictionary( FourMomDict
FourMom/FourMomDict.h
FourMom/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
+ LINK_LIBRARIES FourMom )
atlas_add_test( EEtaPhiM_test
SOURCES
test/EEtaPhiM_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
+ LINK_LIBRARIES FourMom )
atlas_add_test( IPtCotThPhiM_test
SOURCES
test/IPtCotThPhiM_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
+ LINK_LIBRARIES FourMom )
atlas_add_test( PtEtaPhiM_test
SOURCES
test/PtEtaPhiM_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
+ LINK_LIBRARIES FourMom )
atlas_add_test( PxPyPzE_test
SOURCES
test/PxPyPzE_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
+ LINK_LIBRARIES FourMom )
atlas_add_executable( benchEEtaPhiM
test/bench_EEtaPhiM.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} FourMom )
atlas_add_executable( benchIPtCotThPhiM
test/bench_IPtCotThPhiM.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} FourMom )
atlas_add_executable( benchPtEtaPhiM
test/bench_PtEtaPhiM.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} FourMom )
atlas_add_executable( benchPxPyPzE
test/bench_PxPyPzE.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} EventKernel EventPrimitives TestTools FourMom )
-
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} FourMom )
diff --git a/Event/FourMomUtils/CMakeLists.txt b/Event/FourMomUtils/CMakeLists.txt
index df44ab4cbb02790514b4f1a5ad8558bb1caf6582..c2daa8b5d117af7ddf7f7e9e4882a17bf6487e86 100644
--- a/Event/FourMomUtils/CMakeLists.txt
+++ b/Event/FourMomUtils/CMakeLists.txt
@@ -1,26 +1,8 @@
-# $Id: CMakeLists.txt 782308 2016-11-04 09:51:01Z krasznaa $
-################################################################################
-# Package: FourMomUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( FourMomUtils )
-# Extra dependencies:
-if( NOT XAOD_STANDALONE AND NOT XAOD_ANALYSIS )
- set( extra_deps Event/EventKernel Event/NavFourMom
- PRIVATE Event/FourMom )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Control/CxxUtils
- Event/xAOD/xAODBase
- Event/xAOD/xAODMissingET
- ${extra_deps} )
-
# External dependencies:
find_package( CLHEP QUIET )
diff --git a/Event/NavFourMom/CMakeLists.txt b/Event/NavFourMom/CMakeLists.txt
index 788a9bc3cf7a48431e6d5a6e6ffff55f70d270e1..932d1e88fc4c0e5dae6b2b4423614d8173ccb3df 100644
--- a/Event/NavFourMom/CMakeLists.txt
+++ b/Event/NavFourMom/CMakeLists.txt
@@ -1,40 +1,23 @@
-################################################################################
-# Package: NavFourMom
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( NavFourMom )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthLinks
- Control/AthContainers
- Control/Navigation
- Event/EventKernel
- Control/CxxUtils
- PRIVATE
- Event/FourMom )
-
# External dependencies:
find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( NavFourMom
src/*.cxx
PUBLIC_HEADERS NavFourMom
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation EventKernel CxxUtils
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} FourMom )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaKernel CxxUtils EventKernel FourMom Navigation )
atlas_add_dictionary( NavFourMomDict
NavFourMom/NavFourMomDict.h
NavFourMom/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks AthContainers Navigation EventKernel CxxUtils FourMom NavFourMom
+ LINK_LIBRARIES NavFourMom
NAVIGABLES DataVector<INavigable4Momentum> DataVector<IParticle>
DATA_LINKS INav4MomAssocs
ELEMENT_LINKS DataVector<I4Momentum> )
diff --git a/Event/xAOD/xAODCore/CMakeLists.txt b/Event/xAOD/xAODCore/CMakeLists.txt
index dc2c153a0e782a64adde2f8b950e5ce7be88fbec..72e0b5084ecf07ad325dd40bb320180570ed398d 100644
--- a/Event/xAOD/xAODCore/CMakeLists.txt
+++ b/Event/xAOD/xAODCore/CMakeLists.txt
@@ -55,10 +55,6 @@ atlas_add_test( ut_xaodcore_clearDecorations_test
SOURCES test/ut_xaodcore_clearDecorations_test.cxx
LINK_LIBRARIES AthContainers xAODCore )
-atlas_add_test( ut_xaodcore_floatcompression_test
- SOURCES test/ut_xaodcore_floatcompression_test.cxx
- LINK_LIBRARIES xAODCore )
-
atlas_add_test( ut_xaodcore_printhelpers_test
SOURCES test/ut_xaodcore_printhelpers_test.cxx
LINK_LIBRARIES AthContainers xAODCore )
diff --git a/Event/xAOD/xAODCore/Root/AuxContainerBase.cxx b/Event/xAOD/xAODCore/Root/AuxContainerBase.cxx
index a99cbed3f892dcabd8273219a5e27495017d4d2c..40cd0a7a4e5125ecd2779ca7a1b1fb411dabc36a 100644
--- a/Event/xAOD/xAODCore/Root/AuxContainerBase.cxx
+++ b/Event/xAOD/xAODCore/Root/AuxContainerBase.cxx
@@ -16,9 +16,9 @@
#include "xAODCore/AuxContainerBase.h"
#include "xAODCore/tools/IOStats.h"
#include "xAODCore/tools/ReadStats.h"
-#include "xAODCore/tools/FloatCompressor.h"
#include "CxxUtils/checker_macros.h"
+#include "CxxUtils/FloatCompressor.h"
using namespace std;
@@ -682,13 +682,13 @@ namespace xAOD {
// Two main modes are supported: High and Low Compression
const unsigned int idx = highComp ? AuxCompression::High : AuxCompression::Low;
- // This part could be nicer if we were to rewrite xAOD::FloatCompressor
+ // This part could be nicer if we were to rewrite CxxUtils::FloatCompressor
// to accept the number of bits in the call to reduceFloatPrecision instead
// of the constructor
static const unsigned int high_bits = m_compression.getCompressionBits(true);
static const unsigned int low_bits = m_compression.getCompressionBits(false);
- static const std::vector< xAOD::FloatCompressor >
- myFloatCompressors { xAOD::FloatCompressor(high_bits), xAOD::FloatCompressor(low_bits) };
+ static const std::vector< CxxUtils::FloatCompressor >
+ myFloatCompressors { CxxUtils::FloatCompressor(high_bits), CxxUtils::FloatCompressor(low_bits) };
return myFloatCompressors[ idx ].reduceFloatPrecision( value );
}
diff --git a/Event/xAOD/xAODCoreCnv/src/ROOTHeaderLoaderSvc.h b/Event/xAOD/xAODCoreCnv/src/ROOTHeaderLoaderSvc.h
index b1ef589977622ada4593a2390a4c010038876b94..d613e7cbe154beed5c28036c59ea8a3d8ca951c0 100644
--- a/Event/xAOD/xAODCoreCnv/src/ROOTHeaderLoaderSvc.h
+++ b/Event/xAOD/xAODCoreCnv/src/ROOTHeaderLoaderSvc.h
@@ -10,7 +10,7 @@
// Framework include(s).
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// System include(s).
#include <string>
diff --git a/Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.cxx b/Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.cxx
index 4a7f7f574aef191ad3ae81bb77fdb64383acdf7e..e54b7185d03ed59c8f9a2eed99c804d708cc7937 100644
--- a/Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.cxx
+++ b/Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.cxx
@@ -23,46 +23,46 @@ namespace xAOD {
/// Explicit Instantiation of Template
const SG::AuxElement::Accessor< float >*
- showerShapeAccessorV1( xAOD::EgammaParameters::ShowerShapeType type )
- {
+ showerShapeAccessorV1( xAOD::EgammaParameters::ShowerShapeType type )
+ {
switch( type ) {
- DEFINE_ACCESSOR( float, e011 );
- DEFINE_ACCESSOR( float, e033 );
- DEFINE_ACCESSOR( float, e132 );
- DEFINE_ACCESSOR( float, e1152 );
- DEFINE_ACCESSOR( float, ethad1 );
- DEFINE_ACCESSOR( float, ethad );
- DEFINE_ACCESSOR( float, ehad1 );
- DEFINE_ACCESSOR( float, f1 );
- DEFINE_ACCESSOR( float, f3 );
- DEFINE_ACCESSOR( float, f1core );
- DEFINE_ACCESSOR( float, f3core );
- DEFINE_ACCESSOR( float, e233 );
- DEFINE_ACCESSOR( float, e235 );
- DEFINE_ACCESSOR( float, e255 );
- DEFINE_ACCESSOR( float, e237 );
- DEFINE_ACCESSOR( float, e277 );
- DEFINE_ACCESSOR( float, e333 );
- DEFINE_ACCESSOR( float, e335 );
- DEFINE_ACCESSOR( float, e337 );
- DEFINE_ACCESSOR( float, e377 );
- DEFINE_ACCESSOR( float, weta1 );
- DEFINE_ACCESSOR( float, weta2 );
- DEFINE_ACCESSOR( float, e2ts1 );
- DEFINE_ACCESSOR( float, e2tsts1 );
- DEFINE_ACCESSOR( float, fracs1 );
- DEFINE_ACCESSOR( float, widths1 );
- DEFINE_ACCESSOR( float, widths2 );
- DEFINE_ACCESSOR( float, poscs1 );
- DEFINE_ACCESSOR( float, poscs2 );
- DEFINE_ACCESSOR( float, asy1 );
- DEFINE_ACCESSOR( float, pos );
- DEFINE_ACCESSOR( float, pos7 );
- DEFINE_ACCESSOR( float, barys1 );
- DEFINE_ACCESSOR( float, wtots1 );
- DEFINE_ACCESSOR( float, emins1 );
- DEFINE_ACCESSOR( float, emaxs1 );
- DEFINE_ACCESSOR( float, r33over37allcalo );
+ DEFINE_ACCESSOR( float, e011 );
+ DEFINE_ACCESSOR( float, e033 );
+ DEFINE_ACCESSOR( float, e132 );
+ DEFINE_ACCESSOR( float, e1152 );
+ DEFINE_ACCESSOR( float, ethad1 );
+ DEFINE_ACCESSOR( float, ethad );
+ DEFINE_ACCESSOR( float, ehad1 );
+ DEFINE_ACCESSOR( float, f1 );
+ DEFINE_ACCESSOR( float, f3 );
+ DEFINE_ACCESSOR( float, f1core );
+ DEFINE_ACCESSOR( float, f3core );
+ DEFINE_ACCESSOR( float, e233 );
+ DEFINE_ACCESSOR( float, e235 );
+ DEFINE_ACCESSOR( float, e255 );
+ DEFINE_ACCESSOR( float, e237 );
+ DEFINE_ACCESSOR( float, e277 );
+ DEFINE_ACCESSOR( float, e333 );
+ DEFINE_ACCESSOR( float, e335 );
+ DEFINE_ACCESSOR( float, e337 );
+ DEFINE_ACCESSOR( float, e377 );
+ DEFINE_ACCESSOR( float, weta1 );
+ DEFINE_ACCESSOR( float, weta2 );
+ DEFINE_ACCESSOR( float, e2ts1 );
+ DEFINE_ACCESSOR( float, e2tsts1 );
+ DEFINE_ACCESSOR( float, fracs1 );
+ DEFINE_ACCESSOR( float, widths1 );
+ DEFINE_ACCESSOR( float, widths2 );
+ DEFINE_ACCESSOR( float, poscs1 );
+ DEFINE_ACCESSOR( float, poscs2 );
+ DEFINE_ACCESSOR( float, asy1 );
+ DEFINE_ACCESSOR( float, pos );
+ DEFINE_ACCESSOR( float, pos7 );
+ DEFINE_ACCESSOR( float, barys1 );
+ DEFINE_ACCESSOR( float, wtots1 );
+ DEFINE_ACCESSOR( float, emins1 );
+ DEFINE_ACCESSOR( float, emaxs1 );
+ DEFINE_ACCESSOR( float, r33over37allcalo );
DEFINE_ACCESSOR( float, ecore );
DEFINE_ACCESSOR( float, Reta );
DEFINE_ACCESSOR( float, Rphi );
@@ -70,48 +70,12 @@ namespace xAOD {
DEFINE_ACCESSOR( float, Rhad );
DEFINE_ACCESSOR( float, Rhad1 );
DEFINE_ACCESSOR( float, DeltaE );
- default:
+ default:
std::cerr << "xAOD::Egamma ERROR Unknown float ShowerShapeType ("
<< type << ") requested" << std::endl;
return nullptr;
}
-
- }
- const SG::AuxElement::Accessor< char >*
- selectionMenuAccessorV1( xAOD::EgammaParameters::SelectionMenu menu )
- {
- switch( menu ) {
- DEFINE_ACCESSOR( char, Loose);
- DEFINE_ACCESSOR( char, Medium);
- DEFINE_ACCESSOR( char, Tight);
- DEFINE_ACCESSOR( char, LHLoose);
- DEFINE_ACCESSOR( char, LHMedium);
- DEFINE_ACCESSOR( char, LHTight);
- DEFINE_ACCESSOR( char, MultiLepton);
- default:
- std::cerr << "xAOD::Egamma ERROR Unknown char ElectronSelectionMenu ("
- << menu << ") requested" << std::endl;
- return nullptr;
- }
- }
-
- const SG::AuxElement::Accessor< unsigned int >*
- selectionisEMAccessorV1( xAOD::EgammaParameters::SelectionisEM isEM )
- {
- switch( isEM ) {
- DEFINE_ACCESSOR( unsigned int, isEMLoose);
- DEFINE_ACCESSOR( unsigned int, isEMMedium);
- DEFINE_ACCESSOR( unsigned int, isEMTight);
- DEFINE_ACCESSOR( unsigned int, isEMLHLoose);
- DEFINE_ACCESSOR( unsigned int, isEMLHMedium);
- DEFINE_ACCESSOR( unsigned int, isEMLHTight);
- DEFINE_ACCESSOR( unsigned int, isEMMultiLepton);
- default:
- std::cerr << "xAOD::Egamma ERROR Unknown unsigned int ElectronSelectionisEM ("
- << isEM << ") requested" << std::endl;
- return nullptr;
- }
}
diff --git a/Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.h b/Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.h
index 1e4c4157929efe66e4e98fdc3e37882f4ad5c3bf..f2d33c270fade0282e0f775f1a69e2c655beb232 100644
--- a/Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.h
+++ b/Event/xAOD/xAODEgamma/Root/EgammaAccessors_v1.h
@@ -24,13 +24,6 @@ namespace xAOD {
const SG::AuxElement::Accessor< float >*
showerShapeAccessorV1( xAOD::EgammaParameters::ShowerShapeType type );
- const SG::AuxElement::Accessor< char >*
- selectionMenuAccessorV1( xAOD::EgammaParameters::SelectionMenu menu ) ;
-
- const SG::AuxElement::Accessor< unsigned int >*
- selectionisEMAccessorV1( xAOD::EgammaParameters::SelectionisEM isEM ) ;
-
-
} // namespace xAOD
#endif // XAOD_EGAMMAACCESSORS_V1_H
diff --git a/Event/xAOD/xAODEgamma/Root/Egamma_v1.cxx b/Event/xAOD/xAODEgamma/Root/Egamma_v1.cxx
index 9f5c2e0304077bd374354b6e98220d7dbe734bbe..28c9e56dec8889d3f5582f7f61c9daa466de24e0 100644
--- a/Event/xAOD/xAODEgamma/Root/Egamma_v1.cxx
+++ b/Event/xAOD/xAODEgamma/Root/Egamma_v1.cxx
@@ -9,7 +9,7 @@
#include "xAODEgamma/EgammaContainer.h"
#include "EgammaAccessors_v1.h"
#include "xAODPrimitives/tools/getIsolationAccessor.h"
-#include "xAODPrimitives/tools/getIsolationCorrectionAccessor.h"
+#include "xAODPrimitives/tools/getIsolationCorrectionAccessor.h"
#include "EventPrimitives/EventPrimitivesHelpers.h"
#include <stdexcept>
@@ -53,8 +53,8 @@ Egamma_v1::Egamma_v1(const Egamma_v1& eg) : IParticle(eg) {
Egamma_v1& Egamma_v1::operator=(const Egamma_v1& eg ){
- if (this != &eg){ // protect against invalid self-assignment
- if (!this->container() && !this->hasStore() ) {
+ if (this != &eg){ // protect against invalid self-assignment
+ if (!this->container() && !this->hasStore() ) {
makePrivateStore();
}
this->IParticle::operator=( eg );
@@ -89,17 +89,17 @@ Egamma_v1::GenVecFourMom_t Egamma_v1::genvecP4() const {
}
double Egamma_v1::e() const{
- return genvecP4().E();
+ return genvecP4().E();
}
double Egamma_v1::rapidity() const {
- return genvecP4().Rapidity();
+ return genvecP4().Rapidity();
}
Egamma_v1::FourMom_t Egamma_v1::p4() const {
FourMom_t p4;
- p4.SetPtEtaPhiM( pt(), eta(), phi(),m());
- return p4;
+ p4.SetPtEtaPhiM( pt(), eta(), phi(),m());
+ return p4;
}
void Egamma_v1::setP4(float pt, float eta, float phi, float m){
@@ -139,15 +139,15 @@ Egamma_v1::EgammaCovMatrix_t Egamma_v1::covMatrix() const{
EgammaCovMatrix_t cov;
cov.setZero();
- if(!acc.isAvailable(*this) ) {
+ if(!acc.isAvailable(*this) ) {
return cov;
}
- const std::vector<float>& v = acc(*this);
- size_t size= v.size();
+ const std::vector<float>& v = acc(*this);
+ size_t size= v.size();
if(size==16){
//up to 21.0.11
cov = Eigen::Map<const EgammaCovMatrix_t> (v.data());
- }
+ }
else {
//from >21.0.11
EgammaCovMatrix_t cov;
@@ -163,7 +163,7 @@ void Egamma_v1::setCovMatrix(const Egamma_v1::EgammaCovMatrix_t& cov){
MatrixHelpers::compress(cov,acc(*this));
}
-///egamma author
+///egamma author
uint16_t Egamma_v1::author(uint16_t mask) const {
static const Accessor< uint16_t > acc( "author" );
uint16_t author = acc(*this);
@@ -210,7 +210,7 @@ bool Egamma_v1::showerShapeValue(float& value, const EgammaParameters::ShowerSha
if( !acc ) {
return false;
}
- if(!acc->isAvailable(*this) ) {
+ if(!acc->isAvailable(*this) ) {
return false;
}
// Retrieve the value:
@@ -279,7 +279,7 @@ bool Egamma_v1::setIsolation(float value, const Iso::IsolationType information)
}
///Isolation corrections
-bool Egamma_v1::isolationCaloCorrection(float& value, const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
+bool Egamma_v1::isolationCaloCorrection(float& value, const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
const Iso::IsolationCorrectionParameter param) const{
const SG::AuxElement::Accessor< float > acc = getIsolationCorrectionAccessor(flavour,corr,param);
if(!acc.isAvailable(*this) ) {
@@ -290,7 +290,7 @@ bool Egamma_v1::isolationCaloCorrection(float& value, const Iso::IsolationFlavou
return true;
}
-float Egamma_v1::isolationCaloCorrection(const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
+float Egamma_v1::isolationCaloCorrection(const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
const Iso::IsolationCorrectionParameter param) const{
const SG::AuxElement::Accessor< float > acc = getIsolationCorrectionAccessor(flavour,corr,param);
@@ -298,7 +298,7 @@ float Egamma_v1::isolationCaloCorrection(const Iso::IsolationFlavour flavour, co
return acc(*this);
}
-bool Egamma_v1::setIsolationCaloCorrection(float value, const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
+bool Egamma_v1::setIsolationCaloCorrection(float value, const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
const Iso::IsolationCorrectionParameter param){
const SG::AuxElement::Accessor< float > acc = getIsolationCorrectionAccessor(flavour,corr,param);
// Set the value:
@@ -338,7 +338,7 @@ bool Egamma_v1::isolationTrackCorrection(float& value, const Iso::IsolationFlavo
return true;
}
-float Egamma_v1::isolationTrackCorrection(const Iso::IsolationFlavour flavour, const Iso::IsolationTrackCorrection corr) const{
+float Egamma_v1::isolationTrackCorrection(const Iso::IsolationFlavour flavour, const Iso::IsolationTrackCorrection corr) const{
const SG::AuxElement::Accessor< float > acc = getIsolationCorrectionAccessor(flavour,corr);
if( !acc.isAvailable(*this) ) {throw std::runtime_error( "Unknown/Unavailable Isolation correction requested" );}
return acc(*this);
@@ -411,58 +411,10 @@ Egamma_v1::caloClusterLink( size_t index ) const {
AUXSTORE_OBJECT_SETTER_AND_GETTER( Egamma_v1, Egamma_v1::CLELVec_t,
caloClusterLinks, setCaloClusterLinks)
-///Selectors / isEM and all that
-///First with enums (static accessor no lookup => faster but less flexible)
-bool Egamma_v1::passSelection(bool& value, const xAOD::EgammaParameters::SelectionMenu menu ) const {
- const SG::AuxElement::Accessor< char >* acc = selectionMenuAccessorV1( menu );
- if( !acc ) {
- return false;
- }
- if(!acc->isAvailable(*this) ) {
- return false;
- }
- value= (*acc)(*this);
- return true;
-}
-
-bool Egamma_v1::passSelection(const xAOD::EgammaParameters::SelectionMenu menu ) const {
- const SG::AuxElement::Accessor< char >* acc = selectionMenuAccessorV1( menu );
- if(!acc ) throw std::runtime_error( "Unknown/Unavailable bool selection menu requested" );
- return (*acc)(*this);
-}
-
-void Egamma_v1::setPassSelection(bool value, const xAOD::EgammaParameters::SelectionMenu menu){
- const SG::AuxElement::Accessor< char >* acc = selectionMenuAccessorV1( menu );
- ( *acc )(*this)=value;
-}
-
-bool Egamma_v1::selectionisEM(unsigned int& value, const xAOD::EgammaParameters::SelectionisEM isEM) const {
- const SG::AuxElement::Accessor< unsigned int >* acc = selectionisEMAccessorV1( isEM );
- if(!acc ) {
- return false;
- }
- if(!acc->isAvailable(*this) ) {
- return false;
- }
- value= (*acc)(*this);
- return true;
-}
-
-unsigned int Egamma_v1::selectionisEM(const xAOD::EgammaParameters::SelectionisEM isEM) const {
- const SG::AuxElement::Accessor< unsigned int >* acc = selectionisEMAccessorV1( isEM );
- if(!acc ) throw std::runtime_error( "Unknown/Unavailable unsigned int isEM requested" );
- return (*acc)(*this);
-}
-
-void Egamma_v1::setSelectionisEM(unsigned int value, const xAOD::EgammaParameters::SelectionisEM isEM){
- const SG::AuxElement::Accessor< unsigned int >* acc = selectionisEMAccessorV1( isEM );
- ( *acc )(*this)=value;
-}
-
///Then with strings (full flexibility when adding new menus dynamically)
bool Egamma_v1::passSelection(bool& value, const std::string& menu ) const {
const SG::AuxElement::Accessor< char > acc( menu );
- if(!acc.isAvailable(*this) ) {
+ if(!acc.isAvailable(*this) ) {
return false;
}
value= acc(*this);
@@ -481,7 +433,7 @@ void Egamma_v1::setPassSelection(bool value, const std::string& menu){
bool Egamma_v1::selectionisEM(unsigned int& value, const std::string& isEM) const{
const SG::AuxElement::Accessor< unsigned int > acc( isEM );
- if(!acc.isAvailable(*this) ) {
+ if(!acc.isAvailable(*this) ) {
return false;
}
value= acc(*this);
@@ -500,7 +452,7 @@ void Egamma_v1::setSelectionisEM(unsigned int value, const std::string& isEM){
bool Egamma_v1::likelihoodValue(float& value, const std::string& LHValue/*=std::string("LHValue")*/) const{
const SG::AuxElement::Accessor<float> acc( LHValue );
- if(!acc.isAvailable(*this) ) {
+ if(!acc.isAvailable(*this) ) {
return false;
}
value= acc(*this);
diff --git a/Event/xAOD/xAODEgamma/xAODEgamma/EgammaDefs.h b/Event/xAOD/xAODEgamma/xAODEgamma/EgammaDefs.h
index 68c6b440af5f082c290e62bfd923946a0ce4c877..30aeeb6e12271001ff3ef00d93162b65e0db32f7 100644
--- a/Event/xAOD/xAODEgamma/xAODEgamma/EgammaDefs.h
+++ b/Event/xAOD/xAODEgamma/xAODEgamma/EgammaDefs.h
@@ -29,7 +29,7 @@ namespace xAOD {
/** @brief Electron reconstructed by the Forward cluster-based algorithm */
const uint16_t AuthorFwdElectron=0x8;
/** @brief Object Reconstructed by standard cluster-based algorithm. Ambiguous ==> can be either Electron or Photon */
- const uint16_t AuthorAmbiguous=0x10;
+ const uint16_t AuthorAmbiguous=0x10;
/** @brief trigger Electrons */
const uint16_t AuthorTrigElectron=0x20;
/** @brief trigger Photons */
@@ -112,24 +112,24 @@ namespace xAOD {
};
/** @brief */
-
- const uint32_t BADCLUSELECTRON =
+
+ const uint32_t BADCLUSELECTRON =
0x1 << MaskedCellCore |
0x1 << MissingFEBCellCore |
0x1 << MissingFEBCellEdgeS1 |
0x1 << MissingFEBCellEdgeS2 |
- 0x1 << DeadHVS1S2S3Core |
- 0x1 << DeadHVS1S2S3Edge ;
-
- const uint32_t BADCLUSPHOTON =
+ 0x1 << DeadHVS1S2S3Core |
+ 0x1 << DeadHVS1S2S3Edge ;
+
+ const uint32_t BADCLUSPHOTON =
0x1 << MaskedCellCore |
0x1 << MissingFEBCellCore |
0x1 << MissingFEBCellEdgeS1 |
0x1 << MissingFEBCellEdgeS2 |
- 0x1 << DeadHVS1S2S3Core |
+ 0x1 << DeadHVS1S2S3Core |
0x1 << DeadHVS1S2S3Edge |
- 0x1 << BadS1Core;
-
+ 0x1 << BadS1Core;
+
const uint32_t ALLOQ= 0xFFFFFFFF;
diff --git a/Event/xAOD/xAODEgamma/xAODEgamma/EgammaEnums.h b/Event/xAOD/xAODEgamma/xAODEgamma/EgammaEnums.h
index 733fc80244ee04eb12748f4a061d605ef0d06dfd..eae00a33c09d7f9f9514350f3a4a6bea1651fb8c 100644
--- a/Event/xAOD/xAODEgamma/xAODEgamma/EgammaEnums.h
+++ b/Event/xAOD/xAODEgamma/xAODEgamma/EgammaEnums.h
@@ -8,264 +8,288 @@
#ifndef XAODEGAMMA_EGAMMAENUMS_H
#define XAODEGAMMA_EGAMMAENUMS_H
-
namespace xAOD {
- namespace EgammaParameters {
-
- /// @name egamma types
- enum EgammaType {
- electron = 0,
- unconvertedPhoton = 1,
- convertedPhoton = 2,
- NumberOfEgammaTypes = 3
- };
-
+namespace EgammaParameters {
- /// @name Shower shape types
- /// @{
- enum ShowerShapeType{
- /// @brief uncalibrated energy (sum of cells) in presampler in a 1x1 window in cells in eta X phi
- e011 = 0,
- /// @brief uncalibrated energy (sum of cells) in presampler in a 3x3 window in cells in eta X phi
- e033 = 1,
- /// @brief uncalibrated energy (sum of cells) in strips in a 3x2 window in cells in eta X phi
- e132 = 2,
- /// @brief uncalibrated energy (sum of cells) in strips in a 15x2 window in cells in eta X phi
- e1152 = 3,
- /// @brief transverse energy in the first sampling of the hadronic calorimeters behind the cluster calculated from ehad1
- ethad1 = 4,
- /// @brief ET leakage into hadronic calorimeter with exclusion of energy in CaloSampling::TileGap3
- ethad = 5,
- /// @brief E leakage into 1st sampling of had calo (CaloSampling::HEC0 + CaloSampling::TileBar0 + CaloSampling::TileExt0)
- ehad1 = 6,
- /// @brief E1/E = fraction of energy reconstructed in the first sampling, where E1 is energy in all strips belonging to the cluster and E is the total energy reconstructed in the electromagnetic calorimeter cluster
- f1 = 7,
- /// @brief fraction of energy reconstructed in 3rd sampling
- f3 = 8,
- /// @brief E1(3x1)/E = fraction of the energy reconstructed in the first longitudinal compartment of the electromagnetic calorimeter, where E1(3x1) the energy reconstructed in +/-3 strips in eta, centered around the maximum energy strip and E is the energy reconstructed in the electromagnetic calorimeter
- f1core = 9,
- /// @brief E3(3x3)/E fraction of the energy reconstructed in the third compartment of the electromagnetic calorimeter, where E3(3x3), energy in the back sampling, is the sum of the energy contained in a 3x3 window around the maximum energy cell
- f3core = 10,
- /// @brief uncalibrated energy (sum of cells) of the middle sampling in a rectangle of size 3x3 (in cell units eta X phi)
- e233 = 11,
- /// @brief uncalibrated energy (sum of cells) of the middle sampling in a rectangle of size 3x5
- e235 = 12,
- /// @brief uncalibrated energy (sum of cells) of the middle sampling in a rectangle of size 5x5
- e255 = 13,
- /// @brief uncalibrated energy (sum of cells) of the middle sampling in a rectangle of size 3x7
- e237 = 14,
- /// @brief uncalibrated energy (sum of cells) of the middle sampling in a rectangle of size 7x7
- e277 = 15,
- /// @brief uncalibrated energy (sum of cells) of the third sampling in a rectangle of size 3x3
- e333 = 16,
- /// @brief uncalibrated energy (sum of cells) of the third sampling in a rectangle of size 3x5
- e335 = 17,
- /// @brief uncalibrated energy (sum of cells) of the third sampling in a rectangle of size 3x7
- e337 = 18,
- /// @brief uncalibrated energy (sum of cells) of the middle sampling in a rectangle of size 7x7
- e377 = 19,
- /// @brief shower width using +/-3 strips around the one with the maximal energy deposit:
- /// w3 strips = sqrt{sum(Ei)x(i-imax)^2/sum(Ei)}, where i is the number of the strip and imax the strip number of the most energetic one
- weta1 = 20,
- /// @brief the lateral width is calculated with a window of 3x5 cells using the energy weighted sum over all cells, which depends on the particle impact point inside the cell: weta2 =
- /// sqrt(sum Ei x eta^2)/(sum Ei) -((sum Ei x eta)/(sum Ei))^2, where Ei is the energy of the i-th cell
- weta2 = 21,
- /// @brief 2nd max in strips calc by summing 3 strips
- e2ts1 = 22,
- /// @brief energy of the cell corresponding to second energy maximum in the first sampling
- e2tsts1 = 23,
- /// @brief shower shape in the shower core : [E(+/-3)-E(+/-1)]/E(+/-1), where E(+/-n) is the energy in ± n strips around the strip with highest energy
- fracs1 = 24,
- /// @brief same as egammaParameters::weta1 but without corrections on particle impact point inside the cell
- widths1 = 25,
- /// @brief same as egammaParameters::weta2 but without corrections on particle impact point inside the cell
- widths2 = 26,
- /// @brief relative position in eta within cell in 1st sampling
- poscs1 = 27,
- /// @brief relative position in eta within cell in 2nd sampling
- poscs2= 28,
- /// @brief uncorr asymmetry in 3 strips in the 1st sampling
- asy1 = 29,
- /// @brief difference between shower cell and predicted track in +/- 1 cells
- pos = 30,
- /// @brief Difference between the track and the shower positions:
- /// sum_{i=i_m-7}^{i=i_m+7}E_i x (i-i_m) / sum_{i=i_m-7}^{i=i_m+7}E_i,
- /// The difference between the track and the shower positions measured
- /// in units of distance between the strips, where i_m is the impact cell
- /// for the track reconstructed in the inner detector and E_i is the energy
- /// reconstructed in the i-th cell in the eta direction for constant phi given by the track parameters
- pos7 = 31,
- /// @brief barycentre in sampling 1 calculated in 3 strips
- barys1 =32,
- /// @brief shower width is determined in a window detaxdphi = 0,0625 ×~0,2, corresponding typically to 20 strips in
- ///eta : wtot1=sqrt{sum Ei x ( i-imax)^2 / sum Ei}, where i is the strip number and imax the strip number of the first local maximum
- wtots1 = 33,
- /// @brief energy reconstructed in the strip with the minimal value between the first and second maximum
- emins1 = 34,
- /// @brief energy of strip with maximal energy deposit
- emaxs1 = 35,
- /// @brief 1-ratio of energy in 3x3 over 3x7 cells;
- /// E(3x3) = E0(1x1) + E1(3x1) + E2(3x3) + E3(3x3); E(3x7) = E0(3x3) + E1(15x3) + E2(3x7) + E3(3x7)
- r33over37allcalo = 36,
- /// @brief core energy in em calo E(core) = E0(3x3) + E1(15x2) + E2(5x5) + E3(3x5)
- ecore = 37,
- /// @brief e237/e277
- Reta = 38,
- /// @brief e233/e237
- Rphi = 39,
- /// @brief (emaxs1-e2tsts1)/(emaxs1+e2tsts1)
- Eratio = 40,
- /// @brief ethad/et
- Rhad = 41,
- /// @brief ethad1/et
- Rhad1 = 42,
- /// @brief e2tsts1-emins1
- DeltaE =43,
- ///maximum number of enums
- NumberOfShowerShapes = 44
- };
- /// @}
-
-
-
- /// @name Track Match variable types
- /// @{
- enum TrackCaloMatchType{
- /// @brief difference between the cluster eta (presampler) and
- ///the eta of the track extrapolated to the presampler
- deltaEta0 = 0,
- ///@brief difference between the cluster eta (first sampling) and the eta of the track extrapolated to the
- ///first sampling: |eta_stripscluster -eta_ID|, where eta_stripscluster is computed
- ///in the first sampling of the electromagnetic calorimeter, where the granularity is very fine, and eta_ID is the pseudo-rapidity
- ///of the track extrapolated to the calorimeter
- deltaEta1 = 1,
- /// @brief difference between the cluster eta (second sampling) and the eta of the track extrapolated to the second sampling
- deltaEta2 = 2,
- /// @brief difference between the cluster eta (3rd sampling) and
- /// the eta of the track extrapolated to the 3rd sampling
- deltaEta3 = 3,
- /// @brief difference between the cluster phi (presampler) and
- /// the eta of the track extrapolated to the presampler
- deltaPhi0 = 4,
- /// @brief difference between the cluster eta (1st sampling) and
- /// the eta of the track extrapolated to the 1st sampling (strips)
- deltaPhi1 = 5,
- /// @brief difference between the cluster phi (second sampling) and the phi of the track
- /// extrapolated to the second sampling : |phi_middlecluster -phi_ID|, where phi_middlecluster
- /// is computed in the second compartment of the electromagnetic calorimeter and phi_ID is the
- /// azimuth of the track extrapolated to the calorimeter
- deltaPhi2 = 6,
- ///@brief difference between the cluster eta (3rd sampling) and
- /// the eta of the track extrapolated to the 3rd sampling
- deltaPhi3 = 7,
- /// @brief difference between the cluster phi (sampling 2) and the
- /// eta of the track extrapolated from the last measurement point.
- deltaPhiFromLastMeasurement = 8,
- /// @brief difference between the cluster phi (presampler) and
- /// the eta of the track extrapolated to the presampler from the perigee with a rescaled
- /// momentum.
- deltaPhiRescaled0 = 9,
- /// @brief difference between the cluster eta (1st sampling) and
- /// the eta of the track extrapolated to the 1st sampling (strips) from the perigee with a rescaled
- /// momentum.
- deltaPhiRescaled1 = 10,
- /// @brief difference between the cluster phi (second sampling) and the phi of the track
- /// extrapolated to the second sampling from the perigee with a rescaled
- /// momentum.
- deltaPhiRescaled2 = 11,
- ///@brief difference between the cluster eta (3rd sampling) and
- /// the eta of the track extrapolated to the 3rd sampling from the perigee with a rescaled
- /// momentum.
- deltaPhiRescaled3 = 12,
- ///maximum number of enums
- NumberOfTrackMatchProperties= 13
- };
- ///@}
+/// @name egamma types
+enum EgammaType
+{
+ electron = 0,
+ unconvertedPhoton = 1,
+ convertedPhoton = 2,
+ NumberOfEgammaTypes = 3
+};
+/// @name Shower shape types
+/// @{
+enum ShowerShapeType
+{
+ /// @brief uncalibrated energy (sum of cells) in presampler in a 1x1 window in
+ /// cells in eta X phi
+ e011 = 0,
+ /// @brief uncalibrated energy (sum of cells) in presampler in a 3x3 window in
+ /// cells in eta X phi
+ e033 = 1,
+ /// @brief uncalibrated energy (sum of cells) in strips in a 3x2 window in
+ /// cells in eta X phi
+ e132 = 2,
+ /// @brief uncalibrated energy (sum of cells) in strips in a 15x2 window in
+ /// cells in eta X phi
+ e1152 = 3,
+ /// @brief transverse energy in the first sampling of the hadronic
+ /// calorimeters behind the cluster calculated from ehad1
+ ethad1 = 4,
+ /// @brief ET leakage into hadronic calorimeter with exclusion of energy in
+ /// CaloSampling::TileGap3
+ ethad = 5,
+ /// @brief E leakage into 1st sampling of had calo (CaloSampling::HEC0 +
+ /// CaloSampling::TileBar0 + CaloSampling::TileExt0)
+ ehad1 = 6,
+ /// @brief E1/E = fraction of energy reconstructed in the first sampling,
+ /// where E1 is energy in all strips belonging to the cluster and E is the
+ /// total energy reconstructed in the electromagnetic calorimeter cluster
+ f1 = 7,
+ /// @brief fraction of energy reconstructed in 3rd sampling
+ f3 = 8,
+ /// @brief E1(3x1)/E = fraction of the energy reconstructed in the first
+ /// longitudinal compartment of the electromagnetic calorimeter, where E1(3x1)
+ /// the energy reconstructed in +/-3 strips in eta, centered around the
+ /// maximum energy strip and E is the energy reconstructed in the
+ /// electromagnetic calorimeter
+ f1core = 9,
+ /// @brief E3(3x3)/E fraction of the energy reconstructed in the third
+ /// compartment of the electromagnetic calorimeter, where E3(3x3), energy in
+ /// the back sampling, is the sum of the energy contained in a 3x3 window
+ /// around the maximum energy cell
+ f3core = 10,
+ /// @brief uncalibrated energy (sum of cells) of the middle sampling in a
+ /// rectangle of size 3x3 (in cell units eta X phi)
+ e233 = 11,
+ /// @brief uncalibrated energy (sum of cells) of the middle sampling in a
+ /// rectangle of size 3x5
+ e235 = 12,
+ /// @brief uncalibrated energy (sum of cells) of the middle sampling in a
+ /// rectangle of size 5x5
+ e255 = 13,
+ /// @brief uncalibrated energy (sum of cells) of the middle sampling in a
+ /// rectangle of size 3x7
+ e237 = 14,
+ /// @brief uncalibrated energy (sum of cells) of the middle sampling in a
+ /// rectangle of size 7x7
+ e277 = 15,
+ /// @brief uncalibrated energy (sum of cells) of the third sampling in a
+ /// rectangle of size 3x3
+ e333 = 16,
+ /// @brief uncalibrated energy (sum of cells) of the third sampling in a
+ /// rectangle of size 3x5
+ e335 = 17,
+ /// @brief uncalibrated energy (sum of cells) of the third sampling in a
+ /// rectangle of size 3x7
+ e337 = 18,
+ /// @brief uncalibrated energy (sum of cells) of the middle sampling in a
+ /// rectangle of size 7x7
+ e377 = 19,
+ /// @brief shower width using +/-3 strips around the one with the maximal
+ /// energy deposit:
+ /// w3 strips = sqrt{sum(Ei)x(i-imax)^2/sum(Ei)}, where i is the number of
+ ///the strip and imax the strip number of the most energetic one
+ weta1 = 20,
+ /// @brief the lateral width is calculated with a window of 3x5 cells using
+ /// the energy weighted sum over all cells, which depends on the particle
+ /// impact point inside the cell: weta2 =
+ /// sqrt(sum Ei x eta^2)/(sum Ei) -((sum Ei x eta)/(sum Ei))^2, where Ei is
+ ///the energy of the i-th cell
+ weta2 = 21,
+ /// @brief 2nd max in strips calc by summing 3 strips
+ e2ts1 = 22,
+ /// @brief energy of the cell corresponding to second energy maximum in the
+ /// first sampling
+ e2tsts1 = 23,
+ /// @brief shower shape in the shower core : [E(+/-3)-E(+/-1)]/E(+/-1), where
+ /// E(+/-n) is the energy in ± n strips around the strip with highest energy
+ fracs1 = 24,
+ /// @brief same as egammaParameters::weta1 but without corrections on
+ /// particle impact point inside the cell
+ widths1 = 25,
+ /// @brief same as egammaParameters::weta2 but without corrections on particle
+ /// impact point inside the cell
+ widths2 = 26,
+ /// @brief relative position in eta within cell in 1st sampling
+ poscs1 = 27,
+ /// @brief relative position in eta within cell in 2nd sampling
+ poscs2 = 28,
+ /// @brief uncorr asymmetry in 3 strips in the 1st sampling
+ asy1 = 29,
+ /// @brief difference between shower cell and predicted track in +/- 1 cells
+ pos = 30,
+ /// @brief Difference between the track and the shower positions:
+ /// sum_{i=i_m-7}^{i=i_m+7}E_i x (i-i_m) / sum_{i=i_m-7}^{i=i_m+7}E_i,
+ /// The difference between the track and the shower positions measured
+ /// in units of distance between the strips, where i_m is the impact cell
+ /// for the track reconstructed in the inner detector and E_i is the energy
+ /// reconstructed in the i-th cell in the eta direction for constant phi
+ ///given by the track parameters
+ pos7 = 31,
+ /// @brief barycentre in sampling 1 calculated in 3 strips
+ barys1 = 32,
+ /// @brief shower width is determined in a window detaxdphi = 0,0625 ×~0,2,
+ /// corresponding typically to 20 strips in
+ /// eta : wtot1=sqrt{sum Ei x ( i-imax)^2 / sum Ei}, where i is the strip
+ /// number and imax the strip number of the first local maximum
+ wtots1 = 33,
+ /// @brief energy reconstructed in the strip with the minimal value between
+ /// the first and second maximum
+ emins1 = 34,
+ /// @brief energy of strip with maximal energy deposit
+ emaxs1 = 35,
+ /// @brief 1-ratio of energy in 3x3 over 3x7 cells;
+ /// E(3x3) = E0(1x1) + E1(3x1) + E2(3x3) + E3(3x3); E(3x7) = E0(3x3) +
+ ///E1(15x3) + E2(3x7) + E3(3x7)
+ r33over37allcalo = 36,
+ /// @brief core energy in em calo E(core) = E0(3x3) + E1(15x2) + E2(5x5) +
+ /// E3(3x5)
+ ecore = 37,
+ /// @brief e237/e277
+ Reta = 38,
+ /// @brief e233/e237
+ Rphi = 39,
+ /// @brief (emaxs1-e2tsts1)/(emaxs1+e2tsts1)
+ Eratio = 40,
+ /// @brief ethad/et
+ Rhad = 41,
+ /// @brief ethad1/et
+ Rhad1 = 42,
+ /// @brief e2tsts1-emins1
+ DeltaE = 43,
+ /// maximum number of enums
+ NumberOfShowerShapes = 44
+};
+/// @}
- /// @name Vertex Match variable types
- /// @{
- enum VertexCaloMatchType{
- /// @brief difference between the cluster eta and
- ///the eta of the first track of the vertex extrapolated to the second sampling.
- convMatchDeltaEta1 = 0,
+/// @name Track Match variable types
+/// @{
+enum TrackCaloMatchType
+{
+ /// @brief difference between the cluster eta (presampler) and
+ /// the eta of the track extrapolated to the presampler
+ deltaEta0 = 0,
+ ///@brief difference between the cluster eta (first sampling) and the eta of
+ ///the track extrapolated to the
+ /// first sampling: |eta_stripscluster -eta_ID|, where eta_stripscluster is
+ /// computed
+ /// in the first sampling of the electromagnetic calorimeter, where the
+ /// granularity is very fine, and eta_ID is the pseudo-rapidity
+ /// of the track extrapolated to the calorimeter
+ deltaEta1 = 1,
+ /// @brief difference between the cluster eta (second sampling) and the eta of
+ /// the track extrapolated to the second sampling
+ deltaEta2 = 2,
+ /// @brief difference between the cluster eta (3rd sampling) and
+ /// the eta of the track extrapolated to the 3rd sampling
+ deltaEta3 = 3,
+ /// @brief difference between the cluster phi (presampler) and
+ /// the eta of the track extrapolated to the presampler
+ deltaPhi0 = 4,
+ /// @brief difference between the cluster eta (1st sampling) and
+ /// the eta of the track extrapolated to the 1st sampling (strips)
+ deltaPhi1 = 5,
+ /// @brief difference between the cluster phi (second sampling) and the phi of
+ /// the track
+ /// extrapolated to the second sampling : |phi_middlecluster -phi_ID|,
+ ///where phi_middlecluster
+ /// is computed in the second compartment of the electromagnetic
+ ///calorimeter and phi_ID is the
+ /// azimuth of the track extrapolated to the calorimeter
+ deltaPhi2 = 6,
+ ///@brief difference between the cluster eta (3rd sampling) and
+ /// the eta of the track extrapolated to the 3rd sampling
+ deltaPhi3 = 7,
+ /// @brief difference between the cluster phi (sampling 2) and the
+ /// eta of the track extrapolated from the last measurement point.
+ deltaPhiFromLastMeasurement = 8,
+ /// @brief difference between the cluster phi (presampler) and
+ /// the eta of the track extrapolated to the presampler from the perigee
+ ///with a rescaled
+ /// momentum.
+ deltaPhiRescaled0 = 9,
+ /// @brief difference between the cluster eta (1st sampling) and
+ /// the eta of the track extrapolated to the 1st sampling (strips) from
+ ///the perigee with a rescaled
+ /// momentum.
+ deltaPhiRescaled1 = 10,
+ /// @brief difference between the cluster phi (second sampling) and the phi of
+ /// the track
+ /// extrapolated to the second sampling from the perigee with a rescaled
+ /// momentum.
+ deltaPhiRescaled2 = 11,
+ ///@brief difference between the cluster eta (3rd sampling) and
+ /// the eta of the track extrapolated to the 3rd sampling from the perigee
+ /// with a rescaled
+ /// momentum.
+ deltaPhiRescaled3 = 12,
+ /// maximum number of enums
+ NumberOfTrackMatchProperties = 13
+};
+///@}
- /// @brief difference between the cluster eta and
- ///the eta of the second track of the vertex extrapolated to the second sampling.
- convMatchDeltaEta2 = 1,
-
- /// @brief difference between the cluster phi and
- ///the phi of the first track of the vertex extrapolated to the second sampling.
- convMatchDeltaPhi1 = 2,
-
- /// @brief difference between the cluster phi and
- ///the phi of the second track of the vertex extrapolated to the second sampling.
- convMatchDeltaPhi2 = 3,
+/// @name Vertex Match variable types
+/// @{
+enum VertexCaloMatchType
+{
+ /// @brief difference between the cluster eta and
+ /// the eta of the first track of the vertex extrapolated to the second
+ /// sampling.
+ convMatchDeltaEta1 = 0,
- ///maximum number of enums
- NumberOfVertexMatchProperties= 4
- };
- ///@}
+ /// @brief difference between the cluster eta and
+ /// the eta of the second track of the vertex extrapolated to the second
+ /// sampling.
+ convMatchDeltaEta2 = 1,
- /// @name Selection Menus
- /// @{
- enum SelectionMenu{
- Loose = 0,
- Medium = 1,
- Tight = 2,
- LHLoose = 3,
- LHMedium = 4,
- LHTight = 5,
- MultiLepton = 6,
- NumberOfMenus = 7
- };
- ///@}
+ /// @brief difference between the cluster phi and
+ /// the phi of the first track of the vertex extrapolated to the second
+ /// sampling.
+ convMatchDeltaPhi1 = 2,
+ /// @brief difference between the cluster phi and
+ /// the phi of the second track of the vertex extrapolated to the second
+ /// sampling.
+ convMatchDeltaPhi2 = 3,
- /// @name Selection isEM
- /// @{
- enum SelectionisEM{
- isEMLoose = 0,
- isEMMedium = 1,
- isEMTight = 2,
- isEMLHLoose = 3,
- isEMLHMedium = 4,
- isEMLHTight = 5,
- isEMMultiLepton = 6,
- NumberOfisEMs = 7
- };
- ///@}
+ /// maximum number of enums
+ NumberOfVertexMatchProperties = 4
+};
+///@}
+/// @name Conversion types
+/// @{
+enum ConversionType
+{
+ /// @brief unconverted photon
+ unconverted = 0,
- /// @name Conversion types
- /// @{
- enum ConversionType{
- /// @brief unconverted photon
- unconverted = 0,
+ /// @brief one track only, with Si hits
+ singleSi = 1,
- /// @brief one track only, with Si hits
- singleSi = 1,
+ /// @brief one track only, no Si hits (TRT only)
+ singleTRT = 2,
- /// @brief one track only, no Si hits (TRT only)
- singleTRT = 2,
-
- /// @brief two tracks, both with Si hits
- doubleSi = 3,
-
- /// @brief two tracks, none with Si hits (TRT only)
- doubleTRT = 4,
+ /// @brief two tracks, both with Si hits
+ doubleSi = 3,
- /// @brief two tracks, only one with Si hits
- doubleSiTRT = 5,
+ /// @brief two tracks, none with Si hits (TRT only)
+ doubleTRT = 4,
- ///maximum number of types
- NumberOfVertexConversionTypes
- };
- ///@}
+ /// @brief two tracks, only one with Si hits
+ doubleSiTRT = 5,
+ /// maximum number of types
+ NumberOfVertexConversionTypes
+};
+///@}
- }// End namespace EgammaParameters
+} // End namespace EgammaParameters
-}// End namespace xAOD
+} // End namespace xAOD
#endif // XAODEGAMMA_EGAMMAENUMS_H
diff --git a/Event/xAOD/xAODEgamma/xAODEgamma/versions/Egamma_v1.h b/Event/xAOD/xAODEgamma/xAODEgamma/versions/Egamma_v1.h
index f0d1f4724d0a052316c68c90ec8a0248d33f3827..a855583e1a48d722c2dedaddd9f7858ceee70083 100644
--- a/Event/xAOD/xAODEgamma/xAODEgamma/versions/Egamma_v1.h
+++ b/Event/xAOD/xAODEgamma/xAODEgamma/versions/Egamma_v1.h
@@ -18,8 +18,8 @@
#include "xAODEgamma/EgammaEnums.h"
//CaloCluster include
-#include "xAODCaloEvent/CaloCluster.h"
-#include "xAODCaloEvent/CaloClusterContainer.h"
+#include "xAODCaloEvent/CaloCluster.h"
+#include "xAODCaloEvent/CaloClusterContainer.h"
//xAOD Primitives
#include "xAODPrimitives/IsolationCorrection.h"
@@ -42,7 +42,7 @@
namespace xAOD {
/// @class xAOD::Egamma
- /// @brief Class describing an e/gamma
+ /// @brief Class describing an e/gamma
/// @name xAOD::Egamma provides a public interface.
/// @name xAOD::Electron and xAOD::Photon inherit from this class
///
@@ -58,7 +58,7 @@ namespace xAOD {
protected:
/// @name xAOD::Egamma constructors
/// The xAOD::Egamma is not supposed to be created directly, only via xAOD::Electron and xAOD::Photon.
- /// xAOD::Egamma is an abstract class. It does not define the type() pure virtual function from IParticle
+ /// xAOD::Egamma is an abstract class. It does not define the type() pure virtual function from IParticle
/// The default constructors is protected
/// @{
@@ -84,7 +84,7 @@ namespace xAOD {
/// @name xAOD::IParticle functions
/// These are already virtual due to IParticle
/// @{
-
+
/// @brief The transverse momentum (\f$p_T\f$) of the particle
virtual double pt() const final;
@@ -102,7 +102,7 @@ namespace xAOD {
/// @brief The true rapidity (y) of the particle
virtual double rapidity() const final;
-
+
/// @brief Definition of the 4-momentum type
typedef IParticle::FourMom_t FourMom_t;
@@ -110,8 +110,8 @@ namespace xAOD {
virtual FourMom_t p4() const final;
/// @brief The type of the object as a simple enumeration, remains pure virtual in e/gamma.
- virtual Type::ObjectType type() const override =0 ;
-
+ virtual Type::ObjectType type() const override =0 ;
+
/// @}
@@ -122,8 +122,8 @@ namespace xAOD {
typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double> > GenVecFourMom_t;
/// The full 4-momentum of the particle : internal egamma type.
- GenVecFourMom_t genvecP4() const;
-
+ GenVecFourMom_t genvecP4() const;
+
/// @brief set the 4-vec
void setP4(float pt, float eta, float phi, float m);
@@ -138,28 +138,28 @@ namespace xAOD {
/// @brief set the Mass
void setM(float m);
-
+
/// @}
-
+
/// @name xAOD::Egamma 4x4 Covariance Matrix
- /// @{
+ /// @{
///4x4 Covariance Matrix in EtEtaPhiM (needs decision)
typedef Eigen::Matrix<float,4,4> EgammaCovMatrix_t;
/// Returns the 4x4 symmetric covariance matrix .
- EgammaCovMatrix_t covMatrix() const;
+ EgammaCovMatrix_t covMatrix() const;
/// set the 4x4 symmetric covariance matrix .
void setCovMatrix(const EgammaCovMatrix_t& cov);
- /// @}
+ /// @}
/// @name xAOD::Egamma Pointer to CaloClusters
- /// @{
+ /// @{
/// @brief Return the number of xAOD::CaloClusters that define the electron
/// candidate
- size_t nCaloClusters() const;
+ size_t nCaloClusters() const;
/// @brief Pointer to the xAOD::CaloCluster/s that define the electron
/// candidate
@@ -168,14 +168,14 @@ namespace xAOD {
/// @brief ElementLink to the xAOD::CaloCluster/s that match the electron
/// candidate
const ElementLink< CaloClusterContainer >&
- caloClusterLink( size_t index = 0 ) const;
+ caloClusterLink( size_t index = 0 ) const;
/// Helper type definition
typedef std::vector< ElementLink< CaloClusterContainer > > CLELVec_t;
/// @brief Get all cluster links
const CLELVec_t& caloClusterLinks() const;
- /// @brief set Pointer to the xAOD::CaloCluster
+ /// @brief set Pointer to the xAOD::CaloCluster
void setCaloClusterLinks( const CLELVec_t& links );
/// @}
@@ -184,13 +184,13 @@ namespace xAOD {
/// @name xAOD::Egamma author (i.e. which reco algorithm was used)
/// @{
- /// @brief Get author
+ /// @brief Get author
uint16_t author(uint16_t bitmask=EgammaParameters::AuthorALL) const;
- /// @brief add author
+ /// @brief add author
void addAuthor( uint16_t );
- /// @brief set author
+ /// @brief set author
void setAuthor( uint16_t );
/// @}
@@ -198,16 +198,16 @@ namespace xAOD {
/// as the same cluster leads to creation of both.
/// @{
- /// @brief Get ambiguous
+ /// @brief Get ambiguous
const Egamma_v1* ambiguousObject() const;
/// @}
-
-
+
+
/// @name xAOD::Egamma Shower shape Accesors
/// If 'information' is stored in this xAOD::Egamma and is of the correct type,
/// then the function fills 'value' and returns 'true', otherwise it returns 'false', and does not touch 'value'.
///
- /// @{
+ /// @{
/// @brief Accessor for ShowerShape values.
bool showerShapeValue(float& value,const EgammaParameters::ShowerShapeType information) const;
@@ -222,9 +222,9 @@ namespace xAOD {
/// @}
- /// @name xAOD::Egamma object quality of the calorimeter cluster
- /// @{
-
+ /// @name xAOD::Egamma object quality of the calorimeter cluster
+ /// @{
+
/// @brief Check object quality. Return True is it is Good Object Quality
bool isGoodOQ(uint32_t mask ) const;
@@ -233,14 +233,14 @@ namespace xAOD {
/// @brief Set the object quality
void setOQ(uint32_t newOQ);
-
+
///@}
/// @name xAOD::Egamma Isolation value Accesors
/// If 'information' is stored in this xAOD::Egamma and is of the correct type,
/// then the function fills 'value' and returns 'true', otherwise it returns 'false', and does not touch 'value'.
///
- /// @{
+ /// @{
/// @brief Accessor for Isolation values.
bool isolation(float& value, const Iso::IsolationType information) const;
@@ -275,19 +275,19 @@ namespace xAOD {
/// If 'information' is stored in this xAOD::Egamma and is of the correct type,
/// then the function fills 'value' and returns 'true', otherwise it returns 'false', and does not touch 'value'.
///
- /// @{
+ /// @{
/// @brief Accessor for flavour and type depended Isolation Calo correction.
- bool isolationCaloCorrection(float& value, const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
+ bool isolationCaloCorrection(float& value, const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
const Iso::IsolationCorrectionParameter param) const;
/// @brief Accessor for flavour and type depended Isolation Calo corrections , this just returns the correction without internaly checking if it exists.
/// Will lead to an exception if the information is not available
- float isolationCaloCorrection(const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
+ float isolationCaloCorrection(const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
const Iso::IsolationCorrectionParameter param) const;
/// @brief set method for flavour and type depended Isolation Calo Corrections.
- bool setIsolationCaloCorrection(float value, const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
+ bool setIsolationCaloCorrection(float value, const Iso::IsolationFlavour flavour, const Iso::IsolationCaloCorrection corr,
const Iso::IsolationCorrectionParameter param);
/// @brief Accessor for type depended Isolation Calo correction.
@@ -323,52 +323,16 @@ namespace xAOD {
/// @}
-
-
- /// @name xAOD::Egamma selector / isEM methods using enums
- /// @{
- /// @name xAOD::Egamma selector methods with enums
- /// @brief Check if the egamma object pass a selection menu
- ///If the menu decision is stored in this xAOD::Egamma,
- ///then the function fills 'value' with the decision (reference)
- ///and returns 'true', otherwise it returns 'false',
- ///and does not touch 'value'.
- bool passSelection(bool& value, const xAOD::EgammaParameters::SelectionMenu menu ) const;
-
- /// @brief Check if the egamma object pass a selection menu
- /// If the particular menu decision is not stored in this xAOD::Egamma,
- /// an exception will occur
- bool passSelection( const xAOD::EgammaParameters::SelectionMenu menu ) const;
-
- /// @brief Set the selection decision for a menu
- void setPassSelection(bool value, const xAOD::EgammaParameters::SelectionMenu menu);
-
- /// @brief Return the isEM word for a selection menu
- ///If the menu isEM is stored in this xAOD::Egamma,
- ///then the function fills 'value' with the isEM (reference)
- ///and returns 'true', otherwise it returns 'false',
- ///and does not touch 'value'.
- bool selectionisEM(unsigned int& value, const xAOD::EgammaParameters::SelectionisEM isEM) const;
-
- /// @brief Return the isEM word for a selection menu
- /// If the particular isEM word is not stored in this xAOD::Egamma,
- /// an exception will occur
- unsigned int selectionisEM(const xAOD::EgammaParameters::SelectionisEM isEM) const;
-
- /// @brief Set the isEM word for a selection menu
- void setSelectionisEM(unsigned int value, const xAOD::EgammaParameters::SelectionisEM isEM);
-
- ///@}
/// @name xAOD::Egamma selector / isEM methods using the menu name
- /// @{
+ /// @{
/// @brief Check if the egamma object pass a selection menu (using the name)
///If the menu decision is stored in this xAOD::Egamma,
- ///then the function fills 'value' with the decision (reference)
- ///and returns 'true', otherwise it returns 'false',
+ ///then the function fills 'value' with the decision (reference)
+ ///and returns 'true', otherwise it returns 'false',
/// and does not touch 'value'.
bool passSelection(bool& value, const std::string& menu ) const;
@@ -382,8 +346,8 @@ namespace xAOD {
/// @brief Return the isEM word for a selection menu
///If the menu isEM is stored in this xAOD::Egamma,
- ///then the function fills 'value' with the isEM (reference)
- ///and returns 'true', otherwise it returns 'false',
+ ///then the function fills 'value' with the isEM (reference)
+ ///and returns 'true', otherwise it returns 'false',
///and does not touch 'value'.
bool selectionisEM(unsigned int& value, const std::string& isEM) const;
@@ -397,8 +361,8 @@ namespace xAOD {
/// @brief Return the LH value as float
///If the LH decision is stored in this xAOD::Egamma,
- ///then the function fills 'value' with the decision (reference)
- ///and returns 'true', otherwise it returns 'false',
+ ///then the function fills 'value' with the decision (reference)
+ ///and returns 'true', otherwise it returns 'false',
///and does not touch 'value'.
bool likelihoodValue(float& value, const std::string& LHValue=std::string("LHValue")) const;
@@ -407,12 +371,12 @@ namespace xAOD {
/// an exception will occur
float likelihoodValue(const std::string& LHValue=std::string("LHValue")) const;
- /// @brief Set the LHValue as float
+ /// @brief Set the LHValue as float
void setLikelihoodValue(float value, const std::string& LHValue=std::string("LHValue"));
///@}
-
+
}; // class Egamma
diff --git a/Event/xAOD/xAODEgamma/xAODEgamma/versions/Electron_v1.h b/Event/xAOD/xAODEgamma/xAODEgamma/versions/Electron_v1.h
index 5a8c4afd76b796dd7c49b2d9bf1e161c89fb24bf..970e3e625d33f301d62140299d4f00a3eed0ca8b 100644
--- a/Event/xAOD/xAODEgamma/xAODEgamma/versions/Electron_v1.h
+++ b/Event/xAOD/xAODEgamma/xAODEgamma/versions/Electron_v1.h
@@ -6,7 +6,7 @@
#ifndef XAODEGAMMA_VERSIONS_ELECTRON_V1_H
#define XAODEGAMMA_VERSIONS_ELECTRON_V1_H
-
+
// Core include(s):
#include "AthLinks/ElementLink.h"
// xAOD include(s):
@@ -25,13 +25,11 @@
namespace xAOD {
/// @class xAOD::Electron
- /// @brief Class describing an electron
+ /// @brief Class describing an electron
///
/// @author Christos Anastopoulos
/// @author Anthony Morley
///
- /// $Revision: 636327 $
- /// $Date: 2014-12-16 17:34:24 +0100 (Tue, 16 Dec 2014) $
///
class Electron_v1 :public xAOD::Egamma_v1{
@@ -76,12 +74,12 @@ namespace xAOD {
/// @}
/// @name xAOD::Electron Pointers to TrackParticles
- /// @{
+ /// @{
/// @brief Return the number xAOD::TrackParticles that match the electron
/// candidate
size_t nTrackParticles() const;
-
+
/// @brief Pointer to the xAOD::TrackParticle/s that match the electron
/// candidate
const xAOD::TrackParticle* trackParticle( size_t index = 0 ) const;
@@ -89,7 +87,7 @@ namespace xAOD {
/// @brief ElementLink to the xAOD::TrackParticle/s that match the electron
/// candidate
const ElementLink< TrackParticleContainer >&
- trackParticleLink( size_t index = 0 ) const;
+ trackParticleLink( size_t index = 0 ) const;
/// Helper type definition
typedef std::vector< ElementLink< TrackParticleContainer > > TPELVec_t;
@@ -103,16 +101,16 @@ namespace xAOD {
/// @}
/// @name xAOD::Electron Track to Calo matching values.
- /// @{
+ /// @{
- ///@brief Accessor for Track to Calo Match Values
+ ///@brief Accessor for Track to Calo Match Values
bool trackCaloMatchValue( float& value, const EgammaParameters::TrackCaloMatchType information ) const;
///@brief Accessor for Track to Calo Match values , this just returns the value without internaly checking if it exists.
/// Will lead to an exception if the information is not available.
float trackCaloMatchValue( const EgammaParameters::TrackCaloMatchType information ) const;
-
+
///@brief Set method for Track to Calo Match values.
bool setTrackCaloMatchValue( const float value, const EgammaParameters::TrackCaloMatchType information );
diff --git a/Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx b/Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx
index a551aca8817b0e7c3d51173137992156a2c046c2..7996dc153c7dff78dcfa258bc4acf07cbed47fa7 100644
--- a/Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx
+++ b/Event/xAOD/xAODJetCnv/src/JetCnvAlg.cxx
@@ -23,7 +23,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.icc b/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.icc
index abfac21bec19bf3b90544300d19103cbbf89c780..5eefd32cb93d540b856cd6c46bc6cfa04a88676c 100644
--- a/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.icc
+++ b/Event/xAOD/xAODMuon/Root/MuonAccessors_v1.icc
@@ -46,6 +46,7 @@ namespace xAOD {
DEFINE_ACCESSOR( float, msOuterMatchChi2 );
DEFINE_ACCESSOR( float, meanDeltaADCCountsMDT );
DEFINE_ACCESSOR( float, CaloLRLikelihood );
+ DEFINE_ACCESSOR( float, CaloMuonScore );
DEFINE_ACCESSOR( float, FSR_CandidateEnergy );
DEFINE_ACCESSOR( float, EnergyLoss );
DEFINE_ACCESSOR( float, ParamEnergyLoss );
diff --git a/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v2.cxx b/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v2.cxx
index a277d2de1353a8889f2072faec1cdb9097347b0d..246c8d514072735a5af9389ddd83c771c3c8da59 100644
--- a/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v2.cxx
+++ b/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v2.cxx
@@ -107,7 +107,8 @@ namespace xAOD {
AUX_VARIABLE(msInnerMatchChi2 );
AUX_VARIABLE(meanDeltaADCCountsMDT );
AUX_VARIABLE(CaloLRLikelihood );
- AUX_VARIABLE(EnergyLoss );
+ AUX_VARIABLE(CaloMuonScore );
+ AUX_VARIABLE(EnergyLoss );
AUX_VARIABLE(ParamEnergyLoss );
AUX_VARIABLE(MeasEnergyLoss );
AUX_VARIABLE(EnergyLossSigma );
diff --git a/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v3.cxx b/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v3.cxx
index 57efa0a7f384420e7d811f2f6d7dc01767f5433e..92c1ffec9a52ec02a0d188afb7e2c897f9404a38 100644
--- a/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v3.cxx
+++ b/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v3.cxx
@@ -110,6 +110,7 @@ namespace xAOD {
AUX_VARIABLE(msInnerMatchChi2 );
AUX_VARIABLE(meanDeltaADCCountsMDT );
AUX_VARIABLE(CaloLRLikelihood );
+ AUX_VARIABLE(CaloMuonScore );
AUX_VARIABLE(EnergyLoss );
AUX_VARIABLE(ParamEnergyLoss );
AUX_VARIABLE(MeasEnergyLoss );
diff --git a/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v4.cxx b/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v4.cxx
index 979f5b1c49720cf7b42c0e1c98f3c3d0b26d3830..f81c6a52f99346ef4f92f4275174b2dc266d5f6f 100644
--- a/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v4.cxx
+++ b/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v4.cxx
@@ -154,6 +154,7 @@ namespace xAOD {
AUX_VARIABLE(msInnerMatchChi2 );
AUX_VARIABLE(meanDeltaADCCountsMDT );
AUX_VARIABLE(CaloLRLikelihood );
+ AUX_VARIABLE(CaloMuonScore );
AUX_VARIABLE(EnergyLoss );
AUX_VARIABLE(ParamEnergyLoss );
AUX_VARIABLE(MeasEnergyLoss );
diff --git a/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v5.cxx b/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v5.cxx
index d06a294f9fb65025b84ce68270ab847e350dad35..24b0523daec0167dbb7005baa81bcf9e310cb090 100644
--- a/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v5.cxx
+++ b/Event/xAOD/xAODMuon/Root/MuonAuxContainer_v5.cxx
@@ -168,7 +168,8 @@ namespace xAOD {
AUX_VARIABLE(msInnerMatchChi2 );
AUX_VARIABLE(meanDeltaADCCountsMDT );
AUX_VARIABLE(CaloLRLikelihood );
- AUX_VARIABLE(EnergyLoss );
+ AUX_VARIABLE(CaloMuonScore );
+ AUX_VARIABLE(EnergyLoss );
AUX_VARIABLE(ParamEnergyLoss );
AUX_VARIABLE(MeasEnergyLoss );
AUX_VARIABLE(EnergyLossSigma );
diff --git a/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v2.h b/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v2.h
index 32e2ae6d01636e80acc93fa7bc405593e15d12e1..bfa47c21f41d580bff7ea49ed76bdf95a65dffd6 100644
--- a/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v2.h
+++ b/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v2.h
@@ -145,6 +145,7 @@ namespace xAOD {
std::vector< float> msInnerMatchChi2 ;
std::vector< float> meanDeltaADCCountsMDT ;
std::vector< float> CaloLRLikelihood ;
+ std::vector< float> CaloMuonScore ;
std::vector< float> EnergyLoss ;
std::vector< float> ParamEnergyLoss ;
std::vector< float> MeasEnergyLoss ;
diff --git a/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v3.h b/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v3.h
index 26629a979576f0f7cb27638025e045bfcc652b52..b42adcea6192cea0609ee6c9f275725576896a14 100644
--- a/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v3.h
+++ b/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v3.h
@@ -148,6 +148,7 @@ namespace xAOD {
std::vector< float> msInnerMatchChi2 ;
std::vector< float> meanDeltaADCCountsMDT ;
std::vector< float> CaloLRLikelihood ;
+ std::vector< float> CaloMuonScore ;
std::vector< float> EnergyLoss ;
std::vector< float> ParamEnergyLoss ;
std::vector< float> MeasEnergyLoss ;
diff --git a/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v4.h b/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v4.h
index 53000121f0b541717c4b1de00dc5d9b92d8fab30..d0eb8ce5fc325d15780882bb41585b9f393fb949 100644
--- a/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v4.h
+++ b/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v4.h
@@ -193,6 +193,7 @@ namespace xAOD {
std::vector< float> msInnerMatchChi2 ;
std::vector< float> meanDeltaADCCountsMDT ;
std::vector< float> CaloLRLikelihood ;
+ std::vector< float> CaloMuonScore ;
std::vector< float> EnergyLoss ;
std::vector< float> ParamEnergyLoss ;
std::vector< float> MeasEnergyLoss ;
diff --git a/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v5.h b/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v5.h
index ff39bcacde305aebbb717f8819df0bb319d857f4..80b8c5fa8c6ea40215b00b10cbac8a47c3eca113 100644
--- a/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v5.h
+++ b/Event/xAOD/xAODMuon/xAODMuon/versions/MuonAuxContainer_v5.h
@@ -204,6 +204,7 @@ namespace xAOD {
std::vector< float> msInnerMatchChi2 ;
std::vector< float> meanDeltaADCCountsMDT ;
std::vector< float> CaloLRLikelihood ;
+ std::vector< float> CaloMuonScore ;
std::vector< float> EnergyLoss ;
std::vector< float> ParamEnergyLoss ;
std::vector< float> MeasEnergyLoss ;
diff --git a/Event/xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h b/Event/xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h
index a0a6482753a120274325bd0d12517a1aaee70ecf..d544266431e1eae7155f38f8c5bb9552a7a6af67 100644
--- a/Event/xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h
+++ b/Event/xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h
@@ -106,6 +106,7 @@ namespace xAOD {
MuGirlLowBeta,
CaloTag,
CaloLikelihood,
+ CaloScore,
ExtrapolateMuonToIP,
NumberOfMuonAuthors // increase this guy when adding
};
@@ -118,7 +119,7 @@ namespace xAOD {
/// Get all the authors of this Muon.
/// For example during overlap checking, the same Muon may have been reconstructed by many different algorithms. This method returns a 16bit
/// number, where each bit represents a muon algorithm, defined as follows (the lowest bit is indicates that something has gone wrong):
- /// unknown | MuidCo | STACO | MuTag | MuTagIMO | MuidSA | MuGirl | MuGirlLowBeta | CaloTag | CaloLikelihood | ExtrapolateMuonToIP | MuonCombinedRefit | ExtrapolateMuonToIP
+ /// unknown | MuidCo | STACO | MuTag | MuTagIMO | MuidSA | MuGirl | MuGirlLowBeta | CaloTag | CaloLikelihood | CaloScore | ExtrapolateMuonToIP | MuonCombinedRefit | ExtrapolateMuonToIP
/// @returns 16-bit word, 1-bit reserved for each muon Algorithm:
uint16_t allAuthors() const;
void setAllAuthors(uint16_t authors);
@@ -204,15 +205,16 @@ namespace xAOD {
meanDeltaADCCountsMDT=17, //!< Difference between mean number of ADC count for given track and mean number of ADC for all muons from DATA.
/** CaloMuon variables (EnergyLossType is stored separately and retrieved using energyLossType() */
CaloLRLikelihood=18, //!< Calo Muon ID likelihood
- CaloMuonIDTag=19, //!< Calo Muon Identification tag
- FSR_CandidateEnergy=20, //!< FSR candidate energy [MeV]
- EnergyLoss=21, //!< Fitted energy loss (either param or meas depending on track isolation and calo meas) [Mev]
- ParamEnergyLoss=22, //!< Parametrised energy loss [Mev]
- MeasEnergyLoss=23, //!< Measured energy loss [Mev]
- EnergyLossSigma=24, //!< Sigma of Measured or parametrised energy loss used in the track fit [Mev]
- ParamEnergyLossSigmaPlus=25, //!< Sigma plus of Parametrised energy loss [Mev]
- ParamEnergyLossSigmaMinus=26, //!< Sigma minus of Parametrised energy loss [Mev]
- MeasEnergyLossSigma=27, //!< Sigma of Measured energy loss [Mev]
+ CaloMuonScore=19, //!< Calo Muon ID score
+ CaloMuonIDTag=20, //!< Calo Muon Identification tag
+ FSR_CandidateEnergy=21, //!< FSR candidate energy [MeV]
+ EnergyLoss=22, //!< Fitted energy loss (either param or meas depending on track isolation and calo meas) [Mev]
+ ParamEnergyLoss=23, //!< Parametrised energy loss [Mev]
+ MeasEnergyLoss=24, //!< Measured energy loss [Mev]
+ EnergyLossSigma=25, //!< Sigma of Measured or parametrised energy loss used in the track fit [Mev]
+ ParamEnergyLossSigmaPlus=26, //!< Sigma plus of Parametrised energy loss [Mev]
+ ParamEnergyLossSigmaMinus=27, //!< Sigma minus of Parametrised energy loss [Mev]
+ MeasEnergyLossSigma=28, //!< Sigma of Measured energy loss [Mev]
};
/// Get a parameter for this Muon - momentumBalanceSignificance for example
diff --git a/Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx b/Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx
index 39a21de377be44db30c7ed72f0a8a98f4112d48e..82804676bd21095f18883383f294eb7d9c8d4190 100644
--- a/Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx
+++ b/Event/xAOD/xAODTauCnv/src/TauJetCnvAlg.cxx
@@ -23,7 +23,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx b/Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx
index 8d992554722fdb6c08cb304ef3bec6f74613553b..e5ce18c418e642fa9f6956bc1864172a327f93b0 100644
--- a/Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx
+++ b/Event/xAOD/xAODTauCnv/src/TauJetCnvTool.cxx
@@ -16,7 +16,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Event/xAOD/xAODTrackingCnv/CMakeLists.txt b/Event/xAOD/xAODTrackingCnv/CMakeLists.txt
index 2515ff711506926404be8e836f3aa7adc7472d6a..df9daef57bca7a4d9fc79189be3360217dcffd59 100644
--- a/Event/xAOD/xAODTrackingCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrackingCnv/CMakeLists.txt
@@ -40,4 +40,5 @@ atlas_add_component( xAODTrackingCnv
LINK_LIBRARIES xAODTracking TrkTrack AthenaBaseComps AthenaKernel
EventPrimitives GaudiKernel GeneratorObjects MCTruthClassifierLib Particle
ParticleTruth TrkLinks TrkParticleBase TrkTruthData VxVertex
- TrkToolInterfaces xAODCore xAODTrackingCnvLib )
+ TrkToolInterfaces xAODCore xAODTrackingCnvLib
+ PRIVATE_LINK_LIBRARIES CxxUtils )
diff --git a/Event/xAOD/xAODTrackingCnv/src/TrackParticleCompressorTool.cxx b/Event/xAOD/xAODTrackingCnv/src/TrackParticleCompressorTool.cxx
index 0831e6655ce4100547f8a2676ea57331e9e34900..88c40aabd0e396265e4f8ff532388851631c082a 100644
--- a/Event/xAOD/xAODTrackingCnv/src/TrackParticleCompressorTool.cxx
+++ b/Event/xAOD/xAODTrackingCnv/src/TrackParticleCompressorTool.cxx
@@ -41,7 +41,7 @@ namespace xAODMaker {
// Create the helper objects:
m_diagCovMatrixCompressor.reset(
- new xAOD::FloatCompressor( m_diagCovMatrixBits ) );
+ new CxxUtils::FloatCompressor( m_diagCovMatrixBits ) );
// Return gracefully:
return StatusCode::SUCCESS;
@@ -69,7 +69,7 @@ namespace xAODMaker {
tp.setDefiningParametersCovMatrixDiagVec( diagVecCompr );
auto compressOffDiag = []( const std::vector< float >& offDiagVec, int bits ) -> std::vector< float > {
- xAOD::FloatCompressor fc( bits );
+ CxxUtils::FloatCompressor fc( bits );
std::vector< float > offDiagVecCompr;
offDiagVecCompr.reserve( offDiagVec.size() );
for( float element : offDiagVec ) {
diff --git a/Event/xAOD/xAODTrackingCnv/src/TrackParticleCompressorTool.h b/Event/xAOD/xAODTrackingCnv/src/TrackParticleCompressorTool.h
index 7a03ef9b7f6b3f9c01b4e88d35cc723fdc6d8463..7bf758733e8499ea139c2cfec7e4da43d41160de 100644
--- a/Event/xAOD/xAODTrackingCnv/src/TrackParticleCompressorTool.h
+++ b/Event/xAOD/xAODTrackingCnv/src/TrackParticleCompressorTool.h
@@ -14,8 +14,8 @@
// Gaudi/Athena include(s):
#include "AthenaBaseComps/AthAlgTool.h"
-// xAOD include(s):
-#include "xAODCore/tools/FloatCompressor.h"
+// CxxUtils include(s):
+#include "CxxUtils/FloatCompressor.h"
// Local include(s):
#include "xAODTrackingCnv/ITrackParticleCompressorTool.h"
@@ -60,7 +60,7 @@ namespace xAODMaker {
/// Helper object for compressing the on-diagonal covariance matrix
/// elements
- std::unique_ptr< xAOD::FloatCompressor > m_diagCovMatrixCompressor;
+ std::unique_ptr< CxxUtils::FloatCompressor > m_diagCovMatrixCompressor;
}; // class TrackParticleCompressorTool
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigMuonAthenaPool/CMakeLists.txt
index 1f42b034a8263973db0a34dc8a2c312a0552308a..1b50fc8e47e3916f231074628c05f61fd850ff20 100644
--- a/Event/xAOD/xAODTrigMuonAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMuonAthenaPool/CMakeLists.txt
@@ -30,7 +30,7 @@ find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( XAODTRIGMONATHENAPOOL_REFERENCE_TAG
- xAODTrigMuonAthenaPoolReference-01-00-00 )
+ xAODTrigMuonAthenaPoolReference-01-00-01 )
run_tpcnv_legacy_test( xAODTrigMuonAthenaPool_20.1.7.2 AOD-20.1.7.2-full
REQUIRED_LIBRARIES xAODTrigMuonAthenaPoolPoolCnv
REFERENCE_TAG ${XAODTRIGMONATHENAPOOL_REFERENCE_TAG} )
diff --git a/Event/xAOD/xAODTrigger/Root/dict/ContainerProxies.cxx b/Event/xAOD/xAODTrigger/Root/dict/ContainerProxies.cxx
index a63ad6ba574d1f6006c44d1e287b7f7ed9c93ad9..04a66ad2406c17d4d09022e7363570372ebdf8cf 100644
--- a/Event/xAOD/xAODTrigger/Root/dict/ContainerProxies.cxx
+++ b/Event/xAOD/xAODTrigger/Root/dict/ContainerProxies.cxx
@@ -16,6 +16,7 @@
#include "xAODTrigger/versions/JetRoIContainer_v1.h"
#include "xAODTrigger/versions/JetRoIContainer_v2.h"
#include "xAODTrigger/versions/MuonRoIContainer_v1.h"
+#include "xAODTrigger/versions/eFexEMRoIContainer_v1.h"
#include "xAODTrigger/versions/TrigCompositeContainer_v1.h"
#include "xAODTrigger/versions/BunchConfContainer_v1.h"
@@ -30,6 +31,7 @@ ADD_NS_DV_PROXY( xAOD, EmTauRoIContainer_v2 );
ADD_NS_DV_PROXY( xAOD, JetRoIContainer_v1 );
ADD_NS_DV_PROXY( xAOD, JetRoIContainer_v2 );
ADD_NS_DV_PROXY( xAOD, MuonRoIContainer_v1 );
+ADD_NS_DV_PROXY( xAOD, eFexEMRoIContainer_v1 );
ADD_NS_DV_PROXY( xAOD, TrigCompositeContainer_v1 );
ADD_NS_DV_PROXY( xAOD, BunchConfContainer_v1 );
diff --git a/Event/xAOD/xAODTrigger/Root/eFexEMRoIAuxContainer_v1.cxx b/Event/xAOD/xAODTrigger/Root/eFexEMRoIAuxContainer_v1.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..635f2d77b683b1621161d33d2dc369784f7d9710
--- /dev/null
+++ b/Event/xAOD/xAODTrigger/Root/eFexEMRoIAuxContainer_v1.cxx
@@ -0,0 +1,31 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: eFexEMRoIAuxContainer_v1.cxx 2019-07-01 13:04:25Z watsona $
+
+// Local include(s):
+#include "xAODTrigger/versions/eFexEMRoIAuxContainer_v1.h"
+
+namespace xAOD {
+
+ eFexEMRoIAuxContainer_v1::eFexEMRoIAuxContainer_v1()
+ : AuxContainerBase() {
+
+ AUX_VARIABLE( word0);
+ AUX_VARIABLE( word1);
+ AUX_VARIABLE( eFexNumber);
+ AUX_VARIABLE( retaEnv);
+ AUX_VARIABLE( retaCore);
+ AUX_VARIABLE( rhadHad);
+ AUX_VARIABLE( rhadEM);
+ AUX_VARIABLE( wstotNumerator);
+ AUX_VARIABLE( wstotDenominator);
+ AUX_VARIABLE( et);
+ AUX_VARIABLE( eta);
+ AUX_VARIABLE( phi);
+ AUX_VARIABLE( isTOB);
+ AUX_VARIABLE( thrPattern);
+ }
+
+} // namespace xAOD
diff --git a/Event/xAOD/xAODTrigger/Root/eFexEMRoI_v1.cxx b/Event/xAOD/xAODTrigger/Root/eFexEMRoI_v1.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..267e49b9e5dcd420f62ea392bf5fd8bf17bb1db1
--- /dev/null
+++ b/Event/xAOD/xAODTrigger/Root/eFexEMRoI_v1.cxx
@@ -0,0 +1,249 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+// System include(s):
+#include <stdexcept>
+
+// xAOD include(s):
+#include "xAODCore/AuxStoreAccessorMacros.h"
+
+// Local include(s):
+#include "xAODTrigger/versions/eFexEMRoI_v1.h"
+
+namespace xAOD {
+
+ /// Constants used in converting to ATLAS units
+ const float eFexEMRoI_v1::s_tobEtScale = 100.;
+ const float eFexEMRoI_v1::s_xTobEtScale = 25.;
+ const float eFexEMRoI_v1::s_towerEtaWidth = 0.1;
+ const float eFexEMRoI_v1::s_minEta = -2.5;
+
+ eFexEMRoI_v1::eFexEMRoI_v1()
+ : SG::AuxElement() {
+
+ }
+
+ void eFexEMRoI_v1::initialize( uint8_t eFexNumber, uint32_t word0, uint32_t word1 ) {
+
+ setWord0( word0 );
+ setWord1( word1 );
+ seteFexNumber( eFexNumber );
+ setTobEt( etTOB() );
+ setEta( etaIndex() );
+ setPhi( phiIndex() );
+
+ /** If the object is a TOB then the isTOB should be true.
+ For xTOB default is false, but should be set if a matching TOB is found */
+ if (type() == TOB) setIsTOB(1);
+ else setIsTOB(0);
+
+ return;
+ }
+
+
+ /// Raw data words
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint32_t, Word0,
+ setWord0 )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint32_t, Word1,
+ setWord1 )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint8_t, eFexNumber,
+ seteFexNumber )
+
+ /// Only calculable externally
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint16_t, RetaCore,
+ setRetaCore )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint16_t, RetaEnv,
+ setRetaEnv )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint16_t, RhadEM,
+ setRhadEM )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint16_t, RhadHad,
+ setRhadHad )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint16_t, WstotNumerator,
+ setWstotNumerator )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint16_t, WstotDenominator,
+ setWstotDenominator )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint32_t, thrPattern,
+ setThrPattern )
+
+
+ /// Should be set for xTOB if there is a matching TOB
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, char, isTOB,
+ setIsTOB )
+
+ /// Extracted from data words, stored for convenience
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint16_t, tobEt,
+ setTobEt )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint8_t, iEta,
+ setEta )
+ AUXSTORE_PRIMITIVE_SETTER_AND_GETTER( eFexEMRoI_v1, uint8_t, iPhi,
+ setPhi )
+
+
+ /// Methods to decode data from the TOB/RoI and return to the user
+
+ /// TOB or xTOB?
+ eFexEMRoI_v1::ObjectType eFexEMRoI_v1::type() const {
+ if (Word1() == 0) return TOB;
+ else return xTOB;
+ }
+
+ /// Hardware coordinate elements
+ unsigned int eFexEMRoI_v1::fpga() const {
+ return (Word0() >> s_fpgaBit) & s_fpgaMask;
+ }
+
+ unsigned int eFexEMRoI_v1::fpgaEta() const {
+ return (Word0() >> s_etaBit) & s_etaMask;
+ }
+
+ unsigned int eFexEMRoI_v1::fpgaPhi() const {
+ return (Word0() >> s_phiBit) & s_phiMask;
+ }
+
+ unsigned int eFexEMRoI_v1::UpNotDown() const {
+ return (Word0() >> s_updownBit) & s_updownMask;
+ }
+
+ unsigned int eFexEMRoI_v1::seed() const {
+ return (Word0() >> s_seedBit) & s_seedMask;
+ }
+
+ unsigned int eFexEMRoI_v1::seedMax() const {
+ return (Word0() >> s_maxBit) & s_maxMask;
+ }
+
+ /// Raw ET on TOB scale (100 MeV/count)
+ unsigned int eFexEMRoI_v1::etTOB() const {
+ // Data content = TOB
+ if (Word1() == 0) {
+ return (Word0() >> s_etBit) & s_etMask;
+ }
+ // Data Content = xTOB. Need to remove lower bits and cap range
+ else {
+ unsigned int etWord = (etXTOB() >> s_etBitXTOB);
+ if (etWord > s_etMask) etWord = s_etMask;
+ return etWord;
+ }
+ }
+
+ /// Full precision ET (25 MeV/count, only available if object is an xTOB
+ unsigned int eFexEMRoI_v1::etXTOB() const {
+ /// If the object is not an xTOB return 0 as high-precision ET unavailable
+ if (Word1() == 0) {
+ //return etTOB()*s_tobEtScale/s_xTobEtScale;
+ return 0;
+ }
+ else {
+ return (Word1() >> s_etBit) & s_etFullMask;
+ }
+ }
+
+ /// Results of the 3 jet discriminant algorithms
+ unsigned int eFexEMRoI_v1::RetaThresholds() const {
+ return (Word0() >> s_veto1Bit) & s_veto1Mask;
+ }
+
+ unsigned int eFexEMRoI_v1::RhadThresholds() const {
+ return (Word0() >> s_veto2Bit) & s_veto2Mask;
+ }
+
+ unsigned int eFexEMRoI_v1::WstotThresholds() const {
+ return (Word0() >> s_veto3Bit) & s_veto3Mask;
+ }
+
+ unsigned int eFexEMRoI_v1::bcn4() const {
+ return (Word1() >> s_bcn4Bit) & s_bcn4Mask;
+ }
+
+ /// Return single 32-bit TOB word from an xTOB
+ uint32_t eFexEMRoI_v1::tobWord() const {
+ // Do something sensible if called for a TOB
+ if (Word1() == 0) return Word0();
+ // When called for xTOB
+ else {
+ uint32_t word = Word0() + etTOB();
+ return word;
+ }
+ }
+
+ /// Methods that require combining results or applying scales
+ /// ET on TOB scale
+ float eFexEMRoI_v1::et() const {
+ return tobEt()*s_tobEtScale;
+ }
+
+ /// Floating point coordinates
+ float eFexEMRoI_v1::eta() const {
+ return (s_minEta + iEta()*s_towerEtaWidth + (seed()+0.5)*s_towerEtaWidth/4);
+ }
+
+ float eFexEMRoI_v1::phi() const {
+ float value = iPhi() * M_PI/32. + M_PI/64.;
+ if (value > M_PI) value = value - 2.*M_PI;
+ return value;
+ }
+
+ /// Jet discriminant values.
+ /// Note that these are for convenience & intelligibility, but these should
+ /// not be used for bitwise-accurate menu studies
+ float eFexEMRoI_v1::Reta() const {
+ float sum = RetaCore() + RetaEnv();
+ if (sum > 0) return (1. - RetaCore()/sum);
+ else return -1.;
+ }
+
+ float eFexEMRoI_v1::Rhad() const {
+ float sum = RhadEM() + RhadHad();
+ if (sum > 0) return (RhadHad()/sum);
+ else return -1.;
+ }
+
+ float eFexEMRoI_v1::Wstot() const {
+ if (WstotDenominator() > 0) return (WstotNumerator()/WstotDenominator());
+ else return -1.;
+ }
+
+ /// Methods that decode the eFEX number
+
+ /// Return phi index in the range 0-63
+ int eFexEMRoI_v1::phiIndex() const {
+
+ /// Get the eFEX index in phi (1-8, unfortunately)
+ unsigned int eFEX = (eFexNumber() >> s_eFexPhiBit) & s_eFexPhiMask;
+
+ /// Find global phi index (0-63) for this window in this eFEX (the -1 is to correct for the eFEX phi index)
+ unsigned int index = s_eFexPhiWidth*eFEX + s_eFexPhiOffset + fpgaPhi() -1;
+ if (index >= s_numPhi) index -= s_numPhi;
+ return index;
+ }
+
+ /// Return an eta index in the range 0-49
+ /// Note that this may not be the final format!
+ /// And you need to combine with the seed() value to get full eta precision
+ int eFexEMRoI_v1::etaIndex() const {
+
+ /// Get the eFEX number
+ uint8_t eFEX = (eFexNumber() >> s_eFexEtaBit) & s_eFexEtaMask;
+
+ /// FPGA min eta
+ uint8_t index = 99; /// Define a default value in case of invalid eFEX number
+
+ switch (eFEX) {
+ case eFexC: index = s_EtaCOffset + fpga()*s_fpgaEtaWidth + (fpga() > 0 ? 1 : 0);
+ break;
+ case eFexB: index = s_EtaBOffset + fpga()*s_fpgaEtaWidth;
+ break;
+ case eFexA: index = s_EtaAOffset + fpga()*s_fpgaEtaWidth;
+ break;
+ }
+
+ /// Add eta location within the FPGA & return value
+ return index + fpgaEta();
+
+ }
+
+
+
+} // namespace xAOD
diff --git a/Event/xAOD/xAODTrigger/Root/xAODTriggerCLIDs.cxx b/Event/xAOD/xAODTrigger/Root/xAODTriggerCLIDs.cxx
index be4bf891b6c2b14cdd4b01887915abaa9dda0ebf..3f117e029d7ea05eba44a1520d5c3d956a67239f 100644
--- a/Event/xAOD/xAODTrigger/Root/xAODTriggerCLIDs.cxx
+++ b/Event/xAOD/xAODTrigger/Root/xAODTriggerCLIDs.cxx
@@ -30,4 +30,5 @@
#include "xAODTrigger/TrigPassBitsAuxContainer.h"
#include "xAODTrigger/RoiDescriptorStore.h"
#include "xAODTrigger/RoiDescriptorStoreAuxInfo.h"
-
+#include "xAODTrigger/eFexEMRoIContainer.h"
+#include "xAODTrigger/eFexEMRoIAuxContainer.h"
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoI.h b/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoI.h
new file mode 100644
index 0000000000000000000000000000000000000000..f9fcde58656a38eee88cf0b45143427ad58d4276
--- /dev/null
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoI.h
@@ -0,0 +1,22 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: eFexEMRoI.h Alan Watson $
+#ifndef XAODEFEXEMROI_H
+#define XAODEFEXEMROI_H
+
+// Local include(s):
+#include "xAODTrigger/versions/eFexEMRoI_v1.h"
+
+// Namespace holding all the xAOD EDM classes
+namespace xAOD{
+ /// Define the latest version of the eFexEMRoI class
+ typedef eFexEMRoI_v1 eFexEMRoI;
+}
+
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::eFexEMRoI , 58699861 , 1 )
+#endif
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoIAuxContainer.h b/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoIAuxContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..22eac298f5ebb8d6b9f3ece981bfdeca1b1f6856
--- /dev/null
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoIAuxContainer.h
@@ -0,0 +1,22 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: eFexEMRoIAuxContainer.h 2019-07-01 13:04:25Z watsona $
+#ifndef XAODTRIGGER_EFEXEMROIAUXCONTAINER_H
+#define XAODTRIGGER_EFEXEMROIAUXCONTAINER_H
+
+// Local include(s):
+#include "xAODTrigger/versions/eFexEMRoIAuxContainer_v1.h"
+
+namespace xAOD{
+ typedef eFexEMRoIAuxContainer_v1 eFexEMRoIAuxContainer;
+}
+
+// Set up a CLID for the class:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::eFexEMRoIAuxContainer , 1081052998 , 1 )
+
+#endif // XAODTRIGGER_EFEXEMROIAUXCONTAINER_H
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoIContainer.h b/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoIContainer.h
new file mode 100644
index 0000000000000000000000000000000000000000..84122339729c84b037d8c2357d630091583a4073
--- /dev/null
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/eFexEMRoIContainer.h
@@ -0,0 +1,23 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: eFexEMRoIContainer.h 2019-07-01 13:04:25Z watsona $
+#ifndef XAODTRIGGER_EFEXEMROICONTAINER_H
+#define XAODTRIGGER_EFEXEMROICONTAINER_H
+
+// Local include(s):
+#include "xAODTrigger/eFexEMRoI.h"
+#include "xAODTrigger/versions/eFexEMRoIContainer_v1.h"
+
+namespace xAOD{
+ typedef eFexEMRoIContainer_v1 eFexEMRoIContainer;
+}
+
+// Set up a CLID for the container:
+#include "xAODCore/CLASS_DEF.h"
+CLASS_DEF( xAOD::eFexEMRoIContainer , 1176191655 , 1 )
+
+#endif // XAODTRIGGER_EMTAUROICONTAINER_H
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/selection.xml b/Event/xAOD/xAODTrigger/xAODTrigger/selection.xml
index 7eaee8ee54b8c2c393abbb211d823106caadb819..f6cf1bdca61d07afc21d662f56479ab367fc972f 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/selection.xml
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/selection.xml
@@ -114,6 +114,19 @@
targetClass="DataLink<xAOD::EnergySumRoI_v2>"
source="" target="" />
+ <!-- Phase I L1Calo RoI dictionaries: -->
+ <!-- RoI interface types -->
+ <class name="xAOD::eFexEMRoI_v1" />
+ <class name="xAOD::eFexEMRoIContainer_v1"
+ id="89FFBED7-9DDF-4FC4-B099-2B4F827BD098" />
+ <typedef name="xAOD::eFexEMRoI" />
+ <typedef name="xAOD::eFexEMRoIContainer" />
+
+ <!-- RoI auxilliary types -->
+ <class name="xAOD::eFexEMRoIAuxContainer_v1"
+ id="6A1D7149-7476-4F23-8896-D88CB3BF6846" />
+ <typedef name="xAOD::eFexEMRoIAuxContainer" />
+
<!-- xAOD::TriggerMenu interface type(s). -->
<class name="xAOD::TriggerMenu_v1" />
<class name="xAOD::TriggerMenuContainer_v1"
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoIAuxContainer_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoIAuxContainer_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..bf6af04d71b5111a7adb1c13568c84462f4c5c3f
--- /dev/null
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoIAuxContainer_v1.h
@@ -0,0 +1,63 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: eFexEMRoIAuxContainer_v1.h 631149 2014-11-26 12:26:18Z krasznaa $
+#ifndef XAODTRIGGER_VERSIONS_EFEXEMROIAUXCONTAINER_V1_H
+#define XAODTRIGGER_VERSIONS_EFEXEMROIAUXCONTAINER_V1_H
+
+// System include(s):
+extern "C" {
+# include <stdint.h>
+}
+#include <vector>
+#include <string>
+
+// EDM include(s):
+#include "xAODCore/AuxContainerBase.h"
+
+namespace xAOD {
+
+ /// Auxiliary store for the LVL1 eFEX EM TOB/RoI container
+ ///
+ /// This auxiliary container can describe the properties of a container
+ /// of LVL1 EM RoIs.
+ ///
+ /// @author Alan Watson <Alan.Watson@cern.ch>
+ ///
+ /// $Revision: 1 $
+ /// $Date: 2019-07-01 13:04:25 +0100 (Mon, 01 Jul 2019) $
+ ///
+ class eFexEMRoIAuxContainer_v1 : public AuxContainerBase {
+
+ public:
+ /// Default constuctor
+ eFexEMRoIAuxContainer_v1();
+
+ private:
+ std::vector< uint32_t > word0;
+ std::vector< uint32_t > word1;
+ std::vector< uint8_t > eFexNumber;
+ std::vector< uint16_t > retaEnv;
+ std::vector< uint16_t > retaCore;
+ std::vector< uint16_t > rhadHad;
+ std::vector< uint16_t > rhadEM;
+ std::vector< uint16_t > wstotNumerator;
+ std::vector< uint16_t > wstotDenominator;
+ std::vector< uint16_t > et;
+ std::vector< uint8_t > eta;
+ std::vector< uint8_t > phi;
+ std::vector< char > isTOB;
+ std::vector< uint32_t > thrPattern;
+
+ }; // class eFexEMRoIAuxContainer_v1
+
+} // namespace xAOD
+
+// Declare the inheritance of the container:
+#include "xAODCore/BaseInfo.h"
+SG_BASE( xAOD::eFexEMRoIAuxContainer_v1, xAOD::AuxContainerBase );
+
+#endif // XAODTRIGGER_VERSIONS_eFexEMRoIAuxContainer_V1_H
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoIContainer_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoIContainer_v1.h
new file mode 100644
index 0000000000000000000000000000000000000000..612e3bcedd3d5c154a5312a063f51ed0a6f179ac
--- /dev/null
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoIContainer_v1.h
@@ -0,0 +1,22 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: eFexEMRoIContainer_v1.cxx 2019-07-01 13:04:25Z watsona $
+#ifndef XAODTRIGGER_VERSIONS_EFEXEMROICONTAINER_V1_H
+#define XAODTRIGGER_VERSIONS_EFEXEMROICONTAINER_V1_H
+
+// Core include(s):
+#include "AthContainers/DataVector.h"
+
+// Local include(s):
+#include "xAODTrigger/versions/eFexEMRoI_v1.h"
+
+namespace xAOD {
+ /// Declare the em/tau RoI container type
+ typedef DataVector< xAOD::eFexEMRoI_v1 > eFexEMRoIContainer_v1;
+}
+
+#endif // XAODTRIGGER_VERSIONS_EFEXEMROICONTAINER_V1_H
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoI_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoI_v1.h
new file mode 100755
index 0000000000000000000000000000000000000000..d947a73bee248f86795b99b81d2076b6186650ab
--- /dev/null
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/eFexEMRoI_v1.h
@@ -0,0 +1,219 @@
+// Dear emacs, this is -*- c++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// $Id: eFexEMRoI_v1.h 1 2019-06-30 12:15:18 watsona $
+#ifndef XAODTRIGGER_VERSIONS_EFEXEMROI_V1_H
+#define XAODTRIGGER_VERSIONS_EFEXEMROI_V1_H
+
+// System include(s):
+extern "C" {
+# include <stdint.h>
+}
+#include <vector>
+#include <string>
+
+// xAOD include(s):
+#include "AthContainers/AuxElement.h"
+
+namespace xAOD {
+
+ /// Class describing a LVL1 eFEX EM region of interest
+ ///
+ /// This class describes the properties of an EM Trigger Object (TOB)
+ /// or Region of Interest (RoI) in the xAOD format.
+ ///
+ /// @author Alan Watson <Alan.Watson@cern.ch>
+ ///
+ /// $Revision: 1 $
+ /// $Date: 2019-06-30 12:15:18 +0100 (Sun, 30 Jun 2019) $
+ ///
+ class eFexEMRoI_v1 : public SG::AuxElement {
+
+ public:
+ /// Default constructor
+ eFexEMRoI_v1();
+
+ /// Initialise the object with its most important properties
+ void initialize( uint8_t eFexNumber, uint32_t Word0, uint32_t Word1 = 0 );
+
+ /// Object types
+ enum ObjectType {
+ xTOB = 0, ///< This object is an xTOB (2*32 bit words)
+ TOB = 1 ///< This object is a TOB (1*32 bit word)
+ };
+
+ /// The "raw" 32-bit words describing the e/gamma candidate
+ uint32_t Word0() const;
+ uint32_t Word1() const;
+ /// Set the "raw" 32-bit words describing the e/gamma candidate
+ void setWord0( uint32_t value );
+ void setWord1( uint32_t value );
+
+ /// The eFEX number
+ uint8_t eFexNumber() const;
+ /// Set the eFEX number
+ void seteFexNumber( uint8_t value );
+
+ /// TOB ET (decoded from TOB, stored for convenience)
+ uint16_t tobEt() const; /// getter for integer ET on TOB scale (100 MeV/count)
+ void setTobEt( uint16_t value); /// setter for the above
+ float et() const; /// floating point value (MeV, TOB scale)
+
+
+ /// Eta Coordinates (decoded from TOB, stored for convenience)
+ uint8_t iEta() const; /// getter for integer eta index (0-49)
+ void setEta( uint8_t value); /// setter for the above
+ unsigned int seed() const; /// Seed supercell index within central tower (0 -> 3)
+ float eta() const; /// Floating point, full precision (0.025)
+
+ /// Phi coordinates
+ uint8_t iPhi() const; /// Getter for integer phi index (0-63)
+ void setPhi( uint8_t value); /// Setter for the above
+ float phi() const; /// Floating point, ATLAS phi convention (-pi -> pi)
+
+
+ /// Jet Discriminants
+ /// Derived floating point values (not used in actual algorithm)
+ float Reta() const;
+ float Rhad() const;
+ float Wstot() const;
+
+ /// Actual values used in algorithm (setters and getters)
+ uint16_t RetaCore() const;
+ uint16_t RetaEnv() const;
+ uint16_t RhadEM() const;
+ uint16_t RhadHad() const;
+ uint16_t WstotNumerator() const;
+ uint16_t WstotDenominator() const;
+ void setRetaCore( uint16_t value);
+ void setRetaEnv( uint16_t value);
+ void setRhadEM( uint16_t value);
+ void setRhadHad( uint16_t value);
+ void setWstotNumerator( uint16_t value);
+ void setWstotDenominator( uint16_t value);
+
+ /// Is this one a TOB (or xTOB partner of a TOB)?
+ char isTOB() const;
+ void setIsTOB( char value);
+
+ /// Pattern of thresholds passed
+ uint32_t thrPattern() const;
+ void setThrPattern( uint32_t value);
+
+ /// Return TOB word corresponding to this TOB or xTOB
+ uint32_t tobWord() const;
+
+
+ /// Data decoded from the TOB/RoI word and eFEX number
+
+ /// Object type (TOB or xTOB)
+ ObjectType type() const;
+
+
+ /// FPGA number
+ unsigned int fpga() const;
+
+ /// eta index within FPGA
+ unsigned int fpgaEta() const;
+
+ /// phi index within FPGA
+ unsigned int fpgaPhi() const;
+
+ /// Cluster up/down flag (1 = up, 0 = down)
+ unsigned int UpNotDown() const;
+
+ /// Cluster ET (TOB ET scale, 100 MeV/count)
+ unsigned int etTOB() const;
+
+ /// Cluster ET (xTOB ET scale, 25 MeV/count)
+ unsigned int etXTOB() const;
+
+ /// Jet Discriminant 1 (R_eta) results
+ unsigned int RetaThresholds() const;
+
+ /// Jet Discriminant 2 (R_had) results
+ unsigned int RhadThresholds() const;
+
+ /// Jet Discriminant 3 (W_stot) results
+ unsigned int WstotThresholds() const;
+
+ /// Seed = max flag. Is this really useful?
+ unsigned int seedMax() const;
+
+ //? Bunch crossing number (last 4 bits, xTOB only)
+ unsigned int bcn4() const;
+
+ private:
+
+ /// Constants used in converting to ATLAS units
+ static const float s_tobEtScale;
+ static const float s_xTobEtScale;
+ static const float s_towerEtaWidth;
+ static const float s_minEta;
+
+
+ /** Constants used in decoding TOB words
+ For TOB word format changes these can be replaced
+ by arrays in the _v2 object so that different
+ versions can be decoded by one class */
+
+ // Data locations within word
+ static const int s_fpgaBit = 30;
+ static const int s_etaBit = 27;
+ static const int s_phiBit = 24;
+ static const int s_veto3Bit = 22;
+ static const int s_veto2Bit = 20;
+ static const int s_veto1Bit = 18;
+ static const int s_seedBit = 16;
+ static const int s_updownBit = 15;
+ static const int s_maxBit = 14;
+ static const int s_etBit = 0;
+ static const int s_etBitXTOB = 3;
+ static const int s_bcn4Bit = 28;
+
+ // Data masks
+ static const int s_fpgaMask = 0x3;
+ static const int s_etaMask = 0x7;
+ static const int s_phiMask = 0x7;
+ static const int s_veto1Mask = 0x3;
+ static const int s_veto2Mask = 0x3;
+ static const int s_veto3Mask = 0x3;
+ static const int s_seedMask = 0x3;
+ static const int s_updownMask = 0x1;
+ static const int s_maxMask = 0x1;
+ static const int s_etMask = 0xfff;
+ static const int s_etFullMask = 0xffff;
+ static const int s_bcn4Mask = 0xf;
+ // For decoding coordinates
+ //
+ static const int s_numPhi = 64;
+ static const int s_eFexPhiMask = 0xf;
+ static const int s_eFexPhiBit = 0;
+ static const int s_eFexPhiWidth = 8;
+ static const int s_eFexPhiOffset = 2;
+ static const int s_eFexEtaMask = 0xf;
+ static const int s_eFexEtaBit = 4;
+ static const int s_fpgaEtaWidth = 4;
+ static const int s_EtaCOffset = 0;
+ static const int s_EtaBOffset = 17;
+ static const int s_EtaAOffset = 33;
+
+ /// eFEX numbering (eta, 3 locations)
+ enum eFEXTypes {eFexC = 0xc, eFexB = 0xb, eFexA = 0xa};
+
+ /// Compute eta & phi indices from TOB word
+ int etaIndex() const;
+ int phiIndex() const;
+
+ }; // class eFexEMRoI_v1
+
+} // namespace xAOD
+
+// Declare the inheritance of the type:
+#include "xAODCore/BaseInfo.h"
+SG_BASE( xAOD::eFexEMRoI_v1, SG::AuxElement );
+
+#endif // XAODTRIGGER_VERSIONS_EFEXEMROI_V1_H
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/xAODTriggerDict.h b/Event/xAOD/xAODTrigger/xAODTrigger/xAODTriggerDict.h
index 7beb29624bfeb18c89e1c019a35edf74c67b2747..05c57c3beedc2724f3acba9ee09bf2575aef294e 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/xAODTriggerDict.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/xAODTriggerDict.h
@@ -61,6 +61,13 @@
#include "xAODTrigger/versions/EnergySumRoI_v2.h"
#include "xAODTrigger/versions/EnergySumRoIAuxInfo_v2.h"
+#include "xAODTrigger/eFexEMRoI.h"
+#include "xAODTrigger/eFexEMRoIContainer.h"
+#include "xAODTrigger/eFexEMRoIAuxContainer.h"
+#include "xAODTrigger/versions/eFexEMRoI_v1.h"
+#include "xAODTrigger/versions/eFexEMRoIContainer_v1.h"
+#include "xAODTrigger/versions/eFexEMRoIAuxContainer_v1.h"
+
#include "xAODTrigger/TrigDecision.h"
#include "xAODTrigger/TrigDecisionAuxInfo.h"
#include "xAODTrigger/versions/TrigDecision_v1.h"
@@ -121,6 +128,8 @@ namespace {
XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, EmTauRoIContainer_v1 );
XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, EmTauRoIContainer_v2 );
+ XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, eFexEMRoIContainer_v1 );
+
XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, TrigCompositeContainer_v1 );
XAOD_INSTANTIATE_NS_CONTAINER_TYPES( xAOD, TrigPassBitsContainer_v1 );
diff --git a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
index 6dc5bfbac1f21b90276be590e316827a883fc182..0f63e9c71a9c0e01d936f9af8430efab84100869 100644
--- a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
@@ -36,12 +36,15 @@ if( XAOD_STANDALONE )
# The test(s) need(s) ROOT:
find_package( ROOT COMPONENTS Core Tree RIO )
- # Test(s) in standalone mode:
- atlas_add_test( ut_xaodtriggercnv_triggermenumetadatatool_test
- SOURCES test/ut_xaodtriggercnv_triggermenumetadatatool_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODRootAccess xAODTrigger
- xAODTriggerCnv )
+ # FIX ME: temporarily disabled as part of the migration of AnalysisBase
+ # to master
+
+ # # Test(s) in standalone mode:
+ # atlas_add_test( ut_xaodtriggercnv_triggermenumetadatatool_test
+ # SOURCES test/ut_xaodtriggercnv_triggermenumetadatatool_test.cxx
+ # INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ # LINK_LIBRARIES ${ROOT_LIBRARIES} xAODRootAccess xAODTrigger
+ # xAODTriggerCnv )
elseif( XAOD_ANALYSIS )
diff --git a/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvAlg.cxx b/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvAlg.cxx
index 1209fdb8aebef753d5ee9710c6056e763ee34be5..6872925ae04befd3ba8002d89d1f737ace9dbcca 100644
--- a/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvAlg.cxx
+++ b/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: TrigDecisionCnvAlg.cxx 688265 2015-08-08 16:31:45Z stelzer $
@@ -7,14 +7,6 @@
// Gaudi/Athena include(s):
#include "AthenaKernel/errorcheck.h"
-// EDM include(s):
-#include "TrigDecisionEvent/TrigDecision.h"
-#include "xAODTrigger/TrigDecision.h"
-#include "xAODTrigger/TrigDecisionAuxInfo.h"
-
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/TriggerInfo.h"
-
// Local include(s):
#include "TrigDecisionCnvAlg.h"
@@ -22,15 +14,16 @@ namespace xAODMaker {
TrigDecisionCnvAlg::TrigDecisionCnvAlg( const std::string& name,
ISvcLocator* svcLoc )
- : AthAlgorithm( name, svcLoc ),
+ : AthReentrantAlgorithm( name, svcLoc ),
m_cnvTool( "xAODMaker::TrigDecisionCnvTool/TrigDecisionCnvTool",
this ) {
+ }
- declareProperty( "AODKey", m_aodKey = "TrigDecision" );
- declareProperty( "xAODKey", m_xaodKey = "TrigDecision" );
- declareProperty( "CnvTool", m_cnvTool );
+
+ TrigDecisionCnvAlg::~TrigDecisionCnvAlg() {
}
+
StatusCode TrigDecisionCnvAlg::initialize() {
// Greet the user:
@@ -38,6 +31,10 @@ namespace xAODMaker {
ATH_MSG_DEBUG( " AOD Key: " << m_aodKey );
ATH_MSG_DEBUG( "xAOD Key: " << m_xaodKey );
+ CHECK( m_eventInfoKey.initialize() );
+ CHECK( m_aodKey.initialize() );
+ CHECK( m_xaodKey.initialize() );
+
// Retrieve the converter tool:
CHECK( m_cnvTool.retrieve() );
@@ -45,28 +42,28 @@ namespace xAODMaker {
return StatusCode::SUCCESS;
}
- StatusCode TrigDecisionCnvAlg::execute() {
+ StatusCode TrigDecisionCnvAlg::execute(const EventContext& ctx) const {
// Retrieve the AOD object:
- const TrigDec::TrigDecision* aod = 0;
- CHECK( evtStore()->retrieve( aod, m_aodKey ) );
+ SG::ReadHandle<TrigDec::TrigDecision> aodRH{m_aodKey, ctx};
+ CHECK( aodRH.isValid() );
+ const TrigDec::TrigDecision* aod = aodRH.cptr();
// trigger Info
- const EventInfo * evtInfo ( nullptr );
- CHECK( evtStore()->retrieve( evtInfo ) );
- const TriggerInfo * trigInfo = evtInfo ? evtInfo->trigger_info() : nullptr ;
+ SG::ReadHandle<EventInfo> eiRH{m_eventInfoKey, ctx};
+ const TriggerInfo* trigInfo = eiRH.isValid() ? eiRH.cptr()->trigger_info() : nullptr;
// Create the xAOD object and its auxiliary store:
- xAOD::TrigDecisionAuxInfo* aux = new xAOD::TrigDecisionAuxInfo();
- xAOD::TrigDecision* xaod = new xAOD::TrigDecision();
- xaod->setStore( aux );
+ std::unique_ptr<xAOD::TrigDecisionAuxInfo> aux = std::make_unique<xAOD::TrigDecisionAuxInfo>();
+ std::unique_ptr<xAOD::TrigDecision> xaod = std::make_unique<xAOD::TrigDecision>();
+ xaod->setStore( aux.get() );
// Fill the xAOD object:
- CHECK( m_cnvTool->convert( aod, xaod, trigInfo ) );
+ CHECK( m_cnvTool->convert( aod, xaod.get(), trigInfo ) );
// Record the xAOD objects:
- CHECK( evtStore()->record( aux, m_xaodKey + "Aux." ) );
- CHECK( evtStore()->record( xaod, m_xaodKey ) );
+ SG::WriteHandle<xAOD::TrigDecision> writeHandle{m_xaodKey, ctx};
+ CHECK( writeHandle.record(std::move(xaod), std::move(aux)));
// Return gracefully:
return StatusCode::SUCCESS;
diff --git a/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvAlg.h b/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvAlg.h
index 84ef9e2c9149792678744d547fae3b676f67b441..c2e44d67d46ccc53861bf859944e9b5f3518673e 100644
--- a/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvAlg.h
+++ b/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvAlg.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: TrigDecisionCnvAlg.h 578517 2014-01-15 13:48:04Z krasznaa $
@@ -12,9 +12,17 @@
#include <string>
// Gaudi/Athena include(s):
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
+// EDM include(s):
+#include "TrigDecisionEvent/TrigDecision.h"
+#include "xAODTrigger/TrigDecision.h"
+#include "xAODTrigger/TrigDecisionAuxInfo.h"
+
+#include "EventInfo/EventInfo.h"
+#include "EventInfo/TriggerInfo.h"
+
// Local include(s):
#include "xAODTriggerCnv/ITrigDecisionCnvTool.h"
@@ -31,25 +39,25 @@ namespace xAODMaker {
* $Revision: 578517 $
* $Date: 2014-01-15 14:48:04 +0100 (Wed, 15 Jan 2014) $
*/
- class TrigDecisionCnvAlg : public AthAlgorithm {
+ class TrigDecisionCnvAlg : public AthReentrantAlgorithm {
public:
/// Regular Algorithm constructor
TrigDecisionCnvAlg( const std::string& name, ISvcLocator* svcLoc );
+ virtual ~TrigDecisionCnvAlg();
/// Function initialising the algorithm
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
/// Function executing the algorithm
- virtual StatusCode execute();
+ virtual StatusCode execute(const EventContext& ctx) const override;
private:
- /// StoreGate key of the input object
- std::string m_aodKey;
- /// StoreGate key for the output object
- std::string m_xaodKey;
- /// Handle to the converter tool
- ToolHandle< ITrigDecisionCnvTool > m_cnvTool;
+ SG::ReadHandleKey<EventInfo> m_eventInfoKey{this, "EventInfoKey", "EventInfo", "StoreGate key of the legacy event info object"};
+ SG::ReadHandleKey<TrigDec::TrigDecision> m_aodKey{this, "AODKey", "TrigDecision", "StoreGate key of the input object"};
+ SG::WriteHandleKey<xAOD::TrigDecision> m_xaodKey{this, "xAODKey", "xTrigDecision", "StoreGate key for the output object"};
+
+ ToolHandle< ITrigDecisionCnvTool > m_cnvTool{this, "CnvTool", "xAODMaker::TrigDecisionCnvTool/TrigDecisionCnvTool", "Handle to the converter tool"};
}; // class TrigDecisionCnvAlg
diff --git a/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.cxx b/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.cxx
index 499f4417e7be20be0ce09921915143944c3fda55..e9d71cc8f70b3930980c0146fdeb763fd899ed52 100644
--- a/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.cxx
+++ b/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: TrigDecisionCnvTool.cxx 688265 2015-08-08 16:31:45Z stelzer $
@@ -81,6 +81,11 @@ namespace xAODMaker {
declareProperty ("TrigDecisionTool", m_tdt);
}
+
+ TrigDecisionCnvTool::~TrigDecisionCnvTool() {
+ }
+
+
StatusCode TrigDecisionCnvTool::initialize() {
// Greet the user:
@@ -105,7 +110,7 @@ namespace xAODMaker {
* something else if not
*/
StatusCode TrigDecisionCnvTool::convert( const TrigDec::TrigDecision* aod,
- xAOD::TrigDecision* xaod, const TriggerInfo * triggerInfo) {
+ xAOD::TrigDecision* xaod, const TriggerInfo * triggerInfo) const {
ATH_MSG_DEBUG( "converting TrigDecision to xAOD::TrigDecision" );
diff --git a/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.h b/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.h
index 6002efe5764a32b1a386e034f8d34da1f1037791..33fc7ffbed71b1cf74af4c3d1fae898b9492654d 100644
--- a/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.h
+++ b/Event/xAOD/xAODTriggerCnv/src/TrigDecisionCnvTool.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: TrigDecisionCnvTool.h 688265 2015-08-08 16:31:45Z stelzer $
@@ -48,13 +48,15 @@ namespace xAODMaker {
TrigDecisionCnvTool( const std::string& type, const std::string& name,
const IInterface* parent );
+ virtual ~TrigDecisionCnvTool();
+
/// Function initialising the tool
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
/// Function filling an xAOD::TrigDecision object with information
virtual StatusCode convert( const TrigDec::TrigDecision* aod,
xAOD::TrigDecision* xaod,
- const TriggerInfo* level1TriggerInfo );
+ const TriggerInfo* level1TriggerInfo ) const final;
private:
/// Function setting the status of one bit in a bitset
diff --git a/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvAlg.cxx b/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvAlg.cxx
index 2d024e2a691ebb3fed749c05840a3fbac4661785..29355c681013e85fb706b73936e9759f6b4c2ce0 100644
--- a/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvAlg.cxx
+++ b/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: $
@@ -7,11 +7,6 @@
// Gaudi/Athena include(s):
#include "AthenaKernel/errorcheck.h"
-// EDM include(s):
-#include "TrigSteeringEvent/HLTResult.h"
-#include "xAODTrigger/TrigNavigation.h"
-#include "xAODTrigger/TrigNavigationAuxInfo.h"
-
// Local include(s):
#include "TrigNavigationCnvAlg.h"
@@ -21,40 +16,43 @@ using namespace xAODMaker;
TrigNavigationCnvAlg::TrigNavigationCnvAlg( const std::string& name,
ISvcLocator* svcLoc )
- : AthAlgorithm( name, svcLoc ),
+ : AthReentrantAlgorithm( name, svcLoc ),
m_cnvTool( "xAODMaker::TrigNavigationCnvTool/TrigNavigationCnvTool",
this ) {
-
- declareProperty( "AODKeys", m_aodKeys = {"HLTResult_HLT", "HLTResult_EF", "HLTResult_L2"}, "Copy content from this HLT results in order, stop wiht the first present" );
- declareProperty( "xAODKey", m_xaodKey = "TrigNavigation" );
- declareProperty( "CnvTool", m_cnvTool );
}
StatusCode TrigNavigationCnvAlg::initialize() {
- ATH_MSG_DEBUG( " AOD Key: " << m_aodKeys );
+ ATH_MSG_DEBUG( " AOD Key L2: " << m_aodKeyL2 << " doL2:" << m_doL2 );
+ ATH_MSG_DEBUG( " AOD Key EF: " << m_aodKeyEF << " doEF:" << m_doEF );
+ ATH_MSG_DEBUG( " AOD Key HLT: " << m_aodKeyHLT << " doHLT:" << m_doHLT );
ATH_MSG_DEBUG( "xAOD Key: " << m_xaodKey );
CHECK( m_cnvTool.retrieve() );
- return StatusCode::SUCCESS;
-}
-StatusCode TrigNavigationCnvAlg::execute() {
-
- for ( auto key: m_aodKeys ) {
- if ( evtStore()->contains(ClassID_traits<HLT::HLTResult>::ID(), key) ) {
- ATH_MSG_DEBUG("Using the HLTResult#" << key << " other keys: " << m_aodKeys << " absent or skipped " );
- const HLT::HLTResult* aod;
- CHECK( evtStore()->retrieve( aod, key ) );
- xAOD::TrigNavigationAuxInfo* aux = new xAOD::TrigNavigationAuxInfo();
- xAOD::TrigNavigation* xaod = new xAOD::TrigNavigation();
- xaod->setStore(aux);
- CHECK( m_cnvTool->convert( aod, xaod ) );
- CHECK( evtStore()->record( aux, m_xaodKey + "Aux." ) );
- CHECK( evtStore()->record( xaod, m_xaodKey ) );
- break;
- }
+ if ((size_t)m_doL2 + (size_t)m_doEF + (size_t)m_doHLT > 1) {
+ ATH_MSG_ERROR("Cannot convert more than one level. Asked for doL2:" << m_doL2 << " doEF:" << m_doEF << " doHLT:" << m_doHLT);
+ return StatusCode::FAILURE;
}
+
+ CHECK( m_aodKeyL2.initialize(m_doL2) );
+ CHECK( m_aodKeyEF.initialize(m_doEF) );
+ CHECK( m_aodKeyHLT.initialize(m_doHLT) );
+ CHECK( m_xaodKey.initialize() );
return StatusCode::SUCCESS;
}
+StatusCode TrigNavigationCnvAlg::execute(const EventContext& ctx) const {
+ const SG::ReadHandleKey<HLT::HLTResult>& key = (m_doL2 ? m_aodKeyL2 : (m_doEF ? m_aodKeyEF : m_aodKeyHLT));
+ SG::ReadHandle<HLT::HLTResult> hltRH{key, ctx};
+ CHECK( hltRH.isValid() );
+ const HLT::HLTResult* aod = hltRH.cptr();
+ std::unique_ptr<xAOD::TrigNavigationAuxInfo> aux = std::make_unique<xAOD::TrigNavigationAuxInfo>();
+ std::unique_ptr<xAOD::TrigNavigation> xaod = std::make_unique<xAOD::TrigNavigation>();
+ xaod->setStore(aux.get());
+ CHECK( m_cnvTool->convert( aod, xaod.get() ) );
+ SG::WriteHandle<xAOD::TrigNavigation> navWH{m_xaodKey, ctx};
+ CHECK( navWH.record( std::move(xaod), std::move(aux)) );
+ return StatusCode::SUCCESS;
+}
+
diff --git a/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvAlg.h b/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvAlg.h
index 0dda1358189bda752295d953352820f99ef35c64..a5bc367719f8d561a54e71c22e4c795b4ff43b01 100644
--- a/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvAlg.h
+++ b/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvAlg.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: $
@@ -12,9 +12,14 @@
#include <string>
// Gaudi/Athena include(s):
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
+// EDM include(s):
+#include "TrigSteeringEvent/HLTResult.h"
+#include "xAODTrigger/TrigNavigation.h"
+#include "xAODTrigger/TrigNavigationAuxInfo.h"
+
// Local include(s):
#include "xAODTriggerCnv/ITrigNavigationCnvTool.h"
@@ -31,25 +36,31 @@ namespace xAODMaker {
* $Revision: $
* $Date: $
*/
- class TrigNavigationCnvAlg : public AthAlgorithm {
+ class TrigNavigationCnvAlg : public AthReentrantAlgorithm {
public:
/// Regular Algorithm constructor
TrigNavigationCnvAlg( const std::string& name, ISvcLocator* svcLoc );
/// Function initialising the algorithm
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
/// Function executing the algorithm
- virtual StatusCode execute();
+ virtual StatusCode execute(const EventContext& ctx) const override;
private:
+
+ Gaudi::Property<bool> m_doL2{this, "doL2", true, "flag whether or not to consider L2 trigger information"};
+ Gaudi::Property<bool> m_doEF{this, "doEF", true, "flag whether or not to consider L3 (EF) trigger information"};
+ Gaudi::Property<bool> m_doHLT{this, "doHLT", true, "flag whether or not to consider merged L2EF=HLT trigger information"};
+
/// StoreGate key of the input object
- std::vector<std::string> m_aodKeys;
+ SG::ReadHandleKey<HLT::HLTResult> m_aodKeyL2{this, "AODKeyL2", "HLTResult_L2", "Input L2 HLTResult"};
+ SG::ReadHandleKey<HLT::HLTResult> m_aodKeyEF{this, "AODKeyEF", "HLTResult_EF", "Input EF HLTResult"};
+ SG::ReadHandleKey<HLT::HLTResult> m_aodKeyHLT{this, "AODKeyHLT", "HLTResult_HLT", "Input HLT (single level) HLTResult"};
/// StoreGate key for the output object
- std::string m_xaodKey;
+ SG::WriteHandleKey<xAOD::TrigNavigation> m_xaodKey{this, "xAODKey", "TrigNavigation", "Input HLT (single level) HLTResult"};
- /// Handle to the converter tool
- ToolHandle< ITrigNavigationCnvTool > m_cnvTool;
+ ToolHandle< ITrigNavigationCnvTool > m_cnvTool{this, "CnvTool", "xAODMaker::TrigNavigationCnvTool/TrigNavigationCnvTool", "Handle to the converter tool"};
}; // class TrigNavigationCnvAlg
diff --git a/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvTool.cxx b/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvTool.cxx
index 705d9fdeff29c2c08efc9a5489ffff6a6fdd1e9f..980cbf7a9c764bd66cf1f1e81aec63a6fc3a7131 100644
--- a/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvTool.cxx
+++ b/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigNavigationCnvTool.h"
@@ -8,12 +8,16 @@ xAODMaker::TrigNavigationCnvTool::TrigNavigationCnvTool( const std::string& type
: AthAlgTool(type, name, parent) {
declareInterface< ITrigNavigationCnvTool >( this );
}
+
+xAODMaker::TrigNavigationCnvTool::~TrigNavigationCnvTool() {
+}
+
StatusCode xAODMaker::TrigNavigationCnvTool::initialize() {
return StatusCode::SUCCESS;
}
StatusCode xAODMaker::TrigNavigationCnvTool::convert( const HLT::HLTResult* aod,
- xAOD::TrigNavigation* xaod ) {
+ xAOD::TrigNavigation* xaod ) const {
xaod->setSerialized(aod->getNavigationResult());
return StatusCode::SUCCESS;
}
diff --git a/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvTool.h b/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvTool.h
index 256eccfda15966e3f48a2f4b6a6e63e7a66615c9..4e7a6ece0a7c1ad1fb9574f6c4ba0c3db6dfbbf5 100644
--- a/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvTool.h
+++ b/Event/xAOD/xAODTriggerCnv/src/TrigNavigationCnvTool.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: $
@@ -46,13 +46,15 @@ namespace xAODMaker {
/// Regular AlgTool constructor
TrigNavigationCnvTool( const std::string& type, const std::string& name,
const IInterface* parent );
+
+ virtual ~TrigNavigationCnvTool();
/// Function initialising the tool
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
/// Function filling an xAOD::TrigNavigation object with information
virtual StatusCode convert( const HLT::HLTResult* aod,
- xAOD::TrigNavigation* xaod );
+ xAOD::TrigNavigation* xaod ) const final;
private:
diff --git a/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/ITrigDecisionCnvTool.h b/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/ITrigDecisionCnvTool.h
index f2b05140381f07f66aa8bea7d8e1f104de408cff..03f091f95b96a1c6ccb88951cabe38d9473c22b0 100644
--- a/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/ITrigDecisionCnvTool.h
+++ b/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/ITrigDecisionCnvTool.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: ITrigDecisionCnvTool.h 688265 2015-08-08 16:31:45Z stelzer $
@@ -45,7 +45,7 @@ namespace xAODMaker {
/// Function filling an xAOD::TrigDecision object with information
virtual StatusCode convert( const TrigDec::TrigDecision* aod,
xAOD::TrigDecision* xaod,
- const TriggerInfo* level1TriggerInfo ) = 0;
+ const TriggerInfo* level1TriggerInfo ) const = 0;
/// Gaudi interface definition
static const InterfaceID& interfaceID() {
diff --git a/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/ITrigNavigationCnvTool.h b/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/ITrigNavigationCnvTool.h
index 632d07e515c6225434f91c2f5a9186dc181cde4d..e07883737cb326394892ae80094b54e604f7171d 100644
--- a/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/ITrigNavigationCnvTool.h
+++ b/Event/xAOD/xAODTriggerCnv/xAODTriggerCnv/ITrigNavigationCnvTool.h
@@ -1,7 +1,7 @@
// Dear emacs, this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id: $
@@ -42,7 +42,7 @@ namespace xAODMaker {
public:
/// Function filling an xAOD::TrigNavigation object with information
virtual StatusCode convert( const HLT::HLTResult* aod,
- xAOD::TrigNavigation* xaod ) = 0;
+ xAOD::TrigNavigation* xaod ) const = 0;
/// Gaudi interface definition
static const InterfaceID& interfaceID() {
diff --git a/ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h b/ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h
index 766d84bf2696b3f350313321947032366a4a4ef0..f4e3584436b103af5a6b1ddbd871816b574f481f 100644
--- a/ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h
+++ b/ForwardDetectors/AFP/AFP_Digitization/AFP_Digitization/AFP_PileUpTool.h
@@ -10,7 +10,7 @@
#include "xAODEventInfo/EventAuxInfo.h" // NEW EDM
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
index 299c8768d1677dc215b4ac898e8c317ea265cd6b..4782ef71ade22bac03de99d8591a96e23b2d0a08 100644
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
+++ b/ForwardDetectors/ALFA/ALFA_BeamTransport/src/ALFA_BeamTransport.cxx
@@ -23,7 +23,7 @@
// FrameWork includes
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/ALFA_Digitization/ALFA_PileUpTool.h b/ForwardDetectors/ALFA/ALFA_Digitization/ALFA_Digitization/ALFA_PileUpTool.h
index 197b3f6f513ff7826eb63ff823d3a3297e51fbe6..4e39ff15e863e60509c049c35b215036c94a67a4 100644
--- a/ForwardDetectors/ALFA/ALFA_Digitization/ALFA_Digitization/ALFA_PileUpTool.h
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/ALFA_Digitization/ALFA_PileUpTool.h
@@ -7,7 +7,7 @@
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h b/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h
index 57696b81e7e6f810836e30473f7b275d2c063ad7..ea82d17884ec1ac82e66cd9db8ccd6add7913a9e 100644
--- a/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h
+++ b/ForwardDetectors/LUCID/LUCID_Digitization/src/LUCID_PileUpTool.h
@@ -17,7 +17,7 @@
#include "PileUpTools/PileUpMergeSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include <vector>
diff --git a/ForwardDetectors/ZDC/ZDC_SimuDigitization/ZDC_SimuDigitization/ZDC_PileUpTool.h b/ForwardDetectors/ZDC/ZDC_SimuDigitization/ZDC_SimuDigitization/ZDC_PileUpTool.h
index c36fc37aa67e1ffef4dac2c55f00911c557d78b8..4fd5d394caa08173856957902b6a19bbb7bfda0c 100644
--- a/ForwardDetectors/ZDC/ZDC_SimuDigitization/ZDC_SimuDigitization/ZDC_PileUpTool.h
+++ b/ForwardDetectors/ZDC/ZDC_SimuDigitization/ZDC_SimuDigitization/ZDC_PileUpTool.h
@@ -6,7 +6,7 @@
#define ZDC_DIGITIZATION_TOOL_H
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/CMakeLists.txt b/ForwardDetectors/ZDC/ZdcAnalysis/CMakeLists.txt
index d1a0e7097e4cb0578f47e2557469ca43093f30f7..055ba7d022e2b3d800c81e12fd87ff8ad591ab19 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/CMakeLists.txt
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/CMakeLists.txt
@@ -22,5 +22,6 @@ atlas_add_library (ZdcAnalysisLib
Root/*.cxx
PUBLIC_HEADERS ZdcAnalysis
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODForward xAODTrigL1Calo xAODEventInfo PathResolver
)
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
index 52ab89e72fef4e277670ba862a81fa5e42c71aa3..716bd5839c8a09b2f212df13ef4dfcb4a5352abb 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcAnalysisTool.cxx
@@ -11,6 +11,8 @@
#include <sstream>
#include <memory>
#include <xAODForward/ZdcModuleAuxContainer.h>
+#include <AsgDataHandles/ReadHandle.h>
+#include <AsgDataHandles/WriteHandle.h>
#include "PathResolver/PathResolver.h"
namespace ZDC
@@ -19,8 +21,6 @@ namespace ZDC
ZdcAnalysisTool::ZdcAnalysisTool(const std::string& name) : asg::AsgTool(name), m_name(name),
m_writeAux(false),
m_runNumber(0), m_lumiBlock(0),
- m_eventInfoKey("EventInfo"),
- m_ZdcModuleWriteKey("ZdcSums"),
m_splines{{{{0,0,0,0}},{{0,0,0,0}}}}, m_zdcTriggerEfficiency(0)
{
@@ -28,8 +28,6 @@ namespace ZDC
declareInterface<IZdcAnalysisTool>(this);
#endif
- declareProperty("EventInfoKey", m_eventInfoKey, "Location of the event info.");
- declareProperty("ZdcModuleWriteKey", m_ZdcModuleWriteKey, "Output location of ZDC reprocessed data");
declareProperty("Configuration", m_configuration = "PbPb2015");
declareProperty("FlipEMDelay",m_flipEMDelay=false);
declareProperty("LowGainOnly",m_lowGainOnly=false);
diff --git a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h
index 8d944608d957e26b6610344dd86b447c87f78132..cfe43316e5cda21c67d8a58b89846ebf0117fe24 100644
--- a/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h
+++ b/ForwardDetectors/ZDC/ZdcAnalysis/ZdcAnalysis/ZdcAnalysisTool.h
@@ -5,6 +5,8 @@
#ifndef ZDCANALYSIS_ZDCANALYSISTOOL_H
#define ZDCANALYSIS_ZDCANALYSISTOOL_H
+#include "AsgDataHandles/ReadHandleKey.h"
+#include "AsgDataHandles/WriteHandleKey.h"
#include "AsgTools/AsgTool.h"
#include "xAODEventInfo/EventInfo.h"
#include "xAODForward/ZdcModuleContainer.h"
@@ -93,8 +95,13 @@ class ZdcAnalysisTool : public virtual IZdcAnalysisTool, public asg::AsgTool
// internal functions
TF1* m_tf1SincInterp;
- SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey;
- SG::WriteHandleKey<xAOD::ZdcModuleContainer> m_ZdcModuleWriteKey;
+ SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey {
+ this, "EventInfoKey", "EventInfo",
+ "Location of the event info."};
+ SG::WriteHandleKey<xAOD::ZdcModuleContainer> m_ZdcModuleWriteKey {
+ this, "ZdcModuleWriteKey", "ZdcSums",
+ "Output location of ZDC reprocessed data"};
+
bool m_flipEMDelay;
bool m_lowGainOnly;
bool m_combineDelay;
diff --git a/Generators/AtlasHepMC/AtlasHepMC/Flow.h b/Generators/AtlasHepMC/AtlasHepMC/Flow.h
index 72c3b7df628b669bc4047fdcfd47c9d3a24d3805..1aee5c176b48c6264f8f21e8a7f756c4c4262624 100644
--- a/Generators/AtlasHepMC/AtlasHepMC/Flow.h
+++ b/Generators/AtlasHepMC/AtlasHepMC/Flow.h
@@ -16,10 +16,26 @@ std::shared_ptr<HepMC3::IntAttribute> f=p->attribute<HepMC3::IntAttribute>("flow
std::shared_ptr<HepMC3::VectorIntAttribute> vf=p->attribute<HepMC3::VectorIntAttribute>("flow"); if (vf) if (0<i&&i<(int)(vf->value().size())) return vf->value().at(i);
return 0;
}
+inline int flow(HepMC3::ConstGenParticlePtr p, int i){
+std::shared_ptr<HepMC3::IntAttribute> f=p->attribute<HepMC3::IntAttribute>("flow"+std::to_string(i)); if (f) return f->value();
+std::shared_ptr<HepMC3::VectorIntAttribute> vf=p->attribute<HepMC3::VectorIntAttribute>("flow"); if (vf) if (0<i&&i<(int)(vf->value().size())) return vf->value().at(i);
+return 0;
+}
inline Flow flow(HepMC3::GenParticlePtr p){
std::shared_ptr<HepMC3::VectorIntAttribute> vf=p->attribute<HepMC3::VectorIntAttribute>("flow");
if (vf) return vf;
+std::vector<int> fl;
+for (int i=1;i<=10;i++)
+{
+std::shared_ptr<HepMC3::IntAttribute> f=p->attribute<HepMC3::IntAttribute>("flow"+std::to_string(i)); if (f) fl.push_back(i); else break;
+}
+return std::make_shared<HepMC3::VectorIntAttribute>(fl);
+}
+inline Flow flow(HepMC3::ConstGenParticlePtr p){
+std::shared_ptr<HepMC3::VectorIntAttribute> vf=p->attribute<HepMC3::VectorIntAttribute>("flow");
+if (vf) return vf;
+
std::vector<int> fl;
for (int i=1;i<=10;i++)
{
diff --git a/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx b/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx
index 9fcb86b8ccf864dd71130024378b82e1e9b593da..2cf0d6625417ca68f4ae1b3d3a48b9074d637030 100755
--- a/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx
+++ b/Generators/GenAnalysisTools/EventBoost/src/EventBoost.cxx
@@ -174,7 +174,7 @@ StatusCode EventBoost::AnalyseGenEvent(const HepMC::GenEvent* genEvt) {
std::vector<HepMC::GenParticlePtr> particles_needing_modification;
- for(auto p: *genEvt) particles_needing_modification.push_back(p);
+ for(auto p: *((HepMC::GenEvent*)genEvt)) particles_needing_modification.push_back(p);
m_pxsum=0.;
for (auto it: particles_needing_modification) {
@@ -191,11 +191,15 @@ StatusCode EventBoost::AnalyseGenEvent(const HepMC::GenEvent* genEvt) {
std::vector<HepMC::GenVertexPtr> vertices_needing_modification;
+#ifdef HEPMC3
+ for(auto v: ((HepMC::GenEvent*)genEvt)->vertices()) vertices_needing_modification.push_back(v);
+#else
HepMC::GenEvent::vertex_const_iterator v = genEvt->vertices_begin();
HepMC::GenEvent::vertex_const_iterator vEnd = genEvt->vertices_end();
for(; v != vEnd; ++v ) {
vertices_needing_modification.push_back(*v);
}
+#endif
Rndm::Numbers GaussVertexModifier_x(randSvc(), Rndm::Gauss(m_gaussian_mean[0],m_gaussian_width[0]));
diff --git a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
index 58a6b8b7bb6330faefeb8165d29282fbfbf24bb2..dd16e15f27b472f536cedb884076351726557fd8 100644
--- a/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
+++ b/Generators/GenAnalysisTools/ReweightTools/src/PDFReweightTool.cxx
@@ -14,7 +14,7 @@
//
/////////////////////////////////////////////////////////////
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "AthContainers/DataVector.h"
diff --git a/Generators/HepMCAnalysis_i/src/GetEvents.cxx b/Generators/HepMCAnalysis_i/src/GetEvents.cxx
index 693bc84995c1ea53b51b49f48b88a6580fbffd03..47c56f63169a6ce056f5a63c4ec0a518b3be7eeb 100644
--- a/Generators/HepMCAnalysis_i/src/GetEvents.cxx
+++ b/Generators/HepMCAnalysis_i/src/GetEvents.cxx
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
diff --git a/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx b/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
index 1b4b25141e91424ae390b05d021f69b53a0184b1..d954a4898b2b584b167493e5406a17aa1d515a9a 100644
--- a/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
+++ b/Generators/HepMCAnalysis_i/src/HepMCAnalysis.cxx
@@ -11,7 +11,7 @@
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// ROOT
#include "TFile.h"
diff --git a/Generators/HforTool/src/HforTool.cxx b/Generators/HforTool/src/HforTool.cxx
index a72dc7b1af1973af8f0a1c4f0c227a9d02e5b0c6..22e8bdb2330c70086fd0598fd8083fcc664902d2 100644
--- a/Generators/HforTool/src/HforTool.cxx
+++ b/Generators/HforTool/src/HforTool.cxx
@@ -13,7 +13,7 @@
#include <cmath>
#include <set>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GeneratorObjects/McEventCollection.h"
#include "TruthUtils/GeneratorName.h"
@@ -300,10 +300,15 @@ void HforTool::findHFQuarks() {
ATH_MSG_DEBUG(" prod vtx: " << prodvtx);
// check that there is no b/c-hadron as a parent
// also find mpi and top parents
- for (auto pin = prodvtx->particles_begin(HepMC::parents); pin != prodvtx->particles_end(HepMC::parents) && !hasbchadronparent; pin++)
- {
- ATH_MSG_DEBUG(" incoming: " << *(*pin));
- int pdgin(abs((*pin)->pdg_id())) ;
+#ifdef HEPMC3
+ for (auto pin: prodvtx->particles_in()){
+#else
+ for (auto pin_it = prodvtx->particles_begin(HepMC::parents); pin_it != prodvtx->particles_end(HepMC::parents); pin_it++) {
+ auto pin=pin_it;
+#endif
+ if(hasbchadronparent) break;
+ ATH_MSG_DEBUG(" incoming: " << *pin);
+ int pdgin(std::abs((*pin)->pdg_id())) ;
if ( (pdgin%10000)/1000 == apdg || (pdgin%1000)/100 == apdg )
hasbchadronparent = true ;
@@ -336,10 +341,11 @@ void HforTool::findHFQuarks() {
ATH_MSG_DEBUG(" decay vtx: " << decayvtx);
// check whether there are only non-b/c-quark daughters
- for (auto pout = decayvtx->particles_begin(HepMC::children) ; pout != decayvtx->particles_end(HepMC::children) && !hasbcquarkdaughter; pout++)
+ for (auto pout: *decayvtx)
{
- ATH_MSG_DEBUG(" outgoing: " << (*pout));
- int pdgout(std::abs((*pout)->pdg_id())) ;
+ if (hasbcquarkdaughter) break;
+ ATH_MSG_DEBUG(" outgoing: " << pout);
+ int pdgout(std::abs(pout->pdg_id())) ;
if ( pdgout == apdg )
hasbcquarkdaughter = true ;
}
@@ -379,8 +385,13 @@ void HforTool::findHFQuarks() {
ATH_MSG_DEBUG("print out vertex -5") ;
auto vtx5=HepMC::barcode_to_vertex(evt,-5) ;
if (vtx5) {
+#ifdef HEPMC3
+ for ( auto pin = vtx5->particles_in().begin() ; pin != vtx5->particles_in().end(); pin++) ATH_MSG_DEBUG(" incoming: " << (*pin));
+ for ( auto pout = vtx5->particles_out().begin() ; pout != vtx5->particles_out().end(); pout++) ATH_MSG_DEBUG(" outgoing: " << (*pout));
+#else
for ( auto pin = vtx5->particles_begin(HepMC::parents) ; pin != vtx5->particles_end(HepMC::parents); pin++) ATH_MSG_DEBUG(" incoming: " << (*pin));
for ( auto pout = vtx5->particles_begin(HepMC::children) ; pout != vtx5->particles_end(HepMC::children); pout++) ATH_MSG_DEBUG(" outgoing: " << (*pout));
+#endif
}
} // print out vtx -5 if there are HF quarks and in DEBUG mode
} // Pythia shower
@@ -429,21 +440,27 @@ void HforTool::findHFQuarksHerwig
isPDF = true ;
}
if ( !isPDF && prodvtx ) {
+#ifdef HEPMC3
+ for (auto pin: HepMC::ancestor_particles(prodvtx)) {
+#else
HepMC::GenVertex::particle_iterator prodvtx_particles_begin = prodvtx->particles_begin(HepMC::ancestors) ;
HepMC::GenVertex::particle_iterator prodvtx_particles_end = prodvtx->particles_end(HepMC::ancestors) ;
- for (auto pin=prodvtx_particles_begin; pin!= prodvtx_particles_end && !iscquarkfromb && !isPDF ; pin++ ) {
- int apdgin = std::abs((*pin)->pdg_id()) ;
+ for (auto pin_it=prodvtx_particles_begin; pin_it!= prodvtx_particles_end ; pin_it++ ) {
+ auto pin=*pin_it;
+#endif
+ if (iscquarkfromb || isPDF) break;
+ int apdgin = std::abs(pin->pdg_id()) ;
if (apdgin != apdg ) {
- ATH_MSG_DEBUG(" non b/c parent " << (*pin));
+ ATH_MSG_DEBUG(" non b/c parent " << pin);
// if MPI as a non-b parent, label it
- if ( apdgin == 0 && (*pin)->status() == 120 ) {
+ if ( apdgin == 0 && pin->status() == 120 ) {
ATH_MSG_DEBUG(" MPI !!");
isMPI = true ;
}
// gluon splitting or ME origin: in evgen files,
// proton (id 2212) seems to be saved in all events; not so in
// AOD files... Thus look for non-HF origin with status 121 or 122
- if ( (*pin)->status() == 121 || (*pin)->status() == 122 ) {
+ if ( pin->status() == 121 || pin->status() == 122 ) {
ATH_MSG_DEBUG(" GS !!");
isGS = true ;
}
@@ -471,14 +488,14 @@ void HforTool::findHFQuarksHerwig
isWDecay = true ;
}
} else {
- ATH_MSG_DEBUG(" b/c parent " << (*pin));
+ ATH_MSG_DEBUG(" b/c parent " << pin);
// if the status of a b-quark is 123 or 124, then it is a ME b-quark
- if ( (*pin)->status() == 123 || (*pin)->status() == 124 ) {
+ if ( pin->status() == 123 || pin->status() == 124 ) {
ATH_MSG_DEBUG(" ME !!");
isME = true ;
}
// if status 141 or 142 then it came from the PDF, ignore those!!
- if ( (*pin)->status() == 141 || (*pin)->status() == 142 ) {
+ if ( pin->status() == 141 || pin->status() == 142 ) {
ATH_MSG_DEBUG(" PDF !!");
isPDF = true ;
}
@@ -559,7 +576,11 @@ void HforTool::findHFQuarksPythia
// then there is PDF parton too (eg, qc->q'Wc)
auto prodvtx=bcpart->production_vertex() ;
if ( prodvtx ) {
+#ifdef HEPMC3
+ for (auto pin=prodvtx->particles_in().begin(); pin != prodvtx->particles_in().end(); pin++)
+#else
for (auto pin=prodvtx->particles_begin(HepMC::parents); pin != prodvtx->particles_end(HepMC::parents); pin++)
+#endif
{
ATH_MSG_DEBUG(" incoming: " << (*pin));
int pdgin((*pin)->pdg_id()) ;
@@ -598,11 +619,16 @@ void HforTool::findHFQuarksPythia
if ( prodvtx ) {
// check whether there is a proton ancestor,
// and how many ancestors there are
- for ( auto pin = prodvtx->particles_begin(HepMC::ancestors); pin != prodvtx->particles_end(HepMC::ancestors) && !iscquarkfromb ; pin++ )
- {
- int apdgin = std::abs((*pin)->pdg_id()) ;
+#ifdef HEPMC3
+ for ( auto pin: prodvtx->particles_in()) {
+#else
+ for ( auto pin_it = prodvtx->particles_begin(HepMC::ancestors); pin_it != prodvtx->particles_end(HepMC::ancestors) ; pin_it++ ) {
+ auto pin=*pin_it;
+#endif
+ if (iscquarkfromb ) break;
+ int apdgin = std::abs(pin->pdg_id()) ;
if ( apdgin != apdg ) {
- ATH_MSG_DEBUG(" non b/c ancestor " << (*pin));
+ ATH_MSG_DEBUG(" non b/c ancestor " << pin);
// proton parent
if ( apdgin == 2212 ) {
hasPAncestor = true ;
@@ -632,7 +658,7 @@ void HforTool::findHFQuarksPythia
isWDecay = true ;
}
} else {
- ATH_MSG_DEBUG(" b/c or ME/PDF parent " << (*pin));
+ ATH_MSG_DEBUG(" b/c or ME/PDF parent " << pin);
} // b/c or non-b/c quark as parent
} // loop over all ancestors
@@ -675,13 +701,18 @@ void HforTool::findHFQuarksPythia
auto pvtx34=prodvtx ;
bool bc34=(HepMC::barcode(pvtx34)==-3 || HepMC::barcode(pvtx34)==-4) ;
if ( !bc34 ) {
- for (auto pin=prodvtx->particles_begin(HepMC::ancestors);pin!=prodvtx->particles_end(HepMC::ancestors)&&!bc34 ; pin++ )
- {
+#ifdef HEPMC3
+ for (auto pin: HepMC::ancestor_particles(prodvtx) ) {
+#else
+ for (auto pin_it=prodvtx->particles_begin(HepMC::ancestors);pin_it!=prodvtx->particles_end(HepMC::ancestors); pin_it++ ) {
+ auto pin=*pin_it;
+#endif
+ if (bc34) break;
int bcpv(-1) ;
- if ( (*pin)->production_vertex() )
- bcpv = HepMC::barcode((*pin)->production_vertex()) ;
- if ( (*pin)->pdg_id() == pdg && (bcpv==-3 || bcpv==-4) ) {
- pvtx34 = (*pin)->production_vertex() ;
+ if ( pin->production_vertex() )
+ bcpv = HepMC::barcode(pin->production_vertex()) ;
+ if ( pin->pdg_id() == pdg && (bcpv==-3 || bcpv==-4) ) {
+ pvtx34 = pin->production_vertex() ;
bc34 = true ;
}
} // loop over ancestors
@@ -704,7 +735,11 @@ void HforTool::findHFQuarksPythia
auto mepvtx=ime->production_vertex() ;
// check the prod.vertices of the parents
if ( mepvtx ) {
+#ifdef HEPMC3
+ for (auto pin = mepvtx->particles_in().begin() ; pin != mepvtx->particles_in().end(); pin++)
+#else
for (auto pin = mepvtx->particles_begin(HepMC::parents) ; pin != mepvtx->particles_end(HepMC::parents); pin++)
+#endif
{
if ( (*pin)->production_vertex() == pvtx34 && ime->pdg_id() == pdg ) {
ATH_MSG_DEBUG(" -> ME parton") ;
@@ -797,11 +832,16 @@ void HforTool::findHFQuarksUnknown
bool isWDecay(false) ; // subset of top-decays, for hadronic top-decays
bool iscquarkfromb(false) ;
if ( prodvtx ) {
- for ( auto pin = prodvtx->particles_begin(HepMC::ancestors); pin != prodvtx->particles_end(HepMC::ancestors) && !iscquarkfromb ; pin++ )
- {
- int apdgin = std::abs((*pin)->pdg_id()) ;
+#ifdef HEPMC3
+ for ( auto pin: prodvtx->particles_in()) {
+#else
+ for ( auto pin_it = prodvtx->particles_begin(HepMC::ancestors); pin_it != prodvtx->particles_end(HepMC::ancestors) ; pin_it++ ) {
+ auto pin=*pin_it;
+#endif
+ if (!!iscquarkfromb ) break;
+ int apdgin = std::abs(pin->pdg_id()) ;
if (apdgin != apdg ) {
- ATH_MSG_DEBUG(" non b/c parent " << (*pin));
+ ATH_MSG_DEBUG(" non b/c parent " << pin);
// c quark from a b quark (in b-hadron decays)
if ( apdg == 4 && ( apdgin == 5 || (apdgin%10000)/1000 == 5 ||(apdgin%1000)/100 == 5 ) ) {
ATH_MSG_DEBUG(" c quark from b quark or b hadron");
diff --git a/Generators/McAsciiEventSelector/src/McAsciiEventSelector.h b/Generators/McAsciiEventSelector/src/McAsciiEventSelector.h
index 897ed1464dd83dd5b7aed5440b9695933199f534..23faf44f309f80fce638f0cff856d081e2be9c71 100644
--- a/Generators/McAsciiEventSelector/src/McAsciiEventSelector.h
+++ b/Generators/McAsciiEventSelector/src/McAsciiEventSelector.h
@@ -19,7 +19,7 @@
// Gaudi includes
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IEvtSelector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
// Forward declaration
diff --git a/Generators/McEventSelector/McEventSelector/McEventSelector.h b/Generators/McEventSelector/McEventSelector/McEventSelector.h
index 5609eeda5bcfc967bf0022a3dd3561f4ef661776..3bd969807e33b874e32a7ed94eea7e6f3670a473 100644
--- a/Generators/McEventSelector/McEventSelector/McEventSelector.h
+++ b/Generators/McEventSelector/McEventSelector/McEventSelector.h
@@ -25,7 +25,7 @@
// Include files
#include "GaudiKernel/IEvtSelector.h"
#include "AthenaBaseComps/AthService.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/IEvtSelectorSeek.h"
diff --git a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
index 554278d47283b9f543ca7db3781c6d9a954dc2e5..b689a76c1156b536f24a720098277750dabddcff 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
+++ b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
@@ -523,7 +523,7 @@ StatusCode ByteStreamEmonInputSvc::start()
return StatusCode::SUCCESS;
}
-void ByteStreamEmonInputSvc::updateHandler(Property& /* p */)
+void ByteStreamEmonInputSvc::updateHandler(Gaudi::Details::PropertyBase& /* p */)
{
if(! m_connect) {
m_connect = true;
diff --git a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h
index 4fb124f5a162c31285e841c288dd53ca101d8706..b093dc084ede20c75b35ab2c1debd1c04a67acbd 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h
+++ b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h
@@ -54,7 +54,7 @@ private:
void check_publish();
void get_runparams();
- void updateHandler(Property& p);
+ void updateHandler(Gaudi::Details::PropertyBase& p);
int m_totalEventCounter{0}; //!< event Counter
diff --git a/HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamCnvSvcConfig.py b/HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamCnvSvcConfig.py
index 45b6667c8c9f97ee33444419a0959f1a3a8e2e0f..2c0213946f82c2a545802b6a77a74a0d2101c00f 100644
--- a/HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamCnvSvcConfig.py
+++ b/HLT/Event/TrigByteStreamCnvSvc/python/TrigByteStreamCnvSvcConfig.py
@@ -3,6 +3,7 @@
#
from TrigByteStreamCnvSvc.TrigByteStreamCnvSvcConf import TrigByteStreamInputSvc as _TrigByteStreamInputSvc
+from TrigByteStreamCnvSvc.TrigByteStreamCnvSvcConf import TrigByteStreamCnvSvc as _TrigByteStreamCnvSvc
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
class TrigByteStreamInputSvc(_TrigByteStreamInputSvc):
@@ -10,20 +11,76 @@ class TrigByteStreamInputSvc(_TrigByteStreamInputSvc):
super(TrigByteStreamInputSvc, self).__init__(name)
self.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name)
self.MonTool.defineHistogram('L1Result_NumROBs', path='EXPERT', type='TH1F',
- title='Number of ROBs received in L1 result;Number of ROBs;N events',
+ title='Number of ROBs received in L1 result;Number of ROBs;Events',
xbins=100, xmin=0, xmax=100)
self.MonTool.defineHistogram('L1Result_FullEvFragSize', path='EXPERT', type='TH1F',
- title='Size of L1 result FullEventFragment;Size [kB];N events',
+ title='Size of L1 result FullEventFragment;Size [kB];Events',
xbins=100, xmin=0, xmax=100)
self.MonTool.defineHistogram('L1Result_SubDets', path='EXPERT', type='TH1F',
title='Source of ROBs in L1 result passed to HLT;;Total number of ROBs',
xbins=1, xmin=0, xmax=1)
self.MonTool.defineHistogram('TIME_getNext', path='EXPERT', type='TH1F',
- title='Time of DataCollector::getNext() calls;Time [ms];N calls',
+ title='Time of DataCollector::getNext() calls;Time [ms];Calls',
xbins=400, xmin=0, xmax=200)
self.MonTool.defineHistogram('TIME_getNext;TIME_getNext_extRange', path='EXPERT', type='TH1F',
- title='Time of DataCollector::getNext() calls;Time [ms];N calls',
+ title='Time of DataCollector::getNext() calls;Time [ms];Calls',
xbins=400, xmin=0, xmax=2000)
self.MonTool.defineHistogram('getNext_LBN,getNext_noEvent;NoEventFraction', path='EXPERT', type='TProfile',
title='Fraction of getNext calls returning NO_EVENT;Lumi Block;Event fraction',
xbins=100, xmin=0, xmax=100, opt='kCanRebin')
+
+class TrigByteStreamCnvSvc(_TrigByteStreamCnvSvc):
+ def __init__(self, name='TrigByteStreamCnvSvc'):
+ super(TrigByteStreamCnvSvc, self).__init__(name)
+ self.MonTool = GenericMonitoringTool('MonTool', HistPath='HLTFramework/'+name)
+ self.MonTool.defineHistogram('TIME_eventDone', path='EXPERT', type='TH1F',
+ title='Time of DataCollector::eventDone() calls;Time [ms];Calls',
+ xbins=400, xmin=0, xmax=2)
+ self.MonTool.defineHistogram('TIME_eventDone;TIME_eventDone_extRange', path='EXPERT', type='TH1F',
+ title='Time of DataCollector::eventDone() calls;Time [ms];Calls',
+ xbins=400, xmin=0, xmax=200)
+ self.MonTool.defineHistogram('StreamTags', path='EXPERT', type='TH1F',
+ title='Stream Tags produced by HLT;;Events',
+ xbins=1, xmin=0, xmax=1)
+ self.MonTool.defineHistogram('StreamTagCorrA,StreamTagCorrB;StreamTagsCorr', path='EXPERT', type='TH2F',
+ title='Stream Tags (produced by HLT) correlation',
+ xbins=1, xmin=0, xmax=1, ybins=1, ymin=0, ymax=1)
+ self.MonTool.defineHistogram('StreamTagsNum', path='EXPERT', type='TH1F',
+ title='Number of Stream Tags produced by HLT;Number of Stream Tags;Events',
+ xbins=20, xmin=0, xmax=20)
+ self.MonTool.defineHistogram('StreamTagsType', path='EXPERT', type='TH1F',
+ title='Type of Stream Tags produced by HLT;;Events',
+ xbins=7, xmin=0, xmax=7,
+ xlabels=["physics", "calibration", "express", "monitoring", "debug", "reserved", "unknown"])
+ self.MonTool.defineHistogram('StreamTagsPebRobsNum', path='EXPERT', type='TH1F',
+ title='Number of ROBs in PEB stream tags;Number of ROBs;Entries',
+ xbins=200, xmin=0, xmax=200,
+ cutmask="StreamTagIsPeb")
+ self.MonTool.defineHistogram('StreamTagsPebSubDetsNum', path='EXPERT', type='TH1F',
+ title='Number of SubDetectors in PEB stream tags;Number of SubDetectors;Entries',
+ xbins=100, xmin=0, xmax=100,
+ cutmask="StreamTagIsPeb")
+ self.MonTool.defineHistogram('StreamTagsPebSubDetsFromRobList', path='EXPERT', type='TH1F',
+ title='SubDetectors in PEB stream tags ROB list;;Entries',
+ xbins=1, xmin=0, xmax=1)
+ self.MonTool.defineHistogram('StreamTagsPebSubDetsFromSubDetList', path='EXPERT', type='TH1F',
+ title='SubDetectors in PEB stream tags SubDetector list;;Entries',
+ xbins=1, xmin=0, xmax=1)
+ self.MonTool.defineHistogram('ResultSizeTotal', path='EXPERT', type='TH1F',
+ title='HLT result total size (sum of all modules);Size [kB];Events',
+ xbins=200, xmin=0, xmax=2000)
+ self.MonTool.defineHistogram('ResultSizeFullEvFrag', path='EXPERT', type='TH1F',
+ title='HLT output FullEventFragment size;Size [kB];Events',
+ xbins=200, xmin=0, xmax=2000)
+ self.MonTool.defineHistogram('ResultModuleID,ResultModuleSize;ResultSizeByModule', path='EXPERT', type='TH2F',
+ title='HLT result size by module;Module ID;Size [kB]',
+ xbins=10, xmin=0, xmax=10, ybins=200, ymin=0, ymax=2000)
+ self.MonTool.defineHistogram('StreamTags,ResultSizeStream;ResultSizeByStream', path='EXPERT', type='TH2F',
+ title='HLT result size by stream;;Size [kB]',
+ xbins=1, xmin=0, xmax=1, ybins=200, ymin=0, ymax=2000)
+ self.MonTool.defineHistogram('OnlineErrorCode', path='EXPERT', type='TH1F',
+ title='Online error codes;;Events',
+ xbins=1, xmin=0, xmax=1)
+ self.MonTool.defineHistogram('TIME_monitorRawEvent', path='EXPERT', type='TH1F',
+ title='Time of monitorRawEvent() calls;Time [us];Calls',
+ xbins=1000, xmin=0, xmax=1000)
diff --git a/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamCnvSvc.cxx b/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamCnvSvc.cxx
index facf9426ab10bb390de689c4b922ace6b5b64222..ffeda04b3f7de388f9eaf845a4c91492b9bc529f 100644
--- a/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamCnvSvc.cxx
+++ b/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamCnvSvc.cxx
@@ -8,7 +8,6 @@
// Athena includes
#include "AthenaKernel/EventContextClid.h"
-#include "AthenaMonitoringKernel/OHLockedHist.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "StoreGate/StoreGateSvc.h"
@@ -29,6 +28,13 @@
// Local helper functions
namespace {
constexpr float wordsToKiloBytes = 0.001*sizeof(uint32_t);
+ template<typename T> inline bool contains(const std::vector<T>& vec, const T& val) {
+ return std::find(vec.cbegin(), vec.cend(), val)!=vec.cend();
+ }
+ template<typename T> inline int index(const std::vector<T>& vec, const T& val) {
+ typename std::vector<T>::const_iterator it = std::find(vec.cbegin(), vec.cend(), val);
+ return it==vec.cend() ? -1 : std::distance(vec.cbegin(), it);
+ }
template<typename T> struct printWordHex {
printWordHex(const T w) : word(w) {}
T word;
@@ -56,16 +62,29 @@ namespace {
}
return str;
}
+ // StreamTag monitoring accessors
+ inline const std::string mon_streamTypeName(const eformat::helper::StreamTag& st){
+ return st.type+"_"+st.name;
+ }
+ inline const std::string& mon_streamType(const eformat::helper::StreamTag& st){
+ return st.type;
+ }
+ inline bool mon_streamIsPeb(const eformat::helper::StreamTag& st){
+ return st.robs.size()>0 || st.dets.size()>0;
+ }
+ inline size_t mon_streamPebRobsNum(const eformat::helper::StreamTag& st){
+ return st.robs.size();
+ }
+ inline size_t mon_streamPebSubDetsNum(const eformat::helper::StreamTag& st){
+ return st.dets.size();
+ }
}
// =============================================================================
// Standard constructor
// =============================================================================
TrigByteStreamCnvSvc::TrigByteStreamCnvSvc(const std::string& name, ISvcLocator* svcLoc)
-: ByteStreamCnvSvc(name, svcLoc),
- m_evtStore("StoreGateSvc", name),
- m_robDataProviderSvc("ROBDataProviderSvc", name),
- m_THistSvc("THistSvc", name) {}
+: ByteStreamCnvSvc(name, svcLoc) {}
// =============================================================================
// Standard destructor
@@ -80,19 +99,11 @@ StatusCode TrigByteStreamCnvSvc::initialize() {
ATH_CHECK(ByteStreamCnvSvc::initialize());
ATH_CHECK(m_evtStore.retrieve());
ATH_CHECK(m_robDataProviderSvc.retrieve());
- ATH_CHECK(m_THistSvc.retrieve());
+ if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
ATH_MSG_VERBOSE("end of " << __FUNCTION__);
return StatusCode::SUCCESS;
}
-// =============================================================================
-// Reimplementation of Service::start
-// =============================================================================
-StatusCode TrigByteStreamCnvSvc::start() {
- bookHistograms();
- return StatusCode::SUCCESS;
-}
-
// =============================================================================
// Implementation of Service::finalize
// =============================================================================
@@ -102,8 +113,6 @@ StatusCode TrigByteStreamCnvSvc::finalize() {
ATH_MSG_WARNING("Failed to release service " << m_robDataProviderSvc.typeAndName());
if (m_evtStore.release().isFailure())
ATH_MSG_WARNING("Failed to release service " << m_evtStore.typeAndName());
- if (m_THistSvc.release().isFailure())
- ATH_MSG_WARNING("Failed to release service " << m_THistSvc.typeAndName());
ATH_MSG_VERBOSE("end of " << __FUNCTION__);
ATH_CHECK(ByteStreamCnvSvc::finalize());
return StatusCode::SUCCESS;
@@ -180,19 +189,20 @@ StatusCode TrigByteStreamCnvSvc::commitOutput(const std::string& /*outputFile*/,
return StatusCode::FAILURE;
}
- monitorRawEvent(rawEventPtr);
+ {
+ auto t_mon = Monitored::Timer("TIME_monitorRawEvent");
+ monitorRawEvent(rawEventPtr);
+ Monitored::Group(m_monTool, t_mon);
+ }
// Send output to the DataCollector
StatusCode result = StatusCode::SUCCESS;
try {
- auto startTime = std::chrono::high_resolution_clock::now();
+ auto t_eventDone = Monitored::Timer<std::chrono::duration<float, std::milli>>("TIME_eventDone");
hltinterface::DataCollector::instance()->eventDone(std::move(rawEventPtr));
- auto endTime = std::chrono::high_resolution_clock::now();
- auto duration = std::chrono::duration<float, std::milli>(endTime - startTime);
- m_histEventDoneTime->Fill(static_cast<float>(duration.count()));
- m_histEventDoneTimeER->Fill(static_cast<float>(duration.count()));
+ Monitored::Group(m_monTool, t_eventDone);
ATH_MSG_DEBUG("Serialised FullEventFragment with HLT result was returned to DataCollector successfully, "
- << "the eventDone call took " << duration.count() << " microseconds");
+ << "the eventDone call took " << (double)t_eventDone << " milliseconds");
}
catch (const std::exception& e) {
ATH_MSG_ERROR("Sending output to DataCollector failed, caught an unexpected std::exception " << e.what());
@@ -220,9 +230,8 @@ void TrigByteStreamCnvSvc::monitorRawEvent(const std::unique_ptr<uint32_t[]>& ra
HLT::OnlineErrorCode errorCode = static_cast<HLT::OnlineErrorCode>(rawEvent.status()[1]);
std::ostringstream ss;
ss << errorCode;
- oh_scoped_lock_histogram lock;
- m_histOnlineErrorCode->Fill(ss.str().data(), 1.0);
- m_histOnlineErrorCode->LabelsDeflate("X");
+ auto monOnlineErrorCode = Monitored::Scalar<std::string>("OnlineErrorCode", ss.str());
+ Monitored::Group(m_monTool, monOnlineErrorCode);
}
// Decode stream tags
@@ -242,17 +251,24 @@ void TrigByteStreamCnvSvc::monitorRawEvent(const std::unique_ptr<uint32_t[]>& ra
// Get HLT result sizes
std::vector<eformat::read::ROBFragment> robs;
rawEvent.robs(robs);
- std::unordered_map<uint16_t, uint32_t> resultSizes; // {module ID, size in words}
+ std::vector<uint16_t> resultSizeMap_moduleID;
+ std::vector<uint32_t> resultSizeMap_size;
uint32_t totalSizeWords = 0;
try {
for (const eformat::read::ROBFragment& rob : robs) {
eformat::helper::SourceIdentifier sid(rob.rob_source_id());
if (sid.subdetector_id() != eformat::SubDetector::TDAQ_HLT)
continue;
- uint32_t size = rob.fragment_size_word();
- uint16_t module_id = sid.module_id();
- resultSizes[module_id] = size;
+ const uint16_t module_id = sid.module_id();
+ const uint32_t size = rob.fragment_size_word();
totalSizeWords += size;
+ if (!contains(resultSizeMap_moduleID, module_id)) {
+ resultSizeMap_moduleID.push_back(module_id);
+ resultSizeMap_size.push_back(size);
+ }
+ else {
+ ATH_MSG_ERROR("HLT result ROB monitoring found multiple HLT ROBs with the same module ID " << module_id);
+ }
}
}
catch (const std::exception& ex) {
@@ -264,80 +280,68 @@ void TrigByteStreamCnvSvc::monitorRawEvent(const std::unique_ptr<uint32_t[]>& ra
return;
}
- // Associate result sizes to streams and fill histograms
- m_histStreamTagsNum->Fill(streamTags.size());
- std::unordered_map<std::string, uint32_t> resultSizesByStream;
+ // Fill helper containers for monitoring
+ std::vector<std::string> sdFromRobList;
+ std::vector<std::string> sdFromSubDetList;
+ std::vector<std::string> streamTagCorrA;
+ std::vector<std::string> streamTagCorrB;
+ std::vector<float> streamResultSize; // Correlated with streamTags vector
+ streamTagCorrA.reserve(streamTags.size() * streamTags.size());
+ streamTagCorrB.reserve(streamTags.size() * streamTags.size());
+ streamResultSize.reserve(streamTags.size());
for (const eformat::helper::StreamTag& st : streamTags) {
- std::string typeName = st.type + "_" + st.name;
- {
- oh_scoped_lock_histogram lock;
- m_histStreamTags->Fill(typeName.data(), 1.0);
- m_histStreamTags->LabelsDeflate("X");
- }
- m_histStreamTagsType->Fill(st.type.data(), 1.0);
- if (st.robs.size() > 0 || st.dets.size() >0) { // PEB stream tag
- m_histPebRobsNum->Fill(st.robs.size());
- m_histPebSubDetsNum->Fill(st.dets.size());
- }
-
bool hasHLTSubDet = st.dets.find(eformat::SubDetector::TDAQ_HLT) != st.dets.end();
bool includeAll = st.robs.empty() && (st.dets.empty() || hasHLTSubDet);
- if (includeAll) {
- resultSizesByStream[typeName] = totalSizeWords;
- continue;
- }
- uint32_t size = 0;
- std::set<std::string> sdFromRobList;
- std::set<std::string> sdFromSubDetList;
+ // includeAll means a stream with full event building or all HLT results included
+ uint32_t sizeWords = includeAll ? totalSizeWords : 0;
for (const eformat::SubDetector sd : st.dets) {
- sdFromSubDetList.insert(eformat::helper::SubDetectorDictionary.string(sd));
+ const std::string& detName = eformat::helper::SubDetectorDictionary.string(sd);
+ if (!contains(sdFromSubDetList, detName)) sdFromSubDetList.push_back(detName);
}
- for (uint32_t robid : st.robs) {
+ for (const uint32_t robid : st.robs) {
eformat::helper::SourceIdentifier sid(robid);
- sdFromRobList.insert(sid.human_detector());
- if (sid.subdetector_id() != eformat::SubDetector::TDAQ_HLT)
- continue;
- if (resultSizes.find(sid.module_id()) == resultSizes.end()) {
- ATH_MSG_WARNING("Stream tag " << typeName << " declares " << sid.human()
- << " in ROB list, but the ROBFragment is missing");
- continue;
+ const std::string& detName = sid.human_detector();
+ if (!contains(sdFromRobList, detName)) sdFromRobList.push_back(detName);
+ if (!includeAll && sid.subdetector_id() == eformat::SubDetector::TDAQ_HLT) {
+ if (const int ix = index(resultSizeMap_moduleID, sid.module_id()); ix >= 0) {
+ sizeWords += resultSizeMap_size[ix];
+ }
+ else {
+ ATH_MSG_WARNING("Stream tag " << st.type << "_" << st.name << " declares " << sid.human()
+ << " in ROB list, but the ROBFragment is missing");
+ }
}
- size += resultSizes[sid.module_id()];
- }
- resultSizesByStream[typeName] = size;
- for (const std::string& sdName : sdFromRobList) {
- oh_scoped_lock_histogram lock;
- m_histPebSubDetsFromRobList->Fill(sdName.data(), 1.0);
- m_histPebSubDetsFromRobList->LabelsDeflate("X");
}
- for (const std::string& sdName : sdFromSubDetList) {
- oh_scoped_lock_histogram lock;
- m_histPebSubDetsFromSubDetList->Fill(sdName.data(), 1.0);
- m_histPebSubDetsFromSubDetList->LabelsDeflate("X");
+ streamResultSize.push_back(sizeWords*wordsToKiloBytes);
+ for (const eformat::helper::StreamTag& st2 : streamTags) {
+ streamTagCorrA.push_back(mon_streamTypeName(st));
+ streamTagCorrB.push_back(mon_streamTypeName(st2));
}
}
- // Fill result size and stream tag correlation histograms
- for (const auto& [typeName, size] : resultSizesByStream) {
- {
- oh_scoped_lock_histogram lock;
- m_histResultSizeByStream->Fill(typeName.data(), size*wordsToKiloBytes, 1.0);
- m_histResultSizeByStream->LabelsDeflate("X");
- }
- for (const auto& [typeName2, size2] : resultSizesByStream) {
- oh_scoped_lock_histogram lock;
- m_histStreamTagsCorr->Fill(typeName.data(), typeName2.data(), 1.0);
- m_histStreamTagsCorr->LabelsDeflate("X");
- m_histStreamTagsCorr->LabelsDeflate("Y");
- }
- }
- for (const auto& [moduleId, size] : resultSizes) {
- m_histResultSizeByModule->Fill(static_cast<float>(moduleId), size*wordsToKiloBytes, 1.0);
- }
- m_histResultSizeTotal->Fill(totalSizeWords*wordsToKiloBytes);
- m_histResultSizeFullEvFrag->Fill(rawEvent.fragment_size_word()*wordsToKiloBytes);
- ATH_MSG_DEBUG("Total size of HLT ROBs is " << totalSizeWords*wordsToKiloBytes
- << " kB and FullEventFragment size is " << rawEvent.fragment_size_word()*wordsToKiloBytes << " kB");
+ // General stream tag monitoring
+ auto monStreamTagsNum = Monitored::Scalar<size_t>("StreamTagsNum", streamTags.size());
+ auto monStreamTags = Monitored::Collection("StreamTags", streamTags, mon_streamTypeName);
+ auto monStreamTagsType = Monitored::Collection("StreamTagsType", streamTags, mon_streamType);
+ auto monStreamTagCorrA = Monitored::Collection("StreamTagCorrA", streamTagCorrA);
+ auto monStreamTagCorrB = Monitored::Collection("StreamTagCorrB", streamTagCorrB);
+ // PEB stream tag monitoring
+ auto monStreamIsPeb = Monitored::Collection("StreamTagIsPeb", streamTags, mon_streamIsPeb);
+ auto monPebRobsNum = Monitored::Collection("StreamTagsPebRobsNum", streamTags, mon_streamPebRobsNum);
+ auto monPebSubDetsNum = Monitored::Collection("StreamTagsPebSubDetsNum", streamTags, mon_streamPebSubDetsNum);
+ auto monSubDetsFromRobList = Monitored::Collection("StreamTagsPebSubDetsFromRobList", sdFromRobList);
+ auto monSubDetsFromSubDetList = Monitored::Collection("StreamTagsPebSubDetsFromSubDetList", sdFromSubDetList);
+ // Result size monitoring
+ auto monResultSizeTotal = Monitored::Scalar<float>("ResultSizeTotal", totalSizeWords*wordsToKiloBytes);
+ auto monResultSizeFullEvFrag = Monitored::Scalar<float>("ResultSizeFullEvFrag", rawEvent.fragment_size_word()*wordsToKiloBytes);
+ auto monResultCollModuleID = Monitored::Collection("ResultModuleID", resultSizeMap_moduleID);
+ auto monResultCollModuleSize = Monitored::Collection("ResultModuleSize", resultSizeMap_size, [](uint32_t sw){return sw*wordsToKiloBytes;});
+ auto monResultSizeByStream = Monitored::Collection("ResultSizeStream", streamResultSize);
+ // Collect all variables
+ Monitored::Group(m_monTool, monStreamTagsNum, monStreamTags, monStreamTagsType, monStreamTagCorrA,
+ monStreamTagCorrB, monStreamIsPeb, monPebRobsNum, monPebSubDetsNum, monSubDetsFromRobList,
+ monSubDetsFromSubDetList, monResultSizeTotal, monResultSizeFullEvFrag, monResultCollModuleID,
+ monResultCollModuleSize, monResultSizeByStream);
}
// =============================================================================
@@ -403,87 +407,3 @@ void TrigByteStreamCnvSvc::printRawEvent() {
ATH_MSG_DEBUG(ss.str());
}
-
-// =============================================================================
-void TrigByteStreamCnvSvc::bookHistograms() {
- const std::string path = "/EXPERT/HLTFramework/" + name() + "/";
-
- // Function to register histogram in THistSvc (moves the ownership to THistSvc)
- auto regHist = [&path, this](TH1* hist){
- if (m_THistSvc->regHist(path + hist->GetName(), hist).isFailure())
- ATH_MSG_WARNING("Cannot register monitoring histogram " << hist->GetName());
- };
-
- m_histOnlineErrorCode = new TH1I(
- "OnlineErrorCode", "Online error codes;;Events", 1, 0, 1);
- m_histOnlineErrorCode->SetCanExtend(TH1::kXaxis);
- regHist(m_histOnlineErrorCode);
-
- m_histStreamTags = new TH1F(
- "StreamTags", "Stream Tags produced by HLT;;Events", 1, 0, 1);
- m_histStreamTags->SetCanExtend(TH1::kXaxis);
- regHist(m_histStreamTags);
-
- m_histStreamTagsCorr = new TH2F(
- "StreamTagsCorr", "Stream Tags (produced by HLT) correlation", 1, 0, 1, 1, 0, 1);
- m_histStreamTagsCorr->SetCanExtend(TH1::kAllAxes);
- regHist(m_histStreamTagsCorr);
-
- m_histStreamTagsNum = new TH1F(
- "StreamTagsNum", "Number of Stream Tags produced by HLT;Number of Stream Tags;Events", 20, 0, 20);
- regHist(m_histStreamTagsNum);
-
- m_histStreamTagsType = new TH1F(
- "StreamTagsType", "Type of Stream Tags produced by HLT;;Events", 7, 0, 7);
- m_histStreamTagsType->GetXaxis()->SetBinLabel(1, "physics");
- m_histStreamTagsType->GetXaxis()->SetBinLabel(2, "calibration");
- m_histStreamTagsType->GetXaxis()->SetBinLabel(3, "express");
- m_histStreamTagsType->GetXaxis()->SetBinLabel(4, "monitoring");
- m_histStreamTagsType->GetXaxis()->SetBinLabel(5, "debug");
- m_histStreamTagsType->GetXaxis()->SetBinLabel(6, "reserved");
- m_histStreamTagsType->GetXaxis()->SetBinLabel(7, "unknown");
- regHist(m_histStreamTagsType);
-
- m_histPebRobsNum = new TH1F(
- "StreamTagsPebRobsNum", "Number of ROBs in PEB stream tags;Number of ROBs;Entries", 200, 0, 200);
- regHist(m_histPebRobsNum);
-
- m_histPebSubDetsNum = new TH1F(
- "StreamTagsPebSubDetsNum", "Number of SubDetectors in PEB stream tags;Number of SubDetectors;Entries", 100, 0, 100);
- regHist(m_histPebSubDetsNum);
-
- m_histPebSubDetsFromRobList = new TH1F(
- "StreamTagsPebSubDetsFromRobList", "SubDetectors in PEB stream tags ROB list;;Entries", 1, 0, 1);
- m_histPebSubDetsFromRobList->SetCanExtend(TH1::kXaxis);
- regHist(m_histPebSubDetsFromRobList);
-
- m_histPebSubDetsFromSubDetList = new TH1F(
- "StreamTagsPebSubDetsFromSubDetList", "SubDetectors in PEB stream tags SubDetector list;;Entries", 1, 0, 1);
- m_histPebSubDetsFromSubDetList->SetCanExtend(TH1::kXaxis);
- regHist(m_histPebSubDetsFromSubDetList);
-
- m_histResultSizeByModule = new TH2F(
- "ResultSizeByModule", "HLT result size by module;Module ID;Size [kB]", 10, 0, 10, 200, 0, 2000);
- regHist(m_histResultSizeByModule);
-
- m_histResultSizeByStream = new TH2F(
- "ResultSizeByStream", "HLT result size by stream;;Size [kB]", 1, 0, 1, 200, 0, 2000);
- m_histResultSizeByStream->SetCanExtend(TH1::kXaxis);
- regHist(m_histResultSizeByStream);
-
- m_histResultSizeTotal = new TH1F(
- "ResultSizeTotal", "HLT result total size (sum of all modules);Size [kB];Events", 200, 0, 2000);
- regHist(m_histResultSizeTotal);
-
- m_histResultSizeFullEvFrag = new TH1F(
- "ResultSizeFullEvFrag", "HLT output FullEventFragment size;Size [kB];Events", 200, 0, 2000);
- regHist(m_histResultSizeFullEvFrag);
-
- m_histEventDoneTime = new TH1F(
- "TIME_EventDoneCall", "Time of DataCollector::eventDone calls;Time [ms];Events", 400, 0, 2);
- regHist(m_histEventDoneTime);
-
- m_histEventDoneTimeER = new TH1F(
- "TIME_EventDoneCall_extRange", "Time of DataCollector::eventDone calls;Time [ms];Events", 400, 0, 200);
- regHist(m_histEventDoneTimeER);
-}
diff --git a/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamCnvSvc.h b/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamCnvSvc.h
index cedcb95ff6ddfe1c00982eab8d3e3ab7a640e57f..55e6e0d026e72b8f855d191427a97fddff0c2717 100644
--- a/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamCnvSvc.h
+++ b/HLT/Event/TrigByteStreamCnvSvc/src/TrigByteStreamCnvSvc.h
@@ -6,14 +6,11 @@
#define TRIGBYTESTREAMCNVSVC_H
#include "ByteStreamCnvSvc/ByteStreamCnvSvc.h"
-#include <TH1I.h>
-#include <TH1F.h>
-#include <TH2F.h>
+#include "AthenaMonitoringKernel/Monitored.h"
// Forward declarations
class StoreGateSvc;
class IROBDataProviderSvc;
-class ITHistSvc;
/** @class TrigByteStreamCnvSvc
* @brief A ByteStreamCnvSvc implementation for online use
@@ -33,7 +30,6 @@ public:
// ------------------------- IService methods --------------------------------
virtual StatusCode initialize() override;
- virtual StatusCode start() override;
virtual StatusCode finalize() override;
// ------------------------- IConversionSvc methods --------------------------
@@ -46,35 +42,16 @@ public:
virtual StatusCode commitOutput(const std::string& outputFile, bool do_commit) override;
private:
- // ------------------------- Helper methods ---------------------------
+ // ------------------------- Helper methods ----------------------------------
/// Print contents of m_rawEventWrite
void printRawEvent();
/// Fill histograms from contents of a FullEventFragment
void monitorRawEvent(const std::unique_ptr<uint32_t[]>& rawEventPtr) const;
- /// Register monitoring histograms with THistSvc
- void bookHistograms();
- // ------------------------- Service handles ---------------------------
- ServiceHandle<StoreGateSvc> m_evtStore; //< Event store
- ServiceHandle<IROBDataProviderSvc> m_robDataProviderSvc; //< ROB Data Provider
- ServiceHandle<ITHistSvc> m_THistSvc; //< Histogramming service
-
- // ------------------------- Monitoring histograms ---------------------------
- TH1I* m_histOnlineErrorCode{nullptr}; //< Histogram of online error codes
- TH1F* m_histStreamTags{nullptr}; //< Histogram of stream tags
- TH2F* m_histStreamTagsCorr{nullptr}; //< Histogram of stream tags correlation
- TH1F* m_histStreamTagsNum{nullptr}; //< Histogram of number of stream tags
- TH1F* m_histStreamTagsType{nullptr}; //< Histogram of stream tags type
- TH1F* m_histPebRobsNum{nullptr}; //< Histogram of the number of ROBs in PEB stream tag
- TH1F* m_histPebSubDetsNum{nullptr}; //< Histogram of the number of SubDetectors in PEB stream tag
- TH1F* m_histPebSubDetsFromRobList{nullptr}; //< Histogram of SubDetectors from ROB list in PEB stream tag
- TH1F* m_histPebSubDetsFromSubDetList{nullptr}; //< Histogram of SubDetectors from SubDetector list in PEB stream tag
- TH2F* m_histResultSizeByModule{nullptr}; //< Histogram of HLT result size per module ID
- TH2F* m_histResultSizeByStream{nullptr}; //< Histogram of HLT result size per stream
- TH1F* m_histResultSizeTotal{nullptr}; //< Histogram of total HLT result size (all modules)
- TH1F* m_histResultSizeFullEvFrag{nullptr}; //< Histogram of the size of FullEventFragment sent from HLT to DataCollector
- TH1F* m_histEventDoneTime{nullptr}; //< Histogram of the time taken by the eventDone call
- TH1F* m_histEventDoneTimeER{nullptr}; //< Histogram of the time taken by the eventDone call (extended range)
+ // ------------------------- Service / Tool handles --------------------------
+ ServiceHandle<StoreGateSvc> m_evtStore {this, "EventStore", "StoreGateSvc"};
+ ServiceHandle<IROBDataProviderSvc> m_robDataProviderSvc {this, "ROBDataProvider", "ROBDataProviderSvc"};
+ ToolHandle<GenericMonitoringTool> m_monTool {this, "MonTool", "" , "Monitoring tool"};
};
#endif // TRIGBYTESTREAMCNVSVC_H
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/L2muCalibTest.cxx b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/L2muCalibTest.cxx
index 1742ca3f8fbf75e489f6d92b3777f259888169f6..2a724a9fcc2a611bd9c91b5f410bf1928c943bcf 100755
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/L2muCalibTest.cxx
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExL2muCalibTest/src/L2muCalibTest.cxx
@@ -88,11 +88,11 @@ StatusCode L2muCalibTest::initialize(){
ATH_MSG_INFO("Dump of the property catalogue.... ");
std::vector<std::string> clients = m_jobOptionsSvc->getClients();
std::vector<std::string>::iterator cit;
- std::vector<const Property*>::const_iterator pit;
+ std::vector<const Gaudi::Details::PropertyBase*>::const_iterator pit;
for( cit = clients.begin(); cit != clients.end(); cit++ ) {
ATH_MSG_INFO(" Properties of " << *cit << ": ";
- const std::vector<const Property*>* properties = m_jobOptionsSvc->getProperties(*cit);
+ const std::vector<const Gaudi::Details::PropertyBase*>* properties = m_jobOptionsSvc->getProperties(*cit);
for( pit = properties->begin(); pit != properties->end(); pit++ ) {
log << (*pit)->name();
if( (pit+1) != properties->end()) log << ", ";
@@ -112,11 +112,11 @@ StatusCode L2muCalibTest::initialize(){
// Find the Data Flow application name
bool df_found = false;
- const std::vector<const Property*>* dataFlowProps = m_jobOptionsSvc->getProperties("DataFlowConfig");
+ const std::vector<const Gaudi::Details::PropertyBase*>* dataFlowProps = m_jobOptionsSvc->getProperties("DataFlowConfig");
if ( dataFlowProps ) {
ATH_MSG_INFO(" Properties available for 'DataFlowConfig': number = " << dataFlowProps->size());
ATH_MSG_INFO(" --------------------------------------------------- ");
- for ( std::vector<const Property*>::const_iterator cur = dataFlowProps->begin();
+ for ( std::vector<const Gaudi::Details::PropertyBase*>::const_iterator cur = dataFlowProps->begin();
cur != dataFlowProps->end(); cur++) {
ATH_MSG_INFO((*cur)->name() << " = " << (*cur)->toString());
// the application name is found
diff --git a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
index e7d41a6c2208a763c258a4beb0dc51e66fe15595..9a328f352eb55bde3d2767460c2dc15dc4f2d1cf 100644
--- a/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
+++ b/HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
@@ -129,7 +129,7 @@ def make_l1_seq(options=default_options):
# This should be done by the L1Decoder configuration in new-style job options (with component accumulator)
from TrigConfigSvc.TrigConfigSvcCfg import getL1ConfigSvc
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- svcMgr += getL1ConfigSvc()
+ svcMgr += getL1ConfigSvc(ConfigFlags)
# Initialise L1 decoding tools
from L1Decoder.L1DecoderConf import CTPUnpackingTool
diff --git a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
index a72394136831af9ab62dd751ba70617fa9a34204..d54b3ec225b09b6b7607be8bd23c30ca70be2e2c 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
+++ b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
@@ -33,7 +33,7 @@
#include "GaudiKernel/IAlgManager.h"
#include "GaudiKernel/IAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
#include <sstream>
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
index 4ea12222f7e83875bb08ef41e72cb2a2ae9851cd..ee0c6cad6bd22a610d1ed46f88433110afd645f5 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
@@ -106,8 +106,8 @@ def setupCommonServices():
svcMgr.EventPersistencySvc.CnvServices += [ "DetDescrCnvSvc" ]
# Online services for ByteStream input/output
- from TrigByteStreamCnvSvc.TrigByteStreamCnvSvcConf import TrigByteStreamCnvSvc, TrigEventSelectorByteStream
- from TrigByteStreamCnvSvc.TrigByteStreamCnvSvcConfig import TrigByteStreamInputSvc
+ from TrigByteStreamCnvSvc.TrigByteStreamCnvSvcConf import TrigEventSelectorByteStream
+ from TrigByteStreamCnvSvc.TrigByteStreamCnvSvcConfig import TrigByteStreamInputSvc, TrigByteStreamCnvSvc
svcMgr += TrigByteStreamCnvSvc("ByteStreamCnvSvc") # this name is hard-coded in some converters
svcMgr.EventPersistencySvc.CnvServices += [ "ByteStreamCnvSvc" ]
svcMgr += TrigByteStreamInputSvc("ByteStreamInputSvc")
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
index 86286ece89803281541b1110befe5ca3134a2676..6f75db450c8ccf8a1f304f8fe70c13d8129a709a 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltROBDataProviderSvc.cxx
@@ -109,12 +109,12 @@ StatusCode HltROBDataProviderSvc::initialize()
if ((p_jobOptionsSvc.retrieve()).isFailure()) {
ATH_MSG_ERROR("Could not find JobOptionsSvc");
} else {
- const std::vector<const Property*>* dataFlowProps = p_jobOptionsSvc->getProperties("DataFlowConfig");
+ const std::vector<const Gaudi::Details::PropertyBase*>* dataFlowProps = p_jobOptionsSvc->getProperties("DataFlowConfig");
if(!dataFlowProps)
ATH_MSG_ERROR("Could not find DataFlowConfig properties");
else
{
- for ( const Property* cur : *dataFlowProps ) {
+ for ( const Gaudi::Details::PropertyBase* cur : *dataFlowProps ) {
// the enabled ROB list is found
if ( cur->name() == "DF_Enabled_ROB_IDs" ) {
if (m_enabledROBs.assign(*cur)) {
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
index 7024f8995696e70262afdd5e7028eed6ea48911a..eea8a1f06a7a4b5c9ade510457872d0a30a024ee 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMessageSvc.h
@@ -23,7 +23,7 @@
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/IMessageSvc.h"
#include "GaudiKernel/Message.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/StatusCode.h"
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
index 7212c3805b53502dc88555855c1ba0e5472c918f..ef10e7d4be3456bd407c18458bac32cf8fd38b76 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
@@ -4,6 +4,7 @@
#include "PixelCablingCondAlg.h"
#include "GaudiKernel/EventIDRange.h"
+#include "AthenaKernel/IOVInfiniteRange.h"
#include <iostream>
#include <fstream>
@@ -14,6 +15,7 @@
#include "Identifier/IdContext.h"
#include "CoralBase/Blob.h"
+
PixelCablingCondAlg::PixelCablingCondAlg(const std::string& name, ISvcLocator* pSvcLocator):
::AthReentrantAlgorithm(name, pSvcLocator)
{
@@ -134,11 +136,6 @@ StatusCode PixelCablingCondAlg::execute(const EventContext& ctx) const {
// Construct the output Cond Object and fill it in
std::unique_ptr<PixelCablingCondData> writeCdo(std::make_unique<PixelCablingCondData>());
- const EventIDBase::number_type UNDEFNUM = EventIDBase::UNDEFNUM;
- const EventIDBase::event_number_t UNDEFEVT = EventIDBase::UNDEFEVT;
- EventIDRange rangeW (EventIDBase (0, UNDEFEVT, UNDEFNUM, 0, 0),
- EventIDBase (UNDEFNUM-1, UNDEFEVT, UNDEFNUM, 0, 0));
-
// Signed values
int barrel_ec, eta_module;
@@ -171,13 +168,10 @@ StatusCode PixelCablingCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_FATAL("Null pointer to the read conditions object");
return StatusCode::FAILURE;
}
- // Get the validitiy range
- if (not readHandle.range(rangeW)) {
- ATH_MSG_FATAL("Failed to retrieve validity range for " << readHandle.key());
- return StatusCode::FAILURE;
- }
- ATH_MSG_INFO("Size of AthenaAttributeList " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
- ATH_MSG_INFO("Range of input is " << rangeW);
+ writeHandle.addDependency(readHandle);
+
+ ATH_MSG_DEBUG("Size of AthenaAttributeList " << readHandle.fullKey() << " readCdo->size()= " << readCdo->size());
+ ATH_MSG_DEBUG("Range of input is " << readHandle.getRange());
const coral::Blob& blob_cabling=(*readCdo)["CablingMapData"].data<coral::Blob>();
const char* p_cabling = static_cast<const char*>(blob_cabling.startingAddress());
@@ -188,7 +182,7 @@ StatusCode PixelCablingCondAlg::execute(const EventContext& ctx) const {
instr.str(std::string(p_cabling,blob_cabling.size()));
}
else {
- std::string filename = PathResolverFindCalibFile(moduleData->getCablingMapFileName());
+ const std::string filename = PathResolverFindCalibFile(moduleData->getCablingMapFileName());
if (filename.size()==0) {
ATH_MSG_FATAL("Mapping File: " << moduleData->getCablingMapFileName() << " not found!");
return StatusCode::FAILURE;
@@ -196,6 +190,8 @@ StatusCode PixelCablingCondAlg::execute(const EventContext& ctx) const {
std::ifstream fin(filename.c_str());
if (!fin) { return StatusCode::FAILURE; }
instr << fin.rdbuf();
+
+ writeHandle.addDependency(IOVInfiniteRange::infiniteRunLB()); //When reading from file, use infinite IOV
ATH_MSG_DEBUG("Refilled pixel cabling from file \"" << moduleData->getCablingMapFileName() << "\"");
}
@@ -300,11 +296,11 @@ StatusCode PixelCablingCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("Size of ROD readoutspeed map: " << rodReadoutMap.size());
writeCdo->set_readout_map(rodReadoutMap);
- if (writeHandle.record(rangeW, std::move(writeCdo)).isFailure()) {
- ATH_MSG_FATAL("Could not record PixelCablingCondData " << writeHandle.key() << " with EventRange " << rangeW << " into Conditions Store");
+ if (writeHandle.record(std::move(writeCdo)).isFailure()) {
+ ATH_MSG_FATAL("Could not record PixelCablingCondData " << writeHandle.key() << " with EventRange " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::FAILURE;
}
- ATH_MSG_DEBUG("recorded new CDO " << writeHandle.key() << " with range " << rangeW << " into Conditions Store");
+ ATH_MSG_DEBUG("recorded new CDO " << writeHandle.key() << " with range " << writeHandle.getRange() << " into Conditions Store");
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
index 31a63fcae8c0b197201c11abdf6b730b517fd62f..577137b2e779ec98cf24ac6f4bc4d7e2559464ae 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
@@ -24,7 +24,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <map>
#include <stdint.h>
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h
index baa8ae82c44b100936c4900bfee5a41d4781db26..72d5cf388535116fe676c0315932937d2434ca11 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h
@@ -24,7 +24,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelChargeCalibCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.h
index 4d762b8985f4f8952e17629e44cbc5cce2751ce3..fd251509c4b5929106ce916b0521f016bdd49fcf 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeLUTCalibCondAlg.h
@@ -24,7 +24,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelChargeLUTCalibCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
index ebb5a04ad2771622fa90fd8b46ab5ba840cb9657..507ddcd915a949fa683b1b1060b2fd9a071e7564 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
@@ -21,7 +21,7 @@
#include "PixelConditionsData/PixelModuleData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
class PixelConfigCondAlg : public AthReentrantAlgorithm {
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.h
index b53d9c22bb090bdeed7fa94afaf03c332c999a09..46a0518006f2a1b931d04639cd559a7ca6a2e878 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondHVAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDCSCondHVAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
index 9299af3290093ed3bf9a41c8211d4e29a692a846..6555a6287cab7385a6ef9ff49273eca41e5bc8fd 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStateAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDCSCondStateAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
index fe94f516b9c0efafee2c7e2dd6a63aac49bb45c9..c50e26c24fc62292e613856621f833ff297eaf21 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondStatusAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDCSCondStatusAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.h
index 6f392dc81c1a4cdd2e464f0ef3b4604bf414e040..4b1d35a66ebe286b24b0b4c0c1a3251b44d4caf6 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDCSCondTempAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDCSCondTempAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
index cd76863789ce164e50de63c5ba3ac4798f5c4bc1..c4e2ff1b5a6c864542ef4a816d1db59a2d5f7a81 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDeadMapCondAlg.h
@@ -21,7 +21,7 @@
#include "PixelConditionsData/PixelDeadMapCondData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDeadMapCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDistortionAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDistortionAlg.h
index 17fa99956bda996e213cacb609bdf69cfb05be9e..3ed58ff2ecf4820dbebfe1893753b466e4f4254c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDistortionAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelDistortionAlg.h
@@ -24,7 +24,7 @@
#include "AthenaKernel/IAthRNGSvc.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelDistortionAlg : public AthAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h
index cdb463b0d8f4ec139f304d5af94c2f0ebda5da48..fa87f022cfeabc7a1d63c91151cf941ac9391a64 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h
@@ -21,7 +21,7 @@
#include "PixelConditionsData/PixelHitDiscCnfgData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelHitDiscCnfgAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelOfflineCalibCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelOfflineCalibCondAlg.h
index c2a600172eea7e04076b80ed177291b397b8cb18..0f4fd31ce3a489b5f1a118682be433c210fc5b0c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelOfflineCalibCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelOfflineCalibCondAlg.h
@@ -20,7 +20,7 @@
#include "PixelConditionsData/PixelOfflineCalibData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelOfflineCalibCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h
index afc8034ec6fb65ce216a27e3539ca68c2782f8b5..8021f2d950da4ae5036b6f47cce65c2e361cba3c 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h
@@ -20,7 +20,7 @@
#include "PixelConditionsData/PixelReadoutSpeedData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelReadoutSpeedAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
index 1285b56fae4c37812f5be971f8ab6db95eecfb24..77e01c616b872f20302efc3acc74ea3ce38da126 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelTDAQCondAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixelTDAQCondAlg : public AthReentrantAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixeldEdxAlg.h b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixeldEdxAlg.h
index 8d3f29a6b61aa1664ff67d272b8e1d66efbf4d8d..2a1943c9e4c01c44f511bc80628e661171dfdb02 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixeldEdxAlg.h
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixeldEdxAlg.h
@@ -23,7 +23,7 @@
#include "InDetIdentifier/PixelID.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class PixeldEdxAlg : public AthAlgorithm {
public:
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.h
index 5c64fe2f621606d50c5963b4504c5efbbc2d43fd..5d806321532b06bb2556387ad7f4205205640966 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConditionsParameterCondAlg.h
@@ -16,7 +16,7 @@
#include "SCT_Cabling/ISCT_CablingTool.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_ConditionsParameterCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
index fc6d40baafd689c52c2f03d30e24634b4e5fcaf7..3c28e48000d229199aab217a723d485030f66a40 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsHVCondAlg.h
@@ -15,7 +15,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_DCSConditionsHVCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
index 7afb429279f543f0d61144351330b11c093d118e..68f5459642fbefc3fe2551d3a3d58ff895bc48f1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsStatCondAlg.h
@@ -16,7 +16,7 @@
#include "SCT_ConditionsData/SCT_DCSStatCondData.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_DCSConditionsStatCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
index 31e9762ed7e2ccfeb5c41232506b72ea6fe737b6..60344684e1e834539dc7d20c19f941cdead94eb3 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DCSConditionsTempCondAlg.h
@@ -15,7 +15,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_DCSConditionsTempCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_FlaggedConditionTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_FlaggedConditionTestAlg.cxx
index 9671e1a4c05d9e0232f3ed080af201536207d473..e84e9551a182ca599eed77e2a4a8743e2fc04b00 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_FlaggedConditionTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_FlaggedConditionTestAlg.cxx
@@ -33,7 +33,7 @@ StatusCode SCT_FlaggedConditionTestAlg::execute(const EventContext& ctx) const {
ATH_MSG_ALWAYS("------------------------------------------------------------");
ATH_MSG_ALWAYS(" numBadIds " << m_flaggedTool->numBadIds(ctx));
const SCT_FlaggedCondData* badIds{m_flaggedTool->getBadIds(ctx)};
- for (const std::pair<IdentifierHash, std::string>& badId : *badIds) {
+ for (const std::pair<const IdentifierHash, std::string>& badId : *badIds) {
ATH_MSG_ALWAYS(" Wafer hash " << badId.first << " reason " << badId.second);
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.h
index a4485d7c95d4f49377ee60df1e8e8c93db63a0f9..5bceda668f4d46cd6b330fd0a566fca95772307e 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ModuleVetoCondAlg.h
@@ -15,7 +15,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class SCT_ModuleVetoCondAlg : public AthReentrantAlgorithm
{
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
index ba692aa027f104c0cc1e1684cfab37f9bd3ebdd1..c074d512ece885885564920b2f0b295c784cd221 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
@@ -12,7 +12,7 @@
// Include Gaudi classes
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Include Athena classes
#include "StoreGate/ReadCondHandleKey.h"
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
index f6415cc34da3a41e99273674d9a3206f0615f63b..559def8a43e08981cb0fb252b6cb39511be9c612 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
@@ -18,7 +18,7 @@
// Include Gaudi classes
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Forward declarations
class SCT_ID;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
index 9aa5451676836a793c48a2983fb2645a1b748e88..c3af5b1b5308b4372be90c020067536f7df059ed 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.h
@@ -18,7 +18,7 @@
#include "SCT_ConditionsData/SCT_AllGoodStripInfo.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <map>
#include <vector>
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
index 2cc101be4686b183173a2a01df0f3f9af3b4f25e..1fb88df93949fd2def4be1a88364a163a38e6e1b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.h
@@ -26,7 +26,7 @@
#include "SCT_ConditionsData/SCT_DCSStatCondData.h"
// Gaudi
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
// STL
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTActiveCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTActiveCondAlg.h
index c00834999bc1ad8f553704d151ea6015bd286e79..114f0d7c83b773ae83171899a73c24094a612032 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTActiveCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTActiveCondAlg.h
@@ -12,7 +12,7 @@
#include "TRT_ConditionsData/ActiveFraction.h"
#include "TRT_ConditionsServices/ITRT_StrawStatusSummaryTool.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TRT_ReadoutGeometry/TRT_DetElementContainer.h"
class TRT_ID;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHTCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHTCondAlg.h
index da9e82d9cd94dbd8863a01e584b277b3c852313a..a1953cdd1ead3bf82d5372274a2228c8b4d6456d 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHTCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHTCondAlg.h
@@ -10,7 +10,7 @@
#include "TRT_ConditionsData/HTcalculator.h"
#include "AthenaPoolUtilities/CondAttrListVec.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class TRTHTCondAlg : public AthAlgorithm
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h
index 137af71810fda7eef48b50e87436f96f6b95d290..fa3b37a347b2b9911f4e434665da6266c6a7cbe6 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTHWMapCondAlg.h
@@ -12,7 +12,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TRT_ConditionsData/HWMap.h"
class TRTHWMapCondAlg : public AthAlgorithm
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h
index afec6df0873ae2dc6b0d3b94f8bf078a12ccf777..47616fdf2c46d3faca16730246c0cfbdb4085839 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTPhaseCondAlg.h
@@ -11,7 +11,7 @@
#include "TRT_ConditionsData/AverageT0.h"
#include "TRT_ConditionsServices/ITRT_CalDbTool.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class TRT_ID;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawCondAlg.h
index 82de377a6f3bc15e5397cac248c58af489823360..caeb927bbed5a1272f1240c6ebbbd4add50b7160 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTStrawCondAlg.h
@@ -12,7 +12,7 @@
#include "TRT_ConditionsData/AliveStraws.h"
#include "TRT_ConditionsServices/ITRT_StrawStatusSummaryTool.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TRT_ReadoutGeometry/TRT_DetElementContainer.h"
class TRT_ID;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTToTCondAlg.h b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTToTCondAlg.h
index 0d5bee1aa26d6ad512d30e3a11295b0b41d54706..2ab12c34285072d8891489a5fed2e6f23f186e52 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTToTCondAlg.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsAlgs/src/TRTToTCondAlg.h
@@ -14,7 +14,7 @@
#include "AthenaPoolUtilities/CondAttrListVec.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TRT_ConditionsData/TRTDedxcorrection.h"
class TRTToTCondAlg : public AthAlgorithm
diff --git a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
index b64a1fe6a64790da73775f80d5c2d0dd60d613ec..d14bcad6591e00433935ae495335dd24516ab261 100644
--- a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
@@ -23,14 +23,10 @@ def InDetTrackSummaryHelperToolCfg(flags, name='InDetTrackSummaryHelperTool', **
result.addPublicTool(CompFactory.InDet.InDetTrackSummaryHelperTool(name, **kwargs), primary=True)
return result
-def InDetTrackHoleSearchToolCfg(flags, name = 'InDetHoleSearchTool', **kwargs):
+def InDetBoundaryCheckToolCfg(flags, name='InDetBoundaryCheckTool', **kwargs):
result = ComponentAccumulator()
- if 'Extrapolator' not in kwargs:
- tmpAcc = InDetExtrapolatorCfg(flags)
- kwargs.setdefault("Extrapolator", tmpAcc.getPrimary())
- result.merge(tmpAcc)
- if ('SctSummaryTool' not in kwargs):
+ if 'SctSummaryTool' not in kwargs:
if flags.Detector.SCTOn:
tmpAcc = InDetSCT_ConditionsSummaryToolCfg(flags)
kwargs.setdefault("SctSummaryTool", tmpAcc.popPrivateTools())
@@ -43,11 +39,29 @@ def InDetTrackHoleSearchToolCfg(flags, name = 'InDetHoleSearchTool', **kwargs):
kwargs.setdefault("PixelLayerTool", tmpAcc.getPrimary())
result.merge(tmpAcc)
+ kwargs.setdefault("UsePixel", flags.Detector.PixelOn)
+ kwargs.setdefault("UseSCT", flags.Detector.SCTOn)
+
+ indet_boundary_check_tool = CompFactory.InDet.InDetBoundaryCheckTool(name, **kwargs)
+ result.setPrivateTools(indet_boundary_check_tool)
+ return result
+
+
+def InDetTrackHoleSearchToolCfg(flags, name = 'InDetHoleSearchTool', **kwargs):
+ result = ComponentAccumulator()
+ if 'Extrapolator' not in kwargs:
+ tmpAcc = InDetExtrapolatorCfg(flags)
+ kwargs.setdefault("Extrapolator", tmpAcc.getPrimary())
+ result.merge(tmpAcc)
+
+ if 'BoundaryCheckTool' not in kwargs:
+ tmpAcc = InDetBoundaryCheckToolCfg(flags)
+ kwargs.setdefault('BoundaryCheckTool', tmpAcc.popPrivateTools())
+ result.merge(tmpAcc)
+
if flags.Beam.Type == "cosmics" :
kwargs.setdefault("Cosmics", True)
- kwargs.setdefault( "usePixel" , flags.Detector.PixelOn)
- kwargs.setdefault( "useSCT" , flags.Detector.SCTOn)
kwargs.setdefault( "CountDeadModulesAfterLastHit" , True)
indet_hole_search_tool = CompFactory.InDet.InDetTrackHoleSearchTool(name, **kwargs)
@@ -408,7 +422,7 @@ def SCT_TdaqEnabledCondAlgCfg(flags, name="SCT_TdaqEnabledCondAlg", **kwargs):
result.merge( addFolders(flags, [folder], detDb="TDAQ", className="CondAttrListCollection") )
acc = SCT_CablingToolCfg(flags)
- kwargs.setdefault( "SCT_CablingTool", acc.popPrivateTool() )
+ kwargs.setdefault( "SCT_CablingTool", acc.popPrivateTools() )
result.merge(acc)
result.addCondAlgo( CompFactory.SCT_TdaqEnabledCondAlg(name=name, **kwargs) )
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/PixelGeoModel/IBLParameterSvc.h b/InnerDetector/InDetDetDescr/PixelGeoModel/PixelGeoModel/IBLParameterSvc.h
index c9fe48584d07e290fef08fc5271fd36b4061143a..2903a58153b32e37bc699b52b3e16b08cdee4450 100644
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/PixelGeoModel/IBLParameterSvc.h
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/PixelGeoModel/IBLParameterSvc.h
@@ -15,7 +15,7 @@
#include "PixelGeoModel/IIBLParameterSvc.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.h
index c8c85adba0c97dc4561fefec764cc92b2058291f..05c5f05704c42703a9e237470557df7332fb57e6 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/EnergyDepositionTool.h
@@ -15,7 +15,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "CLHEP/Random/RandomEngine.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "HitManagement/TimedHitPtr.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
index e588da71f560cd702dbb9b6830d7c0fa375a87af..66dadbf42c96c030ab07a0cb5ca786a547de54ac 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/FrontEndSimTool.h
@@ -6,7 +6,7 @@
#define PIXELDIGITIZATION_FrontEndSimTool_H
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "CLHEP/Random/RandomEngine.h"
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/RadDamageUtil.h b/InnerDetector/InDetDigitization/PixelDigitization/src/RadDamageUtil.h
index cf9729d43f3f01009c95cafa06c36f9c2119fecd..fba016124e83d3b62b65eb88bd10a2e378c726d7 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/RadDamageUtil.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/RadDamageUtil.h
@@ -14,7 +14,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Service.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "SiDigitization/SiChargedDiodeCollection.h"
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx
index 9291b8009296bfe51e697cd68226084704aa1f58..ea71b48bc6fbd8dfc87d95d69297e548b62427c8 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.cxx
@@ -490,7 +490,7 @@ StatusCode SCT_DigitizationTool::processBunchXing(int bunchXing,
// =========================================================================
// property handlers
// =========================================================================
-void SCT_DigitizationTool::SetupRdoOutputType(Property &) {
+void SCT_DigitizationTool::SetupRdoOutputType(Gaudi::Details::PropertyBase &) {
}
// Does nothing, but required by Gaudi
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.h b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.h
index 8cbb364564d84d70a05b9a235fa90f8de25129bd..2f49b7bfc93808ece0d2a5f53590460b5f26e361 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.h
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/src/SCT_DigitizationTool.h
@@ -116,7 +116,7 @@ private:
/**
@brief Called when m_WriteSCT1_RawData is altered. Does nothing, but required by Gaudi.
*/
- void SetupRdoOutputType(Property&);
+ void SetupRdoOutputType(Gaudi::Details::PropertyBase&);
FloatProperty m_tfix{this, "FixedTime", -999., "Fixed time for Cosmics run selection"};
BooleanProperty m_enableHits{this, "EnableHits", true, "Enable hits"};
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
index 20f9493414f8aa5153d05ffec31f3b23d8ac7e8e..1ad7e645715af8a941645d7fccc4f2a0fc124aac 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
@@ -42,7 +42,7 @@ atlas_install_joboptions( share/*.py )
find_package( AthenaPoolUtilitiesTest )
if( ATHENAPOOLUTILITIESTEST_FOUND )
set( INDETEVENTATHENAPOOL_REFERENCE_TAG
- InDetEventAthenaPoolReference-01-00-00 )
+ InDetEventAthenaPoolReference-02-00-00 )
run_tpcnv_legacy_test( InDetEventTPCnv_16.6.2.1 ESD-16.6.2.1
REFERENCE_TAG ${INDETEVENTATHENAPOOL_REFERENCE_TAG} )
else()
diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/VxSplitValTemplate.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/VxSplitValTemplate.py
index 7db9e525c08ffead89ddf5d269c35e61a8418843..6e30e669d6d1392b5e4037bfd7cd1a62e06ebaa4 100644
--- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/VxSplitValTemplate.py
+++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/VxSplitValTemplate.py
@@ -228,14 +228,20 @@ InDetPrdAssociationTool = InDet__InDetPRD_AssociationToolGangedPixels(name
ToolSvc += InDetPrdAssociationTool
if InDetFlags.doPrintConfigurables:
printfunc ( InDetPrdAssociationTool)
-
+
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+InDetBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="InDetBoundaryCheckTool",
+ UsePixel=DetFlags.haveRIO.pixel_on(),
+ UseSCT=DetFlags.haveRIO.SCT_on()
+)
+ToolSvc += InDetBoundaryCheckTool
+
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool",
Extrapolator = InDetExtrapolator,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on())
-InDetHoleSearchTool.SctSummaryTool = None
-
+ BoundaryCheckTool=InDetBoundaryCheckTool)
+
ToolSvc += InDetHoleSearchTool
if InDetFlags.doPrintConfigurables:
printfunc ( InDetHoleSearchTool)
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index 7eadfc2fc9d0b328aa048bcbe99a176bbf296550..ecd768873b242efdf91c18a9f87ebaa878f77f26 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -290,6 +290,12 @@ class doR3LargeD0(InDetFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = False
+class storeSeparateLargeD0Container(InDetFlagsJobProperty):
+ """Separate the LargeD0 container from the main track container"""
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = False
+
class useExistingTracksAsInput(InDetFlagsJobProperty):
"""Use already processed Track from a (D)ESD input file.
This flag is related with ProcessedESDTracks InDetKey """
@@ -506,6 +512,12 @@ class useZvertexTool(InDetFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = False
+class useActsPriVertexing(InDetFlagsJobProperty):
+ """ use ACTS primary vertexing """
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = False
+
class doSiSPSeededTrackFinder(InDetFlagsJobProperty):
""" use track finding in silicon """
statusOn = True
@@ -2372,6 +2384,8 @@ class InDetJobProperties(JobPropertyContainer):
print('* - primary vertexing cut setup : ',self.primaryVertexCutSetup())
if self.doPrimaryVertex3DFinding() :
print('* - use 3D seed finding')
+ if self.useActsPriVertexing():
+ print('* - use Acts primary vertex finding')
print('* - privtx cut level : ', self.priVtxCutLevel())
if self.doParticleCreation() :
print('* create TrackParticles')
@@ -2620,6 +2634,7 @@ _list_InDetJobProperties = [Enabled,
doLowPtLargeD0,
doLargeD0,
doR3LargeD0,
+ storeSeparateLargeD0Container,
useExistingTracksAsInput,
cutLevel,
priVtxCutLevel,
@@ -2656,6 +2671,7 @@ _list_InDetJobProperties = [Enabled,
trackFitterType,
doHolesOnTrack,
useZvertexTool,
+ useActsPriVertexing,
doSiSPSeededTrackFinder,
# doTRTExtension,
doTRTExtensionNew,
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
index 4f8c882d542cdfb7acfb4f97fc1abd4b9f20a0ac..8a54ef539b9d3bd36f947a98b64f037372598fb4 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetKeys.py
@@ -470,6 +470,12 @@ class ExtendedLargeD0Tracks(JobProperty):
allowedTypes = ['str']
StoredValue = 'ExtendedLargeD0Tracks'
+class ExtendedLargeD0TracksTruth(JobProperty):
+ """ Storegate key for new-tracking extended high-d0 tracks"""
+ statusOn = True
+ allowedTypes = ['str']
+ StoredValue = 'ExtendedLargeD0TracksTruthCollection'
+
class ProcessedESDTracks(JobProperty):
""" Storegate key for already processed tracks from ESD"""
statusOn = True
@@ -963,6 +969,12 @@ class xAODForwardTrackParticleContainer(JobProperty):
allowedTypes = ['str']
StoredValue = "InDetForwardTrackParticles"
+class xAODLargeD0TrackParticleContainer(JobProperty):
+ """xAOD TrackParticle from Forward Tracking"""
+ statusOn = True
+ allowedTypes = ['str']
+ StoredValue = "InDetLargeD0TrackParticles"
+
class xAODLowBetaTrackParticleContainer(JobProperty):
"""xAOD TrackParticle from Low Beta Finder"""
statusOn = True
@@ -1092,6 +1104,7 @@ jobproperties.InDetContainerKeys.add_JobProperty(ExtendedSLHCTracks)
jobproperties.InDetContainerKeys.add_JobProperty(ExtendedLowPtTracks)
jobproperties.InDetContainerKeys.add_JobProperty(ExtendedBeamGasTracks)
jobproperties.InDetContainerKeys.add_JobProperty(ExtendedLargeD0Tracks)
+jobproperties.InDetContainerKeys.add_JobProperty(ExtendedLargeD0TracksTruth)
jobproperties.InDetContainerKeys.add_JobProperty(ProcessedESDTracks)
jobproperties.InDetContainerKeys.add_JobProperty(ExtendedDetailedTracksTruth)
jobproperties.InDetContainerKeys.add_JobProperty(ExtendedTracksTruth)
@@ -1176,6 +1189,7 @@ jobproperties.InDetContainerKeys.add_JobProperty(xAODKshortVertexContainer)
jobproperties.InDetContainerKeys.add_JobProperty(xAODLambdaVertexContainer)
jobproperties.InDetContainerKeys.add_JobProperty(xAODLambdabarVertexContainer)
jobproperties.InDetContainerKeys.add_JobProperty(xAODForwardTrackParticleContainer)
+jobproperties.InDetContainerKeys.add_JobProperty(xAODLargeD0TrackParticleContainer)
jobproperties.InDetContainerKeys.add_JobProperty(xAODLowBetaTrackParticleContainer)
jobproperties.InDetContainerKeys.add_JobProperty(xAODPseudoTrackParticleContainer)
jobproperties.InDetContainerKeys.add_JobProperty(xAODPixelTrackParticleContainer)
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
index de8e47974b79935a896ebc1925a654d03e4dd15d..84f5ebc4b79abb4d858049f600c0f3190f606cb7 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
@@ -839,6 +839,27 @@ def_InDetSCT_ConditionsSummaryTool=None
def getInDetSCT_ConditionsSummaryTool() :
return def_InDetSCT_ConditionsSummaryTool
+@makePublicTool
+def getInDetBoundaryCheckTool(name="InDetBoundarySearchTool", **kwargs):
+ the_name = makeName(name, kwargs)
+ from AthenaCommon.DetFlags import DetFlags
+ from InDetRecExample.InDetJobProperties import InDetFlags
+
+ if 'SctSummaryTool' not in kwargs :
+ kwargs = setDefaults( kwargs, SctSummaryTool = getInDetSCT_ConditionsSummaryTool() if DetFlags.haveRIO.SCT_on() else None)
+
+ if 'PixelLayerTool' not in kwargs :
+ kwargs = setDefaults( kwargs, PixelLayerTool = getInDetTestPixelLayerTool())
+
+ kwargs = setDefaults(
+ kwargs,
+ UsePixel=DetFlags.haveRIO.pixel_on(),
+ UseSCT=DetFlags.haveRIO.SCT_on(),
+ )
+
+ from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+ return InDet__InDetBoundaryCheckTool(name=the_name, **kwargs)
+
@makePublicTool
def getInDetHoleSearchTool(name = 'InDetHoleSearchTool', **kwargs) :
the_name = makeName( name, kwargs)
@@ -848,18 +869,13 @@ def getInDetHoleSearchTool(name = 'InDetHoleSearchTool', **kwargs) :
if 'Extrapolator' not in kwargs :
kwargs = setDefaults( kwargs, Extrapolator = getInDetExtrapolator())
- if 'SctSummaryTool' not in kwargs :
- kwargs = setDefaults( kwargs, SctSummaryTool = getInDetSCT_ConditionsSummaryTool() if DetFlags.haveRIO.SCT_on() else None)
-
- if 'PixelLayerTool' not in kwargs :
- kwargs = setDefaults( kwargs, PixelLayerTool = getInDetTestPixelLayerTool())
+ if 'BoundaryCheckTool' not in kwargs :
+ kwargs = setDefaults( kwargs, BoundaryCheckTool= getInDetBoundaryCheckTool())
if InDetFlags.doCosmics :
kwargs = setDefaults( kwargs, Cosmics = True)
kwargs = setDefaults( kwargs,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on(),
CountDeadModulesAfterLastHit = True)
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
index 619dd1fbbcf78679ebc82d5eeb96abd92c544db9..2c45cf527b4253241031e26ddeb8dfdce8a5ce12 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
@@ -72,6 +72,7 @@ if InDetFlags.doMonitoringGlobal():
TrackCollection = InDetKeys.UnslimmedTracks()
+ from InDetTrackSelectionTool.InDetTrackSelectionToolConf import InDet__InDetTrackSelectionTool
InDetTrackSelectionToolGlobalMon_Baseline = InDet__InDetTrackSelectionTool(name = "InDetTrackSelectionToolGlobalMon_Baseline",
UseTrkTrackTools = True,
CutLevel = "TightPrimary",
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
index 16c6014dc09b44f3e71a7f34c4478804fcc72085..5b6012e177ae740bcf0402bf37ffc9bcc93e8cf6 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecLoadTools.py
@@ -896,16 +896,29 @@ if (InDetFlags.doVertexFinding() or InDetFlags.doVertexFindingForMonitoring()) o
#
# --- load adaptive multi primary vertex finder
#
- from InDetPriVxFinderTool.InDetPriVxFinderToolConf import InDet__InDetAdaptiveMultiPriVxFinderTool
- InDetPriVxFinderTool = InDet__InDetAdaptiveMultiPriVxFinderTool(
- name="InDetAdaptiveMultiPriVxFinderTool",
- SeedFinder=InDetVtxSeedFinder,
- VertexFitterTool=InDetVxFitterTool,
- TrackSelector=InDetTrackSelectorTool,
- useBeamConstraint=InDetFlags.useBeamConstraint(),
- selectiontype=0,
- TracksMaxZinterval=3, # mm
- do3dSplitting=InDetFlags.doPrimaryVertex3DFinding())
+ if not InDetFlags.useActsPriVertexing():
+ from InDetPriVxFinderTool.InDetPriVxFinderToolConf import InDet__InDetAdaptiveMultiPriVxFinderTool
+ InDetPriVxFinderTool = InDet__InDetAdaptiveMultiPriVxFinderTool(name = "InDetAdaptiveMultiPriVxFinderTool",
+ SeedFinder = InDetVtxSeedFinder,
+ VertexFitterTool = InDetVxFitterTool,
+ TrackSelector = InDetTrackSelectorTool,
+ useBeamConstraint = InDetFlags.useBeamConstraint(),
+ selectiontype = 0,
+ TracksMaxZinterval = 3,#mm
+ do3dSplitting = InDetFlags.doPrimaryVertex3DFinding())
+ else:
+ from ActsGeometry.ActsTrackingGeometryTool import ActsTrackingGeometryTool
+ from ActsPriVtxFinder.ActsPriVtxFinderConf import ActsAdaptiveMultiPriVtxFinderTool
+ actsTrackingGeometryTool = getattr(ToolSvc,"ActsTrackingGeometryTool")
+ actsExtrapolationTool = CfgMgr.ActsExtrapolationTool("ActsExtrapolationTool")
+ actsExtrapolationTool.TrackingGeometryTool = actsTrackingGeometryTool
+ InDetPriVxFinderTool = ActsAdaptiveMultiPriVtxFinderTool(name = "ActsAdaptiveMultiPriVtxFinderTool",
+ TrackSelector = InDetTrackSelectorTool,
+ useBeamConstraint = InDetFlags.useBeamConstraint(),
+ tracksMaxZinterval = 3,#mm
+ do3dSplitting = InDetFlags.doPrimaryVertex3DFinding(),
+ TrackingGeometryTool = actsTrackingGeometryTool,
+ ExtrapolationTool = actsExtrapolationTool)
else:
#
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
index dd419a0d6f4cb66a27b9f928dce4a96ff9d7fe1d..dbf37cc41ece47577e64b6245274aee2b177afe8 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRec_jobOptions.py
@@ -457,8 +457,11 @@ else:
# processing case, those tracks are not part of the re-tracking procedure)
if InDetFlags.useExistingTracksAsInput():
_dummy = InputCombinedInDetTracks.pop()
+
# --- add into list for combination
- InputCombinedInDetTracks += [ InDetLargeD0TRTExtension.ForwardTrackCollection()]
+ # Add tracks to standard track collection or a separate container?
+ if not InDetFlags.storeSeparateLargeD0Container():
+ InputCombinedInDetTracks += [ InDetLargeD0TRTExtension.ForwardTrackCollection()]
@@ -588,6 +591,13 @@ else:
#
# ------------------------------------------------------------
+ if InDetFlags.doForwardTracks():
+ # Add tracks that are not saved to the InputCombinedInDetTracks
+ InputForwardInDetTracks = []
+ InputForwardInDetTracks += InputCombinedInDetTracks
+ if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
+ InputForwardInDetTracks +=[ InDetLargeD0TRTExtension.ForwardTrackCollection()]
+
if InDetFlags.doForwardTracks() and InDetFlags.doSLHC():
if InDetFlags.doSLHCVeryForward():
if ('InDetNewTrackingCutsForwardTracks' not in dir()):
@@ -599,7 +609,7 @@ else:
# --- now run Si pattern for Low Pt
#
include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py")
- InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputCombinedInDetTracks,
+ InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputForwardInDetTracks,
InDetKeys.ResolvedForwardTracks(),
InDetKeys.SiSpSeededForwardTracks(),
InDetNewTrackingCutsForwardTracks,
@@ -619,7 +629,7 @@ else:
# --- now run Si pattern for Low Pt
#
include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py")
- InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputCombinedInDetTracks,
+ InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputForwardInDetTracks,
InDetKeys.ResolvedForwardTracks(),
InDetKeys.SiSpSeededForwardTracks(),
InDetNewTrackingCutsForwardTracks,
@@ -644,14 +654,14 @@ else:
# --- now run Si pattern for Low Pt
#
include ("InDetRecExample/ConfiguredNewTrackingSiPattern.py")
- InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputCombinedInDetTracks,
+ InDetForwardTracksSiPattern = ConfiguredNewTrackingSiPattern(InputForwardInDetTracks,
InDetKeys.ResolvedForwardTracks(),
InDetKeys.SiSpSeededForwardTracks(),
InDetNewTrackingCutsForwardTracks,
TrackCollectionKeys,
TrackCollectionTruthKeys)
- # --- do not add into list for combination YET
- # InputCombinedInDetTracks += [ InDetVeryLowPtSiPattern.SiTrackCollection() ]
+ # --- do not add into list for combination
+ # InputCombinedInDetTracks += [ InDetForwardTracksSiPattern.SiTrackCollection() ]
if InDetFlags.doSLHCConversionFinding() and InDetFlags.doSLHC():
#
@@ -684,8 +694,11 @@ else:
if InDetFlags.doTrackSegmentsDisappearing():
InputPixelInDetTracks = []
InputPixelInDetTracks += InputCombinedInDetTracks
+ # Add tracks that are not saved to the InputCombinedInDetTracks
if InDetFlags.doForwardTracks():
InputPixelInDetTracks +=[ InDetForwardTracksSiPattern.SiTrackCollection()]
+ if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
+ InputPixelInDetTracks +=[ InDetLargeD0TRTExtension.ForwardTrackCollection()]
# --- load cuts for pixel segment finding
if ('InDetNewTrackingCutsDisappearing' not in dir()):
printfunc ("InDetRec_jobOptions: InDetNewTrackingCutsDisappearing not set before - import them now")
@@ -928,7 +941,7 @@ else:
# InDetTruthTrackCreation.OutputLevel = VERBOSE
topSequence += InDetTruthTrackCreation
- if InDetFlags.doSplitReco() :
+ if InDetFlags.doSplitReco() or InDetFlags.doIdealPseudoTracking() :
# --- add the truth to the truth tracks ;-)
include ("InDetRecExample/ConfiguredInDetTrackTruth.py")
InDetTracksTruth = ConfiguredInDetTrackTruth(InDetKeys.PseudoTracks(),
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py
index 11a40dc38b27427e3ce3644c8e90f262a6663203..4ba37e42938bfda3c7957e871edbb85f4f18f8f7 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetxAODCreator.py
@@ -212,6 +212,11 @@ if InDetFlags.doPseudoTracking():
InDetKeys.xAODPseudoTrackParticleContainer(),
topSequence)
+
+if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
+ if doCreation :
+ createTrackParticles(InDetKeys.ExtendedLargeD0Tracks(), InDetKeys.ExtendedLargeD0TracksTruth(), InDetKeys.xAODLargeD0TrackParticleContainer(),topSequence)
+
if InDetFlags.doTrackSegmentsPixel() and InDetFlags.doParticleCreation():
if doCreation :
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py
index 934f7aeaab2d13b29d1aba204f290339eecaf0d5..e6832e723528ea39cb70e17d21d811a55dd2f9a3 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetAOD.py
@@ -38,6 +38,9 @@ if InDetFlags.doxAOD():
InDetAODList+=['xAOD::VertexAuxContainer#'+InDetKeys.xAODLambdabarVertexContainer()+'Aux.' + excludedVertexAuxData]
InDetAODList+=['xAOD::VertexContainer#'+InDetKeys.Conversions()]
InDetAODList+=['xAOD::VertexAuxContainer#'+InDetKeys.Conversions() +'Aux.' + excludedVertexAuxData]
+ if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
+ InDetAODList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODLargeD0TrackParticleContainer()]
+ InDetAODList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODLargeD0TrackParticleContainer()+'Aux.' + excludedAuxData]
if InDetFlags.doTrackSegmentsPixel():
InDetAODList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODPixelTrackParticleContainer()]
InDetAODList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODPixelTrackParticleContainer()+'Aux.' + excludedAuxData]
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py
index 9b514e5cfe4fab683a636a9a33a095d67847d1f8..5ad573951429de6859173516094790b2116bdb92 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py
@@ -175,6 +175,9 @@ if InDetFlags.doxAOD():
InDetESDList+=['xAOD::VertexContainer#'+InDetKeys.Conversions()]
InDetESDList+=['xAOD::VertexAuxContainer#'+InDetKeys.Conversions() +'Aux.' + excludedVertexAuxData]
+ if InDetFlags.doR3LargeD0() and InDetFlags.storeSeparateLargeD0Container():
+ InDetESDList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODLargeD0TrackParticleContainer()]
+ InDetESDList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODLargeD0TrackParticleContainer()+'Aux.' + excludedAuxData]
if InDetFlags.doTrackSegmentsPixel():
InDetESDList+=['xAOD::TrackParticleContainer#'+InDetKeys.xAODPixelTrackParticleContainer()]
InDetESDList+=['xAOD::TrackParticleAuxContainer#'+InDetKeys.xAODPixelTrackParticleContainer()+'Aux.' + excludedAuxData]
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index 11b940938dadcdad1c2283febee86cf2e5304846..cedfd5bd811585e4e3636ba8d9062b440bff8363 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -664,6 +664,16 @@ if InDetTrigFlags.loadSummaryTool():
if (InDetTrigFlags.doPrintConfigurables()):
print ( InDetTrigTestPixelLayerTool)
+ from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+ InDetTrigBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="InDetTrigBoundaryCheckTool",
+ UsePixel=DetFlags.haveRIO.pixel_on(),
+ UseSCT=DetFlags.haveRIO.SCT_on(),
+ SctSummaryTool = InDetTrigSCTConditionsSummaryTool,
+ PixelLayerTool=InDetTrigTestPixelLayerTool
+ )
+ ToolSvc += InDetTrigBoundaryCheckTool
+
#
# Loading Configurable HoleSearchTool
@@ -672,10 +682,7 @@ if InDetTrigFlags.loadSummaryTool():
InDetTrigHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetTrigHoleSearchTool",
Extrapolator = InDetTrigExtrapolator,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on(),
- SctSummaryTool = InDetTrigSCTConditionsSummaryTool,
- PixelLayerTool=InDetTrigTestPixelLayerTool,
+ BoundaryCheckTool=InDetTrigBoundaryCheckTool
)
#Commissioning = InDetTrigFlags.doCommissioning()) #renamed
InDetTrigHoleSearchTool.CountDeadModulesAfterLastHit = True
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
index c7b75cbfd7e9be2bb9e7cd218f102fa8b9fae948..6b600dd99928479f854cb3ed3bb461bc616ccc69 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
@@ -18,7 +18,7 @@ PURPOSE: Create a simple ntuple to perform EoverP studies with
// INCLUDE GAUDI HEADER FILES:
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include <algorithm>
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/TrackSummaryToolWorkaround.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/TrackSummaryToolWorkaround.py
index ee832c2c61adc3f7004c37500a6c863731631d2e..c589bb357c64fc53953358605719dec1cb327c62 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/python/TrackSummaryToolWorkaround.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/python/TrackSummaryToolWorkaround.py
@@ -75,12 +75,17 @@ def TrackSummaryToolWorkaround(flags):
CheckDeadRegions=True,
CheckDisabledFEs=True)
result.addPublicTool(InDetTestPixelLayerTool)
+ InDetBoundaryCheckTool = CompFactory.InDet.InDetBoundaryCheckTool(
+ name="InDetBoundaryCheckTool",
+ UsePixel=flags.Detector.GeometryPixel,
+ UseSCT=flags.Detector.GeometrySCT,
+ PixelLayerTool=InDetTestPixelLayerTool
+ )
+ result.addPublicTool(InDetBoundaryCheckTool)
InDetHoleSearchTool = CompFactory.InDet.InDetTrackHoleSearchTool(name = "InDetHoleSearchTool",
Extrapolator = InDetExtrapolator,
- usePixel = flags.Detector.GeometryPixel,
- useSCT = flags.Detector.GeometrySCT,
CountDeadModulesAfterLastHit = True,
- PixelLayerTool = InDetTestPixelLayerTool)
+ BoundaryCheckTool=InDetBoundaryCheckTool)
result.addPublicTool(InDetHoleSearchTool)
InDetPrdAssociationTool = CompFactory.InDet.InDetPRD_AssociationToolGangedPixels(name = "InDetPrdAssociationTool",
PixelClusterAmbiguitiesMapName = "PixelClusterAmbiguitiesMap",
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTMonitor_topOptions.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTMonitor_topOptions.py
index de531d151c97749409d9288ec80270443784ad68..482b645bea914022095c018c8bec10699edf3ab8 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTMonitor_topOptions.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTMonitor_topOptions.py
@@ -143,14 +143,22 @@ InDetSCT_FlaggedConditionTool = sct_FlaggedConditionToolSetup.getTool()
SCTHitEffMonTool.FlaggedConditionTool = InDetSCT_FlaggedConditionTool
SCTHitEffMonTool.ChronoTime = False
+
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+SCT_MonBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="SCT_MonBoundaryCheckTool",
+ SctSummaryTool=SCT_MonConditionsSummaryTool
+)
+ToolSvc += SCT_MonBoundaryCheckTool
+
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
SCT_MonHoleSearch = InDet__InDetTrackHoleSearchTool(name ="SCT_MonHoleSearch",
Extrapolator = InDetExtrapolator,
ExtendedListOfHoles = True,
Cosmics =InDetFlags.doCosmics(),
- SctSummaryTool=SCT_MonConditionsSummaryTool)
-
+ BoundaryCheckTool=SCT_MonBoundaryCheckTool)
+
ToolSvc += SCT_MonHoleSearch
if (InDetFlags.doPrintConfigurables()):
print SCT_MonHoleSearch
diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetPriVxFinder/InDetPriVxFinder.h b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetPriVxFinder/InDetPriVxFinder.h
index 905114c8fd399c0c080157ad6885ffcdbaa89a5f..e22abc87746931e68e7a91696c5909308b3c0bd0 100755
--- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetPriVxFinder/InDetPriVxFinder.h
+++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/InDetPriVxFinder/InDetPriVxFinder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -20,15 +20,17 @@
#ifndef INDETPRIVXFINDER_INDETPRIVXFINDER_H
#define INDETPRIVXFINDER_INDETPRIVXFINDER_H
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "TrkTrack/TrackCollection.h"
#include "xAODTracking/TrackParticleContainer.h"
#include "xAODTracking/VertexContainer.h"
#include "xAODTracking/VertexAuxContainer.h"
-
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+#include "InDetRecToolInterfaces/IVertexFinder.h"
+#include "TrkVertexFitterInterfaces/IVertexMergingTool.h"
+#include "TrkVertexFitterInterfaces/IVertexCollectionSortingTool.h"
/** Primary Vertex Finder.
InDetPriVxFinder uses the InDetPrimaryVertexFinderTool in the package
@@ -36,49 +38,37 @@
and records the returned VxContainer.
*/
-/* Forward declarations */
-
-namespace Trk
-{
- class IVertexMergingTool;
- class IVertexCollectionSortingTool;
-}
-
namespace InDet
-{
- class IVertexFinder;
-
- class InDetPriVxFinder : public AthAlgorithm
+{
+ class InDetPriVxFinder : public AthReentrantAlgorithm
{
public:
InDetPriVxFinder(const std::string &name, ISvcLocator *pSvcLocator);
- virtual ~InDetPriVxFinder();
- StatusCode initialize();
- StatusCode execute();
- StatusCode finalize();
+
+ virtual ~InDetPriVxFinder() = default;
- //Monitoring of the vertex variables
- void monitor_vertex( const std::string &prefix, xAOD::Vertex vertex );
-
+ // Gaudi algorithm hooks
+ virtual StatusCode initialize() override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
+ virtual StatusCode finalize() override;
private:
+
+ //Monitoring of the vertex variables
+ void monitor_vertex( const std::string &prefix, xAOD::Vertex vertex ) const;
+
SG::ReadHandleKey<TrackCollection> m_trkTracksName{this,"TrkTracksName","Tracks","Trk::Track Collection used in Vertexing"};
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_tracksName{this,"TracksName","InDetTrackParticles","xAOD::TrackParticle Collection used in Vertexing"};
SG::WriteHandleKey<xAOD::VertexContainer> m_vxCandidatesOutputName{this,"VxCandidatesOutputName","PrimaryVertices","Output Vertex Collection"};
- ToolHandle< IVertexFinder > m_VertexFinderTool;
- ToolHandle<Trk::IVertexMergingTool > m_VertexMergingTool;
- ToolHandle<Trk::IVertexCollectionSortingTool > m_VertexCollectionSortingTool;
-
- bool m_doVertexMerging;
- bool m_doVertexSorting;
- bool m_useTrackParticles;//use TrackParticles or Trk::Tracks as input
-
- // for summary output at the end
- unsigned int m_numEventsProcessed;
- unsigned int m_totalNumVerticesWithoutDummy;
-
+ ToolHandle< IVertexFinder > m_VertexFinderTool{this, "VertexFinderTool", "", "Primary vertex finder tool"};
+ ToolHandle<Trk::IVertexMergingTool > m_VertexMergingTool{this, "VertexMergingTool", "", "Vertex merging tool"};
+ ToolHandle<Trk::IVertexCollectionSortingTool > m_VertexCollectionSortingTool{this, "VertexCollectionSortingTool", "", "Vertex collection sorting tool"};
ToolHandle<GenericMonitoringTool> m_monTool{this, "PriVxMonTool", "", "Monitoring tool"};
+
+ BooleanProperty m_doVertexMerging{this, "doVertexMerging", false, "Do vertex merging"};
+ BooleanProperty m_doVertexSorting{this, "doVertexSorting", false, "Do vertex sorting"};
+ BooleanProperty m_useTrackParticles{this, "useTrackParticles", true, "Use track particles as input"};
};
}
#endif
diff --git a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx
index d508a6f4099afdb025b674bafbd1dedfa94ec4cf..a69afcffd895d0e3e7772d523bf94d248aaa9e8d 100755
--- a/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPriVxFinder/src/InDetPriVxFinder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -11,45 +11,21 @@
changes :
***************************************************************************/
#include "InDetPriVxFinder/InDetPriVxFinder.h"
-// forward declares
-#include "InDetRecToolInterfaces/IVertexFinder.h"
-#include "TrkVertexFitterInterfaces/IVertexMergingTool.h"
-#include "TrkVertexFitterInterfaces/IVertexCollectionSortingTool.h"
#include "xAODTracking/Vertex.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/TrackParticleAuxContainer.h"
+#include "AthenaMonitoringKernel/Monitored.h"
// normal includes
#include "TrkParticleBase/TrackParticleBaseCollection.h"
-#include "AthenaMonitoringKernel/Monitored.h"
-
namespace InDet
{
- InDetPriVxFinder::InDetPriVxFinder ( const std::string &n, ISvcLocator *pSvcLoc )
- : AthAlgorithm ( n, pSvcLoc ),
- m_VertexFinderTool ( "InDet::InDetPriVxFinderTool" ),
- m_VertexMergingTool( "Trk::VertexMergingTool" ),
- m_VertexCollectionSortingTool ("Trk::VertexCollectionSortingTool"),
- m_doVertexMerging(false),
- m_doVertexSorting(false),
- m_useTrackParticles(true),
- // for summary output at the end
- m_numEventsProcessed(0),
- m_totalNumVerticesWithoutDummy(0)
+InDetPriVxFinder::InDetPriVxFinder
+ (const std::string& name,ISvcLocator* pSvcLocator) : AthReentrantAlgorithm(name, pSvcLocator)
+ { }
- {
- declareProperty ( "VertexFinderTool",m_VertexFinderTool );
- declareProperty ( "VertexMergingTool",m_VertexMergingTool );
- declareProperty ( "VertexCollectionSortingTool",m_VertexCollectionSortingTool );
- declareProperty ( "doVertexMerging",m_doVertexMerging );
- declareProperty ( "doVertexSorting",m_doVertexSorting );
- declareProperty ( "useTrackParticles", m_useTrackParticles);
- }
-
- InDetPriVxFinder::~InDetPriVxFinder()
- {}
StatusCode InDetPriVxFinder::initialize()
{
@@ -64,7 +40,7 @@ namespace InDet
msg(MSG::INFO) << "Retrieved tool " << m_VertexFinderTool << endmsg;
}
- /*Get the Vertex Mergin Tool*/
+ /*Get the Vertex Merging Tool*/
if (m_doVertexMerging) {
if ( m_VertexMergingTool.retrieve().isFailure() )
{
@@ -93,23 +69,21 @@ namespace InDet
} else {
m_VertexCollectionSortingTool.disable();
}
+ if (!m_monTool.empty()) CHECK(m_monTool.retrieve());
ATH_CHECK(m_trkTracksName.initialize(!m_useTrackParticles));
ATH_CHECK(m_tracksName.initialize(m_useTrackParticles));
ATH_CHECK(m_vxCandidatesOutputName.initialize());
-
- if (!m_monTool.empty()) CHECK(m_monTool.retrieve());
msg(MSG::INFO) << "Initialization successful" << endmsg;
return StatusCode::SUCCESS;
}
- StatusCode InDetPriVxFinder::execute()
+ StatusCode InDetPriVxFinder::execute(const EventContext& ctx) const
{
- m_numEventsProcessed++;
- SG::WriteHandle<xAOD::VertexContainer> outputVertices (m_vxCandidatesOutputName);
+ SG::WriteHandle<xAOD::VertexContainer> outputVertices (m_vxCandidatesOutputName, ctx);
xAOD::VertexContainer* vertexContainer = 0;
xAOD::VertexAuxContainer* vertexAuxContainer = 0;
@@ -117,9 +91,10 @@ namespace InDet
= std::make_pair( vertexContainer, vertexAuxContainer );
if(m_useTrackParticles){
- SG::ReadHandle<xAOD::TrackParticleContainer> trackParticleCollection(m_tracksName);
+ SG::ReadHandle<xAOD::TrackParticleContainer> trackParticleCollection(m_tracksName, ctx);
if(trackParticleCollection.isValid()){
- vertexContainerPair = m_VertexFinderTool->findVertex ( trackParticleCollection.cptr() );
+
+ vertexContainerPair = m_VertexFinderTool->findVertex ( trackParticleCollection.cptr() );
}
else{
ATH_MSG_ERROR("No TrackParticle Collection with key "<<m_tracksName.key()<<" exists in StoreGate. No Vertexing Possible");
@@ -127,7 +102,7 @@ namespace InDet
}
}
else{
- SG::ReadHandle<TrackCollection> trackCollection(m_trkTracksName);
+ SG::ReadHandle<TrackCollection> trackCollection(m_trkTracksName, ctx);
if(trackCollection.isValid()){
vertexContainerPair = m_VertexFinderTool->findVertex ( trackCollection.cptr() );
}
@@ -174,7 +149,6 @@ namespace InDet
}
ATH_MSG_DEBUG("Successfully reconstructed " << myVertexContainerPair.first->size()-1 << " vertices (excluding dummy)");
- m_totalNumVerticesWithoutDummy += (myVertexContainerPair.first->size()-1);
}
ATH_CHECK(outputVertices.record(std::unique_ptr<xAOD::VertexContainer>(myVertexContainerPair.first),std::unique_ptr<xAOD::VertexAuxContainer>(myVertexContainerPair.second)));
@@ -196,16 +170,10 @@ namespace InDet
StatusCode InDetPriVxFinder::finalize()
{
- if (msgLvl(MSG::INFO))
- {
- msg() << "Summary from Primary Vertex Finder (InnerDetector/InDetRecAlgs/InDetPriVxFinder)" << endmsg;
- msg() << "=== " << m_totalNumVerticesWithoutDummy << " vertices recoed in " << m_numEventsProcessed << " events (excluding dummy)." << endmsg;
- if (m_numEventsProcessed!=0) msg() << "=== " << double(m_totalNumVerticesWithoutDummy)/double(m_numEventsProcessed) << " vertices per event (excluding dummy)." << endmsg;
- }
return StatusCode::SUCCESS;
}
- void InDetPriVxFinder::monitor_vertex( const std::string &prefix, xAOD::Vertex vertex ){
+ void InDetPriVxFinder::monitor_vertex( const std::string &prefix, xAOD::Vertex vertex ) const {
if (prefix == "allVertex"){
auto x = Monitored::Scalar<double>( "allVertexX", vertex.x() );
auto y = Monitored::Scalar<double>( "allVertexY", vertex.y() );
@@ -225,7 +193,5 @@ namespace InDet
auto mon = Monitored::Group(m_monTool, x, y, z, chi2, nDoF, NTracks );
}
}
-
-
} // end namespace InDet
diff --git a/InnerDetector/InDetRecTools/InDetBoundaryCheckTool/InDetBoundaryCheckTool/InDetBoundaryCheckTool.h b/InnerDetector/InDetRecTools/InDetBoundaryCheckTool/InDetBoundaryCheckTool/InDetBoundaryCheckTool.h
index d5b041ac01f2c6c09cb8ad6b0cb2e094e64ca456..4ca60caf55505839a7a05a3519b14fe8565f238b 100644
--- a/InnerDetector/InDetRecTools/InDetBoundaryCheckTool/InDetBoundaryCheckTool/InDetBoundaryCheckTool.h
+++ b/InnerDetector/InDetRecTools/InDetBoundaryCheckTool/InDetBoundaryCheckTool/InDetBoundaryCheckTool.h
@@ -66,15 +66,15 @@ namespace InDet {
const AtlasDetectorID *m_atlasId;
/** eta and phi tolerances **/
- Gaudi::Property<double> m_etaTol = 3.0;
- Gaudi::Property<double> m_phiTol = 3.0;
+ Gaudi::Property<double> m_etaTol{this, "ToleranceEta", 3.0};
+ Gaudi::Property<double> m_phiTol{this, "TolerancePhi", 3.0};
/** Control usage of pixel and SCT info */
- Gaudi::Property<bool> m_usePixel;
- Gaudi::Property<bool> m_useSCT;
+ Gaudi::Property<bool> m_usePixel{this, "UsePixel", true};
+ Gaudi::Property<bool> m_useSCT{this, "UseSCT", true};
/** Control check of bad SCT chip (should be false for ITk Strip) */
- Gaudi::Property<bool> m_checkBadSCT;
+ Gaudi::Property<bool> m_checkBadSCT{this, "CheckBadSCT", true};
};
}
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
index 23bf33cd1185ec8f11a69d3c0acd4258fb6a18cd..fc81066bb48265e88540844a8ddaad8e6c692a31 100644
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/CMakeLists.txt
@@ -5,29 +5,6 @@
# Declare the package name:
atlas_subdir( InDetConversionFinderTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Event/xAOD/xAODTracking
- GaudiKernel
- InnerDetector/InDetRecTools/InDetRecToolInterfaces
- Reconstruction/Particle
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkTrack
- PRIVATE
- Control/AthLinks
- InnerDetector/InDetRecEvent/InDetPrepRawData
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkMeasurementBase
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/VxVertex
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkTools/TrkToolInterfaces
- Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
- Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils )
-
# External dependencies:
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -38,9 +15,9 @@ atlas_add_library( InDetConversionFinderToolsLib
PUBLIC_HEADERS InDetConversionFinderTools
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces Particle TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack
+ LINK_LIBRARIES AthenaBaseComps xAODTracking GaudiKernel InDetRecToolInterfaces Particle TrkEventPrimitives TrkParameters TrkParticleBase TrkTrack TrkVertexSeedFinderUtilsLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthLinks InDetPrepRawData TrkSurfaces TrkMeasurementBase TrkRIO_OnTrack VxVertex
- TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib )
+ TrkExInterfaces TrkToolInterfaces TrkVertexFitterInterfaces )
atlas_add_component( InDetConversionFinderTools
src/components/*.cxx
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h
index 53b5ace5b53aa32781d7d3cb03c1beb12875bcd1..4b4c7a4ea00a17361833a82da287e476636096c8 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h
@@ -13,6 +13,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
#include "TrkToolInterfaces/ITrackHoleSearchTool.h"
+#include "TrkToolInterfaces/IBoundaryCheckTool.h"
#include "TrkEventPrimitives/ParticleHypothesis.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include "TrkParameters/TrackParameters.h"
@@ -111,33 +112,22 @@ namespace InDet
/** Pointer to Extrapolator AlgTool*/
ToolHandle< Trk::IExtrapolator > m_extrapolator;
-
- /** Handles to IConditionsSummaryTools for Pixels and SCT*/
- ToolHandle <IInDetConditionsTool> m_sctCondSummaryTool{this, "SctSummaryTool", "SCT_ConditionsSummaryTool/InDetSCT_ConditionsSummaryTool", "Tool to retrieve SCT Conditions summary"};
-
- ToolHandle< IInDetTestPixelLayerTool > m_pixelLayerTool;
-
- /** Handle for IGeoModelSvc to retrieve geo model information */
- ServiceHandle<IGeoModelSvc> m_geoModelSvc;
+ ToolHandle<Trk::IBoundaryCheckTool> m_boundaryCheckTool {
+ this,
+ "BoundaryCheckTool",
+ "InDet::InDetBoundaryCheckTool",
+ "Boundary checking tool for detector sensitivities"
+ };
/** Configure outwards hole search */
bool m_extendedListOfHoles,m_cosmic;
- /** Control usage of pixel, SCT and TRT info */
- bool m_usepix, m_usesct;
-
- /** Control check of bad SCT chip (should be false for ITk Strip) */
- bool m_checkBadSCTChip;
-
/** Min number of hits **/
int m_minSiHits;
/* searching for dead modules after the last measurement (needed for robustness of SW)*/
bool m_countDeadModulesAfterLastHit;
- /** eta and phi tolerances **/
- float m_etatol, m_phitol;
-
/** number of warnings printed when no track parameters available **/
mutable std::atomic_int m_warning;
@@ -169,19 +159,10 @@ namespace InDet
*/
const Trk::TrackStateOnSurface* createHoleTSOS(const Trk::TrackParameters* trackPar) const;
-
- /** This method returns true, if the detector element the input parameters correspond to is sensitive detector material,
- otherwise it returns false.
- */
- bool isSensitive(const Trk::TrackParameters* parameters, bool &isgood) const ;
-
/** This Method creates a new Track from the TSOS of the input track combined with the TSOS from listOfHoles
*/
const Trk::Track* addHolesToTrack(const Trk::Track& oldTrack,
std::vector<const Trk::TrackStateOnSurface*>* listOfHoles) const;
-
- /** This method checks the SCT ABCD chip and SCT strip where the track passes through is bad or not */
- bool isBadSCTChipStrip(const Identifier& waferId, const Trk::TrackParameters& parameters, const InDetDD::SiDetectorElement& siElement) const;
};
} // end of namespace
diff --git a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx
index a4fc7a559f1cdd455b4d62fc7d2e12c188e1999b..53257116bfae807b505a38b6bffd821403a8f84a 100644
--- a/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx
@@ -36,27 +36,15 @@ InDet::InDetTrackHoleSearchTool::InDetTrackHoleSearchTool(const std::string& t,
AthAlgTool(t,n,p),
m_atlasId(nullptr),
m_extrapolator("Trk::Extrapolator"),
- m_pixelLayerTool("InDet::InDetTestPixelLayerTool"),
- m_geoModelSvc("GeoModelSvc", n),
m_extendedListOfHoles(false),
m_cosmic(false),
- m_usepix(true),
- m_usesct(true),
- m_checkBadSCTChip(true),
m_warning(0) {
declareInterface<ITrackHoleSearchTool>(this);
declareProperty("Extrapolator" , m_extrapolator);
- declareProperty("PixelLayerTool" , m_pixelLayerTool);
- declareProperty("GeoModelService" , m_geoModelSvc);
declareProperty("ExtendedListOfHoles" , m_extendedListOfHoles = false);
declareProperty("Cosmics" , m_cosmic);
- declareProperty("usePixel" , m_usepix);
- declareProperty("useSCT" , m_usesct);
- declareProperty("checkBadSCTChip" , m_checkBadSCTChip);
declareProperty("minSiHits" , m_minSiHits = 3);
declareProperty("CountDeadModulesAfterLastHit", m_countDeadModulesAfterLastHit = true);
- declareProperty("phitol" , m_phitol = 3.);
- declareProperty("etatol" , m_etatol = 3.);
}
//================ Destructor =================================================
@@ -75,30 +63,6 @@ StatusCode InDet::InDetTrackHoleSearchTool::initialize() {
ATH_CHECK(m_extrapolator.retrieve());
ATH_MSG_INFO("Retrieved tool " << m_extrapolator);
- if (m_usepix) {
- // Get InDetPixelLayerTool from ToolService
- ATH_CHECK(m_pixelLayerTool.retrieve());
- ATH_MSG_INFO("Retrieved tool " << m_pixelLayerTool);
- }
-
- if (m_usesct) {
- // Get SctConditionsSummaryTool
- ATH_CHECK(m_sctCondSummaryTool.retrieve());
- ATH_MSG_INFO("Retrieved tool " << m_sctCondSummaryTool);
- } else {
- m_sctCondSummaryTool.disable();
- }
-
- if (m_checkBadSCTChip) {
- // Check if ITk Strip is used because isBadSCTChipStrip method is valid only for SCT.
- ATH_CHECK(m_geoModelSvc.retrieve());
- if (m_geoModelSvc->geoConfig()==GeoModel::GEO_RUN4 or
- m_geoModelSvc->geoConfig()==GeoModel::GEO_ITk) {
- ATH_MSG_WARNING("Since ITk Strip is used, m_checkBadSCTChip is turned off.");
- m_checkBadSCTChip = false;
- }
- }
-
if (m_extendedListOfHoles) ATH_MSG_INFO("Search for extended list of holes ");
ATH_MSG_INFO("initialize() successful in " << name());
@@ -628,24 +592,24 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
std::map<const Identifier, const Trk::TrackStateOnSurface*>::iterator iTSOS = mapOfHits.find(id);
if (iTSOS == mapOfHits.end()) {
- bool isgood = true;
- if (!isSensitive(nextParameters, isgood)) {
- if (isgood) ATH_MSG_VERBOSE("Extrapolation not in sensitive area, ignore and continue");
-
- if (!isgood) {
+ switch (m_boundaryCheckTool->boundaryCheck(*nextParameters)) {
+ case Trk::BoundaryCheckResult::DeadElement:
if (m_atlasId->is_pixel(id)) {
-
+
ATH_MSG_VERBOSE("Found element is a dead pixel module, add it to the list and continue");
++PixelDead;
} else if (m_atlasId->is_sct(id)) {
-
+
ATH_MSG_VERBOSE("Found element is a dead SCT module, add it to the list and continue");
++SctDead;
}
- }
- continue;
- }
-
+ case Trk::BoundaryCheckResult::Insensitive:
+ case Trk::BoundaryCheckResult::Error:
+ continue;
+ case Trk::BoundaryCheckResult::Candidate:
+ break;
+ }
+
// increment tmp counters only if this detElement should be considered for a proper holesearch
// this info is the boolean in the (mapOfPredictions->second).second
if (((it->second).second)) {
@@ -741,112 +705,6 @@ void InDet::InDetTrackHoleSearchTool::performHoleSearchStepWise(std::map<const I
return;
}
-// ====================================================================================================================
-bool InDet::InDetTrackHoleSearchTool::isSensitive(const Trk::TrackParameters* parameters, bool &isgood) const {
- // do strict boundary check for SCT and Pixels to make sure we are in active area
-
- if (!parameters ||
- !parameters->associatedSurface().associatedDetectorElement()) return false;
-
- const InDetDD::SiDetectorElement* siElement =
- dynamic_cast<const InDetDD::SiDetectorElement*> (parameters->associatedSurface().associatedDetectorElement());
- if (siElement == nullptr) {
- // ------- in dubio pro reo --> return false (is assumed insensitive)
- ATH_MSG_DEBUG("TrackParameters do not belong to a Si Element");
- return false;
- }
-
- double phitol;
- double etatol;
-
- if (parameters->covariance()) {
- phitol = m_phitol * sqrt((*parameters->covariance())(Trk::locX,Trk::locX));
- etatol = m_etatol * sqrt((*parameters->covariance())(Trk::locY,Trk::locY));
- } else {
- phitol = 2.5;
- etatol = 5.0;
- }
- // not on bond gap within tolerance
- if (siElement->nearBondGap(parameters->localPosition(), etatol)) {
- ATH_MSG_VERBOSE("---> extrapolation on bond gap within " << etatol << ", return");
- return false;
- }
-
- bool isActiveElement = true;
- // inside detector within tolerance
- InDetDD::SiIntersect siIn = siElement->inDetector(parameters->localPosition(), phitol, etatol);
- if (!siIn.in()) {
- ATH_MSG_VERBOSE("---> extrapolation not inside (active?) det"
- << "ector within "<<phitol<<" "<<etatol<<", but check for dead module anyway");
- isActiveElement=false;
- }
-
- // errors might be too big (especially for track seeds or short tracks)
- // check for dead modules if extrapolation with smaller errors are in active detector (2.5 5.)
- if (!isActiveElement) {
- if (phitol>2.5 || etatol>5) {
- siIn = siElement->inDetector(parameters->localPosition(), 2.5, 5.);
- if (!siIn.in()) {
- ATH_MSG_VERBOSE("extrapolation too close to inactive detector; abort search for dead module");
- return false;
- }
- } else {
- ATH_MSG_VERBOSE("extrapolation precise enough and too close to inactive detector; abort search for dead module");
- return false;
- }
- }
-
- Identifier id = siElement->identify();
- IdentifierHash idHash = siElement->identifyHash();
- // check if it is a dead module using conditions services !
- if (m_atlasId->is_pixel(id)) {
- if (m_usepix) {
- ATH_MSG_VERBOSE("Found element is a Pixel module without a hit, see if it might be dead");
- isgood=m_pixelLayerTool->expectHit(parameters);
- if (isgood) {
- // this detElement is only cosidered as hole if the extrapolation of
- // the track plus its error hits the active material
- if (isActiveElement) {
- ATH_MSG_VERBOSE("Pixel module is good, this is a hole canditate !");
- return true;
- }
- } else {
- ATH_MSG_VERBOSE("Track is hitting a bad Pixel module, this is not a hole candidate!");
- return false;
- }
- }
- } else if (m_atlasId->is_sct(id)) {
- if (m_usesct) {
- ATH_MSG_VERBOSE("Found element is a SCT module without a hit, see if it might be dead");
- isgood=m_sctCondSummaryTool->isGood(idHash);
- if (isgood) {
- // this detElement is only cosidered as hole if the extrapolation of
- // the track plus its error hits the active material
- if (isActiveElement) {
-
- if (m_checkBadSCTChip and isBadSCTChipStrip(id, *parameters, *siElement)) {
- ATH_MSG_VERBOSE("Track is hiting a bad SCT chip, this is not a hole candidate!");
- isgood = false;
- return false;
- }
-
- ATH_MSG_VERBOSE("SCT module is good, this is a hole candidate !");
- return true;
- }
- } else {
- ATH_MSG_VERBOSE("Track is hiting a bad SCT module, this is not a hole candidate!");
- return false;
- }
- }
- } else {
- ATH_MSG_WARNING("unknown identifier type, this should not happen !");
- return false;
- }
- // the extrapolation of the track plus its error might not
- // be inside the active detector for a good module
- return false;
-}
-
// ====================================================================================================================
const Trk::TrackStateOnSurface* InDet::InDetTrackHoleSearchTool::createHoleTSOS(const Trk::TrackParameters* trackPar) const {
std::bitset<Trk::TrackStateOnSurface::NumberOfTrackStateOnSurfaceTypes> typePattern;
@@ -910,32 +768,3 @@ const Trk::Track* InDet::InDetTrackHoleSearchTool::addHolesToTrack(const Trk::T
return newTrack;
}
-// ====================================================================================================================
-bool InDet::InDetTrackHoleSearchTool::isBadSCTChipStrip(const Identifier& waferId,
- const Trk::TrackParameters& parameters,
- const InDetDD::SiDetectorElement& siElement) const {
- // Check if the track passes through a bad SCT ABCD chip or a bad SCT strip.
- // A chip and a strip are determined by the extrapolated position.
- // Algorithm is based on InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonTool.cxx
-
- // Check the input.
- if (not m_atlasId->is_sct(waferId)) {
- ATH_MSG_WARNING(waferId << " is not an SCT Identifier");
- return true;
- }
-
- // Get strip id from local position.
- // Due to the limited position resolution, we may pick up a neighboring strip...
- const Amg::Vector2D localPos(parameters.localPosition());
- const Identifier stripIdentifier(siElement.identifierOfPosition(localPos));
- if (not m_atlasId->is_sct(stripIdentifier)) {
- ATH_MSG_WARNING(stripIdentifier << " is not an SCT Identifier");
- return true;
- }
-
- // The extrapolated position is on a bad chip.
- if (not m_sctCondSummaryTool->isGood(stripIdentifier, InDetConditions::SCT_CHIP)) return true;
- // The extrapolated position is on a bad strip. (We may need to check neighboring strips.)
- if (not m_sctCondSummaryTool->isGood(stripIdentifier, InDetConditions::SCT_STRIP)) return true;
- return false;
-}
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetTrkInJetType.h b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetTrkInJetType.h
index ab46437ce1cc24e5eabd5182aefc6740405a7ac5..0d416f817b9e89408d23226405a9e5b3daf61e64 100644
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetTrkInJetType.h
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetTrkInJetType.h
@@ -95,17 +95,6 @@ namespace InDet {
Trk::TrkVKalVrtFitter* m_fitSvc{};
int m_initialised{};
-
- float m_Sig3D{};
- float m_prbP{};
- float m_d0{};
- float m_pTvsJet{};
- float m_SigZ{};
- float m_SigR{};
- float m_ptjet{};
- float m_etatrk{};
- float m_ibl{};
- float m_bl{};
};
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/TrackVertexAssoTestAlg.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/TrackVertexAssoTestAlg.cxx
index 9387be90b3f4f0ffea258aa387181311b3b8748a..e19c0bcc4c73afa2b377f76ad8278982601711eb 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/TrackVertexAssoTestAlg.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/src/TrackVertexAssoTestAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/Vertex.h"
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/CMakeLists.txt
index d02f52e4cc0186f70c4c7a9b23b8d0f494a23e07..d6786848fdd6cea6e68c9230538057ecdfac8fbc 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigVxSecondary/CMakeLists.txt
@@ -5,27 +5,6 @@
# Declare the package name:
atlas_subdir( InDetTrigVxSecondary )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTracking
- GaudiKernel
- Tracking/TrkEvent/VxSecVertex
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigInDetToolInterfaces
- PRIVATE
- Control/AthContainers
- Control/CxxUtils
- DetectorDescription/GeoPrimitives
- DetectorDescription/IRegionSelector
- Event/xAOD/xAODBase
- InnerDetector/InDetConditions/InDetBeamSpotService
- InnerDetector/InDetRecTools/InDetRecToolInterfaces
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/VxVertex
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigSteeringEvent )
-
# External dependencies:
find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -35,7 +14,7 @@ atlas_add_component( InDetTrigVxSecondary
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} xAODTracking GaudiKernel VxSecVertex TrigInterfacesLib AthContainers GeoPrimitives IRegionSelector xAODBase InDetRecToolInterfaces TrkParameters TrkTrack VxVertex TrigInDetEvent TrigSteeringEvent InDetBeamSpotServiceLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} xAODTracking GaudiKernel VxSecVertex TrigInterfacesLib AthContainers GeoPrimitives IRegionSelector xAODBase InDetRecToolInterfaces TrkParameters TrkTrack VxVertex TrigInDetEvent TrigSteeringEvent InDetBeamSpotServiceLib TrigInDetToolInterfacesLib )
# Install files from the package:
atlas_install_headers( InDetTrigVxSecondary )
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/InDetPhysValMonitoringTool.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/InDetPhysValMonitoringTool.h
index dfadc7d58e6669e138afc149837c3373565caa0f..4eaa31b7240ea3e8db7fb60b0c678c4cd23b5617 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/InDetPhysValMonitoringTool.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/InDetPhysValMonitoring/InDetPhysValMonitoringTool.h
@@ -125,6 +125,7 @@ private:
std::vector<SG::ReadDecorHandleKey<xAOD::TrackParticleContainer> > m_intTrkDecor;
std::vector<SG::ReadDecorHandleKey<xAOD::TruthParticleContainer> > m_floatTruthDecor;
std::vector<SG::ReadDecorHandleKey<xAOD::TruthParticleContainer> > m_intTruthDecor;
+ std::vector<SG::ReadDecorHandleKey<xAOD::JetContainer> > m_intJetDecor;
///Directory name
std::string m_dirName;
@@ -153,6 +154,7 @@ private:
float m_maxTrkJetDR;
bool m_doTrackInJetPlots;
+ bool m_doBjetPlots;
std::string m_folder;
};
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecoration.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecoration.py
index 2dc4fc298f19c42e1a0ef6aa45cd8994d76cde6e..1d2e09aba1d661fec2468e0ea1b4f740735d0855 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecoration.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecoration.py
@@ -183,8 +183,12 @@ def getTrackDecorators(**kwargs) :
of the algorithms will be extended by the collection name.
'''
# only valid kwarg : TrackParticleContainerName
- return [ getInDetPhysHitDecoratorAlg(**kwargs),
- getParameterErrDecoratorAlg(**kwargs) ]
+ from RecExConfig.AutoConfiguration import IsInInputFile
+ if not IsInInputFile('Trk::TrackCollection','CombinedInDetTracks') :
+ return [ getParameterErrDecoratorAlg(**kwargs) ]
+ else :
+ return [ getInDetPhysHitDecoratorAlg(**kwargs),
+ getParameterErrDecoratorAlg(**kwargs) ]
def getDBMTrackDecorators(**kwargs) :
from InDetRecExample.InDetKeys import InDetKeys
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValJobProperties.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValJobProperties.py
index 67e6470c76682c4bab7ccd0b8cd4a2eb4cc826c9..33cc4495a373d9863ed9aaaa441b681842bb7632 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValJobProperties.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValJobProperties.py
@@ -69,6 +69,11 @@ class doValidateTracksInJets(InDetPhysValFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = False
+class doValidateTracksInBJets(InDetPhysValFlagsJobProperty):
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = False
+
class validateExtraTrackCollections(InDetPhysValFlagsJobProperty) :
"""List of extra track collection names to be validated in addition to Tracks."""
statusOn = True
@@ -149,6 +154,7 @@ _list_InDetPhysValJobProperties = [
doValidateLooseTracks,
doValidateTightPrimaryTracks,
doValidateTracksInJets,
+ doValidateTracksInBJets,
validateExtraTrackCollections,
doPhysValOutput,
doExpertOutput,
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringTool.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringTool.py
index d118812ac402994bfec581b8a6c4ec40f9bd8b60..667585ac116c59a8ecba534b31e4c1e8e53b9a45 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringTool.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValMonitoringTool.py
@@ -53,6 +53,10 @@ def getInDetPhysValMonitoringTool(**kwargs) :
FillTrackInJetPlots = True)
from InDetPhysValMonitoring.addTruthJets import addTruthJetsIfNotExising
addTruthJetsIfNotExising(jets_name)
+ if InDetPhysValFlags.doValidateTracksInBJets():
+ kwargs=setDefaults(kwargs,
+ FillTrackInBJetPlots = True)
+
else :
kwargs=setDefaults(kwargs,
JetContainerName ='' ,
@@ -89,7 +93,8 @@ def getInDetPhysValMonitoringTool(**kwargs) :
TruthSelectionTool = '',
# the jet container is actually meant to be a truth jet container
JetContainerName ='',
- FillTrackInJetPlots = False)
+ FillTrackInJetPlots = False,
+ FillTrackInBJetPlots = False)
# Control the number of output histograms
if InDetPhysValFlags.doPhysValOutput() :
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/AllAndTightSelections.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/AllAndTightSelections.py
index 29cf162e9fc6a4f57dfc23011db50c3aa07ea28b..5508f9af45c4a3cc2492767ada1be46d87e70e51 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/AllAndTightSelections.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/AllAndTightSelections.py
@@ -67,8 +67,14 @@ ToolSvc += tool2
monMan.AthenaMonTools += [tool1, tool2]
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+InDetBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="InDetBoundaryCheckTool"
+)
+ToolSvc += InDetBoundaryCheckTool
+
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
-InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool", Extrapolator = InDetExtrapolator, usePixel = True, useSCT= True, CountDeadModulesAfterLastHit = True)
+InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool", Extrapolator = InDetExtrapolator, BoundaryCheckTool=InDetBoundaryCheckTool, CountDeadModulesAfterLastHit = True)
ToolSvc += InDetHoleSearchTool
print InDetHoleSearchTool
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/LargeD0_jobOptions.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/LargeD0_jobOptions.py
index a2ef80eea165ca6f86fba6e52a35215b97dc5b55..72449f7597e834b797171d96ce78bebc279dc6c9 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/LargeD0_jobOptions.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/LargeD0_jobOptions.py
@@ -100,8 +100,14 @@ ToolSvc += tool2
monMan.AthenaMonTools += [tool2]
#monMan.AthenaMonTools += [truthSelection]
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+InDetBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="InDetBoundaryCheckTool"
+)
+ToolSvc += InDetBoundaryCheckTool
+
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
-InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool", Extrapolator = InDetExtrapolator,usePixel = True,useSCT= True,CountDeadModulesAfterLastHit = True)
+InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool", Extrapolator = InDetExtrapolator, BoundaryCheckTool=InDetBoundaryCheckTool, CountDeadModulesAfterLastHit = True)
ToolSvc += InDetHoleSearchTool
print InDetHoleSearchTool
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysVal_jobOptions.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysVal_jobOptions.py
index e1a1e3c2e9a42d4b9839f6b2d7e4524631148b9a..007395fc9d28058a2b534e1761779b210dec05cb 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysVal_jobOptions.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysVal_jobOptions.py
@@ -104,8 +104,14 @@ print tool1
monMan.AthenaMonTools += [tool1]
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+InDetBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="InDetBoundaryCheckTool"
+)
+ToolSvc += InDetBoundaryCheckTool
+
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
-InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool", Extrapolator = InDetExtrapolator, usePixel = True, useSCT= True, CountDeadModulesAfterLastHit = True)
+InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool", Extrapolator = InDetExtrapolator, BoundaryCheckTool=InDetBoundaryCheckTool, CountDeadModulesAfterLastHit = True)
ToolSvc += InDetHoleSearchTool
print InDetHoleSearchTool
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
index 79abfa53da330a99f80bc5d7b41da40c58c90770..72aa64a3a8fd7522965b25b80df70910fe9509d0 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
@@ -1360,6 +1360,7 @@
<y title="qoverp mean of pull"/>
</h>
+
<h id="pullmean_vs_eta_ptqopt" type="TH1F" title="mean of pull vs #eta for p_{T} #times q/p_{T}">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
<y title="means pull for p_{T} #times q/p_{T}"/>
@@ -1400,6 +1401,7 @@
<y title="qoverp pull"/>
</h>
+
<h id="pullwidth_vs_pt_ptqopt" type="TH1F" title="pull vs p_{T} for p_{T} #times q/p_{T}">
<x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
<y title="width of pull for p_{T} #times q/p_{T}"/>
@@ -1866,32 +1868,32 @@
<!-- Efficiency -->
<h id="efficiency_vs_dR" type="TEfficiency" title="Fraction of reco-matched truth track versus #DeltaR">
- <x title="#DeltaR" n="100" lo="0.0" hi="&DRMAX;"/>
+ <x title="#DeltaR" n="40" lo="0.0" hi="&DRMAX;"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
</h>
<h id="efficiency_vs_smalldR" type="TEfficiency" title="Fraction of reco-matched truth track versus #DeltaR">
- <x title="#DeltaR" n="100" lo="0.0" hi="&SMALLDRMAX;"/>
+ <x title="#DeltaR" n="40" lo="0.0" hi="&SMALLDRMAX;"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
</h>
<h id="efficiency_vs_jetpT" type="TEfficiency" title="Fraction of reco-matched truth track versus jet_{p_{T}}">
- <x title="jet_{p_{T}} [GeV]" n="100" lo="10.0" hi="1000."/>
+ <x title="jet_{p_{T}} [GeV]" n="49" lo="100.0" hi="5000."/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
</h>
<!-- Fake Rate -->
<h id="fakerate_vs_dR" type="TEfficiency" title="Fake rate versus #DeltaR">
- <x title="#DeltaR" n="100" lo="0.0" hi="&DRMAX;"/>
+ <x title="#DeltaR" n="40" lo="0.0" hi="&DRMAX;"/>
<y title="Fake Rate" lo="0.0" hi="2.0"/>
</h>
<h id="fakerate_vs_smalldR" type="TEfficiency" title="Fake rate versus #DeltaR">
- <x title="#DeltaR" n="100" lo="0.0" hi="&SMALLDRMAX;"/>
+ <x title="#DeltaR" n="40" lo="0.0" hi="&SMALLDRMAX;"/>
<y title="Fake Rate" lo="0.0" hi="2.0"/>
</h>
<h id="fakerate_vs_jetpT" type="TEfficiency" title="Fraction of reco-matched truth track versus jet_{p_{T}}">
- <x title="jet_{p_{T}} [GeV]" n="100" lo="10.0" hi="1000."/>
+ <x title="jet_{p_{T}} [GeV]" n="20" lo="100.0" hi="5000."/>
<y title="Fake Rate" lo="0.0" hi="2.0"/>
</h>
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefRun2.xml b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefRun2.xml
index f51e10ec4c0dd409931babaf811479e87223a329..9bae4ec990e780ac7e4e8d232c99534b79acaa1f 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefRun2.xml
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefRun2.xml
@@ -174,5 +174,312 @@
end of hit content plots
========================================================
-->
+
+<!--
+ =======================================================
+ TRT Extension plots
+ ========================================================
+ -->
+<h id="fracTRTExtensions_vs_eta" type="TEfficiency" title="Fraction of TRT Extended Tracks">
+ <x title="#eta" n="32" lo="-&ETA;" hi="&ETA;"/>
+ <y title="Fraction of TRT Extended Tracks" lo="0" hi="2.0"/>
+</h>
+
+<h id="fracTRTExtensions_vs_pt" type="TEfficiency" title="Fraction of TRT Extended Tracks">
+ <x title="p_{T} [GeV]" n="25" lo="0" hi="50"/>
+ <y title="Fraction of TRT Extended Tracks" lo="0" hi="2.0"/>
+</h>
+
+<h id="fracTRTExtensions_vs_nvertices" type="TEfficiency" title="Fraction of TRT Extended Tracks">
+ <x title="Number of Reconstucted Vertices" n="50" lo="0" hi="100"/>
+ <y title="Fraction of TRT Extended Tracks" lo="0" hi="2.0"/>
+</h>
+
+<h id="fracTRTExtensions_vs_mu" type="TEfficiency" title="Fraction of TRT Extended Tracks">
+ <x title="#LT#mu#GT" n="50" lo="0" hi="100"/>
+ <y title="Fraction of TRT Extended Tracks" lo="0" hi="2.0"/>
+</h>
+
+
+
+<h id="fracTRTExtensions_matched_vs_eta" type="TEfficiency" title="Fraction of TRT Extended Matched Tracks">
+ <x title="#eta" n="32" lo="-&ETA;" hi="&ETA;"/>
+ <y title="Fraction of TRT Extended Matched Tracks" lo="0" hi="2.0"/>
+</h>
+
+<h id="fracTRTExtensions_matched_vs_pt" type="TEfficiency" title="Fraction of TRT Extended Matched Tracks">
+ <x title="p_{T} [GeV]" n="25" lo="0" hi="50"/>
+ <y title="Fraction of TRT Extended Matched Tracks" lo="0" hi="2.0"/>
+</h>
+
+<h id="chi2ndofTRTExtensions" type="TH1F" title="reco_{#chi^2/ndof}">
+ <x title="reco_{#chi^2/ndof}" n="100" lo="0.0" hi="5.0"/>
+ <y title="Number of Entries"/>
+</h>
+
+<h id="chi2ndofNoTRTExtensions" type="TH1F" title="reco_{#chi^2/ndof}">
+ <x title="reco_{#chi^2/ndof}" n="100" lo="0.0" hi="5.0"/>
+ <y title="Number of Entries"/>
+</h>
+
+
+<h id="ptresNoTRTExtensions_vs_eta" type="TH2F" title="residual vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="reco_{p_{T} #times q/p_{T}} - truth_{p_{T} #times q/p_{T}}" n="2000" lo="-&PTQOPTRES;" hi="&PTQOPTRES;"/>
+</h>
+
+<h id="ptresNoTRTExtensions_vs_pt" type="TH2F" title="residual vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="reco_{pT #times q/pT} - truth_{pT #times q/pT}" n="2000" lo="-&PTQOPTRES;" hi="&PTQOPTRES;"/>
+</h>
+
+<h id="ptresTRTExtensions_vs_eta" type="TH2F" title="residual vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="reco_{p_{T} #times q/p_{T}} - truth_{p_{T} #times q/p_{T}}" n="2000" lo="-&PTQOPTRES;" hi="&PTQOPTRES;"/>
+</h>
+
+<h id="ptresTRTExtensions_vs_pt" type="TH2F" title="residual vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="reco_{pT #times q/pT} - truth_{pT #times q/pT}" n="2000" lo="-&PTQOPTRES;" hi="&PTQOPTRES;"/>
+</h>
+
+<h id="ptresolutionTRTExtensions_vs_eta" type="TH1F" title="resolution vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="width of resolution for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptresmeanTRTExtensions_vs_eta" type="TH1F" title="mean of resolution vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="mean of resolution for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptresolutionNoTRTExtensions_vs_eta" type="TH1F" title="resolution vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="width of resolution for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptresmeanNoTRTExtensions_vs_eta" type="TH1F" title="mean of resolution vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="mean of resolution for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptresolutionTRTExtensions_vs_pt" type="TH1F" title="resolution vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="width of resolution for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptresmeanTRTExtensions_vs_pt" type="TH1F" title="mean of resolution vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="mean of resolution for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptresolutionNoTRTExtensions_vs_pt" type="TH1F" title="resolution vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="width of resolution for p_{T} #times q/p_{T}"/>
+</h>
+
+
+<h id="ptresmeanNoTRTExtensions_vs_pt" type="TH1F" title="mean of resolution vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="mean of resolution for p_{T} #times q/p_{T}"/>
+</h>
+
+
+<h id="ptpullwidthTRTExtensions_vs_eta" type="TH1F" title="pull vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="width of pull for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptpullmeanTRTExtensions_vs_eta" type="TH1F" title="mean of pull vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="means pull for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptpullwidthTRTExtensions_vs_pt" type="TH1F" title="pull vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="width of pull for p_{T} #times q/p_{T}"/>
+</h>
+<h id="ptpullmeanTRTExtensions_vs_pt" type="TH1F" title="mean of pull vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="mean of pull for p_{T} #times q/p_{T}"/>
+</h>
+
+
+<h id="ptpullwidthNoTRTExtensions_vs_eta" type="TH1F" title="pull vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="width of pull for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptpullmeanNoTRTExtensions_vs_eta" type="TH1F" title="mean of pull vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="means pull for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptpullwidthNoTRTExtensions_vs_pt" type="TH1F" title="pull vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="width of pull for p_{T} #times q/p_{T}"/>
+</h>
+<h id="ptpullmeanNoTRTExtensions_vs_pt" type="TH1F" title="mean of pull vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="mean of pull for p_{T} #times q/p_{T}"/>
+</h>
+
+<h id="ptpullTRTExtensions_vs_eta" type="TH2F" title="pull vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="(reco_{q/p_{T}} - truth_{q/p_{T}}) / #sigma(q/p_{T})" n="100" lo="-10.0" hi="10.0"/>
+</h>
+
+<h id="ptpullTRTExtensions_vs_pt" type="TH2F" title="pull vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="(reco_{q/p_{T}} - truth_{q/p_{T}}) / #sigma(q/p_{T})" n="100" lo="-10.0" hi="10.0"/>
+</h>
+
+<h id="ptpullNoTRTExtensions_vs_eta" type="TH2F" title="pull vs #eta for p_{T} #times q/p_{T}">
+ <x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
+ <y title="(reco_{q/p_{T}} - truth_{q/p_{T}}) / #sigma(q/p_{T})" n="100" lo="-10.0" hi="10.0"/>
+</h>
+
+<h id="ptpullNoTRTExtensions_vs_pt" type="TH2F" title="pull vs p_{T} for p_{T} #times q/p_{T}">
+ <x title="p_{T} [GeV]" n="100" lo="0." hi="100"/>
+ <y title="(reco_{q/p_{T}} - truth_{q/p_{T}}) / #sigma(q/p_{T})" n="100" lo="-10.0" hi="10.0"/>
+</h>
+
+
+<!--
+ =======================================================
+ end TRT Extension plots
+ ========================================================
+ -->
+
+<!--
+ =======================================================
+ ANT plots
+ ========================================================
+ -->
+
+<h id="efficiencySplit_vs_eta" type="TEfficiency" title="Efficiency">
+ <x title="#eta" n="32" lo="-&ETA;" hi="&ETA;"/>
+ <y title="Efficiency" lo="0" hi="2.0"/>
+</h>
+
+<h id="efficiencySplit_vs_pt" type="TEfficiency" title="Efficiency">
+ <x title="p_{T} [GeV]" n="100" lo="0" hi="50"/>
+ <y title="Efficiency" lo="0" hi="2.0"/>
+</h>
+
+<h id="efficiencySplit_vs_phi" type="TEfficiency" title="Efficiency">
+ <x title="#phi" n="32" lo="-3.14;" hi="3.14"/>
+ <y title="Efficiency" lo="0" hi="2.0"/>
+</h>
+
+<h id="efficiencySplit_vs_d0" type="TEfficiency" title="Efficiency">
+ <x title="d_{0} [mm]" n="150" lo="-300.0" hi="300.0"/>
+ <y title="Efficiency" lo="0" hi="2.0"/>
+</h>
+
+<h id="efficiencySplit_vs_z0" type="TEfficiency" title="Efficiency">
+ <x title="z_{0} [mm]" n="150" lo="-500.0" hi="500.0"/>
+ <y title="Efficiency" lo="0" hi="2.0"/>
+</h>
+
+<h id="efficiencySplit_vs_radius" type="TEfficiency" title="Efficiency">
+ <x title="r_{production} [mm]" n="150" lo="0." hi="600.0"/>
+ <y title="Efficiency" lo="0" hi="2.0"/>
+</h>
+
+<h id="efficiencySplit_vs_mu" type="TEfficiency" title="Efficiency">
+ <x title="#LT#mu#GT" n="100" lo="0.0" hi="100.0"/>
+ <y title="Efficiency" lo="0" hi="2.0"/>
+</h>
+
+<h id="efficiencySplit_vs_nvertices" type="TEfficiency" title="Efficiency">
+ <x title="number of vertices" n="100" lo="0.0" hi="100.0"/>
+ <y title="Efficiency" lo="0" hi="2.0"/>
+</h>
+
+<h id="fakeSplit_vs_eta" type="TEfficiency" title="Fake Rate">
+ <x title="#eta" n="32" lo="-&ETA;" hi="&ETA;"/>
+ <y title="Fake Rate" lo="0" hi="2.0"/>
+</h>
+
+<h id="fakeSplit_vs_pt" type="TEfficiency" title="Fake Rate">
+ <x title="p_{T} [GeV]" n="25" lo="0" hi="50"/>
+ <y title="Fake Rate" lo="0" hi="2.0"/>
+</h>
+
+<h id="fakeSplit_vs_phi" type="TEfficiency" title="Fake Rate">
+ <x title="#phi" n="32" lo="-3.14;" hi="3.14"/>
+ <y title="Fake Rate" lo="0" hi="2.0"/>
+</h>
+
+<h id="fakeSplit_vs_d0" type="TEfficiency" title="Fake Rate">
+ <x title="d_{0} [mm]" n="150" lo="-300.0" hi="300.0"/>
+ <y title="Fake Rate" lo="0" hi="2.0"/>
+</h>
+
+<h id="fakeSplit_vs_z0" type="TEfficiency" title="Fake Rate">
+ <x title="z_{0} [mm]" n="150" lo="-500.0" hi="500.0"/>
+ <y title="Fake Rate" lo="0" hi="2.0"/>
+</h>
+
+<h id="fakeSplit_vs_radius" type="TEfficiency" title="Fake Rate">
+ <x title="r_{production} [mm]" n="150" lo="0." hi="600.0"/>
+ <y title="Fake Rate" lo="0" hi="2.0"/>
+</h>
+
+<h id="fakeSplit_vs_mu" type="TEfficiency" title="Fake Rate">
+ <x title="#LT#mu#GT" n="100" lo="0.0" hi="100.0"/>
+ <y title="Fake Rate" lo="0" hi="2.0"/>
+</h>
+
+<h id="fakeSplit_vs_nvertices" type="TEfficiency" title="Fake Rate">
+ <x title="number of vertices" n="100" lo="0.0" hi="100.0"/>
+ <y title="Fake Rate" lo="0" hi="2.0"/>
+</h>
+
+<h id="trkpropSplit_vs_d0" type="TH1F" title="reco_{d_{0}}">
+ <x title="reco_{d0} [mm]" n="100" lo="-300.0" hi="300.0"/>
+ <y title="Number of Entries"/>
+</h>
+<h id="trkpropSplit_vs_z0" type="TH1F" title="reco_{z_{0}}">
+ <x title="reco_{z_{0}}" n="100" lo="-500.0" hi="500.0"/>
+ <y title="Number of Entries"/>
+</h>
+
+<h id="trkpropSplit_vs_phi" type="TH1F" title="reco_{#phi}">
+ <x title="reco_{#phi} [rads]" n="100" lo="-&PI;" hi="&PI;"/>
+ <y title="Number of Entries"/>
+</h>
+<h id="trkpropSplit_vs_eta" type="TH1F" title="reco_{#eta}">
+ <x title="reco_{#eta} [rads]" n="100" lo="-&ETA;" hi="&ETA;"/>
+ <y title="Number of Entries"/>
+</h>
+
+<h id="trkpropSplit_vs_pt" type="TH1F" title="reco_{p_{T}} [GeV]">
+ <x title="reco_{p_{T}} [GeV]" n="100" lo="0.0" hi="100.0"/>
+ <y title="Number of Entries"/>
+</h>
+
+<h id="ntrkSplit_vs_mu" type="TH2" title="Number of tracks versus mu">
+ <x title="#LT#mu#GT" n="100" lo="0.0" hi="100.0"/>
+ <y title="Number of Tracks / Event" n="500" lo="0" hi="900"/>
+</h>
+
+<h id="ntrkSplit_vs_nvertices" type="TH2" title="Number of tracks versus nvertices">
+ <x title="Number of vertices" n="100" lo="0.0" hi="100.0"/>
+ <y title="Number of Tracks / Event" n="500" lo="0" hi="900"/>
+</h>
+
+<!--
+ =======================================================
+ end ANT plots
+ ========================================================
+ -->
+
+
+
+
</hdef>
+
+
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ANTracking.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ANTracking.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..5f30a133adc6d2f497cd9a86d86b79849f538402
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ANTracking.cxx
@@ -0,0 +1,438 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "InDetPerfPlot_ANTracking.h"
+// #include "TrkValHistUtils/ANTrackingPurityCalculator.h"
+#include "xAODTruth/TruthParticle.h"
+#include "xAODTruth/TruthVertex.h"
+#include "InDetPhysValMonitoringUtilities.h"
+#include <cmath>
+using namespace IDPVM;
+
+InDetPerfPlot_ANTracking::InDetPerfPlot_ANTracking(InDetPlotBase* pParent, const std::string& sDir) :
+ InDetPlotBase(pParent, sDir)
+{
+ // nop
+}
+
+void
+InDetPerfPlot_ANTracking::initializePlots() {
+
+ book(m_effANT_eta, "efficiencySplit_vs_eta", "efficiencyANT_vs_eta");
+ book(m_effSTD_eta, "efficiencySplit_vs_eta", "efficiencySTD_vs_eta");
+ book(m_effBAT_eta, "efficiencySplit_vs_eta", "efficiencyBAT_vs_eta");
+ book(m_effANT_pt, "efficiencySplit_vs_pt", "efficiencyANT_vs_pt");
+ book(m_effSTD_pt, "efficiencySplit_vs_pt", "efficiencySTD_vs_pt");
+ book(m_effBAT_pt, "efficiencySplit_vs_pt", "efficiencyBAT_vs_pt");
+
+ book(m_effANT_phi, "efficiencySplit_vs_phi", "efficiencyANT_vs_phi");
+ book(m_effSTD_phi, "efficiencySplit_vs_phi", "efficiencySTD_vs_phi");
+ book(m_effBAT_phi, "efficiencySplit_vs_phi", "efficiencyBAT_vs_phi");
+
+ book(m_effANT_d0, "efficiencySplit_vs_d0", "efficiencyANT_vs_d0");
+ book(m_effSTD_d0, "efficiencySplit_vs_d0", "efficiencySTD_vs_d0");
+ book(m_effBAT_d0, "efficiencySplit_vs_d0", "efficiencyBAT_vs_d0");
+
+ book(m_effANT_z0, "efficiencySplit_vs_z0", "efficiencyANT_vs_z0");
+ book(m_effSTD_z0, "efficiencySplit_vs_z0", "efficiencySTD_vs_z0");
+ book(m_effBAT_z0, "efficiencySplit_vs_z0", "efficiencyBAT_vs_z0");
+
+ book(m_effANT_radius, "efficiencySplit_vs_radius", "efficiencyANT_vs_radius");
+ book(m_effSTD_radius, "efficiencySplit_vs_radius", "efficiencySTD_vs_radius");
+ book(m_effBAT_radius, "efficiencySplit_vs_radius", "efficiencyBAT_vs_radius");
+
+ book(m_effANT_mu, "efficiencySplit_vs_mu", "efficiencyANT_vs_mu");
+ book(m_effSTD_mu, "efficiencySplit_vs_mu", "efficiencySTD_vs_mu");
+ book(m_effBAT_mu, "efficiencySplit_vs_mu", "efficiencyBAT_vs_mu");
+
+ book(m_effANT_nvertices, "efficiencySplit_vs_nvertices", "efficiencyANT_vs_nvertices");
+ book(m_effSTD_nvertices, "efficiencySplit_vs_nvertices", "efficiencySTD_vs_nvertices");
+ book(m_effBAT_nvertices, "efficiencySplit_vs_nvertices", "efficiencyBAT_vs_nvertices");
+
+ book(m_fakeANT_eta, "fakeSplit_vs_eta", "fakeANT_vs_eta");
+ book(m_fakeSTD_eta, "fakeSplit_vs_eta", "fakeSTD_vs_eta");
+ book(m_fakeBAT_eta, "fakeSplit_vs_eta", "fakeBAT_vs_eta");
+
+ book(m_fakeANT_pt, "fakeSplit_vs_pt", "fakeANT_vs_pt");
+ book(m_fakeSTD_pt, "fakeSplit_vs_pt", "fakeSTD_vs_pt");
+ book(m_fakeBAT_pt, "fakeSplit_vs_pt", "fakeBAT_vs_pt");
+
+ book(m_fakeANT_phi, "fakeSplit_vs_phi", "fakeANT_vs_phi");
+ book(m_fakeSTD_phi, "fakeSplit_vs_phi", "fakeSTD_vs_phi");
+ book(m_fakeBAT_phi, "fakeSplit_vs_phi", "fakeBAT_vs_phi");
+
+ book(m_fakeANT_d0, "fakeSplit_vs_d0", "fakeANT_vs_d0");
+ book(m_fakeSTD_d0, "fakeSplit_vs_d0", "fakeSTD_vs_d0");
+ book(m_fakeBAT_d0, "fakeSplit_vs_d0", "fakeBAT_vs_d0");
+
+ book(m_fakeANT_z0, "fakeSplit_vs_z0", "fakeANT_vs_z0");
+ book(m_fakeSTD_z0, "fakeSplit_vs_z0", "fakeSTD_vs_z0");
+ book(m_fakeBAT_z0, "fakeSplit_vs_z0", "fakeBAT_vs_z0");
+
+ book(m_fakeANT_mu, "fakeSplit_vs_mu", "fakeANT_vs_mu");
+ book(m_fakeSTD_mu, "fakeSplit_vs_mu", "fakeSTD_vs_mu");
+ book(m_fakeBAT_mu, "fakeSplit_vs_mu", "fakeBAT_vs_mu");
+
+ book(m_fakeANT_nvertices, "fakeSplit_vs_nvertices", "fakeANT_vs_nvertices");
+ book(m_fakeSTD_nvertices, "fakeSplit_vs_nvertices", "fakeSTD_vs_nvertices");
+ book(m_fakeBAT_nvertices, "fakeSplit_vs_nvertices", "fakeBAT_vs_nvertices");
+
+ book(m_unlinkedANT_eta, "fakeSplit_vs_eta", "unlinkedANT_vs_eta");
+ book(m_unlinkedSTD_eta, "fakeSplit_vs_eta", "unlinkedSTD_vs_eta");
+ book(m_unlinkedBAT_eta, "fakeSplit_vs_eta", "unlinkedBAT_vs_eta");
+
+ book(m_unlinkedANT_pt, "fakeSplit_vs_pt", "unlinkedANT_vs_pt");
+ book(m_unlinkedSTD_pt, "fakeSplit_vs_pt", "unlinkedSTD_vs_pt");
+ book(m_unlinkedBAT_pt, "fakeSplit_vs_pt", "unlinkedBAT_vs_pt");
+
+ book(m_unlinkedANT_phi, "fakeSplit_vs_phi", "unlinkedANT_vs_phi");
+ book(m_unlinkedSTD_phi, "fakeSplit_vs_phi", "unlinkedSTD_vs_phi");
+ book(m_unlinkedBAT_phi, "fakeSplit_vs_phi", "unlinkedBAT_vs_phi");
+
+ book(m_unlinkedANT_d0, "fakeSplit_vs_d0", "unlinkedANT_vs_d0");
+ book(m_unlinkedSTD_d0, "fakeSplit_vs_d0", "unlinkedSTD_vs_d0");
+ book(m_unlinkedBAT_d0, "fakeSplit_vs_d0", "unlinkedBAT_vs_d0");
+
+ book(m_unlinkedANT_z0, "fakeSplit_vs_z0", "unlinkedANT_vs_z0");
+ book(m_unlinkedSTD_z0, "fakeSplit_vs_z0", "unlinkedSTD_vs_z0");
+ book(m_unlinkedBAT_z0, "fakeSplit_vs_z0", "unlinkedBAT_vs_z0");
+
+ book(m_unlinkedANT_mu, "fakeSplit_vs_mu", "unlinkedANT_vs_mu");
+ book(m_unlinkedSTD_mu, "fakeSplit_vs_mu", "unlinkedSTD_vs_mu");
+ book(m_unlinkedBAT_mu, "fakeSplit_vs_mu", "unlinkedBAT_vs_mu");
+
+ book(m_unlinkedANT_nvertices, "fakeSplit_vs_nvertices", "unlinkedANT_vs_nvertices");
+ book(m_unlinkedSTD_nvertices, "fakeSplit_vs_nvertices", "unlinkedSTD_vs_nvertices");
+ book(m_unlinkedBAT_nvertices, "fakeSplit_vs_nvertices", "unlinkedBAT_vs_nvertices");
+
+ book(m_trkpropANT_eta, "trkpropSplit_vs_eta", "trkpropANT_vs_eta");
+ book(m_trkpropBAT_eta, "trkpropSplit_vs_eta", "trkpropBAT_vs_eta");
+ book(m_trkpropSTD_eta, "trkpropSplit_vs_eta", "trkpropSTD_vs_eta");
+
+ book(m_trkpropANT_phi, "trkpropSplit_vs_phi", "trkpropANT_vs_phi");
+ book(m_trkpropBAT_phi, "trkpropSplit_vs_phi", "trkpropBAT_vs_phi");
+ book(m_trkpropSTD_phi, "trkpropSplit_vs_phi", "trkpropSTD_vs_phi");
+
+ book(m_trkpropANT_pt, "trkpropSplit_vs_pt", "trkpropANT_vs_pt");
+ book(m_trkpropBAT_pt, "trkpropSplit_vs_pt", "trkpropBAT_vs_pt");
+ book(m_trkpropSTD_pt, "trkpropSplit_vs_pt", "trkpropSTD_vs_pt");
+
+ book(m_trkpropANT_d0, "trkpropSplit_vs_d0", "trkpropANT_vs_d0");
+ book(m_trkpropBAT_d0, "trkpropSplit_vs_d0", "trkpropBAT_vs_d0");
+ book(m_trkpropSTD_d0, "trkpropSplit_vs_d0", "trkpropSTD_vs_d0");
+
+ book(m_trkpropANT_z0, "trkpropSplit_vs_z0", "trkpropANT_vs_z0");
+ book(m_trkpropBAT_z0, "trkpropSplit_vs_z0", "trkpropBAT_vs_z0");
+ book(m_trkpropSTD_z0, "trkpropSplit_vs_z0", "trkpropSTD_vs_z0");
+
+ book(m_ntrkANT_mu, "ntrkSplit_vs_mu", "ntrkANT_vs_mu");
+ book(m_ntrkBAT_mu, "ntrkSplit_vs_mu", "ntrkBAT_vs_mu");
+ book(m_ntrkSTD_mu, "ntrkSplit_vs_mu", "ntrkSTD_vs_mu");
+
+ book(m_ntrkANT_nvertices, "ntrkSplit_vs_nvertices", "ntrkANT_vs_nvertices");
+ book(m_ntrkBAT_nvertices, "ntrkSplit_vs_nvertices", "ntrkBAT_vs_nvertices");
+ book(m_ntrkSTD_nvertices, "ntrkSplit_vs_nvertices", "ntrkSTD_vs_nvertices");
+
+
+ book(m_nPixelHitsANT_vs_eta, "nPixelHits_vs_eta","nPixelHitsANT_vs_eta");
+ book(m_nPixelHitsSTD_vs_eta, "nPixelHits_vs_eta","nPixelHitsBAT_vs_eta");
+ book(m_nPixelHitsBAT_vs_eta, "nPixelHits_vs_eta","nPixelHitsSTD_vs_eta");
+
+ book(m_nSCTHitsANT_vs_eta, "nSCTHits_vs_eta","nSCTHitsANT_vs_eta");
+ book(m_nSCTHitsSTD_vs_eta, "nSCTHits_vs_eta","nSCTHitsBAT_vs_eta");
+ book(m_nSCTHitsBAT_vs_eta, "nSCTHits_vs_eta","nSCTHitsSTD_vs_eta");
+
+ book(m_nTRTHitsANT_vs_eta, "nTRTHits_vs_eta","nTRTHitsANT_vs_eta");
+ book(m_nTRTHitsSTD_vs_eta, "nTRTHits_vs_eta","nTRTHitsBAT_vs_eta");
+ book(m_nTRTHitsBAT_vs_eta, "nTRTHits_vs_eta","nTRTHitsSTD_vs_eta");
+
+ book(m_nPixelHolesANT_vs_eta, "nPixelHoles_vs_eta","nPixelHolesANT_vs_eta");
+ book(m_nPixelHolesSTD_vs_eta, "nPixelHoles_vs_eta","nPixelHolesBAT_vs_eta");
+ book(m_nPixelHolesBAT_vs_eta, "nPixelHoles_vs_eta","nPixelHolesSTD_vs_eta");
+
+ book(m_nSCTHolesANT_vs_eta, "nSCTHoles_vs_eta","nSCTHolesANT_vs_eta");
+ book(m_nSCTHolesSTD_vs_eta, "nSCTHoles_vs_eta","nSCTHolesBAT_vs_eta");
+ book(m_nSCTHolesBAT_vs_eta, "nSCTHoles_vs_eta","nSCTHolesSTD_vs_eta");
+
+ book(m_nTRTHTHitsANT_vs_eta, "nTRTHighThresholdHits_vs_eta","nTRTHTHitsANT_vs_eta");
+ book(m_nTRTHTHitsSTD_vs_eta, "nTRTHighThresholdHits_vs_eta","nTRTHTHitsBAT_vs_eta");
+ book(m_nTRTHTHitsBAT_vs_eta, "nTRTHighThresholdHits_vs_eta","nTRTHTHitsSTD_vs_eta");
+
+
+ book(m_nPixelSharedHitsANT_vs_eta, "nPixelSharedHits_vs_eta","nPixelSharedHitsANT_vs_eta");
+ book(m_nPixelSharedHitsSTD_vs_eta, "nPixelSharedHits_vs_eta","nPixelSharedHitsBAT_vs_eta");
+ book(m_nPixelSharedHitsBAT_vs_eta, "nPixelSharedHits_vs_eta","nPixelSharedHitsSTD_vs_eta");
+
+ book(m_nSCTSharedHitsANT_vs_eta, "nSCTSharedHits_vs_eta","nSCTSharedHitsANT_vs_eta");
+ book(m_nSCTSharedHitsSTD_vs_eta, "nSCTSharedHits_vs_eta","nSCTSharedHitsBAT_vs_eta");
+ book(m_nSCTSharedHitsBAT_vs_eta, "nSCTSharedHits_vs_eta","nSCTSharedHitsSTD_vs_eta");
+
+
+
+
+}
+
+void
+InDetPerfPlot_ANTracking::fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::TrackParticle& track, const bool isGood, const float mu, const unsigned int nVtx) {
+
+ const float undefinedValue = -9999;
+
+ double eta = truth.eta();
+ double pt = truth.pt() / Gaudi::Units::GeV; // convert MeV to GeV
+ double phi = truth.phi();
+
+ double d0 = truth.isAvailable<float>("d0") ? truth.auxdata<float>("d0") : undefinedValue;
+ double z0 = truth.isAvailable<float>("z0") ? truth.auxdata<float>("z0") : undefinedValue;
+ double radius = truth.isAvailable<float>("prodR") ? truth.auxdata<float>("prodR") : undefinedValue;
+
+ bool isBAT = false; bool isANT = false; bool isSTD = false;
+ if(isGood){
+ const std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> &patternInfo{track.patternRecoInfo()};
+ isBAT = patternInfo.test(xAOD::TrackPatternRecoInfo::TRTSeededTrackFinder);
+ isANT = patternInfo.test(xAOD::TrackPatternRecoInfo::SiSpacePointsSeedMaker_LargeD0);
+ isSTD = not isBAT and not isANT;
+
+ if(isANT){
+ fillHisto(m_effANT_eta, eta, isGood);
+ fillHisto(m_effANT_pt, pt, isGood);
+ fillHisto(m_effANT_phi, phi, isGood);
+ fillHisto(m_effANT_d0, d0, isGood);
+ fillHisto(m_effANT_z0, z0, isGood);
+ fillHisto(m_effANT_radius, radius, isGood);
+ fillHisto(m_effANT_mu, mu, isGood);
+ fillHisto(m_effANT_nvertices, nVtx, isGood);
+ } else if(isSTD){
+ fillHisto(m_effSTD_eta, eta, isGood);
+ fillHisto(m_effSTD_pt, pt, isGood);
+ fillHisto(m_effSTD_phi, phi, isGood);
+ fillHisto(m_effSTD_d0, d0, isGood);
+ fillHisto(m_effSTD_z0, z0, isGood);
+ fillHisto(m_effSTD_radius, radius, isGood);
+ fillHisto(m_effSTD_mu, mu, isGood);
+ fillHisto(m_effSTD_nvertices, nVtx, isGood);
+ } else if(isBAT){
+ fillHisto(m_effBAT_eta, eta, isGood);
+ fillHisto(m_effBAT_pt, pt, isGood);
+ fillHisto(m_effBAT_phi, phi, isGood);
+ fillHisto(m_effBAT_d0, d0, isGood);
+ fillHisto(m_effBAT_z0, z0, isGood);
+ fillHisto(m_effBAT_radius, radius, isGood);
+ fillHisto(m_effBAT_mu, mu, isGood);
+ fillHisto(m_effBAT_nvertices, nVtx, isGood);
+ }
+
+ } else {
+ fillHisto(m_effANT_eta, eta, isGood);
+ fillHisto(m_effANT_pt, pt, isGood);
+ fillHisto(m_effANT_phi, phi, isGood);
+ fillHisto(m_effANT_d0, d0, isGood);
+ fillHisto(m_effANT_z0, z0, isGood);
+ fillHisto(m_effANT_radius, radius, isGood);
+ fillHisto(m_effANT_mu, mu, isGood);
+ fillHisto(m_effANT_nvertices, nVtx, isGood);
+ fillHisto(m_effSTD_eta, eta, isGood);
+ fillHisto(m_effSTD_pt, pt, isGood);
+ fillHisto(m_effSTD_phi, phi, isGood);
+ fillHisto(m_effSTD_d0, d0, isGood);
+ fillHisto(m_effSTD_z0, z0, isGood);
+ fillHisto(m_effSTD_radius, radius, isGood);
+ fillHisto(m_effSTD_mu, mu, isGood);
+ fillHisto(m_effSTD_nvertices, nVtx, isGood);
+ fillHisto(m_effBAT_eta, eta, isGood);
+ fillHisto(m_effBAT_pt, pt, isGood);
+ fillHisto(m_effBAT_phi, phi, isGood);
+ fillHisto(m_effBAT_d0, d0, isGood);
+ fillHisto(m_effBAT_z0, z0, isGood);
+ fillHisto(m_effBAT_radius, radius, isGood);
+ fillHisto(m_effBAT_mu, mu, isGood);
+ fillHisto(m_effBAT_nvertices, nVtx, isGood);
+ }
+
+}
+
+void
+InDetPerfPlot_ANTracking::fillFakeRate(const xAOD::TrackParticle& track, const bool isFake, const float mu, const unsigned int nVtx){
+
+ double eta = track.eta();
+ double phi = track.phi();
+ double pt = track.pt() / Gaudi::Units::GeV;
+ double d0 = track.d0();
+ double z0 = track.z0();
+
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = track.patternRecoInfo();
+ bool isBAT = patternInfo.test(xAOD::TrackPatternRecoInfo::TRTSeededTrackFinder);
+ bool isANT = patternInfo.test(xAOD::TrackPatternRecoInfo::SiSpacePointsSeedMaker_LargeD0);
+ bool isSTD = not isBAT and not isANT;
+
+ if(isANT){
+ fillHisto(m_fakeANT_eta, eta, isFake);
+ fillHisto(m_fakeANT_pt, pt, isFake);
+ fillHisto(m_fakeANT_phi, phi, isFake);
+ fillHisto(m_fakeANT_d0, d0, isFake);
+ fillHisto(m_fakeANT_z0, z0, isFake);
+ fillHisto(m_fakeANT_mu, mu, isFake);
+ fillHisto(m_fakeANT_nvertices, nVtx, isFake);
+ } else if(isSTD){
+ fillHisto(m_fakeSTD_eta, eta, isFake);
+ fillHisto(m_fakeSTD_pt, pt, isFake);
+ fillHisto(m_fakeSTD_phi, phi, isFake);
+ fillHisto(m_fakeSTD_d0, d0, isFake);
+ fillHisto(m_fakeSTD_z0, z0, isFake);
+ fillHisto(m_fakeSTD_mu, mu, isFake);
+ fillHisto(m_fakeSTD_nvertices, nVtx, isFake);
+ } else if(isBAT){
+ fillHisto(m_fakeBAT_eta, eta, isFake);
+ fillHisto(m_fakeBAT_pt, pt, isFake);
+ fillHisto(m_fakeBAT_phi, phi, isFake);
+ fillHisto(m_fakeBAT_d0, d0, isFake);
+ fillHisto(m_fakeBAT_z0, z0, isFake);
+ fillHisto(m_fakeBAT_mu, mu, isFake);
+ fillHisto(m_fakeBAT_nvertices, nVtx, isFake);
+ }
+
+
+}
+
+void
+InDetPerfPlot_ANTracking::fillUnlinked(const xAOD::TrackParticle& track, const bool isAssociatedTruth, const float mu, const unsigned int nVtx) {
+
+ double eta = track.eta();
+ double phi = track.phi();
+ double pt = track.pt() / Gaudi::Units::GeV;
+ double d0 = track.d0();
+ double z0 = track.z0();
+
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = track.patternRecoInfo();
+ bool isBAT = patternInfo.test(xAOD::TrackPatternRecoInfo::TRTSeededTrackFinder);
+ bool isANT = patternInfo.test(xAOD::TrackPatternRecoInfo::SiSpacePointsSeedMaker_LargeD0);
+ bool isSTD = not isBAT and not isANT;
+
+ if(isANT){
+ fillHisto(m_unlinkedANT_eta, eta, isAssociatedTruth);
+ fillHisto(m_unlinkedANT_pt, pt, isAssociatedTruth);
+ fillHisto(m_unlinkedANT_phi, phi, isAssociatedTruth);
+ fillHisto(m_unlinkedANT_d0, d0, isAssociatedTruth);
+ fillHisto(m_unlinkedANT_z0, z0, isAssociatedTruth);
+ fillHisto(m_unlinkedANT_mu, mu, isAssociatedTruth);
+ fillHisto(m_unlinkedANT_nvertices, nVtx, isAssociatedTruth);
+ } else if(isSTD){
+ fillHisto(m_unlinkedSTD_eta, eta, isAssociatedTruth);
+ fillHisto(m_unlinkedSTD_pt, pt, isAssociatedTruth);
+ fillHisto(m_unlinkedSTD_phi, phi, isAssociatedTruth);
+ fillHisto(m_unlinkedSTD_d0, d0, isAssociatedTruth);
+ fillHisto(m_unlinkedSTD_z0, z0, isAssociatedTruth);
+ fillHisto(m_unlinkedSTD_mu, mu, isAssociatedTruth);
+ fillHisto(m_unlinkedSTD_nvertices, nVtx, isAssociatedTruth);
+ } else if(isBAT){
+ fillHisto(m_unlinkedBAT_eta, eta, isAssociatedTruth);
+ fillHisto(m_unlinkedBAT_pt, pt, isAssociatedTruth);
+ fillHisto(m_unlinkedBAT_phi, phi, isAssociatedTruth);
+ fillHisto(m_unlinkedBAT_d0, d0, isAssociatedTruth);
+ fillHisto(m_unlinkedBAT_z0, z0, isAssociatedTruth);
+ fillHisto(m_unlinkedBAT_mu, mu, isAssociatedTruth);
+ fillHisto(m_unlinkedBAT_nvertices, nVtx, isAssociatedTruth);
+ }
+
+
+}
+
+void
+InDetPerfPlot_ANTracking::fill(const xAOD::TrackParticle& track) {
+
+ double eta = track.eta();
+ double phi = track.phi();
+ double pt = track.pt() / Gaudi::Units::GeV;
+ double d0 = track.d0();
+ double z0 = track.z0();
+
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = track.patternRecoInfo();
+ bool isBAT = patternInfo.test(xAOD::TrackPatternRecoInfo::TRTSeededTrackFinder);
+ bool isANT = patternInfo.test(xAOD::TrackPatternRecoInfo::SiSpacePointsSeedMaker_LargeD0);
+ bool isSTD = not isBAT and not isANT;
+
+ uint8_t iPixHits(0), iSctHits(0), iTrtHits(0);
+ uint8_t iPixHoles(0), iSCTHoles(0), iTrtHTHits(0);
+ uint8_t iPixelShared(0), iSCTShared(0);
+
+ if (track.summaryValue(iPixHits, xAOD::numberOfPixelHits)) {
+ if(isANT) fillHisto(m_nPixelHitsANT_vs_eta, eta, iPixHits);
+ if(isSTD) fillHisto(m_nPixelHitsSTD_vs_eta, eta, iPixHits);
+ if(isBAT) fillHisto(m_nPixelHitsBAT_vs_eta, eta, iPixHits);
+ }
+ if (track.summaryValue(iSctHits, xAOD::numberOfSCTHits)) {
+ if(isANT) fillHisto(m_nSCTHitsANT_vs_eta, eta, iSctHits);
+ if(isSTD) fillHisto(m_nSCTHitsSTD_vs_eta, eta, iSctHits);
+ if(isBAT) fillHisto(m_nSCTHitsBAT_vs_eta, eta, iSctHits);
+ }
+ if (track.summaryValue(iTrtHits, xAOD::numberOfTRTHits)) {
+ if(isANT) fillHisto(m_nTRTHitsANT_vs_eta, eta, iTrtHits);
+ if(isSTD) fillHisto(m_nTRTHitsSTD_vs_eta, eta, iTrtHits);
+ if(isBAT) fillHisto(m_nTRTHitsBAT_vs_eta, eta, iTrtHits);
+ }
+ if (track.summaryValue(iPixHoles, xAOD::numberOfPixelHoles)) {
+ if(isANT) fillHisto(m_nPixelHolesANT_vs_eta, eta, iPixHoles);
+ if(isSTD) fillHisto(m_nPixelHolesSTD_vs_eta, eta, iPixHoles);
+ if(isBAT) fillHisto(m_nPixelHolesBAT_vs_eta, eta, iPixHoles);
+ }
+ if (track.summaryValue(iSCTHoles, xAOD::numberOfSCTHoles)) {
+ if(isANT) fillHisto(m_nSCTHolesANT_vs_eta, eta, iSCTHoles);
+ if(isSTD) fillHisto(m_nSCTHolesSTD_vs_eta, eta, iSCTHoles);
+ if(isBAT) fillHisto(m_nSCTHolesBAT_vs_eta, eta, iSCTHoles);
+ }
+ if (track.summaryValue(iTrtHTHits, xAOD::numberOfTRTHighThresholdHits)) {
+ if(isANT) fillHisto(m_nTRTHTHitsANT_vs_eta, eta, iTrtHTHits);
+ if(isSTD) fillHisto(m_nTRTHTHitsSTD_vs_eta, eta, iTrtHTHits);
+ if(isBAT) fillHisto(m_nTRTHTHitsBAT_vs_eta, eta, iTrtHTHits);
+ }
+ if (track.summaryValue(iPixelShared, xAOD::numberOfPixelSharedHits)) {
+ if(isANT) fillHisto(m_nPixelSharedHitsANT_vs_eta, eta, iPixelShared);
+ if(isSTD) fillHisto(m_nPixelSharedHitsSTD_vs_eta, eta, iPixelShared);
+ if(isBAT) fillHisto(m_nPixelSharedHitsBAT_vs_eta, eta, iPixelShared);
+ }
+ if (track.summaryValue(iSCTShared, xAOD::numberOfSCTSharedHits)) {
+ if(isANT) fillHisto(m_nSCTSharedHitsANT_vs_eta, eta, iSCTShared);
+ if(isSTD) fillHisto(m_nSCTSharedHitsSTD_vs_eta, eta, iSCTShared);
+ if(isBAT) fillHisto(m_nSCTSharedHitsBAT_vs_eta, eta, iSCTShared);
+ }
+
+
+ if(isANT){
+ fillHisto(m_trkpropANT_eta, eta);
+ fillHisto(m_trkpropANT_phi, phi);
+ fillHisto(m_trkpropANT_pt, pt);
+ fillHisto(m_trkpropANT_d0, d0);
+ fillHisto(m_trkpropANT_z0, z0);
+ }
+ if(isBAT){
+ fillHisto(m_trkpropBAT_eta, eta);
+ fillHisto(m_trkpropBAT_phi, phi);
+ fillHisto(m_trkpropBAT_pt, pt);
+ fillHisto(m_trkpropBAT_d0, d0);
+ fillHisto(m_trkpropBAT_z0, z0);
+ }
+ if(isSTD){
+ fillHisto(m_trkpropSTD_eta, eta);
+ fillHisto(m_trkpropSTD_phi, phi);
+ fillHisto(m_trkpropSTD_pt, pt);
+ fillHisto(m_trkpropSTD_d0, d0);
+ fillHisto(m_trkpropSTD_z0, z0);
+ }
+}
+
+void
+InDetPerfPlot_ANTracking::fill(const unsigned int nTrkANT, const unsigned int nTrkSTD, const unsigned int nTrkBAT, const float mu, const unsigned int nVtx) {
+
+ fillHisto(m_ntrkANT_mu, mu, nTrkANT);
+ fillHisto(m_ntrkSTD_mu, mu, nTrkSTD);
+ fillHisto(m_ntrkBAT_mu, mu, nTrkBAT);
+
+ fillHisto(m_ntrkANT_nvertices, nVtx, nTrkANT);
+ fillHisto(m_ntrkSTD_nvertices, nVtx, nTrkSTD);
+ fillHisto(m_ntrkBAT_nvertices, nVtx, nTrkBAT);
+
+}
+
+void
+InDetPerfPlot_ANTracking::finalizePlots() {
+}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ANTracking.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ANTracking.h
new file mode 100644
index 0000000000000000000000000000000000000000..fc1cd2f86d8b92a50b7d02e3839a1b4f1d3d9960
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ANTracking.h
@@ -0,0 +1,175 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef INDETPHYSVALMONITORING_INDETPERFPLOT_ANTRACKING
+#define INDETPHYSVALMONITORING_INDETPERFPLOT_ANTRACKING
+/**
+ * @file InDetPerfPlot_ANTracking.cxx
+ * @author Gabrel Facin
+ * Wed Oct 29 09:58:58 CET 2014
+ *
+ * a lot of this is copied from ANTrackingPlots in the TrkValHistUtils which is dumb
+ * the point is that many instances of this will be created so more control of the names
+ * is needed. I don't have permission for that package and time is short...as usual
+ **/
+
+
+
+// local includes
+#include "InDetPlotBase.h"
+#include "xAODTracking/TrackParticle.h"
+#include "xAODTruth/TruthParticle.h"
+
+// std includes
+#include <string>
+
+///class holding Pt plots for Inner Detector RTT Validation and implementing fill methods
+class InDetPerfPlot_ANTracking: public InDetPlotBase {
+public:
+ InDetPerfPlot_ANTracking(InDetPlotBase* pParent, const std::string& dirName);
+
+ void fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::TrackParticle& track, const bool isGood, const float mu, const unsigned int nVtx);
+ void fillFakeRate(const xAOD::TrackParticle& track, const bool isAssociatedTruth, const float mu, const unsigned int nVtx);
+ void fillUnlinked(const xAOD::TrackParticle& track, const bool isAssociatedTruth, const float mu, const unsigned int nVtx);
+
+ void fill(const xAOD::TrackParticle& track);
+ void fill(const unsigned int nTrkANT, const unsigned int nTrkSTD, const unsigned int nTrkBAT, const float mu, const unsigned int nVtx);
+
+
+private:
+
+ // plot base has nop default implementation of this; we use it to book the histos
+ void initializePlots();
+ void finalizePlots();
+
+ TEfficiency* m_effANT_eta;
+ TEfficiency *m_effSTD_eta;
+ TEfficiency *m_effBAT_eta;
+ TEfficiency *m_effANT_pt;
+ TEfficiency *m_effSTD_pt;
+ TEfficiency *m_effBAT_pt;
+ TEfficiency *m_effANT_phi;
+ TEfficiency *m_effSTD_phi;
+ TEfficiency *m_effBAT_phi;
+ TEfficiency *m_effANT_d0;
+ TEfficiency *m_effSTD_d0;
+ TEfficiency *m_effBAT_d0;
+ TEfficiency *m_effANT_z0;
+ TEfficiency *m_effSTD_z0;
+ TEfficiency *m_effBAT_z0;
+ TEfficiency *m_effANT_radius;
+ TEfficiency *m_effSTD_radius;
+ TEfficiency *m_effBAT_radius;
+ TEfficiency *m_effANT_mu;
+ TEfficiency *m_effSTD_mu;
+ TEfficiency *m_effBAT_mu;
+ TEfficiency *m_effANT_nvertices;
+ TEfficiency *m_effSTD_nvertices;
+ TEfficiency *m_effBAT_nvertices;
+
+
+ TEfficiency *m_fakeANT_eta;
+ TEfficiency *m_fakeSTD_eta;
+ TEfficiency *m_fakeBAT_eta;
+ TEfficiency *m_fakeANT_pt;
+ TEfficiency *m_fakeSTD_pt;
+ TEfficiency *m_fakeBAT_pt;
+ TEfficiency *m_fakeANT_phi;
+ TEfficiency *m_fakeSTD_phi;
+ TEfficiency *m_fakeBAT_phi;
+ TEfficiency *m_fakeANT_d0;
+ TEfficiency *m_fakeSTD_d0;
+ TEfficiency *m_fakeBAT_d0;
+ TEfficiency *m_fakeANT_z0;
+ TEfficiency *m_fakeSTD_z0;
+ TEfficiency *m_fakeBAT_z0;
+ TEfficiency *m_fakeANT_mu;
+ TEfficiency *m_fakeSTD_mu;
+ TEfficiency *m_fakeBAT_mu;
+ TEfficiency *m_fakeANT_nvertices;
+ TEfficiency *m_fakeSTD_nvertices;
+ TEfficiency *m_fakeBAT_nvertices;
+
+ TEfficiency *m_unlinkedANT_eta;
+ TEfficiency *m_unlinkedSTD_eta;
+ TEfficiency *m_unlinkedBAT_eta;
+ TEfficiency *m_unlinkedANT_pt;
+ TEfficiency *m_unlinkedSTD_pt;
+ TEfficiency *m_unlinkedBAT_pt;
+ TEfficiency *m_unlinkedANT_phi;
+ TEfficiency *m_unlinkedSTD_phi;
+ TEfficiency *m_unlinkedBAT_phi;
+ TEfficiency *m_unlinkedANT_d0;
+ TEfficiency *m_unlinkedSTD_d0;
+ TEfficiency *m_unlinkedBAT_d0;
+ TEfficiency *m_unlinkedANT_z0;
+ TEfficiency *m_unlinkedSTD_z0;
+ TEfficiency *m_unlinkedBAT_z0;
+ TEfficiency *m_unlinkedANT_mu;
+ TEfficiency *m_unlinkedSTD_mu;
+ TEfficiency *m_unlinkedBAT_mu;
+ TEfficiency *m_unlinkedANT_nvertices;
+ TEfficiency *m_unlinkedSTD_nvertices;
+ TEfficiency *m_unlinkedBAT_nvertices;
+
+ TH1* m_trkpropANT_eta;
+ TH1* m_trkpropBAT_eta;
+ TH1* m_trkpropSTD_eta;
+ TH1* m_trkpropANT_phi;
+ TH1* m_trkpropBAT_phi;
+ TH1* m_trkpropSTD_phi;
+ TH1* m_trkpropANT_pt;
+ TH1* m_trkpropBAT_pt;
+ TH1* m_trkpropSTD_pt;
+ TH1* m_trkpropANT_d0;
+ TH1* m_trkpropBAT_d0;
+ TH1* m_trkpropSTD_d0;
+ TH1* m_trkpropANT_z0;
+ TH1* m_trkpropBAT_z0;
+ TH1* m_trkpropSTD_z0;
+
+ TH2* m_ntrkANT_mu;
+ TH2* m_ntrkBAT_mu;
+ TH2* m_ntrkSTD_mu;
+
+ TH2* m_ntrkANT_nvertices;
+ TH2* m_ntrkBAT_nvertices;
+ TH2* m_ntrkSTD_nvertices;
+
+ TProfile* m_nPixelHitsANT_vs_eta;
+ TProfile* m_nPixelHitsSTD_vs_eta;
+ TProfile* m_nPixelHitsBAT_vs_eta;
+
+ TProfile* m_nSCTHitsANT_vs_eta;
+ TProfile* m_nSCTHitsSTD_vs_eta;
+ TProfile* m_nSCTHitsBAT_vs_eta;
+
+ TProfile* m_nTRTHitsANT_vs_eta;
+ TProfile* m_nTRTHitsSTD_vs_eta;
+ TProfile* m_nTRTHitsBAT_vs_eta;
+
+ TProfile* m_nPixelHolesANT_vs_eta;
+ TProfile* m_nPixelHolesSTD_vs_eta;
+ TProfile* m_nPixelHolesBAT_vs_eta;
+
+ TProfile* m_nSCTHolesANT_vs_eta;
+ TProfile* m_nSCTHolesSTD_vs_eta;
+ TProfile* m_nSCTHolesBAT_vs_eta;
+
+ TProfile* m_nTRTHTHitsANT_vs_eta;
+ TProfile* m_nTRTHTHitsSTD_vs_eta;
+ TProfile* m_nTRTHTHitsBAT_vs_eta;
+
+ TProfile* m_nPixelSharedHitsANT_vs_eta;
+ TProfile* m_nPixelSharedHitsSTD_vs_eta;
+ TProfile* m_nPixelSharedHitsBAT_vs_eta;
+
+ TProfile* m_nSCTSharedHitsANT_vs_eta;
+ TProfile* m_nSCTSharedHitsSTD_vs_eta;
+ TProfile* m_nSCTSharedHitsBAT_vs_eta;
+
+
+};
+
+#endif
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Hits.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Hits.cxx
index 438e4cce5bb420f99f1aa6dd1ef898caa0e69d56..92ab8bbb56eb0c5be2dce9d7a68743259ef46dcd 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Hits.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Hits.cxx
@@ -105,6 +105,7 @@ InDetPerfPlot_Hits::initializePlots() {
book(m_nSCTHits, "nSCTHits");
book(m_nTRTHits, "nTRTHits");
book(m_nPixelHoles, "nPixelHoles");
+ book(m_nSCTHoles, "nSCTHoles");
book(m_nTRTHighThresholdHits, "nTRTHighThresholdHits");
book(m_nInnerMostPixelHits_vs_eta, "nInnerMostPixelHits_vs_eta");
book(m_nNextToInnerMostPixelHits_vs_eta, "nNextToInnerMostPixelHits_vs_eta");
@@ -112,6 +113,7 @@ InDetPerfPlot_Hits::initializePlots() {
book(m_nSCTHits_vs_eta, "nSCTHits_vs_eta");
book(m_nTRTHits_vs_eta, "nTRTHits_vs_eta");
book(m_nPixelHoles_vs_eta, "nPixelHoles_vs_eta");
+ book(m_nSCTHoles_vs_eta, "nSCTHoles_vs_eta");
book(m_nTRTHighThresholdHits_vs_eta, "nTRTHighThresholdHits_vs_eta");
book(m_nInnerMostPixelHits_vs_phi, "nInnerMostPixelHits_vs_phi");
book(m_nNextToInnerMostPixelHits_vs_phi, "nNextToInnerMostPixelHits_vs_phi");
@@ -119,61 +121,63 @@ InDetPerfPlot_Hits::initializePlots() {
book(m_nSCTHits_vs_phi, "nSCTHits_vs_phi");
book(m_nTRTHits_vs_phi, "nTRTHits_vs_phi");
book(m_nPixelHoles_vs_phi, "nPixelHoles_vs_phi");
+ book(m_nSCTHoles_vs_phi, "nSCTHoles_vs_phi");
book(m_nTRTHighThresholdHits_vs_phi, "nTRTHighThresholdHits_vs_phi");
+ book(m_nInnerMostPixelSharedHits, "nInnerMostPixelSharedHits");
+ book(m_nPixelSharedHits, "nPixelSharedHits");
+ book(m_nSCTSharedHits, "nSCTSharedHits");
+ book(m_nInnerMostPixelSharedHits_vs_eta, "nInnerMostPixelSharedHits_vs_eta");
+ book(m_nPixelSharedHits_vs_eta, "nPixelSharedHits_vs_eta");
+ book(m_nSCTSharedHits_vs_eta, "nSCTSharedHits_vs_eta");
+ book(m_nInnerMostPixelSharedHits_vs_phi, "nInnerMostPixelSharedHits_vs_phi");
+ book(m_nPixelSharedHits_vs_phi, "nPixelSharedHits_vs_phi");
+ book(m_nSCTSharedHits_vs_phi, "nSCTSharedHits_vs_phi");
+
if (m_iDetailLevel >= 100){
book(m_nInnerMostPixelOutliers, "nInnerMostPixelOutliers");
- book(m_nInnerMostPixelSharedHits, "nInnerMostPixelSharedHits");
book(m_nInnerMostPixelSplitHits, "nInnerMostPixelSplitHits");
book(m_nExpectedInnerMostPixelHits, "nExpectedInnerMostPixelHits");
book(m_nExpectedNextToInnerMostPixelHits, "nExpectedNextToInnerMostPixelHits");
book(m_nPixelOutliers, "nPixelOutliers");
book(m_nPixelContribLayers, "nPixelContribLayers");
- book(m_nPixelSharedHits, "nPixelSharedHits");
book(m_nPixelSplitHits, "nPixelSplitHits");
book(m_nPixelGangedHits, "nPixelGangedHits");
book(m_nPixelGangedHitsFlaggedFakes, "nPixelGangedHitsFlaggedFakes");
book(m_nSCTOutliers, "nSCTOutliers");
book(m_nSCTDoubleHoles, "nSCTDoubleHoles");
- book(m_nSCTSharedHits, "nSCTSharedHits");
book(m_nTRTOutliers, "nTRTOutliers");
book(m_nTRTHighThresholdOutliers, "nTRTHighThresholdOutliers");
book(m_nPixelDeadSensors, "nPixelDeadSensors");
book(m_nSCTDeadSensors, "nSCTDeadSensors");
book(m_nInnerMostPixelOutliers_vs_eta, "nInnerMostPixelOutliers_vs_eta");
- book(m_nInnerMostPixelSharedHits_vs_eta, "nInnerMostPixelSharedHits_vs_eta");
book(m_nInnerMostPixelSplitHits_vs_eta, "nInnerMostPixelSplitHits_vs_eta");
book(m_nExpectedInnerMostPixelHits_vs_eta, "nExpectedInnerMostPixelHits_vs_eta");
book(m_nExpectedNextToInnerMostPixelHits_vs_eta, "nExpectedNextToInnerMostPixelHits_vs_eta");
book(m_nPixelOutliers_vs_eta, "nPixelOutliers_vs_eta");
book(m_nPixelContribLayers_vs_eta, "nPixelContribLayers_vs_eta");
- book(m_nPixelSharedHits_vs_eta, "nPixelSharedHits_vs_eta");
book(m_nPixelSplitHits_vs_eta, "nPixelSplitHits_vs_eta");
book(m_nPixelGangedHits_vs_eta, "nPixelGangedHits_vs_eta");
book(m_nPixelGangedHitsFlaggedFakes_vs_eta, "nPixelGangedHitsFlaggedFakes_vs_eta");
book(m_nSCTOutliers_vs_eta, "nSCTOutliers_vs_eta");
book(m_nSCTDoubleHoles_vs_eta, "nSCTDoubleHoles_vs_eta");
- book(m_nSCTSharedHits_vs_eta, "nSCTSharedHits_vs_eta");
book(m_nTRTOutliers_vs_eta, "nTRTOutliers_vs_eta");
book(m_nTRTHighThresholdOutliers_vs_eta, "nTRTHighThresholdOutliers_vs_eta");
book(m_nPixelDeadSensors_vs_eta, "nPixelDeadSensors_vs_eta");
book(m_nSCTDeadSensors_vs_eta, "nSCTDeadSensors_vs_eta");
book(m_nInnerMostPixelOutliers_vs_phi, "nInnerMostPixelOutliers_vs_phi");
- book(m_nInnerMostPixelSharedHits_vs_phi, "nInnerMostPixelSharedHits_vs_phi");
book(m_nInnerMostPixelSplitHits_vs_phi, "nInnerMostPixelSplitHits_vs_phi");
book(m_nExpectedInnerMostPixelHits_vs_phi, "nExpectedInnerMostPixelHits_vs_phi");
book(m_nExpectedNextToInnerMostPixelHits_vs_phi, "nExpectedNextToInnerMostPixelHits_vs_phi");
book(m_nPixelOutliers_vs_phi, "nPixelOutliers_vs_phi");
book(m_nPixelContribLayers_vs_phi, "nPixelContribLayers_vs_phi");
- book(m_nPixelSharedHits_vs_phi, "nPixelSharedHits_vs_phi");
book(m_nPixelSplitHits_vs_phi, "nPixelSplitHits_vs_phi");
book(m_nPixelGangedHits_vs_phi, "nPixelGangedHits_vs_phi");
book(m_nPixelGangedHitsFlaggedFakes_vs_phi, "nPixelGangedHitsFlaggedFakes_vs_phi");
book(m_nSCTOutliers_vs_phi, "nSCTOutliers_vs_phi");
book(m_nSCTDoubleHoles_vs_phi, "nSCTDoubleHoles_vs_phi");
- book(m_nSCTSharedHits_vs_phi, "nSCTSharedHits_vs_phi");
book(m_nTRTOutliers_vs_phi, "nTRTOutliers_vs_phi");
book(m_nTRTHighThresholdOutliers_vs_phi, "nTRTHighThresholdOutliers_vs_phi");
book(m_nPixelDeadSensors_vs_phi, "nPixelDeadSensors_vs_phi");
@@ -191,6 +195,7 @@ InDetPerfPlot_Hits::fill(const xAOD::TrackParticle& track) {
uint8_t iInnerMostPixelHits(0), iNextToInnerMostPixelHits(0), iPixHits(0), iSctHits(0), iTrtHits(0);
uint8_t iPixHoles(0), iSCTHoles(0), iTrtHTHits(0);
+ uint8_t iInnerMostPixelShared(0), iPixelShared(0), iSCTShared(0);
if (track.summaryValue(iInnerMostPixelHits, xAOD::numberOfInnermostPixelLayerHits)) {
fillHisto(m_nInnerMostPixelHits, iInnerMostPixelHits);
@@ -232,13 +237,28 @@ InDetPerfPlot_Hits::fill(const xAOD::TrackParticle& track) {
fillHisto(m_nTRTHighThresholdHits_vs_eta, eta, iTrtHTHits);
fillHisto(m_nTRTHighThresholdHits_vs_phi, phi, iTrtHTHits);
}
+ if (track.summaryValue(iInnerMostPixelShared, xAOD::numberOfInnermostPixelLayerSharedHits)) {
+ fillHisto(m_nInnerMostPixelSharedHits, iInnerMostPixelShared);
+ fillHisto(m_nInnerMostPixelSharedHits_vs_eta, eta, iInnerMostPixelShared);
+ fillHisto(m_nInnerMostPixelSharedHits_vs_phi, phi, iInnerMostPixelShared);
+ }
+ if (track.summaryValue(iPixelShared, xAOD::numberOfPixelSharedHits)) {
+ fillHisto(m_nPixelSharedHits, iPixelShared);
+ fillHisto(m_nPixelSharedHits_vs_eta, eta, iPixelShared);
+ fillHisto(m_nPixelSharedHits_vs_phi, phi, iPixelShared);
+ }
+ if (track.summaryValue(iSCTShared, xAOD::numberOfSCTSharedHits)) {
+ fillHisto(m_nSCTSharedHits, iSCTShared);
+ fillHisto(m_nSCTSharedHits_vs_eta, eta, iSCTShared);
+ fillHisto(m_nSCTSharedHits_vs_phi, phi, iSCTShared);
+ }
// expert plots
if (m_iDetailLevel >= 100) {
- uint8_t iInnerMostPixelOutliers(0), iInnerMostPixelShared(0), iInnerMostPixelSplit(0);
+ uint8_t iInnerMostPixelOutliers(0), iInnerMostPixelSplit(0);
uint8_t iExpectedInnerMostPixelHits(0), iExpectedNextToInnerMostPixelHits(0);
- uint8_t iPixelOutliers(0), iPixelContribLayers(0), iPixelShared(0), iPixelSplit(0), iPixelGanged(0), iPixelGangedFakes(0);
- uint8_t iSCTOutliers(0), iSCTDoubleHoles(0), iSCTShared(0);
+ uint8_t iPixelOutliers(0), iPixelContribLayers(0), iPixelSplit(0), iPixelGanged(0), iPixelGangedFakes(0);
+ uint8_t iSCTOutliers(0), iSCTDoubleHoles(0);
uint8_t iTRTOutliers(0), iTRTHTOutliers(0);
uint8_t iPixelDeadSensors(0), iSCTDeadSensors(0);
@@ -247,11 +267,6 @@ InDetPerfPlot_Hits::fill(const xAOD::TrackParticle& track) {
fillHisto(m_nInnerMostPixelOutliers_vs_eta, eta, iInnerMostPixelOutliers);
fillHisto(m_nInnerMostPixelOutliers_vs_phi, phi, iInnerMostPixelOutliers);
}
- if (track.summaryValue(iInnerMostPixelShared, xAOD::numberOfInnermostPixelLayerSharedHits)) {
- fillHisto(m_nInnerMostPixelSharedHits, iInnerMostPixelShared);
- fillHisto(m_nInnerMostPixelSharedHits_vs_eta, eta, iInnerMostPixelShared);
- fillHisto(m_nInnerMostPixelSharedHits_vs_phi, phi, iInnerMostPixelShared);
- }
if (track.summaryValue(iInnerMostPixelSplit, xAOD::numberOfInnermostPixelLayerSplitHits)) {
fillHisto(m_nInnerMostPixelSplitHits, iInnerMostPixelSplit);
fillHisto(m_nInnerMostPixelSplitHits_vs_eta, eta, iInnerMostPixelSplit);
@@ -277,11 +292,6 @@ InDetPerfPlot_Hits::fill(const xAOD::TrackParticle& track) {
fillHisto(m_nPixelContribLayers_vs_eta, eta, iPixelContribLayers);
fillHisto(m_nPixelContribLayers_vs_phi, phi, iPixelContribLayers);
}
- if (track.summaryValue(iPixelShared, xAOD::numberOfPixelSharedHits)) {
- fillHisto(m_nPixelSharedHits, iPixelShared);
- fillHisto(m_nPixelSharedHits_vs_eta, eta, iPixelShared);
- fillHisto(m_nPixelSharedHits_vs_phi, phi, iPixelShared);
- }
if (track.summaryValue(iPixelSplit, xAOD::numberOfPixelSplitHits)) {
fillHisto(m_nPixelSplitHits, iPixelSplit);
fillHisto(m_nPixelSplitHits_vs_eta, eta, iPixelSplit);
@@ -307,11 +317,6 @@ InDetPerfPlot_Hits::fill(const xAOD::TrackParticle& track) {
fillHisto(m_nSCTDoubleHoles_vs_eta, eta, iSCTDoubleHoles);
fillHisto(m_nSCTDoubleHoles_vs_phi, phi, iSCTDoubleHoles);
}
- if (track.summaryValue(iSCTShared, xAOD::numberOfSCTSharedHits)) {
- fillHisto(m_nSCTSharedHits, iSCTShared);
- fillHisto(m_nSCTSharedHits_vs_eta, eta, iSCTShared);
- fillHisto(m_nSCTSharedHits_vs_phi, phi, iSCTShared);
- }
if (track.summaryValue(iTRTOutliers, xAOD::numberOfTRTOutliers)) {
fillHisto(m_nTRTOutliers, iTRTOutliers);
fillHisto(m_nTRTOutliers_vs_eta, eta, iTRTOutliers);
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TRTExtension.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TRTExtension.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..e937b48548853f0837919bc5d7a906a4788ca6d7
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TRTExtension.cxx
@@ -0,0 +1,211 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file InDetPerfPlot_TRTExtension.cxx
+ * @author shaun roe
+ **/
+
+
+#include "InDetPhysValMonitoringUtilities.h"
+
+#include "InDetPerfPlot_TRTExtension.h"
+
+#include <cmath>
+
+using namespace IDPVM;
+
+InDetPerfPlot_TRTExtension::InDetPerfPlot_TRTExtension(InDetPlotBase* pParent, const std::string& sDir) :
+ InDetPlotBase(pParent, sDir),
+ m_resolutionMethod(IDPVM::ResolutionHelper::iterRMS_convergence),
+ m_fracTRTExtensions_vs_eta{},
+ m_fracTRTExtensions_vs_pt{},
+ m_fracTRTExtensions_vs_mu{},
+ m_fracTRTExtensions_vs_nvertices{},
+ m_fracTRTExtensions_matched_vs_eta{},
+ m_fracTRTExtensions_matched_vs_pt{},
+ m_chi2ndofTRTExtensions{},
+ m_chi2ndofNoTRTExtensions{},
+ m_ptresTRTExtensions_vs_eta{},
+ m_ptresTRTExtensions_vs_pt{},
+ m_ptresNoTRTExtensions_vs_eta{},
+ m_ptresNoTRTExtensions_vs_pt{},
+ m_reswidthTRTExtensions_vs_eta{},
+ m_resmeanTRTExtensions_vs_eta{},
+ m_reswidthTRTExtensions_vs_pt{},
+ m_resmeanTRTExtensions_vs_pt{},
+ m_reswidthNoTRTExtensions_vs_eta{},
+ m_resmeanNoTRTExtensions_vs_eta{},
+ m_reswidthNoTRTExtensions_vs_pt{},
+ m_resmeanNoTRTExtensions_vs_pt{},
+ m_ptpullTRTExtensions_vs_eta{},
+ m_ptpullTRTExtensions_vs_pt{},
+ m_ptpullNoTRTExtensions_vs_eta{},
+ m_ptpullNoTRTExtensions_vs_pt{},
+ m_pullwidthTRTExtensions_vs_eta{},
+ m_pullmeanTRTExtensions_vs_eta{},
+ m_pullwidthTRTExtensions_vs_pt{},
+ m_pullmeanTRTExtensions_vs_pt{},
+ m_pullwidthNoTRTExtensions_vs_eta{},
+ m_pullmeanNoTRTExtensions_vs_eta{},
+ m_pullwidthNoTRTExtensions_vs_pt{},
+ m_pullmeanNoTRTExtensions_vs_pt{}
+
+
+ {
+}
+
+void
+InDetPerfPlot_TRTExtension::initializePlots() {
+
+ book(m_fracTRTExtensions_vs_eta, "fracTRTExtensions_vs_eta");
+ book(m_fracTRTExtensions_vs_pt, "fracTRTExtensions_vs_pt");
+ book(m_fracTRTExtensions_vs_mu, "fracTRTExtensions_vs_mu");
+ book(m_fracTRTExtensions_vs_nvertices, "fracTRTExtensions_vs_nvertices");
+
+ book(m_fracTRTExtensions_matched_vs_eta, "fracTRTExtensions_matched_vs_eta");
+ book(m_fracTRTExtensions_matched_vs_pt, "fracTRTExtensions_matched_vs_pt");
+
+ book(m_chi2ndofTRTExtensions, "chi2ndofTRTExtensions");
+ book(m_chi2ndofNoTRTExtensions, "chi2ndofNoTRTExtensions");
+
+ book(m_ptresTRTExtensions_vs_eta, "ptresTRTExtensions_vs_eta");
+ book(m_ptresTRTExtensions_vs_pt, "ptresTRTExtensions_vs_pt");
+ book(m_ptresNoTRTExtensions_vs_eta, "ptresNoTRTExtensions_vs_eta");
+ book(m_ptresNoTRTExtensions_vs_pt, "ptresNoTRTExtensions_vs_pt");
+
+ book(m_reswidthTRTExtensions_vs_eta, "ptresolutionTRTExtensions_vs_eta");
+ book(m_resmeanTRTExtensions_vs_eta, "ptresmeanTRTExtensions_vs_eta");
+ book(m_reswidthTRTExtensions_vs_pt, "ptresolutionTRTExtensions_vs_pt");
+ book(m_resmeanTRTExtensions_vs_pt, "ptresmeanTRTExtensions_vs_pt");
+
+ book(m_reswidthNoTRTExtensions_vs_eta, "ptresolutionNoTRTExtensions_vs_eta");
+ book(m_resmeanNoTRTExtensions_vs_eta, "ptresmeanNoTRTExtensions_vs_eta");
+ book(m_reswidthNoTRTExtensions_vs_pt, "ptresolutionNoTRTExtensions_vs_pt");
+ book(m_resmeanNoTRTExtensions_vs_pt, "ptresmeanNoTRTExtensions_vs_pt");
+
+
+ book(m_ptpullTRTExtensions_vs_eta, "ptpullTRTExtensions_vs_eta");
+ book(m_ptpullTRTExtensions_vs_pt, "ptpullTRTExtensions_vs_pt");
+ book(m_ptpullNoTRTExtensions_vs_eta, "ptpullNoTRTExtensions_vs_eta");
+ book(m_ptpullNoTRTExtensions_vs_pt, "ptpullNoTRTExtensions_vs_pt");
+
+ book(m_pullwidthTRTExtensions_vs_eta, "ptpullwidthTRTExtensions_vs_eta");
+ book(m_pullmeanTRTExtensions_vs_eta, "ptpullmeanTRTExtensions_vs_eta");
+ book(m_pullwidthTRTExtensions_vs_pt, "ptpullwidthTRTExtensions_vs_pt");
+ book(m_pullmeanTRTExtensions_vs_pt, "ptpullmeanTRTExtensions_vs_pt");
+
+ book(m_pullwidthNoTRTExtensions_vs_eta, "ptpullwidthNoTRTExtensions_vs_eta");
+ book(m_pullmeanNoTRTExtensions_vs_eta, "ptpullmeanNoTRTExtensions_vs_eta");
+ book(m_pullwidthNoTRTExtensions_vs_pt, "ptpullwidthNoTRTExtensions_vs_pt");
+ book(m_pullmeanNoTRTExtensions_vs_pt, "ptpullmeanNoTRTExtensions_vs_pt");
+
+}
+
+void
+InDetPerfPlot_TRTExtension::fill(const xAOD::TrackParticle& particle) {
+
+ double eta = particle.eta();
+ double pt = particle.pt() / Gaudi::Units::GeV;
+ float chi2 = particle.chiSquared();
+ float ndof = particle.numberDoF();
+ float chi2Overndof = ndof > 0 ? chi2 / ndof : 0;
+
+ uint8_t iTrtHits = 0;
+ particle.summaryValue(iTrtHits, xAOD::numberOfTRTHits);
+
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = particle.patternRecoInfo();
+ bool isTRTExtension = patternInfo.test(xAOD::TrackPatternRecoInfo::InDetExtensionProcessor) or iTrtHits > 0;
+
+ fillHisto(m_fracTRTExtensions_vs_eta, eta, isTRTExtension);
+ fillHisto(m_fracTRTExtensions_vs_pt, pt, isTRTExtension);
+
+ if(isTRTExtension) fillHisto(m_chi2ndofTRTExtensions, chi2Overndof);
+ else { fillHisto(m_chi2ndofNoTRTExtensions, chi2Overndof); }
+
+}
+
+void
+InDetPerfPlot_TRTExtension::fill(const xAOD::TrackParticle& particle, const float mu, const unsigned int nvertices) {
+
+ uint8_t iTrtHits = 0;
+ particle.summaryValue(iTrtHits, xAOD::numberOfTRTHits);
+
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = particle.patternRecoInfo();
+ bool isTRTExtension = patternInfo.test(xAOD::TrackPatternRecoInfo::InDetExtensionProcessor) or iTrtHits > 0;
+
+ fillHisto(m_fracTRTExtensions_vs_mu, mu, isTRTExtension);
+ fillHisto(m_fracTRTExtensions_vs_nvertices, nvertices, isTRTExtension);
+
+}
+
+void
+InDetPerfPlot_TRTExtension::fill(const xAOD::TrackParticle& particle, const xAOD::TruthParticle& truthParticle) {
+
+ //Fraction of extended for truth matched tracks
+
+ uint8_t iTrtHits = 0;
+ particle.summaryValue(iTrtHits, xAOD::numberOfTRTHits);
+
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = particle.patternRecoInfo();
+ bool isTRTExtension = patternInfo.test(3) or iTrtHits > 0;
+
+ //Get pT resolution for TRT extensions versus without
+ const float undefinedValue = -9999;
+ const float smallestAllowableTan = 1e-8;
+ const float sinTheta{std::sin(particle.theta())};
+ const bool saneSineValue = (std::abs(sinTheta) > 1e-8);
+ const float inverseSinTheta = saneSineValue ? 1./sinTheta : undefinedValue;
+ float track_qopt = saneSineValue ? particle.qOverP()*inverseSinTheta : undefinedValue;
+ const float qopterr = std::sqrt(particle.definingParametersCovMatrix()(4, 4)) * inverseSinTheta;
+
+ const float truth_qop = truthParticle.isAvailable<float>("qOverP") ? truthParticle.auxdata<float>("qOverP") : undefinedValue;
+ const float truth_theta = truthParticle.isAvailable<float>("theta") ? truthParticle.auxdata<float>("theta") : undefinedValue;
+ float truth_qopt = std::abs(truth_theta) > 0 ? truth_qop * 1/(std::sin(truth_theta)) : undefinedValue;
+
+ float ptres = (track_qopt - truth_qopt) * ( 1 / truth_qopt);
+ float ptpull = qopterr > smallestAllowableTan ? (track_qopt - truth_qopt) / qopterr : undefinedValue;
+ float pt = truthParticle.pt() / Gaudi::Units::GeV;
+ const float tanHalfTheta = std::tan(truth_theta * 0.5);
+ const bool tanThetaIsSane = std::abs(tanHalfTheta) > smallestAllowableTan;
+ float eta = undefinedValue;
+ if (tanThetaIsSane) eta = -std::log(tanHalfTheta);
+
+
+ if(isTRTExtension){
+ fillHisto(m_ptresTRTExtensions_vs_eta, eta, ptres);
+ fillHisto(m_ptresTRTExtensions_vs_pt, pt, ptres);
+
+ fillHisto(m_ptpullTRTExtensions_vs_eta, eta, ptpull);
+ fillHisto(m_ptpullTRTExtensions_vs_pt, pt, ptpull);
+ } else {
+ fillHisto(m_ptresNoTRTExtensions_vs_eta, eta, ptres);
+ fillHisto(m_ptresNoTRTExtensions_vs_pt, pt, ptres);
+
+ fillHisto(m_ptpullNoTRTExtensions_vs_eta, eta, ptpull);
+ fillHisto(m_ptpullNoTRTExtensions_vs_pt, pt, ptpull);
+ }
+
+ fillHisto(m_fracTRTExtensions_matched_vs_eta, eta, isTRTExtension);
+ fillHisto(m_fracTRTExtensions_matched_vs_pt, pt, isTRTExtension);
+
+
+}
+
+
+void
+InDetPerfPlot_TRTExtension::finalizePlots() {
+
+ m_resolutionHelper.makeResolutions(m_ptresTRTExtensions_vs_eta, m_reswidthTRTExtensions_vs_eta, m_resmeanTRTExtensions_vs_eta, m_resolutionMethod);
+ m_resolutionHelper.makeResolutions(m_ptresTRTExtensions_vs_pt, m_reswidthTRTExtensions_vs_pt, m_resmeanTRTExtensions_vs_pt, m_resolutionMethod);
+ m_resolutionHelper.makeResolutions(m_ptresNoTRTExtensions_vs_eta, m_reswidthNoTRTExtensions_vs_eta, m_resmeanNoTRTExtensions_vs_eta, m_resolutionMethod);
+ m_resolutionHelper.makeResolutions(m_ptresNoTRTExtensions_vs_pt, m_reswidthNoTRTExtensions_vs_pt, m_resmeanNoTRTExtensions_vs_pt, m_resolutionMethod);
+
+
+ m_resolutionHelper.makeResolutions(m_ptpullTRTExtensions_vs_eta, m_pullwidthTRTExtensions_vs_eta, m_pullmeanTRTExtensions_vs_eta, m_resolutionMethod);
+ m_resolutionHelper.makeResolutions(m_ptpullTRTExtensions_vs_pt, m_pullwidthTRTExtensions_vs_pt, m_pullmeanTRTExtensions_vs_pt, m_resolutionMethod);
+ m_resolutionHelper.makeResolutions(m_ptpullNoTRTExtensions_vs_eta, m_pullwidthNoTRTExtensions_vs_eta, m_pullmeanNoTRTExtensions_vs_eta, m_resolutionMethod);
+ m_resolutionHelper.makeResolutions(m_ptpullNoTRTExtensions_vs_pt, m_pullwidthNoTRTExtensions_vs_pt, m_pullmeanNoTRTExtensions_vs_pt, m_resolutionMethod);
+
+}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TRTExtension.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TRTExtension.h
new file mode 100644
index 0000000000000000000000000000000000000000..2851f4a81a44a6aec813490d9577e9c26abc0486
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TRTExtension.h
@@ -0,0 +1,89 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef INDETPHYSVALMONITORING_INDETPERFPLOT_TRTEXTENSION
+#define INDETPHYSVALMONITORING_INDETPERFPLOT_TRTEXTENSION
+/**
+ * @file InDetPerfPlot_TRTExtension.h
+ * @author nora pettersson
+ **/
+
+
+// std includes
+#include <string>
+#include <array>
+
+// local includes
+#include "InDetPlotBase.h"
+#include "xAODTracking/TrackParticle.h"
+#include "xAODTruth/TruthParticle.h"
+#include "InDetPhysValMonitoring/ResolutionHelper.h"
+
+///class holding Pt plots for Inner Detector RTT Validation and implementing fill methods
+class InDetPerfPlot_TRTExtension: public InDetPlotBase {
+public:
+ InDetPerfPlot_TRTExtension(InDetPlotBase* pParent, const std::string& dirName);
+ void fill(const xAOD::TrackParticle& particle);
+ void fill(const xAOD::TrackParticle& particle, const float mu, const unsigned int nVtx);
+
+ void fill(const xAOD::TrackParticle& particle, const xAOD::TruthParticle& truthie);
+
+private:
+
+ IDPVM::ResolutionHelper m_resolutionHelper;
+ IDPVM::ResolutionHelper::methods m_resolutionMethod;
+
+
+ TEfficiency* m_fracTRTExtensions_vs_eta;
+ TEfficiency* m_fracTRTExtensions_vs_pt;
+ TEfficiency* m_fracTRTExtensions_vs_mu;
+ TEfficiency* m_fracTRTExtensions_vs_nvertices;
+
+ TEfficiency* m_fracTRTExtensions_matched_vs_eta;
+ TEfficiency* m_fracTRTExtensions_matched_vs_pt;
+
+ TH1* m_chi2ndofTRTExtensions;
+ TH1* m_chi2ndofNoTRTExtensions;
+
+ TH2* m_ptresTRTExtensions_vs_eta;
+ TH2* m_ptresTRTExtensions_vs_pt;
+ TH2* m_ptresNoTRTExtensions_vs_eta;
+ TH2* m_ptresNoTRTExtensions_vs_pt;
+
+ TH1* m_reswidthTRTExtensions_vs_eta;
+ TH1* m_resmeanTRTExtensions_vs_eta;
+ TH1* m_reswidthTRTExtensions_vs_pt;
+ TH1* m_resmeanTRTExtensions_vs_pt;
+
+ TH1* m_reswidthNoTRTExtensions_vs_eta;
+ TH1* m_resmeanNoTRTExtensions_vs_eta;
+ TH1* m_reswidthNoTRTExtensions_vs_pt;
+ TH1* m_resmeanNoTRTExtensions_vs_pt;
+
+ TH2* m_ptpullTRTExtensions_vs_eta;
+ TH2* m_ptpullTRTExtensions_vs_pt;
+ TH2* m_ptpullNoTRTExtensions_vs_eta;
+ TH2* m_ptpullNoTRTExtensions_vs_pt;
+
+ TH1* m_pullwidthTRTExtensions_vs_eta;
+ TH1* m_pullmeanTRTExtensions_vs_eta;
+ TH1* m_pullwidthTRTExtensions_vs_pt;
+ TH1* m_pullmeanTRTExtensions_vs_pt;
+
+ TH1* m_pullwidthNoTRTExtensions_vs_eta;
+ TH1* m_pullmeanNoTRTExtensions_vs_eta;
+ TH1* m_pullwidthNoTRTExtensions_vs_pt;
+ TH1* m_pullmeanNoTRTExtensions_vs_pt;
+
+
+ // plot base has nop default implementation of this; we use it to book the histos
+ void initializePlots();
+ // print out final stats on exact zeroes
+ void finalizePlots();
+};
+
+
+
+
+#endif
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
index f88dfc4668250d1026433cfd290e9319653b8072..d68b26f4c418b2917822aad7d233b37e77f30de0 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
@@ -79,7 +79,7 @@ namespace { // utility functions used here
passJetCuts(const xAOD::Jet& jet) {
const float absEtaMax = 2.5;
const float jetPtMin = 100.0; // in GeV
- const float jetPtMax = 1000.0; // in GeV
+ const float jetPtMax = 5000.0; // in GeV
const float jetPt = jet.pt() / Gaudi::Units::GeV; // GeV
const float jetEta = jet.eta();
@@ -134,6 +134,7 @@ InDetPhysValMonitoringTool::InDetPhysValMonitoringTool(const std::string& type,
declareProperty("useVertexTruthMatchTool", m_useVertexTruthMatchTool);
declareProperty("TruthSelectionTool", m_truthSelectionTool);
declareProperty("FillTrackInJetPlots", m_doTrackInJetPlots);
+ declareProperty("FillTrackInBJetPlots", m_doBjetPlots);
declareProperty("maxTrkJetDR", m_maxTrkJetDR = 0.4);
declareProperty("DirName", m_dirName = "SquirrelPlots/");
declareProperty("SubFolder", m_folder);
@@ -176,6 +177,7 @@ InDetPhysValMonitoringTool::initialize() {
std::vector<std::string> required_int_track_decorations {};
std::vector<std::string> required_float_truth_decorations {"d0"};
std::vector<std::string> required_int_truth_decorations {};
+ std::vector<std::string> required_int_jet_decorations {"HadronConeExclTruthLabelID"};
std::string empty_prefix;
IDPVM::addReadDecoratorHandleKeys(*this, m_trkParticleName, empty_prefix, required_float_track_decorations, m_floatTrkDecor);
@@ -184,6 +186,9 @@ InDetPhysValMonitoringTool::initialize() {
IDPVM::addReadDecoratorHandleKeys(*this, m_truthParticleName, empty_prefix, required_float_truth_decorations, m_floatTruthDecor);
IDPVM::addReadDecoratorHandleKeys(*this, m_truthParticleName, empty_prefix, required_int_truth_decorations, m_intTruthDecor);
}
+ if (m_doTrackInJetPlots && m_doBjetPlots){
+ IDPVM::addReadDecoratorHandleKeys(*this, m_jetContainerName, empty_prefix, required_int_jet_decorations, m_intJetDecor);
+ }
return StatusCode::SUCCESS;
}
@@ -211,13 +216,13 @@ InDetPhysValMonitoringTool::fillHistograms() {
ATH_MSG_WARNING("Shouldn't happen - EventInfo is buggy, setting mu to 0");
}
- //NORA WHY IS THIS DONE HERE?
ATH_MSG_DEBUG("Getting number of pu interactings per event");
- unsigned int puEvents = !m_truthPileUpEventName.key().empty() and truthPileupEventContainer.isValid() ? static_cast<int>( truthPileupEventContainer->size() ) : pie.isValid() ? pie->averageInteractionsPerCrossing() : 0;
ATH_MSG_DEBUG("Filling vertex plots");
SG::ReadHandle<xAOD::VertexContainer> vertices(m_vertexContainerName);
const xAOD::Vertex* primaryvertex = nullptr;
+ const float puEvents = !m_truthPileUpEventName.key().empty() and truthPileupEventContainer.isValid() ? static_cast<int>( truthPileupEventContainer->size() ) : pie.isValid() ? pie->actualInteractionsPerCrossing() : 0;
+ const float nVertices = not vertices->empty() ? vertices->size() : 0;
if (vertices.isValid() and not vertices->empty()) {
ATH_MSG_DEBUG("Number of vertices retrieved for this event " << vertices->size());
@@ -279,6 +284,7 @@ InDetPhysValMonitoringTool::fillHistograms() {
//
std::vector<const xAOD::TrackParticle*> selectedTracks {};
selectedTracks.reserve(tracks->size());
+ unsigned int nTrackBAT = 0, nTrackSTD = 0, nTrackANT = 0;
for (const auto& thisTrack: *tracks) {
//FIXME: Why is this w.r.t the primary vertex?
const asg::AcceptData& accept = m_trackSelectionTool->accept(*thisTrack, primaryvertex);
@@ -289,8 +295,16 @@ InDetPhysValMonitoringTool::fillHistograms() {
//Number of selected reco tracks
nSelectedRecoTracks++;
//Fill plots for selected reco tracks, hits / perigee / ???
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = thisTrack->patternRecoInfo();
+ bool isBAT = patternInfo.test(xAOD::TrackPatternRecoInfo::TRTSeededTrackFinder);
+ bool isANT = patternInfo.test(xAOD::TrackPatternRecoInfo::SiSpacePointsSeedMaker_LargeD0);
+ bool isSTD = not isBAT and not isANT;
+ if(isBAT) nTrackBAT++;
+ if(isSTD) nTrackSTD++;
+ if(isANT) nTrackANT++;
+
m_monPlots->fill(*thisTrack);
-
+ m_monPlots->fill(*thisTrack, puEvents, nVertices); //fill mu dependent plots
const xAOD::TruthParticle* associatedTruth = getAsTruth.getTruth(thisTrack);
float prob = getMatchingProbability(*thisTrack);
@@ -316,9 +330,10 @@ InDetPhysValMonitoringTool::fillHistograms() {
if(isFake) nFakeTracks++;
if(!isAssociatedTruth) nMissingAssociatedTruth++;
- m_monPlots->fillFakeRate(*thisTrack, isFake, isAssociatedTruth);
+ m_monPlots->fillFakeRate(*thisTrack, isFake, isAssociatedTruth, puEvents, nVertices);
}
+ m_monPlots->fill(nTrackANT, nTrackSTD, nTrackBAT, puEvents, nVertices);
//FIXME: I don't get why... this is here
if (m_truthSelectionTool.get()) {
ATH_MSG_DEBUG( CutFlow(tmp_truth_cutflow).report(m_truthSelectionTool->names()) );
@@ -344,7 +359,7 @@ InDetPhysValMonitoringTool::fillHistograms() {
//Loop over reco tracks to find the match
//
const xAOD::TrackParticle* matchedTrack = nullptr;
- for (const auto& thisTrack: selectedTracks) { // Inner loop over selected track particles
+ for (const auto& thisTrack: selectedTracks) { // Inner loop over selected track particleis
const xAOD::TruthParticle* associatedTruth = getAsTruth.getTruth(thisTrack);
if (associatedTruth && associatedTruth == thisTruth) {
float prob = getMatchingProbability(*thisTrack);
@@ -356,7 +371,7 @@ InDetPhysValMonitoringTool::fillHistograms() {
}
}
ATH_MSG_DEBUG("Filling efficiency plots info monitoring plots");
- m_monPlots->fillEfficiency(*thisTruth, *matchedTrack, isEfficient, puEvents);
+ m_monPlots->fillEfficiency(*thisTruth, *matchedTrack, isEfficient, puEvents, nVertices);
}
}
@@ -386,6 +401,7 @@ InDetPhysValMonitoringTool::fillHistograms() {
SG::ReadHandle<xAOD::JetContainer> jets(m_jetContainerName);
SG::AuxElement::ConstAccessor<std::vector<ElementLink<xAOD::IParticleContainer> > > ghosttruth("GhostTruth");
+ SG::AuxElement::ConstAccessor<int> btagLabel("HadronConeExclTruthLabelID");
if (not jets.isValid() or truthParticlesVec.empty()) {
ATH_MSG_WARNING(
@@ -396,6 +412,13 @@ InDetPhysValMonitoringTool::fillHistograms() {
if (not passJetCuts(*thisJet)) {
continue;
}
+ bool isBjet = false;
+ if (!btagLabel.isAvailable(*thisJet)){
+ ATH_MSG_WARNING("Failed to extract b-tag truth label from jet");
+ }
+ else{
+ isBjet = (btagLabel(*thisJet) == 5);
+ }
if(!ghosttruth.isAvailable(*thisJet)) {
ATH_MSG_WARNING("Failed to extract ghost truth particles from jet");
} else {
@@ -424,7 +447,7 @@ InDetPhysValMonitoringTool::fillHistograms() {
}
}
}
- m_monPlots->fillEfficiency(*truth, *thisJet, isEfficient);
+ m_monPlots->fillEfficiency(*truth, *thisJet, isEfficient,isBjet);
}
}
}
@@ -438,7 +461,7 @@ InDetPhysValMonitoringTool::fillHistograms() {
}
float prob = getMatchingProbability(*thisTrack);
if(std::isnan(prob)) prob = 0.0;
- m_monPlots->fill(*thisTrack, *thisJet);
+ m_monPlots->fill(*thisTrack, *thisJet,isBjet);
const xAOD::TruthParticle* associatedTruth = getAsTruth.getTruth(thisTrack);
@@ -446,7 +469,7 @@ InDetPhysValMonitoringTool::fillHistograms() {
if(m_truthSelectionTool->accept(associatedTruth) and prob < m_lowProb ) {
isFakeJet = true;
}
- m_monPlots->fillFakeRate(*thisTrack, *thisJet, isFakeJet);
+ m_monPlots->fillFakeRate(*thisTrack, *thisJet, isFakeJet,isBjet);
}
}
}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
index f74928bc807cbcaab76769325548c55338640935..90c0762ab9b02812de3762ddafcb78b5901f3301 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
@@ -29,48 +29,54 @@ InDetRttPlots::InDetRttPlots(InDetPlotBase* pParent, const std::string& sDir, co
m_vertexPlots(this, "Vertices/AllPrimaryVertices"),
m_hardScatterVertexPlots(this, "Vertices/HardScatteringVertex"),
m_hardScatterVertexTruthMatchingPlots(this, "Vertices/HardScatteringVertex"),
+ m_trtExtensionPlots(this, "Tracks/TRTExtension"),
+ m_anTrackingPlots(this, "Tracks/ANT"),
m_resolutionPlotSecd(nullptr),
- m_doTrackInJetPlots(true) //FIX CONFIGURATION
+ m_doTrackInJetPlots(true),
+ m_doTrackInBJetPlots(true) //FIX CONFIGURATION
{
this->m_iDetailLevel = iDetailLevel;
m_trackParticleTruthProbKey = "truthMatchProbability";
m_truthProbLowThreshold = 0.5;
if(m_iDetailLevel >= 200){
- m_resolutionPlotSecd = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "Tracks/Matched/Resolutions/Secondary"));
- m_hitsMatchedTracksPlots = std::unique_ptr<InDetPerfPlot_Hits>(new InDetPerfPlot_Hits(this, "Tracks/Matched/HitsOnTracks"));
- m_vertexTruthMatchingPlots = std::unique_ptr<InDetPerfPlot_VertexTruthMatching>(new InDetPerfPlot_VertexTruthMatching(this, "Vertices/AllPrimaryVertices", m_iDetailLevel));
+ m_resolutionPlotSecd = std::make_unique<InDetPerfPlot_Resolution>(this, "Tracks/Matched/Resolutions/Secondary");
+ m_hitsMatchedTracksPlots = std::make_unique<InDetPerfPlot_Hits>(this, "Tracks/Matched/HitsOnTracks");
+ m_vertexTruthMatchingPlots = std::make_unique<InDetPerfPlot_VertexTruthMatching>(this, "Vertices/AllPrimaryVertices", m_iDetailLevel);
//Split by track author
- m_effSiSPSeededFinderPlots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Efficiency"));
- m_effInDetExtensionProcessorPlots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Efficiency"));
- m_effTRTSeededTrackFinderPlots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Efficiency"));
- m_effTRTStandalonePlots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/TRTStandalone/Tracks/Efficiency"));
- m_effSiSpacePointsSeedMaker_LargeD0Plots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Efficiency"));
-
- m_fakeSiSPSeededFinderPlots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/SiSPSeededFinder/Tracks/FakeRate"));
- m_fakeInDetExtensionProcessorPlots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/FakeRate"));
- m_fakeTRTSeededTrackFinderPlots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/FakeRate"));
- m_fakeTRTStandalonePlots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/TRTStandalone/Tracks/FakeRate"));
- m_fakeSiSpacePointsSeedMaker_LargeD0Plots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/FakeRate"));
-
- m_trkParaSiSPSeededFinderPlots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Parameters"));
- m_trkParaInDetExtensionProcessorPlots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Parameters"));
- m_trkParaTRTSeededTrackFinderPlots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Parameters"));
- m_trkParaTRTStandalonePlots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/TRTStandalone/Tracks/Parameters"));
- m_trkParaSiSpacePointsSeedMaker_LargeD0Plots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Parameters"));
-
- m_resSiSPSeededFinderPlots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Resolution"));
- m_resInDetExtensionProcessorPlots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Resolution"));
- m_resTRTSeededTrackFinderPlots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Resolution"));
- m_resTRTStandalonePlots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/TRTStandalone/Tracks/Resolution"));
- m_resSiSpacePointsSeedMaker_LargeD0Plots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Resolution"));
+ m_effSiSPSeededFinderPlots = std::make_unique<InDetPerfPlot_Efficiency>(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Efficiency");
+ m_effInDetExtensionProcessorPlots = std::make_unique<InDetPerfPlot_Efficiency>(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Efficiency");
+ m_effTRTSeededTrackFinderPlots = std::make_unique<InDetPerfPlot_Efficiency>(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Efficiency");
+ m_effTRTStandalonePlots = std::make_unique<InDetPerfPlot_Efficiency>(this, "TracksByAuthor/TRTStandalone/Tracks/Efficiency");
+ m_effSiSpacePointsSeedMaker_LargeD0Plots = std::make_unique<InDetPerfPlot_Efficiency>(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Efficiency");
+
+ m_fakeSiSPSeededFinderPlots = std::make_unique<InDetPerfPlot_FakeRate>(this, "TracksByAuthor/SiSPSeededFinder/Tracks/FakeRate");
+ m_fakeInDetExtensionProcessorPlots = std::make_unique<InDetPerfPlot_FakeRate>(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/FakeRate");
+ m_fakeTRTSeededTrackFinderPlots = std::make_unique<InDetPerfPlot_FakeRate>(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/FakeRate");
+ m_fakeTRTStandalonePlots = std::make_unique<InDetPerfPlot_FakeRate>(this, "TracksByAuthor/TRTStandalone/Tracks/FakeRate");
+ m_fakeSiSpacePointsSeedMaker_LargeD0Plots = std::make_unique<InDetPerfPlot_FakeRate>(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/FakeRate");
+
+ m_trkParaSiSPSeededFinderPlots = std::make_unique<InDetPerfPlot_TrackParameters>(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Parameters");
+ m_trkParaInDetExtensionProcessorPlots = std::make_unique<InDetPerfPlot_TrackParameters>(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Parameters");
+ m_trkParaTRTSeededTrackFinderPlots = std::make_unique<InDetPerfPlot_TrackParameters>(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Parameters");
+ m_trkParaTRTStandalonePlots = std::make_unique<InDetPerfPlot_TrackParameters>(this, "TracksByAuthor/TRTStandalone/Tracks/Parameters");
+ m_trkParaSiSpacePointsSeedMaker_LargeD0Plots = std::make_unique<InDetPerfPlot_TrackParameters>(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Parameters");
+
+ m_resSiSPSeededFinderPlots = std::make_unique<InDetPerfPlot_Resolution>(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Resolution");
+ m_resInDetExtensionProcessorPlots = std::make_unique<InDetPerfPlot_Resolution>(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Resolution");
+ m_resTRTSeededTrackFinderPlots = std::make_unique<InDetPerfPlot_Resolution>(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Resolution");
+ m_resTRTStandalonePlots = std::make_unique<InDetPerfPlot_Resolution>(this, "TracksByAuthor/TRTStandalone/Tracks/Resolution");
+ m_resSiSpacePointsSeedMaker_LargeD0Plots = std::make_unique<InDetPerfPlot_Resolution>(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Resolution");
}
//A lot of Jets... do we need these at all???
if(m_doTrackInJetPlots){
- m_trkInJetPlots = std::unique_ptr<InDetPerfPlot_TrkInJet>(new InDetPerfPlot_TrkInJet(this, "TracksInJets/Tracks"));
+ m_trkInJetPlots = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInJets/Tracks");
+ if(m_doTrackInBJetPlots){
+ m_trkInJetPlots_bjets = std::make_unique<InDetPerfPlot_TrkInJet>(this, "TracksInBJets/Tracks");
+ }
}
}
@@ -109,6 +115,7 @@ InDetRttPlots::fill(const xAOD::TrackParticle& particle, const xAOD::TruthPartic
}
+ if (barcode < 200000 && barcode != 0 && prob > 0.5) m_trtExtensionPlots.fill(particle, truthParticle);
}
@@ -131,6 +138,8 @@ InDetRttPlots::fill(const xAOD::TrackParticle& particle) {
m_hitEffPlot.fill(particle);
// fill pt plots
m_trackParameters.fill(particle);
+ m_anTrackingPlots.fill(particle);
+
if(m_iDetailLevel >= 200){
std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = particle.patternRecoInfo();
@@ -148,10 +157,23 @@ InDetRttPlots::fill(const xAOD::TrackParticle& particle) {
}
-
m_hitsRecoTracksPlots.fill(particle);
+ m_trtExtensionPlots.fill(particle);
+}
+
+void
+InDetRttPlots::fill(const xAOD::TrackParticle& particle, const float mu, const unsigned int nVtx) {
+
+ m_trtExtensionPlots.fill(particle, mu, nVtx);
+
}
+void
+InDetRttPlots::fill(const unsigned int nTrkANT, const unsigned int nTrkSTD, const unsigned int nTrkBAT, const float mu, const unsigned int nVtx) {
+
+ m_anTrackingPlots.fill(nTrkANT, nTrkSTD, nTrkBAT, mu, nVtx);
+
+}
//
//Fill plots for selected truth particle
//
@@ -166,11 +188,11 @@ InDetRttPlots::fill(const xAOD::TruthParticle& truthParticle) {
//Fill Efficiencies
//
-
void
-InDetRttPlots::fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::TrackParticle& track, const bool isGood, const unsigned int /*nMuEvents*/) {
+InDetRttPlots::fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::TrackParticle& track, const bool isGood, const float mu, const unsigned int nVtx) {
m_effPlots.fill(truth, isGood);
+ m_anTrackingPlots.fillEfficiency(truth, track, isGood, mu, nVtx);
if(m_iDetailLevel >= 200){
if(isGood){
std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = track.patternRecoInfo();
@@ -204,11 +226,14 @@ InDetRttPlots::fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::Trac
//
void
-InDetRttPlots::fillFakeRate(const xAOD::TrackParticle& track, const bool isFake, const bool isAssociatedTruth){
+InDetRttPlots::fillFakeRate(const xAOD::TrackParticle& track, const bool isFake, const bool isAssociatedTruth, const float mu, const unsigned int nVtx){
m_missingTruthFakePlots.fill(track, !isAssociatedTruth);
+ m_anTrackingPlots.fillUnlinked(track, !isAssociatedTruth, mu, nVtx);
+
if(isAssociatedTruth) {
m_fakePlots.fill(track, isFake);
+ m_anTrackingPlots.fillFakeRate(track, isFake, mu, nVtx);
if(m_iDetailLevel >= 200){
std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = track.patternRecoInfo();
@@ -273,17 +298,20 @@ InDetRttPlots::fillCounter(const unsigned int freq, const InDetPerfPlot_nTracks:
//Track in Jet Plots
void
-InDetRttPlots::fill(const xAOD::TrackParticle& track, const xAOD::Jet& jet){
+InDetRttPlots::fill(const xAOD::TrackParticle& track, const xAOD::Jet& jet, bool isBjet){
m_trkInJetPlots->fill(track, jet);
+ if(isBjet) m_trkInJetPlots_bjets->fill(track, jet);
}
void
-InDetRttPlots::fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::Jet& jet, bool isEfficient) {
+InDetRttPlots::fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::Jet& jet, bool isEfficient, bool isBjet) {
m_trkInJetPlots->fillEfficiency(truth, jet, isEfficient);
+ if(isBjet) m_trkInJetPlots_bjets->fillEfficiency(truth, jet, isEfficient);
}
void
-InDetRttPlots::fillFakeRate(const xAOD::TrackParticle& track, const xAOD::Jet& jet, bool isFake) {
+InDetRttPlots::fillFakeRate(const xAOD::TrackParticle& track, const xAOD::Jet& jet, bool isFake, bool isBjet) {
m_trkInJetPlots->fillFakeRate(track, jet, isFake);
+ if(isBjet) m_trkInJetPlots_bjets->fillFakeRate(track, jet, isFake);
}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
index d666f14c5612e63200da194f5afacd550a61acbf..db3d1a80769c427b834bf61626b90c6334e4ba14 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
@@ -26,16 +26,15 @@
#include "InDetPerfPlot_Efficiency.h"
#include "InDetPerfPlot_HitResidual.h"
#include "InDetPerfPlot_HitEfficiency.h"
-
#include "InDetPerfPlot_TrackParameters.h"
-
#include "TrkValHistUtils/IDHitPlots.h"
#include "InDetPerfPlot_Hits.h"
#include "InDetPerfPlot_Vertex.h"
#include "InDetPerfPlot_VertexTruthMatching.h"
#include "InDetPerfPlot_VerticesVsMu.h"
-
#include "InDetPerfPlot_TrkInJet.h"
+#include "InDetPerfPlot_TRTExtension.h"
+#include "InDetPerfPlot_ANTracking.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/Vertex.h"
@@ -51,30 +50,33 @@ public:
///fill for things needing truth and track only
void fill(const xAOD::TrackParticle& particle, const xAOD::TruthParticle& truthParticle);
+
///fill for things needing track only
void fill(const xAOD::TrackParticle& particle);
+ void fill(const xAOD::TrackParticle& particle, const float mu, const unsigned int nVtx); //mu dependent plots
+ void fill(const unsigned int nTrkANT, const unsigned int nTrkSTD, const unsigned int nTrkBAT, const float mu, const unsigned int nVtx);
///fill for things needing truth only
void fill(const xAOD::TruthParticle& particle);
///Fill for efficiency plots
- void fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::TrackParticle& track, const bool isGood, unsigned int /*mu=0*/);
+ void fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::TrackParticle& track, const bool isGood, const float mu, const unsigned int nVtx);
///fill for things needing all truth - not just the ones from the reco tracks
///fill reco-vertex related plots
void fill(const xAOD::VertexContainer& vertexContainer, const std::vector<const xAOD::TruthVertex*>& truthHSVertices, const std::vector<const xAOD::TruthVertex*>& truthPUVertices);
///fill reco-vertex related plots that need EventInfo
- void fill(const xAOD::VertexContainer& vertexContainer, unsigned int nPU);
+ void fill(const xAOD::VertexContainer& vertexContainer, const unsigned int nPU);
- void fill(const xAOD::TrackParticle& track, const xAOD::Jet& jet);
- void fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::Jet& jet, const bool isGood);
- void fillFakeRate(const xAOD::TrackParticle& track, const xAOD::Jet& jet, const bool isFake);
+ void fill(const xAOD::TrackParticle& track, const xAOD::Jet& jet, bool isBjet=false);
+ void fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::Jet& jet, const bool isGood, bool isBjet=false);
+ void fillFakeRate(const xAOD::TrackParticle& track, const xAOD::Jet& jet, const bool isFake, bool isBjet=false);
virtual ~InDetRttPlots() {/**nop**/
};
///fill for Counters
void fillCounter(const unsigned int freq, const InDetPerfPlot_nTracks::CounterCategory counter);
///fill for fakes
- void fillFakeRate(const xAOD::TrackParticle& particle, const bool isFake, const bool isAssociatedTruth);
+ void fillFakeRate(const xAOD::TrackParticle& particle, const bool isFake, const bool isAssociatedTruth, const float mu, const unsigned int nVtx);
private:
InDetPerfPlot_TrackParameters m_trackParameters;
@@ -90,12 +92,15 @@ private:
InDetPerfPlot_Vertex m_vertexPlots;
InDetPerfPlot_Vertex m_hardScatterVertexPlots;
InDetPerfPlot_VertexTruthMatching m_hardScatterVertexTruthMatchingPlots;
-
+ InDetPerfPlot_TRTExtension m_trtExtensionPlots;
+ InDetPerfPlot_ANTracking m_anTrackingPlots;
std::unique_ptr<InDetPerfPlot_Resolution> m_resolutionPlotSecd;
std::unique_ptr<InDetPerfPlot_Hits> m_hitsMatchedTracksPlots;
std::unique_ptr<InDetPerfPlot_VertexTruthMatching> m_vertexTruthMatchingPlots;
bool m_doTrackInJetPlots;
+ bool m_doTrackInBJetPlots;
std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots;
+ std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots_bjets;
//By track authors
std::unique_ptr<InDetPerfPlot_Efficiency> m_effSiSPSeededFinderPlots;
diff --git a/InnerDetector/InDetValidation/InDetVertexSplitter/share/VxSplitValTemplate.py b/InnerDetector/InDetValidation/InDetVertexSplitter/share/VxSplitValTemplate.py
index d73dd964357209d69f161c7c830a253fb277c2ba..3dd674e195c817c5f21cf6473948c54a66320c1a 100644
--- a/InnerDetector/InDetValidation/InDetVertexSplitter/share/VxSplitValTemplate.py
+++ b/InnerDetector/InDetValidation/InDetVertexSplitter/share/VxSplitValTemplate.py
@@ -222,13 +222,20 @@ InDetPrdAssociationTool = InDet__InDetPRD_AssociationToolGangedPixels(name
PixelClusterAmbiguitiesMapName = InDetKeys.GangedPixelMap())
ToolSvc += InDetPrdAssociationTool
if InDetFlags.doPrintConfigurables: print InDetPrdAssociationTool
-
+
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+InDetBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="InDetBoundaryCheckTool",
+ UsePixel=DetFlags.haveRIO.pixel_on(),
+ UseSCT=DetFlags.haveRIO.SCT_on(),
+ SctSummaryTool=None
+)
+ToolSvc += InDetBoundaryCheckTool
+
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool",
Extrapolator = InDetExtrapolator,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on())
-InDetHoleSearchTool.SctSummaryTool = None
+ BoundaryCheckTool=InDetBoundaryCheckTool)
ToolSvc += InDetHoleSearchTool
if InDetFlags.doPrintConfigurables: print InDetHoleSearchTool
diff --git a/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx b/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
index 4a492c9aefcca905c90071d514260bff6a95d909..bee6e56b742b5581b4848ee31da57b6cb7eb922b 100755
--- a/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArPedestalInPhysicsMaker.cxx
@@ -21,7 +21,7 @@
// Include files
#include "LArCalibUtils/LArPedestalInPhysicsMaker.h"
-//#include "GaudiKernel/Property.h"
+//#include "Gaudi/Property.h"
//#include "GaudiKernel/ListItem.h"
#include "GaudiKernel/IIncidentSvc.h"
diff --git a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.py b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.py
index 1757811060b91a804cc8d6ee11cb3c5093107356..7a25092f93b26d161e43ecad1cf630669e4ea85f 100644
--- a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.py
+++ b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.py
@@ -268,7 +268,7 @@ class TestAlg (Alg):
self.idmgr = self.detStore['CaloIdManager']
self.onlineID = self.detStore['LArOnlineID']
self.offlineID = self.detStore['CaloCell_ID']
- self.ccc = make_calo_cells (self.detStore)
+ self.ccc = None
if not self.tool1.retrieve():
return StatusCode.Failure
if not self.tool2.retrieve():
@@ -281,6 +281,9 @@ class TestAlg (Alg):
return StatusCode.Success
def execute (self):
+ if not self.ccc:
+ self.ccc = make_calo_cells (self.detStore)
+
ctx = self.getContext()
iev = ctx.evt()
diff --git a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
index dbe55ea5b6c01fade83b275a0de3012ca95e850a..528b6b3e0f9b96276f8fb70771b9ff1469920c33 100644
--- a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
+++ b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.ref
@@ -1,15 +1,16 @@
-Tue Jun 16 23:39:12 EDT 2020
+Wed Aug 12 22:07:02 CEST 2020
+Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [?-22.0.0] [?] [?/?] -- built on [?]
+Py:Athena INFO using release [WorkDir-22.0.17] [x86_64-centos7-gcc8-opt] [atlas-work3/ed2484eb9f5] -- built on [2020-08-12T1632]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "LArCellRec/LArCellDeadOTXCorr_test.py"
Py:Athena INFO SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5202 configurables from 2 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5547 configurables from 32 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version sss-22.0.0
+EventInfoMgtInit: Got release version Athena-22.0.17
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
Py:Athena INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
Py:Athena INFO including file "CaloConditions/CaloConditions_jobOptions.py"
@@ -23,39 +24,37 @@ Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/OnOffIdMap wit
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/CalibIdMap with tag LARIdentifierCalibIdMap-012
Py:JobPropertyContainer:: INFO setting folder /LAR/Identifier/FebRodMap with tag LARIdentifierFebRodMap-005
Py:Athena INFO including file "AthenaCommon/runbatch.py"
-# setting LC_ALL to "C"
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Tue Jun 16 23:39:43 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
+ running on lxplus770.cern.ch on Wed Aug 12 22:07:13 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 4026 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3589 CLIDRegistry entries for module ALL
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Read replica configuration from /home/sss/atlas/rootaccess/build/share/dbreplica.config
-DBReplicaSvc INFO No specific match for domain found - use default fallback
-DBReplicaSvc INFO Total of 1 servers found for host karma [atlas_dd ]
+DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host lxplus770.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc INFO Resolved path (via DATAPATH) is /home/sss/atlas/DBRelease/current/poolcond/PoolCat_oflcond.xml
-PoolSvc INFO Resolved path (via DATAPATH) is /home/sss/atlas/DBRelease/current/poolcond/PoolCat_oflcond.xml
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /home/sss/atlas/DBRelease/poolcond/PoolFileCatalog.xml
+PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
+PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
DbSession INFO Open DbSession
Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray([])
+OutputStreamSeq... INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
IOVDbSvc INFO Only 5 POOL conditions files will be open at once
+IOVDbSvc INFO Cache alignment will be done in 3 slices
IOVDbSvc INFO Global tag: OFLCOND-RUN12-SDR-35 set from joboptions
IOVDbSvc INFO Folder /LAR/Identifier/OnOffIdMap, adding new key tag with value LARIdentifierOnOffIdMap-012
IOVDbSvc INFO Folder /LAR/Identifier/CalibIdMap, adding new key tag with value LARIdentifierCalibIdMap-012
@@ -63,7 +62,7 @@ IOVDbSvc INFO Folder /LAR/Identifier/FebRodMap, adding new key tag w
IOVDbFolder INFO Read from meta data only for folder /TagInfo
IOVDbSvc INFO Initialised with 3 connections and 25 folders
IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 1441 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1488 CLIDRegistry entries for module ALL
IOVDbSvc INFO preLoadAddresses: Removing folder /TagInfo. It should only be in the file meta data and was not found.
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
@@ -96,8 +95,8 @@ IOVDbSvc INFO Added taginfo remove for /LAR/ElecCalibMC/Shape
IOVDbSvc INFO Added taginfo remove for /LAR/Identifier/LArTTCellMapAtlas
IOVDbSvc INFO Added taginfo remove for /LAR/ElecCalibMC/fSampl
IOVDbSvc INFO Added taginfo remove for /LAR/ElecCalibMC/uA2MeV
-ClassIDSvc INFO getRegistryEntries: read 18 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 2373 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 24 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2436 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 35 CLIDRegistry entries for module ALL
DetDescrCnvSvc INFO initializing
DetDescrCnvSvc INFO Found DetectorStore service
@@ -198,12 +197,12 @@ EMECConstruction INFO multi-layered version of absorbers activated, paramete
EMECConstruction INFO activating LAr::EMEC::Neg::InnerWheel
EMECConstruction INFO activating LAr::EMEC::Neg::OuterWheel
EndcapDMConstru... INFO Start building EC electronics geometry
-GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 17776Kb Time = 0.8S
+GeoModelSvc INFO GeoModelSvc.LArDetectorToolNV SZ= 24348Kb Time = 0.58S
ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 6729 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 5546 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 608 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 3943 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 2989 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
CondInputLoader INFO Adding base classes:
+ ( 'AthenaAttributeList' , 'ConditionStore+/LAR/BadChannels/MissingFEBs' ) ->
@@ -257,7 +256,7 @@ CondInputLoader INFO Will create WriteCondHandle dependencies for the follo
+ ( 'LAruA2MeVMC' , 'ConditionStore+LAruA2MeV' )
PyComponentMgr INFO Initializing PyComponentMgr...
testalg1 INFO Initializing testalg1...
-ClassIDSvc INFO getRegistryEntries: read 582 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1123 CLIDRegistry entries for module ALL
CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a CaloCell_ID helper object in the detector store
CaloIDHelper_ID... INFO in createObj: creating a LArEM_ID helper object in the detector store
@@ -266,15 +265,15 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /home/sss/atlas/rootaccess/build/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /home/sss/atlas/rootaccess/build/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
CaloDM_ID INFO initialize_from_dictionary
@@ -292,26 +291,21 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper ob
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /home/sss/atlas/rootaccess/build/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /home/sss/atlas/rootaccess/build/share/TileSuperCellNeighbour.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-08-11T2101/Athena/22.0.17/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIdMgrDetDes... INFO Finished
CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
-ClassIDSvc INFO getRegistryEntries: read 36 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 301 CLIDRegistry entries for module ALL
LArOnlineIDDetD... INFO in createObj: creating a LArOnlineID helper object in the detector store
LArOnlineID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
-ClassIDSvc INFO getRegistryEntries: read 68 CLIDRegistry entries for module ALL
-CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
-DetectorStore WARNING retrieve(default): No valid proxy for default object
- of type TileDetDescrManager(CLID 2941)
-CaloMgrDetDescrCnvWARNING Could not get the TileDetectorManager. No Calo Elements will be built for Tile
-ClassIDSvc INFO getRegistryEntries: read 190 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1963 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 1454 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Initializing LArCellDeadOTXCorr
ToolSvc.tool1 INFO L1Calo database won't be used. Pedestal values will be constant and equal to 32.
ToolSvc.CaloTri... INFO => CaloTriggerTowerService::initialize()
@@ -323,7 +317,7 @@ LArIdMgrDetDesc... INFO Set CaloCell_ID helper in LArIdMgr
LArIdMgrDetDesc... INFO Initializing LArIdMgr from values in LArIdMgrDetDescrCnv
ClassIDSvc INFO getRegistryEntries: read 59 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
-IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingLegacyService[0x5634b6009340]+7f3ae55f2620 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap]
+IOVSvc.IOVSvcTool INFO Still in initialize phase, not tiggering callback for LArCablingLegacyService[0x3230e000]+7f214a4ac2b0 bound to AthenaAttributeList[/LAR/Identifier/OnOffIdMap]
ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/OnOffIdMap
ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/CalibIdMap
ToolSvc.LArCabl... INFO Successfully installed callback on folder/LAR/Identifier/FebRodMap
@@ -332,7 +326,7 @@ ToolSvc.CaloTri... INFO ====> ...CaloTriggerTowerService::init() OK
ToolSvc.tool2 INFO Initializing LArCellDeadOTXCorr
ToolSvc.tool2 INFO L1Calo database won't be used. Pedestal values will be constant and equal to 32.
ApplicationMgr INFO Application Manager Initialized successfully
-ClassIDSvc INFO getRegistryEntries: read 63 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 131 CLIDRegistry entries for module ALL
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/BadChannels/MissingFEBs'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/CalibIdMap'
CondInputLoader INFO created CondCont<AthenaAttributeList> with key 'ConditionStore+/LAR/Identifier/FebRodMap'
@@ -355,7 +349,7 @@ ApplicationMgr INFO Application Manager Started successfully
AthenaEventLoopMgr INFO ===>>> start of run 1 <<<===
EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-ClassIDSvc INFO getRegistryEntries: read 111 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 118 CLIDRegistry entries for module ALL
IOVDbSvc INFO Opening COOL connection for COOLOFL_LAR/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LARAlign-IOVDEP-00 for folder /LAR/Align
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to LArBadChannelsBadChannels-IOVDEP-06 for folder /LAR/BadChannels/BadChannels
@@ -382,77 +376,81 @@ IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdenti
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to CALOOflIdentifierCaloTTPpmRxIdMapAtlas-0000 for folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas
IOVDbSvc INFO Disconnecting from COOLOFL_CALO/OFLP200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000057.gen.COND/cond09_mc.000057.gen.COND._0001.pool.root File version:52200
ToolSvc.CaloTri... INFO ====> iovCallBack
ToolSvc.LArCabl... INFO ====> iovCallBack
ToolSvc.LArCabl... INFO Done reading online/offline identifier mapping
ToolSvc.LArCabl... INFO Found 195072 online identifier and 182468 offline identifier. 12604 disconnected channels.
+CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
+DetectorStore WARNING retrieve(default): No valid proxy for default object
+ of type TileDetDescrManager(CLID 2941)
+CaloMgrDetDescrCnvWARNING Could not get the TileDetectorManager. No Calo Elements will be built for Tile
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 9229AE70-AC4C-DF11-A934-003048D2BC4A
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0011.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0011.pool.root File version:52200
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0011.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0011.pool.root File version:52200
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 64ADE389-CABD-DD11-8D4C-000423D950B0
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000001.gen.COND/cond08_mc.000001.gen.COND._0053.pool.root
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000001.gen.COND/cond08_mc.000001.gen.COND._0053.pool.root
Warning in <TClass::Init>: no dictionary for class DataHeader_p2 is available
Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p2 is available
Warning in <TClass::Init>: no dictionary for class PoolToken_p1 is available
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000001.gen.COND/cond08_mc.000001.gen.COND._0053.pool.root File version:51800
-/home/sss/atlas... INFO Database being retired...
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000001.gen.COND/cond08_mc.000001.gen.COND._0053.pool.root File version:51800
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EACFEBD4-9BD2-E211-848A-02163E006B20
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 7C42BC12-BD96-E011-B8EC-003048F0E01C
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000032.gen.COND/cond09_mc.000032.gen.COND._0001.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000032.gen.COND/cond09_mc.000032.gen.COND._0001.pool.root File version:52600
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000032.gen.COND/cond09_mc.000032.gen.COND._0001.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000032.gen.COND/cond09_mc.000032.gen.COND._0001.pool.root File version:52600
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 687EA080-E4B6-DD11-A149-000423D9907C
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000001.gen.COND/cond08_mc.000001.gen.COND._0067.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000001.gen.COND/cond08_mc.000001.gen.COND._0067.pool.root File version:51800
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000001.gen.COND/cond08_mc.000001.gen.COND._0067.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000001.gen.COND/cond08_mc.000001.gen.COND._0067.pool.root File version:51800
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 9229AE70-AC4C-DF11-A934-003048D2BC4A
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] FE8535CE-AD50-DC11-952F-000423D67862
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0040.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0040.pool.root File version:51400
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0040.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0040.pool.root File version:51400
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 64ADE389-CABD-DD11-8D4C-000423D950B0
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 3CE29BA7-A6DC-DC11-BF61-000423D65662
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0044.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0044.pool.root File version:51400
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/comcond/comcond.000004.lar_conditions.recon.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0044.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/comcond/comcond.000004.lar_conditions.recon.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0044.pool.root File version:51400
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 7C42BC12-BD96-E011-B8EC-003048F0E01C
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0011.pool.root File version:52200
-/home/sss/atlas... INFO Database being retired...
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0011.pool.root File version:52200
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 687EA080-E4B6-DD11-A149-000423D9907C
LArPedestalMCCnv INFO Reading LArPedestalMC (original)
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 180A4AF2-F47E-DB11-9E8F-000E0C4DEA2D
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0053.pool.root
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0053.pool.root__DQ2-1250193473
Warning in <TClass::Init>: no dictionary for class DataHeader_p1 is available
Warning in <TClass::Init>: no dictionary for class DataHeaderElement_p1 is available
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000002.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0053.pool.root File version:51000
-/home/sss/atlas... INFO Database being retired...
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/cmccond.000001.conditions.simul.pool.v0000/oflcond.000002.conditions.simul.pool.v0000._0053.pool.root__DQ2-1250193473 File version:51000
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] FE8535CE-AD50-DC11-952F-000423D67862
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 303FCBD8-653E-DD11-ABBD-000423D99862
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0061.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0061.pool.root File version:51800
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0061.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/oflcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0061.pool.root File version:51800
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 3CE29BA7-A6DC-DC11-BF61-000423D65662
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] F4885664-6C4D-DF11-A94A-00304867340C
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0013.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0013.pool.root File version:52200
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0013.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000009.gen.COND/cond09_mc.000009.gen.COND._0013.pool.root File version:52200
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 9229AE70-AC4C-DF11-A934-003048D2BC4A
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 445FAD9A-5DB3-E14A-81DB-BA6244602734
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000084.gen.COND/cond09_mc.000084.gen.COND._0001.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000084.gen.COND/cond09_mc.000084.gen.COND._0001.pool.root File version:53413
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000084.gen.COND/cond09_mc.000084.gen.COND._0001.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000084.gen.COND/cond09_mc.000084.gen.COND._0001.pool.root File version:53413
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 180A4AF2-F47E-DB11-9E8F-000E0C4DEA2D
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] D27D07D4-C135-E011-84A9-003048F0E01E
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000027.gen.COND/cond09_mc.000027.gen.COND._0001.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000027.gen.COND/cond09_mc.000027.gen.COND._0001.pool.root File version:52600
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000027.gen.COND/cond09_mc.000027.gen.COND._0001.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000027.gen.COND/cond09_mc.000027.gen.COND._0001.pool.root File version:52600
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 303FCBD8-653E-DD11-ABBD-000423D99862
LArOnOffMappingAlg INFO Done reading online/offline identifier mapping
LArOnOffMappingAlg INFO Found 195072 online identifier and 182468 offline identifier. 12604 disconnected channels.
@@ -462,63 +460,70 @@ LArCalibLineMap... INFO recorded new LArCalibLineMap with range {[0,l:0] - [IN
LArFebRodMappin... INFO Done reading Feb/Rod mapping. Found 1524 Febs and 762 Rods
LArFebRodMappin... INFO recorded new LArFebRodMap with range {[0,l:0] - [INVALID]} into Conditions Store
LArBadChannelCo... INFO Read a total of 0 problematic channels from database
+LArBadChannelCo... INFO Recorded LArRawChannelCont object with key LArBadChannel with EventRange {[0,t:0,l:0] - [1,l:4294967294]} into Conditions Store
LArBadFebCondAlg INFO Read a total of 0 problematic febs from database
+LArBadFebCondAlg INFO Recorded LArBadFebCont object with LArBadFeb with EventRange {[0,l:0] - [115301,l:0]} into Conditions Store
LArKnownBadFebAlg INFO Read a total of 0 problematic febs from database
+LArKnownBadFebAlg INFO Recorded LArBadFebCont object with LArKnownBadFEBs with EventRange {[0,l:0] - [4294967294,l:4294967294]} into Conditions Store
LArKnownMNBFebAlg INFO Read a total of 0 problematic febs from database
+LArKnownMNBFebAlg INFO Recorded LArBadFebCont object with LArKnownMNBFEBs with EventRange {[0,l:0] - [4294967294,l:4294967294]} into Conditions Store
LArMCSymCondAlg INFO recorded new LArMCSym with range {[0,l:0] - [INVALID]} into Conditions Store
-LArSymCondition... INFO recorded new LArRampSym with range {[0,l:0] - [INVALID]} into Conditions Store
-LArSymCondition... INFO recorded new LArAutoCorrSym with range {[0,l:0] - [INVALID]} into Conditions Store
-LArSymCondition... INFO recorded new LArDAC2uASym with range {[0,l:0] - [INVALID]} into Conditions Store
-LArSymCondition... INFO recorded new LArNoiseSym with range {[0,l:0] - [INVALID]} into Conditions Store
-LArSymCondition... INFO recorded new LArfSamplSym with range {[0,l:0] - [INVALID]} into Conditions Store
-LArSymCondition... INFO recorded new LAruA2MeVSym with range {[0,l:0] - [INVALID]} into Conditions Store
-LArSymCondition... INFO recorded new LArMinBiasSym with range {[0,l:0] - [222222,l:0]} into Conditions Store
-LArSymCondition... INFO recorded new LArMinBiasAverageSym with range {[0,l:0] - [222222,l:0]} into Conditions Store
-LArSymCondition... INFO recorded new LArShapeSym with range {[0,l:0] - [INVALID]} into Conditions Store
-LArSymCondition... INFO recorded new LArMphysOverMcalSym with range {[0,l:0] - [INVALID]} into Conditions Store
+LArSymCondition... INFO recorded new LArRampSym with range {[0,t:0,l:0] - [INVALID]} into Conditions Store
+LArSymCondition... INFO recorded new LArAutoCorrSym with range {[0,t:0,l:0] - [INVALID]} into Conditions Store
+LArSymCondition... INFO recorded new LArDAC2uASym with range {[0,t:0,l:0] - [INVALID]} into Conditions Store
+LArSymCondition... INFO recorded new LArNoiseSym with range {[0,t:0,l:0] - [INVALID]} into Conditions Store
+LArSymCondition... INFO recorded new LArfSamplSym with range {[0,t:0,l:0] - [INVALID]} into Conditions Store
+LArSymCondition... INFO recorded new LAruA2MeVSym with range {[0,t:0,l:0] - [INVALID]} into Conditions Store
+LArSymCondition... INFO recorded new LArMinBiasSym with range {[0,t:0,l:0] - [222222,l:0]} into Conditions Store
+LArSymCondition... INFO recorded new LArMinBiasAverageSym with range {[0,t:0,l:0] - [222222,l:0]} into Conditions Store
+LArSymCondition... INFO recorded new LArShapeSym with range {[0,t:0,l:0] - [INVALID]} into Conditions Store
+LArSymCondition... INFO recorded new LArMphysOverMcalSym with range {[0,t:0,l:0] - [INVALID]} into Conditions Store
LArBadFebCondAl... INFO Read a total of 0 problematic febs from database
+LArBadFebCondAl... INFO Recorded LArBadFebCont object with GoodFebs with EventRange {[0,l:0] - [4294967294,l:4294967294]} into Conditions Store
LArBadFebCondAl... INFO Read a total of 3 problematic febs from database
-ClassIDSvc INFO getRegistryEntries: read 1213 CLIDRegistry entries for module ALL
+LArBadFebCondAl... INFO Recorded LArBadFebCont object with BadFebs with EventRange {[0,l:0] - [4294967294,l:4294967294]} into Conditions Store
+ClassIDSvc INFO getRegistryEntries: read 1123 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 130 CLIDRegistry entries for module ALL
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
AthenaEventLoopMgr INFO ===>>> start processing event #2, run #1 1 events processed so far <<<===
LArTTCellMapCnv INFO initialize()
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] B2E3B2B6-B76C-DF11-A505-000423D5ADDA
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000013.gen.COND/cond09_mc.000013.gen.COND._0001.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000013.gen.COND/cond09_mc.000013.gen.COND._0001.pool.root File version:52200
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000013.gen.COND/cond09_mc.000013.gen.COND._0001.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond09_mc.000013.gen.COND/cond09_mc.000013.gen.COND._0001.pool.root File version:52200
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] F4885664-6C4D-DF11-A94A-00304867340C
CaloTTOnOffIdMa... INFO initialize()
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] EC2448FE-EFE2-DD11-80D3-000423D98B8C
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0004.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0004.pool.root File version:51800
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0004.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0004.pool.root File version:51800
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 445FAD9A-5DB3-E14A-81DB-BA6244602734
CaloTTOnAttrIdM... INFO initialize()
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] CE5211E9-F51F-DC11-87A7-000423D6460E
-Domain[ROOT_All] INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0026.pool.root
-RootDatabase.open INFO /home/sss/atlas/DBRelease/current/poolcond/oflcond.000003.conditions.simul.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0026.pool.root File version:51400
-/home/sss/atlas... INFO Database being retired...
+Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/comcond.000001.conditions.recon.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0026.pool.root
+RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cmccond/comcond.000001.conditions.recon.pool.v0000/oflcond.000003.conditions.simul.pool.v0000._0026.pool.root File version:51400
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] D27D07D4-C135-E011-84A9-003048F0E01E
AthenaEventLoopMgr INFO ===>>> done processing event #2, run #1 2 events processed so far <<<===
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-/home/sss/atlas... INFO Database being retired...
-Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] B2E3B2B6-B76C-DF11-A505-000423D5ADDA
-/home/sss/atlas... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] EC2448FE-EFE2-DD11-80D3-000423D98B8C
-/home/sss/atlas... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
+/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] CE5211E9-F51F-DC11-87A7-000423D6460E
+/cvmfs/atlas-co... INFO Database being retired...
+Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] B2E3B2B6-B76C-DF11-A505-000423D5ADDA
Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
ApplicationMgr INFO Application Manager Stopped successfully
IncidentProcAlg1 INFO Finalize
@@ -527,33 +532,33 @@ testalg1 INFO Finalizing testalg1...
IncidentProcAlg2 INFO Finalize
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.10 ))s
-IOVDbFolder INFO Folder /LAR/BadChannels/BadChannels (AttrListColl) db-read 1/1 objs/chan/bytes 0/8/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/BadChannels/MissingFEBs (AttrList) db-read 1/1 objs/chan/bytes 1/1/16 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/CellCorrOfl/deadOTX (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/705 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/1520148 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/6100 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/780292 (( 0.00 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/183 (( 0.07 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.00 ))s
-IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/AutoCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/486 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/DAC2uA (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/HVScaleCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 12/12/1980 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBias (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/174 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBiasAverage (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/MphysOverMcal (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Noise (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Pedestal (PoolRef) db-read 1/1 objs/chan/bytes 1/1/167 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Ramp (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/489 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/Shape (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/477 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/173 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/fSampl (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/194 (( 0.00 ))s
-IOVDbFolder INFO Folder /LAR/ElecCalibMC/uA2MeV (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/165 (( 0.00 ))s
-IOVDbSvc INFO bytes in (( 0.21 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/BadChannels/BadChannels (AttrListColl) db-read 1/1 objs/chan/bytes 0/8/0 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/BadChannels/MissingFEBs (AttrList) db-read 1/1 objs/chan/bytes 1/1/16 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/CellCorrOfl/deadOTX (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/705 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/CalibIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/1520148 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/FebRodMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/6100 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/OnOffIdMap (AttrList) db-read 1/2 objs/chan/bytes 1/1/780292 (( 0.02 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnAttrIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/183 (( 0.03 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTOnOffIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.02 ))s
+IOVDbFolder INFO Folder /CALO/Ofl/Identifier/CaloTTPpmRxIdMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/AutoCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/486 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/DAC2uA (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/HVScaleCorr (PoolRefColl) db-read 1/1 objs/chan/bytes 12/12/1980 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBias (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/174 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/MinBiasAverage (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/181 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/MphysOverMcal (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Noise (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/516 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Pedestal (PoolRef) db-read 1/1 objs/chan/bytes 1/1/167 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Ramp (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/489 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/Shape (PoolRefColl) db-read 1/1 objs/chan/bytes 3/3/477 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/Identifier/LArTTCellMapAtlas (PoolRef) db-read 1/1 objs/chan/bytes 1/1/173 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/fSampl (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/194 (( 0.01 ))s
+IOVDbFolder INFO Folder /LAR/ElecCalibMC/uA2MeV (PoolRefColl) db-read 1/1 objs/chan/bytes 1/1/165 (( 0.02 ))s
+IOVDbSvc INFO bytes in (( 0.38 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 21 ReadTime: (( 0.14 ))s
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 21 ReadTime: (( 0.32 ))s
IOVDbSvc INFO Connection COOLOFL_CALO/OFLP200 : nConnect: 2 nFolders: 3 ReadTime: (( 0.07 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
@@ -561,9 +566,9 @@ ToolSvc.CaloTri... INFO => CaloTriggerTowerService::finalize()
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 6.39 [s] Ave/Min/Max=0.168(+-0.664)/ 0/ 3.45 [s] #= 38
-cObj_ALL INFO Time User : Tot= 6.6 [s] Ave/Min/Max=0.275(+-0.829)/ 0/ 3.51 [s] #= 24
-ChronoStatSvc INFO Time User : Tot= 42 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 0.53 [s] Ave/Min/Max= 0.0139(+- 0.064)/ 0/ 0.4 [s] #= 38
+cObj_ALL INFO Time User : Tot= 0.76 [s] Ave/Min/Max= 0.0317(+- 0.0842)/ 0/ 0.41 [s] #= 24
+ChronoStatSvc INFO Time User : Tot= 49 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h b/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
index 61fb2607958e16a9d09b7fd31207953e05919115..31bcb7a014823eb0c20948448a70359b16875301 100644
--- a/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
+++ b/LArCalorimeter/LArCellRec/src/LArCellDeadOTXCorr.h
@@ -31,7 +31,7 @@
// Headerfile
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandleKey.h"
#include "CaloInterface/ICaloCellMakerTool.h"
#include "Identifier/Identifier.h"
diff --git a/LArCalorimeter/LArCellRec/src/LArHVFraction.h b/LArCalorimeter/LArCellRec/src/LArHVFraction.h
index 22837d5dca868feb67ed9f29cf0fef599e956cd2..c17189aecf01876168d46788bd15e43fa52df98f 100644
--- a/LArCalorimeter/LArCellRec/src/LArHVFraction.h
+++ b/LArCalorimeter/LArCellRec/src/LArHVFraction.h
@@ -9,7 +9,7 @@
#include "LArCabling/LArOnOffIdMapping.h"
#include "LArElecCalib/ILArHVScaleCorr.h"
#include "CaloEvent/CaloClusterCellLink.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CaloInterface/ILArHVFraction.h"
diff --git a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
index becac234003d9153bd9e6933ac57fcb66eb016eb..5b469210fba6b0d94ead4ee42e24ab130d4c119a 100644
--- a/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArTimeVetoAlg.cxx
@@ -5,7 +5,7 @@
#include "LArTimeVetoAlg.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "LArRecEvent/LArEventBitInfo.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEventInfo/EventInfo.h"
//Constructor
diff --git a/LArCalorimeter/LArClusterRec/LArClusterRec/LArClusterCollisionTimeAlg.h b/LArCalorimeter/LArClusterRec/LArClusterRec/LArClusterCollisionTimeAlg.h
index a9a86abdc017661f450f430f99b95906db2dc04e..7f6d4fd45ac1d6bd5dc48f1bdd67bbbf9d201918 100644
--- a/LArCalorimeter/LArClusterRec/LArClusterRec/LArClusterCollisionTimeAlg.h
+++ b/LArCalorimeter/LArClusterRec/LArClusterRec/LArClusterCollisionTimeAlg.h
@@ -5,7 +5,7 @@
#ifndef LARCLUSTERCOLLISIONTIMEALG_H
#define LARCLUSTERCOLLISIONTIMEALG_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
diff --git a/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
index 05f9cce8c1684dd807240b29d5c2c3a0cac6755d..d09418a3424e4a9c7ff52a1c54735cbf72421289 100644
--- a/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
+++ b/LArCalorimeter/LArCondUtils/src/LArHV2Ntuple.cxx
@@ -3,7 +3,7 @@
*/
#include "LArHV2Ntuple.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/NTuple.h"
#include "LArHV/LArHVManager.h"
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
index b010ca6f99a994cb5b4b188fd8308a6ef1711c8a..a84edad0c163748002d1c14417dd3bf101845529 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
@@ -10,7 +10,7 @@
#include "LArDetDescr/LArRecoMaterialTool.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGate.h"
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
index a66d51ff0aead64195969faeda7d42002059c812..93337f14065a57c32b33f70083e5860550cbf4c7 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
@@ -9,7 +9,7 @@
#include "LArDetDescr/LArRecoSimpleGeomTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include <vector>
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h b/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
index 307e0417868825be00bead9b04f7748d2e8b8ac3..f213bd1c5dd24ff54474454875cc6ae4720b99a7 100755
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArHitFilter.h
@@ -7,7 +7,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "LArSimEvent/LArHitContainer.h"
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArHitMerger.h b/LArCalorimeter/LArDigitization/LArDigitization/LArHitMerger.h
index eef0fbba6a2dd2b091c184eddf3c4df3d3859f85..2ddad1c3125cbc219ddcedee57343cd60e163d79 100755
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArHitMerger.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArHitMerger.h
@@ -7,7 +7,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <vector>
class StoreGateSvc;
diff --git a/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h b/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
index 15a592542362452cfe6abd2f87ab50ed89033dc5..8b086ffe6685d3204fd0c3ced15c70d50d539971 100755
--- a/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
+++ b/LArCalorimeter/LArDigitization/LArDigitization/LArPileUpTool.h
@@ -38,7 +38,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/ReadCondHandle.h"
#include "StoreGate/WriteHandleKey.h"
#include "StoreGate/WriteHandle.h"
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
index 6bf43084e6b752c19510de031e356b1121d50163..ec51253979a9c0d5613b10d9817b499fadca52f3 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloDDE.cxx
@@ -7,7 +7,7 @@
// Athena related
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <algorithm>
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloGeom.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloGeom.cxx
index d12b85eac372dbea0234042b6fd4c843394e0ed9..8b723c03765324368c4ddce2e43561f8b201c3c9 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloGeom.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestCaloGeom.cxx
@@ -7,7 +7,7 @@
// Athena related
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IService.h"
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArMaterial.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArMaterial.cxx
index 3a602ec7a97faeaeea6ee894d6fc9ed51161c18c..65184a941833533212a0cf2e407d8a5924bc13cb 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArMaterial.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArMaterial.cxx
@@ -6,7 +6,7 @@
#include "TestLArDetDescr/TestLArMaterial.h"
// Athena related
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IService.h"
diff --git a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArTT.cxx b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArTT.cxx
index b5fbc5f9a517b7fbcefd0d691a8fe2d618e7a139..07eda3a9d188e921992f37eb1d49eba5d499da10 100755
--- a/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArTT.cxx
+++ b/LArCalorimeter/LArExample/TestLArDetDescr/src/TestLArTT.cxx
@@ -7,7 +7,7 @@
// Athena related
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <algorithm>
#include "StoreGate/StoreGateSvc.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
index 8a0e17f3737ce323129901cb95f50adccb1fbbc1..36454b8526bcb0eda0fe8d27010a1ed9ec58e717 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/TestLArHWID_Algo.cxx
@@ -9,7 +9,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
index 04cc746a215ac8faf5ab99c74a58e9501640db5a..121a934fe1e7e645288c55d26be289f0fb8490d8 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/initTTMap_Algo.cxx
@@ -10,7 +10,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
index 5f7f83a3f1902c6d6e85d51041df841301f01cd3..82aa191d9fbd691b311da2e2569ca4e2772038fc 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/reinitTTMap_Algo.cxx
@@ -10,7 +10,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
index 429d33895df95fe787162a51227f0064d6fdc764..c7f5e171bafe605d71af516acad9a373d9fd99f7 100755
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/testTTMap_Algo.cxx
@@ -9,7 +9,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx b/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
index 03e639bf7fcc7225c0bc2b556d020cc8b2b4d965..5ccc92e103db2b81fdb35a749da6c2a7c5f6523f 100644
--- a/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
+++ b/LArCalorimeter/LArExample/TestLArHardwareID/src/updateTTMap_Algo.cxx
@@ -9,7 +9,7 @@
#include "GaudiKernel/IService.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IChronoStatSvc.h"
#include "GaudiKernel/IToolSvc.h"
diff --git a/LArCalorimeter/LArG4/LArG4Code/src/LArG4CalibSD.cc b/LArCalorimeter/LArG4/LArG4Code/src/LArG4CalibSD.cc
index a19d77aeebb381f8cb2f02b35222c8de31840d91..bc2c8bae43b76758bd1c9c681e8bd55b76711e54 100644
--- a/LArCalorimeter/LArG4/LArG4Code/src/LArG4CalibSD.cc
+++ b/LArCalorimeter/LArG4/LArG4Code/src/LArG4CalibSD.cc
@@ -14,7 +14,7 @@
#include "CaloSimEvent/CaloCalibrationHitContainer.h"
#include "G4RunManager.hh"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
#include "G4Step.hh"
@@ -76,8 +76,8 @@ G4bool LArG4CalibSD::SimpleHit( const LArG4Identifier& a_ident , const std::vect
// retreive particle ID
unsigned int particleID = 0;
if( m_doPID ) {
- EventInformation * event_info = dynamic_cast<EventInformation*>(G4RunManager::GetRunManager()->GetCurrentEvent()->GetUserInformation());
- if (event_info) particleID = HepMC::barcode(event_info->GetCurrentPrimary());
+ AtlasG4EventUserInfo * atlasG4EvtUserInfo = dynamic_cast<AtlasG4EventUserInfo*>(G4RunManager::GetRunManager()->GetCurrentEvent()->GetUserInformation());
+ if (atlasG4EvtUserInfo) particleID = HepMC::barcode(atlasG4EvtUserInfo->GetCurrentPrimary());
}
// Build the hit from the calculator results.
diff --git a/LArCalorimeter/LArG4/LArG4Code/src/LArG4SimpleSD.cc b/LArCalorimeter/LArG4/LArG4Code/src/LArG4SimpleSD.cc
index 7dde2dd6a84e01c4a012c1244d263ffa5d6d8d9f..c4ad33d8c76e54764e019edf754a866630629d2c 100644
--- a/LArCalorimeter/LArG4/LArG4Code/src/LArG4SimpleSD.cc
+++ b/LArCalorimeter/LArG4/LArG4Code/src/LArG4SimpleSD.cc
@@ -15,7 +15,7 @@
#include "LArSimEvent/LArHitContainer.h"
#include "G4RunManager.hh"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "G4Step.hh"
#ifdef DEBUG_IDENTIFIERS
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.cc
index 2e9512a429dad3e133f013c10249118a201867c8..c3231a9bc6750f35a1ee655707adf3cf9db6f3e2 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.cc
@@ -31,7 +31,7 @@ namespace LArG4 {
declareProperty("GeometryCalculator",m_geometryCalculator);
}
- void CalibrationCalculator::WheelTypeHandler(Property&)
+ void CalibrationCalculator::WheelTypeHandler(Gaudi::Details::PropertyBase&)
{
switch(m_wcalc_tProp.value())
{
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.h b/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.h
index d66577ab5478917cfaa4983543badf08e4814d4b..eaa187f89bd3c1633173968372231fd91b4bf8bf 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4EC/src/CalibrationCalculator.h
@@ -52,7 +52,7 @@ namespace LArG4 {
CalibrationCalculator(const std::string& name, ISvcLocator *pSvcLocator);
virtual ~CalibrationCalculator();
// Update handler
- void WheelTypeHandler(Property&);
+ void WheelTypeHandler(Gaudi::Details::PropertyBase&);
StatusCode initialize() override final;
// The Process method returns a boolean value. If it's true, the
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
index df9e480f7c5fbcf9b622fe1dd01ec78287201de2..416f9b29703687eca07ef8e238af823149ba0940 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.cc
@@ -210,7 +210,7 @@ EnergyCalculator::EnergyCalculator(const std::string& name, ISvcLocator *pSvcLoc
declareProperty("zSide",m_zside);
}
-void EnergyCalculator::CorrectionTypeHandler(Property&)
+void EnergyCalculator::CorrectionTypeHandler(Gaudi::Details::PropertyBase&)
{
switch(m_corrProp.value())
{
@@ -235,7 +235,7 @@ void EnergyCalculator::CorrectionTypeHandler(Property&)
}
}
-void EnergyCalculator::SolidTypeHandler(Property&)
+void EnergyCalculator::SolidTypeHandler(Gaudi::Details::PropertyBase&)
{
switch(m_solidtypeProp.value())
{
diff --git a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
index 0e29d9ae0f5607ef9b5b0b671bf7b65511c98231..c2cf362a11d807a43d8bcc8bfe5101f490d5d74a 100644
--- a/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4EC/src/EnergyCalculator.h
@@ -54,8 +54,8 @@ namespace LArG4 {
EnergyCalculator(const std::string& name, ISvcLocator *pSvcLocator);
// Update handlers
- void CorrectionTypeHandler(Property&);
- void SolidTypeHandler(Property&);
+ void CorrectionTypeHandler(Gaudi::Details::PropertyBase&);
+ void SolidTypeHandler(Gaudi::Details::PropertyBase&);
virtual StatusCode initialize() override final;
virtual StatusCode finalize() override final;
diff --git a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
index 4b38112f63f99b59eab3357240cd3f4acb223053..e32f47170c121b267bd7af844930d83291a7f29c 100644
--- a/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
+++ b/LArCalorimeter/LArG4/LArG4FastSimSvc/LArG4FastSimSvc/LArG4FastSimSvc.h
@@ -11,7 +11,7 @@
// Minimal service includes
#include "GaudiKernel/StatusCode.h"
//#include "GaudiKernel/Service.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "G4Electron.hh"
#include "G4Positron.hh"
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
index 1af7de6961053949bac73c53c38d01fc67984a4a..cb401764dfb31fb8fd9b3a63024949922aa43c3c 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
@@ -5,7 +5,7 @@
#include "LArG4H6WarmTCSD.h"
#include "CaloG4Sim/SimulationEnergies.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "G4VTouchable.hh"
#include "G4TouchableHistory.hh"
@@ -84,11 +84,11 @@ G4bool LArG4H6WarmTCSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist)
edep = aStep->GetTotalEnergyDeposit() * aStep->GetTrack()->GetWeight();
if(edep == 0.) {
if(m_isCalib){
- EventInformation * event_info = dynamic_cast<EventInformation*>(G4RunManager::GetRunManager()->GetCurrentEvent()->GetUserInformation());
- if ( event_info ) {
+ AtlasG4EventUserInfo * atlasG4EvtUserInfo = dynamic_cast<AtlasG4EventUserInfo*>(G4RunManager::GetRunManager()->GetCurrentEvent()->GetUserInformation());
+ if ( atlasG4EvtUserInfo ) {
// Update the step info
- event_info->SetLastProcessedBarcode( aStep->GetTrack()->GetTrackID() );
- event_info->SetLastProcessedStep( aStep->GetTrack()->GetCurrentStepNumber() );
+ atlasG4EvtUserInfo->SetLastProcessedBarcode( aStep->GetTrack()->GetTrackID() );
+ atlasG4EvtUserInfo->SetLastProcessedStep( aStep->GetTrack()->GetCurrentStepNumber() );
}
}
return true;
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.cc b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.cc
index 8a3a014d79047f4847e870ee6fa6a2689ea32203..d0e4b78b36d562260a9e0a9c5c8cc63d689c2f6c 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.cc
@@ -28,7 +28,7 @@ namespace LArG4 {
m_geometryTypeProp.declareUpdateHandler(&LArHECCalibrationWheelCalculator::GeometryTypeUpdateHandler, this);
}
- void LArHECCalibrationWheelCalculator::GeometryTypeUpdateHandler(Property&)
+ void LArHECCalibrationWheelCalculator::GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&)
{
switch(m_geometryTypeProp.value())
{
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.h b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.h
index a9e5562d453f333b439b2b249051a66562665bf4..dd1ad300a78194ac165fe4063c404cfcb62819da 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LArHECCalibrationWheelCalculator.h
@@ -27,7 +27,7 @@ namespace LArG4 {
public:
LArHECCalibrationWheelCalculator(const std::string& name, ISvcLocator *pSvcLocator);
- void GeometryTypeUpdateHandler(Property&);
+ void GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&);
StatusCode initialize() override final;
virtual ~LArHECCalibrationWheelCalculator();
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
index 914abae827232da886f6eda77d6c4206fdb6e1c2..c50b71729dd8a3c1280ab88cafa3b127fddf65b4 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.cc
@@ -28,7 +28,7 @@ namespace LArG4 {
#endif
}
- void LocalCalibrationCalculator::GeometryTypeUpdateHandler(Property&)
+ void LocalCalibrationCalculator::GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&)
{
std::string geoTypeString = m_strgeometryType.value();
std::transform(geoTypeString.begin(), geoTypeString.end(),geoTypeString.begin(), ::toupper);
diff --git a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.h b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.h
index 1985b52903abfd9369a4a38e497ab5606f093514..8899a81f6be2458fd564f4f41f96f64e28a29974 100644
--- a/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.h
+++ b/LArCalorimeter/LArG4/LArG4HEC/src/LocalCalibrationCalculator.h
@@ -26,7 +26,7 @@ namespace LArG4 {
public:
LocalCalibrationCalculator(const std::string& name, ISvcLocator *pSvcLocatorconst);
- void GeometryTypeUpdateHandler(Property&);
+ void GeometryTypeUpdateHandler(Gaudi::Details::PropertyBase&);
StatusCode initialize() override final;
virtual ~LocalCalibrationCalculator();
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
index 06d7ea5752e40f16b8c539c4f0667d70de315a62..d92032af94022997a9b55c995fda86f83420aebb 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBHVManager.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "LArHV/EMBHVManager.h"
@@ -11,10 +11,10 @@
#include "EMBHVPayload.h"
#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/ServiceHandle.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -46,7 +46,7 @@ public:
}
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
if (StatusCode::SUCCESS!=detStore->retrieve(elecId, "LArElectrodeID")) {
throw std::runtime_error("EMBHVManager failed to retrieve LArElectrodeID");
}
@@ -147,7 +147,7 @@ void EMBHVManager::update() const {
m_c->payloadArray[i].voltage[1]=-99999.;
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
ISvcLocator* svcLocator = Gaudi::svcLocator();
IToolSvc* toolSvc;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
index 1a2354cccca4e1c4f414071b9756ffa94c5e51d5..dd040ea2802d4efc67c1bc58c1c600fbc0f04f02 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMBPresamplerHVManager.cxx
@@ -12,10 +12,10 @@
#include "EMBPresamplerHVPayload.h"
#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/ServiceHandle.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -50,7 +50,7 @@ public:
}
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
if (StatusCode::SUCCESS!=detStore->retrieve(elecId, "LArElectrodeID")) {
throw std::runtime_error("EMBPresamplerHVManager failed to retrieve LArElectrodeID");
}
@@ -140,7 +140,7 @@ void EMBPresamplerHVManager::update() const {
m_c->payloadArray[i].voltage[1]=-99999.;
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
ISvcLocator* svcLocator = Gaudi::svcLocator();
IToolSvc* toolSvc;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
index e315aaef798b05eafe98efdcc4a1e8d95e80b3d0..c059da3103e8f647473e4d3c2f909073071fee00 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECHVManager.cxx
@@ -11,10 +11,10 @@
#include "EMECHVPayload.h"
#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/ServiceHandle.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -48,7 +48,7 @@ public:
}
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
if (StatusCode::SUCCESS!=detStore->retrieve(elecId, "LArElectrodeID")) {
throw std::runtime_error("EMECHVManager failed to retrieve LArElectrodeID");
}
@@ -183,7 +183,7 @@ void EMECHVManager::update() const {
}
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
ISvcLocator* svcLocator = Gaudi::svcLocator();
IToolSvc* toolSvc;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
index ee349c73d203f016d8452d62a5951a01b1474c86..655edf3f95ad6f003d1446d93e100fbaf01ac31f 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/EMECPresamplerHVManager.cxx
@@ -11,10 +11,10 @@
#include "EMECPresamplerHVPayload.h"
#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/ServiceHandle.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -40,7 +40,7 @@ public:
moduleArray[iSide][iPhi] = new EMECPresamplerHVModule(manager, iSide, iPhi);
}
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
if (StatusCode::SUCCESS!=detStore->retrieve(elecId, "LArElectrodeID")) {
throw std::runtime_error("EMECPresamplerHVManager failed to retrieve LArElectrodeID");
}
@@ -117,7 +117,7 @@ void EMECPresamplerHVManager::update() const {
}
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
ISvcLocator* svcLocator = Gaudi::svcLocator();
IToolSvc* toolSvc;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
index e396cc7d8cbf80ad4cb0f23111f326c0ab584cae..632e1295db295f9b02a333f402235ab9bf85f5f5 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/FCALHVManager.cxx
@@ -10,8 +10,8 @@
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "LArIdentifier/LArElectrodeID.h"
@@ -37,7 +37,7 @@ public:
}
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
if (StatusCode::SUCCESS!=detStore->retrieve(elecId, "LArElectrodeID")) {
throw std::runtime_error("FCALHVManager failed to retrieve LArElectrodeID");
}
@@ -121,7 +121,7 @@ void FCALHVManager::update() const {
m_c->payloadArray[i].voltage = -99999;
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
ISvcLocator* svcLocator = Gaudi::svcLocator();
IToolSvc* toolSvc;
diff --git a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
index b97113d8b4e4cc58d10a0277f3395afc31b73c10..0849948926979b383b112ea58a1e66603419c62f 100644
--- a/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArHV/src/HECHVManager.cxx
@@ -10,10 +10,10 @@
#include "HECHVPayload.h"
#include "StoreGate/StoreGateSvc.h"
-#include "StoreGate/StoreGate.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/Bootstrap.h"
+#include "GaudiKernel/ServiceHandle.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
@@ -40,7 +40,7 @@ public:
}
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
if (StatusCode::SUCCESS!=detStore->retrieve(elecId, "LArElectrodeID")) {
throw std::runtime_error("HECHVManager failed to retrieve LArElectrodeID");
}
@@ -129,7 +129,7 @@ void HECHVManager::update() const {
m_c->payloadArray[i].voltage = -99999;
}
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
ISvcLocator* svcLocator = Gaudi::svcLocator();
IToolSvc* toolSvc;
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
index f244a4b07b6a72babc9fb6451c6828478064dad0..fb7efdf627ce75f40df80e89570deafe2dc33f72 100755
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/src/EMECDetectorManager.cxx
@@ -1,10 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/Bootstrap.h"
#include "GaudiKernel/SystemOfUnits.h"
+#include "GaudiKernel/ServiceHandle.h"
#include "RDBAccessSvc/IRDBRecord.h"
#include "RDBAccessSvc/IRDBRecordset.h"
@@ -15,7 +16,7 @@
#include "LArReadoutGeometry/EMECDetectorManager.h"
#include "LArReadoutGeometry/EMECDetectorRegion.h"
#include "LArReadoutGeometry/EMECDetDescr.h"
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
#include "LArHV/LArHVManager.h"
// Class EMECDetectorManager
@@ -130,7 +131,7 @@ const EMECHVManager& EMECDetectorManager::getHVManager (EMECHVManager::IOType io
{
if(!m_HVManager[io]) {
//Support lazy initialization for testbeams
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
const LArHVManager *manager{nullptr};
if (detStore->retrieve(manager)==StatusCode::SUCCESS) {
m_HVManager[io]=&(manager->getEMECHVManager(io));
@@ -142,7 +143,7 @@ const EMECHVManager& EMECDetectorManager::getHVManager (EMECHVManager::IOType io
const EMECPresamplerHVManager& EMECDetectorManager::getPresamplerHVManager () const
{
if (!m_presamplerHVManager) {
- StoreGateSvc *detStore = StoreGate::pointer("DetectorStore");
+ ServiceHandle<StoreGateSvc> detStore ("DetectorStore", "HECHVManager");
const LArHVManager *manager{nullptr};
if (detStore->retrieve(manager)==StatusCode::SUCCESS) {
m_presamplerHVManager=&(manager->getEMECPresamplerHVManager());
diff --git a/LArCalorimeter/LArL1Sim/LArL1Sim/LArSCL1Maker.h b/LArCalorimeter/LArL1Sim/LArL1Sim/LArSCL1Maker.h
index f50d4925c2171427c3e9ca17d96481262d45af33..ae48f24264aa9a2604e4aae8d6f030545562798a 100644
--- a/LArCalorimeter/LArL1Sim/LArL1Sim/LArSCL1Maker.h
+++ b/LArCalorimeter/LArL1Sim/LArL1Sim/LArSCL1Maker.h
@@ -16,7 +16,7 @@
//
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "LArDigitization/LArHitEMap.h"
diff --git a/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h b/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
index 0d7e718c96ce4696ab9941b41fe0cfe3e4541051..167d00b1de2d5f95aa1aac386d4dc59008bc4e7e 100755
--- a/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
+++ b/LArCalorimeter/LArL1Sim/LArL1Sim/LArTTL1Maker.h
@@ -16,7 +16,7 @@
//
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "LArDigitization/LArHitEMap.h"
diff --git a/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx b/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx
index 6635deb48a6cfa5c4dd6e7c95aa5cf67a319c548..a1eab237b7019fb1820ef580ab7a4a35e61c32a3 100755
--- a/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx
+++ b/LArCalorimeter/LArL1Sim/src/LArSCL1Maker.cxx
@@ -43,7 +43,7 @@
// ........ Gaudi needed includes
//
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IChronoStatSvc.h"
diff --git a/LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx b/LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx
index b98e391670561ba783d85f835a4cf4a86a384cc1..c9a25c368de831600079f71b5e736df56bcec306 100755
--- a/LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx
+++ b/LArCalorimeter/LArL1Sim/src/LArTTL1Calib.cxx
@@ -23,7 +23,7 @@
//
// ........ Gaudi needed includes
//
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/INTupleSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx b/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
index 7ec4b8eec737231121dbb9189c5b1a9f0f715eed..b33f0e44bbc6f836213c378040c26a5f765d06b9 100755
--- a/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
+++ b/LArCalorimeter/LArSim/src/LArFakeHitProducer.cxx
@@ -5,7 +5,7 @@
#include "LArSim/LArFakeHitProducer.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitMaker.cxx b/LArCalorimeter/LArSim/src/LArHitMaker.cxx
index 5a49c6f4b346e840607989197ba749dc48afebf4..df0b3e3453974eeb48d46b4b322d906badb57f5b 100755
--- a/LArCalorimeter/LArSim/src/LArHitMaker.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitMaker.cxx
@@ -6,7 +6,7 @@
#include "LArSim/LArHitProducer.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitProducer.cxx b/LArCalorimeter/LArSim/src/LArHitProducer.cxx
index ee93a8e77572e295910e781ac48c1bfc7fad41c3..ed6ba8a7a0cd5b0b5a66261162c343ed00afb8cd 100755
--- a/LArCalorimeter/LArSim/src/LArHitProducer.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitProducer.cxx
@@ -5,7 +5,7 @@
#include "LArSim/LArHitProducer.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
diff --git a/LArCalorimeter/LArSim/src/LArHitReader.cxx b/LArCalorimeter/LArSim/src/LArHitReader.cxx
index 2de954abf1027335205e9d919d2fef2a457832f6..fa209e4c458e77a6797e2ec12c198543515a308d 100755
--- a/LArCalorimeter/LArSim/src/LArHitReader.cxx
+++ b/LArCalorimeter/LArSim/src/LArHitReader.cxx
@@ -4,7 +4,7 @@
#include "LArSim/LArHitReader.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IDataProviderSvc.h"
#include "LArSimEvent/LArHit.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
index 3997f9833bbe95bd7739acf28974e1aee498f8b7..6e11e6c8c778fb435801944379383e6c11207ea4 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArElecCalib.cxx
@@ -59,7 +59,7 @@
#include "LArCalibTest/FixLArElecCalib.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
index 6923c5218d067cb32e8d5c5c6cb6bf83605d0cf7..da0a8d009434192cf0e892c3bfee52a10f49b2ce 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/FixLArIdMap.cxx
@@ -180,7 +180,7 @@ quadrant:
#include "LArCalibTest/FixLArIdMap.h"
#include "GaudiKernel/Algorithm.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IToolSvc.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
index 49765c0b1cf5242279367947967d2a4f1a678cb4..875f2e61ee9e37aac8905312269957d945f15053 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArOFCtoOFC.cxx
@@ -11,7 +11,7 @@
#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
index e8730d22a065242113036fa294eb2398c633e9c2..f0e6941d80f5315cfb6bed73b9e33bd0e9df7bf5 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArShapeToSCShape.cxx
@@ -25,7 +25,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArCondDataTest.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArCondDataTest.cxx
index bf0cfd468c326c4523fa81e37f81cca90adc2ea0..c8bf5fd1725967a6b340f28343c6cc314d01b10c 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArCondDataTest.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArCondDataTest.cxx
@@ -20,7 +20,7 @@
#include "LArIdentifier/LArOnlineID.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "LArElecCalib/ILArShape.h"
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
index 5e3a4349ba687edf598cb663d2dc1ef706594efc..b25249b3952cd4de6a0098f173856186ba03e833 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
@@ -25,7 +25,7 @@
//#include "AthenaKernel/IIOVSvc.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "LArRawConditions/LArRampMC.h"
diff --git a/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h b/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
index cc78063370370609fbee3f94de9b4ac637739666..4bd599f357f61b446df189273fcce0199626dc54 100644
--- a/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
+++ b/LumiBlock/LumiBlockComps/src/BunchCrossingCondTest.h
@@ -9,7 +9,7 @@
// Gaudi/Athena include(s):
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include "LumiBlockData/BunchCrossingCondData.h"
diff --git a/LumiBlock/LumiCalc/CMakeLists.txt b/LumiBlock/LumiCalc/CMakeLists.txt
index ed5dec99e7e1399cec274cec877cf5b4c1885369..2b67db6530d5534d8a25e430d2f5fe7114d8ba09 100644
--- a/LumiBlock/LumiCalc/CMakeLists.txt
+++ b/LumiBlock/LumiCalc/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_add_library( LumiBlockCoolQuery
src/ReplicaSorter.cxx
src/LumiBlockCollectionConverter.cxx
PUBLIC_HEADERS LumiCalc
- INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
+ INCLUDE_DIRS ${COOL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${COOL_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel GoodRunsListsLib LumiBlockData xAODLuminosity )
atlas_add_executable( iLumiCalc
diff --git a/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldCacheCondObj.h b/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldCacheCondObj.h
index f0a75517d5ff6a306631e65d2059a343da05773a..61e5be32d80b329fb1d83330a6713e884437dc26 100644
--- a/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldCacheCondObj.h
+++ b/MagneticField/MagFieldConditions/MagFieldConditions/AtlasFieldCacheCondObj.h
@@ -37,7 +37,7 @@ public:
const MagField::AtlasFieldMap* fieldMap() const { return m_fieldMap; }
/** set values for field scale and service to be able to build the cache **/
- bool initialize(double solFieldScale, double torFieldScale,
+ void initialize(double solFieldScale, double torFieldScale,
const MagField::AtlasFieldMap* fieldMap);
private:
diff --git a/MagneticField/MagFieldConditions/src/AtlasFieldCacheCondObj.cxx b/MagneticField/MagFieldConditions/src/AtlasFieldCacheCondObj.cxx
index d78140314c8c22c45900b9879d5adb1a5c12d1fd..6539ae91be73ae181b076319799891dafbada432 100644
--- a/MagneticField/MagFieldConditions/src/AtlasFieldCacheCondObj.cxx
+++ b/MagneticField/MagFieldConditions/src/AtlasFieldCacheCondObj.cxx
@@ -9,7 +9,7 @@ AtlasFieldCacheCondObj::AtlasFieldCacheCondObj()
AtlasFieldCacheCondObj::~AtlasFieldCacheCondObj() {}
-bool
+void
AtlasFieldCacheCondObj::initialize(double solFieldScale,
double torFieldScale,
const MagField::AtlasFieldMap* fieldMap)
@@ -18,6 +18,5 @@ AtlasFieldCacheCondObj::initialize(double solFieldScale,
m_solFieldScale = solFieldScale;
m_torFieldScale = torFieldScale;
m_fieldMap = fieldMap;
- return (m_fieldMap) != nullptr; // return false if cast failed
}
diff --git a/MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.icc b/MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.icc
index 7b99399a3f43c2f733db8fac87d0428fbec341a3..0ea794a5eae8a8dae481a6fe670beb7c760d0d54 100644
--- a/MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.icc
+++ b/MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.icc
@@ -146,11 +146,11 @@ MagField::AtlasFieldCache::getFieldZR(const double* ATH_RESTRICT xyz,
inline bool
MagField::AtlasFieldCache::solenoidOn() const
{
- return m_fieldMap ? m_fieldMap->solenoidOn() : false;
+ return m_fieldMap ? m_fieldMap->solenoidOn() && m_solScale > 0.0 : false;
}
inline bool
MagField::AtlasFieldCache::toroidOn() const
{
- return m_fieldMap ? m_fieldMap->toroidOn() : false;
+ return m_fieldMap ? m_fieldMap->toroidOn() && m_torScale > 0.0 : false;
}
diff --git a/MagneticField/MagFieldServices/CMakeLists.txt b/MagneticField/MagFieldServices/CMakeLists.txt
index 4d89f8435c5b9a1d0342ea036ef7cac935db4aeb..ebf11dfafe4e445ffb0e875c8d797578a388980f 100644
--- a/MagneticField/MagFieldServices/CMakeLists.txt
+++ b/MagneticField/MagFieldServices/CMakeLists.txt
@@ -19,7 +19,13 @@ atlas_install_headers( MagFieldServices )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
if( NOT SIMULATIONBASE )
- atlas_add_test( MagFieldServicesConfig SCRIPT python -m MagFieldServices.MagFieldServicesConfig
+ atlas_add_test( MagFieldServicesConfig
+ SCRIPT python -m MagFieldServices.MagFieldServicesConfig
PROPERTIES TIMEOUT 300
POST_EXEC_SCRIPT nopost.sh )
+
+ atlas_add_test( MagFieldCondAlg
+ SCRIPT athena --threads=1 ${CMAKE_CURRENT_SOURCE_DIR}/share/test_magFieldCondAlg.py
+ PROPERTIES TIMEOUT 300
+ LOG_SELECT_PATTERN "MagFieldCondReader" )
endif()
diff --git a/MagneticField/MagFieldServices/MagFieldServices/AtlasFieldMapCondAlg.h b/MagneticField/MagFieldServices/MagFieldServices/AtlasFieldMapCondAlg.h
index c87ece15d97f8a0bae48129ca3c5ba2d357459c9..616ebd10ecb77d78ec0f3a9055736a35d99422f3 100644
--- a/MagneticField/MagFieldServices/MagFieldServices/AtlasFieldMapCondAlg.h
+++ b/MagneticField/MagFieldServices/MagFieldServices/AtlasFieldMapCondAlg.h
@@ -76,6 +76,10 @@ namespace MagField {
"MapToroCurrent", 20400., "Nominal toroid current (A)"};
+ // flag to load map on start
+ Gaudi::Property<bool> m_loadMapOnStart {this,
+ "LoadMapOnStart", false , "Load the magnetic field map at start"};
+
// flag to read magnet map filenames from COOL
Gaudi::Property<bool> m_useMapsFromCOOL {this,
"UseMapsFromCOOL", true , "Get magnetic field map filenames from COOL"};
diff --git a/MagneticField/MagFieldServices/share/MagFieldCondAlg.ref b/MagneticField/MagFieldServices/share/MagFieldCondAlg.ref
new file mode 100644
index 0000000000000000000000000000000000000000..b64570735df90c48a9167888391bc10810fcfbe9
--- /dev/null
+++ b/MagneticField/MagFieldServices/share/MagFieldCondAlg.ref
@@ -0,0 +1,30 @@
+MagFieldCondReader 0 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 0 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 1 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 1 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 2 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 2 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 3 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 3 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 4 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 4 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 5 0 INFO Field status: solenoid=0, toroids=0
+MagFieldCondReader 5 0 INFO Field xyz: 100, 100, 100, 0, 0, 0
+MagFieldCondReader 6 0 INFO Field status: solenoid=0, toroids=0
+MagFieldCondReader 6 0 INFO Field xyz: 100, 100, 100, 0, 0, 0
+MagFieldCondReader 7 0 INFO Field status: solenoid=0, toroids=0
+MagFieldCondReader 7 0 INFO Field xyz: 100, 100, 100, 0, 0, 0
+MagFieldCondReader 8 0 INFO Field status: solenoid=0, toroids=0
+MagFieldCondReader 8 0 INFO Field xyz: 100, 100, 100, 0, 0, 0
+MagFieldCondReader 9 0 INFO Field status: solenoid=0, toroids=0
+MagFieldCondReader 9 0 INFO Field xyz: 100, 100, 100, 0, 0, 0
+MagFieldCondReader 10 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 10 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 11 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 11 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 12 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 12 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 13 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 13 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
+MagFieldCondReader 14 0 INFO Field status: solenoid=1, toroids=1
+MagFieldCondReader 14 0 INFO Field xyz: 100, 100, 100, 1.58913e-06, -2.49264e-07, 0.00199734
diff --git a/MagneticField/MagFieldServices/share/test_magFieldCondAlg.py b/MagneticField/MagFieldServices/share/test_magFieldCondAlg.py
new file mode 100644
index 0000000000000000000000000000000000000000..58bc3ca1d068c6c906187833bc3d43246ee0ccfd
--- /dev/null
+++ b/MagneticField/MagFieldServices/share/test_magFieldCondAlg.py
@@ -0,0 +1,78 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# Job options to test magnetic field conditions algs with varying currents.
+#
+
+# Testing IOVs and currents: (since LB, solenoid, toroids)
+currents = [(0, 7730, 20400),
+ (5, 0, 0),
+ (10, 7730, 20400)]
+
+# Folder name
+folder = '/EXT/DCS/MAGNETS/SENSORDATA'
+
+def createDB():
+ """Create sqlite file with DCS currents"""
+ from PyCool import cool
+ from CoolConvUtilities import AtlCoolLib, AtlCoolTool
+
+ # Cleanup previous file
+ import os
+ if os.path.isfile("magfield.db"):
+ os.remove("magfield.db")
+
+ db = cool.DatabaseSvcFactory.databaseService().createDatabase('sqlite://;schema=magfield.db;dbname=CONDBR2')
+ spec = cool.RecordSpecification()
+ spec.extend("value", cool.StorageType.Float)
+ spec.extend("quality_invalid", cool.StorageType.Bool)
+ f = AtlCoolLib.ensureFolder(db, folder, spec, AtlCoolLib.athenaDesc(True, 'CondAttrListCollection'))
+
+ for v in currents:
+ sol = cool.Record(spec)
+ sol['value'] = v[1]
+ sol['quality_invalid'] = False
+ tor = cool.Record(spec)
+ tor['value'] = v[2]
+ tor['quality_invalid'] = False
+ f.storeObject(v[0], cool.ValidityKeyMax, sol, 1) # channel 1
+ f.storeObject(v[0], cool.ValidityKeyMax, tor, 3) # channel 3
+
+ # print database content
+ act = AtlCoolTool.AtlCoolTool(db)
+ print (act.more(folder))
+
+
+# Create sqlite file with DCS currents
+createDB()
+
+# basic job configuration
+import AthenaCommon.AtlasUnixGeneratorJob # noqa: F401
+from AthenaCommon.AppMgr import theApp, ServiceMgr as svcMgr
+from AthenaCommon.AlgSequence import AthSequencer, AlgSequence
+
+# Increment LBN every event
+from McEventSelector import McEventSelectorConf
+svcMgr += McEventSelectorConf.McEventSelector('EventSelector', EventsPerLB=1)
+
+# Conditions folder setup
+from AthenaCommon.GlobalFlags import globalflags
+globalflags.DataSource='data'
+globalflags.ConditionsTag='CONDBR2-BLKPA-RUN2-01'
+
+from IOVDbSvc.CondDB import conddb
+conddb.setGlobalTag(globalflags.ConditionsTag())
+conddb.addFolder('GLOBAL', '/GLOBAL/BField/Maps <noover/>', className="CondAttrListCollection")
+conddb.addFolder('magfield.db', folder, className='CondAttrListCollection')
+
+# Magnetic field algorithm setup
+from AthenaCommon.CfgGetter import getAlgorithm
+condSeq = AthSequencer("AthCondSeq")
+condSeq += getAlgorithm( "AtlasFieldMapCondAlg" )
+condSeq += getAlgorithm( "AtlasFieldCacheCondAlg" )
+condSeq.AtlasFieldCacheCondAlg.LockMapCurrents = False
+
+from MagFieldUtils.MagFieldUtilsConf import MagField__CondReader
+topSequence = AlgSequence()
+topSequence += MagField__CondReader("MagFieldCondReader")
+
+theApp.EvtMax = currents[-1][0]+5 # 5 events per IOV
diff --git a/MagneticField/MagFieldServices/src/AtlasFieldCacheCondAlg.cxx b/MagneticField/MagFieldServices/src/AtlasFieldCacheCondAlg.cxx
index f246e474820c2990639aaa6bb2bc3a61644f6c21..703e82d3d9aa89543d6658d2527d721b2ad7332b 100644
--- a/MagneticField/MagFieldServices/src/AtlasFieldCacheCondAlg.cxx
+++ b/MagneticField/MagFieldServices/src/AtlasFieldCacheCondAlg.cxx
@@ -116,13 +116,9 @@ MagField::AtlasFieldCacheCondAlg::execute(const EventContext& ctx) const {
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
// initialize cond obj with current scale factors and the field svc (needed to setup cache)
- if (!fieldCondObj->initialize(cache.m_solScaleFactor,
- cache.m_torScaleFactor,
- fieldMap)) {
- ATH_MSG_ERROR("execute: Could not initialize conditions field object with solenoid/toroid currents "
- << cache.m_solScaleFactor << "," << cache.m_torScaleFactor);
- return StatusCode::FAILURE;
- }
+ fieldCondObj->initialize(cache.m_solScaleFactor,
+ cache.m_torScaleFactor,
+ fieldMap);
// Record in conditions store the conditions object with scale factors and map pointer for cache
if(writeHandle.record(cache.m_condObjOutputRange, std::move(fieldCondObj)).isFailure()) {
@@ -134,7 +130,12 @@ MagField::AtlasFieldCacheCondAlg::execute(const EventContext& ctx) const {
ATH_MSG_INFO ( "execute: initialized AtlasFieldCacheCondObj and cache with SFs - sol/tor "
<< cache.m_solScaleFactor << "/" << cache.m_torScaleFactor );
- ATH_MSG_INFO ( "execute: solenoid zone id " << fieldMap->solenoidZoneId());
+ if (fieldMap) {
+ ATH_MSG_INFO ( "execute: solenoid zone id " << fieldMap->solenoidZoneId());
+ }
+ else {
+ ATH_MSG_INFO ( "execute: no map read (currents == 0");
+ }
return StatusCode::SUCCESS;
}
@@ -251,7 +252,7 @@ MagField::AtlasFieldCacheCondAlg::updateCurrentFromParameters(Cache& cache) cons
cache.m_solenoidCurrent = solcur;
cache.m_toroidCurrent = torcur;
ATH_MSG_INFO("updateCurrentFromParameters: Update from job options: Range of input/output is " << cache.m_condObjOutputRange);
- ATH_MSG_INFO("updateCurrentFromParameters: Currents taken for jobOption parameters " );
+ ATH_MSG_INFO("updateCurrentFromParameters: Currents taken from jobOption parameters " );
return StatusCode::SUCCESS;
}
@@ -259,18 +260,27 @@ MagField::AtlasFieldCacheCondAlg::updateCurrentFromParameters(Cache& cache) cons
void
MagField::AtlasFieldCacheCondAlg::scaleField(Cache& cache, const MagField::AtlasFieldMap* fieldMap) const
{
- //
+ // Calculate the scale factor for solenoid and toroid
+ // For each current, if it is 0, either from conditions or jobOpt, set the corresponding SF to 0
+
if ( cache.m_solenoidCurrent > 0.0 ) {
- if ( fieldMap->solenoidCurrent() > 0.0 &&
+ if ( fieldMap && fieldMap->solenoidCurrent() > 0.0 &&
std::abs( cache.m_solenoidCurrent/fieldMap->solenoidCurrent() - 1.0 ) > 0.001 ){
cache.m_solScaleFactor = cache.m_solenoidCurrent/fieldMap->solenoidCurrent();
}
ATH_MSG_INFO( "scaleField: Solenoid field scale factor " << cache.m_solScaleFactor << ". Solenoid and map currents: "
<< cache.m_solenoidCurrent << "," << fieldMap->solenoidCurrent());
}
+ else {
+ // No SF set, set it to 0 - current was set to zero either here or for the map, or the map was not read in
+ cache.m_solScaleFactor = 0;
+ ATH_MSG_INFO( "scaleField: Solenoid field scale factor " << cache.m_solScaleFactor << ". Solenoid and map currents: "
+ << cache.m_solenoidCurrent << "," << ((fieldMap) ? fieldMap->solenoidCurrent() : 0));
+ }
+
//
- if (cache.m_toroidCurrent ) {
- if ( fieldMap->toroidCurrent() > 0.0 &&
+ if (cache.m_toroidCurrent > 0.0 ) {
+ if ( fieldMap && fieldMap->toroidCurrent() > 0.0 &&
std::abs(cache.m_toroidCurrent/fieldMap->toroidCurrent() - 1.0 ) > 0.001 ) {
// scale the field in all zones except for the solenoid zone
cache.m_torScaleFactor = cache.m_toroidCurrent/fieldMap->toroidCurrent();
@@ -278,6 +288,11 @@ MagField::AtlasFieldCacheCondAlg::scaleField(Cache& cache, const MagField::Atlas
ATH_MSG_INFO( "scaleField: Toroid field scale factor " << cache.m_torScaleFactor << ". Toroid and map currents: "
<< cache.m_toroidCurrent << "," << fieldMap->toroidCurrent());
}
+ else {
+ cache.m_torScaleFactor = 0;
+ ATH_MSG_INFO( "scaleField: Toroid field scale factor " << cache.m_torScaleFactor << ". Toroid and map currents: "
+ << cache.m_toroidCurrent << "," << ((fieldMap) ? fieldMap->toroidCurrent() : 0));
+ }
}
diff --git a/MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx b/MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx
index 4d15b83660bb8916d3b974b0f050b84291818fe6..c6cca3294f8483083387590681ea0249b4cff767 100644
--- a/MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx
+++ b/MagneticField/MagFieldServices/src/AtlasFieldMapCondAlg.cxx
@@ -71,10 +71,11 @@ StatusCode
MagField::AtlasFieldMapCondAlg::start() {
ATH_MSG_DEBUG ( "start: entering ");
- // If we want to build the map at start, this can be done without access to conditions db
- // This is needed for online operation
- if (!m_useMapsFromCOOL) return(execute(Gaudi::Hive::currentContext()));
-
+ // Load map on start, we assume that the current context is valid
+ if (m_loadMapOnStart) {
+ return(execute(Gaudi::Hive::currentContext()));
+ }
+
return StatusCode::SUCCESS;
}
@@ -97,15 +98,20 @@ MagField::AtlasFieldMapCondAlg::execute(const EventContext& ctx) const {
ATH_CHECK( updateFieldMap(ctx, cache) );
-
- ATH_MSG_INFO ( "execute: solenoid zone id " << cache.m_fieldMap->solenoidZoneId());
+ if (cache.m_fieldMap) {
+ ATH_MSG_INFO ( "execute: solenoid zone id " << cache.m_fieldMap->solenoidZoneId());
+ }
+ else {
+ ATH_MSG_INFO ( "execute: no map read (currents == 0");
+ }
+
// Save newly created map in conditions object, and record it in the conditions store, with its
// own range
auto fieldMapCondObj = std::make_unique<AtlasFieldMapCondObj>();
// move ownership of the field map to the fieldMapCondObj
- fieldMapCondObj->setFieldMap(std::move(cache.m_fieldMap));
+ if (cache.m_fieldMap) fieldMapCondObj->setFieldMap(std::move(cache.m_fieldMap));
if(mapWriteHandle.record(cache.m_mapCondObjOutputRange, std::move(fieldMapCondObj)).isFailure()) {
ATH_MSG_ERROR("execute: Could not record AtlasFieldMapCondObj object with "
<< mapWriteHandle.key()
@@ -202,7 +208,7 @@ MagField::AtlasFieldMapCondAlg::updateFieldMap(const EventContext& ctx, Cache& c
cache.m_mapCondObjOutputRange = rangeW;
ATH_MSG_INFO("updateFieldMap: useMapsFromCOOL == false, using default range " << rangeW);
}
-
+
// We allow to set currents via the TagInfoMgr which adds tags to the TagInfo object - only allowed for offline
if (m_useMapsFromCOOL) {
@@ -235,7 +241,7 @@ MagField::AtlasFieldMapCondAlg::updateFieldMap(const EventContext& ctx, Cache& c
ATH_MSG_INFO("updateFieldMap: tagInfoH " << tagInfoH.fullKey() << " is NOT valid. ");
}
}
-
+
// Select map file according to the value of the currents which indicate which map is 'on'
// determine the map to load
diff --git a/MagneticField/MagFieldUtils/CMakeLists.txt b/MagneticField/MagFieldUtils/CMakeLists.txt
index 433f9eda16812493b5ea234f89b685b2edff005a..54ac61d251329407b134ce01068c3b3be8544730 100644
--- a/MagneticField/MagFieldUtils/CMakeLists.txt
+++ b/MagneticField/MagFieldUtils/CMakeLists.txt
@@ -14,9 +14,7 @@ atlas_add_component( MagFieldUtils
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel MagFieldInterfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel MagFieldConditions MagFieldInterfaces )
# Install files from the package:
-atlas_install_headers( MagFieldUtils )
atlas_install_joboptions( share/*.py )
-
diff --git a/MagneticField/MagFieldUtils/src/MagFieldCondReader.cxx b/MagneticField/MagFieldUtils/src/MagFieldCondReader.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..4fd1e2fe1cd1a8787354ccf72960b63dcd1c7b41
--- /dev/null
+++ b/MagneticField/MagFieldUtils/src/MagFieldCondReader.cxx
@@ -0,0 +1,43 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MagFieldCondReader.h"
+
+MagField::CondReader::CondReader(const std::string& name, ISvcLocator* pSvcLocator) :
+ AthReentrantAlgorithm(name, pSvcLocator)
+{}
+
+StatusCode MagField::CondReader::initialize()
+{
+ ATH_CHECK(m_fieldCacheKey.initialize());
+
+ return StatusCode::SUCCESS;
+}
+
+StatusCode MagField::CondReader::execute(const EventContext& ctx) const
+{
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> rh{m_fieldCacheKey, ctx};
+ const AtlasFieldCacheCondObj* fieldCondObj{*rh};
+ if (fieldCondObj == nullptr) {
+ ATH_MSG_ERROR("Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheKey.key());
+ return StatusCode::FAILURE;
+ }
+
+ MagField::AtlasFieldCache fieldCache;
+ fieldCondObj->getInitializedCache(fieldCache);
+
+ ATH_MSG_INFO("Field status: solenoid=" << fieldCache.solenoidOn() << ", toroids=" << fieldCache.toroidOn());
+
+ // get field at 0,0,0
+ double xyz[3] = { 100, 100, 100 };
+ double bxyz[3];
+ fieldCache. getField(xyz, bxyz);
+
+ ATH_MSG_INFO("Field xyz: " << xyz[0] << ", " << xyz[1] << ", " << xyz[2] << ", " << bxyz[0] << ", " << bxyz[1] << ", " << bxyz[2]);
+
+
+
+
+ return StatusCode::SUCCESS;
+}
diff --git a/MagneticField/MagFieldUtils/src/MagFieldCondReader.h b/MagneticField/MagFieldUtils/src/MagFieldCondReader.h
new file mode 100644
index 0000000000000000000000000000000000000000..96fbf4046fa379d3336cbaa046dc80b39330bdd6
--- /dev/null
+++ b/MagneticField/MagFieldUtils/src/MagFieldCondReader.h
@@ -0,0 +1,31 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef MAGFIELDUTILS_MAGFIELDCONDREADER_H
+#define MAGFIELDUTILS_MAGFIELDCONDREADER_H
+
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "StoreGate/ReadHandleKey.h"
+
+namespace MagField {
+
+ /**
+ * Testing algorithm to read magnetic field
+ */
+ class CondReader : public AthReentrantAlgorithm {
+
+ public:
+ CondReader(const std::string& name, ISvcLocator* pSvcLocator);
+ StatusCode initialize() override;
+ StatusCode execute(const EventContext& ctx) const override;
+
+ private:
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheKey{
+ this, "AtlasFieldCacheCondObj", "fieldCondObj", "Magnetic Field conditions object key"};
+ };
+
+} // namespace MagField
+
+#endif
diff --git a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
index f0d04aae274864ab3ac846457c3ba3e4ed4833d0..ae4d9b8978c60a48392a1b596d82b22b8b111c7e 100644
--- a/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
+++ b/MagneticField/MagFieldUtils/src/components/MagFieldUtils_entries.cxx
@@ -1,8 +1,9 @@
#include "MagFieldUtils/MagFieldTestbedAlg.h"
#include "MagFieldUtils/SolenoidTest.h"
#include "MagFieldUtils/IdentityManipulator.h"
+#include "../MagFieldCondReader.h"
DECLARE_COMPONENT( MagField::MagFieldTestbedAlg )
DECLARE_COMPONENT( MagField::SolenoidTest )
DECLARE_COMPONENT( MagField::IdentityManipulator )
-
+DECLARE_COMPONENT( MagField::CondReader )
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/CMakeLists.txt b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/CMakeLists.txt
index 4f5d282f73ddf65c84d82873c3795f0c383ca789..e1682a970778ef2ba0174e3209142454c6010686 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/CMakeLists.txt
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/CMakeLists.txt
@@ -5,25 +5,6 @@
# Declare the package name:
atlas_subdir( MSVertexTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthContainers
- Control/StoreGate
- DetectorDescription/GeoPrimitives
- DetectorDescription/Identifier
- Event/EventPrimitives
- Event/xAOD/xAODTracking
- GaudiKernel
- MuonSpectrometer/MSVertexReconstruction/MSVertexToolInterfaces
- MuonSpectrometer/MSVertexReconstruction/MSVertexUtils
- MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
- MuonSpectrometer/MuonIdHelpers
- MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkExtrapolation/TrkExInterfaces )
-
# External dependencies:
find_package( CLHEP )
find_package( Eigen )
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.cxx
index ba353c4482b99d2b88215fe57a0545d8a08a2a69..fcedd0f04ee2ec6e58b2ed89ad2ceaf11007fb92 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.cxx
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.cxx
@@ -26,22 +26,12 @@ namespace Muon {
constexpr float sq(float x) { return (x)*(x); }
- MSVertexRecoTool::MSVertexRecoTool (const std::string& type, const std::string& name,
- const IInterface* parent)
- :
+ MSVertexRecoTool::MSVertexRecoTool(const std::string& type, const std::string& name, const IInterface* parent) :
AthAlgTool(type, name, parent),
- m_extrapolator("Trk::Extrapolator/AtlasExtrapolator"),
- m_rndmEngine(0),
- m_rndmSvc(0),
- m_xAODContainerKey("MSDisplacedVertex"),
- m_rpcTESKey("RPC_Measurements"),
- m_tgcTESKey("TGC_Measurements"),
- m_mdtTESKey("MDT_DriftCircles")
+ m_rndmEngine(nullptr),
+ m_rndmSvc(nullptr)
{
declareInterface<IMSVertexRecoTool>(this);
-
- declareProperty("xAODVertexContainer",m_xAODContainerKey);//name of SG container
-
// nominal phi angle for tracklets
declareProperty("TrackPhiAngle",m_TrackPhiAngle = 0.0);
// chi^2 probability cut
@@ -68,17 +58,6 @@ namespace Muon {
// cuts to prevent excessive processing timing
declareProperty("MaxGlobalTracklets", m_maxGlobalTracklets = 40);
declareProperty("MaxClusterTracklets", m_maxClusterTracklets = 50);
-
- //extrapolator
- declareProperty("MyExtrapolator", m_extrapolator );
-
- declareProperty("TESKey", m_rpcTESKey);
- declareProperty("TGCKey", m_tgcTESKey);
- declareProperty("MDTKey", m_mdtTESKey);
-//decorations
- declareProperty("Decor_MDTK", m_decor_nMDT = "nMDT");
- declareProperty("Decor_nRPC", m_decor_nRPC = "nRPC");
- declareProperty("Decor_nTGC", m_decor_nTGC = "nTGC");
}
@@ -112,17 +91,9 @@ namespace Muon {
ATH_CHECK( m_decor_nTGC.initialize() );
return StatusCode::SUCCESS;
}
-
//** ----------------------------------------------------------------------------------------------------------------- **//
-
- MSVertexRecoTool::~MSVertexRecoTool() {}
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
StatusCode MSVertexRecoTool::findMSvertices(std::vector<Tracklet>& tracklets, std::vector<MSVertex*>& vertices, const EventContext &ctx) const {
SG::WriteHandle<xAOD::VertexContainer> xAODVxContainer(m_xAODContainerKey, ctx);
@@ -143,9 +114,7 @@ namespace Muon {
MSVertex* dummyVtx;
MakeDummyVertex(dummyVtx);
vertices.push_back(dummyVtx);
- StatusCode sc = FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC);
- if(sc.isFailure()) return StatusCode::FAILURE;
- else return StatusCode::SUCCESS;
+ ATH_CHECK(FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC));
}
//group the tracks
@@ -163,9 +132,7 @@ namespace Muon {
MSVertex* dummyVtx;
MakeDummyVertex(dummyVtx);
vertices.push_back(dummyVtx);
- StatusCode sc = FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC);
- if(sc.isFailure()) return StatusCode::FAILURE;
- else return StatusCode::SUCCESS;
+ ATH_CHECK(FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC));
}
ATH_MSG_DEBUG( "Running on event with " << BarrelTracklets.size() << " barrel tracklets, "
@@ -178,15 +145,13 @@ namespace Muon {
for(unsigned int i = 0; i < BarrelClusters.size(); i++) {
if(BarrelClusters.at(i).ntrks != (int) BarrelClusters.at(i).tracks.size()) {
ATH_MSG_INFO( "ntrks not equal to track container size; this should never happen. Exiting quietly." );
- StatusCode sc = FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC);
- return sc;
+ return FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC);
}
}
for(unsigned int i = 0; i < EndcapClusters.size(); i++) {
if(EndcapClusters.at(i).ntrks != (int) EndcapClusters.at(i).tracks.size()) {
ATH_MSG_INFO( "ntrks not equal to track container size; this should never happen. Exiting quietly." );
- StatusCode sc = FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC);
- return sc;
+ return FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC);
}
}
@@ -263,20 +228,10 @@ namespace Muon {
}//end loop on endcap tracklet clusters
- StatusCode sc = FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC);
- if(sc.isFailure()) return StatusCode::FAILURE;
- else return StatusCode::SUCCESS;
+ ATH_CHECK(FillOutputContainer(vertices, xAODVxContainer, hMDT, hRPC, hTGC));
+ return StatusCode::SUCCESS;
}//end find vertices
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
- StatusCode MSVertexRecoTool::finalize() {
- return StatusCode::SUCCESS;
- }
-
-
//** ----------------------------------------------------------------------------------------------------------------- **//
@@ -528,14 +483,14 @@ namespace Muon {
float Yp = Rpos[k]*std::sin(avePhi);
//in case there is a nominal opening angle, calculate tracklet direction
//the tracklet must cross the candidate vertex plane at the correct phi
- float DelR = std::sqrt(sq(x0-Xp)+sq(y0-Yp))/std::cos(NominalAngle);
+ float DelR = std::hypot(x0-Xp,y0-Yp)/std::cos(NominalAngle);
float X1 = DelR*std::cos(NominalTrkAng+avePhi) + Xp;
float Y1 = DelR*std::sin(NominalTrkAng+avePhi) + Yp;
- float R1 = std::sqrt(sq(X1)+sq(Y1));
+ float R1 = std::hypot(X1,Y1);
float Norm = r0/R1;
X1 = X1*Norm;
Y1 = Y1*Norm;
- float Dirmag = std::sqrt(sq(X1-Xp)+sq(Y1-Yp));
+ float Dirmag = std::hypot(X1-Xp,Y1-Yp);
float Xdir = (X1-Xp)/Dirmag;
float Ydir = (Y1-Yp)/Dirmag;
float trkpx = Xdir*tracklets.at(i).momentum().perp();
@@ -559,14 +514,14 @@ namespace Muon {
//tracks for errors -- rotate the plane & recalculate the tracklet parameters
float xp = Rpos[k]*std::cos(avePhi);
float yp = Rpos[k]*std::sin(avePhi);
- float delR = std::sqrt(sq(x0-xp)+sq(y0-yp))/std::cos(MaxOpenAngle);
+ float delR = std::hypot(x0-xp,y0-yp)/std::cos(MaxOpenAngle);
float x1 = delR*std::cos(MaxTrkAng+avePhi) + xp;
float y1 = delR*std::sin(MaxTrkAng+avePhi) + yp;
- float r1 = std::sqrt(sq(x1)+sq(y1));
+ float r1 = std::hypot(x1,y1);
float norm = r0/r1;
x1 = x1*norm;
y1 = y1*norm;
- float dirmag = std::sqrt(sq(x1-xp)+sq(y1-yp));
+ float dirmag = std::hypot(x1-xp,y1-yp);
float xdir = (x1-xp)/dirmag;
float ydir = (y1-yp)/dirmag;
float errpx = xdir*tracklets.at(i).momentum().perp();
@@ -622,7 +577,7 @@ namespace Muon {
if(extrap) {
//if the track is neutral just store the uncertainty due to angular uncertainty of the orignal tracklet
if(isNeutralTrack[k].at(i)) {
- float pTot = std::sqrt(sq(TracksForVertexing[k].at(i)->momentum().perp())+sq(TracksForVertexing[k].at(i)->momentum().z()));
+ float pTot = std::hypot(TracksForVertexing[k].at(i)->momentum().perp(),TracksForVertexing[k].at(i)->momentum().z());
float dirErr = Amg::error(*TracksForVertexing[k].at(i)->covariance(),Trk::theta);
float extrapRdist = TracksForVertexing[k].at(i)->position().perp() - Rpos[k];
float sz = std::abs(20*dirErr*extrapRdist*sq(pTot)/sq(TracksForVertexing[k].at(i)->momentum().perp()));
@@ -651,7 +606,7 @@ namespace Muon {
if(extrap2) {
float sz = Amg::error(*extrap->covariance(),Trk::locY);
float zdiff = extrap->localPosition().y() - extrap2->localPosition().y();
- float ExtrapErr = std::sqrt(sq(sz)+sq(zdiff));
+ float ExtrapErr = std::hypot(sz,zdiff);
if(ExtrapErr > maxError) ExtrapSuc[k].push_back(false);
else {
//iff both extrapolations succeed && error is acceptable, store the information
@@ -681,8 +636,8 @@ namespace Muon {
float dzLoF(10);
float aveZpos(0),posWeight(0);
for(unsigned int i=0; i<ExtrapZ[k].size(); ++i) {
- float ExtrapErr = std::sqrt(sq(sigmaZ[k][i])+sq(dlength[k][i])+sq(dzLoF));
- if(isNeutralTrack[k][i]) ExtrapErr = std::sqrt(sq(sigmaZ[k][i]) + sq(dzLoF));
+ float ExtrapErr = std::hypot(sigmaZ[k][i],dlength[k][i],dzLoF);
+ if(isNeutralTrack[k][i]) ExtrapErr = std::hypot(sigmaZ[k][i],dzLoF);
aveZpos += ExtrapZ[k][i]/sq(ExtrapErr);
posWeight += 1./sq(ExtrapErr);
}
@@ -698,7 +653,10 @@ namespace Muon {
vxtracks.clear();
trkp[k].clear();
int tmpnTrks(0);
- float tmpzLoF(0),tmpzpossigma(0),tmpchi2(0),posWeight(0);
+ float tmpzLoF(0);
+ float tmpzpossigma(0);
+ float tmpchi2(0);
+ float posWeight(0);
float worstdelz(0);
unsigned int iworst(0xC0FFEE);
//loop on the tracklets, find the chi^2 contribution from each tracklet
@@ -706,7 +664,7 @@ namespace Muon {
if(blacklist[i]) continue;
trkp[k].push_back(pAtVx[k][i]);
float delz = zLoF - ExtrapZ[k][i];
- float ExtrapErr = std::sqrt(sq(sigmaZ[k][i])+sq(dlength[k][i])+sq(dzLoF));
+ float ExtrapErr = std::hypot(sigmaZ[k][i],dlength[k][i],dzLoF);
float trkchi2 = sq(delz)/sq(ExtrapErr);
if(trkchi2 > worstdelz) {
iworst = i;
@@ -730,8 +688,8 @@ namespace Muon {
//loop on the tracklets and find all that belong to the vertex
for(unsigned int i=0; i<ExtrapZ[k].size(); ++i) {
float delz = zLoF - ExtrapZ[k][i];
- float ExtrapErr = std::sqrt(sq(sigmaZ[k][i])+sq(dlength[k][i])+sq(dzLoF));
- float trkErr = std::sqrt(sq(ExtrapErr)+sq(zpossigma)) + 0.001;
+ float ExtrapErr = std::hypot(sigmaZ[k][i],dlength[k][i],dzLoF);
+ float trkErr = std::hypot(ExtrapErr,zpossigma) + 0.001;
float trkNsigma = std::abs(delz/trkErr);
if(trkNsigma < 3) vxtracks.push_back(i);
}
@@ -892,7 +850,8 @@ namespace Muon {
std::vector<Tracklet> tracklets = getTracklets(trks, *prelim_vx_max);
// use tracklets to estimate the line of flight of decaying particle
- float aveX(0),aveY(0);
+ float aveX(0);
+ float aveY(0);
for(std::vector<Tracklet>::iterator trkItr=tracklets.begin(); trkItr!=tracklets.end(); ++trkItr) {
aveX += ((Tracklet)*trkItr).globalPosition().x();
aveY += ((Tracklet)*trkItr).globalPosition().y();
@@ -901,14 +860,12 @@ namespace Muon {
Amg::Vector3D MyVx = VxMinQuad(tracklets);
float vxtheta = std::atan2(MyVx.x(),MyVx.z());
float vxphi = vxPhiFinder(std::abs(vxtheta),tracklet_vxphi, ctx);
-
Amg::Vector3D vxpos(MyVx.x()*std::cos(vxphi),MyVx.x()*std::sin(vxphi),MyVx.z());
std::vector<xAOD::TrackParticle*> vxTrkTracks;
for(std::vector<Tracklet>::iterator tracklet = tracklets.begin(); tracklet != tracklets.end(); tracklet++) {
AmgSymMatrix(5)* covariance = new AmgSymMatrix(5)(((Tracklet)*tracklet).errorMatrix());
Trk::Perigee* myPerigee = new Trk::Perigee(vxpos,((Tracklet)*tracklet).momentum(),0,vxpos,covariance);
-
xAOD::TrackParticle* myTrack = new xAOD::TrackParticle();
myTrack->makePrivateStore();
@@ -1137,10 +1094,23 @@ namespace Muon {
//vertex phi location -- determined from the RPC/TGC hits
- float MSVertexRecoTool::vxPhiFinder(float theta,float phi, const EventContext &ctx) const {
+ float MSVertexRecoTool::vxPhiFinder(const float theta, const float phi, const EventContext &ctx) const {
float nmeas(0);
- float sinphi(0),cosphi(0);
- float eta = -1*std::log(std::tan(0.5*theta));
+ float sinphi(0);
+ float cosphi(0);
+ if (theta==0) {
+ ATH_MSG_WARNING("vxPhiFinder() called with theta="<<theta<<" and phi="<<phi<<", return 0");
+ return 0;
+ } else if (theta>M_PI) {
+ ATH_MSG_WARNING("vxPhiFinder() called with theta="<<std::setprecision(15)<<theta<<" and phi="<<phi<<", (theta>M_PI), return 0");
+ return 0;
+ }
+ float tanThetaHalf = std::tan(0.5*theta);
+ if (tanThetaHalf<=0) {
+ ATH_MSG_WARNING("vxPhiFinder() called with theta="<<std::setprecision(15)<<theta<<" and phi="<<phi<<", resulting in tan(0.5*theta)<=0, return 0");
+ return 0;
+ }
+ float eta = -std::log(tanThetaHalf);
if(std::abs(eta) < 1.5) {
SG::ReadHandle<Muon::RpcPrepDataContainer> rpcTES(m_rpcTESKey, ctx);
if(!rpcTES.isValid()) {
@@ -1160,7 +1130,7 @@ namespace Muon {
if(dphi > M_PI) dphi -= 2*M_PI;
else if(dphi < -M_PI) dphi += 2*M_PI;
float deta = eta - rpcEta;
- float DR = std::sqrt(sq(deta)+sq(dphi));
+ float DR = std::hypot(deta,dphi);
if(DR < 0.6) {
nmeas++;
sinphi += std::sin(rpcPhi);
@@ -1189,7 +1159,7 @@ namespace Muon {
if(dphi > M_PI) dphi -= 2*M_PI;
else if(dphi < -M_PI) dphi += 2*M_PI;
float deta = eta - tgcEta;
- float DR = std::sqrt(sq(deta)+sq(dphi));
+ float DR = std::hypot(deta,dphi);
if(DR < 0.6) {
nmeas++;
sinphi += std::sin(tgcPhi);
@@ -1211,20 +1181,27 @@ namespace Muon {
//count the hits (MDT, RPC & TGC) around the vertex
void MSVertexRecoTool::HitCounter(MSVertex* MSRecoVx, const EventContext &ctx) const {
int nHighOccupancy(0);
+ // Amg::Vector3D.eta() will crash via floating point exception if both x() and y() are zero (eta=inf)
+ // thus, check it manually here:
+ const Amg::Vector3D msVtxPos = MSRecoVx->getPosition();
+ if (msVtxPos.x()==0 && msVtxPos.y()==0 && msVtxPos.z()!=0) {
+ ATH_MSG_WARNING("given MSVertex has position x=y=0 and z!=0, eta() method will cause FPE, returning...");
+ return;
+ }
SG::ReadHandle<Muon::MdtPrepDataContainer> mdtTES(m_mdtTESKey, ctx);
if(!mdtTES.isValid()) ATH_MSG_ERROR( "Unable to retrieve the MDT hits" );
//MDTs -- count the number around the vertex
int nmdt(0);
Muon::MdtPrepDataContainer::const_iterator MDTItr = mdtTES->begin();
Muon::MdtPrepDataContainer::const_iterator MDTItrE = mdtTES->end();
- for(; MDTItr != MDTItrE; ++MDTItr) {
+ for(; MDTItr != MDTItrE; ++MDTItr) {
if( (*MDTItr)->size() == 0) continue;
Muon::MdtPrepDataCollection::const_iterator mdt = (*MDTItr)->begin();
Muon::MdtPrepDataCollection::const_iterator mdtE = (*MDTItr)->end();
Amg::Vector3D ChamberCenter = (*mdt)->detectorElement()->center();
- float deta = std::abs(MSRecoVx->getPosition().eta() - ChamberCenter.eta());
+ float deta = std::abs(msVtxPos.eta() - ChamberCenter.eta());
if(deta > 0.6) continue;
- float dphi = MSRecoVx->getPosition().phi() - ChamberCenter.phi();
+ float dphi = msVtxPos.phi() - ChamberCenter.phi();
if(dphi > M_PI) dphi -= 2*M_PI;
else if(dphi < -M_PI) dphi += 2*M_PI;
if( std::abs(dphi) > 0.6 ) continue;
@@ -1258,11 +1235,11 @@ namespace Muon {
for(; rpcItr != rpcItrE; ++rpcItr) {
float rpcEta = (*rpcItr)->globalPosition().eta();
float rpcPhi = (*rpcItr)->globalPosition().phi();
- float dphi = MSRecoVx->getPosition().phi() - rpcPhi;
+ float dphi = msVtxPos.phi() - rpcPhi;
if(dphi > M_PI) dphi -= 2*M_PI;
else if(dphi < -M_PI) dphi += 2*M_PI;
- float deta = MSRecoVx->getPosition().eta() - rpcEta;
- float DR = std::sqrt(sq(deta)+sq(dphi));
+ float deta = msVtxPos.eta() - rpcEta;
+ float DR = std::hypot(deta,dphi);
if(DR < 0.6) nrpc++;
if(DR > 1.2) break;
}
@@ -1279,11 +1256,11 @@ namespace Muon {
for(; tgcItr != tgcItrE; ++tgcItr) {
float tgcEta = (*tgcItr)->globalPosition().eta();
float tgcPhi = (*tgcItr)->globalPosition().phi();
- float dphi = MSRecoVx->getPosition().phi() - tgcPhi;
+ float dphi = msVtxPos.phi() - tgcPhi;
if(dphi > M_PI) dphi -= 2*M_PI;
else if(dphi < -M_PI) dphi += 2*M_PI;
- float deta = MSRecoVx->getPosition().eta() - tgcEta;
- float DR = std::sqrt(sq(deta)+sq(dphi));
+ float deta = msVtxPos.eta() - tgcEta;
+ float DR = std::hypot(deta,dphi);
if(DR < 0.6) ntgc++;
if(DR > 1.2) break;
}
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.h b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.h
index 20428164ca5e15787fea28bcf12f659becd183ea..55b6ec7d8a3bdcc190c5d4f265377583abee70c0 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.h
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexRecoTool.h
@@ -5,15 +5,18 @@
#ifndef MSVVERTEXRECOTOOL_H
#define MSVVERTEXRECOTOOL_H
+#include "MSVertexToolInterfaces/IMSVertexRecoTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
+
+#include "StoreGate/WriteHandleKey.h"
+#include "StoreGate/ReadHandleKey.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include "EventPrimitives/EventPrimitives.h"
#include "MuonReadoutGeometry/MdtReadoutElement.h"
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkParameters/TrackParameters.h"
-#include "MSVertexToolInterfaces/IMSVertexRecoTool.h"
#include "MSVertexUtils/Tracklet.h"
#include "MSVertexUtils/MSVertex.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
@@ -22,22 +25,22 @@
#include "MuonPrepRawData/MdtPrepDataContainer.h"
#include "MuonPrepRawData/RpcPrepDataContainer.h"
#include "MuonPrepRawData/TgcPrepDataContainer.h"
+#include "xAODTracking/VertexContainer.h"
+
#include <utility>
+#include <string>
#include <vector>
namespace Muon {
- class MSVertexRecoTool : virtual public IMSVertexRecoTool, public AthAlgTool
- {
- typedef xAOD::VertexContainer decortype;
+ class MSVertexRecoTool : virtual public IMSVertexRecoTool, public AthAlgTool {
+ typedef xAOD::VertexContainer decortype;
public :
- /** default constructor */
MSVertexRecoTool (const std::string& type, const std::string& name, const IInterface* parent);
- /** destructor */
- virtual ~MSVertexRecoTool();
+ virtual ~MSVertexRecoTool()=default;
virtual StatusCode initialize(void) override;
- virtual StatusCode finalize(void) override;
+ StatusCode findMSvertices(std::vector<Tracklet>& traklets, std::vector<MSVertex*>& vertices, const EventContext &ctx) const override;
struct TrkCluster {
float eta;
@@ -57,8 +60,7 @@ namespace Muon {
private:
- //add tool handles, private variables, etc here
- ToolHandle <Trk::IExtrapolator> m_extrapolator;
+ ToolHandle<Trk::IExtrapolator> m_extrapolator {this, "MyExtrapolator", "Trk::Extrapolator/AtlasExtrapolator"};
float m_BarrelTrackletUncert;
float m_EndcapTrackletUncert;
float m_TrackPhiAngle;
@@ -78,19 +80,13 @@ namespace Muon {
std::string m_rndmEngineName;
IAtRndmGenSvc* m_rndmSvc;
-
- public:
-
- StatusCode findMSvertices(std::vector<Tracklet>& traklets, std::vector<MSVertex*>& vertices, const EventContext &ctx) const override;
-
- private:
//barrel vertex reco algorithm
void MSVxFinder(const std::vector<Tracklet>& tracklets, std::unique_ptr<MSVertex>& vtx, const EventContext &ctx) const;
//endcap vertex reco algorithm
void MSStraightLineVx(const std::vector<Tracklet> &trks, std::unique_ptr<MSVertex>& vtx, const EventContext &ctx) const;
void MSStraightLineVx_oldMethod(const std::vector<Tracklet> &trks, std::unique_ptr<MSVertex>& vtx, const EventContext &ctx )const;
void MakeDummyVertex(MSVertex*&) const;
- float vxPhiFinder(float theta,float phi, const EventContext &ctx) const;//vertex phi location reco algorithm
+ float vxPhiFinder(const float theta, const float phi, const EventContext &ctx) const;//vertex phi location reco algorithm
void HitCounter(MSVertex* MSRecoVx, const EventContext &ctx) const;//counts MDT, RPC & TGC around a reco'd vertex
std::vector<TrkCluster> findTrackClusters(const std::vector<Tracklet>& tracklets) const;//group tracklets into clusters -- vertex reco runs on each cluster of tracklets
TrkCluster ClusterizeTracks(std::vector<Tracklet>& tracks) const;//core algorithm for creating the clusters
@@ -100,14 +96,15 @@ namespace Muon {
bool EndcapHasBadTrack(const std::vector<Tracklet> &tracklets, const Amg::Vector3D &Vx) const;
std::vector<Tracklet> getTracklets(const std::vector<Tracklet> &trks, const std::set<int> &tracklet_subset) const;
- SG::WriteHandleKey<xAOD::VertexContainer> m_xAODContainerKey;
- SG::ReadHandleKey<Muon::RpcPrepDataContainer> m_rpcTESKey;//"RPC_Measurements"
- SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_tgcTESKey;//"TGC_Measurements"
- SG::ReadHandleKey<Muon::MdtPrepDataContainer> m_mdtTESKey; //"MDT_DriftCircles"
+ SG::WriteHandleKey<xAOD::VertexContainer> m_xAODContainerKey{ this, "xAODVertexContainer", "MSDisplacedVertex"};
+
+ SG::ReadHandleKey<Muon::RpcPrepDataContainer> m_rpcTESKey{ this, "TESKey", "RPC_Measurements"};
+ SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_tgcTESKey{ this, "TGCKey", "TGC_Measurements"};
+ SG::ReadHandleKey<Muon::MdtPrepDataContainer> m_mdtTESKey{ this, "MDTKey", "MDT_DriftCircles"};
- SG::WriteDecorHandleKey<decortype> m_decor_nMDT;
- SG::WriteDecorHandleKey<decortype> m_decor_nRPC;
- SG::WriteDecorHandleKey<decortype> m_decor_nTGC;
+ SG::WriteDecorHandleKey<decortype> m_decor_nMDT{ this, "Decor_MDTK", "nMDT"};
+ SG::WriteDecorHandleKey<decortype> m_decor_nRPC{ this, "Decor_nRPC", "nRPC"};
+ SG::WriteDecorHandleKey<decortype> m_decor_nTGC{ this, "Decor_nTGC", "nTGC"};
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
};
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexTrackletTool.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexTrackletTool.cxx
index 4077c399dd0b8529d0a4032cc4311e4553046e22..c6f07f17d08529406ef7706e8281677c77324a9e 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexTrackletTool.cxx
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexTrackletTool.cxx
@@ -45,16 +45,10 @@ namespace Muon {
//** ----------------------------------------------------------------------------------------------------------------- **//
- MSVertexTrackletTool::MSVertexTrackletTool (const std::string& type, const std::string& name,
- const IInterface* parent)
- :
- AthAlgTool(type, name, parent),
- m_mdtTESKey("MDT_DriftCircles"),
- m_TPContainer("MSonlyTracklets")
- {
+ MSVertexTrackletTool::MSVertexTrackletTool (const std::string& type, const std::string& name, const IInterface* parent) :
+ AthAlgTool(type, name, parent) {
declareInterface<IMSVertexTrackletTool>(this);
- declareProperty("xAODTrackParticleContainer", m_TPContainer );
// max residual for tracklet seeds
declareProperty("SeedResidual",m_SeedResidual = 5);
// segment fitter chi^2 cut
@@ -67,14 +61,12 @@ namespace Muon {
declareProperty("EndcapDeltaAlpha",m_EndcapDeltaAlphaCut = 0.015);
// tight tracklet requirement (affects efficiency - disabled by default)
declareProperty("TightTrackletRequirement",m_tightTrackletRequirement = false);
- declareProperty("mdtTES", m_mdtTESKey);
}
//** ----------------------------------------------------------------------------------------------------------------- **//
-
StatusCode MSVertexTrackletTool::initialize() {
ATH_CHECK(m_mdtTESKey.initialize());
@@ -84,23 +76,6 @@ namespace Muon {
return StatusCode::SUCCESS;
}
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
- MSVertexTrackletTool::~MSVertexTrackletTool() {
-
- }
-
-
-//** ----------------------------------------------------------------------------------------------------------------- **//
-
-
- StatusCode MSVertexTrackletTool::finalize() {
- return StatusCode::SUCCESS;
- }
-
-
//** ----------------------------------------------------------------------------------------------------------------- **//
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexTrackletTool.h b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexTrackletTool.h
index d47d0d1090a094689d4f4f968f06c71f626bcfc7..c7794224625771741fb5eb61cd0e1da07d6c6c4c 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexTrackletTool.h
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/MSVertexTrackletTool.h
@@ -5,42 +5,35 @@
#ifndef MSVERTEXTRACKLETTOOL_H
#define MSVERTEXTRACKLETTOOL_H
+#include "MSVertexToolInterfaces/IMSVertexTrackletTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "MSVertexToolInterfaces/IMSVertexTrackletTool.h"
+
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include "MSVertexUtils/TrackletSegment.h"
#include "MSVertexUtils/Tracklet.h"
-#include <utility>
-#include <vector>
#include "xAODTracking/TrackParticleContainer.h"
#include "MuonPrepRawData/MdtPrepDataContainer.h"
+#include "StoreGate/WriteHandleKey.h"
+#include "StoreGate/ReadHandleKey.h"
+#include <utility>
+#include <vector>
namespace Muon {
- class MSVertexTrackletTool : virtual public IMSVertexTrackletTool, public AthAlgTool
- {
-
+ class MSVertexTrackletTool : virtual public IMSVertexTrackletTool, public AthAlgTool {
public :
- /** default constructor */
MSVertexTrackletTool (const std::string& type, const std::string& name, const IInterface* parent);
- /** destructor */
- virtual ~MSVertexTrackletTool();
+ virtual ~MSVertexTrackletTool()=default;
- static const InterfaceID& interfaceID();
-
- virtual StatusCode initialize(void) override;
- virtual StatusCode finalize(void) override;
+ virtual StatusCode initialize() override;
StatusCode findTracklets(std::vector<Tracklet>& traklets, const EventContext &ctx) const override;
private:
- //tool handles & private data members
-
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
float m_SeedResidual;
@@ -66,8 +59,9 @@ namespace Muon {
void convertToTrackParticles(std::vector<Tracklet>& tracklets, SG::WriteHandle<xAOD::TrackParticleContainer> &container) const;
void addMDTHits( std::vector<const Muon::MdtPrepData*>& hits, std::vector<std::vector<const Muon::MdtPrepData*> >& SortedMdt ) const;
- SG::ReadHandleKey<Muon::MdtPrepDataContainer> m_mdtTESKey;//"MDT_DriftCircles"
- SG::WriteHandleKey<xAOD::TrackParticleContainer> m_TPContainer;
+
+ SG::ReadHandleKey<Muon::MdtPrepDataContainer> m_mdtTESKey { this, "mdtTES", "MDT_DriftCircles"};
+ SG::WriteHandleKey<xAOD::TrackParticleContainer> m_TPContainer { this, "xAODTrackParticleContainer", "MSonlyTracklets"};
};
diff --git a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_entries.cxx b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_entries.cxx
index 576b66ace4618687c7b91d0c6df6f3f43f22a096..590c16d4e37dc42fa5a118ad11a8cb646ef55df1 100644
--- a/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_entries.cxx
+++ b/MuonSpectrometer/MSVertexReconstruction/MSVertexTools/src/components/MSVertexTools_entries.cxx
@@ -1,8 +1,6 @@
#include "../MSVertexTrackletTool.h"
#include "../MSVertexRecoTool.h"
-using namespace Muon;
-
-DECLARE_COMPONENT( MSVertexTrackletTool )
-DECLARE_COMPONENT( MSVertexRecoTool )
+DECLARE_COMPONENT( Muon::MSVertexTrackletTool )
+DECLARE_COMPONENT( Muon::MSVertexRecoTool )
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.cxx b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.cxx
index 95de963a1a9e261809754ae4f94e5409a7a7d31a..a898d8246cdc1b3633ba4ae7773e0a9a36625e95 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.cxx
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.cxx
@@ -63,15 +63,6 @@ Double_t dualbipfunc(const Double_t *x, const Double_t *par){
return ( bipfunc(x,par) + bipfunc(x,&par[5]) );
}
-StatusCode CscCalibTool::finalize() {
- delete m_addedfunc;
- delete m_bipolarFunc;
- m_addedfunc = nullptr;
- m_bipolarFunc = nullptr;
- return StatusCode::SUCCESS;
-}
-
-
StatusCode CscCalibTool::initialize() {
ATH_MSG_DEBUG ( "Initializing Initializing CscCalibTool");
@@ -100,8 +91,12 @@ StatusCode CscCalibTool::initialize() {
m_messageCnt_t0phase=0;
std::lock_guard<std::mutex> lock(m_mutex);
- m_addedfunc =new TF1("addedfunc", dualbipfunc, 0,500,10);
- m_bipolarFunc =new TF1("bipolarFunc", bipfunc, -500,500,5);
+ if (m_addedfunc == nullptr) {
+ m_addedfunc = std::make_unique<TF1>("addedfunc", dualbipfunc, 0, 500, 10, 1, TF1::EAddToList::kNo);
+ }
+ if (m_bipolarFunc == nullptr) {
+ m_bipolarFunc = std::make_unique<TF1>("bipolarFunc", bipfunc, -500, 500, 5, 1, TF1::EAddToList::kNo);
+ }
return StatusCode::SUCCESS;
}
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.h b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.h
index 8ecba81dad90471656e11e189b3d370f2f02100c..1f92d66e443a845880e7d8f8470cae262fba067f 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.h
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.h
@@ -27,6 +27,7 @@
#include <atomic>
#include <inttypes.h>
+#include <memory>
#include <mutex>
#include <vector>
@@ -39,7 +40,6 @@ public:
virtual ~CscCalibTool () = default;
virtual StatusCode initialize() override final;
- virtual StatusCode finalize() override final;
/** given a charge on the CSC strip, convert that to ADC counts
this is needed in the digitization for example where it is the charges
@@ -168,8 +168,8 @@ protected:
float m_latencyInDigitization; // new in 12/2010 for New Digitization package...
unsigned int m_nSamples;
- mutable TF1* m_addedfunc ATLAS_THREAD_SAFE; // Guarded by m_mutex
- mutable TF1* m_bipolarFunc ATLAS_THREAD_SAFE; // Guarded by m_mutex
+ mutable std::unique_ptr<TF1> m_addedfunc ATLAS_THREAD_SAFE = nullptr; // Guarded by m_mutex
+ mutable std::unique_ptr<TF1> m_bipolarFunc ATLAS_THREAD_SAFE = nullptr; // Guarded by m_mutex
mutable std::mutex m_mutex;
bool m_onlineHLT;
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/make_dd.icc b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/make_dd.icc
index 644ac83701a0d46acb55bf6f8a53c2887345edef..03a94f198646a0615402f1226fd36e80b63720f8 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/make_dd.icc
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/test/make_dd.icc
@@ -320,7 +320,7 @@ const MuonGM::MuonDetectorManager& make_dd()
ddsdet.roParameters.nWireGroups.push_back(0);
ddsdet.roParameters.wireCutout.push_back(0);
- HepGeom::Transform3D xform;
+ GeoTrf::Transform3D xform = GeoTrf::Transform3D::Identity();
AGDDDetectorPositioner* spos2 = new AGDDDetectorPositioner ("psdum2", xform);
deleter.add (spos2);
spos2->theDetector = &ddsdet;
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.cxx
index c66cbd719ebbc8051c63e1035a35d0084fdb7e36..202ef879ef87b62485829d4e8c2491c18bb92ed3 100644
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.cxx
@@ -73,17 +73,17 @@ StatusCode Muon::RPC_RawDataProviderTool::initialize()
return StatusCode::FAILURE;
}
- const std::vector<const Property*>* dataFlowProps
+ const std::vector<const Gaudi::Details::PropertyBase*>* dataFlowProps
= (jobOptionsSvc)? jobOptionsSvc->getProperties("DataFlowConfig") : 0;
- const std::vector<const Property*>* eventSelProps
+ const std::vector<const Gaudi::Details::PropertyBase*>* eventSelProps
= (jobOptionsSvc)? jobOptionsSvc->getProperties("EventSelector") :
TrigConfSvc->getProperties("EventSelector");
if ( dataFlowProps != 0 ) has_bytestream = true;
else if( eventSelProps != 0 )
{
- for (std::vector<const Property*>::const_iterator
+ for (std::vector<const Gaudi::Details::PropertyBase*>::const_iterator
cur = eventSelProps->begin();
cur != eventSelProps->end(); cur++) {
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MuonAlignmentErrorDbAlg.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MuonAlignmentErrorDbAlg.h
index 517ece6d13ec8555ae678bf2e6a1efd05d3a4dff..e307dac06c633d1610dffda6575d53a10789c97a 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MuonAlignmentErrorDbAlg.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MuonAlignmentErrorDbAlg.h
@@ -13,7 +13,7 @@
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-//#include "GaudiKernel/Property.h"
+//#include "Gaudi/Property.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "MuonCondAlg/MuonAlignmentErrorData.h"
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
index 59b7bc7734cc0d9b9643f6c4b96f32b4523f1c50..778cf1496d3262096b08684d07262941967ee6c4 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/CSC_DCSConditionsSvc.cxx
@@ -14,7 +14,7 @@
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsRun2Svc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsRun2Svc.cxx
index 6615d72bf3a94660b988313a3205a9094d7a9a65..5ed93d6e85ddf2df62dfef29452974133b3573c1 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsRun2Svc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsRun2Svc.cxx
@@ -10,7 +10,7 @@
#include <string>
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
index 9499b46d43a30517a07414ad5d3cb7e10398de18..4efe9611c9f88b1cacb8fb092bbafeb3e33e8eba 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DCSConditionsSvc.cxx
@@ -10,7 +10,7 @@
#include <string>
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
index f96abeed3be238ff5305ce03e836b1f477fbed43..cf499a63d76b960d0a2f99736b2a4966c26d0651 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DQConditionsSvc.cxx
@@ -9,7 +9,7 @@
//#include "PathResolver/PathResolver.h"
#include "StoreGate/StoreGateSvc.h"
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
index b47e935f2f60413936db17769fa11f1a274a6848..806b041f0e4358d1b68f592af3eb2a980b457f89 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/MDT_DeadTubeConditionsSvc.cxx
@@ -9,7 +9,7 @@
//#include "PathResolver/PathResolver.h"
#include "StoreGate/StoreGateSvc.h"
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
index 5afa47ae75d191395c96e14368fb72502b1f3d00..99596e06211e4790ff571a40c3795548b10a2dc4 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_DCSConditionsSvc.cxx
@@ -10,7 +10,7 @@
#include <string>
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
index 62477569e016f917d5cba6457c130bf59037d22c..2e921525e928fa8444d97896fa4d0f56a66b8ce8 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/RPC_STATUSConditionsSvc.cxx
@@ -14,7 +14,7 @@
#include <algorithm>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
#include <iostream>
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
index 3d5544479667469e7c04622a6ec07ad1619886f0..1103167b2d34a4a9247375f75ec35bfa59697025 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondSvc/src/TGC_STATUSConditionsSvc.cxx
@@ -16,7 +16,7 @@
#include <iostream>
#include "Identifier/Identifier.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "Identifier/IdentifierHash.h"
TGC_STATUSConditionsSvc::TGC_STATUSConditionsSvc(const std::string& name, ISvcLocator* pSvcLocator) :
diff --git a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
index d385cdba567f491567b342b60d28adb54054dca4..4826a2b8d2ec512857766a82a4a5b650d116d545 100644
--- a/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MDT_DigitizationConfig.py
@@ -8,6 +8,7 @@ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
from MuonConfig.MuonByteStreamCnvTestConfig import MdtDigitToMdtRDOCfg
from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
+from MuonConfig.MuonCalibConfig import MdtCalibrationDbToolCfg
from Digitization.TruthDigitizationOutputConfig import TruthDigitizationOutputCfg
from Digitization.PileUpToolsConfig import PileUpToolsCfg
@@ -35,28 +36,40 @@ def MDT_RangeToolCfg(flags, name="MDT_Range", **kwargs):
def RT_Relation_DB_DigiToolCfg(flags, name="RT_Relation_DB_DigiTool", **kwargs):
"""Return an RT_Relation_DB_DigiTool"""
+ acc = ComponentAccumulator()
RT_Relation_DB_DigiTool = CompFactory.RT_Relation_DB_DigiTool
- return RT_Relation_DB_DigiTool(name, **kwargs)
+ calibDbTool = acc.popToolsAndMerge(MdtCalibrationDbToolCfg(flags))
+ kwargs.setdefault("CalibrationDbTool", calibDbTool)
+ acc.setPrivateTools(RT_Relation_DB_DigiTool(name, **kwargs))
+ return acc
def MDT_Response_DigiToolCfg(flags, name="MDT_Response_DigiTool",**kwargs):
"""Return a configured MDT_Response_DigiTool"""
+ acc = ComponentAccumulator()
QballConfig = (flags.Digitization.SpecialConfiguration.get("MDT_QballConfig") == "True")
kwargs.setdefault("DoQballGamma", QballConfig)
MDT_Response_DigiTool = CompFactory.MDT_Response_DigiTool
- return MDT_Response_DigiTool(name, **kwargs)
+ acc.setPrivateTools(MDT_Response_DigiTool(name, **kwargs))
+ return acc
def MDT_DigitizationToolCommonCfg(flags, name="MdtDigitizationTool", **kwargs):
"""Return ComponentAccumulator with common MdtDigitizationTool config"""
from MuonConfig.MuonCondAlgConfig import MdtCondDbAlgCfg # MT-safe conditions access
acc = MdtCondDbAlgCfg(flags)
+ if "GetT0FromBD" in kwargs and kwargs["GetT0FromBD"]:
+ calibDbTool = acc.popToolsAndMerge(MdtCalibrationDbToolCfg(flags))
+ kwargs.setdefault("CalibrationDbTool", calibDbTool)
+ else:
+ kwargs.setdefault("CalibrationDbTool", '')
kwargs.setdefault("MaskedStations", [])
kwargs.setdefault("UseDeadChamberSvc", True)
kwargs.setdefault("DiscardEarlyHits", True)
kwargs.setdefault("UseTof", flags.Beam.Type != "cosmics")
# "RT_Relation_DB_DigiTool" in jobproperties.Digitization.experimentalDigi() not migrated
- kwargs.setdefault("DigitizationTool", MDT_Response_DigiToolCfg(flags))
+ digiTool = acc.popToolsAndMerge(MDT_Response_DigiToolCfg(flags))
+ kwargs.setdefault("DigitizationTool", digiTool)
QballConfig = (flags.Digitization.SpecialConfiguration.get("MDT_QballConfig") == "True")
kwargs.setdefault("DoQballCharge", QballConfig)
if flags.Digitization.DoXingByXingPileUp:
diff --git a/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py b/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
index f9f8f3d3a43ef4dc001a3560f4198ee6aca603a8..fdf5f1f4f73818f6810aaf5159a2f484324baa87 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonByteStreamCnvTestConfig.py
@@ -4,15 +4,23 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-
+from MuonConfig.MuonGeometryConfig import MuonIdHelperSvcCfg
+from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
+
+def MdtRDO_DecoderCfg(flags, name="Muon::MdtRDO_Decoder"):
+ acc = MuonIdHelperSvcCfg(flags)
+ acc.merge(MDTCablingConfigCfg(flags)) # To provide the Cabling map
+ Muon_MdtRDO_Decoder = CompFactory.Muon.MdtRDO_Decoder
+ mdtRDO_Decoder = Muon_MdtRDO_Decoder(name)
+ mdtRDO_Decoder.MuonIdHelperSvc = acc.getService("MuonIdHelperSvc")
+ acc.setPrivateTools(mdtRDO_Decoder)
+ return acc
def MdtRdoToMdtDigitCfg(flags, name="MdtRdoToMdtDigitAlg", **kwargs):
"""Return ComponentAccumulator with configured MdtRdoToMdtDigit algorithm"""
- acc = ComponentAccumulator()
- from MuonConfig.MuonCablingConfig import MDTCablingConfigCfg
- from MuonConfig.MuonCalibConfig import MdtCalibDbAlgCfg
- acc.merge(MDTCablingConfigCfg(flags))
- acc.merge(MdtCalibDbAlgCfg(flags))
+ acc = MuonIdHelperSvcCfg(flags)
+ decoderTool = acc.popToolsAndMerge(MdtRDO_DecoderCfg(flags))
+ kwargs.setdefault("mdtRdoDecoderTool", decoderTool)
if flags.Detector.OverlayMDT:
kwargs.setdefault("MdtRdoContainer", flags.Overlay.BkgPrefix + "MDTCSM")
kwargs.setdefault("MdtDigitContainer", flags.Overlay.BkgPrefix + "MDT_DIGITS")
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py
index b1c40b9bcc0eef13f87986b8bd862586dae1a9ed..e54e9fe9ecda4ae9785e5641e283c446fd12ce5b 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCalibConfig.py
@@ -3,6 +3,7 @@
# Based on : https://gitlab.cern.ch/atlas/athena/blob/master/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibConfig.py
from MuonConfig.MuonCondAlgConfig import CscCondDbAlgCfg
+from MuonConfig.MuonGeometryConfig import MuonDetectorCondAlgCfg
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline
@@ -99,7 +100,7 @@ def MdtCalibrationDbToolCfg(flags, **kwargs):
return result
def MdtCalibDbAlgCfg(flags,name="MdtCalibDbAlg",**kwargs):
- result = ComponentAccumulator()
+ result = MuonDetectorCondAlgCfg(flags)
# setup COOL folders
acc, mdt_folder_name_appendix = _setupMdtCondDB(flags)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py b/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
index f880265dae93f0ca62f17094b2433609fe313db8..5257d12b90386f2ae1b307db2398e3a28e502adb 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
@@ -8,14 +8,19 @@ Muon__MuonIdHelperSvc=CompFactory.Muon.MuonIdHelperSvc
AGDDtoGeoSvc=CompFactory.AGDDtoGeoSvc
MuonAGDDTool, NSWAGDDTool=CompFactory.getComps("MuonAGDDTool","NSWAGDDTool",)
-def MuonGeoModelCfg(flags):
+
+def MuonIdHelperSvcCfg(flags):
acc = ComponentAccumulator()
+ acc.addService( Muon__MuonIdHelperSvc("MuonIdHelperSvc",
+ HasCSC=flags.Detector.GeometryCSC,
+ HasSTgc=flags.Detector.GeometrysTGC,
+ HasMM=flags.Detector.GeometryMM
+ ) )
+ return acc
- # get the GeoModelSvc and add MuonDetectorTool
- gmsAcc=GeoModelCfg(flags )
- gms=gmsAcc.getPrimary()
- acc.merge(gmsAcc)
+def MuonDetectorToolCfg(flags):
+ acc = ComponentAccumulator()
detTool = MuonDetectorTool(
HasCSC=flags.Detector.GeometryCSC,
HasSTgc=flags.Detector.GeometrysTGC,
@@ -23,36 +28,8 @@ def MuonGeoModelCfg(flags):
)
detTool.UseConditionDb = 1
detTool.UseIlinesFromGM = 1
-
- enableAlignment = flags.Common.Project != 'AthSimulation' and not flags.Detector.SimulateMuon and not flags.Detector.OverlayMuon
+ enableAlignment = flags.Common.Project != 'AthSimulation' and not flags.Detector.SimulateMuon and not (flags.Detector.OverlayMuon and flags.Input.isMC)
if enableAlignment:
- # This is all migrated from MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonAlignConfig.py
-
- from IOVDbSvc.IOVDbSvcConfig import addFolders
- MuonAlignmentCondAlg=CompFactory.MuonAlignmentCondAlg
- if (flags.Common.isOnline and not flags.Input.isMC):
- acc.merge(addFolders( flags, ['/MUONALIGN/Onl/MDT/BARREL'], 'MUONALIGN', className='CondAttrListCollection'))
- acc.merge(addFolders( flags, ['/MUONALIGN/Onl/MDT/ENDCAP/SIDEA'], 'MUONALIGN', className='CondAttrListCollection'))
- acc.merge(addFolders( flags, ['/MUONALIGN/Onl/MDT/ENDCAP/SIDEC'], 'MUONALIGN', className='CondAttrListCollection'))
- acc.merge(addFolders( flags, ['/MUONALIGN/Onl/TGC/SIDEA'], 'MUONALIGN', className='CondAttrListCollection'))
- acc.merge(addFolders( flags, ['/MUONALIGN/Onl/TGC/SIDEC'], 'MUONALIGN', className='CondAttrListCollection'))
- else:
- acc.merge(addFolders( flags, ['/MUONALIGN/MDT/BARREL'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
- acc.merge(addFolders( flags, ['/MUONALIGN/MDT/ENDCAP/SIDEA'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
- acc.merge(addFolders( flags, ['/MUONALIGN/MDT/ENDCAP/SIDEC'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
- acc.merge(addFolders( flags, ['/MUONALIGN/TGC/SIDEA'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
- acc.merge(addFolders( flags, ['/MUONALIGN/TGC/SIDEC'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
-
- MuonAlign = MuonAlignmentCondAlg()
- if flags.Muon.MuonTrigger: MuonAlign.DoRecRoiSvcUpdate = True # this should be removed as soon as RPC/TGCRecRoiSvc are migrated to use the MuonDetectorCondAlg
- MuonAlign.ParlineFolders = ["/MUONALIGN/MDT/BARREL",
- "/MUONALIGN/MDT/ENDCAP/SIDEA",
- "/MUONALIGN/MDT/ENDCAP/SIDEC",
- "/MUONALIGN/TGC/SIDEA",
- "/MUONALIGN/TGC/SIDEC"]
-
- acc.addCondAlgo(MuonAlign)
-
# Condition DB is needed only if A-lines or B-lines are requested
if not (not flags.Muon.Align.UseALines and flags.Muon.Align.UseBLines=='none'):
detTool.UseConditionDb = 1
@@ -66,24 +43,17 @@ def MuonGeoModelCfg(flags):
elif flags.Muon.Align.UseBLines=='endcaps':
detTool.EnableMdtDeformations = 3
-
# here define if I-lines (CSC internal alignment) are enabled
- if flags.Muon.Align.UseILines:
+ if flags.Muon.Align.UseILines:
if 'HLT' in flags.IOVDb.GlobalTag:
#logMuon.info("Reading CSC I-Lines from layout - special configuration for COMP200 in HLT setup.")
- MuonAlign.ILinesFromCondDB = False
detTool.UseIlinesFromGM = True
detTool.EnableCscInternalAlignment = False
else :
#logMuon.info("Reading CSC I-Lines from conditions database.")
- if (flags.Common.isOnline and not flags.Input.isMC):
- acc.merge(addFolders( flags, ['/MUONALIGN/Onl/CSC/ILINES'], 'MUONALIGN', className='CondAttrListCollection'))
+ if (flags.Common.isOnline and not flags.Input.isMC):
detTool.EnableCscInternalAlignment = True
else:
- acc.merge(addFolders( flags, ['/MUONALIGN/CSC/ILINES'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
-
- MuonAlign.ParlineFolders += ["/MUONALIGN/CSC/ILINES"]
- MuonAlign.ILinesFromCondDB = True
detTool.UseIlinesFromGM = False
detTool.EnableCscInternalAlignment = True
@@ -96,10 +66,7 @@ def MuonGeoModelCfg(flags):
else :
#logMuon.info("Reading As-Built parameters from conditions database")
detTool.EnableMdtAsBuiltParameters = 1
- acc.merge(addFolders( flags, '/MUONALIGN/MDT/ASBUILTPARAMS', 'MUONALIGN_OFL', className='CondAttrListCollection'))
- MuonAlign.ParlineFolders += ["/MUONALIGN/MDT/ASBUILTPARAMS"]
pass
- #####
else:
detTool.UseConditionDb = 0
@@ -116,27 +83,96 @@ def MuonGeoModelCfg(flags):
nswAGDDTool.Volumes = ["NewSmallWheel"]
nswAGDDTool.DefaultDetector = "Muon"
AGDD2Geo.Builders += [ nswAGDDTool ]
+
#create=True is needed for the service to be initialised in the new style
acc.addService(AGDD2Geo, create=True)
-
+
# call fill cache of MuonDetectorTool such that all MdtReadoutElement caches are filled
# already during initialize() -> this will increase memory -> needs to be measured
detTool.FillCacheInitTime = 1
# turn on/off caching of MdtReadoutElement surfaces
detTool.CachingFlag = 1
- if enableAlignment:
- MuonDetectorCondAlg = CompFactory.MuonDetectorCondAlg
- MuonDetectorManagerCond = MuonDetectorCondAlg()
- MuonDetectorManagerCond.MuonDetectorTool = detTool
- acc.addCondAlgo(MuonDetectorManagerCond)
+ acc.setPrivateTools(detTool)
+ return acc
+
+def MuonAlignmentCondAlgCfg(flags):
+ acc = MuonIdHelperSvcCfg(flags)
+
+ # This is all migrated from MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonAlignConfig.py
+
+ from IOVDbSvc.IOVDbSvcConfig import addFolders
+ MuonAlignmentCondAlg=CompFactory.MuonAlignmentCondAlg
+ if (flags.Common.isOnline and not flags.Input.isMC):
+ acc.merge(addFolders( flags, ['/MUONALIGN/Onl/MDT/BARREL'], 'MUONALIGN', className='CondAttrListCollection'))
+ acc.merge(addFolders( flags, ['/MUONALIGN/Onl/MDT/ENDCAP/SIDEA'], 'MUONALIGN', className='CondAttrListCollection'))
+ acc.merge(addFolders( flags, ['/MUONALIGN/Onl/MDT/ENDCAP/SIDEC'], 'MUONALIGN', className='CondAttrListCollection'))
+ acc.merge(addFolders( flags, ['/MUONALIGN/Onl/TGC/SIDEA'], 'MUONALIGN', className='CondAttrListCollection'))
+ acc.merge(addFolders( flags, ['/MUONALIGN/Onl/TGC/SIDEC'], 'MUONALIGN', className='CondAttrListCollection'))
+ else:
+ acc.merge(addFolders( flags, ['/MUONALIGN/MDT/BARREL'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
+ acc.merge(addFolders( flags, ['/MUONALIGN/MDT/ENDCAP/SIDEA'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
+ acc.merge(addFolders( flags, ['/MUONALIGN/MDT/ENDCAP/SIDEC'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
+ acc.merge(addFolders( flags, ['/MUONALIGN/TGC/SIDEA'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
+ acc.merge(addFolders( flags, ['/MUONALIGN/TGC/SIDEC'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
+
+ MuonAlign = MuonAlignmentCondAlg()
+ if flags.Muon.MuonTrigger: MuonAlign.DoRecRoiSvcUpdate = True # this should be removed as soon as RPC/TGCRecRoiSvc are migrated to use the MuonDetectorCondAlg
+ MuonAlign.ParlineFolders = ["/MUONALIGN/MDT/BARREL",
+ "/MUONALIGN/MDT/ENDCAP/SIDEA",
+ "/MUONALIGN/MDT/ENDCAP/SIDEC",
+ "/MUONALIGN/TGC/SIDEA",
+ "/MUONALIGN/TGC/SIDEC"]
+
+ # here define if I-lines (CSC internal alignment) are enabled
+ if flags.Muon.Align.UseILines:
+ if 'HLT' in flags.IOVDb.GlobalTag:
+ #logMuon.info("Reading CSC I-Lines from layout - special configuration for COMP200 in HLT setup.")
+ MuonAlign.ILinesFromCondDB = False
+ else :
+ #logMuon.info("Reading CSC I-Lines from conditions database.")
+ if (flags.Common.isOnline and not flags.Input.isMC):
+ acc.merge(addFolders( flags, ['/MUONALIGN/Onl/CSC/ILINES'], 'MUONALIGN', className='CondAttrListCollection'))
+ else:
+ acc.merge(addFolders( flags, ['/MUONALIGN/CSC/ILINES'], 'MUONALIGN_OFL', className='CondAttrListCollection'))
+ MuonAlign.ParlineFolders += ["/MUONALIGN/CSC/ILINES"]
+ MuonAlign.ILinesFromCondDB = True
+
+ # here define if As-Built (MDT chamber alignment) are enabled
+ if flags.Muon.Align.UseAsBuilt:
+ if flags.IOVDb.DatabaseInstance == 'COMP200' or \
+ 'HLT' in flags.IOVDb.GlobalTag or flags.Common.isOnline :
+ #logMuon.info("No MDT As-Built parameters applied.")
+ pass
+ else :
+ #logMuon.info("Reading As-Built parameters from conditions database")
+ acc.merge(addFolders( flags, '/MUONALIGN/MDT/ASBUILTPARAMS', 'MUONALIGN_OFL', className='CondAttrListCollection'))
+ MuonAlign.ParlineFolders += ["/MUONALIGN/MDT/ASBUILTPARAMS"]
+ pass
+
+ acc.addCondAlgo(MuonAlign)
+ return acc
+
+
+def MuonDetectorCondAlgCfg(flags):
+ acc = MuonAlignmentCondAlgCfg(flags)
+ MuonDetectorCondAlg = CompFactory.MuonDetectorCondAlg
+ MuonDetectorManagerCond = MuonDetectorCondAlg()
+ detTool = acc.popToolsAndMerge(MuonDetectorToolCfg(flags))
+ MuonDetectorManagerCond.MuonDetectorTool = detTool
+ acc.addCondAlgo(MuonDetectorManagerCond)
+ return acc
+
+
+def MuonGeoModelCfg(flags):
+ acc=GeoModelCfg(flags)
+ gms=acc.getPrimary()
+ detTool = acc.popToolsAndMerge(MuonDetectorToolCfg(flags))
gms.DetectorTools += [ detTool ]
-
- acc.addService( Muon__MuonIdHelperSvc("MuonIdHelperSvc",
- HasCSC=flags.Detector.GeometryCSC,
- HasSTgc=flags.Detector.GeometrysTGC,
- HasMM=flags.Detector.GeometryMM
- ) )
+ enableAlignment = flags.Common.Project != 'AthSimulation' and not flags.Detector.SimulateMuon and not (flags.Detector.OverlayMuon and flags.Input.isMC)
+ if enableAlignment:
+ acc.merge(MuonDetectorCondAlgCfg(flags))
+ acc.merge(MuonIdHelperSvcCfg(flags)) # This line can be removed once the configuration methods for all 258 components which directly use this service are updated!!
return acc
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
index 66f9790e635d17919ff51bd1673003d0b80bf939..6e1d23f9a3a66d02c27efb4923e8bc24bc9f35f5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
@@ -156,7 +156,7 @@ StatusCode MuonAGDDTool::construct()
bool MuonAGDDTool::WritePREsqlFile() const
{
- std::ifstream outfile(m_outFileName.c_str(), std::ifstream::in | std::ifstream::binary);
+ std::ifstream outfile(m_outFileName.value().c_str(), std::ifstream::in | std::ifstream::binary);
std::vector<std::string> newoutfilelines;
std::string outfileline;
@@ -171,14 +171,14 @@ bool MuonAGDDTool::WritePREsqlFile() const
}
outfile.close();
- std::ofstream newoutfile(m_outFileName.c_str(), std::ofstream::out | std::ofstream::trunc);
+ std::ofstream newoutfile(m_outFileName.value().c_str(), std::ofstream::out | std::ofstream::trunc);
for(auto it = newoutfilelines.begin(); it != newoutfilelines.end(); ++it)
{
if(it != newoutfilelines.begin()) newoutfile << "\n";
newoutfile << *it;
}
newoutfile.close();
- outfile.open(m_outFileName.c_str(), std::ifstream::in | std::ifstream::binary);
+ outfile.open(m_outFileName.value().c_str(), std::ifstream::in | std::ifstream::binary);
int fileSize = 0;
if(outfile.is_open())
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
index 4ae838e48938fb840830a22eeff38f6764fedb45..bc7c02a61b7a46182e3dba41c2c564a20b34cd14 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
@@ -144,7 +144,7 @@ StatusCode NSWAGDDTool::construct()
bool NSWAGDDTool::WritePREsqlFile() const
{
- std::ifstream outfile(m_outFileName.c_str(), std::ifstream::in | std::ifstream::binary);
+ std::ifstream outfile(m_outFileName.value().c_str(), std::ifstream::in | std::ifstream::binary);
std::vector<std::string> newoutfilelines;
std::string outfileline;
@@ -159,14 +159,14 @@ bool NSWAGDDTool::WritePREsqlFile() const
}
outfile.close();
- std::ofstream newoutfile(m_outFileName.c_str(), std::ofstream::out | std::ofstream::trunc);
+ std::ofstream newoutfile(m_outFileName.value().c_str(), std::ofstream::out | std::ofstream::trunc);
for(auto it = newoutfilelines.begin(); it != newoutfilelines.end(); ++it)
{
if(it != newoutfilelines.begin()) newoutfile << "\n";
newoutfile << *it;
}
newoutfile.close();
- outfile.open(m_outFileName.c_str(), std::ifstream::in | std::ifstream::binary);
+ outfile.open(m_outFileName.value().c_str(), std::ifstream::in | std::ifstream::binary);
int fileSize = 0;
if(outfile.is_open())
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/CMakeLists.txt
index 3d00f656c93a95561418ea9c703149e12bd92b03..3fe96c40d108e7096cdc227711eb89c4494dddf5 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDDDescription/CMakeLists.txt
@@ -8,13 +8,12 @@ atlas_subdir( MuonAGDDDescription )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
DetectorDescription/AGDD/AGDDKernel
- PRIVATE
- DetectorDescription/AGDD/AGDDModel )
+ DetectorDescription/AGDD/AGDDModel
+ )
# Component(s) in the package:
atlas_add_library( MuonAGDDDescription
src/*.cxx
PUBLIC_HEADERS MuonAGDDDescription
- LINK_LIBRARIES AGDDKernel
- PRIVATE_LINK_LIBRARIES AGDDModel )
+ LINK_LIBRARIES AGDDKernel AGDDModel )
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CSC_Digitization/CscDigitizationTool.h b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CSC_Digitization/CscDigitizationTool.h
index a4ddbadd6c5a8704229a1004239ec6258573fe90..ef250e8c32576ca92fd91fa573ecb1b144bddcdd 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CSC_Digitization/CscDigitizationTool.h
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CSC_Digitization/CscDigitizationTool.h
@@ -5,6 +5,8 @@
#ifndef MUONDIGITIZATION_CSCDIGITIZATIONTOOL_H
#define MUONDIGITIZATION_CSCDIGITIZATIONTOOL_H
+#include <memory>
+
#include "PileUpTools/PileUpToolBase.h"
#include "GaudiKernel/ServiceHandle.h"
@@ -22,6 +24,8 @@
#include "MuonSimData/CscSimDataCollection.h"
#include "PileUpTools/PileUpMergeSvc.h"
+#include "CSC_Digitizer.h"
+
// Author: Ketevi A. Assamagan
// BNL, October 27, 2003
@@ -43,7 +47,7 @@ public:
CscDigitizationTool(const std::string& type, const std::string& name, const IInterface* pIID);
- ~CscDigitizationTool();
+ ~CscDigitizationTool() = default;
virtual StatusCode initialize() override final;
@@ -89,7 +93,7 @@ private:
SG::WriteHandleKey<CscDigitContainer> m_cscDigitContainerKey{this,"OutputObjectName","CSC_DIGITS","CSC digit container object"};
const MuonGM::MuonDetectorManager* m_geoMgr{nullptr};
- CSC_Digitizer* m_cscDigitizer{nullptr};
+ std::unique_ptr<CSC_Digitizer> m_cscDigitizer{nullptr};
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
index a1ae38121639d613c2dddf2aa2aa53b81dbdf9fe..6bf855c38b2855956650b4d0811530fe23bc4804 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/src/CscDigitizationTool.cxx
@@ -19,10 +19,6 @@ CscDigitizationTool::CscDigitizationTool(const std::string& type,const std::stri
PileUpToolBase(type, name, pIID) {
}
-CscDigitizationTool::~CscDigitizationTool() {
- delete m_cscDigitizer;
-}
-
StatusCode CscDigitizationTool::initialize() {
ATH_MSG_DEBUG ( "Initialized Properties :" );
@@ -57,11 +53,8 @@ StatusCode CscDigitizationTool::initialize() {
/** CSC calibratin tool for the Condtiions Data base access */
ATH_CHECK(m_pcalib.retrieve());
- ICscCalibTool* cscCalibTool = &*(m_pcalib);
-
//initialize the CSC digitizer
- CscHitIdHelper * cscHitHelper = CscHitIdHelper::GetHelper();
- m_cscDigitizer = new CSC_Digitizer(cscHitHelper, m_geoMgr, cscCalibTool);
+ m_cscDigitizer = std::make_unique<CSC_Digitizer>(CscHitIdHelper::GetHelper(), m_geoMgr, &*(m_pcalib));
m_cscDigitizer->setAmplification(m_amplification);
m_cscDigitizer->setDebug ( msgLvl(MSG::DEBUG) );
m_cscDigitizer->setDriftVelocity(m_driftVelocity);
@@ -69,13 +62,11 @@ StatusCode CscDigitizationTool::initialize() {
if (m_NInterFixed) {
m_cscDigitizer->setNInterFixed();
}
-
+ m_cscDigitizer->setWindow(m_timeWindowLowerOffset, m_timeWindowUpperOffset);
ATH_CHECK(m_cscDigitizer->initialize());
ATH_CHECK(m_idHelperSvc.retrieve());
- m_cscDigitizer->setWindow(m_timeWindowLowerOffset, m_timeWindowUpperOffset);
-
// check the input object name
if (m_hitsContainerKey.key().empty()) {
ATH_MSG_FATAL("Property InputObjectName not set !");
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
index f3b5d1612d697bc4cd54d4e2ffe9f2c6ac794fd7..672888aad21546cfbd3e6157b0319affb566b7fc 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/MM_Digitization/MM_StripResponse.h
@@ -40,6 +40,7 @@ class MM_StripResponse {
std::vector<float> getTimeMaxChargeVec() const;
int getNElectrons();
+ float getTotalCharge();
std::vector<MM_Electron*> getElectrons();
private:
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_ElectronicsResponseSimulation.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_ElectronicsResponseSimulation.cxx
index 72509ec96b449ea2a0febcefaf37f95933fec54a..a36dbfc41ec8dcbe414495bbf9ee75f1dd055b1c 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_ElectronicsResponseSimulation.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_ElectronicsResponseSimulation.cxx
@@ -7,9 +7,10 @@
* MC for micromegas athena integration
*
**/
-
#include "MM_Digitization/MM_ElectronicsResponseSimulation.h"
+#include <numeric>
+
#include "GaudiKernel/MsgStream.h"
#include "AthenaKernel/getMessageSvc.h"
#include "TF1.h"
@@ -110,19 +111,25 @@ void MM_ElectronicsResponseSimulation::vmmPeakResponseFunction(const std::vector
if ( ii > 0 ) {
shaperInputTime = tStrip.at(ii-1);
shaperInputCharge = qStrip.at(ii-1);
- maxChargeLeftNeighbor = m_h_intFn->GetMaximum(m_timeWindowLowerOffset,m_timeWindowUpperOffset);
+ // for now by pass the VMM charge measurement and use the total charge on the strip
+ // maxChargeLeftNeighbor = m_h_intFn->GetMaximum(m_timeWindowLowerOffset,m_timeWindowUpperOffset);
+ maxChargeLeftNeighbor = std::accumulate(shaperInputCharge.begin(), shaperInputCharge.end(), 0.0);
}
if ( ii+1 < numberofStrip.size() ) {
shaperInputTime = tStrip.at(ii+1);
shaperInputCharge = qStrip.at(ii+1);
- maxChargeRightNeighbor = m_h_intFn->GetMaximum(m_timeWindowLowerOffset,m_timeWindowUpperOffset);
+ // for now by pass the VMM charge measurement and use the total charge on the strip
+ //maxChargeRightNeighbor = m_h_intFn->GetMaximum(m_timeWindowLowerOffset,m_timeWindowUpperOffset);
+ maxChargeRightNeighbor = std::accumulate(shaperInputCharge.begin(), shaperInputCharge.end(), 0.0);
}
}
shaperInputTime = tStrip.at(ii);
shaperInputCharge = qStrip.at(ii);
- maxChargeThisStrip = m_h_intFn->GetMaximum(m_timeWindowLowerOffset,m_timeWindowUpperOffset);
-
+ // for now by pass the VMM charge measurement and use the total charge on the strip
+ // maxChargeThisStrip = m_h_intFn->GetMaximum(m_timeWindowLowerOffset,m_timeWindowUpperOffset);
+ maxChargeThisStrip = std::accumulate(shaperInputCharge.begin(), shaperInputCharge.end(), 0.0);
+
float scaledThreshold = m_electronicsThreshold * thresholdScaleFactor;
//check if neighbor strip was above threshold
@@ -134,27 +141,30 @@ void MM_ElectronicsResponseSimulation::vmmPeakResponseFunction(const std::vector
shaperInputCharge = qStrip.at(ii);
// float localPeak = 0;
float localPeakt = 0;
- float localPeakq = 0;
-
- float stepSize = 0.1; //ns(?) step size corresponding to VMM discriminator
-
+ // not used for now since VMM charge measurement is temporarily by passed
+ // float localPeakq = 0;
+
+ float stepSize = 0.1; // ns(?) step size corresponding to VMM discriminator
+
for (int jj = 0; jj < (m_timeWindowUpperOffset-m_timeWindowLowerOffset)/stepSize; jj++) {
-
+
float thisStep = m_timeWindowLowerOffset+jj*stepSize;
float nextStep = m_timeWindowLowerOffset+(jj+1)*stepSize;
float oneAfterStep = m_timeWindowLowerOffset+(jj+2)*stepSize;
-
-
+
+
//check if the charge for the next points is less than the current step and the derivative of the first point is positive or 0 and the next point is negative:
if ( ( m_h_intFn->Eval(thisStep,0,0) < m_h_intFn->Eval(nextStep,0,0) ) && ( m_h_intFn->Eval(nextStep,0,0) > m_h_intFn->Eval(oneAfterStep,0,0) ) && (m_h_intFn->Eval(thisStep+0.001)-m_h_intFn->Eval(thisStep-0.001))/0.001 > 0.0 && (m_h_intFn->Eval(oneAfterStep+0.001)-m_h_intFn->Eval(oneAfterStep-0.001))/0.001 < 0.0 ){ // m_h_intFn->Derivative() does not work. WHY? 2016/07/18
-
- localPeakt = nextStep;
- localPeakq = m_h_intFn->Eval(nextStep,0,0);
-
- m_nStripElectronics.push_back(numberofStrip.at(ii));
- m_tStripElectronicsAbThr.push_back(localPeakt);
- m_qStripElectronics.push_back(localPeakq);
- }
+
+ localPeakt = nextStep;
+ // not used for now since VMM charge measurement is temporarily by passed
+ // localPeakq = m_h_intFn->Eval(nextStep,0,0);
+
+ m_nStripElectronics.push_back(numberofStrip.at(ii));
+ m_tStripElectronicsAbThr.push_back(localPeakt);
+ // m_qStripElectronics.push_back(localPeakq);
+ m_qStripElectronics.push_back(std::accumulate(shaperInputCharge.begin(), shaperInputCharge.end(), 0.0));
+ }
// }
}
}
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
index 2ab98c8e481eb2e1b4dd27681695a1d6f35433de..a1af25ef29a67d0b0df18c42f7610c37e1c2033d 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripResponse.cxx
@@ -18,6 +18,14 @@ int MM_StripResponse::getNElectrons(){
return m_Electrons.size();
}
+float MM_StripResponse::getTotalCharge(){
+ float qtot = 0;
+ for(const MM_Electron* electron : m_Electrons) {
+ qtot += electron->getCharge();
+ }
+ return qtot;
+}
+
std::vector<MM_Electron*> MM_StripResponse::getElectrons(){
return m_Electrons;
}
diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
index 1448f771682b47f68766f6b5167e9ba494513087..2e71f603fb9fc3bc183e9f498273aed4d4835e63 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_StripsResponseSimulation.cxx
@@ -23,6 +23,9 @@ Check Lorentz Angle is in correct direction...
*/
+namespace {
+ static constexpr float electronsToFC = 1./6241.;
+}
/*******************************************************************************/
MM_StripsResponseSimulation::MM_StripsResponseSimulation():
@@ -68,6 +71,8 @@ void MM_StripsResponseSimulation::initHistos()
m_mapOfHistograms["lorentzAngle"] = new TH1F("lorentzAngle","lorentzAngle",100,0,3);
m_mapOfHistograms["effectiveCharge"] = new TH1F("effectiveCharge","effectiveCharge",100,0,1e5);
m_mapOfHistograms["effectiveNElectrons"] = new TH1F("effectiveNElectrons","effectiveNElectrons",200,0,200);
+ m_mapOfHistograms["totalEffectiveCharge"] = new TH1F("totalEffectiveCharge","totalEffectiveCharge",400,0,200);
+ m_mapOf2DHistograms["totalEffectiveChargeVsTheta"] = new TH2F("totalEffectiveChargeVsTheta","totalEffectiveChargeVsTheta",17,0,35,300,0,300);
m_mapOf2DHistograms["pathLengthVsTheta"] = new TH2F("pathLengthVsTheta","pathLengthVsTheta", 100,0,10, 100,-3,3);
m_mapOf2DHistograms["pathLengthVsAlpha"] = new TH2F("pathLengthVsAlpha","pathLengthVsAlpha", 100,0,10, 100,-3,3);
@@ -265,7 +270,7 @@ void MM_StripsResponseSimulation::whichStrips( const float & hitx,
tmpEffectiveNElectrons+= effectiveCharge;
}
- m_mapOfHistograms["effectiveNElectrons"]->Fill( tmpEffectiveNElectrons*1e-4 );
+ m_mapOfHistograms["effectiveNElectrons"]->Fill( tmpEffectiveNElectrons / m_avalancheGain);
//---
m_IonizationClusters.push_back(IonizationCluster);
@@ -297,11 +302,16 @@ void MM_StripsResponseSimulation::whichStrips( const float & hitx,
- // Output diagnostic hists and graphs
- //
- m_mapOfHistograms["nInteractions"]->Fill(nPrimaryIons);
- m_mapOfHistograms["nElectrons"]->Fill( stripResponseObject.getNElectrons() );
- m_mapOfHistograms["lorentzAngle"]->Fill( lorentzAngle );
+ // Output diagnostic hists and graphs
+ //
+ m_mapOfHistograms["nInteractions"]->Fill(nPrimaryIons);
+ m_mapOfHistograms["nElectrons"]->Fill(stripResponseObject.getNElectrons());
+ m_mapOfHistograms["totalEffectiveCharge"]->Fill(stripResponseObject.getTotalCharge() * electronsToFC);
+ m_mapOf2DHistograms["totalEffectiveChargeVsTheta"]->Fill(std::abs(incidentAngleXZ),
+ stripResponseObject.getTotalCharge() * electronsToFC);
+ ATH_MSG_DEBUG("incidentAngleXZ" << incidentAngleXZ << "charge [fC]"
+ << stripResponseObject.getTotalCharge() / 6241.);
+ m_mapOfHistograms["lorentzAngle"]->Fill(lorentzAngle);
if(m_writeEventDisplays){
if(m_outputFile) m_outputFile->cd();
diff --git a/MuonSpectrometer/MuonGeoModel/CMakeLists.txt b/MuonSpectrometer/MuonGeoModel/CMakeLists.txt
index 38fab36fef7175cddf6ab519c65b0245f992a7d1..9686f3767c2581fa904235214f4b903793431aa4 100644
--- a/MuonSpectrometer/MuonGeoModel/CMakeLists.txt
+++ b/MuonSpectrometer/MuonGeoModel/CMakeLists.txt
@@ -5,7 +5,6 @@
# Declare the package name:
atlas_subdir( MuonGeoModel )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
@@ -17,8 +16,8 @@ atlas_add_library( MuonGeoModelLib
src/*.cxx
PUBLIC_HEADERS MuonGeoModel
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel MuonCondInterface MuonReadoutGeometry MuonGMdbObjects StoreGateLib SGtests MuonIdHelpersLib AmdcDbLib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaPoolUtilities AGDDKernel IdDictDetDescr MuonAGDDDescription MuonDetDescrUtils )
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel MuonCondInterface MuonReadoutGeometry MuonGMdbObjects StoreGateLib SGtests MuonIdHelpersLib MuonAGDDDescription AGDDKernel AmdcDbLib
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaPoolUtilities IdDictDetDescr MuonDetDescrUtils )
atlas_add_component( MuonGeoModel
src/components/*.cxx
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
index 70746b9da01c0a1ff47f622f97b19fcfb41e89fa..91fb74640c8ee39c1a1ed83027f52e5db82e457d 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscPeakThresholdClusterBuilderTool.cxx
@@ -4,7 +4,7 @@
// CscPeakThresholdClusterBuilderTool.cxx
#include "CscPeakThresholdClusterBuilderTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MuonPrepRawData/CscPrepDataContainer.h"
#include "MuonPrepRawData/CscStripPrepDataContainer.h"
#include "MuonPrepRawData/CscStripPrepData.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilder.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilder.cxx
index 02380c606f9fc9002f360a249765add4dd396f79..aa4f6b890ff32154ca9234bc0e77d2b7023fc08d 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilder.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilder.cxx
@@ -4,7 +4,7 @@
// CscThresholdClusterBuilder.cxx
#include "CscThresholdClusterBuilder.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <sstream>
using std::string;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.cxx
index 5e4ed65d17a1e636f48b74b07dffb94cf468499b..a7b870edb616376208e35f6144a8239919b7abac 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonDataPrep/CscClusterization/src/CscThresholdClusterBuilderTool.cxx
@@ -6,7 +6,7 @@
// CscThresholdClusterBuilderTool.cxx
#include "CscThresholdClusterBuilderTool.h"
#include <sstream>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MuonPrepRawData/CscPrepDataContainer.h"
#include "MuonPrepRawData/CscStripPrepDataContainer.h"
#include "MuonPrepRawData/CscStripPrepData.h"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMuonErrorOptimisationTool.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMuonErrorOptimisationTool.h
index e4780b929d0cc7afb63676242f5146322673d7a9..8b490fb86677f14a9679b83218cb38dfc9a8a3d7 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMuonErrorOptimisationTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMuonErrorOptimisationTool.h
@@ -23,7 +23,7 @@ namespace Muon {
static const InterfaceID& interfaceID();
/** optimise errors on a track to maximize the momentum resolution */
- virtual Trk::Track* optimiseErrors(Trk::Track& track ) const = 0;
+ virtual std::unique_ptr<Trk::Track> optimiseErrors(Trk::Track* track ) const = 0;
};
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMuonRefitTool.h b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMuonRefitTool.h
index e4c5b72ae0fbb274616ffe6e733430c39d96e45e..72ba99d9746f9c64dadd8a7ea83b094058210ee4 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMuonRefitTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonRecToolInterfaces/MuonRecToolInterfaces/IMuonRefitTool.h
@@ -53,10 +53,10 @@ namespace Muon {
static const InterfaceID& interfaceID();
/** refit a track */
- virtual const Trk::Track* refit( const Trk::Track& track, const Settings* settings = 0 ) const = 0;
+ virtual std::unique_ptr<Trk::Track> refit( Trk::Track* track, const Settings* settings = 0 ) const = 0;
/** refit and back extrapolate a vector of track pairs */
- virtual std::vector<const Trk::Track*> refit( const std::vector<const Trk::Track*>& tracks, const Settings* settings = 0 ) const = 0;
+ virtual std::vector<std::unique_ptr<Trk::Track> > refit( std::vector<Trk::Track*>& tracks, const Settings* settings = 0 ) const = 0;
};
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/CMakeLists.txt
index 354c1f4e265335f710bf4495af0d972904c0948f..0dd19eed58738f8a4d6fb3d8367cc77f277fa7da 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/CMakeLists.txt
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/CMakeLists.txt
@@ -8,7 +8,9 @@ atlas_subdir( MuonLayerHough )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/CxxUtils
+ Control/AthenaKernel
MuonSpectrometer/MuonStationIndex
+ GaudiKernel
PRIVATE
DetectorDescription/GeoPrimitives )
@@ -21,11 +23,11 @@ atlas_add_library( MuonLayerHough
src/*.cxx
PUBLIC_HEADERS MuonLayerHough
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES CxxUtils MuonStationIndexLib
+ LINK_LIBRARIES CxxUtils MuonStationIndexLib GaudiKernel AthenaKernel
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives )
atlas_add_executable( MainLayerAnalysis
exe/MainLayerAnalysis.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CxxUtils MuonStationIndexLib GeoPrimitives MuonLayerHough )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CxxUtils GaudiKernel AthenaKernel MuonStationIndexLib GeoPrimitives MuonLayerHough )
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/LayerAnalysis.h b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/LayerAnalysis.h
index 2c471c222641e219cc15f723ab58203d249d53a1..7a5e16505a254ce5d51bf1635024f61a7b91d83a 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/LayerAnalysis.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/LayerAnalysis.h
@@ -5,12 +5,12 @@
#ifndef LAYERANALYSIS_H
#define LAYERANALYSIS_H
-
#include "MuonLayerHough/HitNtuple.h"
#include "MuonLayerHough/MuonLayerHoughSelector.h"
#include "MuonLayerHough/MuonLayerHough.h"
#include "MuonLayerHough/MuonRegionHough.h"
#include "MuonStationIndex/MuonStationIndex.h"
+#include "CxxUtils/checker_macros.h"
class TH1F;
class TH2F;
@@ -40,8 +40,8 @@ namespace MuonHough {
m_ntuple.initForRead(tree);
}
- void initialize();
- void analyse();
+ void initialize ATLAS_NOT_THREAD_SAFE();
+ void analyse ATLAS_NOT_THREAD_SAFE();
void finalize();
private:
@@ -49,7 +49,7 @@ namespace MuonHough {
void analysis( std::map<int,SectorData>& data );
void drawSector( int region, int sector, SectorData& data, MuonDetectorHough& detectorHough, MuonDetectorHough& detectorHoughTruth );
void calculateVariables(Plots* Plot);
- void SetStyle();
+ void SetStyle ATLAS_NOT_THREAD_SAFE();
int getMaxLayers(Muon::MuonStationIndex::DetectorRegionIndex region, int sector);
void finishplot(TH1F* h);
float linear_extrapolate(MuonLayerHough::Maximum ref, MuonLayerHough::Maximum ex);
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/MuonLayerHough.h b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/MuonLayerHough.h
index 52d10cf5cca56867117ed03b36b714e69039e593..162adb0bdc5fb56548a15802683f04254bfed4d0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/MuonLayerHough.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/MuonLayerHough/MuonLayerHough.h
@@ -8,6 +8,7 @@
#include "MuonStationIndex/MuonStationIndex.h"
#include "MuonLayerHough/Hit.h"
#include "MuonLayerHough/MuonLayerHoughSelector.h"
+
#include <vector>
#include <iostream>
#include <string>
@@ -132,7 +133,7 @@ namespace MuonHough {
void associateHitsToMaximum( Maximum& maximum, const std::vector<Hit*>& hits ) const;
/// calculates the first and last bin the hit should be filled in for a given theta bin
- std::pair<int,int> range( float x, float y1, float y2, int bintheta ) const;
+ std::pair<int,int> range(const float x, const float y1, const float y2, const int bintheta) const;
/// returns a pair with the position and angle corresponing to the input x,y values
std::pair<float,float> maximum( float x, float y, int& posbin, int& thetabin ) const;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/exe/MainLayerAnalysis.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/exe/MainLayerAnalysis.cxx
index 09fa004ebcb4f0b05d436a873b8c63e729bbe8c9..6a6e9fc12992068256eb748df3c798c7ecdd84c2 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/exe/MainLayerAnalysis.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/exe/MainLayerAnalysis.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonLayerHough/LayerAnalysis.h"
@@ -13,17 +13,9 @@
#include <fstream>
#include <TApplication.h>
-int main( int argc, char* argv[]){
-
+int main ATLAS_NOT_THREAD_SAFE(int argc, char* argv[]) {
TApplication theApp("App", &argc, argv);
-
- //int data = 0;
- // if( argc > 1 ) {
- // TString str = argv[1];
- // data = str.Atoi();
- // }
-
//set the input text file
TString filename = "input";
@@ -52,21 +44,10 @@ int main( int argc, char* argv[]){
TChain* ntupleToRead = new TChain("data") ;
ntupleToRead->SetMakeClass(1);
TString outName = "LayerAnalysis";
- //TString inName = "HitNtuple2";
TString postFix = filename;
- // if( data == 0 ) postFix += "Cav";
- // else if( data == 1 ) postFix += "Zmumu";
- // else if( data == 2 ) postFix += "Overlay1";
- // else if( data == 3 ) postFix += "Overlay10";
- // else if( data == 4 ) postFix += "Overlay20";
- // else if( data == 5 ) postFix += "CavNSW";
- // else if( data == 6 ) postFix += "SingleNSW";
- // ntupleToRead->Add("HitNtuple.root");
-
for (unsigned int i = 0; i < fileList.size(); i++) {
ntupleToRead->Add(fileList.at(i).c_str());
}
- // ntupleToRead->Add(inName+postFix+".root");
outName += "_" + postFix;
outName += ".root";
TFile* output = new TFile(outName,"RECREATE");
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
index b2ad5242f959d6e1847c9947f036c60637ede772..832a3480b4a97e2ecdca24587327d3c9618b3b4f 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/LayerAnalysis.cxx
@@ -3,6 +3,7 @@
*/
#include "MuonLayerHough/LayerAnalysis.h"
+
#include "MuonLayerHough/MuonLayerHough.h"
#include "MuonLayerHough/MuonRegionHough.h"
#include "GeoPrimitives/GeoPrimitives.h"
@@ -23,7 +24,6 @@
#include <set>
#include <cmath>
-
#include <iostream>
#include <cstdlib>
#include <algorithm>
@@ -45,7 +45,6 @@ namespace MuonHough {
TH1::AddDirectory(false);
initialize();//initialize all the plots
Long64_t nentries = m_tree->GetEntries();
-// nentries = 10;
m_ncalls = 0;
std::cout << " analysing events " << nentries << std::endl;
m_ntuple.initForRead(*m_tree);
@@ -71,7 +70,6 @@ namespace MuonHough {
if (m_DEBUG) nentries = 200;//for debugging purpose
for( Long64_t evt=0; evt<nentries; ++evt ){
- //std::cout << "event: " << evt << std::endl;
if (evt % 1000 == 0) std::cout << "event: " << evt << std::endl;
m_tree->LoadTree(evt);
m_tree->GetEntry(evt);
@@ -100,7 +98,7 @@ namespace MuonHough {
finalize();
}
- void LayerAnalysis::initialize(){
+ void LayerAnalysis::initialize() {
SetStyle();
m_h_dtheta = new TH1F("dtheta", "RMS of the #Delta #theta for each clutser; #theta RMS", 315, -0.01, M_PI);
m_h_dtheta_truth = new TH1F("dtheta_truth", "RMS of the #Delta #theta for each truth clutser; #theta RMS", 315, -M_PI, M_PI);
@@ -178,10 +176,6 @@ namespace MuonHough {
MuonLayerHough& houghTruth = detectorHoughTruth.hough(sit->first.sector(), region, layer);
int chIndex = hough.m_descriptor.chIndex;//BIS, BIL, BMS, BML, BOS, BOL, BEE(6), EIS, EIL, EMS, EML, EOS, EOL, EES, EEL, CSS, CSL,
- // int LayerIndexMax_temp = 0;
- // if (region == 1){ LayerIndexMax_temp = 3;}
- // else if (sit->first.sector()%2 == 0){ LayerIndexMax_temp = 5;}//small sectors
- // else if (sit->first.sector()%2 != 0){ LayerIndexMax_temp = 4;}//large sectors
if (m_DEBUG) std::cout << "DEBUG: start new cluster; position: sector " << sit->first.sector() << " region(A/B/C) "
<< region << " layer: " << layer << " chindex: " << chIndex <<
@@ -197,7 +191,6 @@ namespace MuonHough {
hitsTruth.push_back(*hit);
}
}//end of lopoing all the hits
- //if (hits.size() == 0){continue;}//only interested if there are hits to find maximum!
hough.setDebug(false);//to supress output level
hough.fillLayer2(hits);//fill all the layers with the weight
houghTruth.fillLayer2(hitsTruth);//fill all the layers with the weight
@@ -322,7 +315,6 @@ namespace MuonHough {
<< std::endl;
h_dtheta_temp->Fill(plotMaximum_truth[i][j].theta);
}
- //h_dtheta_truth->Fill(h_dtheta_temp->GetRMS());
delete h_dtheta_temp;//remove the pinter
if (int(plotMaximum_truth[i].size()) < 3){continue;}//just add protection
@@ -446,62 +438,10 @@ namespace MuonHough {
canvas0.Update();
canvas0.Write();
-////-----------------------------------This part is still disabled----------------------------
-//
-//
-// canvasName += "_zoom";
-// canvas = new TCanvas(canvasName,canvasName,1500,1100);
-// canvas->Divide(1,3);
-// for( int i=0;i<3;++i){
-// if( min[i] < 1e9 ){
-// double scale = ((rmax[i]-rmin[i])/12) / ((max[i]-min[i])/3.);
-// if( scale < 1 ) {
-// max[i] += 0.5*(max[i]-min[i])*scale;
-// min[i] -= 0.5*(max[i]-min[i])*scale;
-// }else{
-// rmax[i] += 0.5*(rmax[i]-rmin[i])/scale;
-// rmin[i] -= 0.5*(rmax[i]-rmin[i])/scale;
-// }
-// //std::cout << " drawing " << i << " scale " << scale
-// // << " range z " << min[i] << " " << max[i] << " r " << rmin[i] << " " << rmax[i] << std::endl;
-// histName = "hist_";
-// histName += canvasName;
-// histName += i;
-// canvas->cd(3-i);
-// double rangez = 120;
-// double ranger = 30;
-// if( region != 1 && i == 1 ){
-// rangez = 100;
-// ranger = 10;
-// }
-//
-// hist = new TH1F(histName,histName,100,rmin[i]-ranger,rmax[i]+ranger);
-// hist->SetMinimum(min[i]-rangez);
-// hist->SetMaximum(max[i]+rangez);
-// hist->Draw();
-// for( unsigned int s=0;s<shapes[i].size();++s){
-// shapes[i][s]->Draw("SAME");
-// }
-// }
-// }
-// canvas->Draw();
-// canvas->Update();
-// canvas->Draw();
-// canvas->Update();
-//// canvas->SaveAs(canvasName + ".pdf");
-// canvas->Write();
-//
-
-
-//--------------------------------------------------------------------------------------------------------------
-
-
-
canvasName += "_hough";
TCanvas canvas(canvasName,canvasName,1000,1000);
Muon::MuonStationIndex::DetectorRegionIndex region_index = static_cast<Muon::MuonStationIndex::DetectorRegionIndex>(region);//have to convert type...
const int iLayers = getMaxLayers(region_index, sector);//be careful here, only loop through the correct layers
- //const int iLayers = region != 1 ? Muon::MuonStationIndex::LayerIndexMax : 3; // barrel only has three layers
canvas.Divide(1,iLayers);
for( int i=0;i < iLayers;++i){
@@ -517,21 +457,11 @@ namespace MuonHough {
hists[pos]->SetFillStyle(3244);
hists[pos]->SetFillColor(1);
hists[pos]->Draw();
- // int chIndex = hough.m_descriptor.chIndex;
histsTruth[pos]->SetLineColor(2);
histsTruth[pos]->Draw("SAME");
- // float maxPos = fabs(hists[pos]->GetXaxis()->GetBinCenter(hists[pos]->GetMaximumBin()));
- // float max = hists[pos]->GetBinContent(hists[pos]->GetMaximumBin());
- //
- // if (max > 1) m_hMaximaHeightPerChIndex[chIndex]->Fill( maxPos, max);
- // float truthMaxPos = fabs(histsTruth[pos]->GetXaxis()->GetBinCenter(histsTruth[pos]->GetMaximumBin()));
- // float truthMax = histsTruth[pos]->GetBinContent(histsTruth[pos]->GetMaximumBin());
- //
- // if (truthMax > 1) m_hMaximaHeightPerChIndexTruth[chIndex]->Fill( truthMaxPos, truthMax);
}
canvas.Draw();
canvas.Update();
- //canvas.SaveAs(canvasName + ".pdf");
canvas.Write();
}
@@ -539,25 +469,6 @@ namespace MuonHough {
for (auto Plot : m_hMaximaHeightPerChIndex){
if (Plot == 0) continue;
calculateVariables(Plot);//for calculation efficiencies
- // Plot->Reco->Write();
- // Plot->Truth->Write();
- // Plot->Matched->Write();
- // Plot->Efficiency->Write();
- // Plot->FakeEfficiency->Write();
- // Plot->Diff->Write();
-
- // Plot->Reco->Draw("COLZTEXT");
- // gPad->SaveAs("../Output/"+ TString(Plot->Reco->GetName()) + ".pdf");
- // Plot->Truth->Draw("COLZTEXT");
- // gPad->SaveAs("../Output/"+ TString(Plot->Truth->GetName()) + ".pdf");
- // Plot->Matched->Draw("COLZ");
- // gPad->SaveAs("../Output/"+ TString(Plot->Matched->GetName()) + ".pdf");
- // Plot->Efficiency->Draw();
- // gPad->SaveAs("../Output/"+ TString(Plot->Efficiency->GetName()) + ".pdf");
- // Plot->FakeEfficiency->Draw();
- // gPad->SaveAs("../Output/"+ TString(Plot->FakeEfficiency->GetName()) + ".pdf");
- // Plot->Diff->Draw("COLZTEXT");
- // gPad->SaveAs("../Output/"+ TString(Plot->Diff->GetName()) + ".pdf");
delete Plot->Reco; delete Plot->Truth; delete Plot->Matched;
delete Plot->Efficiency; delete Plot->FakeEfficiency; delete Plot->Diff;
}
@@ -570,7 +481,6 @@ namespace MuonHough {
m_h_dtheta_truth->SetLineColor(2);
m_h_dtheta_truth->Draw("SAME");
m_h_dtheta_truth->Write();
- //gPad->SaveAs("../Output/"+ TString(h_dtheta->GetName()) + ".pdf");
finishplot(m_h_diff_MI_e);
finishplot(m_h_diff_MO_e);
@@ -624,7 +534,6 @@ namespace MuonHough {
gStyle->SetPadBorderMode(icol);
gStyle->SetPadColor(icol);
gStyle->SetStatColor(icol);
- //gStyle->SetFillColor(icol); // don't use: white fill color for *all* objects
// set the paper & margin sizes
gStyle->SetPaperSize(20,26);
// set margin sizes
@@ -648,11 +557,8 @@ namespace MuonHough {
gStyle->SetLabelFont(font,"z");
gStyle->SetTitleFont(fontT,"z");
gStyle->SetLabelSize(tsize,"x");
- //gStyle->SetTitleSize(tsize,"x");
gStyle->SetLabelSize(tsize,"y");
- //gStyle->SetTitleSize(tsize,"y");
gStyle->SetLabelSize(tsize,"z");
- //gStyle->SetTitleSize(tsize,"z");
// use bold lines and markers
gStyle->SetMarkerStyle(20);
gStyle->SetMarkerSize(1.5);
@@ -660,16 +566,12 @@ namespace MuonHough {
gStyle->SetLineStyleString(2,"[12 12]"); // postscript dashes
gStyle->SetPalette(1);//colz color
// get rid of X error bars
- //gStyle->SetErrorX(0.001);
// get rid of error bar caps
gStyle->SetEndErrorSize(0.);
// do not display any of the standard histogram decorations
gStyle->SetOptTitle(1);
- //gStyle->SetOptTitle(0);
gStyle->SetOptStat(1111);
- //gStyle->SetOptStat(0);
gStyle->SetOptFit(1111);
- //gStyle->SetOptFit(0);
// put tick marks on top and RHS of plots
gStyle->SetPadTickX(1);
gStyle->SetPadTickY(1);
@@ -677,7 +579,6 @@ namespace MuonHough {
void LayerAnalysis::finishplot(TH1F* h){
TCanvas c1("c1","c1",700,600);
- //c1.SetLogy();
c1.cd();
h->SetBinContent(h->GetNbinsX(), h->GetBinContent(h->GetNbinsX() + 1) + h->GetBinContent(h->GetNbinsX()));
@@ -811,5 +712,3 @@ namespace MuonHough {
}
}
-
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/MuonLayerHough.cxx b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/MuonLayerHough.cxx
index 1f0a23ed4f049aad292de7d2aaf9d45db2950fa3..5def865984d93e58c50bb6597e314215f749780b 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/MuonLayerHough.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecUtils/MuonLayerHough/src/MuonLayerHough.cxx
@@ -1,20 +1,26 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonLayerHough/MuonLayerHough.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+#include <TString.h> // for Form
+
#include <memory.h>
-#include <cmath>
#include <bitset>
#include <TH1.h>
#include <iostream>
-#include <stdlib.h>
+#include <stdlib.h>
namespace MuonHough {
-
MuonLayerHough::MuonLayerHough( const RegionDescriptor& descriptor ) :
- max(0), maxhist(-1), maxbin(-1), m_debug(false), m_descriptor(descriptor) {
+ max(0),
+ maxhist(-1),
+ maxbin(-1),
+ m_debug(false),
+ m_descriptor(descriptor) {
// calculate the number of bins
m_nbins = (m_descriptor.yMaxRange-m_descriptor.yMinRange)/m_descriptor.yBinSize;//the same for all the cycles
@@ -27,7 +33,6 @@ namespace MuonHough {
reset();
}
-
MuonLayerHough::~MuonLayerHough() {
for( unsigned int i=0;i<m_histos.size();++i ) delete[] m_histos[i];
}
@@ -40,10 +45,7 @@ namespace MuonHough {
}
void MuonLayerHough::fill( float x, float y, float weight ) {
-
- // float x = m_doZ ? z : r;
- // float y = m_doZ ? r : z;
-
+
int cycles = m_histos.size();
for( int ci=0;ci<cycles;++ci ){
float dtheta = m_descriptor.thetaStep;
@@ -66,12 +68,6 @@ namespace MuonHough {
if( binmax - bincenter > 3 ) binmax = bincenter+3;
if( binmax < 0 ) continue;
- // int bincenter2 = bin(r,z);
- // if( fabs(dthetaOffset) < 0.01 && bincenter != bincenter2 ) std::cout << " bad index " << bincenter
- // << " recall " << bincenter2 << " zref " << zref
- // << " refpos " << m_descriptor.referencePosition
- // << " max " << m_nbins << " r " << r << " z " << z << std::endl;
-
if(binmin<0) binmin = 0;
if( binmax >= m_nbins ) binmax = m_nbins-1;
if( m_debug) std::cout << " filling " << x << " y " << binmin << " " << binmax << " w " << weight << " center " << bincenter
@@ -92,9 +88,7 @@ namespace MuonHough {
void MuonLayerHough::fillLayer( const std::vector<Hit*>& hits, bool subtract ) {
if( hits.empty() ) return;
- // float x = m_doZ ? z : r;
- // float y = m_doZ ? r : z;
-
+
// outer loop over cycles
int cycles = m_histos.size();
for( int ci=0;ci<cycles;++ci ){
@@ -114,27 +108,11 @@ namespace MuonHough {
std::pair<int,int> minMax = range((*it)->x,(*it)->ymin,(*it)->ymax,ci);
int binmin = minMax.first;
int binmax = minMax.second;
-
-// if( binmin - bincenter < -3 ) binmin = bincenter-3;
-// if( binmin == bincenter ) binmin -= 1;
-// if( binmax == bincenter ) binmax += 1;
- // std::cout << " hit " << x << " ref " << m_descriptor.referencePosition << " theta " << theta1 << " offset " << dthetaOffset << " dt " << dtheta
- // << " ymin " << y1 << " ymax " << y2 << " z01 " << z01 << " z11 " << z11 << " z02 " << zmin1 << " z12 " << zmin2
- // << " binmin " << binmin << " max " << binmax
- // << " t01 " << 180*(theta1-dthetaOffset+dtheta)/M_PI << " t11 " << 180*(theta1-dthetaOffset-dtheta)/M_PI
- // << " t01 " << tan(theta1-dthetaOffset+dtheta) << " t11 " << tan(theta1-dthetaOffset-dtheta) << std::endl;
if( binmin >= m_nbins ) continue;
-// if( binmax - bincenter > 3 ) binmax = bincenter+3;
if( binmax < 0 ) continue;
if(binmin<0) binmin = 0;
if( binmax >= m_nbins ) binmax = m_nbins-1;
-
- // int bincenter2 = bin(r,z);
- // if( fabs(dthetaOffset) < 0.01 && bincenter != bincenter2 ) std::cout << " bad index " << bincenter
- // << " recall " << bincenter2 << " zref " << zref
- // << " refpos " << m_descriptor.referencePosition
- // << " max " << m_nbins << " r " << r << " z " << z << std::endl;
if( m_debug ) {
std::cout << " filling hit " << x << " refpos " << m_descriptor.referencePosition << " ymin " << y1 << " ymax " << y2 << " layer " << (*it)->layer
<< " binmin " << binmin << " max " << binmax;
@@ -154,13 +132,10 @@ namespace MuonHough {
if( binmin < prevbinmin && prevlayer == (*it)->layer ) {
std::cout << "Error hits are out of order: min " << binmin << " max " << binmax << " lay " << (*it)->layer << std::endl;
- //exit(1);
}
// if the max value of the previous hit is smaller than the current minvalue fill the histogram of the previous hit
// do the same when reached last hit
if( prevbinmax < binmin || prevlayer != (*it)->layer ) {
- // std::cout << " filling " << binmin << " " << binmax << " w " << it->w << " center " << bincenter
- // << " range " << (zmin-m_descriptor.yMinRange)*m_invbinsize << " " << (zmax-m_descriptor.yMinRange)*m_invbinsize << std::endl;
if( m_debug ) std::cout << " filling range " << prevbinmin << " " << prevbinmax << " new min " << binmin << " " << binmax << " weight " << (*it)->w << std::endl;
for( int n=prevbinmin;n<=prevbinmax;++n ) {
unsigned int& val = m_histos[ci][n];
@@ -226,7 +201,6 @@ namespace MuonHough {
for( int i=0;i<m_nbins;++i ) {
if( subtract && -layerCounts[i] >= static_cast<int>(m_histos[ci][i]) ) m_histos[ci][i] = 0;
else m_histos[ci][i] += layerCounts[i];
- //if( m_debug && layerCounts[i] != 0 ) std::cout << " filling layer " << prevlayer << " bin " << i << " val " << layerCounts[i] << " tot " << m_histos[ci][i] << std::endl;
layerCounts[i] = 0; // reset bin
}
prevlayer = (*it)->layer;
@@ -259,8 +233,6 @@ namespace MuonHough {
else std::cout << std::endl;
}
int weight = sign*(*it)->w;// set the hit weight
- //if (weight > sign){weight = weight * 2;}//could even boost the trigger weight here
-
// set bits to true
for( ;binmin<=binmax;++binmin ) layerCounts[binmin] = weight;
}//end of loopin gover hits
@@ -324,7 +296,6 @@ namespace MuonHough {
const float scale = 1. - 0.01*fabs(ci-cycles/2.0); // small deweighting of non pointing bins; weighting more on the central part
for( int n=0;n<m_nbins;++n ) {
const int val = m_histos[ci][n];
- //if( m_debug && val != 0 ) std::cout << " cycle " << ci << " bin " << n << " val " << val << std::endl;
if( val < imaxval ) continue;
if( scale*val > tmax ) {
@@ -334,7 +305,6 @@ namespace MuonHough {
}
}
}
- //if( m_debug ) std::cout << " done loop over bins: cycle " << thetab << " total cylces " << cycles << " bin " << posb << " val " << tmax << std::endl;
if( posb == -1 ) return false;//didn't find a max
const float candidatePos = m_descriptor.yMinRange + m_binsize*posb;
@@ -418,9 +388,7 @@ namespace MuonHough {
float zmax = z0<z1?z1:z0;
int binmin = (zmin-m_descriptor.yMinRange)/m_binsize-1;
int binmax = (zmax-m_descriptor.yMinRange)/m_binsize+1;
- // if( binmin - bincenter < -3 ) binmin = bincenter-3;
if( binmin >= m_nbins ) continue;
- // if( binmax - bincenter > 3 ) binmax = bincenter+3;
if( binmax < 0 ) continue;
if(binmin<0) binmin = 0;
@@ -497,10 +465,11 @@ namespace MuonHough {
}
- std::pair<int,int> MuonLayerHough::range( float x, float y1, float y2, int bintheta ) const {
+ std::pair<int,int> MuonLayerHough::range(const float x, const float y1, const float y2, const int bintheta) const {
int cycles = m_histos.size();
float dx = m_descriptor.referencePosition-x;
float dtheta = m_descriptor.thetaStep;
+ if (dtheta<=0) throw std::runtime_error(Form("File: %s, Line: %d\nMuonLayerHough::range() - dtheta is not positive (%.4f)", __FILE__, __LINE__, dtheta));
float dthetaOffset = 2*dtheta*(bintheta-(cycles-1)/2.);
float theta1 = atan2(x,y1)-dthetaOffset;
@@ -518,7 +487,6 @@ namespace MuonHough {
float zmin = std::min(zmin1,zmin2);
float zmax = std::max(zmax1,zmax2);
- //return std::make_pair<int,int>((zmin-m_descriptor.yMinRange)*m_invbinsize,(zmax-m_descriptor.yMinRange)*m_invbinsize);
return std::make_pair<int,int>(floor((zmin-m_descriptor.yMinRange)*m_invbinsize), floor((zmax-m_descriptor.yMinRange)*m_invbinsize));//convert the output to bins
}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/CscSegmentMakers/ICscSegmentFinder.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/CscSegmentMakers/ICscSegmentFinder.h
index 2761ce9186f6f4a9d7043d9b0313d2bbb398a700..ae55ee2c48e975892c3dbca93b981d7d356c7e36 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/CscSegmentMakers/ICscSegmentFinder.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/CscSegmentMakers/ICscSegmentFinder.h
@@ -1,19 +1,15 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// ICscSegmentFinder.h
-
#ifndef ICscSegmentFinder_H
#define ICscSegmentFinder_H
#include "GaudiKernel/IAlgTool.h"
-//#include "MuonRecToolInterfaces/IMuonSegmentMaker.h" // added..
#include "MuonSegment/MuonSegmentCombinationCollection.h"
#include "MuonSegment/MuonSegmentCombination.h"
#include "MuonPrepRawData/CscPrepDataContainer.h"
-//IMuonSegmentMaker.h
namespace Muon {
class MuonSegment;
class MdtDriftCircleOnTrack;
@@ -30,7 +26,6 @@ namespace Trk {
static const InterfaceID IID_ICscSegmentFinder("ICscSegmentFinder", 1, 0);
class ICscSegmentFinder : virtual public IAlgTool {
- //class ICscSegmentFinder : public Muon::IMuonSegmentMaker {
public: // Static methods
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx
index 100e3a5bb4386d12bde3fda75a8001a68d068600..7679206d8f0a891a690c98135eada94e374b30a9 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.cxx
@@ -63,24 +63,22 @@ namespace Muon {
return StatusCode::SUCCESS;
}
- Trk::Track* MuonErrorOptimisationTool::optimiseErrors( Trk::Track& track ) const {
+ std::unique_ptr<Trk::Track> MuonErrorOptimisationTool::optimiseErrors( Trk::Track* track ) const {
- if( m_refitTool.empty() ) return 0;
- const Trk::Perigee* pp = track.perigeeParameters();
+ if( m_refitTool.empty() ) return std::unique_ptr<Trk::Track>();
+ const Trk::Perigee* pp = track->perigeeParameters();
bool isLowPt = false;
if( pp && pp->momentum().mag() < m_lowPtThreshold ) isLowPt = true;
if( isLowPt ) ++m_nrefitAllLowPt;
else ++m_nrefitAll;
-
- const Trk::Track* refittedTrack = 0;
- const Trk::Track* result1 = 0;
- const Trk::Track* result2 = 0;
+ std::unique_ptr<Trk::Track> result1;
+ std::unique_ptr<Trk::Track> result2;
// first refit with precise errors
IMuonRefitTool::Settings settings = m_refitSettings;
settings.broad = false;
- refittedTrack = m_refitTool->refit(track,&settings);
+ std::unique_ptr<Trk::Track> refittedTrack = m_refitTool->refit(track,&settings);
if( refittedTrack ){
// check whether it is ok
@@ -88,8 +86,7 @@ namespace Muon {
ATH_MSG_VERBOSE("Precise fit bad " << std::endl << m_printer->print(*refittedTrack) << std::endl << m_printer->printStations(*refittedTrack));
// if not delete track
- result1 = refittedTrack != &track ? refittedTrack : 0;
- refittedTrack = 0;
+ result1.swap(refittedTrack);
}else{
ATH_MSG_VERBOSE("Precise fit ok " << std::endl << m_printer->print(*refittedTrack) << std::endl << m_printer->printStations(*refittedTrack));
if( isLowPt ) ++m_nrefitPreciseLowPt;
@@ -110,8 +107,7 @@ namespace Muon {
if( !m_edmHelperSvc->goodTrack(*refittedTrack,m_chi2NdofCutRefit) ) {
ATH_MSG_VERBOSE("Loose fit bad " << std::endl << m_printer->print(*refittedTrack) << std::endl << m_printer->printStations(*refittedTrack));
// if not delete track
- result2 = refittedTrack != &track ? refittedTrack : 0;
- refittedTrack = 0;
+ result2.swap(refittedTrack);
}else{
ATH_MSG_VERBOSE("Loose fit ok " << std::endl << m_printer->print(*refittedTrack) << std::endl << m_printer->printStations(*refittedTrack));
if( isLowPt ) ++m_nrefitLowPt;
@@ -124,13 +120,13 @@ namespace Muon {
}
// if failed to refit or refit returned original track, return 0
- if( !refittedTrack || refittedTrack == &track ){
+ if( !refittedTrack || *refittedTrack->perigeeParameters() == *track->perigeeParameters() ){
// check if any refit succeeded
- if( !result1 && !result2 ) return 0;
+ if( !result1 && !result2 ) return std::unique_ptr<Trk::Track>();
// now compare chi2
- const Trk::FitQuality* fq0 = track.fitQuality();
+ const Trk::FitQuality* fq0 = track->fitQuality();
const Trk::FitQuality* fq1 = result1 ? result1->fitQuality() : 0;
const Trk::FitQuality* fq2 = result2 ? result2->fitQuality() : 0;
@@ -147,56 +143,56 @@ namespace Muon {
doSelection = false;
// ugly bit of code to get the hit counts for the three tracks
int nhits0 = -1;
- Trk::TrackSummary* summary0 = track.trackSummary();
+ Trk::TrackSummary* summary0 = track->trackSummary();
Trk::MuonTrackSummary* muonSummary0 = 0;
if( summary0 ){
if( summary0->muonTrackSummary() ) {
muonSummary0 = summary0->muonTrackSummary();
if( muonSummary0 ) nhits0 = muonSummary0->netaHits()+ muonSummary0->nphiHits();
- }else{
+ }else{
Trk::TrackSummary tmpSum(*summary0);
- m_trackSummaryTool->addDetailedTrackSummary(track,tmpSum);
+ m_trackSummaryTool->addDetailedTrackSummary(*track,tmpSum);
if( tmpSum.muonTrackSummary() ) nhits0 = muonSummary0->netaHits()+ muonSummary0->nphiHits();
}
}else{
Trk::TrackSummary tmpSummary;
- m_trackSummaryTool->addDetailedTrackSummary(track,tmpSummary);
+ m_trackSummaryTool->addDetailedTrackSummary(*track,tmpSummary);
if( tmpSummary.muonTrackSummary() ) muonSummary0 = tmpSummary.muonTrackSummary();
if( muonSummary0 ) nhits0 = muonSummary0->netaHits()+ muonSummary0->nphiHits();
}
int nhits1 = -1;
- Trk::TrackSummary* summary1 = track.trackSummary();
+ Trk::TrackSummary* summary1 = track->trackSummary();
Trk::MuonTrackSummary* muonSummary1 = 0;
if( summary1 ){
if( summary1->muonTrackSummary() ) muonSummary1 = summary1->muonTrackSummary();
else{
Trk::TrackSummary* tmpSum = summary1;
- if( tmpSum ) m_trackSummaryTool->addDetailedTrackSummary(track,*tmpSum);
+ if( tmpSum ) m_trackSummaryTool->addDetailedTrackSummary(*track,*tmpSum);
if( tmpSum->muonTrackSummary() ) muonSummary1 = tmpSum->muonTrackSummary();
}
if( muonSummary1 ) nhits1 = muonSummary1->netaHits()+ muonSummary1->nphiHits();
}else{
Trk::TrackSummary tmpSummary;
- m_trackSummaryTool->addDetailedTrackSummary(track,tmpSummary);
+ m_trackSummaryTool->addDetailedTrackSummary(*track,tmpSummary);
if( tmpSummary.muonTrackSummary() ) muonSummary1 = tmpSummary.muonTrackSummary();
if( muonSummary1 ) nhits1 = muonSummary1->netaHits()+ muonSummary1->nphiHits();
}
int nhits2 = -1;
- Trk::TrackSummary* summary2 = track.trackSummary();
+ Trk::TrackSummary* summary2 = track->trackSummary();
Trk::MuonTrackSummary* muonSummary2 = 0;
if( summary2 ){
if( summary2->muonTrackSummary() ) muonSummary2 = summary2->muonTrackSummary();
else{
Trk::TrackSummary* tmpSum = summary2;
- if( tmpSum ) m_trackSummaryTool->addDetailedTrackSummary(track,*tmpSum);
+ if( tmpSum ) m_trackSummaryTool->addDetailedTrackSummary(*track,*tmpSum);
if( tmpSum->muonTrackSummary() ) muonSummary2 = tmpSum->muonTrackSummary();
}
if( muonSummary2 ) nhits2 = muonSummary2->netaHits()+ muonSummary2->nphiHits();
}else{
Trk::TrackSummary tmpSummary;
- m_trackSummaryTool->addDetailedTrackSummary(track,tmpSummary);
+ m_trackSummaryTool->addDetailedTrackSummary(*track,tmpSummary);
if( tmpSummary.muonTrackSummary() ) muonSummary2 = tmpSummary.muonTrackSummary();
if( muonSummary2 ) nhits2 = muonSummary2->netaHits()+ muonSummary2->nphiHits();
}
@@ -220,27 +216,19 @@ namespace Muon {
if( chi2Refit < fq0->chiSquared() ){
if( firstIsBest ) {
ATH_MSG_DEBUG("Keeping precise refit");
- delete result2;
++m_nbetterPreciseFit;
- return const_cast<Trk::Track*>(result1);
+ return result1;
}else{
ATH_MSG_DEBUG("Keeping loose refit");
- delete result1;
++m_nbetterFit;
- return const_cast<Trk::Track*>(result2);
+ return result2;
}
}
}
- // clean up
- delete result1;
- delete result2;
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
- // clean up
- if( result1 && result1 != refittedTrack ) delete result1;
-// if( result2 && result2 != refittedTrack ) delete result2;
- return const_cast<Trk::Track*>(refittedTrack);
+ return refittedTrack;
}
}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.h
index e144fa27f1242588efeadfcd5649f9f48a59f4c4..a1e46f516764420c5888655d04897935dc5b92fc 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonErrorOptimisationTool.h
@@ -30,7 +30,7 @@ namespace Muon {
virtual StatusCode finalize() override;
/** optimise the error strategy used for the track */
- virtual Trk::Track* optimiseErrors( Trk::Track& track ) const override;
+ virtual std::unique_ptr<Trk::Track> optimiseErrors( Trk::Track* track ) const override;
private:
ServiceHandle<IMuonEDMHelperSvc> m_edmHelperSvc {this, "edmHelper", "Muon::MuonEDMHelperSvc/MuonEDMHelperSvc", "Handle to the service providing the IMuonEDMHelperSvc interface" };
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.cxx
index b8a0c7e8d8bdb1ca8f0d80922c950965b0323327..1d3969d285ea748d2e4385495deb748196057e10 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.cxx
@@ -56,7 +56,12 @@ namespace Muon {
ATH_CHECK( m_printer.retrieve() );
ATH_CHECK( m_edmHelperSvc.retrieve() );
ATH_CHECK( m_idHelperSvc.retrieve() );
- if( !m_alignErrorTool.empty() ) ATH_CHECK(m_alignErrorTool.retrieve());
+ if (m_alignmentErrors) {
+ if( !m_alignErrorTool.empty() ) ATH_CHECK(m_alignErrorTool.retrieve());
+ }
+ else {
+ m_alignErrorTool.disable();
+ }
ATH_CHECK( m_extrapolator.retrieve() );
ATH_CHECK( m_muonExtrapolator.retrieve() );
ATH_CHECK( m_trackFitter.retrieve() );
@@ -150,255 +155,247 @@ namespace Muon {
return StatusCode::SUCCESS;
}
- const Trk::Track* MuonRefitTool::refit( const Trk::Track& track, const IMuonRefitTool::Settings* set ) const {
+ std::unique_ptr<Trk::Track> MuonRefitTool::refit( Trk::Track* track, const IMuonRefitTool::Settings* set ) const {
const IMuonRefitTool::Settings& settings = set ? *set : m_defaultSettings;
+ //to keep track of the latest track
+ std::unique_ptr<Trk::Track> newTrack;
++m_nrefits;
- const Trk::Track* newTrack = &track;
if( settings.removeOutliers ){
- const Trk::Track* cleanedTrack = removeOutliers(*newTrack,settings);
+ std::unique_ptr<Trk::Track> cleanedTrack = removeOutliers(track,settings);
if( !cleanedTrack ){
ATH_MSG_DEBUG("Track lost during outlier removal");
++m_failedOutlierRemoval;
- return newTrack;
+ return std::make_unique<Trk::Track>(*track);
}
- if( cleanedTrack != newTrack ){
+ if( cleanedTrack->perigeeParameters() != track->perigeeParameters() ){
ATH_MSG_DEBUG("Outlier removal removed hits from track");
- if( newTrack != &track ) delete newTrack;
- }
- newTrack = cleanedTrack;
+ }
+ newTrack.swap(cleanedTrack);
}
+ else newTrack=std::make_unique<Trk::Track>(*track);
if( settings.updateErrors ){
- Trk::Track* updateErrorTrack = m_alignmentErrors ? updateAlignmentErrors(*newTrack,settings) : updateErrors(*newTrack,settings);
+ std::unique_ptr<Trk::Track> updateErrorTrack = m_alignmentErrors ? updateAlignmentErrors(newTrack.get(),settings) : updateErrors(newTrack.get(),settings);
if( !updateErrorTrack ) {
ATH_MSG_WARNING("Failed to update errors");
++m_failedErrorUpdate;
return newTrack;
}
- if( updateErrorTrack != newTrack && newTrack != &track ) delete newTrack;
- newTrack = updateErrorTrack;
+ newTrack.swap(updateErrorTrack);
}
if( settings.refit ){
- ATH_MSG_DEBUG("Original track" << m_printer->print(*&track) );
+ ATH_MSG_DEBUG("Original track" << m_printer->print(*track) );
-// do not put AEOTs on extremely bad chi2 tracks and do not refit them
+ // do not put AEOTs on extremely bad chi2 tracks and do not refit them
- Trk::Track* refittedTrack = track.fitQuality()&&track.fitQuality()->chiSquared()<10000*track.fitQuality()->numberDoF() ? m_trackFitter->fit(*newTrack,false,Trk::muon) : 0 ;
+ std::unique_ptr<Trk::Track> refittedTrack;
+ if(track->fitQuality() && track->fitQuality()->chiSquared()<10000*track->fitQuality()->numberDoF())
+ refittedTrack= std::unique_ptr<Trk::Track>(m_trackFitter->fit(*newTrack,false,Trk::muon));
if( !refittedTrack ){
ATH_MSG_DEBUG("Failed to refit track");
++m_failedRefit;
-// BUG fix Peter
- delete newTrack;
- newTrack = &track;
- return newTrack;
+ // BUG fix Peter
+ return std::make_unique<Trk::Track>(*track);
}
ATH_MSG_DEBUG("Refitted track" << m_printer->print(*refittedTrack) );
ATH_MSG_DEBUG("Refitted track" << m_printer->printMeasurements(*refittedTrack) );
- if( refittedTrack != newTrack && newTrack != &track ) delete newTrack;
- newTrack = refittedTrack;
+ newTrack.swap(refittedTrack);
}
if( settings.extrapolateToMuonEntry ){
- Trk::Track* extrapolatedTrack = m_muonEntryTrackExtrapolator->extrapolate(*newTrack);
+ std::unique_ptr<Trk::Track> extrapolatedTrack(m_muonEntryTrackExtrapolator->extrapolate(*newTrack));
if( !extrapolatedTrack ){
ATH_MSG_WARNING("Failed to back-extrapolate track");
++m_failedExtrapolationMuonEntry;
return newTrack;
}
ATH_MSG_DEBUG("Entry track " << m_printer->print(*extrapolatedTrack) );
- if( extrapolatedTrack != newTrack && newTrack != &track ) delete newTrack;
- newTrack = extrapolatedTrack;
+ newTrack.swap(extrapolatedTrack);
}
++m_ngoodRefits;
return newTrack;
}
- std::vector<const Trk::Track*> MuonRefitTool::refit( const std::vector<const Trk::Track*>& tracks, const IMuonRefitTool::Settings* set ) const {
+ std::vector<std::unique_ptr<Trk::Track> > MuonRefitTool::refit( std::vector<Trk::Track*>& tracks, const IMuonRefitTool::Settings* set ) const {
- std::vector<const Trk::Track*> refittedTracks;
+ std::vector<std::unique_ptr<Trk::Track> > refittedTracks;
refittedTracks.reserve(tracks.size());
- std::vector<const Trk::Track*>::const_iterator it = tracks.begin();
- std::vector<const Trk::Track*>::const_iterator it_end = tracks.end();
+ std::vector<Trk::Track*>::const_iterator it = tracks.begin();
+ std::vector<Trk::Track*>::const_iterator it_end = tracks.end();
for( ;it!=it_end;++it ){
- const Trk::Track* refittedTrack = refit(**it,set);
- if( refittedTrack == *it ) refittedTrack = new Trk::Track(**it);
-
- if(refittedTrack) refittedTracks.push_back(refittedTrack);
+ refittedTracks.push_back(refit(*it,set));
}
return refittedTracks;
}
- Trk::Track* MuonRefitTool::updateAlignmentErrors( const Trk::Track& track, const IMuonRefitTool::Settings& settings ) const {
-
+ std::unique_ptr<Trk::Track> MuonRefitTool::updateAlignmentErrors( Trk::Track* track, const IMuonRefitTool::Settings& settings ) const {
-// first scale the Mdt errors
+ // first scale the Mdt errors
- const Trk::Track* inputTrack = &track;
- Trk::Track* updatedTrack = updateMdtErrors(*inputTrack,settings);
-
- Trk::Track* updatedAEOTsTrack = m_simpleAEOTs ? makeSimpleAEOTs(*updatedTrack) : makeAEOTs(*updatedTrack);
- if( updatedAEOTsTrack != updatedTrack ) delete updatedTrack;
+ std::unique_ptr<Trk::Track> updatedTrack = updateMdtErrors(track,settings);
+
+ std::unique_ptr<Trk::Track> updatedAEOTsTrack = m_simpleAEOTs ? makeSimpleAEOTs(updatedTrack.get()) : makeAEOTs(updatedTrack.get());
- return updatedAEOTsTrack;
+ return updatedAEOTsTrack;
}
- Trk::Track* MuonRefitTool::makeAEOTs( const Trk::Track& track ) const {
+ std::unique_ptr<Trk::Track> MuonRefitTool::makeAEOTs( Trk::Track* track ) const {
-//
-// use the new AlignmentEffectsOnTrack class and alignmentErrorTool
-//
+ //
+ // use the new AlignmentEffectsOnTrack class and alignmentErrorTool
+ //
if( m_alignErrorTool.empty() ) {
- Trk::Track* newTrack = new Trk::Track( track );
+ std::unique_ptr<Trk::Track> newTrack = std::make_unique<Trk::Track>( *track );
return newTrack;
}
-//
-// Use the alignmentErrorTool and store a list of hits with error on position and angle
-//
+ //
+ // Use the alignmentErrorTool and store a list of hits with error on position and angle
+ //
std::map< std::vector<Identifier>, std::pair <double, double> > alignerrmap;
- std::vector<Trk::AlignmentDeviation*> align_deviations;
- m_alignErrorTool->makeAlignmentDeviations(track, align_deviations);
-
- int iok = 0;
- bool isSmallChamber = false;
- bool isLargeChamber = false;
- bool isEndcap = false;
- bool isBarrel = false;
- std::vector <int> usedRotations;
-
- // loop on deviations
- for(auto it : align_deviations){
- double angleError = 0.;
- double translationError = 0.;
- bool differentChambers = false;
- int jdifferent = -1;
- isSmallChamber = false;
- isLargeChamber = false;
- isEndcap = false;
- isBarrel = false;
-
- if( dynamic_cast<MuonAlign::AlignmentTranslationDeviation*>(it) ) {
- translationError = std::sqrt(it->getCovariance(0,0));
- // vector to store hit id
- std::vector<Identifier> hitids;
- std::vector<const Trk::RIO_OnTrack*> vec_riowithdev;
- it->getListOfHits(vec_riowithdev);
- // bool to decide if deviation should be skipped (if it's for more than 1 station)
- for(auto riowithdev : vec_riowithdev){
- Identifier id_riowithdev = riowithdev->identify();
- if(m_idHelperSvc->isEndcap(id_riowithdev)) {
- isEndcap = true;
- } else {
- isBarrel = true;
- }
- if(m_idHelperSvc->isSmallChamber(id_riowithdev)) {
- isSmallChamber = true;
- } else {
- isLargeChamber = true;
- }
- hitids.push_back(id_riowithdev);
- if( hitids.size()>1 && m_idHelperSvc->chamberId(id_riowithdev) != m_idHelperSvc->chamberId(hitids[0]) ) {
- differentChambers = true;
- jdifferent = hitids.size()-1;
- }
- }
- bool matchFound = false;
- if( hitids.size()>0) {
- int iRot = -1;
- for(auto itRot : align_deviations){
- iRot++;
- if( dynamic_cast<MuonAlign::AlignmentRotationDeviation*>(itRot) ) {
- if( itRot->hasValidHashOfHits() && it->hasValidHashOfHits() ) {
- if( itRot->getHashOfHits() == it->getHashOfHits() ){
- angleError = std::sqrt(itRot->getCovariance(0,0));
- matchFound = true;
- usedRotations.push_back(iRot);
- }
- } else {
- ATH_MSG_ERROR("One of the alignment deviations has an invalid hash created from the hits.");
- }
- }
- if(matchFound) break;
- }
- }
- // if deviation is accepted (i.e. only on one station) store the hit IDs associated with the deviation and the error
-
-// store (all) translationError with or without a matched angleError
- iok++;
- alignerrmap.insert( std::pair < std::vector<Identifier>, std::pair < double, double > > ( hitids, std::pair < double, double > (translationError,angleError) ) );
-
- if(matchFound) ATH_MSG_DEBUG(" AlignmentMap entry " << iok << " filled with nr hitids " << hitids.size() << " " << m_idHelperSvc->toString(hitids[0]) << " translationError " << translationError << " angleError " << angleError );
- if(!matchFound) ATH_MSG_DEBUG(" AlignmentMap entry No angleError" << iok << " filled with nr hitids " << hitids.size() << " " << m_idHelperSvc->toString(hitids[0]) << " translationError " << translationError << " angleError " << angleError );
- if(isEndcap) ATH_MSG_DEBUG(" AlignmentMap Endcap Chamber ");
- if(isBarrel) ATH_MSG_DEBUG(" AlignmentMap Barrel Chamber ");
- if(isSmallChamber) ATH_MSG_DEBUG(" AlignmentMap Small Chamber ");
- if(isLargeChamber) ATH_MSG_DEBUG(" AlignmentMap Large Chamber ");
- if(differentChambers) ATH_MSG_DEBUG(" AlignmentMap entry " << iok << " for different Chamber " << m_idHelperSvc->toString(hitids[jdifferent]) );
- }
+ std::vector<Trk::AlignmentDeviation*> align_deviations;
+ m_alignErrorTool->makeAlignmentDeviations(*track, align_deviations);
+
+ int iok = 0;
+ bool isSmallChamber = false;
+ bool isLargeChamber = false;
+ bool isEndcap = false;
+ bool isBarrel = false;
+ std::vector <int> usedRotations;
+
+ // loop on deviations
+ for(auto it : align_deviations){
+ double angleError = 0.;
+ double translationError = 0.;
+ bool differentChambers = false;
+ int jdifferent = -1;
+ isSmallChamber = false;
+ isLargeChamber = false;
+ isEndcap = false;
+ isBarrel = false;
+
+ if( dynamic_cast<MuonAlign::AlignmentTranslationDeviation*>(it) ) {
+ translationError = std::sqrt(it->getCovariance(0,0));
+ // vector to store hit id
+ std::vector<Identifier> hitids;
+ std::vector<const Trk::RIO_OnTrack*> vec_riowithdev;
+ it->getListOfHits(vec_riowithdev);
+ // bool to decide if deviation should be skipped (if it's for more than 1 station)
+ for(auto riowithdev : vec_riowithdev){
+ Identifier id_riowithdev = riowithdev->identify();
+ if(m_idHelperSvc->isEndcap(id_riowithdev)) {
+ isEndcap = true;
+ } else {
+ isBarrel = true;
+ }
+ if(m_idHelperSvc->isSmallChamber(id_riowithdev)) {
+ isSmallChamber = true;
+ } else {
+ isLargeChamber = true;
+ }
+ hitids.push_back(id_riowithdev);
+ if( hitids.size()>1 && m_idHelperSvc->chamberId(id_riowithdev) != m_idHelperSvc->chamberId(hitids[0]) ) {
+ differentChambers = true;
+ jdifferent = hitids.size()-1;
+ }
+ }
+ bool matchFound = false;
+ if( hitids.size()>0) {
+ int iRot = -1;
+ for(auto itRot : align_deviations){
+ iRot++;
+ if( dynamic_cast<MuonAlign::AlignmentRotationDeviation*>(itRot) ) {
+ if( itRot->hasValidHashOfHits() && it->hasValidHashOfHits() ) {
+ if( itRot->getHashOfHits() == it->getHashOfHits() ){
+ angleError = std::sqrt(itRot->getCovariance(0,0));
+ matchFound = true;
+ usedRotations.push_back(iRot);
+ }
+ } else {
+ ATH_MSG_ERROR("One of the alignment deviations has an invalid hash created from the hits.");
+ }
+ }
+ if(matchFound) break;
+ }
+ }
+ // if deviation is accepted (i.e. only on one station) store the hit IDs associated with the deviation and the error
+
+ // store (all) translationError with or without a matched angleError
+ iok++;
+ alignerrmap.insert( std::pair < std::vector<Identifier>, std::pair < double, double > > ( hitids, std::pair < double, double > (translationError,angleError) ) );
+
+ if(matchFound) ATH_MSG_DEBUG(" AlignmentMap entry " << iok << " filled with nr hitids " << hitids.size() << " " << m_idHelperSvc->toString(hitids[0]) << " translationError " << translationError << " angleError " << angleError );
+ if(!matchFound) ATH_MSG_DEBUG(" AlignmentMap entry No angleError" << iok << " filled with nr hitids " << hitids.size() << " " << m_idHelperSvc->toString(hitids[0]) << " translationError " << translationError << " angleError " << angleError );
+ if(isEndcap) ATH_MSG_DEBUG(" AlignmentMap Endcap Chamber ");
+ if(isBarrel) ATH_MSG_DEBUG(" AlignmentMap Barrel Chamber ");
+ if(isSmallChamber) ATH_MSG_DEBUG(" AlignmentMap Small Chamber ");
+ if(isLargeChamber) ATH_MSG_DEBUG(" AlignmentMap Large Chamber ");
+ if(differentChambers) ATH_MSG_DEBUG(" AlignmentMap entry " << iok << " for different Chamber " << m_idHelperSvc->toString(hitids[jdifferent]) );
}
+ }
-// now add the angleErrors that were NOT matched to a translationError
-
- int iRot = -1;
- for(auto itRot : align_deviations){
- iRot++;
- isSmallChamber = false;
- isLargeChamber = false;
- isEndcap = false;
- isBarrel = false;
- if( dynamic_cast<MuonAlign::AlignmentRotationDeviation*>(itRot) ) {
- bool used = false;
- for (unsigned int i = 0; i < usedRotations.size(); i++) {
- if(iRot == usedRotations[i]) used = true;
- }
- if(used) continue;
- ATH_MSG_ERROR("This following code should not be reached anymore!");
- std::vector<const Trk::RIO_OnTrack*> vec_riowithdev;
- itRot->getListOfHits(vec_riowithdev);
-
- std::vector<Identifier> hitids;
- // bool to decide if deviation should be skipped (if it's for more than 1 station)
- for(auto riowithdev : vec_riowithdev){
- Identifier id_riowithdev = riowithdev->identify();
- if(m_idHelperSvc->isEndcap(id_riowithdev)) {
- isEndcap = true;
- } else {
- isBarrel = true;
- }
- if(m_idHelperSvc->isSmallChamber(id_riowithdev)) {
- isSmallChamber = true;
- } else {
- isLargeChamber = true;
- }
- hitids.push_back(id_riowithdev);
- }
-
- double translationError = 0.;
- double angleError = std::sqrt(itRot->getCovariance(0,0));
-
- iok++;
- alignerrmap.insert( std::pair < std::vector<Identifier>, std::pair < double, double > > ( hitids, std::pair < double, double > (translationError,angleError) ) );
- ATH_MSG_DEBUG(" AlignmentMap entry No Translation Error " << iok << " filled with nr hitids " << hitids.size() << " " << m_idHelperSvc->toString(hitids[0]) << " translationError " << translationError << " angleError " << angleError );
- if(isEndcap) ATH_MSG_DEBUG(" AlignmentMap Endcap Chamber");
- if(isBarrel) ATH_MSG_DEBUG(" AlignmentMap Barrel Chamber");
- if(isSmallChamber) ATH_MSG_DEBUG(" AlignmentMap Small Chamber ");
- if(isLargeChamber) ATH_MSG_DEBUG(" AlignmentMap Large Chamber ");
- }
+ // now add the angleErrors that were NOT matched to a translationError
+
+ int iRot = -1;
+ for(auto itRot : align_deviations){
+ iRot++;
+ isSmallChamber = false;
+ isLargeChamber = false;
+ isEndcap = false;
+ isBarrel = false;
+ if( dynamic_cast<MuonAlign::AlignmentRotationDeviation*>(itRot) ) {
+ bool used = false;
+ for (unsigned int i = 0; i < usedRotations.size(); i++) {
+ if(iRot == usedRotations[i]) used = true;
+ }
+ if(used) continue;
+ ATH_MSG_ERROR("This following code should not be reached anymore!");
+ std::vector<const Trk::RIO_OnTrack*> vec_riowithdev;
+ itRot->getListOfHits(vec_riowithdev);
+
+ std::vector<Identifier> hitids;
+ // bool to decide if deviation should be skipped (if it's for more than 1 station)
+ for(auto riowithdev : vec_riowithdev){
+ Identifier id_riowithdev = riowithdev->identify();
+ if(m_idHelperSvc->isEndcap(id_riowithdev)) {
+ isEndcap = true;
+ } else {
+ isBarrel = true;
+ }
+ if(m_idHelperSvc->isSmallChamber(id_riowithdev)) {
+ isSmallChamber = true;
+ } else {
+ isLargeChamber = true;
+ }
+ hitids.push_back(id_riowithdev);
+ }
+
+ double translationError = 0.;
+ double angleError = std::sqrt(itRot->getCovariance(0,0));
+
+ iok++;
+ alignerrmap.insert( std::pair < std::vector<Identifier>, std::pair < double, double > > ( hitids, std::pair < double, double > (translationError,angleError) ) );
+ ATH_MSG_DEBUG(" AlignmentMap entry No Translation Error " << iok << " filled with nr hitids " << hitids.size() << " " << m_idHelperSvc->toString(hitids[0]) << " translationError " << translationError << " angleError " << angleError );
+ if(isEndcap) ATH_MSG_DEBUG(" AlignmentMap Endcap Chamber");
+ if(isBarrel) ATH_MSG_DEBUG(" AlignmentMap Barrel Chamber");
+ if(isSmallChamber) ATH_MSG_DEBUG(" AlignmentMap Small Chamber ");
+ if(isLargeChamber) ATH_MSG_DEBUG(" AlignmentMap Large Chamber ");
}
+ }
- // clean-up of alignment deviations
- for(auto it : align_deviations) delete it;
- align_deviations.clear();
+ // clean-up of alignment deviations
+ for(auto it : align_deviations) delete it;
+ align_deviations.clear();
- const DataVector<const Trk::TrackStateOnSurface>* states = track.trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* states = track->trackStateOnSurfaces();
if( !states ){
ATH_MSG_WARNING(" track without states, discarding track ");
return 0;
@@ -434,7 +431,7 @@ namespace Muon {
if( m_idHelperSvc->isMdt(id) ) stationIds.insert( m_idHelperSvc->chamberIndex(id) );
-// make Alignment Effect using the surface of the TSOS
+ // make Alignment Effect using the surface of the TSOS
if(idMiddle==id) {
double deltaError = itAli.second.first;
@@ -452,9 +449,9 @@ namespace Muon {
if(!found) ATH_MSG_WARNING(" This should not happen Identifier from AlignmentErrorTool is not found");
}
-//
-// clone the TSOSs and add the tsosAEOTs
-//
+ //
+ // clone the TSOSs and add the tsosAEOTs
+ //
DataVector<const Trk::TrackStateOnSurface>* trackStateOnSurfaces = new DataVector<const Trk::TrackStateOnSurface>();
trackStateOnSurfaces->reserve(states->size()+indexAEOTs.size());
tsit = states->begin();
@@ -477,7 +474,7 @@ namespace Muon {
if(indexAEOTs.size()==0 && stationIds.size() > 1) ATH_MSG_WARNING(" Track without AEOT ");
- Trk::Track* newTrack = new Trk::Track( track.info(), trackStateOnSurfaces, track.fitQuality() ? track.fitQuality()->clone():0 );
+ std::unique_ptr<Trk::Track> newTrack = std::make_unique<Trk::Track>( track->info(), trackStateOnSurfaces, track->fitQuality() ? track->fitQuality()->clone():0 );
ATH_MSG_DEBUG(m_printer->print(*newTrack));
ATH_MSG_DEBUG(m_printer->printMeasurements(*newTrack));
@@ -486,22 +483,22 @@ namespace Muon {
}
- Trk::Track* MuonRefitTool::makeSimpleAEOTs( const Trk::Track& track ) const {
+ std::unique_ptr<Trk::Track> MuonRefitTool::makeSimpleAEOTs( Trk::Track* track ) const {
-// use the new AlignmentEffectsOnTrack class
+ // use the new AlignmentEffectsOnTrack class
- const DataVector<const Trk::TrackStateOnSurface>* states = track.trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* states = track->trackStateOnSurfaces();
if( !states ){
ATH_MSG_WARNING(" track without states, discarding track ");
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
DataVector<const Trk::TrackStateOnSurface>::const_iterator tsit = states->begin();
DataVector<const Trk::TrackStateOnSurface>::const_iterator tsit_end = states->end();
-//
-// first clone the TSOSs
-//
+ //
+ // first clone the TSOSs
+ //
DataVector<const Trk::TrackStateOnSurface>* trackStateOnSurfaces = new DataVector<const Trk::TrackStateOnSurface>();
trackStateOnSurfaces->reserve(states->size()+1);
for( ;tsit!=tsit_end ; ++tsit ){
@@ -509,7 +506,7 @@ namespace Muon {
}
-// loop over TSOSs and look for EM or BM chambers
+ // loop over TSOSs and look for EM or BM chambers
tsit = trackStateOnSurfaces->begin();
tsit_end = trackStateOnSurfaces->end();
std::vector<const Trk::TrackStateOnSurface*> indicesOfAffectedTSOS;
@@ -519,7 +516,6 @@ namespace Muon {
int index = -1;
int indexFirst = -1;
int indexFirstInner = -1;
-// const Trk::Surface *surf = 0;
for( ; tsit!=tsit_end ; ++tsit ){
index++;
if( !*tsit ) continue; //sanity check
@@ -543,30 +539,28 @@ namespace Muon {
// Not a ROT, else it would have had an identifier. Keep the TSOS.
if( !id.is_valid() || !m_idHelperSvc->isMuon(id) ) continue;
MuonStationIndex::StIndex stIndex = m_idHelperSvc->stationIndex(id);
-// skip phi measurements
+ // skip phi measurements
if( (m_idHelperSvc->isTrigger(id)&&m_idHelperSvc->measuresPhi(id)) || (m_idHelperSvc->isCsc(id)&&m_idHelperSvc->measuresPhi(id) ) ) continue;
if(m_addAll) {
-// skip RPC and TGC eta (to avoid code crashes)
+ // skip RPC and TGC eta (to avoid code crashes)
if( m_idHelperSvc->isTrigger(id)) continue;
if(indexFirst==-1) indexFirst = index;
indicesOfAffectedTSOS.push_back(*tsit);
indicesOfAffectedIds.push_back(id);
} else {
-// skip trigger hits and CSC phi measurements and select precision hits
+ // skip trigger hits and CSC phi measurements and select precision hits
if( m_idHelperSvc->isTrigger(id)) continue;
if( stIndex == MuonStationIndex::BM || stIndex == MuonStationIndex::EM) {
if(indexFirst==-1) indexFirst = index;
indicesOfAffectedTSOS.push_back(*tsit);
indicesOfAffectedIds.push_back(id);
-// two alignment discontinuities
+ // two alignment discontinuities
if(m_addTwo) {
if(indexFirstInner==-1) indexFirstInner = index;
indicesOfAffectedTSOSInner.push_back(*tsit);
indicesOfAffectedIdsInner.push_back(id);
}
}
-// if( stIndex == MuonStationIndex::BO || stIndex == MuonStationIndex::EO ||
-// stIndex == MuonStationIndex::BI || stIndex == MuonStationIndex::EI) {
if( stIndex == MuonStationIndex::BI || stIndex == MuonStationIndex::EI) {
if(indexFirstInner==-1) indexFirstInner = index;
indicesOfAffectedTSOSInner.push_back(*tsit);
@@ -576,7 +570,7 @@ namespace Muon {
}
if(indicesOfAffectedTSOS.size()==0&&indicesOfAffectedTSOSInner.size()==0) {
- Trk::Track* newTrack = new Trk::Track( track.info(), trackStateOnSurfaces, track.fitQuality() ? track.fitQuality()->clone():0 );
+ std::unique_ptr<Trk::Track> newTrack = std::make_unique<Trk::Track>( track->info(), trackStateOnSurfaces, track->fitQuality() ? track->fitQuality()->clone():0 );
return newTrack;
}
@@ -596,7 +590,6 @@ namespace Muon {
if(indicesOfAffectedTSOSInner.size()>0&&(m_addInner||m_addTwo)) {
int middle = indicesOfAffectedTSOSInner.size()/2;
const Trk::TrackStateOnSurface* tsosInner = indicesOfAffectedTSOSInner[middle];
-// const Trk::Surface *surfInner = dynamic_cast <Trk::Surface*> ((tsosInner->measurementOnTrack()->associatedSurface()).clone());
Trk::AlignmentEffectsOnTrack* aEOTInner = new Trk::AlignmentEffectsOnTrack(m_alignmentDelta,m_alignmentDeltaError,m_alignmentAngle,m_alignmentAngleError,indicesOfAffectedIdsInner,&(tsosInner->measurementOnTrack()->associatedSurface()));
tsosAEOTInner = new Trk::TrackStateOnSurface(0,tsosInner->trackParameters()->clone(),0,0,typePattern,aEOTInner);
}
@@ -624,19 +617,7 @@ namespace Muon {
if(!m_addInner&&!m_addTwo&&tsosAEOTInner) delete tsosAEOTInner;
if(!m_addMiddle&&!m_addAll&&tsosAEOT) delete tsosAEOT;
-// trackStateOnSurfacesAEOT->push_back(tsosAEOT);
-// if(m_addInner) trackStateOnSurfacesAEOT->push_back(tsosAEOTInner);
-
- Trk::Track* newTrack = new Trk::Track( track.info(), trackStateOnSurfacesAEOT, track.fitQuality() ? track.fitQuality()->clone():0 );
-
-// dump it
-// const DataVector<const Trk::TrackStateOnSurface>* trackStateOnSurfacesNew = newTrack->trackStateOnSurfaces();
-// tsit = trackStateOnSurfacesNew->begin();
-// tsit_end = trackStateOnSurfacesNew->end();
-// for( ; tsit!=tsit_end ; ++tsit ){
-// if((*tsit)->alignmentEffectsOnTrack()) std::cout << " Peter alignmentEffectsOnTrack found with track pars " << (*tsit)->trackParameters() << std::endl;
-// }
-
+ std::unique_ptr<Trk::Track> newTrack = std::make_unique<Trk::Track>( track->info(), trackStateOnSurfacesAEOT, track->fitQuality() ? track->fitQuality()->clone():0 );
if(aEOT) ATH_MSG_DEBUG(" AlignmentEffectsOnTrack on surface " << aEOT->associatedSurface() << " nr of tsos affected " << indicesOfAffectedTSOS.size());
ATH_MSG_DEBUG(m_printer->print(*newTrack));
@@ -645,13 +626,13 @@ namespace Muon {
return newTrack;
}
- Trk::Track* MuonRefitTool::updateErrors( const Trk::Track& track, const IMuonRefitTool::Settings& settings ) const {
+ std::unique_ptr<Trk::Track> MuonRefitTool::updateErrors( Trk::Track* track, const IMuonRefitTool::Settings& settings ) const {
// loop over track and calculate residuals
- const DataVector<const Trk::TrackStateOnSurface>* states = track.trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* states = track->trackStateOnSurfaces();
if( !states ){
ATH_MSG_WARNING(" track without states, discarding track ");
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
// vector to store states, the boolean indicated whether the state was create in this routine (true) or belongs to the track (false)
@@ -702,11 +683,11 @@ namespace Muon {
}
if( !startPars ){
- if( !track.trackParameters() || track.trackParameters()->empty() ){
+ if( !track->trackParameters() || track->trackParameters()->empty() ){
ATH_MSG_WARNING("Track without parameters, cannot update errors");
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
- startPars = track.trackParameters()->front();
+ startPars = track->trackParameters()->front();
ATH_MSG_VERBOSE("Did not find fit starting parameters, using first parameters " << m_printer->print(*startPars));
}
@@ -1020,20 +1001,20 @@ namespace Muon {
// add states. If nit->first is true we have a new state. If it is false the state is from the old track and has to be cloned
trackStateOnSurfaces->push_back( nit->first ? nit->second : nit->second->clone() );
}
- Trk::Track* newTrack = new Trk::Track( track.info(), trackStateOnSurfaces, track.fitQuality() ? track.fitQuality()->clone():0 );
+ std::unique_ptr<Trk::Track> newTrack = std::make_unique<Trk::Track>( track->info(), trackStateOnSurfaces, track->fitQuality() ? track->fitQuality()->clone():0 );
return newTrack;
}
- Trk::Track* MuonRefitTool::updateMdtErrors( const Trk::Track& track, const IMuonRefitTool::Settings& settings ) const {
+ std::unique_ptr<Trk::Track> MuonRefitTool::updateMdtErrors( Trk::Track* track, const IMuonRefitTool::Settings& settings ) const {
-// uses the muonErrorStrategy
+ // uses the muonErrorStrategy
// loop over track and calculate residuals
- const DataVector<const Trk::TrackStateOnSurface>* states = track.trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* states = track->trackStateOnSurfaces();
if( !states ){
ATH_MSG_WARNING(" track without states, discarding track ");
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
// vector to store states, the boolean indicated whether the state was create in this routine (true) or belongs to the track (false)
@@ -1080,11 +1061,11 @@ namespace Muon {
}
if( !startPars ){
- if( !track.trackParameters() || track.trackParameters()->empty() ){
+ if( !track->trackParameters() || track->trackParameters()->empty() ){
ATH_MSG_WARNING("Track without parameters, cannot update errors");
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
- startPars = track.trackParameters()->front();
+ startPars = track->trackParameters()->front();
ATH_MSG_VERBOSE("Did not find fit starting parameters, using first parameters " << m_printer->print(*startPars));
}
@@ -1170,7 +1151,7 @@ namespace Muon {
}
bool hasT0Fit = false;
- if( mdt->errorStrategy().creationParameter(Muon::MuonDriftCircleErrorStrategy::T0Refit)) hasT0Fit = true;
+ if( mdt->errorStrategy().creationParameter(Muon::MuonDriftCircleErrorStrategy::T0Refit)) hasT0Fit = true;
const Trk::RIO_OnTrack* rot = 0;
Trk::TrackStateOnSurface::TrackStateOnSurfaceType type = (*tsit)->type(Trk::TrackStateOnSurface::Outlier) ?
@@ -1178,7 +1159,7 @@ namespace Muon {
stIndex = m_idHelperSvc->stationIndex(id);
-// use the muonErrorStrategy
+ // use the muonErrorStrategy
MuonDriftCircleErrorStrategy strat(m_muonErrorStrategy);
if( hasT0Fit ) strat.setParameter(MuonDriftCircleErrorStrategy::T0Refit,true);
if( settings.broad ) strat.setParameter(MuonDriftCircleErrorStrategy::BroadError,true);
@@ -1235,7 +1216,6 @@ namespace Muon {
}
-
}else{
if( settings.updateTriggerErrors ){
@@ -1269,18 +1249,18 @@ namespace Muon {
// add states. If nit->first is true we have a new state. If it is false the state is from the old track and has to be cloned
trackStateOnSurfaces->push_back( nit->first ? nit->second : nit->second->clone() );
}
- Trk::Track* newTrack = new Trk::Track( track.info(), trackStateOnSurfaces, track.fitQuality() ? track.fitQuality()->clone():0 );
+ std::unique_ptr<Trk::Track> newTrack = std::make_unique<Trk::Track>( track->info(), trackStateOnSurfaces, track->fitQuality() ? track->fitQuality()->clone():0 );
return newTrack;
}
- const Trk::Track* MuonRefitTool::removeOutliers( const Trk::Track& track, const IMuonRefitTool::Settings& settings ) const {
+ std::unique_ptr<Trk::Track> MuonRefitTool::removeOutliers( Trk::Track* track, const IMuonRefitTool::Settings& settings ) const {
// loop over track and calculate residuals
- const DataVector<const Trk::TrackStateOnSurface>* states = track.trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* states = track->trackStateOnSurfaces();
if( !states ){
ATH_MSG_WARNING(" track without states, discarding track ");
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
Identifier currentMdtChId;
@@ -1335,7 +1315,7 @@ namespace Muon {
if( chamberPars ){
if( !removeMdtOutliers(*chamberPars,mdts,removedIdentifiers,settings) ){
if( mdts.size() > 4 ) ATH_MSG_WARNING("Problem removing outliers in chamber " << m_idHelperSvc->toStringChamber(currentMdtChId) << " hits " << mdts.size());
- if( settings.discardNotCleanedTracks ) return 0;
+ if( settings.discardNotCleanedTracks ) return std::unique_ptr<Trk::Track>();
}
}
// update to new chamber
@@ -1352,13 +1332,13 @@ namespace Muon {
if( chamberPars ){
if( !removeMdtOutliers(*chamberPars,mdts,removedIdentifiers,settings) ){
if( mdts.size() > 4 ) ATH_MSG_WARNING("Problem removing outliers in chamber " << m_idHelperSvc->toStringChamber(currentMdtChId) << " hits " << mdts.size());
- if( settings.discardNotCleanedTracks ) return 0;
+ if( settings.discardNotCleanedTracks ) return std::unique_ptr<Trk::Track>();
}
}
if( removedIdentifiers.empty() ){
ATH_MSG_DEBUG("No hits remove, returning original track");
- return &track;
+ return std::make_unique<Trk::Track>(*track);
}
// states were added, create a new track
@@ -1389,8 +1369,7 @@ namespace Muon {
trackStateOnSurfaces->push_back( (*tsit)->clone() );
}
- Trk::Track* newTrack = new Trk::Track( track.info(), trackStateOnSurfaces, track.fitQuality() ? track.fitQuality()->clone():0 );
-
+ std::unique_ptr<Trk::Track> newTrack = std::make_unique<Trk::Track>( track->info(), trackStateOnSurfaces, track->fitQuality() ? track->fitQuality()->clone():0 );
return newTrack;
}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.h
index bc6c2a819d1947b18d57787250731e3587ff64e5..e6a23a411f6ed5348f6d91a78dced4c73e73ed0e 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonRefitTool.h
@@ -41,25 +41,25 @@ namespace Muon {
virtual StatusCode finalize() override;
/** refit a track */
- const Trk::Track* refit( const Trk::Track& track, const Settings* settings = 0 ) const override;
+ std::unique_ptr<Trk::Track> refit( Trk::Track* track, const Settings* settings = 0 ) const override;
/** refit and back extrapolate a vector of track pairs */
- std::vector<const Trk::Track*> refit( const std::vector<const Trk::Track*>& tracks, const Settings* settings = 0 ) const override;
+ std::vector<std::unique_ptr<Trk::Track> > refit( std::vector<Trk::Track*>& tracks, const Settings* settings = 0 ) const override;
protected:
/** update errors on a muon track */
- Trk::Track* updateErrors( const Trk::Track& track, const Settings& settings ) const;
+ std::unique_ptr<Trk::Track> updateErrors( Trk::Track* track, const Settings& settings ) const;
- Trk::Track* updateMdtErrors( const Trk::Track& track, const Settings& settings ) const;
+ std::unique_ptr<Trk::Track> updateMdtErrors( Trk::Track* track, const Settings& settings ) const;
- Trk::Track* updateAlignmentErrors( const Trk::Track& track, const Settings& settings ) const;
+ std::unique_ptr<Trk::Track> updateAlignmentErrors( Trk::Track* track, const Settings& settings ) const;
- Trk::Track* makeAEOTs( const Trk::Track& track ) const;
+ std::unique_ptr<Trk::Track> makeAEOTs( Trk::Track* track ) const;
- Trk::Track* makeSimpleAEOTs( const Trk::Track& track ) const;
+ std::unique_ptr<Trk::Track> makeSimpleAEOTs( Trk::Track* track ) const;
- const Trk::Track* removeOutliers( const Trk::Track& track,const Settings& settings ) const;
+ std::unique_ptr<Trk::Track> removeOutliers( Trk::Track* track,const Settings& settings ) const;
bool removeMdtOutliers( const Trk::TrackParameters& pars, const std::vector<const MdtDriftCircleOnTrack*>& hits,
std::set<Identifier>& removedIdentifiers, const Settings& settings ) const;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx
index be24f750b19f9a10fef1529034412895ddc75ba4..532adb28c0fe30ab98ebc009f86a04c8c9843fe7 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.cxx
@@ -106,7 +106,7 @@ StatusCode MuonSegmentRegionRecoveryTool::finalize()
Trk::Track* MuonSegmentRegionRecoveryTool::recover( const Trk::Track& track ) const {
- Trk::Track* result = recoverImp(track);;
+ Trk::Track* result = recoverImp(track);
if ( result ) ATH_MSG_DEBUG("Final track " << m_printer->print(*result) << std::endl << m_printer->printStations(*result) );
else ATH_MSG_DEBUG("Track lost during recovery");
return result;
@@ -125,7 +125,7 @@ Trk::Track* MuonSegmentRegionRecoveryTool::recoverImp( const Trk::Track& track )
ATH_MSG_VERBOSE(" Entering segment recovery method " << m_printer->print(track) << std::endl << m_printer->printStations(track) );
//First run the MuonChamberHoleRecoveryTool on the input track
- const Trk::Track* chRecTrack = m_chamberHoleRecoveryTool->recover(track);
+ std::unique_ptr<Trk::Track> chRecTrack(m_chamberHoleRecoveryTool->recover(track));
if (!chRecTrack) {
ATH_MSG_DEBUG(" MuonChamberHoleRecoveryTool failed to create a new track "
<< " Returning input (unrecovered) track " );
@@ -136,13 +136,15 @@ Trk::Track* MuonSegmentRegionRecoveryTool::recoverImp( const Trk::Track& track )
// only run this on single station EM tracks
if ( m_onlyEO ) {
// should be a sl track
- if ( !m_edmHelperSvc->isSLTrack(*chRecTrack) ) return const_cast<Trk::Track*>(chRecTrack);
+ //using release until parent tools use unique_ptr
+ if ( !m_edmHelperSvc->isSLTrack(*chRecTrack) ) return chRecTrack.release();
// get hit summary
IMuonHitSummaryTool::CompactSummary hitSummary = m_hitSummaryTool->summary(*chRecTrack);
// should be single station
+ //using release until parent tools use unique_ptr
if ( hitSummary.stationLayers.size() != 1 ||
- !hitSummary.stationLayers.count(MuonStationIndex::EM) ) return const_cast<Trk::Track*>(chRecTrack);
+ !hitSummary.stationLayers.count(MuonStationIndex::EM) ) return chRecTrack.release();
ATH_MSG_DEBUG("Single station track, checking for EO hits");
}
@@ -167,27 +169,18 @@ Trk::Track* MuonSegmentRegionRecoveryTool::recoverImp( const Trk::Track& track )
collectCrossedChambers( *chRecTrack, muonData );
//3b) compare the two std::sets and make a final std::set of not-yet-on-track Hashes
- const Trk::Track* triggerRecTrack = addMissingChambers( *chRecTrack, muonData, false );
- if ( triggerRecTrack ) {
- if ( chRecTrack != &track ) delete chRecTrack;
- chRecTrack = triggerRecTrack;
- }
+ std::unique_ptr<Trk::Track> triggerRecTrack = addMissingChambers( chRecTrack.get(), muonData, false );
+ if ( triggerRecTrack ) chRecTrack.swap(triggerRecTrack);
- const Trk::Track* mdtRecTrack = addMissingChambers( *chRecTrack, muonData, true );
- if ( mdtRecTrack ) {
- if ( chRecTrack != &track ) delete chRecTrack;
- chRecTrack = mdtRecTrack;
- }
+ std::unique_ptr<Trk::Track> mdtRecTrack = addMissingChambers( chRecTrack.get(), muonData, true );
+ if ( mdtRecTrack ) chRecTrack.swap(mdtRecTrack);
-
- const Trk::Track* mdtRecTrackWithHoles = findHoles( *chRecTrack, muonData );
- if ( mdtRecTrackWithHoles ) {
- if ( chRecTrack != &track ) delete chRecTrack;
- chRecTrack = mdtRecTrackWithHoles;
- }
+ std::unique_ptr<Trk::Track> mdtRecTrackWithHoles = findHoles( chRecTrack.get(), muonData );
+ if ( mdtRecTrackWithHoles ) chRecTrack.swap(mdtRecTrackWithHoles);
//recovered track, success!
- return const_cast<Trk::Track*>(chRecTrack);
+ //use release until calling tools also use unique_ptr
+ return chRecTrack.release();
}
@@ -428,19 +421,19 @@ void MuonSegmentRegionRecoveryTool::fillOnTrackChambers ( const Trk::Track& trac
}
-const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& track, MuonData& data ) const {
+std::unique_ptr<Trk::Track> MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track* track, MuonData& data ) const {
- const DataVector<const Trk::TrackStateOnSurface>* oldStates = track.trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* oldStates = track->trackStateOnSurfaces();
if ( !oldStates ) {
ATH_MSG_WARNING(" track without states, cannot perform mdt hole search ");
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
SG::ReadCondHandle<MuonGM::MuonDetectorManager> DetectorManagerHandle{m_DetectorManagerKey};
const MuonGM::MuonDetectorManager* MuonDetMgr{*DetectorManagerHandle};
if(MuonDetMgr==nullptr){
ATH_MSG_ERROR("Null pointer to the read MuonDetectorManager conditions object");
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
std::vector<const Trk::TrackStateOnSurface*> states;
@@ -469,7 +462,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& tr
ATH_MSG_WARNING("Found no detector element for " << *ith );
continue;
}
- const Trk::TrackParameters* exPars = reachableDetEl(track, *detEl, true );
+ const Trk::TrackParameters* exPars = reachableDetEl(*track, *detEl, true );
if ( !exPars ) {
ATH_MSG_DEBUG("Did not reach " << m_idHelperSvc->toStringChamber(chId) << " hash " << *ith );
continue;
@@ -555,7 +548,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& tr
continue;
}
- const Trk::TrackParameters* exPars = reachableDetEl(track, *detEl, true );
+ const Trk::TrackParameters* exPars = reachableDetEl(*track, *detEl, true );
if ( !exPars ) {
ATH_MSG_DEBUG("Did not reach " << m_idHelperSvc->toStringChamber(chId) << " hash " << *ith );
continue;
@@ -596,7 +589,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& tr
continue;
}
- const Trk::TrackParameters* exPars = reachableDetEl(track, *detEl, true );
+ const Trk::TrackParameters* exPars = reachableDetEl(*track, *detEl, true );
if ( !exPars ) {
ATH_MSG_DEBUG("Did not reach " << m_idHelperSvc->toStringChamber(chId) << " hash " << *ith );
continue;
@@ -638,7 +631,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& tr
continue;
}
- const Trk::TrackParameters* exPars = reachableDetEl(track, *detEl, true );
+ const Trk::TrackParameters* exPars = reachableDetEl(*track, *detEl, true );
if ( !exPars ) {
ATH_MSG_DEBUG("Did not reach " << m_idHelperSvc->toStringChamber(chId) << " hash " << *ith );
continue;
@@ -689,7 +682,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& tr
continue;
}
- const Trk::TrackParameters* exPars = reachableDetEl(track, *detEl, true );
+ const Trk::TrackParameters* exPars = reachableDetEl(*track, *detEl, true );
if ( !exPars ) {
ATH_MSG_DEBUG("Did not reach " << m_idHelperSvc->toStringChamber(chId) << " hash " << *ith );
continue;
@@ -738,7 +731,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& tr
continue;
}
- const Trk::TrackParameters* exPars = reachableDetEl(track, *detEl, true );
+ const Trk::TrackParameters* exPars = reachableDetEl(*track, *detEl, true );
if ( !exPars ) {
ATH_MSG_DEBUG("Did not reach " << m_idHelperSvc->toStringChamber(chId) << " hash " << *ith );
continue;
@@ -782,7 +775,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& tr
std::stable_sort(toBeSorted.begin(), toBeSorted.end(), SortTSOSs(&*m_edmHelperSvc, &*m_idHelperSvc));
trackStateOnSurfaces->insert(trackStateOnSurfaces->begin(), toBeSorted.begin(), toBeSorted.end());
- Trk::Track* trackWithHoles = new Trk::Track( track.info(), trackStateOnSurfaces, track.fitQuality() ? track.fitQuality()->clone() : 0 );
+ std::unique_ptr<Trk::Track> trackWithHoles = std::make_unique<Trk::Track>( track->info(), trackStateOnSurfaces, track->fitQuality() ? track->fitQuality()->clone() : 0 );
// generate a track summary for this track
if (m_trackSummaryTool.isEnabled()) {
m_trackSummaryTool->computeAndReplaceTrackSummary(*trackWithHoles, nullptr, false);
@@ -790,10 +783,10 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::findHoles( const Trk::Track& tr
ATH_MSG_DEBUG("Track with holes " << m_printer->print(*trackWithHoles) << std::endl << m_printer->printStations(*trackWithHoles) );
return trackWithHoles;
}
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
-const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::Track& track, MuonData& data, bool addMdt ) const {
+std::unique_ptr<Trk::Track> MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::Track* track, MuonData& data, bool addMdt ) const {
// states were added, create a new track
std::vector< std::pair<bool, const Trk::TrackStateOnSurface* > > states;
@@ -818,7 +811,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
std::map<int, std::vector<const MdtPrepData*> > mdtPrds;
const Trk::TrackParameters* exParsFirst = 0;
for ( ; mit != mit_end; ++mit ) {
- const Trk::TrackParameters* exPars = reachableDetEl( track, *(*mit)->front()->detectorElement() );
+ const Trk::TrackParameters* exPars = reachableDetEl( *track, *(*mit)->front()->detectorElement() );
if ( exPars ) {
int sector = m_idHelperSvc->sector((*mit)->identify());
ATH_MSG_DEBUG("New chamber " << m_idHelperSvc->toStringChamber((*mit)->identify()) << " hash " << (*mit)->identifyHash() << " sector " << sector );
@@ -838,7 +831,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
} else if ( mdtPrds.size() == 1 ) {
prds = §orIt->second;
} else {
- IMuonHitSummaryTool::CompactSummary hitSummary = m_hitSummaryTool->summary(track);
+ IMuonHitSummaryTool::CompactSummary hitSummary = m_hitSummaryTool->summary(*track);
ATH_MSG_VERBOSE("Multiple sectors selected, using main sector: " << hitSummary.mainSector);
std::map<int, std::vector<const MdtPrepData*> >::iterator pos = mdtPrds.find(hitSummary.mainSector);
if ( pos != mdtPrds.end() ) prds = &pos->second;
@@ -861,7 +854,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
MuonSegment* mseg=dynamic_cast<MuonSegment*>(tseg);
if ( m_trackSegmentMatchingTool.empty() ) ATH_MSG_VERBOSE("No track/segment matching");
- else if ( !m_trackSegmentMatchingTool->match(track, *mseg, true) ) {
+ else if ( !m_trackSegmentMatchingTool->match(*track, *mseg, true) ) {
ATH_MSG_DEBUG(" Segment does not match with track ");
continue;
} else {
@@ -916,7 +909,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
std::vector<const RpcPrepDataCollection*>::iterator rit_end = data.rpcCols.end();
std::vector<const RpcPrepDataCollection*> newrcols;
for ( ; rit != rit_end; ++rit ) {
- const Trk::TrackParameters* exPars = reachableDetEl( track, *(*rit)->front()->detectorElement() );
+ const Trk::TrackParameters* exPars = reachableDetEl( *track, *(*rit)->front()->detectorElement() );
if ( exPars ) {
Identifier detElId = m_idHelperSvc->detElId( (*rit)->identify() );
std::set<Identifier> layIds;
@@ -935,7 +928,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
std::vector<const TgcPrepDataCollection*>::const_iterator tgcit_end = data.tgcCols.end();
std::vector<const TgcPrepDataCollection*> newtcols;
for ( ; tgcit != tgcit_end; ++tgcit ) {
- const Trk::TrackParameters* exPars = reachableDetEl( track, *(*tgcit)->front()->detectorElement() );
+ const Trk::TrackParameters* exPars = reachableDetEl( *track, *(*tgcit)->front()->detectorElement() );
if ( exPars ) {
newtcols.push_back(*tgcit);
Identifier detElId = m_idHelperSvc->detElId( (*tgcit)->identify() );
@@ -957,7 +950,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
std::vector<const CscPrepDataCollection*>::const_iterator cit_end = data.cscCols.end();
std::vector<const CscPrepDataCollection*> newccols;
for ( ; cit != cit_end; ++cit ) {
- const Trk::TrackParameters* exPars = reachableDetEl( track, *(*cit)->front()->detectorElement() );
+ const Trk::TrackParameters* exPars = reachableDetEl( *track, *(*cit)->front()->detectorElement() );
if ( exPars ) {
newccols.push_back(*cit);
Identifier detElId = m_idHelperSvc->detElId( (*cit)->identify() );
@@ -983,7 +976,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
std::vector<const sTgcPrepDataCollection*> newstcols;
ATH_MSG_DEBUG(" extractsTgcPrdCols data.stgcCols.size() " << data.stgcCols.size());
for ( ; stgcit != stgcit_end; ++stgcit ) {
- const Trk::TrackParameters* exPars = reachableDetEl( track, *(*stgcit)->front()->detectorElement() );
+ const Trk::TrackParameters* exPars = reachableDetEl( *track, *(*stgcit)->front()->detectorElement() );
if ( exPars ) {
newstcols.push_back(*stgcit);
Identifier detElId = m_idHelperSvc->detElId( (*stgcit)->identify() );
@@ -1008,7 +1001,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
std::vector<const MMPrepDataCollection*>::const_iterator mit_end = data.mmCols.end();
std::vector<const MMPrepDataCollection*> newmcols;
for ( ; mit != mit_end; ++mit ) {
- const Trk::TrackParameters* exPars = reachableDetEl( track, *(*mit)->front()->detectorElement() );
+ const Trk::TrackParameters* exPars = reachableDetEl( *track, *(*mit)->front()->detectorElement() );
if ( exPars ) {
newmcols.push_back(*mit);
Identifier detElId = m_idHelperSvc->detElId( (*mit)->identify() );
@@ -1029,7 +1022,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
if ( !states.empty() ) {
ATH_MSG_DEBUG("Collected new states: " << states.size());
- const DataVector<const Trk::TrackStateOnSurface>* oldStates = track.trackStateOnSurfaces();
+ const DataVector<const Trk::TrackStateOnSurface>* oldStates = track->trackStateOnSurfaces();
if ( !oldStates ) {
ATH_MSG_WARNING(" track without states, cannot perform cleaning ");
std::vector< std::pair<bool, const Trk::TrackStateOnSurface* > >::iterator nit = states.begin();
@@ -1037,7 +1030,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
for ( ; nit != nit_end; ++nit ) {
if ( nit->first ) delete nit->second;
}
- return 0;
+ return std::unique_ptr<Trk::Track>();
}
@@ -1066,11 +1059,10 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
trackStateOnSurfaces->insert( trackStateOnSurfaces->begin(), newStates.begin(), newStates.end() );
ATH_MSG_DEBUG("Creating new Track " << newStates.size());
- Trk::Track* newTrack = new Trk::Track( track.info(), trackStateOnSurfaces, track.fitQuality() ? track.fitQuality()->clone() : 0 );
- const Trk::Track* refittedTrack;
- if(m_onlyEO) refittedTrack=m_fitter->fit(*newTrack, m_useFitterOutlierLogic, Trk::muon);
- else refittedTrack=m_builder->fit(*newTrack, m_useFitterOutlierLogic, Trk::muon);
- delete newTrack;
+ std::unique_ptr<Trk::Track> newTrack = std::make_unique<Trk::Track>( track->info(), trackStateOnSurfaces, track->fitQuality() ? track->fitQuality()->clone() : 0 );
+ std::unique_ptr<Trk::Track> refittedTrack;
+ if(m_onlyEO) refittedTrack=std::unique_ptr<Trk::Track>(m_fitter->fit(*newTrack, m_useFitterOutlierLogic, Trk::muon));
+ else refittedTrack=std::unique_ptr<Trk::Track>(m_builder->fit(*newTrack, m_useFitterOutlierLogic, Trk::muon));
if ( refittedTrack ) {
ATH_MSG_DEBUG("New Track " << m_printer->print(*refittedTrack) << std::endl << m_printer->printStations(*refittedTrack) );
@@ -1085,7 +1077,7 @@ const Trk::Track* MuonSegmentRegionRecoveryTool::addMissingChambers( const Trk::
}
return refittedTrack;
}
- return 0;
+ return std::unique_ptr<Trk::Track>();
//delete newStates;
}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
index 5ae1646ca315a1b352b6e335e6a19a8e3047bc2f..c653b80206c5986cf3cc15971cc55e0caa3e58a0 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSegmentRegionRecoveryTool.h
@@ -137,12 +137,12 @@ namespace Muon {
//Fill already on track chamber std::set
void fillOnTrackChambers ( const Trk::Track& theTrack, MuonData& data ) const;
//Select hashes of chambers not yet on track
- const Trk::Track* addMissingChambers( const Trk::Track& track, MuonData& data, bool addMdt ) const;
+ std::unique_ptr<Trk::Track> addMissingChambers( const Trk::Track* track, MuonData& data, bool addMdt ) const;
void addHashes( DETID type, const IRoiDescriptor& roi,
std::set<IdentifierHash>& hashes, const std::set<IdentifierHash>& exclusion ) const;
- const Trk::Track* findHoles( const Trk::Track& track, MuonData& data ) const;
+ std::unique_ptr<Trk::Track> findHoles( const Trk::Track* track, MuonData& data ) const;
SG::ReadCondHandleKey<MuonGM::MuonDetectorManager> m_DetectorManagerKey {this, "DetectorManagerKey",
"MuonDetectorManager",
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
index cf21aacec5ce9643cbb3ef1e910ab44e1857af61..9e11681eec6c7f775c6c5f6ebc78242ff32a94e8 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackBuilder.cxx
@@ -94,7 +94,9 @@ namespace Muon {
// if not refit tool specified do a pure refit
if( m_errorOptimisationTool.empty() ) return m_fitter->refit(track);
- return m_errorOptimisationTool->optimiseErrors(track);
+ std::unique_ptr<Trk::Track> optTrack=m_errorOptimisationTool->optimiseErrors(&track);
+ //have to use release until the whole tool uses unique_ptr
+ return optTrack.release();
}
MuPatTrack* MooTrackBuilder::refine( MuPatTrack& track ) const {
diff --git a/MuonSpectrometer/MuonSimEvent/src/CscHitIdHelper.cxx b/MuonSpectrometer/MuonSimEvent/src/CscHitIdHelper.cxx
index 7a46fe9b9145da30a93ebf860ff4e7bc08a1e616..1fb4c35fe2dbaf5f18d8e724f3b780ef75f6f1d7 100644
--- a/MuonSpectrometer/MuonSimEvent/src/CscHitIdHelper.cxx
+++ b/MuonSpectrometer/MuonSimEvent/src/CscHitIdHelper.cxx
@@ -1,11 +1,19 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonSimEvent/CscHitIdHelper.h"
+#include <iomanip> // for std::array
+
CscHitIdHelper* CscHitIdHelper::m_help = nullptr;
+namespace {
+ const static std::array<char, 4> v1 = {'B','E','T','C'};
+ const static std::array<char, 9> v2 = {'I','M','O','E','1','2','3','4','S'};
+ const static std::array<char, 6> v3 = {'S','L','E','R','F','G'};
+}
+
//private constructor
CscHitIdHelper::CscHitIdHelper() : HitIdHelper()
{
@@ -19,11 +27,6 @@ CscHitIdHelper* CscHitIdHelper::GetHelper()
return m_help;
}
-static char v1[] = {'B','E','T','C'};
-static char v2[] = {'I','M','O','E','1','2','3','4','S'};
-static char v3[] = {'S','L','E','R','F','G'};
-
-
void CscHitIdHelper::Initialize()
{
InitializeField("PhiSector",1,8);
diff --git a/MuonSpectrometer/MuonSimEvent/src/MdtHitIdHelper.cxx b/MuonSpectrometer/MuonSimEvent/src/MdtHitIdHelper.cxx
index 23e7de511d5a5c90d2cd22dcddc740d87490aa96..fdc9330603867e3b24526d89d133ef6a103bf569 100644
--- a/MuonSpectrometer/MuonSimEvent/src/MdtHitIdHelper.cxx
+++ b/MuonSpectrometer/MuonSimEvent/src/MdtHitIdHelper.cxx
@@ -1,12 +1,20 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonSimEvent/MdtHitIdHelper.h"
+
#include <iostream>
+#include <iomanip> // for std::array
MdtHitIdHelper* MdtHitIdHelper::m_help = nullptr;
+namespace {
+ const static std::array<char, 4> v1 = {'B','E','T','C'};
+ const static std::array<char, 9> v2 = {'I','M','O','E','1','2','3','4','S'};
+ const static std::array<char, 7> v3 = {'S','L','E','R','F','G','M'};
+}
+
//private constructor
MdtHitIdHelper::MdtHitIdHelper() : HitIdHelper()
{
@@ -20,11 +28,6 @@ MdtHitIdHelper* MdtHitIdHelper::GetHelper()
return m_help;
}
-static char v1[] = {'B','E','T','C'};
-static char v2[] = {'I','M','O','E','1','2','3','4','S'};
-static char v3[] = {'S','L','E','R','F','G','M'};
-
-
void MdtHitIdHelper::Initialize()
{
InitializeField("PhiSector",1,8);
diff --git a/MuonSpectrometer/MuonSimEvent/src/MicromegasHitIdHelper.cxx b/MuonSpectrometer/MuonSimEvent/src/MicromegasHitIdHelper.cxx
index 0a5a95e5f41f6c778822d27956eb902f24cc2e0b..3cffad17e89494e55e9c32c9b9ba3a7c451522ba 100644
--- a/MuonSpectrometer/MuonSimEvent/src/MicromegasHitIdHelper.cxx
+++ b/MuonSpectrometer/MuonSimEvent/src/MicromegasHitIdHelper.cxx
@@ -1,12 +1,21 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonSimEvent/MicromegasHitIdHelper.h"
+
#include <iostream>
+#include <iomanip> // for std::array
MicromegasHitIdHelper* MicromegasHitIdHelper::m_help = nullptr;
+namespace {
+ const static std::array<char, 1> v1 = {'M'};
+ const static std::array<char, 5> v2 = {'0','1','2','3','4'};
+ const static std::array<char, 2> v3 = {'S','L'};
+ const static std::array<char, 2> v4 = {'1','2'};
+}
+
//private constructor
MicromegasHitIdHelper::MicromegasHitIdHelper() : HitIdHelper()
{
@@ -20,12 +29,6 @@ MicromegasHitIdHelper* MicromegasHitIdHelper::GetHelper()
return m_help;
}
-static char v1[] = {'M'};
-static char v2[] = {'0','1','2','3','4'};
-static char v3[] = {'S','L'};
-static char v4[] = {'1','2'};
-
-
void MicromegasHitIdHelper::Initialize()
{
InitializeField("PhiSector",1,16);
diff --git a/MuonSpectrometer/MuonSimEvent/src/RpcHitIdHelper.cxx b/MuonSpectrometer/MuonSimEvent/src/RpcHitIdHelper.cxx
index 1506256c0156fab61baa231e2607250647b94d43..fd8c0da1ffc42cb5cef3fc791b68629ecff0cc2e 100644
--- a/MuonSpectrometer/MuonSimEvent/src/RpcHitIdHelper.cxx
+++ b/MuonSpectrometer/MuonSimEvent/src/RpcHitIdHelper.cxx
@@ -4,8 +4,16 @@
#include "MuonSimEvent/RpcHitIdHelper.h"
+#include <iomanip> // for std::array
+
RpcHitIdHelper* RpcHitIdHelper::m_help = nullptr;
+namespace {
+ const static std::array<char, 4> v1 = {'B','E','T','C'};
+ const static std::array<char, 9> v2 = {'I','M','O','E','1','2','3','4','S'};
+ const static std::array<char, 6> v3 = {'S','L','E','R','F','G'};
+}
+
//private constructor
RpcHitIdHelper::RpcHitIdHelper() : HitIdHelper()
{
@@ -31,11 +39,6 @@ RpcHitIdHelper* RpcHitIdHelper::GetHelper(unsigned int nGasGaps)
return m_help;
}
-static char v1[] = {'B','E','T','C'};
-static char v2[] = {'I','M','O','E','1','2','3','4','S'};
-static char v3[] = {'S','L','E','R','F','G'};
-
-
void RpcHitIdHelper::Initialize(unsigned int nGasGaps)
{
InitializeField("PhiSector",1,8);
diff --git a/MuonSpectrometer/MuonSimEvent/src/TgcHitIdHelper.cxx b/MuonSpectrometer/MuonSimEvent/src/TgcHitIdHelper.cxx
index 81122f16a42321c874d7f56de3ae5198516d67e8..60e3ac3545478fc7a570c01d75e71157b9860cf2 100644
--- a/MuonSpectrometer/MuonSimEvent/src/TgcHitIdHelper.cxx
+++ b/MuonSpectrometer/MuonSimEvent/src/TgcHitIdHelper.cxx
@@ -1,11 +1,19 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonSimEvent/TgcHitIdHelper.h"
+#include <iomanip> // for std::array
+
TgcHitIdHelper* TgcHitIdHelper::m_help = nullptr;
+namespace {
+ const static std::array<char, 4> v1 = {'B','E','T','C'};
+ const static std::array<char, 9> v2 = {'I','M','O','E','1','2','3','4','S'};
+ const static std::array<char, 6> v3 = {'S','L','E','R','F','G'};
+}
+
//private constructor
TgcHitIdHelper::TgcHitIdHelper() : HitIdHelper()
{
@@ -19,11 +27,6 @@ TgcHitIdHelper* TgcHitIdHelper::GetHelper()
return m_help;
}
-static char v1[] = {'B','E','T','C'};
-static char v2[] = {'I','M','O','E','1','2','3','4','S'};
-static char v3[] = {'S','L','E','R','F','G'};
-
-
void TgcHitIdHelper::Initialize()
{
InitializeField("StationPhi",1,48);
diff --git a/MuonSpectrometer/MuonSimEvent/src/sTgcHitIdHelper.cxx b/MuonSpectrometer/MuonSimEvent/src/sTgcHitIdHelper.cxx
index fa9995dfd692f727d551098c5f22c398df6a2da2..395e7a64dd0d3c85a686a27efd3a4e1d8682daae 100644
--- a/MuonSpectrometer/MuonSimEvent/src/sTgcHitIdHelper.cxx
+++ b/MuonSpectrometer/MuonSimEvent/src/sTgcHitIdHelper.cxx
@@ -1,12 +1,21 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonSimEvent/sTgcHitIdHelper.h"
+
#include <iostream>
+#include <iomanip> // for std::array
sTgcHitIdHelper* sTgcHitIdHelper::m_help = nullptr;
+namespace {
+ const static std::array<char, 1> v1 = {'T'};
+ const static std::array<char, 2> v2 = {'S','L'};
+ const static std::array<char, 5> v3 = {'0','1','2','3','4'};
+ const static std::array<char, 2> v4 = {'1','2'};
+}
+
//private constructor
sTgcHitIdHelper::sTgcHitIdHelper() : HitIdHelper(){
InitializeStationName();
@@ -18,12 +27,6 @@ sTgcHitIdHelper* sTgcHitIdHelper::GetHelper(){
return m_help;
}
-static char v1[] = {'T'};
-static char v2[] = {'S','L'};
-static char v3[] = {'0','1','2','3','4'};
-static char v4[] = {'1','2'};
-
-
void sTgcHitIdHelper::Initialize(){
InitializeField("PhiSector",1,16);
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
index af937eb1e4e74d41b6b1d1e3328c60dfa6cb93c3..da1a66572d62e3f8ba36b8a0ae3dd8240e57f933 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MDTMonitorAlgorithm.py
@@ -361,38 +361,81 @@ def MdtMonitoringConfig(inputFlags):
path='Overview/TDC', xbins=100, xmin=0, xmax=2000)
- if(ilayer=="Extra"):
- titleOccvsLbPerRegionPerLayer = "OccupancyVsLB_"+iregion+"OuterPlusExtra"
- var="lb_mon,y_mon_bin_"+iregion+"_"+ilayer+"PlusExtra;"+titleOccvsLbPerRegionPerLayer
- elif(ilayer=="Outer"):
- titleOccvsLbPerRegionPerLayer = "OccupancyVsLB_"+iregion+ilayer+"PlusExtra"
- var="lb_mon,y_mon_bin_"+iregion+"_"+ilayer+";"+titleOccvsLbPerRegionPerLayer
+ if(ilayer=="Extra" or ilayer=="Outer"):
+ labelsY=getMDTLabelx("labelY_OccupancyVsLB_"+iregion+"_OuterExtra")
+ if(ilayer=="Extra" ):
+ titleOccvsLbPerRegionPerLayer = "OccupancyVsLB_"+iregion+"OuterPlusExtra"
+ var="lb_mon,y_mon_bin_"+iregion+"_"+ilayer+"PlusExtra;"+titleOccvsLbPerRegionPerLayer
+ elif(ilayer=="Outer"):
+ titleOccvsLbPerRegionPerLayer = "OccupancyVsLB_"+iregion+ilayer+"PlusExtra"
+ var="lb_mon,y_mon_bin_"+iregion+"_"+ilayer+";"+titleOccvsLbPerRegionPerLayer
+ if(iregion=="BA"):
+ maxy=118 # outer sideA
+ if(iregion=="BC"):
+ maxy=116 # outer sideC
+ if(iregion=="EA"):
+ maxy=103 # outer sideA
+ if(iregion=="EC"):
+ maxy=127 # outer sideA
else :
+ labelsY=getMDTLabelx("labelY_OccupancyVsLB_"+iregion+"_"+ilayer)
+ if(ilayer=="Inner"):
+ if(iregion=="BA" or iregion=="BC"):
+ maxy=122
+ if(iregion=="EA" or iregion=="EC"):
+ maxy=50
+ elif (ilayer=="Middle"):
+ if(iregion=="BA" or iregion=="BC"):
+ maxy=95
+ if(iregion=="EA" or iregion=="EC"):
+ maxy=80
titleOccvsLbPerRegionPerLayer = "OccupancyVsLB_"+iregion+ilayer
var="lb_mon,y_mon_bin_"+iregion+"_"+ilayer+";"+titleOccvsLbPerRegionPerLayer
mdtRegionGroup.defineHistogram(var, title=titleOccvsLbPerRegionPerLayer+";LB;[Eta - Phi]", type='TH2F',
- path='Overview', xbins=834, xmin=1, xmax=2502, ybins=122, ymin=0, ymax=122) #fix y range and I should put labels on the y-axis only, not clear how
+ path='Overview', xbins=834, xmin=1, xmax=2502, ybins=122, ymin=0, ymax=maxy, ylabels=labelsY, opt='kAddBinsDynamically')
for icrate in crates:
+ maxy=122
+ labelsY=getMDTLabelx("labelY_OccupancyVsLB_"+iregion+icrate)
+ if(iregion=="BA" or iregion=="BC"):
+ if(icrate=="01"):
+ maxy=73
+ elif(icrate=="02"):
+ maxy=72
+ elif(icrate=="03"):
+ maxy= 80
+ elif(icrate=="04"):
+ maxy= 79
+ elif(iregion=="EA" or iregion=="EC"):
+ if(icrate=="01"):
+ maxy=73
+ elif(icrate=="02"):
+ maxy=71
+ elif(icrate=="03"):
+ maxy= 73
+ elif(icrate=="04"):
+ maxy= 72
+
titleOccvsLbPerRegionPerCrate = "OccupancyVsLB_"+iregion+icrate
var="lb_mon,y_mon_bin_bycrate_"+iregion+"_"+icrate+";"+titleOccvsLbPerRegionPerCrate
mdtRegionGroup.defineHistogram(var, title=titleOccvsLbPerRegionPerCrate+";LB;[Eta - Phi]", type='TH2F',
- path='Overview', xbins=834, xmin=1, xmax=2502, ybins=122, ymin=0, ymax=122) #fix y range and I should put labels on the y-axis only, not clear how
+ path='Overview', xbins=834, xmin=1, xmax=2502, ybins=122, ymin=0, ymax=maxy, ylabels=labelsY, opt='kAddBinsDynamically')
titleOccvsLbPerRegionPerCrate_ontrack = "OccupancyVsLB_ontrack_"+iregion+icrate
var="lb_mon,y_mon_bin_bycrate_ontrack_"+iregion+"_"+icrate+";"+titleOccvsLbPerRegionPerCrate_ontrack
mdtRegionGroup.defineHistogram(var, title=titleOccvsLbPerRegionPerCrate_ontrack+";LB;[Eta - Phi]", type='TH2F',
- path='Overview', xbins=834, xmin=1, xmax=2502, ybins=122, ymin=0, ymax=122) #fix y range and I should put labels on the y-axis only, not clear how
+ path='Overview', xbins=834, xmin=1, xmax=2502, ybins=122, ymin=0, ymax=maxy, ylabels=labelsY, opt='kAddBinsDynamically')
#mdtoccvslb_summaryPerSector->GetYaxis()->SetBinLabel(1,"BA");
#mdtoccvslb_summaryPerSector->GetYaxis()->SetBinLabel(17,"BC");
#mdtoccvslb_summaryPerSector->GetYaxis()->SetBinLabel(33,"EA");
#mdtoccvslb_summaryPerSector->GetYaxis()->SetBinLabel(49,"EC");
+
+ labelsY=getMDTLabelx("labelY_OccupancyVsLB")
mdtGroup.defineHistogram('lb_mon,sector;OccupancyPerSectorVsLB', type='TH2F',
- title='OccupancyPerSectorVsLB;LB;[Phi]',
- path='Overview', xbins=834,xmin=1.,xmax=2502., ybins=64, ymin=0., ymax=64.
- )
+ title='OccupancyPerSectorVsLB;LB;[Phi]',
+ path='Overview', xbins=834,xmin=1.,xmax=2502., ybins=64, ymin=0., ymax=64., ylabels=labelsY, opt='kAddBinsDynamically')
#histograms per chambers
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MdtRawMonLabels.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MdtRawMonLabels.py
index 13f423f6cf1d1c6c5fb9770c522e0479033fe833..73e9179999d52917498cba3bf564c5543a4b3f49 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MdtRawMonLabels.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/python/MdtRawMonLabels.py
@@ -105,3 +105,50 @@ labels_sectorPhi15=['BIM1A15', 'BIM1C15', 'BIM2A15', 'BIM2C15', 'BIM3A15', 'BIM3
labels_sectorPhi16=['BEE1A16', 'BEE1C16', 'BEE2A16', 'BEE2C16', 'BIS1A16', 'BIS1C16', 'BIS2A16', 'BIS2C16', 'BIS3A16', 'BIS3C16', 'BIS4A16', 'BIS4C16', 'BIS5A16', 'BIS5C16', 'BIS6A16', 'BIS6C16', 'BIS7A16', 'BIS7C16', 'BIS8A16', 'BIS8C16', 'BMS1A16', 'BMS1C16', 'BMS2A16', 'BMS2C16', 'BMS3A16', 'BMS3C16', 'BMS4A16', 'BMS4C16', 'BMS5A16', 'BMS5C16', 'BMS6A16', 'BMS6C16', 'BOS1A16', 'BOS1C16', 'BOS2A16', 'BOS2C16', 'BOS3A16', 'BOS3C16', 'BOS4A16', 'BOS4C16', 'BOS5A16', 'BOS5C16', 'BOS6A16', 'BOS6C16', 'EES1A16', 'EES1C16', 'EES2A16', 'EES2C16', 'EIS1A16', 'EIS1C16', 'EIS2A16', 'EIS2C16', 'EMS1A16', 'EMS1C16', 'EMS2A16', 'EMS2C16', 'EMS3A16', 'EMS3C16', 'EMS4A16', 'EMS4C16', 'EMS5A16', 'EMS5C16', 'EOS1A16', 'EOS1C16', 'EOS2A16', 'EOS2C16', 'EOS3A16', 'EOS3C16', 'EOS4A16', 'EOS4C16', 'EOS5A16', 'EOS5C16', 'EOS6A16', 'EOS6C16']
+label_empty = ['']
+
+labelY_OccupancyVsLB_BA01 = ['BIL']+label_empty*11+['BIS']+label_empty*11+['BME', 'BML']+label_empty*11+['BMS']+label_empty*11+['BOL']+label_empty*11+['BOS']+label_empty*11
+labelY_OccupancyVsLB_BC01 = labelY_OccupancyVsLB_BA01
+labelY_OccupancyVsLB_BA02 = ['BIL']+label_empty*11+['BIS']+label_empty*11+['BML']+label_empty*11+['BMS']+label_empty*11+['BOL']+label_empty*11+['BOS']+label_empty*11
+labelY_OccupancyVsLB_BC02 = labelY_OccupancyVsLB_BA02
+
+labelY_OccupancyVsLB_BA03 = ['BIL']+label_empty*5+['BIM']+label_empty*4+['BIR']+label_empty*5+['BIS']+label_empty*11+['BMF']+label_empty*2+['BMG']+label_empty*2+['BML']+label_empty*11+['BMS']+label_empty*5+['BOF']+label_empty*3+['BOG']+label_empty*4+['BOL']+label_empty*11+['BOS']+label_empty*5
+labelY_OccupancyVsLB_BC03 = ['BIL']+label_empty*5+['BIM']+label_empty*4+['BIR']+label_empty*5+['BIS']+label_empty*11+['BMF']+label_empty*2+['BMG']+label_empty*2+['BML']+label_empty*11+['BMS']+label_empty*5+['BOF']+label_empty*3+['BOG']+label_empty*3+['BOL']+label_empty*11+['BOS']+label_empty*6
+
+labelY_OccupancyVsLB_BA04 = ['BIL']+label_empty*5+['BIM']+label_empty*4+['BIR']+label_empty*5+['BIS']+label_empty*11+['BMF']+label_empty*2+['BMG']+label_empty*2+['BML']+label_empty*10+['BMS']+label_empty*5+['BOF']+label_empty*3+['BOG']+label_empty*4+['BOL']+label_empty*12+['BOS']+label_empty*4
+labelY_OccupancyVsLB_BC04 = ['BIL']+label_empty*5+['BIM']+label_empty*4+['BIR']+label_empty*5+['BIS']+label_empty*11+['BMF']+label_empty*2+['BMG']+label_empty*2+['BML']+label_empty*10+['BMS']+label_empty*5+['BOF']+label_empty*3+['BOG']+label_empty*3+['BOL']+label_empty*12+['BOS']+label_empty*5
+
+labelY_OccupancyVsLB_EA01 = ['BEE']+label_empty*3+['BIS']+label_empty*3+['EEL']+label_empty*3+['EES']+label_empty*3+['EIL']+label_empty*8+['EIS']+label_empty*3+['EML']+label_empty*9+['EMS']+label_empty*9+['EOL']+label_empty*11+['EOS']+label_empty*11
+labelY_OccupancyVsLB_EC01 = labelY_OccupancyVsLB_EA01
+labelY_OccupancyVsLB_EA03 = labelY_OccupancyVsLB_EA01
+labelY_OccupancyVsLB_EC03 = labelY_OccupancyVsLB_EA01
+
+
+labelY_OccupancyVsLB_EA02 = ['BEE']+label_empty*3+['BIS']+label_empty*3+['EEL']+label_empty*2+['EES']+label_empty*3+['EIL']+label_empty*7+['EIS']+label_empty*3+['EML']+label_empty*9+['EMS']+label_empty*9+['EOL']+label_empty*11+['EOS']+label_empty*11
+labelY_OccupancyVsLB_EC02 = labelY_OccupancyVsLB_EA02
+
+labelY_OccupancyVsLB_EA04 = ['BEE']+label_empty*3+['BIS']+label_empty*3+['EEL']+label_empty*3+['EES']+label_empty*3+['EIL']+label_empty*7+['EIS']+label_empty*3+['EML']+label_empty*9+['EMS']+label_empty*9+['EOL']+label_empty*11+['EOS']+label_empty*11
+labelY_OccupancyVsLB_EC04 = labelY_OccupancyVsLB_EA04
+
+
+labelY_OccupancyVsLB = ['BA']+label_empty*15+['BC']+label_empty*15+['EA']+label_empty*15+['EC']+label_empty*15
+
+labelY_OccupancyVsLB_BA_Inner = ['BI1']+label_empty*17+['BI2']+label_empty*17+['BI3']+label_empty*17+['BI4']+label_empty*17+['BI5']+label_empty*17+['BI6']+label_empty*15+['BI7']+label_empty*7+['BI8']+label_empty*7
+labelY_OccupancyVsLB_BC_Inner=labelY_OccupancyVsLB_BA_Inner
+
+labelY_OccupancyVsLB_BA_Middle = ['BM1']+label_empty*15+['BM2']+label_empty*15+['BM3']+label_empty*15+['BM4']+label_empty*15+['BM5']+label_empty*15+['BM6']+label_empty*14
+labelY_OccupancyVsLB_BC_Middle=labelY_OccupancyVsLB_BA_Middle
+
+labelY_OccupancyVsLB_BA_OuterExtra=['BO0']+label_empty*2+['BO1']+label_empty*14+['BO2']+label_empty*15+['BO3']+label_empty*15+['BO4']+label_empty*15+['BO5']+label_empty*15+['BO6']+label_empty*15+['BO7,8']+label_empty*3+['BE1']+label_empty*7+['BE2']+label_empty*7
+labelY_OccupancyVsLB_BC_OuterExtra=['BO1']+label_empty*15+['BO2']+label_empty*15+['BO3']+label_empty*15+['BO4']+label_empty*15+['BO5']+label_empty*15+['BO6']+label_empty*15+['BO7,8']+label_empty*3+['BE1']+label_empty*7+['BE2']+label_empty*7
+
+labelY_OccupancyVsLB_EA_Inner = ['EI1']+label_empty*15+['EI2']+label_empty*15+['EI3']+label_empty*7+['EI4']+label_empty*7+['EI5']+label_empty*1
+labelY_OccupancyVsLB_EC_Inner = labelY_OccupancyVsLB_EA_Inner
+
+labelY_OccupancyVsLB_EA_Middle = ['EM1']+label_empty*15+['EM2']+label_empty*15+['EM3']+label_empty*15+['EM4']+label_empty*15+['EM5']+label_empty*15
+labelY_OccupancyVsLB_EC_Middle = labelY_OccupancyVsLB_EA_Middle
+
+labelY_OccupancyVsLB_EA_OuterExtra = ['EO1']+label_empty*15+['EO2']+label_empty*15+['EO3']+label_empty*15+['EO4']+label_empty*15+['EO5']+label_empty*15+['EO6']+label_empty*15+['EE1,2']+label_empty*6
+labelY_OccupancyVsLB_EC_OuterExtra = ['EO1']+label_empty*15+['EO2']+label_empty*15+['EO3']+label_empty*15+['EO4']+label_empty*15+['EO5']+label_empty*15+['EO6']+label_empty*15+['EE1']+label_empty*15+['EE2']+label_empty*14
+
+
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/CMakeLists.txt
index 61b27027550c137b8154b169727b8ad21f38e5b0..d9f908147e5f1176fbf11218b422362f2753268d 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/CMakeLists.txt
@@ -40,15 +40,17 @@ atlas_install_joboptions( share/*_jobOptions.py )
atlas_install_scripts( share/*_eljob.py )
if( XAOD_STANDALONE )
- atlas_add_test( testJobData
- SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFullSim
- SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFastSim
- SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
- PROPERTIES TIMEOUT 600 )
+ # temporarily disable these until AnalysisBase is fully functional
+
+ # atlas_add_test( testJobData
+ # SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFullSim
+ # SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFastSim
+ # SCRIPT EgammaAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
+ # PROPERTIES TIMEOUT 600 )
else()
atlas_add_test( testJobData
SCRIPT athena.py
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/EgammaAnalysisAlgorithms/EgammaIsGoodOQSelectionTool.h b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/EgammaAnalysisAlgorithms/EgammaIsGoodOQSelectionTool.h
index 179e9b7fac68d5b9f26c772302b8722e880533eb..2cbe5ab4240262b55f64c2585ced7da6599a317d 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/EgammaAnalysisAlgorithms/EgammaIsGoodOQSelectionTool.h
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/EgammaAnalysisAlgorithms/EgammaIsGoodOQSelectionTool.h
@@ -34,10 +34,10 @@ namespace CP {
/// @{
/// Get the results for the last object processed
- virtual const Root::TAccept& getTAccept() const override;
+ virtual const asg::AcceptInfo& getAcceptInfo() const override;
/// Get the results for a given particle
- virtual const Root::TAccept&
+ virtual asg::AcceptData
accept( const xAOD::IParticle* part ) const override;
/// @}
@@ -60,7 +60,7 @@ namespace CP {
/// @}
/// Object handling the e/gamma selection decision
- mutable Root::TAccept m_accept{ "EgammaOQ" };
+ asg::AcceptInfo m_accept{ "EgammaOQ" };
/// Index of the object quality cut
int m_oqCutIndex{ -1 };
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsGoodOQSelectionTool.cxx b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsGoodOQSelectionTool.cxx
index ba2b504cecca8274120b29dfc87096794860d222..eb94bf403d084ebc7bf7431271d35c230031bb21 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsGoodOQSelectionTool.cxx
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsGoodOQSelectionTool.cxx
@@ -23,32 +23,32 @@ namespace CP {
"Mask to require passing object quality bits with" );
}
- const Root::TAccept& EgammaIsGoodOQSelectionTool::getTAccept() const {
+ const asg::AcceptInfo& EgammaIsGoodOQSelectionTool::getAcceptInfo() const {
// Return the internal object.
return m_accept;
}
- const Root::TAccept& EgammaIsGoodOQSelectionTool::
+ asg::AcceptData EgammaIsGoodOQSelectionTool::
accept( const xAOD::IParticle* part ) const {
// Reset the decision object.
- m_accept.clear();
+ asg::AcceptData accept {&m_accept};
// Cast the particle to an e/gamma type.
const xAOD::Egamma* eg = nullptr;
if( ( part->type() != xAOD::Type::Electron ) &&
( part->type() != xAOD::Type::Photon ) ) {
ATH_MSG_WARNING( "Non-e/gamma object received" );
- return m_accept;
+ return accept;
}
eg = static_cast< const xAOD::Egamma* >( part );
// Calculate the decision.
- m_accept.setCutResult( m_oqCutIndex, eg->isGoodOQ( m_mask ) );
+ accept.setCutResult( m_oqCutIndex, eg->isGoodOQ( m_mask ) );
// Return the internal object.
- return m_accept;
+ return accept;
}
StatusCode EgammaIsGoodOQSelectionTool::initialize() {
diff --git a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationSelectionAlg.cxx b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationSelectionAlg.cxx
index 35a77e1e63ecc64bfcec4f7ab610e842cf215e0e..243aceff807631151e7ce3675c7d04fb48b85240 100644
--- a/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationSelectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms/Root/EgammaIsolationSelectionAlg.cxx
@@ -45,10 +45,7 @@ namespace CP
ANA_CHECK (m_systematicsList.initialize());
ANA_CHECK (m_preselection.initialize());
- Root::TAccept blankAccept = m_selectionTool->getObjTAccept();
- // Just in case this isn't initially set up as a failure clear it this one
- // time. This only calls reset on the bitset
- blankAccept.clear();
+ asg::AcceptData blankAccept {&m_selectionTool->getObjAcceptInfo()};
m_setOnFail = selectionFromAccept(blankAccept);
return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/CMakeLists.txt
index a43af6b8437e1c40611133a73b0d9a0c5fe0f585..21b43b73e73ae78d640ec2eecbb379b766db1aed 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/CMakeLists.txt
@@ -43,15 +43,17 @@ atlas_install_joboptions( share/*_jobOptions.py )
atlas_install_scripts( share/*_eljob.py )
if( XAOD_STANDALONE )
- atlas_add_test( testJobData
- SCRIPT MuonAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFullSim
- SCRIPT MuonAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( testJobFastSim
- SCRIPT MuonAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
- PROPERTIES TIMEOUT 600 )
+ # temporarily disable these until AnalysisBase is fully functional
+
+ # atlas_add_test( testJobData
+ # SCRIPT MuonAnalysisAlgorithmsTest_eljob.py --data-type data --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFullSim
+ # SCRIPT MuonAnalysisAlgorithmsTest_eljob.py --data-type mc --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( testJobFastSim
+ # SCRIPT MuonAnalysisAlgorithmsTest_eljob.py --data-type afii --unit-test
+ # PROPERTIES TIMEOUT 600 )
else()
atlas_add_test( testJobData
SCRIPT athena.py
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonIsolationAlg.cxx b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonIsolationAlg.cxx
index cc4481ec6b09373543563a8945888bf094334cd5..272f1daa214590d60848ed7ec74e7db5d5b167ae 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonIsolationAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonIsolationAlg.cxx
@@ -47,10 +47,7 @@ namespace CP
ANA_CHECK (m_systematicsList.initialize());
ANA_CHECK (m_preselection.initialize());
- Root::TAccept blankAccept = m_isolationTool->getObjTAccept();
- // Just in case this isn't initially set up as a failure clear it this one
- // time. This only calls reset on the bitset
- blankAccept.clear();
+ asg::AcceptData blankAccept {&m_isolationTool->getObjAcceptInfo()};
m_setOnFail = selectionFromAccept(blankAccept);
return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonSelectionAlg.cxx b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonSelectionAlg.cxx
index a586bbcbb8c4df56121832e5e6bc18655d90a136..0e0d731fd76aafb4d4e3ca49275855639b1e1041 100644
--- a/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonSelectionAlg.cxx
+++ b/PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms/Root/MuonSelectionAlg.cxx
@@ -52,10 +52,7 @@ namespace CP
ANA_CHECK (m_preselection.initialize());
auto *selectionTool = dynamic_cast<IAsgSelectionTool *>(&*m_selectionTool);
- Root::TAccept blankAccept = selectionTool->getTAccept();
- // Just in case this isn't initially set up as a failure clear it this one
- // time. This only calls reset on the bitset
- blankAccept.clear();
+ asg::AcceptData blankAccept {&selectionTool->getAcceptInfo()};
m_setOnFail = selectionFromAccept(blankAccept);
return StatusCode::SUCCESS;
diff --git a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt
index 3a32fb71c0055535e837f92e0ed95fbc66e96d8a..73816a792040e7cd137d3e4bda9707fd165e08cf 100644
--- a/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/TriggerAnalysisAlgorithms/CMakeLists.txt
@@ -38,15 +38,18 @@ atlas_install_joboptions( share/*_jobOptions.py )
atlas_install_scripts( share/*_eljob.py )
if( XAOD_STANDALONE )
- atlas_add_test( TriggerAlgorithmsTestJobData
- SCRIPT TriggerAlgorithmsTest_eljob.py --data-type data --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( TriggerAlgorithmsTestJobFullSim
- SCRIPT TriggerAlgorithmsTest_eljob.py --data-type mc --unit-test
- PROPERTIES TIMEOUT 600 )
- atlas_add_test( TriggerAlgorithmsTestJobFastSim
- SCRIPT TriggerAlgorithmsTest_eljob.py --data-type afii --unit-test
- PROPERTIES TIMEOUT 600 )
+ # FIX ME: temporarily disabled as part of the migration of AnalysisBase
+ # to master
+
+ # atlas_add_test( TriggerAlgorithmsTestJobData
+ # SCRIPT TriggerAlgorithmsTest_eljob.py --data-type data --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( TriggerAlgorithmsTestJobFullSim
+ # SCRIPT TriggerAlgorithmsTest_eljob.py --data-type mc --unit-test
+ # PROPERTIES TIMEOUT 600 )
+ # atlas_add_test( TriggerAlgorithmsTestJobFastSim
+ # SCRIPT TriggerAlgorithmsTest_eljob.py --data-type afii --unit-test
+ # PROPERTIES TIMEOUT 600 )
else()
atlas_add_test( TriggerAlgorithmsTestJobData
SCRIPT athena.py
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx
index 77df975eb7863da44fc1dd5b72a3d659dbb182b3..fc1eaf0006d745d7ecdf0bfef80522d990fa3ea6 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdEvtStore.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IDictLoaderSvc.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdNtuple.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdNtuple.cxx
index d009c3b2c7e0d9f5925b999e18ef30907a270955..7f016b01dd78fe354714e369dacbee2cd152b461 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdNtuple.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/AthExReadD3pdNtuple.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IDictLoaderSvc.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.cxx
index b3edf57121b2cc0a38d9ef766f0deddbc4a3d122..ca654849c29eb8faeec1b6a0e886ff64d793af2b 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/WriteTruthParticles.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// McParticleKernel includes
#include "McParticleKernel/ITruthParticleCnvTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/ReadINav4MomAssocs.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/ReadINav4MomAssocs.cxx
index 3245dfa39f716f1021f6b1d2db044e91d718ae01..e6bf57d320365211ac1dc45b0c57c7227858c808 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/ReadINav4MomAssocs.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/ReadINav4MomAssocs.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INav4MomAssocs.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
index 1e22bf0d22f28c8d50e1391f3082c6d2c0900acc..93542497f11a139a31c01204016a570bbfc507f6 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INav4MomAssocs.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.cxx
index 4a410005e11955f2f4dbae90d1a6a60adfa5cfe0..4ac57f25a55e665f67af27571d4024f9197ef2bf 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.h
index fbbfe12fc876c7690551b6b86aad6b43e6c680dd..a0099b1ad5cea8aed3f424155a8f5443290518e1 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/AddVarAlg.h
@@ -59,16 +59,16 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'AddVarTo' property
- void setupInputContainer( Property& /*prop*/ );
+ void setupInputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'VarName' property
- void setupVarName( Property& /*prop*/ );
+ void setupVarName( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'VarType' property
- void setupVarType( Property& /*prop*/ );
+ void setupVarType( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'Selection' property
- void setupSelection( Property& /*prop*/ );
+ void setupSelection( Gaudi::Details::PropertyBase& /*prop*/ );
@@ -127,25 +127,25 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'AddVarTo' property
-inline void AddVarAlg::setupInputContainer( Property& /*prop*/ ) {
+inline void AddVarAlg::setupInputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'VarName' property
-inline void AddVarAlg::setupVarName( Property& /*prop*/ ) {
+inline void AddVarAlg::setupVarName( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setVarName = true;
return;
}
/// This internal method will realize if a user sets the 'VarType' property
-inline void AddVarAlg::setupVarType( Property& /*prop*/ ) {
+inline void AddVarAlg::setupVarType( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setVarType = true;
return;
}
/// This internal method will realize if a user sets the 'Selection' property
-inline void AddVarAlg::setupSelection( Property& /*prop*/ ) {
+inline void AddVarAlg::setupSelection( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSelection = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/CutAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/CutAlg.cxx
index 1b4211dd5cc00f6f0de2ddfd6e4915758067ccf6..7642a29a3d29b82625be3b151c3385bf2a1890b6 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/CutAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/CutAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "ExpressionEvaluation/ExpressionParser.h"
#include "ExpressionEvaluation/SGxAODProxyLoader.h"
#include "ExpressionEvaluation/SGNTUPProxyLoader.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/EventDecisionAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/EventDecisionAlg.cxx
index de769b8900b474ac5fb6dc5e21d8e184f09d7904..355ed8eed020dec4a5e55df990090a2f42721f1e 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/EventDecisionAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/EventDecisionAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/IDecisionSvc.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerAlg.h
index 4f458ab7edf45c4d7f4a2b01ea786241e977f3fb..1b550bbbb19276f8c716d5f3f3408d28b6f9d335 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerAlg.h
@@ -71,22 +71,22 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'MissingETObject' property
- void setupMissingETObject( Property& /*prop*/ );
+ void setupMissingETObject( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'OutputContainer' property
- void setupOutputContainer( Property& /*prop*/ );
+ void setupOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'WriteSplitOutputContainer' property
- void setupWriteSplitOutputContainer( Property& /*prop*/ );
+ void setupWriteSplitOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'SetPdgId' property
- void setupSetPdgId( Property& /*prop*/ );
+ void setupSetPdgId( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'SortConstituents' property
- void setupSort( Property& /*prop*/ );
+ void setupSort( Gaudi::Details::PropertyBase& /*prop*/ );
@@ -151,37 +151,37 @@ private:
// Inline methods
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ParticleCombinerAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKeyList = true;
return;
}
/// This internal method will realize if a user sets the 'MissingETObject' property
-inline void ParticleCombinerAlg::setupMissingETObject( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupMissingETObject( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setMetName = true;
return;
}
/// This internal method will realize if a user sets the 'OutputContainer' property
-inline void ParticleCombinerAlg::setupOutputContainer( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setOutCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'WriteSplitOutputContainer' property
-inline void ParticleCombinerAlg::setupWriteSplitOutputContainer( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupWriteSplitOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setWriteSplitAux = true;
return;
}
/// This internal method will realize if a user sets the 'SetPdgId' property
-inline void ParticleCombinerAlg::setupSetPdgId( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupSetPdgId( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setPdgId = true;
return;
}
/// This internal method will realize if a user sets the 'SortConstituents' property
-inline void ParticleCombinerAlg::setupSort( Property& /*prop*/ ) {
+inline void ParticleCombinerAlg::setupSort( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSort = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.h
index a521ae857da5d5b5ce5e76eae6812bf9d70664b7..7f57a6101afd244e3f9759287152bbeb6c8c7a0a 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleCombinerTool.h
@@ -30,7 +30,7 @@
#include <vector>
// Athena includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
index e66c049af8e135b2e7574b062621d4127e924b34..fd4c83812d9c9ecfea902693e5824fe9b5d6c803 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSelectionAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
#include "ExpressionEvaluation/ExpressionParser.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
index f2a33b296cdcf9a64ba7386dde726a0f3eb2cd11..5c8aa14ebbc16233ff264bf0892cbc3ae8cc50a9 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IAugmentationTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
index 060f8aeb7923af02d1c34bf28b4b3b53989349f2..a9ec50eccdaff8ebe08a66319b8565ec250bff94 100644
--- a/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/EventUtils/src/ParticleSortingAlg.h
@@ -60,16 +60,16 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'InputContainer' property
- void setupInputContainer( Property& /*prop*/ );
+ void setupInputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'OutputContainer' property
- void setupOutputContainer( Property& /*prop*/ );
+ void setupOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'SortVariable' property
- void setupSortVar( Property& /*prop*/ );
+ void setupSortVar( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'SortDeceding' property
- void setupSortDescending( Property& /*prop*/ );
+ void setupSortDescending( Gaudi::Details::PropertyBase& /*prop*/ );
@@ -124,26 +124,26 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'InputContainer' property
-inline void ParticleSortingAlg::setupInputContainer( Property& /*prop*/ ) {
+inline void ParticleSortingAlg::setupInputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'OutputContainer' property
-inline void ParticleSortingAlg::setupOutputContainer( Property& /*prop*/ ) {
+inline void ParticleSortingAlg::setupOutputContainer( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setOutCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'SortVariable' property
-inline void ParticleSortingAlg::setupSortVar( Property& /*prop*/ )
+inline void ParticleSortingAlg::setupSortVar( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_setSortVar = true;
return;
}
/// This internal method will realize if a user sets the 'SortDeceding' property
-inline void ParticleSortingAlg::setupSortDescending( Property& /*prop*/ )
+inline void ParticleSortingAlg::setupSortDescending( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_setSortDescending = true;
return;
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/PileupReweighting/PileupReweightingTool.h b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/PileupReweighting/PileupReweightingTool.h
index 93fb1f2ded7204a9745e66d4d02937e22c440144..bdd43a31fdb805f949c825395dac7e842344c152 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/PileupReweighting/PileupReweightingTool.h
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/PileupReweighting/PileupReweightingTool.h
@@ -126,7 +126,7 @@ namespace CP {
CP::SystematicCode applySystematicVariation( const CP::SystematicSet& systConfig );
#ifndef XAOD_STANDALONE
- void updateHandler(Property& /*p*/);
+ void updateHandler(Gaudi::Details::PropertyBase& /*p*/);
#endif
protected:
diff --git a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/PileupReweightingTool.cxx b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/PileupReweightingTool.cxx
index 10a957c649da96bc61f08e8d779c24cf5f906caf..8c5ecf033fa85a47df9a92ea1da1adc3073c3bd8 100644
--- a/PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/PileupReweightingTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/PileupReweighting/Root/PileupReweightingTool.cxx
@@ -73,7 +73,7 @@ PileupReweightingTool::PileupReweightingTool( const std::string& name ) :CP::TPi
#ifndef XAOD_STANDALONE
//attached update handler to the outputlevel property, so we can pass changes on to the underlying tool
auto props = getProperties();
- for( Property* prop : props ) {
+ for( Gaudi::Details::PropertyBase* prop : props ) {
if( prop->name() != "OutputLevel" ) {
continue;
}
@@ -86,7 +86,7 @@ PileupReweightingTool::PileupReweightingTool( const std::string& name ) :CP::TPi
#ifndef XAOD_STANDALONE
//rootcore can't do this yet!
-void PileupReweightingTool::updateHandler(Property& /*p*/) {
+void PileupReweightingTool::updateHandler(Gaudi::Details::PropertyBase& /*p*/) {
// commenting this out as it doesn't compile anymore
// leaving it to domain expert to decide whether to keep or remove it
// //call the original update handler
diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/CMakeLists.txt
index 153087a615f5dcf7bd8d47f200aba074bf2942f6..2b6901e84656c4249844e31119e375bd58b705ef 100644
--- a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/CMakeLists.txt
@@ -12,23 +12,6 @@ if( NOT XAOD_STANDALONE )
set( extra_dep Control/AthenaBaseComps GaudiKernel )
endif()
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODBase
- Event/xAOD/xAODEventInfo
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
- PRIVATE
- Control/CxxUtils
- Event/xAOD/xAODParticleEvent
- Event/xAOD/xAODTruth
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODCutFlow
- Tools/PathResolver
- ${extra_dep} )
-
# External dependencies:
find_package( Lhapdf )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO )
@@ -49,13 +32,13 @@ atlas_add_library( ReweightUtilsLib
INCLUDE_DIRS ${LHAPDF_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${LHAPDF_LIBRARIES} ${ROOT_LIBRARIES} AsgTools xAODEventInfo
xAODBase PATInterfaces AsgAnalysisInterfaces
- PRIVATE_LINK_LIBRARIES xAODParticleEvent xAODTruth PathResolver )
+ PRIVATE_LINK_LIBRARIES xAODParticleEvent xAODTruth PathResolver xAODCutFlow )
if( NOT XAOD_STANDALONE )
atlas_add_component( ReweightUtils
src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODCutFlow
GaudiKernel ReweightUtilsLib )
endif()
diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/share/ut_ParticleScaleFactorTool_test.ref b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/share/ut_ParticleScaleFactorTool_test.ref
index dea198d7941d338af76ae102eb8b7438da9d87e9..b99ca2ef7194f08a345bd4c62eab3bb995fbf699 100644
--- a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/share/ut_ParticleScaleFactorTool_test.ref
+++ b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/share/ut_ParticleScaleFactorTool_test.ref
@@ -1,7 +1,3 @@
-ToolSvc.tool1 DEBUG Property update for OutputLevel : new value = 1
-ToolSvc.tool2 DEBUG Property update for OutputLevel : new value = 1
-ToolSvc.tool3 DEBUG Property update for OutputLevel : new value = 1
-ToolSvc.tool4 DEBUG Property update for OutputLevel : new value = 1
3
4
4.44444
diff --git a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/test/ut_ParticleScaleFactorTool_test.cxx b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/test/ut_ParticleScaleFactorTool_test.cxx
index 6792a18241252f944fd1e76ca9f279d9c8a0adae..8baaaa0a3909f8c8bf014fc5b073770c35e8469c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ReweightUtils/test/ut_ParticleScaleFactorTool_test.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ReweightUtils/test/ut_ParticleScaleFactorTool_test.cxx
@@ -77,9 +77,9 @@ int main() {
// Verbose level setting:
#ifdef XAOD_STANDALONE
- static const MSG::Level verboseLevel = MSG::VERBOSE;
+ static const MSG::Level verboseLevel = MSG::INFO;
#else
- static const int verboseLevel = 1;
+ static const int verboseLevel = 3;
#endif // XAOD_STANDALONE
asg::AnaToolHandle<IObservableTool> myTool("ParticleScaleFactorTool/tool1");
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
index 8b3ed14c2e5fe4239de41156b1384f11d9fee32b..6ee792ac79c52ec444240dce22d39b4877352e62 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
index 9a321f116793ddc9b6fc299a82cb3382348415e2..4fbe27324280b532c9e5a7983ea80e5661e70bc9 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloCellsAlg.h
@@ -61,10 +61,10 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'CaloCellsToThin' property
- void setupCaloCellsToThin( Property& /*prop*/ );
+ void setupCaloCellsToThin( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
///////////////////////////////////////////////////////////////////
@@ -107,13 +107,13 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'CaloCellsToThin' property
-inline void ThinCaloCellsAlg::setupCaloCellsToThin( Property& /*prop*/ ) {
+inline void ThinCaloCellsAlg::setupCaloCellsToThin( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setCaloCellKey = true;
return;
}
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ThinCaloCellsAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ThinCaloCellsAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
index 4aa5439c374782e38e3ecde7747c690834f3cd9f..56028209af2cf0c22565cbc01780a7f6e98c51cb 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
index dfc05e5f0cbf1efe3a6ef5e030dd46c3f9b4c604..db6d844fd80aac7eb752a657115bd8f639d6360f 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinCaloClustersAlg.h
@@ -63,13 +63,13 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'CaloClustersToThin' property
- void setupCaloClustersToThin( Property& /*prop*/ );
+ void setupCaloClustersToThin( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'Selection' property
- void setupSelection( Property& /*prop*/ );
+ void setupSelection( Gaudi::Details::PropertyBase& /*prop*/ );
///////////////////////////////////////////////////////////////////
@@ -120,19 +120,19 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'CaloClustersToThin' property
-inline void ThinCaloClustersAlg::setupCaloClustersToThin( Property& /*prop*/ ) {
+inline void ThinCaloClustersAlg::setupCaloClustersToThin( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setCaloClusKey = true;
return;
}
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ThinCaloClustersAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ThinCaloClustersAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'Selection' property
-inline void ThinCaloClustersAlg::setupSelection( Property& /*prop*/ ) {
+inline void ThinCaloClustersAlg::setupSelection( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSelection = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
index 8fc3cf3ba1b174c080f0fbac556e492c509a964c..c535efd8548284e80f538cf3596c79b00a49522b 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinGeantTruthAlg.cxx
@@ -29,7 +29,7 @@
// FrameWork includes
#include "StoreGate/ThinningHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
//Standard includes
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
index 729f7f50a0056e8e6e61565195bbd2f26386d7b5..223e8d9b520bc98a53f3453a344fb61786ae9f9d 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
index f36fcc4a47a88e51e89b31cd634c4913b81b0b06..794cae00b620cb150dbdabb30ba16618ecd90e60 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinIParticlesAlg.h
@@ -63,13 +63,13 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'IParticlesToThin' property
- void setupIParticlesToThin( Property& /*prop*/ );
+ void setupIParticlesToThin( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'Selection' property
- void setupSelection( Property& /*prop*/ );
+ void setupSelection( Gaudi::Details::PropertyBase& /*prop*/ );
///////////////////////////////////////////////////////////////////
@@ -121,19 +121,19 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'IParticlesToThin' property
-inline void ThinIParticlesAlg::setupIParticlesToThin( Property& /*prop*/ ) {
+inline void ThinIParticlesAlg::setupIParticlesToThin( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setIPartKey = true;
return;
}
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ThinIParticlesAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ThinIParticlesAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'Selection' property
-inline void ThinIParticlesAlg::setupSelection( Property& /*prop*/ ) {
+inline void ThinIParticlesAlg::setupSelection( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSelection = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
index 39b47b4847484291f28db3ade72501d3d06f7f46..c3bc8d9be458bbe01f4f6f95ca286640568a81fe 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
@@ -25,7 +25,7 @@
// FrameWork includes
#include "StoreGate/ThinningHandle.h"
#include "StoreGate/ReadHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/ThreadLocalContext.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
index 8f6b28756acb720d6f40381009ef0ab9dbd494be..685e364ea91b1e685daca484cb90795df4bbeebe 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyCaloClustersAlg.cxx
@@ -21,7 +21,7 @@
// FrameWork includes
#include "StoreGate/ThinningHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/ThreadLocalContext.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
index 25af96e203592e792fc3ec6f21d7da24ec1a77f3..a9d5cd41acc8a6e2dcc7817da8f306fe855573a0 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinNegativeEnergyNeutralPFOsAlg.cxx
@@ -22,7 +22,7 @@
// FrameWork includes
#include "StoreGate/ThinningHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/ThreadLocalContext.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
index 89e394e89b8a9f05fc59edfec6a797b7180930b5..1f06f106c17e82e9849acb08a7c7a1ce23a072d5 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "DerivationFrameworkInterfaces/IThinningTool.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
index 11a8aad3342b2480eafcf30708d33a522a20a94f..1b0b65eecbaa06ddc48755ea9d4dc58abaebf93c 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinTrackParticlesAlg.h
@@ -63,25 +63,25 @@ private:
// The update handlers
/// This internal method will realize if a user sets the 'TrackParticlesToThin' property
- void setupTrackPartsToThin( Property& /*prop*/ );
+ void setupTrackPartsToThin( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'InputContainerList' property
- void setupInputContainerList( Property& /*prop*/ );
+ void setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'Selection' property
- void setupSelection( Property& /*prop*/ );
+ void setupSelection( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'KeepTauConversions' property
- void setupTauConv( Property& /*prop*/ );
+ void setupTauConv( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'KeepTauWide' property
- void setupTauWide( Property& /*prop*/ );
+ void setupTauWide( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'KeepTauOther' property
- void setupTauOther( Property& /*prop*/ );
+ void setupTauOther( Gaudi::Details::PropertyBase& /*prop*/ );
/// This internal method will realize if a user sets the 'NMaxElectronTrackParticles' property
- void setupNEleTPMax( Property& /*prop*/ );
+ void setupNEleTPMax( Gaudi::Details::PropertyBase& /*prop*/ );
///////////////////////////////////////////////////////////////////
@@ -160,43 +160,43 @@ private:
///////////////////////////////////////////////////////////////////
/// This internal method will realize if a user sets the 'TrackParticlesToThin' property
-inline void ThinTrackParticlesAlg::setupTrackPartsToThin( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupTrackPartsToThin( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setTrackPartKey = true;
return;
}
/// This internal method will realize if a user sets the 'InputContainerList' property
-inline void ThinTrackParticlesAlg::setupInputContainerList( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupInputContainerList( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setInCollKey = true;
return;
}
/// This internal method will realize if a user sets the 'Selection' property
-inline void ThinTrackParticlesAlg::setupSelection( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupSelection( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setSelection = true;
return;
}
/// This internal method will realize if a user sets the 'KeepTauConversions' property
-inline void ThinTrackParticlesAlg::setupTauConv( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupTauConv( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setTauConv = true;
return;
}
/// This internal method will realize if a user sets the 'KeepTauWide' property
-inline void ThinTrackParticlesAlg::setupTauWide( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupTauWide( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setTauWide = true;
return;
}
/// This internal method will realize if a user sets the 'KeepTauOther' property
-inline void ThinTrackParticlesAlg::setupTauOther( Property& /*prop*/ ) {
+inline void ThinTrackParticlesAlg::setupTauOther( Gaudi::Details::PropertyBase& /*prop*/ ) {
m_setTauOther = true;
return;
}
/// This internal method will realize if a user sets the 'NMaxElectronTrackParticles' property
-inline void ThinTrackParticlesAlg::setupNEleTPMax( Property& /*prop*/ ){
+inline void ThinTrackParticlesAlg::setupNEleTPMax( Gaudi::Details::PropertyBase& /*prop*/ ){
m_setNEleTPMax = true;
return;
}
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapCheckingTool.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapCheckingTool.cxx
index c613002b4f0cdefe5633a6bcc85190ef0ea18a1e..4d79e4ad6147293a72957820263bf7d42aefb3c4 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapCheckingTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapCheckingTool.cxx
@@ -11,7 +11,7 @@ Purpose : User Analysis Overlap Checking - see UserAnalysisOverlapCheckingTool.h
*****************************************************************************/
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Accessing data:
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapRemovalTool.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapRemovalTool.cxx
index 5aeb8042427d0151351ffb8903f6b27eb18bcd50..b79c89d14f46bf19b5a8ac3edb683a94e40ef733 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapRemovalTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisOverlapRemovalTool.cxx
@@ -11,7 +11,7 @@ Purpose : User Analysis Overlap Removal - see UserAnalysisOverlapRemovalTool.h f
*****************************************************************************/
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Accessing data:
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisPreparationTool.cxx b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisPreparationTool.cxx
index 394b7e5ae91009eacd7ea1333d10aa317265f1a9..99c6a91ab1922dcf7eb1bbc00bf6aeee2e9eb724 100644
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisPreparationTool.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysisUtils/src/UserAnalysisPreparationTool.cxx
@@ -11,7 +11,7 @@ Purpose : User Analysis Preparation - see UserAnalysisPreparationTool.h for deta
*****************************************************************************/
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Accessing data:
#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h b/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
index ba6a5a207e5db40613a5d1ec7a3b80813dbc6c6b..d7ed9cf6d90181ed9dd8f9a14971fe3119fad0db 100644
--- a/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
+++ b/PhysicsAnalysis/AraTool/AraTool/AraToolBase.h
@@ -5,7 +5,7 @@
#ifndef ARATOOLBASE_H
#define ARATOOLBASE_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/PropertyHolder.h"
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/IDataHandleHolder.h"
@@ -35,7 +35,7 @@ public:
template<class TYPE>
- Property* declareProperty
+ Gaudi::Details::PropertyBase* declareProperty
( const std::string& name ,
TYPE& value,
const std::string& doc = "none" ) ;
@@ -47,7 +47,7 @@ public:
};
template<class TYPE>
-inline Property *
+inline Gaudi::Details::PropertyBase *
AraToolBase::declareProperty
( const std::string& name ,
TYPE& value,
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.cxx b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.cxx
index cd3727615a5065ff652bd41804d4299c2220af9f..bdfbd38cae21780a470549710b0a67563af6fb0b 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.cxx
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// CLHEP includes
#include "AthenaKernel/Units.h"
@@ -259,19 +259,19 @@ StatusCode AssocBuilder::execute()
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void AssocBuilder::setupInputContainers( Property& /*inputName*/ )
+void AssocBuilder::setupInputContainers( Gaudi::Details::PropertyBase& /*inputName*/ )
{
// nothing to do (yet ?)
return;
}
-void AssocBuilder::setupInputAssocContainers( Property& /*inputAssocName*/ )
+void AssocBuilder::setupInputAssocContainers( Gaudi::Details::PropertyBase& /*inputAssocName*/ )
{
// nothing to do (yet ?)
return;
}
-void AssocBuilder::setupAssocsOutput( Property& /*assocsOutputName*/ )
+void AssocBuilder::setupAssocsOutput( Gaudi::Details::PropertyBase& /*assocsOutputName*/ )
{
// nothing to do (yet ?)
return;
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
index 1f0c67e8a4bbb911230302ffe71f17cf199ed8cc..48541e809787566685d183d790060ec816ac4d8b 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocBuilder.h
@@ -61,15 +61,15 @@ class AssocBuilder : public AthAlgorithm
/** Callback method to setup the "ObjectContainers" property
*/
- void setupInputContainers( Property& inputNames );
+ void setupInputContainers( Gaudi::Details::PropertyBase& inputNames );
/** Callback method to setup the "AssocContainers" property
*/
- void setupInputAssocContainers( Property& inputAssocNames );
+ void setupInputAssocContainers( Gaudi::Details::PropertyBase& inputAssocNames );
/** Callback method to setup the "AssocsOutput" property
*/
- void setupAssocsOutput( Property& assocsOutputName );
+ void setupAssocsOutput( Gaudi::Details::PropertyBase& assocsOutputName );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.cxx b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.cxx
index b3a65688bbdb9604f9abe47025dbf2f3daa3168a..90ae1fce300944eff1b600f706530827c7e5342e 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.cxx
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.cxx
@@ -17,7 +17,7 @@
#include <ostream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// CLHEP includes
#include "AthenaKernel/Units.h"
@@ -256,13 +256,13 @@ StatusCode AssocDumper::dump( const INav4MomAssocs* assocs )
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void AssocDumper::setupINav4MomAssocs( Property& /*inav4MomAssocsName*/ )
+void AssocDumper::setupINav4MomAssocs( Gaudi::Details::PropertyBase& /*inav4MomAssocsName*/ )
{
// nothing to do (yet?)
return;
}
-void AssocDumper::setupOutputStream( Property& /*outputStreamName*/ )
+void AssocDumper::setupOutputStream( Gaudi::Details::PropertyBase& /*outputStreamName*/ )
{
// reset internal state
if ( m_outputStream &&
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
index 68f107428830f4e21eff79c68499b0bcd66e01f4..818768c0d511907ba80e85868a979c413b072b41 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/AssocDumper.h
@@ -70,12 +70,12 @@ class AssocDumper : public AthAlgorithm
/** Callback method to configure the input location of the
* @c INav4MomAssocs we want to print out
*/
- void setupINav4MomAssocs( Property& inav4MomAssocsName );
+ void setupINav4MomAssocs( Gaudi::Details::PropertyBase& inav4MomAssocsName );
/** Callback method to configure the output stream into which we'll
* dump the informations from @c INav4MomAssocs.
*/
- void setupOutputStream( Property& outputStreamName );
+ void setupOutputStream( Gaudi::Details::PropertyBase& outputStreamName );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
index 5c260ffb81b57c48d8e4f039ad60fe277da0979f..447605ddbbd64519e66859db5e7c44fad96e0597 100644
--- a/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
+++ b/PhysicsAnalysis/AssociationBuilder/AssociationComps/src/DeltaROverlapTool.h
@@ -74,7 +74,7 @@ class DeltaROverlapTool : public OverlapBaseTool
/** Call-back method to configure the "XyzDeltaR" properties (min/max)
*/
- void setupDeltaR( Property& deltaR );
+ void setupDeltaR( Gaudi::Details::PropertyBase& deltaR );
///////////////////////////////////////////////////////////////////
// Protected data:
@@ -102,7 +102,7 @@ class DeltaROverlapTool : public OverlapBaseTool
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void DeltaROverlapTool::setupDeltaR( Property& /*maxDeltaR*/ )
+inline void DeltaROverlapTool::setupDeltaR( Gaudi::Details::PropertyBase& /*maxDeltaR*/ )
{
m_filter = AssociationComps::DeltaROverlapFilter( m_minDeltaR.value(), m_maxDeltaR.value() );
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDElectronSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDElectronSelector.h
index 9deb60867486451266f2888c0cb8825d28724fa9..b92a4123371da0dcd1c051661a091e37d140222b 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDElectronSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDElectronSelector.h
@@ -90,112 +90,112 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): IsEM
- void setupIsEM( Property& prop );
+ void setupIsEM( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): passID
- void setupPassID( Property& prop );
+ void setupPassID( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Author
- void setupAuthor( Property& prop );
+ void setupAuthor( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined et
- void setupUncombinedEt( Property& prop );
+ void setupUncombinedEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined e
- void setupUncombinedE( Property& prop );
+ void setupUncombinedE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined eta
- void setupUncombinedEta( Property& prop );
+ void setupUncombinedEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined |eta|
- void setupUncombinedAbsEta( Property& prop );
+ void setupUncombinedAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined phi
- void setupUncombinedPhi( Property& prop );
+ void setupUncombinedPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined mass
- void setupUncombinedMass( Property& prop );
+ void setupUncombinedMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster et
- void setupClusterEt( Property& prop );
+ void setupClusterEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster e
- void setupClusterE( Property& prop );
+ void setupClusterE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster eta
- void setupClusterEta( Property& prop );
+ void setupClusterEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster |eta|
- void setupClusterAbsEta( Property& prop );
+ void setupClusterAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster eta veto
- void setupClusterEtaVeto( Property& prop );
+ void setupClusterEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster phi
- void setupClusterPhi( Property& prop );
+ void setupClusterPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster phi veto
- void setupClusterPhiVeto( Property& prop );
+ void setupClusterPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster mass
- void setupClusterMass( Property& prop );
+ void setupClusterMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer e
- void setupClusterLayerE( Property& prop );
+ void setupClusterLayerE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer eta
- void setupClusterLayerEta( Property& prop );
+ void setupClusterLayerEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer |eta|
- void setupClusterLayerAbsEta( Property& prop );
+ void setupClusterLayerAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer eta veto
- void setupClusterLayerEtaVeto( Property& prop );
+ void setupClusterLayerEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer phi
- void setupClusterLayerPhi( Property& prop );
+ void setupClusterLayerPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer phi veto
- void setupClusterLayerPhiVeto( Property& prop );
+ void setupClusterLayerPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track pt
- void setupTrackPt( Property& prop );
+ void setupTrackPt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track p
- void setupTrackP( Property& prop );
+ void setupTrackP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track eta
- void setupTrackEta( Property& prop );
+ void setupTrackEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track |eta|
- void setupTrackAbsEta( Property& prop );
+ void setupTrackAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track eta veto
- void setupTrackEtaVeto( Property& prop );
+ void setupTrackEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track phi
- void setupTrackPhi( Property& prop );
+ void setupTrackPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track phi veto
- void setupTrackPhiVeto( Property& prop );
+ void setupTrackPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track mass
- void setupTrackMass( Property& prop );
+ void setupTrackMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster-track et
- void setupClusterTrackEt( Property& prop );
+ void setupClusterTrackEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track pt iso
- void setupTrackPtIso( Property& prop );
+ void setupTrackPtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |track pt iso|
- void setupAbsTrackPtIso( Property& prop );
+ void setupAbsTrackPtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): calo et iso
- void setupCaloEtIso( Property& prop );
+ void setupCaloEtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |calo et iso|
- void setupAbsCaloEtIso( Property& prop );
+ void setupAbsCaloEtIso( Gaudi::Details::PropertyBase& prop );
@@ -749,217 +749,217 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDElectronSelector::setupIsEM( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupIsEM( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doIsEM = true;
return;
}
-inline void D2PDElectronSelector::setupPassID( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupPassID( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPassID = true;
return;
}
-inline void D2PDElectronSelector::setupAuthor( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupAuthor( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAuthor = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedEt( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedEt = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedE( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedE = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedEta = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedAbsEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedAbsEta = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedPhi( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedPhi = true;
return;
}
-inline void D2PDElectronSelector::setupUncombinedMass( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupUncombinedMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedMass = true;
return;
}
-inline void D2PDElectronSelector::setupClusterEt( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEt = true;
return;
}
-inline void D2PDElectronSelector::setupClusterE( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterE = true;
return;
}
-inline void D2PDElectronSelector::setupClusterEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEta = true;
return;
}
-inline void D2PDElectronSelector::setupClusterAbsEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterAbsEta = true;
return;
}
-inline void D2PDElectronSelector::setupClusterEtaVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEtaVeto = true;
return;
}
-inline void D2PDElectronSelector::setupClusterPhi( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterPhi = true;
return;
}
-inline void D2PDElectronSelector::setupClusterPhiVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterPhiVeto = true;
return;
}
-inline void D2PDElectronSelector::setupClusterMass( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterMass = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerE( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerE = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerEta = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerAbsEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerAbsEta = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerEtaVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerEtaVeto = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerPhi( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerPhi = true;
return;
}
-inline void D2PDElectronSelector::setupClusterLayerPhiVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterLayerPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerPhiVeto = true;
return;
}
-inline void D2PDElectronSelector::setupTrackPt( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackPt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPt = true;
return;
}
-inline void D2PDElectronSelector::setupTrackP( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackP = true;
return;
}
-inline void D2PDElectronSelector::setupTrackEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackEta = true;
return;
}
-inline void D2PDElectronSelector::setupTrackAbsEta( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackAbsEta = true;
return;
}
-inline void D2PDElectronSelector::setupTrackEtaVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackEtaVeto = true;
return;
}
-inline void D2PDElectronSelector::setupTrackPhi( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPhi = true;
return;
}
-inline void D2PDElectronSelector::setupTrackPhiVeto( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPhiVeto = true;
return;
}
-inline void D2PDElectronSelector::setupTrackMass( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackMass = true;
return;
}
-inline void D2PDElectronSelector::setupClusterTrackEt( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupClusterTrackEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterTrackEt = true;
return;
}
-inline void D2PDElectronSelector::setupTrackPtIso( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupTrackPtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPtIso = true;
return;
}
-inline void D2PDElectronSelector::setupAbsTrackPtIso( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupAbsTrackPtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsTrackPtIso = true;
return;
}
-inline void D2PDElectronSelector::setupCaloEtIso( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupCaloEtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doCaloEtIso = true;
return;
}
-inline void D2PDElectronSelector::setupAbsCaloEtIso( Property& /*prop*/ )
+inline void D2PDElectronSelector::setupAbsCaloEtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsCaloEtIso = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDJetSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDJetSelector.h
index dccaf112072875bc32aa1664077621d9461096ba..e7d64e7825d7c2db1812b7f014236b5e4549425e 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDJetSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDJetSelector.h
@@ -90,70 +90,70 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max):
- void setupJetVertexFraction( Property& prop );
+ void setupJetVertexFraction( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupFlavorTag( Property& prop );
+ void setupFlavorTag( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupEMFrac( Property& prop );
+ void setupEMFrac( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupPSFrac( Property& prop );
+ void setupPSFrac( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupN90( Property& prop );
+ void setupN90( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSamplingMax( Property& prop );
+ void setupSamplingMax( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupFCor( Property& prop );
+ void setupFCor( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESEt( Property& prop );
+ void setupScaledJESEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESE( Property& prop );
+ void setupScaledJESE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESPt( Property& prop );
+ void setupScaledJESPt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESP( Property& prop );
+ void setupScaledJESP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupScaledJESMass( Property& prop );
+ void setupScaledJESMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateEt( Property& prop );
+ void setupSignalStateEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateE( Property& prop );
+ void setupSignalStateE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStatePt( Property& prop );
+ void setupSignalStatePt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateP( Property& prop );
+ void setupSignalStateP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateEta( Property& prop );
+ void setupSignalStateEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateAbsEta( Property& prop );
+ void setupSignalStateAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateEtaVeto( Property& prop );
+ void setupSignalStateEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStatePhi( Property& prop );
+ void setupSignalStatePhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStatePhiVeto( Property& prop );
+ void setupSignalStatePhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupSignalStateMass( Property& prop );
+ void setupSignalStateMass( Gaudi::Details::PropertyBase& prop );
@@ -499,133 +499,133 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDJetSelector::setupJetVertexFraction( Property& /*prop*/ )
+inline void D2PDJetSelector::setupJetVertexFraction( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doJVF = true;
return;
}
-inline void D2PDJetSelector::setupFlavorTag( Property& /*prop*/ )
+inline void D2PDJetSelector::setupFlavorTag( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doFlavorTag = true;
return;
}
-inline void D2PDJetSelector::setupEMFrac( Property& /*prop*/ )
+inline void D2PDJetSelector::setupEMFrac( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doEMFrac = true;
return;
}
-inline void D2PDJetSelector::setupPSFrac( Property& /*prop*/ )
+inline void D2PDJetSelector::setupPSFrac( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPSFrac = true;
return;
}
-inline void D2PDJetSelector::setupN90( Property& /*prop*/ )
+inline void D2PDJetSelector::setupN90( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doN90 = true;
return;
}
-inline void D2PDJetSelector::setupSamplingMax( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSamplingMax( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSamplingMax = true;
return;
}
-inline void D2PDJetSelector::setupFCor( Property& /*prop*/ )
+inline void D2PDJetSelector::setupFCor( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doFCor = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESEt( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESEt = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESE( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESE = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESPt( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESPt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESPt = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESP( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESP = true;
return;
}
-inline void D2PDJetSelector::setupScaledJESMass( Property& /*prop*/ )
+inline void D2PDJetSelector::setupScaledJESMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doScaledJESMass = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateEt( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateEt = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateE( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateE = true;
return;
}
-inline void D2PDJetSelector::setupSignalStatePt( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStatePt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStatePt = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateP( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateP = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateEta( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateEta = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateAbsEta( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateAbsEta = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateEtaVeto( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateEtaVeto = true;
return;
}
-inline void D2PDJetSelector::setupSignalStatePhi( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStatePhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStatePhi = true;
return;
}
-inline void D2PDJetSelector::setupSignalStatePhiVeto( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStatePhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStatePhiVeto = true;
return;
}
-inline void D2PDJetSelector::setupSignalStateMass( Property& /*prop*/ )
+inline void D2PDJetSelector::setupSignalStateMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doSignalStateMass = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDMuonSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDMuonSelector.h
index cb2621923609719393a946b4ef01166a0eafe179..a19a61fadcf6a74e798cddf765b6738e8d6e04b7 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDMuonSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDMuonSelector.h
@@ -80,7 +80,7 @@ private:
private:
/// Call-back method to configure the cut properties (min/max): mass
- void setupChi2( Property& prop );
+ void setupChi2( Gaudi::Details::PropertyBase& prop );
//------------------------------------------------------
@@ -260,7 +260,7 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDMuonSelector::setupChi2( Property& /*prop*/ )
+inline void D2PDMuonSelector::setupChi2( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doChi2 = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDPhotonSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDPhotonSelector.h
index e6516ecff997f10d9dec69ee084637fecb305e5f..403179bbb4fdf5bc0af4a5dca6e319355d982802 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDPhotonSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDPhotonSelector.h
@@ -91,109 +91,109 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): IsEM
- void setupIsEM( Property& prop );
+ void setupIsEM( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): passID
- void setupPassID( Property& prop );
+ void setupPassID( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Author
- void setupAuthor( Property& prop );
+ void setupAuthor( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined et
- void setupUncombinedEt( Property& prop );
+ void setupUncombinedEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined e
- void setupUncombinedE( Property& prop );
+ void setupUncombinedE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined eta
- void setupUncombinedEta( Property& prop );
+ void setupUncombinedEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined |eta|
- void setupUncombinedAbsEta( Property& prop );
+ void setupUncombinedAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined phi
- void setupUncombinedPhi( Property& prop );
+ void setupUncombinedPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): uncombined mass
- void setupUncombinedMass( Property& prop );
+ void setupUncombinedMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster et
- void setupClusterEt( Property& prop );
+ void setupClusterEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster e
- void setupClusterE( Property& prop );
+ void setupClusterE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster eta
- void setupClusterEta( Property& prop );
+ void setupClusterEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster |eta|
- void setupClusterAbsEta( Property& prop );
+ void setupClusterAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster eta veto
- void setupClusterEtaVeto( Property& prop );
+ void setupClusterEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster phi
- void setupClusterPhi( Property& prop );
+ void setupClusterPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster phi veto
- void setupClusterPhiVeto( Property& prop );
+ void setupClusterPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster mass
- void setupClusterMass( Property& prop );
+ void setupClusterMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer e
- void setupClusterLayerE( Property& prop );
+ void setupClusterLayerE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer eta
- void setupClusterLayerEta( Property& prop );
+ void setupClusterLayerEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer |eta|
- void setupClusterLayerAbsEta( Property& prop );
+ void setupClusterLayerAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer eta veto
- void setupClusterLayerEtaVeto( Property& prop );
+ void setupClusterLayerEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer phi
- void setupClusterLayerPhi( Property& prop );
+ void setupClusterLayerPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): cluster layer phi veto
- void setupClusterLayerPhiVeto( Property& prop );
+ void setupClusterLayerPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track pt
- void setupTrackPt( Property& prop );
+ void setupTrackPt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track p
- void setupTrackP( Property& prop );
+ void setupTrackP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track eta
- void setupTrackEta( Property& prop );
+ void setupTrackEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track |eta|
- void setupTrackAbsEta( Property& prop );
+ void setupTrackAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track eta veto
- void setupTrackEtaVeto( Property& prop );
+ void setupTrackEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track phi
- void setupTrackPhi( Property& prop );
+ void setupTrackPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track phi veto
- void setupTrackPhiVeto( Property& prop );
+ void setupTrackPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track mass
- void setupTrackMass( Property& prop );
+ void setupTrackMass( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): track pt iso
- void setupTrackPtIso( Property& prop );
+ void setupTrackPtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |track pt iso|
- void setupAbsTrackPtIso( Property& prop );
+ void setupAbsTrackPtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): calo et iso
- void setupCaloEtIso( Property& prop );
+ void setupCaloEtIso( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |calo et iso|
- void setupAbsCaloEtIso( Property& prop );
+ void setupAbsCaloEtIso( Gaudi::Details::PropertyBase& prop );
@@ -732,211 +732,211 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDPhotonSelector::setupIsEM( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupIsEM( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doIsEM = true;
return;
}
-inline void D2PDPhotonSelector::setupPassID( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupPassID( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPassID = true;
return;
}
-inline void D2PDPhotonSelector::setupAuthor( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupAuthor( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAuthor = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedEt( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedEt = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedE( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedE = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedEta = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedAbsEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedAbsEta = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedPhi( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedPhi = true;
return;
}
-inline void D2PDPhotonSelector::setupUncombinedMass( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupUncombinedMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doUncombinedMass = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterEt( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEt = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterE( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterE = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEta = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterAbsEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterAbsEta = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterEtaVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterEtaVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterPhi( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterPhi = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterPhiVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterPhiVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterMass( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterMass = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerE( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerE = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerEta = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerAbsEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerAbsEta = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerEtaVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerEtaVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerPhi( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerPhi = true;
return;
}
-inline void D2PDPhotonSelector::setupClusterLayerPhiVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupClusterLayerPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doClusterLayerPhiVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackPt( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackPt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPt = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackP( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackP = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackEta = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackAbsEta( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackAbsEta = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackEtaVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackEtaVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackPhi( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPhi = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackPhiVeto( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPhiVeto = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackMass( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackMass = true;
return;
}
-inline void D2PDPhotonSelector::setupTrackPtIso( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupTrackPtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTrackPtIso = true;
return;
}
-inline void D2PDPhotonSelector::setupAbsTrackPtIso( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupAbsTrackPtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsTrackPtIso = true;
return;
}
-inline void D2PDPhotonSelector::setupCaloEtIso( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupCaloEtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doCaloEtIso = true;
return;
}
-inline void D2PDPhotonSelector::setupAbsCaloEtIso( Property& /*prop*/ )
+inline void D2PDPhotonSelector::setupAbsCaloEtIso( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsCaloEtIso = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDSelectorBase.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDSelectorBase.h
index c7a7e9c94c1243125a76e0f139de5abc11835520..fc426bb614b10f2b4b3f2f05af8fe2041e3a8c09 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDSelectorBase.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDSelectorBase.h
@@ -201,34 +201,34 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): pt
- void setupPt( Property& prop );
+ void setupPt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): p
- void setupP( Property& prop );
+ void setupP( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): et
- void setupEt( Property& prop );
+ void setupEt( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): e
- void setupE( Property& prop );
+ void setupE( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): eta
- void setupEta( Property& prop );
+ void setupEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): |eta|
- void setupAbsEta( Property& prop );
+ void setupAbsEta( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): eta veto ranges
- void setupEtaVeto( Property& prop );
+ void setupEtaVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): phi
- void setupPhi( Property& prop );
+ void setupPhi( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): phi veto ranges
- void setupPhiVeto( Property& prop );
+ void setupPhiVeto( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): mass
- void setupMass( Property& prop );
+ void setupMass( Gaudi::Details::PropertyBase& prop );
@@ -430,70 +430,70 @@ private:
// Inline methods:
///////////////////////////////////////////////////////////////////
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupPt( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupPt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPt = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupP( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupP( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doP = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupEt( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupEt( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doEt = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupE( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupE( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doE = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupEta( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doEta = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupAbsEta( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupAbsEta( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAbsEta = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupEtaVeto( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupEtaVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doEtaVeto = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupPhi( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupPhi( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPhi = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupPhiVeto( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupPhiVeto( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doPhiVeto = true;
return;
}
template < class T, class CT >
-inline void D2PDSelectorBase< T, CT >::setupMass( Property& /*prop*/ )
+inline void D2PDSelectorBase< T, CT >::setupMass( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doMass = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTauSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTauSelector.h
index f2c17ea8106dde905df400ea08d67628976605ac..e0a1d0ad3ce37202b3461f47ad4da5fc428403af 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTauSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTauSelector.h
@@ -86,19 +86,19 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): IsTau
- void setupIsTau( Property& prop );
+ void setupIsTau( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Author
- void setupAuthor( Property& prop );
+ void setupAuthor( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Discriminant
- void setupDiscriminant( Property& prop );
+ void setupDiscriminant( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): Charge
- void setupCharge( Property& prop );
+ void setupCharge( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max):
- void setupNTracks( Property& prop );
+ void setupNTracks( Gaudi::Details::PropertyBase& prop );
@@ -287,31 +287,31 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDTauSelector::setupIsTau( Property& /*prop*/ )
+inline void D2PDTauSelector::setupIsTau( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doIsTau = true;
return;
}
-inline void D2PDTauSelector::setupAuthor( Property& /*prop*/ )
+inline void D2PDTauSelector::setupAuthor( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doAuthor = true;
return;
}
-inline void D2PDTauSelector::setupDiscriminant( Property& /*prop*/ )
+inline void D2PDTauSelector::setupDiscriminant( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doTauDiscriminant = true;
return;
}
-inline void D2PDTauSelector::setupCharge( Property& /*prop*/ )
+inline void D2PDTauSelector::setupCharge( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doCharge = true;
return;
}
-inline void D2PDTauSelector::setupNTracks( Property& /*prop*/ )
+inline void D2PDTauSelector::setupNTracks( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNTracks = true;
return;
diff --git a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTrackParticleSelector.h b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTrackParticleSelector.h
index 9c3ca75931200d57dc7540394cbb919e809dfcaa..7d893e56ea63ecae57b06f561cde6a495cea03dc 100644
--- a/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTrackParticleSelector.h
+++ b/PhysicsAnalysis/D2PDMaker/D2PDMaker/D2PDTrackParticleSelector.h
@@ -81,19 +81,19 @@ private:
//------------------------------------------------------
/// Call-back method to configure the cut properties (min/max): numberBLayerHits
- void setupNumberBLayerHits( Property& prop );
+ void setupNumberBLayerHits( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): numberPixelHits
- void setupNumberPixelHits( Property& prop );
+ void setupNumberPixelHits( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): numberSCTHits
- void setupNumberSCTHits( Property& prop );
+ void setupNumberSCTHits( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): numberSiliconHits
- void setupNumberSiliconHits( Property& prop );
+ void setupNumberSiliconHits( Gaudi::Details::PropertyBase& prop );
/// Call-back method to configure the cut properties (min/max): numberTRTHits
- void setupNumberTRTHits( Property& prop );
+ void setupNumberTRTHits( Gaudi::Details::PropertyBase& prop );
@@ -175,31 +175,31 @@ private:
///////////////////////////////////////////////////////////////////
// Inline methods:
///////////////////////////////////////////////////////////////////
-inline void D2PDTrackParticleSelector::setupNumberBLayerHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberBLayerHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberBLayerHits = true;
return;
}
-inline void D2PDTrackParticleSelector::setupNumberPixelHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberPixelHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberPixelHits = true;
return;
}
-inline void D2PDTrackParticleSelector::setupNumberSCTHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberSCTHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberSCTHits = true;
return;
}
-inline void D2PDTrackParticleSelector::setupNumberSiliconHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberSiliconHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberSiliconHits = true;
return;
}
-inline void D2PDTrackParticleSelector::setupNumberTRTHits( Property& /*prop*/ )
+inline void D2PDTrackParticleSelector::setupNumberTRTHits( Gaudi::Details::PropertyBase& /*prop*/ )
{
m_doNumberTRTHits = true;
return;
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.cxx b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.cxx
index 4e1f72429ef6b9934100866c6c2ed35e09a82041..da734606c6affb1b6c2f64b02b46ea14365cc462 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerCoreComps/src/CollectionGetterRegistryTool.cxx
@@ -101,7 +101,7 @@ CollectionGetterRegistryTool::get (const std::string& label,
}
// Get the properties for the source tool.
- const std::vector<const Property*>* props =
+ const std::vector<const Gaudi::Details::PropertyBase*>* props =
m_jos->getProperties (i->second->name());
// Copy them to the destination tool (except for Label).
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/CompactHardTruth.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/CompactHardTruth.cxx
index 9590503b34fe025190eeb67716ac35048c1196e6..32d008c5c725f9c9f9d5663b86fd68886f468b74 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/CompactHardTruth.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/CompactHardTruth.cxx
@@ -16,7 +16,7 @@
#include <list>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
index 1e2f4e536317b68c91436c10b02730fdf9ad3efd..59cdd4b84fd4eee0b288db0dc64671dc1e89cedc 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/MuonTPJpsiVertexFittingAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "DerivationFrameworkMuons/MuonTPJpsiVertexFittingAlg.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt
index 6cb851b4288c7b597cc65b6de33a716307d2672f..074a83abba96a6da83efdefb57322b3a166a7d66 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/CMakeLists.txt
@@ -7,6 +7,12 @@ atlas_subdir( ElectronEfficiencyCorrection )
find_package( Boost )
find_package( ROOT COMPONENTS Core Hist MathCore)
+if (XAOD_STANDALONE)
+ set (extra_private_libs )
+else ()
+ set (extra_private_libs AthAnalysisBaseCompsLib)
+endif ()
+
# Component(s) in the package:
atlas_add_library( ElectronEfficiencyCorrectionLib
ElectronEfficiencyCorrection/*.h Root/*.cxx
@@ -14,7 +20,7 @@ atlas_add_library( ElectronEfficiencyCorrectionLib
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AsgTools
xAODEgamma PATInterfaces PATCoreLib AsgAnalysisInterfaces EgammaAnalysisInterfacesLib
- PRIVATE_LINK_LIBRARIES AthAnalysisBaseCompsLib xAODCaloEvent xAODCore xAODEventInfo xAODTracking
+ PRIVATE_LINK_LIBRARIES ${extra_private_libs} xAODCaloEvent xAODCore xAODEventInfo xAODTracking
xAODMetaData PathResolver )
if( NOT XAOD_STANDALONE )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
index 123a93c656d6f26d26196018bc85f420d91476a8..daf62201577d1e64a50b9e4ea5fc3c2cfeedfa51 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/util/testEgChargeCorr.cxx
@@ -28,6 +28,7 @@
//Asg includes
#include "AsgTools/AsgMessaging.h"
+#include "PATCore/AcceptData.h"
#include "PATInterfaces/SystematicsUtil.h"
#include <ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h>
@@ -156,7 +157,7 @@ int main( int argc, char* argv[] ) {
xAOD::Electron* el = *el_it;
if (el->pt() < 25000) continue;//skip electrons outside of recommendations
- bool LHacc = m_LHToolTight->accept(el);
+ bool LHacc {m_LHToolTight->accept(el)};
std::cout << "acc: "<< LHacc << std::endl;
if(!m_LHToolTight->accept(el)) continue;
if (fabs(el->caloCluster()->etaBE(2)) > 2.4) continue;//skip electrons outside of recommendations
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/CMakeLists.txt
index d6213fa1b8f68f9e1717227215e7be08b4b65e2e..9b44abb11454465955ab1fbbc01b96b0eec946ba 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/CMakeLists.txt
@@ -39,7 +39,7 @@ atlas_add_library( ElectronPhotonSelectorToolsLib
ElectronPhotonSelectorTools/*.h Root/*.cxx
PUBLIC_HEADERS ElectronPhotonSelectorTools
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES EgammaAnalysisInterfacesLib AsgTools xAODEgamma xAODTracking xAODHIEvent PATCoreLib
+ LINK_LIBRARIES EgammaAnalysisInterfacesLib AsgTools xAODEgamma xAODTracking xAODHIEvent PATCoreLib AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} FourMomUtils
xAODCaloEvent xAODCore xAODEventInfo PathResolver MVAUtils )
@@ -70,17 +70,15 @@ if( XAOD_STANDALONE )
LINK_LIBRARIES ${ROOT_LIBRARIES} xAODCore xAODEgamma AsgTools
xAODRootAccess ElectronPhotonSelectorToolsLib )
- atlas_add_executable( EGIdentification_testEGChargeIDSelector
- util/testEGChargeIDSelector.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEgamma AsgTools xAODRootAccess
- ElectronPhotonSelectorToolsLib )
+ # Disabling this because the underlying tool no longer seems to
+ # exist. Whoever is the expert should either make this work or
+ # remove it completely.
- atlas_add_executable( EGIdentification_testEGChargeIDSelector
- util/testEGChargeIDSelector.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEgamma AsgTools xAODRootAccess
- ElectronPhotonSelectorToolsLib )
+ # atlas_add_executable( EGIdentification_testEGChargeIDSelector
+ # util/testEGChargeIDSelector.cxx
+ # INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ # LINK_LIBRARIES ${ROOT_LIBRARIES} xAODEgamma AsgTools xAODRootAccess
+ # ElectronPhotonSelectorToolsLib )
endif()
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h
index f80d2bd2f83e499dff989683de4b80c71eb8244f..97044e4e07a5d41bf62ffd55a4cdcbcebccf4055 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h
@@ -22,12 +22,13 @@
// Atlas includes
#include "AsgTools/AsgTool.h"
-#include "GaudiKernel/EventContext.h"
// Include the interfaces
#include "EgammaAnalysisInterfaces/IAsgElectronIsEMSelector.h"
#include <string>
+class EventContext;
+
namespace Root{
class TElectronIsEMSelector;
}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h
index a5336af2e4f97f84a88e98db5035b2359b1494bd..5cedcbe49b91434d72ebbc8dead8515e2899126e 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h
@@ -13,10 +13,11 @@
#include "EgammaAnalysisInterfaces/IAsgElectronLikelihoodTool.h"
#include "xAODEgamma/ElectronFwd.h"
#include "PATCore/AcceptData.h"
-#include "StoreGate/ReadHandleKey.h"
+#include "AsgDataHandles/ReadHandleKey.h"
#include "xAODTracking/VertexContainer.h"
#include "xAODHIEvent/HIEventShapeContainer.h"
-#include "GaudiKernel/EventContext.h"
+
+class EventContext;
namespace Root{
class TElectronLikelihoodTool;
@@ -37,10 +38,7 @@ public:
virtual ~AsgElectronLikelihoodTool();
public:
/** Gaudi Service Interface method implementations */
- virtual StatusCode initialize();
-
- /** Gaudi Service Interface method implementations */
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
// Main methods for IAsgSelectorTool interface
@@ -48,17 +46,17 @@ public:
This is needed so that one can already get the AcceptInfo
and query what cuts are defined before the first object
is passed to the tool. */
- virtual const asg::AcceptInfo& getAcceptInfo() const;
+ virtual const asg::AcceptInfo& getAcceptInfo() const override;
/** The main accept method: using the generic interface */
- asg::AcceptData accept( const xAOD::IParticle* part ) const;
- asg::AcceptData accept( const EventContext& ctx, const xAOD::IParticle* part ) const;
+ asg::AcceptData accept( const xAOD::IParticle* part ) const override;
+ asg::AcceptData accept( const EventContext& ctx, const xAOD::IParticle* part ) const override;
/** The main accept method: the actual cuts are applied here */
asg::AcceptData accept( const xAOD::Electron* eg ) const {
return accept (eg, -99); // mu = -99 as input will force accept to grab the pileup variable from the xAOD object
}
- asg::AcceptData accept( const EventContext& ctx, const xAOD::Electron* eg ) const {
+ asg::AcceptData accept( const EventContext& ctx, const xAOD::Electron* eg ) const override {
return accept (ctx, eg, -99); // mu = -99 as input will force accept to grab the pileup variable from the xAOD object
}
@@ -66,29 +64,29 @@ public:
asg::AcceptData accept( const xAOD::Egamma* eg ) const {
return accept (eg, -99); // mu = -99 as input will force accept to grab the pileup variable from the xAOD object
}
- asg::AcceptData accept(const EventContext& ctx, const xAOD::Egamma* eg ) const {
+ asg::AcceptData accept(const EventContext& ctx, const xAOD::Egamma* eg ) const override {
return accept (ctx, eg, -99); // mu = -99 as input will force accept to grab the pileup variable from the xAOD object
}
/** The main accept method: in case mu not in EventInfo online */
asg::AcceptData accept( const xAOD::Electron* eg, double mu ) const;
- asg::AcceptData accept( const EventContext& ctx, const xAOD::Electron* eg, double mu ) const;
+ asg::AcceptData accept( const EventContext& ctx, const xAOD::Electron* eg, double mu ) const override;
/** The main accept method: in case mu not in EventInfo online */
asg::AcceptData accept( const xAOD::Egamma* eg, double mu ) const;
- asg::AcceptData accept( const EventContext& ctx, const xAOD::Egamma* eg, double mu ) const;
+ asg::AcceptData accept( const EventContext& ctx, const xAOD::Egamma* eg, double mu ) const override;
// Main methods for IAsgCalculatorTool interface
public:
/** The main result method: the actual likelihood is calculated here */
double calculate( const xAOD::IParticle* part ) const;
- double calculate( const EventContext &ctx, const xAOD::IParticle* part ) const;
+ double calculate( const EventContext &ctx, const xAOD::IParticle* part ) const override;
/** The main result method: the actual likelihood is calculated here */
double calculate( const xAOD::Electron* eg ) const {
return calculate (eg, -99); // mu = -99 as input will force accept to grab the pileup variable from the xAOD object
}
- double calculate( const EventContext &ctx, const xAOD::Electron* eg ) const {
+ double calculate( const EventContext &ctx, const xAOD::Electron* eg ) const override {
return calculate (ctx, eg, -99); // mu = -99 as input will force accept to grab the pileup variable from the xAOD object
}
@@ -96,19 +94,19 @@ public:
double calculate( const xAOD::Egamma* eg ) const {
return calculate (eg, -99); // mu = -99 as input will force accept to grab the pileup variable from the xAOD object
}
- double calculate( const EventContext &ctx, const xAOD::Egamma* eg ) const {
+ double calculate( const EventContext &ctx, const xAOD::Egamma* eg ) const override {
return calculate (ctx, eg, -99); // mu = -99 as input will force accept to grab the pileup variable from the xAOD object
}
/** The main result method: the actual likelihood is calculated here */
double calculate( const xAOD::Electron* eg, double mu ) const;
- double calculate( const EventContext &ctx, const xAOD::Electron* eg, double mu ) const;
+ double calculate( const EventContext &ctx, const xAOD::Electron* eg, double mu ) const override;
/** The main result method: the actual likelihood is calculated here */
double calculate( const xAOD::Egamma* eg, double mu ) const;
- double calculate( const EventContext &ctx, const xAOD::Egamma* eg, double mu ) const;
+ double calculate( const EventContext &ctx, const xAOD::Egamma* eg, double mu ) const override;
- virtual std::string getOperatingPointName( ) const;
+ virtual std::string getOperatingPointName( ) const override;
// Private methods
private:
@@ -157,10 +155,14 @@ private:
bool m_skipDeltaPoverP;
/// read handle key to heavy ion container
- SG::ReadHandleKey<xAOD::HIEventShapeContainer> m_HIESContKey;
+ SG::ReadHandleKey<xAOD::HIEventShapeContainer> m_HIESContKey {
+ this, "CaloSumsContainer", "CaloSums",
+ "The CaloSums container name"};
/// read handle key to primary vertex container
- SG::ReadHandleKey<xAOD::VertexContainer> m_primVtxContKey;
+ SG::ReadHandleKey<xAOD::VertexContainer> m_primVtxContKey {
+ this, "primaryVertexContainer", "PrimaryVertices",
+ "The primary vertex container name"};
}; // End: class definition
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronMultiLeptonSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronMultiLeptonSelector.h
deleted file mode 100644
index 206464e6960ed8fd81381a5a3094d66e209838ab..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgElectronMultiLeptonSelector.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-// Dear emacs, this is -*-c++-*-
-
-#ifndef __ASGELECTRONMULTILEPTONSELECTOR__
-#define __ASGELECTRONMULTILEPTONSELECTOR__
-
-/**
- @class AsgElectronMultiLeptonSelector
- @brief Tool to select electrons
-
- @author Karsten Koeneke
- @date October 2012
-
- 12-MAR-2014, convert to ASGTool (Jovan Mitrevski)
-
-*/
-
-// Atlas includes
-#include "AsgTools/AsgTool.h"
-#include "EgammaAnalysisInterfaces/IAsgElectronMultiLeptonSelector.h"
-
-namespace Root{
- class TElectronMultiLeptonSelector;
-}
-
-
-class AsgElectronMultiLeptonSelector : public asg::AsgTool,
- virtual public IAsgElectronMultiLeptonSelector
-{
- ASG_TOOL_CLASS2(AsgElectronMultiLeptonSelector, IAsgElectronMultiLeptonSelector,
- CP::ISelectionTool)
-
-public:
- /** Standard constructor */
- AsgElectronMultiLeptonSelector(const std::string& myname);
-
-
- /** Standard destructor */
- virtual ~AsgElectronMultiLeptonSelector();
-
-
-public:
- /** Gaudi Service Interface method implementations */
- virtual StatusCode initialize();
-
- /** Gaudi Service Interface method implementations */
- virtual StatusCode finalize();
-
- // Main methods for IAsgSelectionTool interface
-
- /** Method to get the plain AcceptInfo.
- This is needed so that one can already get the AcceptInfo
- and query what cuts are defined before the first object
- is passed to the tool. */
- const asg::AcceptInfo& getAcceptInfo() const;
-
- /** The main accept method: the actual cuts are applied here */
- asg::AcceptData accept( const xAOD::IParticle* part ) const;
-
- /** The main accept method: the actual cuts are applied here */
- asg::AcceptData accept( const xAOD::Electron* eg ) const;
-
- /** Method to get the operating point */
- virtual std::string getOperatingPointName( ) const;
-
-
- // Private member variables
-private:
- /** Pointer to the underlying ROOT based tool */
- Root::TElectronMultiLeptonSelector* m_rootTool;
-
-}; // End: class definition
-
-
-
-
-
-
-#endif
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgForwardElectronIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgForwardElectronIsEMSelector.h
index d25f01a4327b24f0e0e50a06b745d191bd890ac2..9dcc1f33bc552b5fe919b9bc0286d7ecd29d8550 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgForwardElectronIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgForwardElectronIsEMSelector.h
@@ -27,11 +27,12 @@
#include "EgammaAnalysisInterfaces/IAsgForwardElectronIsEMSelector.h"
#include "xAODTracking/VertexContainer.h"
-#include "StoreGate/ReadHandleKey.h"
-#include "GaudiKernel/EventContext.h"
+#include "AsgDataHandles/ReadHandleKey.h"
#include <string>
+class EventContext;
+
namespace Root{
class TForwardElectronIsEMSelector;
}
@@ -106,7 +107,9 @@ private:
unsigned int m_nPVdefault;
/// read handle key to primary vertex container
- SG::ReadHandleKey<xAOD::VertexContainer> m_primVtxContKey;
+ SG::ReadHandleKey<xAOD::VertexContainer> m_primVtxContKey {
+ this, "primaryVertexContainer", "PrimaryVertices",
+ "The primary vertex container name"};
}; // End: class definition
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgPhotonIsEMSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgPhotonIsEMSelector.h
index 497de4739cda7eec1ac728b06cc9727d1d274c64..24d90cbdb3fb42096f66777b627a0dd7e38c12c1 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgPhotonIsEMSelector.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/AsgPhotonIsEMSelector.h
@@ -21,7 +21,6 @@
// Atlas includes
#include "AsgTools/AsgTool.h"
-#include "GaudiKernel/EventContext.h"
// Include the interfaces
#include "EgammaAnalysisInterfaces/IAsgPhotonIsEMSelector.h"
#include "xAODEgamma/PhotonFwd.h"
@@ -29,6 +28,8 @@
#include "xAODEgamma/ElectronFwd.h"
#include "xAODTracking/VertexFwd.h"
+class EventContext;
+
namespace Root{
class TPhotonIsEMSelector;
}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/ElectronPhotonSelectorToolsPythonDict.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/ElectronPhotonSelectorToolsPythonDict.h
index bc85cb058afb3300220b1681e14792636b816c87..54ac5d791c014c9ebc10760615c1c8a8448dd19a 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/ElectronPhotonSelectorToolsPythonDict.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/ElectronPhotonSelectorToolsPythonDict.h
@@ -8,7 +8,6 @@
// for python
#include "ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h"
#include "ElectronPhotonSelectorTools/AsgPhotonIsEMSelector.h"
-#include "ElectronPhotonSelectorTools/AsgElectronMultiLeptonSelector.h"
#include "ElectronPhotonSelectorTools/AsgForwardElectronIsEMSelector.h"
#include "ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h"
#include "ElectronPhotonSelectorTools/EGammaAmbiguityTool.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/selectionPython.xml b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/selectionPython.xml
index 3f816ee712fd6461e97da31d2c8004106a49e2c2..ed74a007c048e50a96e30b5c08a3bf784711dcb0 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/selectionPython.xml
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/ElectronPhotonSelectorTools/selectionPython.xml
@@ -1,10 +1,9 @@
<lcgdict>
- <class name="AsgElectronIsEMSelector" />
- <class name="AsgForwardElectronIsEMSelector" />
+ <class name="AsgElectronIsEMSelector" />
+ <class name="AsgForwardElectronIsEMSelector" />
<class name="AsgPhotonIsEMSelector" />
- <class name="AsgElectronMultiLeptonSelector" />
- <class name="AsgElectronLikelihoodTool" />
- <class name="EGammaAmbiguityTool" />
- <class name="AsgDeadHVCellRemovalTool" />
+ <class name="AsgElectronLikelihoodTool" />
+ <class name="EGammaAmbiguityTool" />
+ <class name="AsgDeadHVCellRemovalTool" />
<class name="AsgElectronChargeIDSelectorTool"/>
</lcgdict>
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronIsEMSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronIsEMSelector.cxx
index 6d34d7923b4515c4b49b234c4ede8f7842e07f7f..8d5c83182f1c8f33dfa905435328005970a162f3 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronIsEMSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronIsEMSelector.cxx
@@ -24,6 +24,7 @@
#include "xAODEgamma/Photon.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODCaloEvent/CaloCluster.h"
+#include "AsgTools/CurrentContext.h"
#include "PathResolver/PathResolver.h"
#include "TEnv.h"
#include <cstdint>
@@ -172,9 +173,6 @@ AsgElectronIsEMSelector::AsgElectronIsEMSelector(const std::string& myname) :
//=============================================================================
AsgElectronIsEMSelector::~AsgElectronIsEMSelector()
{
- if(finalize().isFailure()){
- ATH_MSG_ERROR ( "Failure in AsgElectronIsEMSelector finalize()");
- }
delete m_rootTool;
}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
index ed561ef7040bbd83665c7edd045163c08be0be3c..47e1fd55c2e4a4c48a3af23a4e9065c786f8e0a1 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
@@ -18,7 +18,6 @@
#include "AsgElectronPhotonIsEMSelectorConfigHelper.h"
#include "TElectronLikelihoodTool.h"
#include "EGSelectorConfigurationMapping.h"
-#include "GaudiKernel/EventContext.h"
// STL includes
#include <string>
#include <cstdint>
@@ -30,6 +29,8 @@
#include "xAODCaloEvent/CaloCluster.h"
#include "TEnv.h"
+#include "AsgDataHandles/ReadHandle.h"
+#include "AsgTools/CurrentContext.h"
#include "PathResolver/PathResolver.h"
@@ -39,9 +40,7 @@
AsgElectronLikelihoodTool::AsgElectronLikelihoodTool(const std::string& myname) :
AsgTool(myname),
m_configFile{""},
- m_rootTool{nullptr},
- m_HIESContKey{"CaloSums"},
- m_primVtxContKey{"PrimaryVertices"}
+ m_rootTool{nullptr}
{
// Create an instance of the underlying ROOT tool
@@ -52,10 +51,8 @@ AsgElectronLikelihoodTool::AsgElectronLikelihoodTool(const std::string& myname)
declareProperty("ConfigFile",m_configFile="","The config file to use");
declareProperty("usePVContainer", m_usePVCont=true, "Whether to use the PV container");
declareProperty("nPVdefault", m_nPVdefault = 0, "The default number of PVs if not counted");
- declareProperty("primaryVertexContainer", m_primVtxContKey="PrimaryVertices", "The primary vertex container name" );
declareProperty("useCaloSumsContainer", m_useCaloSumsCont=true, "Whether to use the CaloSums container");
declareProperty("fcalEtDefault", m_fcalEtDefault = 0, "The default FCal sum ET");
- declareProperty("CaloSumsContainer", m_HIESContKey="CaloSums", "The CaloSums container name" );
declareProperty("skipDeltaPoverP", m_skipDeltaPoverP=false, "If true, it wil skip the check of deltaPoverP" );
@@ -137,9 +134,6 @@ AsgElectronLikelihoodTool::AsgElectronLikelihoodTool(const std::string& myname)
//=============================================================================
AsgElectronLikelihoodTool::~AsgElectronLikelihoodTool()
{
- if(finalize().isFailure()){
- ATH_MSG_ERROR ( "Failure in AsgElectronLikelihoodTool finalize()");
- }
delete m_rootTool;
}
@@ -268,15 +262,6 @@ StatusCode AsgElectronLikelihoodTool::initialize()
return StatusCode::SUCCESS ;
}
-
-//=============================================================================
-// Asgena finalize method (now called by destructor)
-//=============================================================================
-StatusCode AsgElectronLikelihoodTool::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
//=============================================================================
// return the accept info object
//=============================================================================
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronMultiLeptonSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronMultiLeptonSelector.cxx
deleted file mode 100644
index 4ea5adbe38fa749ad107e9f21da12d98253f752c..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronMultiLeptonSelector.cxx
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- @class AsgElectronMultiLeptonSelector
- @brief Electron selector tool to select objects in Asgena using an underlying pure ROOT tool.
-
- @author Karsten Koeneke
- @date October 2012
-
- 12-MAR-2014 convert to ASG tool (Jovan Mitrevski)
-
-*/
-
-// Include this class's header
-#include "ElectronPhotonSelectorTools/AsgElectronMultiLeptonSelector.h"
-#include "TElectronMultiLeptonSelector.h"
-#include "xAODEgamma/Electron.h"
-#include "xAODTracking/TrackParticle.h"
-#include "xAODCaloEvent/CaloCluster.h"
-
-#include <cmath>
-#include <cstdint>
-
-//=============================================================================
-// Standard constructor
-//=============================================================================
-AsgElectronMultiLeptonSelector::AsgElectronMultiLeptonSelector(const std::string& myname) :
- AsgTool(myname),
- m_rootTool(nullptr)
-{
-
- // Create an instance of the underlying ROOT tool
- m_rootTool = new Root::TElectronMultiLeptonSelector(myname.c_str());
-
-}
-
-
-//=============================================================================
-// Standard destructor
-//=============================================================================
-AsgElectronMultiLeptonSelector::~AsgElectronMultiLeptonSelector()
-{
- if(finalize().isFailure()){
- ATH_MSG_ERROR ( "Failure in AsgElectronMultiLeptonSelector finalize()");
- }
- delete m_rootTool;
-}
-
-
-//=============================================================================
-// Asgena initialize method
-//=============================================================================
-StatusCode AsgElectronMultiLeptonSelector::initialize()
-{
-
- ATH_MSG_INFO ("Initialize ");
-
-
- // We need to initialize the underlying ROOT TSelectorTool
- m_rootTool->msg().setLevel(this->msg().level());
- if ( m_rootTool->initialize().isFailure() )
- {
- ATH_MSG_ERROR ( "ERROR! Could not initialize the TElectronMultiLeptonSelector!" );
- return StatusCode::FAILURE;
- }
-
- ATH_MSG_INFO ("Initialize end ");
-
- return StatusCode::SUCCESS ;
-}
-
-
-
-//=============================================================================
-// finalize method (now called by destructor)
-//=============================================================================
-StatusCode AsgElectronMultiLeptonSelector::finalize()
-{
- return StatusCode::SUCCESS;
-}
-
-
-//=============================================================================
-// return the accept info object
-//=============================================================================
-
-const asg::AcceptInfo& AsgElectronMultiLeptonSelector::getAcceptInfo() const
-{
- return m_rootTool->getAcceptInfo();
-}
-
-
-//=============================================================================
-// The main accept method: the actual cuts are applied here
-//=============================================================================
-asg::AcceptData AsgElectronMultiLeptonSelector::accept( const xAOD::Electron* eg ) const
-{
- if ( !eg )
- {
- ATH_MSG_DEBUG ("Failed, no egamma object.");
- return m_rootTool->accept();
- }
-
- const xAOD::CaloCluster* cluster = eg->caloCluster();
- if ( !cluster )
- {
- ATH_MSG_DEBUG ("Failed, no cluster.");
- return m_rootTool->accept();
- }
-
- float eta = fabsf(cluster->etaBE(2));
- if ( eta > 100.0 )
- {
- ATH_MSG_DEBUG ("Failed, eta range.");
- return m_rootTool->accept();
- }
-
- // transverse energy of the electron (using the track eta)
- double et = eg->pt();
-
- bool allFound = true;
-
- float Reta(0);
- float Rhad1(0);
- float Rhad(0);
- float w2(0);
- float f1(0);
- float f3(0);
- float wstot(0);
- float Eratio(0);
- float deltaEta(0);
- float deltaPhiRescaled(0);
-
- // Reta
- allFound = allFound && eg->showerShapeValue(Reta, xAOD::EgammaParameters::Reta);
- allFound = allFound && eg->showerShapeValue(Rhad1, xAOD::EgammaParameters::Rhad1);
- allFound = allFound && eg->showerShapeValue(Rhad, xAOD::EgammaParameters::Rhad);
- // shower width in 2nd sampling
- allFound = allFound && eg->showerShapeValue(w2, xAOD::EgammaParameters::weta2);
- // fraction of energy reconstructed in the 1st sampling
- allFound = allFound && eg->showerShapeValue(f1, xAOD::EgammaParameters::f1);
- // E of 1st max in strips
- allFound = allFound && eg->showerShapeValue(Eratio, xAOD::EgammaParameters::Eratio);
- // fraction of energy reconstructed in the 3rd sampling
- allFound = allFound && eg->showerShapeValue(f3, xAOD::EgammaParameters::f3);
- // total shower width in 1st sampling
- allFound = allFound && eg->showerShapeValue(wstot, xAOD::EgammaParameters::wtots1);
-
-
-
- // delta eta
- allFound = allFound && eg->trackCaloMatchValue(deltaEta, xAOD::EgammaParameters::deltaEta1);
-
- // difference between the cluster phi (sampling 2) and the eta of the track extrapolated from the last measurement point.
- allFound = allFound && eg->trackCaloMatchValue(deltaPhiRescaled, xAOD::EgammaParameters::deltaPhiRescaled2);
-
- // number of track hits
- uint8_t nSCT(0);
- uint8_t nSCTDeadSensors(0);
- uint8_t nSi(0);
- uint8_t nSiDeadSensors(0);
- uint8_t nPix(0);
- uint8_t nPixDeadSensors(0);
- uint8_t nTRThigh(0);
- uint8_t nTRThighOutliers(0);
- uint8_t nTRT(0);
- uint8_t nTRTOutliers(0);
- uint8_t expectBlayer(1);
- uint8_t nBlayerHits(0);
- double trackqoverp(0.0);
- double dpOverp(0.0);
- // retrieve associated track
- const xAOD::TrackParticle* t = eg->trackParticle();
-
- if (t) {
- trackqoverp = t->qOverP();
-
- allFound = allFound && t->summaryValue(nBlayerHits, xAOD::numberOfInnermostPixelLayerHits);
- allFound = allFound && t->summaryValue(nPix, xAOD::numberOfPixelHits);
- allFound = allFound && t->summaryValue(nSCT, xAOD::numberOfSCTHits);
- allFound = allFound && t->summaryValue(nPixDeadSensors, xAOD::numberOfPixelDeadSensors);
- allFound = allFound && t->summaryValue(nSCTDeadSensors, xAOD::numberOfSCTDeadSensors);
-
- allFound = allFound && t->summaryValue(nTRThigh, xAOD::numberOfTRTHighThresholdHits);
- allFound = allFound && t->summaryValue(nTRThighOutliers, xAOD::numberOfTRTHighThresholdOutliers);
- allFound = allFound && t->summaryValue(nTRT, xAOD::numberOfTRTHits);
- allFound = allFound && t->summaryValue(nTRTOutliers, xAOD::numberOfTRTOutliers);
-
- allFound = allFound && t->summaryValue(expectBlayer, xAOD::expectInnermostPixelLayerHit);
-
-
- nSi = nPix+nSCT;
- nSiDeadSensors = nPixDeadSensors+nSCTDeadSensors;
-
- unsigned int index;
- if( t->indexOfParameterAtPosition(index, xAOD::LastMeasurement) ) {
-
- double refittedTrack_LMqoverp =
- t->charge() / sqrt(std::pow(t->parameterPX(index), 2) +
- std::pow(t->parameterPY(index), 2) +
- std::pow(t->parameterPZ(index), 2));
-
- dpOverp = 1 - trackqoverp/(refittedTrack_LMqoverp);
- }
- } else {
- ATH_MSG_DEBUG ( "Failed, no track particle: et= " << et << "eta= " << eta );
- allFound = false;
- }
-
- // TRT high-to-low threshold hits ratio
- double rTRT(0.0);
- rTRT = (nTRT+nTRTOutliers) > 0 ? ((double) ((double)(nTRThigh+nTRThighOutliers))/((double)(nTRT+nTRTOutliers)) ) : 0.;
- int nTRTTotal = nTRT+nTRTOutliers;
-
- if (!allFound) {
- // if object is bad then use the bit for "bad eta"
- ATH_MSG_WARNING("Have some variables missing.");
- return m_rootTool->accept();
- }
-
- // Get the answer from the underlying ROOT tool
- return m_rootTool->accept(eta, et,
- Rhad, Rhad1,
- Reta, w2,
- f1, f3,
- wstot, Eratio,
- deltaEta,
- nSi, nSiDeadSensors, nPix, nPixDeadSensors,
- deltaPhiRescaled,
- dpOverp,
- rTRT, nTRTTotal,
- nBlayerHits, expectBlayer);
-}
-
-
-asg::AcceptData AsgElectronMultiLeptonSelector::accept(const xAOD::IParticle* part) const
-{
- ATH_MSG_DEBUG("Entering accept( const IParticle* part )");
- if(part->type()==xAOD::Type::Electron){
- const xAOD::Electron* eg =static_cast<const xAOD::Electron*> (part);
- return accept(eg);
- }
-
- ATH_MSG_ERROR("AsgElectronMultiLeptonSelector::could not convert argument to accept");
- return m_rootTool->accept();
-
-}
-
-//=============================================================================
-/// Get the name of the current operating point
-//=============================================================================
-std::string AsgElectronMultiLeptonSelector::getOperatingPointName() const{
- return "MultiLepton";
-}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgForwardElectronIsEMSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgForwardElectronIsEMSelector.cxx
index 4d30b5c27f4a9507e99c1a6b10eb2ac3d04b40c0..972c9d8ccc13f840c2cfcd4ad2f8e8dfe4768a9b 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgForwardElectronIsEMSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgForwardElectronIsEMSelector.cxx
@@ -22,8 +22,9 @@
#include "xAODEgamma/Photon.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "xAODTracking/Vertex.h"
+#include "AsgDataHandles/ReadHandle.h"
+#include "AsgTools/CurrentContext.h"
#include "PathResolver/PathResolver.h"
-#include "GaudiKernel/EventContext.h"
#include "TEnv.h"
#include <cstdint>
//=============================================================================
@@ -32,8 +33,7 @@
AsgForwardElectronIsEMSelector::AsgForwardElectronIsEMSelector(const std::string& myname) :
AsgTool(myname),
m_configFile{""},
- m_rootForwardTool{nullptr},
- m_primVtxContKey{"PrimaryVertices"}
+ m_rootForwardTool{nullptr}
{
m_rootForwardTool = new Root::TForwardElectronIsEMSelector(myname.c_str());
@@ -41,7 +41,6 @@ AsgForwardElectronIsEMSelector::AsgForwardElectronIsEMSelector(const std::string
declareProperty("ConfigFile",m_configFile="","The config file to use (if not setting cuts one by one)");
declareProperty("usePVContainer", m_usePVCont=true, "Whether to use the PV container");
declareProperty("nPVdefault", m_nPVdefault = 0, "The default number of PVs if not counted");
- declareProperty("primaryVertexContainer", m_primVtxContKey="PrimaryVertices", "The primary vertex container name" );
// Name of the quality to use
declareProperty("isEMMask",
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgPhotonIsEMSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgPhotonIsEMSelector.cxx
index 309f2118a46e4bd0f289c9ff1fb9e60c5ce39df2..83b37fe9b03f089666ca3f9a80dfdd37b1e550f6 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgPhotonIsEMSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgPhotonIsEMSelector.cxx
@@ -13,7 +13,6 @@
*/
// Include this class's header
-#include "GaudiKernel/EventContext.h"
#include "ElectronPhotonSelectorTools/AsgPhotonIsEMSelector.h"
#include "AsgElectronPhotonIsEMSelectorConfigHelper.h"
#include "TPhotonIsEMSelector.h"
@@ -22,6 +21,7 @@
#include "xAODEgamma/Photon.h"
#include "xAODEgamma/Electron.h"
#include "xAODCaloEvent/CaloCluster.h"
+#include "AsgTools/CurrentContext.h"
#include "PathResolver/PathResolver.h"
#include "TEnv.h"
#include "xAODEgamma/EgammaxAODHelpers.h"
@@ -221,9 +221,6 @@ AsgPhotonIsEMSelector::AsgPhotonIsEMSelector(const std::string& myname) :
// =================================================================
AsgPhotonIsEMSelector::~AsgPhotonIsEMSelector()
{
- if(finalize().isFailure()){
- ATH_MSG_ERROR ( "Failure in AsgPhotonIsEMSelector finalize()");
- }
delete m_rootTool;
}
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx
index e1f56e38c2224213fb6446552ec142e8296a88db..719eaac1fa41c5c854d437cd0d05a9d756a77b38 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.cxx
@@ -3,19 +3,19 @@
*/
#include "TElectronLikelihoodTool.h"
-#include "TFile.h" // for TFile
-#include "TH1.h" // for TH1F
+#include "TFile.h" // for TFile
+#include "TH1.h" // for TH1F
#include "TROOT.h"
-#include "TString.h" // for TString
+#include "TString.h" // for TString
#include "TSystem.h"
-#include <algorithm> // for min
+#include <algorithm> // for min
#include <cmath>
-#include <cstdio> // for sprintf
-#include <fstream> // for char_traits
+#include <cstdio> // for sprintf
+#include <fstream> // for char_traits
#include "ElectronPhotonSelectorTools/ElectronSelectorHelpers.h"
-/**
+/**
Author : Kurt Brendlinger <kurb@sas.upenn.edu>
Please see TElectronLikelihoodTool.h for usage.
*/
@@ -25,40 +25,40 @@ Please see TElectronLikelihoodTool.h for usage.
//=============================================================================
//----------------------------------------------------------------------------------------
-Root::TElectronLikelihoodTool::TElectronLikelihoodTool(const char* name) :
- asg::AsgMessaging(std::string(name)),
- m_doRemoveF3AtHighEt(false),
- m_doRemoveTRTPIDAtHighEt(false),
- m_doSmoothBinInterpolation(false),
- m_useOneExtraHighETLHBin(false),
- m_highETBinThreshold(125),
- m_doPileupTransform(false),
- m_doCentralityTransform(false),
- m_discMaxForPileupTransform(2.0),
- m_pileupMaxForPileupTransform(50),
- m_variableNames(""),
- m_pdfFileName(""),
- m_name(name),
- m_variableBitMask(0x0),
- m_ipBinning(""),
- m_pdfFile(nullptr),
- m_cutPosition_kinematic(-9),
- m_cutPosition_NSilicon(-9),
- m_cutPosition_NPixel(-9),
- m_cutPosition_NBlayer(-9),
- m_cutPosition_ambiguity(-9),
- m_cutPosition_LH(-9),
- m_cutPositionTrackA0(-9),
- m_cutPositionTrackMatchEta(-9),
- m_cutPositionTrackMatchPhiRes(-9),
- m_cutPositionWstotAtHighET(-9),
- m_cutPositionEoverPAtHighET(-9)
+Root::TElectronLikelihoodTool::TElectronLikelihoodTool(const char* name)
+ : asg::AsgMessaging(std::string(name))
+ , m_doRemoveF3AtHighEt(false)
+ , m_doRemoveTRTPIDAtHighEt(false)
+ , m_doSmoothBinInterpolation(false)
+ , m_useOneExtraHighETLHBin(false)
+ , m_highETBinThreshold(125)
+ , m_doPileupTransform(false)
+ , m_doCentralityTransform(false)
+ , m_discMaxForPileupTransform(2.0)
+ , m_pileupMaxForPileupTransform(50)
+ , m_variableNames("")
+ , m_pdfFileName("")
+ , m_name(name)
+ , m_variableBitMask(0x0)
+ , m_ipBinning("")
+ , m_pdfFile(nullptr)
+ , m_cutPosition_kinematic(-9)
+ , m_cutPosition_NSilicon(-9)
+ , m_cutPosition_NPixel(-9)
+ , m_cutPosition_NBlayer(-9)
+ , m_cutPosition_ambiguity(-9)
+ , m_cutPosition_LH(-9)
+ , m_cutPositionTrackA0(-9)
+ , m_cutPositionTrackMatchEta(-9)
+ , m_cutPositionTrackMatchPhiRes(-9)
+ , m_cutPositionWstotAtHighET(-9)
+ , m_cutPositionEoverPAtHighET(-9)
{
- for(unsigned int varIndex = 0; varIndex < s_fnVariables; varIndex++){
- for(unsigned int s_or_b = 0; s_or_b < 2; s_or_b++){
- for (unsigned int ip = 0; ip < IP_BINS; ip++){
- for(unsigned int et = 0; et < s_fnEtBinsHist; et++){
- for(unsigned int eta = 0; eta < s_fnEtaBins; eta++){
+ for (unsigned int varIndex = 0; varIndex < s_fnVariables; varIndex++) {
+ for (unsigned int s_or_b = 0; s_or_b < 2; s_or_b++) {
+ for (unsigned int ip = 0; ip < IP_BINS; ip++) {
+ for (unsigned int et = 0; et < s_fnEtBinsHist; et++) {
+ for (unsigned int eta = 0; eta < s_fnEtaBins; eta++) {
fPDFbins[s_or_b][ip][et][eta][varIndex] = nullptr;
}
}
@@ -67,20 +67,17 @@ Root::TElectronLikelihoodTool::TElectronLikelihoodTool(const char* name) :
}
}
-
-
-
//=============================================================================
// Destructor
//=============================================================================
Root::TElectronLikelihoodTool::~TElectronLikelihoodTool()
{
- for(unsigned int varIndex = 0; varIndex < s_fnVariables; varIndex++){
- for(unsigned int s_or_b = 0; s_or_b < 2; s_or_b++){
- for (unsigned int ip = 0; ip < IP_BINS; ip++){
- for(unsigned int et = 0; et < s_fnEtBinsHist; et++){
- for(unsigned int eta = 0; eta < s_fnEtaBins; eta++){
- if (fPDFbins[s_or_b][ip][et][eta][varIndex]){
+ for (unsigned int varIndex = 0; varIndex < s_fnVariables; varIndex++) {
+ for (unsigned int s_or_b = 0; s_or_b < 2; s_or_b++) {
+ for (unsigned int ip = 0; ip < IP_BINS; ip++) {
+ for (unsigned int et = 0; et < s_fnEtBinsHist; et++) {
+ for (unsigned int eta = 0; eta < s_fnEtaBins; eta++) {
+ if (fPDFbins[s_or_b][ip][et][eta][varIndex]) {
delete fPDFbins[s_or_b][ip][et][eta][varIndex];
fPDFbins[s_or_b][ip][et][eta][varIndex] = nullptr;
}
@@ -91,139 +88,170 @@ Root::TElectronLikelihoodTool::~TElectronLikelihoodTool()
}
}
-
-StatusCode Root::TElectronLikelihoodTool::initialize()
+StatusCode
+Root::TElectronLikelihoodTool::initialize()
{
- ATH_MSG_DEBUG( "TElectronLikelihoodTool initialize.");
+ ATH_MSG_DEBUG("TElectronLikelihoodTool initialize.");
// use an int as a StatusCode
StatusCode sc(StatusCode::SUCCESS);
// Check that all needed variables are setup
- if ( m_pdfFileName.empty() )
- {
- ATH_MSG_WARNING("You need to specify the input PDF file name before you call initialize() with setPDFFileName('your/file/name.root') ");
+ if (m_pdfFileName.empty()) {
+ ATH_MSG_WARNING("You need to specify the input PDF file name before you "
+ "call initialize() with "
+ "setPDFFileName('your/file/name.root') ");
sc = StatusCode::FAILURE;
}
- unsigned int number_of_expected_bin_combinedLH ;
- if(m_useOneExtraHighETLHBin) number_of_expected_bin_combinedLH = s_fnDiscEtBinsOneExtra*s_fnEtaBins ;
- else number_of_expected_bin_combinedLH = s_fnDiscEtBins*s_fnEtaBins ;
- unsigned int number_of_expected_bin_combinedOther = s_fnDiscEtBins*s_fnEtaBins ;
+ unsigned int number_of_expected_bin_combinedLH;
+ if (m_useOneExtraHighETLHBin)
+ number_of_expected_bin_combinedLH = s_fnDiscEtBinsOneExtra * s_fnEtaBins;
+ else
+ number_of_expected_bin_combinedLH = s_fnDiscEtBins * s_fnEtaBins;
+ unsigned int number_of_expected_bin_combinedOther = s_fnDiscEtBins * s_fnEtaBins;
-
- if( m_cutLikelihood.size() != number_of_expected_bin_combinedLH){
- ATH_MSG_ERROR("Configuration issue : cutLikelihood expected size " << number_of_expected_bin_combinedLH <<
- " input size " << m_cutLikelihood.size());
+ if (m_cutLikelihood.size() != number_of_expected_bin_combinedLH) {
+ ATH_MSG_ERROR("Configuration issue : cutLikelihood expected size "
+ << number_of_expected_bin_combinedLH << " input size " << m_cutLikelihood.size());
sc = StatusCode::FAILURE;
- }
+ }
- if( !m_discHardCutForPileupTransform.empty() ) {
- if( m_discHardCutForPileupTransform.size() != number_of_expected_bin_combinedLH){
- ATH_MSG_ERROR("Configuration issue : DiscHardCutForPileupTransform expected size " << number_of_expected_bin_combinedLH <<
- " input size " << m_discHardCutForPileupTransform.size());
+ if (!m_discHardCutForPileupTransform.empty()) {
+ if (m_discHardCutForPileupTransform.size() != number_of_expected_bin_combinedLH) {
+ ATH_MSG_ERROR("Configuration issue : DiscHardCutForPileupTransform expected size "
+ << number_of_expected_bin_combinedLH << " input size "
+ << m_discHardCutForPileupTransform.size());
sc = StatusCode::FAILURE;
- }
+ }
}
- if(!m_discHardCutSlopeForPileupTransform.empty() ) {
- if(m_discHardCutSlopeForPileupTransform.size() != number_of_expected_bin_combinedLH){
- ATH_MSG_ERROR("Configuration issue : DiscHardCutSlopeForPileupTransform expected size " << number_of_expected_bin_combinedLH <<
- " input size " << m_discHardCutSlopeForPileupTransform.size());
+ if (!m_discHardCutSlopeForPileupTransform.empty()) {
+ if (m_discHardCutSlopeForPileupTransform.size() != number_of_expected_bin_combinedLH) {
+ ATH_MSG_ERROR("Configuration issue : "
+ "DiscHardCutSlopeForPileupTransform expected size "
+ << number_of_expected_bin_combinedLH << " input size "
+ << m_discHardCutSlopeForPileupTransform.size());
sc = StatusCode::FAILURE;
- }
+ }
}
- if(!m_discLooseForPileupTransform.empty()) {
- if( m_discLooseForPileupTransform.size() != number_of_expected_bin_combinedLH){
- ATH_MSG_ERROR("Configuration issue : DiscLooseForPileupTransform expected size " << number_of_expected_bin_combinedLH <<
- " input size " << m_discLooseForPileupTransform.size());
+ if (!m_discLooseForPileupTransform.empty()) {
+ if (m_discLooseForPileupTransform.size() != number_of_expected_bin_combinedLH) {
+ ATH_MSG_ERROR("Configuration issue : DiscLooseForPileupTransform expected size "
+ << number_of_expected_bin_combinedLH << " input size "
+ << m_discLooseForPileupTransform.size());
sc = StatusCode::FAILURE;
- }
+ }
}
// d0 cut
- if (!m_cutA0.empty()){
- if (m_cutA0.size() != number_of_expected_bin_combinedOther){
- ATH_MSG_ERROR("Configuration issue : CutA0 expected size " << number_of_expected_bin_combinedOther <<
- " input size " << m_cutA0.size());
+ if (!m_cutA0.empty()) {
+ if (m_cutA0.size() != number_of_expected_bin_combinedOther) {
+ ATH_MSG_ERROR("Configuration issue : CutA0 expected size "
+ << number_of_expected_bin_combinedOther << " input size " << m_cutA0.size());
sc = StatusCode::FAILURE;
}
}
// deltaEta cut
- if (!m_cutDeltaEta.empty()){
- if (m_cutDeltaEta.size() != number_of_expected_bin_combinedOther){
- ATH_MSG_ERROR("Configuration issue : CutDeltaEta expected size " << number_of_expected_bin_combinedOther <<
- " input size " << m_cutDeltaEta.size());
+ if (!m_cutDeltaEta.empty()) {
+ if (m_cutDeltaEta.size() != number_of_expected_bin_combinedOther) {
+ ATH_MSG_ERROR("Configuration issue : CutDeltaEta expected size "
+ << number_of_expected_bin_combinedOther << " input size "
+ << m_cutDeltaEta.size());
sc = StatusCode::FAILURE;
}
}
// deltaPhiRes cut
- if (!m_cutDeltaPhiRes.empty()){
- if (m_cutDeltaPhiRes.size() != number_of_expected_bin_combinedOther ){
- ATH_MSG_ERROR("Configuration issue : CutDeltaPhiRes expected size " << number_of_expected_bin_combinedOther <<
- " input size " << m_cutDeltaPhiRes.size());
+ if (!m_cutDeltaPhiRes.empty()) {
+ if (m_cutDeltaPhiRes.size() != number_of_expected_bin_combinedOther) {
+ ATH_MSG_ERROR("Configuration issue : CutDeltaPhiRes expected size "
+ << number_of_expected_bin_combinedOther << " input size "
+ << m_cutDeltaPhiRes.size());
sc = StatusCode::FAILURE;
}
}
- if ( sc == StatusCode::FAILURE ){
+ if (sc == StatusCode::FAILURE) {
ATH_MSG_ERROR("Could NOT initialize! Please fix the errors mentioned above...");
return sc;
}
// --------------------------------------------------------------------------
// Register the cuts and check that the registration worked:
- // NOTE: THE ORDER IS IMPORTANT!!! Cut0 corresponds to bit 0, Cut1 to bit 1,...
- // if ( m_cutPosition_nSCTMin < 0 ) sc == StatusCode::FAILURE; // Exceeded the number of allowed cuts (32)
-
- // Cut position for the kineatic pre-selection
- m_cutPosition_kinematic = m_acceptInfo.addCut( "kinematic", "pass kinematic" );
- if ( m_cutPosition_kinematic < 0 ) {sc = StatusCode::FAILURE;}
+ // NOTE: THE ORDER IS IMPORTANT!!! Cut0 corresponds to bit 0, Cut1 to bit
+ // 1,... Cut position for the kineatic pre-selection
+ m_cutPosition_kinematic = m_acceptInfo.addCut("kinematic", "pass kinematic");
+ if (m_cutPosition_kinematic < 0) {
+ sc = StatusCode::FAILURE;
+ }
// NSilicon
- m_cutPosition_NSilicon = m_acceptInfo.addCut( "NSilicon", "pass NSilicon" );
- if ( m_cutPosition_NSilicon < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPosition_NSilicon = m_acceptInfo.addCut("NSilicon", "pass NSilicon");
+ if (m_cutPosition_NSilicon < 0) {
+ sc = StatusCode::FAILURE;
+ }
// NPixel
- m_cutPosition_NPixel = m_acceptInfo.addCut( "NPixel", "pass NPixel" );
- if ( m_cutPosition_NPixel < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPosition_NPixel = m_acceptInfo.addCut("NPixel", "pass NPixel");
+ if (m_cutPosition_NPixel < 0) {
+ sc = StatusCode::FAILURE;
+ }
// NBlayer
- m_cutPosition_NBlayer = m_acceptInfo.addCut( "NBlayer", "pass NBlayer" );
- if ( m_cutPosition_NBlayer < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPosition_NBlayer = m_acceptInfo.addCut("NBlayer", "pass NBlayer");
+ if (m_cutPosition_NBlayer < 0) {
+ sc = StatusCode::FAILURE;
+ }
// Ambiguity
- m_cutPosition_ambiguity = m_acceptInfo.addCut( "ambiguity", "pass ambiguity" );
- if ( m_cutPosition_ambiguity < 0 ) {sc = StatusCode::FAILURE;}
-
+ m_cutPosition_ambiguity = m_acceptInfo.addCut("ambiguity", "pass ambiguity");
+ if (m_cutPosition_ambiguity < 0) {
+ sc = StatusCode::FAILURE;
+ }
// Cut position for the likelihood selection - DO NOT CHANGE ORDER!
- m_cutPosition_LH = m_acceptInfo.addCut( "passLH", "pass Likelihood" );
- if ( m_cutPosition_LH < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPosition_LH = m_acceptInfo.addCut("passLH", "pass Likelihood");
+ if (m_cutPosition_LH < 0) {
+ sc = StatusCode::FAILURE;
+ }
// D0
- m_cutPositionTrackA0 = m_acceptInfo.addCut( "TrackA0", "A0 (aka d0) wrt beam spot < Cut" );
- if ( m_cutPositionTrackA0 < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPositionTrackA0 = m_acceptInfo.addCut("TrackA0", "A0 (aka d0) wrt beam spot < Cut");
+ if (m_cutPositionTrackA0 < 0) {
+ sc = StatusCode::FAILURE;
+ }
// deltaeta
- m_cutPositionTrackMatchEta = m_acceptInfo.addCut("TrackMatchEta", "Track match deta in 1st sampling < Cut");
- if ( m_cutPositionTrackMatchEta < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPositionTrackMatchEta =
+ m_acceptInfo.addCut("TrackMatchEta", "Track match deta in 1st sampling < Cut");
+ if (m_cutPositionTrackMatchEta < 0) {
+ sc = StatusCode::FAILURE;
+ }
// deltaphi
- m_cutPositionTrackMatchPhiRes = m_acceptInfo.addCut( "TrackMatchPhiRes", "Track match dphi in 2nd sampling, rescaled < Cut" );
- if ( m_cutPositionTrackMatchPhiRes < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPositionTrackMatchPhiRes =
+ m_acceptInfo.addCut("TrackMatchPhiRes", "Track match dphi in 2nd sampling, rescaled < Cut");
+ if (m_cutPositionTrackMatchPhiRes < 0) {
+ sc = StatusCode::FAILURE;
+ }
// Wstot
- m_cutPositionWstotAtHighET = m_acceptInfo.addCut( "WstotAtHighET", "Above HighETBinThreshold, Wstot < Cut" );
- if ( m_cutPositionWstotAtHighET < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPositionWstotAtHighET =
+ m_acceptInfo.addCut("WstotAtHighET", "Above HighETBinThreshold, Wstot < Cut");
+ if (m_cutPositionWstotAtHighET < 0) {
+ sc = StatusCode::FAILURE;
+ }
// EoverP
- m_cutPositionEoverPAtHighET = m_acceptInfo.addCut( "EoverPAtHighET", "Above HighETBinThreshold, EoverP < Cut" );
- if ( m_cutPositionEoverPAtHighET < 0 ) {sc = StatusCode::FAILURE;}
+ m_cutPositionEoverPAtHighET =
+ m_acceptInfo.addCut("EoverPAtHighET", "Above HighETBinThreshold, EoverP < Cut");
+ if (m_cutPositionEoverPAtHighET < 0) {
+ sc = StatusCode::FAILURE;
+ }
// Check that we got everything OK
- if ( sc == StatusCode::FAILURE ){
- ATH_MSG_ERROR("! Something went wrong with the setup of the decision objects...");
+ if (sc == StatusCode::FAILURE) {
+ ATH_MSG_ERROR("! Something went wrong with the setup of the decision objects...");
return sc;
}
@@ -236,28 +264,28 @@ StatusCode Root::TElectronLikelihoodTool::initialize()
TString tmpString(m_pdfFileName);
gSystem->ExpandPathName(tmpString);
std::string fname(tmpString.Data());
- m_pdfFile = TFile::Open( fname.c_str(), "READ" );
+ m_pdfFile = TFile::Open(fname.c_str(), "READ");
// Check that we could load the ROOT file
- if ( !m_pdfFile )
- {
+ if (!m_pdfFile) {
ATH_MSG_ERROR(" No ROOT file found here: " << m_pdfFileName);
return StatusCode::FAILURE;
}
- //Load the histograms
- for(unsigned int varIndex = 0; varIndex < s_fnVariables; varIndex++){
+ // Load the histograms
+ for (unsigned int varIndex = 0; varIndex < s_fnVariables; varIndex++) {
const std::string& vstr = fVariables[varIndex];
- // Skip the loading of PDFs for variables we don't care about for this operating point.
- // If the string is empty (which is true in the default 2012 case), load all of them.
- if(m_variableNames.find(vstr) == std::string::npos && !m_variableNames.empty()){
+ // Skip the loading of PDFs for variables we don't care about for this
+ // operating point. If the string is empty (which is true in the default
+ // 2012 case), load all of them.
+ if (m_variableNames.find(vstr) == std::string::npos && !m_variableNames.empty()) {
continue;
}
- loadVarHistograms(vstr,varIndex);
+ loadVarHistograms(vstr, varIndex);
}
- //TFile close does not free the memory
+ // TFile close does not free the memory
m_pdfFile->Close();
- //We need the destructor to be called
+ // We need the destructor to be called
delete m_pdfFile;
//----------End File/Histo operation------------------------------------
@@ -265,138 +293,172 @@ StatusCode Root::TElectronLikelihoodTool::initialize()
<< "\n - pdfFileName : " << m_pdfFileName
<< "\n - Variable bitmask : " << m_variableBitMask);
- ATH_MSG_DEBUG( "\n - VariableNames : " << m_variableNames
- << "\n - (bool)CutBL (yes/no) : " << (!m_cutBL.empty() ? "yes" : "no")
- << "\n - (bool)CutPi (yes/no) : " << (!m_cutPi.empty() ? "yes" : "no")
- << "\n - (bool)CutSi (yes/no) : " << (!m_cutSi.empty() ? "yes" : "no")
- << "\n - (bool)CutAmbiguity (yes/no) : " << (!m_cutAmbiguity.empty() ? "yes" : "no")
- << "\n - (bool)doRemoveF3AtHighEt (yes/no) : " << (m_doRemoveF3AtHighEt ? "yes" : "no")
- << "\n - (bool)doRemoveTRTPIDAtHighEt (yes/no) : " << (m_doRemoveTRTPIDAtHighEt ? "yes" : "no")
- << "\n - (bool)doSmoothBinInterpolation (yes/no) : " << (m_doSmoothBinInterpolation ? "yes" : "no")
- << "\n - (bool)useOneExtraHighETLHBin(yes/no) : " << (m_useOneExtraHighETLHBin ? "yes" : "no")
- << "\n - (double)HighETBinThreshold : " << m_highETBinThreshold
- << "\n - (bool)doPileupTransform (yes/no) : " << (m_doPileupTransform ? "yes" : "no")
- << "\n - (bool)doCentralityTransform (yes/no) : " << (m_doCentralityTransform ? "yes" : "no")
- << "\n - (bool)CutLikelihood (yes/no) : " << (!m_cutLikelihood.empty() ? "yes" : "no")
- << "\n - (bool)CutLikelihoodPileupCorrection (yes/no) : " << (!m_cutLikelihoodPileupCorrection.empty() ? "yes" : "no")
- << "\n - (bool)CutA0 (yes/no) : " << (!m_cutA0.empty() ? "yes" : "no")
- << "\n - (bool)CutDeltaEta (yes/no) : " << (!m_cutDeltaEta.empty() ? "yes" : "no")
- << "\n - (bool)CutDeltaPhiRes (yes/no) : " << (!m_cutDeltaPhiRes.empty() ? "yes" : "no")
- << "\n - (bool)CutWstotAtHighET (yes/no) : " << (!m_cutWstotAtHighET.empty() ? "yes" : "no")
- << "\n - (bool)CutEoverPAtHighET (yes/no) : " << (!m_cutEoverPAtHighET.empty() ? "yes" : "no")
- );
+ ATH_MSG_DEBUG(
+ "\n - VariableNames : "
+ << m_variableNames
+ << "\n - (bool)CutBL (yes/no) : " << (!m_cutBL.empty() ? "yes" : "no")
+ << "\n - (bool)CutPi (yes/no) : " << (!m_cutPi.empty() ? "yes" : "no")
+ << "\n - (bool)CutSi (yes/no) : " << (!m_cutSi.empty() ? "yes" : "no")
+ << "\n - (bool)CutAmbiguity (yes/no) : "
+ << (!m_cutAmbiguity.empty() ? "yes" : "no")
+ << "\n - (bool)doRemoveF3AtHighEt (yes/no) : "
+ << (m_doRemoveF3AtHighEt ? "yes" : "no")
+ << "\n - (bool)doRemoveTRTPIDAtHighEt (yes/no) : "
+ << (m_doRemoveTRTPIDAtHighEt ? "yes" : "no")
+ << "\n - (bool)doSmoothBinInterpolation (yes/no) : "
+ << (m_doSmoothBinInterpolation ? "yes" : "no")
+ << "\n - (bool)useOneExtraHighETLHBin(yes/no) : "
+ << (m_useOneExtraHighETLHBin ? "yes" : "no")
+ << "\n - (double)HighETBinThreshold : " << m_highETBinThreshold
+ << "\n - (bool)doPileupTransform (yes/no) : "
+ << (m_doPileupTransform ? "yes" : "no")
+ << "\n - (bool)doCentralityTransform (yes/no) : "
+ << (m_doCentralityTransform ? "yes" : "no")
+ << "\n - (bool)CutLikelihood (yes/no) : "
+ << (!m_cutLikelihood.empty() ? "yes" : "no")
+ << "\n - (bool)CutLikelihoodPileupCorrection (yes/no) : "
+ << (!m_cutLikelihoodPileupCorrection.empty() ? "yes" : "no")
+ << "\n - (bool)CutA0 (yes/no) : " << (!m_cutA0.empty() ? "yes" : "no")
+ << "\n - (bool)CutDeltaEta (yes/no) : "
+ << (!m_cutDeltaEta.empty() ? "yes" : "no")
+ << "\n - (bool)CutDeltaPhiRes (yes/no) : "
+ << (!m_cutDeltaPhiRes.empty() ? "yes" : "no")
+ << "\n - (bool)CutWstotAtHighET (yes/no) : "
+ << (!m_cutWstotAtHighET.empty() ? "yes" : "no")
+ << "\n - (bool)CutEoverPAtHighET (yes/no) : "
+ << (!m_cutEoverPAtHighET.empty() ? "yes" : "no"));
return sc;
}
-int Root::TElectronLikelihoodTool::loadVarHistograms(const std::string& vstr,unsigned int varIndex){
- for(unsigned int s_or_b = 0; s_or_b < 2; s_or_b++){
- for (unsigned int ip = 0; ip < IP_BINS; ip++){
- for(unsigned int et = 0; et < s_fnEtBinsHist; et++){
- for(unsigned int eta = 0; eta < s_fnEtaBins; eta++){
-
- std::string sig_bkg = (s_or_b==0) ? "sig" : "bkg" ;
- // Because eta bins in the root file don't match up exactly with cut menu
- // definitions, the second eta bin is an exact copy of the first,
+int
+Root::TElectronLikelihoodTool::loadVarHistograms(const std::string& vstr, unsigned int varIndex)
+{
+ for (unsigned int s_or_b = 0; s_or_b < 2; s_or_b++) {
+ for (unsigned int ip = 0; ip < IP_BINS; ip++) {
+ for (unsigned int et = 0; et < s_fnEtBinsHist; et++) {
+ for (unsigned int eta = 0; eta < s_fnEtaBins; eta++) {
+
+ std::string sig_bkg = (s_or_b == 0) ? "sig" : "bkg";
+ // Because eta bins in the root file don't match up exactly with cut
+ // menu definitions, the second eta bin is an exact copy of the first,
// and all subsequent eta bins are pushed back by one.
- unsigned int eta_tmp = (eta > 0) ? eta-1 : eta ;
- // The 7-10 GeV, crack bin uses the 10-15 Gev pdfs. WE DO NOT DO THIS ANYMORE!
- //unsigned int et_tmp = (eta == 5 && et == 1) ? 1 : et;
+ unsigned int eta_tmp = (eta > 0) ? eta - 1 : eta;
+ // The 7-10 GeV, crack bin uses the 10-15 Gev pdfs. WE DO NOT DO THIS
+ // ANYMORE! unsigned int et_tmp = (eta == 5 && et == 1) ? 1 : et;
unsigned int et_tmp = et;
char binname[200];
- getBinName( binname, et_tmp, eta_tmp, ip, m_ipBinning );
+ getBinName(binname, et_tmp, eta_tmp, ip, m_ipBinning);
- if (((std::string(binname).find("2.37") != std::string::npos)) && (vstr.find("el_f3") != std::string::npos))
+ if (((std::string(binname).find("2.37") != std::string::npos)) &&
+ (vstr.find("el_f3") != std::string::npos))
continue;
- if (((std::string(binname).find("2.01") != std::string::npos) || (std::string(binname).find("2.37") != std::string::npos))
- && (vstr.find("TRT") != std::string::npos))
+ if (((std::string(binname).find("2.01") != std::string::npos) ||
+ (std::string(binname).find("2.37") != std::string::npos)) &&
+ (vstr.find("TRT") != std::string::npos))
continue;
char pdfdir[500];
- snprintf(pdfdir,500,"%s/%s",vstr.c_str(),sig_bkg.c_str());
+ snprintf(pdfdir, 500, "%s/%s", vstr.c_str(), sig_bkg.c_str());
char pdf[500];
- snprintf(pdf,500,"%s_%s_smoothed_hist_from_KDE_%s",vstr.c_str(),sig_bkg.c_str(),binname);
+ snprintf(
+ pdf, 500, "%s_%s_smoothed_hist_from_KDE_%s", vstr.c_str(), sig_bkg.c_str(), binname);
char pdf_newname[500];
- snprintf(pdf_newname,500,"%s_%s_%s_LHtool_copy_%s", m_name.c_str(),vstr.c_str(),sig_bkg.c_str(),binname);
-
- if (!m_pdfFile->GetListOfKeys()->Contains(vstr.c_str())){
- ATH_MSG_INFO("Warning: skipping variable " << vstr << " because the folder does not exist.");
+ snprintf(pdf_newname,
+ 500,
+ "%s_%s_%s_LHtool_copy_%s",
+ m_name.c_str(),
+ vstr.c_str(),
+ sig_bkg.c_str(),
+ binname);
+
+ if (!m_pdfFile->GetListOfKeys()->Contains(vstr.c_str())) {
+ ATH_MSG_INFO("Warning: skipping variable " << vstr
+ << " because the folder does not exist.");
return 1;
}
- if (!((TDirectory*)m_pdfFile->Get(vstr.c_str()))->GetListOfKeys()->Contains(sig_bkg.c_str())){
- ATH_MSG_INFO("Warning: skipping variable " << vstr << " because the folder does not exist.");
+ if (!((TDirectory*)m_pdfFile->Get(vstr.c_str()))
+ ->GetListOfKeys()
+ ->Contains(sig_bkg.c_str())) {
+ ATH_MSG_INFO("Warning: skipping variable " << vstr
+ << " because the folder does not exist.");
return 1;
}
- // We only need to load PDFs
+ // We only need to load PDFs
// up to a certain ET value (40 GeV)
- if(et > s_fnEtBinsHist-1){
+ if (et > s_fnEtBinsHist - 1) {
continue;
}
- // If the 0th et bin (4-7 GeV) histogram does not exist in the root file,
- // then just use the 7-10 GeV bin histogram.
- // This should preserve backward compatibility
+ // If the 0th et bin (4-7 GeV) histogram does not exist in the root
+ // file, then just use the 7-10 GeV bin histogram. This should
+ // preserve backward compatibility
if (et == 0 && !((TDirectory*)m_pdfFile->Get(pdfdir))->GetListOfKeys()->Contains(pdf)) {
- //std::cout << "Info: using 7 GeV bin in place of 4 GeV bin." << std::endl;
- getBinName( binname, et_tmp+1, eta_tmp, ip, m_ipBinning );
- snprintf(pdf,500,"%s_%s_smoothed_hist_from_KDE_%s",vstr.c_str(),sig_bkg.c_str(),binname);
- snprintf(pdf_newname,500,"%s_%s_%s_LHtool_copy4GeV_%s", m_name.c_str(),vstr.c_str(),sig_bkg.c_str(),binname);
+ getBinName(binname, et_tmp + 1, eta_tmp, ip, m_ipBinning);
+ snprintf(
+ pdf, 500, "%s_%s_smoothed_hist_from_KDE_%s", vstr.c_str(), sig_bkg.c_str(), binname);
+ snprintf(pdf_newname,
+ 500,
+ "%s_%s_%s_LHtool_copy4GeV_%s",
+ m_name.c_str(),
+ vstr.c_str(),
+ sig_bkg.c_str(),
+ binname);
}
if (((TDirectory*)m_pdfFile->Get(pdfdir))->GetListOfKeys()->Contains(pdf)) {
TH1F* hist = (TH1F*)(((TDirectory*)m_pdfFile->Get(pdfdir))->Get(pdf));
fPDFbins[s_or_b][ip][et][eta][varIndex] = new EGSelectors::SafeTH1(hist);
delete hist;
- }
- else {
+ } else {
ATH_MSG_INFO("Warning: Object " << pdf << " does not exist.");
ATH_MSG_INFO("Skipping all other histograms with this variable.");
return 1;
}
}
}
- }
+ }
}
return 1;
}
asg::AcceptData
-Root::TElectronLikelihoodTool::accept( double likelihood,
- double eta,
- double eT,
- int nSiHitsPlusDeadSensors,
- int nPixHitsPlusDeadSensors,
- bool passBLayerRequirement,
- uint8_t ambiguityBit,
- double d0,
- double deltaEta,
- double deltaphires,
- double wstot,
- double EoverP,
- double ip
- ) const
+Root::TElectronLikelihoodTool::accept(double likelihood,
+ double eta,
+ double eT,
+ int nSiHitsPlusDeadSensors,
+ int nPixHitsPlusDeadSensors,
+ bool passBLayerRequirement,
+ uint8_t ambiguityBit,
+ double d0,
+ double deltaEta,
+ double deltaphires,
+ double wstot,
+ double EoverP,
+ double ip) const
{
LikeEnum::LHAcceptVars_t vars;
- vars.likelihood = likelihood;
- vars.eta = eta;
- vars.eT = eT;
- vars.nSiHitsPlusDeadSensors = nSiHitsPlusDeadSensors;
+ vars.likelihood = likelihood;
+ vars.eta = eta;
+ vars.eT = eT;
+ vars.nSiHitsPlusDeadSensors = nSiHitsPlusDeadSensors;
vars.nPixHitsPlusDeadSensors = nPixHitsPlusDeadSensors;
- vars.passBLayerRequirement = passBLayerRequirement;
- vars.ambiguityBit = ambiguityBit;
- vars.d0 = d0;
- vars.deltaEta = deltaEta;
- vars.deltaphires = deltaphires;
- vars.wstot = wstot;
- vars.EoverP = EoverP;
- vars.ip = ip;
+ vars.passBLayerRequirement = passBLayerRequirement;
+ vars.ambiguityBit = ambiguityBit;
+ vars.d0 = d0;
+ vars.deltaEta = deltaEta;
+ vars.deltaphires = deltaphires;
+ vars.wstot = wstot;
+ vars.EoverP = EoverP;
+ vars.ip = ip;
return accept(vars);
}
-// This method calculates if the current electron passes the requested likelihood cut
+// This method calculates if the current electron passes the requested
+// likelihood cut
asg::AcceptData
-Root::TElectronLikelihoodTool::accept( LikeEnum::LHAcceptVars_t& vars_struct ) const
+Root::TElectronLikelihoodTool::accept(LikeEnum::LHAcceptVars_t& vars_struct) const
{
// Setup return accept with AcceptInfo
asg::AcceptData acceptData(&m_acceptInfo);
@@ -414,140 +476,151 @@ Root::TElectronLikelihoodTool::accept( LikeEnum::LHAcceptVars_t& vars_struct ) c
bool passWstotAtHighET(true);
bool passEoverPAtHighET(true);
- if (fabs(vars_struct.eta) > 2.47) {
- ATH_MSG_DEBUG("This electron is fabs(eta)>2.47 Returning False.");
+ if (std::abs(vars_struct.eta) > 2.47) {
+ ATH_MSG_DEBUG("This electron is std::abs(eta)>2.47 Returning False.");
passKine = false;
}
- unsigned int etbinLH = getLikelihoodEtDiscBin(vars_struct.eT,true);
- unsigned int etbinOther = getLikelihoodEtDiscBin(vars_struct.eT,false);
+ unsigned int etbinLH = getLikelihoodEtDiscBin(vars_struct.eT, true);
+ unsigned int etbinOther = getLikelihoodEtDiscBin(vars_struct.eT, false);
unsigned int etabin = getLikelihoodEtaBin(vars_struct.eta);
- //unsigned int ipbin = 0;
// sanity
- if (etbinLH >= s_fnDiscEtBinsOneExtra) {
- ATH_MSG_WARNING( "Cannot evaluate likelihood for Et " << vars_struct.eT<< ". Returning false..");
+ if (etbinLH >= s_fnDiscEtBinsOneExtra) {
+ ATH_MSG_WARNING("Cannot evaluate likelihood for Et " << vars_struct.eT
+ << ". Returning false..");
passKine = false;
}
// sanity
- if (etbinOther >= s_fnDiscEtBins) {
- ATH_MSG_WARNING( "Cannot evaluate likelihood for Et " << vars_struct.eT<< ". Returning false..");
+ if (etbinOther >= s_fnDiscEtBins) {
+ ATH_MSG_WARNING("Cannot evaluate likelihood for Et " << vars_struct.eT
+ << ". Returning false..");
passKine = false;
}
-
// Return if the kinematic requirements are not fulfilled
- acceptData.setCutResult( m_cutPosition_kinematic, passKine );
- if ( !passKine ){ return acceptData; }
+ acceptData.setCutResult(m_cutPosition_kinematic, passKine);
+ if (!passKine) {
+ return acceptData;
+ }
// ambiguity bit
if (!m_cutAmbiguity.empty()) {
- if ( !ElectronSelectorHelpers::passAmbiguity((xAOD::AmbiguityTool::AmbiguityType)vars_struct.ambiguityBit,
- m_cutAmbiguity[etabin])
- ) {
- ATH_MSG_DEBUG("Likelihood macro: ambiguity Bit Failed." );
+ if (!ElectronSelectorHelpers::passAmbiguity(
+ (xAOD::AmbiguityTool::AmbiguityType)vars_struct.ambiguityBit, m_cutAmbiguity[etabin])) {
+ ATH_MSG_DEBUG("Likelihood macro: ambiguity Bit Failed.");
passAmbiguity = false;
}
}
// blayer cut
- if (!m_cutBL.empty() ) {
- if(m_cutBL[etabin] == 1 && !vars_struct.passBLayerRequirement) {
+ if (!m_cutBL.empty()) {
+ if (m_cutBL[etabin] == 1 && !vars_struct.passBLayerRequirement) {
ATH_MSG_DEBUG("Likelihood macro: Blayer cut failed.");
passNBlayer = false;
}
}
// pixel cut
- if (!m_cutPi.empty()){
- if (vars_struct.nPixHitsPlusDeadSensors < m_cutPi[etabin]){
+ if (!m_cutPi.empty()) {
+ if (vars_struct.nPixHitsPlusDeadSensors < m_cutPi[etabin]) {
ATH_MSG_DEBUG("Likelihood macro: Pixels Failed.");
passNPixel = false;
}
}
// silicon cut
- if (!m_cutSi.empty()){
- if (vars_struct.nSiHitsPlusDeadSensors < m_cutSi[etabin]){
- ATH_MSG_DEBUG( "Likelihood macro: Silicon Failed.");
+ if (!m_cutSi.empty()) {
+ if (vars_struct.nSiHitsPlusDeadSensors < m_cutSi[etabin]) {
+ ATH_MSG_DEBUG("Likelihood macro: Silicon Failed.");
passNSilicon = false;
}
}
double cutDiscriminant;
- unsigned int ibin_combinedLH = etbinLH*s_fnEtaBins+etabin; // Must change if number of eta bins changes!. Also starts from 7-10 GeV bin.
- unsigned int ibin_combinedOther = etbinOther*s_fnEtaBins+etabin; // Must change if number of eta bins changes!. Also starts from 7-10 GeV bin.
-
- if(!m_cutLikelihood.empty()){
+ unsigned int ibin_combinedLH =
+ etbinLH * s_fnEtaBins + etabin; // Must change if number of eta bins
+ // changes!. Also starts from 7-10 GeV bin.
+ unsigned int ibin_combinedOther =
+ etbinOther * s_fnEtaBins + etabin; // Must change if number of eta bins changes!. Also
+ // starts from 7-10 GeV bin.
+
+ if (!m_cutLikelihood.empty()) {
// To protect against a binning mismatch, which should never happen
- if(ibin_combinedLH>=m_cutLikelihood.size()){
- ATH_MSG_ERROR("The desired eta/pt bin " << ibin_combinedLH
- << " is outside of the range specified by the input" << m_cutLikelihood.size() << "This should never happen!");
- return acceptData;
+ if (ibin_combinedLH >= m_cutLikelihood.size()) {
+ ATH_MSG_ERROR("The desired eta/pt bin "
+ << ibin_combinedLH << " is outside of the range specified by the input"
+ << m_cutLikelihood.size() << "This should never happen!");
+ return acceptData;
}
- if (m_doSmoothBinInterpolation){
- cutDiscriminant = InterpolateCuts(m_cutLikelihood,m_cutLikelihood4GeV,vars_struct.eT,vars_struct.eta);
- if (!m_doPileupTransform && !m_cutLikelihoodPileupCorrection.empty() && !m_cutLikelihoodPileupCorrection4GeV.empty())
- cutDiscriminant += vars_struct.ip*InterpolateCuts(m_cutLikelihoodPileupCorrection,m_cutLikelihoodPileupCorrection4GeV,vars_struct.eT,vars_struct.eta);
+ if (m_doSmoothBinInterpolation) {
+ cutDiscriminant =
+ InterpolateCuts(m_cutLikelihood, m_cutLikelihood4GeV, vars_struct.eT, vars_struct.eta);
+ if (!m_doPileupTransform && !m_cutLikelihoodPileupCorrection.empty() &&
+ !m_cutLikelihoodPileupCorrection4GeV.empty())
+ cutDiscriminant += vars_struct.ip * InterpolateCuts(m_cutLikelihoodPileupCorrection,
+ m_cutLikelihoodPileupCorrection4GeV,
+ vars_struct.eT,
+ vars_struct.eta);
} else {
- if (vars_struct.eT > 7000. || m_cutLikelihood4GeV.empty()){
+ if (vars_struct.eT > 7000. || m_cutLikelihood4GeV.empty()) {
cutDiscriminant = m_cutLikelihood[ibin_combinedLH];
- // If doPileupTransform, then correct the discriminant itself instead of the cut value
- if (!m_doPileupTransform && !m_cutLikelihoodPileupCorrection.empty())
- cutDiscriminant += vars_struct.ip*m_cutLikelihoodPileupCorrection[ibin_combinedLH];
- }
- else {
+ // If doPileupTransform, then correct the discriminant itself instead of
+ // the cut value
+ if (!m_doPileupTransform && !m_cutLikelihoodPileupCorrection.empty()) {
+ cutDiscriminant += vars_struct.ip * m_cutLikelihoodPileupCorrection[ibin_combinedLH];
+ }
+ } else {
cutDiscriminant = m_cutLikelihood4GeV[etabin];
- if (!m_doPileupTransform && !m_cutLikelihoodPileupCorrection4GeV.empty())
- cutDiscriminant += vars_struct.ip*m_cutLikelihoodPileupCorrection4GeV[etabin];
+ if (!m_doPileupTransform && !m_cutLikelihoodPileupCorrection4GeV.empty())
+ cutDiscriminant += vars_struct.ip * m_cutLikelihoodPileupCorrection4GeV[etabin];
}
}
// Determine if the calculated likelihood value passes the cut
ATH_MSG_DEBUG("Likelihood macro: Discriminant: ");
- if ( vars_struct.likelihood < cutDiscriminant )
- {
+ if (vars_struct.likelihood < cutDiscriminant) {
ATH_MSG_DEBUG("Likelihood macro: Disciminant Cut Failed.");
passLH = false;
}
}
// d0 cut
- if (!m_cutA0.empty()){
- if (fabs(vars_struct.d0) > m_cutA0[ibin_combinedOther]){
+ if (!m_cutA0.empty()) {
+ if (std::abs(vars_struct.d0) > m_cutA0[ibin_combinedOther]) {
ATH_MSG_DEBUG("Likelihood macro: D0 Failed.");
passTrackA0 = false;
}
}
// deltaEta cut
- if (!m_cutDeltaEta.empty()){
- if ( fabs(vars_struct.deltaEta) > m_cutDeltaEta[ibin_combinedOther]){
+ if (!m_cutDeltaEta.empty()) {
+ if (std::abs(vars_struct.deltaEta) > m_cutDeltaEta[ibin_combinedOther]) {
ATH_MSG_DEBUG("Likelihood macro: deltaEta Failed.");
passDeltaEta = false;
}
}
// deltaPhiRes cut
- if (!m_cutDeltaPhiRes.empty()){
- if ( fabs(vars_struct.deltaphires) > m_cutDeltaPhiRes[ibin_combinedOther]){
+ if (!m_cutDeltaPhiRes.empty()) {
+ if (std::abs(vars_struct.deltaphires) > m_cutDeltaPhiRes[ibin_combinedOther]) {
ATH_MSG_DEBUG("Likelihood macro: deltaphires Failed.");
passDeltaPhiRes = false;
}
}
// Only do this above HighETBinThreshold [in GeV]
- if(vars_struct.eT > m_highETBinThreshold*1000){
+ if (vars_struct.eT > m_highETBinThreshold * 1000) {
// wstot cut
- if (!m_cutWstotAtHighET.empty()){
- if ( fabs(vars_struct.wstot) > m_cutWstotAtHighET[etabin]){
+ if (!m_cutWstotAtHighET.empty()) {
+ if (std::abs(vars_struct.wstot) > m_cutWstotAtHighET[etabin]) {
ATH_MSG_DEBUG("Likelihood macro: wstot Failed.");
passWstotAtHighET = false;
}
}
// EoverP cut
- if (!m_cutEoverPAtHighET.empty()){
- if ( fabs(vars_struct.EoverP) > m_cutEoverPAtHighET[etabin]){
+ if (!m_cutEoverPAtHighET.empty()) {
+ if (std::abs(vars_struct.EoverP) > m_cutEoverPAtHighET[etabin]) {
ATH_MSG_DEBUG("Likelihood macro: EoverP Failed.");
passEoverPAtHighET = false;
}
@@ -555,94 +628,116 @@ Root::TElectronLikelihoodTool::accept( LikeEnum::LHAcceptVars_t& vars_struct ) c
}
// Set the individual cut bits in the return object
- acceptData.setCutResult( m_cutPosition_NSilicon, passNSilicon );
- acceptData.setCutResult( m_cutPosition_NPixel, passNPixel );
- acceptData.setCutResult( m_cutPosition_NBlayer, passNBlayer );
- acceptData.setCutResult( m_cutPosition_ambiguity, passAmbiguity );
- acceptData.setCutResult( m_cutPosition_LH, passLH );
- acceptData.setCutResult( m_cutPositionTrackA0, passTrackA0 );
- acceptData.setCutResult( m_cutPositionTrackMatchEta, passDeltaEta );
- acceptData.setCutResult( m_cutPositionTrackMatchPhiRes, passDeltaPhiRes );
- acceptData.setCutResult( m_cutPositionWstotAtHighET, passWstotAtHighET );
- acceptData.setCutResult( m_cutPositionEoverPAtHighET, passEoverPAtHighET );
+ acceptData.setCutResult(m_cutPosition_NSilicon, passNSilicon);
+ acceptData.setCutResult(m_cutPosition_NPixel, passNPixel);
+ acceptData.setCutResult(m_cutPosition_NBlayer, passNBlayer);
+ acceptData.setCutResult(m_cutPosition_ambiguity, passAmbiguity);
+ acceptData.setCutResult(m_cutPosition_LH, passLH);
+ acceptData.setCutResult(m_cutPositionTrackA0, passTrackA0);
+ acceptData.setCutResult(m_cutPositionTrackMatchEta, passDeltaEta);
+ acceptData.setCutResult(m_cutPositionTrackMatchPhiRes, passDeltaPhiRes);
+ acceptData.setCutResult(m_cutPositionWstotAtHighET, passWstotAtHighET);
+ acceptData.setCutResult(m_cutPositionEoverPAtHighET, passEoverPAtHighET);
return acceptData;
}
double
-Root::TElectronLikelihoodTool::calculate( double eta, double eT,double f3, double rHad, double rHad1,
- double Reta, double w2, double f1, double eratio,
- double deltaEta, double d0, double d0sigma, double rphi,
- double deltaPoverP ,double deltaphires, double TRT_PID,
- double ip ) const
+Root::TElectronLikelihoodTool::calculate(double eta,
+ double eT,
+ double f3,
+ double rHad,
+ double rHad1,
+ double Reta,
+ double w2,
+ double f1,
+ double eratio,
+ double deltaEta,
+ double d0,
+ double d0sigma,
+ double rphi,
+ double deltaPoverP,
+ double deltaphires,
+ double TRT_PID,
+ double ip) const
{
LikeEnum::LHCalcVars_t vars;
- vars.eta = eta ;
- vars.eT = eT ;
- vars.f3 = f3 ;
- vars.rHad = rHad ;
- vars.rHad1 = rHad1 ;
- vars.Reta = Reta ;
- vars.w2 = w2 ;
- vars.f1 = f1 ;
- vars.eratio = eratio ;
- vars.deltaEta = deltaEta ;
- vars.d0 = d0 ;
- vars.d0sigma = d0sigma ;
- vars.rphi = rphi ;
+ vars.eta = eta;
+ vars.eT = eT;
+ vars.f3 = f3;
+ vars.rHad = rHad;
+ vars.rHad1 = rHad1;
+ vars.Reta = Reta;
+ vars.w2 = w2;
+ vars.f1 = f1;
+ vars.eratio = eratio;
+ vars.deltaEta = deltaEta;
+ vars.d0 = d0;
+ vars.d0sigma = d0sigma;
+ vars.rphi = rphi;
vars.deltaPoverP = deltaPoverP;
vars.deltaphires = deltaphires;
- vars.TRT_PID = TRT_PID ;
- vars.ip = ip ;
+ vars.TRT_PID = TRT_PID;
+ vars.ip = ip;
return calculate(vars);
}
// The main public method to actually calculate the likelihood value
double
-Root::TElectronLikelihoodTool::calculate(LikeEnum::LHCalcVars_t& vars_struct) const
+Root::TElectronLikelihoodTool::calculate(LikeEnum::LHCalcVars_t& vars_struct) const
{
// Reset the results to defaul values
double result = -999;
unsigned int etabin = getLikelihoodEtaBin(vars_struct.eta);
double rhad_corr;
- if(etabin == 3 || etabin == 4) rhad_corr = vars_struct.rHad;
- else rhad_corr = vars_struct.rHad1;
- double d0significance = vars_struct.d0sigma == 0 ? 0. : fabs(vars_struct.d0)/vars_struct.d0sigma;
-
- std::vector<double> vec ={d0significance,vars_struct.eratio,vars_struct.deltaEta
- ,vars_struct.f1,vars_struct.f3
- ,vars_struct.Reta,rhad_corr,vars_struct.rphi
- ,vars_struct.d0,vars_struct.w2
- ,vars_struct.deltaPoverP,vars_struct.deltaphires
- ,vars_struct.TRT_PID};
+ if (etabin == 3 || etabin == 4) {
+ rhad_corr = vars_struct.rHad;
+ } else {
+ rhad_corr = vars_struct.rHad1;
+ }
+ double d0significance =
+ vars_struct.d0sigma == 0 ? 0. : std::abs(vars_struct.d0) / vars_struct.d0sigma;
+
+ std::vector<double> vec = { d0significance, vars_struct.eratio, vars_struct.deltaEta,
+ vars_struct.f1, vars_struct.f3, vars_struct.Reta,
+ rhad_corr, vars_struct.rphi, vars_struct.d0,
+ vars_struct.w2, vars_struct.deltaPoverP, vars_struct.deltaphires,
+ vars_struct.TRT_PID };
// Calculate the actual likelihood value and fill the return object
- result = this->evaluateLikelihood(vec,vars_struct.eT,vars_struct.eta,vars_struct.ip);
+ result = this->evaluateLikelihood(vec, vars_struct.eT, vars_struct.eta, vars_struct.ip);
return result;
}
-double Root::TElectronLikelihoodTool::evaluateLikelihood(std::vector<float> varVector,double et,double eta,double ip) const
+double
+Root::TElectronLikelihoodTool::evaluateLikelihood(const std::vector<float>& varVector,
+ double et,
+ double eta,
+ double ip) const
{
std::vector<double> vec;
- for(unsigned int var = 0; var < s_fnVariables; var++){
+ for (unsigned int var = 0; var < s_fnVariables; var++) {
vec.push_back(varVector[var]);
}
- return evaluateLikelihood(vec,et,eta,ip);//,mask);
+ return evaluateLikelihood(vec, et, eta, ip);
}
-double Root::TElectronLikelihoodTool::evaluateLikelihood(std::vector<double> varVector,double et,double eta,double ip) const
+double
+Root::TElectronLikelihoodTool::evaluateLikelihood(const std::vector<double>& varVector,
+ double et,
+ double eta,
+ double ip) const
{
const double GeV = 1000;
unsigned int etbin = getLikelihoodEtHistBin(et); // hist binning
unsigned int etabin = getLikelihoodEtaBin(eta);
- unsigned int ipbin = getIpBin(ip);
+ unsigned int ipbin = getIpBin(ip);
- ATH_MSG_DEBUG("et: " << et << " eta: " << eta
- << " etbin: " << etbin << " etabin: " << etabin);
+ ATH_MSG_DEBUG("et: " << et << " eta: " << eta << " etbin: " << etbin << " etabin: " << etabin);
if (etbin >= s_fnEtBinsHist) {
ATH_MSG_WARNING("skipping etbin " << etbin << ", et " << et);
@@ -653,8 +748,9 @@ double Root::TElectronLikelihoodTool::evaluateLikelihood(std::vector<double> var
return -999.;
}
- if (varVector.size() != s_fnVariables)
- ATH_MSG_WARNING("Error! Variable vector size mismatch! Check your vector!" );
+ if (varVector.size() != s_fnVariables) {
+ ATH_MSG_WARNING("Error! Variable vector size mismatch! Check your vector!");
+ }
double SigmaS = 1.;
double SigmaB = 1.;
@@ -664,39 +760,40 @@ double Root::TElectronLikelihoodTool::evaluateLikelihood(std::vector<double> var
const std::string el_f3_string = "el_f3";
const std::string el_TRT_PID_string = "el_TRT_PID";
- for(unsigned int var = 0; var < s_fnVariables; var++){
+ for (unsigned int var = 0; var < s_fnVariables; var++) {
const std::string& varstr = fVariables[var];
// Skip variables that are masked off (not used) in the likelihood
- if (!(m_variableBitMask & (0x1 << var))){
+ if (!(m_variableBitMask & (0x1 << var))) {
continue;
}
// Don't use TRT for outer eta bins (2.01,2.37)
- if (((etabin == 8) || (etabin == 9)) && (varstr.find(TRT_string) != std::string::npos)){
+ if (((etabin == 8) || (etabin == 9)) && (varstr.find(TRT_string) != std::string::npos)) {
continue;
}
// Don't use f3 for outer eta bin (2.37)
- if ((etabin == 9) && (varstr.find(el_f3_string) != std::string::npos)){
+ if ((etabin == 9) && (varstr.find(el_f3_string) != std::string::npos)) {
continue;
}
// Don't use f3 for high et (>80 GeV)
- if (m_doRemoveF3AtHighEt && (et > 80*GeV) && (varstr.find(el_f3_string) != std::string::npos)){
+ if (m_doRemoveF3AtHighEt && (et > 80 * GeV) &&
+ (varstr.find(el_f3_string) != std::string::npos)) {
continue;
}
// Don't use TRTPID for high et (>80 GeV)
- if (m_doRemoveTRTPIDAtHighEt && (et > 80*GeV) && (varstr.find(el_TRT_PID_string) != std::string::npos)){
+ if (m_doRemoveTRTPIDAtHighEt && (et > 80 * GeV) &&
+ (varstr.find(el_TRT_PID_string) != std::string::npos)) {
continue;
}
- for (unsigned int s_or_b=0; s_or_b<2;s_or_b++) {
+ for (unsigned int s_or_b = 0; s_or_b < 2; s_or_b++) {
int bin = fPDFbins[s_or_b][ipbin][etbin][etabin][var]->FindBin(varVector[var]);
double prob = 0;
if (m_doSmoothBinInterpolation) {
- prob = InterpolatePdfs(s_or_b,ipbin,et,eta,bin,var);
- }
- else {
+ prob = InterpolatePdfs(s_or_b, ipbin, et, eta, bin, var);
+ } else {
double integral = double(fPDFbins[s_or_b][ipbin][etbin][etabin][var]->Integral());
if (integral == 0) {
ATH_MSG_WARNING("Error! PDF integral == 0!");
@@ -706,35 +803,50 @@ double Root::TElectronLikelihoodTool::evaluateLikelihood(std::vector<double> var
prob = double(fPDFbins[s_or_b][ipbin][etbin][etabin][var]->GetBinContent(bin)) / integral;
}
- if (s_or_b == 0) SigmaS *= prob;
- else if (s_or_b == 1) SigmaB *= prob;
+ if (s_or_b == 0) {
+ SigmaS *= prob;
+ } else if (s_or_b == 1) {
+ SigmaB *= prob;
+ }
}
}
- return TransformLikelihoodOutput( SigmaS, SigmaB, ip, et, eta );
+ return TransformLikelihoodOutput(SigmaS, SigmaB, ip, et, eta);
}
// --------------------------------------------
-double Root::TElectronLikelihoodTool::TransformLikelihoodOutput(double ps,double pb, double ip, double et, double eta) const {
+double
+Root::TElectronLikelihoodTool::TransformLikelihoodOutput(double ps,
+ double pb,
+ double ip,
+ double et,
+ double eta) const
+{
// returns transformed or non-transformed output
// (Taken mostly from TMVA likelihood code)
double fEpsilon = 1e-99;
// If both signal and bkg are 0, we want it to fail.
- if (ps < fEpsilon) ps = 0;
- if (pb < fEpsilon) pb = fEpsilon;
- double disc = ps/double(ps + pb);
-
- if (disc >= 1.0) disc = 1. - 1.e-15;
- else if (disc <= 0.0) disc = fEpsilon;
+ if (ps < fEpsilon)
+ ps = 0;
+ if (pb < fEpsilon)
+ pb = fEpsilon;
+ double disc = ps / double(ps + pb);
+
+ if (disc >= 1.0) {
+ disc = 1. - 1.e-15;
+ } else if (disc <= 0.0) {
+ disc = fEpsilon;
+ }
double tau = 15.0;
- disc = - log(1.0/disc - 1.0)*(1./double(tau));
+ disc = -log(1.0 / disc - 1.0) * (1. / double(tau));
// Linearly transform the discriminant as a function of pileup, rather than
- // the old scheme of changing the cut value based on pileup. This is simpler for
- // the tuning, as well as ensuring subsets / making discriminants more transparent.
- // In the HI case, a quadratic centrality transform is applied instead.
- if(m_doPileupTransform){
+ // the old scheme of changing the cut value based on pileup. This is simpler
+ // for the tuning, as well as ensuring subsets / making discriminants more
+ // transparent. In the HI case, a quadratic centrality transform is applied
+ // instead.
+ if (m_doPileupTransform) {
// The variables used by the transform:
//
@@ -746,107 +858,123 @@ double Root::TElectronLikelihoodTool::TransformLikelihoodOutput(double ps,double
// - pileup_max = max nvtx or mu for calculating the transform. Any larger
// pileup values will use this maximum value in the transform.
- if( m_discHardCutForPileupTransform.empty() || m_discHardCutSlopeForPileupTransform.empty() || m_discLooseForPileupTransform.empty()){
- ATH_MSG_WARNING("Vectors needed for pileup-dependent transform not correctly filled! Skipping the transform.");
+ if (m_discHardCutForPileupTransform.empty() || m_discHardCutSlopeForPileupTransform.empty() ||
+ m_discLooseForPileupTransform.empty()) {
+ ATH_MSG_WARNING("Vectors needed for pileup-dependent transform not correctly filled! "
+ "Skipping the transform.");
return disc;
}
- if(m_doCentralityTransform && m_discHardCutQuadForPileupTransform.empty()){
- ATH_MSG_WARNING("Vectors needed for centrality-dependent transform not correctly filled! Skipping the transform.");
+ if (m_doCentralityTransform && m_discHardCutQuadForPileupTransform.empty()) {
+ ATH_MSG_WARNING("Vectors needed for centrality-dependent transform not "
+ "correctly filled! "
+ "Skipping the transform.");
return disc;
}
unsigned int etabin = getLikelihoodEtaBin(eta);
- double disc_hard_cut_ref = 0;
+ double disc_hard_cut_ref = 0;
double disc_hard_cut_ref_slope = 0;
- double disc_hard_cut_ref_quad = 0; // only used for heavy ion implementation of the LH
- double disc_loose_ref = 0;
- double disc_max = m_discMaxForPileupTransform;
- double pileup_max = m_pileupMaxForPileupTransform;
-
- if (m_doSmoothBinInterpolation){
- disc_hard_cut_ref = InterpolateCuts(m_discHardCutForPileupTransform,m_discHardCutForPileupTransform4GeV,et,eta);
- disc_hard_cut_ref_slope = InterpolateCuts(m_discHardCutSlopeForPileupTransform,m_discHardCutSlopeForPileupTransform4GeV,et,eta);
- if (m_doCentralityTransform) disc_hard_cut_ref_quad = InterpolateCuts(m_discHardCutQuadForPileupTransform,m_discHardCutQuadForPileupTransform4GeV,et,eta);
- disc_loose_ref = InterpolateCuts(m_discLooseForPileupTransform,m_discLooseForPileupTransform4GeV,et,eta);
+ double disc_hard_cut_ref_quad = 0; // only used for heavy ion implementation of the LH
+ double disc_loose_ref = 0;
+ double disc_max = m_discMaxForPileupTransform;
+ double pileup_max = m_pileupMaxForPileupTransform;
+
+ if (m_doSmoothBinInterpolation) {
+ disc_hard_cut_ref = InterpolateCuts(
+ m_discHardCutForPileupTransform, m_discHardCutForPileupTransform4GeV, et, eta);
+ disc_hard_cut_ref_slope = InterpolateCuts(
+ m_discHardCutSlopeForPileupTransform, m_discHardCutSlopeForPileupTransform4GeV, et, eta);
+ if (m_doCentralityTransform)
+ disc_hard_cut_ref_quad = InterpolateCuts(
+ m_discHardCutQuadForPileupTransform, m_discHardCutQuadForPileupTransform4GeV, et, eta);
+ disc_loose_ref =
+ InterpolateCuts(m_discLooseForPileupTransform, m_discLooseForPileupTransform4GeV, et, eta);
} else {
// default situation, in the case where 4-7 GeV bin is not defined
- if (et > 7000. || m_discHardCutForPileupTransform4GeV.empty()){
- unsigned int etfinebinLH = getLikelihoodEtDiscBin(et,true);
- unsigned int ibin_combined = etfinebinLH*s_fnEtaBins+etabin;
- disc_hard_cut_ref = m_discHardCutForPileupTransform[ibin_combined];
+ if (et > 7000. || m_discHardCutForPileupTransform4GeV.empty()) {
+ unsigned int etfinebinLH = getLikelihoodEtDiscBin(et, true);
+ unsigned int ibin_combined = etfinebinLH * s_fnEtaBins + etabin;
+ disc_hard_cut_ref = m_discHardCutForPileupTransform[ibin_combined];
disc_hard_cut_ref_slope = m_discHardCutSlopeForPileupTransform[ibin_combined];
- if (m_doCentralityTransform) disc_hard_cut_ref_quad = m_discHardCutQuadForPileupTransform[ibin_combined];
- disc_loose_ref = m_discLooseForPileupTransform[ibin_combined];
+ if (m_doCentralityTransform)
+ disc_hard_cut_ref_quad = m_discHardCutQuadForPileupTransform[ibin_combined];
+ disc_loose_ref = m_discLooseForPileupTransform[ibin_combined];
} else {
- if( m_discHardCutForPileupTransform4GeV.empty() || m_discHardCutSlopeForPileupTransform4GeV.empty() || m_discLooseForPileupTransform4GeV.empty()){
- ATH_MSG_WARNING("Vectors needed for pileup-dependent transform not correctly filled for 4-7 GeV bin! Skipping the transform.");
+ if (m_discHardCutForPileupTransform4GeV.empty() ||
+ m_discHardCutSlopeForPileupTransform4GeV.empty() ||
+ m_discLooseForPileupTransform4GeV.empty()) {
+ ATH_MSG_WARNING("Vectors needed for pileup-dependent transform not "
+ "correctly filled for 4-7 GeV "
+ "bin! Skipping the transform.");
return disc;
}
- if(m_doCentralityTransform && m_discHardCutQuadForPileupTransform4GeV.empty()){
- ATH_MSG_WARNING("Vectors needed for centrality-dependent transform not correctly filled for 4-7 GeV bin! Skipping the transform.");
+ if (m_doCentralityTransform && m_discHardCutQuadForPileupTransform4GeV.empty()) {
+ ATH_MSG_WARNING("Vectors needed for centrality-dependent transform "
+ "not correctly filled for 4-7 "
+ "GeV bin! Skipping the transform.");
return disc;
}
- disc_hard_cut_ref = m_discHardCutForPileupTransform4GeV[etabin];
+ disc_hard_cut_ref = m_discHardCutForPileupTransform4GeV[etabin];
disc_hard_cut_ref_slope = m_discHardCutSlopeForPileupTransform4GeV[etabin];
- if (m_doCentralityTransform) disc_hard_cut_ref_quad = m_discHardCutQuadForPileupTransform4GeV[etabin];
- disc_loose_ref = m_discLooseForPileupTransform4GeV[etabin];
+ if (m_doCentralityTransform)
+ disc_hard_cut_ref_quad = m_discHardCutQuadForPileupTransform4GeV[etabin];
+ disc_loose_ref = m_discLooseForPileupTransform4GeV[etabin];
}
}
- double ip_for_corr = std::min(ip,pileup_max); // turn off correction for values > pileup_max
- double disc_hard_cut_ref_prime = disc_hard_cut_ref + disc_hard_cut_ref_slope * ip_for_corr + disc_hard_cut_ref_quad * ip_for_corr * ip_for_corr;
+ double ip_for_corr = std::min(ip, pileup_max); // turn off correction for values > pileup_max
+ double disc_hard_cut_ref_prime = disc_hard_cut_ref + disc_hard_cut_ref_slope * ip_for_corr +
+ disc_hard_cut_ref_quad * ip_for_corr * ip_for_corr;
- if(disc <= disc_loose_ref){
+ if (disc <= disc_loose_ref) {
// Below threshold for applying pileup correction
- //disc = disc;
- }
- else if(disc <= disc_hard_cut_ref_prime){
+ } else if (disc <= disc_hard_cut_ref_prime) {
// Between the loose and hard cut reference points for pileup correction
double denom = double(disc_hard_cut_ref_prime - disc_loose_ref);
- if(denom < 0.001) denom = 0.001;
- disc = disc_loose_ref + (disc - disc_loose_ref) * (disc_hard_cut_ref - disc_loose_ref) / denom;
- }
- else if(disc_hard_cut_ref_prime < disc && disc <= disc_max){
+ if (denom < 0.001)
+ denom = 0.001;
+ disc =
+ disc_loose_ref + (disc - disc_loose_ref) * (disc_hard_cut_ref - disc_loose_ref) / denom;
+ } else if (disc_hard_cut_ref_prime < disc && disc <= disc_max) {
// Between the hard cut and max reference points for pileup correction
double denom = double(disc_max - disc_hard_cut_ref_prime);
- if(denom < 0.001) denom = 0.001;
- disc = disc_hard_cut_ref + (disc - disc_hard_cut_ref_prime) * (disc_max - disc_hard_cut_ref) / denom;
- }
- else{
- // Above threshold where pileup correction necessary
- //disc = disc;
+ if (denom < 0.001)
+ denom = 0.001;
+ disc = disc_hard_cut_ref +
+ (disc - disc_hard_cut_ref_prime) * (disc_max - disc_hard_cut_ref) / denom;
}
}
- ATH_MSG_DEBUG( "disc is " << disc );
+ ATH_MSG_DEBUG("disc is " << disc);
return disc;
}
-
-
-const double Root::TElectronLikelihoodTool::fIpBounds[IP_BINS+1] = {0.,500.};
+const double Root::TElectronLikelihoodTool::fIpBounds[IP_BINS + 1] = { 0., 500. };
//---------------------------------------------------------------------------------------
// Gets the IP bin
-unsigned int Root::TElectronLikelihoodTool::getIpBin(double ip) const{
- for(unsigned int ipBin = 0; ipBin < IP_BINS; ++ipBin){
- if(ip < fIpBounds[ipBin+1])
+unsigned int
+Root::TElectronLikelihoodTool::getIpBin(double ip) const
+{
+ for (unsigned int ipBin = 0; ipBin < IP_BINS; ++ipBin) {
+ if (ip < fIpBounds[ipBin + 1])
return ipBin;
}
return 0;
}
-
//---------------------------------------------------------------------------------------
// Gets the Eta bin [0-9] given the eta
-unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtaBin(double eta) const{
+unsigned int
+Root::TElectronLikelihoodTool::getLikelihoodEtaBin(double eta) const
+{
const unsigned int nEtaBins = s_fnEtaBins;
- const double etaBins[nEtaBins] = {0.1,0.6,0.8,1.15,1.37,1.52,1.81,2.01,2.37,2.47};
+ const double etaBins[nEtaBins] = { 0.1, 0.6, 0.8, 1.15, 1.37, 1.52, 1.81, 2.01, 2.37, 2.47 };
- for(unsigned int etaBin = 0; etaBin < nEtaBins; ++etaBin){
- if(fabs(eta) < etaBins[etaBin])
+ for (unsigned int etaBin = 0; etaBin < nEtaBins; ++etaBin) {
+ if (std::abs(eta) < etaBins[etaBin])
return etaBin;
}
@@ -854,69 +982,90 @@ unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtaBin(double eta) cons
}
//---------------------------------------------------------------------------------------
// Gets the histogram Et bin given the et (MeV) -- corrresponds to fnEtBinsHist
-unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtHistBin(double eT) const {
+unsigned int
+Root::TElectronLikelihoodTool::getLikelihoodEtHistBin(double eT) const
+{
const double GeV = 1000;
const unsigned int nEtBins = s_fnEtBinsHist;
- const double eTBins[nEtBins] = {7*GeV,10*GeV,15*GeV,20*GeV,30*GeV,40*GeV,50*GeV};
+ const double eTBins[nEtBins] = { 7 * GeV, 10 * GeV, 15 * GeV, 20 * GeV,
+ 30 * GeV, 40 * GeV, 50 * GeV };
- for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
- if(eT < eTBins[eTBin])
+ for (unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin) {
+ if (eT < eTBins[eTBin]) {
return eTBin;
+ }
}
- return nEtBins-1; // Return the last bin if > the last bin.
+ return nEtBins - 1; // Return the last bin if > the last bin.
}
//---------------------------------------------------------------------------------------
// Gets the Et bin [0-10] given the et (MeV)
-unsigned int Root::TElectronLikelihoodTool::getLikelihoodEtDiscBin(double eT, const bool isLHbinning) const{
+unsigned int
+Root::TElectronLikelihoodTool::getLikelihoodEtDiscBin(double eT, const bool isLHbinning) const
+{
const double GeV = 1000;
- if(m_useOneExtraHighETLHBin && isLHbinning){
+ if (m_useOneExtraHighETLHBin && isLHbinning) {
const unsigned int nEtBins = s_fnDiscEtBinsOneExtra;
- const double eTBins[nEtBins] = {10*GeV,15*GeV,20*GeV,25*GeV,30*GeV,35*GeV,40*GeV,45*GeV,m_highETBinThreshold*GeV,6000*GeV};
+ const double eTBins[nEtBins] = { 10 * GeV, 15 * GeV, 20 * GeV,
+ 25 * GeV, 30 * GeV, 35 * GeV,
+ 40 * GeV, 45 * GeV, m_highETBinThreshold * GeV,
+ 6000 * GeV };
- for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
- if(eT < eTBins[eTBin])
+ for (unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin) {
+ if (eT < eTBins[eTBin])
return eTBin;
}
- return nEtBins-1; // Return the last bin if > the last bin.
-
+ return nEtBins - 1; // Return the last bin if > the last bin.
}
-
- const unsigned int nEtBins = s_fnDiscEtBins;
- const double eTBins[nEtBins] = {10*GeV,15*GeV,20*GeV,25*GeV,30*GeV,35*GeV,40*GeV,45*GeV,50*GeV};
- for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
- if(eT < eTBins[eTBin])
- return eTBin;
- }
+ const unsigned int nEtBins = s_fnDiscEtBins;
+ const double eTBins[nEtBins] = { 10 * GeV, 15 * GeV, 20 * GeV, 25 * GeV, 30 * GeV,
+ 35 * GeV, 40 * GeV, 45 * GeV, 50 * GeV };
+
+ for (unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin) {
+ if (eT < eTBins[eTBin])
+ return eTBin;
+ }
- return nEtBins-1; // Return the last bin if > the last bin.
-
+ return nEtBins - 1; // Return the last bin if > the last bin.
}
//---------------------------------------------------------------------------------------
// Gets the bin name. Given the HISTOGRAM binning (fnEtBinsHist)
-void Root::TElectronLikelihoodTool::getBinName(char* buffer, int etbin,int etabin, int ipbin, const std::string& iptype) const{
- double eta_bounds[9] = {0.0,0.6,0.8,1.15,1.37,1.52,1.81,2.01,2.37};
- int et_bounds[s_fnEtBinsHist] = {4,7,10,15,20,30,40};
- if (!iptype.empty()){
- snprintf(buffer, 200,"%s%det%02deta%0.2f", iptype.c_str(), int(fIpBounds[ipbin]), et_bounds[etbin], eta_bounds[etabin]);
- }
- else{
- snprintf(buffer, 200,"et%deta%0.2f", et_bounds[etbin], eta_bounds[etabin]);
- }
+void
+Root::TElectronLikelihoodTool::getBinName(char* buffer,
+ int etbin,
+ int etabin,
+ int ipbin,
+ const std::string& iptype) const
+{
+ double eta_bounds[9] = { 0.0, 0.6, 0.8, 1.15, 1.37, 1.52, 1.81, 2.01, 2.37 };
+ int et_bounds[s_fnEtBinsHist] = { 4, 7, 10, 15, 20, 30, 40 };
+ if (!iptype.empty()) {
+ snprintf(buffer,
+ 200,
+ "%s%det%02deta%0.2f",
+ iptype.c_str(),
+ int(fIpBounds[ipbin]),
+ et_bounds[etbin],
+ eta_bounds[etabin]);
+ } else {
+ snprintf(buffer, 200, "et%deta%0.2f", et_bounds[etbin], eta_bounds[etabin]);
}
+}
//----------------------------------------------------------------------------------------
-unsigned int Root::TElectronLikelihoodTool::getLikelihoodBitmask(const std::string& vars) const{
+unsigned int
+Root::TElectronLikelihoodTool::getLikelihoodBitmask(const std::string& vars) const
+{
unsigned int mask = 0x0;
- ATH_MSG_DEBUG ("Variables to be used: ");
- for(unsigned int var = 0; var < s_fnVariables; var++){
- if (vars.find(fVariables[var]) != std::string::npos){
- ATH_MSG_DEBUG( fVariables[var] );
+ ATH_MSG_DEBUG("Variables to be used: ");
+ for (unsigned int var = 0; var < s_fnVariables; var++) {
+ if (vars.find(fVariables[var]) != std::string::npos) {
+ ATH_MSG_DEBUG(fVariables[var]);
mask = mask | 0x1 << var;
}
}
@@ -925,112 +1074,158 @@ unsigned int Root::TElectronLikelihoodTool::getLikelihoodBitmask(const std::stri
}
//----------------------------------------------------------------------------------------
-// Note that this will only perform the cut interpolation up to ~45 GeV, so
+// Note that this will only perform the cut interpolation up to ~45 GeV, so
// no smoothing is done above this for the high ET LH binning yet
-double Root::TElectronLikelihoodTool::InterpolateCuts(const std::vector<double>& cuts,const std::vector<double>& cuts_4gev,double et,double eta) const{
- int etbinLH = getLikelihoodEtDiscBin(et,true);
+double
+Root::TElectronLikelihoodTool::InterpolateCuts(const std::vector<double>& cuts,
+ const std::vector<double>& cuts_4gev,
+ double et,
+ double eta) const
+{
+ int etbinLH = getLikelihoodEtDiscBin(et, true);
int etabin = getLikelihoodEtaBin(eta);
- unsigned int ibin_combinedLH = etbinLH*s_fnEtaBins+etabin;
+ unsigned int ibin_combinedLH = etbinLH * s_fnEtaBins + etabin;
double cut = cuts.at(ibin_combinedLH);
- if (!cuts_4gev.empty() && et < 7000.) {cut = cuts_4gev.at(etabin);}
- if (et > 47500.) {return cut;} // interpolation stops here.
- if (cuts_4gev.empty() && et < 8500.) {return cut;} // stops here
- if (!cuts_4gev.empty() && et < 6000.) {return cut;} // stops here
+ if (!cuts_4gev.empty() && et < 7000.) {
+ cut = cuts_4gev.at(etabin);
+ }
+ if (et > 47500.) {
+ return cut;
+ } // interpolation stops here.
+ if (cuts_4gev.empty() && et < 8500.) {
+ return cut;
+ } // stops here
+ if (!cuts_4gev.empty() && et < 6000.) {
+ return cut;
+ } // stops here
double bin_width = 5000.;
- if (7000. < et && et < 10000.) {bin_width = 3000.;}
- if (et < 7000.) {bin_width = 2000.;}
- const double GeV = 1000;
- const double eTBins[9] = {8.5*GeV,12.5*GeV,17.5*GeV,22.5*GeV,27.5*GeV,32.5*GeV,37.5*GeV,42.5*GeV,47.5*GeV};
+ if (7000. < et && et < 10000.) {
+ bin_width = 3000.;
+ }
+ if (et < 7000.) {
+ bin_width = 2000.;
+ }
+ const double GeV = 1000;
+ const double eTBins[9] = { 8.5 * GeV, 12.5 * GeV, 17.5 * GeV, 22.5 * GeV, 27.5 * GeV,
+ 32.5 * GeV, 37.5 * GeV, 42.5 * GeV, 47.5 * GeV };
double bin_center = eTBins[etbinLH];
if (et > bin_center) {
double cut_next = cut;
- if (etbinLH+1<=8) cut_next = cuts.at((etbinLH+1)*s_fnEtaBins+etabin);
- return cut+(cut_next-cut)*(et-bin_center)/(bin_width);
+ if (etbinLH + 1 <= 8)
+ cut_next = cuts.at((etbinLH + 1) * s_fnEtaBins + etabin);
+ return cut + (cut_next - cut) * (et - bin_center) / (bin_width);
}
// or else if et < bin_center :
double cut_before = cut;
- if (etbinLH-1>=0) {cut_before = cuts.at((etbinLH-1)*s_fnEtaBins+etabin);}
- else if (etbinLH == 0 && !cuts_4gev.empty()){cut_before = cuts_4gev.at(etabin);}
+ if (etbinLH - 1 >= 0) {
+ cut_before = cuts.at((etbinLH - 1) * s_fnEtaBins + etabin);
+ } else if (etbinLH == 0 && !cuts_4gev.empty()) {
+ cut_before = cuts_4gev.at(etabin);
+ }
- return cut-(cut-cut_before)*(bin_center-et)/(bin_width);
+ return cut - (cut - cut_before) * (bin_center - et) / (bin_width);
}
//----------------------------------------------------------------------------------------
-// Note that this will only perform the PDF interpolation up to ~45 GeV, so
+// Note that this will only perform the PDF interpolation up to ~45 GeV, so
// no smoothing is done above this for the high ET LH binning yet
-double Root::TElectronLikelihoodTool::InterpolatePdfs(unsigned int s_or_b,unsigned int ipbin,double et,double eta,int bin,unsigned int var) const{
+double
+Root::TElectronLikelihoodTool::InterpolatePdfs(unsigned int s_or_b,
+ unsigned int ipbin,
+ double et,
+ double eta,
+ int bin,
+ unsigned int var) const
+{
// histograms exist for the following bins: 4, 7, 10, 15, 20, 30, 40.
- // Interpolation between histograms must follow fairly closely the interpolation
- // scheme between cuts - so be careful!
+ // Interpolation between histograms must follow fairly closely the
+ // interpolation scheme between cuts - so be careful!
int etbin = getLikelihoodEtHistBin(et); // hist binning
int etabin = getLikelihoodEtaBin(eta);
double integral = double(fPDFbins[s_or_b][ipbin][etbin][etabin][var]->Integral());
double prob = double(fPDFbins[s_or_b][ipbin][etbin][etabin][var]->GetBinContent(bin)) / integral;
- int Nbins = fPDFbins[s_or_b][ipbin][etbin][etabin][var]->GetNbinsX();
- if (et > 42500.) return prob; // interpolation stops here.
- if (et < 6000.) return prob; // interpolation stops here.
- if (22500. < et && et < 27500.) return prob; // region of non-interpolation for pdfs
- if (32500. < et && et < 37500.) return prob; // region of non-interpolation for pdfs
+ int Nbins = fPDFbins[s_or_b][ipbin][etbin][etabin][var]->GetNbinsX();
+ if (et > 42500.) {
+ return prob; // interpolation stops here.
+ }
+ if (et < 6000.) {
+ return prob; // interpolation stops here.
+ }
+ if (22500. < et && et < 27500.) {
+ return prob; // region of non-interpolation for pdfs
+ }
+ if (32500. < et && et < 37500.) {
+ return prob; // region of non-interpolation for pdfs
+ }
double bin_width = 5000.;
- if (7000. < et && et < 10000.) bin_width = 3000.;
- if (et < 7000.) bin_width = 2000.;
- const double GeV = 1000;
- const double eTHistBins[7] = {6.*GeV,8.5*GeV,12.5*GeV,17.5*GeV,22.5*GeV,32.5*GeV,42.5*GeV};
+ if (7000. < et && et < 10000.) {
+ bin_width = 3000.;
+ }
+ if (et < 7000.) {
+ bin_width = 2000.;
+ }
+ const double GeV = 1000;
+ const double eTHistBins[7] = { 6. * GeV, 8.5 * GeV, 12.5 * GeV, 17.5 * GeV,
+ 22.5 * GeV, 32.5 * GeV, 42.5 * GeV };
double bin_center = eTHistBins[etbin];
- if (etbin == 4 && et >= 27500.) bin_center = 27500.; // special: interpolate starting from 27.5 here
- if (etbin == 5 && et >= 37500.) bin_center = 37500.; // special: interpolate starting from 37.5 here
- if (et > bin_center){
+ if (etbin == 4 && et >= 27500.) {
+ bin_center = 27500.; // special: interpolate starting from 27.5 here
+ }
+ if (etbin == 5 && et >= 37500.) {
+ bin_center = 37500.; // special: interpolate starting from 37.5 here
+ }
+ if (et > bin_center) {
double prob_next = prob;
- if (etbin+1<=6) {
+ if (etbin + 1 <= 6) {
// account for potential histogram bin inequalities
- int NbinsPlus = fPDFbins[s_or_b][ipbin][etbin+1][etabin][var]->GetNbinsX();
+ int NbinsPlus = fPDFbins[s_or_b][ipbin][etbin + 1][etabin][var]->GetNbinsX();
int binplus = bin;
- if (Nbins < NbinsPlus){
- binplus = int(round(bin*(Nbins/NbinsPlus)));
- }
- else if (Nbins > NbinsPlus){
- binplus = int(round(bin*(NbinsPlus/Nbins)));
+ if (Nbins < NbinsPlus) {
+ binplus = int(round(bin * (Nbins / NbinsPlus)));
+ } else if (Nbins > NbinsPlus) {
+ binplus = int(round(bin * (NbinsPlus / Nbins)));
}
// do interpolation
- double integral_next = double(fPDFbins[s_or_b][ipbin][etbin+1][etabin][var]->Integral());
- prob_next = double(fPDFbins[s_or_b][ipbin][etbin+1][etabin][var]->GetBinContent(binplus)) / integral_next;
- return prob+(prob_next-prob)*(et-bin_center)/(bin_width);
+ double integral_next = double(fPDFbins[s_or_b][ipbin][etbin + 1][etabin][var]->Integral());
+ prob_next = double(fPDFbins[s_or_b][ipbin][etbin + 1][etabin][var]->GetBinContent(binplus)) /
+ integral_next;
+ return prob + (prob_next - prob) * (et - bin_center) / (bin_width);
}
}
// or else if et < bin_center :
double prob_before = prob;
- if (etbin-1>=0) {
+ if (etbin - 1 >= 0) {
// account for potential histogram bin inequalities
- int NbinsMinus = fPDFbins[s_or_b][ipbin][etbin-1][etabin][var]->GetNbinsX();
+ int NbinsMinus = fPDFbins[s_or_b][ipbin][etbin - 1][etabin][var]->GetNbinsX();
int binminus = bin;
- if (Nbins < NbinsMinus){
- binminus = int(round(bin*(Nbins/NbinsMinus)));
- }
- else if (Nbins > NbinsMinus){
- binminus = int(round(bin*(NbinsMinus/Nbins)));
+ if (Nbins < NbinsMinus) {
+ binminus = int(round(bin * (Nbins / NbinsMinus)));
+ } else if (Nbins > NbinsMinus) {
+ binminus = int(round(bin * (NbinsMinus / Nbins)));
}
- double integral_before = double(fPDFbins[s_or_b][ipbin][etbin-1][etabin][var]->Integral());
- prob_before = double(fPDFbins[s_or_b][ipbin][etbin-1][etabin][var]->GetBinContent(binminus)) / integral_before;
+ double integral_before = double(fPDFbins[s_or_b][ipbin][etbin - 1][etabin][var]->Integral());
+ prob_before = double(fPDFbins[s_or_b][ipbin][etbin - 1][etabin][var]->GetBinContent(binminus)) /
+ integral_before;
}
- return prob-(prob-prob_before)*(bin_center-et)/(bin_width);
+ return prob - (prob - prob_before) * (bin_center - et) / (bin_width);
}
//----------------------------------------------------------------------------------------
// These are the variables availalble in the likelihood.
const std::string Root::TElectronLikelihoodTool::fVariables[s_fnVariables] = {
- "el_d0significance"
- ,"el_eratio"
- ,"el_deltaeta1"
- ,"el_f1"
- ,"el_f3"
- ,"el_reta"
- ,"el_rhad"
- ,"el_rphi"
- ,"el_trackd0pvunbiased"
- ,"el_weta2"
- ,"el_DeltaPoverP"
- ,"el_deltaphiRescaled"
- ,"el_TRT_PID"
+ "el_d0significance",
+ "el_eratio",
+ "el_deltaeta1",
+ "el_f1",
+ "el_f3",
+ "el_reta",
+ "el_rhad",
+ "el_rphi",
+ "el_trackd0pvunbiased",
+ "el_weta2",
+ "el_DeltaPoverP",
+ "el_deltaphiRescaled",
+ "el_TRT_PID"
};
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
index 970810afb5e43bf2f0286f616202f3eb0606ff2a..f8b4137ab614ef94e3ef5213e233ded86ca833b9 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronLikelihoodTool.h
@@ -3,7 +3,6 @@
*/
// Dear emacs, this is -*-c++-*-
-//----------------------------------------------------------------------------------------
/**
Author: Kurt Brendlinger <kurb@sas.upenn.edu>
@@ -14,93 +13,29 @@ Includes the following operating points:
"Medium" - Same signal efficiency as current (2012) mediumpp menu
"VeryLoose" - Same background rejection as current (2012) multilepton menu
"Loose" - Same signal efficiency as current (2012) multilepton menu
-
-Usage:
-In order to compile this outside the Athena framework, you also need to get PATCore from svn.
-You need to include the header where you want to use it:
-#include "ElectronPhotonSelectorTools/TElectronLikelihoodTool.h"
-
-Then, before the event loop starts, you need to create an instance of this tool:
-Root::TElectronLikelihoodTool* myElLHTool = new TElectronLikelihoodTool();
-
-configure it:
-myElLHTool->setPDFFileName( "path/to/package/data/ElectronLikelihoodPdfs.root" );
-
-and initialize it:
-myElLHTool->initialize();
-
-To get the likelihood value for this electron, do:
-double likelihood = double( myElLHTool->calculate(...) );
-
-To see if an electron passes this selection (in this example, the "VeryLoose" selection), do:
-bool passThisElectron = bool( myElLHTool->accept( likelihood, ... ) );
-
-See below which variables you have to use.
-
-
-In order to correctly apply the macro, you must use the following (d3pd) variables as inputs:
-eta : el_etas2
-eT (in MeV) : energy-rescaled (using egammaAnalysisUtils' EnergyRescalerUpgrade) pt, where pt is defined in
-twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/ElectronsEnergyDirection
-so el_cl_pt if nSiHits < 4, or else
-el_cl_E/cosh(el_etas2) THIS IS PROBABLY NOT CORRECT!!! Don't want to use rescaled energies. To be verified...
-f3 : el_f3
-rHad : el_Ethad / pt (see above for pt)
-rHad1 : el_Ethad1/ pt
-Reta : el_reta
-w2 : el_weta2
-f1 : el_f1
-wstot : el_wstot
-eratio : (el_emaxs1+el_Emax2 == 0.) ? 0. : (el_emaxs1-el_Emax2)/(el_emaxs1+el_Emax2)
-(i.e. Eratio)
-deltaEta : el_deltaeta1
-d0 : el_trackd0pvunbiased
-TRratio : el_TRTHighTHitsRatio
-eOverP : el_cl_E * el_trackqoverp (where el_cl_E is energy-rescaled)
-deltaPhi : el_deltaphi2
-d0sigma : el_tracksigd0pvunbiased
-rphi : el_rphi
-nTRT : el_nTRTHits
-nTRTOutliers : el_nTRTOutliers
-nSi : el_nSiHits
-nSiOutliers : el_nPixelOutliers + el_nSCTOutliers
-nPix : el_nPixHits
-nPixOutliers : el_nPixelOutliers
-nBlayer : el_nBLHits
-nBlayerOutliers : el_nBLayerOutliers
-expectBlayer : el_expectHitInBLayer
-nNextToInnerMostLayer : next to the inner most
-nNextToInnerMostLayerOutliers : next to the inner most
-expectNextToInnerMostLayer : next to the inner most
-convBit : el_isEM & (0x1 << egammaPID::ConversionMatch_Electron)
-ambiguityBit : cut on the ambiguity type
-ip : Count number of vertices in vxp_n with >= 2 tracks in vxp_trk_n
-
-Created:
+reated:
June 2011
-
*/
-//-------------------------------------------------------------------------------------------------------
#ifndef TELECTRONLIKELIHOODTOOL_H
#define TELECTRONLIKELIHOODTOOL_H
// Include the return objects and the base class
#include "AsgTools/AsgMessaging.h"
-#include "PATCore/AcceptInfo.h"
#include "PATCore/AcceptData.h"
+#include "PATCore/AcceptInfo.h"
//
-#include <string> // for string
-#include <vector> // for vector
#include "SafeTH1.h"
+#include <string> // for string
+#include <vector> // for vector
class TFile;
-
-namespace{
-const unsigned int IP_BINS=1;
+namespace {
+const unsigned int IP_BINS = 1;
}
namespace LikeEnum {
-struct LHAcceptVars_t{
+struct LHAcceptVars_t
+{
double likelihood;
double eta;
double eT;
@@ -113,27 +48,28 @@ struct LHAcceptVars_t{
double deltaphires;
double wstot;
double EoverP;
- double ip;
+ double ip;
};
-struct LHCalcVars_t{
+struct LHCalcVars_t
+{
double eta;
double eT;
- double f3;
- double rHad;
+ double f3;
+ double rHad;
double rHad1;
double Reta;
- double w2;
- double f1;
+ double w2;
+ double f1;
double eratio;
- double deltaEta;
- double d0;
+ double deltaEta;
+ double d0;
double d0sigma;
- double rphi;
+ double rphi;
double deltaPoverP;
double deltaphires;
double TRT_PID;
- double ip;
+ double ip;
};
}
@@ -141,7 +77,7 @@ namespace Root {
class TElectronLikelihoodTool : public asg::AsgMessaging
{
-public:
+public:
/// Standard constructor
TElectronLikelihoodTool(const char* name = "TElectronLikelihoodTool");
@@ -159,62 +95,87 @@ public:
/// The main accept method: the actual cuts are applied here
asg::AcceptData accept(LikeEnum::LHAcceptVars_t& vars_struct) const;
- asg::AcceptData accept( double likelihood,
- double eta, double eT,
- int nSiHitsPlusDeadSensors, int nPixHitsPlusDeadSensors,
- bool passBLayerRequirement,
- uint8_t ambiguityBit, double d0, double deltaEta, double deltaphires,
- double wstot, double EoverP, double ip ) const;
+ asg::AcceptData accept(double likelihood,
+ double eta,
+ double eT,
+ int nSiHitsPlusDeadSensors,
+ int nPixHitsPlusDeadSensors,
+ bool passBLayerRequirement,
+ uint8_t ambiguityBit,
+ double d0,
+ double deltaEta,
+ double deltaphires,
+ double wstot,
+ double EoverP,
+ double ip) const;
/** Return dummy accept with only info */
asg::AcceptData accept() const { return asg::AcceptData(&m_acceptInfo); }
- double calculate(LikeEnum::LHCalcVars_t& vars_struct) const ;
- double calculate( double eta, double eT,double f3, double rHad, double rHad1,
- double Reta, double w2, double f1, double eratio,
- double deltaEta, double d0, double d0sigma, double rphi,
- double deltaPoverP ,double deltaphires, double TRT_PID,
- double ip) const;
-
+ double calculate(LikeEnum::LHCalcVars_t& vars_struct) const;
+ double calculate(double eta,
+ double eT,
+ double f3,
+ double rHad,
+ double rHad1,
+ double Reta,
+ double w2,
+ double f1,
+ double eratio,
+ double deltaEta,
+ double d0,
+ double d0sigma,
+ double rphi,
+ double deltaPoverP,
+ double deltaphires,
+ double TRT_PID,
+ double ip) const;
/// Add an input file that holds the PDFs
- inline void setPDFFileName ( const std::string& val ) { m_pdfFileName = val; }
+ inline void setPDFFileName(const std::string& val) { m_pdfFileName = val; }
/// Define the variable names
- inline void setVariableNames ( const std::string& val ) {
- m_variableNames = val;
+ inline void setVariableNames(const std::string& val)
+ {
+ m_variableNames = val;
m_variableBitMask = getLikelihoodBitmask(val);
}
/// Load the variable histograms from the pdf file.
int loadVarHistograms(const std::string& vstr, unsigned int varIndex);
- /// Define the binning
- inline void setBinning ( const std::string& val ) { m_ipBinning = val; }
+ /// Define the binning
+ inline void setBinning(const std::string& val) { m_ipBinning = val; }
- unsigned int getBitmask(void) const { return m_variableBitMask;}
+ unsigned int getBitmask(void) const { return m_variableBitMask; }
inline void setBitmask(unsigned int val) { m_variableBitMask = val; };
// Private methods
private:
-
// For every input "varVector", make sure elements of vector are
// in the same order as prescribed in fVariables
- /// Description???
- double evaluateLikelihood(std::vector<double> varVector,double et,double eta,double ip=0) const;
+ double evaluateLikelihood(const std::vector<double>& varVector,
+ double et,
+ double eta,
+ double ip = 0) const;
- /// Description???
- double evaluateLikelihood(std::vector<float> varVector,double et,double eta,double ip=0) const;
+ double evaluateLikelihood(const std::vector<float>& varVector,
+ double et,
+ double eta,
+ double ip = 0) const;
-
- // To concoct a bitmask on your own, use the
- // variable names prescribed in fVariables.
-
- /// Description???
unsigned int getLikelihoodBitmask(const std::string& vars) const;
- double InterpolateCuts(const std::vector<double>& cuts,const std::vector<double>& cuts_4gev,double et,double eta) const;
- double InterpolatePdfs(unsigned int s_or_b,unsigned int ipbin,double et,double eta,int bin,unsigned int var) const;
+ double InterpolateCuts(const std::vector<double>& cuts,
+ const std::vector<double>& cuts_4gev,
+ double et,
+ double eta) const;
+ double InterpolatePdfs(unsigned int s_or_b,
+ unsigned int ipbin,
+ double et,
+ double eta,
+ int bin,
+ unsigned int var) const;
public:
/** @brief cut min on b-layer hits*/
@@ -259,19 +220,26 @@ public:
std::vector<double> m_cutLikelihoodPileupCorrection4GeV;
/** @brief reference disc for very hard cut; used by pileup transform */
std::vector<double> m_discHardCutForPileupTransform;
- /** @brief reference slope on disc for very hard cut; used by pileup transform */
+ /** @brief reference slope on disc for very hard cut; used by pileup transform
+ */
std::vector<double> m_discHardCutSlopeForPileupTransform;
- /** @brief reference quadratic apr on disc for very hard cut; used by centrality transform */
+ /** @brief reference quadratic apr on disc for very hard cut; used by
+ * centrality transform */
std::vector<double> m_discHardCutQuadForPileupTransform;
- /** @brief reference disc for a pileup independent loose menu; used by pileup transform */
+ /** @brief reference disc for a pileup independent loose menu; used by pileup
+ * transform */
std::vector<double> m_discLooseForPileupTransform;
- /** @brief reference disc for very hard cut; used by pileup transform - 4-7 GeV */
+ /** @brief reference disc for very hard cut; used by pileup transform - 4-7
+ * GeV */
std::vector<double> m_discHardCutForPileupTransform4GeV;
- /** @brief reference slope on disc for very hard cut; used by pileup transform - 4-7 GeV */
+ /** @brief reference slope on disc for very hard cut; used by pileup transform
+ * - 4-7 GeV */
std::vector<double> m_discHardCutSlopeForPileupTransform4GeV;
- /** @brief reference quadratic par on disc for very hard cut; used by centrality transform - 4-7 GeV */
+ /** @brief reference quadratic par on disc for very hard cut; used by
+ * centrality transform - 4-7 GeV */
std::vector<double> m_discHardCutQuadForPileupTransform4GeV;
- /** @brief reference disc for a pileup independent loose menu; used by pileup transform - 4-7 GeV */
+ /** @brief reference disc for a pileup independent loose menu; used by pileup
+ * transform - 4-7 GeV */
std::vector<double> m_discLooseForPileupTransform4GeV;
/** @brief max discriminant for which pileup transform is to be used */
double m_discMaxForPileupTransform;
@@ -282,37 +250,42 @@ public:
/** Name of the pdf file*/
std::string m_pdfFileName;
-
// Private methods
private:
- /// Apply a transform to zoom into the LH output peaks. Optionally do pileup correction too
- double TransformLikelihoodOutput(double ps,double pb, double ip, double et, double eta) const;
+ /// Apply a transform to zoom into the LH output peaks. Optionally do pileup
+ /// correction too
+ double TransformLikelihoodOutput(double ps,
+ double pb,
+ double ip,
+ double et,
+ double eta) const;
/// Eta binning for pdfs and discriminant cuts.
- unsigned int getLikelihoodEtaBin(double eta) const ;
+ unsigned int getLikelihoodEtaBin(double eta) const;
/// Coarse Et binning. Used for the likelihood pdfs.
- unsigned int getLikelihoodEtHistBin(double eT) const ;
+ unsigned int getLikelihoodEtHistBin(double eT) const;
/// Fine Et binning. Used for the likelihood discriminant cuts.
- unsigned int getLikelihoodEtDiscBin(double eT , const bool isLHbinning) const;
+ unsigned int getLikelihoodEtDiscBin(double eT, const bool isLHbinning) const;
// Private member variables
private:
/// tool name
- std::string m_name;
+ std::string m_name;
/// Accept info
- asg::AcceptInfo m_acceptInfo;
+ asg::AcceptInfo m_acceptInfo;
- /// The bitmask corresponding to the variables in the likelihood. For internal use.
- unsigned int m_variableBitMask;
+ /// The bitmask corresponding to the variables in the likelihood. For internal
+ /// use.
+ unsigned int m_variableBitMask;
/// Deprecated.
- std::string m_ipBinning;
+ std::string m_ipBinning;
/// Pointer to the opened TFile that holds the PDFs
- TFile* m_pdfFile;
+ TFile* m_pdfFile;
/// The position of the kinematic cut bit in the AcceptInfo return object
int m_cutPosition_kinematic;
@@ -338,29 +311,41 @@ private:
/// The position of the deltaeta cut bit in the AcceptInfo return object
int m_cutPositionTrackMatchEta;
- // /// The position of the deltaphi cut bit in the AcceptInfo return object
+ /// The position of the deltaphi cut bit in the AcceptInfo return object
int m_cutPositionTrackMatchPhiRes;
- // /// The position of the high ET wstot cut bit in the AcceptInfo return object
+ /// The position of the high ET wstot cut bit in the AcceptInfo return
+ /// object
int m_cutPositionWstotAtHighET;
- // /// The position of the high ET EoverP cut bit in the AcceptInfo return object
+ /// The position of the high ET EoverP cut bit in the AcceptInfo return
+ /// object
int m_cutPositionEoverPAtHighET;
- static const double fIpBounds[IP_BINS+1];
- static const unsigned int s_fnEtBinsHist = 7; // number of hists stored for original LH, including 4GeV bin (for backwards compatibility)
- static const unsigned int s_fnDiscEtBins = 9; // number of discs stored for original LH, excluding 4GeV bin (for backwards compatibility)
- static const unsigned int s_fnDiscEtBinsOneExtra = 10; // number of discs stored for original LH plus one for HighETBinThreshold (useOneExtraHighETLHBin), excluding 4GeV bin
- static const unsigned int s_fnEtaBins = 10;
- static const unsigned int s_fnVariables = 13;
- EGSelectors::SafeTH1* fPDFbins [2][IP_BINS][s_fnEtBinsHist][s_fnEtaBins][s_fnVariables]; // [sig(0)/bkg(1)][ip][et][eta][variable]
- static const std::string fVariables [s_fnVariables];
+ static const double fIpBounds[IP_BINS + 1];
+ // number of hists stored for original LH, including 4GeV bin (for backwards
+ // compatibility)
+ static const unsigned int s_fnEtBinsHist = 7;
+ // number of discs stored for original LH, excluding 4GeV bin (for
+ // backwards compatibility)
+ static const unsigned int s_fnDiscEtBins = 9;
+ // number of discs stored for original LH plus one for
+ // HighETBinThreshold (useOneExtraHighETLHBin), excluding 4GeV bin
+ static const unsigned int s_fnDiscEtBinsOneExtra = 10;
+ static const unsigned int s_fnEtaBins = 10;
+ static const unsigned int s_fnVariables = 13;
+ // 5D array of ptr to SafeTH1 // [sig(0)/bkg(1)][ip][et][eta][variable]
+ EGSelectors::SafeTH1* fPDFbins[2][IP_BINS][s_fnEtBinsHist][s_fnEtaBins][s_fnVariables];
+ static const std::string fVariables[s_fnVariables];
unsigned int getIpBin(double ip) const;
- void getBinName(char* buffer, int etbin,int etabin, int ipbin, const std::string& iptype) const;
+ void getBinName(char* buffer,
+ int etbin,
+ int etabin,
+ int ipbin,
+ const std::string& iptype) const;
};
} // End: namespace Root
-//----------------------------------------------------------------------------------------
#endif
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronMultiLeptonSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronMultiLeptonSelector.cxx
deleted file mode 100644
index fac5afe6c1758a693d2daea3e7526a90219c3e9d..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronMultiLeptonSelector.cxx
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/******************************************************************************
-Name: TElectronMultiLeptonSelector
-
-Author: Karsten Koeneke
-Created: October 2012
-
-Description: Electron selector tool to select objects in pure ROOT using the multi-lepton cuts
-******************************************************************************/
-
-
-// This class header
-#include "TElectronMultiLeptonSelector.h"
-// STL includes
-#include <cmath>
-
-//=============================================================================
-// Constructor
-//=============================================================================
-Root::TElectronMultiLeptonSelector::TElectronMultiLeptonSelector(const char* name) :
- asg::AsgMessaging(std::string(name)),
- GeV(1000.0),
- m_cutPosition_Coverage(-9),
- m_cutPosition_RHad(-9),
- m_cutPosition_F3(-9),
- m_cutPosition_Reta(-9),
- m_cutPosition_W2(-9),
- m_cutPosition_Wstot(-9),
- m_cutPosition_Eratio(-9),
- m_cutPosition_DeltaEta(-9),
- m_cutPosition_DeltaPhiRes(-9),
- m_cutPosition_NSilicon(-9),
- m_cutPosition_NPixel(-9),
- m_cutPosition_NBlayer(-9),
- m_cutPosition_TR(-9),
- m_cutPosition_TightDeltaPhi(-9)
-{
-}
-
-
-
-//=============================================================================
-// Destructor
-//=============================================================================
-Root::TElectronMultiLeptonSelector::~TElectronMultiLeptonSelector()
-{
-}
-
-
-
-//=============================================================================
-// Initialize this selector tool
-//=============================================================================
-StatusCode Root::TElectronMultiLeptonSelector::initialize()
-{
-
- StatusCode sc(StatusCode::SUCCESS);
-
- // --------------------------------------------------------------------------
- // Register the cuts and check that the registration worked:
- // NOTE: THE ORDER IS IMPORTANT!!! Cut0 corresponds to bit 0, Cut1 to bit 1,...
- // if ( m_cutPosition_nSCTMin < 0 ) sc = StatusCode::FAILURE; // Exceeded the number of allowed cuts (32)
-
-
- // RHad
- m_cutPosition_Coverage = m_acceptInfo.addCut( "Coverage", "Coverage" );
- if ( m_cutPosition_Coverage < 0 ) sc = StatusCode::FAILURE;
-
- // RHad
- m_cutPosition_RHad = m_acceptInfo.addCut( "RHad", "RHad" );
- if ( m_cutPosition_RHad < 0 ) sc = StatusCode::FAILURE;
-
- // f3
- m_cutPosition_F3 = m_acceptInfo.addCut( "F3", "F3" );
- if ( m_cutPosition_F3 < 0 ) sc = StatusCode::FAILURE;
-
- // Reta
- m_cutPosition_Reta = m_acceptInfo.addCut( "Reta", "Reta" );
- if ( m_cutPosition_Reta < 0 ) sc = StatusCode::FAILURE;
-
- // w2
- m_cutPosition_W2 = m_acceptInfo.addCut( "W2", "W2" );
- if ( m_cutPosition_W2 < 0 ) sc = StatusCode::FAILURE;
-
- // Check the energy in the strips before cutting on it
- m_cutPosition_Wstot = m_acceptInfo.addCut( "Wstot", "Wstot" );
- if ( m_cutPosition_Wstot < 0 ) sc = StatusCode::FAILURE;
-
- // Eratio
- m_cutPosition_Eratio = m_acceptInfo.addCut( "Eratio", "Eratio" );
- if ( m_cutPosition_Eratio < 0 ) sc = StatusCode::FAILURE;
-
- // Delta Eta
- m_cutPosition_DeltaEta = m_acceptInfo.addCut( "DeltaEta", "DeltaEta" );
- if ( m_cutPosition_DeltaEta < 0 ) sc = StatusCode::FAILURE;
-
- // Rescale deltaPhi
- m_cutPosition_DeltaPhiRes = m_acceptInfo.addCut( "DeltaPhiRes", "DeltaPhiRes" );
- if ( m_cutPosition_DeltaPhiRes < 0 ) sc = StatusCode::FAILURE;
-
- // Si
- m_cutPosition_NSilicon = m_acceptInfo.addCut( "NSilicon", "NSilicon" );
- if ( m_cutPosition_NSilicon < 0 ) sc = StatusCode::FAILURE;
-
- //Pix
- m_cutPosition_NPixel = m_acceptInfo.addCut( "NPixel", "NPixel" );
- if ( m_cutPosition_NPixel < 0 ) sc = StatusCode::FAILURE;
-
- //Blayer
-
- m_cutPosition_NBlayer = m_acceptInfo.addCut( "NBLayer", "NBLayer" );
- if ( m_cutPosition_NBlayer < 0 ) sc = StatusCode::FAILURE;
-
- //TRT Ratio in crack
- m_cutPosition_TR = m_acceptInfo.addCut( "TR", "TR" );
- if ( m_cutPosition_TR < 0 ) sc = StatusCode::FAILURE;
-
- //Tight deltaPhi
- m_cutPosition_TightDeltaPhi = m_acceptInfo.addCut( "TightDeltaPhi", "TightDeltaPhi" );
- if ( m_cutPosition_TightDeltaPhi < 0 ) sc = StatusCode::FAILURE;
-
- return sc;
-}
-
-
-//=============================================================================
-// Calculate the actual accept of each cut individually.
-//=============================================================================
-asg::AcceptData Root::TElectronMultiLeptonSelector::accept( const double eta,
- const double eT,
- const double rHad,
- const double rHad1,
- const double Reta,
- const double w2,
- const double f1,
- const double f3,
- const double wstot,
- const double DEmaxs1,
- const double deltaEta,
- const int nSi,
- const int nSiDeadSensors,
- const int nPix,
- const int nPixDeadSensors,
- const double deltaPhiRes,
- const double dpOverp,
- const double TRratio,
- const int nTRTTotal,
- const int nBlayerHits,
- const bool expectBlayer
- ) const
-{
-
- // -----------------------------------------------------------
- // Setup return accept with AcceptInfo
- asg::AcceptData acceptData(&m_acceptInfo);
-
-
- //Get eta/et bins
- unsigned int eTBin = this->getEtBinH4l(eT);
- unsigned int etaBin = this->getEtaBinH4l(eta);
-
- //High Low Brem
- bool isBrem = this->getBremCategoryH4l(dpOverp, eTBin, etaBin);
-
-
- // Do the actual selection
-
- // Coverage
- bool doPassCoverage = fabs(eta) <= 2.47 ;
- if( !doPassCoverage ){ ATH_MSG_DEBUG("Failed Coverage, et=" << eT << ", eta=" << eta);}
- acceptData.setCutResult( m_cutPosition_Coverage, doPassCoverage );
-
- // RHad
- bool doPassRHad = passRHad(rHad,rHad1,eTBin,etaBin) ;
- if( !doPassRHad ){ ATH_MSG_DEBUG("Failed RHad, et=" << eT << ", eta=" << eta);}
- acceptData.setCutResult( m_cutPosition_RHad, doPassRHad );
-
- // f3
- bool doPassF3 = eT>=90*GeV || passF3(f3,eTBin,etaBin) ;
- if( !doPassF3 ){ ATH_MSG_DEBUG("Failed F3, et=" << eT << ", eta=" << eta);}
- acceptData.setCutResult( m_cutPosition_F3, doPassF3 );
-
- // Reta
- bool doPassReta = passReta(Reta,eTBin,etaBin) ;
- if( !doPassReta ){ ATH_MSG_DEBUG("Failed Reta, et=" << eT << ", eta=" << eta);}
- acceptData.setCutResult( m_cutPosition_Reta, doPassReta );
-
- // w2
- bool doPassW2 = passW2(w2,eTBin,etaBin) ;
- if( !doPassW2 ){ ATH_MSG_DEBUG("Failed W2, et=" << eT << ", eta=" << eta);}
- acceptData.setCutResult( m_cutPosition_W2, doPassW2 );
-
- // Check the energy in the strips before cutting on it
- bool doPassWstot = f1 <= 0.005 || passWstot(wstot,eTBin,etaBin) ;
- if( !doPassWstot ){ ATH_MSG_DEBUG("Failed Wstot, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_Wstot, doPassWstot );
-
- // Eratio
- bool doPassEratio = f1 <= 0.005 || passEratio(DEmaxs1,eTBin,etaBin) ;
- if( !doPassEratio ){ ATH_MSG_DEBUG("Failed Eratio, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_Eratio, doPassEratio );
-
- // Delta Eta
- bool doPassDeltaEta = passDeltaEta(deltaEta, eTBin, etaBin) ;
- if( !doPassDeltaEta ){ ATH_MSG_DEBUG("Failed DeltaEta, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_DeltaEta, doPassDeltaEta );
-
- // Rescale deltaPhi
- bool doPassDeltaPhiRes = passDeltaPhiRes(deltaPhiRes, isBrem, eTBin, etaBin) ;
- if( !doPassDeltaPhiRes ){ ATH_MSG_DEBUG("Failed DeltaPhiRes, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_DeltaPhiRes, doPassDeltaPhiRes );
-
- //Si
- bool doPassNSilicon = (nSi + nSiDeadSensors) >= 7 ;
- if( !doPassNSilicon ){ ATH_MSG_DEBUG("Failed NSilicon, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_NSilicon, doPassNSilicon );
-
- //Pix
- bool doPassNPixel = (nPix+nPixDeadSensors) >= 2 ;
- if( !doPassNPixel ){ ATH_MSG_DEBUG("Failed NPixel, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_NPixel, doPassNPixel );
-
- //BLayer
- bool doPassNBLayer = !(expectBlayer && nBlayerHits < 1) ;
- if( !doPassNBLayer ){ ATH_MSG_DEBUG("Failed NBLayer, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_NBlayer, doPassNBLayer );
-
- //TRT Ratio in crack
- bool doPassTR = passTR(TRratio,eta,nTRTTotal) ;
- if( !doPassTR ){ ATH_MSG_DEBUG("Failed TR, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_TR, doPassTR );
-
- //TightDeltaPhi cut
- bool doPassTightDeltaPhi = passTightDeltaPhi(deltaPhiRes, expectBlayer, nBlayerHits ,eTBin, etaBin) ;
- if( !doPassTightDeltaPhi ){ ATH_MSG_DEBUG("Failed TightDeltaPhi, et=" << eT << ", eta=" << eta );}
- acceptData.setCutResult( m_cutPosition_TightDeltaPhi, doPassTightDeltaPhi );
-
- return acceptData;
-}
-
-
-
-
-// Helper functions
-
-//---------------------------------------------------------------------------------------
-// Gets the Eta bin [0-9] given the eta
-unsigned int Root::TElectronMultiLeptonSelector::getEtaBinH4l(double eta) const {
- const unsigned int nEtaBins = 10;
- static const double etaBins[nEtaBins] = {0.1,0.6,0.8,1.15,1.37,1.52,1.81,2.01,2.37,2.47};
-
- for(unsigned int etaBin = 0; etaBin < nEtaBins; ++etaBin){
- if(fabs(eta) < etaBins[etaBin])
- return etaBin;
- }
- return 9;
-}
-
-
-//---------------------------------------------------------------------------------------
-// Gets the Et bin [0-10] given the et (MeV)
-unsigned int Root::TElectronMultiLeptonSelector::getEtBinH4l(double eT) const {
- const unsigned int nEtBins = 10;
- static const double eTBins[nEtBins] = {5*GeV,10*GeV,15*GeV,20*GeV,30*GeV,40*GeV,50*GeV,60*GeV,70*GeV,80*GeV};
-
- for(unsigned int eTBin = 0; eTBin < nEtBins; ++eTBin){
- if(eT < eTBins[eTBin])
- return eTBin;
- }
- return 10;
-}
-
-
-//----------------------------------------------------------------------------------------
-
-// Determine whether electron is high- or low-brem using dp/p
-bool Root::TElectronMultiLeptonSelector::getBremCategoryH4l(double dpOverp, unsigned int eTBin, unsigned int etaBin) const {
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
-
- static const double bremThresholds[11][10] = {{0.098, 0.098, 0.154, 0.270, 0.306, 0.422, 0.482, 0.606, 0.306, 0.382}, // 0-5 GeV
- {0.110, 0.110, 0.178, 0.374, 0.410, 0.478, 0.610, 0.658, 0.314, 0.410}, // 5-10 GeV
- {0.118, 0.118, 0.194, 0.430, 0.438, 0.502, 0.642, 0.674, 0.322, 0.434}, // 10-15 GeV
- {0.122, 0.122, 0.202, 0.438, 0.458, 0.538, 0.678, 0.722, 0.330, 0.440}, // 15-20 GeV
- {0.142, 0.142, 0.226, 0.506, 0.574, 0.586, 0.714, 0.730, 0.338, 0.462}, // 20-30 GeV
- {0.242, 0.242, 0.362, 0.654, 0.674, 0.630, 0.798, 0.806, 0.362, 0.490}, // 30-40 GeV
- {0.242, 0.242, 0.362, 0.654, 0.674, 0.630, 0.798, 0.806, 0.362, 0.490}, // 40-50 GeV
- {0.242, 0.242, 0.362, 0.654, 0.674, 0.630, 0.798, 0.806, 0.362, 0.490}, // 50-60 GeV
- {0.242, 0.242, 0.362, 0.654, 0.674, 0.630, 0.798, 0.806, 0.362, 0.490}, // 60-70 GeV
- {0.242, 0.242, 0.362, 0.654, 0.674, 0.630, 0.798, 0.806, 0.362, 0.490}, // 70-80 GeV
- {0.242, 0.242, 0.362, 0.654, 0.674, 0.630, 0.798, 0.806, 0.362, 0.490}};// >80 GeV
-
- if(dpOverp < bremThresholds[eTBin][etaBin]) return false; // Low-brem electron
- return true; // High-brem electron
-}
-
-//----------------------------------------------------------------------------------------
-bool Root::TElectronMultiLeptonSelector::passRHad(double rhad, double rhad1,unsigned int etbin,unsigned int etabin) const {
-
-
- static const double cutrhad[11][10] = {{ 0.258, 0.258, 0.208, 0.206, 0.256, 0.188, 0.254, 0.254, 0.226, 0.176 } // 0 - 5 GeV
- ,{ 0.155, 0.155, 0.115, 0.125, 0.125, 0.100, 0.140, 0.135, 0.125, 0.105 } // 5 - 10 GeV
- ,{ 0.075, 0.075, 0.065, 0.065, 0.065, 0.055, 0.080, 0.080, 0.065, 0.050 } // 10 - 15 GeV
- ,{ 0.055, 0.055, 0.045, 0.045, 0.045, 0.040, 0.055, 0.055, 0.050, 0.040 } // 15 - 20 GeV
- ,{ 0.038, 0.038, 0.032, 0.032, 0.032, 0.026, 0.040, 0.040, 0.035, 0.030 } // 20 - 30 GeV
- ,{ 0.025, 0.025, 0.022, 0.022, 0.022, 0.019, 0.030, 0.030, 0.025, 0.020 } // 30 - 40 GeV
- ,{ 0.025, 0.025, 0.021, 0.022, 0.021, 0.019, 0.028, 0.028, 0.023, 0.020 } // 40 - 50 GeV
- ,{ 0.025, 0.025, 0.021, 0.022, 0.021, 0.019, 0.028, 0.028, 0.023, 0.020 } // 50 - 60 GeV
- ,{ 0.025, 0.025, 0.021, 0.022, 0.021, 0.019, 0.028, 0.028, 0.023, 0.020 } // 60 - 70 GeV
- ,{ 0.025, 0.025, 0.021, 0.022, 0.021, 0.019, 0.028, 0.028, 0.023, 0.020 } // 70 - 80 GeV
- ,{ 0.025, 0.025, 0.021, 0.022, 0.021, 0.019, 0.028, 0.028, 0.023, 0.020 } }; // 80 - inf GeV
-
- if(etabin == 3 || etabin == 4){
- if (rhad > cutrhad[etbin][etabin])
- return false;
- } else{
- if(rhad1 > cutrhad[etbin][etabin])
- return false;
- }
- return true;
-}
-
-//----------------------------------------------------------------------------------------
-bool Root::TElectronMultiLeptonSelector::passF3(double f3,unsigned int etbin,unsigned int etabin) const{
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double cutf3[11][10] = {{ 0.0593 , 0.0593 , 0.0540 , 0.0430 , 0.0481 , 9999 , 0.0363 , 0.0391 , 0.0420 , 9999 } // 0 - 5 GeV
- ,{ 0.0377 , 0.0377 , 0.0356 , 0.0327 , 0.0365 , 9999 , 0.0275 , 0.0315 , 0.0360 , 9999 } // 5 - 10 GeV
- ,{ 0.0279 , 0.0279 , 0.0261 , 0.0239 , 0.0267 , 9999 , 0.0217 , 0.0261 , 0.0270 , 9999 } // 10 - 15 GeV
- ,{ 0.0259 , 0.0259 , 0.0219 , 0.0211 , 0.0239 , 9999 , 0.0203 , 0.0253 , 0.0270 , 9999 } // 15 - 20 GeV
- ,{ 0.0252 , 0.0252 , 0.0199 , 0.0196 , 0.0225 , 9999 , 0.0207 , 0.0261 , 0.0270 , 9999 } // 20 - 30 GeV
- ,{ 0.0259 , 0.0259 , 0.0197 , 0.0193 , 0.0215 , 9999 , 0.0223 , 0.0274 , 0.0270 , 9999 } // 30 - 40 GeV
- ,{ 0.0265 , 0.0265 , 0.0201 , 0.0201 , 0.0222 , 9999 , 0.0240 , 0.0291 , 0.0290 , 9999 } // 40 - 50 GeV
- ,{ 0.0265 , 0.0265 , 0.0201 , 0.0201 , 0.0222 , 9999 , 0.0240 , 0.0291 , 0.0290 , 9999 } // 50 - 60 GeV
- ,{ 0.0292 , 0.0292 , 0.0219 , 0.0215 , 0.0241 , 9999 , 0.0264 , 0.0327 , 0.0315 , 9999 } // 60 - 70 GeV
- ,{ 0.0292 , 0.0292 , 0.0219 , 0.0215 , 0.0241 , 9999 , 0.0264 , 0.0327 , 0.0315 , 9999 } // 70 - 80 GeV
- ,{ 9999 , 9999 , 9999 , 9999 , 9999 , 9999 , 9999 , 9999 , 9999 , 9999 } }; // 80 - inf GeV
-
- return f3 <= cutf3[etbin][etabin];
-}
-
-//----------------------------------------------------------------------------------------
-bool Root::TElectronMultiLeptonSelector::passReta(double rEta, unsigned int eTBin, unsigned int etaBin) const {
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double cutReta37[11][10] = {{ 0.600 , 0.600 , 0.600 , 0.600 , 0.650 , 0.650 , 0.700 , 0.690 , 0.690 , 0.690 } // 0 - 5 GeV
- , { 0.750 , 0.750 , 0.730 , 0.730 , 0.735 , 0.700 , 0.735 , 0.735 , 0.775 , 0.775 } // 5 - 10 GeV
- , { 0.827 , 0.827 , 0.804 , 0.826 , 0.770 , 0.700 , 0.770 , 0.802 , 0.830 , 0.830 } // 10 - 15 GeV
- , { 0.863 , 0.863 , 0.845 , 0.826 , 0.770 , 0.700 , 0.813 , 0.847 , 0.853 , 0.853 } // 15 - 20 GeV
- , { 0.893 , 0.893 , 0.878 , 0.864 , 0.839 , 0.700 , 0.851 , 0.873 , 0.879 , 0.878 } // 20 - 30 GeV
- , { 0.893 , 0.893 , 0.878 , 0.864 , 0.839 , 0.700 , 0.851 , 0.873 , 0.879 , 0.878 } // 30 - 40 GeV
- , { 0.917 , 0.917 , 0.908 , 0.900 , 0.888 , 0.700 , 0.883 , 0.898 , 0.898 , 0.896 } // 40 - 50 GeV
- , { 0.917 , 0.917 , 0.908 , 0.900 , 0.888 , 0.700 , 0.883 , 0.898 , 0.898 , 0.896 } // 50 - 60 GeV
- , { 0.917 , 0.917 , 0.908 , 0.900 , 0.888 , 0.700 , 0.883 , 0.898 , 0.898 , 0.896 } // 60 - 70 GeV
- , { 0.917 , 0.917 , 0.908 , 0.900 , 0.888 , 0.700 , 0.883 , 0.898 , 0.898 , 0.896 } // 70 - 80 GeV
- , { 0.917 , 0.917 , 0.908 , 0.900 , 0.888 , 0.700 , 0.883 , 0.898 , 0.898 , 0.896 } }; // 80 - inf GeV
- return rEta >= cutReta37[eTBin][etaBin];
-}
-
-//----------------------------------------------------------------------------------------
-
-bool Root::TElectronMultiLeptonSelector::passW2(double w2, unsigned int eTBin, unsigned int etaBin) const{
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double cutWeta2[11][10] = { { 0.0166 , 0.0166 , 0.0172 , 0.0167 , 0.0170 , 0.0385 , 0.0164 , 0.0152 , 0.0156 , 0.0157 } // 0 - 5 GeV
- , { 0.0145 , 0.0145 , 0.0152 , 0.0154 , 0.0158 , 0.0347 , 0.0159 , 0.0140 , 0.0150 , 0.0150 } // 5 - 10 GeV
- , { 0.0129 , 0.0129 , 0.0137 , 0.0141 , 0.0146 , 0.0311 , 0.0151 , 0.0133 , 0.0140 , 0.0140 } // 10 - 15 GeV
- , { 0.0122 , 0.0122 , 0.0129 , 0.0133 , 0.0139 , 0.0278 , 0.0145 , 0.0128 , 0.0140 , 0.0140 } // 15 - 20 GeV
- , { 0.0117 , 0.0117 , 0.0123 , 0.0126 , 0.0131 , 0.0257 , 0.0139 , 0.0124 , 0.0135 , 0.0135 } // 20 - 30 GeV
- , { 0.0117 , 0.0117 , 0.0123 , 0.0126 , 0.0131 , 0.0257 , 0.0139 , 0.0124 , 0.0135 , 0.0135 } // 30 - 40 GeV
- , { 0.0112 , 0.0112 , 0.0118 , 0.0121 , 0.0125 , 0.0247 , 0.0132 , 0.0120 , 0.0130 , 0.0135 } // 40 - 50 GeV
- , { 0.0112 , 0.0112 , 0.0118 , 0.0121 , 0.0125 , 0.0247 , 0.0132 , 0.0120 , 0.0130 , 0.0135 } // 50 - 60 GeV
- , { 0.0112 , 0.0112 , 0.0118 , 0.0121 , 0.0125 , 0.0247 , 0.0132 , 0.0120 , 0.0130 , 0.0135 } // 60 - 70 GeV
- , { 0.0112 , 0.0112 , 0.0118 , 0.0121 , 0.0125 , 0.0247 , 0.0132 , 0.0120 , 0.0130 , 0.0135 } // 70 - 80 GeV
- , { 0.0112 , 0.0112 , 0.0118 , 0.0121 , 0.0125 , 0.0247 , 0.0132 , 0.0120 , 0.0130 , 0.0135 } };// 80 - inf GeV
-
-
- return w2 <= cutWeta2[eTBin][etaBin];
-}
-
-//----------------------------------------------------------------------------------------
-bool Root::TElectronMultiLeptonSelector::passWstot(double wstot, unsigned int eTBin, unsigned int etaBin) const {
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double cutWstot[11][10] = { { 3.926, 3.926, 4.069, 4.501, 4.986, 9999, 4.650, 3.190, 1.966, 9999 } // 0 - 5 GeV
- , { 3.296, 3.296, 3.427, 3.936, 4.309, 9999, 4.313, 2.845, 1.818, 9999 } // 5 - 10 GeV
- , { 3.095, 3.095, 3.202, 3.708, 4.095, 9999, 3.968, 2.692, 1.754, 9999 } // 10 - 15 GeV
- , { 3.035, 3.035, 3.129, 3.553, 3.941, 9999, 3.758, 2.555, 1.714, 9999 } // 15 - 20 GeV
- , { 3.035, 3.035, 3.129, 3.508, 3.793, 9999, 3.609, 2.505, 1.703, 9999 } // 20 - 30 GeV
- , { 2.881, 2.881, 2.941, 3.319, 3.506, 9999, 3.380, 2.381, 1.644, 9999 } // 30 - 40 GeV
- , { 2.881, 2.881, 2.941, 3.319, 3.506, 9999, 3.380, 2.381, 1.644, 9999 } // 40 - 50 GeV
- , { 2.881, 2.881, 2.941, 3.319, 3.506, 9999, 3.380, 2.381, 1.644, 9999 } // 50 - 60 GeV
- , { 2.881, 2.881, 2.941, 3.319, 3.506, 9999, 3.380, 2.381, 1.644, 9999 } // 60 - 70 GeV
- , { 2.881, 2.881, 2.941, 3.319, 3.506, 9999, 3.380, 2.381, 1.644, 9999 } // 70 - 80 GeV
- , { 2.881, 2.881, 2.941, 3.319, 3.506, 9999, 3.380, 2.381, 1.644, 9999 } }; // 80 - inf GeV
-
- return wstot <= cutWstot[eTBin][etaBin];
-}
-//----------------------------------------------------------------------------------------
-bool Root::TElectronMultiLeptonSelector::passEratio(double DEmaxs1, unsigned int eTBin, unsigned int etaBin) const {
-
- static const double cutDEmaxs1[11][10] = { { 0.278 , 0.278 , 0.150 , 0.150 , 0.250 , -9999 , 0.100 , 0.136 , 0.492 , -9999 } // 0 - 5 GeV
- , { 0.506 , 0.506 , 0.320 , 0.281 , 0.250 , -9999 , 0.250 , 0.281 , 0.543 , -9999 } // 5 - 10 GeV
- , { 0.587 , 0.587 , 0.509 , 0.420 , 0.335 , -9999 , 0.335 , 0.369 , 0.616 , -9999 } // 10 - 15 GeV
- , { 0.591 , 0.591 , 0.556 , 0.420 , 0.335 , -9999 , 0.335 , 0.369 , 0.639 , -9999 } // 15 - 20 GeV
- , { 0.627 , 0.627 , 0.617 , 0.420 , 0.335 , -9999 , 0.417 , 0.505 , 0.653 , -9999 } // 20 - 30 GeV
- , { 0.627 , 0.627 , 0.617 , 0.420 , 0.335 , -9999 , 0.417 , 0.505 , 0.653 , -9999 } // 30 - 40 GeV
- , { 0.627 , 0.627 , 0.617 , 0.420 , 0.335 , -9999 , 0.417 , 0.505 , 0.653 , -9999 } // 40 - 50 GeV
- , { 0.627 , 0.627 , 0.617 , 0.420 , 0.335 , -9999 , 0.417 , 0.505 , 0.653 , -9999 } // 50 - 60 GeV
- , { 0.627 , 0.627 , 0.617 , 0.420 , 0.335 , -9999 , 0.417 , 0.505 , 0.653 , -9999 } // 60 - 70 GeV
- , { 0.627 , 0.627 , 0.617 , 0.420 , 0.335 , -9999 , 0.417 , 0.505 , 0.653 , -9999 } // 70 - 80 GeV
- , { 0.627 , 0.627 , 0.617 , 0.420 , 0.335 , -9999 , 0.417 , 0.505 , 0.653 , -9999 } }; // 80 - GeV
- return DEmaxs1 >= cutDEmaxs1[eTBin][etaBin];
-}
-
-//----------------------------------------------------------------------------------------
-bool Root::TElectronMultiLeptonSelector::passDeltaEta(double deltaEta, unsigned int eTBin, unsigned int etaBin) const {
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double cutDeltaEta[11][10] = {{0.017, 0.017, 0.020, 0.020, 0.020, 0.020, 0.020, 0.020, 0.020, 0.020}, // 0 - 5 GeV
- {0.012, 0.009, 0.009, 0.011, 0.013, 0.014, 0.013, 0.011, 0.011, 0.014}, // 5 - 10 GeV
- {0.012, 0.009, 0.008, 0.009, 0.009, 0.013, 0.010, 0.010, 0.008, 0.013}, // 10 - 15 GeV
- {0.011, 0.008, 0.007, 0.007, 0.009, 0.013, 0.009, 0.007, 0.007, 0.011}, // 15 - 20 GeV
- {0.011, 0.008, 0.007, 0.007, 0.009, 0.013, 0.009, 0.007, 0.007, 0.011}, // 20 - 30 GeV
- {0.011, 0.008, 0.007, 0.007, 0.009, 0.013, 0.009, 0.007, 0.007, 0.011}, // 30 - 40 GeV
- {0.011, 0.008, 0.007, 0.007, 0.009, 0.013, 0.009, 0.007, 0.007, 0.011}, // 40 - 50 GeV
- {0.011, 0.008, 0.007, 0.007, 0.009, 0.013, 0.009, 0.007, 0.007, 0.011}, // 50 - 60 GeV
- {0.011, 0.008, 0.007, 0.007, 0.009, 0.013, 0.009, 0.007, 0.007, 0.011}, // 60 - 70 GeV
- {0.011, 0.008, 0.007, 0.007, 0.009, 0.013, 0.009, 0.007, 0.007, 0.011}, // 70 - 80 GeV
- {0.011, 0.008, 0.007, 0.007, 0.009, 0.013, 0.009, 0.007, 0.007, 0.011}};// 80 - inf GeV
- return fabs(deltaEta) <= cutDeltaEta[eTBin][etaBin];
-
-}
-
-//----------------------------------------------------------------------------------------
-bool Root::TElectronMultiLeptonSelector::passDeltaPhiRes(double deltaPhiRes, bool isBrem, unsigned int eTBin, unsigned int etaBin) const{
-
- // 0.0 0.1 x 0.6 0.8 x 1.15 1.37 1.52 x 1.81 2.01 x 2.37 2.47
- static const double maxDeltaPhiResHigh[11][10]= {{0.083, 0.083, 0.071, 0.050, 0.043, 0.048, 0.047, 0.038, 0.032, 0.044}, // 0 - 5 GeV
- {0.038, 0.030, 0.028, 0.023, 0.023, 0.028, 0.023, 0.023, 0.023, 0.038}, // 5 - 10 GeV
- {0.020, 0.015, 0.013, 0.013, 0.020, 0.023, 0.020, 0.018, 0.023, 0.033}, // 10 - 15 GeV
- {0.017, 0.015, 0.013, 0.013, 0.018, 0.018, 0.018, 0.018, 0.023, 0.028}, // 15 - 20 GeV
- {0.017, 0.015, 0.013, 0.013, 0.018, 0.018, 0.018, 0.018, 0.023, 0.028}, // 20 - 30 GeV
- {0.017, 0.015, 0.013, 0.013, 0.018, 0.018, 0.018, 0.018, 0.023, 0.028}, // 30 - 40 GeV
- {0.017, 0.015, 0.013, 0.013, 0.018, 0.018, 0.018, 0.018, 0.023, 0.028}, // 40 - 50 GeV
- {0.017, 0.015, 0.013, 0.013, 0.018, 0.018, 0.018, 0.018, 0.023, 0.028}, // 50 - 60 GeV
- {0.017, 0.015, 0.013, 0.013, 0.018, 0.018, 0.018, 0.018, 0.023, 0.028}, // 60 - 70 GeV
- {0.017, 0.015, 0.013, 0.013, 0.018, 0.018, 0.018, 0.018, 0.023, 0.028}, // 70 - 80 GeV
- {0.017, 0.015, 0.013, 0.013, 0.018, 0.018, 0.018, 0.018, 0.023, 0.028}};// 80
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double minDeltaPhiResHigh[11][10]= {{-0.100, -0.100, -0.100, -0.100, -0.115, -0.120, -0.090, -0.735, -0.050, -0.038},// 0 - 5 GeV
- {-0.086, -0.078, -0.078, -0.078, -0.083, -0.053, -0.048, -0.028, -0.023, -0.023},// 5 - 10 GeV
- {-0.038, -0.038, -0.038, -0.043, -0.047, -0.038, -0.028, -0.023, -0.014, -0.017},// 10 - 15 GeV
- {-0.032, -0.032, -0.032, -0.032, -0.032, -0.032, -0.029, -0.014, -0.014, -0.014},// 15 - 20 GeV
- {-0.032, -0.032, -0.032, -0.032, -0.032, -0.032, -0.026, -0.014, -0.014, -0.014},// 20 - 30 GeV
- {-0.032, -0.032, -0.032, -0.032, -0.032, -0.032, -0.026, -0.014, -0.014, -0.014},// 30 - 34 GeV
- {-0.032, -0.032, -0.032, -0.032, -0.032, -0.032, -0.026, -0.014, -0.014, -0.014},// 34 - 50 GeV
- {-0.032, -0.032, -0.032, -0.032, -0.032, -0.032, -0.026, -0.014, -0.014, -0.014},// 50 - 60 GeV
- {-0.032, -0.032, -0.032, -0.032, -0.032, -0.032, -0.026, -0.014, -0.014, -0.014},// 60 - 70 GeV
- {-0.032, -0.032, -0.032, -0.032, -0.032, -0.032, -0.026, -0.014, -0.014, -0.014},// 70 - 80 GeV
- {-0.032, -0.032, -0.032, -0.032, -0.032, -0.032, -0.026, -0.014, -0.014, -0.014}};// 80
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double maxDeltaPhiResLow[11][10] = {{0.100, 0.100, 0.100, 0.075, 0.075, 0.080, 0.075, 0.060, 0.045, 0.070}, // 0 - 5 GeV
- {0.038, 0.038, 0.038, 0.023, 0.027, 0.038, 0.028, 0.028, 0.028, 0.068}, // 5 - 10 GeV
- {0.020, 0.017, 0.018, 0.020, 0.020, 0.026, 0.023, 0.023, 0.023, 0.062}, // 10 - 15 GeV
- {0.017, 0.017, 0.017, 0.018, 0.018, 0.018, 0.020, 0.022, 0.031, 0.053}, // 15 - 20 GeV
- {0.017, 0.017, 0.017, 0.018, 0.018, 0.018, 0.020, 0.022, 0.031, 0.053}, // 20 - 30 GeV
- {0.017, 0.017, 0.017, 0.018, 0.018, 0.018, 0.020, 0.022, 0.031, 0.053}, // 30 - 40 GeV
- {0.017, 0.017, 0.017, 0.018, 0.018, 0.018, 0.020, 0.022, 0.031, 0.053}, // 40 - 50 GeV
- {0.017, 0.017, 0.017, 0.018, 0.018, 0.018, 0.020, 0.022, 0.031, 0.053}, // 50 - 60 GeV
- {0.017, 0.017, 0.017, 0.018, 0.018, 0.018, 0.020, 0.022, 0.031, 0.053}, // 60 - 70 GeV
- {0.017, 0.017, 0.017, 0.018, 0.018, 0.018, 0.020, 0.022, 0.031, 0.053}, // 70 - 80 GeV
- {0.017, 0.017, 0.017, 0.018, 0.018, 0.018, 0.020, 0.022, 0.031, 0.053}};// 80
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double minDeltaPhiResLow[11][10]= {{-0.100, -0.100, -0.100, -0.100, -0.095, -0.080, -0.070, -0.060, -0.045, -0.035}, // 0 - 5 GeV
- {-0.074, -0.068, -0.068, -0.071, -0.057, -0.048, -0.038, -0.026, -0.011, -0.020}, // 5 - 10 GeV
- {-0.041, -0.028, -0.028, -0.038, -0.028, -0.028, -0.020, -0.011, -0.011, -0.011}, // 10 - 15 GeV
- {-0.023, -0.023, -0.023, -0.023, -0.023, -0.023, -0.020, -0.011, -0.011, -0.011}, // 15 - 20 GeV
- {-0.023, -0.023, -0.023, -0.023, -0.023, -0.023, -0.020, -0.011, -0.011, -0.011}, // 20 - 25 GeV
- {-0.023, -0.023, -0.023, -0.023, -0.023, -0.023, -0.020, -0.011, -0.011, -0.011}, // 25 - 40 GeV
- {-0.023, -0.023, -0.023, -0.023, -0.023, -0.023, -0.020, -0.011, -0.011, -0.011}, // 40 - 50 GeV
- {-0.023, -0.023, -0.023, -0.023, -0.023, -0.023, -0.020, -0.011, -0.011, -0.011}, // 50 - 60 GeV
- {-0.023, -0.023, -0.023, -0.023, -0.023, -0.023, -0.020, -0.011, -0.011, -0.011}, // 60 - 70 GeV
- {-0.023, -0.023, -0.023, -0.023, -0.023, -0.023, -0.020, -0.011, -0.011, -0.011}, // 70 - 80 GeV
- {-0.023, -0.023, -0.023, -0.023, -0.023, -0.023, -0.020, -0.011, -0.011, -0.011}};// 80
-
- if(isBrem){
- if(deltaPhiRes < minDeltaPhiResHigh[eTBin][etaBin] || deltaPhiRes > maxDeltaPhiResHigh[eTBin][etaBin]) return false;
- }
- if(!isBrem){
- if(deltaPhiRes < minDeltaPhiResLow[eTBin][etaBin] || deltaPhiRes > maxDeltaPhiResLow[eTBin][etaBin]) return false;
- }
- return true;
-
-}
-
-//----------------------------------------------------------------------------------------
-
-bool Root::TElectronMultiLeptonSelector::passTR(double TRratio, double eta, unsigned int nTRTTotal ) const {
- if (fabs(eta)>1.37 && fabs(eta)<1.52 ){
-
- return (nTRTTotal >10 && TRratio > 0.1);
- }
- return true;
-}
-
-
-bool Root::TElectronMultiLeptonSelector::passTightDeltaPhi(double deltaPhiRes, bool expectBlayer, int nBlayerHits,
- unsigned int eTBin, unsigned int etaBin) const {
-
- // 0.0 0.1 0.6 0.8 1.15 1.37 1.52 1.81 2.01 2.37 2.47
- static const double maxDeltaPhiResBL[11][10] = {{ 0.020 , 0.020, 0.020, 0.020, 0.020, 0.016, 0.020, 0.023, 0.023, 0.032}, // 0
- { 0.014, 0.014, 0.014, 0.014, 0.014, 0.015, 0.020, 0.022, 0.022, 0.032}, // 5
- { 0.008, 0.008, 0.008, 0.009, 0.009, 0.011, 0.015, 0.015, 0.018, 0.030}, // 10
- { 0.006, 0.006, 0.007, 0.008, 0.008, 0.019, 0.013, 0.015, 0.017, 0.025}, // 15
- { 0.006, 0.006, 0.006, 0.006, 0.006, 0.008, 0.012, 0.013, 0.015, 0.021}, // 20
- { 0.006 , 0.006, 0.006, 0.006, 0.006, 0.007, 0.012, 0.013, 0.014, 0.020}, // 30
- { 0.005, 0.005, 0.005, 0.005, 0.005, 0.006, 0.012, 0.013, 0.014, 0.020}, // 40
- { 0.005, 0.005, 0.005, 0.005, 0.005, 0.006, 0.012, 0.013, 0.014, 0.020}, // 50
- { 0.005, 0.005, 0.005, 0.005, 0.005, 0.006, 0.012, 0.013, 0.014, 0.020}, // 60
- { 0.005, 0.005, 0.005, 0.005, 0.005, 0.006, 0.012, 0.013, 0.014, 0.020}, // 70
- { 0.005, 0.005, 0.005, 0.005, 0.005, 0.006, 0.012, 0.013, 0.014, 0.020}}; // 80
-
-
- if (expectBlayer && nBlayerHits<1) {
- if(deltaPhiRes > maxDeltaPhiResBL[eTBin][etaBin]){
- return false;
- }
- }
-
-
- return true;
-}
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronMultiLeptonSelector.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronMultiLeptonSelector.h
deleted file mode 100644
index d6d877b7066718373c5fa1b1209d9fd5f22f464e..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/TElectronMultiLeptonSelector.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef __TELECTRONMULTILEPTONSELECTOR__
-#define __TELECTRONMULTILEPTONSELECTOR__
-
-/**
- @class TElectronMultiLeptonSelector
- @brief Electron selector tool to select objects in pure ROOT using the multi-lepton cuts
-
- @author Karsten Koeneke
- @date October 2012
-*/
-
-
-// Include the return object and the base class
-#include "AsgTools/AsgMessaging.h"
-#include "PATCore/AcceptInfo.h"
-#include "PATCore/AcceptData.h"
-
-
-namespace Root {
- class TElectronMultiLeptonSelector : public asg::AsgMessaging
- {
-
- public:
- /** Standard constructor */
- TElectronMultiLeptonSelector(const char* name="TElectronMultiLeptonSelector");
-
- /** Standard destructor */
- ~TElectronMultiLeptonSelector();
-
-
- // Main methods
- public:
- /** Initialize this class */
- StatusCode initialize();
-
- /// accesss to the accept info object
- const asg::AcceptInfo& getAcceptInfo() const { return m_acceptInfo; }
-
- /** The main accept method: the actual cuts are applied here */
- asg::AcceptData accept( const double eta,
- const double eT,
- const double rHad,
- const double rHad1,
- const double Reta,
- const double w2,
- const double f1,
- const double f3,
- const double wstot,
- const double DEmaxs1,
- const double deltaEta,
- const int nSi,
- const int nSiDeadSensors,
- const int nPix,
- const int nPixDeadSensors,
- const double deltaPhiRes,
- const double dpOverp,
- const double TRratio,
- const int nTRTTotal,
- const int nBlayerHits,
- const bool expectBlayer
- ) const;
-
-
- /** Return dummy accept with only info */
- asg::AcceptData accept() const { return asg::AcceptData(&m_acceptInfo); }
-
- private:
- // Private helper methods
- bool passRHad(double rhad, double rhad1, unsigned int etbin, unsigned int etabin) const;
- bool passF3(double f3, unsigned int etbin, unsigned int etabin) const;
- bool passReta(double reta, unsigned int etbin, unsigned int etabin)const ;
- bool passW2(double w2, unsigned int etbin, unsigned int etabin) const ;
- bool passWstot(double wstot, unsigned int etbin, unsigned int etabin) const ;
- bool passEratio(double demaxs1, unsigned int etbin, unsigned int etabin) const ;
- bool passDeltaEta(double deltaEta, unsigned int etbin, unsigned int etabin) const ;
- bool passDeltaPhiRes(double deltaPhiRes, bool isBrem, unsigned int etbin, unsigned int etabin) const ;
- bool passTR(double TRratio, double eta, unsigned int nTRTTotal ) const ;
- bool passTightDeltaPhi(double deltaPhiRes,
- bool expectBlayer, int nBlayerHits,
- unsigned int eTBin, unsigned int etaBin) const ;
-
- // Helper Fuctions
- unsigned int getEtaBinH4l(double eta) const ;
- unsigned int getEtBinH4l(double eT) const ;
- bool getBremCategoryH4l( double dpOverp, unsigned int etbin, unsigned int etabin) const ;
-
- private:
- /// Accept info
- asg::AcceptInfo m_acceptInfo;
-
- const double GeV;
-
- int m_cutPosition_Coverage;
- int m_cutPosition_RHad;
- int m_cutPosition_F3;
- int m_cutPosition_Reta;
- int m_cutPosition_W2;
- int m_cutPosition_Wstot;
- int m_cutPosition_Eratio;
- int m_cutPosition_DeltaEta;
- int m_cutPosition_DeltaPhiRes;
- int m_cutPosition_NSilicon;
- int m_cutPosition_NPixel;
- int m_cutPosition_NBlayer;
- int m_cutPosition_TR;
- int m_cutPosition_TightDeltaPhi;
-
- }; // End: class definition
-
-} // End: namespace Root
-
-#endif
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
index 5cfdd1c4ce651cb311690efd869771576270ad13..1cfb85d02dd6965e132c50c633575d024deb5b49 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/src/components/ElectronPhotonSelectorTools_entries.cxx
@@ -1,5 +1,4 @@
#include "ElectronPhotonSelectorTools/AsgElectronIsEMSelector.h"
-#include "ElectronPhotonSelectorTools/AsgElectronMultiLeptonSelector.h"
#include "ElectronPhotonSelectorTools/AsgElectronLikelihoodTool.h"
#include "ElectronPhotonSelectorTools/AsgPhotonIsEMSelector.h"
#include "ElectronPhotonSelectorTools/AsgForwardElectronIsEMSelector.h"
@@ -7,7 +6,6 @@
#include "ElectronPhotonSelectorTools/AsgDeadHVCellRemovalTool.h"
DECLARE_COMPONENT( AsgElectronIsEMSelector )
-DECLARE_COMPONENT( AsgElectronMultiLeptonSelector )
DECLARE_COMPONENT( AsgElectronLikelihoodTool )
DECLARE_COMPONENT( AsgPhotonIsEMSelector )
DECLARE_COMPONENT( AsgForwardElectronIsEMSelector )
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
index d8857c9471950ac2edade6da2dd70f11ed5fe607..05461c362b7fdf27b6349efff7f7e440b4ae2b0c 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/util/testEGIdentificationPoints.cxx
@@ -17,6 +17,7 @@
#include "xAODEgamma/Electron.h"
#include "xAODEgamma/Photon.h"
#include "AsgTools/AnaToolHandle.h"
+#include "PATCore/AcceptData.h"
#include "EgammaAnalysisInterfaces/IAsgPhotonIsEMSelector.h"
#include "EgammaAnalysisInterfaces/IAsgForwardElectronIsEMSelector.h"
@@ -130,9 +131,9 @@ int main( int argc, char* argv[] ) {
for (const xAOD::Electron* el : *electrons) {
ANA_MSG_INFO("---------------------------");
ANA_MSG_INFO("Electron: " << counter);
- ANA_MSG_INFO("Electron LH Medium accept result: " <<electronMediumLHSelector->accept(el));
+ ANA_MSG_INFO("Electron LH Medium accept result: " <<bool(electronMediumLHSelector->accept(el)));
ANA_MSG_INFO("Electron Cut based");
- ANA_MSG_INFO("Electron Cut Medium accept result: " <<electronMediumIsEMSelector->accept(el));
+ ANA_MSG_INFO("Electron Cut Medium accept result: " <<bool(electronMediumIsEMSelector->accept(el)));
//Bitset manipulation
ANA_MSG_INFO("Decision as a bitset: ");
@@ -191,7 +192,7 @@ int main( int argc, char* argv[] ) {
for (const xAOD::Photon* ph : *photons) {
ANA_MSG_INFO("---------------------------");
ANA_MSG_INFO("Photon: " << counter);
- ANA_MSG_INFO("Photon Tight accept result: " <<photonTightIsEMSelector->accept(ph));
+ ANA_MSG_INFO("Photon Tight accept result: " <<bool(photonTightIsEMSelector->accept(ph)));
++counter;
}
}// loop entries
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/EgammaTagTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/EgammaTagTool.cxx
index fec9448da3817f4ed77e097ee4af1c1963fc358d..371834720f62836dcf66e0e4113ed4e5dd8e0adf 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/EgammaTagTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/EgammaTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a collection of EgammaTag
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "ElectronPhotonTagTools/EgammaTagTool.h"
#include "TagEvent/EgammaAttributeNames.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx
index dd52faf91ddf989ac8e6d1e25b5747037b3c8a8b..140cc4c7824f91f8ec1741de06ca0cc96ffc8cbb 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/ElectronTagTool.cxx
@@ -10,7 +10,7 @@ Purpose : create a collection of ElectronTag
*****************************************************************************/
#include "ElectronPhotonTagTools/ElectronTagTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/StoreGateSvc.h"
#include "xAODCore/ShallowCopy.h"
#include "xAODParticleEvent/IParticleLink.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/PhotonTagTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/PhotonTagTool.cxx
index cc82e2b228d7c96c6923a5c68f1720d8bcb1b322..66baf090de2654138719dab8ca1b7ddf31fe0ff7 100755
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/PhotonTagTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools/src/PhotonTagTool.cxx
@@ -11,7 +11,7 @@ Purpose : create a collection of PhotonTag
#include "ElectronPhotonTagTools/PhotonTagTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/StoreGateSvc.h"
#include "xAODCore/ShallowCopy.h"
#include "xAODParticleEvent/IParticleLink.h"
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/PhotonEfficiencyCorrection/AsgPhotonEfficiencyCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/PhotonEfficiencyCorrection/AsgPhotonEfficiencyCorrectionTool.h
index 0470c719b17afe12e7092d30e83bcba73bcb633d..762996c219db5e9183b58b8770ff54b1eda9465c 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/PhotonEfficiencyCorrection/AsgPhotonEfficiencyCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/PhotonEfficiencyCorrection/AsgPhotonEfficiencyCorrectionTool.h
@@ -52,10 +52,7 @@ public:
public:
/// Gaudi Service Interface method implementations
- virtual StatusCode initialize();
-
- /// Gaudi Service Interface method implementations
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
@@ -69,20 +66,20 @@ public:
} // pass the Egamma obj by reference
///Add some method for now as a first step to move the tool to then new interface
- virtual CP::CorrectionCode getEfficiencyScaleFactor(const xAOD::Egamma& inputObject, double& efficiencyScaleFactor) const;
- virtual CP::CorrectionCode getEfficiencyScaleFactorError(const xAOD::Egamma& inputObject, double& efficiencyScaleFactorError) const;
- virtual CP::CorrectionCode applyEfficiencyScaleFactor(xAOD::Egamma& inputObject) const;
+ virtual CP::CorrectionCode getEfficiencyScaleFactor(const xAOD::Egamma& inputObject, double& efficiencyScaleFactor) const override;
+ virtual CP::CorrectionCode getEfficiencyScaleFactorError(const xAOD::Egamma& inputObject, double& efficiencyScaleFactorError) const override;
+ virtual CP::CorrectionCode applyEfficiencyScaleFactor(xAOD::Egamma& inputObject) const override;
///The methods below should notify the user of what is actually in the list , without him having to go in the wiki
/// returns: whether this tool is affected by the given systematic
- virtual bool isAffectedBySystematic( const CP::SystematicVariation& systematic ) const;
+ virtual bool isAffectedBySystematic( const CP::SystematicVariation& systematic ) const override;
/// returns: the list of all systematics this tool can be affected by
- virtual CP::SystematicSet affectingSystematics() const ;
+ virtual CP::SystematicSet affectingSystematics() const override;
/// returns: the list of all systematics this tool recommends to use
- virtual CP::SystematicSet recommendedSystematics() const ;
+ virtual CP::SystematicSet recommendedSystematics() const override;
/// returns: the currently applied systematics
const CP::SystematicSet& appliedSystematics() const {
@@ -91,7 +88,7 @@ public:
}
/// Configure this tool for the given systematics
- virtual CP::SystematicCode applySystematicVariation ( const CP::SystematicSet& systConfig );
+ virtual CP::SystematicCode applySystematicVariation ( const CP::SystematicSet& systConfig ) override;
CP::SystematicCode registerSystematics();
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
index f25b96cb412d433b911f829329ae1bce7e741300..bef6ac93bf9f061d2a6e044a93c1724e3f62f575 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/AsgPhotonEfficiencyCorrectionTool.cxx
@@ -93,10 +93,6 @@ AsgPhotonEfficiencyCorrectionTool::AsgPhotonEfficiencyCorrectionTool( std::strin
// =============================================================================
AsgPhotonEfficiencyCorrectionTool::~AsgPhotonEfficiencyCorrectionTool()
{
- if(finalize().isFailure()){
- ATH_MSG_ERROR ( "Failure in AsgPhotonEfficiencyCorrectionTool finalize()");
- }
-
if ( m_rootTool_unc ) delete m_rootTool_unc;
if ( m_rootTool_con ) delete m_rootTool_con;
}
@@ -184,21 +180,6 @@ StatusCode AsgPhotonEfficiencyCorrectionTool::initialize()
}
-// =============================================================================
-// Athena finalize method
-// =============================================================================
-StatusCode AsgPhotonEfficiencyCorrectionTool::finalize()
-{
- if ( !(m_rootTool_con->finalize()) || !(m_rootTool_unc->finalize()) )
- {
- ATH_MSG_ERROR("Something went wrong at finalize!");
- return StatusCode::FAILURE;
- }
-
- return StatusCode::SUCCESS ;
-}
-
-
// =============================================================================
// The main accept method: the actual cuts are applied here
// =============================================================================
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/util/TestxAODPhotonAlg.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/util/TestxAODPhotonAlg.cxx
index c6ec289bb52202890dcca1de06306dd2a4e4f58f..c6c06031f44088b0fe594319a32509f1b20ea88b 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/util/TestxAODPhotonAlg.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/util/TestxAODPhotonAlg.cxx
@@ -254,9 +254,6 @@ int main( int argc, char* argv[] ) {
} // END LOOP ON PHOTONS
} // END LOOP ON EVENTS
- CHECK(photonSF_ID.finalize());
- CHECK(photonSF_Iso.finalize());
- CHECK(photonSF_Trig.finalize());
// Return gracefully:
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt
index 0639fdc571305371749167e60348eaef6c99dbc3..563da38a17c27296555828d6fe43af4a24073402 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/CMakeLists.txt
@@ -72,6 +72,8 @@ endif()
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_add_test( flake8_test
- SCRIPT ${ATLAS_FLAKE8} ${CMAKE_CURRENT_SOURCE_DIR}/test
- POST_EXEC_SCRIPT nopost.sh )
+if (NOT XAOD_STANDALONE)
+ atlas_add_test( flake8_test
+ SCRIPT ${ATLAS_FLAKE8} ${CMAKE_CURRENT_SOURCE_DIR}/test
+ POST_EXEC_SCRIPT nopost.sh )
+endif ()
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
index 0cef17ff3e6709fe99f9dcc38334492055ffddd9..683cbbae93d8dec11cb741fa8f7c911c10db35dd 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/util/testClusterMVACalib.cxx
@@ -26,7 +26,7 @@
#include "xAODEgamma/Egamma.h"
#include "xAODCore/AuxContainerBase.h"
-#include "egammaMVACalib/egammaMVATool.h"
+#include "egammaMVACalibAnalysis/egammaMVATool.h"
#include "AsgTools/AsgMessaging.h"
// Infrastructure include(s):
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/EventTagUtils/RegistrationStreamTrig.h b/PhysicsAnalysis/EventTag/EventTagUtils/EventTagUtils/RegistrationStreamTrig.h
index 78808cc220c523db5cc61a2522adedecd8971e34..ca4beccb3c838de857531744e4aa30133ee66dbd 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/EventTagUtils/RegistrationStreamTrig.h
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/EventTagUtils/RegistrationStreamTrig.h
@@ -14,7 +14,7 @@
//<<<<<< INCLUDES >>>>>>
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
#include "GaudiKernel/ToolHandle.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/EventInfoTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/EventInfoTagTool.cxx
index 012e94e184f9d69683dcf9c59556d5c2a48ce900..4f08637383751cb38abb11dc81fb67c90939e682 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/EventInfoTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/EventInfoTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a EventInfoTag - The Tag information associated to the event
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalEventTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalEventTagTool.cxx
index ab3b71c0287f2460a57fd458f6ac2c7eb58d972e..65e828e8f83a6558b4ed23ed0a99ed0606dfcfcd 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalEventTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalEventTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a GlobalEventTag - The Tag information associated to the event
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
index fdc46ac4de77febfd109db0ba4a4d3aab5abb94b..1315e89af23b11f972a4f7ea666c97afd22e555e 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/GlobalTriggerTagTool.cxx
@@ -14,7 +14,7 @@ Purpose : create a GlobalTriggerTag - The Tag information associated to the even
#include "EventTagUtils/GlobalTriggerTagTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/EventTag/EventTagUtils/src/RawInfoSummaryForTagTool.cxx b/PhysicsAnalysis/EventTag/EventTagUtils/src/RawInfoSummaryForTagTool.cxx
index ed866fb59383f73f53edab4745285981982e91ce..8cb73690389b31161aaa3b2dac33bf265c050ee2 100755
--- a/PhysicsAnalysis/EventTag/EventTagUtils/src/RawInfoSummaryForTagTool.cxx
+++ b/PhysicsAnalysis/EventTag/EventTagUtils/src/RawInfoSummaryForTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a DataQualityTag - The Detector Status Words and the Good
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/ExoticPhysTagTool.cxx b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/ExoticPhysTagTool.cxx
index fb7cbe57da362282564f8b03cd67053b9284a256..4d43994972364451008b50f6c9bce57816088c09 100755
--- a/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/ExoticPhysTagTool.cxx
+++ b/PhysicsAnalysis/ExoticPhys/ExoticPhysTagTools/src/ExoticPhysTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a ExoticPhysTag - a word to encode ExoticPhys specific informat
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "ExoticPhysTagTools/ExoticPhysTagTool.h"
diff --git a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/HeavyIonPhysTagTool.cxx b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/HeavyIonPhysTagTool.cxx
index e6f98b4671aade535b0f6e0bfa9ac23cc5c905d4..2ad0971a94888eb26dd75b4ef0eb66a284de484f 100755
--- a/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/HeavyIonPhysTagTool.cxx
+++ b/PhysicsAnalysis/HeavyIonPhys/HeavyIonPhysTagTools/src/HeavyIonPhysTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a HeavyIonPhysTag - a word to encode ExoticPhys specific inform
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "HeavyIonPhysTagTools/HeavyIonPhysTagTool.h"
diff --git a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/HiggsPhysTagTool.cxx b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/HiggsPhysTagTool.cxx
index b0f0fba19576c2d9647b88ee1ff23dcc3c42cecc..86c2b35aae0b1a8aa39d89a7fe8c66a825404c9e 100755
--- a/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/HiggsPhysTagTool.cxx
+++ b/PhysicsAnalysis/HiggsPhys/HiggsPhysTagTools/src/HiggsPhysTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a HiggsPhysTag - a word to encode HiggsPhys specific informatio
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "HiggsPhysTagTools/HiggsPhysTagTool.h"
diff --git a/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/CMakeLists.txt b/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/CMakeLists.txt
index caee70d794b5b11df1562876cce3039f0928e162..83b385add48348e0382eaff82426c6dbb17f3999 100644
--- a/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/CMakeLists.txt
+++ b/PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint/CMakeLists.txt
@@ -35,8 +35,7 @@ atlas_add_library( ZMassConstraintLib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools EventPrimitives xAODBase xAODEgamma
xAODMuon
- PRIVATE_LINK_LIBRARIES ElectronPhotonFourMomentumCorrectionLib
- MuonMomentumCorrectionsLib )
+ PRIVATE_LINK_LIBRARIES MuonMomentumCorrectionsLib )
if( NOT XAOD_STANDALONE )
atlas_add_component( ZMassConstaint
diff --git a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtIdentificationTagTool.cxx b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtIdentificationTagTool.cxx
index 68c218c937f8d62e332fedcea141d1aed9e4ed00..965d9640474044f9ce6510da36287cef7d07a08d 100755
--- a/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtIdentificationTagTool.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetMissingEtTagTools/src/JetMissingEtIdentificationTagTool.cxx
@@ -10,7 +10,7 @@ Purpose : create a JetMissingEtIdentificationTag - word to encode Jet and
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "xAODJet/JetContainer.h"
diff --git a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/util/TestJetCleaningTool.cxx b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/util/TestJetCleaningTool.cxx
index 1b55af5d3289ea5f429da6b76050ec098cd21d7e..4c6fb5b4a5ff227cf85d33e5ded6b769ea3efc86 100644
--- a/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/util/TestJetCleaningTool.cxx
+++ b/PhysicsAnalysis/JetMissingEtID/JetSelectorTools/util/TestJetCleaningTool.cxx
@@ -18,7 +18,7 @@
#include "TString.h"
#include "TSystem.h"
-const char* parseResult(const Root::TAccept& result, const char* selection="Cleaning")
+const char* parseResult(const asg::AcceptData& result, const char* selection="Cleaning")
{
return result.getCutResult(selection)==true?"true":"false";
}
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/JetTagCalibration/CalibrationBroker.h b/PhysicsAnalysis/JetTagging/JetTagCalibration/JetTagCalibration/CalibrationBroker.h
index f7117d662eeaafd866a7f200abc7a0515b7938d2..6565eea27fdaa62bf0b456b90db4580324168263 100755
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/JetTagCalibration/CalibrationBroker.h
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/JetTagCalibration/CalibrationBroker.h
@@ -8,7 +8,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TFile.h"
#include <map>
#include <string>
diff --git a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/JetTaggingTagTool.cxx b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/JetTaggingTagTool.cxx
index 8d4fa1e309ea3e9fe3a484e374709a3f51241972..b06a2c17b81b57633847a4ec329f43e5abcbaa56 100755
--- a/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/JetTaggingTagTool.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTaggingTagTools/src/JetTaggingTagTool.cxx
@@ -13,7 +13,7 @@ Purpose : create a Flavor Tagging Event Tag - a word to encode Flavor Tagging sp
*****************************************************************************/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/JpsiUpsilonTools/share/configureServices.py b/PhysicsAnalysis/JpsiUpsilonTools/share/configureServices.py
index aba323cafa1bd2c2728f78f3611fc7062f90ca7b..8f5d372b640fd872f6cac3fa27b3d6296da93d57 100644
--- a/PhysicsAnalysis/JpsiUpsilonTools/share/configureServices.py
+++ b/PhysicsAnalysis/JpsiUpsilonTools/share/configureServices.py
@@ -44,12 +44,19 @@ CountDeadModulesAfterLastHit=False
from InDetRecExample.InDetJobProperties import InDetFlags
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+BoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="InDetBoundaryCheckTool",
+ UsePixel=DetFlags.haveRIO.pixel_on(),
+ UseSCT=DetFlags.haveRIO.SCT_on(),
+ CheckBadSCT = InDetFlags.checkDeadElementsOnTrack()
+)
+ToolSvc += BoundaryCheckTool
+
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "InDetHoleSearchTool",
Extrapolator = InDetExtrapolator,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on(),
- checkBadSCTChip = InDetFlags.checkDeadElementsOnTrack(),
+ BoundaryCheckTool=BoundaryCheckTool,
#Commissioning = rec.Commissioning())
CountDeadModulesAfterLastHit = CountDeadModulesAfterLastHit)
ToolSvc += InDetHoleSearchTool
diff --git a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/CMakeLists.txt b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/CMakeLists.txt
index 2be9205ff2902d1782f175258839ee2915938522..34773bb868b63640f3ee9407fe561687999398e6 100644
--- a/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/CMakeLists.txt
+++ b/PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonEfficiencyCorrections/CMakeLists.txt
@@ -1,55 +1,23 @@
-################################################################################
-# Package: MuonEfficiencyCorrections
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( MuonEfficiencyCorrections )
-# Extra dependencies, based on the environment:
-set( extra_dep )
-if( XAOD_STANDALONE )
- set( extra_dep Control/xAODRootAccess )
-else()
- set( extra_dep Control/AthenaBaseComps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Control/AthToolSupport/AsgMessaging
- Control/AthToolSupport/AsgDataHandles
- Event/xAOD/xAODEventInfo
- Event/xAOD/xAODMuon
- Event/xAOD/xAODJet
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- PhysicsAnalysis/Interfaces/AsgAnalysisInterfaces
- PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces
- PRIVATE
- Control/AthContainers
- Event/xAOD/xAODTrigger
- Event/FourMomUtils
- Tools/PathResolver
- ${extra_dep} )
-
# External dependencies:
find_package( ROOT COMPONENTS Core Tree RIO Hist Physics )
-
# Libraries in the package:
atlas_add_library( MuonEfficiencyCorrectionsLib
MuonEfficiencyCorrections/*.h Root/*.cxx
PUBLIC_HEADERS MuonEfficiencyCorrections
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODMuon xAODEventInfo MuonAnalysisInterfacesLib PATInterfaces AsgMessagingLib AsgDataHandlesLib
- PRIVATE_LINK_LIBRARIES xAODTrigger PathResolver )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODMuon xAODEventInfo MuonAnalysisInterfacesLib PATInterfaces AsgDataHandlesLib
+ PRIVATE_LINK_LIBRARIES FourMomUtils xAODTrigger PathResolver )
if( NOT XAOD_STANDALONE )
atlas_add_component( MuonEfficiencyCorrections
src/*.h src/*.cxx src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODMuon xAODJet PATInterfaces AthContainers MuonAnalysisInterfacesLib AsgMessagingLib
- AthenaBaseComps GaudiKernel MuonEfficiencyCorrectionsLib StoreGateLib )
+ LINK_LIBRARIES AsgAnalysisInterfaces AthContainers AthenaBaseComps FourMomUtils GaudiKernel MuonEfficiencyCorrectionsLib StoreGateLib xAODJet )
endif()
atlas_add_dictionary( MuonEfficiencyCorrectionsDict
@@ -61,9 +29,7 @@ atlas_add_dictionary( MuonEfficiencyCorrectionsDict
macro( _add_exec name )
atlas_add_executable( ${name}
util/${name}.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} xAODRootAccess xAODEventInfo xAODMuon MuonAnalysisInterfacesLib
- PATInterfaces xAODCore AsgAnalysisInterfaces PileupReweightingLib MuonEfficiencyCorrectionsLib AsgMessagingLib )
+ LINK_LIBRARIES AsgAnalysisInterfaces MuonEfficiencyCorrectionsLib )
endmacro( _add_exec )
if( XAOD_STANDALONE )
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/MuonSelectionTool.h b/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/MuonSelectionTool.h
index 8c7f66f440366cb59c02a52484f0f50de280e71f..3777efe2a04e0dfee91c9c81e85e88669da19153 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/MuonSelectionTool.h
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/MuonSelectorTools/MuonSelectionTool.h
@@ -125,12 +125,11 @@ namespace CP {
private:
MuonSelectionTool & operator=(const MuonSelectionTool &right);
- MuonSelectionTool( const MuonSelectionTool& toCopy );
+
const std::string m_name;
/// Maximum pseudorapidity for the selected muons
double m_maxEta;
int m_quality;
- bool m_isSimulation;
/// Store selection information.
asg::AcceptInfo m_acceptInfo;
@@ -157,13 +156,12 @@ namespace CP {
std::string m_BMVcutFile;
/// Checks for each histogram
- StatusCode getHist( TFile* file, const char* histName, TH2D*& hist );
+ StatusCode getHist( TFile* file, const char* histName, std::unique_ptr<TH2D>& hist );
//
- std::string m_tightWP_rootFile;
- TH2D* m_tightWP_lowPt_rhoCuts;
- TH2D* m_tightWP_lowPt_qOverPCuts;
- TH2D* m_tightWP_mediumPt_rhoCuts;
- TH2D* m_tightWP_highPt_rhoCuts;
+ std::unique_ptr<TH2D> m_tightWP_lowPt_rhoCuts;
+ std::unique_ptr<TH2D> m_tightWP_lowPt_qOverPCuts;
+ std::unique_ptr<TH2D> m_tightWP_mediumPt_rhoCuts;
+ std::unique_ptr<TH2D> m_tightWP_highPt_rhoCuts;
//
std::unique_ptr<TF1> m_BMVcutFunction_barrel;
std::unique_ptr<TF1> m_BMVcutFunction_endcap;
@@ -185,10 +183,10 @@ namespace CP {
bool isBMG(const float eta, const float phi) const;
//TMVA readers for low-pT working point
- TMVA::Reader* m_readerE_MUID;
- TMVA::Reader* m_readerO_MUID;
- TMVA::Reader* m_readerE_MUGIRL;
- TMVA::Reader* m_readerO_MUGIRL;
+ std::unique_ptr<TMVA::Reader> m_readerE_MUID;
+ std::unique_ptr<TMVA::Reader> m_readerO_MUID;
+ std::unique_ptr<TMVA::Reader> m_readerE_MUGIRL;
+ std::unique_ptr<TMVA::Reader> m_readerO_MUGIRL;
//TMVA initialize function
void PrepareReader(TMVA::Reader* reader);
diff --git a/PhysicsAnalysis/MuonID/MuonSelectorTools/Root/MuonSelectionTool.cxx b/PhysicsAnalysis/MuonID/MuonSelectorTools/Root/MuonSelectionTool.cxx
index 6a5ad66afe026ee104e70f7743959452ec25a011..1149b107390ff45960cf8007777c39dce2fdd871 100644
--- a/PhysicsAnalysis/MuonID/MuonSelectorTools/Root/MuonSelectionTool.cxx
+++ b/PhysicsAnalysis/MuonID/MuonSelectorTools/Root/MuonSelectionTool.cxx
@@ -63,91 +63,17 @@ namespace CP {
declareProperty( "SiHolesCutOff", m_SiHolesCutOff = false );
declareProperty( "UseAllAuthors", m_useAllAuthors = true );
//
- m_tightWP_lowPt_rhoCuts = 0;
- m_tightWP_lowPt_qOverPCuts = 0;
- m_tightWP_mediumPt_rhoCuts = 0;
- m_tightWP_highPt_rhoCuts = 0;
- //
m_lowPTmva_middleHoles = new Float_t; m_lowPTmva_muonSeg1ChamberIdx = new Float_t;
m_lowPTmva_muonSeg2ChamberIdx = new Float_t; m_lowPTmva_momentumBalanceSig = new Float_t;
m_lowPTmva_scatteringCurvatureSig = new Float_t; m_lowPTmva_scatteringNeighbourSig = new Float_t;
m_lowPTmva_energyLoss = new Float_t; m_lowPTmva_muonSegmentDeltaEta = new Float_t;
-
ATH_MSG_DEBUG("Creating MuonSelectionTool named "<<m_name);
}
-
- MuonSelectionTool::MuonSelectionTool( const MuonSelectionTool& toCopy )
- : asg::AsgTool(toCopy.m_name+"_copy"),
- m_name(toCopy.m_name+"_copy"),
- m_maxEta( toCopy.m_maxEta ),
- m_quality( toCopy.m_quality ),
- m_acceptInfo( toCopy.m_acceptInfo ),
- m_toroidOff( toCopy.m_toroidOff ),
- m_developMode( toCopy.m_developMode ),
- m_TrtCutOff( toCopy.m_TrtCutOff ),
- m_SctCutOff( toCopy.m_SctCutOff ),
- m_PixCutOff( toCopy.m_PixCutOff ),
- m_SiHolesCutOff( toCopy.m_SiHolesCutOff ),
- m_TurnOffMomCorr( toCopy.m_TurnOffMomCorr ),
- m_calibration_version( toCopy.m_calibration_version ),
- m_custom_dir( toCopy.m_custom_dir ),
- m_readerE_MUID(nullptr),
- m_readerO_MUID(nullptr),
- m_readerE_MUGIRL(nullptr),
- m_readerO_MUGIRL(nullptr)
- {
- //
- m_tightWP_lowPt_rhoCuts = 0;
- m_tightWP_lowPt_qOverPCuts = 0;
- m_tightWP_mediumPt_rhoCuts = 0;
- m_tightWP_highPt_rhoCuts = 0;
- //
- m_lowPTmva_middleHoles = new Float_t; m_lowPTmva_muonSeg1ChamberIdx = new Float_t;
- m_lowPTmva_muonSeg2ChamberIdx = new Float_t; m_lowPTmva_momentumBalanceSig = new Float_t;
- m_lowPTmva_scatteringCurvatureSig = new Float_t; m_lowPTmva_scatteringNeighbourSig = new Float_t;
- m_lowPTmva_energyLoss = new Float_t; m_lowPTmva_muonSegmentDeltaEta = new Float_t;
-
- ATH_MSG_DEBUG("Creating copy of MuonSelectionTool named "<<m_name);
- }
MuonSelectionTool::~MuonSelectionTool(){
ATH_MSG_DEBUG(Form("Deleting MuonSelectionTool named %s",m_name.c_str()));
//
- if( m_tightWP_lowPt_rhoCuts ){
- delete m_tightWP_lowPt_rhoCuts;
- m_tightWP_lowPt_rhoCuts = 0;
- }
- if( m_tightWP_lowPt_qOverPCuts ){
- delete m_tightWP_lowPt_qOverPCuts;
- m_tightWP_lowPt_qOverPCuts = 0;
- }
- if( m_tightWP_mediumPt_rhoCuts ){
- delete m_tightWP_mediumPt_rhoCuts;
- m_tightWP_mediumPt_rhoCuts = 0;
- }
- if( m_tightWP_highPt_rhoCuts ){
- delete m_tightWP_highPt_rhoCuts;
- m_tightWP_highPt_rhoCuts = 0;
- }
- //
- if( m_readerE_MUID ){
- delete m_readerE_MUID;
- m_readerE_MUID = nullptr;
- }
- if( m_readerO_MUID ){
- delete m_readerO_MUID;
- m_readerO_MUID = nullptr;
- }
- if( m_readerE_MUGIRL ){
- delete m_readerE_MUGIRL;
- m_readerE_MUGIRL = nullptr;
- }
- if( m_readerO_MUGIRL ){
- delete m_readerO_MUGIRL;
- m_readerO_MUGIRL = nullptr;
- }
- //
delete m_lowPTmva_middleHoles; delete m_lowPTmva_muonSeg1ChamberIdx; delete m_lowPTmva_muonSeg2ChamberIdx; delete m_lowPTmva_momentumBalanceSig;
delete m_lowPTmva_scatteringCurvatureSig; delete m_lowPTmva_scatteringNeighbourSig; delete m_lowPTmva_energyLoss; delete m_lowPTmva_muonSegmentDeltaEta;
}
@@ -165,9 +91,9 @@ namespace CP {
if (m_custom_dir!="") ATH_MSG_WARNING("!! SETTING UP WITH USER SPECIFIED INPUT LOCATION \""<<m_custom_dir<<"\"!! FOR DEVELOPMENT USE ONLY !! ");
if (!m_useAllAuthors) ATH_MSG_WARNING("Not using allAuthors variable as currently missing in many derivations; LowPtEfficiency working point will always return false, but this is expected at the moment. Have a look here: https://twiki.cern.ch/twiki/bin/view/Atlas/MuonSelectionToolR21#New_LowPtEfficiency_working_poin");
- //Print warning to ensure that users including 2-station muons in the high-pT selection are aware of this
- if (!m_use2stationMuonsHighPt) ATH_MSG_INFO("You have opted select 3-station muons in the high-pT selection! "<<
- "Please feed 'HighPt3Layers' to the 'WorkingPoint' property to retrieve the appropiate scale-factors");
+ //Print message to ensure that users excluding 2-station muons in the high-pT selection are aware of this
+ if (!m_use2stationMuonsHighPt) ATH_MSG_INFO("You have opted to select only 3-station muons in the high-pT selection! "<<
+ "Please feed 'HighPt3Layers' to the 'WorkingPoint' property to retrieve the appropriate scale-factors");
// Set up the TAccept object:
@@ -248,20 +174,20 @@ namespace CP {
TString weightPath_EVEN_MuGirl = PathResolverFindCalibFile(m_MVAreaderFile_EVEN_MuGirl);
TString weightPath_ODD_MuGirl = PathResolverFindCalibFile(m_MVAreaderFile_ODD_MuGirl);
- m_readerE_MUID = new TMVA::Reader();
- PrepareReader( m_readerE_MUID );
+ m_readerE_MUID = std::make_unique<TMVA::Reader>();
+ PrepareReader( m_readerE_MUID.get() );
m_readerE_MUID->BookMVA("BDTG", weightPath_EVEN_MuidCB);
- m_readerO_MUID = new TMVA::Reader();
- PrepareReader( m_readerO_MUID );
+ m_readerO_MUID = std::make_unique<TMVA::Reader>();
+ PrepareReader( m_readerO_MUID.get() );
m_readerO_MUID->BookMVA("BDTG", weightPath_ODD_MuidCB);
- m_readerE_MUGIRL = new TMVA::Reader();
- PrepareReader( m_readerE_MUGIRL );
+ m_readerE_MUGIRL = std::make_unique<TMVA::Reader>();
+ PrepareReader( m_readerE_MUGIRL.get() );
m_readerE_MUGIRL->BookMVA("BDTG", weightPath_EVEN_MuGirl);
- m_readerO_MUGIRL = new TMVA::Reader();
- PrepareReader( m_readerO_MUGIRL );
+ m_readerO_MUGIRL = std::make_unique<TMVA::Reader>();
+ PrepareReader( m_readerO_MUGIRL.get() );
m_readerO_MUGIRL->BookMVA("BDTG", weightPath_ODD_MuGirl);
ATH_CHECK( m_eventInfo.initialize() );
@@ -270,14 +196,14 @@ namespace CP {
return StatusCode::SUCCESS;
}
- StatusCode MuonSelectionTool::getHist( TFile* file, const char* histName, TH2D*& hist ){
+ StatusCode MuonSelectionTool::getHist( TFile* file, const char* histName, std::unique_ptr<TH2D>& hist ){
//
if( !file ) {
ATH_MSG_ERROR(" getHist(...) TFile is nullptr! Check that the Tight cut map is loaded correctly");
return StatusCode::FAILURE;
}
//
- hist = dynamic_cast<TH2D*>( file->Get( histName ) );
+ hist = std::unique_ptr<TH2D>( (TH2D*)file->Get( histName ) );
//
if( !hist ){
ATH_MSG_ERROR( "Cannot retrieve histogram " << histName );
@@ -665,6 +591,7 @@ namespace CP {
}
bool MuonSelectionTool::passedIDCuts( const xAOD::Muon& mu ) const {
+
//do not apply the ID hit requirements for SA muons for |eta| > 2.5
if ( mu.author()==xAOD::Muon::MuidSA && std::abs(mu.eta())>2.5 ) {
return true;
@@ -873,12 +800,12 @@ namespace CP {
//use different trainings for even/odd numbered events
TMVA::Reader *reader_MUID, *reader_MUGIRL;
if( eventInfo->eventNumber() % 2 == 1) {
- reader_MUID = m_readerE_MUID;
- reader_MUGIRL = m_readerE_MUGIRL;
+ reader_MUID = m_readerE_MUID.get();
+ reader_MUGIRL = m_readerE_MUGIRL.get();
}
else {
- reader_MUID = m_readerO_MUID;
- reader_MUGIRL = m_readerO_MUGIRL;
+ reader_MUID = m_readerO_MUID.get();
+ reader_MUGIRL = m_readerO_MUGIRL.get();
}
// get the BDT discriminant response
@@ -1259,6 +1186,7 @@ namespace CP {
}
bool MuonSelectionTool::passedIDCuts( const xAOD::TrackParticle & track ) const {
+
uint8_t value1=0;
uint8_t value2=0;
diff --git a/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx b/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
index 59d27766db79aefa9e971cc625f942292218b8e8..4f900025d5cfd81f62444f701eb541607b47c3c4 100644
--- a/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
+++ b/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
@@ -9,7 +9,7 @@ Purpose : create a collection of MuonTag
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODCore/ShallowCopy.h"
#include "xAODParticleEvent/IParticleLink.h"
#include "AthContainers/ConstDataVector.h"
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
index 2bf8891b1014aaee40184ae21931294253289d41..5e16fddbb18888504283b22a473dd396278bb5df 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/PrimaryDPDPrescaler.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
#include "AthenaBaseComps/AthFilterAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/muonTrkTrackThinTool.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/muonTrkTrackThinTool.cxx
index 2627f61cde1c5d965df51d09f55ba8dbfb273fdd..c8d929a6d87ad9e3391bc87c0e236a35c26065f6 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/muonTrkTrackThinTool.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/muonTrkTrackThinTool.cxx
@@ -13,7 +13,7 @@
#include <iostream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// StoreGate
#include "StoreGate/DataHandle.h"
#include "StoreGate/ThinningHandle.h"
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/SUSYPhysTagTool.cxx b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/SUSYPhysTagTool.cxx
index e1245b209794718e6f5ffc1b52c9b5ce3733e08b..0d81bda279a3c7b111ad822c600c513edcc1533e 100755
--- a/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/SUSYPhysTagTool.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYPhysTagTools/src/SUSYPhysTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a SUSYPhysTag - a word to encode SUSYPhys specific information
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
index 8312602001ef4351e66f702c7e319e30225d3929..3ecabbb3ea2f51427d719e7ed3f6254f8355d4fa 100644
--- a/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
+++ b/PhysicsAnalysis/SUSYPhys/SUSYTools/src/ApplySUSYTools.cxx
@@ -51,7 +51,7 @@
#include "PATInterfaces/SystematicVariation.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/StandardModelTagTool.cxx b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/StandardModelTagTool.cxx
index 2a6eba2f1764467d236535dd3cc08994e76fd504..33efb0d5cb5d4ec5321c5a3141ee4fac7f6d75ef 100755
--- a/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/StandardModelTagTool.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/StandardModelPhysTagTools/src/StandardModelTagTool.cxx
@@ -12,7 +12,7 @@ Purpose : create a StandardModelPhysTag - a word to encode StandardModelPhys spe
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "GaudiKernel/GaudiException.h"
diff --git a/PhysicsAnalysis/TauID/DiTauMassTools/CMakeLists.txt b/PhysicsAnalysis/TauID/DiTauMassTools/CMakeLists.txt
index 4012c44a273d034c8f4924e47d0c52354dde424c..2f69076bfa8aeb1d20bd4a488bfe3be5810093cb 100644
--- a/PhysicsAnalysis/TauID/DiTauMassTools/CMakeLists.txt
+++ b/PhysicsAnalysis/TauID/DiTauMassTools/CMakeLists.txt
@@ -49,14 +49,17 @@ atlas_add_dictionary( DiTauMassToolsDict
# Test(s) in the package:
if( XAOD_STANDALONE )
- atlas_add_test( missingmasstool_test
- SOURCES test/ut_ditaumasstools_missingmasstool_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers xAODEventInfo xAODJet
- xAODTau xAODMissingET xAODRootAccess DiTauMassToolsLib )
+ # FIX ME: temporarily disabled as part of the migration of AnalysisBase
+ # to master
- atlas_add_test( missingmasstool_test_python
- SCRIPT test/ut_ditaumasstools_missingmasstool_test_python.py )
+ # atlas_add_test( missingmasstool_test
+ # SOURCES test/ut_ditaumasstools_missingmasstool_test.cxx
+ # INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ # LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers xAODEventInfo xAODJet
+ # xAODTau xAODMissingET xAODRootAccess DiTauMassToolsLib )
+
+ # atlas_add_test( missingmasstool_test_python
+ # SCRIPT test/ut_ditaumasstools_missingmasstool_test_python.py )
endif()
atlas_add_test( mmcTest
diff --git a/PhysicsAnalysis/TauID/TauTagTools/src/TauIdentificationTagTool.cxx b/PhysicsAnalysis/TauID/TauTagTools/src/TauIdentificationTagTool.cxx
index 6ce885975458796ec043baf0c2f2c36fb4da8ddc..b2acfcfd0da6db7fb3d0b8a3c7f6e3de808b6563 100755
--- a/PhysicsAnalysis/TauID/TauTagTools/src/TauIdentificationTagTool.cxx
+++ b/PhysicsAnalysis/TauID/TauTagTools/src/TauIdentificationTagTool.cxx
@@ -10,7 +10,7 @@ Created : January 2006
Purpose : create a TauIdentificationTag - word to encode tauJet specific informations
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "TauTagTools/TauIdentificationTagTool.h"
diff --git a/PhysicsAnalysis/TauID/TauTagTools/src/TauJetTagTool.cxx b/PhysicsAnalysis/TauID/TauTagTools/src/TauJetTagTool.cxx
index 0a85c9400e87cfca34fd52e020470183a3b9fd25..75d0d88bf573eca4463a267f8c4f5d5317f9e00f 100755
--- a/PhysicsAnalysis/TauID/TauTagTools/src/TauJetTagTool.cxx
+++ b/PhysicsAnalysis/TauID/TauTagTools/src/TauJetTagTool.cxx
@@ -9,7 +9,7 @@ Purpose : create a collection of TauJetTag
*****************************************************************************/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodFilter.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodFilter.cxx
index f1514675dd615f80c3a0c828ba56c933d74a63a6..cb525180bbae4395b1a8a020a13e1b64aeb5116c 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodFilter.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodFilter.cxx
@@ -13,7 +13,7 @@
#include <algorithm>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// McParticleUtils includes
#include "McParticleUtils/McVtxFilter.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.cxx
index 91d395161e71c7ed04edf913a4f9a6bd3d2c7bb1..25325e9e5d44e216792838cb5ba75c3c7aff6238 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/McAodValidationAlg.cxx
@@ -14,7 +14,7 @@
#include <stdexcept>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// CLHEP includes
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.cxx b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.cxx
index 5cfcfc493a103b655127baf723742185d6316e29..85153e8028a8274eceef466777def42ee662e4a6 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// McParticleKernel includes
#include "McParticleKernel/ITruthParticleFilterTool.h"
@@ -148,7 +148,7 @@ StatusCode TruthParticleBuilder::execute()
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void TruthParticleBuilder::setupFilterTool( Property& /*doFiltering*/ )
+void TruthParticleBuilder::setupFilterTool( Gaudi::Details::PropertyBase& /*doFiltering*/ )
{
if ( m_doFiltering ) {
@@ -186,7 +186,7 @@ void TruthParticleBuilder::setupFilterTool( Property& /*doFiltering*/ )
return;
}
-void TruthParticleBuilder::setupCnvTool( Property& /*doTruthParticles*/ )
+void TruthParticleBuilder::setupCnvTool( Gaudi::Details::PropertyBase& /*doTruthParticles*/ )
{
if ( m_doTruthParticles ) {
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
index fac5893c80db47a16abaf6a4a6b5d886645978f7..b535fe3062a002fa57b87fe2dba4520d8ac65aac 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleAlgs/src/TruthParticleBuilder.h
@@ -65,12 +65,12 @@ class TruthParticleBuilder : public AthAlgorithm
/** Call-back method to configure the filter tool if needed (this is defined
* by the state of the "DoFiltering" property)
*/
- void setupFilterTool( Property& doFiltering );
+ void setupFilterTool( Gaudi::Details::PropertyBase& doFiltering );
/** Call-back method to configure the converter tool if needed (this is
* defined by the state of the "DoTruthParticles" property)
*/
- void setupCnvTool( Property& doTruthParticles );
+ void setupCnvTool( Gaudi::Details::PropertyBase& doTruthParticles );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
index 77a2cbdb7380a8c9f010b000ceeb435243964433..6fdb260a495462c372ed96863d78dea55e5cd8d3 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.cxx
@@ -204,13 +204,13 @@ StatusCode RootTruthParticleCnvTool::setProperty( const std::string& ) {
abort(); }
StatusCode RootTruthParticleCnvTool::setProperty( const std::string&, const Gaudi::Details::PropertyBase& ) { abort(); }
StatusCode RootTruthParticleCnvTool::setPropertyRepr( const std::string&, const std::string& ){ abort(); }
-StatusCode RootTruthParticleCnvTool::getProperty( Property* ) const { abort(); }
-const Property&
+StatusCode RootTruthParticleCnvTool::getProperty( Gaudi::Details::PropertyBase* ) const { abort(); }
+const Gaudi::Details::PropertyBase&
RootTruthParticleCnvTool::getProperty( const std::string& ) const{ abort(); }
StatusCode RootTruthParticleCnvTool::getProperty( const std::string&,
std::string& ) const {
abort(); }
-const std::vector< Property* >&
+const std::vector< Gaudi::Details::PropertyBase* >&
RootTruthParticleCnvTool::getProperties() const { abort(); }
bool RootTruthParticleCnvTool::hasProperty( const std::string& ) const {
abort(); }
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
index 3573cbd1e416332bc5390b803940987431f87faf..52f05145f10c0aa79b2aa284d36d294f5e9cb1c5 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleEventTPCnv/src/RootTruthParticleCnvTool.h
@@ -8,7 +8,7 @@
#define MCPARTICLEEVENTTPCNV_ROOTTRUTHPARTICLECNVTOOL_H
#include "McParticleKernel/ITruthParticleCnvTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class RootTruthParticleCnvTool
: public ITruthParticleCnvTool
@@ -56,10 +56,10 @@ public:
virtual StatusCode setProperty( const std::string& name, const Gaudi::Details::PropertyBase& p );
virtual StatusCode setPropertyRepr( const std::string& n, const std::string& r );
- virtual StatusCode getProperty( Property* p ) const;
- virtual const Property& getProperty( const std::string& name ) const;
+ virtual StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const;
+ virtual const Gaudi::Details::PropertyBase& getProperty( const std::string& name ) const;
virtual StatusCode getProperty( const std::string& n, std::string& v ) const;
- virtual const std::vector<Property*>& getProperties( ) const;
+ virtual const std::vector<Gaudi::Details::PropertyBase*>& getProperties( ) const;
virtual bool hasProperty(const std::string& name) const;
/// @}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna.cxx
index 63d9838dda2384aa4db58b20b1e382b6827975fa..94ed60b461a2e94ed2b30e77b17ecf0e9abd1eff 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
namespace McAod {
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna_solution.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna_solution.cxx
index 77bfb2b4c666508f05c391983a962effeca7825a..6edfa84919980f71e3e2a593bfcc17d6c6853a80 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna_solution.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodMcTopAna_solution.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ITHistSvc.h"
#include "GaudiKernel/ServiceHandle.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx
index 1c7a946a76e7d0433a93a1afa570f8c1c87e7d2b..cd9576793676f20cb013c2396a76d1cf91c2c4a5 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTests/src/McAodSymLinkTests.cxx
@@ -14,7 +14,7 @@
#include <limits>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// NavFourMom includes
#include "NavFourMom/INavigable4MomentumCollection.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
index 88688ca952d073c81a2f1afcdaef6b2ca2e99514..6ece2481eea9030bb454985cccc02d0a28457331 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.cxx
@@ -449,13 +449,13 @@ StatusCode EtaPtFilterTool::initializeTool()
return StatusCode::SUCCESS;
}
-void EtaPtFilterTool::setupInnerEtaRegionCuts( Property& /*innerRegion*/ )
+void EtaPtFilterTool::setupInnerEtaRegionCuts( Gaudi::Details::PropertyBase& /*innerRegion*/ )
{
// nothing to do (yet?)
return;
}
-void EtaPtFilterTool::setupOuterEtaRegionCuts( Property& /*outerRegion*/ )
+void EtaPtFilterTool::setupOuterEtaRegionCuts( Gaudi::Details::PropertyBase& /*outerRegion*/ )
{
// nothing to do (yet?)
return;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
index 772357495c2df12fb2e696336df693ea42fc51d0..be8b8014c56e27e4551197625294e45b995fbb16 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/EtaPtFilterTool.h
@@ -137,11 +137,11 @@ class EtaPtFilterTool : public TruthParticleFilterBaseTool
/** Callback function to setup the "InnerEtaRegionCuts" property
*/
- void setupInnerEtaRegionCuts( Property& innerEtaRegionCuts );
+ void setupInnerEtaRegionCuts( Gaudi::Details::PropertyBase& innerEtaRegionCuts );
/** Callback function to setup the "OuterEtaRegionCuts" property
*/
- void setupOuterEtaRegionCuts( Property& outerEtaRegionCuts );
+ void setupOuterEtaRegionCuts( Gaudi::Details::PropertyBase& outerEtaRegionCuts );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
index 363c7d5cf17b6aa4abac34384bc5afa94e9940ad..1a72387d8dfd242fe54bc2637377a099e217e1e2 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/GenAodValidationTool.cxx
@@ -13,7 +13,7 @@
#include <sstream>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// StoreGate
#include "StoreGate/StoreGateSvc.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
index 4aadf20744b7990c271a9501c82067d23a2d8803..b60f1bc1cf329e249951758bce32fcbc8e7d6752 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.cxx
@@ -256,7 +256,7 @@ StatusCode HepMcFloatWriterTool::write( const HepMC::GenEvent* evt )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void HepMcFloatWriterTool::setupBackend( Property& /*prop*/ )
+void HepMcFloatWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*prop*/ )
{
// defaults
std::string protocol = "ascii";
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.h
index b0a8202e28b6e92a240d689a4b05d5d9c5f12b6b..81bff0a2447c71b6e647287d70f2678f01a55e60 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcFloatWriterTool.h
@@ -74,7 +74,7 @@ class HepMcFloatWriterTool : virtual public IIOHepMcTool,
/** @brief Method to configure the back-end to write out the
* @c HepMC::GenEvent.
*/
- void setupBackend( Property& ioBackendURL );
+ void setupBackend( Gaudi::Details::PropertyBase& ioBackendURL );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.cxx
index af6d67a97cf00c79ea6172652584bc4f71dd88a9..691f771c7b8580363b4b888848a33dea4dbf55d2 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.cxx
@@ -143,7 +143,7 @@ StatusCode HepMcReaderTool::read( HepMC::GenEvent* evt )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void HepMcReaderTool::setupFrontend( Property& /*prop*/ )
+void HepMcReaderTool::setupFrontend( Gaudi::Details::PropertyBase& /*prop*/ )
{
// defaults
std::string protocol = "ascii";
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.h
index 2b0393adf668b58d3e2a72c2f9c3d2e2583657fa..dc1a82e20fc603eaaf51ea198b1a5da4d59bbc09 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcReaderTool.h
@@ -73,7 +73,7 @@ class HepMcReaderTool : virtual public IIOHepMcTool,
/** @brief Method to configure the front-end to read out the
* @c HepMC::GenEvent.
*/
- void setupFrontend( Property& ioFrontendURL );
+ void setupFrontend( Gaudi::Details::PropertyBase& ioFrontendURL );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
index fd07363a58ca37329613a43e62f94884c074f8b1..3320a816c0939a114c98bdbc5909499ad2d33bdb 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/GaudiException.h"
// ROOT includes
@@ -176,7 +176,7 @@ StatusCode HepMcTupleWriterTool::write( const HepMC::GenEvent* evt )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void HepMcTupleWriterTool::setupBackend( Property& /*m_outputFileName*/ )
+void HepMcTupleWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*m_outputFileName*/ )
{
const bool createIf = false;
IProperty * tSvc = 0;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.h
index 2284a4ec2f79b82e15a5e61a597d7a0254552cb4..cb27cf1700ea88718091212064b811eef8adfc69 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcTupleWriterTool.h
@@ -77,7 +77,7 @@ class HepMcTupleWriterTool : virtual public IIOHepMcTool,
/** @brief Method to configure the back-end to write out the
* @c HepMC::GenEvent.
*/
- void setupBackend( Property& outputFileName );
+ void setupBackend( Gaudi::Details::PropertyBase& outputFileName );
/**
* @brief book the tuple
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.cxx
index 10e6ec02c9ada63095896b3378d3dbb4bc2e2674..685b361fac618637ea23b958c74a3e0769c1d078 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.cxx
@@ -151,7 +151,7 @@ StatusCode HepMcWriterTool::write( const HepMC::GenEvent* evt )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void HepMcWriterTool::setupBackend( Property& /*prop*/ )
+void HepMcWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*prop*/ )
{
// defaults
std::string protocol = "ascii";
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.h
index e10e73810702e7d7a44370e4944351ddd6786612..1845fb6c6be3ccd748ad19b6a54e82cefdb41bb8 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/HepMcWriterTool.h
@@ -73,7 +73,7 @@ class HepMcWriterTool : virtual public IIOHepMcTool,
/** @brief Method to configure the back-end to write out the
* @c HepMC::GenEvent.
*/
- void setupBackend( Property& ioBackendURL );
+ void setupBackend( Gaudi::Details::PropertyBase& ioBackendURL );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.cxx
index 4460e67d1d864b036b4f2a0249ae90e7457f08b4..2ce8ab169f4566307bb06d4e0a4e90bdb5e7420e 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.cxx
@@ -14,7 +14,7 @@
// FrameWork includes
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/GaudiException.h"
// ROOT includes
@@ -176,7 +176,7 @@ StatusCode McAodTupleWriterTool::write( const TruthParticleContainer* mc )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void McAodTupleWriterTool::setupBackend( Property& /*m_outputFileName*/ )
+void McAodTupleWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*m_outputFileName*/ )
{
const bool createIf = false;
IProperty * tSvc = 0;
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.h
index 3cc305c9df39095a16519868d8bacb261e36d095..bcbbe185f8f48f2a7f79b34fc47f946081ec9824 100644
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodTupleWriterTool.h
@@ -77,7 +77,7 @@ class McAodTupleWriterTool : virtual public IIOMcAodTool,
/** @brief Method to configure the back-end to write out the
* @c HepMC::GenEvent.
*/
- void setupBackend( Property& outputFileName );
+ void setupBackend( Gaudi::Details::PropertyBase& outputFileName );
/**
* @brief book the tuple
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.cxx
index 8fd5bbe7b65b5c7556ad689a961f3247ee1c0eac..fabe82b6e369923439486af96908948862687acc 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.cxx
@@ -172,7 +172,7 @@ StatusCode McAodWriterTool::write( const TruthParticleContainer* mcParts )
/// Non-const methods:
///////////////////////////////////////////////////////////////////
-void McAodWriterTool::setupBackend( Property& /*prop*/ )
+void McAodWriterTool::setupBackend( Gaudi::Details::PropertyBase& /*prop*/ )
{
// defaults
std::string protocol = "ascii";
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.h
index af9f9af46c0fd55a1bbddce1a2ca940af7d9eeaf..90ca9dae90a820a9f41f72a2a95e4b2b90f3bec2 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McAodWriterTool.h
@@ -73,7 +73,7 @@ class McAodWriterTool : virtual public IIOMcAodTool,
/** @brief Method to configure the back-end to write out the
* @c TruthParticleContainer.
*/
- void setupBackend( Property& ioBackendURL );
+ void setupBackend( Gaudi::Details::PropertyBase& ioBackendURL );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
index 73c8712743cbf7d83ec357c160e71a1a6e1bd107..95aaa55589373a51ab76ad771dd2bc570bf15507 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.cxx
@@ -13,7 +13,7 @@
#include <algorithm>
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// HepMC includes
#include "AtlasHepMC/GenEvent.h"
@@ -450,7 +450,7 @@ bool McVtxFilterTool::keepParticle( const VtxType::Flag vtxType,
// Non-const methods:
///////////////////////////////////////////////////////////////////
-void McVtxFilterTool::setupFilters( Property& /*decayPatterns*/ )
+void McVtxFilterTool::setupFilters( Gaudi::Details::PropertyBase& /*decayPatterns*/ )
{
m_filters.clear();
m_counter.clear();
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
index 62da553336783a43ff592e71f0ef4f5fe4840987..723d0523320839b8705c7693041521436f0ff889 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/McVtxFilterTool.h
@@ -51,7 +51,7 @@
// HepMC / CLHEP includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaBaseComps/AthAlgTool.h"
@@ -163,7 +163,7 @@ class McVtxFilterTool : virtual public IMcVtxFilterTool,
* We ensure the consistency between those 2 entities by defining a callback
* function (@setupFilters) to perform the job.
*/
- void setupFilters( Property& decayPatterns );
+ void setupFilters( Gaudi::Details::PropertyBase& decayPatterns );
///////////////////////////////////////////////////////////////////
// Protected data:
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
index 3d68a1119fd7620a7efeac2560e868108fb0bebd..d08ec274bd00a035a9bfa3924e727aca7541cee2 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/NoopFilterTool.cxx
@@ -12,7 +12,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TruthHelper/IsGenStable.h"
#include "TruthHelper/IsGenInteracting.h"
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.cxx b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.cxx
index 9d2a377c934ffbcda37dca57a9d0fa8cc63950f1..53a362fc8814d3abb9d62034f80ca4fbf81b0828 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.cxx
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.cxx
@@ -309,13 +309,13 @@ TruthIsolationTool::computeIso( const GenParticles_t& particles,
}
void
-TruthIsolationTool::setupTruthEtIsolationsPrefix( Property& /*truthEtIsolationsPrefix*/ )
+TruthIsolationTool::setupTruthEtIsolationsPrefix( Gaudi::Details::PropertyBase& /*truthEtIsolationsPrefix*/ )
{
// no-op for now
}
void
-TruthIsolationTool::setupMcEventsOutput( Property& /*mcEventsOutputName*/ )
+TruthIsolationTool::setupMcEventsOutput( Gaudi::Details::PropertyBase& /*mcEventsOutputName*/ )
{
// no-op for now
}
diff --git a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.h b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.h
index c8973ca0370791efacc6a61ba4713d3c355f2040..85286d003d897f1a3c857f2d63125dc07f568977 100755
--- a/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.h
+++ b/PhysicsAnalysis/TruthParticleID/McParticleTools/src/TruthIsolationTool.h
@@ -101,12 +101,12 @@ class TruthIsolationTool : virtual public ITruthIsolationTool,
/** @brief Callback method to ensure consistency of the TruthEtIsolations
* prefix key.
*/
- void setupTruthEtIsolationsPrefix( Property& truthEtIsolationsPrefix );
+ void setupTruthEtIsolationsPrefix( Gaudi::Details::PropertyBase& truthEtIsolationsPrefix );
/** @brief Callback method to ensure consistency of output McEventCollection
* key.
*/
- void setupMcEventsOutput( Property& mcEventsOutputName );
+ void setupMcEventsOutput( Gaudi::Details::PropertyBase& mcEventsOutputName );
///////////////////////////////////////////////////////////////////
// Private data:
diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index 662a326ad049ffe96cdc30f51b882b1fbf02103e..38b5904e54252b60343e01862b79e3c5d599b9cc 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -8,18 +8,11 @@
# packages get fixed up, or moved to the main list if these packages
# are not intended for analysis.
-- PhysicsAnalysis/Algorithms/EgammaAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/MetAnalysisAlgorithms
-- PhysicsAnalysis/Algorithms/MuonAnalysisAlgorithms
- PhysicsAnalysis/Algorithms/TauAnalysisAlgorithms
-- PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection
- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection
-- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools
-- PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection
- PhysicsAnalysis/ElectronPhotonID/PhotonVertexSelection
-- PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis
-- Reconstruction/Jet/JetCalibTools
- Reconstruction/Jet/JetMomentTools
- Reconstruction/Jet/JetRec
- Reconstruction/Jet/JetSubStructureMomentTools
@@ -56,7 +49,7 @@
- Event/xAOD/.*Cnv
+ Event/xAOD/.*
#+ External/AtlasPyFwdBwdPorts
-#+ ForwardDetectors/ZDC/ZdcAnalysis
++ ForwardDetectors/ZDC/ZdcAnalysis
#+ ForwardDetectors/ZDC/ZdcNtuple
+ Generators/TruthUtils
+ InnerDetector/InDetRecTools/InDetTrackSelectionTool
@@ -67,7 +60,7 @@
#+ PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples
+ PhysicsAnalysis/AnalysisCommon/CutBookkeeperUtils
#+ PhysicsAnalysis/AnalysisCommon/FakeBkgTools
-#+ PhysicsAnalysis/AnalysisCommon/FsrUtils
++ PhysicsAnalysis/AnalysisCommon/FsrUtils
+ PhysicsAnalysis/AnalysisCommon/HDF5Utils
+ PhysicsAnalysis/AnalysisCommon/IsolationSelection
+ PhysicsAnalysis/AnalysisCommon/PATCore
@@ -83,10 +76,10 @@
#+ PhysicsAnalysis/DerivationFramework/DerivationFrameworkAnalysisTests
- PhysicsAnalysis/ElectronPhotonID/ElectronPhotonTagTools
+ PhysicsAnalysis/ElectronPhotonID/.*
-#+ PhysicsAnalysis/HeavyIonPhys/HIEventUtils
-#+ PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
++ PhysicsAnalysis/HeavyIonPhys/HIEventUtils
++ PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
+ PhysicsAnalysis/Interfaces/.*
-#+ PhysicsAnalysis/JetMissingEtID/JetSelectorTools
++ PhysicsAnalysis/JetMissingEtID/JetSelectorTools
+ PhysicsAnalysis/JetTagging/FlavorTagDiscriminants
+ PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface
+ PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency
@@ -131,7 +124,7 @@
+ Trigger/TrigConfiguration/TrigConfHLTUtils
+ Trigger/TrigConfiguration/TrigConfInterfaces
+ Trigger/TrigConfiguration/TrigConfL1Data
-#+ Trigger/TrigConfiguration/TrigConfxAOD
++ Trigger/TrigConfiguration/TrigConfxAOD
+ Trigger/TrigEvent/TrigDecisionInterface
+ Trigger/TrigEvent/TrigNavStructure
+ Trigger/TrigEvent/TrigRoiConversion
diff --git a/Projects/AthGeneration/externals.txt b/Projects/AthGeneration/externals.txt
index f132bae02e50268d4db8afa1413149e0dc472d1d..283a2a39f42e9e42f72a57fce7581988e9e18a1f 100644
--- a/Projects/AthGeneration/externals.txt
+++ b/Projects/AthGeneration/externals.txt
@@ -9,4 +9,4 @@
AthGenerationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.000
+GaudiVersion = v34r0.003
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 242f63bc4786e4b81e54ecad45da140d717eba6e..6b7106844207668f7378bd0e9441d8258cb50a36 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -9,4 +9,4 @@
AthSimulationExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.000
+GaudiVersion = v34r0.003
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index eb81e7685bde6621a4c4f9c512a91330fbb87bd6..e1b1715350052a42e4aff75863dd9a7344f585b5 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -9,4 +9,4 @@
AthenaExternalsVersion = 2.0.72
# The version of atlas/Gaudi to use:
-GaudiVersion = v34r0.000
+GaudiVersion = v34r0.003
diff --git a/Projects/Athena/version.txt b/Projects/Athena/version.txt
index 3c1b7f674146fd6e433fa11215110b1411c85eef..c0b885324f71e1eac612d6a61c4f01370140ddca 100644
--- a/Projects/Athena/version.txt
+++ b/Projects/Athena/version.txt
@@ -1 +1 @@
-22.0.17
+22.0.18
diff --git a/Reconstruction/HeavyIonRec/HIGlobal/HIGlobal/HIEventShapeMaker.h b/Reconstruction/HeavyIonRec/HIGlobal/HIGlobal/HIEventShapeMaker.h
index 11e48900b44399371047d6ed1549af7ce843a543..6357c70b4d0a3798066a527e3a74f4ca7788fe5f 100644
--- a/Reconstruction/HeavyIonRec/HIGlobal/HIGlobal/HIEventShapeMaker.h
+++ b/Reconstruction/HeavyIonRec/HIGlobal/HIGlobal/HIEventShapeMaker.h
@@ -13,7 +13,7 @@
#include <string>
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "IHIEventShapeFiller.h"
#include "HIEventUtils/HIEventShapeSummaryTool.h"
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/share/HIegamma_jobOptions.py b/Reconstruction/HeavyIonRec/HIJetRec/share/HIegamma_jobOptions.py
index a9743a824d95b6eae67e0c1a33af9c5863007634..3702c9100149d593c6ca11067c23697673466f7d 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/share/HIegamma_jobOptions.py
+++ b/Reconstruction/HeavyIonRec/HIJetRec/share/HIegamma_jobOptions.py
@@ -9,7 +9,7 @@ import PerfMonComps.DomainsRegistry as pdr
pdr.flag_domain('calo')
from CaloRec.CaloRecFlags import jobproperties
-from AthenaCommon.Resilience import treatException
+from AthenaCommon.Resilience import treatException
from RecExConfig.RecFlags import rec
from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon.DetFlags import DetFlags
@@ -26,25 +26,24 @@ jobproperties.egammaRecFlags.Enabled=True
jobproperties.egammaRecFlags.cellContainerName='SubtractedCells'
jobproperties.egammaRecFlags.doEgammaCaloSeeded=True
jobproperties.egammaRecFlags.doEgammaForwardSeeded=False
-jobproperties.egammaRecFlags.doTopoCaloSeeded=False
-if DetFlags.haveRIO.Calo_on() :
+if DetFlags.haveRIO.Calo_on() :
#combined clusters
- if jobproperties.CaloRecFlags.doCaloCluster() :
+ if jobproperties.CaloRecFlags.doCaloCluster() :
try:
from CaloRec.CaloClusterSWCmbGetter import CaloClusterSWCmbGetter
CaloClusterSWCmbGetter()
- except Exception:
+ except Exception:
treatException("Problem with CaloSWCmbCluster. Switched off.")
- jobproperties.CaloRecFlags.doCaloCluster=False
+ jobproperties.CaloRecFlags.doCaloCluster=False
#EM clusters
if jobproperties.CaloRecFlags.doEmCluster() :
try: include( "LArClusterRec/LArCluster_jobOptions.py" )
- except Exception:
+ except Exception:
treatException("Problem with LArCluster. Switched off.")
- jobproperties.CaloRecFlags.doEmCluster=False
+ jobproperties.CaloRecFlags.doEmCluster=False
# write digits of EM clusters
- if jobproperties.CaloRecFlags.doEMDigits() and globalflags.DataSource()=='data' and globalflags.InputFormat() == 'bytestream':
+ if jobproperties.CaloRecFlags.doEMDigits() and globalflags.DataSource()=='data' and globalflags.InputFormat() == 'bytestream':
try: include ("LArClusterRec/LArDigits_fromEMCluster_jobptions.py")
except Exception:
treatException("Problem with LArDigitsFromEMClust. Switched off.")
@@ -59,7 +58,7 @@ if DetFlags.haveRIO.Calo_on() :
#EM Topoclusters
if jobproperties.CaloRecFlags.doCaloEMTopoCluster() :
- try: include( "CaloRec/EMTopoCluster_jobOptions.py" )
+ try: include( "CaloRec/EMTopoCluster_jobOptions.py" )
except Exception:
treatException("Problem with EMTopoCluster. Switched off")
jobproperties.CaloRecFlags.doCaloTopoCluster=False
diff --git a/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py b/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py
index 787087fc25861d5cf88c07d4c2a96ec67a530bd1..80884031969a6c851aa26f667663ce8e0335c101 100755
--- a/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py
+++ b/Reconstruction/HeavyIonRec/HIRecExample/share/heavyion_flagsESD.py
@@ -18,7 +18,7 @@ if not jobproperties.HIRecExampleFlags.ppMode :
# AO general
rec.Commissioning.set_Value_and_Lock(True)
rec.doRestrictedESD.set_Value_and_Lock(False)
-
+
# AO (standard JetRec turned off)
from JetRec.JetRecFlags import jetFlags
jetFlags.Enabled = False
@@ -43,7 +43,7 @@ if not jobproperties.HIRecExampleFlags.ppMode :
if ( globalflags.DataSource == "geant4" ):
from CaloRec.CaloCellFlags import jobproperties
jobproperties.CaloCellFlags.doLArCellEmMisCalib = False
-
+
if jobproperties.HIRecExampleFlags.doHIJetRec() and \
jobproperties.HIRecExampleFlags.doHIegamma() :
# 2015 fix: cell subtraction
@@ -57,28 +57,23 @@ if not jobproperties.HIRecExampleFlags.ppMode :
#turning off TopoClusters
#jobproperties.CaloRecFlags.doCaloTopoCluster = False
#jobproperties.CaloRecFlags.doCaloEMTopoCluster = False
-
+
rec.doEgamma=False
from egammaRec.egammaRecFlags import jobproperties
- # turning off TopoCaloSeeded
- jobproperties.egammaRecFlags.doTopoCaloSeeded = False
- # turning off not used softe
- #tmp 112014
- #jobproperties.egammaRecFlags.doEgammaTrackSeeded = False
rec.doTau = False
#from JetRec.JetRecFlags import jobproperties
#jobproperties.JetRecFlags.doBTagging = False
#from tauRec.tauRecFlags import jobproperties
- #jobproperties.tauRecFlags.doTauRec = False
+ #jobproperties.tauRecFlags.doTauRec = False
# AO (this turns off all MissingET and EFlow)
rec.doJetMissingETTag = False
recAlgs.doMissingET = False
recAlgs.doMissingETSig = False
recAlgs.doEFlow = False
- recAlgs.doEFlowJet = False
+ recAlgs.doEFlowJet = False
recAlgs.doMuGirl = False
@@ -97,5 +92,5 @@ if not jobproperties.HIRecExampleFlags.ppMode :
InDetNewTrackingCuts = ConfiguredNewTrackingCuts("HeavyIon")
InDetNewTrackingCuts._ConfiguredNewTrackingCuts__minPT = ptCutVal * Units.GeV
InDetNewTrackingCuts.printInfo()
-
+
############################################################################
diff --git a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt
index 720d7c30e5fd4569c133479aa6fae6b5b6da7276..d3c51ae70992c385f4a732c6dade2f067f2b2d82 100644
--- a/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt
+++ b/Reconstruction/Jet/JetAnalysisTools/JetTileCorrection/CMakeLists.txt
@@ -62,10 +62,13 @@ endif()
# Test(s) in the package:
if( XAOD_STANDALONE )
- atlas_add_test( ut_JetTileCorrectionTool_data
- SOURCES test/ut_JetTileCorrectionTool_data.cxx )
- atlas_add_test( ut_JetTileCorrectionTool_mc
- SOURCES test/ut_JetTileCorrectionTool_mc.cxx )
+ # FIX ME: temporarily disabled as part of the migration of AnalysisBase
+ # to master
+
+ # atlas_add_test( ut_JetTileCorrectionTool_data
+ # SOURCES test/ut_JetTileCorrectionTool_data.cxx )
+ # atlas_add_test( ut_JetTileCorrectionTool_mc
+ # SOURCES test/ut_JetTileCorrectionTool_mc.cxx )
endif()
# Install files from the package:
diff --git a/Reconstruction/Jet/JetCalibTools/CMakeLists.txt b/Reconstruction/Jet/JetCalibTools/CMakeLists.txt
index fdc6500235144d7e328130187750520ba3dd21af..d0ed595eed7dbab36490b4b6f43119da50173320 100644
--- a/Reconstruction/Jet/JetCalibTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetCalibTools/CMakeLists.txt
@@ -16,6 +16,7 @@ endif()
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
+ Control/AthToolSupport/AsgDataHandles
Control/AthToolSupport/AsgTools
Event/xAOD/xAODEventInfo
Event/xAOD/xAODEventShape
@@ -38,7 +39,7 @@ atlas_add_library( JetCalibToolsLib
PUBLIC_HEADERS JetCalibTools
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODEventInfo xAODEventShape
- xAODJet xAODTracking PATInterfaces JetInterface
+ xAODJet xAODTracking PATInterfaces JetInterface AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES xAODMuon PathResolver )
if( NOT XAOD_STANDALONE )
diff --git a/Reconstruction/Jet/JetCalibTools/JetCalibTools/JetCalibrationTool.h b/Reconstruction/Jet/JetCalibTools/JetCalibTools/JetCalibrationTool.h
index 660a96793227be506973dc7089efd9ffb581c7dd..6dcca2db70cb8ad2012c3dc95ee061b8c4acc2aa 100644
--- a/Reconstruction/Jet/JetCalibTools/JetCalibTools/JetCalibrationTool.h
+++ b/Reconstruction/Jet/JetCalibTools/JetCalibTools/JetCalibrationTool.h
@@ -21,7 +21,7 @@
#include "xAODEventInfo/EventInfo.h"
#include "xAODTracking/VertexContainer.h"
#include "xAODEventShape/EventShape.h"
-#include "StoreGate/ReadDecorHandleKey.h"
+#include "AsgDataHandles/ReadDecorHandleKey.h"
// JetCalibTools includes
#include "JetCalibTools/IJetCalibrationTool.h"
@@ -91,7 +91,9 @@ private:
// ReadHandleKey(s)
SG::ReadHandleKey<xAOD::EventInfo> m_rhkEvtInfo;
SG::ReadHandleKey<xAOD::EventShape> m_rhkRhoKey;
- SG::ReadHandleKey<xAOD::VertexContainer> m_rhkPV;
+ SG::ReadHandleKey<xAOD::VertexContainer> m_rhkPV {this,
+ "PrimaryVerticesContainerName",
+ "PrimaryVertices"};
SG::ReadDecorHandleKey<xAOD::EventInfo> m_rdhkEvtInfo {this
,"AveIntPerXKey"
,"EventInfo.AveIntPerXDecor"
diff --git a/Reconstruction/Jet/JetCalibTools/Root/JetCalibrationTool.cxx b/Reconstruction/Jet/JetCalibTools/Root/JetCalibrationTool.cxx
index 9c6c239c7c751ad9ed0c7aa7bd7a72badbb236c6..e20d0ea2d3acdf99e119341dd8706a3f2a6274b5 100644
--- a/Reconstruction/Jet/JetCalibTools/Root/JetCalibrationTool.cxx
+++ b/Reconstruction/Jet/JetCalibTools/Root/JetCalibrationTool.cxx
@@ -13,7 +13,7 @@
// JetCalibTools includes
#include "JetCalibTools/JetCalibrationTool.h"
#include "PathResolver/PathResolver.h"
-#include "StoreGate/ReadDecorHandle.h"
+#include "AsgDataHandles/ReadDecorHandle.h"
// Constructors
////////////////
@@ -22,7 +22,6 @@ JetCalibrationTool::JetCalibrationTool(const std::string& name)
: JetCalibrationToolBase::JetCalibrationToolBase( name ),
m_rhkEvtInfo("EventInfo"),
m_rhkRhoKey(""),
- m_rhkPV("PrimaryVertices"),
m_jetAlgo(""), m_config(""), m_calibSeq(""), m_calibAreaTag(""), m_originScale(""), m_devMode(false), m_isData(true), m_timeDependentCalib(false), m_rhoKey("auto"), m_dir(""), m_eInfoName(""), m_globalConfig(NULL),
m_doJetArea(true), m_doResidual(true), m_doOrigin(true), m_doGSC(true), m_gscDepth("auto"),
m_jetPileupCorr(NULL), m_etaJESCorr(NULL), m_globalSequentialCorr(NULL), m_insituDataCorr(NULL), m_jetMassCorr(NULL), m_jetSmearCorr(NULL)
@@ -39,7 +38,6 @@ JetCalibrationTool::JetCalibrationTool(const std::string& name)
declareProperty( "OriginScale", m_originScale = "JetOriginConstitScaleMomentum");
declareProperty( "CalibArea", m_calibAreaTag = "00-04-82");
declareProperty( "rhkRhoKey", m_rhkRhoKey);
- declareProperty( "PrimaryVerticesContainerName", m_rhkPV = "PrimaryVertices");
declareProperty( "GSCDepth", m_gscDepth);
}
diff --git a/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx b/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
index 956b10e6a7738fe1e3a8a4d9c71c1aa98fab18c0..9f5b17169784b648fd367c8e144c83e27ef249da 100644
--- a/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
+++ b/Reconstruction/Jet/JetCalibTools/util/JetCalibTools_Example.cxx
@@ -25,6 +25,7 @@
#include "xAODRootAccess/Init.h"
#include "xAODRootAccess/TEvent.h"
#include "xAODRootAccess/TStore.h"
+#include <AsgTools/MessageCheck.h>
#else
#include "POOLRootAccess/TEvent.h"
#include "StoreGate/StoreGateSvc.h"
@@ -61,6 +62,9 @@ void usage() {
int main(int argc, char* argv[]){
+ using namespace asg::msgUserCode;
+ ANA_CHECK_SET_TYPE (int);
+
//---------------------------------------------
// Declaring input variables with default values
//---------------------------------------------
@@ -125,9 +129,6 @@ int main(int argc, char* argv[]){
}
else if(isData=="TRUE") isCollision = true;
- // Set up the job for xAOD access:
- static const char* APP_NAME = "JetCalibTools_Example";
-
//--------------------
// Opening input file
//--------------------
@@ -135,12 +136,12 @@ int main(int argc, char* argv[]){
// Create a TEvent object.
#ifdef XAOD_STANDALONE
- RETURN_CHECK( APP_NAME, xAOD::Init() );
+ ANA_CHECK( xAOD::Init() );
xAOD::TEvent event( xAOD::TEvent::kClassAccess );
- RETURN_CHECK( APP_NAME, event.readFrom( ifile.get() ) );
+ ANA_CHECK( event.readFrom( ifile.get() ) );
#else // Athena "Store" is the same StoreGate used by the TEvent
POOL::TEvent event( POOL::TEvent::kClassAccess );
- CHECK_WITH_CONTEXT( event.readFrom( ifile.get() ), APP_NAME, 1 );
+ ANA_CHECK( event.readFrom( ifile.get() ) );
#endif
//----------------------------------
@@ -150,17 +151,13 @@ int main(int argc, char* argv[]){
// Call the constructor
JetCalibrationTool jetCalibrationTool(name_JetCalibTools.c_str());
- CHECK_WITH_CONTEXT( jetCalibrationTool.setProperty("JetCollection",jetColl.c_str()),
- APP_NAME, 1 );
+ ANA_CHECK( jetCalibrationTool.setProperty("JetCollection",jetColl.c_str()) );
- CHECK_WITH_CONTEXT( jetCalibrationTool.setProperty("CalibSequence",calibSeq.c_str()),
- APP_NAME, 1 );
+ ANA_CHECK( jetCalibrationTool.setProperty("CalibSequence",calibSeq.c_str()) );
- CHECK_WITH_CONTEXT( jetCalibrationTool.setProperty("ConfigFile",jetCalibConfig.c_str()),
- APP_NAME, 1 );
+ ANA_CHECK( jetCalibrationTool.setProperty("ConfigFile",jetCalibConfig.c_str()) );
- CHECK_WITH_CONTEXT( jetCalibrationTool.setProperty("IsData",isCollision),
- APP_NAME, 1 );
+ ANA_CHECK( jetCalibrationTool.setProperty("IsData",isCollision) );
// Initialize the tool
if(!(jetCalibrationTool.initialize().isSuccess())){
@@ -186,13 +183,13 @@ int main(int argc, char* argv[]){
// Retrieve jet container
const xAOD::JetContainer* jets = 0;
- CHECK_WITH_CONTEXT( event.retrieve( jets, jetColl + "Jets" ), APP_NAME, 1 );
+ ANA_CHECK( event.retrieve( jets, jetColl + "Jets" ) );
// Shallow copy
auto jets_shallowCopy = xAOD::shallowCopyContainer( *jets );
// Calibrate the shallow copy
- CHECK_WITH_CONTEXT( jetCalibrationTool.applyCalibration( *(jets_shallowCopy.first) ), APP_NAME, 1 );
+ ANA_CHECK( jetCalibrationTool.applyCalibration( *(jets_shallowCopy.first) ) );
delete jets_shallowCopy.first;
delete jets_shallowCopy.second;
diff --git a/Reconstruction/Jet/JetMomentTools/CMakeLists.txt b/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
index 8946417b2a89a3be4c38c9e9e874697a7e18091d..9efabbe1482098f87b34a1226feba6f4c9f96cb1 100644
--- a/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetMomentTools/CMakeLists.txt
@@ -78,7 +78,7 @@ atlas_add_library( JetMomentToolsLib
LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES}
AsgTools xAODCaloEvent xAODJet xAODMissingET xAODTracking xAODTruth JetEDM JetInterface TrackVertexAssociationToolLib
JetRecLib JetUtils PFlowUtilsLib JetCalibToolsLib
- xAODMetaData
+ xAODMetaData InDetTrackSelectionToolLib
PRIVATE_LINK_LIBRARIES CaloGeoHelpers xAODEventInfo xAODPFlow PathResolver )
if( NOT XAOD_STANDALONE )
diff --git a/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetEMScaleMomTool.h b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetEMScaleMomTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..dde9c54ea573019e36754f29b04b059e58f37dea
--- /dev/null
+++ b/Reconstruction/Jet/JetMomentTools/JetMomentTools/JetEMScaleMomTool.h
@@ -0,0 +1,45 @@
+// this file is -*- C++ -*-
+
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef JETMOMENTTOOLS_JETEMSCALEMOMTOOL_H
+#define JETMOMENTTOOLS_JETEMSCALEMOMTOOL_H
+
+#include "AsgTools/AsgTool.h"
+#include "JetInterface/IJetDecorator.h"
+#include "StoreGate/ReadDecorHandleKey.h"
+#include "StoreGate/ReadDecorHandle.h"
+#include "StoreGate/WriteDecorHandleKey.h"
+#include "StoreGate/WriteDecorHandle.h"
+#include "xAODJet/JetContainer.h"
+#include <vector>
+
+class JetEMScaleMomTool : public asg::AsgTool,
+ virtual public IJetDecorator {
+ ASG_TOOL_CLASS0(JetEMScaleMomTool)
+public:
+
+ JetEMScaleMomTool(const std::string & t);
+
+ virtual StatusCode initialize() override;
+ virtual StatusCode decorate(const xAOD::JetContainer& jets) const override;
+
+private:
+ Gaudi::Property<std::string> m_jetContainerName{this, "JetContainer", "", "SG key for the input jet container"};
+ // Should be false except if running on topoclusters except for the (legacy/cosmics?) case where
+ // jets were built from the CaloCalTopoClusters at EM scale
+ Gaudi::Property<bool> m_useUncalibConstits{this, "UseUncalibConstits", "", "Toggle for extracting the EMScale momentum from uncalibrated topoclusters"};
+
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_emscalePtKey{this, "EMScalePtName", "JetEMScaleMomentum_pt", "SG key for the EMScale pt attribute"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_emscaleEtaKey{this, "EMScaleEtaName", "JetEMScaleMomentum_eta", "SG key for the EMScale eta attribute"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_emscalePhiKey{this, "EMScalePhiName", "JetEMScaleMomentum_phi", "SG key for the EMScale phi attribute"};
+ SG::WriteDecorHandleKey<xAOD::JetContainer> m_emscaleMassKey{this, "EMScaleMassName", "JetEMScaleMomentum_m", "SG key for the EMScale mass attribute"};
+
+};
+
+
+#undef ASG_DERIVED_TOOL_CLASS
+#endif
+
diff --git a/Reconstruction/Jet/JetMomentTools/Root/JetEMScaleMomTool.cxx b/Reconstruction/Jet/JetMomentTools/Root/JetEMScaleMomTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..2ee1050c4ba7b9048610f23b1f87d94dee7fd557
--- /dev/null
+++ b/Reconstruction/Jet/JetMomentTools/Root/JetEMScaleMomTool.cxx
@@ -0,0 +1,100 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <functional>
+#include "JetMomentTools/JetEMScaleMomTool.h"
+
+#include "xAODJet/JetAccessorMap.h"
+
+struct p4Decorator {
+
+ SG::WriteDecorHandle<xAOD::JetContainer, float > ptHandle;
+ SG::WriteDecorHandle<xAOD::JetContainer, float > etaHandle;
+ SG::WriteDecorHandle<xAOD::JetContainer, float > phiHandle;
+ SG::WriteDecorHandle<xAOD::JetContainer, float > massHandle;
+
+ p4Decorator(const SG::WriteDecorHandleKey<xAOD::JetContainer>& ptKey,
+ const SG::WriteDecorHandleKey<xAOD::JetContainer>& etaKey,
+ const SG::WriteDecorHandleKey<xAOD::JetContainer>& phiKey,
+ const SG::WriteDecorHandleKey<xAOD::JetContainer>& massKey) :
+ ptHandle(ptKey),
+ etaHandle(etaKey),
+ phiHandle(phiKey),
+ massHandle(massKey)
+ {}
+
+ void decorateP4(const xAOD::Jet& jet, const xAOD::JetFourMom_t& p4) {
+ ptHandle(jet) = p4.Pt();
+ etaHandle(jet) = p4.Eta();
+ phiHandle(jet) = p4.Phi();
+ massHandle(jet) = p4.M();
+ }
+
+};
+
+xAOD::JetFourMom_t getEMScaleP4(xAOD::JetConstituentVector& constits) {
+
+ xAOD::JetFourMom_t emscaleSum;
+ // just sum 4-vectors:
+ for (auto iconstit=constits.begin(xAOD::UncalibratedJetConstituent); iconstit!=constits.end(xAOD::UncalibratedJetConstituent); ++iconstit) {
+ emscaleSum += **iconstit;
+ }
+ return emscaleSum;
+}
+
+//**********************************************************************
+
+JetEMScaleMomTool::JetEMScaleMomTool(const std::string& name)
+: AsgTool(name) { }
+
+//**********************************************************************
+
+StatusCode JetEMScaleMomTool::initialize() {
+ ATH_MSG_INFO("Initializing JetEMScaleMomTool " << name());
+
+ if(m_jetContainerName.empty()){
+ ATH_MSG_ERROR("JetEMScaleMomTool needs to have its input jet container configured!");
+ return StatusCode::FAILURE;
+ }
+
+ std::vector<std::reference_wrapper<SG::WriteDecorHandleKey<xAOD::JetContainer> > > keys = {m_emscalePtKey, m_emscaleEtaKey, m_emscalePhiKey, m_emscaleMassKey};
+ for(SG::WriteDecorHandleKey<xAOD::JetContainer>& key : keys) {
+ key = m_jetContainerName + "." + key.key();
+ ATH_CHECK( key.initialize() );
+ }
+
+ ATH_MSG_DEBUG("Operating on jets with " << (m_useUncalibConstits ? "" : "un") << "calibrated constituents." );
+
+ return StatusCode::SUCCESS;
+}
+
+//**********************************************************************
+
+StatusCode JetEMScaleMomTool::decorate(const xAOD::JetContainer& jets) const {
+ ATH_MSG_VERBOSE("Begin decorating jets.");
+ p4Decorator emscale_decor(m_emscalePtKey, m_emscaleEtaKey, m_emscalePhiKey, m_emscaleMassKey);
+
+ for(const xAOD::Jet* jet : jets) {
+ if(m_useUncalibConstits) {
+ // Need to loop and sum the constituents
+ xAOD::JetConstituentVector constits = jet->getConstituents();
+ if(! constits.isValid() ) {
+ ATH_MSG_WARNING("Jet constituent vector is invalid. Can't set EM scale momentum");
+ return StatusCode::FAILURE;
+ }
+ xAOD::JetFourMom_t em_p4 = getEMScaleP4(constits);
+ emscale_decor.decorateP4(*jet,em_p4);
+ } else {
+ // Simply add the constituent-level p4
+ xAOD::JetFourMom_t constit_p4 = jet->jetP4(xAOD::JetConstitScaleMomentum);
+ emscale_decor.decorateP4(*jet,constit_p4);
+ }
+
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+//**********************************************************************
diff --git a/Reconstruction/Jet/JetMomentTools/python/JetMomentToolsConfig.py b/Reconstruction/Jet/JetMomentTools/python/JetMomentToolsConfig.py
index f144effe6d325a2a96126e5efd59f42ff3361241..28628be137b85d0a44e8032d57b70437839719b3 100644
--- a/Reconstruction/Jet/JetMomentTools/python/JetMomentToolsConfig.py
+++ b/Reconstruction/Jet/JetMomentTools/python/JetMomentToolsConfig.py
@@ -15,6 +15,8 @@ from JetRecTools import JetRecToolsConfig
from JetRecTools.JetRecToolsConfig import trackcollectionmap
from AthenaConfiguration.ComponentFactory import CompFactory
+from xAODBase.xAODType import xAODType
+
def getCaloQualityTool():
caloqual = CompFactory.JetCaloQualityTool(
"caloqual",
@@ -23,9 +25,28 @@ def getCaloQualityTool():
)
return caloqual
-def getConstitFourMomTool(jetdef):
- # All this code needs to live in a JetMomentTools module
+def getEMScaleMomTool(jetdef):
+ # This may need updating e.g. for evolving trigger cluster container names
+ # We do the non-trivial summation over constituents unless the jets were
+ # built directly from EM-scale topoclusters, in which case we can just
+ # copy the constituent scale
+ useUncalibConstits = False
+ if jetdef.inputdef.basetype==xAODType.CaloCluster:
+ builtFromEMClusters = jetdef.inputdef.inputname in ["CaloCalTopoClusters","HLT_CaloTopoClustersFS"] and jetdef.inputdef.modifiers==["EM"]
+ useUncalibConstits = not builtFromEMClusters
+ elif jetdef.inputdef.basetype==xAODType.ParticleFlow:
+ useUncalibConstits = True
+ else:
+ raise ValueError("EM scale momentum not defined for input type {}".format(jetdef.inputdef.basetype))
+
+ emscalemom = CompFactory.JetEMScaleMomTool(
+ "emscalemom_{}".format(jetdef.basename),
+ UseUncalibConstits = useUncalibConstits
+ )
+ return emscalemom
+
+def getConstitFourMomTool(jetdef):
### Not ideal, but because CaloCluster.Scale is an internal class
### it makes the dict load really slow.
### So just copy the enum to a dict...
@@ -53,9 +74,14 @@ def getConstitFourMomTool(jetdef):
cfourmom = CompFactory.JetConstitFourMomTool("constitfourmom_{0}".format(jetdef.basename))
if "LCTopo" in jetdef.basename or "EMTopo" in jetdef.basename:
cfourmom.JetScaleNames = ["DetectorEtaPhi"]
- cfourmom.AltConstitColls = ["CaloCalTopoClusters"]
- cfourmom.AltConstitScales = [CaloClusterStates["CALIBRATED"]]
- cfourmom.AltJetScales = [""]
+ if "HLT_" in jetdef.inputdef.inputname:
+ cfourmom.AltConstitColls = [""]
+ cfourmom.AltConstitScales = [0]
+ cfourmom.AltJetScales = ["JetConstitScaleMomentum"]
+ else:
+ cfourmom.AltConstitColls = ["CaloCalTopoClusters"]
+ cfourmom.AltConstitScales = [CaloClusterStates["CALIBRATED"]]
+ cfourmom.AltJetScales = [""]
# Drop the LC-calibrated four-mom for EMTopo jets as we only wanted it as a possibility
# in MET CST calculations but never used it
elif "EMPFlow" in jetdef.basename:
diff --git a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
index bdc099dee4edcc37546ed51e81ac164db3d35105..e9286347a60537436517cceb7cabfe81abe004fc 100644
--- a/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
+++ b/Reconstruction/Jet/JetMomentTools/src/components/JetMomentTools_entries.cxx
@@ -16,6 +16,7 @@
#include "JetMomentTools/JetECPSFractionTool.h"
#include "JetMomentTools/JetConstitFourMomTool.h"
#include "JetMomentTools/JetQGTaggerVariableTool.h"
+#include "JetMomentTools/JetEMScaleMomTool.h"
#ifndef XAOD_ANALYSIS
#include "JetMomentTools/JetBadChanCorrTool.h"
@@ -39,6 +40,7 @@ DECLARE_COMPONENT( JetOriginCorrectionTool )
DECLARE_COMPONENT( JetECPSFractionTool )
DECLARE_COMPONENT( JetConstitFourMomTool )
DECLARE_COMPONENT( JetQGTaggerVariableTool )
+DECLARE_COMPONENT( JetEMScaleMomTool )
#ifndef XAOD_ANALYSIS
DECLARE_COMPONENT( JetBadChanCorrTool )
diff --git a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetHistoSelectSort.h b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetHistoSelectSort.h
index 241e8e9fc1c5f82948974dd299c724891c92dd37..4e14ebfcdd418243fa6e56f988f718cc6f9a3ffe 100644
--- a/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetHistoSelectSort.h
+++ b/Reconstruction/Jet/JetMonitoring/JetMonitoring/JetHistoSelectSort.h
@@ -33,8 +33,8 @@ private:
ToolHandle<IJetSelector> m_selectTool;
ToolHandle<IJetEventSelector> m_eventSelTool;
+ Gaudi::Property<bool> m_inverseJetSel {this,"InverseJetSel", false};
Gaudi::Property<int> m_selIndex {this,"SelectedIndex", -1};
-
ToolHandle<IJetHistoVarTool> m_sortVar;
diff --git a/Reconstruction/Jet/JetMonitoring/python/JetMonitoringConfig.py b/Reconstruction/Jet/JetMonitoring/python/JetMonitoringConfig.py
index 9577ba56a446f77652588b2d79fc19f77b2e6875..3fcd54da34b19dd3936dac6dad4488b1e4b8eb36 100644
--- a/Reconstruction/Jet/JetMonitoring/python/JetMonitoringConfig.py
+++ b/Reconstruction/Jet/JetMonitoring/python/JetMonitoringConfig.py
@@ -445,6 +445,7 @@ class SelectSpec(ToolSpec):
args['Selector'] = selSpec
+
self.name = selname
self.path = path
ConfigDict.__init__(self, **args)
@@ -460,7 +461,7 @@ class SelectSpec(ToolSpec):
from AthenaConfiguration.ComponentFactory import CompFactory
# conf = self.clone(self.name)
# name = conf.pop('name')
- selTool = CompFactory.JetHistoSelectSort(self.name, SelectedIndex=self.get('SelectedIndex',-1))
+ selTool = CompFactory.JetHistoSelectSort(self.name, SelectedIndex=self.get('SelectedIndex',-1), InverseJetSel=self.get('InverseJetSel',False))
if hasattr(self,'Selector'):
self.Selector.topLevelDir = self.topLevelDir
self.Selector.bottomLevelDir = self.bottomLevelDir
diff --git a/Reconstruction/Jet/JetMonitoring/src/JetHistoSelectSort.cxx b/Reconstruction/Jet/JetMonitoring/src/JetHistoSelectSort.cxx
index ec9a1a8d913dae26aec6b449a65df812cd48ed99..d5cbf62192c9fbcda8a5141cd433e72cc69eba98 100644
--- a/Reconstruction/Jet/JetMonitoring/src/JetHistoSelectSort.cxx
+++ b/Reconstruction/Jet/JetMonitoring/src/JetHistoSelectSort.cxx
@@ -10,7 +10,6 @@ JetHistoSelectSort::JetHistoSelectSort( const std::string& type, const std::str
, m_selectTool(this)
, m_eventSelTool(this)
, m_sortVar(this)
-
{
declareInterface<IJetHistoFiller>(this);
@@ -19,7 +18,6 @@ JetHistoSelectSort::JetHistoSelectSort( const std::string& type, const std::str
declareProperty("Selector",m_selectTool);
declareProperty("EventSelector",m_eventSelTool);
declareProperty("SortVariable",m_sortVar);
-
}
@@ -38,6 +36,9 @@ StatusCode JetHistoSelectSort::initialize() {
ATH_CHECK(m_selectTool.retrieve());
ATH_MSG_INFO( " Selecting with "<< m_selectTool->name() );
}
+ if(m_inverseJetSel){
+ ATH_MSG_DEBUG( " inverse Jet Selection will be applied" );
+ }
if(m_eventSelTool.isEnabled()){
ATH_CHECK(m_eventSelTool.retrieve());
@@ -73,8 +74,14 @@ StatusCode JetHistoSelectSort::processJetContainer(const JetMonitoringAlg& paren
// select if needed
if(m_selectTool.isEnabled()){
- auto sel = [this] (const xAOD::Jet * j) {return ! m_selectTool->keep(*j) ; } ;
- tmpList.remove_if( sel );
+ if (m_inverseJetSel) {
+ auto sel = [this] (const xAOD::Jet * j) {return m_selectTool->keep(*j) ; } ;
+ tmpList.remove_if( sel );
+ }
+ else {
+ auto sel = [this] (const xAOD::Jet * j) {return ! m_selectTool->keep(*j) ; } ;
+ tmpList.remove_if( sel );
+ }
}
if(m_eventSelTool.isEnabled()){
diff --git a/Reconstruction/Jet/JetRec/Root/JetClusterer.cxx b/Reconstruction/Jet/JetRec/Root/JetClusterer.cxx
index fba227864d178fa7510fbb259ad40682dfbd8ca8..2d0e2b1d462ba752fb02943342a762590175db2d 100644
--- a/Reconstruction/Jet/JetRec/Root/JetClusterer.cxx
+++ b/Reconstruction/Jet/JetRec/Root/JetClusterer.cxx
@@ -95,18 +95,18 @@ std::pair<std::unique_ptr<xAOD::JetContainer>, std::unique_ptr<SG::IAuxStore> >
// Build the cluster sequence
fastjet::JetDefinition jetdef(m_fjalg, m_jetrad);
fastjet::ClusterSequence *clSequence = nullptr;
- bool useArea = m_ghostarea <= 0 ;
+ bool useArea = m_ghostarea > 0 ;
if ( useArea ) {
- ATH_MSG_DEBUG("Creating input cluster sequence");
- clSequence = new fastjet::ClusterSequence(*pseudoJetVector, jetdef);
- } else {
// Prepare ghost area specifications -------------
ATH_MSG_DEBUG("Creating input area cluster sequence");
bool seedsok=true;
fastjet::AreaDefinition adef = buildAreaDefinition(seedsok);
if(seedsok) {clSequence = new fastjet::ClusterSequenceArea(*pseudoJetVector, jetdef, adef);}
else {return nullreturn;}
- }
+ } else {
+ ATH_MSG_DEBUG("Creating input cluster sequence");
+ clSequence = new fastjet::ClusterSequence(*pseudoJetVector, jetdef);
+ }
// -----------------------
diff --git a/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx b/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
index 9ede1a27d07fc21e702f9f59440dbeb2c3b5bb15..a15742dbb8e79f6a8efc67c30a7994e2365d8c99 100644
--- a/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
+++ b/Reconstruction/Jet/JetRec/src/JetRecAlg.cxx
@@ -54,6 +54,7 @@ StatusCode JetRecAlg::execute(const EventContext& ctx) const {
// Calculate moments, calibrate, sort, filter... -----------
for(const ToolHandle<IJetModifier>& t : m_modifiers){
+ ATH_MSG_DEBUG("Running " << t.name());
ATH_CHECK(t->modify(*jetContHandle));
}
diff --git a/Reconstruction/Jet/JetRec/src/PseudoJetMerger.cxx b/Reconstruction/Jet/JetRec/src/PseudoJetMerger.cxx
index 2f642be182016114a6faaf4c29c91a89d17a2c64..38e6c9da3fc4a81d214a0be44e0d25a6093b192f 100644
--- a/Reconstruction/Jet/JetRec/src/PseudoJetMerger.cxx
+++ b/Reconstruction/Jet/JetRec/src/PseudoJetMerger.cxx
@@ -14,7 +14,7 @@ StatusCode PseudoJetMerger::initialize() {
// Ugly check but no other good way of testing at initialisation
auto add_if_ghost = [](unsigned int sum_ghosts, const SG::ReadHandleKey<PseudoJetContainer>& pjckey) {
- return sum_ghosts + pjckey.key().find("Ghost")!=std::string::npos;
+ return sum_ghosts + (pjckey.key().find("Ghost")!=std::string::npos);
};
unsigned int N_ghosts = std::accumulate(m_inputPJC.begin(), m_inputPJC.end(), 0, add_if_ghost);
if(m_inputPJC.size()-N_ghosts!=1) {
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py b/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
index b492a539e4ea25ed2a4206e36facbbcb136a4781..cdfafdd6e15595914a9db2dc14f777a17753ed09 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetDefinition.py
@@ -78,6 +78,10 @@ class JetConstit(object):
self.__basetype = basetype
self.defineLabelAndContainerNames()
+ @property
+ def prefix(self):
+ return self.__prefix
+
@property
def modifiers(self):
return self.__modifiers
@@ -221,7 +225,7 @@ class JetDefinition(object):
self.ptmin = ptmin # The pt down to which FastJet is run
self.ptminfilter = ptminfilter # The pt above which xAOD::Jets are kept, may include calibration
- if ptmin<1000. or ptminfilter<1000.:
+ if ptmin<1000.*MeV or ptminfilter<1000.*MeV:
jetlog.warning("Very low filter threshold set: ptmin {0:.0f} MeV, ptminfilter {1:.0f} MeV. Are you sure?")
self.ghostdefs = ghostdefs # Objects to ghost-associate
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
index a660b656524281c606d7677be65f411c0159de9a..aabff57aeaab8760497ef7d29a2a7402a89e41f8 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
@@ -41,7 +41,7 @@ __all__ = ["JetRecCfg", "resolveDependencies", "JetInputCfg"]
# Receives the jet definition and input flags, mainly for input file
# peeking such that we don't attempt to reproduce stuff that's already
# in the input file
-def JetRecCfg(jetdef, configFlags, jetnameprefix="",jetnamesuffix="", jetnameoverride=None):
+def JetRecCfg(jetdef, configFlags, jetnameprefix="",jetnamesuffix="", evsprefix="", jetnameoverride=None):
# Ordinarily we want to have jet collection names be descriptive and derived from
# the configured reconstruction.
# Nevertheless, we allow an explicit specification when necessary
@@ -49,7 +49,7 @@ def JetRecCfg(jetdef, configFlags, jetnameprefix="",jetnamesuffix="", jetnameove
if jetnameoverride:
jetsfullname = jetnameoverride
else:
- jetsfullname = jetnameprefix+jetdef.basename+jetnamesuffix+"Jets"
+ jetsfullname = jetnameprefix+jetdef.basename+"Jets"+jetnamesuffix
jetlog.info("Setting up to find {0}".format(jetsfullname))
sequencename = jetsfullname
@@ -66,7 +66,7 @@ def JetRecCfg(jetdef, configFlags, jetnameprefix="",jetnamesuffix="", jetnameove
#
# To facilitate running in serial mode, we also prepare
# the constituent PseudoJetAlgorithm here (needed for rho)
- inputcomps = JetInputCfg(deps["inputs"], configFlags, sequenceName=jetsfullname)
+ inputcomps = JetInputCfg(deps["inputs"], configFlags, sequenceName=jetsfullname, evsprefix=evsprefix)
constitpjalg = inputcomps.getPrimary()
constitpjkey = constitpjalg.OutputContainer
@@ -82,7 +82,15 @@ def JetRecCfg(jetdef, configFlags, jetnameprefix="",jetnamesuffix="", jetnameove
# Generate a JetAlgorithm to run the jet finding and modifiers
# (via a JetRecTool instance).
- jetrecalg = getJetAlgorithm(jetsfullname, jetdef, pjs, deps["mods"])
+ mergepjalg = CompFactory.PseudoJetMerger(
+ "pjmergealg_"+jetsfullname,
+ InputPJContainers = pjs,
+ OutputContainer = "PseudoJetMerged_"+jetsfullname)
+
+ components.addEventAlgo(mergepjalg, sequencename)
+
+ jetrecalg = getJetRecAlg(jetsfullname, jetdef, "PseudoJetMerged_"+jetsfullname, deps["mods"])
+
components.addEventAlgo(jetrecalg, sequencename)
jetlog.info("Scheduled JetAlgorithm instance \"jetalg_{0}\"".format(jetsfullname))
@@ -227,16 +235,16 @@ def autoconfigureModifiers(modifiers, containerName):
# Function producing an EventShapeAlg to calculate
# medaian energy density for pileup correction
#
-def getEventShapeAlg( constit, constitpjkey, nameprefix="" ):
+def getEventShapeAlg( constit, constitpjkey, evsprefix="" ):
- rhokey = nameprefix+"Kt4"+constit.label+"EventShape"
- rhotoolname = "EventDensity_Kt4"+constit.label
+ rhokey = evsprefix+"Kt4"+constit.label+"EventShape"
+ rhotoolname = "EventDensity_{}Kt4{}".format(evsprefix,constit.label)
rhotool = CompFactory.EventDensityTool(rhotoolname)
rhotool.InputContainer = constitpjkey
rhotool.OutputContainer = rhokey
- eventshapealg = CompFactory.EventDensityAthAlg("{0}{1}Alg".format(nameprefix,rhotoolname))
+ eventshapealg = CompFactory.EventDensityAthAlg("{0}{1}Alg".format(evsprefix,rhotoolname))
eventshapealg.EventDensityTool = rhotool
return eventshapealg
@@ -246,13 +254,13 @@ def getEventShapeAlg( constit, constitpjkey, nameprefix="" ):
#
# This includes constituent modifications, track selection, copying of
# input truth particles and event density calculations
-def JetInputCfg(inputdeps, configFlags, sequenceName):
+def JetInputCfg(inputdeps, configFlags, sequenceName, evsprefix=""):
jetlog.info("Setting up jet inputs.")
components = ComponentAccumulator(sequenceName)
jetlog.info("Inspecting input file contents")
- filecontents = configFlags.Input.Collections
-
+ filecontents = [i for i in configFlags.Input.Collections]
+
constit = inputdeps[0]
# Truth and track particle inputs are handled later
if constit.basetype not in [xAODType.TruthParticle, xAODType.TrackParticle] and constit.inputname!=constit.rawname:
@@ -331,9 +339,9 @@ def JetInputCfg(inputdeps, configFlags, sequenceName):
elif dep == "EventDensity":
rhokey = "Kt4"+constit.label+"EventShape"
if rhokey in filecontents:
- jetlog.debug("Event density {0} for label {1} already in input file.".format(rhokey, constit.label))
+ jetlog.info("Event density {0} for label {1} already in input file.".format(rhokey, constit.label))
else:
- components.addEventAlgo( getEventShapeAlg(constit,constitpjkey) )
+ components.addEventAlgo( getEventShapeAlg(constit,constitpjkey,evsprefix) )
return components
@@ -437,7 +445,6 @@ def getJetAlgorithm(jetname, jetdef, pjs, modlist, monTool = None):
jetalg.Tools = [rectool]
return jetalg
-
########################################################################
# Function for generating a jet builder, i.e. converter from
@@ -475,7 +482,6 @@ def getJetRecTool(jetname, finder, pjs, mods):
JetFinder = finder,
JetModifiers = mods )
autoconfigureModifiers(jetrec.JetModifiers, jetname)
- #configureContainerName(jetrec.JetModifiers, jetname)
return jetrec
@@ -512,3 +518,32 @@ if __name__=="__main__":
import sys
sys.exit(0)
+
+########################################################################
+# Function that substitues JetRecTool + JetAlgorithm
+#
+def getJetRecAlg(jetname, jetdef, pjs, modlist):
+
+ jclust = CompFactory.JetClusterer("builder")
+ jclust.JetAlgorithm = jetdef.algorithm
+ jclust.JetRadius = jetdef.radius
+ jclust.PtMin = jetdef.ptmin
+ jclust.InputPseudoJets = pjs
+ jclust.GhostArea = 0.01 # In which cases do we not want areas?
+ jclust.JetInputType = jetdef.inputdef.basetype
+
+ from . import JetModConfig
+ mods = []
+ for moddef,modspec in modlist:
+ mod = JetModConfig.getModifier(jetdef,moddef,modspec)
+ mods.append(mod)
+
+ jra = CompFactory.JetRecAlg(
+ "jetrecalg_"+jetname,
+ Provider = jclust,
+ Modifiers = mods,
+ OutputContainer = jetname)
+
+ autoconfigureModifiers(jra.Modifiers, jetname)
+
+ return jra
diff --git a/Reconstruction/Jet/JetRecConfig/python/StandardJetMods.py b/Reconstruction/Jet/JetRecConfig/python/StandardJetMods.py
index 613647c79c93987f636a3e8d5d4e4d98ed96d1bc..3606cd15440f36f7ccc7a6c68edf9b652acabd90 100644
--- a/Reconstruction/Jet/JetRecConfig/python/StandardJetMods.py
+++ b/Reconstruction/Jet/JetRecConfig/python/StandardJetMods.py
@@ -56,24 +56,29 @@ jetmoddict.update(jetcalibmods)
from JetMomentTools import JetMomentToolsConfig
jetmomentmods = {
# Easy cases, no special config or prereqs, just default tool config
- "CaloEnergies": JetModifier("JetCaloEnergies", "jetens"),
"ClusterMoments": JetModifier("JetClusterMomentsTool", "clsmoms"),
- "LArHVCorr": JetModifier("JetLArHVTool", "larhvcorr"),
"ECPSFrac": JetModifier("JetECPSFractionTool", "ecpsfrac"),
"Width": JetModifier("JetWidthTool", "width"),
# More complex cases here
+ "CaloEnergies": JetModifier("JetCaloEnergies", "jetens",
+ prereqs=["mod:EMScaleMom"]),
"CaloQuality": JetModifier("JetCaloQualityTool", "caloqual",
helperfn=JetMomentToolsConfig.getCaloQualityTool),
"ConstitFourMom": JetModifier("JetConstitFourMomTool", "constitfourmom_basename",
helperfn=JetMomentToolsConfig.getConstitFourMomTool,
passJetDef=True),
+ "EMScaleMom": JetModifier("JetEMScaleMomTool", "emscalemom_basename",
+ helperfn=JetMomentToolsConfig.getEMScaleMomTool,
+ passJetDef=True),
"JVF": JetModifier("JetVertexFractionTool", "jvf",
helperfn=JetMomentToolsConfig.getJVFTool,
prereqs = ["mod:TrackMoments"] ),
"JVT": JetModifier("JetVertexTaggerTool", "jvt",
helperfn=JetMomentToolsConfig.getJVTTool,
prereqs = [ "mod:JVF" ]),
+ "LArHVCorr": JetModifier("JetLArHVTool", "larhvcorr",
+ prereqs = ["mod:EMScaleMom"]),
"OriginSetPV": JetModifier("JetOriginCorrectionTool", "origin_setpv",
prereqs = [ "mod:JVF" ]),
"TrackMoments": JetModifier("JetTrackMomentsTool", "trkmoms",
diff --git a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
index 1fe556f147b1dc5b1d3d8568b9f84aaff06e26d3..11f94e75234cb42d359ec614e7ff2b6599b574b8 100755
--- a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
+++ b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
@@ -159,10 +159,6 @@ if __name__=="__main__":
# Prevent the flags from being modified
ConfigFlags.lock()
- ########################################################################
- # Define flags steering the jet reco config
- jetdefs = DefineJetCollections(ConfigFlags)
-
# Get a ComponentAccumulator setting up the fundamental Athena job
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
cfg=MainServicesCfg(ConfigFlags)
@@ -180,6 +176,10 @@ if __name__=="__main__":
muWriter = CompFactory.LumiBlockMuWriter("LumiBlockMuWriter",LumiDataKey="LuminosityCondData")
cfg.addEventAlgo(muWriter,"AthAlgSeq")
+ ########################################################################
+ # Define flags steering the jet reco config
+ jetdefs = DefineJetCollections(ConfigFlags)
+
# Add the components from our jet reconstruction job
cfg.merge(JetRecTestCfg(jetdefs,ConfigFlags,args))
@@ -189,11 +189,11 @@ if __name__=="__main__":
originaljets = ["AntiKt4EMPFlowJets","AntiKt4EMTopoJets"]
for jetcoll in originaljets:
outputlist += ["xAOD::JetContainer#"+jetcoll,
- "xAOD::JetAuxContainer#"+jetcoll+"Aux."]
+ "xAOD::JetAuxContainer#"+jetcoll+"Aux.-PseudoJet"]
for jetdef in jetdefs:
key = "{0}{1}Jets".format("New",jetdef.basename)
outputlist += ["xAOD::JetContainer#"+key,
- "xAOD::JetAuxContainer#"+key+"Aux."]
+ "xAOD::JetAuxContainer#"+key+"Aux.-PseudoJet"]
# Now get the output stream components
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
diff --git a/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx b/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
index a1015e1b1fa5fc1c1f96fb0f6633384ee0b2b362..4eaf7bee42331a7b614c8991186f228c1b0237d2 100644
--- a/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
+++ b/Reconstruction/MissingETGoodness/src/JetGoodiesFiller.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MissingETGoodness/JetGoodiesFiller.h"
#include "MissingETGoodness/MissingETUtils.h"
diff --git a/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx b/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
index 69fe8b5d178b37b123f89daeeaecb8e515114c38..ac1fdcf45b23540cfe4c52ddfc2b0a294f4edc02 100644
--- a/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
+++ b/Reconstruction/MissingETGoodness/src/MuonGoodiesFiller.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "muonEvent/MuonContainer.h"
#include "MissingETGoodness/MuonGoodiesFiller.h"
#include "MissingETGoodness/MuonSpShowerHelper.h"
diff --git a/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx b/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
index 901a4b1ddcb3f0f383be7016d9fbd87887c81a9a..8465c8bac77533f94530d65dd8d1e52f6463c099 100755
--- a/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/BasicPlotsTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx b/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
index 6c18ac2cb4e234124004aa860bc3f13c27e2b2af..bf3fad81fe650c88db04fa08fd72a5565356aa46 100755
--- a/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ContainerComparatorTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx b/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
index f2e746e87045a2f94e65442c38c7d2ce945360d7..69a255d86c30fcfa447f54faddbf0d5866692019 100755
--- a/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/EtaRingsTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx b/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
index e5e67680f7af504161c6b4580fc9ac72f1e6d81b..1efeecece8fe3635f248e6eb7dbee3d6eefcfa51 100755
--- a/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/FakeMissingETTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
#include "TLorentzVector.h"
diff --git a/Reconstruction/MissingETPerformance/src/LinearityTool.cxx b/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
index f76fecc13b3b7c80f66325c0a9009e321e2bb585..448238c8f7dda4a444f573eac46538eff1a864b7 100755
--- a/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/LinearityTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
diff --git a/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx b/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
index 373a41192f288f520e04c20cd50a3a218469fc5c..c9a8276fdc9726467af46e98815062e5c90af655 100755
--- a/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MissingETCompositionTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx b/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
index 46e1c3676227bc7b910253af3746b09e05e650d6..d80947c5e5ded89e9420d26f5fc26714ea0d9f9c 100755
--- a/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MissingETScaleTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "egammaEvent/ElectronContainer.h"
diff --git a/Reconstruction/MissingETPerformance/src/MuonTool.cxx b/Reconstruction/MissingETPerformance/src/MuonTool.cxx
index 1865325d41fd848aa9548d6ecefe2f70cc82a9be..6746f89c0283e4f28713016b8d1809fb88d8d8f7 100644
--- a/Reconstruction/MissingETPerformance/src/MuonTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/MuonTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MissingETPerformance/MuonTool.h"
diff --git a/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx b/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
index 323bcd3e4ff3beb9eca0d3c11c709c0c8e0623be..46256b23156655922232540f32586564909a1e7f 100755
--- a/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ResolutionTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/PhysicalConstants.h"
#include "AthenaKernel/Units.h"
diff --git a/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx b/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
index cc8b08e035274f4bd9ee506a7f5e1337f40498f5..98f62cf6c9859dda31bf8e5ff5c46d829ca5e55a 100755
--- a/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ZMuMuTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//#include "CLHEP/Units/PhysicalConstants.h"
#include <vector>
diff --git a/Reconstruction/MissingETPerformance/src/ZeeTool.cxx b/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
index 3202e7f8aa35e38fb677011c27b92e745bea6c5a..e589b705b016476af5d900bd77643ba5b127b7a9 100755
--- a/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
+++ b/Reconstruction/MissingETPerformance/src/ZeeTool.cxx
@@ -4,7 +4,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/GaudiException.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "egammaEvent/ElectronContainer.h"
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CMakeLists.txt b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CMakeLists.txt
index 6ed5abefd201a5b0487f457341dafa5ea1717981..ddd7a9322115e9421e037c07c6cdc816082adc52 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CMakeLists.txt
@@ -34,16 +34,17 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( onnxruntime )
# Component(s) in the package:
atlas_add_component( CaloTrkMuIdTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaBaseComps StoreGateLib SGtests xAODTracking GaudiKernel ICaloTrkMuIdTools RecoToolInterfaces TrkExInterfaces CaloDetDescrLib CaloGeoHelpers CaloIdentifier CaloUtilsLib xAODCaloEvent ParticleCaloExtension TileDetDescr PathResolver TrkSurfaces TrkCaloExtension TrkEventPrimitives CaloTrackingGeometryLib )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${ONNXRUNTIME_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${ONNXRUNTIME_LIBRARIES} CaloEvent AthenaBaseComps StoreGateLib SGtests xAODTracking GaudiKernel ICaloTrkMuIdTools RecoToolInterfaces TrkExInterfaces CaloDetDescrLib CaloGeoHelpers CaloIdentifier CaloUtilsLib xAODCaloEvent ParticleCaloExtension TileDetDescr PathResolver TrkSurfaces TrkCaloExtension TrkEventPrimitives CaloTrackingGeometryLib )
# Install files from the package:
atlas_install_headers( CaloTrkMuIdTools )
atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/CaloMuonLikelihood.PDF.A0.root share/CaloMuonLikelihood.PDF.A1.root share/CaloMuonLikelihood.PDF.A2.root share/CaloMuonLikelihood.PDF.B0.root share/CaloMuonLikelihood.PDF.B1.root share/CaloMuonLikelihood.PDF.B2.root share/CaloMuonLikelihood.PDF.C0.root share/CaloMuonLikelihood.PDF.C1.root share/CaloMuonLikelihood.PDF.C2.root share/CaloTag.CutConfig.root )
-
+atlas_install_runtime( share/CaloMuonScoreModels/*.onnx )
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonScoreONNXRuntimeSvc.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonScoreONNXRuntimeSvc.h
new file mode 100644
index 0000000000000000000000000000000000000000..502ad1ef9c45786c6c5b9f6217d1460a7ca75ff9
--- /dev/null
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonScoreONNXRuntimeSvc.h
@@ -0,0 +1,56 @@
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#ifndef CALOTRKMUIDTOOLS_CALOMUONSCOREONNXRUNTIMESVC_H
+#define CALOTRKMUIDTOOLS_CALOMUONSCOREONNXRUNTIMESVC_H
+
+// Local include(s).
+#include "ICaloTrkMuIdTools/ICaloMuonScoreONNXRuntimeSvc.h"
+
+// Framework include(s).
+#include "AthenaBaseComps/AthService.h"
+
+// ONNX include(s).
+#include <core/session/onnxruntime_cxx_api.h>
+
+// System include(s).
+#include <memory>
+
+/// Service implementing @c ICaloMuonScoreONNXRuntimeSvc
+///
+/// This is a very simple implementation, just managing the lifetime
+/// of some ONNX Runtime C++ objects.
+///
+/// Ported from Control/AthenaExamples/AthExOnnxRuntime (Ricardo Woelker <ricardo.woelker@cern.ch>)
+///
+/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+///
+class CaloMuonScoreONNXRuntimeSvc : public extends< AthService, ICaloMuonScoreONNXRuntimeSvc > {
+
+ public:
+ /// Inherit the base class's constructor
+ using extends::extends;
+
+ /// @name Function(s) inherited from @c Service
+ /// @{
+
+ /// Function initialising the service
+ virtual StatusCode initialize() override;
+ /// Function finalising the service
+ virtual StatusCode finalize() override;
+
+ /// @}
+
+ /// @name Function(s) inherited from @c ICaloMuonScoreONNXRuntimeSvc
+ /// @{
+
+ /// Return the ONNX Runtime environment object
+ virtual Ort::Env& env() const override;
+
+ /// @}
+
+ private:
+ /// Global runtime environment for ONNX Runtime
+ std::unique_ptr< Ort::Env > m_env;
+
+}; // class CaloMuonScoreONNXRuntimeSvc
+
+#endif // CALOTRKMUIDTOOLS_CALOMUONSCOREONNXRUNTIMESVC_H
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonScoreTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonScoreTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..9b1f24eb93206820f938b763f9fde026d4fe7b59
--- /dev/null
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonScoreTool.h
@@ -0,0 +1,108 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CALOTRKMUIDTOOLS_CALOMUONSCORETOOL_H
+#define CALOTRKMUIDTOOLS_CALOMUONSCORETOOL_H
+
+#include "ICaloTrkMuIdTools/ICaloMuonScoreTool.h"
+#include "ICaloTrkMuIdTools/ICaloMuonScoreONNXRuntimeSvc.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+#include "RecoToolInterfaces/IParticleCaloCellAssociationTool.h"
+
+#include <vector>
+#include <memory>
+
+/** @class CaloMuonScoreTool
+
+ Fetch the calorimeter cells around a track particle and compute the muon
+ score.
+
+ The muon score is computed by doing inference on a 7-colour-channel
+ convolutional neural network. The inputs to the convolutional
+ neural network are the energy deposits in 30 eta
+ and 30 phi bins around the track particle. Seven colour channels are
+ considered, corresponding to the seven calorimeter layers
+ (CaloSamplingIDs) in the low-eta region (eta < 0.1).
+
+ The convolutional neural network was trained using tensorflow.
+ Inference on this model is done using ONNX (the tensorflow model
+ having been converted to ONNX format).
+
+ @author Ricardo Woelker <ricardo.woelker@cern.ch>
+*/
+
+class CaloMuonScoreTool : public AthAlgTool, virtual public ICaloMuonScoreTool {
+public:
+ CaloMuonScoreTool(const std::string& type, const std::string& name, const IInterface* parent);
+ virtual ~CaloMuonScoreTool()=default;
+
+ virtual StatusCode initialize();
+
+ // Compute the muon score given a track particle
+ float getMuonScore(const xAOD::TrackParticle* trk) const;
+
+ // run the ONNX inference on the input tensor
+ float runOnnxInference(std::vector<float> &tensor) const;
+
+ // fill vectors from the particle cell association
+ void fillInputVectors(std::unique_ptr<const Rec::ParticleCellAssociation>& association, std::vector<float> &eta, std::vector<float> &phi, std::vector<float> &energy, std::vector<int> &samplingId) const;
+
+ // Compute the median of a vector of floats (can be even or odd in length)
+ float getMedian(std::vector<float> v) const;
+
+ // Get a linearly spaced vector of size `nBins`, ranging from `min` to `max` (both values included)
+ std::vector<float> getLinearlySpacedBins(float min, float max, int nBins) const;
+
+ // Given a vector of bins, return the index of the matching bin
+ int getBin(std::vector<float> &bins, float &val) const;
+
+ // Given a calo sampling ID (as integer), return the corresponding "RGB"-like channel ID (0,1,2,3,4,5,6)
+ int channelForSamplingId(int &samplingId) const;
+
+ // for a given particle, consume vectors for eta, phi, energy, sampling ID, and return the input tensor to be used in ONNX
+ std::vector<float> getInputTensor(std::vector<float> &eta, std::vector<float> &phi, std::vector<float> &energy, std::vector<int> &sampling) const;
+
+private:
+ // Number of bins in eta
+ int m_etaBins = 30;
+
+ // Number of bins in phi
+ int m_phiBins = 30;
+
+ // window in terms of abs(eta) to consider around the median eta value
+ float m_etaCut = 0.25;
+
+ // window in terms of abs(phi) to consider around the median phi value
+ float m_phiCut = 0.25;
+
+ // Number of colour channels to consider in the convolutional neural network
+ int m_nChannels = 7;
+
+ // Eta cut (absolute value) up to which a track particle's muon score will be calculated
+ float m_caloMuonEtaCut = 0.1;
+
+ // name of the model to use
+ std::string m_modelFileName;
+
+ ToolHandle <Rec::IParticleCaloCellAssociationTool> m_caloCellAssociationTool{this, "ParticleCaloCellAssociationTool", ""};
+
+ /// Handle to @c IONNXRuntimeSvc
+ ServiceHandle< ICaloMuonScoreONNXRuntimeSvc > m_svc{ this, "CaloMuonScoreONNXRuntimeSvc",
+ "CaloMuonScoreONNXRuntimeSvc",
+ "Name of the service to use" };
+
+ std::unique_ptr< Ort::Session > m_session;
+
+ std::vector<const char*> m_input_node_names;
+
+ std::vector<const char*> m_output_node_names;
+
+ std::vector<int64_t> m_input_node_dims;
+
+};
+
+#endif
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h
index 60192db003db861549d50582a12e491f31f0dcd4..093f0c8cd9345cfdf8d6b306ea5e78621f6c2c26 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h
@@ -21,6 +21,7 @@
// --- STL ---
#include <map>
#include <vector>
+#include <mutex>
// --- Forward declarations ---
class CaloCellContainer;
@@ -123,8 +124,10 @@ class TrackDepositInCaloTool: public AthAlgTool, virtual public ITrackDepositInC
private:
/**
Invoked from initialize(), initializes the CaloLayerMap.
+ Marked const because it must be called from some const methods
+ Actually will change mutable member variables
*/
- StatusCode initializeDetectorInfo();
+ StatusCode initializeDetectorInfo() const;
/**
Extrapolate track to cylinder surface along straight line.
(x0, y0, z0) is the starting position, (phi0,theta0) is the direction of the momentum, r is the bound of
@@ -162,24 +165,25 @@ class TrackDepositInCaloTool: public AthAlgTool, virtual public ITrackDepositInC
// Services & Tools
ITHistSvc* m_histSvc{};
- ToolHandle<Trk::IExtrapolator> m_extrapolator{this, "ExtrapolatorHandle", ""};
- const CaloDetDescrManager* m_caloDDM{}; //!< Calorimeter detector description manager
+ ToolHandle<Trk::IExtrapolator> m_extrapolator{this, "ExtrapolatorHandle", ""};
+ const mutable CaloDetDescrManager* m_caloDDM{}; //!< Calorimeter detector description manager
const TileDetDescrManager* m_tileDDM{};
ToolHandle <Trk::IParticleCaloExtensionTool> m_caloExtensionTool{this, "ParticleCaloExtensionTool", "", "Tool to make the step-wise extrapolation"};
ToolHandle <Rec::IParticleCaloCellAssociationTool> m_caloCellAssociationTool{this, "ParticleCaloCellAssociationTool", ""};
// Members
- const CaloCellContainer* m_cellContainer; //!< CaloCell container.
-
- bool m_doExtr; //!< Flag to perform extrapolations using m_extrapolator
- bool m_doHist; //!< Flag to write histograms to track performance
- bool m_debugMode; //!< Flag to run in specialized debug mode
- bool m_showNeighbours;
- double m_solenoidRadius; //!< Radius of the solenoid surrounding the ID
- CaloLayerMap m_barrelLayerMap; //!< std::map of \f$r\f$ distance versus descriptor for cylindrical calo regions
- CaloLayerMap m_endCapLayerMap; //!< std::map of \f$z\f$ distance versus descriptor for disc-like calo regions
-
+ const CaloCellContainer* m_cellContainer; //!< CaloCell container.
+
+ bool m_doExtr; //!< Flag to perform extrapolations using m_extrapolator
+ bool m_doHist; //!< Flag to write histograms to track performance
+ bool m_debugMode; //!< Flag to run in specialized debug mode
+ bool m_showNeighbours;
+ double m_solenoidRadius; //!< Radius of the solenoid surrounding the ID
+ CaloLayerMap mutable m_barrelLayerMap; //!< std::map of \f$r\f$ distance versus descriptor for cylindrical calo regions
+ CaloLayerMap mutable m_endCapLayerMap; //!< std::map of \f$z\f$ distance versus descriptor for disc-like calo regions
+
+ std::once_flag mutable m_initializeOnce;
// Histograms
TH1F* m_hDepositLayer12{};
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/packagedoc.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/packagedoc.h
index dd0d49d97185b7b56486589fc0cac5dcd7edcd89..5f7fb90785f3287f627451f32b363621f1973752 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/packagedoc.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/doc/packagedoc.h
@@ -15,6 +15,16 @@
Builds likelihood ratio discriminant using distribution
of energy ratios for muons and pions.
+@section CaloTrkMuIdTools_CaloMuonScoreToolIntroduction CaloMuonScoreTool
+ AlgTool for Muon Identification in the Calorimeter.
+ Computes a muon score representing based on the particle's
+ calorimeter cell energy deposits using a convolutional
+ neural network.
+
+@section CaloTrkMuIdTools_CaloMuonScoreONNXRuntimeSvcIntroduction CaloMuonScoreONNXRuntimeSvc
+ Service that maintains a ONNX session which holds
+ a tensorflow model and can perform inference on it.
+
@section CaloTrkMuIdTools_CaloMuonTagIntroduction CaloMuonTag
Muon tagger using calorimeter deposits.
A track is tagged when deposits above the noise treshold are found in the
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/share/CaloMuonScoreModels/CaloMuonCNN_0.onnx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/share/CaloMuonScoreModels/CaloMuonCNN_0.onnx
new file mode 100644
index 0000000000000000000000000000000000000000..41c4ea7706a3d03a918527cc119326180876df9f
Binary files /dev/null and b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/share/CaloMuonScoreModels/CaloMuonCNN_0.onnx differ
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/share/CaloTrkMuIdTools_jobOptions.py b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/share/CaloTrkMuIdTools_jobOptions.py
index dbd17150fb4cf4887ea50ebf5257a2966672e53c..fddeef89261af8d562e6cf8766da818b79753521 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/share/CaloTrkMuIdTools_jobOptions.py
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/share/CaloTrkMuIdTools_jobOptions.py
@@ -60,3 +60,8 @@ from CaloTrkMuIdTools.CaloTrkMuIdToolsConf import CaloMuonLikelihoodTool as Conf
CaloMuonLikelihoodTool = ConfiguredCaloMuonLikelihoodTool(TrackEnergyInCaloTool = TrackEnergyInCaloTool)
ToolSvc += CaloMuonLikelihoodTool
+### Configure CaloMuonScoreTool ###
+from CaloTrkMuIdTools.CaloTrkMuIdToolsConf import CaloMuonScoreTool as ConfiguredCaloMuonScoreTool
+CaloMuonScoreTool = ConfiguredCaloMuonScoreTool(TrackEnergyInCaloTool = TrackEnergyInCaloTool)
+ToolSvc += CaloMuonScoreTool
+
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonScoreONNXRuntimeSvc.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonScoreONNXRuntimeSvc.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..b2845368fede7e51913d10a22e123b4d096db7f1
--- /dev/null
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonScoreONNXRuntimeSvc.cxx
@@ -0,0 +1,30 @@
+// Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+// Local include(s).
+#include "CaloTrkMuIdTools/CaloMuonScoreONNXRuntimeSvc.h"
+
+StatusCode CaloMuonScoreONNXRuntimeSvc::initialize() {
+
+ // Create the environment object.
+ m_env = std::make_unique< Ort::Env >( ORT_LOGGING_LEVEL_WARNING,
+ name().c_str() );
+ ATH_MSG_DEBUG( "Ort::Env object created" );
+
+ // Return gracefully.
+ return StatusCode::SUCCESS;
+}
+
+StatusCode CaloMuonScoreONNXRuntimeSvc::finalize() {
+
+ // Dekete the environment object.
+ m_env.reset();
+ ATH_MSG_DEBUG( "Ort::Env object deleted" );
+
+ // Return gracefully.
+ return StatusCode::SUCCESS;
+}
+
+Ort::Env& CaloMuonScoreONNXRuntimeSvc::env() const {
+
+ return *m_env;
+}
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonScoreTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonScoreTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..6d78553d0dc7cf4dd3211d33599443851e4da81c
--- /dev/null
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonScoreTool.cxx
@@ -0,0 +1,320 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "CaloTrkMuIdTools/CaloMuonScoreTool.h"
+
+#include "xAODCaloEvent/CaloCluster.h"
+#include "PathResolver/PathResolver.h"
+#include "CaloIdentifier/CaloCell_ID.h"
+#include "GaudiKernel/SystemOfUnits.h"
+
+#include "TrkParameters/TrackParameters.h"
+#include "ParticleCaloExtension/ParticleCellAssociationCollection.h"
+
+#include <string>
+#include <iostream>
+#include <cmath>
+#include <map>
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool constructor
+///////////////////////////////////////////////////////////////////////////////
+CaloMuonScoreTool::CaloMuonScoreTool(const std::string& type, const std::string& name, const IInterface* parent) :
+ AthAlgTool(type,name,parent),
+ m_modelFileName("CaloMuonCNN_0.onnx")
+{
+ declareInterface<ICaloMuonScoreTool>(this);
+ declareProperty("ModelFileName", m_modelFileName);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::initialize
+///////////////////////////////////////////////////////////////////////////////
+StatusCode CaloMuonScoreTool::initialize() {
+ ATH_MSG_INFO("Initializing " << name());
+
+ ATH_CHECK( m_svc.retrieve() );
+ ATH_CHECK(m_caloCellAssociationTool.retrieve());
+
+ if (m_modelFileName.empty()) {
+ ATH_MSG_FATAL("Could not find an ONNX model file!");
+ return StatusCode::FAILURE;
+ }
+
+ // initialise session
+ Ort::SessionOptions session_options;
+ Ort::AllocatorWithDefaultOptions allocator;
+ session_options.SetIntraOpNumThreads(1);
+ session_options.SetGraphOptimizationLevel( ORT_ENABLE_BASIC );
+
+ const std::string model_file_name = PathResolverFindDataFile( m_modelFileName );
+
+ m_session = std::make_unique< Ort::Session > (m_svc->env(), model_file_name.c_str(), session_options);
+
+ ATH_MSG_INFO("Created ONNX runtime session with model " << model_file_name);
+
+ size_t num_input_nodes = m_session->GetInputCount();
+ m_input_node_names.resize(num_input_nodes);
+
+ for( std::size_t i = 0; i < num_input_nodes; i++ ) {
+ // print input node names
+ char* input_name = m_session->GetInputName(i, allocator);
+ ATH_MSG_INFO("Input "<<i<<" : "<<" name= "<<input_name);
+ m_input_node_names[i] = input_name;
+ // print input node types
+ Ort::TypeInfo type_info = m_session->GetInputTypeInfo(i);
+ auto tensor_info = type_info.GetTensorTypeAndShapeInfo();
+ ONNXTensorElementDataType type = tensor_info.GetElementType();
+ ATH_MSG_INFO("Input "<<i<<" : "<<" type= "<<type);
+
+ // print input shapes/dims
+ m_input_node_dims = tensor_info.GetShape();
+ ATH_MSG_INFO("Input "<<i<<" : num_dims= "<<m_input_node_dims.size());
+ for (std::size_t j = 0; j < m_input_node_dims.size(); j++){
+ if(m_input_node_dims[j]<0)
+ m_input_node_dims[j] =1;
+ ATH_MSG_INFO("Input "<<i<<" : dim "<<j<<"= "<<m_input_node_dims[j]);
+ }
+ }
+
+
+ //output nodes
+ std::vector<int64_t> output_node_dims;
+ size_t num_output_nodes = m_session->GetOutputCount();
+ ATH_MSG_INFO("Have output nodes " << num_output_nodes);
+ m_output_node_names.resize(num_output_nodes);
+
+ for( std::size_t i = 0; i < num_output_nodes; i++ ) {
+ // print output node names
+ char* output_name = m_session->GetOutputName(i, allocator);
+ ATH_MSG_INFO("Output "<<i<<" : "<<" name= "<<output_name);
+ m_output_node_names[i] = output_name;
+
+ Ort::TypeInfo type_info = m_session->GetOutputTypeInfo(i);
+ auto tensor_info = type_info.GetTensorTypeAndShapeInfo();
+ ONNXTensorElementDataType type = tensor_info.GetElementType();
+ ATH_MSG_INFO("Output "<<i<<" : "<<" type= "<<type);
+
+ // print output shapes/dims
+ output_node_dims = tensor_info.GetShape();
+ ATH_MSG_INFO("Output "<<i<<" : num_dims= "<<output_node_dims.size());
+ for (std::size_t j = 0; j < output_node_dims.size(); j++){
+ if(output_node_dims[j]<0)
+ output_node_dims[j] =1;
+ ATH_MSG_INFO("Output"<<i<<" : dim "<<j<<"= "<<output_node_dims[j]);
+ }
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::fillInputVectors
+///////////////////////////////////////////////////////////////////////////////
+void CaloMuonScoreTool::fillInputVectors(std::unique_ptr<const Rec::ParticleCellAssociation>& association, std::vector<float> &eta, std::vector<float> &phi, std::vector<float> &energy, std::vector<int> &samplingId) const {
+ int cell_count = 0;
+
+ for( auto cluster: association->data()){
+ eta.push_back(cluster->eta());
+ phi.push_back(cluster->phi());
+ samplingId.push_back(cluster->caloDDE()->getSampling());
+ energy.push_back(cluster->energy());
+
+ cell_count++;
+ }
+
+ ATH_MSG_DEBUG("Iterated over " << cell_count << " calo cells");
+
+ return;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::getMuonScore
+///////////////////////////////////////////////////////////////////////////////
+float CaloMuonScoreTool::getMuonScore( const xAOD::TrackParticle* trk ) const {
+ ATH_MSG_DEBUG("in CaloMuonScoreTool::getMuonScore()");
+
+ double track_eta = trk->eta();
+
+ if(std::abs(track_eta) > m_caloMuonEtaCut){
+ ATH_MSG_INFO("Skip calculation of muon score for track particle due to failed eta cut of " << m_caloMuonEtaCut << " (eta="<<track_eta<<")");
+ return -1;
+ }
+
+ ATH_MSG_INFO("Calculating muon score for track particle with eta="<<track_eta);
+
+ // - associate calocells to trackparticle, cone size 0.2, use cache
+ std::unique_ptr<const Rec::ParticleCellAssociation> association = m_caloCellAssociationTool->particleCellAssociation(*trk,0.2,nullptr);
+ if(!association){
+ ATH_MSG_VERBOSE("Could not get particleCellAssociation");
+ return -1.;
+ }
+ ATH_MSG_VERBOSE(" particleCellAssociation done " << association.get() );
+
+ // create input vectors from calo cell association
+ std::vector<float> eta, phi, energy;
+ std::vector<int> sampling;
+ fillInputVectors(association, eta, phi, energy, sampling);
+
+ // create tensor from vectors
+ std::vector<float> inputTensor = getInputTensor(eta, phi, energy, sampling);
+
+ // run inference on input tensor
+ float outputScore = runOnnxInference(inputTensor);
+ ATH_MSG_INFO("Computed CaloMuonScore: " << outputScore);
+
+ return outputScore;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::runOnnxInference
+///////////////////////////////////////////////////////////////////////////////
+float CaloMuonScoreTool::runOnnxInference( std::vector<float> &tensor ) const {
+ // create input tensor object from data values
+ ATH_MSG_INFO("in CaloMuonScoreTool::runOnnxInference()");
+
+ auto memory_info = Ort::MemoryInfo::CreateCpu(OrtArenaAllocator, OrtMemTypeDefault);
+ int input_tensor_size(m_etaBins * m_phiBins * m_nChannels);
+ Ort::Value input_tensor = Ort::Value::CreateTensor<float>(memory_info, tensor.data(), input_tensor_size, m_input_node_dims.data(), m_input_node_dims.size());
+
+ // score model & input tensor, get back output tensor
+
+ auto output_tensors = m_session->Run(Ort::RunOptions{nullptr}, m_input_node_names.data(), &input_tensor, m_input_node_names.size(), m_output_node_names.data(), m_output_node_names.size());
+
+ // Get pointer to output tensor float values
+ float* output_score_array = output_tensors.front().GetTensorMutableData<float>();
+
+ // Binary classification - the score is just the first element of the output tensor
+ float output_score = output_score_array[0];
+
+ return output_score;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::channelForSamplingId
+///////////////////////////////////////////////////////////////////////////////
+int CaloMuonScoreTool::channelForSamplingId(int &samplingId) const{
+ //List of 7 central calo sampling IDs: [0,1,2,3,12,13,14]
+ switch(samplingId){
+ case 0: return 0;
+ case 1: return 1;
+ case 2: return 2;
+ case 3: return 3;
+ case 12: return 4;
+ case 13: return 5;
+ case 14: return 6;
+ default: return -1;
+ }
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::getMedian
+///////////////////////////////////////////////////////////////////////////////
+float CaloMuonScoreTool::getMedian(std::vector<float> vec) const{
+ std::nth_element( vec.begin(), vec.begin() + vec.size() / 2, vec.end() );
+
+ float val_right = *(vec.begin() + (vec.size() / 2));
+
+ if(vec.size() % 2 == 1){
+ return val_right;
+ }
+
+ float val_left = *(vec.begin() + (vec.size() / 2 - 1 ));
+
+ return (val_left + val_right) / 2;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::getBin
+///////////////////////////////////////////////////////////////////////////////
+int CaloMuonScoreTool::getBin(std::vector<float> &bins, float &val) const{
+ // return -1 if value is outside the range
+ if(val < bins.front()){
+ return -1;
+ }
+
+ if(val > bins.back()){
+ return -1;
+ }
+
+ for(long unsigned int i = 0; i < bins.size(); i++) {
+ if(val < bins[i]) return i;
+ }
+
+ return -1;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::getLinearlySpacedBins
+///////////////////////////////////////////////////////////////////////////////
+std::vector<float> CaloMuonScoreTool::getLinearlySpacedBins(float min, float max, int nBins) const{
+ double h = (max - min) / static_cast<float>(nBins-1);
+ std::vector<float> xs(nBins);
+ std::vector<float>::iterator x;
+ double val;
+ for (x = xs.begin(), val = min; x != xs.end(); ++x, val += h) {
+ *x = val;
+ }
+ return xs;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// CaloMuonScoreTool::getInputTensor
+///////////////////////////////////////////////////////////////////////////////
+std::vector<float> CaloMuonScoreTool::getInputTensor(std::vector<float> &eta, std::vector<float> &phi, std::vector<float> &energy, std::vector<int> &sampling) const {
+ int n_cells = eta.size();
+
+ float median_eta = getMedian(eta);
+ float median_phi = getMedian(phi);
+
+ // initialise output matrix of zeros
+ std::vector<float> tensor(m_etaBins * m_phiBins * m_nChannels, 0.);
+
+ std::vector<float> eta_bins = getLinearlySpacedBins(-m_etaCut, m_etaCut, m_etaBins);
+ std::vector<float> phi_bins = getLinearlySpacedBins(-m_phiCut, m_phiCut, m_phiBins);
+
+ int skipped_cells = 0;
+
+ for(int i = 0; i < n_cells; i++ ){
+ // take eta and phi values, and shift them by their repsective median
+ float shifted_eta = eta[i] - median_eta;
+ float shifted_phi = phi[i] - median_phi;
+
+ int eta_bin = getBin(eta_bins, shifted_eta);
+ int phi_bin = getBin(phi_bins, shifted_phi);
+
+ // the cell lies outside the acceptable range
+ if(eta_bin == -1 || phi_bin == -1){
+ skipped_cells++;
+ ATH_MSG_DEBUG("Skipping cell because eta or phi bin lies outside of range. Eta bin: " << eta_bin << " phi bin: " << phi_bin);
+ continue;
+ }
+
+ int channel = channelForSamplingId(sampling[i]);
+
+ // this really should not happen, but let's skip this cell if it does
+ if(channel == -1){
+ skipped_cells++;
+ ATH_MSG_DEBUG("Skipping cell because sampling ID does not correspond to low-eta layers. Sampling ID: " << sampling[i]);
+ continue;
+ }
+
+ // 3D array flattening in row-major style: https://en.wikipedia.org/wiki/Row-_and_column-major_order#Explanation_and_example
+ int tensor_idx = eta_bin * m_phiBins * m_nChannels + phi_bin * m_nChannels + channel;
+
+ tensor[tensor_idx] += energy[i];
+ }
+
+ ATH_MSG_DEBUG("Skipped " << skipped_cells << " out of " << n_cells << " cells");
+
+ return tensor;
+}
+
+
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
index ae1dcac120dc916a04d4a8bb1c2fac257b5e3273..cad4b2bb14eb7bfa93c8f3f2d51d0b665bc2e92b 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
@@ -61,15 +61,6 @@ StatusCode TrackDepositInCaloTool::initialize() {
return StatusCode::FAILURE;
}
- if ( detStore()->retrieve(m_caloDDM).isFailure() ) {
- ATH_MSG_WARNING("Unable to retrieve CaloDetDescrManager from DetectorStore. Calling the CaloDetDescrManager::instance() method");
- m_caloDDM = CaloDetDescrManager::instance();
- }
- if ( !m_caloDDM ) {
- ATH_MSG_ERROR("Unfortunately that did not succeed. Sending StatusCode::FAILURE");
- return StatusCode::FAILURE;
- }
-
if ( detStore()->retrieve(m_tileDDM).isFailure() ) {
ATH_MSG_ERROR("Could not retrieve TileDetDescrManager from DetectorStore!");
return StatusCode::FAILURE;
@@ -91,11 +82,6 @@ StatusCode TrackDepositInCaloTool::initialize() {
}
}
- if ( initializeDetectorInfo().isFailure() ) {
- ATH_MSG_ERROR("Could not initialize detector info.");
- return StatusCode::FAILURE;
- }
-
ATH_CHECK(m_extrapolator.retrieve());
ATH_CHECK(m_caloExtensionTool.retrieve() );
ATH_CHECK(m_caloCellAssociationTool.retrieve());
@@ -357,6 +343,12 @@ std::vector<const CaloCell*>* TrackDepositInCaloTool::getCaloCellsForTile(const
// --- Fill vecHash ---
CaloCell_ID::CaloSample sample = descr->getSampling();
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ if ( !m_caloDDM ) {
+ StatusCode sc = detStore()->retrieve( m_caloDDM );
+ if ( !sc.isSuccess() ) return result;
+ }
+
std::vector<IdentifierHash> vecHash;
m_caloDDM->cellsInZone(etaMin, etaMax, phiMin, phiMax, sample, vecHash);
std::vector<IdentifierHash>::iterator it = vecHash.begin();
@@ -859,7 +851,9 @@ double TrackDepositInCaloTool::calcEnergy(const Trk::TrackParameters* par, const
///////////////////////////////////////////////////////////////////////////////
// initializeDetectorInfo()
///////////////////////////////////////////////////////////////////////////////
-StatusCode TrackDepositInCaloTool::initializeDetectorInfo() {
+StatusCode TrackDepositInCaloTool::initializeDetectorInfo() const {
+
+ if ( !m_caloDDM ) ATH_CHECK( detStore()->retrieve( m_caloDDM ) );
ATH_MSG_DEBUG("In CaloTrkMuIdDetStore::initialize()");
// Initialize LAr
@@ -985,6 +979,11 @@ Amg::Vector3D* TrackDepositInCaloTool::extrapolateZ(const Amg::Vector3D& initial
///////////////////////////////////////////////////////////////////////////////
StatusCode TrackDepositInCaloTool::getTraversedLayers(const Trk::TrackParameters* par, std::map<double, const CaloDetDescriptor*>& caloInfo , std::vector<Amg::Vector3D>& extrapolations) const {
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ StatusCode sc = StatusCode::SUCCESS;
+ std::call_once( m_initializeOnce, [this, &sc](){ sc = initializeDetectorInfo(); } );
+ if ( !sc.isSuccess() ) return sc;
+
const Trk::TrackParameters* parAtSolenoid = 0;
// --- To be replaced by a check, possibly extrapolating to solenoid surface if needed ---
bool parIsAtSolenoid = true;
@@ -1163,6 +1162,12 @@ that is closest to the track.
///////////////////////////////////////////////////////////////////////////////
const CaloCell* TrackDepositInCaloTool::getClosestCellLAr(const Trk::TrackParameters* par, const CaloDetDescriptor* descr, const CaloCellContainer* caloCellCont) const {
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ if ( !m_caloDDM ) {
+ StatusCode sc = detStore()->retrieve( m_caloDDM );
+ if ( !sc.isSuccess() ) return 0;
+ }
+
CaloCell_ID::CaloSample sample = descr->getSampling();
// ATH_MSG_INFO("Sampling = " << sample);
const CaloDetDescrElement* cellDescr = m_caloDDM->get_element(sample, par->position().eta(), par->position().phi());
@@ -1196,6 +1201,12 @@ const CaloCell* TrackDepositInCaloTool::getClosestCellTile(const Trk::TrackParam
// --- Fill vecHash ---
CaloCell_ID::CaloSample sample = descr->getSampling();
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ if ( !m_caloDDM ) {
+ StatusCode sc = detStore()->retrieve( m_caloDDM );
+ if ( !sc.isSuccess() ) return result;
+ }
+
std::vector<IdentifierHash> vecHash;
m_caloDDM->cellsInZone(etaMin, etaMax, phiMin, phiMax, sample, vecHash);
std::vector<IdentifierHash>::iterator it = vecHash.begin();
@@ -1398,6 +1409,12 @@ std::vector<DepositInCalo> TrackDepositInCaloTool::deposits( const Trk::Track* t
void TrackDepositInCaloTool::showNeighbours(const CaloCell* cell) const {
+ // Cannot do this in initialize: see ATLASRECTS-5012
+ if ( !m_caloDDM ) {
+ StatusCode sc = detStore()->retrieve( m_caloDDM );
+ if ( !sc.isSuccess() ) return;
+ }
+
// --- Get helper class for finding neighbours ---
const CaloCell_ID* cellId = m_caloDDM->getCaloCell_ID();
if (cellId) {
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
index 6d46c86e9ddcd8349ea4f45d2b2ef71252f5d79e..644c6809704001e352b356efe885f5f29e4581c7 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/components/CaloTrkMuIdTools_entries.cxx
@@ -2,9 +2,13 @@
#include "CaloTrkMuIdTools/TrackEnergyInCaloTool.h"
#include "CaloTrkMuIdTools/TrackDepositInCaloTool.h"
#include "CaloTrkMuIdTools/CaloMuonLikelihoodTool.h"
+#include "CaloTrkMuIdTools/CaloMuonScoreTool.h"
+#include "CaloTrkMuIdTools/CaloMuonScoreONNXRuntimeSvc.h"
DECLARE_COMPONENT( CaloMuonTag )
DECLARE_COMPONENT( TrackEnergyInCaloTool )
DECLARE_COMPONENT( TrackDepositInCaloTool )
DECLARE_COMPONENT( CaloMuonLikelihoodTool )
+DECLARE_COMPONENT( CaloMuonScoreTool )
+DECLARE_COMPONENT( CaloMuonScoreONNXRuntimeSvc )
diff --git a/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/CMakeLists.txt b/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/CMakeLists.txt
index c4f7e80e7b6e5bf56c39f6163a9ea47572af4f99..7371ecf0819b68cbe0c2cf603041010c0b3e6f35 100644
--- a/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/CMakeLists.txt
+++ b/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/CMakeLists.txt
@@ -5,6 +5,8 @@
# Declare the package name:
atlas_subdir( ICaloTrkMuIdTools )
+find_package( onnxruntime )
+
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloDetDescr
@@ -22,5 +24,5 @@ atlas_depends_on_subdirs( PUBLIC
# Component(s) in the package:
atlas_add_library( ICaloTrkMuIdTools
PUBLIC_HEADERS ICaloTrkMuIdTools
- LINK_LIBRARIES CaloEvent CaloIdentifier xAODCaloEvent xAODTracking GaudiKernel muonEvent TrkSurfaces TrkEventPrimitives TrkParameters TrkTrack CaloDetDescrLib )
-
+ INCLUDE_DIRS ${ONNXRUNTIME_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ONNXRUNTIME_LIBRARIES} CaloEvent CaloIdentifier xAODCaloEvent xAODTracking GaudiKernel muonEvent TrkSurfaces TrkEventPrimitives TrkParameters TrkTrack CaloDetDescrLib )
diff --git a/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/ICaloTrkMuIdTools/ICaloMuonScoreONNXRuntimeSvc.h b/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/ICaloTrkMuIdTools/ICaloMuonScoreONNXRuntimeSvc.h
new file mode 100644
index 0000000000000000000000000000000000000000..5390caf4b42e8945e04fa089394b55416fcc22b7
--- /dev/null
+++ b/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/ICaloTrkMuIdTools/ICaloMuonScoreONNXRuntimeSvc.h
@@ -0,0 +1,36 @@
+#ifndef CALOTRKMUIDTOOLS_ICALOMUONSCOREONNXRUNTIMESVC_H
+#define CALOTRKMUIDTOOLS_ICALOMUONSCOREONNXRUNTIMESVC_H
+
+// Gaudi include(s).
+#include "GaudiKernel/IService.h"
+
+// ONNX include(s).
+#include <core/session/onnxruntime_cxx_api.h>
+
+/// Namespace holding all of the ONNX Runtime example code
+
+/// Service used for managing global objects used by ONNX Runtime
+///
+/// In order to allow multiple clients to use ONNX Runtime at the same
+/// time, this service is used to manage the objects that must only
+/// be created once in the Athena process.
+///
+/// Ported from Control/AthenaExamples/AthExOnnxRuntime (Ricardo Woelker <ricardo.woelker@cern.ch>)
+///
+/// @author Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
+///
+class ICaloMuonScoreONNXRuntimeSvc : public virtual IService {
+
+ public:
+ /// Virtual destructor, to make vtable happy
+ virtual ~ICaloMuonScoreONNXRuntimeSvc() = default;
+
+ /// Declare an ID for this interface
+ DeclareInterfaceID( ICaloMuonScoreONNXRuntimeSvc, 1, 0 );
+
+ /// Return the ONNX Runtime environment object
+ virtual Ort::Env& env() const = 0;
+
+}; // class ICaloMuonScoreONNXRuntimeSvc
+
+#endif // CALOTRKMUIDTOOLS_ICALOMUONSCOREONNXRUNTIMESVC_H
diff --git a/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/ICaloTrkMuIdTools/ICaloMuonScoreTool.h b/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/ICaloTrkMuIdTools/ICaloMuonScoreTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..6eabefed1fe3e21904765736f07321cf7667ddca
--- /dev/null
+++ b/Reconstruction/MuonIdentification/ICaloTrkMuIdTools/ICaloTrkMuIdTools/ICaloMuonScoreTool.h
@@ -0,0 +1,25 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef CALOTRKMUIDTOOLS_ICALOMUONSCORETOOL_H
+#define CALOTRKMUIDTOOLS_ICALOMUONSCORETOOL_H
+
+#include "GaudiKernel/IAlgTool.h"
+#include "xAODTracking/TrackParticle.h"
+
+static const InterfaceID IID_ICaloMuonScoreTool("ICaloMuonScoreTool",1,0);
+
+class ICaloMuonScoreTool : virtual public IAlgTool
+{
+ public:
+
+ virtual ~ICaloMuonScoreTool(){}
+
+ static const InterfaceID& interfaceID(){return IID_ICaloMuonScoreTool;}
+
+ virtual float getMuonScore(const xAOD::TrackParticle* trk) const = 0;
+
+};
+
+#endif
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
index 6b05614defd116d398e2e214293a2d51328cc728..bf23fea72aea1662a1191fa558f8cdc6d7c0e772 100755
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
+++ b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/CombinedMuonTrackBuilder.cxx
@@ -2212,46 +2212,45 @@ CombinedMuonTrackBuilder::standaloneRefit(const Trk::Track& combinedTrack, float
return nullptr;
}
- if (refittedTrack) {
- if (!refittedTrack->fitQuality()) {
- delete refittedTrack;
- delete vertex;
- return nullptr;
+ //eventually this whole tool will use unique_ptrs
+ //in the meantime, this allows the MuonErrorOptimisationTool and MuonRefitTool to use them
+ std::unique_ptr<Trk::Track> refittedTrackUnique(refittedTrack);
+ if (refittedTrackUnique) {
+ if (!refittedTrackUnique->fitQuality()) {
+ delete vertex;
+ return nullptr;
}
- if (!m_trackQuery->isCaloAssociated(*refittedTrack)) {
+ if (!m_trackQuery->isCaloAssociated(*refittedTrackUnique)) {
// fail as calo incorrectly described
m_messageHelper->printWarning(28);
- delete refittedTrack;
delete vertex;
return nullptr;
}
- countAEOTs(refittedTrack, " standaloneRefit final refittedTrack ");
+ countAEOTs(refittedTrackUnique.get(), " standaloneRefit final refittedTrack ");
// fit with optimized spectrometer errors
// this should also be inside the "if(refittedTrack) statement
- if (!m_muonErrorOptimizer.empty() && !refittedTrack->info().trackProperties(Trk::TrackInfo::StraightTrack)
- && countAEOTs(refittedTrack, " before optimize ") == 0)
+ if (!m_muonErrorOptimizer.empty() && !refittedTrackUnique->info().trackProperties(Trk::TrackInfo::StraightTrack)
+ && countAEOTs(refittedTrackUnique.get(), " before optimize ") == 0)
{
ATH_MSG_VERBOSE(" perform spectrometer error optimization after cleaning ");
- Trk::Track* optimizedTrack = m_muonErrorOptimizer->optimiseErrors(*refittedTrack);
+ std::unique_ptr<Trk::Track> optimizedTrack = m_muonErrorOptimizer->optimiseErrors(refittedTrackUnique.get());
if (optimizedTrack) {
- if (checkTrack("standaloneRefitOpt", optimizedTrack, refittedTrack)) {
- delete refittedTrack;
- refittedTrack = optimizedTrack;
- countAEOTs(refittedTrack, " standaloneRefit alignment errors Track ");
- } else {
- delete optimizedTrack;
- }
+ if (checkTrack("standaloneRefitOpt", optimizedTrack.get(), refittedTrackUnique.get())) {
+ refittedTrackUnique.swap(optimizedTrack);
+ countAEOTs(refittedTrackUnique.get(), " standaloneRefit alignment errors Track ");
+ }
}
}
}
delete vertex;
- return refittedTrack;
+ //have to release it until the whole tool is migrated to unique_ptr
+ return refittedTrackUnique.release();
}
/** refit a track */
@@ -2381,42 +2380,42 @@ CombinedMuonTrackBuilder::fit(Trk::Track& track, const Trk::RunOutlierRemoval ru
return nullptr;
}
+ //eventually this whole tool will use unique_ptrs
+ //in the meantime, this allows the MuonErrorOptimisationTool and MuonRefitTool to use them
+ std::unique_ptr<Trk::Track> fittedTrackUnique(fittedTrack);
// track cleaning
if (runOutlier) {
- // fit with optimized spectrometer errors
+ // fit with optimized spectrometer errors
- if (!m_muonErrorOptimizer.empty() && !fittedTrack->info().trackProperties(Trk::TrackInfo::StraightTrack)
- && optimizeErrors(fittedTrack))
+ if (!m_muonErrorOptimizer.empty() && !fittedTrackUnique->info().trackProperties(Trk::TrackInfo::StraightTrack)
+ && optimizeErrors(fittedTrackUnique.get()))
{
ATH_MSG_VERBOSE(" perform spectrometer error optimization after cleaning ");
- Trk::Track* optimizedTrack = m_muonErrorOptimizer->optimiseErrors(*fittedTrack);
+ std::unique_ptr<Trk::Track> optimizedTrack = m_muonErrorOptimizer->optimiseErrors(fittedTrackUnique.get());
if (optimizedTrack) {
- if (checkTrack("fitInterface1Opt", optimizedTrack, fittedTrack)) {
- delete fittedTrack;
- fittedTrack = optimizedTrack;
- countAEOTs(fittedTrack, " re fit scaled errors Track ");
- } else {
- delete optimizedTrack;
- }
+ if (checkTrack("fitInterface1Opt", optimizedTrack.get(), fittedTrackUnique.get())) {
+ fittedTrackUnique.swap(optimizedTrack);
+ countAEOTs(fittedTrackUnique.get(), " re fit scaled errors Track ");
+ }
}
}
// chi2 before clean
- double chi2Before = normalizedChi2(*fittedTrack);
+ double chi2Before = normalizedChi2(*fittedTrackUnique);
// muon cleaner
- ATH_MSG_VERBOSE(" perform track cleaning... " << m_printer->print(*fittedTrack) << std::endl
- << m_printer->printStations(*fittedTrack));
+ ATH_MSG_VERBOSE(" perform track cleaning... " << m_printer->print(*fittedTrackUnique) << std::endl
+ << m_printer->printStations(*fittedTrackUnique));
- if (fittedTrack) countAEOTs(fittedTrack, " refit: fitted track before cleaning ");
+ if (fittedTrackUnique) countAEOTs(fittedTrackUnique.get(), " refit: fitted track before cleaning ");
- std::unique_ptr<Trk::Track> cleanTrack = m_cleaner->clean(*fittedTrack);
+ std::unique_ptr<Trk::Track> cleanTrack = m_cleaner->clean(*fittedTrackUnique);
if (cleanTrack) countAEOTs(cleanTrack.get(), " refit: after cleaning");
- if (cleanTrack && !checkTrack("fitInterface1Cleaner", cleanTrack.get(), fittedTrack)) {
+ if (cleanTrack && !checkTrack("fitInterface1Cleaner", cleanTrack.get(), fittedTrackUnique.get())) {
cleanTrack.reset();
}
@@ -2424,32 +2423,30 @@ CombinedMuonTrackBuilder::fit(Trk::Track& track, const Trk::RunOutlierRemoval ru
if (m_allowCleanerVeto && chi2Before > m_badFitChi2) {
ATH_MSG_DEBUG(" cleaner veto A ");
++m_countStandaloneCleanerVeto;
- delete fittedTrack;
- fittedTrack = nullptr;
+ fittedTrackUnique.reset();
} else {
ATH_MSG_DEBUG(" keep original standalone track despite cleaner veto ");
}
- } else if (!(*cleanTrack->perigeeParameters() == *fittedTrack->perigeeParameters())) {
+ } else if (!(*cleanTrack->perigeeParameters() == *fittedTrackUnique->perigeeParameters())) {
double chi2After = normalizedChi2(*cleanTrack);
if (chi2After < m_badFitChi2 || chi2After < chi2Before) {
ATH_MSG_VERBOSE(" found and removed spectrometer outlier(s) ");
- delete fittedTrack;
- // using release until the entire code can be migrated to use smart pointers
- fittedTrack = cleanTrack.release();
+ fittedTrackUnique.swap(cleanTrack);
} else {
ATH_MSG_VERBOSE(" keep original track despite cleaning ");
}
}
// FIXME: provide indet cleaner
- if (fittedTrack) {
- ATH_MSG_VERBOSE(" finished track cleaning... " << m_printer->print(*fittedTrack) << std::endl
- << m_printer->printStations(*fittedTrack));
+ if (fittedTrackUnique) {
+ ATH_MSG_VERBOSE(" finished track cleaning... " << m_printer->print(*fittedTrackUnique) << std::endl
+ << m_printer->printStations(*fittedTrackUnique));
}
}
- return fittedTrack;
+ //have to use release until the whole tool uses unique_ptr
+ return fittedTrackUnique.release();
}
/**
@@ -2519,40 +2516,40 @@ CombinedMuonTrackBuilder::fit(const Trk::MeasurementSet& measurementSet, const T
return nullptr;
}
+ //eventually this whole tool will use unique_ptrs
+ //in the meantime, this allows the MuonErrorOptimisationTool and MuonRefitTool to use them
+ std::unique_ptr<Trk::Track> fittedTrackUnique(fittedTrack);
// track cleaning
if (runOutlier) {
// fit with optimized spectrometer errors
- if (!m_muonErrorOptimizer.empty() && !fittedTrack->info().trackProperties(Trk::TrackInfo::StraightTrack)
- && optimizeErrors(fittedTrack))
+ if (!m_muonErrorOptimizer.empty() && !fittedTrackUnique->info().trackProperties(Trk::TrackInfo::StraightTrack)
+ && optimizeErrors(fittedTrackUnique.get()))
{
ATH_MSG_VERBOSE(" perform spectrometer error optimization after cleaning ");
- Trk::Track* optimizedTrack = m_muonErrorOptimizer->optimiseErrors(*fittedTrack);
+ std::unique_ptr<Trk::Track> optimizedTrack = m_muonErrorOptimizer->optimiseErrors(fittedTrackUnique.get());
if (optimizedTrack) {
- if (checkTrack("fitInterface2Opt", optimizedTrack, fittedTrack)) {
- delete fittedTrack;
- fittedTrack = optimizedTrack;
- countAEOTs(fittedTrack, " fit mstSet scaled errors Track ");
- } else {
- delete optimizedTrack;
- }
+ if (checkTrack("fitInterface2Opt", optimizedTrack.get(), fittedTrackUnique.get())) {
+ fittedTrackUnique.swap(optimizedTrack);
+ countAEOTs(fittedTrackUnique.get(), " fit mstSet scaled errors Track ");
+ }
}
}
// chi2 before clean
- double chi2Before = normalizedChi2(*fittedTrack);
+ double chi2Before = normalizedChi2(*fittedTrackUnique);
// muon cleaner
ATH_MSG_VERBOSE(" perform track cleaning... ");
- if (fittedTrack) countAEOTs(fittedTrack, " fit mstSet before cleaning ");
+ if (fittedTrackUnique) countAEOTs(fittedTrackUnique.get(), " fit mstSet before cleaning ");
- std::unique_ptr<Trk::Track> cleanTrack = m_cleaner->clean(*fittedTrack);
+ std::unique_ptr<Trk::Track> cleanTrack = m_cleaner->clean(*fittedTrackUnique);
if (cleanTrack) countAEOTs(cleanTrack.get(), " fit mstSet clean Track ");
- if (cleanTrack && !checkTrack("fitInterface2Cleaner", cleanTrack.get(), fittedTrack)) {
+ if (cleanTrack && !checkTrack("fitInterface2Cleaner", cleanTrack.get(), fittedTrackUnique.get())) {
cleanTrack.reset();
}
@@ -2560,19 +2557,15 @@ CombinedMuonTrackBuilder::fit(const Trk::MeasurementSet& measurementSet, const T
if (m_allowCleanerVeto && chi2Before > m_badFitChi2) {
ATH_MSG_DEBUG(" cleaner veto B");
++m_countExtensionCleanerVeto;
- delete fittedTrack;
- fittedTrack = nullptr;
+ fittedTrackUnique.reset();
} else {
ATH_MSG_DEBUG(" keep original extension track despite cleaner veto ");
}
- } else if (!(*cleanTrack->perigeeParameters() == *fittedTrack->perigeeParameters())) {
+ } else if (!(*cleanTrack->perigeeParameters() == *fittedTrackUnique->perigeeParameters())) {
double chi2After = normalizedChi2(*cleanTrack);
if (chi2After < m_badFitChi2 || chi2After < chi2Before) {
ATH_MSG_VERBOSE(" found and removed spectrometer outlier(s) ");
-
- delete fittedTrack;
- // using release until the entire code can be migrated to use smart pointers
- fittedTrack = cleanTrack.release();
+ fittedTrackUnique.swap(cleanTrack);
} else {
ATH_MSG_VERBOSE(" keep original track despite cleaning ");
}
@@ -2581,8 +2574,8 @@ CombinedMuonTrackBuilder::fit(const Trk::MeasurementSet& measurementSet, const T
// FIXME: provide indet cleaner
ATH_MSG_VERBOSE(" finished cleaning");
}
-
- return fittedTrack;
+ //have to use release until the whole code uses unique_ptr
+ return fittedTrackUnique.release();
}
@@ -2644,34 +2637,37 @@ CombinedMuonTrackBuilder::fit(const Trk::Track& indetTrack, Trk::Track& extrapol
if (!fittedTrack) return nullptr;
+ //eventually this whole tool will use unique_ptrs
+ //in the meantime, this allows the MuonErrorOptimisationTool and MuonRefitTool to use them
+ std::unique_ptr<Trk::Track> fittedTrackUnique(fittedTrack);
+
// track cleaning
if (runOutlier) {
// fit with optimized spectrometer errors
if (!m_muonErrorOptimizer.empty() && !fittedTrack->info().trackProperties(Trk::TrackInfo::StraightTrack)
- && optimizeErrors(fittedTrack))
+ && optimizeErrors(fittedTrackUnique.get()))
{
ATH_MSG_VERBOSE(" perform spectrometer error optimization after cleaning ");
- Trk::Track* optimizedTrack = m_muonErrorOptimizer->optimiseErrors(*fittedTrack);
+ std::unique_ptr<Trk::Track> optimizedTrack = m_muonErrorOptimizer->optimiseErrors(fittedTrackUnique.get());
if (optimizedTrack) {
- delete fittedTrack;
- fittedTrack = optimizedTrack;
- countAEOTs(fittedTrack, " cbfit scaled errors Track ");
+ fittedTrackUnique.swap(optimizedTrack);
+ countAEOTs(fittedTrackUnique.get(), " cbfit scaled errors Track ");
}
}
// chi2 before clean
- double chi2Before = normalizedChi2(*fittedTrack);
+ double chi2Before = normalizedChi2(*fittedTrackUnique.get());
// muon cleaner
- ATH_MSG_VERBOSE(" perform track cleaning... " << m_printer->print(*fittedTrack) << std::endl
- << m_printer->printStations(*fittedTrack));
+ ATH_MSG_VERBOSE(" perform track cleaning... " << m_printer->print(*fittedTrackUnique) << std::endl
+ << m_printer->printStations(*fittedTrackUnique));
- if (fittedTrack) {
- countAEOTs(fittedTrack, " cb before clean Track ");
+ if (fittedTrackUnique) {
+ countAEOTs(fittedTrackUnique.get(), " cb before clean Track ");
}
- std::unique_ptr<Trk::Track> cleanTrack = m_cleaner->clean(*fittedTrack);
+ std::unique_ptr<Trk::Track> cleanTrack = m_cleaner->clean(*fittedTrackUnique);
if (cleanTrack) {
countAEOTs(cleanTrack.get(), " cb after clean Track ");
}
@@ -2680,19 +2676,15 @@ CombinedMuonTrackBuilder::fit(const Trk::Track& indetTrack, Trk::Track& extrapol
if (m_allowCleanerVeto && chi2Before > m_badFitChi2) {
ATH_MSG_DEBUG(" cleaner veto C");
++m_countCombinedCleanerVeto;
- delete fittedTrack;
- fittedTrack = nullptr;
+ fittedTrackUnique.reset();
} else {
ATH_MSG_DEBUG(" keep original combined track despite cleaner veto ");
}
- } else if (!(*cleanTrack->perigeeParameters() == *fittedTrack->perigeeParameters())) {
+ } else if (!(*cleanTrack->perigeeParameters() == *fittedTrackUnique->perigeeParameters())) {
double chi2After = normalizedChi2(*cleanTrack);
if (chi2After < m_badFitChi2 || chi2After < chi2Before) {
ATH_MSG_VERBOSE(" found and removed spectrometer outlier(s) ");
-
- delete fittedTrack;
- // using release until the entire code can be migrated to use smart pointers
- fittedTrack = cleanTrack.release();
+ fittedTrackUnique.swap(cleanTrack);
} else {
ATH_MSG_VERBOSE(" keep original track despite cleaning ");
}
@@ -2701,8 +2693,8 @@ CombinedMuonTrackBuilder::fit(const Trk::Track& indetTrack, Trk::Track& extrapol
// FIXME: provide indet cleaner
ATH_MSG_VERBOSE(" finished cleaning");
}
-
- return fittedTrack;
+ //have to use release until the whole code uses unique_ptr
+ return fittedTrackUnique.release();
}
/* private methods follow */
@@ -4285,21 +4277,25 @@ CombinedMuonTrackBuilder::finalTrackBuild(Trk::Track*& track) const
ATH_MSG_VERBOSE(" finished hole recovery procedure ");
}
+ //eventually this whole tool will use unique_ptrs
+ //in the meantime, this allows the MuonErrorOptimisationTool and MuonRefitTool to use them
+ std::unique_ptr<Trk::Track> trackUnique(track);
// final fit with optimized spectrometer errors
- if (!m_muonErrorOptimizer.empty() && !track->info().trackProperties(Trk::TrackInfo::StraightTrack)
- && countAEOTs(track, " before optimize ") == 0)
+ if (!m_muonErrorOptimizer.empty() && !trackUnique->info().trackProperties(Trk::TrackInfo::StraightTrack)
+ && countAEOTs(trackUnique.get(), " before optimize ") == 0)
{
ATH_MSG_VERBOSE(" perform spectrometer error optimization... ");
- Trk::Track* optimizedTrack = m_muonErrorOptimizer->optimiseErrors(*track);
- if (optimizedTrack && checkTrack("finalTrackBuild2", optimizedTrack, track)) {
- delete track;
- track = optimizedTrack;
- countAEOTs(track, " finalTrackBuilt alignment errors Track ");
+ std::unique_ptr<Trk::Track> optimizedTrack = m_muonErrorOptimizer->optimiseErrors(trackUnique.get());
+ if (optimizedTrack && checkTrack("finalTrackBuild2", optimizedTrack.get(), trackUnique.get())) {
+ trackUnique.swap(optimizedTrack);
+ countAEOTs(track, " finalTrackBuilt alignment errors Track ");
}
}
// add the track summary
- m_trackSummary->updateTrack(*track);
+ m_trackSummary->updateTrack(*trackUnique);
+ //have to use release until the whole code uses unique_ptr
+ track=trackUnique.release();
}
Trk::Track*
diff --git a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/OutwardsCombinedMuonTrackBuilder.cxx b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/OutwardsCombinedMuonTrackBuilder.cxx
index ee5260697a83b281de418d4850c13f2242af5946..516bbe8ffe6231ec465a5e874cbf767f9974bb4e 100755
--- a/Reconstruction/MuonIdentification/MuidTrackBuilder/src/OutwardsCombinedMuonTrackBuilder.cxx
+++ b/Reconstruction/MuonIdentification/MuidTrackBuilder/src/OutwardsCombinedMuonTrackBuilder.cxx
@@ -386,10 +386,11 @@ OutwardsCombinedMuonTrackBuilder::fit(Trk::Track& track, const Trk::RunOutlierRe
if (!m_muonErrorOptimizer.empty() && !fittedTrack->info().trackProperties(Trk::TrackInfo::StraightTrack)) {
ATH_MSG_VERBOSE(" perform spectrometer error optimization before cleaning ");
- Trk::Track* optimizedTrack = m_muonErrorOptimizer->optimiseErrors(*fittedTrack);
+ std::unique_ptr<Trk::Track> optimizedTrack = m_muonErrorOptimizer->optimiseErrors(fittedTrack);
if (optimizedTrack) {
delete fittedTrack;
- fittedTrack = optimizedTrack;
+ //until code is updated to use unique_ptr or removed
+ fittedTrack = optimizedTrack.release();
}
}
@@ -467,10 +468,11 @@ OutwardsCombinedMuonTrackBuilder::fit(const Trk::Track& indetTrack, const Trk::T
// fit with optimized spectrometer errors
if (!m_muonErrorOptimizer.empty() && !fittedTrack->info().trackProperties(Trk::TrackInfo::StraightTrack)) {
ATH_MSG_VERBOSE(" perform spectrometer error optimization before cleaning ");
- Trk::Track* optimizedTrack = m_muonErrorOptimizer->optimiseErrors(*fittedTrack);
+ std::unique_ptr<Trk::Track> optimizedTrack = m_muonErrorOptimizer->optimiseErrors(fittedTrack);
if (optimizedTrack) {
delete fittedTrack;
- fittedTrack = optimizedTrack;
+ //until code is updated to use unique_ptr or removed
+ fittedTrack = optimizedTrack.release();
}
}
// muon cleaner
@@ -580,10 +582,11 @@ OutwardsCombinedMuonTrackBuilder::fit(const Trk::Track& indetTrack, const Trk::T
ATH_MSG_VERBOSE(" perform spectrometer error optimization... ");
- Trk::Track* optimizedTrack = m_muonErrorOptimizer->optimiseErrors(*fittedTrack);
+ std::unique_ptr<Trk::Track> optimizedTrack = m_muonErrorOptimizer->optimiseErrors(fittedTrack);
if (optimizedTrack) {
delete fittedTrack;
- fittedTrack = optimizedTrack;
+ //until the code uses unique ptrs (or is removed since it's deprecated)
+ fittedTrack = optimizedTrack.release();
}
}
return fittedTrack;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx
index 418ff63ce05e8a877a577bfd2b0bcd34b2ea21aa..93e86b38d1b289249ed0302474c0e433224f716d 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.cxx
@@ -40,9 +40,9 @@
#include <cmath>
namespace MuonCombined {
-
-
MuonCaloTagTool::MuonCaloTagTool (const std::string& type, const std::string& name, const IInterface* parent) :
+
+
AthAlgTool(type, name, parent),
m_nTrueMuons(0),
m_nTracksTagged(0),
@@ -63,6 +63,10 @@ namespace MuonCombined {
// --- Get an Identifier helper object ---
if( m_doCaloLR ) ATH_CHECK( m_caloMuonLikelihood.retrieve() );
else m_caloMuonLikelihood.disable();
+
+ if( m_doCaloMuonScore ) ATH_CHECK( m_caloMuonScoreTool.retrieve() );
+ else m_caloMuonScoreTool.disable();
+
ATH_CHECK( m_caloMuonTagLoose.retrieve() );
ATH_CHECK( m_caloMuonTagTight.retrieve() );
ATH_CHECK( m_trkDepositInCalo.retrieve() );
@@ -194,6 +198,7 @@ namespace MuonCombined {
// --- Muon tagging ---
float likelihood = 0;
+ float muon_score = -1;
int tag = 0;
std::vector<DepositInCalo> deposits;
if (m_doCaloMuonTag) {
@@ -205,9 +210,13 @@ namespace MuonCombined {
tag = m_caloMuonTagLoose->caloMuonTag(deposits, par->eta(), par->pT());
tag += 10*m_caloMuonTagTight->caloMuonTag(deposits, par->eta(), par->pT());
}
- if(m_doCaloLR)
+ if(m_doCaloLR){
likelihood = m_caloMuonLikelihood->getLHR(tp, caloClusterCont);
- ATH_MSG_DEBUG("Track found with tag " << tag << " and LHR " << likelihood);
+ }
+ if(m_doCaloMuonScore){
+ muon_score = m_caloMuonScoreTool->getMuonScore(tp);
+ }
+ ATH_MSG_DEBUG("Track found with tag " << tag << ", LHR " << likelihood << " and muon score " << muon_score);
// --- If both the taggers do not think it's a muon, forget about it ---
if (tag == 0 && likelihood <= m_CaloLRlikelihoodCut) {
continue;
@@ -218,7 +227,7 @@ namespace MuonCombined {
}
// FIXME const-cast changes object passed in as const
- createMuon(*idTP, deposits, tag, likelihood, tagMap);
+ createMuon(*idTP, deposits, tag, likelihood, muon_score, tagMap);
// --- Count number of muons written to container
if ( abs(pdgId) == 13 ) m_nMuonsTagged++;
@@ -337,7 +346,7 @@ namespace MuonCombined {
}
void MuonCaloTagTool::createMuon(const InDetCandidate& muonCandidate,
- const std::vector<DepositInCalo>& deposits, int tag, float likelihood, InDetCandidateToTagMap* tagMap) const {
+ const std::vector<DepositInCalo>& deposits, int tag, float likelihood, float muonScore, InDetCandidateToTagMap* tagMap) const {
std::vector<DepositInCalo>::const_iterator deposit = deposits.begin();
std::vector<DepositInCalo>::const_iterator depositE = deposits.end();
@@ -345,7 +354,7 @@ namespace MuonCombined {
CaloTag* caloTag = 0;
for(; deposit != depositE; deposit++)
eLoss+=deposit->energyDeposited();
-
+
if (tag>0) {
caloTag = new CaloTag(xAOD::Muon::CaloTag, eLoss, 0); //set eLoss, sigmaEloss is set to 0.
if(likelihood > m_CaloLRlikelihoodCut)
@@ -357,9 +366,14 @@ namespace MuonCombined {
caloTag->set_deposits(deposits);
caloTag->set_caloMuonIdTag(tag);
caloTag->set_caloLRLikelihood(likelihood);
-
+ caloTag->set_caloMuonScore(muonScore);
tagMap->addEntry(&muonCandidate,caloTag);
}
+
+ if (muonScore > -1) {
+ caloTag->set_author3(xAOD::Muon::CaloScore);
+ }
+
}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
index 637b98798716c5abcdce919f8c23422fd356c2e3..ba33009354030a86f785dd5e35e8ed3b7a5d6483 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCaloTagTool.h
@@ -21,8 +21,10 @@
#include "RecoToolInterfaces/IParticleCaloCellAssociationTool.h"
#include "muonEvent/DepositInCalo.h"
#include "ICaloTrkMuIdTools/ICaloMuonLikelihoodTool.h"
+#include "ICaloTrkMuIdTools/ICaloMuonScoreTool.h"
#include "ICaloTrkMuIdTools/ICaloMuonTag.h"
#include "ICaloTrkMuIdTools/ITrackDepositInCaloTool.h"
+#include "ICaloTrkMuIdTools/ICaloMuonScoreONNXRuntimeSvc.h"
#include "TrkToolInterfaces/ITrackSelectorTool.h"
#include "StoreGate/ReadHandleKey.h"
@@ -58,7 +60,7 @@ namespace MuonCombined {
private:
- void createMuon(const InDetCandidate & muonCandidate, const std::vector<DepositInCalo>& deposits, int tag, float likelihood, InDetCandidateToTagMap* tagMap) const;
+ void createMuon(const InDetCandidate & muonCandidate, const std::vector<DepositInCalo>& deposits, int tag, float likelihood, float muonScore, InDetCandidateToTagMap* tagMap) const;
const Trk::TrackParameters* getTrackParameters(const Trk::Track* trk) const;
bool selectTrack(const Trk::Track* trk, const Trk::Vertex* vertex) const;
bool selectCosmic(const Trk::Track* ptcl) const;
@@ -76,6 +78,7 @@ namespace MuonCombined {
// --- Set up what to do and what not to do ---
Gaudi::Property<bool> m_doCaloMuonTag {this, "doCaloMuonTag", true, "run CaloMuonTag Tool"};
+ Gaudi::Property<bool> m_doCaloMuonScore {this, "doCaloMuonScore", true, "run CaloMuonScoreTool"};
Gaudi::Property<bool> m_doCaloLR {this, "doCaloLR", true, "run CaloMuonLikelihoodTool"};
Gaudi::Property<bool> m_doTrkSelection {this, "doTrkSelection", true, "This variable should be set to false when there is no primary vertex reconstructed."};
Gaudi::Property<bool> m_doCosmicTrackSelection {this, "doCosmicTrackSelection", false, "Apply track selection for cosmics"};
@@ -98,6 +101,9 @@ namespace MuonCombined {
// --- CaloTrkMuIdTools ---
ToolHandle<ICaloMuonLikelihoodTool> m_caloMuonLikelihood{this,"CaloMuonLikelihoodTool","CaloMuonLikelihoodTool/CaloMuonLikelihoodTool"};
+ ToolHandle<ICaloMuonScoreTool> m_caloMuonScoreTool{this, "CaloMuonScoreTool", "CaloMuonScoreTool/CaloMuonScoreTool"};
+ ServiceHandle<ICaloMuonScoreONNXRuntimeSvc> m_caloMuonScoreONNXRuntimeSvc{this, "CaloMuonScoreONNXRuntimeSvc", "CaloMuonScoreTool/CaloMuonScoreONNXRuntimeSvc"};
+
ToolHandle<ICaloMuonTag> m_caloMuonTagLoose{this,"CaloMuonTagLoose","CaloMuonTag/CaloMuonTagLoose","CaloTrkMuIdTools::CaloMuonTag for loose tagging"};
ToolHandle<ICaloMuonTag> m_caloMuonTagTight{this,"CaloMuonTagTight","CaloMuonTag/CaloMuonTag","CaloTrkMuIdTools::CaloMuonTag for tight tagging"};
ToolHandle<ITrackDepositInCaloTool> m_trkDepositInCalo{this,"TrackDepositInCaloTool","TrackDepositInCaloTool/TrackDepositInCaloTool"};
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
index ed56ae43e70f13bcff0d000eba768cdb81a36193..73cf0339ac54d04af5d97f4a321f92c61779205a 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
@@ -794,6 +794,7 @@ namespace MuonCombined {
// init variables if necessary.
mu.setParameter(static_cast<float>( 0.0 ), xAOD::Muon::CaloLRLikelihood);
+ mu.setParameter(static_cast<float>( 0.0 ), xAOD::Muon::CaloMuonScore);
mu.setParameter(static_cast<int>( 0xFF ), xAOD::Muon::CaloMuonIDTag);
if ( m_fillExtraELossInfo) {
// Here we can make sure that we store the extra calotag information - just always add it since this is then unambigious for debugging
@@ -805,8 +806,9 @@ namespace MuonCombined {
return;
}
- ATH_MSG_DEBUG("Adding Calo Muon " << tag->author() << " type " << tag->type());
+ ATH_MSG_DEBUG("Adding Calo Muon with author " << tag->author() << ", type " << tag->type() << ", LHR " << tag->caloLRLikelihood() << ", CaloMuonScore " << tag->caloMuonScore() );
mu.setParameter(static_cast<float>( tag->caloLRLikelihood() ), xAOD::Muon::CaloLRLikelihood);
+ mu.setParameter(static_cast<float>( tag->caloMuonScore() ), xAOD::Muon::CaloMuonScore);
mu.setParameter(static_cast<int>( tag->caloMuonIdTag() ), xAOD::Muon::CaloMuonIDTag);
if ( m_fillExtraELossInfo) {
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index bee7b31c20d38ded5859b283cbd0a1a96711305d..1f1f7d6051539c7cb6145b1805559d8f937b44e8 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -816,6 +816,16 @@ def CaloMuonLikelihoodToolCfg(flags, name='CaloMuonLikelihoodTool', **kwargs ):
result.setPrivateTools(tool)
return result
+def CaloMuonScoreToolCfg(flags, name='CaloMuonScoreTool', **kwargs ):
+ from TrackToCalo.TrackToCaloConfig import ParticleCaloCellAssociationToolCfg
+ result = ParticleCaloCellAssociationToolCfg(flags)
+ kwargs.setdefault("ParticleCaloCellAssociationTool", result.popPrivateTools())
+ caloMuonScoreSvc = CompFactory.CaloMuonScoreONNXRuntimeSvc(name="CaloMuonScoreONNXRuntimeSvc")
+ result.addService(caloMuonScoreSvc)
+ tool = CompFactory.CaloMuonScoreTool(name, **kwargs )
+ result.setPrivateTools(tool)
+ return result
+
def MuonCaloTagToolCfg(flags, name='MuonCaloTagTool', **kwargs ):
result = ComponentAccumulator()
kwargs.setdefault("CaloMuonTagLoose", CompFactory.CaloMuonTag(name = "CaloMuonTagLoose", TagMode="Loose") )
@@ -827,6 +837,10 @@ def MuonCaloTagToolCfg(flags, name='MuonCaloTagTool', **kwargs ):
kwargs.setdefault("CaloMuonLikelihoodTool", acc.popPrivateTools() )
result.addPublicTool(kwargs['CaloMuonLikelihoodTool'])
+ acc = CaloMuonScoreToolCfg(flags)
+ kwargs.setdefault("CaloMuonScoreTool", acc.popPrivateTools() )
+ result.addPublicTool(kwargs['CaloMuonScoreTool'])
+
result.merge(acc)
acc = TrackDepositInCaloToolCfg(flags)
trackDepositInCaloTool = acc.popPrivateTools()
@@ -838,7 +852,7 @@ def MuonCaloTagToolCfg(flags, name='MuonCaloTagTool', **kwargs ):
result.addPublicTool(calotrkmuidalgtrackselectortool)
kwargs.setdefault("TrackSelectorTool", calotrkmuidalgtrackselectortool )
result.merge(acc)
- kwargs.setdefault("doCaloLR", True )
+ kwargs.setdefault("doCaloLR", True)
tool = CompFactory.MuonCombined.MuonCaloTagTool(name, **kwargs )
result.setPrivateTools(tool)
return result
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
index 7b6f2246e8cca6db95947fa532d231ad4f08400f..c611b96ec1b1bf3a9891ea97708c4beb5384e6fb 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
@@ -143,6 +143,9 @@ std::string Rec::MuonPrintingTool::print( const xAOD::Muon& muon ) const {
float CaloLRLikelihood=0;
if(muon.parameter(CaloLRLikelihood, xAOD::Muon::CaloLRLikelihood))
sout << " CaloLRLikelihood : " << CaloLRLikelihood << std::endl;
+ float CaloMuonScore=0;
+ if(muon.parameter(CaloLRLikelihood, xAOD::Muon::CaloMuonScore))
+ sout << " CaloMuonScore : " << CaloMuonScore << std::endl;
int CaloMuonIDTag=0;
if(muon.parameter(CaloMuonIDTag, xAOD::Muon::CaloMuonIDTag))
sout << " CaloMuonIDTag : " << CaloMuonIDTag << std::endl;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/CaloTag.h b/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/CaloTag.h
index e42dd3413e11ba51dfa3bf5b1862b66fc159d3ad..464c096704b4e813ae47dcdbbe7d4a385b9f3c72 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/CaloTag.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/CaloTag.h
@@ -44,7 +44,8 @@ namespace MuonCombined {
float sigmaMinusDeltaE=0.0,
float sigmaPlusDeltaE=0.0,
unsigned short energyLossType=0,
- float likelhoold=0,
+ float likelihood=0,
+ float muonScore=0,
unsigned short tag=0);
/** full constructor with the detailed deposits in Calo */
@@ -54,7 +55,8 @@ namespace MuonCombined {
float sigmaMinusDeltaE,
float sigmaPlusDeltaE,
unsigned short energyLossType,
- float likelhoold,
+ float likelihood,
+ float muonScore,
unsigned short tag,
const std::vector<DepositInCalo>& deposits);
@@ -77,6 +79,9 @@ namespace MuonCombined {
/** the calo Muon Identification likehood */
double caloLRLikelihood() const { return m_caloLRLikelihood; }
+ /** the calo Muon score */
+ double caloMuonScore() const { return m_caloMuonScore; }
+
/** the vector of detailed deposits in calo layers */
const std::vector<DepositInCalo>& depositInCalo() const { return m_deposits; }
@@ -94,6 +99,9 @@ namespace MuonCombined {
/** set the likelihood */
void set_caloLRLikelihood ( const float likelihood ) { m_caloLRLikelihood = likelihood; }
+ /** set the calo muon score */
+ void set_caloMuonScore ( const float muonScore ) { m_caloMuonScore = muonScore; }
+
/** set the tag */
void set_caloMuonIdTag ( unsigned short tag ) { m_caloMuonIdTag = tag; }
@@ -112,9 +120,15 @@ namespace MuonCombined {
/** access to secondary author */
Author author2() const { return m_author2; }
+ /** access to third author */
+ Author author3() const { return m_author3; }
+
/** set the secondary author */
void set_author2 ( const Author author2 ) { m_author2 = author2; }
+ /** set the third author */
+ void set_author3 ( const Author author3 ) { m_author3 = author3; }
+
private:
/** block copy and assignment */
CaloTag(const CaloTag&) = delete;
@@ -124,11 +138,13 @@ namespace MuonCombined {
EnergyLossType m_energyLossType;
float m_caloLRLikelihood;
+ float m_caloMuonScore;
unsigned short m_caloMuonIdTag;
float m_fsrCandidateEnergy;
std::vector<DepositInCalo> m_deposits;
float m_etCore; // summed cell ET in core DeltaR
Author m_author2; // in case of tag by both Algorithms
+ Author m_author3; // in case of tag by all three algorithms
};
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/TagBase.h b/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/TagBase.h
index 7ab1538a08edad6c08f7aa6138d48f847936b11e..4408089d7aa0c59b985085a6d547e21d37bbd4eb 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/TagBase.h
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvent/MuonCombinedEvent/TagBase.h
@@ -26,8 +26,9 @@ namespace MuonCombined {
if( a == xAOD::Muon::MuTag ) return 3;
if( a == xAOD::Muon::CaloTag ) return 4;
if( a == xAOD::Muon::CaloLikelihood ) return 5;
- if( a == xAOD::Muon::MuidSA ) return 6;
- if( a == xAOD::Muon::STACO ) return 7;
+ if( a == xAOD::Muon::CaloLikelihood ) return 6;
+ if( a == xAOD::Muon::MuidSA ) return 7;
+ if( a == xAOD::Muon::STACO ) return 8;
return 8;
}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvent/src/CaloTag.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvent/src/CaloTag.cxx
index a7ce4e08b5541c4ea2691a2122a07eb469aa83f0..5bc07fb7c3e89f60370bd95ba25bf121f5471775 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvent/src/CaloTag.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvent/src/CaloTag.cxx
@@ -11,22 +11,26 @@ CaloTag::CaloTag (void)
: TagBase(xAOD::Muon::CaloTag,xAOD::Muon::CaloTagged),
Trk::EnergyLoss(0,0,0,0),
m_caloLRLikelihood (0),
+ m_caloMuonScore (0),
m_caloMuonIdTag (0),
m_fsrCandidateEnergy (0),
m_deposits (),
m_etCore (0.0),
- m_author2(xAOD::Muon::unknown)
+ m_author2(xAOD::Muon::unknown),
+ m_author3(xAOD::Muon::unknown)
{ m_energyLossType = static_cast<CaloTag::EnergyLossType>(0); }
CaloTag::CaloTag (const Trk::EnergyLoss& eloss)
: TagBase(xAOD::Muon::CaloTag,xAOD::Muon::CaloTagged),
Trk::EnergyLoss( eloss ),
m_caloLRLikelihood (0),
+ m_caloMuonScore (0),
m_caloMuonIdTag (0),
m_fsrCandidateEnergy (0),
m_deposits (),
m_etCore (0.0),
- m_author2(xAOD::Muon::unknown)
+ m_author2(xAOD::Muon::unknown),
+ m_author3(xAOD::Muon::unknown)
{ m_energyLossType = static_cast<CaloTag::EnergyLossType>(0); }
CaloTag::CaloTag (xAOD::Muon::Author author,
@@ -36,14 +40,17 @@ CaloTag::CaloTag (xAOD::Muon::Author author,
float sigmaPlusDeltaE,
unsigned short energyLossType,
float likelihood,
+ float muonScore,
unsigned short tag)
: TagBase(author,xAOD::Muon::CaloTagged),
Trk::EnergyLoss(deltaE, sigmaDeltaE, sigmaMinusDeltaE, sigmaPlusDeltaE ),
m_caloLRLikelihood (likelihood),
+ m_caloMuonScore (muonScore),
m_caloMuonIdTag (tag),
m_deposits (),
m_etCore (0.0),
- m_author2(xAOD::Muon::unknown)
+ m_author2(xAOD::Muon::unknown),
+ m_author3(xAOD::Muon::unknown)
{
m_energyLossType = static_cast<CaloTag::EnergyLossType>(energyLossType);
m_fsrCandidateEnergy = 0.0;
@@ -57,15 +64,18 @@ CaloTag::CaloTag (xAOD::Muon::Author author,
float sigmaPlusDeltaE,
unsigned short energyLossType,
float likelihood,
+ float muonScore,
unsigned short tag,
const std::vector<DepositInCalo>& deposits)
: TagBase(author,xAOD::Muon::CaloTagged),
Trk::EnergyLoss(deltaE, sigmaDeltaE, sigmaMinusDeltaE, sigmaPlusDeltaE ),
m_caloLRLikelihood (likelihood),
+ m_caloMuonScore (muonScore),
m_caloMuonIdTag (tag),
m_etCore (0.0),
- m_author2(xAOD::Muon::unknown)
+ m_author2(xAOD::Muon::unknown),
+ m_author3(xAOD::Muon::unknown)
{
m_energyLossType = static_cast<CaloTag::EnergyLossType>(energyLossType);
m_fsrCandidateEnergy = 0.0;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
index 43d625052d4f6288686b4365bfe940ec1537e98d..b63e6870ff1c0e4037d91d93633f7ff87dd0c356 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/CombinedMuonTrackSummary.py
@@ -21,13 +21,20 @@ atlasExtrapolator = getPublicTool('AtlasExtrapolator')
muonTrackSummaryHelper = getPublicTool('MuonTrackSummaryHelperTool')
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+CombinedMuonIDBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="CombinedMuonIDBoundaryCheckTool",
+ UsePixel=DetFlags.haveRIO.pixel_on(),
+ UseSCT=DetFlags.haveRIO.SCT_on()
+)
+ToolSvc += CombinedMuonIDBoundaryCheckTool
+
# load InDetHoleSearchTool
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
ToolSvc += InDet__InDetTrackHoleSearchTool( \
name = "CombinedMuonIDHoleSearch",
Extrapolator = atlasExtrapolator,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on(),
+ BoundaryCheckTool = CombinedMuonIDBoundaryCheckTool,
CountDeadModulesAfterLastHit = True)
import InDetRecExample.TrackingCommon as TrackingCommon
@@ -113,5 +120,5 @@ if DetFlags.haveRIO.SCT_on():
sct_ConditionsSummaryToolSetup = SCT_ConditionsSummaryToolSetup()
sct_ConditionsSummaryToolSetup.setup()
InDetSCT_ConditionsSummaryTool = sct_ConditionsSummaryToolSetup.getTool()
- ToolSvc.CombinedMuonIDHoleSearch.SctSummaryTool = InDetSCT_ConditionsSummaryTool
+ ToolSvc.CombinedMuonIDBoundaryCheckTool.SctSummaryTool = InDetSCT_ConditionsSummaryTool
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
index 30842320cc1ed19dbddf27d68d3a0e413f60db3b..074e85438f605b992d7316d50b88d3d801c4b467 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCaloTagTool.py
@@ -5,9 +5,6 @@
from AthenaCommon import CfgMgr
from AthenaCommon.CfgGetter import getPublicTool,getService, getPrivateTool
-###logfile
-from AthenaCommon.Logging import log
-
###############################################################################
## Helper function for defining THistSvc inputs
###############################################################################
@@ -16,7 +13,6 @@ from AthenaCommon.Logging import log
### Track Selector for CaloTrkMuIdAlg
def CaloTrkMuIdAlgTrackSelectorTool( name='CaloTrkMuIdAlgTrackSelectorTool', **kwargs ):
- import MuonCombinedRecExample.CombinedMuonTrackSummary
from AthenaCommon.AppMgr import ToolSvc
kwargs.setdefault("pTMin", 5000.)
kwargs.setdefault("IPd0Max", 7.)
@@ -43,10 +39,20 @@ def TrackDepositInCaloTool( name ='TrackDepositInCaloTool', **kwargs ):
kwargs.setdefault("ParticleCaloCellAssociationTool", caloCellAssociationTool )
return CfgMgr.TrackDepositInCaloTool(name,**kwargs)
+def CaloMuonScoreONNXRuntimeSvc(name='CaloMuonScoreONNXRuntimeSvc', **kwargs):
+ return CfgMgr.CaloMuonScoreONNXRuntimeSvc(name, **kwargs)
+
def CaloMuonLikelihoodTool(name='CaloMuonLikelihoodTool', **kwargs ):
kwargs.setdefault("ParticleCaloExtensionTool", getPublicTool("MuonParticleCaloExtensionTool") )
return CfgMgr.CaloMuonLikelihoodTool(name,**kwargs)
+def CaloMuonScoreTool(name='CaloMuonScoreTool', **kwargs ):
+ from TrackToCalo.TrackToCaloConf import Rec__ParticleCaloCellAssociationTool
+ caloCellAssociationTool = Rec__ParticleCaloCellAssociationTool(ParticleCaloExtensionTool = getPublicTool("MuonParticleCaloExtensionTool"))
+ kwargs.setdefault("ParticleCaloCellAssociationTool", caloCellAssociationTool )
+ kwargs.setdefault("CaloMuonScoreONNXRuntimeSvc", getService("CaloMuonScoreONNXRuntimeSvc") )
+ return CfgMgr.CaloMuonScoreTool(name,**kwargs)
+
def MuonCaloTagTool( name='MuonCaloTagTool', **kwargs ):
from CaloTrkMuIdTools.CaloTrkMuIdToolsConf import CaloMuonTag as ConfiguredCaloMuonTag
CaloMuonTagLoose = ConfiguredCaloMuonTag(name = "CaloMuonTagLoose")
@@ -55,6 +61,7 @@ def MuonCaloTagTool( name='MuonCaloTagTool', **kwargs ):
kwargs.setdefault("CaloMuonTagLoose", CaloMuonTagLoose )
kwargs.setdefault("CaloMuonTagTight", CaloMuonTagTight )
kwargs.setdefault("CaloMuonLikelihoodTool", getPrivateTool("CaloMuonLikelihoodTool") )
+ kwargs.setdefault("CaloMuonScoreTool", getPrivateTool("CaloMuonScoreTool") )
kwargs.setdefault("TrackDepositInCaloTool", getPublicTool("TrackDepositInCaloTool") )
kwargs.setdefault("TrackSelectorTool", getPublicTool("CaloTrkMuIdAlgTrackSelectorTool") )
kwargs.setdefault("doCaloLR", True )
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
index f6b1adae137247723aeec47aa83f8ee147faf13f..565578b69f1b04f9523b70e7bf39b5773a1f84e0 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/python/MuonCombinedRecExampleConfigDb.py
@@ -82,6 +82,8 @@ addTool("MuonCombinedRecExample.MuonCaloTagTool.TrackDepositInCaloTool","TrackDe
addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonTagLoose","CaloMuonTagLoose")
addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonTag","CaloMuonTag")
addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonLikelihoodTool","CaloMuonLikelihoodTool")
+addTool("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonScoreTool","CaloMuonScoreTool")
+addService("MuonCombinedRecExample.MuonCaloTagTool.CaloMuonScoreONNXRuntimeSvc","CaloMuonScoreONNXRuntimeSvc")
####### muid tools
addTool("MuonCombinedRecExample.MuonCombinedFitTools.MuonMatchQuality","MuonMatchQuality")
diff --git a/Reconstruction/MuonIdentification/muonEvent/muonEvent/CaloEnergy.h b/Reconstruction/MuonIdentification/muonEvent/muonEvent/CaloEnergy.h
index b884f77f5d26209a14b75c6cc3a502af2150d536..536fb856fc13a36e8d4fcca15ebf8b9f9bcd5197 100644
--- a/Reconstruction/MuonIdentification/muonEvent/muonEvent/CaloEnergy.h
+++ b/Reconstruction/MuonIdentification/muonEvent/muonEvent/CaloEnergy.h
@@ -1,3 +1,4 @@
+
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -52,7 +53,8 @@ public:
float sigmaMinusDeltaE=0.0,
float sigmaPlusDeltaE=0.0,
unsigned short energyLossType=0,
- float likelhoold=0,
+ float likelihood=0,
+ float muonScore=0,
unsigned short tag=0);
/** full constructor with the detailed deposits in Calo */
@@ -61,7 +63,8 @@ public:
float sigmaMinusDeltaE,
float sigmaPlusDeltaE,
unsigned short energyLossType,
- float likelhoold,
+ float likelihood,
+ float muonScore,
unsigned short tag,
const std::vector<DepositInCalo>& deposits);
@@ -86,6 +89,9 @@ public:
/** the calo Muon Identification likehood */
double caloLRLikelihood() const { return m_caloLRLikelihood; }
+ /** the calo Muon Identification likehood */
+ double caloMuonScore() const { return m_caloMuonScore; }
+
/** the vector of detailed deposits in calo layers */
const std::vector<DepositInCalo>& depositInCalo() const { return m_deposits; }
@@ -103,6 +109,9 @@ public:
/** set the likelihood */
void set_caloLRLikelihood ( const float likelihood ) { m_caloLRLikelihood = likelihood; }
+ /** set the calo muon score */
+ void set_caloMuonScore ( const float muonScore ) { m_caloMuonScore = muonScore; }
+
/** set the tag */
void set_caloMuonIdTag ( unsigned short tag ) { m_caloMuonIdTag = tag; }
@@ -145,6 +154,7 @@ private:
EnergyLossType m_energyLossType;
float m_caloLRLikelihood;
+ float m_caloMuonScore;
unsigned short m_caloMuonIdTag;
float m_fsrCandidateEnergy;
std::vector<DepositInCalo> m_deposits;
diff --git a/Reconstruction/MuonIdentification/muonEvent/muonEvent/MuonParamDefs.h b/Reconstruction/MuonIdentification/muonEvent/muonEvent/MuonParamDefs.h
index 95aea47168c24a697eeef60b34ec3b0bb192f5c9..f9c032c26a971a918909e4aabf5fa2a3d574f17a 100644
--- a/Reconstruction/MuonIdentification/muonEvent/muonEvent/MuonParamDefs.h
+++ b/Reconstruction/MuonIdentification/muonEvent/muonEvent/MuonParamDefs.h
@@ -43,10 +43,11 @@ namespace MuonParameters {
MuGirlLowBeta=15,
CaloTag=16,
CaloLikelihood=17,
- MuTagIMO=18,
- MuonCombinedRefit=19,
- ExtrapolateMuonToIP=20,
- NumberOfMuonAuthors=21 // increase this guy when adding
+ CaloScore=18,
+ MuTagIMO=19,
+ MuonCombinedRefit=20,
+ ExtrapolateMuonToIP=21,
+ NumberOfMuonAuthors=22 // increase this guy when adding
};
@@ -85,9 +86,10 @@ namespace MuonParameters {
author.push_back("MuGirlLowBeta"); // 15
author.push_back("CaloTag");
author.push_back("CaloLikelihood");
+ author.push_back("CaloScore");
author.push_back("MuTagIMO");
- author.push_back("MuonCombinedRefit");
- author.push_back("ExtrapolateMuonToIP"); // 20
+ author.push_back("MuonCombinedRefit"); // 20
+ author.push_back("ExtrapolateMuonToIP");
}
/**The member*/
diff --git a/Reconstruction/MuonIdentification/muonEvent/src/CaloEnergy.cxx b/Reconstruction/MuonIdentification/muonEvent/src/CaloEnergy.cxx
index 840d93df8005335bd9b4d58b4c33a9fd3406fe6a..e311bf4ef08c8b36675aa131e5347054bd56b60f 100644
--- a/Reconstruction/MuonIdentification/muonEvent/src/CaloEnergy.cxx
+++ b/Reconstruction/MuonIdentification/muonEvent/src/CaloEnergy.cxx
@@ -18,6 +18,7 @@ using namespace Trk;
CaloEnergy::CaloEnergy (void)
: EnergyLoss(0,0,0,0),
m_caloLRLikelihood (0),
+ m_caloMuonScore (0),
m_caloMuonIdTag (0),
m_fsrCandidateEnergy (0),
m_deposits (),
@@ -32,6 +33,7 @@ CaloEnergy::CaloEnergy (void)
CaloEnergy::CaloEnergy (const Trk::EnergyLoss& eloss)
: EnergyLoss( eloss ),
m_caloLRLikelihood (0),
+ m_caloMuonScore (0),
m_caloMuonIdTag (0),
m_fsrCandidateEnergy (0),
m_deposits (),
@@ -49,10 +51,12 @@ CaloEnergy::CaloEnergy (float deltaE,
float sigmaPlusDeltaE,
unsigned short energyLossType,
float likelihood,
+ float muonScore,
unsigned short tag)
: EnergyLoss(deltaE, sigmaDeltaE, sigmaMinusDeltaE, sigmaPlusDeltaE ),
m_caloLRLikelihood (likelihood),
+ m_caloMuonScore (muonScore),
m_caloMuonIdTag (tag),
m_deposits (),
m_etCore (0.0),
@@ -72,12 +76,14 @@ CaloEnergy::CaloEnergy (float deltaE,
float sigmaPlusDeltaE,
unsigned short energyLossType,
float likelihood,
+ float muonScore,
unsigned short tag,
const std::vector<DepositInCalo>& deposits)
: EnergyLoss(deltaE, sigmaDeltaE, sigmaMinusDeltaE, sigmaPlusDeltaE ),
m_energyLossType (static_cast<CaloEnergy::EnergyLossType>(energyLossType)),
m_caloLRLikelihood (likelihood),
+ m_caloMuonScore (muonScore),
m_caloMuonIdTag (tag),
m_fsrCandidateEnergy (0.0),
m_deposits (deposits),
@@ -95,6 +101,7 @@ CaloEnergy::CaloEnergy (const CaloEnergy& caloEnergy)
: EnergyLoss ( caloEnergy ),
m_energyLossType (caloEnergy.m_energyLossType),
m_caloLRLikelihood (caloEnergy.m_caloLRLikelihood),
+ m_caloMuonScore (caloEnergy.m_caloMuonScore),
m_caloMuonIdTag (caloEnergy.m_caloMuonIdTag),
m_fsrCandidateEnergy (caloEnergy.m_fsrCandidateEnergy),
m_deposits (caloEnergy.m_deposits),
@@ -115,6 +122,7 @@ CaloEnergy& CaloEnergy::operator=(const CaloEnergy& rhs) {
EnergyLoss::operator=( rhs );
m_energyLossType = rhs.m_energyLossType;
m_caloLRLikelihood = rhs.m_caloLRLikelihood;
+ m_caloMuonScore = rhs.m_caloMuonScore;
m_caloMuonIdTag = rhs.m_caloMuonIdTag;
m_fsrCandidateEnergy = rhs.m_fsrCandidateEnergy;
m_deposits = rhs.m_deposits;
diff --git a/Reconstruction/RecAlgs/src/JobOptsDumperAlg.h b/Reconstruction/RecAlgs/src/JobOptsDumperAlg.h
index 936e8d8bf3cf3e5056c2009d05620b20aad19246..bd86ae90aa58377501d9f30338c5de5dff27a686 100755
--- a/Reconstruction/RecAlgs/src/JobOptsDumperAlg.h
+++ b/Reconstruction/RecAlgs/src/JobOptsDumperAlg.h
@@ -7,7 +7,7 @@
#ifndef RECO_ALGS_JOBOPTIONSDUMPERALG_H
#define RECO_ALGS_JOBOPTIONSDUMPERALG_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgorithm.h"
#include <string>
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py b/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
index e0c49adb64615745d03ad7629ab073549a4f5514..144f768a016c1cf0ba73dff7e953d5b096bf3fbf 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
@@ -140,11 +140,12 @@ if _streamRDO:
alg = xAODMaker__TrigDecisionCnvAlg()
alg.AODKey = "TrigDecision"
alg.xAODKey = "xTrigDecision"
- alg.ExtraOutputs = [('xAOD::TrigDecision','StoreGateSvc+xTrigDecision')]
topSequence.insert(idx+1, alg)
from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__TrigNavigationCnvAlg
trigNavCnv = xAODMaker__TrigNavigationCnvAlg()
- trigNavCnv.ExtraOutputs = [('xAOD::TrigNavigation','StoreGateSvc+TrigNavigation')]
+ trigNavCnv.doL2 = False
+ trigNavCnv.doEF = False
+ trigNavCnv.doHLT = True
topSequence.insert(idx+2, trigNavCnv)
_TriggerESDList = {}
_TriggerAODList = {}
diff --git a/Reconstruction/RecTPCnv/RecTPCnv/CaloEnergy_p1.h b/Reconstruction/RecTPCnv/RecTPCnv/CaloEnergy_p1.h
index 8de413bf22642085ac00fad47fbe88f5b3c07b1f..53e9d8335f0a350ac02debc324e06822371a0731 100644
--- a/Reconstruction/RecTPCnv/RecTPCnv/CaloEnergy_p1.h
+++ b/Reconstruction/RecTPCnv/RecTPCnv/CaloEnergy_p1.h
@@ -43,6 +43,7 @@ public:
m_energySigmaPlus(0),
m_energyLossType(0),
m_caloLRLikelihood(0),
+ m_caloMuonScore(0),
m_caloMuonIdTag(0),
m_fsrCandidateEnergy(0)
{}
@@ -69,6 +70,7 @@ public:
float m_energySigmaPlus;
int m_energyLossType;
float m_caloLRLikelihood;
+ float m_caloMuonScore;
unsigned short m_caloMuonIdTag;
float m_fsrCandidateEnergy;
std::vector<DepositInCalo_p1> m_deposits;
diff --git a/Reconstruction/RecTPCnv/RecTPCnv/CaloEnergy_p2.h b/Reconstruction/RecTPCnv/RecTPCnv/CaloEnergy_p2.h
index fe06b9ee2dff2619f2f922e5ed7a6d82170713ee..2952e6dda54b2c625a505116c381ffa88649a485 100644
--- a/Reconstruction/RecTPCnv/RecTPCnv/CaloEnergy_p2.h
+++ b/Reconstruction/RecTPCnv/RecTPCnv/CaloEnergy_p2.h
@@ -41,6 +41,7 @@ public:
CaloEnergy_p2()
: m_energyLossType(0),
m_caloLRLikelihood(0),
+ m_caloMuonScore(0),
m_caloMuonIdTag(0),
m_fsrCandidateEnergy(0),
m_etCore(0)
@@ -69,6 +70,7 @@ private:
int m_energyLossType;
float m_caloLRLikelihood;
+ float m_caloMuonScore;
unsigned short m_caloMuonIdTag;
float m_fsrCandidateEnergy;
std::vector<DepositInCalo_p2> m_deposits;
diff --git a/Reconstruction/RecTPCnv/src/CaloEnergyCnv_p1.cxx b/Reconstruction/RecTPCnv/src/CaloEnergyCnv_p1.cxx
index 32ff780906ff4f1f15fc79359b5b3a105edfe70c..64d27711e34873564594a2a4166f6eee69cc37e3 100644
--- a/Reconstruction/RecTPCnv/src/CaloEnergyCnv_p1.cxx
+++ b/Reconstruction/RecTPCnv/src/CaloEnergyCnv_p1.cxx
@@ -53,6 +53,7 @@ void CaloEnergyCnv_p1::persToTrans( const CaloEnergy_p1* pers,
trans->set_energyLossType (static_cast<CaloEnergy::EnergyLossType>(pers->m_energyLossType));
trans->set_caloLRLikelihood (pers->m_caloLRLikelihood);
+ trans->set_caloMuonScore (pers->m_caloMuonScore);
trans->set_caloMuonIdTag (pers->m_caloMuonIdTag);
trans->set_fsrCandidateEnergy(pers->m_fsrCandidateEnergy);
diff --git a/Reconstruction/RecTPCnv/src/CaloEnergyCnv_p2.cxx b/Reconstruction/RecTPCnv/src/CaloEnergyCnv_p2.cxx
index 628c7e04c58579124018c5d7b271231fce55e47e..818457099c30a4ef75ba4ca6c70513a44d37422e 100644
--- a/Reconstruction/RecTPCnv/src/CaloEnergyCnv_p2.cxx
+++ b/Reconstruction/RecTPCnv/src/CaloEnergyCnv_p2.cxx
@@ -52,6 +52,7 @@ void CaloEnergyCnv_p2::persToTrans( const CaloEnergy_p2* pers,
trans->set_energyLossType (static_cast<CaloEnergy::EnergyLossType>(pers->m_energyLossType));
trans->set_caloLRLikelihood (pers->m_caloLRLikelihood);
+ trans->set_caloMuonScore (pers->m_caloMuonScore);
trans->set_caloMuonIdTag (pers->m_caloMuonIdTag);
trans->set_fsrCandidateEnergy(pers->m_fsrCandidateEnergy);
@@ -83,6 +84,7 @@ void CaloEnergyCnv_p2::transToPers( const CaloEnergy* trans,
pers->m_energyLossType = trans->energyLossType();
pers->m_caloLRLikelihood = trans->caloLRLikelihood();
+ pers->m_caloMuonScore = trans->caloMuonScore();
pers->m_caloMuonIdTag = trans->caloMuonIdTag();
pers->m_fsrCandidateEnergy = trans->fsrCandidateEnergy();
diff --git a/Reconstruction/RecTPCnv/src/MuonCnv_p1.cxx b/Reconstruction/RecTPCnv/src/MuonCnv_p1.cxx
index a40ea17e13bc1c22d2d046c43b155131c62301fe..8ca1812669c43e1586fbdbb8e9ed10698c2cdbac 100644
--- a/Reconstruction/RecTPCnv/src/MuonCnv_p1.cxx
+++ b/Reconstruction/RecTPCnv/src/MuonCnv_p1.cxx
@@ -147,10 +147,11 @@ void MuonCnv_p1::persToTrans( const Muon_p1* pers,
float sigma = (sigmaM+sigmaP)/2.0;
unsigned short elossT = static_cast<unsigned short> (pers->m_caloEnergyLoss.m_energyLossType);
float caloLR = pers->m_caloEnergyLoss.m_caloLRLikelihood;
+ float caloScore = pers->m_caloEnergyLoss.m_caloMuonScore;
unsigned short tag = static_cast<unsigned short>(pers->m_caloEnergyLoss.m_fsrCandidateEnergy);
float fsrEnergy = pers->m_caloEnergyLoss.m_fsrCandidateEnergy;
- CaloEnergy * caloEnergy = new CaloEnergy(deltaE, sigma, sigmaM, sigmaP, elossT, caloLR, tag) ;
+ CaloEnergy * caloEnergy = new CaloEnergy(deltaE, sigma, sigmaM, sigmaP, elossT, caloLR, caloScore, tag) ;
caloEnergy->set_fsrCandidateEnergy ( fsrEnergy );
std::vector<DepositInCalo> deposits;
deposits.reserve( pers->m_caloEnergyLoss.m_deposits.size() );
diff --git a/Reconstruction/RecTPCnv/src/MuonCnv_p2.cxx b/Reconstruction/RecTPCnv/src/MuonCnv_p2.cxx
index eb8c663219fe5035c723a1a292ab1571d2a11b93..d2d31738c1eb5a430399ab782d8bbca8a87843fc 100644
--- a/Reconstruction/RecTPCnv/src/MuonCnv_p2.cxx
+++ b/Reconstruction/RecTPCnv/src/MuonCnv_p2.cxx
@@ -159,10 +159,11 @@ void MuonCnv_p2::persToTrans( const Muon_p2* pers,
float sigma = (sigmaM+sigmaP)/2.0;
unsigned short elossT = static_cast<unsigned short> (pers->m_caloEnergyLoss.m_energyLossType);
float caloLR = pers->m_caloEnergyLoss.m_caloLRLikelihood;
+ float caloScore = pers->m_caloEnergyLoss.m_caloMuonScore;
unsigned short tag = static_cast<unsigned short>(pers->m_caloEnergyLoss.m_fsrCandidateEnergy);
float fsrEnergy = pers->m_caloEnergyLoss.m_fsrCandidateEnergy;
- CaloEnergy * caloEnergy = new CaloEnergy(deltaE, sigma, sigmaM, sigmaP, elossT, caloLR, tag) ;
+ CaloEnergy * caloEnergy = new CaloEnergy(deltaE, sigma, sigmaM, sigmaP, elossT, caloLR, caloScore, tag) ;
caloEnergy->set_fsrCandidateEnergy ( fsrEnergy );
std::vector<DepositInCalo> deposits;
deposits.reserve( pers->m_caloEnergyLoss.m_deposits.size() );
diff --git a/Reconstruction/RecTPCnv/test/CaloEnergyCnv_p1_test.cxx b/Reconstruction/RecTPCnv/test/CaloEnergyCnv_p1_test.cxx
index eaa3b763ae619643f26676669bbee1cb9ee74955..f6bc6f58233b817b5b709f9f472f9b67843d47c7 100644
--- a/Reconstruction/RecTPCnv/test/CaloEnergyCnv_p1_test.cxx
+++ b/Reconstruction/RecTPCnv/test/CaloEnergyCnv_p1_test.cxx
@@ -83,7 +83,7 @@ void test1()
std::vector<DepositInCalo> deposits;
deposits.emplace_back (CaloCell_ID::EMB2, 10.5, 11.5, 12.5);
deposits.emplace_back (CaloCell_ID::EME2, 20.5, 21.5, 22.5);
- CaloEnergy trans1 (1.5, 2.5, 3.5, 4.5, 1, 5.5, 20, deposits);
+ CaloEnergy trans1 (1.5, 2.5, 3.5, 4.5, 1, 5.5, 0.8, 20, deposits);
CaloEnergy_p1 pers1;
pers1.m_energyLossType = static_cast<int>(trans1.energyLossType());
diff --git a/Reconstruction/RecTPCnv/test/CaloEnergyCnv_p2_test.cxx b/Reconstruction/RecTPCnv/test/CaloEnergyCnv_p2_test.cxx
index 1a36b035d71b105ab1b725edc7377db32d484926..9c0cb94e0039e919d9f5e91ee01020bfab5971d0 100644
--- a/Reconstruction/RecTPCnv/test/CaloEnergyCnv_p2_test.cxx
+++ b/Reconstruction/RecTPCnv/test/CaloEnergyCnv_p2_test.cxx
@@ -85,7 +85,7 @@ void test1()
std::vector<DepositInCalo> deposits;
deposits.emplace_back (CaloCell_ID::EMB2, 10.5, 11.5, 12.5);
deposits.emplace_back (CaloCell_ID::EME2, 20.5, 21.5, 22.5);
- CaloEnergy trans1 (1.5, 2.5, 3.5, 4.5, 1, 5.5, 20, deposits);
+ CaloEnergy trans1 (1.5, 2.5, 3.5, 4.5, 1, 5.5, 0.8, 20, deposits);
testit (trans1);
}
diff --git a/Reconstruction/RecTPCnv/test/MuonCaloEnergyContainerCnv_p1_test.cxx b/Reconstruction/RecTPCnv/test/MuonCaloEnergyContainerCnv_p1_test.cxx
index f892fe596ac1c158e27808e6244260778ade910d..24feb41962030f5441c5b5ed602fc3294cfbd851 100644
--- a/Reconstruction/RecTPCnv/test/MuonCaloEnergyContainerCnv_p1_test.cxx
+++ b/Reconstruction/RecTPCnv/test/MuonCaloEnergyContainerCnv_p1_test.cxx
@@ -89,7 +89,7 @@ std::unique_ptr<CaloEnergy> make_one (float offs)
deposits.emplace_back (CaloCell_ID::EMB2, offs+10.5, offs+11.5, offs+12.5);
deposits.emplace_back (CaloCell_ID::EME2, offs+20.5, offs+21.5, offs+22.5);
return std::make_unique<CaloEnergy> (offs+1.5, offs+2.5, offs+3.5, offs+4.5,
- 2, offs+5.5, offs+20,
+ 2, offs+5.5, offs+0.8, offs+20,
deposits);
}
diff --git a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
index d3b7c8b460f9a17284010b104d12c53b2effc898..d851ec7de07ea2b91236be13c69e6aee936ffc43 100644
--- a/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
+++ b/Reconstruction/RecoTools/CaloClusterMatching/src/CaloClusterMatchLinkAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CaloClusterMatching/TopoClusterMap.h"
diff --git a/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertex.cxx b/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertex.cxx
index ab072e6d8d55019909e8f921e84aed4f544926e2..61bd45a41de2404db01b59393c19e4cd74587388 100755
--- a/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertex.cxx
+++ b/Reconstruction/RecoTools/TrackToVertex/src/TrackToVertex.cxx
@@ -38,17 +38,13 @@ Reco::TrackToVertex::~TrackToVertex()
{
}
-
-
-// Athena standard methods
-
// initialize
StatusCode Reco::TrackToVertex::initialize()
{
// Get the GeometryBuilder AlgTool
if ( m_extrapolator.retrieve().isFailure() ) {
ATH_MSG_WARNING( "Failed to retrieve tool " << m_extrapolator << " - extrapolations will not be performed." );
- } else
+ } else
ATH_MSG_INFO( "Retrieved tool " << m_extrapolator);
if(!m_ForceBeamSpotZero){
ATH_CHECK(m_beamSpotKey.initialize());
@@ -83,8 +79,8 @@ StatusCode Reco::TrackToVertex::finalize()
const Trk::Perigee* Reco::TrackToVertex::perigeeAtVertex(const Rec::TrackParticle& tp) const {
-
- // retrieve the reconstructed Vertex from the TrackParticle
+
+ // retrieve the reconstructed Vertex from the TrackParticle
const Trk::VxCandidate* vxCandidate = tp.reconstructedVertex();
if (vxCandidate!=0) {
// create a global position from this
@@ -105,25 +101,32 @@ const Trk::Perigee* Reco::TrackToVertex::perigeeAtVertex(const xAOD::TrackPartic
const Trk::Perigee* Reco::TrackToVertex::perigeeAtVertex(const xAOD::TrackParticle& tp, const Amg::Vector3D& gp) const {
// preparation
- Trk::PerigeeSurface persf(gp);
- const Trk::Perigee* vertexPerigee = 0;
+ Trk::PerigeeSurface persf(gp);
+ const Trk::Perigee* vertexPerigee = nullptr;
// retrieve the Perigee from the track particle
const Trk::Perigee& trackparPerigee = tp.perigeeParameters();
- if ( trackparPerigee.associatedSurface() == persf) {
- ATH_MSG_DEBUG("Perigee of TrackParticle is already expressed to given vertex, a copy is returned.");
- return(trackparPerigee.clone());
- } else
- vertexPerigee = dynamic_cast<const Trk::Perigee*>(m_extrapolator->extrapolateDirectly(trackparPerigee, persf));
+ if (trackparPerigee.associatedSurface() == persf) {
+ ATH_MSG_DEBUG("Perigee of TrackParticle is already expressed to given "
+ "vertex, a copy is returned.");
+ return (trackparPerigee.clone());
+ } else {
+ const Trk::TrackParameters* extrapResult =
+ m_extrapolator->extrapolateDirectly(trackparPerigee, persf);
+ if (extrapResult && extrapResult->surfaceType() == Trk::Surface::Perigee) {
+ vertexPerigee = static_cast<const Trk::Perigee*>(extrapResult);
+ }
+ }
if (!vertexPerigee)
- ATH_MSG_DEBUG("Extrapolation to Perigee failed, a NULL pointer is returned.");
- return vertexPerigee;
+ ATH_MSG_DEBUG(
+ "Extrapolation to Perigee failed, a NULL pointer is returned.");
+ return vertexPerigee;
}
const Trk::Perigee* Reco::TrackToVertex::perigeeAtVertex(const Rec::TrackParticle& tp, const Amg::Vector3D& gp) const {
// preparation
- Trk::PerigeeSurface persf(gp);
- const Trk::Perigee* vertexPerigee = 0;
+ Trk::PerigeeSurface persf(gp);
+ const Trk::Perigee* vertexPerigee = nullptr;
// retrieve the Perigee from the track particle
const Trk::Perigee* trackparPerigee = tp.measuredPerigee();
if (trackparPerigee){
@@ -131,43 +134,59 @@ const Trk::Perigee* Reco::TrackToVertex::perigeeAtVertex(const Rec::TrackParticl
{
ATH_MSG_DEBUG("Perigee of TrackParticle is already expressed to given vertex, a copy is returned.");
return(trackparPerigee->clone());
- } else
- vertexPerigee = dynamic_cast<const Trk::Perigee*>(m_extrapolator->extrapolateDirectly(*trackparPerigee, persf));
+ } else {
+ const Trk::TrackParameters* extrapResult =
+ m_extrapolator->extrapolateDirectly(*trackparPerigee, persf);
+ if (extrapResult &&
+ extrapResult->surfaceType() == Trk::Surface::Perigee) {
+ vertexPerigee = static_cast<const Trk::Perigee*>(extrapResult);
+ }
+ }
} else {
- ATH_MSG_DEBUG("No Perigee found in TrackParticle, a NULL pointer is returned.");
- return 0;
+ ATH_MSG_DEBUG(
+ "No Perigee found in TrackParticle, a NULL pointer is returned.");
+ return nullptr;
}
- if (!vertexPerigee)
- ATH_MSG_DEBUG("Extrapolation to Perigee failed, a NULL pointer is returned.");
- return vertexPerigee;
+ if (!vertexPerigee){
+ ATH_MSG_DEBUG(
+ "Extrapolation to Perigee failed, a NULL pointer is returned.");
+ }
+ return vertexPerigee;
}
const Trk::Perigee* Reco::TrackToVertex::perigeeAtVertex(const Trk::Track& track, const Amg::Vector3D& gp) const {
- Trk::PerigeeSurface persf(gp);
- const Trk::Perigee* vertexPerigee = dynamic_cast<const Trk::Perigee*>(m_extrapolator->extrapolate(track, persf));
- if (!vertexPerigee){
- const Trk::Perigee* trackPerigee = track.perigeeParameters();
- if ( trackPerigee && trackPerigee->associatedSurface() == persf )
- {
- ATH_MSG_DEBUG("Perigee of Track is already expressed to given vertex, a copy is returned.");
- vertexPerigee = trackPerigee->clone();
- } else
- ATH_MSG_DEBUG("Extrapolation to Perigee failed, NULL pointer is returned.");
- }
+ Trk::PerigeeSurface persf(gp);
+ const Trk::Perigee* vertexPerigee = nullptr;
+ const Trk::TrackParameters* extrapResult =
+ m_extrapolator->extrapolate(track, persf);
+ if (extrapResult && extrapResult->surfaceType() == Trk::Surface::Perigee) {
+ vertexPerigee = static_cast<const Trk::Perigee*>(extrapResult);
+ }
+ if (!vertexPerigee) {
+ const Trk::Perigee* trackPerigee = track.perigeeParameters();
+ if (trackPerigee && trackPerigee->associatedSurface() == persf) {
+ ATH_MSG_DEBUG("Perigee of Track is already expressed to given vertex, a "
+ "copy is returned.");
+ vertexPerigee = trackPerigee->clone();
+ } else{
+ ATH_MSG_DEBUG(
+ "Extrapolation to Perigee failed, NULL pointer is returned.");
+ }
+ }
return (vertexPerigee);
}
const Trk::Perigee* Reco::TrackToVertex::perigeeAtBeamspot(const Rec::TrackParticle& tp, const InDet::BeamSpotData* beamspot) const
-{
+{
return perigeeAtVertex(tp, beamspot ? beamspot->beamVtx().position() : s_origin);
}
const Trk::Perigee* Reco::TrackToVertex::perigeeAtBeamspot(const xAOD::TrackParticle& tp, const InDet::BeamSpotData* beamspot) const
-{
+{
return perigeeAtVertex(tp, beamspot ? beamspot->beamVtx().position() : s_origin);
}
@@ -180,8 +199,8 @@ const Trk::Perigee* Reco::TrackToVertex::perigeeAtBeamspot(const Trk::Track& tra
const Trk::Perigee* Reco::TrackToVertex::perigeeAtBeamline(const Trk::Track& track, const InDet::BeamSpotData* beamspotptr) const
{
-
- Amg::Vector3D beamspot(s_origin);
+
+ Amg::Vector3D beamspot(s_origin);
float tiltx = 0.0;
float tilty = 0.0;
if (beamspotptr) {
@@ -195,9 +214,14 @@ const Trk::Perigee* Reco::TrackToVertex::perigeeAtBeamline(const Trk::Track& tra
*amgTransf *= Amg::AngleAxis3D(tilty, Amg::Vector3D(0.,1.,0.));
*amgTransf *= Amg::AngleAxis3D(tiltx, Amg::Vector3D(1.,0.,0.));
// preparation
- Trk::PerigeeSurface persf(amgTransf);
-
- const Trk::Perigee* vertexPerigee = dynamic_cast<const Trk::Perigee*>(m_extrapolator->extrapolate(track, persf));
+ Trk::PerigeeSurface persf(amgTransf);
+
+ const Trk::Perigee* vertexPerigee = nullptr;
+ const Trk::TrackParameters* extrapResult =
+ m_extrapolator->extrapolate(track, persf);
+ if (extrapResult && extrapResult->surfaceType() == Trk::Surface::Perigee) {
+ vertexPerigee = static_cast<const Trk::Perigee*>(extrapResult);
+ }
if (!vertexPerigee) {
// workaround.
// try again using the first track parameter set, since the current extrapolator will
@@ -207,24 +231,30 @@ const Trk::Perigee* Reco::TrackToVertex::perigeeAtBeamline(const Trk::Track& tra
const DataVector<const Trk::TrackParameters> *track_parameter_list= track.trackParameters();
if (track_parameter_list) {
for(const Trk::TrackParameters *trk_params: *track_parameter_list) {
- if (!trk_params) continue;
- vertexPerigee = dynamic_cast<const Trk::Perigee*>(m_extrapolator->extrapolate(*trk_params, persf));
+ if (!trk_params) {
+ continue;
+ }
+ extrapResult = m_extrapolator->extrapolate(*trk_params, persf);
+ if (extrapResult &&
+ extrapResult->surfaceType() == Trk::Surface::Perigee) {
+ vertexPerigee = static_cast<const Trk::Perigee*>(extrapResult);
+ }
break;
}
}
}
- if (!vertexPerigee){
+ if (!vertexPerigee) {
const Trk::Perigee* trackPerigee = track.perigeeParameters();
- if ( trackPerigee && trackPerigee->associatedSurface() == persf )
- {
- ATH_MSG_DEBUG("Perigee of Track is already expressed to given vertex, a copy is returned.");
- vertexPerigee = trackPerigee->clone();
- } else{
- ATH_MSG_DEBUG("Extrapolation to Beamline Perigee failed, NULL pointer is returned.");
- }
+ if (trackPerigee && trackPerigee->associatedSurface() == persf) {
+ ATH_MSG_DEBUG("Perigee of Track is already expressed to given vertex, a "
+ "copy is returned.");
+ vertexPerigee = trackPerigee->clone();
+ } else {
+ ATH_MSG_DEBUG(
+ "Extrapolation to Beamline Perigee failed, NULL pointer is returned.");
}
- return (vertexPerigee);
-
+ }
+ return (vertexPerigee);
}
const Trk::TrackParameters* Reco::TrackToVertex::trackAtBeamline(const Rec::TrackParticle& /*tp*/) const
@@ -233,12 +263,12 @@ const Trk::TrackParameters* Reco::TrackToVertex::trackAtBeamline(const Rec::Trac
return 0;
//return m_extrapolator->extrapolate(tp, *m_beamLine);
}
-
+
const Trk::TrackParameters* Reco::TrackToVertex::trackAtBeamline(const xAOD::TrackParticle& tp,
const InDet::BeamSpotData* beamspotptr) const
{
-
- Amg::Vector3D beamspot(s_origin);
+
+ Amg::Vector3D beamspot(s_origin);
float tiltx = 0.0;
float tilty = 0.0;
if (beamspotptr) {
@@ -252,7 +282,7 @@ const Trk::TrackParameters* Reco::TrackToVertex::trackAtBeamline(const xAOD::Tra
*amgTransf *= Amg::AngleAxis3D(tilty, Amg::Vector3D(0.,1.,0.));
*amgTransf *= Amg::AngleAxis3D(tiltx, Amg::Vector3D(1.,0.,0.));
// preparation
- Trk::PerigeeSurface persf(amgTransf);
+ Trk::PerigeeSurface persf(amgTransf);
const Trk::TrackParameters* vertexPerigee = 0;
// retrieve the Perigee from the track particle
const Trk::Perigee& trackparPerigee = tp.perigeeParameters();
@@ -260,7 +290,7 @@ const Trk::TrackParameters* Reco::TrackToVertex::trackAtBeamline(const xAOD::Tra
ATH_MSG_DEBUG("Perigee of TrackParticle is already expressed to given vertex, a copy is returned.");
delete amgTransf;
return(trackparPerigee.clone());
- } else
+ } else
vertexPerigee = m_extrapolator->extrapolateDirectly(trackparPerigee, persf);
if (!vertexPerigee){
ATH_MSG_DEBUG("Extrapolation to Beam Line failed, a NULL pointer is returned.");
diff --git a/Reconstruction/egamma/egammaAlgs/CMakeLists.txt b/Reconstruction/egamma/egammaAlgs/CMakeLists.txt
index b71e28930fe9f2377d0c8a3f4a3fd7257e369f0a..e2a2dd234ffd668a1aa65fdaa03e1c8e97d20063 100644
--- a/Reconstruction/egamma/egammaAlgs/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaAlgs/CMakeLists.txt
@@ -5,48 +5,15 @@
# Declare the package name:
atlas_subdir( egammaAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaBaseComps
- Event/EventKernel
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODTruth
- GaudiKernel
- PhysicsAnalysis/MCTruthClassifier
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloUtils
- Calorimeter/CaloDetDescr
- Control/AthenaKernel
- Control/StoreGate
- Event/FourMomUtils
- Event/xAOD/xAODTracking
- InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetRecTools/InDetConversionFinderTools
- InnerDetector/InDetRecTools/InDetRecToolInterfaces
- PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces
- Reconstruction/egamma/egammaInterfaces
- Reconstruction/egamma/egammaRecEvent
- Reconstruction/egamma/egammaMVACalib
- Reconstruction/egamma/egammaUtils
- Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
- Reconstruction/RecoTools/RecoToolInterfaces
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTrackLink
- Tracking/TrkTools/TrkToolInterfaces
- Tracking/TrkEvent/TrkCaloExtension)
-
-
-
atlas_add_component( egammaAlgs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS
- LINK_LIBRARIES AthenaBaseComps EventKernel xAODCaloEvent xAODEgamma xAODTruth GaudiKernel
- MCTruthClassifierLib CaloGeoHelpers CaloUtilsLib CaloDetDescrLib AthenaKernel StoreGateLib
+ INCLUDE_DIRS
+ LINK_LIBRARIES AthenaBaseComps EventKernel xAODCaloEvent xAODEgamma xAODTruth GaudiKernel
+ MCTruthClassifierLib CaloGeoHelpers CaloUtilsLib CaloDetDescrLib AthenaKernel StoreGateLib
xAODTracking InDetReadoutGeometry EgammaAnalysisInterfacesLib egammaRecEvent egammaUtils
- TrkToolInterfaces InDetRecToolInterfaces FourMomUtils RecoToolInterfaces TrkTrack
+ TrkToolInterfaces InDetRecToolInterfaces FourMomUtils RecoToolInterfaces TrkTrack
TrkPseudoMeasurementOnTrack InDetConversionFinderToolsLib TrkCaloExtension egammaInterfacesLib )
-
+
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
index d2e04127c24dd9ae7ad3e5a0fb67a278b647a732..a3a53e0094712eaac119bae0c327449954a28f42 100644
--- a/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/components/egammaAlgs_entries.cxx
@@ -1,4 +1,3 @@
-#include "../egammaBuilder.h"
#include "../egammaRecBuilder.h"
#include "../topoEgammaBuilder.h"
#include "../egammaForwardBuilder.h"
@@ -12,7 +11,6 @@
#include "../egammaSelectedTrackCopy.h"
#include "../EMGSFCaloExtensionBuilder.h"
-DECLARE_COMPONENT( egammaBuilder )
DECLARE_COMPONENT( egammaRecBuilder )
DECLARE_COMPONENT( topoEgammaBuilder )
DECLARE_COMPONENT( egammaForwardBuilder )
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaBuilder.cxx
deleted file mode 100644
index b9d6a7bb435adf00d0e4e43316eee947007f3e1d..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAlgs/src/egammaBuilder.cxx
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
- */
-
-/********************************************************************
-
-NAME: egammaBuilder.cxx
-PACKAGE: offline/Reconstruction/egamma/egammaRec
-
-AUTHORS: H. Ma MW, SR , FD , JH , KT , CA, BL
-CREATED: Nov 2000
-CHANGES: Mar 2014 (CA / BL) xAOD migration
-
-PURPOSE: Algorithm which makes a egammaObjectCollection. For each cluster
-create a new egamma object and fills it then in the egammaContainer.
-The algorithm takes care to make the objects containing shower
-shape variables, leakage into had. calo, objects for track matching
-and eventually conversions.
- ********************************************************************/
-
-// INCLUDE HEADER FILES:
-
-#include "egammaBuilder.h"
-
-#include "AthenaKernel/errorcheck.h"
-#include "GaudiKernel/IToolSvc.h"
-
-#include "xAODCaloEvent/CaloClusterContainer.h"
-#include "xAODTracking/TrackParticleContainer.h"
-#include "xAODTracking/VertexContainer.h"
-#include "xAODEgamma/EgammaContainer.h"
-#include "xAODEgamma/ElectronContainer.h"
-#include "xAODEgamma/PhotonContainer.h"
-#include "xAODEgamma/ElectronAuxContainer.h"
-#include "xAODEgamma/PhotonAuxContainer.h"
-#include "egammaRecEvent/egammaRecContainer.h"
-
-#include "xAODEgamma/Electron.h"
-#include "xAODEgamma/Photon.h"
-
-
-#include "egammaUtils/egammaDuplicateRemoval.h"
-
-#include "CaloDetDescr/CaloDetDescrManager.h"
-#include "CaloUtils/CaloClusterStoreHelper.h"
-#include "CaloGeoHelpers/CaloPhiRange.h"
-
-#include "StoreGate/ReadHandle.h"
-#include "StoreGate/WriteHandle.h"
-
-// INCLUDE GAUDI HEADER FILES:
-#include <algorithm>
-#include <cmath>
-
-
-// END OF HEADER FILES INCLUDE
-
-/////////////////////////////////////////////////////////////////
-
-// CONSTRUCTOR:
-
-egammaBuilder::egammaBuilder(const std::string& name,
- ISvcLocator* pSvcLocator):
- AthAlgorithm(name, pSvcLocator),
- m_timingProfile(nullptr)
-{
-}
-
-// ================================================================
-egammaBuilder::~egammaBuilder()
-{
- //
- // destructor
- //
-}
-
-// =================================================================
-StatusCode egammaBuilder::initialize()
-{
- //
- // initialize method
- //
-
- ATH_MSG_DEBUG("Initializing egammaBuilder");
-
- // the keys
- ATH_CHECK(m_electronOutputKey.initialize());
- ATH_CHECK(m_photonOutputKey.initialize());
- ATH_CHECK(m_inputClusterContainerKey.initialize());
- ATH_CHECK(m_topoSeededClusterContainerKey.initialize(m_doTopoSeededPhotons));
- ATH_CHECK(m_egammaRecContainerKey.initialize());
-
- // retrieve track match builder
- CHECK( RetrieveEMTrackMatchBuilder() );
-
- // retrieve conversion builder
- CHECK( RetrieveEMConversionBuilder() );
-
- // retrieve EM Cluster Tool
- ATH_CHECK( m_clusterTool.retrieve() );
-
- // retrieve ambiguity tool
- ATH_CHECK( m_ambiguityTool.retrieve() );
-
- //retrieve shower builder
- ATH_CHECK( m_ShowerTool.retrieve() );
-
- ATH_MSG_INFO("Retrieving " << m_egammaTools.size() << " tools for egamma objects");
- ATH_CHECK( m_egammaTools.retrieve() );
-
- ATH_MSG_INFO("Retrieving " << m_electronTools.size() << " tools for electrons");
- ATH_CHECK( m_electronTools.retrieve() );
-
- ATH_MSG_INFO("Retrieving " << m_photonTools.size() << " tools for photons");
- ATH_CHECK( m_photonTools.retrieve() );
-
- // retrieve timing profile
- CHECK( service("ChronoStatSvc",m_timingProfile) );
-
- ATH_MSG_INFO("Initialization completed successfully");
- return StatusCode::SUCCESS;
-}
-
-
-// ====================================================================
-StatusCode egammaBuilder::RetrieveEMTrackMatchBuilder(){
- //
- // retrieve EMTrackMatchBuilder tool
- //
- if (!m_doTrackMatching) {
- m_trackMatchBuilder.disable();
- return StatusCode::SUCCESS;
- }
-
- if (m_trackMatchBuilder.empty()) {
- ATH_MSG_ERROR("EMTrackMatchBuilder is empty, but track matching is enabled");
- return StatusCode::FAILURE;
- }
-
-
- if(m_trackMatchBuilder.retrieve().isFailure()) {
- ATH_MSG_ERROR("Unable to retrieve "<<m_trackMatchBuilder);
- return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG("Retrieved Tool "<<m_trackMatchBuilder);
-
- return StatusCode::SUCCESS;
-}
-
-// ====================================================================
-StatusCode egammaBuilder::RetrieveEMConversionBuilder(){
- //
- // retrieve EMConversionBuilder tool
- //
-
- if (!m_doConversions) {
- m_conversionBuilder.disable();
- return StatusCode::SUCCESS;
- }
-
- if (m_conversionBuilder.empty()) {
- ATH_MSG_ERROR("EMConversionBuilder is empty");
- return StatusCode::FAILURE;
- }
-
- if(m_conversionBuilder.retrieve().isFailure()) {
- ATH_MSG_ERROR("Unable to retrieve "<<m_conversionBuilder);
- return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG("Retrieved Tool "<<m_conversionBuilder);
-
- return StatusCode::SUCCESS;
-}
-
-// ====================================================================
-StatusCode egammaBuilder::finalize(){
- //
- // finalize method
- //
- return StatusCode::SUCCESS;
-}
-
-// ======================================================================
-StatusCode egammaBuilder::execute(){
- //
- // athena execute method
- //
-
- ATH_MSG_DEBUG("Executing egammaBuilder");
-
- // This we can drop once the Alg becomes re-entrant
- const EventContext& ctx = Gaudi::Hive::currentContext();
-
- // Chrono name for each Tool
- std::string chronoName;
-
- // create egammaRecContainer, ElectronContainer, PhotonContainer and register them
- //Build the initial egamma Rec objects for all copied Topo Clusters
- SG::WriteHandle<EgammaRecContainer> egammaRecs(m_egammaRecContainerKey);
- ATH_CHECK(egammaRecs.record(std::make_unique<EgammaRecContainer>()));
-
-
- SG::WriteHandle<xAOD::ElectronContainer> electronContainer(m_electronOutputKey);
- ATH_CHECK(electronContainer.record(std::make_unique<xAOD::ElectronContainer>(),
- std::make_unique<xAOD::ElectronAuxContainer>()));
-
- SG::WriteHandle<xAOD::PhotonContainer> photonContainer(m_photonOutputKey);
- ATH_CHECK(photonContainer.record(std::make_unique<xAOD::PhotonContainer>(),
- std::make_unique<xAOD::PhotonAuxContainer>()));
-
- // Loop over clusters and create egammaRec objects
- ATH_MSG_DEBUG("Creating egammaRec objects");
- SG::ReadHandle<xAOD::CaloClusterContainer> clusters(m_inputClusterContainerKey);
- // only for single-threaded running, remove later
- if (!clusters.isValid()) {
- ATH_MSG_FATAL("Could not retrieve cluster container " << m_inputClusterContainerKey.key());
- return StatusCode::FAILURE;
- }
-
- for (unsigned int i = 0; i < clusters->size(); ++i) {
- const ElementLink< xAOD::CaloClusterContainer > clusterLink( *clusters, i );
- const std::vector< ElementLink<xAOD::CaloClusterContainer> > elClusters {clusterLink};
- egammaRec *egRec = new egammaRec();
- egRec->setCaloClusters( elClusters );
- egammaRecs->push_back( egRec );
- }
-
- //
- if (m_doTrackMatching){
- ATH_MSG_DEBUG("Running TrackMatchBuilder");
- //
- std::string chronoName = this->name()+"_"+m_trackMatchBuilder->name();
- if(m_timingProfile) m_timingProfile->chronoStart(chronoName);
- //
- ATH_CHECK(m_trackMatchBuilder->executeRec(ctx,egammaRecs.ptr()));
- //
- if(m_timingProfile) m_timingProfile->chronoStop(chronoName);
- }
- //
- if (m_doConversions){
- ATH_MSG_DEBUG("Running ConversionBuilder");
- //
- chronoName = this->name()+"_"+m_conversionBuilder->name();
- if(m_timingProfile) m_timingProfile->chronoStart(chronoName);
- for (auto egRec : *egammaRecs) {
- if (m_conversionBuilder->executeRec(ctx,egRec).isFailure()){
- ATH_MSG_ERROR("Problem executing " << m_conversionBuilder);
- return StatusCode::FAILURE;
- }
- }
- if(m_timingProfile) m_timingProfile->chronoStop(chronoName);
- }
- ////////////////////////////
-
- // Run the ambiguity resolving to decide if we should create electron and/or photon
- static const SG::AuxElement::Accessor<uint8_t> acc("ambiguityType");
- static const SG::AuxElement::Accessor<ElementLink<xAOD::EgammaContainer> > ELink ("ambiguityLink");
- ElementLink<xAOD::EgammaContainer> dummylink;
-
- for (const auto& egRec : *egammaRecs){
-
- xAOD::AmbiguityTool::AmbiguityType type= xAOD::AmbiguityTool::unknown;
-
- ATH_MSG_DEBUG("Running AmbiguityTool");
- unsigned int author = m_ambiguityTool->ambiguityResolve(egRec->caloCluster(),
- egRec->vertex(),
- egRec->trackParticle(),
- type);
-
- ATH_MSG_DEBUG("...author: " << author);
- if (author == xAOD::EgammaParameters::AuthorUnknown) {
- continue;
- }
- //Electron
- if (author == xAOD::EgammaParameters::AuthorElectron){
- ATH_MSG_DEBUG("getElectron");
- if ( !getElectron(egRec, electronContainer.ptr(), author) ){
- return StatusCode::FAILURE;
- }
- acc(*(electronContainer->back())) = type;
- ELink(*(electronContainer->back()))=dummylink;
- }
- //Photon
- if (author == xAOD::EgammaParameters::AuthorPhoton ){
- ATH_MSG_DEBUG("getPhoton");
- if ( !getPhoton(egRec, photonContainer.ptr(), author) ){
- return StatusCode::FAILURE;
- }
- acc(*(photonContainer->back())) = type;
- ELink(*(photonContainer->back()))=dummylink;
- }
- //Both Electron and Photon
- if(author == xAOD::EgammaParameters::AuthorAmbiguous){
-
- ATH_MSG_DEBUG("get Electron and Photon");
-
- if ( !getPhoton(egRec, photonContainer.ptr(), author) ||
- !getElectron(egRec, electronContainer.ptr(), author)){
- return StatusCode::FAILURE;
- }
-
- acc(*(electronContainer->back())) = type;
- size_t photonIndex=photonContainer->size()-1;
- ElementLink<xAOD::EgammaContainer> linktoPhoton (*photonContainer,photonIndex);
- ELink(*(electronContainer->back()))=linktoPhoton;
-
- acc(*(photonContainer->back())) = type;
- size_t electronIndex=electronContainer->size()-1;
- ElementLink<xAOD::EgammaContainer> linktoElectron (*electronContainer,electronIndex);
- ELink(*(photonContainer->back()))=linktoElectron;
- }
- }
-
- // Add topo-seeded clusters to the photon collection
- if (m_doTopoSeededPhotons) {
- CHECK( addTopoSeededPhotons(photonContainer.ptr(), clusters.ptr()) );
- }
-
- const CaloDetDescrManager* calodetdescrmgr = nullptr;
- ATH_CHECK( detStore()->retrieve(calodetdescrmgr,"CaloMgr") );
- // Call tools
-
- /*
- * Shower Shapes
- */
- if (electronContainer.ptr()) {
- for (xAOD::Electron* electron : *electronContainer) {
- ATH_CHECK(m_ShowerTool->execute(ctx, *calodetdescrmgr, electron));
- }
- }
- if (photonContainer.ptr()) {
- for (xAOD::Photon* photon : *photonContainer) {
- ATH_CHECK(m_ShowerTool->execute(ctx, *calodetdescrmgr, photon));
- }
- }
-
- // First the final cluster/calibration
- ATH_MSG_DEBUG("Executing : " << m_clusterTool);
- if ( m_clusterTool->contExecute(ctx, *calodetdescrmgr ,electronContainer.ptr(), photonContainer.ptr()).isFailure() ){
- ATH_MSG_ERROR("Problem executing the " << m_clusterTool<<" tool");
- return StatusCode::FAILURE;
- }
-
-
- for (auto& tool : m_egammaTools)
- {
- CHECK( CallTool(ctx, tool, electronContainer.ptr(), photonContainer.ptr()) );
- }
-
- for (auto& tool : m_electronTools)
- {
- CHECK( CallTool(ctx, tool, electronContainer.ptr(), nullptr) );
- }
-
- for (auto& tool : m_photonTools)
- {
- CHECK( CallTool(ctx, tool, nullptr, photonContainer.ptr()) );
- }
- ATH_MSG_DEBUG("execute completed successfully");
-
- return StatusCode::SUCCESS;
-}
-
-// =====================================================
-StatusCode egammaBuilder::CallTool(const EventContext& ctx,
- ToolHandle<IegammaBaseTool>& tool,
- xAOD::ElectronContainer *electronContainer /* = 0*/,
- xAOD::PhotonContainer *photonContainer /* = 0*/)
-{
-
- std::string chronoName = this->name()+"_"+tool->name();
- if(m_timingProfile) m_timingProfile->chronoStart(chronoName);
-
- if (electronContainer)
- {
- ATH_MSG_DEBUG("Executing tool on electrons: " << tool );
- for (const auto& electron : *electronContainer)
- {
- if (tool->execute(ctx, electron).isFailure() )
- {
- ATH_MSG_ERROR("Problem executing tool on electrons: " << tool);
- return StatusCode::FAILURE;
- }
- }
- }
-
- if (photonContainer)
- {
- ATH_MSG_DEBUG("Executing tool on photons: " << tool );
- for (const auto& photon : *photonContainer)
- {
- if (tool->execute(ctx, photon).isFailure() )
- {
- ATH_MSG_ERROR("Problem executing tool on photons: " << tool);
- return StatusCode::FAILURE;
- }
- }
- }
-
- if(m_timingProfile) m_timingProfile->chronoStop(chronoName);
- return StatusCode::SUCCESS;
-}
-// =====================================================
-bool egammaBuilder::getElectron(const egammaRec* egRec,
- xAOD::ElectronContainer *electronContainer,
- unsigned int author)
-{
- if (!egRec || !electronContainer) return false;
-
- xAOD::Electron *electron = new xAOD::Electron();
- electronContainer->push_back( electron );
- electron->setAuthor( author );
-
- std::vector< ElementLink< xAOD::CaloClusterContainer > > clusterLinks;
- for (unsigned int i = 0 ; i < egRec->getNumberOfClusters(); ++i){
- clusterLinks.push_back( egRec->caloClusterElementLink(i) );
- }
- electron->setCaloClusterLinks( clusterLinks );
-
- std::vector< ElementLink< xAOD::TrackParticleContainer > > trackLinks;
- for (unsigned int i = 0 ; i < egRec->getNumberOfTrackParticles(); ++i){
- trackLinks.push_back( egRec->trackParticleElementLink(i) );
- }
- electron->setTrackParticleLinks( trackLinks );
-
- electron->setCharge(electron->trackParticle()->charge());
-
- //Set DeltaEta, DeltaPhi , DeltaPhiRescaled
- std::array<double,4> deltaEta = egRec->deltaEta();
- std::array<double,4> deltaPhi = egRec->deltaPhi();
- std::array<double,4> deltaPhiRescaled = egRec->deltaPhiRescaled();
-
- electron->setTrackCaloMatchValue(static_cast<float>(deltaEta[0]),xAOD::EgammaParameters::deltaEta0);
- electron->setTrackCaloMatchValue(static_cast<float> (deltaPhi[0]),xAOD::EgammaParameters::deltaPhi0 );
- electron->setTrackCaloMatchValue(static_cast<float>(deltaPhiRescaled[0]), xAOD::EgammaParameters::deltaPhiRescaled0);
-
- electron->setTrackCaloMatchValue(static_cast<float>(deltaEta[1]), xAOD::EgammaParameters::deltaEta1);
- electron->setTrackCaloMatchValue(static_cast<float> (deltaPhi[1]),xAOD::EgammaParameters::deltaPhi1 );
- electron->setTrackCaloMatchValue(static_cast<float>(deltaPhiRescaled[1]), xAOD::EgammaParameters::deltaPhiRescaled1);
-
- electron->setTrackCaloMatchValue(static_cast<float>(deltaEta[2]), xAOD::EgammaParameters::deltaEta2);
- electron->setTrackCaloMatchValue(static_cast<float> (deltaPhi[2]),xAOD::EgammaParameters::deltaPhi2 );
- electron->setTrackCaloMatchValue(static_cast<float>(deltaPhiRescaled[2]), xAOD::EgammaParameters::deltaPhiRescaled2);
-
- electron->setTrackCaloMatchValue(static_cast<float>(deltaEta[3]), xAOD::EgammaParameters::deltaEta3);
- electron->setTrackCaloMatchValue(static_cast<float> (deltaPhi[3]),xAOD::EgammaParameters::deltaPhi3 );
- electron->setTrackCaloMatchValue(static_cast<float>(deltaPhiRescaled[3]), xAOD::EgammaParameters::deltaPhiRescaled3);
-
-
- float deltaPhiLast = static_cast<float>(egRec->deltaPhiLast ());
- electron->setTrackCaloMatchValue(deltaPhiLast,xAOD::EgammaParameters::deltaPhiFromLastMeasurement );
-
- return true;
-}
-
-// =====================================================
-bool egammaBuilder::getPhoton(const egammaRec* egRec,
- xAOD::PhotonContainer *photonContainer,
- unsigned int author)
-{
- if (!egRec || !photonContainer) return false;
-
- xAOD::Photon *photon = new xAOD::Photon();
- photonContainer->push_back( photon );
- photon->setAuthor( author );
-
- // Transfer the links to the clusters
- std::vector< ElementLink< xAOD::CaloClusterContainer > > clusterLinks;
- for (unsigned int i = 0 ; i < egRec->getNumberOfClusters(); ++i)
- clusterLinks.push_back( egRec->caloClusterElementLink(i) );
- photon->setCaloClusterLinks( clusterLinks );
-
- // Transfer the links to the vertices
- std::vector< ElementLink< xAOD::VertexContainer > > vertexLinks;
- for (unsigned int i = 0 ; i < egRec->getNumberOfVertices(); ++i)
- vertexLinks.push_back( egRec->vertexElementLink(i) );
- photon->setVertexLinks( vertexLinks );
-
- // Transfer deltaEta/Phi info
- float deltaEta = egRec->deltaEtaVtx();
- float deltaPhi = egRec->deltaPhiVtx();
- if (!photon->setVertexCaloMatchValue( deltaEta,
- xAOD::EgammaParameters::convMatchDeltaEta1) )
- {
- ATH_MSG_WARNING("Could not transfer deltaEta to photon");
- return false;
- }
-
- if (!photon->setVertexCaloMatchValue( deltaPhi,
- xAOD::EgammaParameters::convMatchDeltaPhi1) )
- {
- ATH_MSG_WARNING("Could not transfer deltaPhi to photon");
- return false;
- }
-
- return true;
-}
-
-// =====================================================
-StatusCode egammaBuilder::addTopoSeededPhotons(xAOD::PhotonContainer *photonContainer,
- const xAOD::CaloClusterContainer *clusters)
-{
- // Retrieve the cluster container
- SG::ReadHandle<xAOD::CaloClusterContainer> topoSeededClusters(m_topoSeededClusterContainerKey);
- // only for single-threaded running, remove later
- if (!topoSeededClusters.isValid()) {
- ATH_MSG_FATAL("Could not retrieve toposeeded cluster container " << m_topoSeededClusterContainerKey.key());
- return StatusCode::FAILURE;
- }
-
- ATH_MSG_DEBUG("Number of photons (before topo-clusters): " << photonContainer->size() );
- ATH_MSG_DEBUG("Number of topo-seeded clusters: " << topoSeededClusters->size() );
-
- // Create photon objects for the clusters that pass minimum Et and eta requirements and
- // do not overlap with egamma clusters
- typedef ElementLink<xAOD::CaloClusterContainer> ClusterLink_t;
-
- std::vector<const xAOD::CaloCluster* > candidateTopoClusters;
- for (const auto topoCluster : *topoSeededClusters){
- if (topoCluster->et() < m_minEtTopo ||
- topoCluster->et() > m_maxEtTopo ||
- fabs(topoCluster->etaBE(2)) > 2.47 ||
- clustersOverlap(topoCluster, clusters))
- continue;
-
- candidateTopoClusters.push_back(topoCluster);
- }
-
- std::vector<const xAOD::CaloCluster* > finalTopoClusters= egammaDuplicateRemoval::getClusterDuplicateRemoval(candidateTopoClusters);
-
- for (const auto topoCluster : finalTopoClusters){
- ATH_MSG_DEBUG("Creating topo-seeded photon, Et: " << topoCluster->et() <<
- " eta: " << topoCluster->eta() << " phi: " << topoCluster->phi());
-
- xAOD::Photon *photon = new xAOD::Photon();
- photonContainer->push_back(photon);
- photon->setAuthor( xAOD::EgammaParameters::AuthorCaloTopo35 );
-
- ClusterLink_t link(topoCluster, *topoSeededClusters );
- photon->setCaloClusterLinks( std::vector< ClusterLink_t>{ link } );
- //
- //Add the dummy to all new photons created here
- static const SG::AuxElement::Accessor<ElementLink<xAOD::EgammaContainer> > ELink ("ambiguityLink");
- ElementLink<xAOD::EgammaContainer> dummylink;
- ELink(*photon)=dummylink;
- }
- ATH_MSG_DEBUG("Number of photons (after topo-clusters): " << photonContainer->size() );
-
- return StatusCode::SUCCESS;
-}
-
-// =====================================================
-bool egammaBuilder::clustersOverlap(const xAOD::CaloCluster *refCluster,
- const xAOD::CaloClusterContainer *clusters)
-{
- if (!refCluster || !clusters) return false;
-
- for (const auto cluster: *clusters)
- {
- if (fabs(refCluster->eta() - cluster->eta()) < m_minDeltaEta &&
- fabs(CaloPhiRange::diff(refCluster->phi(), cluster->phi())) < m_minDeltaPhi)
- return true;
- }
- return false;
-}
-
-// LocalWords: newClus egc getCellLinks
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaBuilder.h b/Reconstruction/egamma/egammaAlgs/src/egammaBuilder.h
deleted file mode 100644
index e1835f6a3a5762c91b6da821eed65394395a1d37..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAlgs/src/egammaBuilder.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef EGAMMAALGS_EGAMMABUILDER_H
-#define EGAMMAALGS_EGAMMABUILDER_H
-/**
- @class egammaBuilder
- top-Algorithm which creates an egammaObjectCollection.
- It retrieves data objects from TDS, and calls the subalgorithms to
- make the pieces in egamma classs. The subclass should inherit from
- egammaBuilder, and implement the method build(egamma*)
-
- It is seeded from the electromagnetic (EM) calorimeters and starts from clusters reconstructed in the calorimeters by the SlidingWindowFinder (https://twiki.cern.ch/twiki/bin/view/Atlas/SlidingWindowClustering#Sliding_Window_Clustering). For each cluster, with ET(seed)>3GeV in the cluster container the best inner detector track is searched for within a given E/p range. The complexity of the extrapolation (coordinate systems, etc) is hidden in ExtrapolateToCaloTool. It then builds identification variables
- - The electromagnetic shower shape variables are calculated in the EMShowerBuilder tool with respect to these hot cells;
- - Some variables combining inner detector and electromagnetic calorimeter information, like E/p, are build;
- - In order to minimize amount of fakes, in particular in jets, pre-selection cuts are applied in egammaSelectSETool;
- - Discriminating variables are build and used in the EMPIDBuilder tool based on shower shapes in the electromagnetic calorimeter and information from the inner detector;
- - Possible matching to a conversion object is done through the tool EMConversionBuilder;
- - Bremsstrahlung recovery information is obtained through the tools EMBremsstrahlungBuilder and EMTrkRefitter;
- - the 4-momentum is build in EMFourMomBuilder.
- - apply photon recovery
- - apply photon post-processing to recalculate correctly
- information for these recovered photons
-*/
-
-// INCLUDE HEADER FILES:
-#include <vector>
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/EventContext.h"
-
-#include "StoreGate/ReadHandleKey.h"
-#include "StoreGate/WriteHandleKey.h"
-
-#include "xAODEgamma/ElectronFwd.h"
-#include "xAODEgamma/PhotonFwd.h"
-#include "xAODEgamma/ElectronContainer.h"
-#include "xAODEgamma/PhotonContainer.h"
-#include "xAODCaloEvent/CaloClusterContainer.h"
-#include "egammaRecEvent/egammaRecContainer.h"
-
-#include "EgammaAnalysisInterfaces/IEGammaAmbiguityTool.h"
-#include "egammaInterfaces/IEMClusterTool.h"
-#include "egammaInterfaces/IegammaBaseTool.h"
-#include "egammaInterfaces/IEMTrackMatchBuilder.h"
-#include "egammaInterfaces/IEMConversionBuilder.h"
-#include "egammaInterfaces/IEMShowerBuilder.h"
-#include "GaudiKernel/SystemOfUnits.h"
-
-class egammaRec;
-
-class egammaBuilder : public AthAlgorithm
-{
- public:
-
- /** @brief Default constructor*/
- egammaBuilder(const std::string& name, ISvcLocator* pSvcLocator);
-
- /** @brief Destructor*/
- ~egammaBuilder();
-
- /** @brief initialize method*/
- StatusCode initialize() override final;
- /** @brief finalize method*/
- StatusCode finalize() override final;
- /** @brief execute method*/
- StatusCode execute() override final;
-
- /** Given an egammaRec object, a pointer to the electron container and the author,
- * create and dress an electron, pushing it back to the container and
- * calling the relevant tools **/
- bool getElectron(const egammaRec*, xAOD::ElectronContainer*, unsigned int);
-
- /** Given an egammaRec object, a pointer to the photon container and the author,
- * create and dress a photon, pushing it back to the container and
- * calling the relevant tools **/
- bool getPhoton(const egammaRec*, xAOD::PhotonContainer*, unsigned int);
-
- /** Add topo-seeded photons (that do not overlap with other clusters)
- * to the photon container **/
- StatusCode addTopoSeededPhotons(xAOD::PhotonContainer *photonContainer,
- const xAOD::CaloClusterContainer *clusters);
-
- /** Return true if refCluster overlaps with any cluster in the collection
- * Used to select topo-seeded clusters **/
- bool clustersOverlap(const xAOD::CaloCluster *refCluster,
- const xAOD::CaloClusterContainer *clusters);
-
-
- private:
-
-
- /** @brief Vector of tools for dressing electrons and photons **/
- ToolHandleArray<IegammaBaseTool> m_egammaTools {this,
- "egammaTools", {}, "Tools for dressing electrons and photons"};
-
- /** @brief Vector of tools for dressing ONLY electrons **/
- ToolHandleArray<IegammaBaseTool> m_electronTools {this,
- "ElectronTools", {}, "Tools for dressing ONLY electrons"};
-
- /** @brief Vector of tools for dressing ONLY photons **/
- ToolHandleArray<IegammaBaseTool> m_photonTools {this,
- "PhotonTools", {}, "Tools for dressing ONLY photons"};
-
- /** @brief Tool to do the final electron/photon cluster building */
- ToolHandle<IEMShowerBuilder> m_ShowerTool {this,
- "EMShowerTool", "egammaTools/EMShowerBuilder",
- "Tool that does electron/photon shower shape building"};
-
- /** @brief Tool to do the final electron/photon cluster building */
- ToolHandle<IEMClusterTool> m_clusterTool {this,
- "EMClusterTool", "EMClusterTool",
- "Tool that does electron/photon final cluster building"};
-
- /** @brief Tool to resolve electron/photon ambiguity */
- ToolHandle<IEGammaAmbiguityTool> m_ambiguityTool {this,
- "AmbiguityTool", "EGammaAmbiguityTool",
- "Tool that does electron/photon ambiguity resolution"};
-
- /** @brief Tool to perform track matching*/
- ToolHandle<IEMTrackMatchBuilder> m_trackMatchBuilder {this,
- "TrackMatchBuilderTool", "EMTrackMatchBuilder",
- "Tool that matches tracks to egammaRecs"};
-
- /** @brief Tool to perfrom conversion vertex matching*/
- ToolHandle<IEMConversionBuilder> m_conversionBuilder {this,
- "ConversionBuilderTool", "EMConversionBuilder",
- "Tool that matches conversion vertices to egammaRecs"};
-
-
- /** @brief Call a tool using contExecute and electrons, photon containers if given **/
- StatusCode CallTool(const EventContext& ctx,
- ToolHandle<IegammaBaseTool>& tool,
- xAOD::ElectronContainer *electronContainer = nullptr,
- xAOD::PhotonContainer *photonContainer = nullptr);
-
- /** @brief retrieve EMTrackMatchBuilder **/
- StatusCode RetrieveEMTrackMatchBuilder();
- /** @brief retrieve EMConversionBuilder **/
- StatusCode RetrieveEMConversionBuilder();
-
- /** @brief Name of the electron output collection*/
- SG::WriteHandleKey<xAOD::ElectronContainer> m_electronOutputKey {this,
- "ElectronOutputName", "ElectronContainer",
- "Name of Electron Container to be created"};
-
- /** @brief Name of the photon output collection */
- SG::WriteHandleKey<xAOD::PhotonContainer> m_photonOutputKey {this,
- "PhotonOutputName", "PhotonContainer",
- "Name of Photon Container to be created"};
-
- /** @brief Name of the cluster intput collection */
- SG::ReadHandleKey<xAOD::CaloClusterContainer> m_inputClusterContainerKey {this,
- "InputClusterContainerName", "LArClusterEM",
- "Input cluster container for egamma objects"};
-
- /** @brief Name of the topo-seeded cluster collection */
- SG::ReadHandleKey<xAOD::CaloClusterContainer> m_topoSeededClusterContainerKey {this,
- "TopoSeededClusterContainerName", "EMTopoCluster430",
- "Input topo-seeded cluster container for egamma objects"};
-
- /** @brief Name of egammaRec container */
- SG::WriteHandleKey<EgammaRecContainer> m_egammaRecContainerKey {this,
- "egammaRecContainer", "egammaRecCollection",
- "Output container for egammaRec objects"};
-
- // All booleans
- //
- /** @brief private member flag to do the track matching */
- Gaudi::Property<bool> m_doTrackMatching {this, "doTrackMatching", true,
- "Boolean to do track matching"};
-
- /** @brief private member flag to do the conversion matching */
- Gaudi::Property<bool> m_doConversions {this, "doConversions", true,
- "Boolean to do conversion matching"};
-
- /** @brief add topo-seeded photons */
- Gaudi::Property<bool> m_doTopoSeededPhotons {this,
- "doTopoSeededPhotons", true,
- "Boolean to do topo-seeded photons"};
- //
- // Other properties.
- //
- /** @brief Discard clusters with energy less than this after corrections. */
- Gaudi::Property<float> m_clusterEnergyCut {this,
- "clusterEnergyCut", 10 * Gaudi::Units::MeV,
- "Discard clusters with energies below this after corrections"};
-
- // @brief Minimum deltaEta to check if clusters overlap
- Gaudi::Property<float> m_minDeltaEta {this, "minDeltaEta", 0.05,
- "Minimum deltaEta to check if clusters overlap"};
-
- // @brief Minimum deltaPhi to check if clusters overlap
- Gaudi::Property<float> m_minDeltaPhi {this, "minDeltaPhi", 0.1,
- "Minimum deltaPhi to check if clusters overlap"};
-
- // @brief Minimum transverse energy to accept topo-seeded clusters
- Gaudi::Property<float> m_minEtTopo {this, "minEtTopo", 1.5 * Gaudi::Units::GeV,
- "Minimum transverse energy to accept topo-seeded clusters"};
-
- // @brief Maximum transverse energy to accept topo-seeded clusters
- Gaudi::Property<float> m_maxEtTopo {this, "maxEtTopo", 8 * Gaudi::Units::GeV,
- "Maximum transverse energy to accept topo-seeded clusters"};
-
- // others:
- Gaudi::Property<bool> m_dump {this, "Dump", false,
- "Boolean to dump content of each object"};
-
- IChronoStatSvc* m_timingProfile;
-
-};
-
-#endif
diff --git a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
index ea3aeb6e4eb4b15473334b6b6fd9de4142f63490..1d681d092ed045cbca09bd75eb06622873aebf92 100644
--- a/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/egammaRecBuilder.cxx
@@ -66,7 +66,7 @@ egammaRecBuilder::RetrieveEMTrackMatchBuilder()
if (m_trackMatchBuilder.retrieve().isFailure()) {
ATH_MSG_ERROR("Unable to retrieve " << m_trackMatchBuilder);
return StatusCode::FAILURE;
- }
+ }
ATH_MSG_DEBUG("Retrieved Tool " << m_trackMatchBuilder);
return StatusCode::SUCCESS;
@@ -89,7 +89,7 @@ egammaRecBuilder::RetrieveEMConversionBuilder()
if (m_conversionBuilder.retrieve().isFailure()) {
ATH_MSG_ERROR("Unable to retrieve " << m_conversionBuilder);
return StatusCode::FAILURE;
- }
+ }
ATH_MSG_DEBUG("Retrieved Tool " << m_conversionBuilder);
return StatusCode::SUCCESS;
@@ -118,15 +118,14 @@ egammaRecBuilder::execute_r(const EventContext& ctx) const
ATH_MSG_ERROR("Could not retrieve cluster container:"
<< m_inputTopoClusterContainerKey.key());
return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG("Retrieved input cluster container");
-
+ }
// Build the initial egamma Rec objects for all copied Topo Clusters
SG::WriteHandle<EgammaRecContainer> egammaRecs(m_egammaRecContainerKey, ctx);
ATH_CHECK(egammaRecs.record(std::make_unique<EgammaRecContainer>()));
-
- for (size_t i(0); i < topoclusters->size(); i++) {
+ const size_t nTopo = topoclusters->size();
+ egammaRecs->reserve(nTopo);
+ for (size_t i(0); i < nTopo; i++) {
const ElementLink<xAOD::CaloClusterContainer> clusterLink(*topoclusters, i);
const std::vector<ElementLink<xAOD::CaloClusterContainer>> ClusterLink{
clusterLink
@@ -141,12 +140,8 @@ egammaRecBuilder::execute_r(const EventContext& ctx) const
}
// Do the conversion matching
if (m_doConversions) {
- ATH_MSG_DEBUG("Running ConversionBuilder");
for (auto egRec : *egammaRecs) {
- if (m_conversionBuilder->executeRec(ctx, egRec).isFailure()) {
- ATH_MSG_ERROR("Problem executing " << m_conversionBuilder);
- return StatusCode::FAILURE;
- }
+ ATH_CHECK(m_conversionBuilder->executeRec(ctx, egRec));
}
}
return StatusCode::SUCCESS;
diff --git a/Reconstruction/egamma/egammaCaloTools/CMakeLists.txt b/Reconstruction/egamma/egammaCaloTools/CMakeLists.txt
index 8d489a9a1d63eac0ad775f49acc82b8b2c85ac45..be54b48b823c026e5c3abfd4590418faa3557bf4 100644
--- a/Reconstruction/egamma/egammaCaloTools/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaCaloTools/CMakeLists.txt
@@ -5,28 +5,13 @@
# Declare the package name:
atlas_subdir( egammaCaloTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloUtils
- Control/AthenaBaseComps
- Control/SGTools
- Event/FourMomUtils
- Event/xAOD/xAODCaloEvent
- GaudiKernel
- Reconstruction/egamma/egammaInterfaces
- Reconstruction/egamma/egammaUtils
- )
-
# Component(s) in the package:
atlas_add_component( egammaCaloTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS
- LINK_LIBRARIES CaloDetDescrLib CaloEvent CaloGeoHelpers CaloIdentifier CaloUtilsLib AthenaBaseComps SGTools FourMomUtils xAODCaloEvent GaudiKernel egammaUtils egammaInterfacesLib )
+ INCLUDE_DIRS
+ LINK_LIBRARIES CaloDetDescrLib CaloEvent CaloGeoHelpers CaloIdentifier CaloUtilsLib AthenaBaseComps
+ SGTools FourMomUtils xAODCaloEvent GaudiKernel egammaUtils egammaInterfacesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Reconstruction/egamma/egammaCaloTools/python/egammaCaloToolsFactories.py b/Reconstruction/egamma/egammaCaloTools/python/egammaCaloToolsFactories.py
index ae97d893b443d43ad54ca2322cb15839d247ea25..70c72c7c5feca0c0a011b1fde01bd746cc2c90ae 100644
--- a/Reconstruction/egamma/egammaCaloTools/python/egammaCaloToolsFactories.py
+++ b/Reconstruction/egamma/egammaCaloTools/python/egammaCaloToolsFactories.py
@@ -1,38 +1,40 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "ToolFactories to instantiate all egammaCaloTools with default configuration"
+from CaloClusterCorrection import CaloClusterCorrectionConf as Cccc
+__doc__ = """ToolFactories to instantiate all
+egammaCaloTools with default configuration"""
__author__ = "Bruno Lenzi"
-from egammaRec.Factories import FcnWrapper, ToolFactory
+from egammaRec.Factories import ToolFactory
from egammaCaloTools import egammaCaloToolsConf
from egammaRec import egammaKeys
-#---------------------------------------
-
-egammaShowerShape = ToolFactory(egammaCaloToolsConf.egammaShowerShape,
- # Samplings to execute
- ExecAllVariables = True,
- ExecPreSampler = True,
- ExecEMFirst = True,
- ExecEMSecond = True,
- ExecEMThird = True,
- ExecEMCombined = True)
-
-
-from CaloClusterCorrection import CaloClusterCorrectionConf as Cccc
-CaloFillRectangularCluster = ToolFactory( Cccc.CaloFillRectangularCluster,
- name = "egamma_CaloFillRectangularCluster",
- eta_size = 5,
- phi_size = 7,
- cells_name = egammaKeys.caloCellKey() )
+# ---------------------------------------
+egammaShowerShape = ToolFactory(
+ egammaCaloToolsConf.egammaShowerShape,
+ # Samplings to execute
+ ExecAllVariables=True,
+ ExecPreSampler=True,
+ ExecEMFirst=True,
+ ExecEMSecond=True,
+ ExecEMThird=True,
+ ExecEMCombined=True)
+CaloFillRectangularCluster = ToolFactory(
+ Cccc.CaloFillRectangularCluster,
+ name="egamma_CaloFillRectangularCluster",
+ eta_size=5,
+ phi_size=7,
+ cells_name=egammaKeys.caloCellKey())
-egammaIso = ToolFactory(egammaCaloToolsConf.egammaIso)
-egammaCheckEnergyDepositTool = ToolFactory(egammaCaloToolsConf.egammaCheckEnergyDepositTool)
+egammaIso = ToolFactory(
+ egammaCaloToolsConf.egammaIso)
+egammaCheckEnergyDepositTool = ToolFactory(
+ egammaCaloToolsConf.egammaCheckEnergyDepositTool)
-#---------------------------------------
+# ---------------------------------------
diff --git a/Reconstruction/egamma/egammaCaloTools/src/egammaPreSamplerShape.cxx b/Reconstruction/egamma/egammaCaloTools/src/egammaPreSamplerShape.cxx
index 3c1ed3ad74195eca60d6c0baab942f7b77bcde53..03f7d947f2d3a97354bb3bc184331e28ee317d56 100755
--- a/Reconstruction/egamma/egammaCaloTools/src/egammaPreSamplerShape.cxx
+++ b/Reconstruction/egamma/egammaCaloTools/src/egammaPreSamplerShape.cxx
@@ -14,7 +14,7 @@
#include "GaudiKernel/ObjectVector.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/Reconstruction/egamma/egammaInterfaces/CMakeLists.txt b/Reconstruction/egamma/egammaInterfaces/CMakeLists.txt
index c61eef477e9e5b17bf58b6cc8b97af1b3f89c7f2..8f109fdeabb79adba673a971fb22a4b6870d96ee 100644
--- a/Reconstruction/egamma/egammaInterfaces/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaInterfaces/CMakeLists.txt
@@ -5,18 +5,6 @@
# Declare the package name:
atlas_subdir( egammaInterfaces )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODTracking
- GaudiKernel
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkCaloExtension
- Reconstruction/egamma/egammaRecEvent)
# Component(s) in the package:
atlas_add_library( egammaInterfacesLib
diff --git a/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMClusterTool.h b/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMClusterTool.h
index 9e58569d17f59ab3d8accd4ad5fb338cbab8cf6b..1039574bc4aa3a981a5558662efe446a8a989c40 100644
--- a/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMClusterTool.h
+++ b/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMClusterTool.h
@@ -25,10 +25,10 @@ class IEMClusterTool : virtual public IAlgTool {
public:
/** @brief Virtual destructor*/
virtual ~IEMClusterTool() {};
-
+
/** @brief AlgTool interface methods */
static const InterfaceID& interfaceID();
-
+
/** @brief initialize method*/
virtual StatusCode initialize() = 0;
/** @brief execute on containers */
@@ -36,9 +36,7 @@ class IEMClusterTool : virtual public IAlgTool {
const CaloDetDescrManager& cmgr,
xAOD::ElectronContainer* electronContainer,
xAOD::PhotonContainer* photonContainer) const = 0;
- /** @brief finalize method*/
- virtual StatusCode finalize() = 0;
-
+
};
inline const InterfaceID& IEMClusterTool::interfaceID()
@@ -46,4 +44,4 @@ inline const InterfaceID& IEMClusterTool::interfaceID()
return IID_IEMClusterTool;
}
-#endif // EGAMMAINTERFACES_IEMCLUSTERTOOL_H
+#endif // EGAMMAINTERFACES_IEMCLUSTERTOOL_H
diff --git a/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMConversionBuilder.h b/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMConversionBuilder.h
index 1c8929f7cb86a81196c9c3390893941397a21eaa..711fd5da1f16469a85941c67ccc9994950eb8387 100755
--- a/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMConversionBuilder.h
+++ b/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IEMConversionBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -34,7 +34,7 @@ class IEMConversionBuilder : virtual public IAlgTool
/** @brief Virtual destructor*/
virtual ~IEMConversionBuilder() {};
-
+
/** @brief AlgTool interface methods */
static const InterfaceID& interfaceID();
@@ -44,9 +44,7 @@ class IEMConversionBuilder : virtual public IAlgTool
virtual StatusCode executeRec(const EventContext& ctx,egammaRec* egRec) const = 0;
/** @brief execute method*/
virtual StatusCode hltExecute(egammaRec* egRec, const xAOD::VertexContainer* conversions) const =0;
- /** @brief finalize method*/
- virtual StatusCode finalize() = 0;
-
+
};
inline const InterfaceID& IEMConversionBuilder::interfaceID()
diff --git a/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IegammaSwTool.h b/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IegammaSwTool.h
index 675d0fb36af2ec3d324c28e406e7775d62b49917..c42ba6bf9ab86ffab1ce2afc3b177e1716569554 100755
--- a/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IegammaSwTool.h
+++ b/Reconstruction/egamma/egammaInterfaces/egammaInterfaces/IegammaSwTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -18,35 +18,37 @@ CREATED : 01/09/2008
MODIFIED : Bruno Lenzi (02/2014): xAOD migration
*/
-// INCLUDE HEADER FILES:
+// INCLUDE HEADER FILES:
+#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/IAlgTool.h"
#include "xAODCaloEvent/CaloClusterFwd.h"
#include "xAODEgamma/EgammaEnums.h"
-#include "GaudiKernel/EventContext.h"
static const InterfaceID IID_IegammaSwTool("IegammaSwTool", 1, 0);
class IegammaSwTool : virtual public IAlgTool
{
- public:
-
+public:
/** @brief Virtual destructor*/
- virtual ~IegammaSwTool() {};
-
+ virtual ~IegammaSwTool(){};
+
/** @brief AlgTool interface methods */
static const InterfaceID& interfaceID();
/** @brief initialize method*/
virtual StatusCode initialize() = 0;
- /** @brief finalize method*/
- virtual StatusCode finalize() = 0;
/** @brief execute method*/
- virtual StatusCode execute(const EventContext& ctx, xAOD::CaloCluster* cluster) const = 0;
- virtual StatusCode execute(const EventContext& ctx, xAOD::CaloCluster* cluster, xAOD::EgammaParameters::EgammaType egType , bool isBarrel) const = 0;
+ virtual StatusCode execute(const EventContext& ctx,
+ xAOD::CaloCluster* cluster) const = 0;
+ virtual StatusCode execute(const EventContext& ctx,
+ xAOD::CaloCluster* cluster,
+ xAOD::EgammaParameters::EgammaType egType,
+ bool isBarrel) const = 0;
};
-inline const InterfaceID& IegammaSwTool::interfaceID()
+inline const InterfaceID&
+IegammaSwTool::interfaceID()
{
return IID_IegammaSwTool;
}
diff --git a/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibFactories.py b/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibFactories.py
index f83174d9ce4e85f3220a038ba48bf3ff90caaf78..a0632e884e4cc2081f93fac3c73d5a2fa7d0351b 100644
--- a/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibFactories.py
+++ b/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibFactories.py
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-__doc__ = "Tool and service factories to instantiate MVA calibration"
+__doc__ = """Tool and service factories to instantiate MVA calibration"""
__author__ = "Jovan Mitrevski"
@@ -10,22 +10,26 @@ from egammaMVACalib import egammaMVACalibConf
from egammaRec.egammaRecFlags import jobproperties
from xAODEgamma.xAODEgammaParameters import xAOD
-electronMVATool = ToolFactory(egammaMVACalibConf.egammaMVACalibTool,
- name = "electronMVATool",
- ParticleType = xAOD.EgammaParameters.electron,
- folder=jobproperties.egammaRecFlags.calibMVAVersion())
-
-unconvPhotonMVATool = ToolFactory(egammaMVACalibConf.egammaMVACalibTool,
- name = "unconvPhotonMVATool",
- ParticleType = xAOD.EgammaParameters.unconvertedPhoton,
- folder=jobproperties.egammaRecFlags.calibMVAVersion())
-
-convertedPhotonMVATool = ToolFactory(egammaMVACalibConf.egammaMVACalibTool,
- name = "convertePhotonMVATool",
- ParticleType = xAOD.EgammaParameters.convertedPhoton,
- folder=jobproperties.egammaRecFlags.calibMVAVersion())
-
-egammaMVASvc = ServiceFactory(egammaMVACalibConf.egammaMVASvc,
- ElectronTool = electronMVATool,
- UnconvertedPhotonTool = unconvPhotonMVATool,
- ConvertedPhotonTool = convertedPhotonMVATool)
+electronMVATool = ToolFactory(
+ egammaMVACalibConf.egammaMVACalibTool,
+ name="electronMVATool",
+ ParticleType=xAOD.EgammaParameters.electron,
+ folder=jobproperties.egammaRecFlags.calibMVAVersion())
+
+unconvPhotonMVATool = ToolFactory(
+ egammaMVACalibConf.egammaMVACalibTool,
+ name="unconvPhotonMVATool",
+ ParticleType=xAOD.EgammaParameters.unconvertedPhoton,
+ folder=jobproperties.egammaRecFlags.calibMVAVersion())
+
+convertedPhotonMVATool = ToolFactory(
+ egammaMVACalibConf.egammaMVACalibTool,
+ name="convertePhotonMVATool",
+ ParticleType=xAOD.EgammaParameters.convertedPhoton,
+ folder=jobproperties.egammaRecFlags.calibMVAVersion())
+
+egammaMVASvc = ServiceFactory(
+ egammaMVACalibConf.egammaMVASvc,
+ ElectronTool=electronMVATool,
+ UnconvertedPhotonTool=unconvPhotonMVATool,
+ ConvertedPhotonTool=convertedPhotonMVATool)
diff --git a/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py b/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
index 0afa22e13c1177145b1999697f1c28237c2af3d3..340d2986ad9abe19359067d58a493b84ad4d0b12 100644
--- a/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
+++ b/Reconstruction/egamma/egammaRec/python/EMCommonRefitter.py
@@ -51,25 +51,12 @@ def getGSFTrackFitter():
GsfMaterialConvolution=GsfMaterialUpdator,
SurfaceBasedMaterialEffects=False)
- from TrkMeasurementUpdator.TrkMeasurementUpdatorConf import (
- Trk__KalmanUpdatorAmg as ConfiguredKalmanUpdator)
-
- egTrkUpdator = ConfiguredKalmanUpdator('egTrkUpdator')
-
- from TrkGaussianSumFilter.TrkGaussianSumFilterConf import (
- Trk__GsfMeasurementUpdator)
-
- GsfMeasurementUpdator = Trk__GsfMeasurementUpdator(
- name='GsfMeasurementUpdator',
- Updator=egTrkUpdator)
-
from TrkGaussianSumFilter.TrkGaussianSumFilterConf import (
Trk__GaussianSumFitter)
GSFTrackFitter = Trk__GaussianSumFitter(
name='GSFTrackFitter',
ToolForExtrapolation=GsfExtrapolator,
- MeasurementUpdatorType=GsfMeasurementUpdator,
ReintegrateOutliers=True,
MakePerigee=True,
RefitOnMeasurementBase=True,
diff --git a/Reconstruction/egamma/egammaRec/python/egammaForwardGetter.py b/Reconstruction/egamma/egammaRec/python/egammaForwardGetter.py
index b28c0ff58eb12d67189a46f3f267f24bd30b1324..13901af9f7791796507e418386a4fae9f5d6ae07 100755
--- a/Reconstruction/egamma/egammaRec/python/egammaForwardGetter.py
+++ b/Reconstruction/egamma/egammaRec/python/egammaForwardGetter.py
@@ -1,9 +1,12 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# specifies egammaForwardBuilder "standard"
+from egammaTools.egammaToolsFactories import (
+ egammaOQFlagsBuilder, EMFourMomBuilder,
+ LooseForwardElectronSelector, MediumForwardElectronSelector,
+ TightForwardElectronSelector)
from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import *
-from AthenaCommon.Constants import *
+from AthenaCommon.SystemOfUnits import GeV
import traceback
from RecExConfig.Configured import Configured
@@ -13,49 +16,50 @@ from egammaAlgs import egammaAlgsConf
from egammaRec.Factories import AlgFactory, FcnWrapper
from egammaRec import egammaRecFlags as egRecFlags
egammaRecFlags = egRecFlags.jobproperties.egammaRecFlags
-from egammaTools.egammaToolsFactories import egammaOQFlagsBuilder, EMFourMomBuilder, LooseForwardElectronSelector, MediumForwardElectronSelector, TightForwardElectronSelector
-from ElectronPhotonSelectorTools.ForwardElectronIsEMSelectorMapping import forwardelectronPIDmenu
+
def forwardSelectorTools():
- "Return a list with the selectors for forward electrons"
- return [ LooseForwardElectronSelector(), MediumForwardElectronSelector(), TightForwardElectronSelector() ]
-
-egammaForwardBuilder = AlgFactory( egammaAlgsConf.egammaForwardBuilder,
- name = 'egammaForward',
-
- # Keys
- ElectronOutputName=egammaKeys.outputFwdElectronKey(),
- TopoClusterName="CaloCalTopoClusters",
- ClusterContainerName=egammaKeys.outputFwdClusterKey(),
-
- # Tools
- ObjectQualityTool = egammaOQFlagsBuilder,
- FourMomBuilderTool = EMFourMomBuilder,
-
- # Flags and other properties
- EtCut=5*GeV,
- EtaCut=2.5,
-
- forwardelectronIsEMselectors = FcnWrapper(forwardSelectorTools),
- forwardelectronIsEMselectorResultNames = ["Loose", "Medium", "Tight"]
- )
-
-class egammaForwardGetter ( Configured ) :
-
- def configure(self):
- mlog = logging.getLogger ('egammaForwardGetter.py::configure:')
- mlog.info('entering')
-
- # configure egammaForward here:
- try:
- self._egammaFwdBuilderHandle = egammaForwardBuilder()
- except Exception:
- mlog.error("could not get handle to egammaForward")
- traceback.print_exc()
- return False
- return True
-
- def egammaFwdBuilderHandle(self):
- return self._egammaFwdBuilderHandle
-
-
+ "Return a list with the selectors for forward electrons"
+ return [LooseForwardElectronSelector(),
+ MediumForwardElectronSelector(),
+ TightForwardElectronSelector()]
+
+
+egammaForwardBuilder = AlgFactory(
+ egammaAlgsConf.egammaForwardBuilder,
+ name='egammaForward',
+ # Keys
+ ElectronOutputName=egammaKeys.outputFwdElectronKey(),
+ TopoClusterName="CaloCalTopoClusters",
+ ClusterContainerName=egammaKeys.outputFwdClusterKey(),
+ # Tools
+ ObjectQualityTool=egammaOQFlagsBuilder,
+ FourMomBuilderTool=EMFourMomBuilder,
+ # Flags and other properties
+ EtCut=5*GeV,
+ EtaCut=2.5,
+
+ forwardelectronIsEMselectors=FcnWrapper(
+ forwardSelectorTools),
+ forwardelectronIsEMselectorResultNames=[
+ "Loose", "Medium", "Tight"]
+)
+
+
+class egammaForwardGetter (Configured):
+
+ def configure(self):
+ mlog = logging.getLogger('egammaForwardGetter.py::configure:')
+ mlog.info('entering')
+
+ # configure egammaForward here:
+ try:
+ self._egammaFwdBuilderHandle = egammaForwardBuilder()
+ except Exception:
+ mlog.error("could not get handle to egammaForward")
+ traceback.print_exc()
+ return False
+ return True
+
+ def egammaFwdBuilderHandle(self):
+ return self._egammaFwdBuilderHandle
diff --git a/Reconstruction/egamma/egammaRec/python/egammaGetter.py b/Reconstruction/egamma/egammaRec/python/egammaGetter.py
deleted file mode 100755
index 1ee172fbbb64e4c13f9bc4118f3b7ee3c3a5f0b2..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaRec/python/egammaGetter.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from __future__ import print_function
-
-# This file is for the "old" non-topocluster version of egamma
-from AthenaCommon.Logging import logging
-from AthenaCommon.SystemOfUnits import *
-from AthenaCommon.Constants import *
-
-from AthenaCommon.DetFlags import DetFlags
-from RecExConfig.Configured import Configured
-#
-from egammaRec import egammaKeys
-from egammaAlgs import egammaAlgsConf
-from egammaRec.Factories import AlgFactory, FcnWrapper
-from egammaRec import egammaRecFlags as egRecFlags
-egammaRecFlags = egRecFlags.jobproperties.egammaRecFlags
-
-def doConversions() :
- return DetFlags.detdescr.ID_on() and egammaRecFlags.doConversions()
-################
-
-# Import the tool factories
-from egammaTools.egammaToolsFactories import \
- EMTrackMatchBuilder,\
- EMConversionBuilder, EGammaAmbiguityTool,\
- EMClusterTool, EMFourMomBuilder, EMShowerBuilder, egammaOQFlagsBuilder, \
- ElectronPIDBuilder, PhotonPIDBuilder
-
-#
-#Topo seeded fixed size clusters, related configurations
-#Create and return the TopoSeededCollection
-def getTopoSeededCollectionName():
- if egammaRecFlags.doTopoCaloSeeded():
- from CaloRec import CaloRecFlags
- from CaloRec.CaloRecTopoEM35Flags import jobproperties
- jobproperties.CaloRecTopoEM35Flags.EtSeedCut =0.8 * GeV # The cut on the Fixed size is 1.5 GeV later on
- from CaloRec.CaloClusterTopoEMFixedSizeGetter import CaloClusterTopoEMFixedSizeGetter
- theCaloClusterTopoEMFixedSizeGetter = CaloClusterTopoEMFixedSizeGetter()
- return theCaloClusterTopoEMFixedSizeGetter.outputKey()
- else:
- return ""
-
-#The tools used to add properties
-def egammaDecorationTools():
- "Return a list with the tools that decorate both electrons and photons"
- return [EMFourMomBuilder(), egammaOQFlagsBuilder()]
-
-def electronDecorationTools():
- "Return a list with the tools that decorate only electrons"
- return [ ElectronPIDBuilder() ]
-
-def photonDecorationTools():
- "Return a list with the tools that decorate only photons"
- return [ PhotonPIDBuilder() ]
-#
-
-class egammaGetter ( Configured ) :
-
- def configure(self):
- mlog = logging.getLogger ('egammaGetter.py::configure:')
- mlog.info('entering')
-
- egammaBuilder = AlgFactory(egammaAlgsConf.egammaBuilder, name = 'egamma',
- # Keys
- ElectronOutputName = egammaKeys.outputElectronKey(),
- PhotonOutputName = egammaKeys.outputPhotonKey(),
- TopoSeededClusterContainerName = getTopoSeededCollectionName(),
- # Builder tools
- TrackMatchBuilderTool = EMTrackMatchBuilder,
- ConversionBuilderTool = EMConversionBuilder if doConversions() else None,
- EMClusterTool=EMClusterTool,
- EMShowerTool=EMShowerBuilder,
- AmbiguityTool = EGammaAmbiguityTool,
- # Decoration tools
- egammaTools = FcnWrapper(egammaDecorationTools),
- ElectronTools = FcnWrapper(electronDecorationTools),
- PhotonTools = FcnWrapper(photonDecorationTools),
- # Flags and other properties
- # Track matching depending if ID is on/off
- doTrackMatching = DetFlags.detdescr.ID_on(),
- # conversions matching depending if ID is on/off
- doConversions = doConversions(),
- #
- clusterEnergyCut = 10*MeV,
- doTopoSeededPhotons = egammaRecFlags.doTopoCaloSeeded()
- )
-
- # configure egamma here:
- try:
- self._egammaBuilderHandle = egammaBuilder()
- except Exception:
- mlog.error("could not get handle to egamma")
- import traceback
- traceback.print_exc()
- return False
-
- print (self._egammaBuilderHandle)
- return True
-
- def egammaBuilderHandle(self):
- return self._egammaBuilderHandle
diff --git a/Reconstruction/egamma/egammaRec/python/egammaKeys.py b/Reconstruction/egamma/egammaRec/python/egammaKeys.py
index 2ada287c755052244caaf48fd6af2d9dc7fc204b..b6a4785be13a8aa29ae4da28cff92ca6522d745d 100644
--- a/Reconstruction/egamma/egammaRec/python/egammaKeys.py
+++ b/Reconstruction/egamma/egammaRec/python/egammaKeys.py
@@ -3,71 +3,93 @@
__doc__ = "egammaKeys.py"
__author__ = "Bruno Lenzi"
-# Temporary solution just to emulate what was being done in egammaGetter.py
-from InDetRecExample.InDetKeys import InDetKeys
-
-# Name (i.e Electron) = [type =type of the collection, key = name of the collection,
-# option = for aux container applied in ALL cases (ESD and AOD),
+# Name (i.e Electron) = [type =type of the collection, key = name of the collection,
+# option = for aux container applied in ALL cases (ESD and AOD),
# option = for additional suppression for AOD only]
+
+
class egammaKeysDict:
- inputs = dict(
+ inputs = dict(
)
- ShowerShapesSuppress = '-e033.-e011.-e333.-e335.-e337.-e377'
- PhotonisemSupress = '.-isEMLoose.-isEMTight'
- ElectronisemSupress = '.-isEMLHLoose.-isEMLHTight.-isEMLHMedium.-isEMLoose.-isEMMultiLepton.-isEMMedium.-isEMTight'
- FwdElectronisemSupress = '-isEMTight.-isEMMedium.-isEMLoose'
+ ShowerShapesSuppress = '-e033.-e011.-e333.-e335.-e337.-e377'
+ PhotonisemSupress = '.-isEMLoose.-isEMTight'
+ ElectronisemSupress = '.-isEMLHLoose.-isEMLHTight.-isEMLHMedium.-isEMLoose.-isEMMultiLepton.-isEMMedium.-isEMTight'
+ FwdElectronisemSupress = '-isEMTight.-isEMMedium.-isEMLoose'
+ outputs = dict(
+ Conversion=['xAOD::VertexContainer',
+ 'GSFConversionVertices', '-vxTrackAtVertex.', ''],
+ Cluster=['xAOD::CaloClusterContainer', 'egammaClusters', '', ''],
+ EgammaLargeClusters=['xAOD::CaloClusterContainer',
+ 'egamma711Clusters', '', ''], # not output to AOD
+ TopoSeededCluster=['xAOD::CaloClusterContainer',
+ 'egammaTopoSeededClusters', '', '-CellLink'],
+ Electron=['xAOD::ElectronContainer', 'Electrons',
+ '', ShowerShapesSuppress+ElectronisemSupress],
+ EgammaRec=['egammaRecContainer', 'egammaRecCollection', '', ''],
+ PhotonSuperRec=['egammaRecContainer',
+ 'PhotonSuperRecCollection', '', ''],
+ ElectronSuperRec=['egammaRecContainer',
+ 'ElectronSuperRecCollection', '', ''],
+ FwdElectron=['xAOD::ElectronContainer',
+ 'ForwardElectrons', '', FwdElectronisemSupress],
+ FwdCluster=['xAOD::CaloClusterContainer',
+ 'ForwardElectronClusters', '-SisterCluster', '.-CellLink'],
+ Photon=['xAOD::PhotonContainer', 'Photons', '',
+ ShowerShapesSuppress+PhotonisemSupress],
+ TrackParticle=['xAOD::TrackParticleContainer', 'GSFTrackParticles',
+ '-caloExtension.-cellAssociation.-perigeeExtrapEta.-perigeeExtrapPhi', ''],
+ Track=['TrackCollection', 'GSFTracks', '', ''],
+ Truth=['xAOD::TruthParticleContainer',
+ 'egammaTruthParticles', '-caloExtension', '']
+ )
+ #
+ outputs['CellLink'] = ['CaloClusterCellLinkContainer',
+ outputs['Cluster'][1] + '_links', '', '']
+ outputs['TopoSeededCellLink'] = ['CaloClusterCellLinkContainer',
+ outputs['TopoSeededCluster'][1] +
+ '_links',
+ '', '']
+ outputs['FwdClusterCellLink'] = ['CaloClusterCellLinkContainer',
+ outputs['FwdCluster'][1] + '_links',
+ '', '']
+ outputs['EgammaLargeClustersCellLink'] = ['CaloClusterCellLinkContainer',
+ outputs['EgammaLargeClusters'][1] +
+ '_links',
+ '', '']
+ #
- outputs = dict(
- Conversion = [ 'xAOD::VertexContainer', 'GSFConversionVertices','-vxTrackAtVertex.' , ''],
- Cluster = [ 'xAOD::CaloClusterContainer', 'egammaClusters', '','' ],
- EgammaLargeClusters = [ 'xAOD::CaloClusterContainer', 'egamma711Clusters', '','' ], # not output to AOD
- TopoSeededCluster = [ 'xAOD::CaloClusterContainer', 'egammaTopoSeededClusters', '','-CellLink' ],
- Electron = [ 'xAOD::ElectronContainer', 'Electrons', '',ShowerShapesSuppress+ElectronisemSupress ],
- EgammaRec = [ 'egammaRecContainer', 'egammaRecCollection', '','' ],
- PhotonSuperRec = [ 'egammaRecContainer', 'PhotonSuperRecCollection', '','' ],
- ElectronSuperRec = [ 'egammaRecContainer', 'ElectronSuperRecCollection', '','' ],
- FwdElectron = [ 'xAOD::ElectronContainer', 'ForwardElectrons', '',FwdElectronisemSupress ],
- FwdCluster = [ 'xAOD::CaloClusterContainer', 'ForwardElectronClusters','-SisterCluster','.-CellLink' ],
- Photon = [ 'xAOD::PhotonContainer', 'Photons', '',ShowerShapesSuppress+PhotonisemSupress ],
- TrackParticle = [ 'xAOD::TrackParticleContainer', 'GSFTrackParticles','-caloExtension.-cellAssociation.-perigeeExtrapEta.-perigeeExtrapPhi',''],
- Track = [ 'TrackCollection', 'GSFTracks', '',''],
- Truth = [ 'xAOD::TruthParticleContainer', 'egammaTruthParticles','-caloExtension','']
- )
- #
- outputs['CellLink'] = ['CaloClusterCellLinkContainer', outputs['Cluster'][1] + '_links', '','']
- outputs['TopoSeededCellLink'] = ['CaloClusterCellLinkContainer', outputs['TopoSeededCluster'][1] + '_links', '','']
- outputs['FwdClusterCellLink'] = ['CaloClusterCellLinkContainer', outputs['FwdCluster'][1] + '_links', '','']
- outputs['EgammaLargeClustersCellLink'] = ['CaloClusterCellLinkContainer', outputs['EgammaLargeClusters'][1] + '_links', '','']
- #
# Create methods to return the types and keys in inputs and outputs
# e.g. egammaKeys.outputElectronKey()
-for i,j in egammaKeysDict.inputs.items():
- exec ("def input%sType(): return '%s'" % (i, j[0]))
- exec ("def input%sKey(): return '%s'" % (i, j[1]))
+for i, j in egammaKeysDict.inputs.items():
+ exec("def input%sType(): return '%s'" % (i, j[0]))
+ exec("def input%sKey(): return '%s'" % (i, j[1]))
+
+for i, j in egammaKeysDict.outputs.items():
+ exec("def output%sType(): return '%s'" % (i, j[0]))
+ exec("def output%sKey(): return '%s'" % (i, j[1]))
+ exec("def %sKey(): return '%s'" % (i, j[1]))
+del i, j
-for i,j in egammaKeysDict.outputs.items():
- exec ("def output%sType(): return '%s'" % (i, j[0]))
- exec ("def output%sKey(): return '%s'" % (i, j[1]))
- exec ("def %sKey(): return '%s'" % (i, j[1]))
-del i,j
def caloCellKey():
- "Return the default key for CaloCells, depending on the job configuration"
- from egammaRec import egammaRecFlags as egRecFlags
- egammaRecFlags = egRecFlags.jobproperties.egammaRecFlags
- if egammaRecFlags.cellContainerName.statusOn:
- return egammaRecFlags.cellContainerName()
- from RecExConfig.RecFlags import rec
- if rec.readAOD:
- return "AODCellContainer"
- else:
- return "AllCalo"
+ "Return the default key for CaloCells, depending on the job configuration"
+ from egammaRec import egammaRecFlags as egRecFlags
+ egammaRecFlags = egRecFlags.jobproperties.egammaRecFlags
+ if egammaRecFlags.cellContainerName.statusOn:
+ return egammaRecFlags.cellContainerName()
+ from RecExConfig.RecFlags import rec
+ if rec.readAOD:
+ return "AODCellContainer"
+ else:
+ return "AllCalo"
+
def truthParticleKey():
- return 'TruthParticles'
+ return 'TruthParticles'
+
def truthEventKey():
- return 'TruthEvents'
+ return 'TruthEvents'
diff --git a/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py b/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
index 72c432121ddf7cb0d73c6c8ff0414dd66bf74959..8b2425563986febd35588cef08cc426238dac9ea 100755
--- a/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
+++ b/Reconstruction/egamma/egammaRec/python/egammaRecFlags.py
@@ -1,150 +1,165 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#=======================================================================
+# =======================================================================
# File: egammaRec/python/egammaRecFlags.py
-#=======================================================================
-__author__ = 'C. Anastopoulos'
-__version__="$Revision: 2.0 $"
-__doc__="egamma flags . "
-
-#=======================================================================
-# imports
-#=======================================================================
-from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
+# =======================================================================
from AthenaCommon.JobProperties import jobproperties
+from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
+__author__ = 'C. Anastopoulos'
+__version__ = "$Revision: 2.0 $"
+__doc__ = "egamma flags . "
+
class Enabled(JobProperty):
- """ jobproperty to disable/enable the egamma algorithms as a group (container) in one go.
+ """ jobproperty to disable/enable the egamma algorithms as a group
+ (container) in one go.
Can enable/disable the full egamma
"""
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
+
class egammaRecFlagsJobProperty(JobProperty):
- """ special flag . Subclass which has get_value depending on job properties.egammaRecFlags.Enabled
- so properties inheriting from this will be disables if egammaRec is not Enabled.
+ """ special flag . Subclass which has get_value depending on
+ job properties.egammaRecFlags.Enabled
+ so properties inheriting from this will be disables
+ if egammaRec is not Enabled.
"""
+
def get_Value(self):
- return self.statusOn and self.StoredValue and jobproperties.egammaRecFlags.Enabled()
+ return (self.statusOn and
+ self.StoredValue
+ and jobproperties.egammaRecFlags.Enabled())
+
+# Different egamma seeding styles
+
-#Different egamma seeding styles
class doEgammaCaloSeeded (egammaRecFlagsJobProperty):
""" switch for standard cluster-based egamma algorithm
"""
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
+
class doEgammaForwardSeeded (egammaRecFlagsJobProperty):
""" switch for standard forward electrons algorithm
"""
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
-class doTopoCaloSeeded (JobProperty):
- """ switch for SW TopoCalo algorithm
- """
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
class doBremFinding (egammaRecFlagsJobProperty):
""" switch for whether to do the brem finding
"""
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
+
class doVertexBuilding (egammaRecFlagsJobProperty):
""" switch for whether to do the conversion vertex building
"""
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
+
+
+# Other options
-#Other options
class doEgammaTruthAssociation (JobProperty):
""" switch for truth association alg
"""
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
+
class doConversions (JobProperty):
""" switch for doing conversion matching
"""
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
+
class cellContainerName (JobProperty):
- """Allows overriding the name of the cell container used for building EM object clusters.
+ """Allows overriding the name of the cell container used
+ for building EM object clusters.
"""
- statusOn=False
- allowedTypes=['str']
- StoredValue=''
-
+ statusOn = False
+ allowedTypes = ['str']
+ StoredValue = ''
+
# Super cluster options
class doSuperclusters (JobProperty):
""" switch to enable/disable the supercluster based algorithm
"""
- statusOn=True
- allowedTypes=['bool']
- StoredValue=True
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = True
+
class inputTopoClusterCollection (JobProperty):
- """Name of input cluster container from which the topological cluster to be used during superclustering
- are selected
+ """Name of input cluster container from which the topological
+ cluster to be used during superclustering
+ are selected
"""
- statusOn=True
- allowedTypes=['str']
- StoredValue='CaloTopoCluster'
+ statusOn = True
+ allowedTypes = ['str']
+ StoredValue = 'CaloTopoCluster'
+
class egammaTopoClusterCollection (JobProperty):
- """Name of cluster container containing the selected topological clusters
+ """Name of cluster container containing the selected topological clusters
used during superclustering
"""
- statusOn=True
- allowedTypes=['str']
- StoredValue='egammaTopoCluster'
+ statusOn = True
+ allowedTypes = ['str']
+ StoredValue = 'egammaTopoCluster'
+
+# Calibration Options
+
-#Calibration Options
class clusterCorrectionVersion (JobProperty):
"""Version of calo cluster corrections used for calibration.
"""
- statusOn=True
- allowedTypes=['str', 'None']
- StoredValue='v12phiflip_noecorrnogap'
+ statusOn = True
+ allowedTypes = ['str', 'None']
+ StoredValue = 'v12phiflip_noecorrnogap'
+
class calibMVAVersion (JobProperty):
"""Version of calo cluster corrections used for calibration.
"""
- statusOn=True
- allowedTypes=['str', 'None']
- StoredValue="egammaMVACalib/offline/v7"
+ statusOn = True
+ allowedTypes = ['str', 'None']
+ StoredValue = "egammaMVACalib/offline/v7"
# Defines a sub-container holding the jobProperties for egamma
+
+
class egammaRecFlags(JobPropertyContainer):
""" egamma information """
-# add the egammaRec flags container to the top container
+
+# add the egammaRec flags container to the top container
jobproperties.add_Container(egammaRecFlags)
-# I want always the following flags in the container
-_list_Egamma=[Enabled, doEgammaCaloSeeded, doEgammaForwardSeeded, doBremFinding, doVertexBuilding,
- doConversions, doTopoCaloSeeded, cellContainerName, doEgammaTruthAssociation,
- clusterCorrectionVersion, calibMVAVersion, doSuperclusters,
- inputTopoClusterCollection, egammaTopoClusterCollection]
+# I want always the following flags in the container
+_list_Egamma = [Enabled, doEgammaCaloSeeded, doEgammaForwardSeeded,
+ doBremFinding, doVertexBuilding, doConversions,
+ cellContainerName, doEgammaTruthAssociation,
+ clusterCorrectionVersion, calibMVAVersion, doSuperclusters,
+ inputTopoClusterCollection, egammaTopoClusterCollection]
-for j in _list_Egamma:
+for j in _list_Egamma:
jobproperties.egammaRecFlags.add_JobProperty(j)
del _list_Egamma
-
-#=======================================================================
-
+# =======================================================================
diff --git a/Reconstruction/egamma/egammaRec/share/egammaOutputItemList_jobOptions.py b/Reconstruction/egamma/egammaRec/share/egammaOutputItemList_jobOptions.py
index dcd1159477be20c0ef43d43b19782b0cf099c4a8..0707bb62f5e58fe8aab7ce9619e5993cdc212d9a 100755
--- a/Reconstruction/egamma/egammaRec/share/egammaOutputItemList_jobOptions.py
+++ b/Reconstruction/egamma/egammaRec/share/egammaOutputItemList_jobOptions.py
@@ -1,89 +1,106 @@
-__doc__ = "Add containers to ESD/AOD ItemList using the definitions from egammaKeys"
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+__doc__ = """Add containers to ESD/AOD ItemList using
+the definitions from egammaKeys"""
from egammaRec import egammaKeys
from egammaRec.egammaKeys import egammaKeysDict
from AthenaCommon.Logging import logging
from RecExConfig.RecFlags import rec
+
def getItem(cType, cKey):
- "getItem(cType, cKey) -> Return item to be added to the output list: <cType>#<cKey>"
- return '%s#%s' % (cType, cKey)
+ """getItem(cType, cKey) -> Return item to be added
+ to the output list: <cType>#<cKey>"""
+ return '%s#%s' % (cType, cKey)
+
+
+def getAuxItem(cType, cKey, auxOptionAll='', auxOptionAOD=''):
+ """getAuxItem(cType, cKey, auxOption='')
+ -> <cType>#<cKey>Aux.<auxOption>"""
+ auxType = cType.replace('Container', 'AuxContainer')
+ auxKey = cKey + 'Aux.'
+ return '%s#%s%s%s' % (auxType, auxKey, auxOptionAll, auxOptionAOD)
-def getAuxItem(cType, cKey, auxOptionAll='',auxOptionAOD=''):
- "getAuxItem(cType, cKey, auxOption='') -> <cType>#<cKey>Aux.<auxOption>"
- auxType = cType.replace('Container', 'AuxContainer')
- auxKey = cKey + 'Aux.'
- return '%s#%s%s%s' % (auxType, auxKey, auxOptionAll,auxOptionAOD)
def addContainer(outputList, cType, cKey):
- "addContainer(outputList, cType, cKey) -> Add container to outputList"
- # Skip containers if already in outputList
- item = getItem(cType, cKey)
- if item not in outputList:
- outputList.append( item )
-
-def addAuxContainer(outputList, cType, cKey, auxOptionAll='',auxOptionAOD=''):
- "addAux(outputList, cType, cKey, auxOption='') -> Add aux container to outputList"
- item = getAuxItem(cType, cKey, auxOptionAll,auxOptionAOD)
- if item not in outputList:
- outputList.append( item )
-
-# List for of keys to be written to AOD.
+ """addContainer(outputList, cType, cKey)
+ -> Add container to outputList"""
+ # Skip containers if already in outputList
+ item = getItem(cType, cKey)
+ if item not in outputList:
+ outputList.append(item)
+
+
+def addAuxContainer(outputList, cType, cKey, auxOptionAll='', auxOptionAOD=''):
+ """addAux(outputList, cType, cKey, auxOption='')
+ -> Add aux container to outputList"""
+ item = getAuxItem(cType, cKey, auxOptionAll, auxOptionAOD)
+ if item not in outputList:
+ outputList.append(item)
+
+
+# List for of keys to be written to AOD.
# All egammaKeys.outputs but EgammaRec and TopoSeededCellLink
-AOD_outputs = [i for i,j in egammaKeysDict.outputs.items()
- if i not in ('EgammaRec','PhotonSuperRec','ElectronSuperRec',
- 'TopoSeededCellLink','FwdClusterCellLink',
- 'EgammaLargeClusters', 'EgammaLargeClustersCellLink')]
+AOD_outputs = [i for i, j in egammaKeysDict.outputs.items()
+ if i not in ('EgammaRec', 'PhotonSuperRec',
+ 'ElectronSuperRec', 'TopoSeededCellLink',
+ 'FwdClusterCellLink', 'EgammaLargeClusters',
+ 'EgammaLargeClustersCellLink')]
+
-ESD_outputs = [i for i,j in egammaKeysDict.outputs.items()
- if i not in ('EgammaRec','PhotonSuperRec','ElectronSuperRec',
- 'TopoSeededCellLink','FwdClusterCellLink')]
+ESD_outputs = [i for i, j in egammaKeysDict.outputs.items()
+ if i not in ('EgammaRec', 'PhotonSuperRec',
+ 'ElectronSuperRec', 'TopoSeededCellLink',
+ 'FwdClusterCellLink')]
# Define egammaAODList in the proper format (<type>#<key><option>),
# including aux containers
egammaAODList = []
egammaESDList = []
for i in AOD_outputs:
- cType, cKey, auxOptionAll, auxOptionAOD = egammaKeysDict.outputs[i]
+ cType, cKey, auxOptionAll, auxOptionAOD = egammaKeysDict.outputs[i]
- # Skip truth if doTruth = False
- if not rec.doTruth() and 'Truth' in cKey:
- continue
+ # Skip truth if doTruth = False
+ if not rec.doTruth() and 'Truth' in cKey:
+ continue
- # Skip Trk::Tracks in xAOD
- if egammaKeys.outputTrackType() in cType:
- continue
-
- addContainer(egammaAODList, cType, cKey)
+ # Skip Trk::Tracks in xAOD
+ if egammaKeys.outputTrackType() in cType:
+ continue
- # Add aux containers for xAOD containers
- if 'xAOD::' in cType:
- addAuxContainer(egammaAODList, cType, cKey, auxOptionAll, auxOptionAOD)
+ addContainer(egammaAODList, cType, cKey)
-for i in ESD_outputs:
- cType, cKey, auxOptionAll, auxOptionAOD = egammaKeysDict.outputs[i]
+ # Add aux containers for xAOD containers
+ if 'xAOD::' in cType:
+ addAuxContainer(egammaAODList, cType, cKey, auxOptionAll, auxOptionAOD)
- # Skip truth if doTruth = False
- if not rec.doTruth() and 'Truth' in cKey:
- continue
+for i in ESD_outputs:
+ cType, cKey, auxOptionAll, auxOptionAOD = egammaKeysDict.outputs[i]
- # Skip Trk::Tracks in xAOD
- if egammaKeys.outputTrackType() in cType:
- continue
-
- addContainer(egammaESDList, cType, cKey)
+ # Skip truth if doTruth = False
+ if not rec.doTruth() and 'Truth' in cKey:
+ continue
- # Add aux containers for xAOD containers
- if 'xAOD::' in cType:
- addAuxContainer(egammaESDList, cType, cKey, auxOptionAll)
+ # Skip Trk::Tracks in xAOD
+ if egammaKeys.outputTrackType() in cType:
+ continue
+ addContainer(egammaESDList, cType, cKey)
+ # Add aux containers for xAOD containers
+ if 'xAOD::' in cType:
+ addAuxContainer(egammaESDList, cType, cKey, auxOptionAll)
-# Add the non xAOD kind of collection in the ESD
-egammaESDList.append( getItem(egammaKeys.outputTrackType(), egammaKeys.outputTrackKey()) )
-egammaESDList.append( getItem(egammaKeys.outputFwdClusterCellLinkType(), egammaKeys.outputFwdClusterCellLinkKey()) )
-egammaESDList.append( getItem(egammaKeys.outputTopoSeededCellLinkType(), egammaKeys.outputTopoSeededCellLinkKey()))
-logEgammaOutputItemList_jobOptions = logging.getLogger( 'egammaOutputItemList_jobOptions' )
-logEgammaOutputItemList_jobOptions.info('egammaESDList: %s', egammaESDList)
-logEgammaOutputItemList_jobOptions.info('egammaAODList: %s', egammaAODList)
+# Add the non xAOD kind of collection in the ESD
+egammaESDList.append(getItem(egammaKeys.outputTrackType(),
+ egammaKeys.outputTrackKey()))
+egammaESDList.append(getItem(egammaKeys.outputFwdClusterCellLinkType(
+), egammaKeys.outputFwdClusterCellLinkKey()))
+egammaESDList.append(getItem(egammaKeys.outputTopoSeededCellLinkType(
+), egammaKeys.outputTopoSeededCellLinkKey()))
+logEgammaOutputItemList_jobOptions = logging.getLogger(
+ 'egammaOutputItemList_jobOptions')
+logEgammaOutputItemList_jobOptions.info('egammaESDList: %s', egammaESDList)
+logEgammaOutputItemList_jobOptions.info('egammaAODList: %s', egammaAODList)
diff --git a/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py b/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py
index 0e6d5e508625ae662ecbd5f7969743562863f8f2..1404a2e29c2594cf969283f93529f6c89b7afabc 100755
--- a/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py
+++ b/Reconstruction/egamma/egammaRec/share/egammaRec_jobOptions.py
@@ -1,131 +1,128 @@
# all these tests, except egamma, should be in egammaGetter
from CaloRec.CaloRecFlags import jobproperties
from egammaRec.egammaRecFlags import jobproperties
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
+from RecExConfig.RecFlags import rec
from AthenaCommon.Resilience import treatException
from AthenaCommon.DetFlags import DetFlags
-from egammaRec import egammaKeys
-from egammaRec.egammaKeys import egammaKeysDict
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
jobproperties.egammaRecFlags.print_JobProperties("full")
-######The simple cases where we can disable a flag
-# Truth
-if not rec.doTruth():
- jobproperties.egammaRecFlags.doEgammaTruthAssociation = False
+# The simple cases where we can disable a flag
-#GSF and vertex building need the inner detector
-if not DetFlags.detdescr.ID_on():
- jobproperties.egammaRecFlags.doBremFinding=False
- jobproperties.egammaRecFlags.doVertexBuilding=False
+# Truth
+if not rec.doTruth():
+ jobproperties.egammaRecFlags.doEgammaTruthAssociation = False
-#GSF also is seeded by the LarEMClusters for now. So we need these as well
-#if not (rec.readESD() or jobproperties.CaloRecFlags.doEmCluster()):
-# jobproperties.egammaRecFlags.doBremFinding=False
+# GSF and vertex building need the inner detector
+if not DetFlags.detdescr.ID_on():
+ jobproperties.egammaRecFlags.doBremFinding = False
+ jobproperties.egammaRecFlags.doVertexBuilding = False
-#We can not run Forward without having the TopoClusters
+# We can not run without having the Calo
if not (rec.readESD() or jobproperties.CaloRecFlags.doCaloTopoCluster()):
- jobproperties.egammaRecFlags.doEgammaForwardSeeded=False
+ jobproperties.egammaRecFlags.doEgammaCaloSeeded = False
+ jobproperties.egammaRecFlags.doEgammaForwardSeeded = False
+
+
+# Function to schedule the GSF
-#######Helper Functions
-#Function to schedule the GSF
def setupGSF():
- try:
- from egammaAlgs.egammaSelectedTrackCopy import egammaSelectedTrackCopy
- egammaSelectedTrackCopy(doPrint=True)
- except Exception:
- treatException("Could not set up the egamma track Selection for GSF. Switch Brem Building off !")
- jobproperties.egammaRecFlags.doBremFinding=False
- try:
- from egammaAlgs.EMBremCollectionBuilder import EMBremCollectionBuilder
- EMBremCollectionBuilder(doPrint=True)
- except Exception:
- treatException("Could not set up EMBremCollectionBuilder. Switch Brem Building off !")
- jobproperties.egammaRecFlags.doBremFinding=False
- try:
- from egammaAlgs.EMGSFCaloExtensionBuilder import EMGSFCaloExtensionBuilder
- EMGSFCaloExtensionBuilder(doPrint=True)
- except Exception:
- treatException("Could not set up EMGSFCaloExtensionBuilder.")
-
-#Function to schedule the conversion vertices reconstructions
+ try:
+ from egammaAlgs.egammaSelectedTrackCopy import (
+ egammaSelectedTrackCopy)
+ egammaSelectedTrackCopy(doPrint=True)
+ except Exception:
+ treatException(
+ "Could not set up the egamma track Selection for GSF."
+ "Switch Brem Building off !")
+ jobproperties.egammaRecFlags.doBremFinding = False
+ try:
+ from egammaAlgs.EMBremCollectionBuilder import (
+ EMBremCollectionBuilder)
+ EMBremCollectionBuilder(doPrint=True)
+ except Exception:
+ treatException(
+ "Could not set up EMBremCollectionBuilder."
+ "Switch Brem Building off !")
+ jobproperties.egammaRecFlags.doBremFinding = False
+ try:
+ from egammaAlgs.EMGSFCaloExtensionBuilder import (
+ EMGSFCaloExtensionBuilder)
+ EMGSFCaloExtensionBuilder(doPrint=True)
+ except Exception:
+ treatException("Could not set up EMGSFCaloExtensionBuilder.")
+
+# Function to schedule the conversion vertices reconstructions
+
+
def setupVertices():
- # Conversion vertex builder can not run in the default mode without GSF
- try:
- from egammaAlgs.EMVertexBuilder import EMVertexBuilder
- EMVertexBuilder(doPrint=True)
- except Exception:
- treatException("Could not set up the conversion vertex building. Switch vertex building off !")
- jobproperties.egammaRecFlags.doVertexBuilding=False
-
-#Function to schedule the Topo cluster based egamma
+ # Conversion vertex builder can not run in the default mode without GSF
+ try:
+ from egammaAlgs.EMVertexBuilder import EMVertexBuilder
+ EMVertexBuilder(doPrint=True)
+ except Exception:
+ treatException(
+ "Could not set up the conversion vertex building."
+ "Switch vertex building off !")
+ jobproperties.egammaRecFlags.doVertexBuilding = False
+
+# Function to schedule the Topo cluster based egamma
+
+
def setupTopoSeededEgamma():
- try:
- from egammaRec.topoEgammaGetter import topoEgammaGetter
- topoEgammaGetter(ignoreExistingDataObject=True)
- except Exception:
- treatException("Could not set up topoEgammaGetter. Switch it off !")
- #If we wanted Topo based cluster seeded egamma it just failed
- jobproperties.egammaRecFlags.doEgammaCaloSeeded=False
- topoEgammaGetter(disable=True)
-
-
-#Function to schedule the SW seeded egamma (only if we do not do super clusters).
-def setupSWSeededEgamma():
- try:
- from egammaRec.egammaGetter import egammaGetter
- egammaGetter(ignoreExistingDataObject=True)
- except Exception:
- treatException("Could not set up egammaGetter. Switch it off !")
- #If we wanted SW based cluster seeded egamma it just failed
- jobproperties.egammaRecFlags.doEgammaCaloSeeded=False
- egammaGetter(disable=True)
-
-#Function to schedule the Fwd egamma
-def setupFwdSeededEgamma():
- try:
- from egammaRec.egammaForwardGetter import egammaForwardGetter
- egammaForwardGetter(ignoreExistingDataObject=True)
- except Exception:
- treatException("Could not set up egammaForwardGetter. Switch it off !")
- jobproperties.egammaRecFlags.doEgammaForwardSeeded=False
- egammaForwardGetter(disable=True)
-
-#Function to schedule the Truth Association
-def setupTruthAssociation():
- try:
- from egammaRec.egammaTruthAssociationAlg import egammaTruthAssociationGetter
- egammaTruthAssociationGetter(ignoreExistingDataObject=True)
- except Exception:
- treatException("Could not set up egammaTruthAssociationAlg. Switched off !")
- jobproperties.egammaRecFlags.doEgammaTruthAssociation=False
- egammaTruthAssociationGetter(disable=True)
-
-
-######## Do the actual scheduling
+ try:
+ from egammaRec.topoEgammaGetter import topoEgammaGetter
+ topoEgammaGetter(ignoreExistingDataObject=True)
+ except Exception:
+ treatException("Could not set up topoEgammaGetter. Switch it off !")
+ # If we wanted Topo based cluster seeded egamma it just failed
+ jobproperties.egammaRecFlags.doEgammaCaloSeeded = False
+ topoEgammaGetter(disable=True)
+
+# Function to schedule the Fwd egamma
+
+
+def setupFwdSeededEgamma():
+ try:
+ from egammaRec.egammaForwardGetter import egammaForwardGetter
+ egammaForwardGetter(ignoreExistingDataObject=True)
+ except Exception:
+ treatException("Could not set up egammaForwardGetter. Switch it off !")
+ jobproperties.egammaRecFlags.doEgammaForwardSeeded = False
+ egammaForwardGetter(disable=True)
+
+# Function to schedule the Truth Association
+
+
+def setupTruthAssociation():
+ try:
+ from egammaRec.egammaTruthAssociationAlg import (
+ egammaTruthAssociationGetter)
+ egammaTruthAssociationGetter(ignoreExistingDataObject=True)
+ except Exception:
+ treatException(
+ "Could not set up egammaTruthAssociationAlg. Switched off !")
+ jobproperties.egammaRecFlags.doEgammaTruthAssociation = False
+ egammaTruthAssociationGetter(disable=True)
+
+
+# Do the actual scheduling
+
if jobproperties.egammaRecFlags.doBremFinding():
- setupGSF()
+ setupGSF()
+
if jobproperties.egammaRecFlags.doVertexBuilding():
- setupVertices()
-#Calo seeded egamma
-# Either we can do TopoSeeded superClusters
-# Or we can do SW seeded
-# Or we can do nothing (i.e no ESD nor CaloTopo nor LarEM clusters)
-if jobproperties.egammaRecFlags.doEgammaCaloSeeded():
- if jobproperties.egammaRecFlags.doSuperclusters() and (jobproperties.CaloRecFlags.doCaloTopoCluster() or rec.readESD()):
- setupTopoSeededEgamma()
- elif not jobproperties.egammaRecFlags.doSuperclusters() and (jobproperties.CaloRecFlags.doEmCluster() or rec.readESD()):
- setupSWSeededEgamma()
- else:
- jobproperties.egammaRecFlags.doEgammaCaloSeeded=False
+ setupVertices()
-if jobproperties.egammaRecFlags.doEgammaForwardSeeded():
- setupFwdSeededEgamma()
+if jobproperties.egammaRecFlags.doEgammaCaloSeeded():
+ setupTopoSeededEgamma()
-if jobproperties.egammaRecFlags.doEgammaTruthAssociation() and jobproperties.egammaRecFlags.doEgammaCaloSeeded():
- setupTruthAssociation()
+if jobproperties.egammaRecFlags.doEgammaForwardSeeded():
+ setupFwdSeededEgamma()
+if (jobproperties.egammaRecFlags.doEgammaTruthAssociation()
+ and jobproperties.egammaRecFlags.doEgammaCaloSeeded()):
+ setupTruthAssociation()
diff --git a/Reconstruction/egamma/egammaTools/CMakeLists.txt b/Reconstruction/egamma/egammaTools/CMakeLists.txt
index de3b4f2437df407bee6ae7eaa71c840c9bc9b564..12849074ea01e792f56dafd68cfb759cc79ab9bb 100644
--- a/Reconstruction/egamma/egammaTools/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaTools/CMakeLists.txt
@@ -5,48 +5,14 @@
# Declare the package name:
atlas_subdir( egammaTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Calorimeter/CaloConditions
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Calorimeter/CaloRec
- Calorimeter/CaloUtils
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Control/AthContainers
- DetectorDescription/Identifier
- DetectorDescription/GeoPrimitives
- Event/EventKernel
- Event/EventPrimitives
- Event/FourMom
- Event/FourMomUtils
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTruth
- GaudiKernel
- LArCalorimeter/LArRecConditions
- LArCalorimeter/LArCabling
- LumiBlock/LumiBlockComps
- PhysicsAnalysis/AnalysisCommon/PATCore
- PhysicsAnalysis/Interfaces/EgammaAnalysisInterfaces
- Reconstruction/egamma/egammaInterfaces
- Reconstruction/egamma/egammaRecEvent
- Reconstruction/egamma/egammaUtils
- Tracking/TrkEvent/TrkEventPrimitives
- )
-
atlas_add_component( egammaTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS
- LINK_LIBRARIES CaloConditions CaloEvent CaloIdentifier CaloRecLib CaloUtilsLib AthenaBaseComps AthenaKernel
- AthContainers StoreGateLib Identifier EventKernel EventPrimitives FourMom FourMomUtils xAODCaloEvent
- xAODEgamma xAODTracking xAODTruth GaudiKernel LArRecConditions LArCablingLib LumiBlockCompsLib PATCoreLib
+ LINK_LIBRARIES CaloConditions CaloEvent CaloIdentifier CaloRecLib CaloUtilsLib AthenaBaseComps AthenaKernel
+ AthContainers StoreGateLib Identifier EventKernel EventPrimitives FourMom FourMomUtils xAODCaloEvent
+ xAODEgamma xAODTracking xAODTruth GaudiKernel LArRecConditions LArCablingLib LumiBlockCompsLib PATCoreLib
EgammaAnalysisInterfacesLib egammaRecEvent egammaUtils TrkEventPrimitives egammaInterfacesLib )
# Install files from the package:
diff --git a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py
index d5578eed80d1bb336ca6c6bcd7621bb7028b5536..dbcc3123d4df69e72f3148dcacd272abbe83f2e7 100755
--- a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py
+++ b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderBase.py
@@ -45,11 +45,6 @@ class EMPIDBuilderElectronBase (EMPIDBuilder):
"TightLHSelector", LikeEnum.Tight)
TightLHSelector.primaryVertexContainer = "PrimaryVertices"
- # Multi Lepton
- from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf \
- import AsgElectronMultiLeptonSelector
- MultiLeptonSelector = AsgElectronMultiLeptonSelector(
- "MultiLeptonSelector")
self.electronIsEMselectors = [
LooseElectronSelector,
@@ -60,8 +55,6 @@ class EMPIDBuilderElectronBase (EMPIDBuilder):
self.electronLHselectors = [
LooseLHSelector, MediumLHSelector, TightLHSelector]
self.electronLHselectorResultNames = ["LHLoose", "LHMedium", "LHTight"]
- self.genericIsEMselectors = [MultiLeptonSelector]
- self.genericIsEMselectorResultNames = ["MultiLepton"]
self.LuminosityTool = None
diff --git a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
index a3b08875e879d2e39303e029418e6f3673e7747b..e69fddcf6ef0f73e98d99b2b15d87929b6f0c051 100755
--- a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
@@ -52,13 +52,6 @@ def EMPIDBuilderElectronCfg(flags, name='EMPIDBuilderElectron', **kwargs):
acc.merge(MediumLHSelectorAcc)
acc.merge(TightLHSelectorAcc)
- # Multi Lepton
- AsgElectronMultiLeptonSelector=CompFactory.AsgElectronMultiLeptonSelector
- if "genericIsEMselectors" not in kwargs:
- MultiLeptonSelector = AsgElectronMultiLeptonSelector("MultiLeptonSelector")
- kwargs["genericIsEMselectors"] = [MultiLeptonSelector]
- kwargs["genericIsEMselectorResultNames"] = ["MultiLepton"]
-
tool = EMPIDBuilder(name, **kwargs)
acc.setPrivateTools(tool)
diff --git a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
index c02121ec662422e944133eb2176c972e1ac621af..fcfc574ab50ec7c7eab23133d10fd2b2a003c414 100644
--- a/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMClusterTool.cxx
@@ -3,132 +3,147 @@
*/
#include "EMClusterTool.h"
+#include "CaloEvent/CaloClusterCellLink.h"
#include "GaudiKernel/EventContext.h"
-#include "xAODEgamma/EgammaxAODHelpers.h"
+#include "StoreGate/StoreGateSvc.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "xAODCaloEvent/CaloClusterAuxContainer.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "CaloEvent/CaloClusterCellLink.h"
+#include "xAODEgamma/EgammaxAODHelpers.h"
#include "xAODEgamma/ElectronContainer.h"
#include "xAODEgamma/PhotonContainer.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
-#include "CaloUtils/CaloClusterStoreHelper.h"
#include "CaloUtils/CaloCellDetPos.h"
+#include "CaloUtils/CaloClusterStoreHelper.h"
#include "StoreGate/WriteHandle.h"
-
// =============================================================
-EMClusterTool::EMClusterTool(const std::string& type, const std::string& name, const IInterface* parent) :
- AthAlgTool(type, name, parent),
- m_caloCellDetPos{},
- m_doTopoSeededContainer(false)
+EMClusterTool::EMClusterTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
+ : AthAlgTool(type, name, parent)
+ , m_caloCellDetPos{}
+ , m_doTopoSeededContainer(false)
{
declareInterface<IEMClusterTool>(this);
-
}
-EMClusterTool::~EMClusterTool() { }
-
-// const InterfaceID& ClusterTool::interfaceID() {
-// return IID_IClusterTool;
-// }
-
-// =============================================================
-StatusCode EMClusterTool::initialize() {
+StatusCode
+EMClusterTool::initialize()
+{
ATH_MSG_DEBUG("Initializing " << name() << "...");
ATH_CHECK(m_outputClusterContainerKey.initialize());
- m_outputClusterContainerCellLinkKey = m_outputClusterContainerKey.key() + "_links";
+
+ m_outputClusterContainerCellLinkKey =
+ m_outputClusterContainerKey.key() + "_links";
ATH_CHECK(m_outputClusterContainerCellLinkKey.initialize());
- m_doTopoSeededContainer = (m_outputTopoSeededClusterContainerKey.key() != m_outputClusterContainerKey.key() && !m_doSuperClusters);
- ATH_CHECK(m_outputTopoSeededClusterContainerKey.initialize(m_doTopoSeededContainer));
- m_outputTopoSeededClusterContainerCellLinkKey = m_outputTopoSeededClusterContainerKey.key() + "_links";
- ATH_CHECK(m_outputTopoSeededClusterContainerCellLinkKey.initialize(m_doTopoSeededContainer));
+ m_doTopoSeededContainer = (m_outputTopoSeededClusterContainerKey.key() !=
+ m_outputClusterContainerKey.key() &&
+ !m_doSuperClusters);
+ ATH_CHECK(
+ m_outputTopoSeededClusterContainerKey.initialize(m_doTopoSeededContainer));
+ m_outputTopoSeededClusterContainerCellLinkKey =
+ m_outputTopoSeededClusterContainerKey.key() + "_links";
+
+ ATH_CHECK(m_outputTopoSeededClusterContainerCellLinkKey.initialize(
+ m_doTopoSeededContainer));
// Get the cluster correction tool
- if(m_clusterCorrectionTool.retrieve().isFailure()) {
+ if (m_clusterCorrectionTool.retrieve().isFailure()) {
ATH_MSG_ERROR("Failed to retrieve " << m_clusterCorrectionTool);
return StatusCode::SUCCESS;
- }
-
- ATH_MSG_DEBUG("Retrieved tool " << m_clusterCorrectionTool);
-
+ }
+ ATH_MSG_DEBUG("Retrieved tool " << m_clusterCorrectionTool);
// Get the cluster correction tool
- if(m_MVACalibSvc.retrieve().isFailure()) {
+ if (m_MVACalibSvc.retrieve().isFailure()) {
ATH_MSG_ERROR("Failed to retrieve " << m_MVACalibSvc);
return StatusCode::SUCCESS;
- }
-
- ATH_MSG_DEBUG("Retrieved tool " << m_MVACalibSvc);
-
+ }
- ATH_MSG_DEBUG("Initialization successful");
+ ATH_MSG_DEBUG("Retrieved tool " << m_MVACalibSvc);
- return StatusCode::SUCCESS;
-}
+ ATH_MSG_DEBUG("Initialization successful");
-// =========================================================================
-StatusCode EMClusterTool::finalize() {
return StatusCode::SUCCESS;
}
-// =========================================================================
-StatusCode EMClusterTool::contExecute(const EventContext& ctx,
- const CaloDetDescrManager& mgr,
- xAOD::ElectronContainer *electronContainer,
- xAOD::PhotonContainer *photonContainer) const
+StatusCode
+EMClusterTool::contExecute(const EventContext& ctx,
+ const CaloDetDescrManager& mgr,
+ xAOD::ElectronContainer* electronContainer,
+ xAOD::PhotonContainer* photonContainer) const
{
+
// Create output cluster container and register in StoreGate
- SG::WriteHandle<xAOD::CaloClusterContainer> outputClusterContainer(m_outputClusterContainerKey, ctx);
- ATH_CHECK(outputClusterContainer.record(std::make_unique<xAOD::CaloClusterContainer>(),
- std::make_unique<xAOD::CaloClusterAuxContainer>()));
- SG::WriteHandle<CaloClusterCellLinkContainer> outputClusterContainerCellLink(m_outputClusterContainerCellLinkKey, ctx);
- ATH_CHECK(outputClusterContainerCellLink.record(std::make_unique<CaloClusterCellLinkContainer>()));
-
- // Create output cluster container for topo-seeded clusters and register in StoreGate
- // Only if they differ from the main output cluster container
- // and if we do not do supercluster
+ SG::WriteHandle<xAOD::CaloClusterContainer> outputClusterContainer(
+ m_outputClusterContainerKey, ctx);
+
+ ATH_CHECK(outputClusterContainer.record(
+ std::make_unique<xAOD::CaloClusterContainer>(),
+ std::make_unique<xAOD::CaloClusterAuxContainer>()));
+
+ SG::WriteHandle<CaloClusterCellLinkContainer> outputClusterContainerCellLink(
+ m_outputClusterContainerCellLinkKey, ctx);
+
+ ATH_CHECK(outputClusterContainerCellLink.record(
+ std::make_unique<CaloClusterCellLinkContainer>()));
+
+ // Create output cluster container for topo-seeded clusters and register in
+ // StoreGate Only if they differ from the main output cluster container and if
+ // we do not do supercluster
SG::WriteHandle<xAOD::CaloClusterContainer> outputTopoSeededClusterContainer;
- SG::WriteHandle<CaloClusterCellLinkContainer> outputTopoSeededClusterContainerCellLink;
+ SG::WriteHandle<CaloClusterCellLinkContainer>
+ outputTopoSeededClusterContainerCellLink;
+
if (m_doTopoSeededContainer) {
- outputTopoSeededClusterContainer = SG::WriteHandle<xAOD::CaloClusterContainer>(m_outputTopoSeededClusterContainerKey, ctx);
- ATH_CHECK(outputTopoSeededClusterContainer.record(std::make_unique<xAOD::CaloClusterContainer>(),
- std::make_unique<xAOD::CaloClusterAuxContainer>()));
- outputTopoSeededClusterContainerCellLink = SG::WriteHandle<CaloClusterCellLinkContainer>(m_outputTopoSeededClusterContainerCellLinkKey, ctx);
- ATH_CHECK(outputTopoSeededClusterContainerCellLink.record(std::make_unique<CaloClusterCellLinkContainer>()));
+ outputTopoSeededClusterContainer =
+ SG::WriteHandle<xAOD::CaloClusterContainer>(
+ m_outputTopoSeededClusterContainerKey, ctx);
+
+ ATH_CHECK(outputTopoSeededClusterContainer.record(
+ std::make_unique<xAOD::CaloClusterContainer>(),
+ std::make_unique<xAOD::CaloClusterAuxContainer>()));
+
+ outputTopoSeededClusterContainerCellLink =
+ SG::WriteHandle<CaloClusterCellLinkContainer>(
+ m_outputTopoSeededClusterContainerCellLinkKey, ctx);
+
+ ATH_CHECK(outputTopoSeededClusterContainerCellLink.record(
+ std::make_unique<CaloClusterCellLinkContainer>()));
}
-
+
// Loop over electrons and create new clusters
xAOD::EgammaParameters::EgammaType egType = xAOD::EgammaParameters::electron;
- if(electronContainer){
- for (auto electron : *electronContainer){
- setNewCluster(ctx,mgr, electron, outputClusterContainer.ptr(), egType);
+ if (electronContainer) {
+ for (auto electron : *electronContainer) {
+ setNewCluster(ctx, mgr, electron, outputClusterContainer.ptr(), egType);
}
}
- if(photonContainer){
+
+ if (photonContainer) {
// Loop over photons and create new clusters
- for (auto photon : *photonContainer){
- egType = (xAOD::EgammaHelpers::isConvertedPhoton(photon) ?
- xAOD::EgammaParameters::convertedPhoton :
- xAOD::EgammaParameters::unconvertedPhoton);
-
- if (!m_doTopoSeededContainer || !photon->author(xAOD::EgammaParameters::AuthorCaloTopo35) ){
- setNewCluster(ctx, mgr,photon, outputClusterContainer.ptr(), egType);
- }
- else{
- setNewCluster(ctx, mgr,photon, outputTopoSeededClusterContainer.ptr(), egType);
+ for (auto photon : *photonContainer) {
+ egType = (xAOD::EgammaHelpers::isConvertedPhoton(photon)
+ ? xAOD::EgammaParameters::convertedPhoton
+ : xAOD::EgammaParameters::unconvertedPhoton);
+
+ if (!m_doTopoSeededContainer ||
+ !photon->author(xAOD::EgammaParameters::AuthorCaloTopo35)) {
+ setNewCluster(ctx, mgr, photon, outputClusterContainer.ptr(), egType);
+ } else {
+ setNewCluster(
+ ctx, mgr, photon, outputTopoSeededClusterContainer.ptr(), egType);
}
}
}
- // Now finalize the cluster: based on code in CaloClusterStoreHelper::finalizeClusters
- // Note: I don't specifically set the IProxyDict, since I also don't set it when I create
- // data handles, either.
+ // Now finalize the cluster: based on code in
+ // CaloClusterStoreHelper::finalizeClusters
auto sg = outputClusterContainer.storeHandle().get();
for (xAOD::CaloCluster* cl : *outputClusterContainer) {
cl->setLink(outputClusterContainerCellLink.ptr(), sg);
@@ -151,34 +166,35 @@ EMClusterTool::setNewCluster(const EventContext& ctx,
xAOD::CaloClusterContainer* outputClusterContainer,
xAOD::EgammaParameters::EgammaType egType) const
{
- if (!eg) {return;}
+ if (!eg) {
+ return;
+ }
- if (!eg->caloCluster()){
+ if (!eg->caloCluster()) {
ATH_MSG_DEBUG("egamma object does not have a cluster associated");
return;
}
typedef ElementLink<xAOD::CaloClusterContainer> ClusterLink_t;
xAOD::CaloCluster* cluster = nullptr;
- //Special Case for topo seeded photons.
+ // Special Case for topo seeded photons.
if (eg->author(xAOD::EgammaParameters::AuthorCaloTopo35)) {
cluster = new xAOD::CaloCluster(*(eg->caloCluster()));
- fillPositionsInCalo(cluster,mgr);
+ fillPositionsInCalo(cluster, mgr);
} // Doing superClusters
- else if ( m_doSuperClusters){
- //copy over for super clusters
- cluster = makeNewSuperCluster(*(eg->caloCluster()),eg);
- }
- else {
- cluster = makeNewCluster(ctx,*(eg->caloCluster()), mgr, eg, egType);
+ else if (m_doSuperClusters) {
+ // copy over for super clusters
+ cluster = makeNewSuperCluster(*(eg->caloCluster()), eg);
+ } else {
+ cluster = makeNewCluster(ctx, *(eg->caloCluster()), mgr, eg, egType);
}
+
outputClusterContainer->push_back(cluster);
// Set the link to the new cluster
ClusterLink_t clusterLink(cluster, *outputClusterContainer);
- const std::vector<ClusterLink_t> clusterLinks{clusterLink};
- eg->setCaloClusterLinks( clusterLinks );
-
+ const std::vector<ClusterLink_t> clusterLinks{ clusterLink };
+ eg->setCaloClusterLinks(clusterLinks);
}
xAOD::CaloCluster*
@@ -188,108 +204,122 @@ EMClusterTool::makeNewCluster(const EventContext& ctx,
xAOD::Egamma* eg,
xAOD::EgammaParameters::EgammaType egType) const
{
- //
// Create new cluster based on an existing one
// const CaloCluster* cluster : input cluster
- //
+
// protection against cluster not in barrel nor endcap
- if (!cluster.inBarrel() && !cluster.inEndcap() ){
+ if (!cluster.inBarrel() && !cluster.inEndcap()) {
ATH_MSG_ERROR("Cluster neither in barrel nor in endcap, Skipping cluster");
return nullptr;
}
-
- if ((int) egType < 0 || egType >= xAOD::EgammaParameters::NumberOfEgammaTypes){
+
+ if (static_cast<int>(egType) < 0 ||
+ egType >= xAOD::EgammaParameters::NumberOfEgammaTypes) {
ATH_MSG_WARNING("Invalid egamma type");
return nullptr;
}
- bool isBarrel = xAOD::EgammaHelpers::isBarrel(&cluster);
- xAOD::CaloCluster::ClusterSize cluSize=xAOD::CaloCluster:: CSize_Unknown;
- if (egType == xAOD::EgammaParameters::electron){
- cluSize= (isBarrel ? xAOD::CaloCluster::SW_37ele : xAOD::CaloCluster::SW_55ele);
- }
- else if (egType == xAOD::EgammaParameters::convertedPhoton){
- cluSize= (isBarrel ? xAOD::CaloCluster::SW_37Econv : xAOD::CaloCluster::SW_55Econv);
- }
- else {//(egType == xAOD::EgammaParameters::unconvertedPhoton)
- cluSize = (isBarrel ? xAOD::CaloCluster::SW_37gam : xAOD::CaloCluster::SW_55gam);
+ bool isBarrel = xAOD::EgammaHelpers::isBarrel(&cluster);
+ xAOD::CaloCluster::ClusterSize cluSize = xAOD::CaloCluster::CSize_Unknown;
+ switch (egType) {
+ case xAOD::EgammaParameters::electron: {
+ cluSize =
+ isBarrel ? xAOD::CaloCluster::SW_37ele : xAOD::CaloCluster::SW_55ele;
+ break;
+ }
+ case xAOD::EgammaParameters::convertedPhoton: {
+ cluSize = isBarrel ? xAOD::CaloCluster::SW_37Econv
+ : xAOD::CaloCluster::SW_55Econv;
+ break;
+ }
+ default: {
+ cluSize =
+ (isBarrel ? xAOD::CaloCluster::SW_37gam : xAOD::CaloCluster::SW_55gam);
+ }
}
- xAOD::CaloCluster *newCluster = makeNewCluster(ctx,cluster, mgr,cluSize);
-
- if (newCluster && m_MVACalibSvc->execute(*newCluster,*eg).isFailure()){
+ xAOD::CaloCluster* newCluster = makeNewCluster(ctx, cluster, mgr, cluSize);
+
+ if (newCluster && m_MVACalibSvc->execute(*newCluster, *eg).isFailure()) {
ATH_MSG_ERROR("Problem executing MVA cluster tool");
}
return newCluster;
}
-// ==========================================================================
xAOD::CaloCluster*
-EMClusterTool::makeNewCluster(const EventContext& ctx,
- const xAOD::CaloCluster& cluster,
- const CaloDetDescrManager& mgr,
- const xAOD::CaloCluster::ClusterSize& cluSize) const
+EMClusterTool::makeNewCluster(
+ const EventContext& ctx,
+ const xAOD::CaloCluster& cluster,
+ const CaloDetDescrManager& mgr,
+ const xAOD::CaloCluster::ClusterSize& cluSize) const
{
- xAOD::CaloCluster* newClus = CaloClusterStoreHelper::makeCluster(cluster.getCellLinks()->getCellContainer(),
- cluster.eta0(),cluster.phi0(),
- cluSize);
- if(newClus){
- if (m_clusterCorrectionTool->execute(ctx,newClus).isFailure()){
+ xAOD::CaloCluster* newClus = CaloClusterStoreHelper::makeCluster(
+ cluster.getCellLinks()->getCellContainer(),
+ cluster.eta0(),
+ cluster.phi0(),
+ cluSize);
+ if (newClus) {
+ if (m_clusterCorrectionTool->execute(ctx, newClus).isFailure()) {
ATH_MSG_ERROR("Problem executing cluster correction tool");
}
- fillPositionsInCalo(newClus,mgr);
- //Fill the raw state using the cluster with correct size but not MVA
+ fillPositionsInCalo(newClus, mgr);
+ // Fill the raw state using the cluster with correct size but not MVA
newClus->setRawE(newClus->calE());
newClus->setRawEta(newClus->calEta());
newClus->setRawPhi(newClus->calPhi());
- //Fill the Alt state using the 3x5 cluster
+ // Fill the Alt state using the 3x5 cluster
newClus->setAltE(cluster.calE());
newClus->setAltEta(cluster.calEta());
newClus->setAltPhi(cluster.calPhi());
- }
- else {
+ } else {
ATH_MSG_ERROR("Null newClus");
}
return newClus;
}
+
xAOD::CaloCluster*
EMClusterTool::makeNewSuperCluster(const xAOD::CaloCluster& cluster,
xAOD::Egamma* eg) const
{
//
xAOD::CaloCluster* newClus = new xAOD::CaloCluster(cluster);
- if(m_applySuperClusters){
- if (newClus && m_MVACalibSvc->execute(*newClus,*eg).isFailure()){
+ if (m_applySuperClusters) {
+ if (newClus && m_MVACalibSvc->execute(*newClus, *eg).isFailure()) {
ATH_MSG_ERROR("Problem executing MVA cluster tool");
}
}
-
- ATH_MSG_DEBUG("Cluster Energy after final calibration: "<<newClus->e());
return newClus;
}
void
-EMClusterTool::fillPositionsInCalo(xAOD::CaloCluster* cluster, const CaloDetDescrManager& mgr) const
+EMClusterTool::fillPositionsInCalo(xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr) const
{
bool isBarrel = xAOD::EgammaHelpers::isBarrel(cluster);
- CaloCell_ID::CaloSample sample = isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
+ CaloCell_ID::CaloSample sample =
+ isBarrel ? CaloCell_ID::EMB2 : CaloCell_ID::EME2;
+
// eta and phi of the cluster in the calorimeter frame
double eta;
double phi;
- m_caloCellDetPos.getDetPosition(mgr,sample,cluster->eta(), cluster->phi(), eta, phi);
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->eta(), cluster->phi(), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETACALOFRAME,eta);
- cluster->insertMoment(xAOD::CaloCluster::PHICALOFRAME,phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETACALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHICALOFRAME, phi);
// eta in the second sampling
- m_caloCellDetPos.getDetPosition(mgr,sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETA2CALOFRAME,eta);
- cluster->insertMoment(xAOD::CaloCluster::PHI2CALOFRAME,phi);
- // eta in the first sampling
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->etaBE(2), cluster->phiBE(2), eta, phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETA2CALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHI2CALOFRAME, phi);
+
+ // eta in the first sampling
sample = isBarrel ? CaloCell_ID::EMB1 : CaloCell_ID::EME1;
- m_caloCellDetPos.getDetPosition(mgr,sample, cluster->etaBE(1), cluster->phiBE(1),eta, phi);
- cluster->insertMoment(xAOD::CaloCluster::ETA1CALOFRAME,eta);
- cluster->insertMoment(xAOD::CaloCluster::PHI1CALOFRAME,phi);
+ m_caloCellDetPos.getDetPosition(
+ mgr, sample, cluster->etaBE(1), cluster->phiBE(1), eta, phi);
+ cluster->insertMoment(xAOD::CaloCluster::ETA1CALOFRAME, eta);
+ cluster->insertMoment(xAOD::CaloCluster::PHI1CALOFRAME, phi);
}
diff --git a/Reconstruction/egamma/egammaTools/src/EMClusterTool.h b/Reconstruction/egamma/egammaTools/src/EMClusterTool.h
index a729802a76a9002f952562eed52bcffd243dbadb..0e67e6dc1941c4ac42fc81946372bc86b7d95d1b 100644
--- a/Reconstruction/egamma/egammaTools/src/EMClusterTool.h
+++ b/Reconstruction/egamma/egammaTools/src/EMClusterTool.h
@@ -6,19 +6,19 @@
#define EGAMMATOOLS_EMCLUSTERTOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/EventContext.h"
-#include "egammaInterfaces/IEMClusterTool.h"
+#include "GaudiKernel/ToolHandle.h"
#include "egammaBaseTool.h"
+#include "egammaInterfaces/IEMClusterTool.h"
-#include "egammaInterfaces/IegammaSwTool.h"
#include "egammaInterfaces/IegammaMVASvc.h"
+#include "egammaInterfaces/IegammaSwTool.h"
+#include "StoreGate/WriteHandleKey.h"
#include "xAODCaloEvent/CaloCluster.h" // cannot use CaloClusterFwd b/c of ClusterSize
#include "xAODCaloEvent/CaloClusterContainer.h"
-#include "xAODEgamma/EgammaFwd.h"
#include "xAODEgamma/EgammaEnums.h"
-#include "StoreGate/WriteHandleKey.h"
+#include "xAODEgamma/EgammaFwd.h"
#include "CaloUtils/CaloCellDetPos.h"
class CaloClusterCellLink;
@@ -26,133 +26,162 @@ class CaloClusterCellLink;
/**
@class EMClusterTool
This tool makes the EM CaloCluster used by egamma objects.
- It also defines the cluster size
+ It also defines the cluster size
- in barrel
3*7 for electrons
3*7 for converted photons with Rconv<800mm
3*5 for converted photons with Rconv>800mm
- 3*5 for unconverted photons
+ 3*5 for unconverted photons
- in end-caps
5*5 for electrons
5*5 for converted photons with Rconv<800mm
5*5 for converted photons with Rconv>800mm
- 5*5 for unconverted photons
- and applies the right cluster corrections depending on classification as electron, unconverted photon or converted photon
-
+ 5*5 for unconverted photons
+ and applies the right cluster corrections depending on classification as
+ electron, unconverted photon or converted photon
+
@author Thomas Koffas
@author F. Derue
@author B. Lenzi
@author C. Anastopoulos
*/
-class EMClusterTool : public AthAlgTool, virtual public IEMClusterTool {
-
- public:
+class EMClusterTool
+ : public AthAlgTool
+ , virtual public IEMClusterTool
+{
+public:
/** @brief constructor */
- EMClusterTool (const std::string& type,const std::string& name, const IInterface* parent);
+ EMClusterTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
/** @brief destructor */
- virtual ~EMClusterTool();
+ virtual ~EMClusterTool() = default;
/** @brief initialize method */
- virtual StatusCode initialize() override;
+ virtual StatusCode initialize() override final;
/** @brief execute on container */
- virtual StatusCode contExecute(const EventContext& ctx,
- const CaloDetDescrManager& mgr,
- xAOD::ElectronContainer* electronContainer,
- xAOD::PhotonContainer* photonContainer) const override final;
- /** @brief finalize method */
- virtual StatusCode finalize() override;
-
+ virtual StatusCode contExecute(
+ const EventContext& ctx,
+ const CaloDetDescrManager& mgr,
+ xAOD::ElectronContainer* electronContainer,
+ xAOD::PhotonContainer* photonContainer) const override final;
private:
-
/** @brief Set new cluster to the egamma object, decorate the new cluster
- * with a link to the old one **/
+ * with a link to the old one **/
void setNewCluster(const EventContext& ctx,
const CaloDetDescrManager& mgr,
- xAOD::Egamma *eg,
- xAOD::CaloClusterContainer *outputClusterContainer,
+ xAOD::Egamma* eg,
+ xAOD::CaloClusterContainer* outputClusterContainer,
xAOD::EgammaParameters::EgammaType egType) const;
-
- /** @brief creation of new cluster based on existing one
- * Return a new cluster using the seed eta0, phi0 from the existing one,
- * applying cluster corrections and MVA calibration (requires the egamma object).
- * The cluster size depends on the given EgammaType
- */
+
+ /** @brief creation of new cluster based on existing one
+ * Return a new cluster using the seed eta0, phi0 from the existing one,
+ * applying cluster corrections and MVA calibration (requires the egamma
+ * object). The cluster size depends on the given EgammaType
+ */
xAOD::CaloCluster* makeNewCluster(const EventContext&,
const xAOD::CaloCluster&,
const CaloDetDescrManager& mgr,
xAOD::Egamma* eg,
xAOD::EgammaParameters::EgammaType) const;
- /** @brief creation of new cluster based on existing one
- * Return a new cluster with the given size using the seed eta0, phi0 from the
- * existing cluster and applying cluster corrections.
- * If doDecorate is true, copy the cal to the raw signal state
- * and set the raw one to the cal e,eta,phi from the existing cluster
- */
- xAOD::CaloCluster* makeNewCluster(const EventContext& ctx,
- const xAOD::CaloCluster&,
- const CaloDetDescrManager& mgr,
- const xAOD::CaloCluster::ClusterSize&) const;
+ /** @brief creation of new cluster based on existing one
+ * Return a new cluster with the given size using the seed eta0, phi0 from the
+ * existing cluster and applying cluster corrections.
+ * If doDecorate is true, copy the cal to the raw signal state
+ * and set the raw one to the cal e,eta,phi from the existing cluster
+ */
+ xAOD::CaloCluster* makeNewCluster(
+ const EventContext& ctx,
+ const xAOD::CaloCluster&,
+ const CaloDetDescrManager& mgr,
+ const xAOD::CaloCluster::ClusterSize&) const;
/** @brief creation of new super cluster based on existing one */
xAOD::CaloCluster* makeNewSuperCluster(const xAOD::CaloCluster& cluster,
xAOD::Egamma* eg) const;
/** @brief build extra positions in calo frame*/
- void fillPositionsInCalo(xAOD::CaloCluster* cluster, const CaloDetDescrManager& mgr) const;
+ void fillPositionsInCalo(xAOD::CaloCluster* cluster,
+ const CaloDetDescrManager& mgr) const;
/** @brief Key of the output cluster container **/
- SG::WriteHandleKey<xAOD::CaloClusterContainer> m_outputClusterContainerKey {this,
- "OutputClusterContainerName", "",
- "Name of the output cluster container"};
-
- /** @brief Key of the output cluster container cell links:
+ SG::WriteHandleKey<xAOD::CaloClusterContainer> m_outputClusterContainerKey{
+ this,
+ "OutputClusterContainerName",
+ "",
+ "Name of the output cluster container"
+ };
+
+ /** @brief Key of the output cluster container cell links:
name taken from containter name; only dummy configurable **/
- SG::WriteHandleKey<CaloClusterCellLinkContainer> m_outputClusterContainerCellLinkKey {this,
- "DoNotSet_OutputClusterContainerLinks", "",
- "Key of the output cluster container cell links; Do not set! Name taken from associated container"};
+ SG::WriteHandleKey<CaloClusterCellLinkContainer>
+ m_outputClusterContainerCellLinkKey{
+ this,
+ "DoNotSet_OutputClusterContainerLinks",
+ "",
+ "Key of the output cluster container cell links; Do not set! Name taken "
+ "from associated container"
+ };
/** @brief Key of the output cluster container for topo-seeded clusters **/
- SG::WriteHandleKey<xAOD::CaloClusterContainer> m_outputTopoSeededClusterContainerKey {this,
- "OutputTopoSeededClusterContainerName", ""
- "Name of the output cluster container for topo-seeded clusters (can be the same as the other clusters)"};
-
- /** @brief Key of the output cluster container cell links for topo-seeded clusters:
- * name taken from containter name; only dummy configurable */
- SG::WriteHandleKey<CaloClusterCellLinkContainer> m_outputTopoSeededClusterContainerCellLinkKey {this,
- "DoNotSet_OutputTopoSeededClusterContainerLinks", "",
- "Key of the output cluster container cell links for topo-seeded clusters; Do not set! Name taken from associated container"};
+ SG::WriteHandleKey<xAOD::CaloClusterContainer>
+ m_outputTopoSeededClusterContainerKey{
+ this,
+ "OutputTopoSeededClusterContainerName",
+ ""
+ "Name of the output cluster container for topo-seeded clusters (can be "
+ "the same as the other clusters)"
+ };
+
+ /** @brief Key of the output cluster container cell links for topo-seeded
+ * clusters: name taken from containter name; only dummy configurable */
+ SG::WriteHandleKey<CaloClusterCellLinkContainer>
+ m_outputTopoSeededClusterContainerCellLinkKey{
+ this,
+ "DoNotSet_OutputTopoSeededClusterContainerLinks",
+ "",
+ "Key of the output cluster container cell links for topo-seeded "
+ "clusters; Do not set! Name taken from associated container"
+ };
/** Handle to the MVA calibration service **/
- ServiceHandle<IegammaMVASvc> m_MVACalibSvc {this,
- "MVACalibSvc", "egammaMVASvc", "calibration service"};
+ ServiceHandle<IegammaMVASvc> m_MVACalibSvc{ this,
+ "MVACalibSvc",
+ "egammaMVASvc",
+ "calibration service" };
-
/** @brief Tool to handle cluster corrections */
- ToolHandle<IegammaSwTool> m_clusterCorrectionTool{ this,
- "ClusterCorrectionTool",
- "egammaSwTool/egammaswtool",
- "tool that applies cluster corrections" };
+ ToolHandle<IegammaSwTool> m_clusterCorrectionTool{
+ this,
+ "ClusterCorrectionTool",
+ "egammaSwTool/egammaswtool",
+ "tool that applies cluster corrections"
+ };
/** @brief do super clusters **/
- Gaudi::Property<bool> m_doSuperClusters{ this, "doSuperCluster", true, "Do Super Cluster Reco" };
+ Gaudi::Property<bool> m_doSuperClusters{ this,
+ "doSuperCluster",
+ true,
+ "Do Super Cluster Reco" };
/** @brief flag to protect against applying the MVA to super Clusters **/
- Gaudi::Property<bool> m_applySuperClusters{ this,
- "applyMVAToSuperCluster",
- true,
- "Protection to not do anything for superClusters" };
-
- /** @brief Position in Calo frame**/
+ Gaudi::Property<bool> m_applySuperClusters{
+ this,
+ "applyMVAToSuperCluster",
+ true,
+ "Protection to not do anything for superClusters"
+ };
+
+ /** @brief Position in Calo frame**/
const CaloCellDetPos m_caloCellDetPos;
// derived variable (not set by JOs)
bool m_doTopoSeededContainer;
-
};
#endif // EGAMMATOOLS_EMCLUSTERTOOL_H
diff --git a/Reconstruction/egamma/egammaTools/src/EMConversionBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMConversionBuilder.cxx
index 9c62c73bd4bbe81c125f67bbf5000105ee32b860..969e6a2f249e3ac7a3b81b6910715cb973698cb5 100644
--- a/Reconstruction/egamma/egammaTools/src/EMConversionBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMConversionBuilder.cxx
@@ -11,63 +11,65 @@ CREATED: Jul, 2005
CHANGES: Mar, 2014 (BL) xAOD migration
CHANGES: 2020 (CA) Athena MT migration
-PURPOSE: subAlgorithm which creates an EMConversion object.
+PURPOSE: subAlgorithm which creates an EMConversion object.
********************************************************************/
// INCLUDE HEADER FILES:
#include "EMConversionBuilder.h"
-#include "xAODTracking/VertexContainer.h"
-#include "egammaRecEvent/egammaRecContainer.h"
-#include "egammaRecEvent/egammaRec.h"
#include "FourMomUtils/P4Helpers.h"
-#include "StoreGate/ReadHandle.h"
#include "GaudiKernel/EventContext.h"
-#include "xAODTracking/Vertex.h"
+#include "StoreGate/ReadHandle.h"
+#include "egammaRecEvent/egammaRec.h"
+#include "egammaRecEvent/egammaRecContainer.h"
#include "xAODEgamma/EgammaxAODHelpers.h"
+#include "xAODTracking/Vertex.h"
+#include "xAODTracking/VertexContainer.h"
// END OF HEADER FILES INCLUDE
/////////////////////////////////////////////////////////////////
namespace {
- /** Sort conversion vertices according to the following criteria:
- - Vertices with more Si tracks have priority
- - Vertices with more tracks have priority
- - Vertices with smaller radii have priority
-
- OLD SCHEME:
- - Vertices with 2 tracks have priority over the ones with 1 track
- - Vertices with Si + Si tracks have priority (if m_preferSi > 0)
- - Vertices with Si + TRT or TRT + TRT depending on m_preferSi
- - Vertices with smaller radii have priority
- **/
- bool ConvVxSorter (const xAOD::Vertex& vx1, const xAOD::Vertex& vx2)
- {
- xAOD::EgammaParameters::ConversionType convType1;
- xAOD::EgammaParameters::ConversionType convType2;
- convType1 = xAOD::EgammaHelpers::conversionType(&vx1);
- convType2 = xAOD::EgammaHelpers::conversionType(&vx2);
-
- if (convType1 != convType2)
- {
- // Different conversion type, preference to vertices with Si tracks
- int nSi1 = xAOD::EgammaHelpers::numberOfSiTracks(convType1);
- int nSi2 = xAOD::EgammaHelpers::numberOfSiTracks(convType2);
- if (nSi1 != nSi2) return nSi1 > nSi2;
-
- // Same number of Si tracks: either 0 or 1 (Si+TRT vs. Si single)
- // For 1 Si track, preference to Si+TRT
- if (nSi1 != 0) return convType1 == xAOD::EgammaParameters::doubleSiTRT;
-
- // No Si track, preference to doubleTRT over single TRT
- return convType1 == xAOD::EgammaParameters::doubleTRT;
- }
-
- // Same conversion type, preference to lower radius
- return (vx1.position().perp() < vx2.position().perp());
+/** Sort conversion vertices according to the following criteria:
+ - Vertices with more Si tracks have priority
+ - Vertices with more tracks have priority
+ - Vertices with smaller radii have priority
+
+ OLD SCHEME:
+ - Vertices with 2 tracks have priority over the ones with 1 track
+ - Vertices with Si + Si tracks have priority (if m_preferSi > 0)
+ - Vertices with Si + TRT or TRT + TRT depending on m_preferSi
+ - Vertices with smaller radii have priority
+ **/
+bool
+ConvVxSorter(const xAOD::Vertex& vx1, const xAOD::Vertex& vx2)
+{
+ xAOD::EgammaParameters::ConversionType convType1;
+ xAOD::EgammaParameters::ConversionType convType2;
+ convType1 = xAOD::EgammaHelpers::conversionType(&vx1);
+ convType2 = xAOD::EgammaHelpers::conversionType(&vx2);
+
+ if (convType1 != convType2) {
+ // Different conversion type, preference to vertices with Si tracks
+ int nSi1 = xAOD::EgammaHelpers::numberOfSiTracks(convType1);
+ int nSi2 = xAOD::EgammaHelpers::numberOfSiTracks(convType2);
+ if (nSi1 != nSi2)
+ return nSi1 > nSi2;
+
+ // Same number of Si tracks: either 0 or 1 (Si+TRT vs. Si single)
+ // For 1 Si track, preference to Si+TRT
+ if (nSi1 != 0)
+ return convType1 == xAOD::EgammaParameters::doubleSiTRT;
+
+ // No Si track, preference to doubleTRT over single TRT
+ return convType1 == xAOD::EgammaParameters::doubleTRT;
}
+
+ // Same conversion type, preference to lower radius
+ return (vx1.position().perp() < vx2.position().perp());
+}
} // end of namespace
using namespace xAOD::EgammaParameters;
@@ -77,16 +79,11 @@ EMConversionBuilder::EMConversionBuilder(const std::string& type,
const IInterface* parent)
: AthAlgTool(type, name, parent)
{
-
+
// declare interface
declareInterface<IEMConversionBuilder>(this);
-
}
-// =================================================================
-// DESTRUCTOR:
-EMConversionBuilder::~EMConversionBuilder() {}
-
StatusCode
EMConversionBuilder::initialize()
{
@@ -96,12 +93,11 @@ EMConversionBuilder::initialize()
ATH_CHECK(m_conversionContainerKey.initialize());
// the extrapolation tool
- if(m_extrapolationTool.retrieve().isFailure()){
+ if (m_extrapolationTool.retrieve().isFailure()) {
ATH_MSG_ERROR("Cannot retrieve extrapolationTool " << m_extrapolationTool);
return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG("Retrieved extrapolationTool " << m_extrapolationTool);
-
+ }
+ ATH_MSG_DEBUG("Retrieved extrapolationTool " << m_extrapolationTool);
return StatusCode::SUCCESS;
}
@@ -110,20 +106,20 @@ StatusCode
EMConversionBuilder::executeRec(const EventContext& ctx, egammaRec* egRec) const
{
// retrieve Conversion Container
-
- SG::ReadHandle<xAOD::VertexContainer> conversions(m_conversionContainerKey, ctx);
+
+ SG::ReadHandle<xAOD::VertexContainer> conversions(m_conversionContainerKey,
+ ctx);
// only for serial running; remove for MT
- if(!conversions.isValid()){
- ATH_MSG_ERROR(
- "Could not retrieve Conversion container with key: "
- << m_conversionContainerKey.key());
+ if (!conversions.isValid()) {
+ ATH_MSG_ERROR("Could not retrieve Conversion container with key: "
+ << m_conversionContainerKey.key());
return StatusCode::FAILURE;
}
- //reset the vertices
- std::vector< ElementLink< xAOD::VertexContainer > > vertices;
+ // reset the vertices
+ std::vector<ElementLink<xAOD::VertexContainer>> vertices;
egRec->setVertices(vertices);
- ATH_CHECK(vertexExecute(ctx,egRec,conversions.cptr()));
+ ATH_CHECK(vertexExecute(ctx, egRec, conversions.cptr()));
return StatusCode::SUCCESS;
}
@@ -142,8 +138,9 @@ EMConversionBuilder::vertexExecute(
const xAOD::VertexContainer* conversions) const
{
- if (!egRec || !conversions){
- ATH_MSG_WARNING("trackExecute: NULL pointer to egammaRec or VertexContainer");
+ if (!egRec || !conversions) {
+ ATH_MSG_WARNING(
+ "trackExecute: NULL pointer to egammaRec or VertexContainer");
return StatusCode::SUCCESS;
}
@@ -152,12 +149,12 @@ EMConversionBuilder::vertexExecute(
float etaAtCalo(0);
float phiAtCalo(0);
- for (unsigned int iVtx = 0; iVtx < conversions->size(); ++iVtx){
-
- const xAOD::Vertex *vertex = conversions->at(iVtx);
- // Check if vertex was already decorated with etaAtCalo, phiAtCalo
- if ( accetaAtCalo.isAvailable(*vertex) &&
- accphiAtCalo.isAvailable(*vertex) ){
+ for (unsigned int iVtx = 0; iVtx < conversions->size(); ++iVtx) {
+
+ const xAOD::Vertex* vertex = conversions->at(iVtx);
+ // Check if vertex was already decorated with etaAtCalo, phiAtCalo
+ if (accetaAtCalo.isAvailable(*vertex) &&
+ accphiAtCalo.isAvailable(*vertex)) {
etaAtCalo = accetaAtCalo(*vertex);
phiAtCalo = accphiAtCalo(*vertex);
}
@@ -166,7 +163,7 @@ EMConversionBuilder::vertexExecute(
ctx, vertex, &etaAtCalo, &phiAtCalo)) {
continue;
}
- const xAOD::CaloCluster *cluster = egRec->caloCluster();
+ const xAOD::CaloCluster* cluster = egRec->caloCluster();
if (!passPtAndEoverP(ctx, *vertex, *cluster)) {
continue;
}
@@ -174,80 +171,83 @@ EMConversionBuilder::vertexExecute(
cluster, vertex, etaAtCalo, phiAtCalo)) {
continue;
}
- const ElementLink< xAOD::VertexContainer > vertexLink( *conversions, iVtx );
-
- // If this is the best (or the first) vertex, push front and keep deltaEta, deltaPhi
+ const ElementLink<xAOD::VertexContainer> vertexLink(*conversions, iVtx);
+
+ // If this is the best (or the first) vertex, push front and keep deltaEta,
+ // deltaPhi
if (!egRec->getNumberOfVertices() ||
ConvVxSorter(*vertex, *egRec->vertex())) {
- egRec->pushFrontVertex( vertexLink );
- egRec->setDeltaEtaVtx( cluster->etaBE(2) - etaAtCalo );
- egRec->setDeltaPhiVtx( P4Helpers::deltaPhi(cluster->phiBE(2), phiAtCalo) );
+ egRec->pushFrontVertex(vertexLink);
+ egRec->setDeltaEtaVtx(cluster->etaBE(2) - etaAtCalo);
+ egRec->setDeltaPhiVtx(P4Helpers::deltaPhi(cluster->phiBE(2), phiAtCalo));
} else { // Not the best vertex, push back
- egRec->pushBackVertex( vertexLink );
+ egRec->pushBackVertex(vertexLink);
}
}
return StatusCode::SUCCESS;
}
-StatusCode EMConversionBuilder::finalize(){
- return StatusCode::SUCCESS;
-}
-
bool
EMConversionBuilder::passPtAndEoverP(const EventContext& ctx,
const xAOD::Vertex& vertex,
const xAOD::CaloCluster& cluster) const
{
- Amg::Vector3D momentum = m_extrapolationTool->getMomentumAtVertex(ctx,vertex);
+ Amg::Vector3D momentum =
+ m_extrapolationTool->getMomentumAtVertex(ctx, vertex);
float pt = momentum.perp();
float EoverP = cluster.e() / momentum.mag();
-
+
auto convType = xAOD::EgammaHelpers::conversionType(&vertex);
bool isSingle = (convType == singleTRT || convType == singleSi);
- bool isTRT = (convType == singleTRT || convType == xAOD::EgammaParameters::doubleTRT);
- float EoverPcut = m_maxEoverP_singleTrack*(1+m_maxEoverP_singleTrack_EtSf*cluster.et()*1e-3);
-
+ bool isTRT =
+ (convType == singleTRT || convType == xAOD::EgammaParameters::doubleTRT);
+ float EoverPcut = m_maxEoverP_singleTrack *
+ (1 + m_maxEoverP_singleTrack_EtSf * cluster.et() * 1e-3);
+
// Check TRT tube hit fraction
float tubeHitFraction = getMaxTRTTubeHitFraction(vertex);
- if (isTRT && tubeHitFraction > m_maxTRTTubeHitFraction)
- {
- ATH_MSG_DEBUG("Conversion failed cut on TRT tube hit fraction: "
- << tubeHitFraction << " vs. " << m_maxTRTTubeHitFraction);
+ if (isTRT && tubeHitFraction > m_maxTRTTubeHitFraction) {
+ ATH_MSG_DEBUG("Conversion failed cut on TRT tube hit fraction: "
+ << tubeHitFraction << " vs. " << m_maxTRTTubeHitFraction);
return false;
}
-
- bool reject = (
- (isTRT && m_rejectAllTRT) ||
- (isSingle && pt < m_minPt_singleTrack) ||
- (!isSingle && pt < m_minSumPt_double) ||
- (isSingle && EoverP > EoverPcut) ||
- (convType == singleTRT && pt < m_minPt_singleTRT) ||
- (convType == doubleTRT && pt < m_minSumPt_doubleTRT)
- );
-
- if (reject) {ATH_MSG_DEBUG("Conversion failed pt or E/p cuts");}
+
+ bool reject =
+ ((isTRT && m_rejectAllTRT) || (isSingle && pt < m_minPt_singleTrack) ||
+ (!isSingle && pt < m_minSumPt_double) ||
+ (isSingle && EoverP > EoverPcut) ||
+ (convType == singleTRT && pt < m_minPt_singleTRT) ||
+ (convType == doubleTRT && pt < m_minSumPt_doubleTRT));
+
+ if (reject) {
+ ATH_MSG_DEBUG("Conversion failed pt or E/p cuts");
+ }
return !reject;
}
float
EMConversionBuilder::getMaxTRTTubeHitFraction(const xAOD::Vertex& vertex) const
{
- auto getTRTTubeHitFraction = [](const xAOD::TrackParticle *trk){
+ auto getTRTTubeHitFraction = [](const xAOD::TrackParticle* trk) {
uint8_t nTRT;
uint8_t nTRTTube;
- if (!trk || !trk->summaryValue(nTRT, xAOD::numberOfTRTHits) || !nTRT ) return 0.;
- return trk->summaryValue(nTRTTube, xAOD::numberOfTRTTubeHits) ? 1.*nTRTTube/nTRT : 0.;
+ if (!trk || !trk->summaryValue(nTRT, xAOD::numberOfTRTHits) || !nTRT)
+ return 0.;
+ return trk->summaryValue(nTRTTube, xAOD::numberOfTRTTubeHits)
+ ? 1. * nTRTTube / nTRT
+ : 0.;
};
-
+
float maxTubeHitFraction = 0.;
- for (unsigned int i=0; i < vertex.nTrackParticles(); ++i){
- if ( !vertex.trackParticle(i) ){
+ for (unsigned int i = 0; i < vertex.nTrackParticles(); ++i) {
+ if (!vertex.trackParticle(i)) {
ATH_MSG_WARNING("NULL pointer to track particle in conversion vertex");
+ } else {
+ float tubeHitFraction = getTRTTubeHitFraction(vertex.trackParticle(i));
+ if (tubeHitFraction > maxTubeHitFraction) {
+ maxTubeHitFraction = tubeHitFraction;
+ }
}
- else{
- float tubeHitFraction = getTRTTubeHitFraction( vertex.trackParticle(i) );
- if (tubeHitFraction > maxTubeHitFraction) {maxTubeHitFraction = tubeHitFraction;}
- }
- }
+ }
return maxTubeHitFraction;
}
diff --git a/Reconstruction/egamma/egammaTools/src/EMConversionBuilder.h b/Reconstruction/egamma/egammaTools/src/EMConversionBuilder.h
index 92d24d67751bf7529194b4abb134f2262956da16..8cf030913022b84d719c5a605caee8590af4cfc1 100644
--- a/Reconstruction/egamma/egammaTools/src/EMConversionBuilder.h
+++ b/Reconstruction/egamma/egammaTools/src/EMConversionBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EGAMMATOOLS_EMCONVERSIONBUILDER_H
@@ -49,10 +49,10 @@ public:
const IInterface* parent);
/** @brief Destructor*/
- ~EMConversionBuilder();
+ virtual ~EMConversionBuilder() = default;
/** @brief initialize method*/
- StatusCode initialize() override;
+ StatusCode initialize() override final;
/** @brief execute method*/
virtual StatusCode executeRec(const EventContext& ctx,
egammaRec* egRec) const override final;
@@ -60,16 +60,12 @@ public:
virtual StatusCode hltExecute(
egammaRec* egRec,
const xAOD::VertexContainer* conversions) const override final;
- /** @brief finalize method*/
- StatusCode finalize() override;
private:
/** @brief actual implementation method*/
- StatusCode vertexExecute(
- const EventContext& ctx,
- egammaRec* egRec,
- const xAOD::VertexContainer* conversions) const;
-
+ StatusCode vertexExecute(const EventContext& ctx,
+ egammaRec* egRec,
+ const xAOD::VertexContainer* conversions) const;
/** @brief Return true if vertex and cluster pass Pt and E/p cuts **/
bool passPtAndEoverP(const EventContext& ctx,
diff --git a/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.cxx
index 2680e5c1a8658b2cdd2b9e337206ed3efa84e4e2..ca663f033d5fe87205164df0dbf30b8f71499d34 100644
--- a/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.cxx
@@ -13,182 +13,191 @@ PACKAGE: offline/Reconstruction/egamma/egammaTools
#include "EMFourMomBuilder.h"
#include "FourMom/ErrorMatrixEEtaPhiM.h"
-//NEW xAOD INCLUDES.
+// NEW xAOD INCLUDES.
#include "xAODEgamma/EgammaxAODHelpers.h"
#include "xAODEgamma/Electron.h"
-#include "xAODEgamma/Photon.h"
#include "xAODEgamma/ElectronContainer.h"
+#include "xAODEgamma/Photon.h"
#include "xAODEgamma/PhotonContainer.h"
-#include "xAODEgamma/EgammaxAODHelpers.h"
#include "EventPrimitives/EventPrimitives.h"
#include "FourMom/EigenP5Jacobiand0z0PhiThetaqOverP2d0z0PhiEtaP.h"
-#include "egammaUtils/eg_resolution.h"
#include "GeoPrimitives/GeoPrimitives.h"
+#include "xAODEgamma/EgammaxAODHelpers.h"
// END OF HEADER FILES INCLUDE
namespace {
- const float el_mass=0.510998;
- const float ph_mass=0.0;
+const float el_mass = 0.510998;
+const float ph_mass = 0.0;
}
/////////////////////////////////////////////////////////////////
EMFourMomBuilder::EMFourMomBuilder(const std::string& type,
- const std::string& name,
- const IInterface* parent)
-: egammaBaseTool(type, name, parent)
+ const std::string& name,
+ const IInterface* parent)
+ : egammaBaseTool(type, name, parent)
{
- // declare interface
- declareInterface<IEMFourMomBuilder>(this);
-}
-// =============================================================
-// DESTRUCTOR:
-EMFourMomBuilder::~EMFourMomBuilder(){
+ // declare interface
+ declareInterface<IEMFourMomBuilder>(this);
}
-StatusCode EMFourMomBuilder::initialize(){
+StatusCode
+EMFourMomBuilder::initialize()
+{
- ATH_MSG_DEBUG(" Initializing EMFourMomBuilder");
- m_eg_resol=std::make_unique<eg_resolution>(m_ResolutionConfiguration);
- m_eg_resol->msg().setLevel(this->msg().level());
- return StatusCode::SUCCESS;
+ ATH_MSG_DEBUG(" Initializing EMFourMomBuilder");
+ m_eg_resol = std::make_unique<eg_resolution>(m_ResolutionConfiguration);
+ m_eg_resol->msg().setLevel(this->msg().level());
+ return StatusCode::SUCCESS;
}
-StatusCode EMFourMomBuilder::execute(const EventContext& ctx, xAOD::Egamma* eg) const {
- (void)ctx;
- if (!eg){
- ATH_MSG_WARNING("Null pointer to egamma object ");
- return StatusCode::SUCCESS;
- }
-
- xAOD::Electron *electron = eg->type() == xAOD::Type::Electron ? static_cast<xAOD::Electron*>(eg) : nullptr;
- xAOD::Photon *photon = electron ? nullptr : static_cast<xAOD::Photon*>(eg);
-
- bool hasTrack(false);
- if (electron) {
- const xAOD::TrackParticle *trackParticle = electron->trackParticle();
- if(trackParticle){
- hasTrack=true;
- }
- }
-
- /* One method deals with electron with tracks,
- * Another with double Si Conversion Photons
- * The last is for no track e.g forward electrons
- * or the rest of the photons
- */
-
- StatusCode sc = StatusCode::SUCCESS;
- if (electron && hasTrack) {
- sc = setFromTrkCluster(*electron);
- }
- else if (photon &&
- xAOD::EgammaHelpers::conversionType(photon) == xAOD::EgammaParameters::doubleSi ){
- sc = setFromTrkCluster(*photon);
- }
- else{
- sc = setFromCluster(*eg);
+StatusCode
+EMFourMomBuilder::execute(const EventContext& ctx, xAOD::Egamma* eg) const
+{
+ (void)ctx;
+ if (!eg) {
+ ATH_MSG_WARNING("Null pointer to egamma object ");
+ return StatusCode::SUCCESS;
+ }
+
+ xAOD::Electron* electron = eg->type() == xAOD::Type::Electron
+ ? static_cast<xAOD::Electron*>(eg)
+ : nullptr;
+ xAOD::Photon* photon = electron ? nullptr : static_cast<xAOD::Photon*>(eg);
+
+ bool hasTrack(false);
+ if (electron) {
+ const xAOD::TrackParticle* trackParticle = electron->trackParticle();
+ if (trackParticle) {
+ hasTrack = true;
}
- return sc;
+ }
+
+ /* One method deals with electron with tracks,
+ * Another with double Si Conversion Photons
+ * The last is for no track e.g forward electrons
+ * or the rest of the photons
+ */
+
+ StatusCode sc = StatusCode::SUCCESS;
+ if (electron && hasTrack) {
+ sc = setFromTrkCluster(*electron);
+ } else if (photon && xAOD::EgammaHelpers::conversionType(photon) ==
+ xAOD::EgammaParameters::doubleSi) {
+ sc = setFromTrkCluster(*photon);
+ } else {
+ sc = setFromCluster(*eg);
+ }
+ return sc;
}
-StatusCode EMFourMomBuilder::hltExecute(xAOD::Egamma* eg) const{
- return execute(Gaudi::Hive::currentContext(), eg);
+StatusCode
+EMFourMomBuilder::hltExecute(xAOD::Egamma* eg) const
+{
+ return execute(Gaudi::Hive::currentContext(), eg);
}
-StatusCode EMFourMomBuilder::setFromTrkCluster(xAOD::Electron& el) const {
+StatusCode
+EMFourMomBuilder::setFromTrkCluster(xAOD::Electron& el) const
+{
- const xAOD::CaloCluster *cluster = el.caloCluster();
- if (!cluster) {
- ATH_MSG_WARNING("Null pointer to cluster");
- return StatusCode::SUCCESS;
- }
- const xAOD::TrackParticle *trackParticle = el.trackParticle();
- if (!trackParticle) {
- ATH_MSG_WARNING("Null pointer to Track Particle");
- return StatusCode::SUCCESS;
- }
- bool goodTrack=(xAOD::EgammaHelpers::numberOfSiHits(trackParticle)>=4);
- const float E = cluster->e();
- const float eta = goodTrack ? trackParticle->eta() : cluster->eta() ;
- const float phi = goodTrack ? trackParticle->phi() : cluster->phi() ;
-
- //Set the four momentum.
- ATH_MSG_DEBUG("Setting P4 using E=" << E << " eta=" << eta
- << " phi=" << phi <<" mass" << el_mass);
- const double pt = E > el_mass ? sqrt(E*E - el_mass*el_mass)/cosh(eta) : 0;
- el.setP4(pt, eta, phi, el_mass);
-
- //Electron with tracks all should have a covariance matrix set
- AmgMatrix(4,4) matrix;
- matrix.setZero();
- const float sigmaE_over_E= m_eg_resol->getResolution(el);
- matrix(0,0) = (sigmaE_over_E* E * sigmaE_over_E *E)/(cosh(eta)*cosh(eta)) ;
-
- //Direction can be filled only when a good track is there
- if(goodTrack){
- xAOD::ParametersCovMatrix_t covmat=trackParticle->definingParametersCovMatrix();
- EigenP5Jacobiand0z0PhiThetaqOverP2d0z0PhiEtaP J(trackParticle->phi(),
- trackParticle->charge(),
- trackParticle->p4().P());
- AmgMatrix(5,5) m;
- m.setZero();
- m = J * (covmat * J.transpose());
- //Rearrange the elements of the d0, z0, phi, eta, Pt
- //representation to make the (Et, eta, phi, M)
- matrix(1,1) = m(3,3);
- matrix(2,2) = m(2,2);
- matrix.fillSymmetric(0,1,m(4,3));
- matrix.fillSymmetric(0,2,m(4,2));
- matrix.fillSymmetric(1,2,m(3,2));
- }
-
- el.setCovMatrix(matrix.cast<float>());
+ const xAOD::CaloCluster* cluster = el.caloCluster();
+ if (!cluster) {
+ ATH_MSG_WARNING("Null pointer to cluster");
+ return StatusCode::SUCCESS;
+ }
+ const xAOD::TrackParticle* trackParticle = el.trackParticle();
+ if (!trackParticle) {
+ ATH_MSG_WARNING("Null pointer to Track Particle");
return StatusCode::SUCCESS;
+ }
+ bool goodTrack = (xAOD::EgammaHelpers::numberOfSiHits(trackParticle) >= 4);
+ const float E = cluster->e();
+ const float eta = goodTrack ? trackParticle->eta() : cluster->eta();
+ const float phi = goodTrack ? trackParticle->phi() : cluster->phi();
+
+ // Set the four momentum.
+ ATH_MSG_DEBUG("Setting P4 using E=" << E << " eta=" << eta << " phi=" << phi
+ << " mass" << el_mass);
+ const double pt =
+ E > el_mass ? sqrt(E * E - el_mass * el_mass) / cosh(eta) : 0;
+ el.setP4(pt, eta, phi, el_mass);
+
+ // Electron with tracks all should have a covariance matrix set
+ AmgMatrix(4, 4) matrix;
+ matrix.setZero();
+ const float sigmaE_over_E = m_eg_resol->getResolution(el);
+ matrix(0, 0) =
+ (sigmaE_over_E * E * sigmaE_over_E * E) / (cosh(eta) * cosh(eta));
+
+ // Direction can be filled only when a good track is there
+ if (goodTrack) {
+ xAOD::ParametersCovMatrix_t covmat =
+ trackParticle->definingParametersCovMatrix();
+ EigenP5Jacobiand0z0PhiThetaqOverP2d0z0PhiEtaP J(
+ trackParticle->phi(), trackParticle->charge(), trackParticle->p4().P());
+ AmgMatrix(5, 5) m;
+ m.setZero();
+ m = J * (covmat * J.transpose());
+ // Rearrange the elements of the d0, z0, phi, eta, Pt
+ // representation to make the (Et, eta, phi, M)
+ matrix(1, 1) = m(3, 3);
+ matrix(2, 2) = m(2, 2);
+ matrix.fillSymmetric(0, 1, m(4, 3));
+ matrix.fillSymmetric(0, 2, m(4, 2));
+ matrix.fillSymmetric(1, 2, m(3, 2));
+ }
+
+ el.setCovMatrix(matrix.cast<float>());
+ return StatusCode::SUCCESS;
}
-StatusCode EMFourMomBuilder::setFromTrkCluster(xAOD::Photon& ph) const {
- const xAOD::CaloCluster *cluster = ph.caloCluster();
- if (!cluster) {
- ATH_MSG_WARNING("Null pointer to cluster");
- return StatusCode::SUCCESS;
- }
- float E = cluster->e();
- float eta = cluster->eta();
- float phi = cluster->phi() ;
- Amg::Vector3D momentumAtVertex = xAOD::EgammaHelpers::momentumAtVertex(&ph);
- if (momentumAtVertex.mag() > 1e-5) { // protection against p = 0
- eta = momentumAtVertex.eta();
- phi = momentumAtVertex.phi();
- }
- //Set the four momentum.
- ATH_MSG_DEBUG("Setting P4 using E=" << E << " eta="
- << eta << " phi=" << phi <<" mass" << ph_mass);
- ph.setP4( E/cosh(eta), eta, phi, ph_mass);
+StatusCode
+EMFourMomBuilder::setFromTrkCluster(xAOD::Photon& ph) const
+{
+ const xAOD::CaloCluster* cluster = ph.caloCluster();
+ if (!cluster) {
+ ATH_MSG_WARNING("Null pointer to cluster");
return StatusCode::SUCCESS;
+ }
+ float E = cluster->e();
+ float eta = cluster->eta();
+ float phi = cluster->phi();
+ Amg::Vector3D momentumAtVertex = xAOD::EgammaHelpers::momentumAtVertex(&ph);
+ if (momentumAtVertex.mag() > 1e-5) { // protection against p = 0
+ eta = momentumAtVertex.eta();
+ phi = momentumAtVertex.phi();
+ }
+ // Set the four momentum.
+ ATH_MSG_DEBUG("Setting P4 using E=" << E << " eta=" << eta << " phi=" << phi
+ << " mass" << ph_mass);
+ ph.setP4(E / cosh(eta), eta, phi, ph_mass);
+ return StatusCode::SUCCESS;
}
-StatusCode EMFourMomBuilder::setFromCluster(xAOD::Egamma& eg) const {
-
- const xAOD::CaloCluster *cluster = eg.caloCluster();
- if (!cluster) {
- ATH_MSG_WARNING("Null pointer to cluster");
- return StatusCode::SUCCESS;
- }
+StatusCode
+EMFourMomBuilder::setFromCluster(xAOD::Egamma& eg) const
+{
- const float eta = cluster->eta();
- const float phi = cluster->phi();
- const float E = cluster->e();
- if(eg.type()==xAOD::Type::Electron){
- const double pt = E > el_mass ? sqrt(E*E - el_mass*el_mass)/cosh(eta) : 0;
- eg.setP4(pt, eta, phi, el_mass);
- }
- else{
- eg.setP4( E/cosh(eta), eta, phi, ph_mass);
- }
+ const xAOD::CaloCluster* cluster = eg.caloCluster();
+ if (!cluster) {
+ ATH_MSG_WARNING("Null pointer to cluster");
return StatusCode::SUCCESS;
+ }
+
+ const float eta = cluster->eta();
+ const float phi = cluster->phi();
+ const float E = cluster->e();
+ if (eg.type() == xAOD::Type::Electron) {
+ const double pt =
+ E > el_mass ? sqrt(E * E - el_mass * el_mass) / cosh(eta) : 0;
+ eg.setP4(pt, eta, phi, el_mass);
+ } else {
+ eg.setP4(E / cosh(eta), eta, phi, ph_mass);
+ }
+ return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.h b/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.h
index f9a71460649aadb3cb23fa119988a25b10e12e5f..2dd3f86ffc6a827f6ccf6dfffd9def9a33444129 100644
--- a/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.h
+++ b/Reconstruction/egamma/egammaTools/src/EMFourMomBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EGAMMATOOLS_EMFOURMOMBUILDER_H
@@ -7,67 +7,72 @@
/**
@class EMFourMomBuilder
- sets the fourmomentum : energy is taken from the cluster and angles either from tracking or cluster.
- In case the egamma object is a conversion :
- - if it is a single/double track conversion with TRT only tracks
- - (i.e no more than 4 hits in pixel+SCT), take the cluster info, not the track info
- -
+ sets the fourmomentum : energy is taken from the cluster and angles either
+ from tracking or cluster. In case the egamma object is a conversion :
+ - if it is a single/double track conversion with TRT only tracks
+ - (i.e no more than 4 hits in pixel+SCT), take the cluster info, not the track
+ info
+ -
@author Zerwas,Anastopoulos
*/
// XAOD INCLUDES:
#include "AthenaBaseComps/AthAlgTool.h"
#include "egammaInterfaces/IegammaBaseTool.h"
+#include "xAODCaloEvent/CaloClusterFwd.h"
#include "xAODEgamma/EgammaFwd.h"
-#include "xAODEgamma/PhotonFwd.h"
#include "xAODEgamma/ElectronFwd.h"
-#include "xAODCaloEvent/CaloClusterFwd.h"
+#include "xAODEgamma/PhotonFwd.h"
// INCLUDE HEADER FILES:
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "EventPrimitives/EventPrimitives.h"
#include "egammaBaseTool.h"
#include "egammaInterfaces/IEMFourMomBuilder.h"
-#include "EventPrimitives/EventPrimitives.h"
#include "egammaRecEvent/egammaRec.h"
+#include "egammaUtils/eg_resolution.h"
-class eg_resolution;
-class EMFourMomBuilder : public egammaBaseTool, virtual public IEMFourMomBuilder
+class EMFourMomBuilder
+ : public egammaBaseTool
+ , virtual public IEMFourMomBuilder
{
public:
+ /** @brief Default constructor*/
+ EMFourMomBuilder(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
- /** @brief Default constructor*/
- EMFourMomBuilder(const std::string& type,
- const std::string& name,
- const IInterface* parent);
-
- /** @brief Destructor*/
- ~EMFourMomBuilder();
+ /** @brief Destructor*/
+ virtual ~EMFourMomBuilder() = default;
- /** @brief initialize method*/
- StatusCode initialize() override;
- /** @brief execute method*/
- virtual StatusCode execute(const EventContext& ctx, xAOD::Egamma* eg) const override;
- /** @brief execute method*/
- virtual StatusCode hltExecute(xAOD::Egamma* eg) const override;
+ /** @brief initialize method*/
+ StatusCode initialize() override final;
+ /** @brief execute method*/
+ virtual StatusCode execute(const EventContext& ctx,
+ xAOD::Egamma* eg) const override final;
+ /** @brief execute method*/
+ virtual StatusCode hltExecute(xAOD::Egamma* eg) const override final;
private:
+ /** @brief Method to set the 4-mom in case of electron */
+ StatusCode setFromTrkCluster(xAOD::Electron&) const;
+ StatusCode setFromTrkCluster(xAOD::Photon&) const;
+ /** @brief Method to set the 4-mom in case of unconverted photon */
+ StatusCode setFromCluster(xAOD::Egamma&) const;
- /** @brief Method to set the 4-mom in case of electron */
- StatusCode setFromTrkCluster(xAOD::Electron& ) const ;
- StatusCode setFromTrkCluster(xAOD::Photon& ) const ;
- /** @brief Method to set the 4-mom in case of unconverted photon */
- StatusCode setFromCluster(xAOD::Egamma& ) const;
-
- /** @brief Resolution configuration*/
- Gaudi::Property<std::string> m_ResolutionConfiguration {this,
- "ResolutionConfiguration", "run2_pre",
- "Resolution Configuration"};
+ /** @brief Resolution configuration*/
+ Gaudi::Property<std::string> m_ResolutionConfiguration{
+ this,
+ "ResolutionConfiguration",
+ "run2_pre",
+ "Resolution Configuration"
+ };
- std::unique_ptr<eg_resolution> m_eg_resol;
+ std::unique_ptr<eg_resolution> m_eg_resol;
};
#endif
diff --git a/Reconstruction/egamma/egammaTools/src/EMPIDBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMPIDBuilder.cxx
index f54cf8b8de99cec562b895f7e94a770debd45051..d558b4103bfcb868694fa009d06c020329d9b6c4 100644
--- a/Reconstruction/egamma/egammaTools/src/EMPIDBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMPIDBuilder.cxx
@@ -2,161 +2,163 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// INCLUDE HEADER FILES:
-#include "AthenaKernel/errorcheck.h"
#include "EMPIDBuilder.h"
-#include "xAODEgamma/Egamma.h"
+#include "AthenaKernel/errorcheck.h"
#include "PATCore/AcceptData.h"
+#include "xAODEgamma/Egamma.h"
-
-// ===========================================================================
EMPIDBuilder::EMPIDBuilder(const std::string& type,
- const std::string& name,
- const IInterface* parent)
-: egammaBaseTool(type, name, parent)
+ const std::string& name,
+ const IInterface* parent)
+ : egammaBaseTool(type, name, parent)
{
- // declare interface
- declareInterface<IegammaBaseTool>(this);
-
+ // declare interface
+ declareInterface<IegammaBaseTool>(this);
}
-EMPIDBuilder::~EMPIDBuilder()
-{
-}
-
-StatusCode EMPIDBuilder::initialize()
+StatusCode
+EMPIDBuilder::initialize()
{
- ATH_MSG_DEBUG(" Initializing EMPIDBuilder");
-
- ATH_CHECK(m_electronIsEMselectors.retrieve());
-
- if (m_electronIsEMselectors.size() != m_electronIsEMselectorResultNames.size()) {
- ATH_MSG_ERROR("The number of selectors does not match the number of given electronIsEMselector names");
- return StatusCode::FAILURE;
+ ATH_MSG_DEBUG(" Initializing EMPIDBuilder");
+
+ ATH_CHECK(m_electronIsEMselectors.retrieve());
+
+ if (m_electronIsEMselectors.size() !=
+ m_electronIsEMselectorResultNames.size()) {
+ ATH_MSG_ERROR("The number of selectors does not match the number of given "
+ "electronIsEMselector names");
+ return StatusCode::FAILURE;
+ }
+
+ ATH_CHECK(m_electronLHselectors.retrieve());
+
+ if (m_electronLHselectors.size() != m_electronLHselectorResultNames.size()) {
+ ATH_MSG_ERROR("The number of selectors does not match the number of given "
+ "electron LH selector names");
+ return StatusCode::FAILURE;
+ }
+
+ ATH_CHECK(m_genericIsEMselectors.retrieve());
+
+ if (m_genericIsEMselectors.size() !=
+ m_genericIsEMselectorResultNames.size()) {
+ ATH_MSG_ERROR("The number of selectors does not match the number of given "
+ "generic selector names");
+ return StatusCode::FAILURE;
+ }
+
+ ATH_CHECK(m_photonIsEMselectors.retrieve());
+
+ if (m_photonIsEMselectors.size() != m_photonIsEMselectorResultNames.size()) {
+ ATH_MSG_ERROR("The number of selectors does not match the number of given "
+ "photon selector names");
+ return StatusCode::FAILURE;
+ }
+
+ if (m_UselumiBlockMuTool) {
+ ATH_MSG_INFO("enabling lumiBlockMuTool");
+ if (m_lumiBlockMuTool.retrieve().isFailure()) {
+ ATH_MSG_FATAL("Unable to retrieve Luminosity Tool");
+ return StatusCode::FAILURE;
}
+ ATH_MSG_DEBUG("Successfully retrieved Luminosity Tool");
- ATH_CHECK(m_electronLHselectors.retrieve());
-
- if (m_electronLHselectors.size() != m_electronLHselectorResultNames.size()) {
- ATH_MSG_ERROR("The number of selectors does not match the number of given electron LH selector names");
- return StatusCode::FAILURE;
- }
-
- ATH_CHECK(m_genericIsEMselectors.retrieve());
-
- if (m_genericIsEMselectors.size() != m_genericIsEMselectorResultNames.size()) {
- ATH_MSG_ERROR("The number of selectors does not match the number of given generic selector names");
- return StatusCode::FAILURE;
- }
-
- ATH_CHECK(m_photonIsEMselectors.retrieve());
-
- if (m_photonIsEMselectors.size() != m_photonIsEMselectorResultNames.size()) {
- ATH_MSG_ERROR("The number of selectors does not match the number of given photon selector names");
- return StatusCode::FAILURE;
- }
-
- if (m_UselumiBlockMuTool) {
- std::cout << "enabling lumiBlockMuTool" <<std::endl;
- if (m_lumiBlockMuTool.retrieve().isFailure()) {
- ATH_MSG_FATAL("Unable to retrieve Luminosity Tool");
- return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG("Successfully retrieved Luminosity Tool");
-
- } else {
- std::cout << "disabling lumiBlockMuTool" <<std::endl;
- m_lumiBlockMuTool.disable();
- }
- return StatusCode::SUCCESS;
+ } else {
+ ATH_MSG_INFO("disabling lumiBlockMuTool");
+ m_lumiBlockMuTool.disable();
+ }
+ return StatusCode::SUCCESS;
}
-StatusCode EMPIDBuilder::finalize()
+StatusCode
+EMPIDBuilder::execute(const EventContext& ctx, xAOD::Egamma* eg) const
{
- return StatusCode::SUCCESS;
-}
-
-StatusCode EMPIDBuilder::execute(const EventContext& ctx, xAOD::Egamma* eg) const
-{
-
- ATH_MSG_DEBUG("Executing EMPIDBuilder::execute");
-
- // Protection against bad pointers
- if (eg==nullptr) {
- ATH_MSG_WARNING("NULL egamma object given to execute function");
- return StatusCode::SUCCESS;
- }
-
- size_t size = m_electronIsEMselectors.size();
-
- for (size_t i = 0; i<size;++i) {
- asg::AcceptData accept = m_electronIsEMselectors[i]->accept(ctx, eg);
- //save the bool result
- eg->setPassSelection(static_cast<bool>(accept), m_electronIsEMselectorResultNames[i]);
- //save the isem
- unsigned int isEM = (~0);
- if ( m_electronIsEMselectors[i]->execute(ctx, eg, isEM).isFailure() ) {
- ATH_MSG_ERROR("problem to get isEM for " << m_electronIsEMselectorResultNames[i]);
- return StatusCode::FAILURE;
- }
- eg->setSelectionisEM(isEM, "isEM"+m_electronIsEMselectorResultNames[i]);
-
- }
- size_t sizePh = m_photonIsEMselectors.size();
-
- for (size_t i = 0; i<sizePh;++i) {
- asg::AcceptData accept = m_photonIsEMselectors[i]->accept(ctx, eg);
- //save the bool result
- eg->setPassSelection(static_cast<bool>(accept), m_photonIsEMselectorResultNames[i]);
- //save the isem
- unsigned int isEM = ~0;
- if ( m_photonIsEMselectors[i]->execute(ctx, eg, isEM).isFailure() ) {
- ATH_MSG_ERROR("problem to get isEM for " << m_photonIsEMselectorResultNames[i]);
- return StatusCode::FAILURE;
- }
- eg->setSelectionisEM(isEM, "isEM"+m_photonIsEMselectorResultNames[i]);
- }
-
- size_t sizeLH = m_electronLHselectors.size();
+ ATH_MSG_DEBUG("Executing EMPIDBuilder::execute");
- //negative mu means the default behaviour --> retrieve the one in xAOD
- double mu = -99.;
- double avg_mu = -99.;
- if(m_UselumiBlockMuTool){ //
- mu = m_lumiBlockMuTool->actualInteractionsPerCrossing(); // (retrieve mu for the current BCID)
- avg_mu = m_lumiBlockMuTool->averageInteractionsPerCrossing();
- ATH_MSG_DEBUG("REGTEST: Retrieved Mu Value : " << mu);
- ATH_MSG_DEBUG("REGTEST: Average Mu Value : " << avg_mu);
+ // Protection against bad pointers
+ if (eg == nullptr) {
+ ATH_MSG_WARNING("NULL egamma object given to execute function");
+ return StatusCode::SUCCESS;
+ }
+
+ size_t size = m_electronIsEMselectors.size();
+
+ for (size_t i = 0; i < size; ++i) {
+ asg::AcceptData accept = m_electronIsEMselectors[i]->accept(ctx, eg);
+ // save the bool result
+ eg->setPassSelection(static_cast<bool>(accept),
+ m_electronIsEMselectorResultNames[i]);
+ // save the isem
+ unsigned int isEM = (~0);
+ if (m_electronIsEMselectors[i]->execute(ctx, eg, isEM).isFailure()) {
+ ATH_MSG_ERROR("problem to get isEM for "
+ << m_electronIsEMselectorResultNames[i]);
+ return StatusCode::FAILURE;
}
-
- for (size_t i = 0; i<sizeLH; ++i) {
-
- asg::AcceptData accept = m_electronLHselectors[i]->accept(ctx, eg,avg_mu);
- //save the bool result
- eg->setPassSelection(static_cast<bool>(accept), m_electronLHselectorResultNames[i]);
- //save the isem
- eg->setSelectionisEM(static_cast<unsigned int>(accept.getCutResultInverted()),
- "isEM" + m_electronLHselectorResultNames[i]);
-
- //save the LHValue only once
- if(i==0){
- eg->setLikelihoodValue(
- static_cast<float>(m_electronLHselectors[i]->calculate(ctx, eg, avg_mu)),m_LHValueName);
- }
+ eg->setSelectionisEM(isEM, "isEM" + m_electronIsEMselectorResultNames[i]);
+ }
+
+ size_t sizePh = m_photonIsEMselectors.size();
+
+ for (size_t i = 0; i < sizePh; ++i) {
+ asg::AcceptData accept = m_photonIsEMselectors[i]->accept(ctx, eg);
+ // save the bool result
+ eg->setPassSelection(static_cast<bool>(accept),
+ m_photonIsEMselectorResultNames[i]);
+ // save the isem
+ unsigned int isEM = ~0;
+ if (m_photonIsEMselectors[i]->execute(ctx, eg, isEM).isFailure()) {
+ ATH_MSG_ERROR("problem to get isEM for "
+ << m_photonIsEMselectorResultNames[i]);
+ return StatusCode::FAILURE;
}
-
- size_t sizeGen = m_genericIsEMselectors.size();
- for (size_t i = 0; i<sizeGen;++i) {
- asg::AcceptData accept = m_genericIsEMselectors[i]->accept(eg);
- //save the bool result
- eg->setPassSelection(static_cast<bool>(accept), m_genericIsEMselectorResultNames[i]);
- //save the isem
- eg->setSelectionisEM(static_cast<unsigned int>(accept.getCutResultInverted()),
- "isEM" + m_genericIsEMselectorResultNames[i]);
+ eg->setSelectionisEM(isEM, "isEM" + m_photonIsEMselectorResultNames[i]);
+ }
+
+ size_t sizeLH = m_electronLHselectors.size();
+
+ // negative mu means the default behaviour --> retrieve the one in xAOD
+ double mu = -99.;
+ double avg_mu = -99.;
+ if (m_UselumiBlockMuTool) { //
+ mu = m_lumiBlockMuTool->actualInteractionsPerCrossing();
+ avg_mu = m_lumiBlockMuTool->averageInteractionsPerCrossing();
+ ATH_MSG_DEBUG("REGTEST: Retrieved Mu Value : " << mu);
+ ATH_MSG_DEBUG("REGTEST: Average Mu Value : " << avg_mu);
+ }
+
+ for (size_t i = 0; i < sizeLH; ++i) {
+ asg::AcceptData accept = m_electronLHselectors[i]->accept(ctx, eg, avg_mu);
+ // save the bool result
+ eg->setPassSelection(static_cast<bool>(accept),
+ m_electronLHselectorResultNames[i]);
+ // save the isem
+ eg->setSelectionisEM(
+ static_cast<unsigned int>(accept.getCutResultInverted()),
+ "isEM" + m_electronLHselectorResultNames[i]);
+
+ // save the LHValue only once
+ if (i == 0) {
+ eg->setLikelihoodValue(
+ static_cast<float>(
+ m_electronLHselectors[i]->calculate(ctx, eg, avg_mu)),
+ m_LHValueName);
}
-
-
- return StatusCode::SUCCESS;
+ }
+
+ size_t sizeGen = m_genericIsEMselectors.size();
+ for (size_t i = 0; i < sizeGen; ++i) {
+ asg::AcceptData accept = m_genericIsEMselectors[i]->accept(eg);
+ // save the bool result
+ eg->setPassSelection(static_cast<bool>(accept),
+ m_genericIsEMselectorResultNames[i]);
+ // save the isem
+ eg->setSelectionisEM(
+ static_cast<unsigned int>(accept.getCutResultInverted()),
+ "isEM" + m_genericIsEMselectorResultNames[i]);
+ }
+
+ return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/egamma/egammaTools/src/EMPIDBuilder.h b/Reconstruction/egamma/egammaTools/src/EMPIDBuilder.h
index 08521387122724e211d6b04290b06877d40de262..cd7e7798891f7101f34f7e83536967281929667d 100644
--- a/Reconstruction/egamma/egammaTools/src/EMPIDBuilder.h
+++ b/Reconstruction/egamma/egammaTools/src/EMPIDBuilder.h
@@ -1,20 +1,19 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EGAMMATOOLS_EMPIDBUILDER_H
#define EGAMMATOOLS_EMPIDBUILDER_H
/**
@class EMPIDBuilder
- egamma tool to add selector outputs to the egamma objects
+ egamma tool to add selector outputs to the egamma objects
Note: Subject to change after the PAT selectors evolve
-
+
@author Jovan Mitrevski Jovan.Mitrevski@cern.ch
*/
-// INCLUDE HEADER FILES:
-#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ToolHandle.h"
#include "egammaBaseTool.h"
#include <string>
@@ -28,70 +27,94 @@
class EMPIDBuilder : public egammaBaseTool
{
public:
-
/** @brief Default constructor*/
EMPIDBuilder(const std::string& type,
- const std::string& name,
- const IInterface* parent);
-
+ const std::string& name,
+ const IInterface* parent);
+
/** @brief Destructor*/
- ~EMPIDBuilder();
-
+ virtual ~EMPIDBuilder() = default;
+
/** @brief initialize method*/
- virtual StatusCode initialize() override;
+ virtual StatusCode initialize() override final;
/** @brief standard execute method */
- virtual StatusCode execute(const EventContext& ctx, xAOD::Egamma*) const override final ;
- /** @brief finalize method*/
- virtual StatusCode finalize() override;
+ virtual StatusCode execute(const EventContext& ctx,
+ xAOD::Egamma*) const override final;
-protected:
- /** Handle to the selectors */
-
- ToolHandleArray<IAsgElectronIsEMSelector> m_electronIsEMselectors {this,
- "electronIsEMselectors", {},
- "The selectors that we need to apply to the Electron object"};
- Gaudi::Property<std::vector<std::string> > m_electronIsEMselectorResultNames {this,
- "electronIsEMselectorResultNames", {}, "The selector result names"};
-
- ToolHandleArray<IAsgElectronLikelihoodTool> m_electronLHselectors {this,
- "electronLHselectors", {},
- "The selectors that we need to apply to the LH electron object"};
- Gaudi::Property<std::vector<std::string> > m_electronLHselectorResultNames {this,
- "electronLHselectorResultNames", {}, "The selector result names"};
-
- ToolHandleArray<CP::ISelectionTool> m_genericIsEMselectors {this,
- "genericIsEMselectors", {},
- "The selectors that we need to apply to the generic object"};
-
- Gaudi::Property<std::vector<std::string> > m_genericIsEMselectorResultNames {this,
- "genericIsEMselectorResultNames", {}, "The selector result names"};
-
- ToolHandleArray<IAsgPhotonIsEMSelector> m_photonIsEMselectors {this,
- "photonIsEMselectors", {},
- "The selectors that we need to apply to the pothon object"};
- Gaudi::Property<std::vector<std::string> > m_photonIsEMselectorResultNames {this,
- "photonIsEMselectorResultNames", {}, "The selector result names"};
-
- ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool {this,
- "LuminosityTool", "LumiBlockMuTool/LumiBlockMuTool", "Luminosity Tool"};
-
- Gaudi::Property<std::string> m_LHValueName {this,
- "LHValueName", "LHValue", "The LH Value name"};
-
private:
- Gaudi::Property<bool> m_UselumiBlockMuTool {this,
- "UseLuminosityTool", false,
- "Use Luminosity Tool instead of value stored in xAOD"};
-
+ /** Handle to the selectors */
+ ToolHandleArray<IAsgElectronIsEMSelector> m_electronIsEMselectors{
+ this,
+ "electronIsEMselectors",
+ {},
+ "The selectors that we need to apply to the Electron object"
+ };
+ Gaudi::Property<std::vector<std::string>> m_electronIsEMselectorResultNames{
+ this,
+ "electronIsEMselectorResultNames",
+ {},
+ "The selector result names"
+ };
+
+ ToolHandleArray<IAsgElectronLikelihoodTool> m_electronLHselectors{
+ this,
+ "electronLHselectors",
+ {},
+ "The selectors that we need to apply to the LH electron object"
+ };
+ Gaudi::Property<std::vector<std::string>> m_electronLHselectorResultNames{
+ this,
+ "electronLHselectorResultNames",
+ {},
+ "The selector result names"
+ };
+
+ ToolHandleArray<CP::ISelectionTool> m_genericIsEMselectors{
+ this,
+ "genericIsEMselectors",
+ {},
+ "The selectors that we need to apply to the generic object"
+ };
+
+ Gaudi::Property<std::vector<std::string>> m_genericIsEMselectorResultNames{
+ this,
+ "genericIsEMselectorResultNames",
+ {},
+ "The selector result names"
+ };
+
+ ToolHandleArray<IAsgPhotonIsEMSelector> m_photonIsEMselectors{
+ this,
+ "photonIsEMselectors",
+ {},
+ "The selectors that we need to apply to the pothon object"
+ };
+ Gaudi::Property<std::vector<std::string>> m_photonIsEMselectorResultNames{
+ this,
+ "photonIsEMselectorResultNames",
+ {},
+ "The selector result names"
+ };
+
+ ToolHandle<ILumiBlockMuTool> m_lumiBlockMuTool{
+ this,
+ "LuminosityTool",
+ "LumiBlockMuTool/LumiBlockMuTool",
+ "Luminosity Tool"
+ };
+
+ Gaudi::Property<std::string> m_LHValueName{ this,
+ "LHValueName",
+ "LHValue",
+ "The LH Value name" };
+
+ Gaudi::Property<bool> m_UselumiBlockMuTool{
+ this,
+ "UseLuminosityTool",
+ false,
+ "Use Luminosity Tool instead of value stored in xAOD"
+ };
};
#endif
-
-
-
-
-
-
-
-
diff --git a/Reconstruction/egamma/egammaTools/src/EMShowerBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMShowerBuilder.cxx
index d56fd53301af93bdc69ed6b5d32de55f0692e16c..39bbf832e45359bbe6fb2b1e8ab80b8105d90488 100644
--- a/Reconstruction/egamma/egammaTools/src/EMShowerBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMShowerBuilder.cxx
@@ -26,16 +26,18 @@
EMShowerBuilder::EMShowerBuilder(const std::string& type,
const std::string& name,
const IInterface* parent)
- : AthAlgTool(type, name, parent) {
+ : AthAlgTool(type, name, parent)
+{
// declare interface
declareInterface<IEMShowerBuilder>(this);
}
-EMShowerBuilder::~EMShowerBuilder() {}
-StatusCode EMShowerBuilder::initialize() {
+StatusCode
+EMShowerBuilder::initialize()
+{
ATH_MSG_DEBUG(
- " Initializing EMShowerBuilder, m_cellKey = " << m_cellsKey.key());
+ " Initializing EMShowerBuilder, m_cellKey = " << m_cellsKey.key());
ATH_CHECK(m_cellsKey.initialize((m_UseShowerShapeTool || m_UseCaloIsoTool) &&
!m_cellsKey.key().empty()));
@@ -43,9 +45,8 @@ StatusCode EMShowerBuilder::initialize() {
if (m_UseShowerShapeTool) {
if ((RetrieveShowerShapeTool()).isFailure()) {
return StatusCode::FAILURE;
- }
- m_ShowerShapeTool.disable();
-
+ }
+ m_ShowerShapeTool.disable();
}
//
// call calorimeter isolation tool only if needed
@@ -53,16 +54,17 @@ StatusCode EMShowerBuilder::initialize() {
if (m_UseCaloIsoTool) {
if ((RetrieveHadronicLeakageTool()).isFailure()) {
return StatusCode::FAILURE;
- }
- m_HadronicLeakageTool.disable();
-
+ }
+ m_HadronicLeakageTool.disable();
}
// for measuring the timing
return StatusCode::SUCCESS;
}
-StatusCode EMShowerBuilder::RetrieveShowerShapeTool() {
+StatusCode
+EMShowerBuilder::RetrieveShowerShapeTool()
+{
if (m_ShowerShapeTool.empty()) {
ATH_MSG_INFO("ShowerShape is empty");
return StatusCode::SUCCESS;
@@ -71,7 +73,9 @@ StatusCode EMShowerBuilder::RetrieveShowerShapeTool() {
return StatusCode::SUCCESS;
}
-StatusCode EMShowerBuilder::RetrieveHadronicLeakageTool() {
+StatusCode
+EMShowerBuilder::RetrieveHadronicLeakageTool()
+{
if (m_HadronicLeakageTool.empty()) {
ATH_MSG_INFO("HadronicLeakageTool is empty");
return StatusCode::SUCCESS;
@@ -80,11 +84,17 @@ StatusCode EMShowerBuilder::RetrieveHadronicLeakageTool() {
return StatusCode::SUCCESS;
}
-StatusCode EMShowerBuilder::finalize() { return StatusCode::SUCCESS; }
+StatusCode
+EMShowerBuilder::finalize()
+{
+ return StatusCode::SUCCESS;
+}
-StatusCode EMShowerBuilder::execute(const EventContext& ctx,
- const CaloDetDescrManager& cmgr,
- xAOD::Egamma* eg) const {
+StatusCode
+EMShowerBuilder::execute(const EventContext& ctx,
+ const CaloDetDescrManager& cmgr,
+ xAOD::Egamma* eg) const
+{
ATH_MSG_DEBUG("Executing EMShowerBuilder::execute");
// protection against bad pointers
@@ -103,9 +113,11 @@ StatusCode EMShowerBuilder::execute(const EventContext& ctx,
return StatusCode::SUCCESS;
}
-StatusCode EMShowerBuilder::executeWithCells(const CaloCellContainer* cellcoll,
- const CaloDetDescrManager& cmgr,
- xAOD::Egamma* eg) const {
+StatusCode
+EMShowerBuilder::executeWithCells(const CaloCellContainer* cellcoll,
+ const CaloDetDescrManager& cmgr,
+ xAOD::Egamma* eg) const
+{
ATH_CHECK(CalcShowerShape(eg, cmgr, cellcoll));
return StatusCode::SUCCESS;
}
@@ -113,7 +125,8 @@ StatusCode EMShowerBuilder::executeWithCells(const CaloCellContainer* cellcoll,
StatusCode
EMShowerBuilder::CalcShowerShape(xAOD::Egamma* eg,
const CaloDetDescrManager& cmgr,
- const CaloCellContainer* cellcoll) const {
+ const CaloCellContainer* cellcoll) const
+{
//
// Estimate shower shapes and fill the EMShower object associated to eg
//
@@ -152,7 +165,8 @@ StatusCode
EMShowerBuilder::CalcHadronicLeakage(xAOD::Egamma* eg,
const CaloDetDescrManager& cmgr,
const xAOD::CaloCluster* clus,
- const CaloCellContainer* cellcoll) const {
+ const CaloCellContainer* cellcoll) const
+{
//
// Call calorimeter isolation tool
//
@@ -165,9 +179,9 @@ EMShowerBuilder::CalcHadronicLeakage(xAOD::Egamma* eg,
if (m_HadronicLeakageTool.empty()) {
return StatusCode::SUCCESS;
}
- // calculate information concerning just the hadronic leakage
+ // calculate information concerning just the hadronic leakage
IegammaIso::Info info;
- StatusCode sc = m_HadronicLeakageTool->execute(*clus,cmgr,*cellcoll,info);
+ StatusCode sc = m_HadronicLeakageTool->execute(*clus, cmgr, *cellcoll, info);
if (sc.isFailure()) {
ATH_MSG_WARNING("call to Iso returns failure for execute");
return sc;
@@ -190,7 +204,8 @@ EMShowerBuilder::CalcHadronicLeakage(xAOD::Egamma* eg,
StatusCode
EMShowerBuilder::FillEMShowerShape(xAOD::Egamma* eg,
- const IegammaShowerShape::Info& info) const {
+ const IegammaShowerShape::Info& info) const
+{
// protection in case Tool does not exist
if (m_ShowerShapeTool.empty()) {
@@ -332,8 +347,8 @@ EMShowerBuilder::FillEMShowerShape(xAOD::Egamma* eg,
value = static_cast<float>(info.emaxs1);
valueSecond = static_cast<float>(info.esec1);
eg->setShowerShapeValue(fabs(value + valueSecond) > 0.
- ? (value - valueSecond) / (value + valueSecond)
- : 0.,
+ ? (value - valueSecond) / (value + valueSecond)
+ : 0.,
xAOD::EgammaParameters::Eratio);
value = static_cast<float>(info.emins1);
diff --git a/Reconstruction/egamma/egammaTools/src/EMShowerBuilder.h b/Reconstruction/egamma/egammaTools/src/EMShowerBuilder.h
index 1f263603f56c3f1311d8fb9996e0543dc73e6c72..0d4a92ed61bb681bc5e4486da0988d6f3a74ef4c 100644
--- a/Reconstruction/egamma/egammaTools/src/EMShowerBuilder.h
+++ b/Reconstruction/egamma/egammaTools/src/EMShowerBuilder.h
@@ -6,129 +6,153 @@
#define EGAMMATOOLS_EMSHOWERBUILDER_H
/**
@class EMShowerBuilder
- EMShower data object builder :
- - Get pointing information associated to the cluster from the egammaqpoint tool
+ EMShower data object builder :
+ - Get pointing information associated to the cluster from the egammaqpoint
+ tool
- Get shower depth associated to the cluster from the egammaqgcld tool
- Define a Calo Cell list corresponding to EM, HAD, FCAL Calo
- - egammaIso calculates information concerning isolation behind em clusters
+ - egammaIso calculates information concerning isolation behind em clusters
in the hadronic calorimeter and around the em cluster
for isolation around em clustr use cone of different sizes
- Calculate shower shapes in all samplings from egammaShowerShape tool
- - When running on AOD data(defined as samples which do not contain AllCalo
- CaloCellContainer) as there is not enough cells, the showers are not
- recalculated. On the other hand we try to find the original
- electron/photon object which matches the cluster and
- keep this information in the new EMShower object
+ - When running on AOD data(defined as samples which do not contain AllCalo
+ CaloCellContainer) as there is not enough cells, the showers are not
+ recalculated. On the other hand we try to find the original
+ electron/photon object which matches the cluster and
+ keep this information in the new EMShower object
- @author H. Ma
+ @author H. Ma
@author F. Derue
*/
-// INCLUDE HEADER FILES:
-#include "GaudiKernel/Algorithm.h"
+// INCLUDE HEADER FILES:
#include "GaudiKernel/AlgTool.h"
-#include "egammaBaseTool.h"
-#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/Algorithm.h"
+#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/ReadHandleKey.h"
+#include "egammaBaseTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "egammaInterfaces/IEMShowerBuilder.h"
-#include "egammaInterfaces/IegammaShowerShape.h"
#include "egammaInterfaces/IegammaIso.h"
+#include "egammaInterfaces/IegammaShowerShape.h"
+#include "xAODCaloEvent/CaloClusterFwd.h"
#include "xAODEgamma/EgammaEnums.h"
#include "xAODEgamma/EgammaFwd.h"
-#include "xAODCaloEvent/CaloClusterFwd.h"
-#include "xAODTracking/TrackParticleContainer.h"
-#include "xAODTracking/VertexContainer.h"
+#include "xAODTracking/TrackParticleContainer.h"
+#include "xAODTracking/VertexContainer.h"
class StoreGateSvc;
class CaloCellContainer;
class IChronoStatSvc;
class CaloDetDescrManager;
-class EMShowerBuilder : public AthAlgTool, virtual public IEMShowerBuilder
+class EMShowerBuilder
+ : public AthAlgTool
+ , virtual public IEMShowerBuilder
{
public:
-
- /** @brief Default constructor*/
- EMShowerBuilder(const std::string& type,
- const std::string& name,
- const IInterface* parent);
-
- /** @brief Destructor*/
- ~EMShowerBuilder();
-
- /** @brief initialize method*/
- virtual StatusCode initialize() override;
- /** @brief standard execute method */
- virtual StatusCode execute(const EventContext& ctx,
- const CaloDetDescrManager& cmgr,
- xAOD::Egamma*) const override final;
-
- virtual StatusCode executeWithCells(const CaloCellContainer* cellcoll,
- const CaloDetDescrManager& cmgr,
- xAOD::Egamma*) const override final;
- /** @brief finalize method*/
- virtual StatusCode finalize() override;
+ /** @brief Default constructor*/
+ EMShowerBuilder(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
+
+ /** @brief Destructor*/
+ ~EMShowerBuilder() = default;
+
+ /** @brief initialize method*/
+ virtual StatusCode initialize() override final;
+ /** @brief standard execute method */
+ virtual StatusCode execute(const EventContext& ctx,
+ const CaloDetDescrManager& cmgr,
+ xAOD::Egamma*) const override final;
+
+ virtual StatusCode executeWithCells(const CaloCellContainer* cellcoll,
+ const CaloDetDescrManager& cmgr,
+ xAOD::Egamma*) const override final;
+ /** @brief finalize method*/
+ virtual StatusCode finalize() override;
private:
- /** @brief method to retrieve ShowerBuilder tool */
- StatusCode RetrieveShowerShapeTool();
- /** @brief method to retrieve hadronic leakage calculation from CaloIso tool */
- StatusCode RetrieveHadronicLeakageTool();
- /** @brief calculate shower shapes*/
- StatusCode CalcShowerShape(xAOD::Egamma* eg,
- const CaloDetDescrManager& cmgr,
- const CaloCellContainer* cellcoll) const;
- /** @brief calculate Hadronic leakage*/
- StatusCode CalcHadronicLeakage(xAOD::Egamma* eg,
- const CaloDetDescrManager& cmgr,
- const xAOD::CaloCluster* clus,
- const CaloCellContainer* cellcoll) const ;
- /** @brief fill shower detail from shower shape calculation*/
- StatusCode FillEMShowerShape(xAOD::Egamma* eg,const IegammaShowerShape::Info& info) const ;
-
- /** @brief Cell container*/
- SG::ReadHandleKey<CaloCellContainer> m_cellsKey {this,
- "CellsName", "AllCalo", "Names of containers which contain cells"};
-
- /** @brief Obsolete enum on the layers to use for the HadLeakage variables*/
- Gaudi::Property<std::vector<int> > m_caloNums {this,
- "CaloNums", {}, "list of calo to treat"};
-
- /** @brief Tool for shower shape calculation*/
- ToolHandle<IegammaShowerShape> m_ShowerShapeTool {this,
- "ShowerShapeTool", "egammaShowerShape/egammashowershape",
- "Handle of instance of egammaShowerShape Tool to be run"};
-
- /** @brief Tool for hadronic leakage calculation*/
- ToolHandle<IegammaIso> m_HadronicLeakageTool {this,
- "HadronicLeakageTool", "egammaIso",
- "Handle of the EMCaloIsolationTool for Hadronic leakage"};
-
- /** @brief boolean to print results*/
- Gaudi::Property<bool> m_Print {this,
- "Print", false, "in case of extra prints"};
-
- /** @brief Boolean to call shower shape calculation and filling
- (NB: this could be important when redoing calculation from AODs) */
- Gaudi::Property<bool> m_UseShowerShapeTool {this,
- "UseShowerShapeTool", true,
- "Boolean to call shower shape calculation and filling"};
-
- /** @brief Boolean to call calo isolation variables calculation and filling
- (NB: this could be important when redoing calculation from AODs) */
- Gaudi::Property<bool> m_UseCaloIsoTool {this,
- "UseCaloIsoTool", true,
- "Boolean to call hadronic leakage calculation and filling"};
-
- /** @brief boolean to know if we are looking at cosmic data */
- Gaudi::Property<bool> m_isCosmics {this,
- "isCosmics", false, "Boolean for use of cosmics"};
-
-
+ /** @brief method to retrieve ShowerBuilder tool */
+ StatusCode RetrieveShowerShapeTool();
+ /** @brief method to retrieve hadronic leakage calculation from CaloIso tool
+ */
+ StatusCode RetrieveHadronicLeakageTool();
+ /** @brief calculate shower shapes*/
+ StatusCode CalcShowerShape(xAOD::Egamma* eg,
+ const CaloDetDescrManager& cmgr,
+ const CaloCellContainer* cellcoll) const;
+ /** @brief calculate Hadronic leakage*/
+ StatusCode CalcHadronicLeakage(xAOD::Egamma* eg,
+ const CaloDetDescrManager& cmgr,
+ const xAOD::CaloCluster* clus,
+ const CaloCellContainer* cellcoll) const;
+ /** @brief fill shower detail from shower shape calculation*/
+ StatusCode FillEMShowerShape(xAOD::Egamma* eg,
+ const IegammaShowerShape::Info& info) const;
+
+ /** @brief Cell container*/
+ SG::ReadHandleKey<CaloCellContainer> m_cellsKey{
+ this,
+ "CellsName",
+ "AllCalo",
+ "Names of containers which contain cells"
+ };
+
+ /** @brief Obsolete enum on the layers to use for the HadLeakage variables*/
+ Gaudi::Property<std::vector<int>> m_caloNums{ this,
+ "CaloNums",
+ {},
+ "list of calo to treat" };
+
+ /** @brief Tool for shower shape calculation*/
+ ToolHandle<IegammaShowerShape> m_ShowerShapeTool{
+ this,
+ "ShowerShapeTool",
+ "egammaShowerShape/egammashowershape",
+ "Handle of instance of egammaShowerShape Tool to be run"
+ };
+
+ /** @brief Tool for hadronic leakage calculation*/
+ ToolHandle<IegammaIso> m_HadronicLeakageTool{
+ this,
+ "HadronicLeakageTool",
+ "egammaIso",
+ "Handle of the EMCaloIsolationTool for Hadronic leakage"
+ };
+
+ /** @brief boolean to print results*/
+ Gaudi::Property<bool> m_Print{ this,
+ "Print",
+ false,
+ "in case of extra prints" };
+
+ /** @brief Boolean to call shower shape calculation and filling
+ (NB: this could be important when redoing calculation from AODs) */
+ Gaudi::Property<bool> m_UseShowerShapeTool{
+ this,
+ "UseShowerShapeTool",
+ true,
+ "Boolean to call shower shape calculation and filling"
+ };
+
+ /** @brief Boolean to call calo isolation variables calculation and filling
+ (NB: this could be important when redoing calculation from AODs) */
+ Gaudi::Property<bool> m_UseCaloIsoTool{
+ this,
+ "UseCaloIsoTool",
+ true,
+ "Boolean to call hadronic leakage calculation and filling"
+ };
+
+ /** @brief boolean to know if we are looking at cosmic data */
+ Gaudi::Property<bool> m_isCosmics{ this,
+ "isCosmics",
+ false,
+ "Boolean for use of cosmics" };
};
#endif
diff --git a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
index 630db579b640ab93e2c2ded5f3ae395db67546fb..22683c98faff29c3f71c1d68ccbfabd7ca6b8518 100644
--- a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
@@ -9,19 +9,18 @@
#include "egammaRecEvent/egammaRec.h"
#include "egammaRecEvent/egammaRecContainer.h"
-
#include "xAODCaloEvent/CaloCluster.h"
-#include "xAODTracking/TrackParticle.h"
-#include "xAODTracking/TrackParticleContainer.h"
#include "xAODEgamma/EgammaxAODHelpers.h"
+#include "xAODTracking/TrackParticle.h"
+#include "xAODTracking/TrackParticleContainer.h"
-#include "egammaUtils/CandidateMatchHelpers.h"
#include "CaloUtils/CaloCellList.h"
#include "FourMomUtils/P4Helpers.h"
+#include "egammaUtils/CandidateMatchHelpers.h"
+#include "GaudiKernel/EventContext.h"
#include "SGTools/CurrentEventStore.h"
#include "StoreGate/ReadHandle.h"
-#include "GaudiKernel/EventContext.h"
#include <cmath>
@@ -29,119 +28,125 @@
EMTrackMatchBuilder::EMTrackMatchBuilder(const std::string& type,
const std::string& name,
- const IInterface* parent) :
- AthAlgTool(type, name, parent)
+ const IInterface* parent)
+ : AthAlgTool(type, name, parent)
{
// declare interface
declareInterface<IEMTrackMatchBuilder>(this);
}
-EMTrackMatchBuilder::~EMTrackMatchBuilder() {
-}
-
-StatusCode EMTrackMatchBuilder::initialize()
+StatusCode
+EMTrackMatchBuilder::initialize()
{
ATH_CHECK(m_TrackParticlesKey.initialize());
-
+
// the extrapolation tool
ATH_CHECK(m_extrapolationTool.retrieve());
// set things up for the sorting
m_sorter = TrackMatchSorter(m_distanceForScore);
- m_deltaEtaWeight = 1.0/m_deltaEtaResolution;
- m_deltaPhiWeight = 1.0/m_deltaPhiResolution;
- m_deltaPhiRescaleWeight = 1.0/m_deltaPhiRescaleResolution;
+ m_deltaEtaWeight = 1.0 / m_deltaEtaResolution;
+ m_deltaPhiWeight = 1.0 / m_deltaPhiResolution;
+ m_deltaPhiRescaleWeight = 1.0 / m_deltaPhiRescaleResolution;
return StatusCode::SUCCESS;
}
-StatusCode EMTrackMatchBuilder::executeRec(const EventContext& ctx,
- EgammaRecContainer* egammas) const
+StatusCode
+EMTrackMatchBuilder::executeRec(const EventContext& ctx,
+ EgammaRecContainer* egammas) const
{
// protection against bad pointers
- if (egammas==nullptr ) {
+ if (egammas == nullptr) {
return StatusCode::SUCCESS;
}
// retrieve the trackparticle container
- SG::ReadHandle<xAOD::TrackParticleContainer> trackPC(m_TrackParticlesKey, ctx);
+ SG::ReadHandle<xAOD::TrackParticleContainer> trackPC(m_TrackParticlesKey,
+ ctx);
// check is only used for serial running; remove when MT scheduler used
- if( !trackPC.isValid() ) {
- ATH_MSG_ERROR("Couldn't retrieve TrackParticle container with key: " << m_TrackParticlesKey.key());
+ if (!trackPC.isValid()) {
+ ATH_MSG_ERROR("Couldn't retrieve TrackParticle container with key: "
+ << m_TrackParticlesKey.key());
return StatusCode::FAILURE;
}
- //Loop over calling the trackExecute method
- for (egammaRec* eg: *egammas){
+ // Loop over calling the trackExecute method
+ for (egammaRec* eg : *egammas) {
// retrieve the cluster
- ATH_CHECK(trackExecute(ctx,eg,trackPC.cptr()));
+ ATH_CHECK(trackExecute(ctx, eg, trackPC.cptr()));
}
return StatusCode::SUCCESS;
}
-StatusCode EMTrackMatchBuilder::trackExecute(const EventContext& ctx, egammaRec* eg,
- const xAOD::TrackParticleContainer* trackPC) const
+StatusCode
+EMTrackMatchBuilder::trackExecute(
+ const EventContext& ctx,
+ egammaRec* eg,
+ const xAOD::TrackParticleContainer* trackPC) const
{
- if (!eg || !trackPC){
- ATH_MSG_WARNING("trackExecute: NULL pointer to egammaRec or TrackParticleContainer");
+ if (!eg || !trackPC) {
+ ATH_MSG_WARNING(
+ "trackExecute: NULL pointer to egammaRec or TrackParticleContainer");
return StatusCode::SUCCESS;
}
// retrieve corresponding cluster
const xAOD::CaloCluster* cluster = eg->caloCluster();
// check if the cluster is sane
- if (cluster && cluster->e() ==0.0) {
+ if (cluster && cluster->e() == 0.0) {
ATH_MSG_WARNING("trackExecute: cluster energy is 0.0! Ignoring cluster.");
return StatusCode::SUCCESS;
}
// Loop over tracks and fill TrackMatch vector
- std::vector<TrackMatch> trkMatches;
+ std::vector<TrackMatch> trkMatches;
xAOD::TrackParticleContainer::const_iterator trkIt = trackPC->begin();
- for (unsigned int trackNumber = 0; trkIt != trackPC->end(); ++trkIt, ++trackNumber)
- {
- //Avoid TRT alone
- if(xAOD::EgammaHelpers::numberOfSiHits(*trkIt) < 4){
+ for (unsigned int trackNumber = 0; trkIt != trackPC->end();
+ ++trkIt, ++trackNumber) {
+ // Avoid TRT alone
+ if (xAOD::EgammaHelpers::numberOfSiHits(*trkIt) < 4) {
continue;
}
- /*
- * Try with normal directions.
+ /*
+ * Try with normal directions.
* For cosmics allow a retry with inverted direction.
*/
- if (isCandidateMatch(cluster, (*trkIt), false)){
- inBroadWindow(ctx, trkMatches, *cluster, trackNumber,
- (**trkIt), Trk::alongMomentum);
- }
- else if (m_isCosmics && isCandidateMatch(cluster, (*trkIt), true)){
- inBroadWindow(ctx, trkMatches, *cluster, trackNumber,
- (**trkIt), Trk::oppositeMomentum);
+ if (isCandidateMatch(cluster, (*trkIt), false)) {
+ inBroadWindow(
+ ctx, trkMatches, *cluster, trackNumber, (**trkIt), Trk::alongMomentum);
+ } else if (m_isCosmics && isCandidateMatch(cluster, (*trkIt), true)) {
+ inBroadWindow(ctx,
+ trkMatches,
+ *cluster,
+ trackNumber,
+ (**trkIt),
+ Trk::oppositeMomentum);
}
}
- if(!trkMatches.empty()){
- //sort the track matches
+ if (!trkMatches.empty()) {
+ // sort the track matches
std::sort(trkMatches.begin(), trkMatches.end(), m_sorter);
- //set the matching values
- TrackMatch bestTrkMatch=trkMatches.at(0);
- eg->setDeltaEta (bestTrkMatch.deltaEta);
- eg->setDeltaPhi (bestTrkMatch.deltaPhi);
- eg->setDeltaPhiRescaled (bestTrkMatch.deltaPhiRescaled);
+ // set the matching values
+ TrackMatch bestTrkMatch = trkMatches.at(0);
+ eg->setDeltaEta(bestTrkMatch.deltaEta);
+ eg->setDeltaPhi(bestTrkMatch.deltaPhi);
+ eg->setDeltaPhiRescaled(bestTrkMatch.deltaPhiRescaled);
eg->setDeltaPhiLast(bestTrkMatch.deltaPhiLast);
- //set the element Links
+ // set the element Links
typedef ElementLink<xAOD::TrackParticleContainer> EL;
std::vector<EL> trackParticleLinks;
- trackParticleLinks.reserve (trkMatches.size());
+ trackParticleLinks.reserve(trkMatches.size());
const std::string key = EL(*trackPC, 0).dataID();
IProxyDict* sg = SG::CurrentEventStore::store();
for (const TrackMatch& m : trkMatches) {
- ATH_MSG_DEBUG("Match dR: "<< m.dR
- <<" second dR: "<< m.seconddR
- <<" hasPix: "<< m.hasPix
- <<" hitsScore: " << m.hitsScore);
- if (key.empty()){
- trackParticleLinks.emplace_back (*trackPC, m.trackNumber, sg);
- }
- else{
- trackParticleLinks.emplace_back (key, m.trackNumber, sg);
+ ATH_MSG_DEBUG("Match dR: " << m.dR << " second dR: " << m.seconddR
+ << " hasPix: " << m.hasPix
+ << " hitsScore: " << m.hitsScore);
+ if (key.empty()) {
+ trackParticleLinks.emplace_back(*trackPC, m.trackNumber, sg);
+ } else {
+ trackParticleLinks.emplace_back(key, m.trackNumber, sg);
}
}
eg->setTrackParticles(trackParticleLinks);
@@ -152,72 +157,69 @@ StatusCode EMTrackMatchBuilder::trackExecute(const EventContext& ctx, egammaRec*
bool
EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
std::vector<TrackMatch>& trackMatches,
- const xAOD::CaloCluster& cluster,
- int trackNumber,
+ const xAOD::CaloCluster& cluster,
+ int trackNumber,
const xAOD::TrackParticle& trkPB,
const Trk::PropDirection dir) const
{
- IEMExtrapolationTools::TrkExtrapDef extrapFrom = IEMExtrapolationTools::fromPerigee;
-
+ IEMExtrapolationTools::TrkExtrapDef extrapFrom =
+ IEMExtrapolationTools::fromPerigee;
// Now get the delta eta/phi and eta correction at the calorimeter
// final arrays that we will write
// Save the value of deltaPhiRescale. If we do not use rescaled
// perigee, we recalculate deltaPhi using rescaled momentum. This
// will be saved in EMTrackMatch
- std::array<double,4> eta = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> phi = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> deltaEta = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> deltaPhi = {-999.0,-999.0,-999.0,-999.0};
-
+ std::array<double, 4> eta = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> phi = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> deltaEta = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> deltaPhi = { -999.0, -999.0, -999.0, -999.0 };
+
/*
* Try both from perigee
* and from perigee Rescale.
*
* We need anyhow both to be there at the end.
*/
- if (m_extrapolationTool->getMatchAtCalo (ctx,
- cluster,
- trkPB,
- dir,
- eta,
- phi,
- deltaEta,
- deltaPhi,
- extrapFrom).isFailure())
- {
+ if (m_extrapolationTool
+ ->getMatchAtCalo(
+ ctx, cluster, trkPB, dir, eta, phi, deltaEta, deltaPhi, extrapFrom)
+ .isFailure()) {
return false;
}
- IEMExtrapolationTools::TrkExtrapDef extrapFromRes = IEMExtrapolationTools::fromPerigeeRescaled;
- std::array<double,4> etaRes = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> phiRes = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> deltaEtaRes = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> deltaPhiRes = {-999.0,-999.0,-999.0,-999.0};
-
- if (m_extrapolationTool->getMatchAtCalo (ctx,
- cluster,
- trkPB,
- dir,
- etaRes,
- phiRes,
- deltaEtaRes,
- deltaPhiRes,
- extrapFromRes).isFailure())
- {
+ IEMExtrapolationTools::TrkExtrapDef extrapFromRes =
+ IEMExtrapolationTools::fromPerigeeRescaled;
+ std::array<double, 4> etaRes = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> phiRes = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> deltaEtaRes = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> deltaPhiRes = { -999.0, -999.0, -999.0, -999.0 };
+
+ if (m_extrapolationTool
+ ->getMatchAtCalo(ctx,
+ cluster,
+ trkPB,
+ dir,
+ etaRes,
+ phiRes,
+ deltaEtaRes,
+ deltaPhiRes,
+ extrapFromRes)
+ .isFailure()) {
return false;
}
-
+
double deltaPhiRescale = deltaPhiRes[2];
/*
- * Sanity check for very far away matches
- * The assumption is when we rescale we should be in the
+ * Sanity check for very far away matches
+ * The assumption is when we rescale we should be in the
* correct neighborhood for a valid track-cluster pair.
*/
- if(fabs(deltaPhiRes[2]) > m_MaxDeltaPhiRescale){
- ATH_MSG_DEBUG("DeltaPhiRescaled above maximum: " << deltaPhiRes[2] <<
- " (max: " << m_MaxDeltaPhiRescale << ")" );
+ if (fabs(deltaPhiRes[2]) > m_MaxDeltaPhiRescale) {
+ ATH_MSG_DEBUG("DeltaPhiRescaled above maximum: "
+ << deltaPhiRes[2] << " (max: " << m_MaxDeltaPhiRescale
+ << ")");
return false;
}
/*
@@ -225,231 +227,243 @@ EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
* If this fails and the cluster Et is larger than the track Pt
* it might get matched only under the rescaled assumption that
* should be less sensitive to radiative losses.
- */
- if(fabs(deltaEta[2]) < m_narrowDeltaEta &&
- deltaPhi[2] < m_narrowDeltaPhi &&
- deltaPhi[2] > -m_narrowDeltaPhiBrem){
- ATH_MSG_DEBUG("Matched with Perigee") ;
- }
- else if(m_SecondPassRescale &&
- cluster.et() > trkPB.pt() &&
- fabs(deltaEtaRes[2]) < m_narrowDeltaEta &&
- deltaPhiRes[2] < m_narrowDeltaPhiRescale &&
- deltaPhiRes[2] > -m_narrowDeltaPhiRescaleBrem){
- ATH_MSG_DEBUG("Not Perigee but matched with Rescale") ;
- }
- else{
- ATH_MSG_DEBUG("Normal matched Failed deltaPhi/deltaEta " << deltaPhi[2] <<" / "<< deltaEta[2]);
- ATH_MSG_DEBUG("Rescaled matched Failed deltaPhi/deltaEta " << deltaPhiRes[2] <<" / "<< deltaEtaRes[2] );
+ */
+ if (fabs(deltaEta[2]) < m_narrowDeltaEta && deltaPhi[2] < m_narrowDeltaPhi &&
+ deltaPhi[2] > -m_narrowDeltaPhiBrem) {
+ ATH_MSG_DEBUG("Matched with Perigee");
+ } else if (m_SecondPassRescale && cluster.et() > trkPB.pt() &&
+ fabs(deltaEtaRes[2]) < m_narrowDeltaEta &&
+ deltaPhiRes[2] < m_narrowDeltaPhiRescale &&
+ deltaPhiRes[2] > -m_narrowDeltaPhiRescaleBrem) {
+ ATH_MSG_DEBUG("Not Perigee but matched with Rescale");
+ } else {
+ ATH_MSG_DEBUG("Normal matched Failed deltaPhi/deltaEta "
+ << deltaPhi[2] << " / " << deltaEta[2]);
+ ATH_MSG_DEBUG("Rescaled matched Failed deltaPhi/deltaEta "
+ << deltaPhiRes[2] << " / " << deltaEtaRes[2]);
return false;
}
- //Always the deltaPhiLast will be from the last measurement
- IEMExtrapolationTools::TrkExtrapDef extrapFrom1 = IEMExtrapolationTools::fromLastMeasurement;
- std::array<double,4> eta1 = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> phi1 = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> deltaEta1 = {-999.0,-999.0,-999.0,-999.0};
- std::array<double,4> deltaPhi1 = {-999.0,-999.0,-999.0,-999.0};
-
- if (m_extrapolationTool->getMatchAtCalo (ctx,
- cluster,
- trkPB,
- dir,
- eta1,
- phi1,
- deltaEta1,
- deltaPhi1,
- extrapFrom1).isFailure())
- {
+ // Always the deltaPhiLast will be from the last measurement
+ IEMExtrapolationTools::TrkExtrapDef extrapFrom1 =
+ IEMExtrapolationTools::fromLastMeasurement;
+ std::array<double, 4> eta1 = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> phi1 = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> deltaEta1 = { -999.0, -999.0, -999.0, -999.0 };
+ std::array<double, 4> deltaPhi1 = { -999.0, -999.0, -999.0, -999.0 };
+
+ if (m_extrapolationTool
+ ->getMatchAtCalo(ctx,
+ cluster,
+ trkPB,
+ dir,
+ eta1,
+ phi1,
+ deltaEta1,
+ deltaPhi1,
+ extrapFrom1)
+ .isFailure()) {
ATH_MSG_DEBUG("Extrapolation from last measurement failed");
return false;
}
double deltaPhiLast = deltaPhi1[2];
ATH_MSG_DEBUG("Rescale dPhi " << deltaPhiRescale);
- ATH_MSG_DEBUG("dPhi Last measurement " << deltaPhiLast);
+ ATH_MSG_DEBUG("dPhi Last measurement " << deltaPhiLast);
/*
* Done with extrapolation
* Lets do the matching logic
*/
TrackMatch trkmatch;
- //Add the matching variable to the TrackMAtch
- trkmatch.deltaEta=deltaEta;
- trkmatch.deltaPhi=deltaPhi;
- trkmatch.deltaPhiRescaled=deltaPhiRes;
- trkmatch.deltaPhiLast=deltaPhiLast;
-
- //Variables used for the sorting. Note both dPhi's will be used.
- trkmatch.trackNumber=trackNumber;
- if(m_useRescaleMetric){
- trkmatch.dR = sqrt(std::pow(m_deltaEtaWeight*deltaEta[2], 2) +
- std::pow(m_deltaPhiRescaleWeight*deltaPhiRescale, 2));
- trkmatch.seconddR = sqrt(std::pow(m_deltaEtaWeight*deltaEta[2], 2) +
- std::pow(m_deltaPhiWeight*deltaPhi[2], 2));
- }
- else{
- trkmatch.dR = sqrt(std::pow(m_deltaEtaWeight*deltaEta[2], 2) +
- std::pow(m_deltaPhiWeight*deltaPhi[2], 2));
- trkmatch.seconddR = sqrt(std::pow(m_deltaEtaWeight*deltaEta[2], 2) +
- std::pow(m_deltaPhiRescaleWeight*deltaPhiRescale, 2));
+ // Add the matching variable to the TrackMAtch
+ trkmatch.deltaEta = deltaEta;
+ trkmatch.deltaPhi = deltaPhi;
+ trkmatch.deltaPhiRescaled = deltaPhiRes;
+ trkmatch.deltaPhiLast = deltaPhiLast;
+
+ // Variables used for the sorting. Note both dPhi's will be used.
+ trkmatch.trackNumber = trackNumber;
+ if (m_useRescaleMetric) {
+ trkmatch.dR = sqrt(std::pow(m_deltaEtaWeight * deltaEta[2], 2) +
+ std::pow(m_deltaPhiRescaleWeight * deltaPhiRescale, 2));
+ trkmatch.seconddR = sqrt(std::pow(m_deltaEtaWeight * deltaEta[2], 2) +
+ std::pow(m_deltaPhiWeight * deltaPhi[2], 2));
+ } else {
+ trkmatch.dR = sqrt(std::pow(m_deltaEtaWeight * deltaEta[2], 2) +
+ std::pow(m_deltaPhiWeight * deltaPhi[2], 2));
+ trkmatch.seconddR =
+ sqrt(std::pow(m_deltaEtaWeight * deltaEta[2], 2) +
+ std::pow(m_deltaPhiRescaleWeight * deltaPhiRescale, 2));
}
- ATH_MSG_DEBUG(" DR " << trkmatch.dR <<" deltaPhi "
- << deltaPhi[2] <<" deltaEta "<< deltaEta[2]);
+ ATH_MSG_DEBUG(" DR " << trkmatch.dR << " deltaPhi " << deltaPhi[2]
+ << " deltaEta " << deltaEta[2]);
/*
- * The first thing to check in
- * finding the best track match
- * Prefer pixel over SCT only
+ * The first thing is
+ * Prefer pixel over SCT only
*/
- int nPixel=0;
- uint8_t uint8_value=0;
- //Check number of pixel hits
- if (trkPB.summaryValue(uint8_value, xAOD::numberOfPixelDeadSensors)){
- nPixel+=uint8_value;
+ int nPixel = 0;
+ uint8_t uint8_value = 0;
+ // Check number of pixel hits
+ if (trkPB.summaryValue(uint8_value, xAOD::numberOfPixelDeadSensors)) {
+ nPixel += uint8_value;
}
- if (trkPB.summaryValue(uint8_value, xAOD::numberOfPixelHits)){
- nPixel+=uint8_value;
+ if (trkPB.summaryValue(uint8_value, xAOD::numberOfPixelHits)) {
+ nPixel += uint8_value;
}
trkmatch.hasPix = (nPixel > 0);
+
/*
- * Seconday score based on hits to be used
+ * Seconday hitsScore score based on hits to be used
* for track that are very close
- * to each other at the calo,
+ * to each other at the calo i.e similar dR with cluster,
* pick the longest possible one
*/
- trkmatch.hitsScore=0;
- if(m_useScoring){
- //Check the 2 innermost layers
- int nInnerMost =0;
- if (trkPB.summaryValue(uint8_value, xAOD::numberOfInnermostPixelLayerHits)){
- nInnerMost+=uint8_value;
+ trkmatch.hitsScore = 0;
+ if (m_useScoring) {
+ // Check the 2 innermost layers
+ int nInnerMost = 0;
+ if (trkPB.summaryValue(uint8_value,
+ xAOD::numberOfInnermostPixelLayerHits)) {
+ nInnerMost += uint8_value;
}
- int expectInnermostPixelLayerHit = 0;
- if (trkPB.summaryValue(uint8_value, xAOD::expectInnermostPixelLayerHit)){
- expectInnermostPixelLayerHit+=uint8_value;
+ int expectInnermostPixelLayerHit = 0;
+ if (trkPB.summaryValue(uint8_value, xAOD::expectInnermostPixelLayerHit)) {
+ expectInnermostPixelLayerHit += uint8_value;
}
- int nNextToInnerMost =0;
- if (trkPB.summaryValue(uint8_value, xAOD::numberOfNextToInnermostPixelLayerHits)){
- nNextToInnerMost+=uint8_value;
+ int nNextToInnerMost = 0;
+ if (trkPB.summaryValue(uint8_value,
+ xAOD::numberOfNextToInnermostPixelLayerHits)) {
+ nNextToInnerMost += uint8_value;
}
- int expectNextToInnermostPixelLayerHit = 0;
- if (trkPB.summaryValue(uint8_value, xAOD::expectNextToInnermostPixelLayerHit)){
- expectNextToInnermostPixelLayerHit+=uint8_value;
+ int expectNextToInnermostPixelLayerHit = 0;
+ if (trkPB.summaryValue(uint8_value,
+ xAOD::expectNextToInnermostPixelLayerHit)) {
+ expectNextToInnermostPixelLayerHit += uint8_value;
}
- //Secondary score , find the longest track possible,
- //i.e the one with the most inner hists in the pixel
- //npixel*5
- trkmatch.hitsScore+=(nPixel*5);
- //Extra points for NextToInnermost
- if(!expectNextToInnermostPixelLayerHit || nNextToInnerMost>0){
- trkmatch.hitsScore+=5;
+ // Secondary score , find the longest track possible,
+ // i.e the one with the most inner hists in the pixel
+ // npixel*5
+ trkmatch.hitsScore += (nPixel * 5);
+ // Extra points for NextToInnermost
+ if (!expectNextToInnermostPixelLayerHit || nNextToInnerMost > 0) {
+ trkmatch.hitsScore += 5;
}
- //Extra points for Innermost
- if(!expectInnermostPixelLayerHit || nInnerMost>0){
- trkmatch.hitsScore+=10;
+ // Extra points for Innermost
+ if (!expectInnermostPixelLayerHit || nInnerMost > 0) {
+ trkmatch.hitsScore += 10;
}
- }
- ATH_MSG_DEBUG("hasPix : " <<trkmatch.hasPix <<" hitsScore : " <<trkmatch.hitsScore);
+ }
+ ATH_MSG_DEBUG("hasPix : " << trkmatch.hasPix
+ << " hitsScore : " << trkmatch.hitsScore);
trackMatches.push_back(trkmatch);
return true;
}
bool
-EMTrackMatchBuilder::isCandidateMatch(const xAOD::CaloCluster* cluster,
+EMTrackMatchBuilder::isCandidateMatch(const xAOD::CaloCluster* cluster,
const xAOD::TrackParticle* track,
- bool flip) const
+ bool flip) const
{
// loose cluster-track matching
- if ( !m_useCandidateMatch ) {
+ if (!m_useCandidateMatch) {
return true;
}
-
- //Tracking
- const Trk::Perigee& candidatePerigee =track->perigeeParameters();
- //Decide whether to try the opposite direction (cosmics)
- const double trkPhi = (!flip) ? candidatePerigee.parameters()[Trk::phi] : -candidatePerigee.parameters()[Trk::phi];
- const double trkEta = (!flip) ? candidatePerigee.eta() : -candidatePerigee.eta();
- const double z_perigee=candidatePerigee.position().z();
- const double r_perigee=candidatePerigee.position().perp();
+
+ // Tracking
+ const Trk::Perigee& candidatePerigee = track->perigeeParameters();
+ // Decide whether to try the opposite direction (cosmics)
+ const double trkPhi = (!flip) ? candidatePerigee.parameters()[Trk::phi]
+ : -candidatePerigee.parameters()[Trk::phi];
+ const double trkEta =
+ (!flip) ? candidatePerigee.eta() : -candidatePerigee.eta();
+ const double z_perigee = candidatePerigee.position().z();
+ const double r_perigee = candidatePerigee.position().perp();
const Amg::Vector3D PerigeeXYZPosition(candidatePerigee.position().x(),
candidatePerigee.position().y(),
z_perigee);
- //Cluster variables
- const double clusterEta=cluster->eta();
- const bool isEndCap= !xAOD::EgammaHelpers::isBarrel(cluster);
- const double Et= cluster->e()/cosh(trkEta);
- const double clusterPhi=cluster->phi();
-
- //Avoid clusters with |eta| > 10 or Et less than 10 MeV
- if(fabs(clusterEta)>10.0 || Et <10){
+ // Cluster variables
+ const double clusterEta = cluster->eta();
+ const bool isEndCap = !xAOD::EgammaHelpers::isBarrel(cluster);
+ const double Et = cluster->e() / cosh(trkEta);
+ const double clusterPhi = cluster->phi();
+
+ // Avoid clusters with |eta| > 10 or Et less than 10 MeV
+ if (fabs(clusterEta) > 10.0 || Et < 10) {
return false;
}
- //Calculate the eta/phi of the cluster as would be seen from the perigee position of the Track
- const Amg::Vector3D XYZClusterWrtTrackPerigee = CandidateMatchHelpers::approxXYZwrtPoint(*cluster,
- PerigeeXYZPosition,
- isEndCap);
-
- const double clusterEtaCorrected=XYZClusterWrtTrackPerigee.eta();
- //check eta match . Both metrics need to fail in order to disgard the track
- if ( (fabs(clusterEta - trkEta) > 2.*m_broadDeltaEta) &&
- (fabs(clusterEtaCorrected- trkEta) > 2.*m_broadDeltaEta)){
- ATH_MSG_DEBUG(" Fails broad window eta match (track eta, cluster eta, cluster eta corrected): ( "
- << trkEta << ", " << clusterEta <<", "<<clusterEtaCorrected<<")" );
+ // Calculate the eta/phi of the cluster as would be seen from the perigee
+ // position of the Track
+ const Amg::Vector3D XYZClusterWrtTrackPerigee =
+ CandidateMatchHelpers::approxXYZwrtPoint(
+ *cluster, PerigeeXYZPosition, isEndCap);
+
+ const double clusterEtaCorrected = XYZClusterWrtTrackPerigee.eta();
+ // check eta match . Both metrics need to fail in order to disgard the track
+ if ((fabs(clusterEta - trkEta) > 2. * m_broadDeltaEta) &&
+ (fabs(clusterEtaCorrected - trkEta) > 2. * m_broadDeltaEta)) {
+ ATH_MSG_DEBUG(" Fails broad window eta match (track eta, cluster eta, "
+ "cluster eta corrected): ( "
+ << trkEta << ", " << clusterEta << ", " << clusterEtaCorrected
+ << ")");
return false;
}
- //Calculate the possible rotation of the track
- //Once assuming the cluster Et being the better estimate (e.g big brem)
- const double phiRotRescaled = CandidateMatchHelpers::PhiROT(Et,trkEta,
- track->charge(),
- r_perigee,
- isEndCap) ;
- //And also assuming the track Pt being correct
- const double phiRotTrack = CandidateMatchHelpers::PhiROT(track->pt(),
- trkEta,
- track->charge(),
- r_perigee,
- isEndCap) ;
+ // Calculate the possible rotation of the track
+ // Once assuming the cluster Et being the better estimate (e.g big brem)
+ const double phiRotRescaled = CandidateMatchHelpers::PhiROT(
+ Et, trkEta, track->charge(), r_perigee, isEndCap);
+ // And also assuming the track Pt being correct
+ const double phiRotTrack = CandidateMatchHelpers::PhiROT(
+ track->pt(), trkEta, track->charge(), r_perigee, isEndCap);
//
- const double clusterPhiCorrected=XYZClusterWrtTrackPerigee.phi();
- //deltaPhi between the track and the cluster
+ const double clusterPhiCorrected = XYZClusterWrtTrackPerigee.phi();
+ // deltaPhi between the track and the cluster
const double deltaPhiStd = P4Helpers::deltaPhi(clusterPhiCorrected, trkPhi);
- //deltaPhi between the track and the cluster accounting for rotation assuming cluster Et is a better estimator
- const double trkPhiRescaled= P4Helpers::deltaPhi(trkPhi, phiRotRescaled);
- const double deltaPhiRescaled = P4Helpers::deltaPhi(clusterPhiCorrected, trkPhiRescaled);
- //deltaPhi between the track and the cluster accounting for rotation
+ // deltaPhi between the track and the cluster accounting for rotation assuming
+ // cluster Et is a better estimator
+ const double trkPhiRescaled = P4Helpers::deltaPhi(trkPhi, phiRotRescaled);
+ const double deltaPhiRescaled =
+ P4Helpers::deltaPhi(clusterPhiCorrected, trkPhiRescaled);
+ // deltaPhi between the track and the cluster accounting for rotation
const double trkPhiCorrTrack = P4Helpers::deltaPhi(trkPhi, phiRotTrack);
- const double deltaPhiTrack = P4Helpers::deltaPhi(clusterPhiCorrected, trkPhiCorrTrack);
-
- //It has to fail all phi metrics in order to be disgarded
- if ( (fabs(deltaPhiRescaled) > 2.*m_broadDeltaPhi) &&
- (fabs(deltaPhiTrack) > 2.*m_broadDeltaPhi) &&
- (fabs(deltaPhiStd) > 2.*m_broadDeltaPhi) ){
- ATH_MSG_DEBUG("FAILS broad window phi match (track phi, phirotCluster , phiRotTrack , "
- <<"cluster phi corrected, cluster phi): ( "
- << trkPhi << ", " << phiRotRescaled<< ", "<<phiRotTrack<< ", "
- <<clusterPhiCorrected<< ", " <<clusterPhi <<")" );
+ const double deltaPhiTrack =
+ P4Helpers::deltaPhi(clusterPhiCorrected, trkPhiCorrTrack);
+
+ // It has to fail all phi metrics in order to be disgarded
+ if ((fabs(deltaPhiRescaled) > 2. * m_broadDeltaPhi) &&
+ (fabs(deltaPhiTrack) > 2. * m_broadDeltaPhi) &&
+ (fabs(deltaPhiStd) > 2. * m_broadDeltaPhi)) {
+
+ ATH_MSG_DEBUG(
+ "FAILS broad window phi match (track phi, phirotCluster , phiRotTrack , "
+ << "cluster phi corrected, cluster phi): ( " << trkPhi << ", "
+ << phiRotRescaled << ", " << phiRotTrack << ", " << clusterPhiCorrected
+ << ", " << clusterPhi << ")");
+
return false;
}
- //if not false returned we end up here
+ // if not false returned we end up here
return true;
}
-bool EMTrackMatchBuilder::TrackMatchSorter::operator()(
+bool
+EMTrackMatchBuilder::TrackMatchSorter::operator()(
const EMTrackMatchBuilder::TrackMatch& match1,
const EMTrackMatchBuilder::TrackMatch& match2)
{
- if(match1.hasPix != match2.hasPix) {// prefer pixels first
+ if (match1.hasPix != match2.hasPix) { // prefer pixels first
return match1.hasPix;
}
- //sqrt(0.025**2)*sqrt(2)/sqrt(12) ~ 0.01
- if(fabs(match1.dR-match2.dR) < m_distance) {
+ // sqrt(0.025**2)*sqrt(2)/sqrt(12) ~ 0.01
+ if (fabs(match1.dR - match2.dR) < m_distance) {
- if(fabs(match1.seconddR-match2.seconddR) > m_distance ){ //Can the second distance separate them?
- return match1.seconddR < match2.seconddR ;
+ if (fabs(match1.seconddR - match2.seconddR) >
+ m_distance) { // Can the second distance separate them?
+ return match1.seconddR < match2.seconddR;
}
- if((match1.hitsScore!= match2.hitsScore)){ //use the one with more pixel
- return match1.hitsScore>match2.hitsScore;
+ if ((match1.hitsScore != match2.hitsScore)) { // use the one with more pixel
+ return match1.hitsScore > match2.hitsScore;
}
}
- //closest DR
+ // closest DR
return match1.dR < match2.dR;
}
diff --git a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.h b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.h
index bca5cb1f6386170ad0fcd2cb625d2e8bbf0a0d40..548e131593750a67ccfdaadf20f2fb3d926b91d1 100644
--- a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.h
+++ b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EGAMMATOOLS_EMTRACKMATCHBUILDER_H
@@ -12,49 +12,55 @@
@author RD schaffer
@author Thomas Koffas
@author Christos Anastopoulos
- The matching of a track to a cluster is driven by the EMTrackMatchBuilder tool located in the Reconstruction/egamma/egammaTools package.
+ The matching of a track to a cluster is driven by the EMTrackMatchBuilder tool
+ located in the Reconstruction/egamma/egammaTools package.
*/
// INCLUDE HEADER FILES:
#include "AthenaBaseComps/AthAlgTool.h"
-#include "egammaInterfaces/IEMTrackMatchBuilder.h"
+#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ToolHandle.h"
#include "egammaInterfaces/IEMExtrapolationTools.h"
+#include "egammaInterfaces/IEMTrackMatchBuilder.h"
#include "egammaRecEvent/egammaRecContainer.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/EventContext.h"
-#include "xAODCaloEvent/CaloClusterFwd.h"
-#include "xAODTracking/TrackParticleContainerFwd.h"
-#include "TrkEventPrimitives/PropDirection.h"
#include "StoreGate/ReadHandleKey.h"
+#include "TrkEventPrimitives/PropDirection.h"
+#include "xAODCaloEvent/CaloClusterFwd.h"
+#include "xAODTracking/TrackParticleContainerFwd.h"
-namespace Reco { class ITrackToVertex; }
+namespace Reco {
+class ITrackToVertex;
+}
-class EMTrackMatchBuilder : public AthAlgTool, virtual public IEMTrackMatchBuilder
+class EMTrackMatchBuilder
+ : public AthAlgTool
+ , virtual public IEMTrackMatchBuilder
{
public:
-
/** @brief Default constructor*/
EMTrackMatchBuilder(const std::string& type,
const std::string& name,
const IInterface* parent);
/** @brief Destructor*/
- ~EMTrackMatchBuilder();
+ virtual ~EMTrackMatchBuilder() = default;
/** @brief Gaudi algorithm hooks*/
- StatusCode initialize() override;
+ StatusCode initialize() override final;
/** @brief execute method*/
- virtual StatusCode executeRec(const EventContext& ctx,
- EgammaRecContainer* egammas) const override final;
+ virtual StatusCode executeRec(
+ const EventContext& ctx,
+ EgammaRecContainer* egammas) const override final;
+
/** @brief execute method*/
- virtual StatusCode trackExecute(const EventContext& ctx,
- egammaRec* eg,
- const xAOD::TrackParticleContainer * trackPC) const override final;
+ virtual StatusCode trackExecute(
+ const EventContext& ctx,
+ egammaRec* eg,
+ const xAOD::TrackParticleContainer* trackPC) const override final;
private:
-
/** @brief A structure for keeping track match information */
struct TrackMatch
{
@@ -65,17 +71,19 @@ private:
double dR;
double seconddR;
double deltaPhiLast;
- std::array<double,4> deltaEta;
- std::array<double,4> deltaPhi;
- std::array<double,4> deltaPhiRescaled;
+ std::array<double, 4> deltaEta;
+ std::array<double, 4> deltaPhi;
+ std::array<double, 4> deltaPhiRescaled;
};
/** @brief function object to sort track matches based on quality */
class TrackMatchSorter
{
public:
- TrackMatchSorter(double distance = 0.0) : m_distance(distance) {};
+ TrackMatchSorter(double distance = 0.0)
+ : m_distance(distance){};
bool operator()(const TrackMatch& match1, const TrackMatch& match2);
+
private:
double m_distance;
};
@@ -83,106 +91,156 @@ private:
/** @brief Compute for tracks passing the loose matching
the distance between track extrapolated to 2nd sampling and cluster */
bool inBroadWindow(const EventContext& ctx,
- std::vector<TrackMatch>& trackMatches,
- const xAOD::CaloCluster& cluster,
- int trackNumber,
- const xAOD::TrackParticle& trkPB,
- const Trk::PropDirection dir) const;
+ std::vector<TrackMatch>& trackMatches,
+ const xAOD::CaloCluster& cluster,
+ int trackNumber,
+ const xAOD::TrackParticle& trkPB,
+ const Trk::PropDirection dir) const;
/** @brief Loose track-cluster matching */
- bool isCandidateMatch(const xAOD::CaloCluster* cluster,
+ bool isCandidateMatch(const xAOD::CaloCluster* cluster,
const xAOD::TrackParticle* track,
- bool flip) const;
-
+ bool flip) const;
// configuration:
/** @brief name of TrackParticle container in TDS*/
- SG::ReadHandleKey<xAOD::TrackParticleContainer> m_TrackParticlesKey { this,
- "TrackParticlesName", "",
- "Name of the input track particle container"};
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_TrackParticlesKey{
+ this,
+ "TrackParticlesName",
+ "",
+ "Name of the input track particle container"
+ };
/** @brief broad cut on deltaEta*/
- Gaudi::Property<double> m_broadDeltaEta {this,
- "broadDeltaEta", 0.1, "Value of broad cut for delta eta"};
+ Gaudi::Property<double> m_broadDeltaEta{ this,
+ "broadDeltaEta",
+ 0.1,
+ "Value of broad cut for delta eta" };
/** @brief broad cut on deltaPhi*/
- Gaudi::Property<double> m_broadDeltaPhi {this,
- "broadDeltaPhi", 0.1, "Value of broad cut for delta phi"};
+ Gaudi::Property<double> m_broadDeltaPhi{ this,
+ "broadDeltaPhi",
+ 0.1,
+ "Value of broad cut for delta phi" };
/** @brief narrow cut on deltaEta*/
- Gaudi::Property<double> m_narrowDeltaEta {this,
- "narrowDeltaEta", 0.05,
- "Value of narrow cut for delta eta"};
+ Gaudi::Property<double> m_narrowDeltaEta{
+ this,
+ "narrowDeltaEta",
+ 0.05,
+ "Value of narrow cut for delta eta"
+ };
/** @brief narrow cut on deltaPhiRescale*/
- Gaudi::Property<double> m_narrowDeltaPhi {this,
- "narrowDeltaPhi", 0.05,
- "Value of the narrowd cut for delta phi"};
+ Gaudi::Property<double> m_narrowDeltaPhi{
+ this,
+ "narrowDeltaPhi",
+ 0.05,
+ "Value of the narrowd cut for delta phi"
+ };
/** @brief narrow cut on deltaPhi for electrons*/
- Gaudi::Property<double> m_narrowDeltaPhiBrem {this,
- "narrowDeltaPhiBrem", 0.1,
- "Value of the narrow cut for delta phi Brem"};
+ Gaudi::Property<double> m_narrowDeltaPhiBrem{
+ this,
+ "narrowDeltaPhiBrem",
+ 0.1,
+ "Value of the narrow cut for delta phi Brem"
+ };
/** @brief narrow cut on deltaPhiRescale*/
- Gaudi::Property<double> m_narrowDeltaPhiRescale {this,
- "narrowDeltaPhiRescale", 0.05,
- "Value of the narrow cut for delta phi Rescale"};
+ Gaudi::Property<double> m_narrowDeltaPhiRescale{
+ this,
+ "narrowDeltaPhiRescale",
+ 0.05,
+ "Value of the narrow cut for delta phi Rescale"
+ };
/** @brief narrow cut on deltaPhiRescale for electrons*/
- Gaudi::Property<double> m_narrowDeltaPhiRescaleBrem {this,
- "narrowDeltaPhiRescaleBrem", 0.1,
- "Value of the narrow cut for delta phi Rescale Brem"};
+ Gaudi::Property<double> m_narrowDeltaPhiRescaleBrem{
+ this,
+ "narrowDeltaPhiRescaleBrem",
+ 0.1,
+ "Value of the narrow cut for delta phi Rescale Brem"
+ };
/** @Maximum deltaPhi (Res) allowed for a match */
- Gaudi::Property<double> m_MaxDeltaPhiRescale {this,
- "MaxDeltaPhiRescale", 0.25,
- "Maximum Value of the deltaPhi rescale"};
+ Gaudi::Property<double> m_MaxDeltaPhiRescale{
+ this,
+ "MaxDeltaPhiRescale",
+ 0.25,
+ "Maximum Value of the deltaPhi rescale"
+ };
/** @brief flag to turn on/off use of isCandidateMatch*/
- Gaudi::Property<bool> m_useCandidateMatch {this,
- "useCandidateMatch", true,
- "Boolean to use candidate matching"};
+ Gaudi::Property<bool> m_useCandidateMatch{
+ this,
+ "useCandidateMatch",
+ true,
+ "Boolean to use candidate matching"
+ };
/** @brief Boolean to apply heuristic when tracks have close deltaR */
- Gaudi::Property<bool> m_useScoring {this,
- "useScoring", true,
- "Boolean to apply heuristic when tracks have close deltaR"};
+ Gaudi::Property<bool> m_useScoring{
+ this,
+ "useScoring",
+ true,
+ "Boolean to apply heuristic when tracks have close deltaR"
+ };
/** @brief Boolean to use Rescale in the metric*/
- Gaudi::Property<bool> m_useRescaleMetric {this,
- "UseRescaleMetric", true, "Use Rescale Metric"};
+ Gaudi::Property<bool> m_useRescaleMetric{ this,
+ "UseRescaleMetric",
+ true,
+ "Use Rescale Metric" };
/** @brief Boolean to do second pass with Rescale*/
- Gaudi::Property<bool> m_SecondPassRescale {this,
- "SecondPassRescale", true, "Do second pass with rescale"};
+ Gaudi::Property<bool> m_SecondPassRescale{ this,
+ "SecondPassRescale",
+ true,
+ "Do second pass with rescale" };
/// The resolutions: might be good to split in barrel/end-cap in the future
- Gaudi::Property<float> m_deltaEtaResolution {this,
- "DeltaEtaResolution", 1.0, "The deltaEta resolution"};
-
- Gaudi::Property<float> m_deltaPhiResolution {this,
- "DeltaPhiResolution", 1.0, "The deltaPhi resolution"};
-
- Gaudi::Property<float> m_deltaPhiRescaleResolution {this,
- "DeltaPhiRescaleResolution", 1.0,
- "The deltaPhiRescale resolution"};
+ Gaudi::Property<float> m_deltaEtaResolution{ this,
+ "DeltaEtaResolution",
+ 1.0,
+ "The deltaEta resolution" };
+
+ Gaudi::Property<float> m_deltaPhiResolution{ this,
+ "DeltaPhiResolution",
+ 1.0,
+ "The deltaPhi resolution" };
+
+ Gaudi::Property<float> m_deltaPhiRescaleResolution{
+ this,
+ "DeltaPhiRescaleResolution",
+ 1.0,
+ "The deltaPhiRescale resolution"
+ };
- /** @brief The distance from which one goes from using better deltaR to using score.
- Note that this distance varies depending on the resolutions entered above.
- If you don't use resolutions (resolution = 1.0) this becomes deltaR distance.
+ /** @brief The distance from which one goes from using better deltaR to using
+ score. Note that this distance varies depending on the resolutions entered
+ above. If you don't use resolutions (resolution = 1.0) this becomes deltaR
+ distance.
*/
- Gaudi::Property<float> m_distanceForScore {this,
- "DistanceForScore", 0.01,
- "The distance from which one goes from using better deltaR to using score."};
-
- ToolHandle<IEMExtrapolationTools> m_extrapolationTool {this,
- "ExtrapolationTool", "EMExtrapolationTools",
- "Name of the extrapolation tool"};
+ Gaudi::Property<float> m_distanceForScore{
+ this,
+ "DistanceForScore",
+ 0.01,
+ "The distance from which one goes from using better deltaR to using score."
+ };
+
+ ToolHandle<IEMExtrapolationTools> m_extrapolationTool{
+ this,
+ "ExtrapolationTool",
+ "EMExtrapolationTools",
+ "Name of the extrapolation tool"
+ };
/** @brief */
- Gaudi::Property<bool> m_isCosmics {this,
- "isCosmics", false, "Boolean for use of cosmics"};
+ Gaudi::Property<bool> m_isCosmics{ this,
+ "isCosmics",
+ false,
+ "Boolean for use of cosmics" };
// Calculated values based on resolutions
double m_deltaEtaWeight;
@@ -190,7 +248,6 @@ private:
double m_deltaPhiRescaleWeight;
TrackMatchSorter m_sorter;
-
};
#endif
diff --git a/Reconstruction/egamma/egammaTools/src/egammaBaseTool.cxx b/Reconstruction/egamma/egammaTools/src/egammaBaseTool.cxx
index addb54a1a8e0a379e91fa9862ece823f3e8bbe28..2660522af4355cf9bfc073f8f47b39a79ae42f68 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaBaseTool.cxx
+++ b/Reconstruction/egamma/egammaTools/src/egammaBaseTool.cxx
@@ -4,23 +4,23 @@
#include "egammaBaseTool.h"
-
egammaBaseTool::egammaBaseTool(const std::string& type,
- const std::string& name,
- const IInterface* parent):
- AthAlgTool(type, name, parent)
-{
+ const std::string& name,
+ const IInterface* parent)
+ : AthAlgTool(type, name, parent)
+{
declareInterface<IegammaBaseTool>(this);
}
-egammaBaseTool::~egammaBaseTool() {
-}
-
-StatusCode egammaBaseTool::initialize() {
+StatusCode
+egammaBaseTool::initialize()
+{
return StatusCode::SUCCESS;
}
-StatusCode egammaBaseTool::finalize(){
+StatusCode
+egammaBaseTool::finalize()
+{
return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/egamma/egammaTools/src/egammaBaseTool.h b/Reconstruction/egamma/egammaTools/src/egammaBaseTool.h
index 7108ec7992698619dd9325553ac25214389fe2b0..450efdb58002e20398ff983cdd6ed06739d77166 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaBaseTool.h
+++ b/Reconstruction/egamma/egammaTools/src/egammaBaseTool.h
@@ -7,13 +7,13 @@
/**
@class egammaBaseTool
- Base Tool for all egamma tool that require
+ Base Tool for all egamma tool that require
an egamma object as its input. Hence the specific versions
will have access to all the framework services in addition
- of being passed an 'egamma' object. The derived
- tools must implement
+ of being passed an 'egamma' object. The derived
+ tools must implement
execute(const EventContext& ctx, xAOD::Egamma* eg).
- Used typically for constucting ToolHandleArrays of
+ Used typically for constucting ToolHandleArrays of
egammaTools
@author F. Derue, A. Kaczmarska
*/
@@ -29,16 +29,16 @@ class egammaBaseTool
public:
/** @brief Default constructor*/
- egammaBaseTool(const std::string& name,
- const std::string& description,
- const IInterface* parent);
- /** @brief destructor*/
- virtual ~egammaBaseTool();
+ egammaBaseTool(const std::string& name,
+ const std::string& description,
+ const IInterface* parent);
+ /** @brief destructor*/
+ virtual ~egammaBaseTool() = default;
- /** @brief initialize method*/
- StatusCode initialize() override;
- /** @brief finalize method*/
- StatusCode finalize() override;
+ /** @brief initialize method*/
+ virtual StatusCode initialize() override;
+ /** @brief finalize method*/
+ virtual StatusCode finalize() override;
};
#endif // EGAMMATOOLS_EGAMMABASETOOL_H
diff --git a/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.cxx b/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.cxx
index 83e3e4c75b0dbce76b6b8be2f0a622f1acb48723..19be23762f1c50ebaf3cc8c770527424d5fcd360 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.cxx
+++ b/Reconstruction/egamma/egammaTools/src/egammaLargeClusterMaker.cxx
@@ -3,131 +3,132 @@
*/
#include "egammaLargeClusterMaker.h"
-#include "egammaUtils/egammaEnergyPositionAllSamples.h"
#include "CaloEvent/CaloCellContainer.h"
#include "CaloEvent/CaloClusterCellLink.h"
+#include "CaloUtils/CaloClusterStoreHelper.h"
+#include "egammaUtils/egammaEnergyPositionAllSamples.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "xAODCaloEvent/CaloClusterAuxContainer.h"
-#include "CaloUtils/CaloClusterStoreHelper.h"
//#include "xAODCaloEvent/CaloClusterKineHelper.h"
+#include "CaloDetDescr/CaloDetDescrManager.h"
+#include "CaloUtils/CaloLayerCalculator.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
-#include "CaloUtils/CaloLayerCalculator.h"
-#include "CaloDetDescr/CaloDetDescrManager.h"
-
-// =============================================================
egammaLargeClusterMaker::egammaLargeClusterMaker(const std::string& type,
- const std::string& name,
- const IInterface* parent)
+ const std::string& name,
+ const IInterface* parent)
: AthAlgTool(type, name, parent)
{
-
+
// declare interface
declareInterface<CaloClusterCollectionProcessor>(this);
-
}
-// =============================================================
-StatusCode egammaLargeClusterMaker::initialize() {
-
+StatusCode
+egammaLargeClusterMaker::initialize()
+{
ATH_MSG_DEBUG("Initializing " << name() << "...");
-
ATH_CHECK(m_inputClusterCollection.initialize());
ATH_CHECK(m_cellsKey.initialize());
-
-
ATH_MSG_DEBUG("Initialization successful");
-
return StatusCode::SUCCESS;
}
-// =========================================================================
-StatusCode egammaLargeClusterMaker::execute(const EventContext& ctx,
- xAOD::CaloClusterContainer* collection) const {
+StatusCode
+egammaLargeClusterMaker::execute(const EventContext& ctx,
+ xAOD::CaloClusterContainer* collection) const
+{
if (!collection) {
ATH_MSG_ERROR("A null collection was passed, which should never happen");
return StatusCode::FAILURE;
}
- SG::ReadHandle<xAOD::CaloClusterContainer> inputClusters(m_inputClusterCollection, ctx);
+ SG::ReadHandle<xAOD::CaloClusterContainer> inputClusters(
+ m_inputClusterCollection, ctx);
// retrieve the cell containers
SG::ReadHandle<CaloCellContainer> cellcoll(m_cellsKey, ctx);
-
- const CaloDetDescrManager* dd_man= nullptr;
- ATH_CHECK( detStore()->retrieve(dd_man,"CaloMgr") );
-
+
+ const CaloDetDescrManager* dd_man = nullptr;
+ ATH_CHECK(detStore()->retrieve(dd_man, "CaloMgr"));
+
// The main loop over clusters
for (auto cluster : *inputClusters) {
- // find the center of the cluster, copying the logic of egammaMiddleShape.cxx
+ // find the center of the cluster, copying the logic of
+ // egammaMiddleShape.cxx
// check if cluster is in barrel or in the end-cap
- if(!cluster->inBarrel() && !cluster->inEndcap() ) {
+ if (!cluster->inBarrel() && !cluster->inEndcap()) {
ATH_MSG_DEBUG(" Cluster is neither in Barrel nor in Endcap; skipping ");
continue;
}
-
+
// check if cluster is in barrel or end-cap
- bool in_barrel = egammaEnergyPositionAllSamples::inBarrel(*cluster,2);
- CaloSampling::CaloSample sam=CaloSampling::EMB2;
+ bool in_barrel = egammaEnergyPositionAllSamples::inBarrel(*cluster, 2);
+ CaloSampling::CaloSample sam = CaloSampling::EMB2;
if (in_barrel) {
- sam=CaloSampling::EMB2;
+ sam = CaloSampling::EMB2;
} else {
- sam=CaloSampling::EME2;
+ sam = CaloSampling::EME2;
}
// granularity in (eta,phi) in the pre sampler
// CaloCellList needs both enums: subCalo and CaloSample
auto eta = cluster->etaSample(sam);
- auto phi= cluster->phiSample(sam);
+ auto phi = cluster->phiSample(sam);
- if ((eta==0. && phi==0.) || fabs(eta)>100) {
- return StatusCode::SUCCESS;
+ if ((eta == 0. && phi == 0.) || fabs(eta) > 100) {
+ return StatusCode::SUCCESS;
}
-
+
// Should get overritten
- bool barrel=false;
- CaloCell_ID::SUBCALO subcalo=CaloCell_ID::LAREM;
- int sampling_or_module=0;
+ bool barrel = false;
+ CaloCell_ID::SUBCALO subcalo = CaloCell_ID::LAREM;
+ int sampling_or_module = 0;
- CaloDetDescrManager::decode_sample(subcalo, barrel, sampling_or_module,
- (CaloCell_ID::CaloSample) sam);
+ CaloDetDescrManager::decode_sample(
+ subcalo, barrel, sampling_or_module, (CaloCell_ID::CaloSample)sam);
// Get the corresponding grannularities : needs to know where you are
// the easiest is to look for the CaloDetDescrElement
const CaloDetDescrElement* dde =
- dd_man->get_element(CaloCell_ID::LAREM, 0,barrel,eta,phi);
+ dd_man->get_element(CaloCell_ID::LAREM, 0, barrel, eta, phi);
// if object does not exist then return
if (!dde) {
- return StatusCode::SUCCESS;
+ return StatusCode::SUCCESS;
}
// local granularity
auto deta = dde->deta();
auto dphi = dde->dphi();
-
+
// search the hottest cell around the (eta,phi)
// (eta,phi) are defined as etaSample() and phiSample
// around this position a hot cell is searched for in a window
// (m_neta*m_deta,m_nphi*m_dphi), by default (m_neta,m_nphi)=(7,7)
CaloLayerCalculator calc;
- StatusCode sc = calc.fill(*dd_man,cellcoll.ptr(),cluster->etaSample(sam),cluster->phiSample(sam),
- m_neta*deta,m_nphi*dphi, (CaloSampling::CaloSample) sam);
- if ( sc.isFailure() ) {
- ATH_MSG_WARNING("CaloLayerCalculator failed fill ");
+ StatusCode sc = calc.fill(*dd_man,
+ cellcoll.ptr(),
+ cluster->etaSample(sam),
+ cluster->phiSample(sam),
+ m_neta * deta,
+ m_nphi * dphi,
+ (CaloSampling::CaloSample)sam);
+ if (sc.isFailure()) {
+ ATH_MSG_WARNING("CaloLayerCalculator failed fill ");
}
double etamax = calc.etarmax();
double phimax = calc.phirmax();
-
+
// create the new cluster
- xAOD::CaloCluster *newCluster =
+ xAOD::CaloCluster* newCluster =
CaloClusterStoreHelper::makeCluster(collection, cellcoll.ptr());
newCluster->setEta0(etamax);
newCluster->setPhi0(phimax);
- newCluster->setClusterSize(xAOD::CaloCluster::SW_7_11);
+ newCluster->setClusterSize(xAOD::CaloCluster::SW_7_11);
}
return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/egamma/egammaTools/src/egammaOQFlagsBuilder.cxx b/Reconstruction/egamma/egammaTools/src/egammaOQFlagsBuilder.cxx
index 449164fb2356e3bf3fd5e4a22cf9f267d9ed4563..9afe98cfe36a0543bc5b81fcaa89615c2bd075fe 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaOQFlagsBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/egammaOQFlagsBuilder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// INCLUDE HEADER FILES:
@@ -34,7 +34,7 @@ isbadtilecell(CaloCellList& ccl,
{
bool isbadtilecell = false;
- ccl.select(cmgr,clusterEta, clusterPhi, sizeEta, sizePhi, sample);
+ ccl.select(cmgr, clusterEta, clusterPhi, sizeEta, sizePhi, sample);
CaloCellList::list_iterator cclIter = ccl.begin();
CaloCellList::list_iterator cclIterEnd = ccl.end();
for (; cclIter != cclIterEnd; cclIter++) {
@@ -58,7 +58,7 @@ egammaOQFlagsBuilder::egammaOQFlagsBuilder(const std::string& type,
m_calocellId = nullptr;
}
-egammaOQFlagsBuilder::~egammaOQFlagsBuilder() {}
+egammaOQFlagsBuilder::~egammaOQFlagsBuilder() = default;
StatusCode
egammaOQFlagsBuilder::initialize()
@@ -70,7 +70,7 @@ egammaOQFlagsBuilder::initialize()
// Get CaloAffectedTool
StatusCode sc = m_affectedTool.retrieve();
if (sc.isFailure()) {
- ATH_MSG_ERROR( "Could not retrieve CaloAffectedTool " << m_affectedTool);
+ ATH_MSG_ERROR("Could not retrieve CaloAffectedTool " << m_affectedTool);
return StatusCode::FAILURE;
}
@@ -111,8 +111,9 @@ egammaOQFlagsBuilder::findCentralCell(const xAOD::CaloCluster* cluster,
for (; cellIter != cellIterEnd; cellIter++) {
const CaloCell* cell = (*cellIter);
- if (!cell)
+ if (!cell){
continue;
+ }
float eta = cell->eta();
float phi = cell->phi();
float energy = cell->energy();
@@ -278,68 +279,80 @@ egammaOQFlagsBuilder::execute(const EventContext& ctx,
}
} else {
if ((cell->provenance() & 0x0A00) == 0x0A00) {
+
if (layer == CaloSampling::PreSamplerB ||
layer == CaloSampling::PreSamplerE) {
iflag |= (0x1 << xAOD::EgammaParameters::MissingFEBCellEdgePS);
- }
- if (layer == CaloSampling::EMB1 || layer == CaloSampling::EME1) {
+ } else if (layer == CaloSampling::EMB1 ||
+ layer == CaloSampling::EME1) {
iflag |= (0x1 << xAOD::EgammaParameters::MissingFEBCellEdgeS1);
if (isStripCoreCell)
iflag |= (0x1 << xAOD::EgammaParameters::BadS1Core);
- }
- if (layer == CaloSampling::EMB2 || layer == CaloSampling::EME2)
+ } else if (layer == CaloSampling::EMB2 ||
+ layer == CaloSampling::EME2) {
iflag |= (0x1 << xAOD::EgammaParameters::MissingFEBCellEdgeS2);
- if (layer == CaloSampling::EMB3 || layer == CaloSampling::EME3)
+ } else if (layer == CaloSampling::EMB3 ||
+ layer == CaloSampling::EME3) {
iflag |= (0x1 << xAOD::EgammaParameters::MissingFEBCellEdgeS3);
+ }
}
if ((cell->provenance() & 0x0A00) == 0x0800) {
+
if (layer == CaloSampling::PreSamplerB ||
layer == CaloSampling::PreSamplerE) {
iflag |= (0x1 << xAOD::EgammaParameters::MaskedCellEdgePS);
- }
- if (layer == CaloSampling::EMB1 || layer == CaloSampling::EME1) {
+ } else if (layer == CaloSampling::EMB1 ||
+ layer == CaloSampling::EME1) {
iflag |= (0x1 << xAOD::EgammaParameters::MaskedCellEdgeS1);
- if (isStripCoreCell)
+ if (isStripCoreCell) {
iflag |= (0x1 << xAOD::EgammaParameters::BadS1Core);
- }
- if (layer == CaloSampling::EMB2 || layer == CaloSampling::EME2)
+ }
+ } else if (layer == CaloSampling::EMB2 ||
+ layer == CaloSampling::EME2) {
iflag |= (0x1 << xAOD::EgammaParameters::MaskedCellEdgeS2);
- if (layer == CaloSampling::EMB3 || layer == CaloSampling::EME3)
+ } else if (layer == CaloSampling::EMB3 ||
+ layer == CaloSampling::EME3) {
iflag |= (0x1 << xAOD::EgammaParameters::MaskedCellEdgeS3);
+ }
}
if (bc.sporadicBurstNoise() && qual < m_QCellSporCut) {
iflag |= (0x1 << xAOD::EgammaParameters::SporadicNoiseLowQEdge);
}
+
if (bc.deadCalib() || bc.lowNoiseHG() || bc.lowNoiseMG() ||
bc.lowNoiseLG() || bc.distorted() || bc.unstable() ||
bc.unstableNoiseHG() || bc.unstableNoiseMG() ||
bc.unstableNoiseLG() || bc.peculiarCalibrationLine() ||
bc.almostDead() || bc.shortProblem()) {
+
if (layer == CaloSampling::PreSamplerB ||
layer == CaloSampling::PreSamplerE) {
iflag |= (0x1 << xAOD::EgammaParameters::AffectedCellEdgePS);
- }
- if (layer == CaloSampling::EMB1 || layer == CaloSampling::EME1)
+ } else if (layer == CaloSampling::EMB1 ||
+ layer == CaloSampling::EME1) {
iflag |= (0x1 << xAOD::EgammaParameters::AffectedCellEdgeS1);
- if (layer == CaloSampling::EMB2 || layer == CaloSampling::EME2)
+ } else if (layer == CaloSampling::EMB2 ||
+ layer == CaloSampling::EME2) {
iflag |= (0x1 << xAOD::EgammaParameters::AffectedCellEdgeS2);
- if (layer == CaloSampling::EMB3 || layer == CaloSampling::EME3)
+ } else if (layer == CaloSampling::EMB3 ||
+ layer == CaloSampling::EME3) {
iflag |= (0x1 << xAOD::EgammaParameters::AffectedCellEdgeS3);
+ }
}
if (qual >= 4000) {
iflag |= (0x1 << xAOD::EgammaParameters::HighQEdge);
}
}
} // end loop over LAr cells
-
- //Set LArQCleaning bit
+
+ // Set LArQCleaning bit
double egammaLArQCleaning = 0;
if (totE != 0)
egammaLArQCleaning = badE / totE;
if (egammaLArQCleaning > m_LArQCut) {
iflag |= (0x1 << xAOD::EgammaParameters::LArQCleaning);
}
- //Set HighRcell bit//
+ // Set HighRcell bit//
double ratioCell = 0;
if (totE != 0)
ratioCell = energyCellMax / totE;
@@ -348,7 +361,7 @@ egammaOQFlagsBuilder::execute(const EventContext& ctx,
}
} // close if found central cell
- //Check the HV components
+ // Check the HV components
float deta = 0;
float dphi = 0;
@@ -377,7 +390,7 @@ egammaOQFlagsBuilder::execute(const EventContext& ctx,
CaloSampling::PreSamplerB,
CaloSampling::PreSamplerB,
1));
- if (isNonNominalHVPS){
+ if (isNonNominalHVPS) {
iflag |= (0x1 << xAOD::EgammaParameters::NonNominalHVPS);
}
@@ -395,7 +408,7 @@ egammaOQFlagsBuilder::execute(const EventContext& ctx,
CaloSampling::PreSamplerB,
CaloSampling::PreSamplerB,
2));
- if (isDeadHVPS){
+ if (isDeadHVPS) {
iflag |= (0x1 << xAOD::EgammaParameters::DeadHVPS);
}
diff --git a/Reconstruction/egamma/egammaTools/src/egammaOQFlagsBuilder.h b/Reconstruction/egamma/egammaTools/src/egammaOQFlagsBuilder.h
index 201c9b8b59382b127aca750b4aedbfc3b5811db1..e07e4accf59546b2a87b2d168a1e6d07d04c9fef 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaOQFlagsBuilder.h
+++ b/Reconstruction/egamma/egammaTools/src/egammaOQFlagsBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EGAMMATOOLS_EGAMMAOQFLAGSBUILDER_H
@@ -20,23 +20,22 @@ the EM calorimeter) and the edge (all the other cells) of the cluster.
@author Quentin Buat quentin.buat@lpsc.in2p3.fr
*/
-// INCLUDE HEADER FILES:
#include "egammaInterfaces/IegammaOQFlagsBuilder.h"
+#include "CaloInterface/ICaloAffectedTool.h"
#include "egammaBaseTool.h"
-#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/EventContext.h"
+#include "CaloIdentifier/CaloCell_ID.h"
#include "CaloIdentifier/LArEM_ID.h"
+#include "CaloUtils/CaloCellList.h"
+#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ToolHandle.h"
#include "Identifier/HWIdentifier.h"
-#include "CaloIdentifier/CaloCell_ID.h"
+#include "LArCabling/LArOnOffIdMapping.h"
+#include "LArRecConditions/LArBadChannelCont.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "StoreGate/ReadHandleKey.h"
#include "CaloConditions/CaloAffectedRegionInfoVec.h"
-#include "CaloInterface/ICaloAffectedTool.h"
-#include "CaloUtils/CaloCellList.h"
-#include "xAODEgamma/EgammaFwd.h"
#include "xAODCaloEvent/CaloClusterFwd.h"
-#include "StoreGate/ReadHandleKey.h"
-#include "StoreGate/ReadCondHandleKey.h"
-#include "LArRecConditions/LArBadChannelCont.h"
-#include "LArCabling/LArOnOffIdMapping.h"
+#include "xAODEgamma/EgammaFwd.h"
class IToolSvc;
class CaloCellContainer;
@@ -48,72 +47,71 @@ class egammaOQFlagsBuilder
: public AthAlgTool
, virtual public IegammaOQFlagsBuilder
{
- public:
-
+public:
/** @brief Default constructor*/
- egammaOQFlagsBuilder(const std::string& type,
- const std::string& name,
- const IInterface* parent);
-
- /** @brief Destructor*/
- ~egammaOQFlagsBuilder();
- /** @brief initialize method*/
- StatusCode initialize();
- /** @brief standard execute method */
- virtual StatusCode execute(const EventContext& ctx,
- const CaloDetDescrManager& cmgr,
- xAOD::Egamma& egamma) const;
- /** @brief finalize method*/
- StatusCode finalize();
-
- private:
- /** Handle to bad-channel CDO */
- SG::ReadCondHandleKey<LArBadChannelCont> m_bcContKey{
- this,
- "LArBadChannelKey",
- "LArBadChannel",
- "Key of the LArBadChannelCont CDO"
- };
-
- SG::ReadCondHandleKey<CaloAffectedRegionInfoVec> m_affKey{
- this,
- "LArAffectedRegionKey",
- "LArAffectedRegionInfo",
- "SG key for affected regions cond object"
- };
-
- ToolHandle<ICaloAffectedTool> m_affectedTool{ this,
- "affectedTool",
- "CaloAffectedTool",
- "CaloAffectedTool" };
-
- const LArEM_ID* m_emHelper;
- const CaloCell_ID* m_calocellId;
-
- SG::ReadHandleKey<CaloCellContainer> m_cellsKey{
- this,
- "CellsName",
- "AllCalo",
- "Names of container which contain cells"
- };
-
- // IToolSvc* m_toolSvc;
- bool isCore(const Identifier Id,
- const std::vector<IdentifierHash>& neighbourList) const;
-
- std::vector<IdentifierHash> findNeighbours(
- const Identifier cellCentrId) const;
-
- bool findCentralCell(const xAOD::CaloCluster* cluster,
- Identifier& cellCentrId) const;
-
- Gaudi::Property<double> m_QCellCut{ this, "QCellCut", 4000. };
- Gaudi::Property<double> m_QCellHECCut{ this, "QCellHECCut", 60000. };
- Gaudi::Property<double> m_QCellSporCut{ this, "QCellSporCut", 4000. };
- Gaudi::Property<double> m_LArQCut{ this, "LArQCut", 0.8 };
- Gaudi::Property<double> m_TCut{ this, "TCut", 10.0 };
- Gaudi::Property<double> m_TCutVsE{ this, "TCutVsE", 2.0 };
- Gaudi::Property<double> m_RcellCut{ this, "RcellCut", 0.8 };
+ egammaOQFlagsBuilder(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
+
+ /** @brief Destructor*/
+ ~egammaOQFlagsBuilder();
+ /** @brief initialize method*/
+ StatusCode initialize();
+ /** @brief standard execute method */
+ virtual StatusCode execute(const EventContext& ctx,
+ const CaloDetDescrManager& cmgr,
+ xAOD::Egamma& egamma) const;
+ /** @brief finalize method*/
+ StatusCode finalize();
+
+private:
+ /** Handle to bad-channel CDO */
+ SG::ReadCondHandleKey<LArBadChannelCont> m_bcContKey{
+ this,
+ "LArBadChannelKey",
+ "LArBadChannel",
+ "Key of the LArBadChannelCont CDO"
+ };
+
+ SG::ReadCondHandleKey<CaloAffectedRegionInfoVec> m_affKey{
+ this,
+ "LArAffectedRegionKey",
+ "LArAffectedRegionInfo",
+ "SG key for affected regions cond object"
+ };
+
+ ToolHandle<ICaloAffectedTool> m_affectedTool{ this,
+ "affectedTool",
+ "CaloAffectedTool",
+ "CaloAffectedTool" };
+
+ const LArEM_ID* m_emHelper;
+ const CaloCell_ID* m_calocellId;
+
+ SG::ReadHandleKey<CaloCellContainer> m_cellsKey{
+ this,
+ "CellsName",
+ "AllCalo",
+ "Names of container which contain cells"
+ };
+
+ // IToolSvc* m_toolSvc;
+ bool isCore(const Identifier Id,
+ const std::vector<IdentifierHash>& neighbourList) const;
+
+ std::vector<IdentifierHash> findNeighbours(
+ const Identifier cellCentrId) const;
+
+ bool findCentralCell(const xAOD::CaloCluster* cluster,
+ Identifier& cellCentrId) const;
+
+ Gaudi::Property<double> m_QCellCut{ this, "QCellCut", 4000. };
+ Gaudi::Property<double> m_QCellHECCut{ this, "QCellHECCut", 60000. };
+ Gaudi::Property<double> m_QCellSporCut{ this, "QCellSporCut", 4000. };
+ Gaudi::Property<double> m_LArQCut{ this, "LArQCut", 0.8 };
+ Gaudi::Property<double> m_TCut{ this, "TCut", 10.0 };
+ Gaudi::Property<double> m_TCutVsE{ this, "TCutVsE", 2.0 };
+ Gaudi::Property<double> m_RcellCut{ this, "RcellCut", 0.8 };
};
#endif
diff --git a/Reconstruction/egamma/egammaTools/src/egammaSwTool.cxx b/Reconstruction/egamma/egammaTools/src/egammaSwTool.cxx
index 229edeee86e90e0378554b56d985895ab115a91c..c73af23e49179a7c159f0d94601514daf4f546a6 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaSwTool.cxx
+++ b/Reconstruction/egamma/egammaTools/src/egammaSwTool.cxx
@@ -2,17 +2,15 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
#include "egammaSwTool.h"
-
-#include "xAODCaloEvent/CaloCluster.h"
-#include "CaloUtils/CaloLayerCalculator.h"
#include "CaloUtils/CaloClusterStoreHelper.h"
+#include "CaloUtils/CaloLayerCalculator.h"
+#include "xAODCaloEvent/CaloCluster.h"
#include "GaudiKernel/ListItem.h"
-#include <algorithm>
+#include <algorithm>
#include <cmath>
// END OF HEADER FILES INCLUDE
@@ -22,28 +20,19 @@
// CONSTRUCTOR:
egammaSwTool::egammaSwTool(const std::string& type,
- const std::string& name,
- const IInterface* parent)
+ const std::string& name,
+ const IInterface* parent)
: AthAlgTool(type, name, parent)
{
// declare interface
declareInterface<IegammaSwTool>(this);
-
-}
-
-// ===============================================================
-// DESTRUCTOR:
-egammaSwTool::~egammaSwTool()
-{
}
-// ===============================================================
-// INITIALIZE METHOD:
-StatusCode egammaSwTool::initialize()
+StatusCode
+egammaSwTool::initialize()
{
ATH_MSG_DEBUG(" Initializing egammaSwTool");
-
ATH_CHECK(m_clusterCorrectionPointersEle35.retrieve());
ATH_CHECK(m_clusterCorrectionPointersEle37.retrieve());
@@ -56,7 +45,7 @@ StatusCode egammaSwTool::initialize()
ATH_CHECK(m_clusterCorrectionPointersEconv35.retrieve());
ATH_CHECK(m_clusterCorrectionPointersEconv37.retrieve());
ATH_CHECK(m_clusterCorrectionPointersEconv55.retrieve());
- //SuperCluster
+ // SuperCluster
ATH_CHECK(m_clusterCorrectionPointersSuperClusterEle35.retrieve());
ATH_CHECK(m_clusterCorrectionPointersSuperClusterEle37.retrieve());
ATH_CHECK(m_clusterCorrectionPointersSuperClusterEle55.retrieve());
@@ -71,121 +60,140 @@ StatusCode egammaSwTool::initialize()
return StatusCode::SUCCESS;
}
-// ==================================================================
-// FINALIZE METHOD:
-StatusCode egammaSwTool::finalize(){
- return StatusCode::SUCCESS;
-}
-
-// ==============================================================
-// ATHENA EXECUTE METHOD:
-StatusCode egammaSwTool::execute(const EventContext& ctx, xAOD::CaloCluster *cluster) const {
+StatusCode
+egammaSwTool::execute(const EventContext& ctx, xAOD::CaloCluster* cluster) const
+{
ATH_MSG_DEBUG("Executing egammaSwTool");
-
+
// protection against bad clusters
- if (cluster==nullptr) return StatusCode::SUCCESS;
+ if (cluster == nullptr)
+ return StatusCode::SUCCESS;
xAOD::CaloCluster::ClusterSize requestedSize = cluster->clusterSize();
switch (requestedSize) {
- case xAOD::CaloCluster::SW_55ele:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersEle55,cluster));
- break;
- case xAOD::CaloCluster::SW_35ele:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersEle35,cluster));
- break;
- case xAOD::CaloCluster::SW_37ele:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersEle37,cluster));
- break;
- case xAOD::CaloCluster::SW_35gam:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersGam35,cluster));
- break;
- case xAOD::CaloCluster::SW_55gam:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersGam55,cluster));
- break;
- case xAOD::CaloCluster::SW_37gam:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersGam37,cluster));
- break;
- case xAOD::CaloCluster::SW_55Econv:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersEconv55,cluster));
- break;
- case xAOD::CaloCluster::SW_35Econv:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersEconv35,cluster));
- break;
- case xAOD::CaloCluster::SW_37Econv:
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersEconv37,cluster));
- break;
- default:
- ATH_MSG_DEBUG("Inexisting cluster type and calibration requested: " << requestedSize);
- return StatusCode::FAILURE;
- break;
+ case xAOD::CaloCluster::SW_55ele:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersEle55, cluster));
+ break;
+ case xAOD::CaloCluster::SW_35ele:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersEle35, cluster));
+ break;
+ case xAOD::CaloCluster::SW_37ele:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersEle37, cluster));
+ break;
+ case xAOD::CaloCluster::SW_35gam:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersGam35, cluster));
+ break;
+ case xAOD::CaloCluster::SW_55gam:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersGam55, cluster));
+ break;
+ case xAOD::CaloCluster::SW_37gam:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersGam37, cluster));
+ break;
+ case xAOD::CaloCluster::SW_55Econv:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersEconv55, cluster));
+ break;
+ case xAOD::CaloCluster::SW_35Econv:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersEconv35, cluster));
+ break;
+ case xAOD::CaloCluster::SW_37Econv:
+ ATH_CHECK(processTools(ctx, m_clusterCorrectionPointersEconv37, cluster));
+ break;
+ default:
+ ATH_MSG_DEBUG(
+ "Inexisting cluster type and calibration requested: " << requestedSize);
+ return StatusCode::FAILURE;
+ break;
}
return StatusCode::SUCCESS;
}
// ==============================================================
// ATHENA EXECUTE METHOD for superClusters
-StatusCode egammaSwTool::execute(const EventContext& ctx, xAOD::CaloCluster* cluster, xAOD::EgammaParameters::EgammaType egType , bool isBarrel) const {
+StatusCode
+egammaSwTool::execute(const EventContext& ctx,
+ xAOD::CaloCluster* cluster,
+ xAOD::EgammaParameters::EgammaType egType,
+ bool isBarrel) const
+{
ATH_MSG_DEBUG("Executing egammaSwTool");
-
- // protection against bad clusters
- if (cluster==nullptr) return StatusCode::SUCCESS;
- if(isBarrel){
+ // protection against bad clusters
+ if (cluster == nullptr) {
+ return StatusCode::SUCCESS;
+ }
+ if (isBarrel) {
switch (egType) {
- case xAOD::EgammaParameters::electron:
- ATH_MSG_DEBUG("correction for barrel electron");
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersSuperClusterEle37,cluster));
- break;
- case xAOD::EgammaParameters::unconvertedPhoton:
- ATH_MSG_DEBUG("correction for barrel unconverted");
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersSuperClusterGam37,cluster));
- break;
- case xAOD::EgammaParameters::convertedPhoton:
- ATH_MSG_DEBUG("correction for barrel converted");
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersSuperClusterEconv37,cluster));
- break;
- default:
- ATH_MSG_DEBUG("Inexisting correction requested for egType: " <<egType << " isBarrel: " << isBarrel);
- return StatusCode::FAILURE;
- break;
+ case xAOD::EgammaParameters::electron: {
+ ATH_MSG_DEBUG("correction for barrel electron");
+ ATH_CHECK(processTools(
+ ctx, m_clusterCorrectionPointersSuperClusterEle37, cluster));
+ break;
+ }
+ case xAOD::EgammaParameters::unconvertedPhoton: {
+ ATH_MSG_DEBUG("correction for barrel unconverted");
+ ATH_CHECK(processTools(
+ ctx, m_clusterCorrectionPointersSuperClusterGam37, cluster));
+ break;
+ }
+ case xAOD::EgammaParameters::convertedPhoton: {
+ ATH_MSG_DEBUG("correction for barrel converted");
+ ATH_CHECK(processTools(
+ ctx, m_clusterCorrectionPointersSuperClusterEconv37, cluster));
+ break;
+ }
+ default: {
+ ATH_MSG_DEBUG("Inexisting correction requested for egType: "
+ << egType << " isBarrel: " << isBarrel);
+ return StatusCode::FAILURE;
+ break;
+ }
}
- } else{
+ } else {
switch (egType) {
- case xAOD::EgammaParameters::electron:
- ATH_MSG_DEBUG("correction for endcap electron");
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersSuperClusterEle55,cluster));
- break;
- case xAOD::EgammaParameters::unconvertedPhoton:
- ATH_MSG_DEBUG("correction for endcap unconverted");
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersSuperClusterGam55,cluster));
- break;
- case xAOD::EgammaParameters::convertedPhoton:
- ATH_MSG_DEBUG("correction for endcap converted");
- ATH_CHECK(processTools(ctx,m_clusterCorrectionPointersSuperClusterEconv55,cluster));
- break;
- default:
- ATH_MSG_DEBUG("Inexisting correction requested for egType: " <<egType << " isBarrel: " << isBarrel);
- return StatusCode::FAILURE;
- break;
+ case xAOD::EgammaParameters::electron: {
+ ATH_MSG_DEBUG("correction for endcap electron");
+ ATH_CHECK(processTools(
+ ctx, m_clusterCorrectionPointersSuperClusterEle55, cluster));
+ break;
+ }
+ case xAOD::EgammaParameters::unconvertedPhoton: {
+ ATH_MSG_DEBUG("correction for endcap unconverted");
+ ATH_CHECK(processTools(
+ ctx, m_clusterCorrectionPointersSuperClusterGam55, cluster));
+ break;
+ }
+ case xAOD::EgammaParameters::convertedPhoton: {
+ ATH_MSG_DEBUG("correction for endcap converted");
+ ATH_CHECK(processTools(
+ ctx, m_clusterCorrectionPointersSuperClusterEconv55, cluster));
+ break;
+ }
+ default: {
+ ATH_MSG_DEBUG("Inexisting correction requested for egType: "
+ << egType << " isBarrel: " << isBarrel);
+ return StatusCode::FAILURE;
+ break;
+ }
}
}
return StatusCode::SUCCESS;
}
-StatusCode egammaSwTool::processTools(const EventContext& ctx, const ToolHandleArray<CaloClusterProcessor>& tools,
- xAOD::CaloCluster* cluster) const
+StatusCode
+egammaSwTool::processTools(const EventContext& ctx,
+ const ToolHandleArray<CaloClusterProcessor>& tools,
+ xAOD::CaloCluster* cluster) const
{
-
auto firstTool = tools.begin();
- auto lastTool = tools.end();
+ auto lastTool = tools.end();
// loop tools
- for ( ; firstTool != lastTool; ++firstTool ) {
- StatusCode processCheck = (*firstTool)->execute(ctx, cluster);
- ATH_MSG_DEBUG("Tool " << (*firstTool)->name() << " executing ");
- if ( processCheck.isFailure() ) {
- ATH_MSG_ERROR("Cluster corrections failed!");
- }
+ for (; firstTool != lastTool; ++firstTool) {
+ StatusCode processCheck = (*firstTool)->execute(ctx, cluster);
+ ATH_MSG_DEBUG("Tool " << (*firstTool)->name() << " executing ");
+ if (processCheck.isFailure()) {
+ ATH_MSG_ERROR("Cluster corrections failed!");
+ }
}
return StatusCode::SUCCESS;
}
diff --git a/Reconstruction/egamma/egammaTools/src/egammaSwTool.h b/Reconstruction/egamma/egammaTools/src/egammaSwTool.h
index d05840a61b27d155815f3751d0d8f35e3220780d..0211a11a25a8edc3f25a889431cdf70716817523 100644
--- a/Reconstruction/egamma/egammaTools/src/egammaSwTool.h
+++ b/Reconstruction/egamma/egammaTools/src/egammaSwTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EGAMMATOOLS_EGAMMASWTOOL_H
@@ -8,89 +8,156 @@
@class egammaSwTool
Tool which applies positions and energy corrections to a CaloCluster
@author D. Zerwas
-@author B. Lenzi
-@author C. Anastopoulos
+@author B. Lenzi
+@author C. Anastopoulos
*/
// INCLUDE HEADER FILES:
-
+
#include "AthenaBaseComps/AthAlgTool.h"
-#include "egammaInterfaces/IegammaSwTool.h"
-#include "xAODCaloEvent/CaloClusterFwd.h"
#include "CaloRec/CaloClusterProcessor.h"
#include "GaudiKernel/EventContext.h"
+#include "egammaInterfaces/IegammaSwTool.h"
+#include "xAODCaloEvent/CaloClusterFwd.h"
-class egammaSwTool : public AthAlgTool, virtual public IegammaSwTool
+class egammaSwTool
+ : public AthAlgTool
+ , virtual public IegammaSwTool
{
- public:
-
+public:
/** @brief Default constructor*/
egammaSwTool(const std::string& type,
- const std::string& name,
- const IInterface* parent);
+ const std::string& name,
+ const IInterface* parent);
/** @brief Destructor*/
- ~egammaSwTool();
-
+ virtual ~egammaSwTool() = default;
+
/** @brief initialize method*/
- StatusCode initialize();
- /** @brief finalize method*/
- StatusCode finalize();
+ virtual StatusCode initialize() override;
/** @brief execute method*/
- StatusCode execute(const EventContext& ctx, xAOD::CaloCluster* cluster) const;
- StatusCode execute(const EventContext& ctx, xAOD::CaloCluster* cluster, xAOD::EgammaParameters::EgammaType egType , bool isBarrel) const ;
-
- private:
-
- StatusCode processTools(const EventContext& ctx, const ToolHandleArray<CaloClusterProcessor>& tools, xAOD::CaloCluster* cluster) const;
+ virtual StatusCode execute(const EventContext& ctx,
+ xAOD::CaloCluster* cluster) const override final;
+ virtual StatusCode execute(const EventContext& ctx,
+ xAOD::CaloCluster* cluster,
+ xAOD::EgammaParameters::EgammaType egType,
+ bool isBarrel) const override final;
+
+private:
+ StatusCode processTools(const EventContext& ctx,
+ const ToolHandleArray<CaloClusterProcessor>& tools,
+ xAOD::CaloCluster* cluster) const;
/**
* @brief a list of names for tools to correct clusters
- *
+ *
* the tools in this list are executed after all maker tools are done
* and run one after each other on each cluster in the container. */
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEle55{this, "ClusterCorrectionToolsEle55", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEle35{this, "ClusterCorrectionToolsEle35", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEle37{this, "ClusterCorrectionToolsEle37", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersGam35{this, "ClusterCorrectionToolsGam35", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersGam55{this, "ClusterCorrectionToolsGam55", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersGam37{this, "ClusterCorrectionToolsGam37", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEconv55{this, "ClusterCorrectionToolsEconv55", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEconv35{this, "ClusterCorrectionToolsEconv35", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEconv37{this, "ClusterCorrectionToolsEconv37", {}};
- //SuperCluster
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterEle35{this,
- "ClusterCorrectionToolsSuperClusterEle35", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterEconv35{this,
- "ClusterCorrectionToolsSuperClusterEconv35", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterGam35{this,
- "ClusterCorrectionToolsSuperClusterGam35", {}};
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEle55{
+ this,
+ "ClusterCorrectionToolsEle55",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEle35{
+ this,
+ "ClusterCorrectionToolsEle35",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEle37{
+ this,
+ "ClusterCorrectionToolsEle37",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersGam35{
+ this,
+ "ClusterCorrectionToolsGam35",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersGam55{
+ this,
+ "ClusterCorrectionToolsGam55",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersGam37{
+ this,
+ "ClusterCorrectionToolsGam37",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEconv55{
+ this,
+ "ClusterCorrectionToolsEconv55",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEconv35{
+ this,
+ "ClusterCorrectionToolsEconv35",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersEconv37{
+ this,
+ "ClusterCorrectionToolsEconv37",
+ {}
+ };
+ // SuperCluster
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterEle35{
+ this,
+ "ClusterCorrectionToolsSuperClusterEle35",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterEconv35{
+ this,
+ "ClusterCorrectionToolsSuperClusterEconv35",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterGam35{
+ this,
+ "ClusterCorrectionToolsSuperClusterGam35",
+ {}
+ };
//
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterEle55{this,
- "ClusterCorrectionToolsSuperClusterEle55", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterGam55{this,
- "ClusterCorrectionToolsSuperClusterGam55", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterEconv55{this,
- "ClusterCorrectionToolsSuperClusterEconv55", {}};
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterEle55{
+ this,
+ "ClusterCorrectionToolsSuperClusterEle55",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterGam55{
+ this,
+ "ClusterCorrectionToolsSuperClusterGam55",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterEconv55{
+ this,
+ "ClusterCorrectionToolsSuperClusterEconv55",
+ {}
+ };
//
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterEle37{this,
- "ClusterCorrectionToolsSuperClusterEle37", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterGam37{this,
- "ClusterCorrectionToolsSuperClusterGam37", {}};
- ToolHandleArray<CaloClusterProcessor> m_clusterCorrectionPointersSuperClusterEconv37{this,
- "ClusterCorrectionToolsSuperClusterEconv37", {}};
-
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterEle37{
+ this,
+ "ClusterCorrectionToolsSuperClusterEle37",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterGam37{
+ this,
+ "ClusterCorrectionToolsSuperClusterGam37",
+ {}
+ };
+ ToolHandleArray<CaloClusterProcessor>
+ m_clusterCorrectionPointersSuperClusterEconv37{
+ this,
+ "ClusterCorrectionToolsSuperClusterEconv37",
+ {}
+ };
};
#endif
-
-
-
-
-
-
-
-
diff --git a/Reconstruction/egamma/egammaTrackTools/CMakeLists.txt b/Reconstruction/egamma/egammaTrackTools/CMakeLists.txt
index 8130a491acee40bcc71a7408ded3cf5264812a21..2b2b5168e47d3aee505c4cd65f14b570dc67097f 100644
--- a/Reconstruction/egamma/egammaTrackTools/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaTrackTools/CMakeLists.txt
@@ -5,56 +5,16 @@
# Declare the package name:
atlas_subdir( egammaTrackTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloIdentifier
- Calorimeter/CaloTrackingGeometry
- Calorimeter/CaloUtils
- Calorimeter/CaloGeoHelpers
- Control/AthenaBaseComps
- Control/AthContainers
- DetectorDescription/AtlasDetDescr
- DetectorDescription/IdDictDetDescr
- Event/EventPrimitives
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODTracking
- Event/FourMomUtils
- GaudiKernel
- InnerDetector/InDetConditions/BeamSpotConditionsData
- InnerDetector/InDetDetDescr/InDetIdentifier
- Reconstruction/RecoTools/RecoToolInterfaces
- Reconstruction/egamma/egammaInterfaces
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkCaloCluster_OnTrack
- Tracking/TrkEvent/TrkCaloExtension
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkMeasurementBase
- Tracking/TrkEvent/TrkNeutralParameters
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkParametersIdentificationHelpers
- Tracking/TrkEvent/TrkParticleBase
- Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkVertexOnTrack
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkFitter/TrkFitterInterfaces
- Tracking/TrkVertexFitter/TrkVertexFitterInterfaces )
-
# Component(s) in the package:
atlas_add_component( egammaTrackTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS
- LINK_LIBRARIES CaloDetDescrLib CaloEvent CaloIdentifier CaloUtilsLib CaloGeoHelpers AthenaBaseComps AthContainers
- AtlasDetDescr IdDictDetDescr EventPrimitives xAODCaloEvent xAODEgamma xAODTracking FourMomUtils GaudiKernel BeamSpotConditionsData InDetIdentifier
- RecoToolInterfaces TrkSurfaces TrkCaloCluster_OnTrack TrkCaloExtension TrkEventPrimitives TrkMaterialOnTrack TrkMeasurementBase
- TrkNeutralParameters TrkParameters TrkParametersIdentificationHelpers TrkParticleBase TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack
+ INCLUDE_DIRS
+ LINK_LIBRARIES CaloDetDescrLib CaloEvent CaloIdentifier CaloUtilsLib CaloGeoHelpers AthenaBaseComps AthContainers
+ AtlasDetDescr IdDictDetDescr EventPrimitives xAODCaloEvent xAODEgamma xAODTracking FourMomUtils GaudiKernel BeamSpotConditionsData InDetIdentifier
+ RecoToolInterfaces TrkSurfaces TrkCaloCluster_OnTrack TrkCaloExtension TrkEventPrimitives TrkMaterialOnTrack TrkMeasurementBase
+ TrkNeutralParameters TrkParameters TrkParametersIdentificationHelpers TrkParticleBase TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack
TrkVertexOnTrack TrkExInterfaces TrkFitterInterfaces TrkVertexFitterInterfaces egammaInterfacesLib CaloTrackingGeometryLib )
# Install files from the package:
diff --git a/Reconstruction/egamma/egammaTrackTools/src/egammaTrkRefitterTool.cxx b/Reconstruction/egamma/egammaTrackTools/src/egammaTrkRefitterTool.cxx
index 1abba788f4264f1329f6e1b866ac54b2b6004e4d..d0b00200a8fa811ac092b68e06d1183861b632c6 100644
--- a/Reconstruction/egamma/egammaTrackTools/src/egammaTrkRefitterTool.cxx
+++ b/Reconstruction/egamma/egammaTrackTools/src/egammaTrkRefitterTool.cxx
@@ -31,7 +31,7 @@
// INCLUDE GAUDI HEADER FILES:
#include "GaudiKernel/ObjectVector.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
egammaTrkRefitterTool::egammaTrkRefitterTool(const std::string& type,
diff --git a/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx b/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
index 08b349310712a0e093a821f816bf52ee3ec22421..62c370e1e0d37fab3feca5f6c78ed32ffba580a8 100644
--- a/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
@@ -7,7 +7,7 @@
#include "EfficiencyPlot.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
index 2c46cc99f3bb23232c87a2acac758d8b5ee7481b..c2d4c52b235072c55d4883c3091505f5acb7d282 100644
--- a/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
+++ b/Reconstruction/egamma/egammaValidation/src/EgammaMonitoring.h
@@ -25,7 +25,7 @@
#include "xAODTruth/xAODTruthHelpers.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ITHistSvc.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx b/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
index fc4b83e2018fff1d4e02a4f4ae2b7db8c8ec608e..a4a584733bf6e0064b68c34a8c97cca8766ef7eb 100644
--- a/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/ParticleHistograms.cxx
@@ -6,7 +6,7 @@
#include <typeinfo>
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx b/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
index 6360ce859dda99a5fc4539c1848a295cf4c9dcda..f8b214c78e72091213ed65577c321aab9a0071da 100644
--- a/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/WidthPlot.cxx
@@ -5,7 +5,7 @@
#include "WidthPlot.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaBaseComps/AthAlgorithm.h"
diff --git a/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx b/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
index e6763cc28db5e6534835a1e4f904af9abd2dc055..3e0466a674d29e6cbc60b54b3ad58945d57891ed 100644
--- a/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
+++ b/Reconstruction/tauRecTools/Root/TauRecToolBase.cxx
@@ -27,11 +27,11 @@ std::string TauRecToolBase::find_file(const std::string& fname) const {
StatusCode TauRecToolBase::readConfig() {
// Sanity check to see if property ConfigPath is declared for a tool. Might be
// removed once all tools are updated to have a config path declared.
- // in athena getProperties returns std::vector<Property*>
+ // in athena getProperties returns std::vector<Gaudi::Details::PropertyBase*>
// in rc getProperties returns std::map<std::string,Property*>
#ifndef XAOD_STANDALONE
bool configPathDeclared = false;
- for (Property* property : getProperties())
+ for (Gaudi::Details::PropertyBase* property : getProperties())
{
if (property->name() == "ConfigPath")
{
diff --git a/Simulation/BeamEffects/src/CrabKissingVertexPositioner.cxx b/Simulation/BeamEffects/src/CrabKissingVertexPositioner.cxx
index 3ada121414e1bdb05577fb1b543974c544aa5a23..330776676aaf3a16172b473d6bbef8efa17ee328 100644
--- a/Simulation/BeamEffects/src/CrabKissingVertexPositioner.cxx
+++ b/Simulation/BeamEffects/src/CrabKissingVertexPositioner.cxx
@@ -60,7 +60,7 @@ namespace Simulation
{
}
- void CrabKissingVertexPositioner::BunchShapeHandler(Property&)
+ void CrabKissingVertexPositioner::BunchShapeHandler(Gaudi::Details::PropertyBase&)
{
if(m_bunchShapeProp.value() == "GAUSS") m_bunchShape = BunchShape::GAUSS;
else if(m_bunchShapeProp.value() == "FLAT") m_bunchShape = BunchShape::FLAT;
diff --git a/Simulation/BeamEffects/src/CrabKissingVertexPositioner.h b/Simulation/BeamEffects/src/CrabKissingVertexPositioner.h
index fba1fa239958da2cb30e2c133410bae580c965ba..9348a52f1e5b96efe0d22335db55013cf79eb78e 100644
--- a/Simulation/BeamEffects/src/CrabKissingVertexPositioner.h
+++ b/Simulation/BeamEffects/src/CrabKissingVertexPositioner.h
@@ -72,7 +72,7 @@ namespace Simulation
std::string m_randomEngineName; //!< Name of the random number stream
StringProperty m_bunchShapeProp;
- void BunchShapeHandler(Property&);
+ void BunchShapeHandler(Gaudi::Details::PropertyBase&);
enum BunchShape{GAUSS,FLAT,NSHAPES};
BunchShape m_bunchShape; // GAUSS or FLAT
double m_bunchLength; //!< Parameter in the Z distribution of the beamspot
diff --git a/Simulation/Digitization/python/DigiAlgConfig.py b/Simulation/Digitization/python/DigiAlgConfig.py
index 77ace3912f900b3659b152f6ca777ca44ce80de8..561a10c8fb8f5fcf37ce457c74ab26af66c49ee3 100644
--- a/Simulation/Digitization/python/DigiAlgConfig.py
+++ b/Simulation/Digitization/python/DigiAlgConfig.py
@@ -478,6 +478,7 @@ def getSplitNoMergeFFPileUpToolsList():
def getStandardPileUpToolsAlg(name="StandardPileUpToolsAlg", **kwargs):
kwargs.setdefault('PileUpTools', getStandardPileUpToolsList() )
+ kwargs.setdefault('ExtraInputs', [('xAOD::EventInfo', 'EventInfo')])
from Digitization.DigitizationFlags import digitizationFlags
if digitizationFlags.doXingByXingPileUp():
return CfgMgr.PileUpToolsAlg(name, **kwargs)
diff --git a/Simulation/Digitization/python/DigitizationConfigFlags.py b/Simulation/Digitization/python/DigitizationConfigFlags.py
index 57f81782e310fcc85d2f50c9613c86c5dba69684..980ef260e126934176f872355ab80d4d54d59005 100644
--- a/Simulation/Digitization/python/DigitizationConfigFlags.py
+++ b/Simulation/Digitization/python/DigitizationConfigFlags.py
@@ -38,6 +38,7 @@ def getSpecialConfiguration(flags):
# include(inc)
return out
+
def createDigitizationCfgFlags():
"""Return an AthConfigFlags object with required flags"""
flags = AthConfigFlags()
@@ -67,5 +68,27 @@ def createDigitizationCfgFlags():
flags.addFlag("Digitization.AddCaloDigi", False)
# Integer offset to random seed initialisation
flags.addFlag("Digitization.RandomSeedOffset", 0)
+ # Digitization extra input dependencies
+ flags.addFlag("Digitization.ExtraInputs", [("xAOD::EventInfo", "EventInfo")])
return flags
+
+def digitizationRunArgsToFlags(runArgs, flags):
+ """Fill digitization configuration flags from run arguments."""
+ if hasattr(runArgs, "PileUpPremixing"):
+ flags.Digitization.PileUpPremixing = runArgs.PileUpPremixing
+
+ if hasattr(runArgs, "doAllNoise"):
+ flags.Digitization.DoInnerDetectorNoise = runArgs.doAllNoise
+ flags.Digitization.DoCaloNoise = runArgs.doAllNoise
+
+ if hasattr(runArgs, "AddCaloDigi"):
+ flags.Digitization.AddCaloDigi = runArgs.AddCaloDigi
+
+ if hasattr(runArgs, "digiSeedOffset1"):
+ flags.Digitization.RandomSeedOffset = runArgs.digiSeedOffset1
+
+ # TODO: Not covered yet as no flag equivalents exist yet
+ # '--digiRndmSvc'
+ # '--digiSteeringConf'
+ # '--samplingFractionDbTag'
diff --git a/Simulation/Digitization/python/PileUpToolsConfig.py b/Simulation/Digitization/python/PileUpToolsConfig.py
index cbb73ab792c1905f7c371e65c3ae168bf4ac67bb..e8b4af5e4624d99f33f7d2916b1510429d1904e6 100644
--- a/Simulation/Digitization/python/PileUpToolsConfig.py
+++ b/Simulation/Digitization/python/PileUpToolsConfig.py
@@ -20,6 +20,9 @@ def PileUpToolsCfg(flags, name="StandardPileUpToolsAlg", **kwargs):
if not isinstance(PileUpTools, list):
kwargs["PileUpTools"] = [PileUpTools]
+ # declare common extra inputs
+ kwargs["ExtraInputs"] = flags.Digitization.ExtraInputs
+
# choose the correct alg
if flags.Digitization.DoXingByXingPileUp:
Alg = PileUpToolsAlg
diff --git a/Simulation/Digitization/share/FixDataDependenciesForMT.py b/Simulation/Digitization/share/FixDataDependenciesForMT.py
index 55e5c44ea4ad3447e0094d6bf6f0a53ef685ac32..2ed696a90745365778a82e42c994a6ac5a9bc187 100644
--- a/Simulation/Digitization/share/FixDataDependenciesForMT.py
+++ b/Simulation/Digitization/share/FixDataDependenciesForMT.py
@@ -54,8 +54,8 @@ if DetFlags.digitize.TGC_on():
StreamRDOExtraInputs += [( 'TgcRdoContainer' , 'StoreGateSvc+TGCRDO' ),
( 'MuonSimDataCollection' , 'StoreGateSvc+TGC_SDO' )]
-topSequence.StandardPileUpToolsAlg.ExtraInputs = digiExtraInputs
-topSequence.StandardPileUpToolsAlg.ExtraOutputs = digiExtraOutputs
+topSequence.StandardPileUpToolsAlg.ExtraInputs += digiExtraInputs
+topSequence.StandardPileUpToolsAlg.ExtraOutputs += digiExtraOutputs
from AthenaCommon.AppMgr import theApp
StreamRDO = theApp.getOutputStream( "StreamRDO" )
diff --git a/Simulation/Digitization/test/DigitizationComparisonNew_test.py b/Simulation/Digitization/test/DigitizationComparisonNew_test.py
index c3141dbe7338a8d69c6927be6507b3fec60842b4..0f0dd4d13dc7aaac691c0816e99ae6ea43a6c673 100755
--- a/Simulation/Digitization/test/DigitizationComparisonNew_test.py
+++ b/Simulation/Digitization/test/DigitizationComparisonNew_test.py
@@ -5,10 +5,9 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
import sys
from AthenaCommon.Logging import log
-from AthenaCommon.Constants import DEBUG, WARNING
+from AthenaCommon.Constants import DEBUG
from AthenaCommon.Configurable import Configurable
from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from AthenaConfiguration.TestDefaults import defaultTestFiles
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
@@ -25,6 +24,7 @@ from LArDigitization.LArDigitizationConfigNew import LArTriggerDigitizationCfg
from TileSimAlgs.TileDigitizationConfig import TileDigitizationCfg, TileTriggerDigitizationCfg
from MCTruthSimAlgs.RecoTimingConfig import MergeRecoTimingObjCfg
from OverlayConfiguration.OverlayTestHelpers import JobOptsDumperCfg
+from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
# Set up logging and new style config
log.setLevel(DEBUG)
@@ -60,6 +60,12 @@ acc.merge(PoolReadCfg(ConfigFlags))
acc.merge(PoolWriteCfg(ConfigFlags))
acc.merge(writeDigitizationMetadata(ConfigFlags))
+# Old EventInfo conversion
+if "EventInfo" not in ConfigFlags.Input.Collections:
+ acc.merge(EventInfoCnvAlgCfg(ConfigFlags,
+ inputKey="McEventInfo",
+ outputKey="EventInfo"))
+
# Inner Detector
acc.merge(BCM_DigitizationCfg(ConfigFlags))
acc.merge(PixelDigitizationCfg(ConfigFlags))
diff --git a/Simulation/Digitization/test/DigitizationConfigNew_test.py b/Simulation/Digitization/test/DigitizationConfigNew_test.py
index bda86c6d9f34b4d50b1b37815c8dd09a1619b525..21bed961c1b818458ad2637be0d41bdc5c8d26d1 100755
--- a/Simulation/Digitization/test/DigitizationConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationConfigNew_test.py
@@ -24,6 +24,7 @@ from MuonConfig.CSC_DigitizationConfig import CSC_DigitizationDigitToRDOCfg
from LArDigitization.LArDigitizationConfigNew import LArTriggerDigitizationCfg
from TileSimAlgs.TileDigitizationConfig import TileDigitizationCfg, TileTriggerDigitizationCfg
from MCTruthSimAlgs.RecoTimingConfig import MergeRecoTimingObjCfg
+from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
# Set up logging and new style config
log.setLevel(DEBUG)
@@ -45,6 +46,12 @@ acc.merge(PoolReadCfg(ConfigFlags))
acc.merge(PoolWriteCfg(ConfigFlags))
acc.merge(writeDigitizationMetadata(ConfigFlags))
+# Old EventInfo conversion
+if "EventInfo" not in ConfigFlags.Input.Collections:
+ acc.merge(EventInfoCnvAlgCfg(ConfigFlags,
+ inputKey="McEventInfo",
+ outputKey="EventInfo"))
+
# Inner Detector
acc.merge(BCM_DigitizationCfg(ConfigFlags))
acc.merge(PixelDigitizationCfg(ConfigFlags))
diff --git a/Simulation/FastShower/FastCaloSim/src/CaloCellContainerFCSFinalizerTool.cxx b/Simulation/FastShower/FastCaloSim/src/CaloCellContainerFCSFinalizerTool.cxx
index 2a9507522c5624c6dbad3c2a2a79b6c7b5e3c0d8..49ccf8f71b442caa40fe8cdce24ce68f51141915 100644
--- a/Simulation/FastShower/FastCaloSim/src/CaloCellContainerFCSFinalizerTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/CaloCellContainerFCSFinalizerTool.cxx
@@ -19,7 +19,7 @@ PURPOSE: Apply necessary finalising operation to CaloCellContainer
#include "GaudiKernel/Service.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include "StoreGate/StoreGateSvc.h"
diff --git a/Simulation/G4Extensions/Charginos/python/CharginosConfig.py b/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
index eaa569b12f4ba3f1ccbca5425a40e0dbcd07d4a3..cf7c2fb518292b306850b9f156c17d11ffe74db9 100644
--- a/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
+++ b/Simulation/G4Extensions/Charginos/python/CharginosConfig.py
@@ -3,15 +3,16 @@
from AthenaCommon import CfgMgr
def getCharginosPhysicsTool(name="CharginosPhysicsTool", **kwargs):
from G4AtlasApps.SimFlags import simFlags
- from AthenaCommon.SystemOfUnits import MeV,ns
+ from AthenaCommon.SystemOfUnits import MeV, ns, GeV # noqa: F401
+ # Example specialConfiguration: {'AMSBC1Mass': '1200.16*GeV', 'AMSBN1Mass': '1200.0*GeV', 'AMSBC1Lifetime': '0.2*ns'}
C1Mass = eval(simFlags.specialConfiguration.get_Value().get("AMSBC1Mass", None))
N1Mass = eval(simFlags.specialConfiguration.get_Value().get("AMSBN1Mass", None))
C1Lifetime = eval(simFlags.specialConfiguration.get_Value().get("AMSBC1Lifetime", "-1.0"))
- kwargs.setdefault("CharginoPlusMass", C1Mass*MeV) # TODO check units
+ kwargs.setdefault("CharginoPlusMass", C1Mass)
kwargs.setdefault("CharginoPlusStable", (C1Lifetime < 0))
if not (C1Lifetime < 0):
- kwargs.setdefault("CharginoPlusLifetime", C1Lifetime*ns)
+ kwargs.setdefault("CharginoPlusLifetime", C1Lifetime)
##kwargs.setdefault("CharginoPlusMass", 101.0*GeV)
##kwargs.setdefault("CharginoPlusWidth", 0.0*MeV)
##kwargs.setdefault("CharginoPlusCharge", 1.*eplus)
@@ -20,10 +21,10 @@ def getCharginosPhysicsTool(name="CharginosPhysicsTool", **kwargs):
##kwargs.setdefault("CharginoPlusLifetime", -1)
##kwargs.setdefault("CharginoPlusShortlived", False)
- kwargs.setdefault("CharginoMinusMass", C1Mass*MeV) # TODO check units
+ kwargs.setdefault("CharginoMinusMass", C1Mass)
kwargs.setdefault("CharginoMinusStable", (C1Lifetime < 0))
if not (C1Lifetime < 0):
- kwargs.setdefault("CharginoMinusLifetime", C1Lifetime*ns)
+ kwargs.setdefault("CharginoMinusLifetime", C1Lifetime)
##kwargs.setdefault("CharginoMinusMass", 101.0*GeV)
##kwargs.setdefault("CharginoMinusWidth", 0.0*MeV)
##kwargs.setdefault("CharginoMinusCharge", 1.*eplus)
@@ -32,7 +33,7 @@ def getCharginosPhysicsTool(name="CharginosPhysicsTool", **kwargs):
##kwargs.setdefault("CharginoMinusLifetime", -1)
##kwargs.setdefault("CharginoMinusShortlived", False)
- kwargs.setdefault("NeutralinoMass", N1Mass*MeV) # TODO check units
+ kwargs.setdefault("NeutralinoMass", N1Mass)
##kwargs.setdefault("NeutralinoWidth", 0.0*MeV)
##kwargs.setdefault("NeutralinoCharge", 0.*eplus)
##kwargs.setdefault("NeutralinoPDGCode", 1000022)
diff --git a/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py b/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
index 8dca17479cb92f426bab7d57e36016b217012457..ca04f29730b544c288b8eef7a3800f15f923b332 100644
--- a/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
+++ b/Simulation/G4Extensions/Gauginos/python/GauginosConfig.py
@@ -2,7 +2,9 @@
from AthenaCommon import CfgMgr
def getGauginosPhysicsTool(name="GauginosPhysicsTool", **kwargs):
+ from AthenaCommon.SystemOfUnits import GeV,ns # noqa: F401
from G4AtlasApps.SimFlags import simFlags
+ # Example specialConfiguration {'GMSBSlepton': '100.0*GeV', 'GMSBGravitino': '1e-07*GeV', 'GMSBSleptonTime': '0.01*ns'}
GMSBNeutralino = eval(simFlags.specialConfiguration.get_Value().get("GMSBNeutralino", "0*GeV"))
GMSBTime = eval(simFlags.specialConfiguration.get_Value().get("GMSBLifeTime", "0*GeV"))
kwargs.setdefault("NeutralinoMass", GMSBNeutralino)
diff --git a/Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py b/Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py
index 7e3944555d56182f9af72f35b85a723757b4382a..f662b7664cb5b658e58e77b4edb3e9df0c8e9ca0 100644
--- a/Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py
+++ b/Simulation/G4Extensions/Sleptons/python/SleptonsConfig.py
@@ -1,6 +1,8 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon import CfgMgr
+from AthenaCommon.SystemOfUnits import GeV,ns # noqa: F401
+# Example specialConfiguration {'GMSBSlepton': '100.0*GeV', 'GMSBGravitino': '1e-07*GeV', 'GMSBSleptonTime': '0.01*ns'}
"""
Defining default settings for slepton/staus. Possible options are:
diff --git a/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx b/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
index 8daa1f348c6bb8986f9a063114cf52e40fa2b50b..16be5ad8cd26d7bb6d2b20cdd05559bad5175dd5 100644
--- a/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
+++ b/Simulation/G4Sim/G4HiveEx/src/G4InputLoader.cxx
@@ -9,7 +9,7 @@
#include "G4InputLoader.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GeneratorObjects/McEventCollection.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/Simulation/G4Sim/MCTruth/MCTruth/EventInformation.h b/Simulation/G4Sim/MCTruth/MCTruth/AtlasG4EventUserInfo.h
similarity index 90%
rename from Simulation/G4Sim/MCTruth/MCTruth/EventInformation.h
rename to Simulation/G4Sim/MCTruth/MCTruth/AtlasG4EventUserInfo.h
index 9b3e6a2a5cc0d96631cb7df711d8b460783ccb28..76f22bbc290248abf1a2229bf52148ef7db3eb52 100644
--- a/Simulation/G4Sim/MCTruth/MCTruth/EventInformation.h
+++ b/Simulation/G4Sim/MCTruth/MCTruth/AtlasG4EventUserInfo.h
@@ -2,17 +2,17 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef EventInformation_H
-#define EventInformation_H
+#ifndef MCTRUTH_ATLASG4EVENTUSERINFO_H
+#define MCTRUTH_ATLASG4EVENTUSERINFO_H
#include "AtlasHepMC/GenEvent.h"
#include "AtlasHepMC/GenParticle.h"
#include "G4ThreeVector.hh"
#include "G4VUserEventInformation.hh"
-class EventInformation: public G4VUserEventInformation {
+class AtlasG4EventUserInfo: public G4VUserEventInformation {
public:
- EventInformation(): G4VUserEventInformation(),m_nrOfPrimaryParticles(0),
+ AtlasG4EventUserInfo(): G4VUserEventInformation(),m_nrOfPrimaryParticles(0),
m_nrOfPrimaryVertices(0),m_secondaryParticleBarCode(200000),
m_secondaryVertexBarCode(-200000),m_theEvent(0),
m_currentPrimary(0),m_currentlyTraced(0),
@@ -59,4 +59,4 @@ private:
int m_last_processed_step;
};
-#endif
+#endif // MCTRUTH_ATLASG4EVENTUSERINFO_H
diff --git a/Simulation/G4Sim/MCTruth/doc/packagedoc.h b/Simulation/G4Sim/MCTruth/doc/packagedoc.h
index a19f1f154a8615d323dbe5d9160c6f2b331e32d0..cb93cb51f4cc8e452f6786e66bf3ff503400b8b3 100644
--- a/Simulation/G4Sim/MCTruth/doc/packagedoc.h
+++ b/Simulation/G4Sim/MCTruth/doc/packagedoc.h
@@ -16,7 +16,7 @@ The MCTruth package includes the following classes:
- AtlasTrajectory : An ATLAS-specific Geant4 trajectory, used as a helper (i.e. including some additional information for us)
- CosmicTRSD : The track recording sensitive detector used by the cosmic simulation. This sensitive detector stores cosmic rays at the entrance to the cavern so that they can be resimulated beginning from that point later on.
- - EventInformation : The ATLAS implementation of G4UserEventInformation. Includes some helpful information about the event.
+ - AtlasG4EventUserInfo : The ATLAS implementation of G4UserEventInformation. Includes some helpful information about the event.
- MCTruthSteppingAction : A piece of code that tests, at every step, whether a particle (or vertex, more accurately) is to be saved in the truth tree. It decides based on the Truth Strategies enabled in the TruthStrategyManager
- PrimaryParticleInformation : The ATLAS implementation of user information for a particle. This stores additional information for those particles coming from the generator for use later in the simulation.
- TrackHelper : Provides several useful functions for dealing with G4Tracks
diff --git a/Simulation/G4Sim/MCTruth/src/AtlasG4EventUserInfo.cxx b/Simulation/G4Sim/MCTruth/src/AtlasG4EventUserInfo.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..0396208720faa1bcded430b7a087330b3136d933
--- /dev/null
+++ b/Simulation/G4Sim/MCTruth/src/AtlasG4EventUserInfo.cxx
@@ -0,0 +1,38 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "MCTruth/AtlasG4EventUserInfo.h"
+
+HepMC::GenEvent* AtlasG4EventUserInfo::GetHepMCEvent()
+{
+ return m_theEvent;
+}
+void AtlasG4EventUserInfo::SetHepMCEvent(HepMC::GenEvent* ev)
+{
+ m_theEvent=ev;
+}
+int AtlasG4EventUserInfo::GetNrOfPrimaryParticles() const
+{
+ return m_nrOfPrimaryParticles;
+}
+void AtlasG4EventUserInfo::SetNrOfPrimaryParticles(int nr)
+{
+ m_nrOfPrimaryParticles=nr;
+}
+int AtlasG4EventUserInfo::GetNrOfPrimaryVertices() const
+{
+ return m_nrOfPrimaryVertices;
+}
+void AtlasG4EventUserInfo::SetNrOfPrimaryVertices(int nr)
+{
+ m_nrOfPrimaryVertices=nr;
+}
+void AtlasG4EventUserInfo::SetVertexPosition(const G4ThreeVector vtx)
+{
+ m_vertexPosition=vtx;
+}
+const G4ThreeVector AtlasG4EventUserInfo::GetVertexPosition() const
+{
+ return m_vertexPosition;
+}
diff --git a/Simulation/G4Sim/MCTruth/src/EventInformation.cxx b/Simulation/G4Sim/MCTruth/src/EventInformation.cxx
deleted file mode 100644
index 39666aae481ecf8ef246b78aed7473bc134879ac..0000000000000000000000000000000000000000
--- a/Simulation/G4Sim/MCTruth/src/EventInformation.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "MCTruth/EventInformation.h"
-
-HepMC::GenEvent* EventInformation::GetHepMCEvent()
-{
- return m_theEvent;
-}
-void EventInformation::SetHepMCEvent(HepMC::GenEvent* ev)
-{
- m_theEvent=ev;
-}
-int EventInformation::GetNrOfPrimaryParticles() const
-{
- return m_nrOfPrimaryParticles;
-}
-void EventInformation::SetNrOfPrimaryParticles(int nr)
-{
- m_nrOfPrimaryParticles=nr;
-}
-int EventInformation::GetNrOfPrimaryVertices() const
-{
- return m_nrOfPrimaryVertices;
-}
-void EventInformation::SetNrOfPrimaryVertices(int nr)
-{
- m_nrOfPrimaryVertices=nr;
-}
-void EventInformation::SetVertexPosition(const G4ThreeVector vtx)
-{
- m_vertexPosition=vtx;
-}
-const G4ThreeVector EventInformation::GetVertexPosition() const
-{
- return m_vertexPosition;
-}
diff --git a/Simulation/G4Sim/MCTruthBase/src/TruthStrategyManager.cxx b/Simulation/G4Sim/MCTruthBase/src/TruthStrategyManager.cxx
index 0356960958811edaf6760585cda47957d19d8500..c76da70098ea4e6bc44d0ece00f1a6aacbb8d366 100644
--- a/Simulation/G4Sim/MCTruthBase/src/TruthStrategyManager.cxx
+++ b/Simulation/G4Sim/MCTruthBase/src/TruthStrategyManager.cxx
@@ -18,7 +18,7 @@
#include "G4VSolid.hh"
// Truth-related includes
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/TrackHelper.h"
// ISF includes
@@ -58,7 +58,7 @@ bool TruthStrategyManager::CreateTruthIncident(const G4Step* aStep, int subDetVo
{
AtlasDetDescr::AtlasRegion geoID = iGeant4::ISFG4GeoHelper::nextGeoId(aStep, subDetVolLevel, m_geoIDSvc);
- auto* eventInfo = static_cast<EventInformation*> (G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation());
+ auto* atlasG4EvtUserInfo = static_cast<AtlasG4EventUserInfo*> (G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation());
// This is pretty ugly and but necessary because the Geant4TruthIncident
// requires an ISFParticle at this point.
@@ -73,7 +73,7 @@ bool TruthStrategyManager::CreateTruthIncident(const G4Step* aStep, int subDetVo
int myBCID = 0;
ISF::ISFParticle myISFParticle(myPos, myMom, myMass, myCharge, myPdgCode, myTime, origin, myBCID);
- iGeant4::Geant4TruthIncident truth(aStep, myISFParticle, geoID, eventInfo);
+ iGeant4::Geant4TruthIncident truth(aStep, myISFParticle, geoID, atlasG4EvtUserInfo);
m_truthSvc->registerTruthIncident(truth);
return false;
diff --git a/Simulation/G4Utilities/G4DebuggingTools/src/VerboseSelector.cxx b/Simulation/G4Utilities/G4DebuggingTools/src/VerboseSelector.cxx
index eb4e87bd1807d991c4233d19fd67f4b598f66163..d99ae27a7bb14feb979c71f77a94ab12062df50f 100644
--- a/Simulation/G4Utilities/G4DebuggingTools/src/VerboseSelector.cxx
+++ b/Simulation/G4Utilities/G4DebuggingTools/src/VerboseSelector.cxx
@@ -4,7 +4,7 @@
#include "VerboseSelector.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/TrackHelper.h"
#include "G4EventManager.hh"
@@ -106,7 +106,7 @@ namespace G4UA
G4Track *itr = const_cast<G4Track*>(aTrack);
TrackHelper trackHelper(itr);
- EventInformation* eventInfo = static_cast<EventInformation*>
+ AtlasG4EventUserInfo* atlasG4EvtUserInfo = static_cast<AtlasG4EventUserInfo*>
(G4EventManager::GetEventManager()->GetConstCurrentEvent()->
GetUserInformation());
@@ -114,9 +114,9 @@ namespace G4UA
if (trackHelper.IsPrimary() || trackHelper.IsRegisteredSecondary()) {
// FIXME: re-evaluate this comment below.
- // ADS this code crashes in MT runs, since eventInfo->GetCurrentlyTraced()
+ // ADS this code crashes in MT runs, since atlasG4EvtUserInfo->GetCurrentlyTraced()
// is NULL untill we migrate the truth
- currentBarcode = HepMC::barcode(eventInfo->GetCurrentlyTraced());
+ currentBarcode = HepMC::barcode(atlasG4EvtUserInfo->GetCurrentlyTraced());
}
bool p1 = m_config.targetTrack<0 && m_config.targetBarcode<0;
diff --git a/Simulation/G4Utilities/G4UserActions/src/AthenaDebugStackingAction.cxx b/Simulation/G4Utilities/G4UserActions/src/AthenaDebugStackingAction.cxx
index 143d735401cc20d84341e26fd4b8aec71d91ebdd..8872fc0f871240db89c54026285e1ae9581af68e 100644
--- a/Simulation/G4Utilities/G4UserActions/src/AthenaDebugStackingAction.cxx
+++ b/Simulation/G4Utilities/G4UserActions/src/AthenaDebugStackingAction.cxx
@@ -14,7 +14,7 @@
#include "MCTruth/PrimaryParticleInformation.h"
#include "MCTruth/TrackInformation.h"
#include "MCTruth/TrackBarcodeInfo.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
// Geant4 includes
#include "G4Track.hh"
@@ -54,8 +54,8 @@ namespace G4UA
// TODO: Why is this here? Can I remove it?
G4Event* ev = G4EventManager::GetEventManager()->GetNonconstCurrentEvent();
- EventInformation* eventInfo __attribute__ ((unused)) =
- static_cast<EventInformation*> (ev->GetUserInformation());
+ AtlasG4EventUserInfo* atlasG4EvtUserInfo __attribute__ ((unused)) =
+ static_cast<AtlasG4EventUserInfo*> (ev->GetUserInformation());
// Was track subject to a RR?
bool rouletted = false;
diff --git a/Simulation/G4Utilities/G4UserActions/src/AthenaStackingAction.cxx b/Simulation/G4Utilities/G4UserActions/src/AthenaStackingAction.cxx
index 8850f23d6a1b458e79fb394e4f70379c33268fbb..0a35cfcd6784352c6b0db17a3455e32727650187 100644
--- a/Simulation/G4Utilities/G4UserActions/src/AthenaStackingAction.cxx
+++ b/Simulation/G4Utilities/G4UserActions/src/AthenaStackingAction.cxx
@@ -14,7 +14,7 @@
#include "MCTruth/PrimaryParticleInformation.h"
#include "MCTruth/TrackInformation.h"
#include "MCTruth/TrackBarcodeInfo.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
// Geant4 includes
#include "G4Track.hh"
@@ -73,8 +73,8 @@ namespace G4UA
// TODO: Why is this here? Can I remove it?
G4Event* ev = G4EventManager::GetEventManager()->GetNonconstCurrentEvent();
- EventInformation* eventInfo __attribute__ ((unused)) =
- static_cast<EventInformation*> (ev->GetUserInformation());
+ AtlasG4EventUserInfo* atlasG4EvtUserInfo __attribute__ ((unused)) =
+ static_cast<AtlasG4EventUserInfo*> (ev->GetUserInformation());
// Neutron Russian Roulette
if (m_config.applyNRR && isNeutron(track) &&
diff --git a/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx b/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx
index cd95ed929b74bf60120c60beaac30379c8666eab..acc9cd35f9db2bec38c7ab640caa961fa173a232 100644
--- a/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx
+++ b/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.cxx
@@ -9,7 +9,7 @@
#include "G4Event.hh"
#include "G4EventManager.hh"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/PrimaryParticleInformation.h"
#include "MCTruth/TrackHelper.h"
#include "MCTruth/TrackInformation.h"
@@ -41,7 +41,7 @@ namespace G4UA
// Use the TrackHelper code to identify the kind of particle.
TrackHelper trackHelper(track);
- // Condition for storing the GenParticle in the EventInformation for later.
+ // Condition for storing the GenParticle in the AtlasG4EventUserInfo for later.
if (trackHelper.IsPrimary() || trackHelper.IsRegisteredSecondary())
{
// Why a const_cast???
@@ -50,11 +50,11 @@ namespace G4UA
const_cast<HepMC::GenParticlePtr>( trackHelper.GetTrackInformation()->
GetHepMCParticle() );
- // Assign the GenParticle to the EventInformation.
- EventInformation* eventInfo = static_cast<EventInformation*>
+ // Assign the GenParticle to the AtlasG4EventUserInfo.
+ AtlasG4EventUserInfo* atlasG4EvtUserInfo = static_cast<AtlasG4EventUserInfo*>
(G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation());
- if (trackHelper.IsPrimary()) eventInfo->SetCurrentPrimary(part);
- eventInfo->SetCurrentlyTraced(part);
+ if (trackHelper.IsPrimary()) atlasG4EvtUserInfo->SetCurrentPrimary(part);
+ atlasG4EvtUserInfo->SetCurrentlyTraced(part);
}
// Condition for creating a trajectory object to store truth.
diff --git a/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.h b/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.h
index 625ca7b3f3ce97b26af792c23534588929db1d17..12f8ded7aae671a8412587a79d73611a882c645e 100644
--- a/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.h
+++ b/Simulation/G4Utilities/G4UserActions/src/AthenaTrackingAction.h
@@ -26,7 +26,7 @@ namespace G4UA
/// @brief Called before tracking a new particle.
///
/// If the track meets certain conditions, we save it in the
- /// EventInformation and possibly construct a new AtlasTrajectory
+ /// AtlasG4EventUserInfo and possibly construct a new AtlasTrajectory
/// which will be used for writing out truth particles later.
virtual void PreUserTrackingAction(const G4Track*) override final;
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeGenericMuonSimHitCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeGenericMuonSimHitCollTool.h
index fa469a37abf3f2115d8a4142c2f19dc048922a56..7b6167d4a0c854fa39ca7fbe724da8e8266a0af0 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeGenericMuonSimHitCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeGenericMuonSimHitCollTool.h
@@ -9,7 +9,7 @@
#include "MuonSimEvent/GenericMuonSimHitCollection.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include <string>
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
index e556c97518a47f7146e952eb190db0bc65518676..038b9aefa9285373060744f0e1c14690d6d6a6cc 100755
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeMcEventCollTool.h
@@ -7,7 +7,7 @@
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/PhysicalConstants.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeRecoTimingObjTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeRecoTimingObjTool.h
index 036f05839cdb94b23a72d38d24f1bf23677802b3..8c934d33c2f7ca6736d4cd03ee5dff8aabd383b6 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeRecoTimingObjTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeRecoTimingObjTool.h
@@ -7,7 +7,7 @@
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "PileUpTools/PileUpMergeSvc.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTrackRecordCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTrackRecordCollTool.h
index f7f438309a4b396c1385573fa3a52ae3eb6b6dcb..204c3f02d546955842106396fc449a3964d1a006 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTrackRecordCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTrackRecordCollTool.h
@@ -8,7 +8,7 @@
#include "PileUpTools/PileUpToolBase.h"
#include "TrackRecord/TrackRecordCollection.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "PileUpTools/PileUpMergeSvc.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.h
index 177c6dd0d8838ec3c7020800d030a13557c6a752..623c8b260c1a3bf55d7452f923922c84e7f4b4d8 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/MergeTruthJetsTool.h
@@ -9,7 +9,7 @@
#include "xAODJet/JetContainer.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "PileUpTools/PileUpMergeSvc.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.h
index 07c14ad2440b0961366feab1e522ddee8886c73c..aad1f6615745ec0ccaa9615c5eb4b22de56ce295 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/NewMergeMcEventCollTool.h
@@ -5,7 +5,7 @@
#ifndef MCTRUTHSIMALGS_NEWMERGEMCEVENTCOLLTOOL_H
#define MCTRUTHSIMALGS_NEWMERGEMCEVENTCOLLTOOL_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/WriteHandle.h"
diff --git a/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.h b/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.h
index 15e3259f717936d8fd67445a68f6181d49536d87..a378da019de6d254d91e54465dcd9560e1151848 100644
--- a/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.h
+++ b/Simulation/G4Utilities/MCTruthSimAlgs/src/SimpleMergeMcEventCollTool.h
@@ -7,7 +7,7 @@
#include "PileUpTools/PileUpToolBase.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ServiceHandle.h"
#include <utility> /* pair */
diff --git a/Simulation/G4Utilities/TrackWriteFastSim/src/NeutronFastSim.cxx b/Simulation/G4Utilities/TrackWriteFastSim/src/NeutronFastSim.cxx
index bfea4a739dd857d2307a4bbf076cc8c977606e0a..0e49b78b3285d17a2051eac3bb5c34512957243d 100644
--- a/Simulation/G4Utilities/TrackWriteFastSim/src/NeutronFastSim.cxx
+++ b/Simulation/G4Utilities/TrackWriteFastSim/src/NeutronFastSim.cxx
@@ -3,7 +3,7 @@
*/
#include "TrackWriteFastSim/NeutronFastSim.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "G4Event.hh"
#include "G4Neutron.hh"
@@ -50,8 +50,8 @@ G4bool NeutronFastSim::ModelTrigger(const G4FastTrack& fastTrack)
}
// Not a neutron... Pick it up if the primary had eta>6.0
- EventInformation *eventInfo=static_cast<EventInformation*>(G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation());
- HepMC::GenParticlePtr gp = eventInfo->GetCurrentPrimary();
+ AtlasG4EventUserInfo *atlasG4EvtUserInfo=static_cast<AtlasG4EventUserInfo*>(G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation());
+ HepMC::GenParticlePtr gp = atlasG4EvtUserInfo->GetCurrentPrimary();
if (std::abs(gp->momentum().eta())>m_etaCut && HepMC::barcode(gp)<200000){
return true;
} else {
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
index 55e5cba78f08360639861154e0011917da309d41..02bcb6db259a99d48d21732e903468217ddcec1a 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/src/SimKernel.cxx
@@ -13,7 +13,7 @@
#include "ISF_Interfaces/IMonitoringTool.h"
#include "ISF_Interfaces/IEventFilterTool.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Boost
#include <boost/lexical_cast.hpp>
// ATLAS cxx utils
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
index 73e3231492312f59889607e7b31f453f79a45a75..65a7b18a2ac0723fa17390740b5af3f126ca4f5c 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
@@ -28,7 +28,7 @@
#include "ISF_Event/ParticleUserInformation.h"
// MCTruth includes
#include "MCTruth/PrimaryParticleInformation.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
// McEventCollection
#include "GeneratorObjects/McEventCollection.h"
// Geant4 includes
@@ -368,11 +368,11 @@ G4Event* ISF::InputConverter::ISF_to_G4Event(const ISF::ConstISFParticleVector&
n_pp++;
}
- EventInformation *eventInfo=new EventInformation();
- eventInfo->SetNrOfPrimaryParticles(n_pp);
- eventInfo->SetNrOfPrimaryVertices(n_pp); // special case for ISF batches of particles
- eventInfo->SetHepMCEvent(genEvent);
- g4evt->SetUserInformation(eventInfo);
+ AtlasG4EventUserInfo *atlasG4EvtUserInfo=new AtlasG4EventUserInfo();
+ atlasG4EvtUserInfo->SetNrOfPrimaryParticles(n_pp);
+ atlasG4EvtUserInfo->SetNrOfPrimaryVertices(n_pp); // special case for ISF batches of particles
+ atlasG4EvtUserInfo->SetHepMCEvent(genEvent);
+ g4evt->SetUserInformation(atlasG4EvtUserInfo);
return g4evt;
}
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/Geant4TruthIncident.h b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/Geant4TruthIncident.h
index d4770981320394d56514699d8e2d637f1bc28f20..d6f8e150b04176495c7eca7149f149331d3626b9 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/Geant4TruthIncident.h
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/Geant4TruthIncident.h
@@ -20,7 +20,7 @@
// forward declarations
class G4Step;
class G4Track;
-class EventInformation;
+class AtlasG4EventUserInfo;
namespace ISF {
class ISFParticle;
@@ -41,7 +41,7 @@ namespace iGeant4 {
Geant4TruthIncident( const G4Step*,
const ISF::ISFParticle& baseISP,
AtlasDetDescr::AtlasRegion geoID,
- EventInformation* eventInfo);
+ AtlasG4EventUserInfo* atlasG4EvtUserInfo);
virtual ~Geant4TruthIncident() {};
/** Return HepMC position of the truth vertex */
@@ -121,7 +121,7 @@ namespace iGeant4 {
const G4Step* m_step{};
const ISF::ISFParticle& m_baseISP;
- EventInformation* m_eventInfo{};
+ AtlasG4EventUserInfo* m_atlasG4EvtUserInfo{};
mutable bool m_childrenPrepared;
mutable std::vector<const G4Track*> m_children;
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/ISFG4Helper.h b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/ISFG4Helper.h
index 2cae499ed00089397657d146d71bf2509f2ef16f..11a5fe483086c297f2dc7694504d5c87232c0d8b 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/ISFG4Helper.h
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/ISF_Geant4Event/ISFG4Helper.h
@@ -21,7 +21,7 @@ namespace ISF {
}
class VTrackInformation;
class TrackInformation;
-class EventInformation;
+class AtlasG4EventUserInfo;
class G4Track;
namespace iGeant4 {
@@ -51,8 +51,8 @@ class ISFG4Helper {
TrackClassification classification,
HepMC::GenParticlePtr nonRegeneratedTruthParticle = nullptr);
- /** return pointer to current EventInformation */
- static EventInformation* getEventInformation();
+ /** return pointer to current AtlasG4EventUserInfo */
+ static AtlasG4EventUserInfo* getAtlasG4EventUserInfo();
private:
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/Geant4TruthIncident.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/Geant4TruthIncident.cxx
index e6593e152ed589b9b67739f5dbd69031bd2abdb4..bbbd98ff4b9c89ef966aebc3f3473a8d93d5033b 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/Geant4TruthIncident.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/Geant4TruthIncident.cxx
@@ -9,7 +9,7 @@
#include "ISF_Geant4Event/ISFG4Helper.h"
// Atlas G4 Helpers
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/TrackBarcodeInfo.h"
#include "MCTruth/TrackHelper.h"
#include "MCTruth/TrackInformation.h"
@@ -51,7 +51,7 @@
- retrives information from a G4Step (via StepHelper)
Simulation/G4Sim/MCTruth/MCTruth/TruthStrategy.h
- common base for different truth strategies
- Simulation/G4Sim/MCTruth/src/EventInformation.cxx
+ Simulation/G4Sim/MCTruth/src/AtlasG4EventUserInfo.cxx
- stores HepMCevent in G4
Simulation/G4Sim/MCTruth/src/TrackInformation.cxx
Simulation/G4Sim/MCTruth/src/TrackHelper.cxx
@@ -62,13 +62,13 @@
iGeant4::Geant4TruthIncident::Geant4TruthIncident( const G4Step *step,
const ISF::ISFParticle& baseISP,
AtlasDetDescr::AtlasRegion geoID,
- EventInformation *eventInfo) :
+ AtlasG4EventUserInfo *atlasG4EvtUserInfo) :
ITruthIncident(geoID, step->GetSecondaryInCurrentStep()->size()), // switch to G4Step::GetNumberOfSecondariesInCurrentStep() once we're using G4 10.2 or later
m_positionSet(false),
m_position(),
m_step(step),
m_baseISP(baseISP),
- m_eventInfo(eventInfo),
+ m_atlasG4EvtUserInfo(atlasG4EvtUserInfo),
m_childrenPrepared(false),
m_children(),
m_parentParticleAfterIncident(nullptr)
@@ -125,7 +125,7 @@ Barcode::ParticleBarcode iGeant4::Geant4TruthIncident::parentBarcode() const {
}
HepMC::GenParticlePtr iGeant4::Geant4TruthIncident::parentParticle() const {
- HepMC::GenParticlePtr hepParticle = m_eventInfo->GetCurrentlyTraced();
+ HepMC::GenParticlePtr hepParticle = m_atlasG4EvtUserInfo->GetCurrentlyTraced();
return hepParticle;
}
@@ -161,14 +161,14 @@ HepMC::GenParticlePtr iGeant4::Geant4TruthIncident::parentParticleAfterIncident(
// from G4DynamicParticle (which should be equivalent to postStep)
m_parentParticleAfterIncident = convert(track, newBarcode, false);
- m_eventInfo->SetCurrentlyTraced( m_parentParticleAfterIncident );
+ m_atlasG4EvtUserInfo->SetCurrentlyTraced( m_parentParticleAfterIncident );
// store (new) hepmc particle in track's UserInformation
TrackHelper tHelper(track);
TrackInformation *tInfo = tHelper.GetTrackInformation();
if (tInfo) {
// do NOT update the TrackInformation for regenerated particles!
- // (most recent truth info is kept in EventInformation)
+ // (most recent truth info is kept in AtlasG4EventUserInfo)
//tInfo->SetParticle( m_parentParticleAfterIncident );
int regenerationNr = tInfo->GetRegenerationNr();
regenerationNr++;
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/ISFG4Helper.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/ISFG4Helper.cxx
index b78444b79d5fc9d7bb9f6a5febd19654fdc6739a..f84bbcf0bade9cb204721a8f0c9cfb3abf0bd62e 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/ISFG4Helper.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Event/src/ISFG4Helper.cxx
@@ -14,7 +14,7 @@
#include "AtlasHepMC/GenParticle.h"
// G4Atlas includes
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/TrackBarcodeInfo.h"
#include "MCTruth/TrackInformation.h"
@@ -108,10 +108,10 @@ iGeant4::ISFG4Helper::attachTrackInfoToNewG4Track( G4Track& aTrack,
return trackInfo;
}
-/** return pointer to current EventInformation */
-EventInformation*
-iGeant4::ISFG4Helper::getEventInformation()
+/** return pointer to current AtlasG4EventUserInfo */
+AtlasG4EventUserInfo*
+iGeant4::ISFG4Helper::getAtlasG4EventUserInfo()
{
- return ( static_cast<EventInformation*> (G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation()) );
+ return ( static_cast<AtlasG4EventUserInfo*> (G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation()) );
}
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx
index 115c294a99af60a475c2aa2d83148441cd2358d9..39deff0dda1f6962659d640c1e0188d4c0071157 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx
@@ -19,7 +19,7 @@
#include "GeneratorObjects/McEventCollection.h"
#include "MCTruth/PrimaryParticleInformation.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
// HepMC classes
#include "AtlasHepMC/GenParticle.h"
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/ISFTrajectory.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/ISFTrajectory.cxx
index 586ec166aef9b620587fba11173f0b895a774bcd..ae443c2c671facec8b09193eb53644b850ea0411 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/ISFTrajectory.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/ISFTrajectory.cxx
@@ -22,7 +22,7 @@
//#include "FadsActions/TrackingAction.h"
// MCTruth includes
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/TrackInformation.h"
#include "MCTruth/TrackHelper.h"
@@ -101,8 +101,8 @@ void iGeant4::ISFTrajectory::AppendStep(const G4Step* aStep)
AtlasDetDescr::AtlasRegion geoID = baseIsp->nextGeoID();
- auto* eventInfo = ISFG4Helper::getEventInformation();
- iGeant4::Geant4TruthIncident truth(aStep, *baseIsp, geoID, eventInfo);
+ auto* atlasG4EvtUserInfo = ISFG4Helper::getAtlasG4EventUserInfo();
+ iGeant4::Geant4TruthIncident truth(aStep, *baseIsp, geoID, atlasG4EvtUserInfo);
if (m_truthRecordSvcQuick) {
m_truthRecordSvcQuick->registerTruthIncident(truth);
@@ -113,7 +113,7 @@ void iGeant4::ISFTrajectory::AppendStep(const G4Step* aStep)
// make sure that the TruthBinding of the ISFParticle points to the newest
// HepMC::GenParticle instance in case it got updated by the
// ITruthSvc::registerTruthIncident call above
- auto* currentGenPart = eventInfo->GetCurrentlyTraced();
+ auto* currentGenPart = atlasG4EvtUserInfo->GetCurrentlyTraced();
baseIsp->getTruthBinding()->setTruthParticle( currentGenPart );
Barcode::ParticleBarcode newBarcode = HepMC::barcode(currentGenPart);
baseIsp->setBarcode( newBarcode );
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/MCTruthUserAction.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/MCTruthUserAction.cxx
index 1ed277eddbec9d32f49a36b1b12177ead90ff59a..8c97095aaf66e20db9d8cd49ff5e8f29babb5a34 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/MCTruthUserAction.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/MCTruthUserAction.cxx
@@ -23,7 +23,7 @@
// Athena includes
#include "MCTruth/TrackInformation.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/TrackHelper.h"
#include "G4EventManager.hh"
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx
index b845ede14de0b1a4c65f8332a71487489083f7d5..de62457c715a1b66c4bc69304625386e3e6b8712 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx
@@ -21,7 +21,7 @@
//Athena includes
#include "AtlasDetDescr/AtlasRegion.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/VTrackInformation.h"
#include "MCTruth/TrackBarcodeInfo.h"
@@ -318,10 +318,10 @@ namespace G4UA{
if (process->GetProcessSubType()==2 ) m_ionloss+=eloss;
if (process->GetProcessSubType()==3 ) m_radloss+=eloss;
- EventInformation* eventInfo = static_cast<EventInformation*> (G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation());
+ AtlasG4EventUserInfo* atlasG4EvtUserInfo = static_cast<AtlasG4EventUserInfo*> (G4EventManager::GetEventManager()->GetConstCurrentEvent()->GetUserInformation());
VTrackInformation * trackInfo = static_cast<VTrackInformation*>(track->GetUserInformation());
const auto baseISP = const_cast<ISF::ISFParticle*>( trackInfo->GetBaseISFParticle() );
- ::iGeant4::Geant4TruthIncident truth( aStep, *baseISP, geoID, eventInfo);
+ ::iGeant4::Geant4TruthIncident truth( aStep, *baseISP, geoID, atlasG4EvtUserInfo);
unsigned int nSec = truth.numberOfChildren();
if (nSec>0 || track->GetTrackStatus()!=fAlive ) { // save interaction info
//std::cout <<"interaction:"<< process->GetProcessSubType() <<":"<<nSec<< std::endl;
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.cxx
index b69bec16eb8b0839392ff232d60ddc145c766e73..dab4b903e4322dbf9843578bf08f789080e64b0b 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.cxx
@@ -21,7 +21,7 @@
// Athena includes
#include "AtlasDetDescr/AtlasRegion.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/PrimaryParticleInformation.h"
#include "MCTruth/TrackHelper.h"
#include "MCTruth/TrackInformation.h"
@@ -49,7 +49,7 @@ namespace G4UA {
namespace iGeant4 {
TrackProcessorUserActionBase::TrackProcessorUserActionBase():
- m_eventInfo(nullptr),
+ m_atlasG4EvtUserInfo(nullptr),
m_curBaseISP(nullptr)
{;
}
@@ -57,14 +57,14 @@ TrackProcessorUserActionBase::TrackProcessorUserActionBase():
void TrackProcessorUserActionBase::BeginOfEventAction(const G4Event*)
{
m_curBaseISP = nullptr;
- m_eventInfo = ::iGeant4::ISFG4Helper::getEventInformation();
+ m_atlasG4EvtUserInfo = ::iGeant4::ISFG4Helper::getAtlasG4EventUserInfo();
return;
}
void TrackProcessorUserActionBase::EndOfEventAction(const G4Event*)
{
m_curBaseISP = nullptr;
- m_eventInfo = nullptr;
+ m_atlasG4EvtUserInfo = nullptr;
return;
}
@@ -204,8 +204,8 @@ void TrackProcessorUserActionBase::setCurrentParticle(ISF::ISFParticle* baseISFP
HepMC::GenParticlePtr truthCurrentlyTraced)
{
m_curBaseISP = baseISFParticle;
- m_eventInfo->SetCurrentPrimary( truthPrimary );
- m_eventInfo->SetCurrentlyTraced( truthCurrentlyTraced );
+ m_atlasG4EvtUserInfo->SetCurrentPrimary( truthPrimary );
+ m_atlasG4EvtUserInfo->SetCurrentlyTraced( truthCurrentlyTraced );
return;
}
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.h b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.h
index e5b215a382625e86a14e71b40c6142ccb209db06..8ee7d046c7d4b97ca642671deae19bcc588f174b 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.h
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionBase.h
@@ -16,7 +16,7 @@
#include "ISF_Event/ISFParticleContainer.h"
// forward declarations
-class EventInformation;
+class AtlasG4EventUserInfo;
#include "AtlasHepMC/GenParticle_fwd.h"
@@ -47,7 +47,7 @@ public:
ISF::ISFParticleContainer ReturnSecondaries(ISF::ISFParticle const* parent);
protected:
- EventInformation* m_eventInfo; //!< event-global G4 UserInformation
+ AtlasG4EventUserInfo* m_atlasG4EvtUserInfo; //!< event-global G4 UserInformation
ISF::ISFParticleContainer m_storedSecondaries;
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.cxx
index cb2774d200483c0a1819523df74c740c3851043f..1fdfb5dbe154f816eb4b5fc403f3dc5122e61a83 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.cxx
@@ -25,7 +25,7 @@
// MCTruth includes
#include "MCTruth/TrackBarcodeInfo.h"
#include "MCTruth/TrackHelper.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/TrackInformation.h"
#include "MCTruth/VTrackInformation.h"
@@ -175,7 +175,7 @@ namespace G4UA {
// " and is returned to ISF.");
const ISF::ISFParticle* parent = curISP;
- HepMC::GenParticlePtr truthParticle = m_eventInfo->GetCurrentlyTraced();
+ HepMC::GenParticlePtr truthParticle = m_atlasG4EvtUserInfo->GetCurrentlyTraced();
this->returnParticleToISF(aTrack, parent, truthParticle, nextGeoID);
}
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx
index 2b490c979487677f864487cec3722dea6dca9924..f281f3306fee835b7e1b01d8ae00e21e3f932f58 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx
@@ -23,7 +23,7 @@
#include "GaudiKernel/IThreadInitTool.h"
#include "MCTruth/PrimaryParticleInformation.h"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
// HepMC classes
#include "AtlasHepMC/GenParticle.h"
diff --git a/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.cxx b/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.cxx
index 646d3b15d701ee1993126a9d9fd702b2720c42b4..d83c4d2320399486645049a7974e0d51b7404746 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.cxx
+++ b/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.cxx
@@ -24,7 +24,7 @@ ISF::BaseSimulationSelector::BaseSimulationSelector(const std::string& type, con
m_simFlavorProp.declareUpdateHandler(&ISF::BaseSimulationSelector::SimulationFlavorHandler, this);
}
-void ISF::BaseSimulationSelector::SimulationFlavorHandler(Property&)
+void ISF::BaseSimulationSelector::SimulationFlavorHandler(Gaudi::Details::PropertyBase&)
{
// FIXME would probably be better to have this in SimulationFlavor.h
switch(m_simFlavorProp.value())
diff --git a/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.h b/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.h
index d0e9940463e33b46420041c7bc31c6488116c123..6b23eb1bc62e089b98b9f33c18c0db52ec42d68e 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.h
+++ b/Simulation/ISF/ISF_SimulationSelectors/src/BaseSimulationSelector.h
@@ -72,7 +72,7 @@ class BaseSimulationSelector : public extends<AthAlgTool, ISimulationSelector> {
bool m_isDynamic; //!< this selector is either dynamic or static
bool m_invertCuts; //!< invert the result given by passesCuts(..) method
Gaudi::CheckedProperty<unsigned short> m_simFlavorProp{0}; //!< the simulation flavour that this selector will select
- void SimulationFlavorHandler(Property&);
+ void SimulationFlavorHandler(Gaudi::Details::PropertyBase&);
ISF::SimulationFlavor m_simflavor{ISF::UndefinedSim}; //!< simulation flavor
};
diff --git a/Event/EventOverlay/OverlayByteStreamAlgs/CMakeLists.txt b/Simulation/Overlay/OverlayByteStreamUtils/CMakeLists.txt
similarity index 86%
rename from Event/EventOverlay/OverlayByteStreamAlgs/CMakeLists.txt
rename to Simulation/Overlay/OverlayByteStreamUtils/CMakeLists.txt
index 899ed6e11c7a89212223ce2c46a448f432c2ebe3..87f203488952884b690643986e501b54cbbd52ca 100644
--- a/Event/EventOverlay/OverlayByteStreamAlgs/CMakeLists.txt
+++ b/Simulation/Overlay/OverlayByteStreamUtils/CMakeLists.txt
@@ -1,13 +1,13 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
-atlas_subdir( OverlayByteStreamAlgs )
+atlas_subdir( OverlayByteStreamUtils )
# External dependencies:
find_package( ROOT COMPONENTS MathCore )
# Component(s) in the package:
-atlas_add_component( OverlayByteStreamAlgs
+atlas_add_component( OverlayByteStreamUtils
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
diff --git a/Event/EventOverlay/OverlayByteStreamAlgs/src/BSFilter.cxx b/Simulation/Overlay/OverlayByteStreamUtils/src/BSFilter.cxx
similarity index 100%
rename from Event/EventOverlay/OverlayByteStreamAlgs/src/BSFilter.cxx
rename to Simulation/Overlay/OverlayByteStreamUtils/src/BSFilter.cxx
diff --git a/Event/EventOverlay/OverlayByteStreamAlgs/src/BSFilter.h b/Simulation/Overlay/OverlayByteStreamUtils/src/BSFilter.h
similarity index 86%
rename from Event/EventOverlay/OverlayByteStreamAlgs/src/BSFilter.h
rename to Simulation/Overlay/OverlayByteStreamUtils/src/BSFilter.h
index bb52999ec6924e68cc3103ce7a81ce6c2b31b55c..3b9b128b0c3a5c5e7d850a914e99c181668bcf35 100644
--- a/Event/EventOverlay/OverlayByteStreamAlgs/src/BSFilter.h
+++ b/Simulation/Overlay/OverlayByteStreamUtils/src/BSFilter.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef OVERLAYBYTESTREAMALGS_BSFILTER_H
-#define OVERLAYBYTESTREAMALGS_BSFILTER_H
+#ifndef OVERLAYBYTESTREAMUTILS_BSFILTER_H
+#define OVERLAYBYTESTREAMUTILS_BSFILTER_H
#include <string>
#include <map>
@@ -37,4 +37,4 @@ class BSFilter : public AthAlgorithm
ServiceHandle< TrigConf::ITrigConfigSvc > m_trigConf;
};
-#endif //OVERLAYBYTESTREAMALGS_BSFILTER_H
+#endif // OVERLAYBYTESTREAMUTILS_BSFILTER_H
diff --git a/Event/EventOverlay/OverlayByteStreamAlgs/src/ByteStreamMultipleOutputStreamCopyTool.cxx b/Simulation/Overlay/OverlayByteStreamUtils/src/ByteStreamMultipleOutputStreamCopyTool.cxx
similarity index 100%
rename from Event/EventOverlay/OverlayByteStreamAlgs/src/ByteStreamMultipleOutputStreamCopyTool.cxx
rename to Simulation/Overlay/OverlayByteStreamUtils/src/ByteStreamMultipleOutputStreamCopyTool.cxx
diff --git a/Event/EventOverlay/OverlayByteStreamAlgs/src/ByteStreamMultipleOutputStreamCopyTool.h b/Simulation/Overlay/OverlayByteStreamUtils/src/ByteStreamMultipleOutputStreamCopyTool.h
similarity index 93%
rename from Event/EventOverlay/OverlayByteStreamAlgs/src/ByteStreamMultipleOutputStreamCopyTool.h
rename to Simulation/Overlay/OverlayByteStreamUtils/src/ByteStreamMultipleOutputStreamCopyTool.h
index e5485fe7f23609288986e42eca27c251fa155b23..6545a7789a69918104b416a706c44a779eba56f8 100644
--- a/Event/EventOverlay/OverlayByteStreamAlgs/src/ByteStreamMultipleOutputStreamCopyTool.h
+++ b/Simulation/Overlay/OverlayByteStreamUtils/src/ByteStreamMultipleOutputStreamCopyTool.h
@@ -2,8 +2,8 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef OVERLAYBYTESTREAMALGS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
-# define OVERLAYBYTESTREAMALGS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
+#ifndef OVERLAYBYTESTREAMUTILS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
+# define OVERLAYBYTESTREAMUTILS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
/**
* @file ByteStreamMultipleOutputStreamCopyTool.h
*
@@ -111,4 +111,4 @@ private:
};
-#endif // OVERLAYBYTESTREAMALGS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
+#endif // OVERLAYBYTESTREAMUTILS_BYTESTREAMMULTIPLEOUTPUTSTREAMCOPYTOOL_H
diff --git a/Event/EventOverlay/OverlayByteStreamAlgs/src/components/OverlayByteStreamAlgs_entries.cxx b/Simulation/Overlay/OverlayByteStreamUtils/src/components/OverlayByteStreamUtils_entries.cxx
similarity index 100%
rename from Event/EventOverlay/OverlayByteStreamAlgs/src/components/OverlayByteStreamAlgs_entries.cxx
rename to Simulation/Overlay/OverlayByteStreamUtils/src/components/OverlayByteStreamUtils_entries.cxx
diff --git a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
index b84d4eca1d7034eb9ade967b8c231aacfd8f9d86..a5a739aa446351fdb5dc2548d6a7af0e32025286 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
@@ -253,6 +253,14 @@ if hasattr(runArgs,'TruthReductionScheme'):
McEventCollectionFilter.UseTRTHits = False
except:
filterHitLog.error('Trying to run on upgrade samples (no TRT) with an old tag of McEventCollectionFilter - job will fail.')
+
+ ## For upgrade geometries the BCM has been removed, so should be switched off
+ if not DetFlags.detdescr.BCM_on():
+ try:
+ McEventCollectionFilter.UseBCMHits = False
+ except:
+ filterHitLog.error('Trying to run on upgrade samples (no BCM) with an old version of McEventCollectionFilter - job will fail.')
+
if not DetFlags.detdescr.CSC_on():
try:
McEventCollectionFilter.UseCSCHits = False
diff --git a/Simulation/SimulationJobOptions/share/g4/postInclude.McEventCollection.py b/Simulation/SimulationJobOptions/share/g4/postInclude.McEventCollection.py
new file mode 100644
index 0000000000000000000000000000000000000000..ef8dc2d20b079b190d20cd42ad8e54e94376dc21
--- /dev/null
+++ b/Simulation/SimulationJobOptions/share/g4/postInclude.McEventCollection.py
@@ -0,0 +1,10 @@
+#########################################################
+#########################################################
+from AthenaCommon.AlgSequence import AthSequencer
+## configure Athena for POOL persistency
+streamAlgs = ['StreamHITS']
+streamSeq = AthSequencer("AthOutSeq")
+for stream in streamAlgs:
+ sSoutStream = getattr(streamSeq, stream, None)
+ if sSoutStream is not None:
+ sSoutStream.ItemList += [ "McEventCollection#*" ]
diff --git a/Simulation/SimulationJobOptions/share/heavyIons/postInclude.HijingPars.py b/Simulation/SimulationJobOptions/share/heavyIons/postInclude.HijingPars.py
index c35afbf9132875a8a996386f49254fd818f5f7f5..b029b307b7ce6942c52362befed80ae7cd63f20e 100644
--- a/Simulation/SimulationJobOptions/share/heavyIons/postInclude.HijingPars.py
+++ b/Simulation/SimulationJobOptions/share/heavyIons/postInclude.HijingPars.py
@@ -10,7 +10,7 @@
# is called.
#
#########################################################
-from AthenaCommon.AlgSequence import AlgSequence
+from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
topSequence = AlgSequence()
from AthenaCommon.DetFlags import DetFlags
@@ -37,7 +37,7 @@ else:
## configure Athena for POOL persistency
streamAlgs = ['StreamHITS','StreamRDO','StreamESD','StreamAOD']
-streamSeq = AlgSequence("Streams")
+streamSeq = AthSequencer("AthOutSeq")
for stream in streamAlgs:
sSoutStream = getattr(streamSeq, stream, None)
tSoutStream = getattr(topSequence, stream, None)
diff --git a/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx b/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx
index 98cca5dec77c58e83a5a2db1ebe278921b9566e3..401e0e793ddcf2a5774b8e4309ac6aa0164d113c 100644
--- a/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx
+++ b/Simulation/Tools/CaloSamplingFractionAnalysis/src/LarEMSamplingFraction.cxx
@@ -14,7 +14,7 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ITHistSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GeneratorObjects/McEventCollection.h"
diff --git a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
index 0a6c9a1f712101a60a4c8446f66edcaf48ba89df..29b6fd61281d61ac2b6f2af16da72c62523e03ce 100644
--- a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
+++ b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.cxx
@@ -53,6 +53,7 @@ McEventCollectionFilter::McEventCollectionFilter(const std::string& name, ISvcLo
, m_UseCSCHits(true) // On unless RUN3 symmetric layout
, m_UseSTGCHits(false) // Off unless RUN3 layout
, m_UseMMHits(false) // Off unless RUN3 layout
+ , m_UseBCMHits(true) //On unless RUN4 layout
, m_RefBarcode(0)
{
declareProperty("TruthInput" , m_inputTruthCollection);
@@ -83,6 +84,7 @@ McEventCollectionFilter::McEventCollectionFilter(const std::string& name, ISvcLo
declareProperty("UseCSCHits" , m_UseCSCHits);
declareProperty("UseSTGCHits" , m_UseSTGCHits);
declareProperty("UseMMHits" , m_UseMMHits);
+ declareProperty("UseBCMHits" , m_UseBCMHits);
}
@@ -114,7 +116,7 @@ StatusCode McEventCollectionFilter::execute(){
//.......Reduce McEventCollection
ATH_CHECK( ReduceMCEventCollection() );
- //.......to relink all Si hits to the new particle
+ //.......to relink all Pixel/SCT hits to the new particle
ATH_CHECK( SiliconHitsTruthRelink() );
//.......to relink all TRT hits to the new particle
@@ -145,6 +147,11 @@ StatusCode McEventCollectionFilter::execute(){
if(m_UseMMHits) {
ATH_CHECK( MM_HitsTruthRelink() );
}
+
+ //.......to relink all BCM hits to the new particle
+ if(m_UseBCMHits) {
+ ATH_CHECK( BCMHitsTruthRelink() );
+ }
ATH_MSG_DEBUG( "succeded McEventCollectionFilter ..... " );
@@ -251,7 +258,7 @@ StatusCode McEventCollectionFilter::ReduceMCEventCollection(){
//--------------------------------------------------------
StatusCode McEventCollectionFilter::SiliconHitsTruthRelink(){
//--------------------------------------------------------
- //.......to relink all Si hits to the new particle
+ //.......to relink all Pixel/SCT hits to the new particle
//--------------------------------------------------------
//
if(!m_inputPixelHits.isValid())
@@ -276,6 +283,16 @@ StatusCode McEventCollectionFilter::SiliconHitsTruthRelink(){
ATH_CHECK(this->SiHitsTruthRelink(m_inputSCTHits,m_outputSCTHits));
+ return StatusCode::SUCCESS;
+}
+
+//--------------------------------------------------------
+StatusCode McEventCollectionFilter::BCMHitsTruthRelink(){
+ //--------------------------------------------------------
+ //.......to relink BCM hits to the new particle
+ //--------------------------------------------------------
+ //
+
if(!m_inputBCMHits.isValid())
{
ATH_MSG_ERROR( "Could not find BCM SiHitCollection");
diff --git a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.h b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.h
index 9e7dc44ed1a3c2e0b3579ef200e172d67782a9a1..28c363055ea4e1bdd127ef1d62fd4d005025b753 100644
--- a/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.h
+++ b/Simulation/Tools/McEventCollectionFilter/src/McEventCollectionFilter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MCEVENTCOLLECTIONFILTER_H
@@ -48,6 +48,7 @@ private:
StatusCode TGCHitsTruthRelink();
StatusCode STGC_HitsTruthRelink();
StatusCode MM_HitsTruthRelink();
+ StatusCode BCMHitsTruthRelink();
SG::ReadHandle<McEventCollection> m_inputTruthCollection;
SG::ReadHandle<SiHitCollection> m_inputBCMHits;
@@ -79,6 +80,7 @@ private:
bool m_UseCSCHits;
bool m_UseSTGCHits;
bool m_UseMMHits;
+ bool m_UseBCMHits;
//---------------------
//std::string m_HitName;
int m_RefBarcode;
diff --git a/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx b/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx
index 730da3a8ad9c428b65bf0187e564b4c816b868d4..7143e0ee41647d3f3b98450f2ddc3fc68ef80fe7 100644
--- a/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx
+++ b/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.cxx
@@ -1,10 +1,12 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "PixelRDOAnalysis.h"
#include "StoreGate/ReadHandle.h"
+#include "GeneratorObjects/McEventCollection.h"
+
#include "TTree.h"
#include "TString.h"
@@ -49,7 +51,6 @@ PixelRDOAnalysis::PixelRDOAnalysis(const std::string& name, ISvcLocator *pSvcLoc
, m_barcode_vec(0)
, m_eventIndex_vec(0)
, m_charge_vec(0)
-
, m_h_rdoID(0)
, m_h_rdoWord(0)
, m_h_barrelEndcap(0)
@@ -80,6 +81,7 @@ PixelRDOAnalysis::PixelRDOAnalysis(const std::string& name, ISvcLocator *pSvcLoc
, m_h_ecBCID(0)
, m_h_ecLVL1A(0)
, m_h_ecLVL1ID(0)
+ , m_h_TruthMatchedRDOs(nullptr)
, m_tree(0)
, m_ntupleFileName("/ntuples/file1")
@@ -316,6 +318,13 @@ StatusCode PixelRDOAnalysis::initialize() {
m_h_charge->StatOverflows();
ATH_CHECK(m_thistSvc->regHist(m_path + m_h_charge->GetName(), m_h_charge));
+ m_h_TruthMatchedRDOs = new TH1F("h_TruthMatchedPixelRDOs", "h_TruthMatchedPixelRDOs", 4, 1, 5);
+ TString truthMatchBinLables[4] = { "All RDOs", "Truth Matched", "HS Matched", "Unmatched" };
+ for(unsigned int ibin = 1; ibin < 5; ibin++) {
+ m_h_TruthMatchedRDOs->GetXaxis()->SetBinLabel(ibin, truthMatchBinLables[ibin-1]);
+ }
+ ATH_CHECK(m_thistSvc->regHist(m_path + m_h_TruthMatchedRDOs->GetName(), m_h_TruthMatchedRDOs));
+
return StatusCode::SUCCESS;
}
@@ -356,6 +365,18 @@ StatusCode PixelRDOAnalysis::execute() {
// Raw Data
SG::ReadHandle<PixelRDO_Container> p_pixelRDO_cont (m_inputKey);
+ //Adding SimMap and McEvent here for added truthMatching checks
+ SG::ReadHandle<InDetSimDataCollection> simDataMapPixel (m_inputTruthKey);
+ SG::ReadHandle<McEventCollection> mcEventCollection("TruthEvent");
+ bool doTruthMatching = true;
+ const HepMC::GenEvent* hardScatterEvent(nullptr);
+
+ if (mcEventCollection->size()==0){
+ ATH_MSG_WARNING("Failed to retrieve a nonzero sized truth event collection, disabling truthMatching");
+ doTruthMatching = false;
+ }
+ if(doTruthMatching) hardScatterEvent = mcEventCollection->at(0);
+
if(p_pixelRDO_cont.isValid()) {
// loop over RDO container
PixelRDO_Container::const_iterator rdoCont_itr(p_pixelRDO_cont->begin());
@@ -365,6 +386,30 @@ StatusCode PixelRDOAnalysis::execute() {
PixelRDO_Collection::const_iterator rdo_itr(p_pixelRDO_coll->begin());
const PixelRDO_Collection::const_iterator rdo_end(p_pixelRDO_coll->end());
for ( ; rdo_itr != rdo_end; ++rdo_itr ) {
+ if(doTruthMatching){
+ m_h_TruthMatchedRDOs->Fill(1.5);
+ bool findMatch = false;
+ if(simDataMapPixel.isValid()){
+ InDetSimDataCollection::const_iterator iter = (*simDataMapPixel).find((*rdo_itr)->identify());
+
+ if ( iter != (*simDataMapPixel).end() ) {
+ const InDetSimData& sdo = iter->second;
+ const std::vector< InDetSimData::Deposit >& deposits = sdo.getdeposits();
+ std::vector< InDetSimData::Deposit >::const_iterator nextdeposit = deposits.begin();
+ std::vector< InDetSimData::Deposit >::const_iterator lastdeposit = deposits.end();
+ for( ; nextdeposit!=lastdeposit; ++nextdeposit) {
+ const HepMcParticleLink& particleLink = nextdeposit->first;
+ if(particleLink.isValid() && !findMatch){
+ const HepMC::GenParticle *genPart(particleLink.cptr());
+ if(genPart->parent_event() == hardScatterEvent) m_h_TruthMatchedRDOs->Fill(3.5);
+ m_h_TruthMatchedRDOs->Fill(2.5);
+ findMatch = true;
+ }
+ }
+ }
+ }
+ if(!findMatch) m_h_TruthMatchedRDOs->Fill(4.5);
+ }
const Identifier rdoID((*rdo_itr)->identify());
const int pixBrlEc(m_pixelID->barrel_ec(rdoID));
const unsigned int rdoWord((*rdo_itr)->getWord());
@@ -432,7 +477,6 @@ StatusCode PixelRDOAnalysis::execute() {
}
// Sim Data
- SG::ReadHandle<InDetSimDataCollection> simDataMapPixel (m_inputTruthKey);
if(simDataMapPixel.isValid()) {
// loop over SDO container
InDetSimDataCollection::const_iterator sdo_itr(simDataMapPixel->begin());
diff --git a/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.h b/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.h
index c2371ca72506ad05162a96a57e0abf13c50bbab9..52ff0323b7ca6015009830901c151295b95db62d 100644
--- a/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.h
+++ b/Simulation/Tools/RDOAnalysis/src/PixelRDOAnalysis.h
@@ -123,6 +123,7 @@ private:
TH1* m_h_barcode;
TH1* m_h_eventIndex;
TH1* m_h_charge;
+ TH1* m_h_TruthMatchedRDOs;
TTree* m_tree;
std::string m_ntupleFileName;
diff --git a/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx b/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx
index 217f16dfbc99c839d22fbd9bb5d194fa42422037..383484cdac8b4b5cbd4cbfe2040fd05f496424a5 100644
--- a/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx
+++ b/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.cxx
@@ -5,6 +5,7 @@
#include "SCT_RDOAnalysis.h"
#include "InDetIdentifier/SCT_ID.h"
+#include "GeneratorObjects/McEventCollection.h"
#include "StoreGate/ReadHandle.h"
#include "TString.h"
@@ -81,6 +82,7 @@ SCT_RDOAnalysis::SCT_RDOAnalysis(const std::string& name, ISvcLocator *pSvcLocat
, m_h_eventIndex{nullptr}
, m_h_charge{nullptr}
, m_h_phi_v_eta_sdo{nullptr}
+ , m_h_TruthMatchedRDOs{nullptr}
, m_tree{nullptr}
, m_thistSvc("THistSvc", name)
@@ -282,6 +284,15 @@ StatusCode SCT_RDOAnalysis::initialize() {
m_h_phi_v_eta_sdo->StatOverflows();
ATH_CHECK(m_thistSvc->regHist(m_path.value() + m_h_phi_v_eta_sdo->GetName(), m_h_phi_v_eta_sdo));
+ m_h_TruthMatchedRDOs = new TH1F("h_TruthMatchedSCTRDOs", "h_TruthMatchedSCTRDOs", 4, 1, 5);
+ TString truthMatchBinLables[4] = { "All RDOs", "Truth Matched", "HS Matched", "Unmatched" };
+ for(unsigned int ibin = 1; ibin < 5; ibin++) {
+ m_h_TruthMatchedRDOs->GetXaxis()->SetBinLabel(ibin, truthMatchBinLables[ibin-1]);
+ }
+ ATH_CHECK(m_thistSvc->regHist(m_path + m_h_TruthMatchedRDOs->GetName(), m_h_TruthMatchedRDOs));
+
+
+
return StatusCode::SUCCESS;
}
@@ -317,7 +328,19 @@ StatusCode SCT_RDOAnalysis::execute() {
// RawData
SG::ReadHandle<SCT_RDO_Container> p_SCT_RDO_cont (m_inputKey);
- if (p_SCT_RDO_cont.isValid()) {
+ //Adding SimMap and McEvent here for added truthMatching checks
+ SG::ReadHandle<InDetSimDataCollection> simDataMapSCT (m_inputTruthKey);
+ SG::ReadHandle<McEventCollection> mcEventCollection("TruthEvent");
+
+ const HepMC::GenEvent* hardScatterEvent(nullptr);
+ bool doTruthMatching = true;
+ if (mcEventCollection->size()==0){
+ ATH_MSG_WARNING("Failed to retrieve a nonzero sized truth event collection, disabling truthMatching");
+ doTruthMatching = false;
+ }
+ if(doTruthMatching) hardScatterEvent = mcEventCollection->at(0);
+
+ if(p_SCT_RDO_cont.isValid()) {
// loop over RDO container
SCT_RDO_Container::const_iterator rdoCont_itr(p_SCT_RDO_cont->begin());
const SCT_RDO_Container::const_iterator rdoCont_end(p_SCT_RDO_cont->end());
@@ -328,6 +351,30 @@ StatusCode SCT_RDOAnalysis::execute() {
const SCT_RDO_Collection::const_iterator rdo_end(p_SCT_RDO_coll->end());
for ( ; rdo_itr != rdo_end; ++rdo_itr ) {
+ if(doTruthMatching){
+ m_h_TruthMatchedRDOs->Fill(1.5);
+ bool findMatch = false;
+ if(simDataMapSCT.isValid()){
+ InDetSimDataCollection::const_iterator iter = (*simDataMapSCT).find((*rdo_itr)->identify());
+
+ if ( iter != (*simDataMapSCT).end() ) {
+ const InDetSimData& sdo = iter->second;
+ const std::vector< InDetSimData::Deposit >& deposits = sdo.getdeposits();
+ std::vector< InDetSimData::Deposit >::const_iterator nextdeposit = deposits.begin();
+ std::vector< InDetSimData::Deposit >::const_iterator lastdeposit = deposits.end();
+ for( ; nextdeposit!=lastdeposit; ++nextdeposit) {
+ const HepMcParticleLink& particleLink = nextdeposit->first;
+ if(particleLink.isValid() && !findMatch){
+ const HepMC::GenParticle *genPart(particleLink.cptr());
+ if(genPart->parent_event() == hardScatterEvent) m_h_TruthMatchedRDOs->Fill(3.5);
+ m_h_TruthMatchedRDOs->Fill(2.5);
+ findMatch = true;
+ }
+ }
+ }
+ }
+ if(!findMatch) m_h_TruthMatchedRDOs->Fill(4.5);
+ }
const Identifier rdoID((*rdo_itr)->identify());
const unsigned int rdoWord((*rdo_itr)->getWord());
const int sctBrlEc(m_sctID->barrel_ec(rdoID));
@@ -383,7 +430,6 @@ StatusCode SCT_RDOAnalysis::execute() {
}
// SimData
- SG::ReadHandle<InDetSimDataCollection> simDataMapSCT (m_inputTruthKey);
if (simDataMapSCT.isValid()) {
// loop over SDO container
InDetSimDataCollection::const_iterator sdo_itr(simDataMapSCT->begin());
diff --git a/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.h b/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.h
index 38f7864104db09c9a2d508dd7ed26daffb3ae8de..7b81fd25cd21e4d51e25c1721425c326b4436665 100644
--- a/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.h
+++ b/Simulation/Tools/RDOAnalysis/src/SCT_RDOAnalysis.h
@@ -113,6 +113,8 @@ class SCT_RDOAnalysis : public AthAlgorithm {
TH1* m_h_eventIndex;
TH1* m_h_charge;
TH2* m_h_phi_v_eta_sdo;
+ TH1* m_h_TruthMatchedRDOs;
+
TTree* m_tree;
StringProperty m_ntupleFileName{this, "NtupleFileName", "/ntuples/file1"};
diff --git a/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx b/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
index 64f47ec3785439d206462b569c10773a835aadad..445fc27d1c9fd4735dd303233a56acfdf53029d6 100755
--- a/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
+++ b/TestBeam/TBCaloGeometry/src/TBCaloCoordinate.cxx
@@ -11,7 +11,7 @@
#include "TBCaloGeometry/TBCaloCoordinate.h"
#include "GaudiKernel/Bootstrap.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx b/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
index 9f77816c8067aac59393ad36cc4050ff90821073..fa1ab72feded07f8f4a77fdd9245a26993c6b8a5 100644
--- a/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
+++ b/TestBeam/TBCnv/src/TBByteStreamCnvTool.cxx
@@ -4,7 +4,7 @@
#include "TBCnv/TBByteStreamCnvTool.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "ByteStreamCnvSvc/ByteStreamCnvSvc.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
diff --git a/TileCalorimeter/TileConditions/src/TileEMScaleCondAlg.h b/TileCalorimeter/TileConditions/src/TileEMScaleCondAlg.h
index bad5ace034947621efa966fd9eddc0dbfe4bc492..740c31dd0d2a8a295148e549b1b3df7114010b4b 100644
--- a/TileCalorimeter/TileConditions/src/TileEMScaleCondAlg.h
+++ b/TileCalorimeter/TileConditions/src/TileEMScaleCondAlg.h
@@ -17,7 +17,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
/**
* @brief Condition algorithm to produce TileEMScale and put it into condition store
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
index eee3567b9a27d31bcea674b8a9227356068f640d..980e207ac8ce617c32039b97bf055d63a8d2be63 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.cc
@@ -50,7 +50,7 @@
#include "G4EventManager.hh"
#include "G4Event.hh"
#include "G4RunManager.hh"
-#include "MCTruth/EventInformation.h"
+#include "MCTruth/AtlasG4EventUserInfo.h"
#include "MCTruth/VTrackInformation.h"
@@ -177,7 +177,7 @@ TileGeoG4CalibSD::TileGeoG4CalibSD(const G4String& name, const std::vector<std::
m_addToCell = m_plateToCell;
m_addToGirder = !m_plateToCell;
- m_event_info = 0;
+ m_atlasG4EvtUserInfo = 0;
m_aStep = 0;
}
@@ -201,7 +201,7 @@ void TileGeoG4CalibSD::Initialize(G4HCofThisEvent* /*HCE*/) {
//TILECAL IDENTIFIER NUMBER - ALWAYS FIXED
m_subCalo = 3;
- m_event_info = 0;
+ m_atlasG4EvtUserInfo = 0;
m_E_em = 0.;
m_E_nonem = 0.;
@@ -236,14 +236,14 @@ G4bool TileGeoG4CalibSD::ProcessHits(G4Step* step, G4TouchableHistory* /*ROhist*
m_tile_eep->SetEscapedFlag(false);
}
- if (!m_event_info)
- m_event_info = dynamic_cast<EventInformation*>(G4RunManager::GetRunManager()->GetCurrentEvent()->GetUserInformation());
+ if (!m_atlasG4EvtUserInfo)
+ m_atlasG4EvtUserInfo = dynamic_cast<AtlasG4EventUserInfo*>(G4RunManager::GetRunManager()->GetCurrentEvent()->GetUserInformation());
// Update the event information to note that this step has been dealt with
- if ( m_event_info ) {
+ if ( m_atlasG4EvtUserInfo ) {
// Update the step info
- m_event_info->SetLastProcessedBarcode( step->GetTrack()->GetTrackID() );
- m_event_info->SetLastProcessedStep( step->GetTrack()->GetCurrentStepNumber() );
+ m_atlasG4EvtUserInfo->SetLastProcessedBarcode( step->GetTrack()->GetTrackID() );
+ m_atlasG4EvtUserInfo->SetLastProcessedStep( step->GetTrack()->GetCurrentStepNumber() );
}
//THIS METHOD WILL CHECK WHETER ARE ALL CLASSIFIED ENERGIES
@@ -356,7 +356,7 @@ G4bool TileGeoG4CalibSD::ProcessHits(G4Step* step, G4TouchableHistory* /*ROhist*
int primary_id = 0;
if (m_doCalibHitParticleID) {
- if (m_event_info && m_event_info->GetCurrentPrimary()) primary_id = HepMC::barcode(m_event_info->GetCurrentPrimary());
+ if (m_atlasG4EvtUserInfo && m_atlasG4EvtUserInfo->GetCurrentPrimary()) primary_id = HepMC::barcode(m_atlasG4EvtUserInfo->GetCurrentPrimary());
else throw std::runtime_error("CalibrationSensitiveDetector: Unable to retrieve barcode!");
}
diff --git a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
index 6a3a3fd70e4a0b4ee1f8dd03453dce0a23c3f5a6..008fc66f4d66abefd6b105513b1a9c11a668f38b 100644
--- a/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
+++ b/TileCalorimeter/TileG4/TileGeoG4Calib/src/TileGeoG4CalibSD.h
@@ -77,7 +77,7 @@ struct TileHitData;
class G4TouchableHistory;
class G4VPhysicalVolume;
-class EventInformation;
+class AtlasG4EventUserInfo;
#include <string>
#include <vector>
@@ -258,7 +258,7 @@ private:
bool m_addToGirder;
/** variable used for producing calibration hits signed with primary particle ID */
- EventInformation* m_event_info;
+ AtlasG4EventUserInfo* m_atlasG4EvtUserInfo;
class LessHit {
public:
diff --git a/TileCalorimeter/TileRecUtils/src/TileCellMaskingTool.cxx b/TileCalorimeter/TileRecUtils/src/TileCellMaskingTool.cxx
index 4a349f41b2635f858661dde6f119eb7767f17842..873bca789c38430f472ae4ac3d4aee92c3390e6d 100644
--- a/TileCalorimeter/TileRecUtils/src/TileCellMaskingTool.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileCellMaskingTool.cxx
@@ -4,7 +4,7 @@
// Gaudi includes
#include "GaudiKernel/Service.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Atlas includes
#include "AthenaKernel/errorcheck.h"
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilter.cxx
index 7a87b1650ba1b6c7f1e5f404ddfd169fcf1f706e..d929947ccbeadfcde1e4b95a06af0318e2a33ace 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilter.cxx
@@ -19,7 +19,7 @@
#include "AthenaKernel/errorcheck.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// lang include
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
index cd39b530c4a0594a9ffd01b88a0dd5e4f8885666..477d783b14c27d6ae612032870c0bcee46233b20 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFitFilterCool.cxx
@@ -5,7 +5,7 @@
#include "TileEvent/TileRawChannel.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IIncidentSvc.h"
// Atlas includes
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFlatFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFlatFilter.cxx
index da200a02a37d63df79d79cbabc67e427f1440f12..ca39c80ada9234938210ec6443532ba7c4685177 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFlatFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderFlatFilter.cxx
@@ -5,7 +5,7 @@
#include "TileEvent/TileRawChannel.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Atlas includes
#include "AthAllocators/DataPool.h"
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
index f5a53f0eea6a6787b4fee30a393f310d0bdb9918..b67c1087fb72cea2882577f95a7db03fb6915034 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderMF.cxx
@@ -18,7 +18,7 @@
#include "AthenaKernel/errorcheck.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// lang include
#include <algorithm>
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderManyAmps.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderManyAmps.cxx
index 21a8686b63a5bec5ddb7d2ff2e7fc4aa8331db27..234fb28ca51908b3369bdf802fc8af5e1623954f 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderManyAmps.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderManyAmps.cxx
@@ -15,7 +15,7 @@
#include "TileRecUtils/TileFilterTester.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//Atlas includes
#include "AthAllocators/DataPool.h"
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
index 2e0082e0d21f5c4030acaad63a2af4af21f7b0d0..5ef745a88fac3868e0220a6825dc3ede91b3384f 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderOpt2Filter.cxx
@@ -32,7 +32,7 @@
#include "AthenaKernel/errorcheck.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Matrix/Matrix.h"
//using namespace std;
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderQIEFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderQIEFilter.cxx
index 6f898b871acdef1abf4df12fbc06140737421f64..60d40ea8b5d54fb330c244508b804d92bbb44f3f 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderQIEFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderQIEFilter.cxx
@@ -22,7 +22,7 @@
#include "TileCalibBlobObjs/TileCalibUtils.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Atlas includes
#include "AthAllocators/DataPool.h"
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderWienerFilter.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderWienerFilter.cxx
index 6ec1792a13aa7515040778da89c45ac76804de69..2b3c7b9dba0f438f981f5ee10ca7bd4533482c3e 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderWienerFilter.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilderWienerFilter.cxx
@@ -6,7 +6,7 @@
#include "TileCalibBlobObjs/TileCalibUtils.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GeoModelInterfaces/IGeoModelSvc.h"
// Atlas includes
diff --git a/TileCalorimeter/TileSimUtils/src/TileCalibHitCntNtup.cxx b/TileCalorimeter/TileSimUtils/src/TileCalibHitCntNtup.cxx
index 6053a20abf54dfdd0721abcfdd90e26f12cbdd29..4b086efc0d24043504153bcb5c451c37df8a9689 100644
--- a/TileCalorimeter/TileSimUtils/src/TileCalibHitCntNtup.cxx
+++ b/TileCalorimeter/TileSimUtils/src/TileCalibHitCntNtup.cxx
@@ -6,7 +6,7 @@
// Atlas includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
// ROOT includes
diff --git a/TileCalorimeter/TileSimUtils/src/TileCalibHitNtuple.cxx b/TileCalorimeter/TileSimUtils/src/TileCalibHitNtuple.cxx
index 10e10f12f88907719cb0aafcb797a420448bfcad..70a433b97236713137014bd1057347f436555fbb 100644
--- a/TileCalorimeter/TileSimUtils/src/TileCalibHitNtuple.cxx
+++ b/TileCalorimeter/TileSimUtils/src/TileCalibHitNtuple.cxx
@@ -6,7 +6,7 @@
// Atlas includes
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaKernel/errorcheck.h"
// ROOT includes
diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref
index 875c9e0059df7ff7f6de2b3ce537cd10901472ca..210c184fddb4160df7483fcdef624421d6ea4def 100644
--- a/Tools/PROCTools/data/master_q221_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref
@@ -13,12 +13,12 @@
284500 87473091 43 49 3 0 2 1 1 5 2 3
284500 87473096 72 76 3 2 2 0 2 3 2 1
284500 87473104 61 63 6 0 6 1 5 5 4 1
- 284500 87473114 93 78 7 2 13 1 12 8 5 3
+ 284500 87473114 93 80 7 2 13 1 12 8 5 3
284500 87473121 93 100 6 3 16 4 12 6 5 1
284500 87473132 81 58 9 1 11 0 11 4 4 0
284500 87473137 81 71 8 3 15 0 15 6 6 0
284500 87473144 83 67 7 1 6 0 6 8 5 3
- 284500 87473154 89 89 7 0 10 2 8 8 4 4
+ 284500 87473154 89 88 7 0 10 2 8 8 4 4
284500 87473162 52 52 3 0 7 0 7 3 2 1
284500 87473167 74 54 6 3 12 2 10 13 8 5
284500 87473171 82 70 8 3 4 2 2 5 3 2
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 7601ecfd0c02496387da5da6cd41126fc184c31c..83524e312f5e124fb56c41ca175df124a9e61386 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -18,7 +18,7 @@
330470 1183753006 357 377 11 3
330470 1183754806 470 406 15 0
330470 1183769295 342 317 8 1
- 330470 1183769939 348 341 11 3
+ 330470 1183769939 348 340 11 3
330470 1183773832 307 198 7 0
330470 1183775209 57 0 0 0
330470 1183787124 431 361 11 2
diff --git a/Tools/PyJobTransforms/scripts/makeTrfJSONSignatures.py b/Tools/PyJobTransforms/scripts/makeTrfJSONSignatures.py
index 7f5f5461636d735acc17d2adb73fae24b8ee609a..66c370bed0eb0b60f995d1a4200cba1bc9b0bfe0 100755
--- a/Tools/PyJobTransforms/scripts/makeTrfJSONSignatures.py
+++ b/Tools/PyJobTransforms/scripts/makeTrfJSONSignatures.py
@@ -164,7 +164,7 @@ def main():
msg.info('Processing transform {0}:'.format(transform_path))
try:
- trfModule = __import__(transform_module, globals(), locals(), ['getTransform'], -1)
+ trfModule = __import__(transform_module, globals(), locals(), ['getTransform'], 0)
except Exception as e:
msg.warning('Failed to import transform {0} ({1}) - ignored'.format(transform_module, e))
diff --git a/Tools/PyJobTransforms/scripts/makeTrfSignatures.py b/Tools/PyJobTransforms/scripts/makeTrfSignatures.py
index 2ce23e42503c13b2a6cb188e85d57d6986579526..ed670c19c9ed4275b3529079a8d6f06dfeb30470 100755
--- a/Tools/PyJobTransforms/scripts/makeTrfSignatures.py
+++ b/Tools/PyJobTransforms/scripts/makeTrfSignatures.py
@@ -43,7 +43,7 @@ def main():
logging.info('Processing argument signatures for {0}'.format(trf))
# Use __import__ to allow us to import from the trf list
try:
- trfModule = __import__('{0}'.format(trf), globals(), locals(), ['getTransform'], -1)
+ trfModule = __import__('{0}'.format(trf), globals(), locals(), ['getTransform'], 0)
except ImportError:
logging.warning('Failed to import transform {0} - ignored'.format(trf))
continue
diff --git a/Tools/PyUtils/python/MetaReader.py b/Tools/PyUtils/python/MetaReader.py
index 3d6992790a3104f43876cd607c0f1139bb2770ba..ee7fb225fcc45ccc427ec4813528c517f8ef2d28 100644
--- a/Tools/PyUtils/python/MetaReader.py
+++ b/Tools/PyUtils/python/MetaReader.py
@@ -13,6 +13,8 @@ regexEventStreamInfo = re.compile(r'^EventStreamInfo(_p\d+)?$')
regexIOVMetaDataContainer = re.compile(r'^IOVMetaDataContainer(_p\d+)?$')
regexByteStreamMetadataContainer = re.compile(r'^ByteStreamMetadataContainer(_p\d+)?$')
regexXAODEventFormat = re.compile(r'^xAOD::EventFormat(_v\d+)?$')
+regexXAODTriggerMenu = re.compile(r'^DataVector<xAOD::TriggerMenu(_v\d+)?>$')
+regexXAODTriggerMenuAux = re.compile(r'^xAOD::TriggerMenuAuxContainer(_v\d+)?$')
regex_cppname = re.compile(r'^([\w:]+)(<.*>)?$')
# regex_persistent_class = re.compile(r'^([a-zA-Z]+_p\d+::)*[a-zA-Z]+_p\d+$')
regex_persistent_class = re.compile(r'^([a-zA-Z]+(_[pv]\d+)?::)*[a-zA-Z]+_[pv]\d+$')
@@ -146,6 +148,8 @@ def read_metadata(filenames, file_type = None, mode = 'lite', promote = None, me
'/Simulation/Parameters': 'IOVMetaDataContainer_p1',
'/Digitization/Parameters': 'IOVMetaDataContainer_p1',
'/EXT/DCS/MAGNETS/SENSORDATA': 'IOVMetaDataContainer_p1',
+ 'TriggerMenu': 'DataVector<xAOD::TriggerMenu_v1>',
+ 'TriggerMenuAux.': 'xAOD::TriggerMenuAuxContainer_v1',
'*': 'EventStreamInfo_p*'
}
@@ -158,6 +162,7 @@ def read_metadata(filenames, file_type = None, mode = 'lite', promote = None, me
branch = metadata_branches.At(i)
name = branch.GetName()
+
class_name = branch.GetClassName()
if regexIOVMetaDataContainer.match(class_name):
@@ -192,6 +197,10 @@ def read_metadata(filenames, file_type = None, mode = 'lite', promote = None, me
persistent_instances[name] = ROOT.IOVMetaDataContainer_p1()
elif regexXAODEventFormat.match(class_name):
persistent_instances[name] = ROOT.xAOD.EventFormat_v1()
+ elif regexXAODTriggerMenu.match(class_name):
+ persistent_instances[name] = ROOT.xAOD.TriggerMenuContainer_v1()
+ elif regexXAODTriggerMenuAux.match(class_name):
+ persistent_instances[name] = ROOT.xAOD.TriggerMenuAuxContainer_v1()
if name in persistent_instances:
branch.SetAddress(ROOT.AddressOf(persistent_instances[name]))
@@ -209,8 +218,13 @@ def read_metadata(filenames, file_type = None, mode = 'lite', promote = None, me
if hasattr(content, 'm_folderName'):
key = getattr(content, 'm_folderName')
- meta_dict[filename][key] = _convert_value(content)
+ aux = None
+ if key == 'TriggerMenu' and 'TriggerMenuAux.' in persistent_instances:
+ aux = persistent_instances['TriggerMenuAux.']
+ elif key == 'TriggerMenuAux.':
+ continue
+ meta_dict[filename][key] = _convert_value(content, aux)
# This is a required workaround which will temporarily be fixing ATEAM-560 originated from ATEAM-531
@@ -423,7 +437,7 @@ def _extract_fields(obj):
return result
-def _convert_value(value):
+def _convert_value(value, aux = None):
if hasattr(value, '__cppname__'):
result = regex_cppname.match(value.__cppname__)
@@ -452,6 +466,9 @@ def _convert_value(value):
elif value.__cppname__ == 'xAOD::EventFormat_v1':
return _extract_fields_ef(value)
+ elif value.__cppname__ == 'DataVector<xAOD::TriggerMenu_v1>' :
+ return _extract_fields_triggermenu(interface=value, aux=aux)
+
elif (value.__cppname__ == 'EventStreamInfo_p2' or
value.__cppname__ == 'EventStreamInfo_p3'):
return _extract_fields_esi(value)
@@ -576,6 +593,29 @@ def _extract_fields_ef(value):
return result
+def _extract_fields_triggermenu(interface, aux):
+ L1Items = []
+ HLTChains = []
+
+ try:
+ interface.setStore( aux )
+ if interface.size() > 0:
+ # We make the assumption that the first stored SMK is
+ # representative of all events in the input collection.
+ firstMenu = interface.at(0)
+ L1Items = [ item for item in firstMenu.itemNames() ]
+ HLTChains = [ chain for chain in firstMenu.chainNames() ]
+ except Exception as err:
+ msg.warn('Problem reading xAOD::TriggerMenu:')
+ msg.warn(err)
+
+ result = {}
+ result['L1Items'] = L1Items
+ result['HLTChains'] = HLTChains
+
+ return result
+
+
def _convert_event_type_bitmask(value):
types = None
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExCellWriterSvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExCellWriterSvc.h
index ec9bc4cd60dad47e2dc10eac751020e127c09d45..a0f2ae278f69ce02c4d3d8cc3ec7fcf241ecfc0d 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExCellWriterSvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExCellWriterSvc.h
@@ -7,7 +7,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "ActsGeometry/IActsExCellWriterSvc.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
index 9c6aa5d3058a8296f7eee7da2395dd427322651d..89635fe82c745fa86a91ed512e04dff1590691d0 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationAlg.h
@@ -8,7 +8,7 @@
// ATHENA
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
// ACTS
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
index 2be0eca267ffad316f940cc021b258423a3b5565..3b3588e846d323dfab659776bab1ba219e84abb3 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
@@ -9,9 +9,14 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
+// Need to include this early; otherwise, we run into errors with
+// ReferenceWrapperAnyCompat in clang builds due the is_constructable
+// specialization defined there getting implicitly instantiated earlier.
+#include "Acts/Propagator/Propagator.hpp"
+
// PACKAGE
#include "ActsGeometryInterfaces/IActsExtrapolationTool.h"
#include "ActsGeometryInterfaces/IActsTrackingGeometryTool.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
index c457d4ee3efc7186e6da1a7b372e6a9b91d97c90..6ae582a783f4b1d08e89b20db65538f4185a3865 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialJsonWriterTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
// PACKAGE
#include "ActsGeometryInterfaces/IActsMaterialJsonWriterTool.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
index 10a7105a2454a5b577f08d4154d85db3002dfb64..4cad3f6f2e6d9f0781921fdb49447f06201ec13a 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialMapping.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
#include "StoreGate/ReadHandleKey.h"
#include "TrkGeometry/MaterialStepCollection.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialTrackWriterSvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialTrackWriterSvc.h
index c8aeff8c547570008f850dc0fbe71aa8629fa78e..7c4e5a32d90eb45bde17de11d0532a349d89e049 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialTrackWriterSvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsMaterialTrackWriterSvc.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include <vector>
#include <deque>
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
index 23f101e8f8584a48d2b5474306a2a84fffe5198f..5ad9eea85e6fbe1d16901053dbb0d6e3086e2c14 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
@@ -11,7 +11,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "ActsGeometry/ActsGeometryContext.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
namespace Acts {
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsPropStepRootWriterSvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsPropStepRootWriterSvc.h
index 7c63e67f3a7f297c3a4a07e0e5964556dce2fc28..ec67d1c3b007b349b8bb489fac2e8e54c95df994 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsPropStepRootWriterSvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsPropStepRootWriterSvc.h
@@ -7,7 +7,7 @@
#include "AthenaBaseComps/AthService.h"
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "ActsGeometry/IActsPropStepRootWriterSvc.h"
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsSurfaceMappingTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsSurfaceMappingTool.h
index 95e225b023cce7ede305185212cd48cb7367c004..d9211d1e9bbff72b70b74d08cab51d2c85beca91 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsSurfaceMappingTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsSurfaceMappingTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
// PACKAGE
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsVolumeMappingTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsVolumeMappingTool.h
index e22160eb09baf4e517c8401aa77241a4d72af9ee..4b04bd4dd468ffafd4b1866e4158abf09c370fdc 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsVolumeMappingTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsVolumeMappingTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
// PACKAGE
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometry.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometry.h
index 9d79fb9e7ed6590d5daddfe8110e67e2c8842152..c86281634a50dc4c03a4d8d901ddea99b500507a 100755
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometry.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometry.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IAthRNGSvc.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
// PACKAGE
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometryTransforms.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometryTransforms.h
index 14d1da4953312df6e5d4c9c85b60d29c5086a7e3..32fcf333e67bfca3bcdf5d8d8fec32552b75d2f5 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometryTransforms.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsWriteTrackingGeometryTransforms.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "AthenaKernel/IAthRNGSvc.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
// PACKAGE
diff --git a/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py b/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py
new file mode 100644
index 0000000000000000000000000000000000000000..0537e430445c037d5230c3e65760aaab34f1bab1
--- /dev/null
+++ b/Tracking/Acts/ActsGeometry/python/ActsTrackingGeometryTool.py
@@ -0,0 +1,60 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+##################################################################################
+# The ActsTrackingGeometryTool fragment
+#
+# usage:
+# include('ActsGeometry/ActsTrackingGeometryTool.py')
+##################################################################################
+
+from __future__ import print_function
+
+# import the DetFlags for the setting
+from AthenaCommon.DetFlags import DetFlags
+
+from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
+
+# import the Extrapolator configurable
+from ActsGeometry.ActsGeometryConf import ActsTrackingGeometryTool
+
+class ConfiguredActsTrackingGeometry( ActsTrackingGeometryTool ) :
+ # constructor
+ def __init__(self,name):
+
+ subDetectors = []
+ if DetFlags.pixel_on():
+ subDetectors += ["Pixel"]
+ if DetFlags.SCT_on():
+ subDetectors += ["SCT"]
+ if DetFlags.TRT_on():
+ subDetectors += ["TRT"]
+ if DetFlags.Calo_on():
+ subDetectors += ["Calo"]
+
+ from ActsGeometry.ActsGeometryConf import ActsTrackingGeometrySvc
+ actsTrackingGeometrySvc = ActsTrackingGeometrySvc(name = "ActsTrackingGeometrySvc",
+ BuildSubDetectors = subDetectors)
+
+ from AthenaCommon.AppMgr import ServiceMgr
+ ServiceMgr += actsTrackingGeometrySvc
+
+
+ from ActsGeometry.ActsGeometryConf import NominalAlignmentCondAlg
+ from AthenaCommon.AlgSequence import AthSequencer
+ condSeq = AthSequencer("AthCondSeq")
+ if not hasattr(condSeq, "NominalAlignmentCondAlg"):
+ condSeq += NominalAlignmentCondAlg(name = "NominalAlignmentCondAlg")
+
+ ActsTrackingGeometryTool.__init__(self,
+ name,
+ ActsTrackingGeometrySvc=actsTrackingGeometrySvc)
+
+##################################################################################
+
+# now create the instance
+from AthenaCommon.AppMgr import ToolSvc
+if not hasattr(ToolSvc, "ActsTrackingGeometryTool"):
+ actsTrackingGeometryTool = ConfiguredActsTrackingGeometry(name = "ActsTrackingGeometryTool")
+ # add it to the ServiceManager
+ ToolSvc += actsTrackingGeometryTool
+
diff --git a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
index cfb416be91c90eadb1f7fbb522bdbe52a203c271..9b742841e1606e2e238c765fdcf1c9855850440c 100644
--- a/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
+++ b/Tracking/Acts/ActsPriVtxFinder/ActsPriVtxFinder/ActsAdaptiveMultiPriVtxFinderTool.h
@@ -9,7 +9,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/EventContext.h"
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "TrkTrackLink/ITrackLink.h"
@@ -17,6 +17,11 @@
#include "TrkTrack/LinkToTrack.h"
#include "InDetRecToolInterfaces/IVertexFinder.h"
+// Need to include this early; otherwise, we run into errors with
+// ReferenceWrapperAnyCompat in clang builds due the is_constructable
+// specialization defined there getting implicitly instantiated earlier.
+#include "Acts/Propagator/Propagator.hpp"
+
// PACKAGE
#include "ActsGeometryInterfaces/IActsTrackingGeometryTool.h"
#include "ActsGeometryInterfaces/IActsExtrapolationTool.h"
diff --git a/Tracking/Acts/ActsPriVtxFinder/share/ActsPriVtxFinder_jobOptions.py b/Tracking/Acts/ActsPriVtxFinder/share/ActsPriVtxFinder_jobOptions.py
new file mode 100644
index 0000000000000000000000000000000000000000..4189a85049cac4640b2cda11c2e743f326d25de6
--- /dev/null
+++ b/Tracking/Acts/ActsPriVtxFinder/share/ActsPriVtxFinder_jobOptions.py
@@ -0,0 +1,237 @@
+from AthenaCommon.AppMgr import ServiceMgr
+#--------------------------------------------------------------
+# control input
+#--------------------------------------------------------------
+# --- specify input type
+#if not 'readAOD' in dir():
+readAOD = True
+readESD = not readAOD
+
+# Use Acts AMVF
+doAMVF = True
+useActs = True
+#--------------------------------------------------------------
+# Event related parameters
+#--------------------------------------------------------------
+nEvents = 30
+
+# Set your input AOD file here
+myfile = ""
+
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+
+if readESD:
+ athenaCommonFlags.FilesInput = [ "ESD.pool.root" ]
+elif readAOD:
+ athenaCommonFlags.FilesInput = [ myfile ]
+
+import AthenaPython.ConfigLib as apcl
+cfg = apcl.AutoCfg(name = 'InDetRecExampleAutoConfig', input_files=athenaCommonFlags.FilesInput())
+
+theApp.EvtMax = nEvents
+
+#--------------------------------------------------------------
+# control output (here so RecExCommon via auto-config doesn't delete the global flags)
+#--------------------------------------------------------------
+# --- controls what is written out. ESD includes AOD, so it's normally enough
+doWriteESD = False and readESD
+doWriteAOD = True
+
+#--------------------------------------------------------------
+# control algorithms to be rerun
+#--------------------------------------------------------------
+# --- run InDetRecStatistics (only possible if readESD = True)
+doInDetRecStatistics = True and readESD
+# --- refit the EXISTING tracks in ESD (only possible if readESD = True)
+doRefitTracks = False and readESD
+# --- redo the pattern reco and the tracking (do not use that in conjunction with doRefitTracks above)
+redoPatternRecoAndTracking = False and not doRefitTracks and readESD
+# --- redo primary vertexing (will be set to true later automatically if you redid the tracking and want to redo the TrackParticle creation)
+reDoPrimaryVertexing = True
+# --- redo particle creation (recommended after revertexing on ESD, otherwise trackparticles are inconsistent)
+reDoParticleCreation = False and readESD and reDoPrimaryVertexing
+# --- redo conversion finding
+reDoConversions = False
+# --- redo V0 finding
+reDoV0Finder = False
+
+#--------------------------------------------------------------
+# Control - standard options (as in jobOptions.py)
+#--------------------------------------------------------------
+# --- Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
+OutputLevel = INFO
+# --- produce an atlantis data file
+doJiveXML = False
+# --- run the Virtual Point 1 event visualisation
+doVP1 = False
+# --- do auditors ?
+doAuditors = True
+
+import os
+if os.environ['CMTCONFIG'].endswith('-dbg'):
+ # --- do EDM monitor (debug mode only)
+ doEdmMonitor = True
+ # --- write out a short message upon entering or leaving each algorithm
+ doNameAuditor = True
+else:
+ doEdmMonitor = False
+ doNameAuditor = False
+
+# safety section ... redoing tracking/vertexing is a tricky business to stay consistent ...
+if redoPatternRecoAndTracking and reDoParticleCreation:
+ reDoPrimaryVertexing = True
+
+if not (readESD or readAOD):
+ print( "You have to turn on reading of ESD or AOD! That's the purpose of this jobO!")
+if readESD and readAOD:
+ print( "I can either read ESD or AOD but not both at the same time! Turn one or the other off!")
+if readESD and reDoPrimaryVertexing and not reDoParticleCreation:
+ print( "INFO! You are running on ESD, redoing the vertexing but not recreating the TrackParticles!")
+ print( "INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!")
+ if doWriteESD or doWriteAOD:
+ print( "INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new ESD/AOD!")
+if readAOD and reDoPrimaryVertexing:
+ print( "INFO! You are running on AOD, and redoing the vertexing. At the moment new track particles cannot be made from old ones.")
+ print( "INFO! To avoid inconsistencies do not use the old track particles in conjunction with the new vertex!")
+ if doWriteAOD:
+ print( "INFO! To avoid inconsistencies the old track particle (truth) container will not be in the new AOD!")
+if doRefitTracks and (reDoPrimaryVertexing or reDoParticleCreation):
+ print( "INFO! You are refitting tracks and also revertex and/or recreate track particles")
+ print( "INFO! The input for that will be the refitted tracks!")
+
+#--------------------------------------------------------------
+# Additional Detector setup
+#--------------------------------------------------------------
+
+from RecExConfig.RecFlags import rec
+rec.Commissioning=False
+
+from AthenaCommon.DetFlags import DetFlags
+# --- switch on InnerDetector
+DetFlags.ID_setOn()
+# --- and switch off all the rest
+DetFlags.Calo_setOff()
+DetFlags.Muon_setOff()
+# --- print(out)
+DetFlags.Print()
+
+#--------------------------------------------------------------
+# Load Reconstruction configuration for tools only
+#--------------------------------------------------------------
+#--------------------------------------------------------------
+# Load InDet configuration
+#--------------------------------------------------------------
+import MagFieldServices.SetupField
+
+from AthenaCommon.GlobalFlags import globalflags
+globalflags.DetDescrVersion = "ATLAS-R2-2016-00-01-00"
+
+# --- setup InDetJobProperties
+from InDetRecExample.InDetJobProperties import InDetFlags
+InDetFlags.doTruth = (globalflags.DataSource == 'geant4' and globalflags.InputFormat == "pool")
+InDetFlags.preProcessing = redoPatternRecoAndTracking
+InDetFlags.doPRDFormation = False # those two will be (later) automatically false if
+InDetFlags.doSpacePointFormation = redoPatternRecoAndTracking # preProcessing is false
+InDetFlags.doNewTracking = redoPatternRecoAndTracking
+#InDetFlags.doiPatRec = False
+#InDetFlags.doxKalman = False
+InDetFlags.doLowPt = False
+InDetFlags.doBackTracking = redoPatternRecoAndTracking
+InDetFlags.doTRTStandalone = redoPatternRecoAndTracking
+InDetFlags.doTrtSegments = redoPatternRecoAndTracking
+InDetFlags.postProcessing = reDoPrimaryVertexing or reDoParticleCreation or reDoConversions or doInDetRecStatistics or reDoV0Finder
+InDetFlags.doTrackSegmentsPixel = False
+InDetFlags.doTrackSegmentsSCT = False
+InDetFlags.doTrackSegmentsTRT = False
+InDetFlags.doSlimming = False
+InDetFlags.loadTools = True
+InDetFlags.doVertexFinding = reDoPrimaryVertexing
+InDetFlags.doParticleCreation = reDoParticleCreation
+InDetFlags.doConversions = reDoConversions
+InDetFlags.doSecVertexFinder = False
+InDetFlags.doV0Finder = reDoV0Finder
+InDetFlags.doSimpleV0Finder = False
+InDetFlags.doTrkNtuple = False
+InDetFlags.doPixelTrkNtuple = False
+InDetFlags.doSctTrkNtuple = False
+InDetFlags.doTrtTrkNtuple = False
+#InDetFlags.doPixelClusterNtuple = False
+InDetFlags.doSctClusterNtuple = False
+#InDetFlags.doTrtDriftCircleNtuple = False
+InDetFlags.doVtxNtuple = False
+InDetFlags.doConvVtxNtuple = False
+InDetFlags.doV0VtxNtuple = False
+InDetFlags.doRefit = doRefitTracks
+InDetFlags.doLowBetaFinder = False
+InDetFlags.doPrintConfigurables = True
+
+# --- activate (memory/cpu) monitoring
+#InDetFlags.doPerfMon = True
+
+# IMPORTANT NOTE: initialization of the flags and locking them is done in InDetRec_jobOptions.py!
+# This way RecExCommon just needs to import the properties without doing anything else!
+# DO NOT SET JOBPROPERTIES AFTER THIS LINE! The change will be ignored!
+
+from InDetRecExample.InDetKeys import InDetKeys
+if InDetFlags.doVertexFinding() and readAOD:
+ InDetKeys.Tracks = InDetKeys.TrackParticles()
+
+# uncomment if you don't want to overwrite the original fits (e.g. for comparison)
+# this would also require enabling "pass-through" output mode (see bottom of this file)
+# or else manually adding the input collection to the output stream
+if InDetFlags.doVertexFinding():
+ InDetKeys.xAODVertexContainer = "RefitPrimaryVertices"
+
+if readESD and not redoPatternRecoAndTracking:
+ InDetKeys.UnslimmedTracks = 'Tracks'
+ InDetKeys.UnslimmedTracksTruth = 'TrackTruthCollection'
+
+# Set container names
+if doWriteESD:
+ InDetKeys.OutputESDFileName = "InDetRecESD_new.root"
+
+toolString = ""
+if useActs:
+ toolString = "acts"
+else:
+ toolString = "athena"
+
+if doWriteAOD:
+ InDetKeys.OutputAODFileName = "InDetRecAOD_{}_n{}.root".format(toolString,nEvents)
+
+print( "Printing InDetKeys")
+InDetKeys.lockAllExceptAlias()
+InDetKeys.print_JobProperties()
+
+#--------------------------------------------------------------
+# enable statistics for reading ESD testing
+#--------------------------------------------------------------
+
+InDetFlags.doStatistics = doInDetRecStatistics
+TrackCollectionKeys = [InDetKeys.Tracks()]
+TrackCollectionTruthKeys = [InDetKeys.TracksTruth()]
+
+# Uncomment to use variant vertex seeding and/or finding
+if doAMVF:
+ InDetFlags.primaryVertexSetup = "GaussAdaptiveMultiFinding"
+# Use Acts primary vertexing
+InDetFlags.useActsPriVertexing = useActs
+
+#--------------------------------------------------------------
+# load master joboptions file
+#--------------------------------------------------------------
+
+include("InDetRecExample/InDetRec_all.py")
+
+from GaudiSvc.GaudiSvcConf import THistSvc
+ServiceMgr += THistSvc()
+ServiceMgr.THistSvc.Output += ["InDetAdaptiveMultiPriVxFinderTool DATAFILE='AMVF_{}_output_nEvent{}.root' OPT='RECREATE'".format(toolString,nEvents)]
+
+# Set to True if you want to write out all input data ("pass-through" mode)
+if doWriteESD:
+ StreamESD.TakeItemsFromInput = False
+
+if doWriteAOD:
+ StreamAOD.TakeItemsFromInput = True
+
+from AthenaCommon.ConfigurationShelve import saveToAscii; saveToAscii("config_vertexing_{}.txt".format(toolString));
diff --git a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
index 3cd5914f102f2921bbbfbb65943659944934fdb5..69d853cb9831bec7db9f5de319ddffe1630a781b 100755
--- a/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
+++ b/Tracking/Acts/ActsPriVtxFinder/src/ActsAdaptiveMultiPriVtxFinderTool.cxx
@@ -104,7 +104,7 @@ ActsAdaptiveMultiPriVtxFinderTool::initialize()
// Vertex seed finder
VertexSeedFinder::Config seedFinderConfig;
- //seedFinderConfig.trackDensityEstimator = trackDensity;
+ seedFinderConfig.trackDensityEstimator = trackDensity;
VertexSeedFinder seedFinder(seedFinderConfig, extractParameters);
VertexFinder::Config finderConfig(std::move(fitter), seedFinder,
ipEst, linearizer);
diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/ATLAS_CHECK_THREAD_SAFETY b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/TrkAmbiguitySolver/TrkAmbiguityScore.h b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/TrkAmbiguitySolver/TrkAmbiguityScore.h
index 32807c8294f1e8dd7908a01d1527b18c9852202f..e112ca6e98f251c12c2a9d27e3b46cab471586e6 100644
--- a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/TrkAmbiguitySolver/TrkAmbiguityScore.h
+++ b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/TrkAmbiguitySolver/TrkAmbiguityScore.h
@@ -11,7 +11,7 @@ TrkAmbiguityScore Algorithm
#ifndef TRKAMBIGUITYSCORE_H
#define TRKAMBIGUITYSCORE_H
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "TrkTrack/TrackCollection.h"
#include "AthContainers/DataVector.h"
@@ -24,14 +24,14 @@ namespace Trk
class ITrackAmbiguityProcessorTool;
class ITrackAmbiguityScoreProcessorTool;
- class TrkAmbiguityScore : public AthAlgorithm
+ class TrkAmbiguityScore : public AthReentrantAlgorithm
{
public:
TrkAmbiguityScore(const std::string& name, ISvcLocator* pSvcLocator);
~TrkAmbiguityScore(void);
StatusCode initialize(void) override;
- StatusCode execute(void) override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize(void) override;
private:
diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/TrkAmbiguitySolver/TrkAmbiguitySolver.h b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/TrkAmbiguitySolver/TrkAmbiguitySolver.h
index 2bb6b3820de88ceefd26ebbd0a8ba15e47759d0b..600744a934b4775cb3d5cbe2e699c63a00d8c468 100644
--- a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/TrkAmbiguitySolver/TrkAmbiguitySolver.h
+++ b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/TrkAmbiguitySolver/TrkAmbiguitySolver.h
@@ -11,7 +11,7 @@ TrkAmbiguitySolver Algorithm
#ifndef TRKAMBIGUITYSOLVER_H
#define TRKAMBIGUITYSOLVER_H
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "TrkTrack/TrackCollection.h"
#include "AthContainers/DataVector.h"
@@ -30,7 +30,7 @@ namespace Trk
Actually at the moment, this functionality is disabled - all TrkAmbiguitySolver does is to load Trk::Tracks (from
a location passed by jobOptions) and save them into (by default) "Tracks"*/
- class TrkAmbiguitySolver : public AthAlgorithm
+ class TrkAmbiguitySolver : public AthReentrantAlgorithm
{
public:
@@ -38,7 +38,7 @@ namespace Trk
~TrkAmbiguitySolver(void);
StatusCode initialize(void) override;
- StatusCode execute(void) override;
+ StatusCode execute(const EventContext& ctx) const override;
StatusCode finalize(void) override;
private:
@@ -46,19 +46,12 @@ namespace Trk
SG::ReadHandleKey<TracksScores> m_scoredTracksKey;
SG::WriteHandleKey<TrackCollection> m_resolvedTracksKey;//!<where to save the resolved tracks
ToolHandle<ITrackAmbiguityProcessorTool> m_ambiTool;
-
- /** decides whether ambi processing actually occurs
- (if not, the tracks are just resaved).
- Default=false.*/
- bool m_applySolve;
-
+
/**Number of tracks input. Useful for debugging*/
- std::atomic<long int> m_trackInCount;
+ mutable std::atomic<long int> m_trackInCount;
/**Number of tracks passing Ambi solving. Useful for debugging*/
- std::atomic<long int> m_trackOutCount;
+ mutable std::atomic<long int> m_trackOutCount;
- /** Save the processed tracks. If ambiguity process has not been called then they will
- still be the original converted tracks */
};
}
diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/TrkAmbiguityScore.cxx b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/TrkAmbiguityScore.cxx
index cfa166e9d1dda4cca537d3f19a598f4e47b2043d..a6e67930c9bfdbfde4d29e3f6313a305716fe8ff 100644
--- a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/TrkAmbiguityScore.cxx
+++ b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/TrkAmbiguityScore.cxx
@@ -6,7 +6,7 @@
#include "TrkToolInterfaces/ITrackAmbiguityScoreProcessorTool.h"
Trk::TrkAmbiguityScore::TrkAmbiguityScore(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm (name, pSvcLocator),
+ AthReentrantAlgorithm (name, pSvcLocator),
m_originTracksKey{""},
m_scoredTracksKey("Tracks"),
m_scoreTool("",this)
@@ -36,9 +36,9 @@ Trk::TrkAmbiguityScore::initialize()
//-------------------------------------------------------------------------
StatusCode
-Trk::TrkAmbiguityScore::execute()
+Trk::TrkAmbiguityScore::execute(const EventContext& ctx) const
{
- std::vector<SG::ReadHandle<TrackCollection>> handles = m_originTracksKey.makeHandles();
+ std::vector<SG::ReadHandle<TrackCollection>> handles = m_originTracksKey.makeHandles(ctx);
size_t totalsize = 0;
for (SG::ReadHandle<TrackCollection>& trackColHandle : handles) {
if (!trackColHandle.isValid())
@@ -61,12 +61,13 @@ Trk::TrkAmbiguityScore::execute()
m_scoreTool->process(&originTracks, scoredTracks.get());
}
else{
+ scoredTracks->reserve(originTracks.size());
for(const Track* trk: originTracks ){
- scoredTracks->push_back( std::pair<const Track*, float>(trk, 0));//TODO: logpT
+ scoredTracks->push_back( std::pair<const Track*, float>(trk, 0));//TODO: logpT
}
}
- SG::WriteHandle<TracksScores> scoredTracksHandle(m_scoredTracksKey);
+ SG::WriteHandle<TracksScores> scoredTracksHandle(m_scoredTracksKey, ctx);
ATH_CHECK(scoredTracksHandle.record(std::move(scoredTracks)));
return StatusCode::SUCCESS;
}
diff --git a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/TrkAmbiguitySolver.cxx b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/TrkAmbiguitySolver.cxx
index d78ebcc0c7138dbcf23dbac5b16c58fe692017e1..d5acba4f127a3a02102ab530be1a776428ef7701 100644
--- a/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/TrkAmbiguitySolver.cxx
+++ b/Tracking/TrkAlgorithms/TrkAmbiguitySolver/src/TrkAmbiguitySolver.cxx
@@ -7,18 +7,16 @@
#include "TrkToolInterfaces/ITrackAmbiguityScoreProcessorTool.h"
Trk::TrkAmbiguitySolver::TrkAmbiguitySolver(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm (name, pSvcLocator),
+ AthReentrantAlgorithm (name, pSvcLocator),
m_scoredTracksKey(""),
m_resolvedTracksKey("Tracks"),
m_ambiTool("Trk::SimpleAmbiguityProcessorTool/TrkAmbiguityProcessor", this),
- m_applySolve(true),
m_trackInCount(0),
m_trackOutCount(0)
{
declareProperty("TrackInput" , m_scoredTracksKey);
declareProperty("TrackOutput" , m_resolvedTracksKey);
declareProperty("AmbiguityProcessor", m_ambiTool);
- declareProperty("ResolveTracks" , m_applySolve);
}
//--------------------------------------------------------------------------
@@ -29,15 +27,7 @@ Trk::TrkAmbiguitySolver::~TrkAmbiguitySolver(void)
StatusCode
Trk::TrkAmbiguitySolver::initialize()
{
- ATH_MSG_INFO( "TrkAmbiguitySolver::initialize(). " );
-
- if (m_applySolve) {
- ATH_CHECK(m_ambiTool.retrieve());
- ATH_MSG_INFO( "Retrieved tool " << m_ambiTool );
- } else {
- ATH_MSG_INFO( "ATTENTION: Resolving tracks turned off! " );
- m_ambiTool.disable();
- }
+ ATH_CHECK(m_ambiTool.retrieve());
ATH_CHECK(m_scoredTracksKey.initialize());
ATH_CHECK(m_resolvedTracksKey.initialize());
@@ -48,25 +38,18 @@ Trk::TrkAmbiguitySolver::initialize()
//-------------------------------------------------------------------------
StatusCode
-Trk::TrkAmbiguitySolver::execute()
+Trk::TrkAmbiguitySolver::execute(const EventContext& ctx) const
{
ATH_MSG_VERBOSE ("TrkAmbiguitySolver::execute()");
- SG::ReadHandle<TracksScores> scoredTracksHandle(m_scoredTracksKey);
+ SG::ReadHandle<TracksScores> scoredTracksHandle(m_scoredTracksKey, ctx);
if ( !scoredTracksHandle.isValid() ) ATH_MSG_ERROR("Could not read scoredTracks.");
m_trackInCount += scoredTracksHandle->size();
+
std::unique_ptr<TrackCollection> resolvedTracks;
- if (m_applySolve ){
- resolvedTracks.reset(m_ambiTool->process(scoredTracksHandle.cptr())); //note: take ownership and delete
- }
- else{
- resolvedTracks = std::make_unique<TrackCollection>(SG::VIEW_ELEMENTS);
- resolvedTracks->reserve(scoredTracksHandle->size());
- for(const std::pair< const Trk::Track *, float> &e: *scoredTracksHandle) {
- resolvedTracks->push_back(const_cast<Trk::Track *>(e.first));
- }
- }
+ resolvedTracks.reset(m_ambiTool->process(scoredTracksHandle.cptr())); //note: take ownership and delete
m_trackOutCount += resolvedTracks->size();
- SG::WriteHandle<TrackCollection> resolvedTracksHandle(m_resolvedTracksKey);
+
+ SG::WriteHandle<TrackCollection> resolvedTracksHandle(m_resolvedTracksKey, ctx);
ATH_CHECK(resolvedTracksHandle.record(std::move(resolvedTracks)));
ATH_MSG_VERBOSE ("Saved "<<resolvedTracksHandle->size()<<" tracks");
return StatusCode::SUCCESS;
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h b/Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h
index 843ae7714d571b9058277f295bbaea7bd8ad7071..22f57382df0e485cf182f9649b9e362544af49ae 100755
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/TrkDetDescrSvc/TrackingGeometrySvc.h
@@ -14,7 +14,7 @@
#include "TrkGeometry/LayerMaterialMap.h"
#include "TrkDetDescrInterfaces/IGeometryBuilder.h"
#include "TrkDetDescrInterfaces/IGeometryProcessor.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaKernel/IOVSvcDefs.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Tracking/TrkDetDescr/TrkDetDescrTools/CMakeLists.txt b/Tracking/TrkDetDescr/TrkDetDescrTools/CMakeLists.txt
index d4f4f8bdc2013fcf0da89bc3765aa744d67420c2..98e40a3fc130e53bb91df27fe7dead66cf03ccef 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrTools/CMakeLists.txt
+++ b/Tracking/TrkDetDescr/TrkDetDescrTools/CMakeLists.txt
@@ -1,34 +1,10 @@
-################################################################################
-# Package: TrkDetDescrTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrkDetDescrTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
- Tracking/TrkDetDescr/TrkDetDescrUtils
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkVolumes
- PRIVATE
- AtlasGeometryCommon/SubDetectorEnvelopes
- Event/EventPrimitives
- Tracking/TrkDetDescr/TrkSurfaces )
-
-# External dependencies:
-find_package( Eigen )
-
# Component(s) in the package:
atlas_add_component( TrkDetDescrTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GeoPrimitives GaudiKernel TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry TrkVolumes EventPrimitives TrkSurfaces )
-
-# Install files from the package:
-atlas_install_headers( TrkDetDescrTools )
-
+ LINK_LIBRARIES AthenaBaseComps EventPrimitives GaudiKernel GeoPrimitives SubDetectorEnvelopesLib TrkDetDescrInterfaces TrkDetDescrUtils TrkGeometry TrkSurfaces TrkVolumes )
diff --git a/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/ResidualPull.icc b/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/ResidualPull.icc
index c47bd50e8749ec48d92d2b2ba7edf1e49e1519e4..bb0819538c31458e33d8e3251b51e6ca72afaa3b 100644
--- a/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/ResidualPull.icc
+++ b/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/ResidualPull.icc
@@ -2,6 +2,8 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#include <stdexcept>
+
namespace Trk {
// constructor with parameters
inline Trk::ResidualPull::ResidualPull(
diff --git a/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/CMakeLists.txt b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/CMakeLists.txt
index 3011f269fb4381180b7a7062f0e27f1c6d4670b5..8d4149792b3aad99d6952657476d80d681585b0a 100644
--- a/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/CMakeLists.txt
+++ b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/CMakeLists.txt
@@ -5,21 +5,15 @@
# Declare the package name:
atlas_subdir( TrkMultiComponentStateOnSurface )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack
- PRIVATE
- GaudiKernel
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkMeasurementBase )
-
# Component(s) in the package:
atlas_add_library( TrkMultiComponentStateOnSurface
src/*.cxx
PUBLIC_HEADERS TrkMultiComponentStateOnSurface
- LINK_LIBRARIES TrkEventPrimitives TrkParameters TrkTrack
+ LINK_LIBRARIES TrkEventPrimitives TrkParameters TrkTrack AthContainers
PRIVATE_LINK_LIBRARIES GaudiKernel TrkSurfaces TrkMaterialOnTrack TrkMeasurementBase )
+atlas_add_dictionary( TrkMultiComponentStateOnSurfaceDict
+ TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurfaceDict.h
+ TrkMultiComponentStateOnSurface/selection.xml
+ LINK_LIBRARIES TrkMultiComponentStateOnSurface)
+
diff --git a/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h
index 09b2c1624d5a1da0beac8a003001992532752556..a88f025329fcd4f8f64d383751f305309c2d4d8a 100755
--- a/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h
+++ b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h
@@ -9,15 +9,15 @@ begin : Monday 20th December 2004
author : atkinson, amorley,anastopoulos
email : Anthony.Morley@cern.ch (adapted from Edward Moyse)
description : This class is a multi component adaption of the class
- TrackStateOnSurface.
+ TrackStateOnSurface.
In that class the track state was
represented by a single 5 component track paramter
vector (a0, z0, phi0, theta0, q/p) and the associated
- covariance matrix.
- In its multi-component form the track state on surface
- is represented by many track parameters each with a covariance matrix
- and additionally a weighting is attached to each component
- which reflects the importance of that particular component
+ covariance matrix.
+ In its multi-component form the track state on surface
+ is represented by many track parameters each with a covariance matrix
+ and additionally a weighting is attached to each component
+ which reflects the importance of that particular component
in the overall mixture of components which is used to describe
the track state at that surface.
Instances of this class are EDM objects. So objects passed
@@ -101,7 +101,7 @@ public:
/** Clone method for deep copy of MultiComponentStateOnSurface - overidden from base class */
virtual TrackStateOnSurface* clone() const override final;
-
+
/** This is Multi, since we MultiComponent */
virtual TrackStateOnSurface::Variety variety() const override final;
@@ -126,5 +126,13 @@ operator<<(std::ostream&, const MultiComponentStateOnSurface&);
} // end of Trk namespace
+/// Trk::Track is constucted from DataVector<const Trk::TrackStateOnSurface>.
+/// Let the type system know this class inherits so we can have
+/// DataVector<const Trk::MultiComponentStateOnSurface>
+#include "AthContainers/DataVector.h"
+DATAVECTOR_BASE(const Trk::MultiComponentStateOnSurface,const Trk::TrackStateOnSurface);
+typedef DataVector<const Trk::MultiComponentStateOnSurface> TrkMultiComponentStateOnSurfaceDV;
+
+
#include "TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.icc"
#endif
diff --git a/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurfaceDict.h b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurfaceDict.h
new file mode 100644
index 0000000000000000000000000000000000000000..fcd55673abcfcb5dcf97938a10ef4db78a8ede8f
--- /dev/null
+++ b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurfaceDict.h
@@ -0,0 +1,9 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TrkMultiComponentStateOnSurfaceDict_H
+#define TrkMultiComponentStateOnSurfaceDitc_H
+#include "TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h"
+#endif
+
diff --git a/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/selection.xml b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/selection.xml
new file mode 100644
index 0000000000000000000000000000000000000000..572d27dd347b7846dc46d6955609f71bc0eb97d5
--- /dev/null
+++ b/Tracking/TrkEvent/TrkMultiComponentStateOnSurface/TrkMultiComponentStateOnSurface/selection.xml
@@ -0,0 +1,10 @@
+<lcgdict>
+
+<class name = "Trk::MultiComponentStateOnSurface" >
+<field name = "m_multiComponentState" transient="true" />
+<field name = "m_mixtureModeQoverP" transient="true" />
+</class>
+
+<class name="TrkMultiComponentStateOnSurfaceDV" />
+
+</lcgdict>
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
index aa969d304ab7560608f5adf3ba6dad5e0698ada4..fa61505d3492948c4159589b4006b7b8bd42e5b8 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/ExtrapolatorComparisonTest.h
@@ -15,7 +15,7 @@
// ATHENA
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ISvcLocator.h"
#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/RndmGenerators.h"
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
index 420ca7a2f2fc413999e2e55b9185e63eb910822f..af7335299ac5a57adaa47b0d247cde9821c7f28d 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
@@ -7,7 +7,7 @@
#define TRKEXALGS_PROPRESULTROOTWRITERSVC_H
#include "GaudiKernel/IInterface.h"
-#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
+#include "Gaudi/Property.h" /*no forward decl: typedef*/
#include "GaudiKernel/ITHistSvc.h"
#include "AthenaBaseComps/AthService.h"
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IMaterialEffectsUpdator.h b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IMaterialEffectsUpdator.h
index 1334fae9d69713437536362869bd13daf7827e0e..a2aae99c34fe19c8d37adbeaedcda384411df0a2 100755
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IMaterialEffectsUpdator.h
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/IMaterialEffectsUpdator.h
@@ -84,61 +84,61 @@ public:
virtual std::unique_ptr<ICache> getCache() const = 0;
/** Updator interface (full update for a layer):
- The parmeters are given as a pointer, they are delete inside the update
+ The parameters are given as a pointer, they are delete inside the update
method. Layer-based material update
*/
virtual const TrackParameters* update(
ICache& icache,
- const TrackParameters* parm,
+ const TrackParameters* param,
const Layer& sf,
PropDirection dir = alongMomentum,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const = 0;
/** User updator interface (full update for a layer):
- The parmeters are given as a pointer, they are deleted inside the update
- method. Update occurs on the place where the parameters parm are according
- to the specified MaterialEffectsOnTrack
+ The parameters are given as a pointer owned by the caller.
+ The returned ptr is owned by the caller
*/
- virtual const TrackParameters* update(
+ virtual TrackParameters* update(
ICache& icache,
- const TrackParameters* parm,
+ const TrackParameters* param,
const MaterialEffectsOnTrack& meff,
Trk::ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const = 0;
/** Updator interface (pre-update for a layer):
- The parmeters are given as a pointer, they are delete inside the update
- method. Layer-based material update
+ The parameters are given as a pointer owned by the caller.
+ The returned ptr is owned by the caller
*/
- virtual const TrackParameters* preUpdate(
+ virtual TrackParameters* preUpdate(
ICache& icache,
- const TrackParameters* parm,
+ const TrackParameters* param,
const Layer& sf,
PropDirection dir = alongMomentum,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const = 0;
/** Updator interface (pre-update for a layer):
- The parmeters are given as a pointer, they are delete inside the update
- method. Layer-based material update if the postUpdate fails, it returns 0
+ The parameters are given as a pointer owned by the caller.
+ The returned ptr is owned by the caller
+ Layer-based material update if the postUpdate fails, it returns 0
*/
- virtual const TrackParameters* postUpdate(
+ virtual TrackParameters* postUpdate(
ICache& icache,
- const TrackParameters& parm,
+ const TrackParameters& param,
const Layer& sf,
PropDirection dir = alongMomentum,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const = 0;
/** Updator interface:
- The parmeters are given as a pointer, they are delete inside the update
+ The parameters are given as a pointer, they are delete inside the update
method. MaterialProperties based material update
- used by all Layer-based methods
*/
- virtual const TrackParameters* update(
+ virtual TrackParameters* update(
ICache& icache,
- const TrackParameters& parm,
+ const TrackParameters& param,
const MaterialProperties& mprop,
double pathcorrection,
PropDirection dir = alongMomentum,
@@ -150,58 +150,51 @@ public:
/** Model Action:*/
virtual void modelAction(ICache& icache,
- const TrackParameters* parm = nullptr) const = 0;
+ const TrackParameters* param = nullptr) const = 0;
/** Updator interface (full update for a layer):
- The parmeters are given as a pointer, they are delete inside the update
- method. Layer-based material update
*/
- virtual const TrackParameters* update(
- const TrackParameters* parm,
+ virtual TrackParameters* update(
+ const TrackParameters* param,
const Layer& sf,
PropDirection dir = alongMomentum,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const = 0;
/** User updator interface (full update for a layer):
- The parmeters are given as a pointer, they are deleted inside the update
- method. Update occurs on the place where the parameters parm are according
- to the specified MaterialEffectsOnTrack
*/
- virtual const TrackParameters* update(
- const TrackParameters* parm,
+ virtual TrackParameters* update(
+ const TrackParameters* param,
const MaterialEffectsOnTrack& meff,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const = 0;
/** Updator interface (pre-update for a layer):
- The parmeters are given as a pointer, they are delete inside the update
+ The parameters are given as a pointer, they are delete inside the update
method. Layer-based material update
*/
- virtual const TrackParameters* preUpdate(
- const TrackParameters* parm,
+ virtual TrackParameters* preUpdate(
+ const TrackParameters* param,
const Layer& sf,
PropDirection dir = alongMomentum,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const = 0;
/** Updator interface (pre-update for a layer):
- The parmeters are given as a pointer, they are delete inside the update
- method. Layer-based material update if the postUpdate fails, it returns 0
*/
- virtual const TrackParameters* postUpdate(
- const TrackParameters& parm,
+
+ virtual TrackParameters* postUpdate(
+ const TrackParameters& param,
const Layer& sf,
PropDirection dir = alongMomentum,
ParticleHypothesis particle = pion,
MaterialUpdateMode matupmode = addNoise) const = 0;
/** Updator interface:
- The parmeters are given as a pointer, they are delete inside the update
- method. MaterialProperties based material update
+ MaterialProperties based material update
- used by all Layer-based methods
*/
- virtual const TrackParameters* update(
- const TrackParameters& parm,
+ virtual TrackParameters* update(
+ const TrackParameters& param,
const MaterialProperties& mprop,
double pathcorrection,
PropDirection dir = alongMomentum,
@@ -216,7 +209,7 @@ public:
* doing non-local MaterialEffectsUpdates for different models
* Optional
*/
- virtual void modelAction(const TrackParameters* parm = nullptr) const = 0;
+ virtual void modelAction(const TrackParameters* param = nullptr) const = 0;
};
} // end of namespace
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.h b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.h
index 3fcfc1d67079db78d60663bddac0ccf2b7e0adc0..e9886fc221694c2ea938b8590317e622dd56f2d5 100755
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.h
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.h
@@ -74,13 +74,16 @@ public:
/** INavigator interface method - returns the TrackingGeometry used for
* navigation */
- virtual const TrackingGeometry* trackingGeometry() const = 0;
+ virtual const TrackingGeometry* trackingGeometry(
+ const EventContext& ctx) const = 0;
/** INavigator interface method - global search for the Volume one is in */
- virtual const TrackingVolume* volume(const Amg::Vector3D& gp) const = 0;
+ virtual const TrackingVolume* volume(const EventContext& ctx,
+ const Amg::Vector3D& gp) const = 0;
/** INavigator interface method - forward hightes TrackingVolume */
- virtual const TrackingVolume* highestVolume() const = 0;
+ virtual const TrackingVolume* highestVolume(
+ const EventContext& ctx) const = 0;
/** INavigator interface method - getting the closest TrackParameters from a
* Track to a Surface */
@@ -142,6 +145,21 @@ public:
const TrackingVolume& vol,
double& path) const = 0;
+ /*
+ * Methods without explicit Event Context. To be removed
+ * when clients get migrated
+ */
+
+ /** INavigator interface method - returns the TrackingGeometry used for
+ * navigation */
+ virtual const TrackingGeometry* trackingGeometry() const;
+
+ /** INavigator interface method - global search for the Volume one is in */
+ virtual const TrackingVolume* volume(const Amg::Vector3D& gp) const;
+
+ /** INavigator interface method - forward hightes TrackingVolume */
+ virtual const TrackingVolume* highestVolume() const;
+
/** INavigator interface method - getting the next BoundarySurface not knowing
* the Volume*/
virtual const BoundarySurface<TrackingVolume>* nextBoundarySurface(
diff --git a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.icc b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.icc
index a9b9ddd34cf2afae18fdef2377b663090275f60a..d8676b50b721b6bba21088d1fb9bf8677298c54b 100644
--- a/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.icc
+++ b/Tracking/TrkExtrapolation/TrkExInterfaces/TrkExInterfaces/INavigator.icc
@@ -7,8 +7,26 @@
* in terms of the Gaudi Context aware ones
*/
namespace Trk {
-/** INavigator interface method - getting the next BoundarySurface not knowing
- * the Volume*/
+
+inline const TrackingGeometry*
+INavigator::trackingGeometry() const
+{
+ return trackingGeometry(Gaudi::Hive::currentContext());
+}
+
+inline const TrackingVolume*
+INavigator::volume(const Amg::Vector3D& gp) const
+{
+
+ return volume(Gaudi::Hive::currentContext(), gp);
+}
+
+inline const TrackingVolume*
+INavigator::highestVolume() const
+{
+ return highestVolume(Gaudi::Hive::currentContext());
+}
+
inline const BoundarySurface<TrackingVolume>*
INavigator::nextBoundarySurface(const IPropagator& prop,
const TrackParameters& parms,
@@ -17,8 +35,6 @@ INavigator::nextBoundarySurface(const IPropagator& prop,
return nextBoundarySurface(Gaudi::Hive::currentContext(), prop, parms, dir);
}
-/** INavigator interface method - getting the next BoundarySurface when
- * knowing the Volume*/
inline const BoundarySurface<TrackingVolume>*
INavigator::nextBoundarySurface(const IPropagator& prop,
const TrackParameters& parms,
@@ -30,8 +46,6 @@ INavigator::nextBoundarySurface(const IPropagator& prop,
Gaudi::Hive::currentContext(), prop, parms, dir, vol);
}
-/** INavigator interface method - - getting the next Volume and the parameter
- * for the next Navigation */
inline NavigationCell
INavigator::nextTrackingVolume(const IPropagator& prop,
const TrackParameters& parms,
@@ -40,13 +54,9 @@ INavigator::nextTrackingVolume(const IPropagator& prop,
{
return nextTrackingVolume(
- Gaudi::Hive::currentContext(),prop,parms, dir, vol);
+ Gaudi::Hive::currentContext(), prop, parms, dir, vol);
}
-/** INavigator interface method - getting the next Volume and the parameter
- for the next Navigation
- - contains full loop over volume boundaries
-*/
inline NavigationCell
INavigator::nextDenseTrackingVolume(const IPropagator& prop,
const TrackParameters& parms,
@@ -67,5 +77,4 @@ INavigator::nextDenseTrackingVolume(const IPropagator& prop,
path);
}
-
}
diff --git a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/test/RungeKuttaIntersector_test.cxx b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/test/RungeKuttaIntersector_test.cxx
index 54362474e96a6903574fe4deda194912f75ae278..27ebdcb3e8d3e0cae2eacc8b8fe3661b7dec3de6 100644
--- a/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/test/RungeKuttaIntersector_test.cxx
+++ b/Tracking/TrkExtrapolation/TrkExRungeKuttaIntersector/test/RungeKuttaIntersector_test.cxx
@@ -321,7 +321,7 @@ void createAtlasFieldCacheCondObj(SGTest::TestStore &store) {
SG::WriteCondHandle<AtlasFieldCacheCondObj> fieldHandle {fieldKey};
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
- assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/test/SolenoidParametrization_test.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/test/SolenoidParametrization_test.cxx
index 58f4d34803021296a0c8929b1756190b241e58d0..1c409cc93566679ebb425edf71e44d1a94272562 100644
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/test/SolenoidParametrization_test.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/test/SolenoidParametrization_test.cxx
@@ -93,7 +93,7 @@ int main()
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
// initialize cond obj with current scale factors and the field svc (needed to setup cache)
- assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.get()));
+ fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.get());
Trk::SolenoidParametrization sol (*fieldCondObj);
test1 (sol, *fieldCondObj);
diff --git a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/test/SolenoidalIntersector_test.cxx b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/test/SolenoidalIntersector_test.cxx
index 07b7005d0ea72b591a8a2db4672f19705f1f7bb4..d2b1d588dafedf55c9d9cdf8725f02d677473eba 100644
--- a/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/test/SolenoidalIntersector_test.cxx
+++ b/Tracking/TrkExtrapolation/TrkExSolenoidalIntersector/test/SolenoidalIntersector_test.cxx
@@ -341,7 +341,7 @@ void createSolenoidParametrizationCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
- assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
parm_ptr = std::make_unique<Trk::SolenoidParametrization>(*fieldCondObj);
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
diff --git a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/DummyMaterialEffectsUpdator.h b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/DummyMaterialEffectsUpdator.h
index 489252c532b886c36d905242df3c897d6782644f..a7c8cc871d978f45b13122f0376f608a5c3b5e4a 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/DummyMaterialEffectsUpdator.h
+++ b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/DummyMaterialEffectsUpdator.h
@@ -47,59 +47,60 @@ class DummyMaterialEffectsUpdator : public AthAlgTool,
StatusCode finalize() override;
/** Updator interface (full update for a layer): Dummy full update
- */
- const TrackParameters* update( const TrackParameters* parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override;
+ */
+ TrackParameters* update(const TrackParameters* parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override;
/** User updator interface (full update for a layer):
The parmeters are given as a pointer, they are deleted inside the update method.
Update occurs on the place where the parameters parm are according to the specified MaterialEffectsOnTrack
*/
- virtual const TrackParameters* update( const TrackParameters* parm,
- const MaterialEffectsOnTrack& meff,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override {
- (void) meff;
- (void)particle;
+ virtual TrackParameters* update(const TrackParameters* parm,
+ const MaterialEffectsOnTrack& meff,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override
+ {
+ (void)meff;
+ (void)particle;
(void)matupmode;
- return parm;
+ return parm->clone();
}
/** Updator interface (pre-update for a layer): Dummy pre update
- */
- virtual const TrackParameters* preUpdate( const TrackParameters* parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override;
+ */
+ virtual TrackParameters* preUpdate(const TrackParameters* parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override;
/** Updator interface (post-update for a layer): Dummy post update
- */
- virtual const TrackParameters* postUpdate(const TrackParameters& parm,
+ */
+ virtual TrackParameters* postUpdate(const TrackParameters& parm,
const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override;
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override;
/** Updator interface:
The parmeters are given as a pointer, they are delete inside the update method.
MaterialProperties based material update
- used by all Layer-based methods
*/
- virtual const TrackParameters* update( const TrackParameters& parm,
- const MaterialProperties& mprop,
- double pathcorrection,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override;
-
+ virtual TrackParameters* update(const TrackParameters& parm,
+ const MaterialProperties& mprop,
+ double pathcorrection,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override;
+
virtual void validationAction() const override {};
- virtual void modelAction(const TrackParameters* parm=nullptr) const override{
- if(parm) return;
+ virtual void modelAction(const TrackParameters* parm=nullptr) const override{
+ if(parm) return;
}
typedef IMaterialEffectsUpdator::ICache ICache;
@@ -116,66 +117,74 @@ class DummyMaterialEffectsUpdator : public AthAlgTool,
return std::make_unique<Cache>();
}
- virtual const TrackParameters* update(ICache& icache, const TrackParameters* parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override {
+ virtual TrackParameters* update(ICache& icache,
+ const TrackParameters* parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override
+ {
(void)icache;
- return update(parm,sf,dir,particle,matupmode);
- }
+ return update(parm, sf, dir, particle, matupmode);
+ }
- virtual const TrackParameters* update(ICache& icache, const TrackParameters* parm,
- const MaterialEffectsOnTrack& meff,
- Trk::ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override{
+ virtual TrackParameters* update(ICache& icache,
+ const TrackParameters* parm,
+ const MaterialEffectsOnTrack& meff,
+ Trk::ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override
+ {
(void)icache;
- return update(parm,meff,particle,matupmode);
- }
+ return update(parm, meff, particle, matupmode);
+ }
- virtual const TrackParameters* preUpdate(ICache& icache, const TrackParameters* parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override{
+ virtual TrackParameters* preUpdate(ICache& icache,
+ const TrackParameters* parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override
+ {
(void)icache;
- return preUpdate(parm,sf,dir,particle,matupmode);
+ return preUpdate(parm, sf, dir, particle, matupmode);
}
- virtual const TrackParameters* postUpdate(ICache& icache,const TrackParameters& parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override{
+ virtual TrackParameters* postUpdate(ICache& icache,
+ const TrackParameters& parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override
+ {
(void)icache;
return postUpdate(parm,sf,dir,particle,matupmode);
}
- virtual const TrackParameters* update(ICache& icache, const TrackParameters& parm,
- const MaterialProperties& mprop,
- double pathcorrection,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override{
+ virtual TrackParameters* update(ICache& icache, const TrackParameters& parm,
+ const MaterialProperties& mprop,
+ double pathcorrection,
+ PropDirection dir=alongMomentum,
+ ParticleHypothesis particle=pion,
+ MaterialUpdateMode matupmode=addNoise) const override{
(void) icache;
return update(parm,mprop,pathcorrection,dir,particle,matupmode);
}
/** Validation Action: */
- virtual void validationAction(ICache& icache) const override {
+ virtual void validationAction(ICache& icache) const override {
(void) icache;
- validationAction();
+ validationAction();
}
/** Model Action:*/
- virtual void modelAction(ICache& icache,const TrackParameters* parm=nullptr) const override{
+ virtual void modelAction(ICache& icache,const TrackParameters* parm=nullptr) const override{
(void) icache;
- modelAction(parm);
- }
+ modelAction(parm);
+ }
private:
@@ -184,7 +193,7 @@ class DummyMaterialEffectsUpdator : public AthAlgTool,
bool m_validationMode; //!< boolean switch for the validation mode
int m_validationDirectionSwitch; //!< jO switch for PropDirection
PropDirection m_validationDirection; //!< distinction between forward and backward validation
- ToolHandle< IMaterialMapper > m_materialMapper; //!< the material mapper for recording the layer material
+ ToolHandle< IMaterialMapper > m_materialMapper; //!< the material mapper for recording the layer material
};
} // end of namespace
diff --git a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/MaterialEffectsUpdator.h b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/MaterialEffectsUpdator.h
index 148939e7c31e22b918e7909f61e8d0667f9d802f..cdb1f7d0798affc183ee71384e95709cf0ad88fb 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/MaterialEffectsUpdator.h
+++ b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/MaterialEffectsUpdator.h
@@ -44,7 +44,7 @@ class IMaterialMapper;
Point-like (also called surface-based) u
pdate of TrackParameters and associated errors.
- It extends the TrkParametersManipulator, for applying modifications on
+ It extends the TrkParametersManipulator, for applying modifications on
the track parameters:
- if the update is done on a pointer to a TrackParameters object,
@@ -69,9 +69,6 @@ class MaterialEffectsUpdator : public AthAlgTool,
/** AlgTool initailize method.*/
virtual StatusCode initialize() override ;
- /** AlgTool finalize method */
- StatusCode finalize() override ;
-
/*
* The concrete cache class for this specialization of the IMaterialEffectsUpdator
*/
@@ -108,8 +105,8 @@ class MaterialEffectsUpdator : public AthAlgTool,
---> ALWAYS the same pointer is returned
the pointer to the same TrackParameters object is returned,
it is manipulated (if sf.fullUpdateMaterial())
- */
- virtual const TrackParameters* update(ICache& icache, const TrackParameters* parm,
+ */
+ virtual TrackParameters* update(ICache& icache, const TrackParameters* parm,
const Layer& sf,
PropDirection dir=alongMomentum,
ParticleHypothesis particle=pion,
@@ -119,7 +116,7 @@ class MaterialEffectsUpdator : public AthAlgTool,
return nullptr;
}
Cache& cache= static_cast<Cache&> (icache);
- const TrackParameters* outparam = updateImpl(cache,parm,sf,dir,particle,matupmode);
+ TrackParameters* outparam = updateImpl(cache,parm,sf,dir,particle,matupmode);
return outparam;
}
/** Updator interface (full update for a layer) according to user
@@ -128,7 +125,7 @@ class MaterialEffectsUpdator : public AthAlgTool,
the pointer to the same TrackParameters object is returned,
it is manipulated
*/
- virtual const TrackParameters* update(ICache& icache,
+ virtual TrackParameters* update(ICache& icache,
const TrackParameters* parm,
const MaterialEffectsOnTrack& meff,
Trk::ParticleHypothesis particle = pion,
@@ -140,7 +137,7 @@ class MaterialEffectsUpdator : public AthAlgTool,
return nullptr;
}
Cache& cache = static_cast<Cache&>(icache);
- const TrackParameters* outparam = updateImpl(cache, parm, meff, particle, matupmode);
+ TrackParameters* outparam = updateImpl(cache, parm, meff, particle, matupmode);
return outparam;
}
@@ -149,7 +146,7 @@ class MaterialEffectsUpdator : public AthAlgTool,
the pointer to the same TrackParametes object is returned,
it is manipulated (if.preUpdateMaterial())
*/
- virtual const TrackParameters* preUpdate(ICache& icache,
+ virtual TrackParameters* preUpdate(ICache& icache,
const TrackParameters* parm,
const Layer& sf,
PropDirection dir = alongMomentum,
@@ -161,7 +158,7 @@ class MaterialEffectsUpdator : public AthAlgTool,
return nullptr;
}
Cache& cache = static_cast<Cache&>(icache);
- const TrackParameters* outparam = preUpdateImpl(cache, parm, sf, dir, particle, matupmode);
+ TrackParameters* outparam = preUpdateImpl(cache, parm, sf, dir, particle, matupmode);
return outparam;
}
@@ -169,43 +166,43 @@ class MaterialEffectsUpdator : public AthAlgTool,
---> ALWAYS pointer to new TrackParameters are returned
if no postUpdate is to be done : return 0
*/
- virtual const TrackParameters* postUpdate(
+ virtual TrackParameters* postUpdate(
ICache& icache,
const TrackParameters& parm,
const Layer& sf,
PropDirection dir = alongMomentum,
ParticleHypothesis particle = pion,
- MaterialUpdateMode matupmode = addNoise) const override
+ MaterialUpdateMode matupmode = addNoise) const override final
{
if (icache.type() != ICache::MaterialEffects) {
ATH_MSG_WARNING("Wrong cache Type");
return nullptr;
}
Cache& cache = static_cast<Cache&>(icache);
- const TrackParameters* outparam = postUpdateImpl(cache, parm, sf, dir, particle, matupmode);
+ TrackParameters* outparam = postUpdateImpl(cache, parm, sf, dir, particle, matupmode);
return outparam;
}
/** Dedicated Updator interface:-> create new track parameters*/
- virtual const TrackParameters* update(ICache& icache,
+ virtual TrackParameters* update(ICache& icache,
const TrackParameters& parm,
const MaterialProperties& mprop,
double pathcorrection,
PropDirection dir = alongMomentum,
ParticleHypothesis particle = pion,
- MaterialUpdateMode matupmode = addNoise) const override
+ MaterialUpdateMode matupmode = addNoise) const override final
{
if (icache.type() != ICache::MaterialEffects) {
ATH_MSG_WARNING("Wrong cache Type");
return nullptr;
}
Cache& cache = static_cast<Cache&>(icache);
- const TrackParameters* outparam =
+ TrackParameters* outparam =
updateImpl(cache, parm, mprop, pathcorrection, dir, particle, matupmode);
return outparam;
}
/** Validation Action - calls the writing and resetting of the TTree variables */
- virtual void validationAction(ICache& icache) const override
+ virtual void validationAction(ICache& icache) const override final
{
if (icache.type() != ICache::MaterialEffects) {
ATH_MSG_WARNING("Wrong cache Type");
@@ -217,7 +214,7 @@ class MaterialEffectsUpdator : public AthAlgTool,
/** Only has an effect if m_landauMode == true.
Resets mutable variables used for non-local calculation of energy loss if
parm == 0. Otherwise, modifies parm with the final update of the covariance matrix*/
- virtual void modelAction(ICache& icache, const TrackParameters* parm = nullptr) const override
+ virtual void modelAction(ICache& icache, const TrackParameters* parm = nullptr) const override final
{
if (icache.type() != ICache::MaterialEffects) {
@@ -228,110 +225,135 @@ class MaterialEffectsUpdator : public AthAlgTool,
}
public:
- /*
+ /*
* Public methods using the TLS cache.
*/
- virtual const TrackParameters* update( const TrackParameters* parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override {
+ virtual TrackParameters* update(
+ const TrackParameters* parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override final
+ {
Cache& cache = getTLSCache();
- const TrackParameters* outparam = updateImpl(cache,parm,sf,dir,particle,matupmode);
+ TrackParameters* outparam =
+ updateImpl(cache, parm, sf, dir, particle, matupmode);
return outparam;
}
- virtual const TrackParameters* update(const TrackParameters* parm,
- const MaterialEffectsOnTrack& meff,
- Trk::ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override {
+ virtual TrackParameters* update(
+ const TrackParameters* parm,
+ const MaterialEffectsOnTrack& meff,
+ Trk::ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override final
+ {
Cache& cache = getTLSCache();
- const TrackParameters* outparam = updateImpl(cache,parm,meff,particle,matupmode);
+ TrackParameters* outparam =
+ updateImpl(cache, parm, meff, particle, matupmode);
return outparam;
}
- virtual const TrackParameters* preUpdate( const TrackParameters* parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override {
+ virtual TrackParameters* preUpdate(
+ const TrackParameters* parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override final
+ {
Cache& cache = getTLSCache();
- const TrackParameters* outparam = preUpdateImpl(cache,parm,sf,dir,particle,matupmode);
+ TrackParameters* outparam =
+ preUpdateImpl(cache, parm, sf, dir, particle, matupmode);
return outparam;
}
- virtual const TrackParameters* postUpdate(const TrackParameters& parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override{
+ virtual TrackParameters* postUpdate(
+ const TrackParameters& parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override final
+ {
Cache& cache = getTLSCache();
- const TrackParameters* outparam = postUpdateImpl(cache,parm,sf,dir,particle,matupmode);
+ TrackParameters* outparam =
+ postUpdateImpl(cache, parm, sf, dir, particle, matupmode);
return outparam;
}
- virtual const TrackParameters* update(const TrackParameters& parm,
- const MaterialProperties& mprop,
- double pathcorrection,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const override {
+ virtual TrackParameters* update(
+ const TrackParameters& parm,
+ const MaterialProperties& mprop,
+ double pathcorrection,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const override final
+ {
Cache& cache = getTLSCache();
- const TrackParameters* outparam = updateImpl(cache,parm,mprop,pathcorrection,dir,particle,matupmode);
+ TrackParameters* outparam = updateImpl(
+ cache, parm, mprop, pathcorrection, dir, particle, matupmode);
return outparam;
}
- virtual void validationAction() const override{
+ virtual void validationAction() const override final
+ {
Cache& cache = getTLSCache();
validationActionImpl(cache);
- }
+ }
- virtual void modelAction(const TrackParameters* parm = nullptr) const override {
+ virtual void modelAction(
+ const TrackParameters* parm = nullptr) const override final
+ {
Cache& cache = getTLSCache();
- modelActionImpl(cache,parm);
- }
+ modelActionImpl(cache, parm);
+ }
private:
- /* The acutal implementation methods using the tool's
- * concrete Cache*/
- const TrackParameters* updateImpl(Cache& cache, const TrackParameters* parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const ;
-
- const TrackParameters* updateImpl(Cache& cache, const TrackParameters* parm,
- const MaterialEffectsOnTrack& meff,
- Trk::ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const ;
-
- const TrackParameters* preUpdateImpl(Cache& cache, const TrackParameters* parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const ;
-
- const TrackParameters* postUpdateImpl(Cache& cache,const TrackParameters& parm,
- const Layer& sf,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const ;
-
- const TrackParameters* updateImpl(Cache& cache, const TrackParameters* parm,
- const MaterialProperties& mprop,
- double pathcorrection,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const ;
-
- const TrackParameters* updateImpl(Cache& cache, const TrackParameters& parm,
- const MaterialProperties& mprop,
- double pathcorrection,
- PropDirection dir=alongMomentum,
- ParticleHypothesis particle=pion,
- MaterialUpdateMode matupmode=addNoise) const ;
+ /* The acutal implementation methods using the tool's
+ * concrete Cache*/
+ TrackParameters* updateImpl(Cache& cache,
+ const TrackParameters* parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const;
+
+ TrackParameters* updateImpl(Cache& cache,
+ const TrackParameters* parm,
+ const MaterialEffectsOnTrack& meff,
+ Trk::ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const;
+
+ TrackParameters* preUpdateImpl(
+ Cache& cache,
+ const TrackParameters* parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const;
+ TrackParameters* postUpdateImpl(
+ Cache& cache,
+ const TrackParameters& parm,
+ const Layer& sf,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const;
+
+ TrackParameters* updateImpl(Cache& cache,
+ const TrackParameters* parm,
+ const MaterialProperties& mprop,
+ double pathcorrection,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const;
+
+ TrackParameters* updateImpl(Cache& cache,
+ const TrackParameters& parm,
+ const MaterialProperties& mprop,
+ double pathcorrection,
+ PropDirection dir = alongMomentum,
+ ParticleHypothesis particle = pion,
+ MaterialUpdateMode matupmode = addNoise) const;
void validationActionImpl(Cache& cache) const;
@@ -339,7 +361,7 @@ class MaterialEffectsUpdator : public AthAlgTool,
/** A simple check method for the 'removeNoise' update model */
bool checkCovariance(AmgSymMatrix(5)& updated) const ;
- const TrackParameters* finalLandauCovarianceUpdate (const TrackParameters* parm) const;
+ TrackParameters* finalLandauCovarianceUpdate (const TrackParameters* parm) const;
/* Private Class members*/
bool m_doCompoundLayerCheck; //!< turn on/off the necessary checks when we may have compound layers
@@ -356,7 +378,7 @@ class MaterialEffectsUpdator : public AthAlgTool,
// ------------ validation variables -------------------------------------------------
bool m_validationMode; //!< Switch for validation mode
bool m_validationIgnoreUnmeasured; //!< Ignore unmeasured TrackParameters (Navigation!)
- bool m_landauMode; //!< If in Landau mode, error propagation is done as for landaus
+ bool m_landauMode; //!< If in Landau mode, error propagation is done as for landaus
int m_validationDirection; //!< validation direction
// ------------------------------
double m_momentumCut; //!< Minimal momentum cut for update
@@ -366,12 +388,12 @@ class MaterialEffectsUpdator : public AthAlgTool,
ToolHandle< IEnergyLossUpdator > m_eLossUpdator; //!< AlgoTool for EnergyLoss updates
ToolHandle< IMultipleScatteringUpdator > m_msUpdator; //!< AlgoTool for MultipleScatterin effects
// the material mapper for the validation process
- ToolHandle< IMaterialMapper > m_materialMapper; //!< the material mapper for recording the layer material
-
+ ToolHandle< IMaterialMapper > m_materialMapper; //!< the material mapper for recording the layer material
+
/*
* TLS part
- * The solution adopted here is an effort to implement
- * "Schmidt, Douglas & Pryce, Nat & H. Harrison, Timothy. (1998).
+ * The solution adopted here is an effort to implement
+ * "Schmidt, Douglas & Pryce, Nat & H. Harrison, Timothy. (1998).
* Thread-Specific Storage for C/C++ - An Object
* Behavioral Pattern for Accessing per-Thread State Efficiently."
* Published in "More C++ Gems (SIGS Reference Library)".
@@ -379,13 +401,13 @@ class MaterialEffectsUpdator : public AthAlgTool,
*/
mutable boost::thread_specific_ptr<Cache> m_cache_tls;
- Cache& getTLSCache() const{
+ Cache& getTLSCache() const{
Cache* cache = m_cache_tls.get();
if (!cache) {
cache = new Cache();
m_cache_tls.reset( cache );
}
- return *cache;
+ return *cache;
}
};
} // end of namespace
diff --git a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h
index ce3a1fbb1d7bce42f0d308b786ae82bbfdc4b798..fbc3fa6530453558e3e47793c922028691f08be2 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h
+++ b/Tracking/TrkExtrapolation/TrkExTools/TrkExTools/Navigator.h
@@ -19,13 +19,16 @@
#include "TrkVolumes/BoundarySurface.h"
#include "TrkGeometry/MagneticFieldProperties.h"
#include "TrkParameters/TrackParameters.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "TrkGeometry/TrackingGeometry.h"
+
+
// STD
#include <cstring>
#include <exception>
#include <Gaudi/Accumulators.h>
-#include "CxxUtils/checker_macros.h"
namespace Trk {
class ITrackingGeometrySvc;
@@ -34,7 +37,7 @@ namespace Trk {
class NavigatorException : public std::exception
{
const char* what() const throw()
- { return "Problem with TrackingGeometry loading"; }
+ { return "Problem with TrackingGeometry loading"; }
};
class IGeometryBuilder;
@@ -42,24 +45,22 @@ namespace Trk {
class Surface;
class Track;
class TrackingVolume;
- class TrackingGeometry;
+ typedef std::pair<const NavigationCell*,const NavigationCell*> NavigationPair;
- typedef std::pair<const NavigationCell*,const NavigationCell*> NavigationPair;
-
- /**
+ /**
@class Navigator
-
+
Main AlgTool for Navigation in the TrkExtrapolation realm :
- It retrieves the TrackingGeometry from the DetectorStore
- as the reference Geometry.
+ It retrieves the TrackingGeometry from the DetectorStore
+ as the reference Geometry.
- There's an experimental possibility to use a straightLineApproximation for the
+ There's an experimental possibility to use a straightLineApproximation for the
Navigation. This is unstable due to wrong cylinder intersections.
@author Andreas.Salzburger@cern.ch
*/
- class ATLAS_NOT_THREAD_SAFE Navigator : public AthAlgTool,
+ class Navigator : public AthAlgTool,
virtual public INavigator {
public:
/** Constructor */
@@ -72,17 +73,27 @@ namespace Trk {
/** AlgTool finalize method */
virtual StatusCode finalize() override;
+ using INavigator::trackingGeometry;
+ using INavigator::volume;
+ using INavigator::highestVolume;
+ using INavigator::nextBoundarySurface;
+ using INavigator::nextTrackingVolume;
+ using INavigator::nextDenseTrackingVolume;
+
+
/** INavigator interface method - returns the TrackingGeometry used for
* navigation */
- virtual const TrackingGeometry* trackingGeometry() const override final;
+ virtual const TrackingGeometry* trackingGeometry(
+ const EventContext& ctx) const override final;
/** INavigator interface methods - global search for the Volume one is in
*/
virtual const TrackingVolume* volume(
- const Amg::Vector3D& gp) const override final;
+ const EventContext& ctx, const Amg::Vector3D& gp) const override final;
/** INavigator interface method - forward hightes TrackingVolume */
- virtual const TrackingVolume* highestVolume() const override final;
+ virtual const TrackingVolume* highestVolume(
+ const EventContext& ctx) const override final;
/** INavigator interface method - getting the closest TrackParameters from
* a Track to a Surface*/
@@ -103,10 +114,6 @@ namespace Trk {
steps */
virtual void validationAction() const override {}
- using INavigator::nextBoundarySurface;
- using INavigator::nextTrackingVolume;
- using INavigator::nextDenseTrackingVolume;
-
/** INavigator interface methods - getting the next BoundarySurface not
* knowing the Volume*/
virtual const BoundarySurface<TrackingVolume>* nextBoundarySurface(
@@ -148,37 +155,43 @@ namespace Trk {
double& path) const override final;
private:
- /*
+ /*
* Methods to be overriden by the NavigatorValidation
*/
virtual void validationInitialize() {}
virtual void validationFill(const Trk::TrackParameters* trackPar) const{
(void)trackPar;
- }
-
- void updateTrackingGeometry() const;
-
-
- bool m_validationMode; //!<This becomes a dummy option for now
- /*
- ****************************************************************
- * According to Goetz Gaycken this needs special attention marking as
- * @TODO replace by conditions handle.
- */
- mutable const TrackingGeometry* m_trackingGeometry; //!< the tracking geometry owned by the navigator
- ServiceHandle<Trk::ITrackingGeometrySvc> m_trackingGeometrySvc; //!< ToolHandle to the TrackingGeometrySvc
- std::string m_trackingGeometryName; //!< Name of the TrackingGeometry as given in Detector Store
- /******************************************************************/
- double m_insideVolumeTolerance; //!< Tolerance for inside() method of Volumes
- double m_isOnSurfaceTolerance; //!< Tolerance for isOnSurface() method of BoundarySurfaces
- bool m_useStraightLineApproximation; //!< use the straight line approximation for the next boundary sf
- bool m_searchWithDistance; //!< search with new distanceToSurface() method
+ }
+
+ SG::ReadCondHandleKey<TrackingGeometry> m_trackingGeometryReadKey{
+ this,
+ "TrackingGeometryKey",
+ "",
+ "Key of output of TrackingGeometry for ID"
+ };
+
+ /// ToolHandle to the TrackingGeometrySvc
+ ServiceHandle<Trk::ITrackingGeometrySvc> m_trackingGeometrySvc;
+ /// Name of the TrackingGeometry as given in Detector Store
+ std::string m_trackingGeometryName;
+ /******************************************************************/
+ /// Tolerance for inside() method of Volumes
+ double m_insideVolumeTolerance;
+ /// Tolerance for isOnSurface() method of BoundarySurfaces
+ double m_isOnSurfaceTolerance;
+ bool m_useConditions;
+ Trk::MagneticFieldProperties m_fieldProperties;
+ /// use the straight line approximation for the next boundary sf
+ bool m_useStraightLineApproximation;
+ /// search with new distanceToSurface() method
+ bool m_searchWithDistance;
//------------ Magnetic field properties
- bool m_fastField;
- Trk::MagneticFieldProperties m_fieldProperties;
+ bool m_fastField;
+ bool m_validationMode; //!< This becomes a dummy option for now
// ------ PERFORMANCE STATISTICS -------------------------------- //
- /* All performance stat counters are atomic (the simplest solution perhaps not the most performant one)*/
+ /* All performance stat counters are atomic (the simplest solution perhaps
+ * not the most performant one)*/
mutable Gaudi::Accumulators::Counter<int> m_forwardCalls; //!< counter for forward nextBounday calls
mutable Gaudi::Accumulators::Counter<int> m_forwardFirstBoundSwitch; //!< counter for failed first forward nextBounday calls
mutable Gaudi::Accumulators::Counter<int> m_forwardSecondBoundSwitch; //!< counter for failed second forward nextBounday calls
@@ -188,7 +201,7 @@ namespace Trk {
mutable Gaudi::Accumulators::Counter<int> m_backwardSecondBoundSwitch; //!< counter for failed second backward nextBounday calls
mutable Gaudi::Accumulators::Counter<int> m_backwardThirdBoundSwitch; //!< counter for failed third backward nextBounday calls
mutable Gaudi::Accumulators::Counter<int> m_outsideVolumeCase; //!< counter for navigation-break in outside volume cases (ovc)
- mutable Gaudi::Accumulators::Counter<int> m_sucessfulBackPropagation; //!< counter for sucessful recovery of navigation-break in ovc
+ mutable Gaudi::Accumulators::Counter<int> m_sucessfulBackPropagation; //!< counter for sucessful recovery of navigation-break in ovc
};
} // end of namespace
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/DummyMaterialEffectsUpdator.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/DummyMaterialEffectsUpdator.cxx
index 2b1b9a2e7abd0a3a17d2ae5988e835dad90394fe..4a4cf2eef1b7dd82362ca8c12a8b705ae79d9b62 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/src/DummyMaterialEffectsUpdator.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/DummyMaterialEffectsUpdator.cxx
@@ -34,8 +34,7 @@ Trk::DummyMaterialEffectsUpdator::DummyMaterialEffectsUpdator(const std::string
}
// destructor
-Trk::DummyMaterialEffectsUpdator::~DummyMaterialEffectsUpdator() {
-}
+Trk::DummyMaterialEffectsUpdator::~DummyMaterialEffectsUpdator() = default;
// Athena standard methods
// initialize
@@ -44,9 +43,9 @@ Trk::DummyMaterialEffectsUpdator::initialize() {
if (m_materialMapper.retrieve().isFailure()) {
ATH_MSG_FATAL("Failed to retrieve tool " << m_materialMapper);
return StatusCode::FAILURE;
- }
+ }
ATH_MSG_INFO("Retrieved tool " << m_materialMapper);
-
+
// set the validation switch
m_validationDirection = (m_validationDirectionSwitch == 1) ? Trk::alongMomentum : Trk::oppositeMomentum;
@@ -62,7 +61,7 @@ Trk::DummyMaterialEffectsUpdator::finalize() {
return StatusCode::SUCCESS;
}
-const Trk::TrackParameters *
+Trk::TrackParameters *
Trk::DummyMaterialEffectsUpdator::update(const TrackParameters *parm,
const Layer &lay,
PropDirection,
@@ -101,10 +100,10 @@ Trk::DummyMaterialEffectsUpdator::update(const TrackParameters *parm,
ATH_MSG_WARNING("update() ... dynamic cast to MaterialProperties failed!");
}
}
- return parm;
+ return parm->clone();
}
-const Trk::TrackParameters *
+Trk::TrackParameters *
Trk::DummyMaterialEffectsUpdator::preUpdate(const TrackParameters *parm,
const Layer &lay,
PropDirection dir,
@@ -117,7 +116,7 @@ Trk::DummyMaterialEffectsUpdator::preUpdate(const TrackParameters *parm,
double preFactor = lay.preUpdateMaterialFactor(*parm, dir);
// return if the preFactor is too small
if (preFactor < 0.1) {
- return(parm);
+ return parm->clone();
}
double correctionFactor = fabs(lay.surfaceRepresentation().pathCorrection(parm->position(), parm->momentum()));
@@ -155,10 +154,10 @@ Trk::DummyMaterialEffectsUpdator::preUpdate(const TrackParameters *parm,
ATH_MSG_WARNING("preUpdate() ... dynamic cast to MaterialProperties failed!");
}
}
- return parm;
+ return parm->clone();
}
-const Trk::TrackParameters *
+Trk::TrackParameters *
Trk::DummyMaterialEffectsUpdator::postUpdate(const TrackParameters &parm,
const Layer &lay,
PropDirection dir,
@@ -207,7 +206,7 @@ Trk::DummyMaterialEffectsUpdator::postUpdate(const TrackParameters &parm,
}
// actual update method
-const Trk::TrackParameters *
+Trk::TrackParameters *
Trk::DummyMaterialEffectsUpdator::update(const TrackParameters &parm,
const MaterialProperties &,
double,
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/MaterialEffectsUpdator.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/MaterialEffectsUpdator.cxx
index 6e4eb845895185ec637fb4b519d615e3fa3567cd..dd8e97ef1752b5c4ae206a395ca40bb6c226bf2e 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/src/MaterialEffectsUpdator.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/MaterialEffectsUpdator.cxx
@@ -8,114 +8,114 @@
// Trk include
#include "TrkExTools/MaterialEffectsUpdator.h"
-#include "TrkExInterfaces/IEnergyLossUpdator.h"
-#include "TrkExInterfaces/IMultipleScatteringUpdator.h"
+#include "GaudiKernel/ITHistSvc.h"
#include "TrkDetDescrInterfaces/IMaterialMapper.h"
-#include "TrkParameters/TrackParameters.h"
-#include "TrkEventPrimitives/ParamDefs.h"
#include "TrkEventPrimitives/DefinedParameter.h"
-#include "TrkSurfaces/Surface.h"
-#include "TrkGeometry/Layer.h"
+#include "TrkEventPrimitives/ParamDefs.h"
+#include "TrkExInterfaces/IEnergyLossUpdator.h"
+#include "TrkExInterfaces/IMultipleScatteringUpdator.h"
+#include "TrkGeometry/AssociatedMaterial.h"
#include "TrkGeometry/CompoundLayer.h"
+#include "TrkGeometry/Layer.h"
#include "TrkGeometry/MaterialProperties.h"
-#include "TrkGeometry/AssociatedMaterial.h"
#include "TrkGeometry/TrackingVolume.h"
-#include "TrkMaterialOnTrack/MaterialEffectsOnTrack.h"
#include "TrkMaterialOnTrack/EnergyLoss.h"
+#include "TrkMaterialOnTrack/MaterialEffectsOnTrack.h"
#include "TrkMaterialOnTrack/ScatteringAngles.h"
-#include "GaudiKernel/ITHistSvc.h"
+#include "TrkParameters/TrackParameters.h"
+#include "TrkSurfaces/Surface.h"
// Amg
#include "EventPrimitives/EventPrimitives.h"
#include "GeoPrimitives/GeoPrimitives.h"
-//std
-#include<functional>
+// std
#include <algorithm>
+#include <functional>
namespace {
const Trk::ParticleMasses s_particleMasses{};
}
// constructor
-Trk::MaterialEffectsUpdator::MaterialEffectsUpdator(const std::string &t, const std::string &n, const IInterface *p) :
- AthAlgTool(t, n, p),
+Trk::MaterialEffectsUpdator::MaterialEffectsUpdator(const std::string& t, const std::string& n, const IInterface* p)
+ : AthAlgTool(t, n, p)
+ ,
// TrkParametersManipulator(),
- m_doCompoundLayerCheck(false),
- m_doEloss(true),
- m_doMs(true),
- m_forceMomentum(false),
- m_xKalmanStraggling(false),
- m_useMostProbableEloss(false),
- m_msgOutputValidationDirection(true),
- m_msgOutputCorrections(false),
- m_validationMode(false),
- m_validationIgnoreUnmeasured(true),
- m_landauMode(false),
- m_validationDirection(1),
- m_momentumCut(50. * Gaudi::Units::MeV),
- m_momentumMax(10. * Gaudi::Units::TeV),
- m_forcedMomentum(2000. * Gaudi::Units::MeV),
- m_eLossUpdator("Trk::EnergyLossUpdator/AtlasEnergyLossUpdator"),
- m_msUpdator("Trk::MultipleScatteringUpdator/AtlasMultipleScatteringUpdator"),
- m_materialMapper("Trk::MaterialMapper/AtlasMaterialMapper"){
- declareInterface<IMaterialEffectsUpdator>(this);
- // configuration (to be changed to new genconf style)
- declareProperty("CheckForCompoundLayers", m_doCompoundLayerCheck);
- declareProperty("EnergyLoss", m_doEloss);
- declareProperty("EnergyLossUpdator", m_eLossUpdator);
- declareProperty("MultipleScattering", m_doMs);
- declareProperty("MultipleScatteringUpdator", m_msUpdator);
- // the momentum cut for particle interactions
- declareProperty("MinimalMomentum", m_momentumCut);
- declareProperty("MaximalMomentum", m_momentumMax);
- declareProperty("ForceMomentum", m_forceMomentum);
- declareProperty("ForcedMomentumValue", m_forcedMomentum);
- declareProperty("MostProbableEnergyLoss", m_useMostProbableEloss);
- declareProperty("ScreenOutputValidationDirection", m_msgOutputValidationDirection);
- declareProperty("ScreenOutputCorrections", m_msgOutputCorrections);
- // run vaidation mode true/false
- declareProperty("ValidationMode", m_validationMode);
- declareProperty("ValidationIgnoreUnmeasured", m_validationIgnoreUnmeasured);
- declareProperty("ValidationDirection", m_validationDirection);
- declareProperty("ValidationMaterialMapper", m_materialMapper);
- declareProperty("LandauMode", m_landauMode);
- }
+ m_doCompoundLayerCheck(false)
+ , m_doEloss(true)
+ , m_doMs(true)
+ , m_forceMomentum(false)
+ , m_xKalmanStraggling(false)
+ , m_useMostProbableEloss(false)
+ , m_msgOutputValidationDirection(true)
+ , m_msgOutputCorrections(false)
+ , m_validationMode(false)
+ , m_validationIgnoreUnmeasured(true)
+ , m_landauMode(false)
+ , m_validationDirection(1)
+ , m_momentumCut(50. * Gaudi::Units::MeV)
+ , m_momentumMax(10. * Gaudi::Units::TeV)
+ , m_forcedMomentum(2000. * Gaudi::Units::MeV)
+ , m_eLossUpdator("Trk::EnergyLossUpdator/AtlasEnergyLossUpdator")
+ , m_msUpdator("Trk::MultipleScatteringUpdator/AtlasMultipleScatteringUpdator")
+ , m_materialMapper("Trk::MaterialMapper/AtlasMaterialMapper")
+{
+ declareInterface<IMaterialEffectsUpdator>(this);
+ // configuration (to be changed to new genconf style)
+ declareProperty("CheckForCompoundLayers", m_doCompoundLayerCheck);
+ declareProperty("EnergyLoss", m_doEloss);
+ declareProperty("EnergyLossUpdator", m_eLossUpdator);
+ declareProperty("MultipleScattering", m_doMs);
+ declareProperty("MultipleScatteringUpdator", m_msUpdator);
+ // the momentum cut for particle interactions
+ declareProperty("MinimalMomentum", m_momentumCut);
+ declareProperty("MaximalMomentum", m_momentumMax);
+ declareProperty("ForceMomentum", m_forceMomentum);
+ declareProperty("ForcedMomentumValue", m_forcedMomentum);
+ declareProperty("MostProbableEnergyLoss", m_useMostProbableEloss);
+ declareProperty("ScreenOutputValidationDirection", m_msgOutputValidationDirection);
+ declareProperty("ScreenOutputCorrections", m_msgOutputCorrections);
+ // run vaidation mode true/false
+ declareProperty("ValidationMode", m_validationMode);
+ declareProperty("ValidationIgnoreUnmeasured", m_validationIgnoreUnmeasured);
+ declareProperty("ValidationDirection", m_validationDirection);
+ declareProperty("ValidationMaterialMapper", m_materialMapper);
+ declareProperty("LandauMode", m_landauMode);
+}
// destructor
-Trk::MaterialEffectsUpdator::~MaterialEffectsUpdator() {
-}
+Trk::MaterialEffectsUpdator::~MaterialEffectsUpdator() = default;
// Athena standard methods
// initialize
StatusCode
-Trk::MaterialEffectsUpdator::initialize() {
+Trk::MaterialEffectsUpdator::initialize()
+{
ATH_MSG_INFO("Minimal momentum cut for material update : " << m_momentumCut << " MeV");
// retrieve the EnergyLoss Updator and Material Effects updator
if (m_doEloss) {
if (m_eLossUpdator.retrieve().isFailure()) {
- ATH_MSG_FATAL(
- "Failed to retrieve tool " << m_eLossUpdator << ". No multiple scattering effects will be taken into account.");
+ ATH_MSG_FATAL("Failed to retrieve tool " << m_eLossUpdator
+ << ". No multiple scattering effects will be taken into account.");
m_doEloss = false;
return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG("Retrieved tool " << m_eLossUpdator);
-
- }
- else {
+ }
+ ATH_MSG_DEBUG("Retrieved tool " << m_eLossUpdator);
+
+ } else {
m_eLossUpdator.disable();
}
if (m_doMs) {
if (m_msUpdator.retrieve().isFailure()) {
- ATH_MSG_FATAL("Failed to retrieve tool " << m_msUpdator <<
- ". No energy loss effects will be taken into account.");
+ ATH_MSG_FATAL("Failed to retrieve tool " << m_msUpdator
+ << ". No energy loss effects will be taken into account.");
m_doMs = false;
return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG("Retrieved tool " << m_msUpdator);
-
- }
- else {
+ }
+ ATH_MSG_DEBUG("Retrieved tool " << m_msUpdator);
+
+ } else {
m_msUpdator.disable();
}
@@ -124,48 +124,42 @@ Trk::MaterialEffectsUpdator::initialize() {
if (m_materialMapper.retrieve().isFailure()) {
ATH_MSG_FATAL("Failed to retrieve tool " << m_materialMapper << ". No material recording.");
return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG("Retrieved tool " << m_materialMapper);
-
- }
- else {
+ }
+ ATH_MSG_DEBUG("Retrieved tool " << m_materialMapper);
+
+ } else {
m_materialMapper.disable();
}
return StatusCode::SUCCESS;
}
-// finalize
-StatusCode
-Trk::MaterialEffectsUpdator::finalize() {
- ATH_MSG_DEBUG("finalize() successful");
- return StatusCode::SUCCESS;
-}
-
-const Trk::TrackParameters *
-Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm,
- const Layer &lay,
+Trk::TrackParameters*
+Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,
+ const TrackParameters* parm,
+ const Layer& lay,
PropDirection dir,
ParticleHypothesis particle,
- MaterialUpdateMode matupmode) const {
+ MaterialUpdateMode matupmode) const
+{
// no material properties - pass them back
if (particle == Trk::geantino || particle == Trk::nonInteractingMuon || (!m_doMs && !m_doEloss) ||
!lay.isOnLayer(parm->position())) {
- return(parm);
+ return parm->clone();
}
// get the quantities
- const Trk::MaterialProperties *mprop = lay.fullUpdateMaterialProperties(*parm);
+ const Trk::MaterialProperties* mprop = lay.fullUpdateMaterialProperties(*parm);
if (!mprop) {
- return(parm);
+ return parm->clone();
}
// get the real pathlength
double pathCorrection = fabs(lay.surfaceRepresentation().pathCorrection(parm->position(), parm->momentum()));
// set the output if restricted to the direction
- bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
+ bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
// --------------------------------------------------------------------------------------------------
if (msgLvl(MSG::VERBOSE) && outputFlag) {
@@ -174,34 +168,33 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
double eta = parm->momentum().eta();
double sX0 = mprop->thicknessInX0();
double tX0 = pathCorrection * mprop->thicknessInX0();
- ATH_MSG_VERBOSE(
- " [M] full material update, layer with [r,z] = [ " << layerR << ", " << layerZ << " ] - Index " <<
- lay.layerIndex());
- ATH_MSG_VERBOSE(
- " thickness/X0 , path/X0 (eta: g.factor) = " << sX0 << " , " << tX0 << " (" << eta << ": " << pathCorrection <<
- ")");
+ ATH_MSG_VERBOSE(" [M] full material update, layer with [r,z] = [ " << layerR << ", " << layerZ << " ] - Index "
+ << lay.layerIndex());
+ ATH_MSG_VERBOSE(" thickness/X0 , path/X0 (eta: g.factor) = " << sX0 << " , " << tX0 << " (" << eta << ": "
+ << pathCorrection << ")");
}
// --------------------------------------------------------------------------------------------------
- if (m_validationMode){
- cache.validationLayer = &lay ;
+ if (m_validationMode) {
+ cache.validationLayer = &lay;
}
- return(updateImpl(cache,parm, *mprop, pathCorrection, dir, particle, matupmode));
+ return (updateImpl(cache, parm, *mprop, pathCorrection, dir, particle, matupmode));
}
-const Trk::TrackParameters *
-Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm,
- const MaterialEffectsOnTrack &meff,
+Trk::TrackParameters*
+Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,
+ const TrackParameters* parm,
+ const MaterialEffectsOnTrack& meff,
ParticleHypothesis particle,
- MaterialUpdateMode matupmode) const {
+ MaterialUpdateMode matupmode) const
+{
// no material properties - pass them back
// TODO, if the parm doesn't have a surface (i.e. its in
// curvilinear) then should we fall through?
if (particle == Trk::geantino || particle == Trk::nonInteractingMuon || (!m_doMs && !m_doEloss) ||
parm->associatedSurface() != meff.associatedSurface()) {
- return(parm);
+ return parm->clone();
}
-
// get the kinematics
double p = parm->momentum().mag();
double updateMomentum = (m_forceMomentum) ? m_forcedMomentum : p;
@@ -209,7 +202,7 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
double E = sqrt(p * p + m * m);
double beta = p / E;
- double pathcorrection = 1.; // Trick the MultipleScatteringUpdator interface
+ double pathcorrection = 1.; // Trick the MultipleScatteringUpdator interface
double energyLoss = 0;
double energyLossSigma = 0;
@@ -226,11 +219,11 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
// Landaus mpvs don't just add, if in Landau mode we need to do a different update
if (m_landauMode && cache.accumulatedElossSigma != 0 && energyLossSigma != 0) {
if (energyLoss > 0) {
- energyLoss += energyLossSigma * log(1 + cache.accumulatedElossSigma / (energyLossSigma))
- +cache.accumulatedElossSigma * log(1 + energyLossSigma / cache.accumulatedElossSigma);
+ energyLoss += energyLossSigma * std::log(1 + cache.accumulatedElossSigma / (energyLossSigma)) +
+ cache.accumulatedElossSigma * std::log(1 + energyLossSigma / cache.accumulatedElossSigma);
} else {
- energyLoss -= energyLossSigma * log(1 + cache.accumulatedElossSigma / energyLossSigma)
- + cache.accumulatedElossSigma * log(1 + energyLossSigma / cache.accumulatedElossSigma);
+ energyLoss -= energyLossSigma * std::log(1 + cache.accumulatedElossSigma / energyLossSigma) +
+ cache.accumulatedElossSigma * std::log(1 + energyLossSigma / cache.accumulatedElossSigma);
}
cache.accumulatedElossSigma += energyLossSigma;
} else if (m_landauMode) {
@@ -255,9 +248,9 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
// check if Parameters are measured parameters
// the updatedParameters - first a copy
- const Trk::TrackParameters *mpars = parm;
+ const Trk::TrackParameters* mpars = parm;
AmgVector(5) updatedParameters(mpars->parameters());
- AmgSymMatrix(5) * updatedCovariance = nullptr;
+ AmgSymMatrix(5)* updatedCovariance = nullptr;
// initialize ErrorMatrix pointer
if (m_validationMode && !m_validationIgnoreUnmeasured) {
// the new CovarianceMatrix - a copy first
@@ -275,10 +268,10 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
MaterialProperties mprop(meff.thicknessInX0(), 1., 1., 0., 0., 0.);
angularVariation = m_msUpdator->sigmaSquare(mprop, updateMomentum, pathcorrection, Trk::muon);
// sigmaDeltaPhiSq = angularVariation/(parm->sinTheta()*parm->sinTheta());
- sigmaDeltaPhiSq = angularVariation /
- (sin(parm->parameters()[Trk::theta]) * sin(parm->parameters()[Trk::theta]));
+ sigmaDeltaPhiSq =
+ angularVariation / (std::sin(parm->parameters()[Trk::theta]) * std::sin(parm->parameters()[Trk::theta]));
sigmaDeltaThetaSq = angularVariation;
- }else {
+ } else {
// material update from mefots -> D.L.
sigmaDeltaPhiSq = meff.scatteringAngles()->sigmaDeltaPhi();
sigmaDeltaPhiSq *= sigmaDeltaPhiSq;
@@ -297,18 +290,16 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
COVARIANCEUPDATEWITHCHECK((*updatedCovariance)(Trk::theta, Trk::theta), sign, sigmaDeltaThetaSq);
if (!m_xKalmanStraggling && !m_landauMode) {
COVARIANCEUPDATEWITHCHECK((*updatedCovariance)(Trk::qOverP, Trk::qOverP), sign, sigmaQoverPSq);
- }else if (m_xKalmanStraggling) { /* to be filled in*/
- }else if (m_landauMode) {
+ } else if (m_xKalmanStraggling) { /* to be filled in*/
+ } else if (m_landauMode) {
// subtract what we added up till now and add what we should add up till now
// Landau's 68% limit is approx 1.6*sigmaParameter
/* Get the TLS to a local here once and use it for calculation*/
- (*updatedCovariance)(Trk::qOverP,
- Trk::qOverP) -= sign *
- std::pow(1.6 * (cache.accumulatedElossSigma - p * p * sigmaQoverP) / (p * p),
- 2);
- (*updatedCovariance)(Trk::qOverP, Trk::qOverP) += sign * std::pow(1.6 * cache.accumulatedElossSigma / (newP * newP),
- 2);
+ (*updatedCovariance)(Trk::qOverP, Trk::qOverP) -=
+ sign * std::pow(1.6 * (cache.accumulatedElossSigma - p * p * sigmaQoverP) / (p * p), 2);
+ (*updatedCovariance)(Trk::qOverP, Trk::qOverP) +=
+ sign * std::pow(1.6 * cache.accumulatedElossSigma / (newP * newP), 2);
}
// the checks for the remove Noise mode -----------------------------------------------------
if (matupmode == Trk::removeNoise && !checkCovariance(*updatedCovariance)) {
@@ -322,27 +313,30 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
// -------------------------------------- screen output --------------------------------------
if (m_msgOutputCorrections) {
double sigmaAngle = sqrt(angularVariation);
- ATH_MSG_VERBOSE(" sigma(phi) / sigma(theta) = " << sigmaAngle / sin(
- parm->parameters()[Trk::theta]) << " / " << sigmaAngle);
+ ATH_MSG_VERBOSE(" sigma(phi) / sigma(theta) = " << sigmaAngle / std::sin(parm->parameters()[Trk::theta]) << " / "
+ << sigmaAngle);
ATH_MSG_VERBOSE(" deltaP / sigmaQoverP = " << energyLoss << " / " << sigmaQoverP);
}
// -------------------------------------------------------------------------------------------
}
// ----------------------------------------- validation section ----------------------------------
// validation if configured
- if (m_validationMode){
- if(cache.validationLayer) {
+ if (m_validationMode) {
+ if (cache.validationLayer) {
// all you have from MaterialProperties
double pathInX0 = meff.thicknessInX0();
Trk::AssociatedMaterial assMatHit(parm->position(),
- pathInX0, pathInX0,
- 0, 0, 0, 0,
+ pathInX0,
+ pathInX0,
+ 0,
+ 0,
+ 0,
+ 0,
pathcorrection,
cache.validationLayer->enclosingTrackingVolume(),
cache.validationLayer);
-
// record the Material hit ----------------------------------------------------------------
m_materialMapper->recordMaterialHit(assMatHit, parm->position());
@@ -356,36 +350,40 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
}
// ----------------------------------------- validation section ----------------------------------
}
- // return parm;
updatedParameters[Trk::qOverP] = qOverPnew;
- return parm->associatedSurface().createTrackParameters(updatedParameters[Trk::loc1], updatedParameters[Trk::loc2],
- updatedParameters[Trk::phi], updatedParameters[Trk::theta],
- updatedParameters[Trk::qOverP], updatedCovariance);
+ return parm->associatedSurface().createTrackParameters(updatedParameters[Trk::loc1],
+ updatedParameters[Trk::loc2],
+ updatedParameters[Trk::phi],
+ updatedParameters[Trk::theta],
+ updatedParameters[Trk::qOverP],
+ updatedCovariance);
}
-const Trk::TrackParameters *
-Trk::MaterialEffectsUpdator::preUpdateImpl(Cache& cache,const TrackParameters *parm,
- const Layer &lay,
+Trk::TrackParameters*
+Trk::MaterialEffectsUpdator::preUpdateImpl(Cache& cache,
+ const TrackParameters* parm,
+ const Layer& lay,
PropDirection dir,
ParticleHypothesis particle,
- MaterialUpdateMode matupmode) const {
+ MaterialUpdateMode matupmode) const
+{
// no material properties - pass the parameters back
if (particle == Trk::geantino || particle == Trk::nonInteractingMuon || (!m_doMs && !m_doEloss)) {
- return(parm);
+ return parm->clone();
}
// get the split factor
double preFactor = lay.preUpdateMaterialFactor(*parm, dir);
// return if the preFactor is less than one
if (preFactor < 0.01) {
- return(parm);
+ return parm->clone();
}
// get the material properties
- const Trk::MaterialProperties *mprop = nullptr;
+ const Trk::MaterialProperties* mprop = nullptr;
// set the output if restricted to the validation direction
- bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
+ bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
mprop = lay.fullUpdateMaterialProperties(*parm);
double pathCorrection = fabs(lay.surfaceRepresentation().pathCorrection(parm->position(), parm->momentum()));
@@ -393,7 +391,7 @@ Trk::MaterialEffectsUpdator::preUpdateImpl(Cache& cache,const TrackParameters *p
// exit if no mprop could be assigned
if (!mprop) {
- return(parm);
+ return parm->clone();
}
// --------------------------------------------------------------------------------------------------
if (outputFlag) {
@@ -402,43 +400,43 @@ Trk::MaterialEffectsUpdator::preUpdateImpl(Cache& cache,const TrackParameters *p
double eta = parm->momentum().eta();
double sX0 = mprop->thicknessInX0();
double tX0 = pathCorrection * mprop->thicknessInX0();
- ATH_MSG_VERBOSE(
- " [M] pre material update at layer with [r,z] = [ " << layerR << ", " << layerZ << " ] - Index " <<
- lay.layerIndex());
- ATH_MSG_VERBOSE(
- " thickness/X0 , path/X0 (eta: g.factor) = " << sX0 << " , " << tX0 << " (" << eta << ": " << pathCorrection <<
- ")");
+ ATH_MSG_VERBOSE(" [M] pre material update at layer with [r,z] = [ " << layerR << ", " << layerZ << " ] - Index "
+ << lay.layerIndex());
+ ATH_MSG_VERBOSE(" thickness/X0 , path/X0 (eta: g.factor) = " << sX0 << " , " << tX0 << " (" << eta << ": "
+ << pathCorrection << ")");
}
// --------------------------------------------------------------------------------------------------
- if(m_validationMode){
- cache.validationLayer = &lay ;
+ if (m_validationMode) {
+ cache.validationLayer = &lay;
}
- return(updateImpl(cache,parm, *mprop, pathCorrection, dir, particle, matupmode));
+ return (updateImpl(cache, parm, *mprop, pathCorrection, dir, particle, matupmode));
}
-const Trk::TrackParameters *
-Trk::MaterialEffectsUpdator::postUpdateImpl(Cache& cache,const TrackParameters &parm,
- const Layer &lay,
+Trk::TrackParameters*
+Trk::MaterialEffectsUpdator::postUpdateImpl(Cache& cache,
+ const TrackParameters& parm,
+ const Layer& lay,
PropDirection dir,
ParticleHypothesis particle,
- MaterialUpdateMode matupmode) const {
+ MaterialUpdateMode matupmode) const
+{
// no material properties - pass the parameters back
if (particle == Trk::geantino || particle == Trk::nonInteractingMuon || (!m_doMs && !m_doEloss) ||
!lay.isOnLayer(parm.position())) {
- return(&parm);
+ return parm.clone();
}
// get the quantities
- const Trk::MaterialProperties *mprop = nullptr;
+ const Trk::MaterialProperties* mprop = nullptr;
double postFactor = lay.postUpdateMaterialFactor(parm, dir);
// no material properties - pass them back
if (postFactor < 0.01) {
- return(&parm);
+ return parm.clone();
}
// set the output if restricted to the validation direction
- bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
+ bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
mprop = lay.fullUpdateMaterialProperties(parm);
double pathCorrection = fabs(lay.surfaceRepresentation().pathCorrection(parm.position(), parm.momentum()));
@@ -446,7 +444,7 @@ Trk::MaterialEffectsUpdator::postUpdateImpl(Cache& cache,const TrackParameters &
// exit if no material properties
if (!mprop) {
- return(&parm);
+ return parm.clone();
}
// --------------------------------------------------------------------------------------------------
@@ -456,31 +454,31 @@ Trk::MaterialEffectsUpdator::postUpdateImpl(Cache& cache,const TrackParameters &
double eta = parm.momentum().eta();
double sX0 = mprop->thicknessInX0();
double tX0 = pathCorrection * mprop->thicknessInX0();
- ATH_MSG_VERBOSE(
- " [M] post material update, layer with [r,z] = [ " << layerR << ", " << layerZ << " ] - Index " <<
- lay.layerIndex());
- ATH_MSG_VERBOSE(
- " thickness/X0 , path/X0 (eta: g.factor) = " << sX0 << " , " << tX0 << " (" << eta << ": " << pathCorrection <<
- ")");
+ ATH_MSG_VERBOSE(" [M] post material update, layer with [r,z] = [ " << layerR << ", " << layerZ << " ] - Index "
+ << lay.layerIndex());
+ ATH_MSG_VERBOSE(" thickness/X0 , path/X0 (eta: g.factor) = " << sX0 << " , " << tX0 << " (" << eta << ": "
+ << pathCorrection << ")");
}
// --------------------------------------------------------------------------------------------------
- if (m_validationMode){
- cache.validationLayer = &lay ;
+ if (m_validationMode) {
+ cache.validationLayer = &lay;
}
- return(updateImpl(cache,parm, *mprop, pathCorrection, dir, particle, matupmode));
+ return (updateImpl(cache, parm, *mprop, pathCorrection, dir, particle, matupmode));
}
// actual update method - manipulation
-const Trk::TrackParameters *
-Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm,
- const MaterialProperties &matprop,
+Trk::TrackParameters*
+Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,
+ const TrackParameters* parm,
+ const MaterialProperties& matprop,
double pathcorrection,
PropDirection dir,
ParticleHypothesis particle,
- MaterialUpdateMode matupmode) const {
+ MaterialUpdateMode matupmode) const
+{
// no material properties - pass them back
if (particle == Trk::geantino || particle == Trk::nonInteractingMuon || (!m_doMs && !m_doEloss)) {
- return((parm));
+ return parm->clone();
}
// get the kinematics
@@ -491,15 +489,15 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
double beta = p / E;
// set the output if restricted to the validation direction
- bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
+ bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
// no material update below/above a certain cut value
if (p > m_momentumCut && p < m_momentumMax) {
// get the delta of the Energy
- EnergyLoss *energyLoss = (m_doEloss) ?
- m_eLossUpdator->energyLoss(matprop, updateMomentum, pathcorrection, dir, particle,
- m_useMostProbableEloss) :
- nullptr;
+ EnergyLoss* energyLoss =
+ (m_doEloss)
+ ? m_eLossUpdator->energyLoss(matprop, updateMomentum, pathcorrection, dir, particle, m_useMostProbableEloss)
+ : nullptr;
// update for mean energy loss
double deltaE = energyLoss ? energyLoss->deltaE() : 0;
double sigmaDeltaE = energyLoss ? energyLoss->sigmaDeltaE() : 0;
@@ -507,14 +505,14 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
if (m_landauMode && cache.accumulatedElossSigma != 0 && sigmaDeltaE != 0) {
if (dir == Trk::oppositeMomentum) {
- deltaE += sigmaDeltaE * log(1 + cache.accumulatedElossSigma / sigmaDeltaE)
- + cache.accumulatedElossSigma * log(1 + sigmaDeltaE / cache.accumulatedElossSigma);
+ deltaE += sigmaDeltaE * std::log(1 + cache.accumulatedElossSigma / sigmaDeltaE) +
+ cache.accumulatedElossSigma * std::log(1 + sigmaDeltaE / cache.accumulatedElossSigma);
} else {
- deltaE -= sigmaDeltaE * log(1 + cache.accumulatedElossSigma / sigmaDeltaE)
- + cache.accumulatedElossSigma * log(1 + sigmaDeltaE / cache.accumulatedElossSigma);
+ deltaE -= sigmaDeltaE * std::log(1 + cache.accumulatedElossSigma / sigmaDeltaE) +
+ cache.accumulatedElossSigma * std::log(1 + sigmaDeltaE / cache.accumulatedElossSigma);
}
cache.accumulatedElossSigma += sigmaDeltaE;
- }else if (m_landauMode) {
+ } else if (m_landauMode) {
cache.accumulatedElossSigma += sigmaDeltaE;
}
@@ -532,11 +530,11 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
// check if Parameters are measured parameters
// const Trk::MeasuredTrackParameters* mpars = dynamic_cast<const Trk::MeasuredTrackParameters*>(parm);
- const Trk::TrackParameters *mpars = parm;
+ const Trk::TrackParameters* mpars = parm;
AmgVector(5) updatedParameters(mpars->parameters());
// initialize ErrorMatrix pointer
// Trk::ErrorMatrix* updatedError = 0;
- AmgSymMatrix(5) * updatedCovariance = nullptr;
+ AmgSymMatrix(5)* updatedCovariance = nullptr;
if (mpars || (m_validationMode && !m_validationIgnoreUnmeasured)) {
// the new CovarianceMatrix - a copy first
if (mpars) {
@@ -550,8 +548,8 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
// sign of the noise adding ----------------------------------------------------------------
int sign = int(matupmode);
- double sigmaDeltaPhiSq = angularVariation /
- (sin(parm->parameters()[Trk::theta]) * sin(parm->parameters()[Trk::theta]));
+ double sigmaDeltaPhiSq =
+ angularVariation / (std::sin(parm->parameters()[Trk::theta]) * std::sin(parm->parameters()[Trk::theta]));
double sigmaDeltaThetaSq = angularVariation;
// checks will only be done in the removeNoise mode
COVARIANCEUPDATEWITHCHECK((*updatedCovariance)(Trk::phi, Trk::phi), sign, sigmaDeltaPhiSq);
@@ -560,19 +558,15 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
COVARIANCEUPDATEWITHCHECK((*updatedCovariance)(Trk::qOverP, Trk::qOverP), sign, sigmaQoverP * sigmaQoverP);
} else if (m_xKalmanStraggling) {
double q = parm->charge();
- COVARIANCEUPDATEWITHCHECK((*updatedCovariance)(Trk::qOverP,
- Trk::qOverP), sign, 0.2 * deltaP * deltaP * q * q * q * q);
+ COVARIANCEUPDATEWITHCHECK(
+ (*updatedCovariance)(Trk::qOverP, Trk::qOverP), sign, 0.2 * deltaP * deltaP * q * q * q * q);
} else if (m_landauMode) {
// subtract what we added up till now and add what we should add up till now
// Landau's 68% limit is approx 1.6*sigmaParameter
- (*updatedCovariance)(Trk::qOverP,
- Trk::qOverP) -= sign *
- std::pow(1.6 * (cache.accumulatedElossSigma - p * p * sigmaQoverP) / (p * p),
- 2);
- (*updatedCovariance)(Trk::qOverP,
- Trk::qOverP) += sign *
- std::pow(1.6 * cache.accumulatedElossSigma / ((p + deltaP) * (p + deltaP)),
- 2);
+ (*updatedCovariance)(Trk::qOverP, Trk::qOverP) -=
+ sign * std::pow(1.6 * (cache.accumulatedElossSigma - p * p * sigmaQoverP) / (p * p), 2);
+ (*updatedCovariance)(Trk::qOverP, Trk::qOverP) +=
+ sign * std::pow(1.6 * cache.accumulatedElossSigma / ((p + deltaP) * (p + deltaP)), 2);
}
// the checks for the remove Noise mode -----------------------------------------------------
if (matupmode == Trk::removeNoise && !checkCovariance(*updatedCovariance)) {
@@ -587,19 +581,17 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
// -------------------------------------- screen output --------------------------------------
if (outputFlag && m_msgOutputCorrections) {
double sigmaAngle = sqrt(angularVariation);
- ATH_MSG_VERBOSE(" sigma(phi) / sigma(theta) = " << sigmaAngle / sin(
- parm->parameters()[Trk::theta]) << " / " << sigmaAngle);
+ ATH_MSG_VERBOSE(" sigma(phi) / sigma(theta) = " << sigmaAngle / std::sin(parm->parameters()[Trk::theta])
+ << " / " << sigmaAngle);
ATH_MSG_VERBOSE(" deltaP / sigmaQoverP = " << deltaP << " / " << sigmaQoverP);
}
// -------------------------------------------------------------------------------------------
}
// ----------------------------------------- validation section ----------------------------------
// validation if configured
- if (m_validationMode
- && dir == Trk::PropDirection(m_validationDirection)
- && updatedCovariance) {
+ if (m_validationMode && dir == Trk::PropDirection(m_validationDirection) && updatedCovariance) {
- if (cache.validationLayer){
+ if (cache.validationLayer) {
// all you have from MaterialProperties
double pathInX0 = pathcorrection * matprop.thicknessInX0();
double A = 0.;
@@ -607,8 +599,7 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
double rho = 0.;
double l0 = 0.;
// or better take the extended version for more information
- const Trk::MaterialProperties *extProperties
- = dynamic_cast<const Trk::MaterialProperties *>(&matprop);
+ const Trk::MaterialProperties* extProperties = dynamic_cast<const Trk::MaterialProperties*>(&matprop);
if (extProperties) {
A = extProperties->averageA();
@@ -618,16 +609,18 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
}
Trk::AssociatedMaterial assMatHit(parm->position(),
- pathInX0, matprop.x0(),
- l0, A, Z, rho,
+ pathInX0,
+ matprop.x0(),
+ l0,
+ A,
+ Z,
+ rho,
pathcorrection,
cache.validationLayer->enclosingTrackingVolume(),
cache.validationLayer);
-
// record the Material hit ----------------------------------------------------------------
- m_materialMapper->recordMaterialHit(assMatHit,
- parm->position());
+ m_materialMapper->recordMaterialHit(assMatHit, parm->position());
// the steps
cache.validationSteps++;
cache.validationPhi += parm->position().phi();
@@ -638,26 +631,31 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters *parm
}
// ----------------------------------------- validation section ----------------------------------
}
- // parm = Trk::TrkParametersManipulator::manipulateParameter(parm, qOverPmod, updatedError);
updatedParameters[Trk::qOverP] = parm->charge() / (p + deltaP);
- parm = parm->associatedSurface().createTrackParameters(updatedParameters[Trk::loc1], updatedParameters[Trk::loc2],
- updatedParameters[Trk::phi], updatedParameters[Trk::theta],
- updatedParameters[Trk::qOverP], updatedCovariance);
+ return parm->associatedSurface().createTrackParameters(updatedParameters[Trk::loc1],
+ updatedParameters[Trk::loc2],
+ updatedParameters[Trk::phi],
+ updatedParameters[Trk::theta],
+ updatedParameters[Trk::qOverP],
+ updatedCovariance);
}
- return parm;
+ //default if we have not returned just above
+ return parm->clone();
}
// actual update method
-const Trk::TrackParameters *
-Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm,
- const MaterialProperties &matprop,
+Trk::TrackParameters*
+Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,
+ const TrackParameters& parm,
+ const MaterialProperties& matprop,
double pathcorrection,
PropDirection dir,
ParticleHypothesis particle,
- MaterialUpdateMode matupmode) const {
+ MaterialUpdateMode matupmode) const
+{
// no material properties - pass them back
if (particle == Trk::geantino || (!m_doMs && !m_doEloss)) {
- return(&(parm));
+ return parm.clone();
}
// get the kinematics
@@ -668,7 +666,7 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
double beta = p / E;
// set the output if restricted to the validation direction
- bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
+ bool outputFlag = m_msgOutputValidationDirection ? dir == int(m_validationDirection) : true;
// no material update below or above a certain cut value
if (p > m_momentumCut && p < m_momentumMax) {
@@ -676,25 +674,25 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
AmgVector(5) updatedParameters(parm.parameters());
// get the delta of the Energy
- EnergyLoss *energyLoss = (m_doEloss) ?
- m_eLossUpdator->energyLoss(matprop, updateMomentum, pathcorrection, dir, particle,
- m_useMostProbableEloss) :
- nullptr;
+ EnergyLoss* energyLoss =
+ (m_doEloss)
+ ? m_eLossUpdator->energyLoss(matprop, updateMomentum, pathcorrection, dir, particle, m_useMostProbableEloss)
+ : nullptr;
// update for mean energy loss
double deltaE = energyLoss ? energyLoss->deltaE() : 0;
double sigmaDeltaE = energyLoss ? energyLoss->sigmaDeltaE() : 0;
delete energyLoss;
if (m_landauMode && cache.accumulatedElossSigma != 0 && sigmaDeltaE != 0) {
if (dir == Trk::oppositeMomentum) {
- deltaE += sigmaDeltaE * log(1 + cache.accumulatedElossSigma / sigmaDeltaE)
- + cache.accumulatedElossSigma * log(1 + sigmaDeltaE / cache.accumulatedElossSigma);
+ deltaE += sigmaDeltaE * std::log(1 + cache.accumulatedElossSigma / sigmaDeltaE) +
+ cache.accumulatedElossSigma * std::log(1 + sigmaDeltaE / cache.accumulatedElossSigma);
} else {
- deltaE -= sigmaDeltaE * log(1 + cache.accumulatedElossSigma / sigmaDeltaE)
- + cache.accumulatedElossSigma * log(1 + sigmaDeltaE / cache.accumulatedElossSigma);
+ deltaE -= sigmaDeltaE * std::log(1 + cache.accumulatedElossSigma / sigmaDeltaE) +
+ cache.accumulatedElossSigma * std::log(1 + sigmaDeltaE / cache.accumulatedElossSigma);
}
cache.accumulatedElossSigma += sigmaDeltaE;
- }else if (m_landauMode) {
+ } else if (m_landauMode) {
cache.accumulatedElossSigma += sigmaDeltaE;
}
@@ -711,7 +709,7 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
updatedParameters[Trk::qOverP] = parm.charge() / (p + deltaP);
// check if Parameters are measured parameters
- AmgSymMatrix(5) * updatedCovariance = nullptr;
+ AmgSymMatrix(5)* updatedCovariance = nullptr;
if (parm.covariance() || (m_validationMode && !m_validationIgnoreUnmeasured)) {
// the new CovarianceMatrix - a copy first
updatedCovariance = new AmgSymMatrix(5)(*parm.covariance());
@@ -722,8 +720,8 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
// sign of the noise adding ----------------------------------------------------------------
int sign = int(matupmode);
// checks will only be done in the removeNoise mode
- double sigmaDeltaPhiSq = angularVariation /
- (sin(parm.parameters()[Trk::theta]) * sin(parm.parameters()[Trk::theta]));
+ double sigmaDeltaPhiSq =
+ angularVariation / (std::sin(parm.parameters()[Trk::theta]) * std::sin(parm.parameters()[Trk::theta]));
double sigmaDeltaThetaSq = angularVariation;
// checks will only be done in the removeNoise mode
COVARIANCEUPDATEWITHCHECK((*updatedCovariance)(Trk::phi, Trk::phi), sign, sigmaDeltaPhiSq);
@@ -731,16 +729,13 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
if (!m_xKalmanStraggling && !m_landauMode) {
COVARIANCEUPDATEWITHCHECK((*updatedCovariance)(Trk::qOverP, Trk::qOverP), sign, sigmaQoverP * sigmaQoverP);
} else if (m_xKalmanStraggling) { /* to be filled in*/
- }else if (m_landauMode) {
+ } else if (m_landauMode) {
// subtract what we added up till now and add what we should add up till now
// Landau's 68% limit is best modeled by 1.6*sigmaParameter
- (*updatedCovariance)(Trk::qOverP,
- Trk::qOverP) -= sign *
- std::pow(1.6 * (cache.accumulatedElossSigma - p * p * sigmaQoverP) / (p * p),
- 2);
- (*updatedCovariance)(Trk::qOverP,
- Trk::qOverP) += sign *
- std::pow(1.6 * cache.accumulatedElossSigma / ((p + deltaP) * (p + deltaP)), 2);
+ (*updatedCovariance)(Trk::qOverP, Trk::qOverP) -=
+ sign * std::pow(1.6 * (cache.accumulatedElossSigma - p * p * sigmaQoverP) / (p * p), 2);
+ (*updatedCovariance)(Trk::qOverP, Trk::qOverP) +=
+ sign * std::pow(1.6 * cache.accumulatedElossSigma / ((p + deltaP) * (p + deltaP)), 2);
}
// the checks for the remove Noise mode -----------------------------------------------------
@@ -754,16 +749,15 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
// --------------------------------------
if (outputFlag && m_msgOutputCorrections) {
double sigmaAngle = sqrt(angularVariation);
- ATH_MSG_VERBOSE(" sigma(phi) / sigma(theta) = " << sigmaAngle / sin(
- parm.parameters()[Trk::theta]) << " / " << sigmaAngle);
+ ATH_MSG_VERBOSE(" sigma(phi) / sigma(theta) = " << sigmaAngle / std::sin(parm.parameters()[Trk::theta]) << " / "
+ << sigmaAngle);
ATH_MSG_VERBOSE(" deltaP / sigmaQoverP = " << deltaP << " / " << sigmaQoverP);
}
// ----------------------------------------- validation section ----------------------------------
// validation if configured
- if (m_validationMode
- && dir == Trk::PropDirection(m_validationDirection)){
+ if (m_validationMode && dir == Trk::PropDirection(m_validationDirection)) {
- if(cache.validationLayer) {
+ if (cache.validationLayer) {
// all you have from MaterialProperties
double pathInX0 = pathcorrection * matprop.thicknessInX0();
double A = 0.;
@@ -771,8 +765,7 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
double rho = 0.;
double l0 = 0.;
// or better take the extended version for more information
- const Trk::MaterialProperties *extProperties
- = dynamic_cast<const Trk::MaterialProperties *>(&matprop);
+ const Trk::MaterialProperties* extProperties = dynamic_cast<const Trk::MaterialProperties*>(&matprop);
if (extProperties) {
A = extProperties->averageA();
@@ -782,18 +775,18 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
}
Trk::AssociatedMaterial assMatHit(parm.position(),
- pathInX0, matprop.x0(),
+ pathInX0,
+ matprop.x0(),
l0,
- A, Z, rho, pathcorrection,
+ A,
+ Z,
+ rho,
+ pathcorrection,
cache.validationLayer->enclosingTrackingVolume(),
cache.validationLayer);
-
// record the Material hit ----------------------------------------------------------------
- m_materialMapper->recordMaterialHit(assMatHit,
- parm.position());
-
-
+ m_materialMapper->recordMaterialHit(assMatHit, parm.position());
// the steps
cache.validationSteps++;
@@ -805,29 +798,34 @@ Trk::MaterialEffectsUpdator::updateImpl(Cache& cache,const TrackParameters &parm
}
// ------------------------------------------validation section ----------------------------------
}
- return parm.associatedSurface().createTrackParameters(updatedParameters[Trk::loc1], updatedParameters[Trk::loc2],
- updatedParameters[Trk::phi], updatedParameters[Trk::theta],
- updatedParameters[Trk::qOverP], updatedCovariance);
+ return parm.associatedSurface().createTrackParameters(updatedParameters[Trk::loc1],
+ updatedParameters[Trk::loc2],
+ updatedParameters[Trk::phi],
+ updatedParameters[Trk::theta],
+ updatedParameters[Trk::qOverP],
+ updatedCovariance);
}
return parm.clone();
}
void
-Trk::MaterialEffectsUpdator::validationActionImpl(Cache& cache) const {
+Trk::MaterialEffectsUpdator::validationActionImpl(Cache& cache) const
+{
cache.validationEta = 0.;
cache.validationPhi = 0.;
cache.validationSteps = 0;
}
void
-Trk::MaterialEffectsUpdator::modelActionImpl(Cache& cache, const Trk::TrackParameters * /*parm*/) const {
+Trk::MaterialEffectsUpdator::modelActionImpl(Cache& cache, const Trk::TrackParameters* /*parm*/) const
+{
cache.accumulatedElossSigma = 0;
}
-bool
-Trk::MaterialEffectsUpdator::checkCovariance(AmgSymMatrix(5) &updated) const {
- if (updated(Trk::phi,
- Trk::phi) > 0. && updated(Trk::theta, Trk::theta) > 0. && updated(Trk::qOverP, Trk::qOverP) > 0.) {
+bool Trk::MaterialEffectsUpdator::checkCovariance(AmgSymMatrix(5) & updated) const
+{
+ if (updated(Trk::phi, Trk::phi) > 0. && updated(Trk::theta, Trk::theta) > 0. &&
+ updated(Trk::qOverP, Trk::qOverP) > 0.) {
return true;
}
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/Navigator.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/Navigator.cxx
index 01d804dd48954776e4ec1af5d5d3ebf8bac91bcf..3ab740e92dba2ade05b5cfd46cbc633eddb52f1a 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/src/Navigator.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/Navigator.cxx
@@ -42,8 +42,6 @@ const Trk::MagneticFieldProperties s_zeroMagneticField(Trk::NoField);
// constructor
Trk::Navigator::Navigator(const std::string &t, const std::string &n, const IInterface *p) :
AthAlgTool(t, n, p),
- m_validationMode(false),
- m_trackingGeometry(nullptr),
m_trackingGeometrySvc("AtlasTrackingGeometrySvc", n),
m_trackingGeometryName("AtlasTrackingGeometry"),
m_insideVolumeTolerance(1. * Gaudi::Units::mm),
@@ -51,6 +49,7 @@ Trk::Navigator::Navigator(const std::string &t, const std::string &n, const IInt
m_useStraightLineApproximation(false),
m_searchWithDistance(true),
m_fastField(false),
+ m_validationMode(false),
m_forwardCalls{},
m_forwardFirstBoundSwitch{},
m_forwardSecondBoundSwitch{},
@@ -83,41 +82,46 @@ Trk::Navigator::~Navigator() {
// initialize
StatusCode
Trk::Navigator::initialize() {
- // Initialize StatusCode
- //StatusCode s = StatusCode::SUCCESS;
+
+
+ //We can use conditions when the key is not empty
+ m_useConditions=!m_trackingGeometryReadKey.key().empty();
// get the TrackingGeometrySvc
- if (m_trackingGeometrySvc.retrieve().isSuccess()) {
- ATH_MSG_INFO("Successfully retrieved " << m_trackingGeometrySvc);
- m_trackingGeometryName = m_trackingGeometrySvc->trackingGeometryName();
- } else {
- ATH_MSG_WARNING("Couldn't retrieve " << m_trackingGeometrySvc << ". ");
- ATH_MSG_WARNING(" -> Trying to retrieve default '" << m_trackingGeometryName << "' from DetectorStore.");
+ if (!m_useConditions) {
+ if (m_trackingGeometrySvc.retrieve().isSuccess()) {
+ ATH_MSG_INFO("Successfully retrieved " << m_trackingGeometrySvc);
+ m_trackingGeometryName = m_trackingGeometrySvc->trackingGeometryName();
+ } else {
+ ATH_MSG_WARNING("Couldn't retrieve " << m_trackingGeometrySvc << ". ");
+ ATH_MSG_WARNING(" -> Trying to retrieve default '"
+ << m_trackingGeometryName << "' from DetectorStore.");
+ }
}
- validationInitialize();
+ ATH_CHECK(m_trackingGeometryReadKey.initialize(m_useConditions));
- m_fieldProperties = m_fastField ? Trk::MagneticFieldProperties(Trk::FastField) :
- Trk::MagneticFieldProperties(Trk::FullField);
+ m_fieldProperties = m_fastField
+ ? Trk::MagneticFieldProperties(Trk::FastField)
+ : Trk::MagneticFieldProperties(Trk::FullField);
+ //This is no-op for the Navigator only relevant for
+ //derivated Validation for now
+ validationInitialize();
ATH_MSG_DEBUG("initialize() successful");
return StatusCode::SUCCESS;
}
-const Trk::TrackingVolume *
-Trk::Navigator::volume(const Amg::Vector3D &gp) const {
- if (!m_trackingGeometry) {
- updateTrackingGeometry();
- }
- return(m_trackingGeometry->lowestTrackingVolume(gp));
+const Trk::TrackingVolume*
+Trk::Navigator::volume(const EventContext& ctx, const Amg::Vector3D& gp) const
+{
+ return (trackingGeometry(ctx)->lowestTrackingVolume(gp));
}
-const Trk::TrackingVolume *
-Trk::Navigator::highestVolume() const {
- if (!m_trackingGeometry) {
- updateTrackingGeometry();
- }
- return(m_trackingGeometry->highestTrackingVolume());
+const Trk::TrackingVolume*
+Trk::Navigator::highestVolume(const EventContext& ctx) const
+{
+ return (trackingGeometry(ctx)->highestTrackingVolume());
}
const Trk::BoundarySurface<Trk::TrackingVolume>*
@@ -141,9 +145,6 @@ Trk::Navigator::nextBoundarySurface(const EventContext& ctx,
Trk::PropDirection dir,
const Trk::TrackingVolume& vol) const
{
- if (!m_trackingGeometry) {
- updateTrackingGeometry();
- }
// get the surface accessor
Trk::ObjectAccessor surfAcc = vol.boundarySurfaceAccessor(
parms.position(), dir * parms.momentum().normalized());
@@ -210,9 +211,6 @@ Trk::Navigator::nextTrackingVolume(const EventContext& ctx,
Trk::PropDirection dir,
const Trk::TrackingVolume& vol) const
{
- if (!m_trackingGeometry) {
- updateTrackingGeometry();
- }
// ---------------------------------------------------
if (dir == Trk::alongMomentum) {
@@ -271,11 +269,11 @@ Trk::Navigator::nextTrackingVolume(const EventContext& ctx,
<< surface_id << " of Volume: '"
<< vol.volumeName() << "' NOT FOUND.");
continue;
- }
+ }
ATH_MSG_VERBOSE(" [N] " << tryBoundary << ". try - BoundarySurface "
<< surface_id << " of Volume: '"
<< vol.volumeName() << "'.");
-
+
const Trk::Surface& currentSurface =
currentBoundary->surfaceRepresentation();
@@ -355,9 +353,6 @@ Trk::Navigator::nextDenseTrackingVolume(
ATH_MSG_DEBUG(" [N] nextDenseTrackingVolume() to volume '"
<< vol.volumeName() << "', starting from " << parms.position());
- if (!m_trackingGeometry) {
- updateTrackingGeometry();
- }
Trk::NavigationCell solution(nullptr, nullptr);
const Trk::TrackParameters *currPar = &parms;
@@ -370,7 +365,7 @@ Trk::Navigator::nextDenseTrackingVolume(
if (atVolumeBoundary(currPar, &vol, dir, nextVolume, tol) && nextVolume != (&vol)) {
if (!nextVolume) {
const Amg::Vector3D& gp = currPar->position();
- const Trk::TrackingVolume *currStatic = m_trackingGeometry->lowestStaticTrackingVolume(gp);
+ const Trk::TrackingVolume *currStatic = trackingGeometry(ctx)->lowestStaticTrackingVolume(gp);
if (&vol != currStatic) {
nextVolume = currStatic;
}
@@ -414,7 +409,7 @@ Trk::Navigator::nextDenseTrackingVolume(
} else if (atVolumeBoundary(nextPar, &vol, dir, nextVolume, tol)) {
if (!nextVolume) {
// detached volume boundary or world boundary : resolve
- const Trk::TrackingVolume *currStatic = m_trackingGeometry->lowestStaticTrackingVolume(gp);
+ const Trk::TrackingVolume *currStatic = trackingGeometry(ctx)->lowestStaticTrackingVolume(gp);
if (&vol != currStatic) {
nextVolume = currStatic;
}
@@ -455,8 +450,9 @@ Trk::Navigator::atVolumeBoundary(const Trk::TrackParameters* parms,
dir * parms->momentum().unit());
if (distSol.currentDistance(false) < tol && distSol.numberOfSolutions() > 0) {
isAtBoundary = true;
- const Trk::TrackingVolume *attachedVol = (bounds[ib].get())->attachedVolume(
- parms->position(), parms->momentum(), dir);
+ const Trk::TrackingVolume* attachedVol =
+ (bounds[ib].get())
+ ->attachedVolume(parms->position(), parms->momentum(), dir);
if (!nextVol && attachedVol) {
nextVol = attachedVol;
}
@@ -482,14 +478,10 @@ Trk::Navigator::closestParameters(const Trk::Track& trk,
const Trk::Surface& sf,
const Trk::IPropagator* propptr) const
{
- if (!m_trackingGeometry) {
- updateTrackingGeometry();
- }
// -- corresponds to Extrapolator::m_searchLevel = 2/3 - search with Propagation
if (propptr && !m_searchWithDistance) {
const Trk::TrackParameters *closestTrackParameters = nullptr;
- // const Trk::TrackingVolume* highestVolume = (m_trackingGeometry->highestTrackingVolume());
double distanceToSurface = 10e10;
@@ -606,7 +598,6 @@ Trk::Navigator::closestParameters(const Trk::Track& trk,
// finalize
StatusCode
Trk::Navigator::finalize() {
- m_trackingGeometry = nullptr;
if (msgLvl(MSG::DEBUG)) {
ATH_MSG_DEBUG("[N] " << name() << " Perfomance Statistics : --------------------------------");
@@ -627,21 +618,25 @@ Trk::Navigator::finalize() {
return StatusCode::SUCCESS;
}
-const Trk::TrackingGeometry *
-Trk::Navigator::trackingGeometry() const {
- if (!m_trackingGeometry) {
- updateTrackingGeometry();
+const Trk::TrackingGeometry*
+Trk::Navigator::trackingGeometry(const EventContext& ctx) const
+{
+ if (!m_useConditions) {
+ const TrackingGeometry* trackingGeometry = nullptr;
+ if (detStore()
+ ->retrieve(trackingGeometry, m_trackingGeometryName)
+ .isFailure()) {
+ ATH_MSG_FATAL("Could not retrieve TrackingGeometry from DetectorStore.");
+ throw Trk::NavigatorException();
+ }
+ return trackingGeometry;
+ } else {
+ SG::ReadCondHandle<TrackingGeometry> handle(m_trackingGeometryReadKey, ctx);
+ if (!handle.isValid()) {
+ ATH_MSG_FATAL("Could not retrieve TrackingGeometry from DetectorStore.");
+ throw Trk::NavigatorException();
+ }
+ return handle.cptr();
}
- return m_trackingGeometry;
}
-void
-Trk::Navigator::updateTrackingGeometry() const {
- // -------------------- public TrackingGeometry (from DetectorStore) ----------------------------
-
- if (detStore()->retrieve(m_trackingGeometry, m_trackingGeometryName).isFailure()) {
- ATH_MSG_FATAL("Could not retrieve TrackingGeometry '" << m_trackingGeometryName << "' from DetectorStore.");
- ATH_MSG_FATAL(" - probably the chosen layout is not supported / no cool tag exists. ");
- throw Trk::NavigatorException();
- }
-}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/CMakeLists.txt b/Tracking/TrkFitter/TrkGaussianSumFilter/CMakeLists.txt
index eebd6b6775dca818e1de84fd20278c2f151149d5..ddbed75050f15477daff17c495cd4040f6bde11b 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/CMakeLists.txt
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/CMakeLists.txt
@@ -4,39 +4,6 @@
# Declare the package name:
atlas_subdir( TrkGaussianSumFilter )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthContainers
- DetectorDescription/GeoPrimitives
- Event/EventPrimitives
- GaudiKernel
- Tracking/TrkDetDescr/TrkGeometry
- Tracking/TrkDetDescr/TrkSurfaces
- Tracking/TrkEvent/TrkEventPrimitives
- Tracking/TrkEvent/TrkEventUtils
- Tracking/TrkEvent/TrkMaterialOnTrack
- Tracking/TrkEvent/TrkMultiComponentStateOnSurface
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils
- Tracking/TrkFitter/TrkFitterInterfaces
- Tracking/TrkFitter/TrkFitterUtils
- Tracking/TrkTools/TrkToolInterfaces
- PRIVATE
- Control/CxxUtils
- Tools/PathResolver
- Tracking/TrkDetDescr/TrkDetElementBase
- Tracking/TrkEvent/TrkCaloCluster_OnTrack
- Tracking/TrkEvent/TrkMeasurementBase
- Tracking/TrkEvent/TrkPrepRawData
- Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkParametersBase
- )
-
# External dependencies:
find_package( Eigen )
@@ -45,10 +12,11 @@ atlas_add_component( TrkGaussianSumFilter
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives EventPrimitives GaudiKernel TrkGeometry TrkSurfaces
- TrkEventPrimitives TrkEventUtils TrkMaterialOnTrack TrkMultiComponentStateOnSurface TrkParameters TrkExInterfaces TrkExUtils TrkFitterInterfaces
- TrkFitterUtils TrkToolInterfaces CxxUtils PathResolver TrkDetElementBase TrkCaloCluster_OnTrack TrkMeasurementBase TrkPrepRawData
- TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkParametersBase)
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives EventPrimitives GaudiKernel
+ TrkGeometry TrkSurfaces TrkEventPrimitives TrkEventUtils TrkMaterialOnTrack TrkMultiComponentStateOnSurface
+ TrkParameters TrkExInterfaces TrkExUtils TrkFitterInterfaces TrkFitterUtils TrkToolInterfaces CxxUtils PathResolver TrkDetElementBase
+ TrkCaloCluster_OnTrack TrkMeasurementBase TrkPrepRawData TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack
+ TrkParametersBase KalmanParameterUpdatorLib)
# Install files from the package:
atlas_install_headers( TrkGaussianSumFilter )
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h
index c7c912a05008a0e92f6e259e95ede834a2e75cad..22fb3e8505161c56bea1c1837d7b6adab1383af2 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h
@@ -6,14 +6,14 @@
* @file ForwardGsfFitter.h
* @date Wednesday 9th March 2005
* @author Tom Athkinson, Anthony Morley, Christos Anastopoulos
- * @brief Class definition for the forward GSF fitter
+ * @brief Class definition for the forward GSF fitter
*/
#ifndef TrkForwardGsfFitter_H
#define TrkForwardGsfFitter_H
-
#include "TrkEventPrimitives/ParticleHypothesis.h"
#include "TrkFitterUtils/FitterTypes.h"
+#include "TrkGaussianSumFilter/GsfMeasurementUpdator.h"
#include "TrkGaussianSumFilter/IForwardGsfFitter.h"
#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
@@ -51,14 +51,14 @@ public:
- Configure the measurement updator
- Configure the RIO_OnTrack creator */
virtual StatusCode configureTools(
- const ToolHandle<Trk::IMultiStateExtrapolator>&,
- const ToolHandle<Trk::IMultiStateMeasurementUpdator>&,
- const ToolHandle<Trk::IRIO_OnTrackCreator>&) override final;
+ const ToolHandle<Trk::IMultiStateExtrapolator>& extrapolator,
+ const ToolHandle<Trk::IRIO_OnTrackCreator>& rioOnTrackCreator)
+ override final;
/** Forward GSF fit using PrepRawData */
virtual std::unique_ptr<ForwardTrajectory> fitPRD(
const EventContext& ctx,
- IMultiStateExtrapolator::Cache&,
+ IMultiStateExtrapolator::Cache&,
const PrepRawDataSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis =
@@ -67,7 +67,7 @@ public:
/** Forward GSF fit using MeasurementSet */
virtual std::unique_ptr<ForwardTrajectory> fitMeasurements(
const EventContext& ctx,
- IMultiStateExtrapolator::Cache&,
+ IMultiStateExtrapolator::Cache&,
const MeasurementSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis =
@@ -80,7 +80,7 @@ private:
/** Progress one step along the fit */
bool stepForwardFit(
const EventContext& ctx,
- IMultiStateExtrapolator::Cache&,
+ IMultiStateExtrapolator::Cache&,
ForwardTrajectory*,
const PrepRawData*,
const MeasurementBase*,
@@ -91,8 +91,8 @@ private:
private:
/**These are passed via the configure tools so not retrieved from this tool*/
ToolHandle<IMultiStateExtrapolator> m_extrapolator;
- ToolHandle<IMultiStateMeasurementUpdator> m_updator;
ToolHandle<IRIO_OnTrackCreator> m_rioOnTrackCreator;
+ GsfMeasurementUpdator m_updator;
double m_cutChiSquaredPerNumberDOF;
int m_overideMaterialEffects;
ParticleHypothesis m_overideParticleHypothesis;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
index 6fc9d21ce6e9c1c2f8b08f2f2d9a419529028a4a..5eaaa6eaa60d5c38084783c5f44ab82caeea4300 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
@@ -4,7 +4,7 @@
/**
* @file GaussianSumFitter.h
- * @date Monday 7th March 2005
+ * @date Monday 7th March 2005
* @author Tom Athkinson, Anthony Morley, Christos Anastopoulos
* @brief Class for fitting according to the Gaussian Sum Filter formalism
*/
@@ -12,20 +12,17 @@
#include "TrkEventPrimitives/PropDirection.h"
#include "TrkEventUtils/TrkParametersComparisonFunction.h"
#include "TrkFitterInterfaces/ITrackFitter.h"
-#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
#include "TrkFitterUtils/FitterTypes.h"
-#include "TrkParameters/TrackParameters.h"
#include "TrkFitterUtils/TrackFitInputPreparator.h"
+#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
+#include "TrkParameters/TrackParameters.h"
#include "TrkToolInterfaces/IRIO_OnTrackCreator.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ToolHandle.h"
#include <atomic>
-
namespace Trk {
class IMultiStateMeasurementUpdator;
class MultiComponentStateOnSurface;
@@ -34,7 +31,6 @@ class IGsfSmoother;
class FitQuality;
class Track;
-
class GaussianSumFitter
: virtual public ITrackFitter
, public AthAlgTool
@@ -129,12 +125,6 @@ private:
"Trk::GsfExtrapolator/GsfExtrapolator",
""
};
- ToolHandle<IMultiStateMeasurementUpdator> m_updator{
- this,
- "MeasurementUpdatorType",
- "Trk::GsfMeasurementUpdator/GsfMeasurementUpdator",
- ""
- };
ToolHandle<IRIO_OnTrackCreator> m_rioOnTrackCreator{
this,
"ToolForROTCreation",
@@ -151,26 +141,43 @@ private:
"GsfSmoother",
"Trk::GsfSmoother/GsfSmoother",
"" };
-
+
Gaudi::Property<bool> m_StoreMCSOS{
this,
"StoreMCSOS",
- false,
- "Store multicomponent state or single state in final trajectory"
+ true,
+ "Store Multicomponent State (preferred if we slim later on) or Single "
+ "state in final trajectory"
};
-
- bool m_reintegrateOutliers;
- bool m_makePerigee;
- bool m_refitOnMeasurementBase;
- bool m_doHitSorting;
+
+ Gaudi::Property<bool> m_reintegrateOutliers{ this,
+ "ReintegrateOutliers",
+ true,
+ "Reintegrate Outliers" };
+
+ Gaudi::Property<bool> m_makePerigee{ this,
+ "MakePerigee",
+ true,
+ "Make Perigee" };
+
+ Gaudi::Property<bool> m_refitOnMeasurementBase{ this,
+ "RefitOnMeasurementBase",
+ true,
+ "Refit On Measurement Base" };
+
+ Gaudi::Property<bool> m_doHitSorting{ this,
+ "DoHitSorting",
+ true,
+ "Do Hit Sorting" };
+
PropDirection m_directionToPerigee;
- std::unique_ptr<TrkParametersComparisonFunction> m_trkParametersComparisonFunction;
+ std::unique_ptr<TrkParametersComparisonFunction>
+ m_trkParametersComparisonFunction;
std::unique_ptr<TrackFitInputPreparator> m_inputPreparator;
std::vector<double> m_sortingReferencePoint;
- ServiceHandle<IChronoStatSvc> m_chronoSvc;
// Number of Fit PrepRawData Calls
- mutable std::atomic<int> m_FitPRD;
+ mutable std::atomic<int> m_FitPRD;
// Number of Fit MeasurementBase Calls
mutable std::atomic<int> m_FitMeasurementBase;
// Number of Foward Fit Failures
@@ -183,8 +190,6 @@ private:
mutable std::atomic<int> m_fitQualityFailure;
// Number of Tracks that are successfull
mutable std::atomic<int> m_fitSuccess;
-
-
};
} // end Trk namespace
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfMeasurementUpdator.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfMeasurementUpdator.h
index 6267abeb34c8112886f3ee87af43ed2d7775ecac..d2ff4e48829fcb10338072651be14f2c48d72630 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfMeasurementUpdator.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfMeasurementUpdator.h
@@ -13,78 +13,38 @@
#ifndef TrkGsfMeasurementUpdator_H
#define TrkGsfMeasurementUpdator_H
+#include "KalmanParameterUpdator/KalmanParameterUpdator.h"
#include "TrkEventPrimitives/FitQualityOnSurface.h"
#include "TrkGaussianSumFilter/MultiComponentStateAssembler.h"
-
-#include "TrkGaussianSumFilter/IMultiStateMeasurementUpdator.h"
-#include "TrkToolInterfaces/IUpdator.h"
-
-#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/IChronoStatSvc.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
+#include "TrkMeasurementBase/MeasurementBase.h"
+#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
+#include <memory>
namespace Trk {
-class LocalParameters;
-
class GsfMeasurementUpdator
- : public AthAlgTool
- , virtual public IMultiStateMeasurementUpdator
{
-
-private:
- /** Private typedef for calling the correct updator member function depending
- * of direction of fitting */
- typedef Trk::TrackParameters* (Trk::IUpdator::*Updator)(
- const Trk::TrackParameters&,
- const LocalParameters&,
- const Amg::MatrixX&,
- FitQualityOnSurface*&)const;
-
public:
- /** Constructor with parameters to be passed to AlgTool */
- GsfMeasurementUpdator(const std::string&,
- const std::string&,
- const IInterface*);
-
- /** Virtual destructor */
- virtual ~GsfMeasurementUpdator() = default;
-
- /** AlgTool initialise method */
- StatusCode initialize() override;
-
- /** AlgTool finalise method */
- StatusCode finalize() override;
-
/** Method for updating the multi-state with a new measurement */
- virtual MultiComponentState update(
- MultiComponentState&&,
- const MeasurementBase&) const override final;
+ MultiComponentState update(MultiComponentState&&,
+ const MeasurementBase&) const;
/** Method for updating the multi-state with a new measurement and calculate
* the fit qaulity at the same time*/
- virtual MultiComponentState update(
+ MultiComponentState update(
Trk::MultiComponentState&&,
const Trk::MeasurementBase&,
- std::unique_ptr<FitQualityOnSurface>& fitQoS) const override final;
-
- /** Method for GSF smoother to calculate unbiased parameters of the
- * multi-component state */
- virtual MultiComponentState getUnbiasedTrackParameters(
- MultiComponentState&&,
- const MeasurementBase&) const override final;
+ std::unique_ptr<FitQualityOnSurface>& fitQoS) const;
/** Method for determining the chi2 of the multi-component state and the
* number of degrees of freedom */
- virtual const FitQualityOnSurface* fitQuality(
- const MultiComponentState&,
- const MeasurementBase&) const override;
+ const FitQualityOnSurface* fitQuality(const MultiComponentState&,
+ const MeasurementBase&) const;
private:
MultiComponentState calculateFilterStep(MultiComponentState&&,
const MeasurementBase&,
- const Updator) const;
+ int addRemoveFlag) const;
MultiComponentState calculateFilterStep(
MultiComponentState&&,
@@ -96,11 +56,7 @@ private:
MultiComponentState rebuildState(
Trk::MultiComponentState&& stateBeforeUpdate) const;
-private:
- ToolHandle<IUpdator> m_updator{ this,
- "Updator",
- "Trk::KalmanUpdator/KalmanUpdator",
- "" };
+ KalmanParameterUpdator m_updator{};
};
}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfSmoother.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfSmoother.h
index 615054c82b7fbf2d162d313f26cd53d1bc6c6e7c..6be5af09e428b48e80053e68b78408df5a7238c6 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfSmoother.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfSmoother.h
@@ -13,7 +13,7 @@
#define TrkGsfSmoother_H
#include "TrkGaussianSumFilter/IGsfSmoother.h"
-
+#include "TrkGaussianSumFilter/GsfMeasurementUpdator.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "TrkEventPrimitives/ParticleHypothesis.h"
@@ -48,8 +48,7 @@ public:
- Configure the extrapolator
- Configure the measurement updator */
virtual StatusCode configureTools(
- const ToolHandle<IMultiStateExtrapolator>&,
- const ToolHandle<IMultiStateMeasurementUpdator>&);
+ const ToolHandle<IMultiStateExtrapolator>& extrapolator);
/** Gsf smoother method */
virtual SmoothedTrajectory* fit(
@@ -72,6 +71,7 @@ private:
Trk::SmoothedTrajectory* smoothedTrajectory) const;
private:
+ GsfMeasurementUpdator m_updator;
bool m_combineWithFitter;
Gaudi::Property<unsigned int> m_maximumNumberOfComponents{
@@ -80,11 +80,11 @@ private:
12,
"Maximum number of components"
};
+
/*
- * Special Tool Handles set by the configureTools
+ * Special Tool Handle set by the configureTools
*/
ToolHandle<IMultiStateExtrapolator> m_extrapolator;
- ToolHandle<IMultiStateMeasurementUpdator> m_updator;
};
} // end Trk namespace
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h
index f514deb5402bd767c625b094b299494007814235..7d149e85b3e99c13ef72548aa88963623a630ac6 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h
@@ -50,7 +50,6 @@ public:
- Configure the RIO_OnTrack creator */
virtual StatusCode configureTools(
const ToolHandle<Trk::IMultiStateExtrapolator>&,
- const ToolHandle<Trk::IMultiStateMeasurementUpdator>&,
const ToolHandle<Trk::IRIO_OnTrackCreator>&) = 0;
/** Forward GSF fit using PrepRawData */
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IGsfSmoother.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IGsfSmoother.h
index 11ae1e16db27e39c95f90bd4cf7c9a80bd2643c0..7e5770677e75ffb3c7415bc281d5bebaeb509ce1 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IGsfSmoother.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IGsfSmoother.h
@@ -3,7 +3,7 @@
*/
/**
- * @file IGsfSmoother.h
+ * @file IGsfSmoother.h
* @date Thursday 8th January 2009
* @author Anthony Morley, Christos Anastopoulos
* @brief Abstract interface for the GSF smoother
@@ -14,8 +14,8 @@
#include "TrkEventPrimitives/ParticleHypothesis.h"
#include "TrkFitterUtils/FitterTypes.h"
+#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
-#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/IAlgTool.h"
@@ -42,8 +42,7 @@ public:
- Configure the extrapolator
- Configure the measurement updator */
virtual StatusCode configureTools(
- const ToolHandle<IMultiStateExtrapolator>&,
- const ToolHandle<IMultiStateMeasurementUpdator>&) = 0;
+ const ToolHandle<IMultiStateExtrapolator>& extrapolator) = 0;
/** Gsf smoother method */
virtual SmoothedTrajectory* fit(
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IMultiStateMeasurementUpdator.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IMultiStateMeasurementUpdator.h
deleted file mode 100644
index 7b8df475912d7bbdc46acebdeb2f042d186c15f4..0000000000000000000000000000000000000000
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IMultiStateMeasurementUpdator.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
- * @file IMultiStateMeasurementUpdator.h
- * @date Friday 25th February 2005
- * @author Tom Atkinson, Anthony Morley, Christos Anastopoulos
- * @brief Interface class for performing updates on multi-component state
- * objects
- */
-
-
-#ifndef TrkIMultiStateMeasurementUpdator_H
-#define TrkIMultiStateMeasurementUpdator_H
-
-#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
-
-#include "GaudiKernel/IAlgTool.h"
-#include "TrkEventPrimitives/FitQualityOnSurface.h"
-#include <memory>
-namespace Trk {
-
-class MeasurementBase;
-
-static const InterfaceID
- IID_IMultiStateMeasurementUpdator("IMultiStateMeasurementUpdator", 1, 0);
-
-class IMultiStateMeasurementUpdator : virtual public IAlgTool
-{
-
-public:
- /** IAlgTool and AlgTool interface method */
- static const InterfaceID& interfaceID()
- {
- return IID_IMultiStateMeasurementUpdator;
- };
-
- /** Virtual destructor */
- virtual ~IMultiStateMeasurementUpdator() = default;
-
- /** Method for forward filters to incorporate measurement updates */
- virtual MultiComponentState update(MultiComponentState&&,
- const MeasurementBase&) const = 0;
-
- /** Method for updating the multi-state with a new measurement and calculate
- * the fit qaulity at the same time*/
- virtual MultiComponentState update(
- Trk::MultiComponentState&&,
- const Trk::MeasurementBase&,
- std::unique_ptr<FitQualityOnSurface>& fitQoS) const = 0;
-
- /** Method for reverse filters (smoothers) to determine the unbiased track
- * parameters */
- virtual MultiComponentState getUnbiasedTrackParameters(
- MultiComponentState&&,
- const MeasurementBase&) const = 0;
-
- /** Method for determining the chi2 of the track and the number of degrees of
- * freedom */
- virtual const FitQualityOnSurface* fitQuality(
- const MultiComponentState&,
- const MeasurementBase&) const = 0;
-};
-
-} // end Trk namespace
-
-#endif
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
index f317764a29d4be26782b557a60498cc62d6948e0..b8fb7d3353c5e0f0446fabb03a3db395931c124c 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
@@ -13,7 +13,6 @@
#include "TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h"
#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
-#include "TrkGaussianSumFilter/IMultiStateMeasurementUpdator.h"
#include "TrkGaussianSumFilter/MultiComponentStateCombiner.h"
#include "TrkDetElementBase/TrkDetElementBase.h"
@@ -28,6 +27,7 @@ Trk::ForwardGsfFitter::ForwardGsfFitter(const std::string& type,
const std::string& name,
const IInterface* parent)
: AthAlgTool(type, name, parent)
+ , m_updator{}
, m_cutChiSquaredPerNumberDOF(50.)
, m_overideMaterialEffects(4)
, m_overideParticleHypothesis(nonInteracting)
@@ -47,7 +47,6 @@ Trk::ForwardGsfFitter::initialize()
ATH_MSG_DEBUG("A cut on Chi2 / NDOF: " << m_cutChiSquaredPerNumberDOF
<< " will be applied");
-
Trk::ParticleSwitcher particleSwitcher;
m_overideParticleHypothesis =
particleSwitcher.particle[m_overideMaterialEffects];
@@ -73,11 +72,9 @@ Trk::ForwardGsfFitter::finalize()
StatusCode
Trk::ForwardGsfFitter::configureTools(
const ToolHandle<IMultiStateExtrapolator>& extrapolator,
- const ToolHandle<IMultiStateMeasurementUpdator>& measurementUpdator,
const ToolHandle<IRIO_OnTrackCreator>& rioOnTrackCreator)
{
m_extrapolator = extrapolator;
- m_updator = measurementUpdator;
m_rioOnTrackCreator = rioOnTrackCreator;
ATH_MSG_INFO("Configuration of " << name() << " was successful");
@@ -179,11 +176,6 @@ Trk::ForwardGsfFitter::fitMeasurements(
const Trk::TrackParameters& estimatedTrackParametersNearOrigin,
const Trk::ParticleHypothesis particleHypothesis) const
{
- // Check that the updator is instansiated
- if (!m_updator) {
- ATH_MSG_ERROR("The measurement updator is not configured... Exiting!");
- return nullptr;
- }
if (!m_extrapolator) {
ATH_MSG_ERROR("The extrapolator is not configured... Exiting!");
@@ -291,7 +283,8 @@ Trk::ForwardGsfFitter::stepForwardFit(
ATH_MSG_DEBUG("Extrapolation failed... returning false");
return false;
} else {
- ATH_MSG_DEBUG("Extrapolation worked... state size: "<< extrapolatedState.size() );
+ ATH_MSG_DEBUG(
+ "Extrapolation worked... state size: " << extrapolatedState.size());
}
// =======================
// Measurement Preparation
@@ -322,7 +315,7 @@ Trk::ForwardGsfFitter::stepForwardFit(
return false;
}
std::unique_ptr<Trk::FitQualityOnSurface> fitQuality;
- updatedState = m_updator->update(
+ updatedState = m_updator.update(
std::move(*(MultiComponentStateHelpers::clone(extrapolatedState))),
*measurement,
fitQuality);
@@ -330,7 +323,8 @@ Trk::ForwardGsfFitter::stepForwardFit(
ATH_MSG_DEBUG("Measurement update of the state failed... Exiting!");
return false;
} else {
- ATH_MSG_DEBUG("Measurement update of the state worked : " << updatedState.size() );
+ ATH_MSG_DEBUG(
+ "Measurement update of the state worked : " << updatedState.size());
}
// Bail if the fit quality is not defined:
if (!fitQuality) {
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
index b2654163bd4876b21e864738fd70861272ddb338..3a8d3e982c2deaa87acfef457a2494a7568301f0 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
@@ -3,17 +3,16 @@
*/
/**
- * @file GaussianSumFitter.cxx
+ * @file GaussianSumFitter.cxx
* @begin Monday 7th March 2005
* @author Anthony Morley, Tom Atkinson, Christos Anastopoulos
* @brief Implementation code for Gaussian Sum Fitter class
-*/
+ */
#include "TrkGaussianSumFilter/GaussianSumFitter.h"
#include "TrkGaussianSumFilter/IForwardGsfFitter.h"
#include "TrkGaussianSumFilter/IGsfSmoother.h"
#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
-#include "TrkGaussianSumFilter/IMultiStateMeasurementUpdator.h"
#include "TrkGaussianSumFilter/MultiComponentStateCombiner.h"
#include "TrkEventUtils/MeasurementBaseComparisonFunction.h"
@@ -41,14 +40,9 @@ Trk::GaussianSumFitter::GaussianSumFitter(const std::string& type,
const std::string& name,
const IInterface* parent)
: AthAlgTool(type, name, parent)
- , m_reintegrateOutliers(false)
- , m_makePerigee(true)
- , m_refitOnMeasurementBase(true)
- , m_doHitSorting(true)
, m_directionToPerigee(Trk::oppositeMomentum)
, m_trkParametersComparisonFunction(nullptr)
, m_inputPreparator(nullptr)
- , m_chronoSvc("ChronoStatSvc", name)
, m_FitPRD{ 0 }
, m_FitMeasurementBase{ 0 }
, m_ForwardFailure{ 0 }
@@ -57,13 +51,7 @@ Trk::GaussianSumFitter::GaussianSumFitter(const std::string& type,
, m_fitQualityFailure{ 0 }
, m_fitSuccess{ 0 }
{
-
declareInterface<ITrackFitter>(this);
-
- declareProperty("ReintegrateOutliers", m_reintegrateOutliers);
- declareProperty("MakePerigee", m_makePerigee);
- declareProperty("RefitOnMeasurementBase", m_refitOnMeasurementBase);
- declareProperty("DoHitSorting", m_doHitSorting);
declareProperty("SortingReferencePoint", m_sortingReferencePoint);
// Estrablish reference point as origin
m_sortingReferencePoint.push_back(0.);
@@ -77,9 +65,6 @@ Trk::GaussianSumFitter::initialize()
StatusCode sc;
- // Request the Chrono Service
- ATH_CHECK(m_chronoSvc.retrieve());
-
// Request the GSF forward fitter - hardwired type and instanace name for the
// GSF
ATH_CHECK(m_forwardGsfFitter.retrieve());
@@ -87,10 +72,6 @@ Trk::GaussianSumFitter::initialize()
// Request the GSF smoother - hardwired type and instance name for the GSF
ATH_CHECK(m_gsfSmoother.retrieve());
- // Request the GSF measurement updator - hardwired type and instance name for
- // the GSF
- ATH_CHECK(m_updator.retrieve());
-
// Request the GSF extrapolator
ATH_CHECK(m_extrapolator.retrieve());
@@ -118,15 +99,14 @@ Trk::GaussianSumFitter::initialize()
std::make_unique<Trk::TrkParametersComparisonFunction>(referencePosition);
// Configure forward fitter
- sc = m_forwardGsfFitter->configureTools(
- m_extrapolator, m_updator, m_rioOnTrackCreator);
+ sc = m_forwardGsfFitter->configureTools(m_extrapolator, m_rioOnTrackCreator);
if (sc.isFailure()) {
ATH_MSG_FATAL("Could not configure the forwards GSF fitter... Exiting!");
return StatusCode::FAILURE;
}
// Configure smoother
- sc = m_gsfSmoother->configureTools(m_extrapolator, m_updator);
+ sc = m_gsfSmoother->configureTools(m_extrapolator);
if (sc.isFailure()) {
ATH_MSG_FATAL("Could not configure the GSF smoother... Exiting!");
return StatusCode::FAILURE;
@@ -170,9 +150,9 @@ Trk::GaussianSumFitter::finalize()
return StatusCode::SUCCESS;
}
-/*
+/*
* Refitting of a track
-*/
+ */
std::unique_ptr<Trk::Track>
Trk::GaussianSumFitter::fit(
const EventContext& ctx,
@@ -180,8 +160,6 @@ Trk::GaussianSumFitter::fit(
const Trk::RunOutlierRemoval outlierRemoval,
const Trk::ParticleHypothesis particleHypothesis) const
{
- // Start the timer
- Chrono chrono(&(*m_chronoSvc), name());
// Check that the input track has well defined parameters
if (inputTrack.trackParameters()->empty()) {
@@ -306,8 +284,6 @@ Trk::GaussianSumFitter::fit(
"Outlier removal not yet implemented for the Gaussian Sum Filter");
}
- // Start the timer
- Chrono chrono(&(*m_chronoSvc), name());
// Protect against empty PrepRawDataSet object
if (prepRawDataSet.empty()) {
ATH_MSG_FATAL("PrepRawData set for fit is empty... Exiting!");
@@ -329,7 +305,6 @@ Trk::GaussianSumFitter::fit(
// Create Extrapolator cache that holds material effects cache;
Trk::IMultiStateExtrapolator::Cache extrapolatorCache;
-
// Perform GSF forwards fit
ForwardTrajectory* forwardTrajectory =
m_forwardGsfFitter
@@ -354,8 +329,8 @@ Trk::GaussianSumFitter::fit(
}
// Perform GSF smoother operation
- SmoothedTrajectory* smoothedTrajectory =
- m_gsfSmoother->fit(ctx, extrapolatorCache, *forwardTrajectory, particleHypothesis);
+ SmoothedTrajectory* smoothedTrajectory = m_gsfSmoother->fit(
+ ctx, extrapolatorCache, *forwardTrajectory, particleHypothesis);
// Protect against failed smoother fit
if (!smoothedTrajectory) {
@@ -377,7 +352,8 @@ Trk::GaussianSumFitter::fit(
if (m_makePerigee) {
const Trk::MultiComponentStateOnSurface* perigeeMultiStateOnSurface =
- makePerigee(ctx, extrapolatorCache, smoothedTrajectory, particleHypothesis);
+ makePerigee(
+ ctx, extrapolatorCache, smoothedTrajectory, particleHypothesis);
ATH_MSG_DEBUG(
"perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface);
if (perigeeMultiStateOnSurface) {
@@ -396,12 +372,13 @@ Trk::GaussianSumFitter::fit(
delete forwardTrajectory;
// Reverse the order of the TSOS's to make be order flow from inside to out
std::reverse(smoothedTrajectory->begin(), smoothedTrajectory->end());
-
+
// Store only TSOS in tracks instead of MCSOS
- if( !m_StoreMCSOS ){
- auto slimmedSmoothedTrajectory = std::make_unique<Trk::SmoothedTrajectory>();
- for( const Trk::TrackStateOnSurface* tsos : *smoothedTrajectory ){
- slimmedSmoothedTrajectory->push_back( new Trk::TrackStateOnSurface( *tsos ) );
+ if (!m_StoreMCSOS) {
+ auto slimmedSmoothedTrajectory =
+ std::make_unique<Trk::SmoothedTrajectory>();
+ for (const Trk::TrackStateOnSurface* tsos : *smoothedTrajectory) {
+ slimmedSmoothedTrajectory->push_back(new Trk::TrackStateOnSurface(*tsos));
}
delete smoothedTrajectory;
// Create new track
@@ -409,10 +386,10 @@ Trk::GaussianSumFitter::fit(
info.setTrackProperties(TrackInfo::BremFit);
info.setTrackProperties(TrackInfo::BremFitSuccessful);
++m_fitSuccess;
- return std::make_unique<Track>(info, slimmedSmoothedTrajectory.release(), fitQuality);
+ return std::make_unique<Track>(
+ info, slimmedSmoothedTrajectory.release(), fitQuality);
}
-
// Create new track
Trk::TrackInfo info(Trk::TrackInfo::GaussianSumFilter, particleHypothesis);
info.setTrackProperties(TrackInfo::BremFit);
@@ -439,10 +416,6 @@ Trk::GaussianSumFitter::fit(
"Outlier removal not yet implemented for the Gaussian Sum Filter");
}
-
- // Start the timer
- Chrono chrono(&(*m_chronoSvc), name());
-
++m_FitMeasurementBase;
// Protect against empty PrepRawDataSet object
if (measurementSet.empty()) {
@@ -489,12 +462,9 @@ Trk::GaussianSumFitter::fit(
measurementBaseComparisonFunction);
}
-
// Create Extrapolator cache that holds material effects cache;
Trk::IMultiStateExtrapolator::Cache extrapolatorCache;
-
-
// Perform GSF forwards fit - new memory allocated in forwards fitter
ForwardTrajectory* forwardTrajectory =
m_forwardGsfFitter
@@ -520,8 +490,8 @@ Trk::GaussianSumFitter::fit(
// Perform GSF smoother operation
- SmoothedTrajectory* smoothedTrajectory =
- m_gsfSmoother->fit(ctx, extrapolatorCache, *forwardTrajectory, particleHypothesis, ccot);
+ SmoothedTrajectory* smoothedTrajectory = m_gsfSmoother->fit(
+ ctx, extrapolatorCache, *forwardTrajectory, particleHypothesis, ccot);
// Protect against failed smoother fit
if (!smoothedTrajectory) {
@@ -544,7 +514,8 @@ Trk::GaussianSumFitter::fit(
if (m_makePerigee) {
const Trk::MultiComponentStateOnSurface* perigeeMultiStateOnSurface =
- makePerigee(ctx, extrapolatorCache, smoothedTrajectory, particleHypothesis);
+ makePerigee(
+ ctx, extrapolatorCache, smoothedTrajectory, particleHypothesis);
ATH_MSG_DEBUG(
"perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface);
@@ -566,12 +537,12 @@ Trk::GaussianSumFitter::fit(
// Reverse the order of the TSOS's to make be order flow from inside to out
std::reverse(smoothedTrajectory->begin(), smoothedTrajectory->end());
-
// Store only TSOS in tracks instead of MCSOS
- if( !m_StoreMCSOS ){
- auto slimmedSmoothedTrajectory = std::make_unique<Trk::SmoothedTrajectory>();
- for( const Trk::TrackStateOnSurface* tsos : *smoothedTrajectory ){
- slimmedSmoothedTrajectory->push_back( new Trk::TrackStateOnSurface(*tsos) );
+ if (!m_StoreMCSOS) {
+ auto slimmedSmoothedTrajectory =
+ std::make_unique<Trk::SmoothedTrajectory>();
+ for (const Trk::TrackStateOnSurface* tsos : *smoothedTrajectory) {
+ slimmedSmoothedTrajectory->push_back(new Trk::TrackStateOnSurface(*tsos));
}
delete smoothedTrajectory;
// Create new track
@@ -579,7 +550,8 @@ Trk::GaussianSumFitter::fit(
info.setTrackProperties(TrackInfo::BremFit);
info.setTrackProperties(TrackInfo::BremFitSuccessful);
++m_fitSuccess;
- return std::make_unique<Track>(info, slimmedSmoothedTrajectory.release(), fitQuality);
+ return std::make_unique<Track>(
+ info, slimmedSmoothedTrajectory.release(), fitQuality);
}
// Create new track
@@ -759,22 +731,21 @@ Trk::GaussianSumFitter::makePerigee(
multiComponentStateOnSurfaceNearestOrigin = nullptr;
if (stateOnSurfaceNearestOrigin->variety() ==
- Trk::TrackStateOnSurface::MultiComponent) {
+ Trk::TrackStateOnSurface::MultiComponent) {
multiComponentStateOnSurfaceNearestOrigin =
static_cast<const Trk::MultiComponentStateOnSurface*>(
stateOnSurfaceNearestOrigin);
}
- const Trk::MultiComponentState* multiComponentState = nullptr;
- if (!multiComponentStateOnSurfaceNearestOrigin) {
- // we need to make a dummy multicomponent surface
- Trk::ComponentParameters dummyComponent(
- stateOnSurfaceNearestOrigin->trackParameters()->clone(), 1.);
- auto tmp_multiComponentState =
- std::make_unique<Trk::MultiComponentState>();
- tmp_multiComponentState->push_back(std::move(dummyComponent));
- multiComponentState = tmp_multiComponentState.release();
+ const Trk::MultiComponentState* multiComponentState = nullptr;
+ if (!multiComponentStateOnSurfaceNearestOrigin) {
+ // we need to make a dummy multicomponent surface
+ Trk::ComponentParameters dummyComponent(
+ stateOnSurfaceNearestOrigin->trackParameters()->clone(), 1.);
+ auto tmp_multiComponentState = std::make_unique<Trk::MultiComponentState>();
+ tmp_multiComponentState->push_back(std::move(dummyComponent));
+ multiComponentState = tmp_multiComponentState.release();
} else {
multiComponentState =
multiComponentStateOnSurfaceNearestOrigin->components();
@@ -815,7 +786,7 @@ Trk::GaussianSumFitter::makePerigee(
if (std::abs(combinedPerigee->parameters()[Trk::qOverP]) > 1e8) {
// Protection against 0-momentum track .. this check should NEVER be needed.
- //actual cutoff is 0.01eV track
+ // actual cutoff is 0.01eV track
ATH_MSG_ERROR(
"makePerigee() about to return with 0 momentum!! Returning null instead");
return nullptr;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfExtrapolator.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfExtrapolator.cxx
index 99417a5534f4c2f017cb1407f4ec72ae02407d96..d7bc79f5af500ef36fdba7eebb532250065cca06 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfExtrapolator.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfExtrapolator.cxx
@@ -32,8 +32,8 @@ decription : Implementation code for GsfExtrapolator class
#include "TrkTrack/TrackStateOnSurface.h"
-#include <utility>
#include <unordered_set>
+#include <utility>
namespace {
const bool useBoundaryMaterialUpdate(true);
@@ -146,7 +146,7 @@ Trk::GsfExtrapolator::extrapolateImpl(
const Trk::BoundaryCheck& boundaryCheck,
Trk::ParticleHypothesis particleHypothesis) const
{
- ATH_MSG_DEBUG("Calling extrpolate: " << multiComponentState.size() );
+ ATH_MSG_DEBUG("Calling extrpolate: " << multiComponentState.size());
auto buff_extrapolateCalls = m_extrapolateCalls.buffer();
// If the extrapolation is to be without material effects simply revert to the
@@ -434,7 +434,8 @@ Trk::GsfExtrapolator::extrapolateImpl(
return {};
}
// After successful extrapolation return the state
- ATH_MSG_DEBUG("extrapolateInsideVolume() successful: " << destinationState.size() );
+ ATH_MSG_DEBUG(
+ "extrapolateInsideVolume() successful: " << destinationState.size());
return destinationState;
}
/*
@@ -522,7 +523,7 @@ Trk::GsfExtrapolator::extrapolateDirectly(
auto buff_extrapolateDirectlyCalls = m_extrapolateDirectlyCalls.buffer();
// statistics
++buff_extrapolateDirectlyCalls;
- const Trk::TrackingVolume* currentVolume = m_navigator->highestVolume();
+ const Trk::TrackingVolume* currentVolume = m_navigator->highestVolume(ctx);
if (!currentVolume) {
ATH_MSG_WARNING(
"Current tracking volume could not be determined... returning 0");
@@ -633,8 +634,12 @@ Trk::GsfExtrapolator::extrapolateToVolumeBoundary(
// Only loop over layers if they can be found within the tracking volume
else if (trackingVolume.confinedLayers() &&
associatedLayer->layerMaterialProperties()) {
- Trk::MultiComponentState updatedState = m_materialUpdator->postUpdate(
- cache.m_materialEffectsCaches, *currentState, *layer, direction, particleHypothesis);
+ Trk::MultiComponentState updatedState =
+ m_materialUpdator->postUpdate(cache.m_materialEffectsCaches,
+ *currentState,
+ *layer,
+ direction,
+ particleHypothesis);
if (!updatedState.empty()) {
addMaterialtoVector(cache, layer, currentState->begin()->first.get());
@@ -756,8 +761,12 @@ Trk::GsfExtrapolator::extrapolateToVolumeBoundary(
if (layerAtBoundary->layerMaterialProperties()) {
ATH_MSG_DEBUG("Boundary surface has material - updating properties");
assert(currentState);
- matUpdatedState = m_materialUpdator->postUpdate(
- cache.m_materialEffectsCaches, *currentState, *layerAtBoundary, direction, particleHypothesis);
+ matUpdatedState =
+ m_materialUpdator->postUpdate(cache.m_materialEffectsCaches,
+ *currentState,
+ *layerAtBoundary,
+ direction,
+ particleHypothesis);
}
}
@@ -814,7 +823,8 @@ Trk::GsfExtrapolator::extrapolateInsideVolume(
{
ATH_MSG_DEBUG("GSF extrapolateInsideVolume() in tracking volume: "
- << trackingVolume.volumeName() << " with " << multiComponentState.size() << " components" );
+ << trackingVolume.volumeName() << " with "
+ << multiComponentState.size() << " components");
/*
* We use current State to track where we are
@@ -860,8 +870,11 @@ Trk::GsfExtrapolator::extrapolateInsideVolume(
trackingVolume.confinedLayers() &&
associatedLayer->layerMaterialProperties()) {
- updatedState = m_materialUpdator->postUpdate(
- cache.m_materialEffectsCaches, *currentState, *associatedLayer, direction, particleHypothesis);
+ updatedState = m_materialUpdator->postUpdate(cache.m_materialEffectsCaches,
+ *currentState,
+ *associatedLayer,
+ direction,
+ particleHypothesis);
if (!updatedState.empty()) {
addMaterialtoVector(
@@ -1094,8 +1107,12 @@ Trk::GsfExtrapolator::extrapolateToIntermediateLayer(
Material effects
------------------------------------- */
- Trk::MultiComponentState updatedState = m_materialUpdator->update(
- cache.m_materialEffectsCaches, destinationState, layer, direction, particleHypothesis);
+ Trk::MultiComponentState updatedState =
+ m_materialUpdator->update(cache.m_materialEffectsCaches,
+ destinationState,
+ layer,
+ direction,
+ particleHypothesis);
if (updatedState.empty()) {
return destinationState;
@@ -1170,11 +1187,14 @@ Trk::GsfExtrapolator::extrapolateToDestinationLayer(
Trk::MultiComponentState updatedState{};
if (startLayer != &layer) {
- updatedState = m_materialUpdator->preUpdate(
- cache.m_materialEffectsCaches, destinationState, layer, direction, particleHypothesis);
+ updatedState = m_materialUpdator->preUpdate(cache.m_materialEffectsCaches,
+ destinationState,
+ layer,
+ direction,
+ particleHypothesis);
}
- ATH_MSG_DEBUG( "State size after preUpdate: " << updatedState.size() );
+ ATH_MSG_DEBUG("State size after preUpdate: " << updatedState.size());
if (updatedState.empty()) {
return destinationState;
@@ -1208,8 +1228,9 @@ Trk::GsfExtrapolator::extrapolateSurfaceBasedMaterialEffects(
// Check the multi-component state is populated
if (multiComponentState.empty()) {
- ATH_MSG_WARNING("Multi component state passed to extrapolateSurfaceBasedMaterialEffects "
- "is not populated... returning 0");
+ ATH_MSG_WARNING(
+ "Multi component state passed to extrapolateSurfaceBasedMaterialEffects "
+ "is not populated... returning 0");
return {};
}
@@ -1359,7 +1380,7 @@ Trk::GsfExtrapolator::initialiseNavigation(
Trk::PropDirection direction) const
{
- ATH_MSG_DEBUG("initialiseNavigation !!! : " << multiComponentState.size() );
+ ATH_MSG_DEBUG("initialiseNavigation !!! : " << multiComponentState.size());
// Empty the garbage bin
ATH_MSG_DEBUG("Destination to surface [r,z] ["
<< surface.center().perp() << ",\t" << surface.center().z()
@@ -1389,7 +1410,7 @@ Trk::GsfExtrapolator::initialiseNavigation(
else if (!currentVolume) {
// If the recall method fails then the cashed information needs to be reset
resetRecallInformation(cache);
- currentVolume = m_navigator->volume(combinedState->position());
+ currentVolume = m_navigator->volume(ctx, combinedState->position());
currentLayer = (currentVolume)
? currentVolume->associatedLayer(combinedState->position())
: nullptr;
@@ -1462,12 +1483,14 @@ Trk::GsfExtrapolator::initialiseNavigation(
}
// Global search of tracking geometry to find the destination volume
if (referenceParameters) {
- destinationVolume = m_navigator->volume(referenceParameters->position());
+ destinationVolume =
+ m_navigator->volume(ctx, referenceParameters->position());
}
// If destination volume is still not found then global search based on
// surface position
else {
- destinationVolume = m_navigator->volume(surface.globalReferencePoint());
+ destinationVolume =
+ m_navigator->volume(ctx, surface.globalReferencePoint());
}
}
}
@@ -1511,9 +1534,10 @@ Trk::GsfExtrapolator::addMaterialtoVector(Cache& cache,
: nullptr;
// Determine the pathCorrection if the material properties exist
- pathcorr = materialProperties
- ? 1. / std::abs(surface->normal().dot(nextPar->momentum().unit()))
- : 0.;
+ pathcorr =
+ materialProperties
+ ? 1. / std::abs(surface->normal().dot(nextPar->momentum().unit()))
+ : 0.;
}
// Check that the material properties have been defined - if not define them
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMeasurementUpdator.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMeasurementUpdator.cxx
index 5ffb33af9b5b74fbfde643566eaa7e59c37514df..bc984b9e41c1d7bffaa5494379372e1f5a46fc4d 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMeasurementUpdator.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfMeasurementUpdator.cxx
@@ -1,54 +1,19 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-/*********************************************************************************
- GsfMeasurementUpdator.cxx - description
- -----------------------------------------
-begin : Friday 25th February 2005
-author : amorley, atkinson
-email : Anthony.Morley@cern.ch, Tom.Atkinson@cern.ch
-decription : Implementation code for GsfMeasurementUpdator class
-*********************************************************************************/
+/**
+ * @file GsfMeasurementUpdator.cxx
+ * @date Friday 25th February 2005
+ * @author Tom Athkinson, Anthony Morley, Christos Anastopoulos
+ * @brief Implementation code for GsfMeasurementUpdator class
+ */
#include "TrkGaussianSumFilter/GsfMeasurementUpdator.h"
-#include "GaudiKernel/Chrono.h"
-#include "GaudiKernel/IChronoStatSvc.h"
#include "TrkEventPrimitives/FitQuality.h"
#include "TrkEventPrimitives/LocalParameters.h"
#include "TrkGaussianSumFilter/MultiComponentStateAssembler.h"
-#include "TrkMeasurementBase/MeasurementBase.h"
-
#include "TrkGaussianSumFilter/PosteriorWeightsCalculator.h"
-
-Trk::GsfMeasurementUpdator::GsfMeasurementUpdator(const std::string& type,
- const std::string& name,
- const IInterface* parent)
- : AthAlgTool(type, name, parent)
-{
- declareInterface<IMultiStateMeasurementUpdator>(this);
-}
-
-StatusCode
-Trk::GsfMeasurementUpdator::initialize()
-{
- // Retrieve the updator tool
- if (m_updator.retrieve().isFailure()) {
- ATH_MSG_FATAL(
- "Could not retrieve measurement updator AlgTool ... Exiting!");
- return StatusCode::FAILURE;
- }
-
- ATH_MSG_INFO("Initialisation of " << name() << " was successful");
- return StatusCode::SUCCESS;
-}
-
-StatusCode
-Trk::GsfMeasurementUpdator::finalize()
-{
- ATH_MSG_INFO("Finalisation of " << name() << " was successful");
- return StatusCode::SUCCESS;
-}
+#include "TrkMeasurementBase/MeasurementBase.h"
Trk::MultiComponentState
Trk::GsfMeasurementUpdator::update(
@@ -56,9 +21,6 @@ Trk::GsfMeasurementUpdator::update(
const Trk::MeasurementBase& measurement) const
{
MultiComponentState updatedState{};
- // Point to the correct member function of the linear fitter measurement
- // updator for fitting in the direction of momentum
- Updator updator = &Trk::IUpdator::addToState;
// Check all components have associated error matricies
Trk::MultiComponentState::iterator component = stateBeforeUpdate.begin();
bool rebuildStateWithErrors = false;
@@ -73,31 +35,18 @@ Trk::GsfMeasurementUpdator::update(
Trk::MultiComponentState stateWithInsertedErrors =
rebuildState(std::move(stateBeforeUpdate));
// Perform the measurement update with the modified state
- updatedState = calculateFilterStep(
- std::move(stateWithInsertedErrors), measurement, updator);
+ updatedState =
+ calculateFilterStep(std::move(stateWithInsertedErrors), measurement, 1);
return updatedState;
}
// Perform the measurement update
updatedState =
- calculateFilterStep(std::move(stateBeforeUpdate), measurement, updator);
+ calculateFilterStep(std::move(stateBeforeUpdate), measurement, 1);
return updatedState;
}
-Trk::MultiComponentState
-Trk::GsfMeasurementUpdator::getUnbiasedTrackParameters(
- Trk::MultiComponentState&& stateBeforeUpdate,
- const MeasurementBase& measurement) const
-{
- // Point to the correct member function of the linear fitter measurement
- // updator for fitting in the direction opposite to momentum (smoothing)
- Updator updator = &Trk::IUpdator::removeFromState;
- // Calculate the weight of each state after the measurement
- return calculateFilterStep(
- std::move(stateBeforeUpdate), measurement, updator);
-}
-
const Trk::FitQualityOnSurface*
Trk::GsfMeasurementUpdator::fitQuality(const MultiComponentState& updatedState,
const MeasurementBase& measurement) const
@@ -105,13 +54,9 @@ Trk::GsfMeasurementUpdator::fitQuality(const MultiComponentState& updatedState,
// Fit quality assumes that a state that has been updated by the measurement
// updator has been supplied to it
-
if (updatedState.empty()) {
- ATH_MSG_WARNING("Attempting to calculate chi2 of a hit with respect to an "
- "empty multiple-component state");
return nullptr;
}
-
double chi2 = 0;
int degreesOfFreedom = 0;
Trk::MultiComponentState::const_iterator component = updatedState.begin();
@@ -123,29 +68,24 @@ Trk::GsfMeasurementUpdator::fitQuality(const MultiComponentState& updatedState,
// calculations depending on if the track parameters incorporate the
// information contained in the measurement. I ALWAYS do this - hence the
// fullStateFitQuality method is used
- const Trk::FitQualityOnSurface* componentFitQuality =
- m_updator->fullStateFitQuality(*trackParameters,
- measurement.localParameters(),
- measurement.localCovariance());
-
- double componentChi2 = componentFitQuality->chiSquared();
-
+ Trk::FitQualityOnSurface componentFitQuality;
+ m_updator.stateFitQuality(componentFitQuality,
+ *trackParameters,
+ measurement.localParameters(),
+ measurement.localCovariance(),
+ 1);
+
+ double componentChi2 = componentFitQuality.chiSquared();
chi2 += component->second * componentChi2;
-
- // The same measurement is included in each update so it is the same for
- // each component
+ // The same measurement is included in each update
if (component == updatedState.begin()) {
- degreesOfFreedom = componentFitQuality->numberDoF();
+ degreesOfFreedom = componentFitQuality.numberDoF();
}
-
- delete componentFitQuality;
}
if (std::isnan(chi2) || chi2 <= 0.) {
-
return nullptr;
}
-
const Trk::FitQualityOnSurface* fitQualityOnSurface =
new FitQualityOnSurface(chi2, degreesOfFreedom);
@@ -156,70 +96,41 @@ Trk::MultiComponentState
Trk::GsfMeasurementUpdator::calculateFilterStep(
Trk::MultiComponentState&& stateBeforeUpdate,
const Trk::MeasurementBase& measurement,
- const Updator updator) const
+ int addRemoveFlag) const
{
- // state Assembler cache
- MultiComponentStateAssembler::Cache cache;
-
if (stateBeforeUpdate.empty()) {
- ATH_MSG_WARNING("Cannot update multi-state with no components!");
return {};
}
+ // state Assembler cache
+ MultiComponentStateAssembler::Cache cache;
+
// Calculate the weight of each component after the measurement
std::vector<Trk::ComponentParameters> stateWithNewWeights =
PosteriorWeightsCalculator::weights(std::move(stateBeforeUpdate),
measurement);
-
+
if (stateWithNewWeights.empty()) {
- ATH_MSG_DEBUG("Cacluation of state posterior weights failed... Exiting!");
return {};
}
- // Update each component using the specified updator
- Trk::MultiComponentState::const_iterator component =
- stateWithNewWeights.begin();
+ for (Trk::ComponentParameters& component : stateWithNewWeights) {
- for (; component != stateWithNewWeights.end(); ++component) {
+ auto fitQuality = std::make_unique<Trk::FitQualityOnSurface>();
+ /// Update the component in place
+ bool updateSuccess = m_updator.filterStep(*(component.first),
+ *fitQuality,
+ measurement.localParameters(),
+ measurement.localCovariance(),
+ addRemoveFlag);
- Trk::FitQualityOnSurface* fitQuality = nullptr;
-
- // Track updates using a pointer to the member function
- std::unique_ptr<Trk::TrackParameters> updatedTrackParameters(
- ((&(*m_updator))->*updator)(*(*component).first,
- measurement.localParameters(),
- measurement.localCovariance(),
- fitQuality));
-
- if (!updatedTrackParameters) {
- ATH_MSG_DEBUG(
- "Update of state with Measurement has failed 1... Exiting!");
- if (fitQuality) {
- delete fitQuality;
- }
+ // If we fail we need to erase the element
+ if (!updateSuccess || fitQuality->chiSquared() <= 0.) {
+ fitQuality.reset();
continue;
}
- if (fitQuality && fitQuality->chiSquared() <= 0.) {
- ATH_MSG_DEBUG("Fit quality of update failed... Exiting!");
- delete fitQuality;
- updatedTrackParameters.reset();
- continue;
- }
- // Clean up memory
- delete fitQuality;
-
- // Updator does not change the weighting
- ComponentParameters updatedComponentParameters(
- std::move(updatedTrackParameters), component->second);
- // Add component to state being prepared for assembly and check that it is
- // valid
- bool componentAdded = MultiComponentStateAssembler::addComponent(
- cache, std::move(updatedComponentParameters));
-
- if (!componentAdded) {
- ATH_MSG_DEBUG(
- "Component could not be added to the state in the assembler");
- }
+ // Move component to state being prepared for assembly
+ MultiComponentStateAssembler::addComponent(cache, std::move(component));
}
Trk::MultiComponentState assembledUpdatedState =
@@ -261,7 +172,6 @@ Trk::GsfMeasurementUpdator::update(
updatedState = calculateFilterStep(
std::move(stateWithInsertedErrors), measurement, fitQoS);
if (updatedState.empty()) {
- ATH_MSG_DEBUG("Updated state could not be calculated... Returning 0");
fitQoS.reset();
return {};
}
@@ -273,7 +183,6 @@ Trk::GsfMeasurementUpdator::update(
calculateFilterStep(std::move(stateBeforeUpdate), measurement, fitQoS);
if (updatedState.empty()) {
- ATH_MSG_DEBUG("Updated state could not be calculated... Returning 0");
fitQoS.reset();
return {};
}
@@ -289,10 +198,7 @@ Trk::GsfMeasurementUpdator::calculateFilterStep(
// state Assembler cache
MultiComponentStateAssembler::Cache cache;
if (stateBeforeUpdate.empty()) {
- ATH_MSG_WARNING("Cannot update multi-state with no components!");
return {};
- } else {
- ATH_MSG_DEBUG("calculateFilterStep() starting with : " << stateBeforeUpdate.size() );
}
// Calculate the weight of each component after the measurement
@@ -301,100 +207,60 @@ Trk::GsfMeasurementUpdator::calculateFilterStep(
measurement);
if (stateWithNewWeights.empty()) {
- ATH_MSG_DEBUG("Cacluation of state posterior weights failed... Exiting!");
return {};
- } else {
- ATH_MSG_DEBUG("calculateFilterStep() after new weights : " << stateWithNewWeights.size() );
}
- // Update each component using the specified updator
- Trk::MultiComponentState::const_iterator component =
- stateWithNewWeights.begin();
-
double chiSquared = 0;
int degreesOfFreedom = 0;
+ for (Trk::ComponentParameters& component : stateWithNewWeights) {
- for (; component != stateWithNewWeights.end(); ++component) {
-
- if ( stateWithNewWeights.size() > 1 &&
- std::abs((*component).first->parameters()[Trk::qOverP]) > 0.033333) {
- ATH_MSG_DEBUG(
- "About to update component with p<30 MeV...skipping component! (2)");
+ if (stateWithNewWeights.size() > 1 &&
+ std::abs(component.first->parameters()[Trk::qOverP]) > 0.033333) {
continue;
}
- Trk::FitQualityOnSurface* componentFitQuality = nullptr;
- // Track update alternates between update and getUnbiasedTrackParams
- std::unique_ptr<Trk::TrackParameters> updatedTrackParameters(
- m_updator->addToState(*(*component).first,
- measurement.localParameters(),
- measurement.localCovariance(),
- componentFitQuality));
-
- if (!updatedTrackParameters) {
- ATH_MSG_DEBUG(
- "Update of state with Measurement has failed 2... Exiting!");
+ auto componentFitQuality = std::make_unique<Trk::FitQualityOnSurface>();
+ /// Update the component in place
+ bool updateSuccess = m_updator.filterStep(*(component.first),
+ *componentFitQuality,
+ measurement.localParameters(),
+ measurement.localCovariance(),
+ 1);
+ if (!updateSuccess) {
if (componentFitQuality) {
- delete componentFitQuality;
+ componentFitQuality.reset();
}
continue;
}
- if (invalidComponent(updatedTrackParameters.get())) {
- ATH_MSG_DEBUG("Invalid cov matrix after update... Exiting!");
- if ((*component).first->covariance()) {
- ATH_MSG_DEBUG("Original has a COV\n "
- << *(*component).first->covariance());
- }
- if (updatedTrackParameters->covariance()) {
- ATH_MSG_DEBUG("Result has a COV\n"
- << *updatedTrackParameters->covariance());
- }
- updatedTrackParameters.reset();
- delete componentFitQuality;
+ if (invalidComponent(component.first.get())) {
+ componentFitQuality.reset();
continue;
}
if (!componentFitQuality || componentFitQuality->chiSquared() <= 0.) {
- ATH_MSG_DEBUG("Fit quality of update failed... Exiting!");
- updatedTrackParameters.reset();
- delete componentFitQuality;
+ componentFitQuality.reset();
continue;
}
double componentChi2 = componentFitQuality->chiSquared();
- chiSquared += component->second * componentChi2;
+ chiSquared += component.second * componentChi2;
- // The same measurement is included in each update so it is the same for
- // each component
- if (component == stateWithNewWeights.begin()) {
+ // The same measurement is included in each update
+ // so we can update the degree of freedom only
+ if (degreesOfFreedom == 0.0) {
degreesOfFreedom = componentFitQuality->numberDoF();
}
- // Clean up memory
- delete componentFitQuality;
-
- // Updator does not change the weighting
- ComponentParameters updatedComponentParameters(
- std::move(updatedTrackParameters), component->second);
- // Add component to state being prepared for assembly and check that it is
- // valid
- bool componentAdded = MultiComponentStateAssembler::addComponent(
- cache, std::move(updatedComponentParameters));
-
- if (!componentAdded) {
- ATH_MSG_DEBUG(
- "Component could not be added to the state in the assembler");
- }
- }
+ componentFitQuality.reset();
- ATH_MSG_DEBUG("Assembeler cache size : " << cache.multiComponentState.size() );
+ // Add component to state being prepared for assembly
+ MultiComponentStateAssembler::addComponent(cache, std::move(component));
+ }
Trk::MultiComponentState assembledUpdatedState =
MultiComponentStateAssembler::assembledState(cache);
if (assembledUpdatedState.empty()) {
return {};
- } else {
- ATH_MSG_DEBUG("Assembeled size : " << assembledUpdatedState.size() );
}
fitQoS = std::make_unique<FitQualityOnSurface>(chiSquared, degreesOfFreedom);
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfSmoother.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfSmoother.cxx
index 3f10e5e1a9d22d0991672520f5bab613b349286e..f1d4779989f92a72fc03069cf3df76209a54d21e 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfSmoother.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfSmoother.cxx
@@ -24,7 +24,6 @@ decription : Implementation code for the class GsfSmoother
#include "TrkSurfaces/Surface.h"
#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
-#include "TrkGaussianSumFilter/IMultiStateMeasurementUpdator.h"
#include "TrkGaussianSumFilter/MultiComponentStateCombiner.h"
#include "TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h"
#include "TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h"
@@ -33,6 +32,7 @@ Trk::GsfSmoother::GsfSmoother(const std::string& type,
const std::string& name,
const IInterface* parent)
: AthAlgTool(type, name, parent)
+ , m_updator{}
, m_combineWithFitter(false)
{
declareInterface<IGsfSmoother>(this);
@@ -54,11 +54,9 @@ Trk::GsfSmoother::finalize()
StatusCode
Trk::GsfSmoother::configureTools(
- const ToolHandle<IMultiStateExtrapolator>& extrapolator,
- const ToolHandle<IMultiStateMeasurementUpdator>& measurementUpdator)
+ const ToolHandle<IMultiStateExtrapolator>& extrapolator)
{
m_extrapolator = extrapolator;
- m_updator = measurementUpdator;
ATH_MSG_INFO("Configuration of " << name() << " was successful");
return StatusCode::SUCCESS;
}
@@ -70,11 +68,6 @@ Trk::GsfSmoother::fit(const EventContext& ctx,
const ParticleHypothesis particleHypothesis,
const Trk::CaloCluster_OnTrack* ccot) const
{
- // Check that extrapolator and updator are instansiated
- if (!m_updator) {
- ATH_MSG_ERROR("The measurement updator is not configured... Exiting!");
- return nullptr;
- }
if (!m_extrapolator) {
ATH_MSG_ERROR("The extrapolator is not configured... Exiting!");
return nullptr;
@@ -160,7 +153,7 @@ Trk::GsfSmoother::fit(const EventContext& ctx,
return nullptr;
}
Trk::MultiComponentState firstSmoothedState =
- m_updator->update(std::move(*smootherPredictionMultiState),
+ m_updator.update(std::move(*smootherPredictionMultiState),
*firstSmootherMeasurementOnTrack,
fitQuality);
@@ -211,7 +204,7 @@ Trk::GsfSmoother::fit(const EventContext& ctx,
firstSmoothedState, 15., 5., 15., 5., 15.);
// Perform a measurement update on this new state
- Trk::MultiComponentState updatedState = m_updator->update(
+ Trk::MultiComponentState updatedState = m_updator.update(
std::move(*smoothedStateWithScaledError), *firstSmootherMeasurementOnTrack);
if (updatedState.empty()) {
@@ -290,7 +283,7 @@ Trk::GsfSmoother::fit(const EventContext& ctx,
// Update newly extrapolated state with MeasurementBase measurement
updatedState =
- m_updator->update(std::move(extrapolatedState), *measurement, fitQuality);
+ m_updator.update(std::move(extrapolatedState), *measurement, fitQuality);
if (updatedState.empty()) {
ATH_MSG_WARNING(
"Could not update the multi-component state... rejecting track!");
@@ -334,7 +327,7 @@ Trk::GsfSmoother::fit(const EventContext& ctx,
return nullptr;
}
const Trk::FitQualityOnSurface* combinedFitQuality =
- m_updator->fitQuality(combinedState2, *measurement);
+ m_updator.fitQuality(combinedState2, *measurement);
// In the case of combination with forwards state - push back the combined
// state
const Trk::MultiComponentStateOnSurface* combinedStateOnSurface =
@@ -536,7 +529,7 @@ Trk::GsfSmoother::addCCOT(const EventContext& ctx,
// Update newly extrapolated state with MeasurementBase measurement
std::unique_ptr<Trk::FitQualityOnSurface> fitQuality;
Trk::MultiComponentState updatedState =
- m_updator->update(std::move(extrapolatedState), *ccot, fitQuality);
+ m_updator.update(std::move(extrapolatedState), *ccot, fitQuality);
if (updatedState.empty()) {
ATH_MSG_DEBUG("Update of extrapolated state with CCOT failed .. now not "
@@ -587,7 +580,7 @@ Trk::GsfSmoother::addCCOT(const EventContext& ctx,
MultiComponentStateCombiner::combine(extrapolatedState, true);
const Trk::FitQualityOnSurface* combinedFitQuality =
- m_updator->fitQuality(extrapolatedState, *ccot);
+ m_updator.fitQuality(extrapolatedState, *ccot);
// Build a TSOS using the dummy measurement and combined state
Trk::MultiComponentStateOnSurface* finalSOS =
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
index 9272a42af19f77befff4bd11e36ab1b2cbe4d533..96ccf1db1608fa3d43931583e2d10a005e346da6 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
@@ -3,6 +3,7 @@
*/
#include "TrkGaussianSumFilter/KLGaussianMixtureReduction.h"
#include "CxxUtils/features.h"
+#include "CxxUtils/vec.h"
#include "CxxUtils/vectorize.h"
#include "TrkGaussianSumFilter/AlignedDynArray.h"
#include <limits>
@@ -241,224 +242,150 @@ findMerges(Component1D* componentsIn,
/**
* findMinimumIndex
- *
* For FindMinimumIndex at x86_64 we have
* AVX2,SSE4.1,SSE2 versions
* These assume that the number of elements is a multiple
* of 8 and are to be used for sizeable inputs.
- *
* We also provide a default "scalar" implementation
*/
#if HAVE_FUNCTION_MULTIVERSIONING
#if defined(__x86_64__)
-#include <immintrin.h>
-/*
- * AVX2 intrinsics used :
- *
- * _mm256_set1_epi32
- * Broadcast 32-bit integer a to all elements of dst.
- *
- * _mm256_setr_epi32
- * Set packed 32-bit integers in dst with the supplied values in reverse order.
- *
- * _mm256_load_ps
- * Load 256-bits (composed of 8 packed single-precision (32-bit) floating-point
- * elements) from memory into dst. mem_addr must be aligned on a 32-byte
- * boundary or a general-protection exception may be generated.
- *
- * _mm256_add_epi32
- * Add packed 32-bit integers in a and b, and store the results in dst.
- *
- * _mm256_cmp_ps
- * Compare packed single-precision (32-bit) floating-point elements in a and b
- * based on the comparison operand specified by imm8, and store the results in
- * dst.
- *
- * _mm256_min_ps
- * Compare packed single-precision (32-bit) floating-point elements in a and
- * b, and store packed minimum values in dst.
- *
- * _mm256_blendv_epi8
- * Blend packed 8-bit integers from a and b using mask, and store the results
- * in dst.
- */
__attribute__((target("avx2")))
int32_t
findMinimumIndex(const float* distancesIn, const int n)
{
+ using namespace CxxUtils;
float* array = (float*)__builtin_assume_aligned(distancesIn, alignment);
- const __m256i increment = _mm256_set1_epi32(8);
- __m256i indicesIn = _mm256_setr_epi32(0, 1, 2, 3, 4, 5, 6, 7);
- __m256i minindices = indicesIn;
- __m256 minvalues = _mm256_load_ps(array);
+ const vec<int, 8> increment = { 8, 8, 8, 8, 8, 8, 8, 8 };
+ vec<int, 8> indicesIn = { 0, 1, 2, 3, 4, 5, 6, 7 };
+ vec<int, 8> minindices = indicesIn;
+ vec<float, 8> minvalues{};
+ vec<float, 8> values{};
+ vload(minvalues, array);
for (int i = 8; i < n; i += 8) {
// Load next 8 elements
- const __m256 values = _mm256_load_ps(array + i);
+ vload(values, array + i);
// increment the indices
- indicesIn = _mm256_add_epi32(indicesIn, increment);
+ indicesIn = indicesIn + increment;
// Get a mask indicating when an element is less than the ones we have
- __m256i lt =
- _mm256_castps_si256(_mm256_cmp_ps(values, minvalues, _CMP_LT_OS));
- // b lend select the indices to update
- minindices = _mm256_blendv_epi8(minindices, indicesIn, lt);
- minvalues = _mm256_min_ps(values, minvalues);
+ vec<int, 8> lt = values < minvalues;
+ // blend select the indices to update
+ vselect(minindices, indicesIn, minindices, lt);
+ vmin(minvalues, values, minvalues);
}
// Do the final calculation scalar way
- alignas(alignment) float distances[8];
- alignas(alignment) int32_t indices[8];
- _mm256_store_ps(distances, minvalues);
- _mm256_store_si256((__m256i*)(indices), minindices);
- int32_t minIndex = indices[0];
- float minDistance = distances[0];
+ int32_t minIndex = minindices[0];
+ float minDistance = minvalues[0];
for (int i = 1; i < 8; ++i) {
- if (distances[i] < minDistance) {
- minIndex = indices[i];
- minDistance = distances[i];
+ if (minvalues[i] < minDistance) {
+ minIndex = minindices[i];
+ minDistance = minvalues[i];
}
}
return minIndex;
}
-/*
- * SSE intrinsics used
- * _mm_set1_epi32
- * Broadcast 32-bit integer a to all elements of dst.
- *
- * _mm_setr_epi32
- * Set packed 32-bit integers in dst with the supplied values in reverse order.
- *
- * _mm_load_ps
- * Set packed 32-bit integers in dst with the supplied values in reverse order.
- *
- * _mm_add_epi32 (a,b)
- * Add packed 32-bit integers in a and b, and store the results in dst.
- *
- * _mm_min_ps (a,b)
- * Compare packed single-precision (32-bit) floating-point elements in a and
- * b, and store packed minimum values in dst.
- *
- * _mm_cmplt_ps ( a, b)
- * Compare packed single-precision (32-bit) floating-point elements in a and b
- * for less-than, and store the results in dst.
- *
- * _mm_castps_si128
- * Cast vector of type __m128 to type __m128i. This intrinsic is only used
- * for compilation and does not generate any instructions, thus it has zero
- * latency.
- */
__attribute__((target("sse4.1")))
int32_t
findMinimumIndex(const float* distancesIn, const int n)
{
+ using namespace CxxUtils;
float* array = (float*)__builtin_assume_aligned(distancesIn, alignment);
// Do 2 vectors of 4 elements , so 8 at time
- const __m128i increment = _mm_set1_epi32(8);
- __m128i indices1 = _mm_setr_epi32(0, 1, 2, 3);
- __m128i indices2 = _mm_setr_epi32(4, 5, 6, 7);
- __m128i minindices1 = indices1;
- __m128i minindices2 = indices2;
- __m128 minvalues1 = _mm_load_ps(array);
- __m128 minvalues2 = _mm_load_ps(array + 4);
-
+ const vec<int, 4> increment = { 8, 8, 8, 8 };
+ vec<int, 4> indices1 = { 0, 1, 2, 3 };
+ vec<int, 4> indices2 = { 4, 5, 6, 7 };
+ vec<int, 4> minindices1 = indices1;
+ vec<int, 4> minindices2 = indices2;
+ vec<float, 4> minvalues1;
+ vec<float, 4> minvalues2;
+ vload(minvalues1, array);
+ vload(minvalues2, array + 4);
+ vec<float, 4> values1;
+ vec<float, 4> values2;
for (int i = 8; i < n; i += 8) {
- // Load 8 elements at a time in 2 vectors of size 4
- const __m128 values1 = _mm_load_ps(array + i); // first 4
- const __m128 values2 = _mm_load_ps(array + i + 4); // second 4
- // Handle the first 4
- indices1 = _mm_add_epi32(indices1, increment);
- __m128i lt1 = _mm_castps_si128(_mm_cmplt_ps(values1, minvalues1));
- minindices1 = _mm_blendv_epi8(minindices1, indices1, lt1);
- minvalues1 = _mm_min_ps(values1, minvalues1);
- // Handle the second 4
- indices2 = _mm_add_epi32(indices2, increment);
- __m128i lt2 = _mm_castps_si128(_mm_cmplt_ps(values2, minvalues2));
- minindices2 = _mm_blendv_epi8(minindices2, indices2, lt2);
- minvalues2 = _mm_min_ps(values2, minvalues2);
+ // Load 8 elements at a time
+ vload(values1, array + i); // first 4
+ vload(values2, array + i + 4); // second 4
+ // 1
+ indices1 = indices1 + increment;
+ vec<int, 4> lt1 = values1 < minvalues1;
+ vselect(minindices1, indices1, minindices1, lt1);
+ vmin(minvalues1, values1, minvalues1);
+ // 2
+ indices2 = indices2 + increment;
+ vec<int, 4> lt2 = values2 < minvalues2;
+ vselect(minindices2, indices2, minindices2, lt2);
+ vmin(minvalues2, values2, minvalues2);
}
-
// Compare //1 with //2
- __m128i lt = _mm_castps_si128(_mm_cmplt_ps(minvalues1, minvalues2));
- minindices1 = _mm_blendv_epi8(minindices2, minindices1, lt);
- minvalues1 = _mm_min_ps(minvalues2, minvalues1);
-
- // Do the final 4 scalar way
- alignas(alignment) float distances[4];
- alignas(alignment) int32_t indices[4];
- _mm_store_ps(distances, minvalues1);
- _mm_store_si128((__m128i*)(indices), minindices1);
-
- int32_t minIndex = indices[0];
- float minDistance = distances[0];
- for (int i = 1; i < 4; ++i) {
- if (distances[i] < minDistance) {
- minIndex = indices[i];
- minDistance = distances[i];
+ vec<int, 4> lt = minvalues1 < minvalues2;
+ vselect(minindices1, minindices1, minindices2, lt);
+ vmin(minvalues1, minvalues1, minvalues2);
+ /*
+ * Do the final calculation scalar way
+ */
+ size_t minIndex = minindices1[0];
+ float minvalue = minvalues1[0];
+ for (size_t i = 1; i < 4; ++i) {
+ const float value = minvalues1[i];
+ if (value < minvalue) {
+ minvalue = value;
+ minIndex = minindices1[i];
}
}
return minIndex;
}
/*
* SSE2 does not have a blend/select instruction.
- * To create one
- * We AND &
- * - a with the NOT of the mask
- * - b with the mask
- * - The we OR the above 2
*/
-static inline __m128i
-SSE2_mm_blendv_epi8(__m128i a, __m128i b, __m128i mask)
-{
- return _mm_or_si128(_mm_andnot_si128(mask, a), _mm_and_si128(mask, b));
-}
__attribute__((target("sse2")))
int32_t
findMinimumIndex(const float* distancesIn, const int n)
{
+ using namespace CxxUtils;
float* array = (float*)__builtin_assume_aligned(distancesIn, alignment);
- // Do 2 vectors of 4 elements, so 8 at a time
- const __m128i increment = _mm_set1_epi32(8);
- __m128i indices1 = _mm_setr_epi32(0, 1, 2, 3);
- __m128i indices2 = _mm_setr_epi32(4, 5, 6, 7);
- __m128i minindices1 = indices1;
- __m128i minindices2 = indices2;
- __m128 minvalues1 = _mm_load_ps(array);
- __m128 minvalues2 = _mm_load_ps(array + 4);
-
+ const vec<int, 4> increment = { 8, 8, 8, 8 };
+ vec<int, 4> indices1 = { 0, 1, 2, 3 };
+ vec<int, 4> indices2 = { 4, 5, 6, 7 };
+ vec<int, 4> minindices1 = indices1;
+ vec<int, 4> minindices2 = indices2;
+ vec<float, 4> minvalues1;
+ vec<float, 4> minvalues2;
+ vload(minvalues1, array);
+ vload(minvalues2, array + 4);
+ vec<float, 4> values1;
+ vec<float, 4> values2;
for (int i = 8; i < n; i += 8) {
- // Load 8 elements at a time in 2 vectors of size 4
- const __m128 values1 = _mm_load_ps(array + i); // first 4
- const __m128 values2 = _mm_load_ps(array + i + 4); // second 4
- // Handle the first 4
- indices1 = _mm_add_epi32(indices1, increment);
- __m128i lt1 = _mm_castps_si128(_mm_cmplt_ps(values1, minvalues1));
- minindices1 = SSE2_mm_blendv_epi8(minindices1, indices1, lt1);
- minvalues1 = _mm_min_ps(values1, minvalues1);
- // Handle the second 4
- indices2 = _mm_add_epi32(indices2, increment);
- __m128i lt2 = _mm_castps_si128(_mm_cmplt_ps(values2, minvalues2));
- minindices2 = SSE2_mm_blendv_epi8(minindices2, indices2, lt2);
- minvalues2 = _mm_min_ps(values2, minvalues2);
+ // Load 8 elements at a time
+ vload(values1, array + i); // first 4
+ vload(values2, array + i + 4); // second 4
+ // 1
+ indices1 = indices1 + increment;
+ vec<int, 4> lt1 = values1 < minvalues1;
+ vselect(minindices1, indices1, minindices1, lt1);
+ vmin(minvalues1, values1, minvalues1);
+ // 2
+ indices2 = indices2 + increment;
+ vec<int, 4> lt2 = values2 < minvalues2;
+ vselect(minindices2, indices2, minindices2, lt2);
+ vmin(minvalues2, values2, minvalues2);
}
-
// Compare //1 with //2
- __m128i lt = _mm_castps_si128(_mm_cmplt_ps(minvalues1, minvalues2));
- minindices1 = SSE2_mm_blendv_epi8(minindices2, minindices1, lt);
- minvalues1 = _mm_min_ps(minvalues2, minvalues1);
-
- // Do the final 4 scalar way
- alignas(alignment) float distances[4];
- alignas(alignment) int32_t indices[4];
- _mm_store_ps(distances, minvalues1);
- _mm_store_si128((__m128i*)(indices), minindices1);
-
- int32_t minIndex = indices[0];
- float minDistance = distances[0];
- for (int i = 1; i < 4; ++i) {
- if (distances[i] < minDistance) {
- minIndex = indices[i];
- minDistance = distances[i];
+ vec<int, 4> lt = minvalues1 < minvalues2;
+ vselect(minindices1, minindices1, minindices2, lt);
+ vmin(minvalues1, minvalues1, minvalues2);
+ /*
+ * Do the final calculation scalar way
+ */
+ size_t minIndex = minindices1[0];
+ float minvalue = minvalues1[0];
+ for (size_t i = 1; i < 4; ++i) {
+ const float value = minvalues1[i];
+ if (value < minvalue) {
+ minvalue = value;
+ minIndex = minindices1[i];
}
}
-
return minIndex;
}
#endif // end of x86_64 versions
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
index 86bd37996bb9a33d5164599b62c9fd34442ab1fe..ce335d74f2fea158dd3dc65b0ddb102228a28901 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/components/TrkGaussianSumFilter_entries.cxx
@@ -2,7 +2,6 @@
#include "TrkGaussianSumFilter/GsfCombinedMaterialEffects.h"
#include "TrkGaussianSumFilter/GsfMaterialEffectsUpdator.h"
#include "TrkGaussianSumFilter/GsfBetheHeitlerEffects.h"
-#include "TrkGaussianSumFilter/GsfMeasurementUpdator.h"
#include "TrkGaussianSumFilter/GaussianSumFitter.h"
#include "TrkGaussianSumFilter/ForwardGsfFitter.h"
#include "TrkGaussianSumFilter/GsfExtrapolator.h"
@@ -12,7 +11,6 @@ DECLARE_COMPONENT( Trk::GsfMaterialMixtureConvolution )
DECLARE_COMPONENT( Trk::GsfCombinedMaterialEffects )
DECLARE_COMPONENT( Trk::GsfMaterialEffectsUpdator )
DECLARE_COMPONENT( Trk::GsfBetheHeitlerEffects )
-DECLARE_COMPONENT( Trk::GsfMeasurementUpdator )
DECLARE_COMPONENT( Trk::GaussianSumFitter )
DECLARE_COMPONENT( Trk::ForwardGsfFitter )
DECLARE_COMPONENT( Trk::GsfExtrapolator )
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrackState.h b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrackState.h
index 19e4a05a587e9a15770fc96bae2c1f315e5d397b..eae768c1a9baa444dc1019ea7f934ff7136b7a49 100755
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrackState.h
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrackState.h
@@ -28,32 +28,41 @@ namespace Trk {
class GXFTrackState {
public:
- GXFTrackState();
+ GXFTrackState() = delete;
GXFTrackState(GXFTrackState &);
- ~GXFTrackState();
- GXFTrackState(const MeasurementBase *, const TrackParameters * trackpar = nullptr, bool ownmb = false);
- GXFTrackState(const TrackParameters *);
- GXFTrackState(GXFMaterialEffects *, const TrackParameters * trackpar = nullptr);
- GXFTrackState & operator=(GXFTrackState & rhs);
+ GXFTrackState(std::unique_ptr<const MeasurementBase>, std::unique_ptr<const TrackParameters>);
+ GXFTrackState(const TrackParameters *, TrackState::TrackStateType = TrackState::Hole);
+ GXFTrackState(GXFMaterialEffects *, const TrackParameters * trackpar);
+ GXFTrackState & operator=(GXFTrackState &) = delete;
+
+ void setMeasurement(std::unique_ptr<const MeasurementBase>);
+ const MeasurementBase *measurement(void);
+ const MeasurementBase *takeMeasurement(void);
- void setMeasurement(const MeasurementBase *);
- const MeasurementBase *measurement(bool takeownership = false);
TrackState::TrackStateType trackStateType();
void setTrackStateType(TrackState::TrackStateType);
- void setTrackParameters(const TrackParameters *);
- const TrackParameters *trackParameters(bool takeownership = false);
- void setMaterialEffects(GXFMaterialEffects *);
+
+ void setTrackParameters(std::unique_ptr<const TrackParameters>);
+ const TrackParameters *trackParameters(void);
+ const TrackParameters *takeTrackParameters(void);
+
GXFMaterialEffects *materialEffects();
const Surface *surface();
- void setJacobian(TransportJacobian *);
+ void setJacobian(TransportJacobian &);
Eigen::Matrix<double, 5, 5> & jacobian();
Amg::MatrixX & derivatives();
void setDerivatives(Amg::MatrixX &);
- AmgSymMatrix(5) * trackCovariance(bool takeownership = false);
+
void setTrackCovariance(AmgSymMatrix(5) *);
- const FitQualityOnSurface *fitQuality(bool takeownership = false);
- void setFitQuality(const FitQualityOnSurface *);
+ AmgSymMatrix(5) & trackCovariance(void);
+ bool hasTrackCovariance(void);
+ void zeroTrackCovariance(void);
+
+ void setFitQuality(std::unique_ptr<const FitQualityOnSurface>);
+ const FitQualityOnSurface *fitQuality(void);
+ const FitQualityOnSurface *takeFitQuality(void);
+
TrackState::MeasurementType measurementType();
void setMeasurementType(TrackState::MeasurementType);
@@ -75,24 +84,26 @@ namespace Trk {
void setMeasuresPhi(bool);
private:
- const MeasurementBase *m_measurement; //!< The measurement defining the track state
+ std::unique_ptr<const MeasurementBase> m_measurement; //!< The measurement defining the track state
TrackState::TrackStateType m_tsType; //!< type of track state, eg Fittable, Outlier, Scatterer, Brem, Hole
- const TrackParameters *m_trackpar; //!< track parameters
- GXFMaterialEffects *m_materialEffects; //!< Material effects on track (ie scatterer, brem)
+ std::unique_ptr<const TrackParameters> m_trackpar; //!< track parameters
+ std::unique_ptr<GXFMaterialEffects> m_materialEffects; //!< Material effects on track (ie scatterer, brem)
Eigen::Matrix<double, 5, 5> m_jacobian; //!< Transport jacobian wrt previous state
- Amg::MatrixX * m_derivs; //!< Derivatives of local parameters wrt fit parameters
- AmgSymMatrix(5) * m_covariancematrix; //!< Covariance matrix of track parameters at this surface
- const FitQualityOnSurface *m_fitqual;
+ Amg::MatrixX m_derivs; //!< Derivatives of local parameters wrt fit parameters
+
+ AmgSymMatrix(5) m_covariancematrix; //!< Covariance matrix of track parameters at this surface
+ bool m_covariance_set;
+
+ std::unique_ptr<const FitQualityOnSurface> m_fitqual;
double m_measerror[5]; //!< Measurement errors (corrected for stereo angle)
double m_sinstereo; //!< stereo angle
TrackState::MeasurementType m_mType; //!< Measurement type, eg pixel, SCT, ...
bool m_recalib; //!< Has this measurement already been recalibrated?
- bool m_owntp;
- bool m_ownmb;
- bool m_ownfq;
- bool m_owncov;
bool m_measphi;
Amg::Vector3D m_globpos;
+
+ public:
+ EIGEN_MAKE_ALIGNED_OPERATOR_NEW
};
inline Eigen::Matrix<double, 5, 5> & GXFTrackState::jacobian() {
@@ -100,25 +111,23 @@ namespace Trk {
}
inline Amg::MatrixX & GXFTrackState::derivatives() {
- return *m_derivs;
+ return m_derivs;
}
- inline AmgSymMatrix(5) * GXFTrackState::trackCovariance(bool takeownership) {
- AmgSymMatrix(5) * tmpcov = m_covariancematrix;
- if (takeownership) {
- m_owncov = false;
- }
- return tmpcov;
+ inline AmgSymMatrix(5) & GXFTrackState::trackCovariance(void) {
+ return m_covariancematrix;
}
- inline const TrackParameters *GXFTrackState::trackParameters(bool takeownership) {
- if (takeownership)
- m_owntp = false;
- return m_trackpar;
+ inline const TrackParameters *GXFTrackState::trackParameters(void) {
+ return m_trackpar.get();
+ }
+
+ inline const TrackParameters *GXFTrackState::takeTrackParameters(void) {
+ return m_trackpar.get();
}
inline GXFMaterialEffects *GXFTrackState::materialEffects() {
- return m_materialEffects;
+ return m_materialEffects.get();
}
inline TrackState::MeasurementType GXFTrackState::measurementType() {
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrajectory.h b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrajectory.h
index 5ee0720db437e4a81e0e7a2c4f50331a2c8af8ff..049844cbe79ad3c2a6a690483e25662812c03f20 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrajectory.h
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GXFTrajectory.h
@@ -6,6 +6,7 @@
#define TRK_GXFTRAJECTORY_H
#include "TrkGlobalChi2Fitter/GXFTrackState.h"
+#include "TrkGeometry/MagneticFieldProperties.h"
namespace Trk {
class MeasurementBase;
@@ -30,8 +31,7 @@ namespace Trk {
GXFTrajectory & operator=(GXFTrajectory & rhs);
bool addMeasurementState(GXFTrackState *, int index = -1);
- void addHoleState(const TrackParameters *);
- void addMaterialState(GXFTrackState *, int index = -1, bool owntp = false);
+ void addMaterialState(GXFTrackState *, int index = -1);
void setReferenceParameters(const TrackParameters *);
void setScatteringAngles(std::vector < std::pair < double, double > >&);
@@ -73,9 +73,9 @@ namespace Trk {
bool converged();
int prefit();
void resetReferenceParameters();
- double chi2();
+ double chi2() const;
double prevchi2();
- int nDOF();
+ int nDOF() const;
Amg::VectorX & residuals();
Amg::VectorX & errors();
@@ -90,8 +90,11 @@ namespace Trk {
std::vector < std::pair < const Layer *,
const Layer *>>&upstreamMaterialLayers();
+ void resetCovariances(void);
+ std::unique_ptr<const FitQuality> quality(void) const;
+
bool m_straightline;
- MagneticFieldProperties *m_fieldprop;
+ MagneticFieldProperties m_fieldprop = Trk::FullField;
private:
std::vector < GXFTrackState * >m_states; //!< The vector of track states, i.e. measurements, scatterers, brem points, and holes
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
index e2f7baf142de1602adc0554cf3b9867450c6f778..d7fb48e2adee86c870ce5c9e505f197fab84b955 100755
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
@@ -10,7 +10,23 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/EventContext.h"
+
+#include "TrkDetDescrInterfaces/ITrackingGeometrySvc.h"
+
+#include "TrkToolInterfaces/ITrkMaterialProviderTool.h"
+#include "TrkToolInterfaces/IResidualPullCalculator.h"
+#include "TrkToolInterfaces/IRIO_OnTrackCreator.h"
+#include "TrkToolInterfaces/IUpdator.h"
+
+#include "TrkExInterfaces/IExtrapolator.h"
+#include "TrkExInterfaces/IPropagator.h"
+#include "TrkExInterfaces/INavigator.h"
+#include "TrkExInterfaces/IMultipleScatteringUpdator.h"
+#include "TrkExInterfaces/IEnergyLossUpdator.h"
+#include "TrkExInterfaces/IMaterialEffectsUpdator.h"
+
#include "TrkFitterInterfaces/IGlobalTrackFitter.h"
+
#include "TrkGlobalChi2Fitter/GXFTrajectory.h"
#include "TrkMaterialOnTrack/MaterialEffectsOnTrack.h"
#include "TrkFitterUtils/FitterStatusCode.h"
@@ -27,16 +43,6 @@ class AtlasDetectorID;
namespace Trk {
class Track;
class TransportJacobian;
- class IRIO_OnTrackCreator;
- class IUpdator;
- class IEnergyLossUpdator;
- class IMultipleScatteringUpdator;
- class IMaterialEffectsUpdator;
- class INavigator;
- class IPropagator;
- class IExtrapolator;
- class IResidualPullCalculator;
- class ITrackingGeometrySvc;
class TrackFitInputPreparator;
class IMagneticFieldTool;
class MeasuredPerigee;
@@ -50,10 +56,8 @@ namespace Trk {
class TrackingGeometry;
class TrackingVolume;
class Volume;
- class ITrkMaterialProviderTool;
-
- class GlobalChi2Fitter: virtual public IGlobalTrackFitter, public AthAlgTool {
+ class GlobalChi2Fitter: public extends<AthAlgTool, IGlobalTrackFitter> {
struct Cache {
/*
* Currently the information about what type of fit is being passed by the
@@ -526,12 +530,12 @@ namespace Trk {
void calculateTrackErrors(GXFTrajectory &, Amg::SymMatrixX &, bool) const;
- TransportJacobian *numericalDerivatives(
+ std::unique_ptr<TransportJacobian> numericalDerivatives(
const EventContext& ctx,
const TrackParameters *,
const Surface *,
PropDirection,
- const MagneticFieldProperties *
+ const MagneticFieldProperties
) const;
virtual int iterationsOfLastFit() const;
@@ -560,21 +564,21 @@ namespace Trk {
Cache & cache
) const;
- ToolHandle < IRIO_OnTrackCreator > m_ROTcreator;
- ToolHandle < IRIO_OnTrackCreator > m_broadROTcreator;
- ToolHandle < IUpdator > m_updator;
- ToolHandle < IExtrapolator > m_extrapolator;
- ToolHandle < IMultipleScatteringUpdator > m_scattool;
- ToolHandle < IEnergyLossUpdator > m_elosstool;
- ToolHandle < IMaterialEffectsUpdator > m_matupdator;
- ToolHandle < IPropagator > m_propagator;
- ToolHandle < INavigator > m_navigator;
- ToolHandle < IResidualPullCalculator > m_residualPullCalculator; //!< The residual and pull calculator tool
- ToolHandle < Trk::ITrkMaterialProviderTool > m_caloMaterialProvider;
- ToolHandle < IMaterialEffectsOnTrackProvider > m_calotool;
- ToolHandle < IMaterialEffectsOnTrackProvider > m_calotoolparam;
-
- ServiceHandle < ITrackingGeometrySvc > m_trackingGeometrySvc;
+ ToolHandle<IRIO_OnTrackCreator> m_ROTcreator {this, "RotCreatorTool", "", ""};
+ ToolHandle<IRIO_OnTrackCreator> m_broadROTcreator {this, "BroadRotCreatorTool", "", ""};
+ ToolHandle<IUpdator> m_updator {this, "MeasurementUpdateTool", "", ""};
+ ToolHandle<IExtrapolator> m_extrapolator {this, "ExtrapolationTool", "Trk::Extrapolator/CosmicsExtrapolator", ""};
+ ToolHandle<IMultipleScatteringUpdator> m_scattool {this, "MultipleScatteringTool", "Trk::MultipleScatteringUpdator/AtlasMultipleScatteringUpdator", ""};
+ ToolHandle<IEnergyLossUpdator> m_elosstool {this, "EnergyLossTool", "Trk::EnergyLossUpdator/AtlasEnergyLossUpdator", ""};
+ ToolHandle<IMaterialEffectsUpdator> m_matupdator {this, "MaterialUpdateTool", "", ""};
+ ToolHandle<IPropagator> m_propagator {this, "PropagatorTool", "Trk::StraightLinePropagator/CosmicsPropagator", ""};
+ ToolHandle<INavigator> m_navigator {this, "NavigatorTool", "Trk::Navigator/CosmicsNavigator", ""};
+ ToolHandle<IResidualPullCalculator> m_residualPullCalculator {this, "ResidualPullCalculatorTool", "Trk::ResidualPullCalculator/ResidualPullCalculator", ""};
+ ToolHandle<Trk::ITrkMaterialProviderTool> m_caloMaterialProvider {this, "CaloMaterialProvider", "Trk::TrkMaterialProviderTool/TrkMaterialProviderTool", ""};
+ ToolHandle<IMaterialEffectsOnTrackProvider> m_calotool {this, "MuidTool", "Rec::MuidMaterialEffectsOnTrackProvider/MuidMaterialEffectsOnTrackProvider", ""};
+ ToolHandle<IMaterialEffectsOnTrackProvider> m_calotoolparam {this, "MuidToolParam", "", ""};
+
+ ServiceHandle<ITrackingGeometrySvc> m_trackingGeometrySvc;
SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_field_cache_key{
this,
@@ -583,40 +587,41 @@ namespace Trk {
"Trk::GlobalChi2Fitter field conditions object key"
};
- bool m_signedradius;
- bool m_calomat, m_extmat;
- bool m_fillderivmatrix;
- double m_outlcut;
- double m_maxoutliers;
- bool m_printderivs;
- double m_p; // momentum (for estimating multiple scattering)
- bool m_straightlineprop;
- bool m_extensioncuts;
- bool m_sirecal;
- bool m_trtrecal;
- bool m_kinkfinding;
const AtlasDetectorID *m_DetID = nullptr;
- bool m_decomposesegments;
- bool m_getmaterialfromtrack;
- bool m_domeastrackpar;
- bool m_storemat;
- double m_chi2cut;
- double m_scalefactor;
- bool m_redoderivs;
- bool m_reintoutl;
- TrackFitInputPreparator *m_inputPreparator;
- int m_maxit;
- bool m_acceleration;
- bool m_numderiv;
- int m_miniter;
- bool m_fiteloss;
- bool m_asymeloss;
- int m_fixbrem;
- bool m_useCaloTG = false;
- bool m_rejectLargeNScat = false;
-
- MagneticFieldProperties *m_fieldpropnofield;
- MagneticFieldProperties *m_fieldpropfullfield;
+
+ Gaudi::Property<bool> m_signedradius {this, "SignedDriftRadius", true};
+ Gaudi::Property<bool> m_calomat {this, "MuidMat", false};
+ Gaudi::Property<bool> m_extmat {this, "ExtrapolatorMaterial", true};
+ Gaudi::Property<bool> m_fillderivmatrix {this, "FillDerivativeMatrix", false};
+ Gaudi::Property<bool> m_printderivs {this, "PrintDerivatives", false};
+ Gaudi::Property<bool> m_straightlineprop {this, "StraightLine", true};
+ Gaudi::Property<bool> m_extensioncuts {this, "TRTExtensionCuts", true};
+ Gaudi::Property<bool> m_sirecal {this, "RecalibrateSilicon", false};
+ Gaudi::Property<bool> m_trtrecal {this, "RecalibrateTRT", false};
+ Gaudi::Property<bool> m_kinkfinding {this, "KinkFinding", false};
+ Gaudi::Property<bool> m_decomposesegments {this, "DecomposeSegments", true};
+ Gaudi::Property<bool> m_getmaterialfromtrack {this, "GetMaterialFromTrack", true};
+ Gaudi::Property<bool> m_domeastrackpar {this, "MeasuredTrackParameters", true};
+ Gaudi::Property<bool> m_storemat {this, "StoreMaterialOnTrack", true};
+ Gaudi::Property<bool> m_redoderivs {this, "RecalculateDerivatives", false};
+ Gaudi::Property<bool> m_reintoutl {this, "ReintegrateOutliers", false};
+ Gaudi::Property<bool> m_acceleration {this, "Acceleration", false};
+ Gaudi::Property<bool> m_numderiv {this, "NumericalDerivs", false};
+ Gaudi::Property<bool> m_fiteloss {this, "FitEnergyLoss", false};
+ Gaudi::Property<bool> m_asymeloss {this, "AsymmetricEnergyLoss", true};
+ Gaudi::Property<bool> m_useCaloTG {this, "UseCaloTG", false};
+ Gaudi::Property<bool> m_rejectLargeNScat {this, "RejectLargeNScat", false};
+
+ Gaudi::Property<double> m_outlcut {this, "OutlierCut", 5.0};
+ Gaudi::Property<double> m_p {this, "Momentum", 0.0};
+ Gaudi::Property<double> m_chi2cut {this, "TrackChi2PerNDFCut", 1.e15};
+ Gaudi::Property<double> m_scalefactor {this, "TRTTubeHitCut", 2.5};
+
+ Gaudi::Property<int> m_maxoutliers {this, "MaxOutliers", 10};
+ Gaudi::Property<int> m_maxit {this, "MaxIterations", 30};
+ Gaudi::Property<int> m_miniter {this, "MinimumIterations", 1};
+ Gaudi::Property<int> m_fixbrem {this, "FixBrem", -1};
+
ParticleMasses m_particleMasses;
/*
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrackState.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrackState.cxx
index 0836e3b85a2d789514c5779f5333a679d30c5477..4a6fff9172cafc781652d75a8bd228cfc765bf4d 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrackState.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrackState.cxx
@@ -19,42 +19,18 @@
// #include <string>
namespace Trk {
- GXFTrackState::GXFTrackState():
- m_measurement(nullptr),
- m_tsType(TrackState::Fittable),
- m_trackpar(nullptr),
- m_materialEffects(nullptr),
- m_jacobian {},
- m_derivs(nullptr),
- m_covariancematrix(nullptr),
- m_fitqual(nullptr),
- m_sinstereo(0),
- m_mType(TrackState::unidentified),
- m_recalib(false),
- m_owntp(false),
- m_ownmb(false),
- m_ownfq(false),
- m_owncov(false),
- m_measphi(false)
- {
- m_measerror[0] = m_measerror[1] = m_measerror[2] = m_measerror[3] = m_measerror[4] = -1;
- }
-
GXFTrackState::GXFTrackState(GXFTrackState & rhs):
- m_measurement(rhs.m_measurement != nullptr ? (rhs.m_ownmb ? rhs.m_measurement->clone() : rhs.m_measurement) : nullptr),
+ m_measurement(rhs.m_measurement != nullptr ? std::unique_ptr<const MeasurementBase>(rhs.m_measurement->clone()) : nullptr),
m_tsType(rhs.m_tsType),
- m_trackpar(rhs.m_trackpar),
- m_materialEffects(rhs.m_materialEffects != nullptr ? new GXFMaterialEffects(*rhs. m_materialEffects) : nullptr),
- m_derivs(rhs.m_derivs != nullptr ? new Amg::MatrixX(*rhs.m_derivs) : nullptr),
- m_covariancematrix(rhs.m_covariancematrix != nullptr ? (rhs.m_owncov ? new AmgSymMatrix(5) (*rhs.m_covariancematrix) : rhs.m_covariancematrix) : nullptr),
- m_fitqual(rhs.m_fitqual != nullptr ? (rhs.m_ownfq ? new FitQualityOnSurface(*rhs.m_fitqual) : rhs.m_fitqual) : nullptr),
+ m_trackpar(std::unique_ptr<const TrackParameters>(rhs.m_trackpar != nullptr ? rhs.m_trackpar->clone() : nullptr)),
+ m_materialEffects(std::unique_ptr<GXFMaterialEffects>(rhs.m_materialEffects != nullptr ? new GXFMaterialEffects(*rhs. m_materialEffects) : nullptr)),
+ m_derivs(rhs.m_derivs),
+ m_covariancematrix(rhs.m_covariancematrix),
+ m_covariance_set(rhs.m_covariance_set),
+ m_fitqual(rhs.m_fitqual ? std::make_unique<const FitQualityOnSurface>(*rhs.m_fitqual) : nullptr),
m_sinstereo(rhs.m_sinstereo),
m_mType(rhs.m_mType),
m_recalib(rhs.m_recalib),
- m_owntp(false),
- m_ownmb(rhs.m_ownmb),
- m_ownfq(rhs.m_ownfq),
- m_owncov(rhs.m_owncov),
m_measphi(rhs.m_measphi)
{
for (int i = 0; i < 5; i++) {
@@ -66,47 +42,41 @@ namespace Trk {
}
GXFTrackState::GXFTrackState(
- const MeasurementBase * measurement,
- const TrackParameters * trackpar,
- bool ownmb
+ std::unique_ptr<const MeasurementBase> measurement,
+ std::unique_ptr<const TrackParameters> trackpar
):
- m_measurement(measurement),
+ m_measurement(std::move(measurement)),
m_tsType(TrackState::Fittable),
- m_trackpar(trackpar),
+ m_trackpar(std::move(trackpar)),
m_materialEffects(nullptr),
m_jacobian {},
- m_derivs(nullptr),
- m_covariancematrix(nullptr),
+ m_derivs(),
+ m_covariancematrix(),
+ m_covariance_set(false),
m_fitqual(nullptr),
m_sinstereo(0),
m_mType(TrackState::unidentified),
m_recalib(false),
- m_owntp(false),
- m_ownmb(ownmb),
- m_ownfq(false),
- m_owncov(false),
m_measphi(false) {
m_measerror[0] = m_measerror[1] = m_measerror[2] = m_measerror[3] = m_measerror[4] = -1;
}
GXFTrackState::GXFTrackState(
- const TrackParameters * trackpar
+ const TrackParameters * trackpar,
+ TrackState::TrackStateType tsType
):
m_measurement(nullptr),
- m_tsType(TrackState::Hole),
- m_trackpar(trackpar),
+ m_tsType(tsType),
+ m_trackpar(std::unique_ptr<const TrackParameters>(trackpar != nullptr ? trackpar->clone() : nullptr)),
m_materialEffects(nullptr),
m_jacobian {},
- m_derivs(nullptr),
- m_covariancematrix(nullptr),
+ m_derivs(),
+ m_covariancematrix(),
+ m_covariance_set(false),
m_fitqual(nullptr),
m_sinstereo(0),
m_mType(TrackState::unidentified),
m_recalib(false),
- m_owntp(false),
- m_ownmb(false),
- m_ownfq(false),
- m_owncov(false),
m_measphi(false)
{
m_measerror[0] = m_measerror[1] = m_measerror[2] = m_measerror[3] = m_measerror[4] = -1;
@@ -118,19 +88,16 @@ namespace Trk {
):
m_measurement(nullptr),
m_tsType(TrackState::Scatterer),
- m_trackpar(trackpar),
- m_materialEffects(mef),
+ m_trackpar(std::unique_ptr<const TrackParameters>(trackpar != nullptr ? trackpar->clone() : nullptr)),
+ m_materialEffects(std::unique_ptr<GXFMaterialEffects>(mef)),
m_jacobian {},
- m_derivs(nullptr),
- m_covariancematrix(nullptr),
+ m_derivs(),
+ m_covariancematrix(),
+ m_covariance_set(false),
m_fitqual(nullptr),
m_sinstereo(0),
m_mType(TrackState::unidentified),
m_recalib(false),
- m_owntp(false),
- m_ownmb(false),
- m_ownfq(false),
- m_owncov(false),
m_measphi(false)
{
m_measerror[0] = m_measerror[1] = m_measerror[2] = m_measerror[3] = m_measerror[4] = -1;
@@ -140,130 +107,30 @@ namespace Trk {
}
}
- Trk::GXFTrackState::~GXFTrackState() {
- if (m_ownmb) {
- delete m_measurement;
- }
-
- if (m_owntp) {
- delete m_trackpar;
- }
-
- delete m_materialEffects;
-
- if (m_owncov) {
- delete m_covariancematrix;
- }
-
- if (m_ownfq) {
- delete m_fitqual;
- }
-
- delete m_derivs;
- }
-
- GXFTrackState & GXFTrackState::operator =(GXFTrackState & rhs) {
- if (this != &rhs) {
- if (m_ownmb) {
- delete m_measurement;
- }
-
- if (m_owntp) {
- delete m_trackpar;
- }
-
- m_measurement = rhs.m_measurement != nullptr ? (rhs.m_ownmb ? rhs.m_measurement->clone() : rhs.m_measurement) : nullptr;
- m_tsType = rhs.m_tsType;
- m_trackpar = rhs.m_trackpar;
- m_materialEffects = rhs.m_materialEffects != nullptr ? new GXFMaterialEffects(*rhs.m_materialEffects) : nullptr;
- m_derivs = rhs.m_derivs != nullptr ? new Amg::MatrixX(*rhs.m_derivs) : nullptr;
-
- delete m_covariancematrix;
-
- m_covariancematrix = (
- rhs.m_covariancematrix != nullptr ? (
- rhs.m_owncov ?
- new AmgSymMatrix(5) (*rhs.m_covariancematrix) :
- rhs.m_covariancematrix
- ) : nullptr
- );
-
- m_fitqual = rhs.m_fitqual != nullptr ? (rhs.m_ownfq ? new FitQualityOnSurface(*rhs.m_fitqual) : rhs.m_fitqual) : nullptr;
- m_sinstereo = rhs.m_sinstereo;
- m_mType = rhs.m_mType;
- m_recalib = rhs.m_recalib;
- m_owntp = false;
- m_ownmb = rhs.m_ownmb;
- m_ownfq = rhs.m_ownfq;
- m_owncov = rhs.m_owncov;
- m_measphi = rhs.m_measphi;
-
- for (int i = 0; i < 5; i++) {
- m_measerror[i] = rhs.m_measerror[i];
- for (int j = 0; j < 5; j++) {
- m_jacobian(i, j) = rhs.m_jacobian(i, j);
- }
- }
- }
-
- return *this;
- }
-
- void GXFTrackState::setMeasurement(const MeasurementBase * meas) {
- if (m_ownmb) {
- delete m_measurement;
- }
-
- m_measurement = meas;
+ void GXFTrackState::setMeasurement(std::unique_ptr<const MeasurementBase> meas) {
+ m_measurement = std::move(meas);
m_recalib = true;
- m_ownmb = true;
}
- const MeasurementBase *GXFTrackState::measurement(bool takeownership) {
- const MeasurementBase *meas = m_measurement;
-
- if ((meas != nullptr) && !m_ownmb && takeownership) {
- meas = meas->clone();
- }
- if (takeownership) {
- m_ownmb = false;
- }
- return meas;
+ const MeasurementBase *GXFTrackState::measurement(void) {
+ return m_measurement.get();
+ }
+
+ const MeasurementBase *GXFTrackState::takeMeasurement(void) {
+ return m_measurement.get();
}
- void
- GXFTrackState::setTrackParameters(const TrackParameters * par) {
- if ((m_trackpar != nullptr) && m_owntp) {
- delete m_trackpar;
- }
- m_trackpar = par;
- m_owntp = true;
+ void GXFTrackState::setTrackParameters(std::unique_ptr<const TrackParameters> par) {
+ m_trackpar = std::move(par);
}
- void
- GXFTrackState::setMaterialEffects(GXFMaterialEffects * mef) {
-
- delete m_materialEffects;
-
- m_materialEffects = mef;
- }
-
- void
- GXFTrackState::setJacobian(TransportJacobian * jac) {
- for (int i = 0; i < 5; i++) {
- for (int j = 0; j < 5; j++) {
- m_jacobian(i, j) = (*jac)(i, j);
- }
- }
- delete jac;
+ void GXFTrackState::setJacobian(TransportJacobian & jac) {
+ m_jacobian = jac;
}
void
GXFTrackState::setDerivatives(Amg::MatrixX & deriv) {
-
- delete m_derivs;
-
- m_derivs = new Amg::MatrixX(deriv);
+ m_derivs = deriv;
}
void
@@ -308,29 +175,24 @@ namespace Trk {
void
GXFTrackState::setTrackCovariance(AmgSymMatrix(5) * covmat) {
- if ((m_covariancematrix != nullptr) && m_owncov) {
- delete m_covariancematrix;
- }
- m_covariancematrix = covmat;
- if (covmat != nullptr) {
- m_owncov = true;
+ if (covmat == nullptr) {
+ m_covariance_set = false;
+ } else {
+ m_covariance_set = true;
+ m_covariancematrix = *covmat;
}
}
- void
- GXFTrackState::setFitQuality(const FitQualityOnSurface * fitqual) {
- if ((m_fitqual != nullptr) && m_ownfq) {
- delete m_fitqual;
- }
- m_fitqual = fitqual;
- m_ownfq = true;
+ void GXFTrackState::setFitQuality(std::unique_ptr<const FitQualityOnSurface> fitqual) {
+ m_fitqual = std::move(fitqual);
}
- const FitQualityOnSurface *GXFTrackState::fitQuality(bool takeownership) {
- if (takeownership) {
- m_ownfq = false;
- }
- return m_fitqual;
+ const FitQualityOnSurface *GXFTrackState::fitQuality(void) {
+ return m_fitqual.get();
+ }
+
+ const FitQualityOnSurface *GXFTrackState::takeFitQuality(void) {
+ return m_fitqual.get();
}
int
@@ -378,4 +240,13 @@ namespace Trk {
GXFTrackState::setRecalibrated(bool isrecal) {
m_recalib = isrecal;
}
+
+ bool GXFTrackState::hasTrackCovariance(void) {
+ return m_covariance_set;
+ }
+
+ void GXFTrackState::zeroTrackCovariance(void) {
+ m_covariance_set = true;
+ m_covariancematrix.setZero();
+ }
}
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrajectory.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrajectory.cxx
index 1b20623bd4e38bde3dbfec9c777fb1e9cf1ec524..e6458f85b35bb680febb44de94d7ceeb245b92ae 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrajectory.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GXFTrajectory.cxx
@@ -15,7 +15,6 @@ using CLHEP::HepVector;
namespace Trk {
GXFTrajectory::GXFTrajectory() {
m_straightline = true;
- m_fieldprop = nullptr;
m_ndof = 0;
m_nperpars = -1;
m_nscatterers = 0;
@@ -234,18 +233,9 @@ namespace Trk {
return true;
}
- void GXFTrajectory::addHoleState(const TrackParameters * par) {
- GXFTrackState *state = new GXFTrackState(par);
- m_states.push_back(state);
- }
-
- void GXFTrajectory::addMaterialState(GXFTrackState * state, int index, bool owntp) {
+ void GXFTrajectory::addMaterialState(GXFTrackState * state, int index) {
const TrackParameters *par = state->trackParameters();
GXFMaterialEffects *meff = state->materialEffects();
-
- if (owntp) {
- state->setTrackParameters(par);
- }
if (index == -1) {
m_states.push_back(state);
@@ -521,7 +511,7 @@ namespace Trk {
return m_nperpars + numberOfBrems() + 2 * numberOfScatterers();
}
- double GXFTrajectory::chi2() {
+ double GXFTrajectory::chi2() const {
return m_chi2;
}
@@ -537,7 +527,7 @@ namespace Trk {
m_prevchi2 = chi2;
}
- int GXFTrajectory::nDOF() {
+ int GXFTrajectory::nDOF() const {
return m_ndof;
}
@@ -671,15 +661,8 @@ namespace Trk {
GXFTrackState *firstmeasstate = nullptr;
GXFTrackState *lastmeasstate = nullptr;
- for (auto & hit : trackStates()) {
- if (
- hit->measurementType() == TrackState::Pseudo &&
- hit->trackStateType() == TrackState::GeneralOutlier
- ) {
- continue;
- }
-
- if (hit->measurement(false) != nullptr) {
+ for (GXFTrackState * hit : trackStates()) {
+ if (hit->measurement() != nullptr) {
if (firstmeasstate == nullptr) {
firstmeasstate = hit;
}
@@ -713,4 +696,14 @@ namespace Trk {
return false;
}
+
+ void GXFTrajectory::resetCovariances(void) {
+ for (GXFTrackState *hit : trackStates()) {
+ hit->setTrackCovariance(nullptr);
+ }
+ }
+
+ std::unique_ptr<const FitQuality> GXFTrajectory::quality(void) const {
+ return std::make_unique<const FitQuality>(chi2(), nDOF());
+ }
}
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
index 64e6cb74a504d92a7ef870278ebf5facc893632b..24415d469d460b3823d42934377ca3c2e434eb68 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
@@ -23,14 +23,11 @@
#include "TrkGeometry/TrackingVolume.h"
#include "TrkGeometry/TrackingGeometry.h"
-#include "TrkDetDescrInterfaces/ITrackingGeometrySvc.h"
-
#include "TrkExUtils/TransportJacobian.h"
#include "TrkMaterialOnTrack/EnergyLoss.h"
#include "TrkMaterialOnTrack/ScatteringAngles.h"
#include "TrkMaterialOnTrack/EstimatedBremOnTrack.h"
-#include "TrkToolInterfaces/ITrkMaterialProviderTool.h"
#include "TrkGeometry/HomogeneousLayerMaterial.h"
#include "TrkGeometry/MaterialProperties.h"
@@ -45,16 +42,7 @@
#include "TrkVertexOnTrack/VertexOnTrack.h"
#include "TrkSegment/TrackSegment.h"
-#include "TrkToolInterfaces/IRIO_OnTrackCreator.h"
-#include "TrkToolInterfaces/IUpdator.h"
-#include "TrkToolInterfaces/IResidualPullCalculator.h"
-
-#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkExInterfaces/IPropagator.h"
-#include "TrkExInterfaces/INavigator.h"
-#include "TrkExInterfaces/IMultipleScatteringUpdator.h"
-#include "TrkExInterfaces/IEnergyLossUpdator.h"
-#include "TrkExInterfaces/IMaterialEffectsUpdator.h"
#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "MagFieldElements/AtlasFieldCache.h"
@@ -130,72 +118,10 @@ namespace Trk {
const std::string & n,
const IInterface * p
):
- AthAlgTool(t, n, p),
- m_ROTcreator(""),
- m_broadROTcreator(""),
- m_updator(""),
- m_extrapolator("Trk::Extrapolator/CosmicsExtrapolator"),
- m_scattool("Trk::MultipleScatteringUpdator/AtlasMultipleScatteringUpdator"),
- m_elosstool("Trk::EnergyLossUpdator/AtlasEnergyLossUpdator"),
- m_matupdator(""),
- m_propagator("Trk::StraightLinePropagator/CosmicsPropagator"),
- m_navigator("Trk::Navigator/CosmicsNavigator"),
- m_residualPullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator"),
- m_caloMaterialProvider("Trk::TrkMaterialProviderTool/TrkMaterialProviderTool"),
- m_calotool("Rec::MuidMaterialEffectsOnTrackProvider/MuidMaterialEffectsOnTrackProvider"),
- m_calotoolparam(""),
- m_trackingGeometrySvc("", n),
- m_DetID(nullptr),
- m_fieldpropnofield(new MagneticFieldProperties(Trk::NoField)),
- m_fieldpropfullfield(new MagneticFieldProperties(Trk::FullField))
+ base_class(t, n, p),
+ m_trackingGeometrySvc("", n)
{
- declareProperty("ExtrapolationTool", m_extrapolator);
- declareProperty("MeasurementUpdateTool", m_updator);
- declareProperty("RotCreatorTool", m_ROTcreator);
- declareProperty("BroadRotCreatorTool", m_broadROTcreator);
- declareProperty("MultipleScatteringTool", m_scattool);
- declareProperty("EnergyLossTool", m_elosstool);
- declareProperty("MaterialUpdateTool", m_matupdator);
- declareProperty("PropagatorTool", m_propagator);
- declareProperty("NavigatorTool", m_navigator);
- declareProperty("ResidualPullCalculatorTool", m_residualPullCalculator);
declareProperty("TrackingGeometrySvc", m_trackingGeometrySvc);
- declareProperty("CaloMaterialProvider", m_caloMaterialProvider);
- declareProperty("MuidTool", m_calotool);
- declareProperty("MuidToolParam", m_calotoolparam);
-
- declareProperty("DecomposeSegments", m_decomposesegments = true);
- declareProperty("StraightLine", m_straightlineprop = true);
- declareProperty("OutlierCut", m_outlcut = 5.);
- declareProperty("MaxOutliers", m_maxoutliers = 10);
- declareProperty("SignedDriftRadius", m_signedradius = true);
- declareProperty("Momentum", m_p = 0.);
- declareProperty("ExtrapolatorMaterial", m_extmat = true);
- declareProperty("MuidMat", m_calomat = false);
- declareProperty("FillDerivativeMatrix", m_fillderivmatrix = false);
- declareProperty("RecalibrateSilicon", m_sirecal = false);
- declareProperty("RecalibrateTRT", m_trtrecal = false);
- declareProperty("MaxIterations", m_maxit = 30);
- declareProperty("GetMaterialFromTrack", m_getmaterialfromtrack = true);
- declareProperty("MeasuredTrackParameters", m_domeastrackpar = true);
- declareProperty("StoreMaterialOnTrack", m_storemat = true);
- declareProperty("ReintegrateOutliers", m_reintoutl = false);
- declareProperty("TrackChi2PerNDFCut", m_chi2cut = 1.e15);
- declareProperty("RecalculateDerivatives", m_redoderivs = false);
- declareProperty("TRTExtensionCuts", m_extensioncuts = true);
- declareProperty("TRTTubeHitCut", m_scalefactor = 2.5);
- declareProperty("PrintDerivatives", m_printderivs = false);
- declareProperty("Acceleration", m_acceleration = false);
- declareProperty("KinkFinding", m_kinkfinding = false);
- declareProperty("NumericalDerivs", m_numderiv = false);
- declareProperty("FitEnergyLoss", m_fiteloss = false);
- declareProperty("AsymmetricEnergyLoss", m_asymeloss = true);
- declareProperty("MinimumIterations", m_miniter = 1);
- declareProperty("UseCaloTG", m_useCaloTG = false);
- declareProperty("FixBrem", m_fixbrem = -1);
- declareProperty("RejectLargeNScat", m_rejectLargeNScat = false);
-
- declareInterface<IGlobalTrackFitter>(this);
}
StatusCode GlobalChi2Fitter::initialize() {
@@ -255,13 +181,11 @@ namespace Trk {
}
ATH_MSG_INFO("fixed momentum: " << m_p);
- m_inputPreparator = new TrackFitInputPreparator;
return StatusCode::SUCCESS;
}
StatusCode GlobalChi2Fitter::finalize() {
- delete m_inputPreparator;
ATH_MSG_INFO("finalize()");
ATH_MSG_INFO(m_fit_status[S_FITS] << " attempted track fits");
@@ -299,7 +223,7 @@ namespace Trk {
);
}
- trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
+ trajectory.m_fieldprop = trajectory.m_straightline ? Trk::NoField : Trk::FullField;
bool firstismuon = isMuonTrack(intrk1);
@@ -519,7 +443,7 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(
DefinedParameter(updpar->parameters()[Trk::locY], Trk::locY)
),
@@ -528,7 +452,7 @@ namespace Trk {
);
delete updpar;
- pseudostate->setMeasurement(newpseudo);
+ pseudostate->setMeasurement(std::move(newpseudo));
double errors[5];
errors[0] = errors[2] = errors[3] = errors[4] = -1;
errors[1] = 10;
@@ -728,7 +652,7 @@ namespace Trk {
*matsurf,
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
);
@@ -740,7 +664,7 @@ namespace Trk {
*matsurf,
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
);
}
@@ -865,7 +789,7 @@ namespace Trk {
calomeots[0].associatedSurface(),
Trk::alongMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
);
@@ -888,7 +812,7 @@ namespace Trk {
calomeots[2].associatedSurface(),
Trk::oppositeMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
);
@@ -898,8 +822,7 @@ namespace Trk {
return nullptr;
}
- TransportJacobian *jac1 = nullptr;
- TransportJacobian *jac2 = nullptr;
+ std::unique_ptr<TransportJacobian> jac1, jac2;
std::unique_ptr<const TrackParameters> elosspar;
double firstscatphi = 0;
@@ -943,6 +866,7 @@ namespace Trk {
PropDirection propdir = !firstismuon ? oppositeMomentum : alongMomentum;
+ TransportJacobian *tmp_jac1 = jac1.get();
tmpelosspar = m_propagator->propagateParameters(
ctx,
*tmppar1,
@@ -950,13 +874,13 @@ namespace Trk {
associatedSurface(),
propdir,
false,
- *trajectory.m_fieldprop,
- jac1,
+ trajectory.m_fieldprop,
+ tmp_jac1,
Trk::nonInteracting
);
+ if (jac1.get() != tmp_jac1) jac1.reset(tmp_jac1);
if (m_numderiv) {
- delete jac1;
jac1 = numericalDerivatives(
ctx,
firstscatpar,
@@ -968,7 +892,6 @@ namespace Trk {
delete tmppar1;
if ((tmpelosspar == nullptr) || (jac1 == nullptr)) {
- delete jac1;
delete tp_closestmuon;
delete firstscatpar;
delete lastscatpar;
@@ -994,6 +917,7 @@ namespace Trk {
delete tmpelosspar;
}
+ TransportJacobian * tmp_jac2 = jac2.get();
const TrackParameters *scat2 = m_propagator->propagateParameters(
ctx,
*elosspar2,
@@ -1002,13 +926,13 @@ namespace Trk {
calomeots[2].associatedSurface(),
propdir,
false,
- *trajectory.m_fieldprop,
- jac2,
+ trajectory.m_fieldprop,
+ tmp_jac2,
Trk::nonInteracting
);
+ if (jac2.get() != tmp_jac2) jac2.reset(tmp_jac2);
if (m_numderiv) {
- delete jac2;
jac2 = numericalDerivatives(
ctx,
elosspar2,
@@ -1025,8 +949,6 @@ namespace Trk {
delete elosspar2;
if ((scat2 == nullptr) || (jac2 == nullptr)) {
delete scat2;
- delete jac1;
- delete jac2;
delete tp_closestmuon;
delete firstscatpar;
delete lastscatpar;
@@ -1043,10 +965,8 @@ namespace Trk {
}
}
- delete jac1;
- delete jac2;
-
- jac1 = jac2 = nullptr;
+ jac1.reset(nullptr);
+ jac2.reset(nullptr);
Amg::MatrixX jac4(2, 2);
jac4(0, 0) = jac3[0][2];
@@ -1208,9 +1128,9 @@ namespace Trk {
elossmeff->setSigmaDeltaE(calomeots[1].energyLoss()->sigmaDeltaE());
- trajectory.addMaterialState(new GXFTrackState(firstscatmeff, firstscatpar), -1, true);
- trajectory.addMaterialState(new GXFTrackState(elossmeff, elosspar.release()), -1, true);
- trajectory.addMaterialState(new GXFTrackState(secondscatmeff, lastscatpar), -1, true);
+ trajectory.addMaterialState(new GXFTrackState(firstscatmeff, firstscatpar), -1);
+ trajectory.addMaterialState(new GXFTrackState(elossmeff, elosspar.release()), -1);
+ trajectory.addMaterialState(new GXFTrackState(secondscatmeff, lastscatpar), -1);
if (!firstismuon) {
for (auto & i : tmp_matvec) {
@@ -1285,18 +1205,17 @@ namespace Trk {
tpar->position().perp() > 9000 &&
std::abs(tpar->position().z()) < 13000
) {
- const TrackParameters *pseudopar = tpar->clone();
+ std::unique_ptr<const TrackParameters> pseudopar(tpar->clone());
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(pseudopar->parameters()[Trk::locY], Trk::locY)),
covMatrix,
pseudopar->associatedSurface()
);
- GXFTrackState *pseudostate = new GXFTrackState(newpseudo, pseudopar, true);
- pseudostate->setTrackParameters(pseudopar);
+ GXFTrackState *pseudostate = new GXFTrackState(std::move(newpseudo), std::move(pseudopar));
pseudostate->setMeasurementType(TrackState::Pseudo);
double errors[5];
@@ -1431,7 +1350,7 @@ namespace Trk {
calomeots[0].associatedSurface(),
Trk::alongMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting));
delete lastidpar;
@@ -1447,7 +1366,7 @@ namespace Trk {
calomeots[1].associatedSurface(),
Trk::alongMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting));
if (!tmppar) {
@@ -1482,7 +1401,7 @@ namespace Trk {
calomeots[2].associatedSurface(),
Trk::alongMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting));
if (!lastscatpar) {
@@ -1496,7 +1415,7 @@ namespace Trk {
calomeots[2].associatedSurface(),
Trk::oppositeMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
)
);
@@ -1512,7 +1431,7 @@ namespace Trk {
calomeots[1].associatedSurface(),
Trk::oppositeMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
)
);
@@ -1541,7 +1460,7 @@ namespace Trk {
calomeots[0].associatedSurface(),
Trk::oppositeMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
)
);
@@ -1584,9 +1503,9 @@ namespace Trk {
dp = 1000 * (lastscatpar->parameters()[Trk::qOverP] - firstscatpar->parameters()[Trk::qOverP]);
elossmeff->setdelta_p(dp);
- trajectory.addMaterialState(new GXFTrackState(firstscatmeff.release(), firstscatpar.release()), -1, true);
- trajectory.addMaterialState(new GXFTrackState(elossmeff.release(), elosspar.release()), -1, true);
- trajectory.addMaterialState(new GXFTrackState(secondscatmeff.release(), lastscatpar.release()), -1, true);
+ trajectory.addMaterialState(new GXFTrackState(firstscatmeff.release(), firstscatpar.release()), -1);
+ trajectory.addMaterialState(new GXFTrackState(elossmeff.release(), elosspar.release()), -1);
+ trajectory.addMaterialState(new GXFTrackState(secondscatmeff.release(), lastscatpar.release()), -1);
GXFTrackState *secondscatstate = trajectory.trackStates().back();
const Surface *triggersurf1 = nullptr;
@@ -1741,17 +1660,24 @@ namespace Trk {
std::abs((*itStates2)->measurementOnTrack()->globalPosition().z()) < 10000
)
) {
- const TrackParameters* par2 =
- (((*itStates2)->trackParameters() != nullptr) && nphi > 99)
- ? (*itStates2)->trackParameters()->clone()
- : m_propagator->propagateParameters(
- ctx,
- *secondscatstate->trackParameters(),
- (*itStates2)->measurementOnTrack()->associatedSurface(),
- alongMomentum,
- false,
- *trajectory.m_fieldprop,
- Trk::nonInteracting);
+ std::unique_ptr<const TrackParameters> par2;
+
+ if (((*itStates2)->trackParameters() != nullptr) && nphi > 99) {
+ par2.reset((*itStates2)->trackParameters()->clone());
+ } else {
+ par2.reset(
+ m_propagator->propagateParameters(
+ ctx,
+ *secondscatstate->trackParameters(),
+ (*itStates2)->measurementOnTrack()->associatedSurface(),
+ alongMomentum,
+ false,
+ trajectory.m_fieldprop,
+ Trk::nonInteracting
+ )
+ );
+ }
+
if (par2 == nullptr) {
continue;
}
@@ -1765,8 +1691,7 @@ namespace Trk {
par2->associatedSurface()
);
- firstpseudostate = new GXFTrackState(newpseudo, par2, true);
- firstpseudostate->setTrackParameters(par2);
+ firstpseudostate = new GXFTrackState(std::unique_ptr<const MeasurementBase>(newpseudo), std::move(par2));
firstpseudostate->setMeasurementType(TrackState::Pseudo);
double errors[5];
@@ -1804,11 +1729,11 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(0, Trk::locY)), covMatrix, slsurf
);
- pseudostate1 = new GXFTrackState(newpseudo, nullptr, true);
+ pseudostate1 = new GXFTrackState(std::move(newpseudo), nullptr);
pseudostate1->setMeasurementType(TrackState::Pseudo);
double errors[5];
@@ -1832,11 +1757,11 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(0, Trk::locY)), covMatrix, slsurf
);
- pseudostate2 = new GXFTrackState(newpseudo, nullptr, true);
+ pseudostate2 = new GXFTrackState(std::move(newpseudo), nullptr);
pseudostate2->setMeasurementType(TrackState::Pseudo);
double errors[5];
@@ -1895,12 +1820,12 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(par2->parameters()[Trk::locY], Trk::locY)),
covMatrix,
par2->associatedSurface()
);
- firstpseudostate->setMeasurement(newpseudo);
+ firstpseudostate->setMeasurement(std::move(newpseudo));
firstpseudostate->setRecalibrated(false);
}
@@ -1958,8 +1883,7 @@ namespace Trk {
trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
- trajectory.m_fieldprop =
- trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
+ trajectory.m_fieldprop = trajectory.m_straightline ? Trk::NoField : Trk::FullField;
return std::unique_ptr<Track>(
fitIm(ctx, cache, inputTrack, runOutlier, matEffects));
@@ -2012,7 +1936,7 @@ namespace Trk {
trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
- trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
+ trajectory.m_fieldprop = trajectory.m_straightline ? Trk::NoField : Trk::FullField;
if (inputTrack.trackStateOnSurfaces()->empty()) {
ATH_MSG_WARNING("Track with zero track states, cannot perform fit");
@@ -2310,14 +2234,14 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(updpar->parameters()[Trk::locY], Trk::locY)),
covMatrix,
pseudopar->associatedSurface()
);
delete updpar;
- pseudostate->setMeasurement(newpseudo);
+ pseudostate->setMeasurement(std::move(newpseudo));
double errors[5];
errors[0] = errors[2] = errors[3] = errors[4] = -1;
errors[1] = 10;
@@ -2450,7 +2374,7 @@ namespace Trk {
trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
- trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
+ trajectory.m_fieldprop = trajectory.m_straightline ? Trk::NoField : Trk::FullField;
const TrackParameters *minpar = inputTrack.perigeeParameters();
@@ -2599,7 +2523,7 @@ namespace Trk {
trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
- trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
+ trajectory.m_fieldprop = trajectory.m_straightline ? Trk::NoField : Trk::FullField;
MeasurementSet rots;
@@ -2691,26 +2615,26 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(firstpar->parameters()[Trk::locY], Trk::locY)),
covMatrix,
firstpar->associatedSurface()
);
- trajectory.trackStates().front()->setMeasurement(newpseudo);
+ trajectory.trackStates().front()->setMeasurement(std::move(newpseudo));
}
if (trajectory.trackStates().back()->measurementType() == TrackState::Pseudo) {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(lastpar->parameters()[Trk::locY], Trk::locY)),
covMatrix,
lastpar->associatedSurface()
);
- trajectory.trackStates().back()->setMeasurement(newpseudo);
+ trajectory.trackStates().back()->setMeasurement(std::move(newpseudo));
}
if (!trajectory.m_straightline) {
@@ -2747,13 +2671,13 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(firstpar->parameters()[Trk::locY], Trk::locY)),
covMatrix,
firstpar->associatedSurface()
);
- trajectory.trackStates().front()->setMeasurement(newpseudo);
+ trajectory.trackStates().front()->setMeasurement(std::move(newpseudo));
double errors[5];
errors[0] = errors[2] = errors[3] = errors[4] = -1;
errors[1] = 10;
@@ -2766,13 +2690,13 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(lastpar->parameters()[Trk::locY], Trk::locY)),
covMatrix,
lastpar->associatedSurface()
);
- trajectory.trackStates().back()->setMeasurement(newpseudo);
+ trajectory.trackStates().back()->setMeasurement(std::move(newpseudo));
double errors[5];
errors[0] = errors[2] = errors[3] = errors[4] = -1;
errors[1] = 10;
@@ -2889,8 +2813,7 @@ namespace Trk {
newmeff,
copytp ? tsos->trackParameters()->clone() : tsos->trackParameters()
),
- index,
- copytp
+ index
);
}
@@ -2938,7 +2861,10 @@ namespace Trk {
for (int i = 0; i < imax; i++) {
const MeasurementBase *measbase2 = ((seg != nullptr) && m_decomposesegments) ? seg->measurement(i) : measbase;
const TrackParameters *newtrackpar = ((seg != nullptr) && m_decomposesegments) ? nullptr : trackpar;
- GXFTrackState *ptsos = new GXFTrackState(measbase2, newtrackpar);
+ GXFTrackState *ptsos = new GXFTrackState(
+ std::unique_ptr<const MeasurementBase>(measbase2->clone()),
+ std::unique_ptr<const TrackParameters>(newtrackpar != nullptr ? newtrackpar->clone() : nullptr)
+ );
const Amg::MatrixX & covmat = measbase2->localCovariance();
double sinstereo = 0;
double errors[5];
@@ -3661,8 +3587,7 @@ namespace Trk {
* Create a new track state in the internal representation and load it
* with any and all information we might have.
*/
-
- GXFTrackState *matstate = new GXFTrackState(meff);
+ GXFTrackState *matstate = new GXFTrackState(meff, nullptr);
matstate->setPosition(intersect);
trajectory.addMaterialState(matstate);
@@ -3966,18 +3891,19 @@ namespace Trk {
) {
if (firstsistate == nullptr) {
if (oldstates[i]->trackParameters() == nullptr) {
- const TrackParameters* tmppar = m_propagator->propagateParameters(
+ std::unique_ptr<const TrackParameters> tmppar(m_propagator->propagateParameters(
ctx,
- *refpar,
- *oldstates[i]->surface(),
- alongMomentum,
- false,
- *trajectory.m_fieldprop,
- Trk::nonInteracting);
-
+ *refpar,
+ *oldstates[i]->surface(),
+ alongMomentum,
+ false,
+ trajectory.m_fieldprop,
+ Trk::nonInteracting
+ ));
+
if (tmppar == nullptr) return;
- oldstates[i]->setTrackParameters(tmppar);
+ oldstates[i]->setTrackParameters(std::move(tmppar));
}
firstsistate = oldstates[i];
}
@@ -4000,17 +3926,17 @@ namespace Trk {
* enough.
*/
if (lastsistate->trackParameters() == nullptr) {
- const TrackParameters *tmppar = m_propagator->propagateParameters(
+ std::unique_ptr<const TrackParameters> tmppar(m_propagator->propagateParameters(
*refpar,
*lastsistate->surface(),
alongMomentum, false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
- );
+ ));
if (tmppar == nullptr) return;
- lastsistate->setTrackParameters(tmppar);
+ lastsistate->setTrackParameters(std::move(tmppar));
}
/*
@@ -4120,7 +4046,7 @@ namespace Trk {
return;
}
- state->setTrackParameters(tp);
+ state->setTrackParameters(std::unique_ptr<const TrackParameters>(tp));
}
// When acceleration is enabled, material collection starts from first hit
refpar2 = tp;
@@ -4467,7 +4393,7 @@ namespace Trk {
calomeots[i].associatedSurface(),
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
nonInteracting
);
@@ -4525,7 +4451,7 @@ namespace Trk {
calomeots[i].associatedSurface(),
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
nonInteracting
);
@@ -4678,7 +4604,7 @@ namespace Trk {
firstmuonhit->associatedSurface(),
oppositeMomentum,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
nonInteracting
);
@@ -4998,7 +4924,7 @@ namespace Trk {
}
}
- trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
+ trajectory.m_fieldprop = trajectory.m_straightline ? Trk::NoField : Trk::FullField;
cache.m_lastiter = 0;
Amg::SymMatrixX lu;
@@ -5177,7 +5103,7 @@ namespace Trk {
*matsurf,
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
);
@@ -5189,7 +5115,7 @@ namespace Trk {
*matsurf,
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
);
@@ -5238,7 +5164,7 @@ namespace Trk {
persurf,
Trk::anyDirection,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting
);
@@ -5511,7 +5437,7 @@ namespace Trk {
cache.m_fittercode = FitterStatusCode::OutlierLogicFailure;
}
- double cut = (finaltrajectory->numberOfSiliconHits() == finaltrajectory->numberOfHits())? 999 : m_chi2cut;
+ double cut = (finaltrajectory->numberOfSiliconHits() == finaltrajectory->numberOfHits())? 999.0 : m_chi2cut.value();
if (
runOutlier &&
@@ -5592,14 +5518,14 @@ namespace Trk {
Amg::MatrixX covMatrix(1, 1);
covMatrix(0, 0) = 100;
- PseudoMeasurementOnTrack *newpseudo = new PseudoMeasurementOnTrack(
+ std::unique_ptr<const PseudoMeasurementOnTrack> newpseudo = std::make_unique<const PseudoMeasurementOnTrack>(
LocalParameters(DefinedParameter(currenttrackpar->parameters()[Trk::locY], Trk::locY)),
covMatrix,
currenttrackpar->associatedSurface()
);
- state->setMeasurement(newpseudo);
- measbase = newpseudo;
+ state->setMeasurement(std::move(newpseudo));
+ measbase = state->measurement();
}
double *errors = state->measurementErrors();
@@ -6492,15 +6418,13 @@ namespace Trk {
double dcerror = sqrt(oldrot->prepRawData()->localCovariance()(Trk::driftRadius, Trk::driftRadius));
double trackradius = state->trackParameters()->parameters()[Trk::driftRadius];
- const Trk::RIO_OnTrack * newrot = nullptr;
+ std::unique_ptr<const Trk::RIO_OnTrack> newrot = nullptr;
double distance = std::abs(std::abs(trackradius) - dcradius);
if (distance < scalefactor * dcerror && (olderror > 1. || trackradius * oldradius < 0)) {
- newrot = m_ROTcreator->correct(*oldrot->prepRawData(), *state->trackParameters());
- }
-
- if (distance > scalefactor * dcerror && olderror < 1.) {
- newrot = m_broadROTcreator->correct(*oldrot->prepRawData(), *state->trackParameters());
+ newrot.reset(m_ROTcreator->correct(*oldrot->prepRawData(), *state->trackParameters()));
+ } else if (distance > scalefactor * dcerror && olderror < 1.) {
+ newrot.reset(m_broadROTcreator->correct(*oldrot->prepRawData(), *state->trackParameters()));
}
if (newrot != nullptr) {
@@ -6518,7 +6442,7 @@ namespace Trk {
double oldres = res[measno];
double newres = newradius - state->trackParameters()->parameters()[Trk::driftRadius];
errors[0] = newerror;
- state->setMeasurement(newrot);
+ state->setMeasurement(std::move(newrot));
for (int i = 0; i < nfitpars; i++) {
if (weightderiv(measno, i) == 0) {
@@ -6634,9 +6558,9 @@ namespace Trk {
if (statetype == TrackState::Fittable) {
TrackState::MeasurementType hittype = state->measurementType();
- if ((hittype == TrackState::Pixel || hittype == TrackState::SCT) && (state->trackCovariance() != nullptr)) {
+ if ((hittype == TrackState::Pixel || hittype == TrackState::SCT) && state->hasTrackCovariance()) {
double *errors = state->measurementErrors();
- AmgSymMatrix(5) & trackcov = *state->trackCovariance();
+ AmgSymMatrix(5) & trackcov = state->trackCovariance();
const Amg::MatrixX & hitcov = state->measurement()->localCovariance();
double sinstereo = state->sinStereo();
double cosstereo = (sinstereo == 0) ? 1 : sqrt(1 - sinstereo * sinstereo);
@@ -6719,7 +6643,7 @@ namespace Trk {
parameterVector[Trk::phi],
parameterVector[Trk::theta],
parameterVector[Trk::qOverP],
- new AmgSymMatrix(5)(*state_maxsipull->trackCovariance())
+ state_maxsipull->hasTrackCovariance() ? new AmgSymMatrix(5)(state_maxsipull->trackCovariance()) : nullptr
)
);
@@ -6865,7 +6789,7 @@ namespace Trk {
olderror[1] << " newerror_1=" << newerror[1]
);
- state_maxsipull->setMeasurement(broadrot.release());
+ state_maxsipull->setMeasurement(std::move(broadrot));
state_maxsipull->setSinStereo(newsinstereo);
state_maxsipull->setMeasurementErrors(newerror);
} else if (
@@ -7069,15 +6993,16 @@ namespace Trk {
ParticleHypothesis
matEffects) const {
// Convert internal track state into "official" TrackStateOnSurface
- const TrackParameters *trackpar = state->trackParameters(true);
- const MeasurementBase *measurement = state->measurement(true);
- const FitQualityOnSurface *fitQual = state->fitQuality(true);
+ const TrackParameters *trackpar = state->trackParameters() != nullptr ? state->takeTrackParameters()->clone() : nullptr;
+ const MeasurementBase *measurement = state->measurement() != nullptr ? state->takeMeasurement()->clone() : nullptr;
+ const FitQualityOnSurface *fitQual = state->fitQuality() != nullptr ? state->takeFitQuality()->clone() : nullptr;
+
GXFMaterialEffects *gxfmeff = state->materialEffects();
const MaterialEffectsBase *mateff = nullptr;
TrackState::TrackStateType tstype = state->trackStateType();
std::bitset<TrackStateOnSurface::NumberOfTrackStateOnSurfaceTypes> typePattern;
- if (state->trackCovariance() != nullptr) {
+ if (state->hasTrackCovariance()) {
state->setTrackCovariance(nullptr);
}
@@ -7195,12 +7120,16 @@ namespace Trk {
) const {
GXFTrackState *firstmeasstate, *lastmeasstate;
std::tie(firstmeasstate, lastmeasstate) = oldtrajectory.findFirstLastMeasurement();
- const TrackParameters *per = nullptr;
+ std::unique_ptr<const TrackParameters> per(nullptr);
if (cache.m_acceleration && !m_matupdator.empty()) {
- const TrackParameters *prevpar = firstmeasstate->trackParameters();
- const TrackParameters *tmppar = firstmeasstate->trackParameters();
+ std::unique_ptr<const TrackParameters> prevpar(
+ firstmeasstate->trackParameters() != nullptr ?
+ firstmeasstate->trackParameters()->clone() :
+ nullptr
+ );
std::vector<std::pair<const Layer *, const Layer *>> & upstreamlayers = oldtrajectory.upstreamMaterialLayers();
+ bool first = true;
for (int i = (int)upstreamlayers.size() - 1; i >= 0; i--) {
if (prevpar == nullptr) {
@@ -7225,23 +7154,25 @@ namespace Trk {
continue;
}
- if (distsol.first() * distsol.second() < 0 && prevpar != firstmeasstate->trackParameters()) {
+ if (distsol.first() * distsol.second() < 0 && !first) {
continue;
}
}
- if (prevpar == firstmeasstate->trackParameters() && distance > 0) {
+ if (first && distance > 0) {
propdir = alongMomentum;
}
- const TrackParameters *layerpar = m_propagator->propagate(
- ctx,
- *prevpar,
- layer->surfaceRepresentation(),
- propdir,
- true,
- *oldtrajectory.m_fieldprop,
- nonInteracting
+ std::unique_ptr<const TrackParameters> layerpar(
+ m_propagator->propagate(
+ ctx,
+ *prevpar,
+ layer->surfaceRepresentation(),
+ propdir,
+ true,
+ oldtrajectory.m_fieldprop,
+ nonInteracting
+ )
);
if (layerpar == nullptr) {
@@ -7249,18 +7180,65 @@ namespace Trk {
}
if (layer->surfaceRepresentation().bounds().inside(layerpar->localPosition())) {
- const TrackParameters *updatedpar = m_matupdator->update(layerpar, *layer, oppositeMomentum, matEffects);
- if ((updatedpar != nullptr) && updatedpar != layerpar) {
- delete layerpar;
- layerpar = updatedpar;
+ /*
+ * WARNING: Possible memory aliasing. As far as I can tell, the
+ * update method either returns its argument pointer (thereby not
+ * allocating new memory), or allocates new memory on the heap, or
+ * returns a nullptr.
+ *
+ * In other words, the user of this method cannot be sure whether the
+ * pointer returned is an alias of the argument pointer without
+ * additional checks. It also seems to free the memory pointed at in
+ * some cases.
+ *
+ * This sort of duplicity does not work well with C++ smart pointers,
+ * so it's up to the developer to ensure that the memory is handled
+ * safely.
+ *
+ * Stephen Nicholas Swatman <stephen.nicholas.swatman@cern.ch>
+ * August 11th, 2020
+ */
+ const TrackParameters * updatedpar = m_matupdator->update(layerpar.get(), *layer, oppositeMomentum, matEffects);
+
+ if (updatedpar != nullptr) {
+ if (updatedpar != layerpar.get()) {
+ /*
+ * Updating succeeded, and the result is the not the same pointer
+ * that we used as input for our method. This means that the
+ * update method freed the contents of our smart pointer. We need
+ * to replace the contents of our smart pointer _without_
+ * invoking the automatic freeing mechanism.
+ */
+ layerpar.release();
+ layerpar.reset(updatedpar);
+ }
+ /*
+ * If the returned pointer is the same as the input pointer, then
+ * our smart pointer and the returned raw pointer now alias each
+ * other. That's a less than ideal situation, but we can control
+ * the scope of the returned raw pointer. If we make sure we don't
+ * do anything with this raw pointer, for example create new smart
+ * pointers from it or free it, the aliasing raw pointer will
+ * eventually go out of scope and become harmless.
+ */
+ } else {
+ /*
+ * If the updated parameters are a nullptr, then the update failed.
+ * What this means exactly is hidden in the implementation of the
+ * update method, but god help us because it seems it also frees
+ * the memory pointed to by the argument pointer. Since the pointer
+ * argument comes from a smart pointer, we must release that
+ * pointer without freeing it, to prevent RAII mechanics from
+ * freeing it again. We also have to set it to nullptr, but
+ * luckily the std::unique_ptr::release method does both those
+ * things.
+ */
+ layerpar.release();
}
}
-
- if (prevpar != firstmeasstate->trackParameters()) {
- delete prevpar;
- }
-
- prevpar = layerpar;
+
+ prevpar = std::move(layerpar);
+ first = false;
}
const Layer *startlayer = firstmeasstate->trackParameters()->associatedSurface().associatedLayer();
@@ -7274,8 +7252,9 @@ namespace Trk {
}
if (startfactor > 0.5) {
const TrackParameters *updatedpar = m_matupdator->update(firstmeasstate->trackParameters(), *startlayer, oppositeMomentum, matEffects);
+
if ((updatedpar != nullptr) && updatedpar != firstmeasstate->trackParameters()) {
- firstmeasstate->setTrackParameters(updatedpar);
+ firstmeasstate->setTrackParameters(std::unique_ptr<const TrackParameters>(updatedpar->clone()));
}
}
}
@@ -7296,28 +7275,27 @@ namespace Trk {
if (endfactor > 0.5) {
const TrackParameters *updatedpar = m_matupdator->update(lastmeasstate->trackParameters(), *endlayer, alongMomentum, matEffects);
+
if ((updatedpar != nullptr) && updatedpar != lastmeasstate->trackParameters()) {
- lastmeasstate->setTrackParameters(updatedpar);
+ lastmeasstate->setTrackParameters(std::unique_ptr<const TrackParameters>(updatedpar->clone()));
}
}
}
if (prevpar != nullptr) {
- per = m_propagator->propagate(
- ctx,
- *prevpar,
- PerigeeSurface(Amg::Vector3D(0, 0, 0)),
- oppositeMomentum,
- false,
- *oldtrajectory.m_fieldprop,
- nonInteracting
+ per.reset(
+ m_propagator->propagate(
+ ctx,
+ *prevpar,
+ PerigeeSurface(Amg::Vector3D(0, 0, 0)),
+ oppositeMomentum,
+ false,
+ oldtrajectory.m_fieldprop,
+ nonInteracting
+ )
);
}
- if (prevpar != tmppar) {
- delete prevpar;
- }
-
if (per == nullptr) {
ATH_MSG_DEBUG("Failed to extrapolate to perigee, returning 0");
incrementFitStatus(S_PROPAGATION_FAIL);
@@ -7325,18 +7303,20 @@ namespace Trk {
return nullptr;
}
} else if (cache.m_acceleration && (firstmeasstate->trackParameters() != nullptr)) {
- per = m_extrapolator->extrapolate(
- *firstmeasstate->trackParameters(),
- PerigeeSurface(Amg::Vector3D(0, 0, 0)),
- oppositeMomentum,
- false,
- matEffects
+ per.reset(
+ m_extrapolator->extrapolate(
+ *firstmeasstate->trackParameters(),
+ PerigeeSurface(Amg::Vector3D(0, 0, 0)),
+ oppositeMomentum,
+ false,
+ matEffects
+ )
);
} else {
- per = oldtrajectory.referenceParameters(true);
+ per.reset(oldtrajectory.referenceParameters(true)->clone());
}
- return std::unique_ptr<const TrackParameters>(per);
+ return std::move(per);
}
std::unique_ptr<const TrackStateOnSurface> GlobalChi2Fitter::makeTrackFindPerigee(
@@ -7377,7 +7357,7 @@ namespace Trk {
hit->measurementType() == TrackState::Pseudo &&
hit->trackStateType() == TrackState::GeneralOutlier
) {
- if (hit->trackCovariance() != nullptr) {
+ if (hit->hasTrackCovariance()) {
hit->setTrackCovariance(nullptr);
}
continue;
@@ -7424,8 +7404,6 @@ namespace Trk {
}
GlobalChi2Fitter::~GlobalChi2Fitter() {
- delete m_fieldpropnofield;
- delete m_fieldpropfullfield;
}
FitterStatusCode GlobalChi2Fitter::calculateTrackParameters(
@@ -7444,7 +7422,7 @@ namespace Trk {
for (int hitno = nstatesupstream - 1; hitno >= 0; hitno--) {
TrackState::TrackStateType prevtstype = prevstate != nullptr ? prevstate->trackStateType() : TrackState::AnyState;
- TransportJacobian *jac = nullptr;
+ std::unique_ptr<TransportJacobian> jac;
const Surface *surf = states[hitno]->surface();
const TrackParameters *currenttrackpar = nullptr;
Trk::PropDirection propdir = Trk::oppositeMomentum;
@@ -7465,17 +7443,19 @@ namespace Trk {
bool curvpar = false;
if (calcderiv && !m_numderiv) {
+ TransportJacobian * tmp_jac = jac.get();
currenttrackpar = m_propagator->propagateParameters(
ctx,
*prevtrackpar,
*surf,
propdir,
false,
- *trajectory.m_fieldprop,
- jac,
+ trajectory.m_fieldprop,
+ tmp_jac,
Trk::nonInteracting,
curvpar
);
+ if (jac.get() != tmp_jac) jac.reset(tmp_jac);
} else {
currenttrackpar = m_propagator->propagateParameters(
ctx,
@@ -7483,18 +7463,15 @@ namespace Trk {
*surf,
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting,
curvpar
);
}
if (currenttrackpar == nullptr) {
- if (jac != nullptr) {
- delete jac;
- jac = nullptr;
- }
-
+ jac.reset(nullptr);
+
propdir = (
propdir == Trk::oppositeMomentum ?
Trk::alongMomentum :
@@ -7502,17 +7479,19 @@ namespace Trk {
);
if (calcderiv && !m_numderiv) {
+ TransportJacobian * tmp_jac = jac.get();
currenttrackpar = m_propagator->propagateParameters(
ctx,
*prevtrackpar,
*surf,
propdir,
false,
- *trajectory.m_fieldprop,
- jac,
+ trajectory.m_fieldprop,
+ tmp_jac,
Trk::nonInteracting,
curvpar
);
+ if (jac.get() != tmp_jac) jac.reset(tmp_jac);
} else {
currenttrackpar = m_propagator->propagateParameters(
ctx,
@@ -7520,7 +7499,7 @@ namespace Trk {
*surf,
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting,
curvpar
);
@@ -7528,9 +7507,7 @@ namespace Trk {
}
if ((currenttrackpar != nullptr) && m_numderiv && calcderiv) {
- delete jac;
- jac = numericalDerivatives(
- ctx, prevtrackpar, surf, propdir, trajectory.m_fieldprop);
+ jac = numericalDerivatives(ctx, prevtrackpar, surf, propdir, trajectory.m_fieldprop);
}
if (
@@ -7546,11 +7523,6 @@ namespace Trk {
if (currenttrackpar == nullptr) {
ATH_MSG_DEBUG("propagation failed, prev par: " << *prevtrackpar <<
" pos: " << prevtrackpar->position() << " destination surface: " << *surf);
-
-
- delete jac;
-
-
if (
hitno != nstatesupstream - 1 &&
(prevtstype == TrackState::Scatterer || prevtstype == TrackState::Brem)
@@ -7568,7 +7540,7 @@ namespace Trk {
delete prevtrackpar;
}
- states[hitno]->setTrackParameters(currenttrackpar);
+ states[hitno]->setTrackParameters(std::unique_ptr<const TrackParameters>(currenttrackpar));
surf = states[hitno]->surface();
if (calcderiv && (jac == nullptr)) {
@@ -7587,7 +7559,7 @@ namespace Trk {
}
}
- states[hitno]->setJacobian(jac);
+ states[hitno]->setJacobian(*jac);
}
GXFMaterialEffects *meff = states[hitno]->materialEffects();
@@ -7636,7 +7608,7 @@ namespace Trk {
bremno = trajectory.numberOfUpstreamBrems();
for (int hitno = nstatesupstream; hitno < (int) states.size(); hitno++) {
- TransportJacobian *jac = nullptr;
+ std::unique_ptr<TransportJacobian> jac;
const Surface *surf = states[hitno]->surface();
const TrackParameters *currenttrackpar = nullptr;
Trk::PropDirection propdir = Trk::alongMomentum;
@@ -7651,17 +7623,19 @@ namespace Trk {
bool curvpar = false;
if (calcderiv && !m_numderiv) {
+ TransportJacobian * tmp_jac = jac.get();
currenttrackpar = m_propagator->propagateParameters(
ctx,
*prevtrackpar,
*surf,
propdir,
false,
- *trajectory.m_fieldprop,
- jac,
+ trajectory.m_fieldprop,
+ tmp_jac,
Trk::nonInteracting,
curvpar
);
+ if (jac.get() != tmp_jac) jac.reset(tmp_jac);
} else {
currenttrackpar = m_propagator->propagateParameters(
ctx,
@@ -7669,7 +7643,7 @@ namespace Trk {
*surf,
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting,
curvpar
);
@@ -7681,24 +7655,23 @@ namespace Trk {
Trk::alongMomentum :
Trk::oppositeMomentum
);
-
- if (jac != nullptr) {
- delete jac;
- jac = nullptr;
- }
+
+ jac.reset(nullptr);
if (calcderiv && !m_numderiv) {
+ TransportJacobian * tmp_jac = jac.get();
currenttrackpar = m_propagator->propagateParameters(
ctx,
*prevtrackpar,
*surf,
propdir,
false,
- *trajectory.m_fieldprop,
- jac,
+ trajectory.m_fieldprop,
+ tmp_jac,
Trk::nonInteracting,
curvpar
);
+ if (jac.get() != tmp_jac) jac.reset(tmp_jac);
} else {
currenttrackpar = m_propagator->propagateParameters(
ctx,
@@ -7706,7 +7679,7 @@ namespace Trk {
*surf,
propdir,
false,
- *trajectory.m_fieldprop,
+ trajectory.m_fieldprop,
Trk::nonInteracting,
curvpar
);
@@ -7714,7 +7687,6 @@ namespace Trk {
}
if ((currenttrackpar != nullptr) && m_numderiv && calcderiv) {
- delete jac;
jac = numericalDerivatives(ctx, prevtrackpar, surf, propdir, trajectory.m_fieldprop);
}
@@ -7734,10 +7706,6 @@ namespace Trk {
ATH_MSG_DEBUG("propagation failed, prev par: " << *prevtrackpar <<
" pos: " << prevtrackpar->
position() << " destination surface: " << *surf);
-
- delete jac;
-
-
return FitterStatusCode::ExtrapolationFailure;
}
@@ -7757,7 +7725,7 @@ namespace Trk {
}
}
- states[hitno]->setJacobian(jac);
+ states[hitno]->setJacobian(*jac);
}
if (calcderiv && (jac == nullptr)) {
@@ -7818,7 +7786,7 @@ namespace Trk {
delete oldpar;
}
- states[hitno]->setTrackParameters(currenttrackpar);
+ states[hitno]->setTrackParameters(std::unique_ptr<const TrackParameters>(currenttrackpar));
prevtrackpar = currenttrackpar;
}
@@ -8058,19 +8026,17 @@ namespace Trk {
continue;
}
- if (state->trackCovariance() == nullptr) {
- AmgMatrix(5, 5) * newcov = new AmgMatrix(5, 5);
- newcov->setZero();
- state->setTrackCovariance(newcov);
+ if (!state->hasTrackCovariance()) {
+ state->zeroTrackCovariance();
}
- AmgMatrix(5, 5) & trackerrmat = *state->trackCovariance();
+ AmgMatrix(5, 5) & trackerrmat = state->trackCovariance();
if ((prevstate != nullptr) &&
(prevstate->trackStateType() == TrackState::Fittable ||
prevstate->trackStateType() == TrackState::GeneralOutlier)
&& !onlylocal) {
Eigen::Matrix<double, 5, 5> & jac = state->jacobian();
- AmgMatrix(5, 5) & prevcov = *states[indices[stateno - 1]]->trackCovariance();
+ AmgMatrix(5, 5) & prevcov = states[indices[stateno - 1]]->trackCovariance();
trackerrmat = jac * prevcov * jac.transpose();
} else {
@@ -8120,47 +8086,53 @@ namespace Trk {
trackerrmat(4, 4) = 1e-20;
}
- const TrackParameters *trackpar = nullptr;
const TrackParameters *tmptrackpar =
state->trackParameters();
- AmgMatrix(5, 5) * trkerrmat = state->trackCovariance(true);
+ AmgMatrix(5, 5) * trkerrmat;
+
+ if (state->hasTrackCovariance()) {
+ trkerrmat = new AmgSymMatrix(5)(state->trackCovariance());
+ } else {
+ trkerrmat = nullptr;
+ }
+
const AmgVector(5) & tpars = tmptrackpar->parameters();
- trackpar =
+ std::unique_ptr<const TrackParameters> trackpar(
tmptrackpar->associatedSurface().createTrackParameters(tpars[0],
tpars[1],
tpars[2],
tpars[3],
tpars[4],
- trkerrmat);
- state->setTrackParameters(trackpar);
- const FitQualityOnSurface *fitQual = nullptr;
+ trkerrmat)
+ );
+ state->setTrackParameters(std::move(trackpar));
+ std::unique_ptr<const FitQualityOnSurface> fitQual = nullptr;
if (state->trackStateType() == TrackState::Fittable) {
if (errorok && trajectory.nDOF() > 0) {
- fitQual = m_updator->fullStateFitQuality(*trackpar,
- measurement->
- localParameters(),
- measurement->
- localCovariance());
+ fitQual.reset(m_updator->fullStateFitQuality(
+ *state->trackParameters(),
+ measurement->localParameters(),
+ measurement->localCovariance()
+ ));
} else {
- fitQual =
- new FitQualityOnSurface(0, state->numberOfMeasuredParameters());
+ fitQual = std::make_unique<const FitQualityOnSurface>(0, state->numberOfMeasuredParameters());
}
}
- state->setFitQuality(fitQual);
+ state->setFitQuality(std::move(fitQual));
}
prevstate = state;
hitno++;
}
}
- TransportJacobian*
+ std::unique_ptr<TransportJacobian>
GlobalChi2Fitter::numericalDerivatives(
const EventContext& ctx,
const TrackParameters* prevpar,
const Surface* surf,
PropDirection propdir,
- const MagneticFieldProperties* fieldprop) const
+ const MagneticFieldProperties fieldprop) const
{
ParamDefsAccessor paraccessor;
double J[25] = {
@@ -8170,7 +8142,7 @@ namespace Trk {
0, 0, 0, 1, 0,
0, 0, 0, 0, 1
};
- TransportJacobian *jac = new TransportJacobian(J);
+ std::unique_ptr<TransportJacobian> jac = std::make_unique<TransportJacobian>(J);
const TrackParameters *tmpprevpar = prevpar;
double eps[5] = {
0.01, 0.01, 0.00001, 0.00001, 0.000000001
@@ -8212,68 +8184,80 @@ namespace Trk {
correctAngles(vecminuseps[Trk::phi], vecminuseps[Trk::theta]);
correctAngles(vecpluseps[Trk::phi], vecpluseps[Trk::theta]);
- const TrackParameters *parpluseps =
- tmpprevpar->associatedSurface().createTrackParameters(vecpluseps[0],
- vecpluseps[1],
- vecpluseps[2],
- vecpluseps[3],
- vecpluseps[4],
- nullptr);
- const TrackParameters *parminuseps =
- tmpprevpar->associatedSurface().createTrackParameters(vecminuseps[0],
- vecminuseps[1],
- vecminuseps[2],
- vecminuseps[3],
- vecminuseps[4],
- nullptr);
- const TrackParameters* newparpluseps = m_propagator->propagateParameters(
- ctx,
- *parpluseps,
- *surf,
- propdir,
- false,
- *fieldprop,
- Trk::nonInteracting);
- const TrackParameters* newparminuseps = m_propagator->propagateParameters(
- ctx,
- *parminuseps,
- *surf,
- propdir,
- false,
- *fieldprop,
- Trk::nonInteracting);
- PropDirection propdir2 =
- (propdir ==
- Trk::alongMomentum) ? Trk::oppositeMomentum : Trk::alongMomentum;
- if (newparpluseps == nullptr) {
- newparpluseps = m_propagator->propagateParameters(
+ std::unique_ptr<const TrackParameters> parpluseps(
+ tmpprevpar->associatedSurface().createTrackParameters(
+ vecpluseps[0],
+ vecpluseps[1],
+ vecpluseps[2],
+ vecpluseps[3],
+ vecpluseps[4],
+ nullptr
+ )
+ );
+ std::unique_ptr<const TrackParameters> parminuseps(
+ tmpprevpar->associatedSurface().createTrackParameters(
+ vecminuseps[0],
+ vecminuseps[1],
+ vecminuseps[2],
+ vecminuseps[3],
+ vecminuseps[4],
+ nullptr
+ )
+ );
+
+ std::unique_ptr<const TrackParameters> newparpluseps(
+ m_propagator->propagateParameters(
ctx,
*parpluseps,
*surf,
- propdir2,
+ propdir,
false,
- *fieldprop,
- Trk::nonInteracting);
- }
- if (newparminuseps == nullptr) {
- newparminuseps = m_propagator->propagateParameters(
+ fieldprop,
+ Trk::nonInteracting
+ )
+ );
+ std::unique_ptr<const TrackParameters> newparminuseps(
+ m_propagator->propagateParameters(
ctx,
*parminuseps,
*surf,
- propdir2,
+ propdir,
false,
- *fieldprop,
- Trk::nonInteracting);
+ fieldprop,
+ Trk::nonInteracting
+ )
+ );
+
+ PropDirection propdir2 =
+ (propdir ==
+ Trk::alongMomentum) ? Trk::oppositeMomentum : Trk::alongMomentum;
+ if (newparpluseps == nullptr) {
+ newparpluseps.reset(
+ m_propagator->propagateParameters(
+ ctx,
+ *parpluseps,
+ *surf,
+ propdir2,
+ false,
+ fieldprop,
+ Trk::nonInteracting
+ )
+ );
+ }
+ if (newparminuseps == nullptr) {
+ newparminuseps.reset(
+ m_propagator->propagateParameters(
+ ctx,
+ *parminuseps,
+ *surf,
+ propdir2,
+ false,
+ fieldprop,
+ Trk::nonInteracting
+ )
+ );
}
- delete parpluseps;
- delete parminuseps;
if ((newparpluseps == nullptr) || (newparminuseps == nullptr)) {
- delete newparpluseps;
- delete newparminuseps;
- delete jac;
- if (tmpprevpar != prevpar) {
- delete tmpprevpar;
- }
return nullptr;
}
@@ -8303,11 +8287,6 @@ namespace Trk {
(*jac) (j, i) = diff / (2 * eps[i]);
}
- delete newparpluseps;
- delete newparminuseps;
- }
- if (tmpprevpar != prevpar) {
- delete tmpprevpar;
}
return jac;
}
diff --git a/Tracking/TrkTools/KalmanParameterUpdator/CMakeLists.txt b/Tracking/TrkTools/KalmanParameterUpdator/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..82a50fd075fbb36069719d2b84eae2ee5489effa
--- /dev/null
+++ b/Tracking/TrkTools/KalmanParameterUpdator/CMakeLists.txt
@@ -0,0 +1,19 @@
+################################################################################
+# Package: TrkMeasurementUpdator
+################################################################################
+
+# Declare the package name:
+atlas_subdir( KalmanParameterUpdator )
+
+
+# External dependencies:
+find_package( Eigen )
+
+# Component(s) in the package:
+atlas_add_library( KalmanParameterUpdatorLib
+ src/*.cxx
+ PUBLIC_HEADERS KalmanParameterUpdator
+ INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives TrkEventPrimitives TrkParameters)
+
+
diff --git a/Tracking/TrkTools/KalmanParameterUpdator/KalmanParameterUpdator/ATLAS_CHECK_THREAD_SAFETY b/Tracking/TrkTools/KalmanParameterUpdator/KalmanParameterUpdator/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..8f1f6e63f25c412638181b87fb7da35c5a2e031c
--- /dev/null
+++ b/Tracking/TrkTools/KalmanParameterUpdator/KalmanParameterUpdator/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Tracking/TrkTools/KalmanParameterUpdator
diff --git a/Tracking/TrkTools/KalmanParameterUpdator/KalmanParameterUpdator/KalmanParameterUpdator.h b/Tracking/TrkTools/KalmanParameterUpdator/KalmanParameterUpdator/KalmanParameterUpdator.h
new file mode 100644
index 0000000000000000000000000000000000000000..a14a944039aec3048b347138ff8f254c4b674ed9
--- /dev/null
+++ b/Tracking/TrkTools/KalmanParameterUpdator/KalmanParameterUpdator/KalmanParameterUpdator.h
@@ -0,0 +1,253 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file KalmanParameterUpdator.h
+ * @date 31/07/2020
+ * @author Anthony Morley, Christos Anastopoulos
+ *
+ * Implementation of the gain formalist for Kalman filters
+ * allowing updating of parameters.
+ *
+ * Started from /based on KalmanUpdatorAmg
+ */
+
+#ifndef TRK_KALMANPARAMETERUPDATOR_H
+#define TRK_KALMANPARAMETERUPDATOR_H
+
+#include "EventPrimitives/EventPrimitives.h"
+#include "TrkEventPrimitives/FitQualityOnSurface.h"
+#include "TrkEventPrimitives/ParamDefs.h"
+#include "TrkEventPrimitives/ProjectionMatricesSet.h"
+#include "TrkParameters/TrackParameters.h"
+
+namespace Trk {
+
+class KalmanParameterUpdator
+{
+public:
+ enum RangeCheckDef
+ {
+ absoluteCheck = 0,
+ differentialCheck = 1
+ };
+
+ KalmanParameterUpdator();
+
+ /// calling the appropriate implementation for this rank of the measurement
+ /// perform a filter step.
+ /// Updates (in place) the current TrackParameters and FitQualityOnSurface
+ /// to represent the predicted state containing
+ /// the measurement LocalParameters and covariance.
+ /// For prediction sign should be 1 for smoothing -1.
+ bool filterStep(TrackParameters& trackParameters,
+ FitQualityOnSurface& fitQos,
+ const LocalParameters& measurement,
+ const Amg::MatrixX& measCovariance,
+ const int sign) const;
+
+ bool stateFitQuality(FitQualityOnSurface& updatedFitQoS,
+ const TrackParameters& trkPar,
+ const LocalParameters& position,
+ const Amg::MatrixX& covariance,
+ int predFull) const;
+
+private:
+ /// 1D version
+ bool calculateFilterStep_1D(TrackParameters& TP,
+ const AmgSymMatrix(5) & trkCov,
+ double measPar,
+ double measCov,
+ int paramKey,
+ int updateDirection,
+ FitQualityOnSurface& fQ) const;
+
+ /// Templated version
+ template<int DIM>
+ bool calculateFilterStep_T(TrackParameters& TP,
+ const AmgSymMatrix(5) & trkCov,
+ const AmgVector(DIM) & measPar,
+ const AmgSymMatrix(DIM) & measCov,
+ int paramKey,
+ int updateDirection,
+ FitQualityOnSurface& fQ) const;
+
+ /// 5D version
+ bool calculateFilterStep_5D(TrackParameters& TP,
+ const AmgSymMatrix(5) & trkCov,
+ const AmgVector(5) & measPar,
+ const AmgSymMatrix(5) & measCov,
+ int updateDirection,
+ FitQualityOnSurface& fQ) const;
+ /// Chi2 1D version
+ bool makeChi2_1D(FitQualityOnSurface& updatedFitQoS,
+ const AmgVector(5) & trkPar,
+ const AmgSymMatrix(5) & trkCov,
+ double valRio,
+ double rioCov,
+ int paramKey,
+ int sign) const;
+
+ /// Chi2 templated version
+ template<int DIM>
+ bool makeChi2_T(FitQualityOnSurface& updatedFitQoS,
+ const AmgVector(5) & trkPar,
+ const AmgSymMatrix(5) & trkCov,
+ const AmgVector(DIM) & measPar,
+ const AmgSymMatrix(DIM) & covPar,
+ int paramKey,
+ int sign) const;
+
+ /// Avoid multiplications with sparse H matrices by cutting 2D rows&columns
+ /// out of the full cov matrix.
+ template<int DIM>
+ AmgSymMatrix(DIM) projection_T(const AmgSymMatrix(5) &, int key) const;
+
+ bool consistentParamDimensions(const LocalParameters&,
+ const int nLocCoord) const;
+
+ /** Absolute phi values should be in [-pi, pi]
+ absolute theta values should be in [0, +pi]
+ phi differences should also be in [-pi, pi] - else go other way round,
+ theta differences should be smaller than pi but can be negative
+ => other constraint than absolute theta.
+ */
+ bool thetaPhiWithinRange_5D(
+ const AmgVector(5) & V,
+ const KalmanParameterUpdator::RangeCheckDef rcd) const;
+
+ //!< Test if theta angle is inside boundaries. No differential-check option.
+ bool thetaWithinRange_5D(const AmgVector(5) & V) const;
+
+ /// method correcting the calculated angles back to their defined ranges phi
+ /// (-pi, pi) and theta (0, pi).
+ bool correctThetaPhiRange_5D(
+ AmgVector(5) &,
+ AmgSymMatrix(5) &,
+ const KalmanParameterUpdator::RangeCheckDef) const;
+
+private:
+ AmgVector(5) m_cov0Vec;
+ AmgSymMatrix(5) m_unitMatrix;
+ ProjectionMatricesSet m_reMatrices;
+};
+
+template<int DIM>
+bool
+KalmanParameterUpdator::calculateFilterStep_T(TrackParameters& TP,
+ const AmgSymMatrix(5) & trkCov,
+ const AmgVector(DIM) & measPar,
+ const AmgSymMatrix(DIM) & measCov,
+ int paramKey,
+ int sign,
+ FitQualityOnSurface& fQ) const
+{
+ // get the parameter vector
+ const AmgVector(5)& trkPar = TP.parameters();
+ // reduction matrix
+ AmgMatrix(DIM, 5) H =
+ m_reMatrices.expansionMatrix(paramKey).block<DIM, 5>(0, 0);
+ // the projected parameters from the TrackParameters
+ AmgVector(DIM) projTrkPar;
+ if (paramKey == 3 || paramKey == 7 || paramKey == 15) {
+ projTrkPar = trkPar.block<DIM, 1>(0, 0);
+ } else {
+ projTrkPar = H * trkPar;
+ }
+
+ // reduction matrix H, Kalman gain K, residual r, combined covariance R
+ // residual after reduction
+ const AmgVector(DIM) r = measPar - projTrkPar;
+ // combined covariance after reduction
+ const AmgSymMatrix(DIM) R =
+ (sign * measCov + projection_T<DIM>(trkCov, paramKey)).inverse();
+ // Kalman gain matrix
+ const AmgMatrix(5, DIM) K = trkCov * H.transpose() * R;
+ const AmgMatrix(5, 5) M = m_unitMatrix - K * H;
+ // --- compute local filtered state
+ const AmgVector(5) newPar = trkPar + K * r;
+ // --- compute filtered covariance matrix
+ // C = M * trkCov * M.T() +/- K * covRio * K.T()
+ const AmgSymMatrix(5) newCov =
+ M * trkCov * M.transpose() + sign * K * measCov * K.transpose();
+ const double chiSquared =
+ (sign > 0) ? r.transpose() * R * r : r.transpose() * (-R) * r;
+ // create the FQSonSurface
+ fQ = FitQualityOnSurface(chiSquared, DIM);
+ // In place update of parameters
+ TP.updateParameters(newPar, newCov);
+ return true;
+}
+
+template<int DIM>
+bool
+Trk::KalmanParameterUpdator::makeChi2_T(FitQualityOnSurface& updatedFitQoS,
+ const AmgVector(5) & trkPar,
+ const AmgSymMatrix(5) & trkCov,
+ const AmgVector(DIM) & measPar,
+ const AmgSymMatrix(DIM) & covPar,
+ int paramKey,
+ int sign) const
+{ // sign: -1 = updated, +1 = predicted parameters.
+
+ const AmgMatrix(DIM, 5) H =
+ m_reMatrices.expansionMatrix(paramKey).block<DIM, 5>(0, 0);
+ const AmgVector(DIM) r = measPar - H * trkPar;
+ // get the projected matrix
+ AmgSymMatrix(DIM) R = sign * projection_T<DIM>(trkCov, paramKey);
+ R += covPar;
+ // calcualte the chi2 value
+ double chiSquared = 0.0;
+ if (R.determinant() != 0.0) {
+ chiSquared = r.transpose() * R.inverse() * r;
+ }
+ updatedFitQoS = FitQualityOnSurface(chiSquared, DIM);
+ return true;
+}
+
+template<int DIM>
+AmgSymMatrix(DIM) Trk::KalmanParameterUpdator::projection_T(
+ const AmgSymMatrix(5) & M,
+ int key) const
+{
+ if (key == 3 || key == 7 ||
+ key == 15) { // shortcuts for the most common use cases
+ return M.block<DIM, DIM>(0, 0);
+ } else {
+ Eigen::Matrix<int, DIM, 1, 0, DIM, 1> iv;
+ iv.setZero();
+ for (int i = 0, k = 0; i < 5; ++i) {
+ if (key & (1 << i))
+ iv[k++] = i;
+ }
+ AmgSymMatrix(DIM) covSubMatrix;
+ covSubMatrix.setZero();
+ for (int i = 0; i < DIM; ++i) {
+ for (int j = 0; j < DIM; ++j) {
+ covSubMatrix(i, j) = M(iv(i), iv(j));
+ }
+ }
+ return covSubMatrix;
+ }
+}
+
+inline bool
+KalmanParameterUpdator::thetaPhiWithinRange_5D(
+ const AmgVector(5) & V,
+ const KalmanParameterUpdator::RangeCheckDef rcd) const
+{
+ static const AmgVector(2) thetaMin(0.0, -M_PI);
+ return ((std::abs(V(Trk::phi)) <= M_PI) && (V(Trk::theta) >= thetaMin(rcd)) &&
+ (V(Trk::theta) <= M_PI));
+}
+
+inline bool
+KalmanParameterUpdator::thetaWithinRange_5D(const AmgVector(5) & V) const
+{
+ return (V(Trk::theta) >= 0.0 && (V(Trk::theta) <= M_PI));
+}
+
+} // end of namespace Trk
+
+#endif // TRK_KALMANPARAMETERUPDATOR_H
diff --git a/Tracking/TrkTools/KalmanParameterUpdator/src/KalmanParameterUpdator.cxx b/Tracking/TrkTools/KalmanParameterUpdator/src/KalmanParameterUpdator.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..8f917b76e939dada2f73f7fb4003ceb931b969ce
--- /dev/null
+++ b/Tracking/TrkTools/KalmanParameterUpdator/src/KalmanParameterUpdator.cxx
@@ -0,0 +1,322 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "KalmanParameterUpdator/KalmanParameterUpdator.h"
+#include "TrkEventPrimitives/FitQualityOnSurface.h"
+#include "TrkEventPrimitives/LocalParameters.h"
+#include "TrkEventPrimitives/ParamDefs.h"
+
+#include <cmath>
+
+namespace {
+constexpr double s_thetaGainDampingValue = 0.1;
+}
+
+Trk::KalmanParameterUpdator::KalmanParameterUpdator()
+ : m_unitMatrix(AmgMatrix(5, 5)::Identity())
+ , m_reMatrices(5)
+{
+
+ m_cov0Vec << 250., 250., 0.25, 0.25, 0.000001;
+}
+bool
+Trk::KalmanParameterUpdator::filterStep(TrackParameters& trackParameters,
+ FitQualityOnSurface& fitQos,
+ const LocalParameters& measurement,
+ const Amg::MatrixX& measCovariance,
+ const int sign) const
+{
+
+ const AmgSymMatrix(5)* trkCov = trackParameters.covariance();
+ if (!trkCov) {
+ return false;
+ }
+
+ int nLocCoord = measCovariance.cols();
+ if (!consistentParamDimensions(measurement, nLocCoord)) {
+ return false;
+ }
+
+ switch (nLocCoord) {
+ case 1: {
+ return calculateFilterStep_1D(trackParameters,
+ *trkCov,
+ measurement(0),
+ measCovariance(0, 0),
+ measurement.parameterKey(),
+ sign,
+ fitQos);
+ }
+ case 2: {
+ return calculateFilterStep_T<2>(trackParameters,
+ *trkCov,
+ measurement.block<2, 1>(0, 0),
+ measCovariance.block<2, 2>(0, 0),
+ measurement.parameterKey(),
+ sign,
+ fitQos);
+ }
+ case 3: {
+ return calculateFilterStep_T<3>(trackParameters,
+ *trkCov,
+ measurement.block<3, 1>(0, 0),
+ measCovariance.block<3, 3>(0, 0),
+ measurement.parameterKey(),
+ sign,
+ fitQos);
+ }
+ case 4: {
+ return calculateFilterStep_T<4>(trackParameters,
+ *trkCov,
+ measurement.block<4, 1>(0, 0),
+ measCovariance.block<4, 4>(0, 0),
+ measurement.parameterKey(),
+ sign,
+ fitQos);
+ }
+ case 5: {
+ return calculateFilterStep_5D(trackParameters,
+ *trkCov,
+ measurement.block<5, 1>(0, 0),
+ measCovariance.block<5, 5>(0, 0),
+ sign,
+ fitQos);
+ }
+ default: {
+ return false;
+ }
+ }
+}
+bool
+Trk::KalmanParameterUpdator::stateFitQuality(FitQualityOnSurface& updatedFitQoS,
+ const TrackParameters& trkPar,
+ const LocalParameters& position,
+ const Amg::MatrixX& covariance,
+ int predFull) const
+{
+ if (!trkPar.covariance()) {
+ return false;
+ }
+ // For the LocalPos. version, need to get # meas. coord. from covariance
+ // matrix.
+ int nLocCoord = covariance.cols();
+ switch (nLocCoord) {
+ case 1: {
+ return makeChi2_1D(updatedFitQoS,
+ trkPar.parameters(),
+ (*trkPar.covariance()),
+ position[Trk::locX],
+ covariance(0, 0),
+ 1,
+ predFull);
+ }
+ case 2: {
+ return makeChi2_T<2>(updatedFitQoS,
+ trkPar.parameters(),
+ (*trkPar.covariance()),
+ position,
+ covariance.block<2, 2>(0, 0),
+ 3,
+ predFull);
+ }
+ default: {
+ return false;
+ }
+ }
+}
+
+// calculations for Kalman updator and inverse Kalman filter
+bool
+Trk::KalmanParameterUpdator::calculateFilterStep_1D(
+ TrackParameters& TP,
+ const AmgSymMatrix(5) & trkCov,
+ double measPar,
+ double measCov,
+ int paramKey,
+ int sign,
+ Trk::FitQualityOnSurface& fitQoS) const
+{
+
+ int mk = 0;
+ if (paramKey != 1) {
+ for (int i = 0; i < 5; ++i) {
+ if (paramKey & (1 << i)) {
+ mk = i;
+ break;
+ }
+ }
+ }
+ // get the parameters from the
+ const AmgVector(5)& trkPar = TP.parameters();
+ // use measuring coordinate (variable "mk") instead of reduction matrix
+ double r = measPar - trkPar(mk);
+ double R = (sign * measCov) + trkCov(mk, mk);
+ if (R == 0.0) {
+ return false;
+ }
+ R = 1. / R;
+ // --- compute Kalman gain matrix
+ AmgMatrix(5, 1) K = trkCov.block<5, 1>(0, mk) * R;
+ // --- compute local filtered state, here = TP+K*r = TP + TCov * H.T * R * r
+ AmgVector(5) newPar = trkPar + trkCov.col(mk) * R * r;
+
+ if (!thetaWithinRange_5D(newPar)) {
+
+ if (mk != Trk::theta &&
+ (std::abs(R * r) > 1.0 ||
+ trkCov(Trk::theta, Trk::theta) > 0.1 * m_cov0Vec(Trk::theta))) {
+
+ AmgVector(5) dampedCov = trkCov.col(mk);
+
+ dampedCov(Trk::theta) = dampedCov(Trk::theta) * s_thetaGainDampingValue;
+
+ newPar = trkPar + dampedCov * R * r;
+
+ K(Trk::theta, 0) = K(Trk::theta, 0) * s_thetaGainDampingValue;
+ }
+ }
+ // --- compute covariance matrix of local filteres state
+ AmgMatrix(5, 5) KtimesH;
+ KtimesH.setZero();
+ KtimesH.col(mk) = K;
+ AmgMatrix(5, 5) M = m_unitMatrix - KtimesH;
+ AmgSymMatrix(5) newCov =
+ M * trkCov * M.transpose() + sign * K * measCov * K.transpose();
+
+ if ((!thetaPhiWithinRange_5D(newPar,
+ Trk::KalmanParameterUpdator::absoluteCheck))
+ ? !correctThetaPhiRange_5D(
+ newPar, newCov, Trk::KalmanParameterUpdator::absoluteCheck)
+ : false) {
+ return false;
+ }
+
+ double predictedResidual = (sign < 0) ? r : (measPar - newPar(mk));
+ const AmgSymMatrix(5)& updatedCov =
+ (sign < 0) ? trkCov : // when removing, the input are updated par
+ newCov; // when adding, chi2 is made from upd. par
+
+ // for both signs (add/remove) the chi2 is now calculated like for updated
+ // states
+ double chiSquared = measCov - updatedCov(mk, mk);
+ if (chiSquared != 0.0) {
+ // get chi2 = r.T() * R^-1 * r
+ chiSquared = predictedResidual * predictedResidual / chiSquared;
+ }
+ fitQoS = FitQualityOnSurface(chiSquared, 1);
+ // In place update of parameters
+ TP.updateParameters(newPar, newCov);
+ return true;
+}
+
+bool
+Trk::KalmanParameterUpdator::calculateFilterStep_5D(
+ TrackParameters& TP,
+ const AmgSymMatrix(5) & trkCov,
+ const AmgVector(5) & measPar,
+ const AmgSymMatrix(5) & measCov,
+ int sign,
+ FitQualityOnSurface& fQ) const
+{
+ // get the parameter vector
+ const AmgVector(5)& trkPar = TP.parameters();
+ // Kalman gain K, residual r, combined covariance R
+ const AmgVector(5) r = measPar - trkPar;
+ // for full safety in Eigen see
+ // http://eigen.tuxfamily.org/dox/classEigen_1_1FullPivLU.html
+ const AmgSymMatrix(5) R = (sign * measCov + trkCov).inverse();
+ const AmgMatrix(5, 5) K = trkCov * R;
+ const AmgMatrix(5, 5) M = m_unitMatrix - K;
+ // --- compute local filtered state
+ AmgVector(5) newPar = trkPar + K * r;
+ // --- compute filtered covariance matrix
+ const AmgSymMatrix(5) newCov =
+ trkCov.similarity(M) + sign * measCov.similarity(K);
+ double chiSquared =
+ (sign > 0) ? r.transpose() * R * r : r.transpose() * (-R) * r;
+ // create the FQSonSurface
+ fQ = FitQualityOnSurface(chiSquared, 5);
+ TP.updateParameters(newPar, newCov);
+ return true;
+}
+
+bool
+Trk::KalmanParameterUpdator::makeChi2_1D(FitQualityOnSurface& updatedFitQoS,
+ const AmgVector(5) & trkPar,
+ const AmgSymMatrix(5) & trkCov,
+ double valRio,
+ double rioCov,
+ int paramKey,
+ int sign) const
+{
+ int mk = 0;
+ if (paramKey != 1) {
+ for (int i = 0; i < 5; ++i) {
+ if (paramKey & (1 << i)) {
+ mk = i;
+ break;
+ }
+ }
+ }
+ // sign: -1 = updated, +1 = predicted parameters.
+ double r = valRio - trkPar(mk);
+ // if (mk==3) catchPiPi;
+ double chiSquared = rioCov + sign * trkCov(mk, mk);
+ if (chiSquared == 0.0) {
+ return false;
+ }
+ chiSquared = r * r / chiSquared;
+ updatedFitQoS = FitQualityOnSurface(chiSquared, 1);
+ return true;
+}
+
+bool
+Trk::KalmanParameterUpdator::consistentParamDimensions(
+ const Trk::LocalParameters& P,
+ const int dimCov) const
+{
+ return P.dimension() == dimCov;
+}
+
+bool
+Trk::KalmanParameterUpdator::correctThetaPhiRange_5D(
+ AmgVector(5) & V,
+ AmgSymMatrix(5) & M,
+ const KalmanParameterUpdator::RangeCheckDef rcd) const
+{
+ static const AmgVector(2) thetaMin(0.0, -M_PI);
+
+ // correct theta coordinate
+ if (V(Trk::theta) < thetaMin((int)rcd) || V(Trk::theta) > M_PI) {
+ // absolute theta: repair if between -pi and +2pi.
+ // differential theta: repair if between -pi and +pi
+ if ((V(Trk::theta) < -M_PI) ||
+ (V(Trk::theta) > (rcd == Trk::KalmanParameterUpdator::differentialCheck
+ ? M_PI
+ : 2 * M_PI))) {
+ return false;
+ }
+ if (V(Trk::theta) > M_PI) {
+ V(Trk::theta) = 2 * M_PI - V(Trk::theta);
+ V(Trk::phi) += (V(Trk::phi) > 0.0) ? -M_PI : M_PI;
+ } else if (V(Trk::theta) < 0.0) {
+ V(Trk::theta) = -V(Trk::theta);
+ V(Trk::phi) += (V(Trk::phi) > 0.0) ? -M_PI : M_PI;
+ }
+ // correct also cov matrix:
+ M.fillSymmetric(0, 3, -M(0, 3)); // cov(polar,locX)
+ M.fillSymmetric(1, 3, -M(1, 3)); // cov(polar,locY)
+ M.fillSymmetric(2, 3, -M(2, 3)); // cov(polar,azimuthal)
+ M.fillSymmetric(3, 4, -M(3, 4)); // cov(polar,qOverP)
+ }
+
+ // correct phi coordinate if necessary
+ if ((V(Trk::phi) > M_PI)) {
+ V(Trk::phi) = fmod(V(Trk::phi) + M_PI, 2 * M_PI) - M_PI;
+ } else if ((V(Trk::phi) < -M_PI)) {
+ V(Trk::phi) = fmod(V(Trk::phi) - M_PI, 2 * M_PI) + M_PI;
+ }
+
+ return true;
+}
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingCondAlg.h b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingCondAlg.h
index 3900549600efe18e0ed4e77eb5c7a048882f242e..fd4c86c764d3a105a8421d79709cc3d9f67fbacc 100644
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingCondAlg.h
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingCondAlg.h
@@ -13,7 +13,7 @@
#include "StoreGate/CondHandleKeyArray.h"
#include "TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <iostream>
class RIO_OnTrackErrorScalingKit;
diff --git a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingDbOverrideCondAlg.h b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingDbOverrideCondAlg.h
index 1bf64c0d7fffa3c695fc3d18bf93d2cfc6bf3bd2..f2d21b137ba634d2b714309c3aa003da527171d9 100644
--- a/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingDbOverrideCondAlg.h
+++ b/Tracking/TrkTools/TrkRIO_OnTrackCreator/src/RIO_OnTrackErrorScalingDbOverrideCondAlg.h
@@ -12,7 +12,7 @@
#include "StoreGate/WriteCondHandleKey.h"
#include "TrkRIO_OnTrack/RIO_OnTrackErrorScaling.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <iostream>
class RIO_OnTrackErrorScalingKit;
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/python/AtlasTrackSummaryTool.py b/Tracking/TrkTools/TrkTrackSummaryTool/python/AtlasTrackSummaryTool.py
index 2c8f21f1f8c384917002ef27346854810f51d291..a85426e275d7964016d1be2101d83d47d14f0362 100755
--- a/Tracking/TrkTools/TrkTrackSummaryTool/python/AtlasTrackSummaryTool.py
+++ b/Tracking/TrkTools/TrkTrackSummaryTool/python/AtlasTrackSummaryTool.py
@@ -43,14 +43,24 @@ class AtlasTrackSummaryTool( Trk__TrackSummaryTool ):
ToolSvc += AtlasPrdAssociationTool
#print AtlasPrdAssociationTool
+ #
+ # Setup Boundary Check Tool
+ #
+ from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+ AtlasBoundaryCheckTool = InDet__InDetBoundaryCheckTool(
+ name="AtlasBoundaryCheckTool",
+ UsePixel = DetFlags.haveRIO.pixel_on(),
+ UseSCT = DetFlags.haveRIO.SCT_on()
+ )
+ ToolSvc += AtlasBoundaryCheckTool
+
#
# Loading Configurable HoleSearchTool
#
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
AtlasHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "AtlasHoleSearchTool",
Extrapolator = AtlasExtrapolator,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on()
+ BoundaryCheckTool=AtlasBoundaryCheckTool
)
ToolSvc += AtlasHoleSearchTool
#print AtlasHoleSearchTool
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrkTrack.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrkTrack.cxx
index 4a25f6b0b2987ca65b995e125fcfca11bb21fd16..18b5a577a2cad637ee7134dad9ea90435a1a539e 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrkTrack.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrkTrack.cxx
@@ -141,7 +141,8 @@ namespace Trk{
const std::vector<double>& VKCov,
const IVKalState& istate) const
{
- const State& state = dynamic_cast<const State&> (istate);
+ assert(dynamic_cast<const State*> (&istate)!=nullptr);
+ const State& state = static_cast<const State&> (istate);
const Trk::Perigee* perigee = CreatePerigee(0., 0., 0., VKPerigee, VKCov, state);
const Trk::FitQuality* fitQuality = new Trk::FitQuality(10.,1);
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/SetFitOptions.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/SetFitOptions.cxx
index b580730d76e3af66c1fbd7f15eebebeaf4260741..35a4dbd4a50904918da472d8aa0251b4346fc3f3 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/SetFitOptions.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/SetFitOptions.cxx
@@ -79,7 +79,8 @@ namespace Trk{
//
void TrkVKalVrtFitter::setCnstType(int TYPE, IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
if(TYPE>0)msg(MSG::DEBUG)<< "ConstraintType is changed at execution stage. New type="<<TYPE<< endmsg;
if(TYPE<0)TYPE=0;
if(TYPE>14)TYPE=0;
@@ -105,13 +106,15 @@ namespace Trk{
void TrkVKalVrtFitter::setApproximateVertex(double X,double Y,double Z,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_ApproximateVertex.assign ({X, Y, Z});
}
void TrkVKalVrtFitter::setRobustness(int IROB, IVKalState& istate) const
{ if(IROB>0)msg(MSG::DEBUG)<< "Robustness is changed at execution stage "<<m_Robustness<<"=>"<<IROB<< endmsg;
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_Robustness = IROB;
if(state.m_Robustness<0)state.m_Robustness=0;
if(state.m_Robustness>7)state.m_Robustness=0;
@@ -119,7 +122,8 @@ namespace Trk{
void TrkVKalVrtFitter::setRobustScale(double Scale, IVKalState& istate) const
{ if(Scale!=m_RobustScale)msg(MSG::DEBUG)<< "Robust Scale is changed at execution stage "<<m_RobustScale<<"=>"<<Scale<< endmsg;
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_RobustScale = Scale;
if(state.m_RobustScale<0.01) state.m_RobustScale=1.;
if(state.m_RobustScale>100.) state.m_RobustScale=1.;
@@ -128,7 +132,8 @@ namespace Trk{
void TrkVKalVrtFitter::setMassForConstraint(double MASS,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_massForConstraint = MASS;
}
@@ -136,7 +141,8 @@ namespace Trk{
const std::vector<int>& TrkIndex,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_partMassCnst.push_back(MASS);
state.m_partMassCnstTrk.push_back(TrkIndex);
}
@@ -144,7 +150,8 @@ namespace Trk{
void TrkVKalVrtFitter::setVertexForConstraint(const xAOD::Vertex & Vrt,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_VertexForConstraint.assign ({Vrt.position().x(),
Vrt.position().y(),
Vrt.position().z()});
@@ -161,7 +168,8 @@ namespace Trk{
void TrkVKalVrtFitter::setVertexForConstraint(double X,double Y,double Z,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_VertexForConstraint.assign ({X, Y, Z});
}
@@ -169,14 +177,16 @@ namespace Trk{
double XZ,double YZ,double ZZ,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_CovVrtForConstraint.assign ({XX, XY, YY, XZ, YZ, ZZ});
}
void TrkVKalVrtFitter::setMassInputParticles( const std::vector<double>& mass,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_MassInputParticles = mass;
for (double& m : state.m_MassInputParticles) {
m = std::abs(m);
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkCascadeFitter.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkCascadeFitter.cxx
index cb96513d1f270c7031aeb9bb8dd132759c71969c..b5b15efa4487ae9dee438df09133242d6699025a 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkCascadeFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkCascadeFitter.cxx
@@ -77,7 +77,8 @@ VertexID TrkVKalVrtFitter::startVertex(const std::vector<const xAOD::TrackParti
IVKalState& istate,
const double massConstraint) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
state.m_cascadeState = std::make_unique<CascadeState>();
state.m_vkalFitControl.renewCascadeEvent(new CascadeEvent());
@@ -111,7 +112,8 @@ VertexID TrkVKalVrtFitter::nextVertex(const std::vector<const xAOD::TrackPartic
IVKalState& istate,
const double massConstraint) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
CascadeState& cstate = *state.m_cascadeState;
//----
@@ -158,7 +160,8 @@ VertexID TrkVKalVrtFitter::nextVertex(const std::vector<const xAOD::TrackPartic
IVKalState& istate,
const double massConstraint) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
CascadeState& cstate = *state.m_cascadeState;
VertexID vID=nextVertex( list, particleMass, istate, massConstraint);
@@ -284,7 +287,8 @@ inline int SymIndex(int it, int i, int j) { return (3*it+3+i)*(3*it+3+i+1)/2 +
VxCascadeInfo * TrkVKalVrtFitter::fitCascade(IVKalState& istate,
const Vertex* primVrt, bool FirstDecayAtPV ) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
CascadeState& cstate = *state.m_cascadeState;
int iv,it,jt;
@@ -743,7 +747,8 @@ StatusCode TrkVKalVrtFitter::addMassConstraint(VertexID Vertex,
IVKalState& istate,
double massConstraint ) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
CascadeState& cstate = *state.m_cascadeState;
int ivc, it, itc;
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkVKalVrtFitter.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkVKalVrtFitter.cxx
index 1790138ca57c85d5974182edd4c7354453956595..b4fde73eb743cf95bdc5a52fbf776c83569811e0 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkVKalVrtFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/TrkVKalVrtFitter.cxx
@@ -421,7 +421,8 @@ xAOD::Vertex * TrkVKalVrtFitter::fit(const std::vector<const xAOD::TrackParticle
const Amg::Vector3D & startingPoint,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
xAOD::Vertex * tmpVertex = nullptr;
setApproximateVertex(startingPoint.x(),
@@ -505,7 +506,8 @@ xAOD::Vertex * TrkVKalVrtFitter::fit(const std::vector<const xAOD::TrackParticle
const xAOD::Vertex & constraint,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<< "A priori vertex constraint is activated in VKalVrt fitter!" << endmsg;
xAOD::Vertex * tmpVertex = nullptr;
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalGetImpact.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalGetImpact.cxx
index 5ed75ce70926ecd7d4ec2a6bf26a327aad98587d..2884736cae5464390a2c385e8341f0b70eec5623 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalGetImpact.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalGetImpact.cxx
@@ -36,7 +36,8 @@ namespace Trk{
std::vector<double>& Impact, std::vector<double>& ImpactError,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
//
//------ Variables and arrays needed for fitting kernel
//
@@ -82,7 +83,8 @@ namespace Trk{
std::vector<double>& Impact, std::vector<double>& ImpactError,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
//
//------ Variables and arrays needed for fitting kernel
//
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitFastSvc.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitFastSvc.cxx
index 3388279b89cfe73532a9877c207fe35f64a669ca..882cec09722935801f43dac4e3d4e0f191b49adc 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitFastSvc.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitFastSvc.cxx
@@ -33,7 +33,8 @@ namespace Trk{
Amg::Vector3D& Vertex,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
//
// Convert particles and setup reference frame
//
@@ -98,7 +99,8 @@ namespace Trk{
Amg::Vector3D& Vertex,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
//
// Convert particles and setup reference frame
//
@@ -164,7 +166,8 @@ namespace Trk{
Amg::Vector3D& Vertex,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
//
// Convert particles and setup reference frame
//
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitSvc.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitSvc.cxx
index 9da932d296715b16e238d2498540c2adcff747d3..c29f012bdcfa4ea3c6f8659415473d29b3c7f84e 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitSvc.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitSvc.cxx
@@ -16,7 +16,7 @@
namespace Trk {
- extern void cfpest( int ntrk, double *vrt, long int *Charge, double (*part)[5], double (*par0)[3]);
+ extern void cfpest( int ntrk, double *vrt, long int *Charge, double (*part)[5], double (*par0)[3]);
extern void xyztrp( long int* Charge, double* vrt, double* Mom, double* CovVrtMom, double BMAG, double* Perig, double* CovPerig );
extern int CFit(VKalVrtControl *FitCONTROL, int ifCovV0, int NTRK,
@@ -42,7 +42,8 @@ StatusCode TrkVKalVrtFitter::VKalVrtFit(const std::vector<const Track*>& InpTrk,
IVKalState& istate,
bool ifCovV0 /*= false*/) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
//
//------ extract information about selected tracks
//
@@ -71,7 +72,8 @@ StatusCode TrkVKalVrtFitter::VKalVrtFit(const std::vector<const xAOD::TrackParti
IVKalState& istate,
bool ifCovV0 /*= false*/) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
//
//------ extract information about selected tracks
@@ -174,7 +176,8 @@ StatusCode TrkVKalVrtFitter::VKalVrtFit(const std::vector<const TrackParameters*
IVKalState& istate,
bool ifCovV0 /*= false*/) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
//
//------ extract information about selected tracks
@@ -371,7 +374,8 @@ int TrkVKalVrtFitter::VKalVrtFit3( int ntrk,
dvect& CovPerigee,
IVKalState& istate) const
{
- State& state = dynamic_cast<State&> (istate);
+ assert(dynamic_cast<State*> (&istate)!=nullptr);
+ State& state = static_cast<State&> (istate);
int i,j,ij;
double Vrt[3],PMom[4],Cov0[21],Per[5],CovPer[15];
@@ -438,7 +442,8 @@ int TrkVKalVrtFitter::VKalVrtFit3( int ntrk,
const IVKalState& istate,
bool useMom) const
{
- const State& state = dynamic_cast<const State&> (istate);
+ assert(dynamic_cast<const State*> (&istate)!=nullptr);
+ const State& state = static_cast<const State&> (istate);
if(!state.m_FitStatus) return StatusCode::FAILURE;
if(NTrk<1) return StatusCode::FAILURE;
if(NTrk>NTrMaxVFit) return StatusCode::FAILURE;
@@ -558,7 +563,8 @@ int TrkVKalVrtFitter::VKalVrtFit3( int ntrk,
StatusCode TrkVKalVrtFitter::VKalGetMassError( double& dM, double& MassError,
const IVKalState& istate) const
{
- const State& state = dynamic_cast<const State&> (istate);
+ assert(dynamic_cast<const State*> (&istate)!=nullptr);
+ const State& state = static_cast<const State&> (istate);
if(!state.m_FitStatus) return StatusCode::FAILURE;
dM = state.m_vkalFitControl.getVertexMass();
MassError = state.m_vkalFitControl.getVrtMassError();
@@ -569,7 +575,8 @@ int TrkVKalVrtFitter::VKalVrtFit3( int ntrk,
StatusCode TrkVKalVrtFitter::VKalGetTrkWeights(dvect& trkWeights,
const IVKalState& istate) const
{
- const State& state = dynamic_cast<const State&> (istate);
+ assert(dynamic_cast<const State*> (&istate)!=nullptr);
+ const State& state = static_cast<const State&> (istate);
if(!state.m_FitStatus) return StatusCode::FAILURE; // no fit made
trkWeights.clear();
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx
index a6e6ce66e65e1018c7c59d330162ed8132b1b573..f86e5097d406ad6b0b680e4baa84b04ca55b2e98 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/Chi2TrackCompatibilityEstimator.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*********************************************************************
@@ -112,16 +112,18 @@ namespace Trk
float Chi2TrackCompatibilityEstimator::compatibility(VxTrackAtVertex & vtxTrack,const Amg::Vector3D & vertex) const
{
+ //Looking for a AtaPlane object (track)
const Trk::AtaPlane * myAtaPlane=vtxTrack.ImpactPoint3dAtaPlane();
-
- if (myAtaPlane!=nullptr && myAtaPlane->covariance()!=nullptr) //Looking for a AtaPlane object (track)
+ if (myAtaPlane!=nullptr && myAtaPlane->covariance()!=nullptr) {
return _compatibility(myAtaPlane, vertex);
+ }
+
//looking for a NeutralAtaPlane object (neutral)
- const Trk::NeutralAtaPlane * myNeutralAtaPlane=vtxTrack.ImpactPoint3dNeutralAtaPlane();
- if (myNeutralAtaPlane!=nullptr && myNeutralAtaPlane->covariance()!=nullptr)
- return _compatibility(myNeutralAtaPlane, vertex);
+ const Trk::NeutralAtaPlane * myNeutralAtaPlane=vtxTrack.ImpactPoint3dNeutralAtaPlane();
+ if (myNeutralAtaPlane!=nullptr && myNeutralAtaPlane->covariance()!=nullptr){
+ return _compatibility(myNeutralAtaPlane, vertex);
+ }
-
ATH_MSG_WARNING( " No compatibility plane attached to the VxTrackAtVertex. Compatibility couldn't be found... 0 compatibility returned." );
return 100;
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/test/ImpactPoint3dEstimator_test.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/test/ImpactPoint3dEstimator_test.cxx
index a840d7c9b9912b44375489f631b979bbbb82c561..78ae4f18635fa47787c04f1879adf10fe0075ef5 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/test/ImpactPoint3dEstimator_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/test/ImpactPoint3dEstimator_test.cxx
@@ -157,7 +157,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
- assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
index e20760d1ce3da2b2fe8f93903f68f09416626f75..acde5ef4f23b4213b60fc5346405849f8af563d1 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/GaussianDensityTestAlg.cxx
@@ -13,7 +13,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTracking/Vertex.h"
#include "TrkLinks/LinkToXAODTrackParticle.h"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/ImagingSeedTuningAlg.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/ImagingSeedTuningAlg.cxx
index 475120b0317f657c6375dd5cb5af5fc0a03ae43a..c5582c8d102010cba204ecfc005227724e609671 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/ImagingSeedTuningAlg.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/ImagingSeedTuningAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "InDetTrackSelectionTool/IInDetTrackSelectionTool.h"
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/NewtonTrkDistanceFinder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/NewtonTrkDistanceFinder_test.cxx
index 26e529b58fa8dc04e1c341b278d5642bde034066..be7fb26d3caf07f678c6b387d01d086fa3a7bca9 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/NewtonTrkDistanceFinder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/NewtonTrkDistanceFinder_test.cxx
@@ -133,7 +133,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
- assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SeedNewtonTrkDistanceFinder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SeedNewtonTrkDistanceFinder_test.cxx
index 22ff9744f713391cb33b51c573b79d79637c30fe..ad910f01235d38ca3006623af0cccdff7fb8467e 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SeedNewtonTrkDistanceFinder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SeedNewtonTrkDistanceFinder_test.cxx
@@ -140,7 +140,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
- assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2DDistanceFinder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2DDistanceFinder_test.cxx
index 062e116d362fab8a3dfa432eb02103ce454e6eac..8b63ea0e03bc7f5f43ab39aaf7700e171004e894 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2DDistanceFinder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2DDistanceFinder_test.cxx
@@ -146,7 +146,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
- assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2dDistanceSeeder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2dDistanceSeeder_test.cxx
index 092b263580100a8314c78a28778f0e554cb32ebf..c44be7730464425084b14289083330a3d6146e4b 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2dDistanceSeeder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2dDistanceSeeder_test.cxx
@@ -165,7 +165,7 @@ void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
{
std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
- assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release());
assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
}
}
diff --git a/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/src/TrigInDetAccelerationSvc.h b/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/src/TrigInDetAccelerationSvc.h
index b778445330d2686743ccd4346210b611cbb17187..eb338cd99cc1cae689ad96c7bd8c1d3726517c96 100644
--- a/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/src/TrigInDetAccelerationSvc.h
+++ b/Trigger/TrigAccel/TrigInDetAccel/TrigInDetAccelerationService/src/TrigInDetAccelerationSvc.h
@@ -61,7 +61,6 @@ class TrigInDetAccelerationSvc : public extends<AthService, ITrigInDetAccelerati
public:
PhiEtaHash(short phi, short eta, int hash) : m_phiIndex(phi), m_etaIndex(eta), m_hash(hash) {};
- PhiEtaHash(const PhiEtaHash& p) : m_phiIndex(p.m_phiIndex), m_etaIndex(p.m_etaIndex), m_hash(p.m_hash) {};
short m_phiIndex, m_etaIndex;
int m_hash;
};
diff --git a/Trigger/TrigAccel/TrigInDetCUDA/src/SeedMakingWorkCuda.cu b/Trigger/TrigAccel/TrigInDetCUDA/src/SeedMakingWorkCuda.cu
index 4ade289028e32ee95869662977583e6ca257322b..1806e133b65e55196bd3bbb991e38305b82ddb98 100644
--- a/Trigger/TrigAccel/TrigInDetCUDA/src/SeedMakingWorkCuda.cu
+++ b/Trigger/TrigAccel/TrigInDetCUDA/src/SeedMakingWorkCuda.cu
@@ -18,21 +18,41 @@
#include "DoubletMakingKernelCuda.cuh"
#include "DoubletMatchingKernelCuda.cuh"
-SeedMakingWorkCuda::SeedMakingWorkCuda(unsigned int id, const SeedMakingWorkContextCuda& ctx, std::shared_ptr<TrigAccel::OffloadBuffer> data,
- tbb::concurrent_queue<SeedMakingDeviceContext*>& CQ, tbb::concurrent_vector<WorkTimeStamp>& TL) :
+SeedMakingWorkCuda::SeedMakingWorkCuda(unsigned int id, SeedMakingDeviceContext* ctx, std::shared_ptr<TrigAccel::OffloadBuffer> data,
+ tbb::concurrent_vector<WorkTimeStamp>* TL) :
m_workId(id),
- m_context(0),
+ m_context(ctx),
m_input(data),
- m_contextQueue(CQ),
m_timeLine(TL)
{
- m_context = new SeedMakingWorkContextCuda(ctx);//make a copy
m_output = std::make_shared<TrigAccel::OffloadBuffer>(sizeof(TrigAccel::OUTPUT_SEED_STORAGE));//output data
}
SeedMakingWorkCuda::~SeedMakingWorkCuda() {
- if(m_context) delete(m_context);//delete the copy
+
+ SeedMakingDeviceContext* p = m_context;
+
+ int id = p->m_deviceId;
+
+ cudaSetDevice(id);
+
+ cudaStreamDestroy(p->m_stream);
+
+ cudaFree(p->d_settings);
+ cudaFree(p->d_spacepoints);
+ cudaFree(p->d_detmodel);
+
+ cudaFree(p->d_outputseeds);
+ cudaFree(p->d_doubletstorage);
+ cudaFree(p->d_doubletinfo);
+
+ cudaFreeHost(p->h_settings);
+ cudaFreeHost(p->h_spacepoints);
+ cudaFreeHost(p->h_outputseeds);
+
+ delete p;
+ m_context = 0;
}
std::shared_ptr<TrigAccel::OffloadBuffer> SeedMakingWorkCuda::getOutput() {
@@ -41,9 +61,9 @@ std::shared_ptr<TrigAccel::OffloadBuffer> SeedMakingWorkCuda::getOutput() {
bool SeedMakingWorkCuda::run() {
- m_timeLine.push_back(WorkTimeStamp(m_workId, 0, tbb::tick_count::now()));
+ m_timeLine->push_back(WorkTimeStamp(m_workId, 0, tbb::tick_count::now()));
- const SeedMakingDeviceContext& p = *(m_context->m_pdc);
+ const SeedMakingDeviceContext& p = *m_context;
int id = p.m_deviceId;
@@ -104,7 +124,7 @@ bool SeedMakingWorkCuda::run() {
checkError();
doubletMakingKernel<<<gridDimensions, blockDimensions, 0, p.m_stream>>>(dSettings, dSpacepoints, dDetModel, dOutput,
- dInfo, dStorage, nLayers, nSlices);
+ dInfo, dStorage, nLayers, nSlices);
cudaStreamSynchronize(p.m_stream);
@@ -115,8 +135,8 @@ bool SeedMakingWorkCuda::run() {
cudaMemcpy(&nStats[0], p.d_doubletstorage, 3*sizeof(int), cudaMemcpyDeviceToHost);
- doubletMatchingKernel<<<p.m_gpuParams.m_nNUM_TRIPLET_BLOCKS, NUM_TRIPLET_THREADS, 0, p.m_stream>>>(dSettings, dSpacepoints, dDetModel, dInfo,
- dStorage, dOutput, nStats[0]);
+ doubletMatchingKernel<<<p.m_gpuParams.m_nNUM_TRIPLET_BLOCKS, NUM_TRIPLET_THREADS, 0, p.m_stream>>>(dSettings, dSpacepoints, dDetModel, dInfo,
+ dStorage, dOutput, nStats[0]);
cudaStreamSynchronize(p.m_stream);
@@ -141,10 +161,8 @@ bool SeedMakingWorkCuda::run() {
checkError();
memcpy(pOutput, ps, sizeof(TrigAccel::OUTPUT_SEED_STORAGE));
-
- m_contextQueue.push(m_context->m_pdc);
-
- m_timeLine.push_back(WorkTimeStamp(m_workId, 1, tbb::tick_count::now()));
+
+ m_timeLine->push_back(WorkTimeStamp(m_workId, 1, tbb::tick_count::now()));
return true;
}
diff --git a/Trigger/TrigAccel/TrigInDetCUDA/src/SeedMakingWorkCuda.h b/Trigger/TrigAccel/TrigInDetCUDA/src/SeedMakingWorkCuda.h
index cc8a5bb2f0d9774e2a7fed17e17858d6e232f4b8..30ad7e258f0f02fbaa77c93df04e17285c540f3a 100644
--- a/Trigger/TrigAccel/TrigInDetCUDA/src/SeedMakingWorkCuda.h
+++ b/Trigger/TrigAccel/TrigInDetCUDA/src/SeedMakingWorkCuda.h
@@ -7,7 +7,6 @@
#include <vector>
-#include "tbb/concurrent_queue.h"
#include "tbb/concurrent_vector.h"
#include "TrigInDetDataContexts.h"
#include "TrigAccelEvent/Work.h"
@@ -17,8 +16,8 @@
class SeedMakingWorkCuda : public TrigAccel::Work{
public:
- SeedMakingWorkCuda(unsigned int, const SeedMakingWorkContextCuda&, std::shared_ptr<TrigAccel::OffloadBuffer> data,
- tbb::concurrent_queue<SeedMakingDeviceContext*>&, tbb::concurrent_vector<WorkTimeStamp>&);
+ SeedMakingWorkCuda(unsigned int, SeedMakingDeviceContext*, std::shared_ptr<TrigAccel::OffloadBuffer>,
+ tbb::concurrent_vector<WorkTimeStamp>*);
~SeedMakingWorkCuda();
std::shared_ptr<TrigAccel::OffloadBuffer> getOutput();
bool run();
@@ -37,10 +36,9 @@ private:
};
unsigned int m_workId;
- SeedMakingWorkContextCuda* m_context;
+ SeedMakingDeviceContext* m_context;
std::shared_ptr<TrigAccel::OffloadBuffer> m_input, m_output;
- tbb::concurrent_queue<SeedMakingDeviceContext*>& m_contextQueue;
- tbb::concurrent_vector<WorkTimeStamp>& m_timeLine;
+ tbb::concurrent_vector<WorkTimeStamp>* m_timeLine;
float m_CovMS, m_ptCoeff, m_minPt2, m_ptCoeff2, m_maxD0;
};
diff --git a/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetDataContexts.h b/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetDataContexts.h
index 8ddf837d4802ca9aecc1dfe2118aa9bbc1644f83..9412c7198b6619293ee251b85d6ab51900f344b1 100644
--- a/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetDataContexts.h
+++ b/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetDataContexts.h
@@ -22,12 +22,6 @@ public:
};
-class SeedMakingWorkContext {//base class
-public:
- SeedMakingWorkContext() {};
- SeedMakingWorkContext(const SeedMakingWorkContext& c) {};
-};
-
struct SeedMakingDeviceContext {
public:
SeedMakingDeviceContext() : m_deviceId(-1), h_spacepoints(0), d_spacepoints(0), d_size(0), h_size(0) {};
@@ -58,25 +52,5 @@ private:
-class SeedMakingWorkContextCuda : public SeedMakingWorkContext {
-public:
- SeedMakingWorkContextCuda(SeedMakingDeviceContext* pdc,
- bool pinm = true, bool wcm = false, bool link = false) : SeedMakingWorkContext(),
- m_pdc(pdc),
- m_usePinnedMemory(pinm),
- m_useWriteCombinedMemory(wcm),
- m_linkOutputToShm(link) {};
-
- SeedMakingWorkContextCuda(const SeedMakingWorkContextCuda& c) : SeedMakingWorkContext(),
- m_pdc(c.m_pdc),
- m_usePinnedMemory(c.m_usePinnedMemory),
- m_useWriteCombinedMemory(c.m_useWriteCombinedMemory),
- m_linkOutputToShm(c.m_linkOutputToShm) {};
- SeedMakingDeviceContext* m_pdc;
- bool m_usePinnedMemory;
- bool m_useWriteCombinedMemory;
- bool m_linkOutputToShm;
-};
-
#endif
diff --git a/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetModuleCuda.cu b/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetModuleCuda.cu
index f24815a593a6eb0929bb865a9f1ce63bae1c7403..7e99ca70d46b1b2b70922903b66a97a33ac13f1c 100644
--- a/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetModuleCuda.cu
+++ b/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetModuleCuda.cu
@@ -12,6 +12,8 @@
#include "TrigAccelEvent/TrigInDetAccelCodes.h"
+#include <sstream>
+
extern "C" TrigAccel::WorkFactory* getFactory() {
return new TrigInDetModuleCuda();
}
@@ -25,147 +27,89 @@ extern "C" void deleteFactory(TrigAccel::WorkFactory* c){
delete mod;
}
-TrigInDetModuleCuda::TrigInDetModuleCuda() : m_maxNumberOfContexts(12), m_maxDevice(0), m_usePinnedMemory(true),
- m_useWriteCombinedMemory(false), m_linkOutputToShm(false), m_dumpTimeLine(false) {
-
- m_d_detmodels.clear();
+void TrigInDetModuleCuda::getNumberOfGPUs() {
+ pid_t childpid;
+ int fd[2];
+ // create pipe descriptors
+ pipe(fd);
+
+ childpid = fork();
+ if(childpid != 0) { // parent
+ close(fd[1]);
+ // read the data (blocking operation)
+ read(fd[0], &m_maxDevice, sizeof(m_maxDevice));
+ // close the read-descriptor
+ close(fd[0]);
+ }
+ else { // child
+ // writing only, no need for read-descriptor
+ close(fd[0]);
+ int maxDevice = 0;
+ cudaGetDeviceCount(&maxDevice);
+ cudaError_t error = cudaGetLastError();
+ if(error != cudaSuccess) {
+ maxDevice = 0;
+ }
+ // send the value on the write-descriptor
+ write(fd[1], &maxDevice, sizeof(maxDevice));
+ // close the write descriptor
+ close(fd[1]);
+ exit(0);
+ }
+}
- cudaGetDeviceCount(&m_maxDevice);
+TrigInDetModuleCuda::TrigInDetModuleCuda() : m_maxDevice(0), m_dumpTimeLine(false) {
- cudaError_t error = cudaGetLastError();
+ m_h_detmodel = 0;
- if(error != cudaSuccess) {
- m_maxDevice = 0;
- }
+ getNumberOfGPUs();
for(unsigned int i=0;i<getProvidedAlgs().size();i++) {
m_workItemCounters[i] = 0;
}
+
+ m_h_detmodel = (unsigned char*) malloc(sizeof(TrigAccel::DETECTOR_MODEL));
m_timeLine.clear();
}
TrigInDetModuleCuda::~TrigInDetModuleCuda() {
-
- SeedMakingDeviceContext* ps = 0;
-
- std::cout<<"deleting "<<m_seedMakingDcQueue.unsafe_size()<<" device contexts"<<std::endl;
- while(m_seedMakingDcQueue.try_pop(ps)) deleteSeedMakingContext(ps);
-
- for(auto dm : m_d_detmodels) {
- cudaSetDevice(dm.first);
- cudaFree(dm.second);
-
- }
- m_d_detmodels.clear();
-
+ free(m_h_detmodel);
+ m_h_detmodel = 0;
if(m_dumpTimeLine) {
-
- std::cout<<"time_line has "<<m_timeLine.size()<<" events"<<std::endl;
- if(m_timeLine.size() > 0) {
- tbb::tick_count t0 = m_timeLine[0].m_time;
- std::ofstream tl("timeLine.csv");
- tl<<"workId,eventType,time"<<std::endl;
- tl<<m_timeLine[0].m_workId<<","<<m_timeLine[0].m_eventType<<",0"<<std::endl;
- for(unsigned int tIdx = 1;tIdx < m_timeLine.size();++tIdx) {
- tbb::tick_count t1 = m_timeLine[tIdx].m_time;
- auto duration = t1-t0;
- tl<<m_timeLine[tIdx].m_workId<<","<<m_timeLine[tIdx].m_eventType<<","<<1000*duration.seconds()<<std::endl;
- }
- tl.close();
- }
- }
+ if(m_timeLine.size() > 0) {
+ tbb::tick_count t0 = m_timeLine[0].m_time;
+ std::ostringstream fileName;
+ fileName <<"timeLine_"<<getpid()<<".csv";
+ std::ofstream tl(fileName.str());
+ tl<<"workId,eventType,time"<<std::endl;
+ tl<<m_timeLine[0].m_workId<<","<<m_timeLine[0].m_eventType<<",0"<<std::endl;
+ for(unsigned int tIdx = 1;tIdx < m_timeLine.size();++tIdx) {
+ tbb::tick_count t1 = m_timeLine[tIdx].m_time;
+ auto duration = t1-t0;
+ tl<<m_timeLine[tIdx].m_workId<<","<<m_timeLine[tIdx].m_eventType<<","<<1000*duration.seconds()<<std::endl;
+ }
+ tl.close();
+ m_timeLine.clear();
+ }
+ }
}
bool TrigInDetModuleCuda::configure() {
- std::vector<int> allowedGPUs, nDeviceContexts;
-
- allowedGPUs.resize(1,0);//configured for just 1 device with deviceId = 0
-
- nDeviceContexts.resize(1,8);//configured for 8 DataContexts
-
if(m_maxDevice == 0) {
std::cout<<"No CUDA devices found"<<std::endl;
return false;
}
-
- if(allowedGPUs.empty() || nDeviceContexts.empty()) return false;
-
- if(allowedGPUs.size() != nDeviceContexts.size()) return false;
-
- unsigned int dcIndex=0;
-
- size_t memTotalSize = 0;
-
- std::vector< SeedMakingDeviceContext*> vSeedDCs[100];//we do not have that many GPUs
-
- int nDCTotal=0;
-
- for(std::vector<int>::iterator devIt = allowedGPUs.begin(); devIt!= allowedGPUs.end();++devIt, dcIndex++) {
-
- int deviceId = (*devIt);
-
- if(deviceId<0 || deviceId>=m_maxDevice) continue;
-
- size_t memTotalSizeOnDevice = 0;
-
- cudaSetDevice(deviceId);
-
- checkError();
-
- unsigned char* d_detmodel;
-
- cudaMalloc((void **)&d_detmodel, sizeof(TrigAccel::DETECTOR_MODEL));
-
- checkError();
-
- m_d_detmodels.insert(std::pair<unsigned int, unsigned char*>(deviceId, d_detmodel));
-
- int nDC = nDeviceContexts[dcIndex];
- nDCTotal += nDC;
-
- memTotalSizeOnDevice += sizeof(TrigAccel::DETECTOR_MODEL);
-
- for(int dc=0;dc<nDC;dc++) {
- SeedMakingDeviceContext* p = createSeedMakingContext(deviceId);
- memTotalSizeOnDevice += p->deviceSize();
- vSeedDCs[dcIndex].push_back(p);
- }
-
- memTotalSize += memTotalSizeOnDevice;
-
- std::cout<<"GPU"<<deviceId<<" allocated data context size = "<<1e-6*memTotalSizeOnDevice<<" MBytes"<<std::endl;
- }
-
- int nDCLeft = nDCTotal;
- while(nDCLeft>0) {
- for(unsigned int iGPU=0;iGPU<allowedGPUs.size();iGPU++) {
- if(vSeedDCs[iGPU].empty()) continue;
- m_seedMakingDcQueue.push(vSeedDCs[iGPU].back());
- vSeedDCs[iGPU].pop_back();
- --nDCLeft;
- }
- }
-
- std::cout<<"Data context queue : ";
- for(tbb::concurrent_queue< SeedMakingDeviceContext*>::const_iterator i(m_seedMakingDcQueue.unsafe_begin()); i!=m_seedMakingDcQueue.unsafe_end(); ++i ) {
- std::cout<<(*i)->m_deviceId<<" ";
- }
- std::cout<<std::endl;
-
- std::cout<<"Total size of memory allocated on all GPUs = "<<1e-6*memTotalSize<<" MBytes"<<std::endl;
-
return true;
}
-
-SeedMakingDeviceContext* TrigInDetModuleCuda::createSeedMakingContext(int id) {
+SeedMakingDeviceContext* TrigInDetModuleCuda::createSeedMakingContext(int id) const {
cudaSetDevice(id);
-
+ checkError(11);
SeedMakingDeviceContext* p = new SeedMakingDeviceContext;
p->m_deviceId = id;
@@ -173,7 +117,7 @@ SeedMakingDeviceContext* TrigInDetModuleCuda::createSeedMakingContext(int id) {
//set stream
cudaStreamCreate(&p->m_stream);
-
+ checkError(12);
//check device property
cudaDeviceProp deviceProp;
@@ -194,78 +138,49 @@ SeedMakingDeviceContext* TrigInDetModuleCuda::createSeedMakingContext(int id) {
//Allocate memory
- cudaMalloc((void **)&p->d_settings, sizeof(TrigAccel::SEED_FINDER_SETTINGS));
+ cudaMalloc((void **)&p->d_settings, sizeof(TrigAccel::SEED_FINDER_SETTINGS));
cudaMalloc((void **)&p->d_spacepoints, sizeof(TrigAccel::SPACEPOINT_STORAGE));
-
- auto dmIt = m_d_detmodels.find(p->m_deviceId);
- if(dmIt!=m_d_detmodels.end()) {
- p->d_detmodel = (*dmIt).second;
- }
-
+ cudaMalloc((void **)&p->d_detmodel, sizeof(TrigAccel::DETECTOR_MODEL));
+ checkError();
cudaMalloc((void **)&p->d_outputseeds, sizeof(TrigAccel::OUTPUT_SEED_STORAGE));
cudaMalloc((void **)&p->d_doubletstorage, sizeof(DOUBLET_STORAGE));
cudaMalloc((void **)&p->d_doubletinfo, sizeof(DOUBLET_INFO));
-
+ checkError(13);
p->d_size = sizeof(TrigAccel::SEED_FINDER_SETTINGS) +
- sizeof(TrigAccel::SPACEPOINT_STORAGE) + sizeof(TrigAccel::OUTPUT_SEED_STORAGE) + sizeof(DOUBLET_STORAGE) + sizeof(DOUBLET_INFO);
-
+ sizeof(TrigAccel::SPACEPOINT_STORAGE) + sizeof(TrigAccel::OUTPUT_SEED_STORAGE) + sizeof(DOUBLET_STORAGE) + sizeof(DOUBLET_INFO) +
+ sizeof(TrigAccel::DETECTOR_MODEL);
+
cudaMallocHost((void **)&p->h_settings, sizeof(TrigAccel::SEED_FINDER_SETTINGS));
cudaMallocHost((void **)&p->h_spacepoints, sizeof(TrigAccel::SPACEPOINT_STORAGE));
cudaMallocHost((void **)&p->h_outputseeds, sizeof(TrigAccel::OUTPUT_SEED_STORAGE));
p->h_size = sizeof(TrigAccel::SEED_FINDER_SETTINGS) + sizeof(TrigAccel::SPACEPOINT_STORAGE) + sizeof(TrigAccel::OUTPUT_SEED_STORAGE);
-
- return p;
-}
-
-void TrigInDetModuleCuda::deleteSeedMakingContext(SeedMakingDeviceContext* p) {
-
- int id = p->m_deviceId;
-
- cudaSetDevice(id);
-
- cudaStreamDestroy(p->m_stream);
-
- cudaFree(p->d_settings);
- cudaFree(p->d_spacepoints);
- cudaFree(p->d_outputseeds);
- cudaFree(p->d_doubletstorage);
- cudaFree(p->d_doubletinfo);
-
- cudaFreeHost(p->h_settings);
- cudaFreeHost(p->h_spacepoints);
- cudaFreeHost(p->h_outputseeds);
-
- delete p;
-
+ checkError(14);
+ return p;
}
TrigAccel::Work* TrigInDetModuleCuda::createWork(int workType, std::shared_ptr<TrigAccel::OffloadBuffer> data){
if(workType == TrigAccel::InDetJobControlCode::SIL_LAYERS_EXPORT){
-
- for(auto dm : m_d_detmodels) {
- unsigned int deviceId = dm.first;
+ memcpy(m_h_detmodel, (unsigned char*)data->get(), sizeof(TrigAccel::DETECTOR_MODEL));
- cudaSetDevice(deviceId);
-
- cudaMemcpy(dm.second, (unsigned char*)data->get(), sizeof(TrigAccel::DETECTOR_MODEL), cudaMemcpyHostToDevice);
- }
return 0;
}
if(workType == TrigAccel::InDetJobControlCode::MAKE_SEEDS){
- SeedMakingDeviceContext* ctx = 0;
-
- while(!m_seedMakingDcQueue.try_pop(ctx)) {
- // std::cout<<"waiting for free device context..."<<std::endl;
- };
+ int deviceId = 0;//always using device 0 for the time being
+
+ //TO-DO: to support mult-GPU load balancing get deviceId from a tbb_concurrent_queue
+
+ SeedMakingDeviceContext* ctx = createSeedMakingContext(deviceId);
+ cudaMemcpy(ctx->d_detmodel, m_h_detmodel, sizeof(TrigAccel::DETECTOR_MODEL), cudaMemcpyHostToDevice);
+ checkError(21);
TrigAccel::SEED_MAKING_JOB *pArray = reinterpret_cast<TrigAccel::SEED_MAKING_JOB*>(data->get());
//1. copy settings to the context host array
@@ -282,9 +197,7 @@ TrigAccel::Work* TrigInDetModuleCuda::createWork(int workType, std::shared_ptr<T
unsigned int workId = workNum*100;
- SeedMakingWorkCuda* w = new SeedMakingWorkCuda(workId, SeedMakingWorkContextCuda(ctx, m_usePinnedMemory,
- m_useWriteCombinedMemory,
- m_linkOutputToShm), data, m_seedMakingDcQueue, m_timeLine);
+ SeedMakingWorkCuda* w = new SeedMakingWorkCuda(workId, ctx, data, &m_timeLine);
return w;
}
diff --git a/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetModuleCuda.h b/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetModuleCuda.h
index 44559910072535e13ce790ea925c774236f39f67..351bd379addfaec83d833516c8221ff2d5e98be6 100644
--- a/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetModuleCuda.h
+++ b/Trigger/TrigAccel/TrigInDetCUDA/src/TrigInDetModuleCuda.h
@@ -25,7 +25,7 @@ class TrigInDetModuleCuda : public TrigAccel::WorkFactory {
~TrigInDetModuleCuda();
bool configure();
-
+
TrigAccel::Work* createWork(int, std::shared_ptr<TrigAccel::OffloadBuffer>);
const std::vector<int> getProvidedAlgs();
@@ -36,35 +36,28 @@ class TrigInDetModuleCuda : public TrigAccel::WorkFactory {
private:
- inline void checkError() const {
+ inline void checkError(int code = 0) const {
cudaError_t error = cudaGetLastError();
if(error != cudaSuccess) {
- printf("CUDA error: %s\n", cudaGetErrorString(error));
- exit(-1);
+ printf("%d CUDA error %d: %s\n", getpid(), code, cudaGetErrorString(error));
+ exit(-1);
}
};
+ void getNumberOfGPUs();
+
//data structures
//1. "const" data: managed by the Factory
+
+ unsigned char* m_h_detmodel;
- std::map<unsigned int, unsigned char*> m_d_detmodels;
-
- int m_maxNumberOfContexts;//Factory setting
int m_maxDevice;
- bool m_usePinnedMemory;
- bool m_useWriteCombinedMemory;
- bool m_linkOutputToShm;
-
- // host / device pairs for each device
-
- tbb::concurrent_queue<SeedMakingDeviceContext*> m_seedMakingDcQueue;
-
// data context allocation / de-allocation
- SeedMakingDeviceContext* createSeedMakingContext(int);
- void deleteSeedMakingContext(SeedMakingDeviceContext*);
+ SeedMakingDeviceContext* createSeedMakingContext(int) const;
+ void deleteSeedMakingContext(SeedMakingDeviceContext*) const;
bool m_dumpTimeLine;
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
index 7966ff386d1a406159ef92cb20688a6308d64ea5..131c2e98954e3ac382d60c64ce4d526cec51c6ef 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
@@ -67,7 +67,7 @@ StatusCode HLTCaloCellMaker::execute( const EventContext& context ) const {
// datahandle
if ( m_roiMode ) {
if ( roiCollection->size() > 1 )
- ATH_MSG_INFO ( "roiMode but multiple rois found, will only use the first one");
+ ATH_MSG_DEBUG ( "roiMode but multiple rois found, will only use the first one");
SG::WriteHandle<CaloConstCellContainer > cellContainer = SG::WriteHandle< CaloConstCellContainer > ( m_cellContainerKey, context );
auto cdv = std::make_unique<CaloConstCellContainer>(SG::VIEW_ELEMENTS);
@@ -75,7 +75,7 @@ StatusCode HLTCaloCellMaker::execute( const EventContext& context ) const {
auto clEta = Monitored::Collection ("Cells_eta",*cdv,&CaloCell::eta);
auto clPhi = Monitored::Collection ("Cells_phi",*cdv,&CaloCell::phi);
for( const TrigRoiDescriptor* roiDescriptor : *roiCollection) {
- ATH_MSG_INFO ( "Running on RoI " << *roiDescriptor<< " FS="<<roiDescriptor->isFullscan());
+ ATH_MSG_DEBUG ( "Running on RoI " << *roiDescriptor<< " FS="<<roiDescriptor->isFullscan());
if ( roiDescriptor->isFullscan() ) {
ATH_CHECK(m_dataAccessSvc->loadFullCollections( context, *cdv ));
cdv->setHasCalo(CaloCell_ID::LAREM);
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloCell2ClusterMapper.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloCell2ClusterMapper.cxx
index 79eea27e7b991791a6ba64ecc6887d1313a5eb0e..193eeceb981f46a90a644c6ad0d708e9e334ce38 100755
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloCell2ClusterMapper.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloCell2ClusterMapper.cxx
@@ -42,7 +42,7 @@
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//###############################################################################
// CONSTRUCTOR:
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTopoTowerAlgorithm.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTopoTowerAlgorithm.cxx
index c9b031816b8176a4d011d4661faa502c7731ae11..295ec5287447d3ff84405ef36aa51a4a9b590b0d 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTopoTowerAlgorithm.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloTopoTowerAlgorithm.cxx
@@ -17,7 +17,7 @@
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/ListItem.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//
#include "EventKernel/INavigable4Momentum.h"
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h b/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h
index debb6771b4c16bb49dd305871edce6db08d9cd8d..b334a25abbc8cffa59f582cb89c553203dfd3362 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/src/FexBase.h
@@ -15,7 +15,7 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTrigMissingET/TrigMissingETContainer.h"
#include "GaudiKernel/SystemOfUnits.h"
#include "MonGroupBuilder.h"
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
index 9c4201c7399ed6ba88d3d7a612ab4bd552ac2d3b..d982a3d6f8e3c93ed9910eae5e2b7834ed7a2515 100755
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
@@ -73,7 +73,7 @@ PURPOSE: Algorithm is an adaptation for the trigger of the egammaBuilder.cxx
// INCLUDE GAUDI HEADER FILES:
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
#include <algorithm>
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
index e1102d79b411dcdbe98b8d33a8d07514f152dce0..65d426f3d39af314a1580de3da70603e6535e52b 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/DetectorTimingAlgo.h
@@ -16,7 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
@@ -54,7 +54,7 @@ public:
/// Run once per event
HLT::ErrorCode hltExecute(std::vector<HLT::TEVec>&, unsigned int output);
- void updateHandler(Property& p);
+ void updateHandler(Gaudi::Details::PropertyBase& p);
// TrigL2MuonSA::RecMuonRoIUtils m_recMuonRoIUtils;
// ToolHandle<TrigL2MuonSA::MuFastDataPreparator> m_dataPreparator;
ToolHandle<TrigL2MuonSA::RpcDataPreparator>m_rpcDataPreparator;
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
index bc7f108cce1929276ed5812781a8c9a91f81a1b3..9f15867d33a3a777c79cbe97725f1ab2605b8276 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/TrigGenericAlgs/L1CorrelationAlgo.h
@@ -16,7 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
@@ -67,7 +67,7 @@ public:
/// Run once per event
HLT::ErrorCode hltExecute(std::vector<HLT::TEVec>&, unsigned int output);
- void updateHandler(Property& p);
+ void updateHandler(Gaudi::Details::PropertyBase& p);
private:
std::vector<uint32_t> m_bitmasks;
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DetectorTimingAlgo.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DetectorTimingAlgo.cxx
index 573f83e8dfecb1455ed1eae19f4b3b1081c9441d..7936b31355e63ec30cc8059f65bb2b6fd5d4fa6d 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DetectorTimingAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/DetectorTimingAlgo.cxx
@@ -12,7 +12,7 @@
#include "TrigGenericAlgs/DetectorTimingAlgo.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <math.h>
#include <sstream>
@@ -145,7 +145,7 @@ HLT::ErrorCode DetectorTimingAlgo::hltInitialize()
}
-void DetectorTimingAlgo::updateHandler(Property&)
+void DetectorTimingAlgo::updateHandler(Gaudi::Details::PropertyBase&)
{
// parseROBRequest();
}
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/L1CorrelationAlgo.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/L1CorrelationAlgo.cxx
index 6be24bcf5e1d53f6d34c83a1732ec6fb6a734914..3061287b5d902a4b97675d5151ed9a9da7a7b3bd 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/L1CorrelationAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/L1CorrelationAlgo.cxx
@@ -12,7 +12,7 @@
#include "TrigGenericAlgs/L1CorrelationAlgo.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include <math.h>
@@ -285,7 +285,7 @@ HLT::ErrorCode L1CorrelationAlgo::hltInitialize()
}
-void L1CorrelationAlgo::updateHandler(Property&)
+void L1CorrelationAlgo::updateHandler(Gaudi::Details::PropertyBase&)
{
// parseROBRequest();
}
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.cxx b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.cxx
index 20a2562075cf77906150a093dfa8f2f84c17e71d..b9360ee106f01109713f91e7edc3eccfddfdcdd1 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.cxx
@@ -12,7 +12,7 @@
#include "ROBRequestAlgo.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include <math.h>
@@ -43,7 +43,7 @@ HLT::ErrorCode ROBRequestAlgo::hltInitialize()
ServiceHandle<IJobOptionsSvc> jobOptSvc("JobOptionsSvc", name());
// get the list of enabled ROBs
- const Property* p = Gaudi::Utils::getProperty(jobOptSvc->getProperties("DataFlowConfig"),
+ const Gaudi::Details::PropertyBase* p = Gaudi::Utils::getProperty(jobOptSvc->getProperties("DataFlowConfig"),
"DF_Enabled_ROB_IDs");
if (p) m_enabledROBs.assign(*p);
else ATH_MSG_DEBUG("Could not find property DataFlowConfig.DF_Enabled_ROB_IDs");
@@ -70,7 +70,7 @@ HLT::ErrorCode ROBRequestAlgo::hltInitialize()
}
-void ROBRequestAlgo::updateHandler(Property&)
+void ROBRequestAlgo::updateHandler(Gaudi::Details::PropertyBase&)
{
parseROBRequest();
}
diff --git a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
index 0d3c4318a2345530f8653bea0d20f41e9affad4c..9361a82a211f963d9c12199fd3cb61012fd86b5a 100644
--- a/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigGenericAlgs/src/ROBRequestAlgo.h
@@ -16,7 +16,7 @@
#include "TrigInterfaces/AllTEAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include <string>
#include <vector>
@@ -68,7 +68,7 @@ public:
/// Run once per event
HLT::ErrorCode hltExecute(std::vector<HLT::TEVec>&, unsigned int);
- void updateHandler(Property& p);
+ void updateHandler(Gaudi::Details::PropertyBase& p);
private:
void parseROBRequest();
diff --git a/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIClusterMaker.cxx b/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIClusterMaker.cxx
index e4298fa465f5bec805aff516581e981903e55398..434e8e1aad0bc24dc0abd99f151a11cbd7940998 100644
--- a/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIClusterMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIClusterMaker.cxx
@@ -14,7 +14,7 @@
#include "CaloUtils/CaloCollectionHelper.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ListItem.h"
//#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/StatusCode.h"
diff --git a/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIEventShapeJetIteration.cxx b/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIEventShapeJetIteration.cxx
index 2d0f5bfafe0521bf39df16709fc9d81400b4f8a3..93a82095fd2a5301c293bbd975da7f46846b3312 100644
--- a/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIEventShapeJetIteration.cxx
+++ b/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIEventShapeJetIteration.cxx
@@ -12,8 +12,7 @@
#include "xAODCore/ShallowCopy.h"
#include "xAODCaloEvent/CaloClusterContainer.h"
-TrigHIEventShapeJetIteration::TrigHIEventShapeJetIteration(std::string name) : AsgTool(name),
- m_isInit(false)
+TrigHIEventShapeJetIteration::TrigHIEventShapeJetIteration(std::string name) : AsgTool(name)
{
declareProperty("InputClustersKey",m_input_clusters_key="HIClusters");
diff --git a/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIEventShapeJetIteration.h b/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIEventShapeJetIteration.h
index 0d6f3b582c35ead675b5fec0d447dbd914569398..2f7ed4f76c650d24b0373425d38d116d2fec4c09 100644
--- a/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIEventShapeJetIteration.h
+++ b/Trigger/TrigAlgorithms/TrigHIRec/src/TrigHIEventShapeJetIteration.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/********************************************************************
@@ -65,8 +65,6 @@ private:
/// \brief If selected, the jet constituents define the associated clusters
bool m_exclude_constituents;
- mutable bool m_isInit;
-
std::string m_modulation_key;
};
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
index 3ee2812855c5fdf7763ff2209adf95835d28753a..715c4de3e6556d5003215022b705bd5466135dfa 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
@@ -12,7 +12,7 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#include "xAODTracking/TrackParticleContainer.h"
#include "AthenaMonitoringKernel/Monitored.h"
#include <map>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthViews/View.h"
// STL includes
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
index 6fadfe9373bc09479cd2cd021f7b36d340c6636d..4c0347dca06f5abc52efc47254a12f2ec324d12c 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
@@ -4,7 +4,7 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#ifndef TRIGT2MINBIAS_TRACKCOUNTHYPOTOOL_H
#define TRIGT2MINBIAS_TRACKCOUNTHYPOTOOL_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/MuonFilterAlg.cxx b/Trigger/TrigAlgorithms/TrigMuonEF/src/MuonFilterAlg.cxx
index cc2d14c33fbcf15ac3d8ab51a1bc4c43181d9edc..0693873aa6e7f6a556a3c33322c7aa292ee0e2ff 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/src/MuonFilterAlg.cxx
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/MuonFilterAlg.cxx
@@ -7,7 +7,7 @@
#include "MuonFilterAlg.h"
MuonFilterAlg::MuonFilterAlg(const std::string& name, ISvcLocator* pSvcLocator )
-:AthAlgorithm(name, pSvcLocator)
+:AthReentrantAlgorithm(name, pSvcLocator)
{
@@ -26,12 +26,12 @@ StatusCode MuonFilterAlg::finalize()
return StatusCode::SUCCESS;
}
-StatusCode MuonFilterAlg::execute()
+StatusCode MuonFilterAlg::execute(const EventContext& ctx) const
{
bool pass = false;
//Get muon container
- SG::ReadHandle<xAOD::MuonContainer> rh_muons(m_muonContainerKey);
+ SG::ReadHandle<xAOD::MuonContainer> rh_muons(m_muonContainerKey, ctx);
if(!rh_muons.isValid()){
ATH_MSG_ERROR("Could not find muons with name: "<<m_muonContainerKey.key());
return StatusCode::FAILURE;
@@ -45,8 +45,8 @@ StatusCode MuonFilterAlg::execute()
}
if(nCBmuons==0) pass = true;
- ATH_MSG_DEBUG("Found: "<<muons->size()<<" muons; pass="<<pass);
- setFilterPassed(pass);
+ ATH_MSG_DEBUG("Found: "<<nCBmuons<<" muons; pass="<<pass);
+ setFilterPassed(pass, ctx);
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/MuonFilterAlg.h b/Trigger/TrigAlgorithms/TrigMuonEF/src/MuonFilterAlg.h
index d73a427fd9472175f525ac8f7da3594447aeac88..42ac73098a86a635780b743c0b58f49e00b5f008 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/src/MuonFilterAlg.h
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/MuonFilterAlg.h
@@ -7,11 +7,11 @@
#ifndef TRIGMUONEF_MUONFILTERALG_H
#define TRIGMUONEF_MUONFILTERALG_H
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "StoreGate/ReadHandleKey.h"
#include "xAODMuon/MuonContainer.h"
-class MuonFilterAlg : public AthAlgorithm
+class MuonFilterAlg : public AthReentrantAlgorithm
{
public :
@@ -25,7 +25,7 @@ class MuonFilterAlg : public AthAlgorithm
StatusCode finalize();
/** execute the filter alg */
- StatusCode execute();
+ StatusCode execute(const EventContext& ctx) const;
private :
diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpot.h b/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpot.h
index 21bc51b5fdb6ecb5ed72aa4c2a819f69bc74343b..66b394a62deeba81b0bb3d02faea843e8a6e215b 100644
--- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpot.h
+++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/TrigT2BeamSpot/T2VertexBeamSpot.h
@@ -104,7 +104,7 @@ namespace PESA {
virtual StatusCode initialize() final;
- SG::ReadHandleKeyArray<TrackCollection> m_trackCollections; /*Input list of track collection names which should be used for the algorithms*/
+ SG::ReadHandleKey<TrackCollection> m_trackCollectionKey; /*track collection name which should be used for the algorithms*/
//The same as in Run2 (m_vertexCollName)
SG::WriteHandleKey<TrigVertexCollection> m_outputVertexCollectionKey;
diff --git a/Trigger/TrigAlgorithms/TrigT2BeamSpot/src/T2VertexBeamSpot.cxx b/Trigger/TrigAlgorithms/TrigT2BeamSpot/src/T2VertexBeamSpot.cxx
index 0d65b6ebb719f866055ddf6a6c379cc8b5866c71..b64d686df2874d185416c142e3618648d6e94e9c 100644
--- a/Trigger/TrigAlgorithms/TrigT2BeamSpot/src/T2VertexBeamSpot.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2BeamSpot/src/T2VertexBeamSpot.cxx
@@ -53,10 +53,10 @@ HLT::TEVec getAllTEs(const std::vector<HLT::TEVec>& tes_in){
T2VertexBeamSpot::T2VertexBeamSpot( const std::string& name, ISvcLocator* pSvcLocator )
: HLT::AllTEAlgo(name, pSvcLocator){
- declareProperty( "TrackCollections", m_trackCollections = {"TrigFastTrackFinder_Tracks"} );
- declareProperty( "VertexCollection", m_outputVertexCollectionKey = "myVertices" );
+ declareProperty( "TrackCollection", m_trackCollectionKey = "TrigFastTrackFinder_Tracks" );
+ declareProperty( "VertexCollection", m_outputVertexCollectionKey = "myVertices" );
- declareProperty("vertexCollName", m_vertexCollName = "TrigBeamSpotVertex");
+ declareProperty("vertexCollName", m_vertexCollName = "TrigBeamSpotVertex");
@@ -161,7 +161,7 @@ HLT::ErrorCode T2VertexBeamSpot::hltExecute( std::vector< HLT::TEVec >& tes_in,
auto nPerVecTEHighPTTracks = Monitored::Scalar<unsigned>("nPerVecTEHighPTTracks");
//Loop over Trigger Elements
- for ( HLT::TriggerElement* TE : iTE){
+ for ( HLT::TriggerElement* TE : iTE){
//Monitor how long does it take to loop over each trigger element
auto tTE = Monitored::Timer("TIME_EachTE");
@@ -183,7 +183,7 @@ HLT::ErrorCode T2VertexBeamSpot::hltExecute( std::vector< HLT::TEVec >& tes_in,
m_beamSpotTool->selectTracks( tracks, mySelectedTrackCollection, nTracks );
//Increment counters per TE
- nPerTETracks += nTracks[0];
+ nPerTETracks += nTracks[0];
nPerTEPassedTracks += nTracks[1];
nPerTEHighPTTracks += nTracks[2];
}
@@ -216,14 +216,14 @@ HLT::ErrorCode T2VertexBeamSpot::hltExecute( std::vector< HLT::TEVec >& tes_in,
} //End part of track selection
- ATH_MSG_DEBUG( "Number of all Tracks: "<< nAllTracks <<" Selected Tracks: " << nSelectedTracks << " highPt Tracks: " << nHighPtTracks );
+ ATH_MSG_DEBUG( "Number of all Tracks: "<< nAllTracks <<" Selected Tracks: " << nSelectedTracks << " highPt Tracks: " << nHighPtTracks );
if ( !m_beamSpotTool->isHighPTTrack( nHighPtTracks ) ) {
ATH_MSG_DEBUG( " No seed tracks for vertex");
break;
}
-
+
m_beamSpotTool->eventStage( hasSeedTrack );
@@ -258,7 +258,7 @@ HLT::ErrorCode T2VertexBeamSpot::hltExecute( std::vector< HLT::TEVec >& tes_in,
HLT::TEVec allTEs = getAllTEs(tes_in);
ATH_MSG_DEBUG( "n of all TEs: " << allTEs.size() );
- //Check how many vertices passed the selection
+ //Check how many vertices passed the selection
unsigned int nPassedVtx = m_beamSpotTool->m_NvtxPass;
//Save all events, or only those events which pass the Npv cuts (if activated)!
@@ -397,10 +397,10 @@ StatusCode T2VertexBeamSpot::initialize() {
return StatusCode::FAILURE;
}
- ATH_CHECK( m_trackCollections.initialize() );
+ ATH_CHECK( m_trackCollectionKey.initialize() );
- ATH_CHECK( m_outputVertexCollectionKey.initialize() );
+ ATH_CHECK( m_outputVertexCollectionKey.initialize() );
ATH_CHECK( m_eventInfoKey.initialize() );
@@ -420,7 +420,7 @@ StatusCode T2VertexBeamSpot::execute(){
- //Reset monitored variables from previous event
+ //Reset monitored variables from previous event
m_beamSpotTool->resetMonitoredVariables();
// Initialize booleans for event stats
m_beamSpotTool->m_eventStageFlag = std::vector<bool>( numStatistics, false );
@@ -462,22 +462,20 @@ StatusCode T2VertexBeamSpot::execute(){
auto nTotalPassedTracks = Monitored::Scalar<unsigned>("nTotalPassedTracks");
auto nTotalHighPTTracks = Monitored::Scalar<unsigned>("nTotalHighPTTracks");
//Loop over track collections and select tracks
- for (SG::ReadHandleKey<TrackCollection> trackCollectionKey : m_trackCollections) {
- SG::ReadHandle<TrackCollection> trackCollection (trackCollectionKey);
- ATH_CHECK(trackCollection.isValid());
+ SG::ReadHandle<TrackCollection> trackCollection (m_trackCollectionKey);
+ ATH_CHECK(trackCollection.isValid());
- //Dereference tracks
- const TrackCollection* tracks = trackCollection.cptr();
+ //Dereference tracks
+ const TrackCollection* tracks = trackCollection.cptr();
- //Select tracks
- std::vector<unsigned> trackCounter(3,0);//returning all tracks[0]/passed tracks[1]/ hipt tracks[2] counts
- m_beamSpotTool->selectTracks( tracks, mySelectedTrackCollection, trackCounter );
+ //Select tracks
+ std::vector<unsigned> trackCounter(3,0);//returning all tracks[0]/passed tracks[1]/ hipt tracks[2] counts
+ m_beamSpotTool->selectTracks( tracks, mySelectedTrackCollection, trackCounter );
- //FIXME: make a counter class
- nTotalTracks += trackCounter[0];
- nTotalPassedTracks += trackCounter[1];
- nTotalHighPTTracks += trackCounter[2];
- }
+ //FIXME: make a counter class
+ nTotalTracks += trackCounter[0];
+ nTotalPassedTracks += trackCounter[1];
+ nTotalHighPTTracks += trackCounter[2];
//Store counts for all/highPt/selected tracks
nAllTracks = nTotalTracks;
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
index ef96d698a84f0e848c053d5aea466699845be281..06c97ab7da03320343029f7a7e6d9e102d3a9947 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/CMakeLists.txt
@@ -38,6 +38,5 @@ endfunction( _add_test )
_add_test( TestService test/test_dataaccess.sh )
_add_test( TestServiceNewJO test/test_dataaccessNewJO.sh )
-_add_test( caloCf test/test_t2calo_cf_build.sh )
_add_test( caloOnly test/test_t2calo_only_build.sh )
_add_test( caloRinger test/test_t2calo_ringer_only_build.sh )
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
index 75586fc0e253c84802aac1629392540ff8649b0c..a969a417250c25541c673840bfa7552c0225fdaf 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
@@ -10,6 +10,10 @@ def setMinimalCaloSetup() :
from TrigT2CaloCommon.TrigT2CaloCommonConfig import TrigCaloDataAccessSvc
svcMgr+=TrigCaloDataAccessSvc()
svcMgr.TrigCaloDataAccessSvc.OutputLevel=ERROR
+ if not hasattr(svcMgr,'RegSelSvcDefault'):
+ from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
+ svcMgr += RegSelSvcDefault()
+
########################
@@ -110,7 +114,7 @@ def createFastCaloSequence(EMRoIDecisions, doRinger=False, ClustersName="HLT_Fas
def clusterFSInputMaker( ):
"""Creates the inputMaker for FS in menu"""
- RoIs = 'FSJETRoI'
+ RoIs = 'HLT_FSJETRoI'
from AthenaConfiguration.ComponentFactory import CompFactory
InputMakerAlg = CompFactory.InputMakerForRoI("IMclusterFS", RoIsLink="initialRoI")
InputMakerAlg.RoITool = CompFactory.ViewCreatorInitialROITool()
@@ -118,11 +122,11 @@ def clusterFSInputMaker( ):
return InputMakerAlg
-def HLTCellMaker(RoIs='FSJETRoI', outputName="CaloCells", algSuffix=""):
+def HLTCellMaker(RoIs='HLT_FSJETRoI', outputName="CaloCells", algSuffix=""):
cellMakerAlgo = _algoHLTCaloCell(name="HLTCaloCellMaker"+algSuffix, inputEDM=RoIs, outputEDM=outputName, RoIMode=True)
return cellMakerAlgo
-def HLTFSCellMakerRecoSequence(RoIs='FSJETRoI'):
+def HLTFSCellMakerRecoSequence(RoIs='HLT_FSJETRoI'):
cellMaker = HLTCellMaker(RoIs, outputName="CaloCellsFS", algSuffix="FS")
RecoSequence = parOR("ClusterRecoSequenceFS", [cellMaker])
return (RecoSequence, cellMaker.CellsName)
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
index ea095c06df22d69e8246a42513089ed4a0a25d3a..16f838d58e9ca6aee3c1441d7ade0d486124e046 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TestCaloDataAccess.cxx
@@ -7,7 +7,7 @@
#include "tbb/blocked_range.h"
#include "TestTools/expect.h"
#include "TestTools/ParallelCallTest.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigT2CaloCommon/LArCellCont.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "CaloEvent/CaloConstCellContainer.h"
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh
deleted file mode 100755
index 235141b868488c828298931b855afd7c20ad179a..0000000000000000000000000000000000000000
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_t2calo_cf_build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using IDCalo job options with doID=False
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/IDCalo.py"
-export EXTRA="doID=False"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoAlgMT.h b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoAlgMT.h
index d3a6f5e6e6399a92f5c3fe418fc899f5cee967cc..e59d4c8cd239fa36297237b13037650d56e0f86b 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoAlgMT.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoAlgMT.h
@@ -11,7 +11,7 @@ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#include "DecisionHandling/TrigCompositeUtils.h"
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include <map>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthViews/View.h"
// STL includes
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.h b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.h
index 49c852fc05d35eb28991cc34e77acab5168dcdab..73e860784673b862b5ea453e970dc8aab219c27b 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.h
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/src/SPCountHypoTool.h
@@ -4,7 +4,7 @@ Copyright! (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#ifndef TRIGT2MINBIAS_SPCOUNTHYPOTOOL_H
#define TRIGT2MINBIAS_SPCOUNTHYPOTOOL_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx
index 9dcb15f6f22668740533952ce5dccb4446e42306..2fe0baa8aaa6d3ea09709ed3766878229e33cf51 100755
--- a/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx
+++ b/Trigger/TrigAlgorithms/TrigTauRec/src/TrigTauRecMerged.cxx
@@ -17,7 +17,7 @@
//#include "GaudiKernel/IToolSvc.h"
//#include "GaudiKernel/ListItem.h"
//#include "GaudiKernel/StatusCode.h"
-//#include "GaudiKernel/Property.h"
+//#include "Gaudi/Property.h"
#include "TrigT1Interfaces/TrigT1Interfaces_ClassDEF.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py b/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
index 01d9306ddfc87e31242a7164a40cfd1dca0daad9..f3ef8033f4154fff1ddc24f4c72b6a3ef6bcd62d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
@@ -126,7 +126,6 @@ class WritexAODTrigDecision ( object ) :
from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__TrigDecisionCnvAlg
alg = xAODMaker__TrigDecisionCnvAlg()
- alg.ExtraOutputs = [('xAOD::TrigDecision','StoreGateSvc+xTrigDecision')]
# In order for the conversion to work we need to setup the TrigDecisionTool such that it uses the old decision
ToolSvc.TrigDecisionTool.UseAODDecision = True
@@ -140,8 +139,7 @@ class WritexAODTrigDecision ( object ) :
TopAlg += alg
from xAODTriggerCnv.xAODTriggerCnvConf import xAODMaker__TrigNavigationCnvAlg
- navAlg = xAODMaker__TrigNavigationCnvAlg()
- navAlg.ExtraOutputs = [('xAOD::TrigNavigation','StoreGateSvc+TrigNavigation')]
+ navAlg = xAODMaker__TrigNavigationCnvAlg('TrigNavigationCnvAlg')
TopAlg += navAlg
log.info('TrigDecision writing to xAOD enabled')
@@ -155,7 +153,6 @@ class WriteTrigDecision ( object ) :
TopAlg = AlgSequence()
self.TrigDecMaker = TrigDecisionMaker('TrigDecMaker')
- self.TrigDecMaker.ExtraOutputs = [('TrigDec::TrigDecision', 'StoreGateSvc+TrigDecision')]
TopAlg += self.TrigDecMaker
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx
index 8aa2d1324b28a2bba792d550f86ff1bb556b23fa..508c49aebd40c9ba4843f46c038fb52f5044c62f 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**************************************************************************
@@ -26,8 +26,6 @@
#include "EventInfo/EventID.h"
#include "EventInfo/EventType.h"
-#include "TrigT1Result/RoIBResult.h"
-
#include "TrigSteeringEvent/Lvl1Result.h"
#include "TrigSteering/Lvl1ResultAccessTool.h"
@@ -41,7 +39,7 @@
using namespace TrigDec;
TrigDecisionMaker::TrigDecisionMaker(const std::string &name, ISvcLocator *pSvcLocator)
- : AthAlgorithm(name, pSvcLocator),
+ : AthReentrantAlgorithm(name, pSvcLocator),
m_trigConfigSvc("TrigConf::TrigConfigSvc/TrigConfigSvc", name),
m_lvl1Tool("HLT::Lvl1ResultAccessTool/Lvl1ResultAccessTool", this),
m_nEvents(0),
@@ -56,20 +54,6 @@ TrigDecisionMaker::TrigDecisionMaker(const std::string &name, ISvcLocator *pSvcL
m_hlt_passed(0)
{
declareProperty("TrigConfigSvc", m_trigConfigSvc, "Trigger config service");
-
- declareProperty("doL1", m_doL1 = true);
- declareProperty("doL2", m_doL2 = true);
- declareProperty("doEF", m_doEF = true);
- declareProperty("doHLT", m_doHLT = true);
-// declareProperty("doEvtInfo", m_doEvtInfo = false);
-
- declareProperty("TrigDecisionKey", m_trigDecisionKey = "TrigDecision");
- declareProperty("L1ResultKey", m_l1ResultKey = "");
- declareProperty("L2ResultKey", m_l2ResultKey = "HLTResult_L2");
- declareProperty("EFResultKey", m_efResultKey = "HLTResult_EF");
- declareProperty("HLTResultKey", m_hltResultKey = "HLTResult_HLT");
-// declareProperty("EventInfoKey", m_evtInfoKey = "McEventInfo");
-// declareProperty("TrigDecisionTool", m_trigDec, "The tool to access TrigDecision");
}
@@ -106,6 +90,7 @@ StatusCode TrigDecisionMaker::initialize()
ATH_MSG_DEBUG ( " doHLT = " << (m_doHLT ? "True":"False") ) ;
ATH_MSG_DEBUG ( " TrigDecisionKey = " << m_trigDecisionKey ) ;
ATH_MSG_DEBUG ( " TrigL1ResultKey = " << m_l1ResultKey ) ;
+ ATH_MSG_DEBUG ( " TrigROIBL1ResultKey = " << m_l1roibResultKey ) ;
ATH_MSG_DEBUG ( " TrigL2ResultKey = " << m_l2ResultKey ) ;
ATH_MSG_DEBUG ( " TrigEFResultKey = " << m_efResultKey ) ;
ATH_MSG_DEBUG ( " TrigHLTResultKey= " << m_hltResultKey ) ;
@@ -113,6 +98,13 @@ StatusCode TrigDecisionMaker::initialize()
ATH_CHECK( m_lvl1Tool.retrieve() );
ATH_CHECK( m_trigConfigSvc.retrieve() );
+ ATH_CHECK( m_trigDecisionKey.initialize() );
+ ATH_CHECK( m_l1ResultKey.initialize(m_doL1) );
+ ATH_CHECK( m_l1roibResultKey.initialize(m_doL1) );
+ ATH_CHECK( m_l2ResultKey.initialize(m_doL2) );
+ ATH_CHECK( m_efResultKey.initialize(m_doEF) );
+ ATH_CHECK( m_hltResultKey.initialize(m_doHLT) );
+
return StatusCode::SUCCESS;
}
@@ -153,7 +145,7 @@ StatusCode TrigDecisionMaker::finalize()
}
-StatusCode TrigDecisionMaker::execute()
+StatusCode TrigDecisionMaker::execute(const EventContext& ctx) const
{
// increment event counter
m_nEvents++;
@@ -164,7 +156,7 @@ StatusCode TrigDecisionMaker::execute()
const HLT::HLTResult* efResult = 0;
const HLT::HLTResult* hltResult = 0;
- ResultStatus l1Stat = getL1Result(l1Result);
+ ResultStatus l1Stat = getL1Result(l1Result, ctx);
if (!l1Result) {
if (l1Stat == NotRequested ) m_l1_notReq++;
else if (l1Stat == SGError || l1Stat == ProcError) m_l1_error++;
@@ -172,7 +164,7 @@ StatusCode TrigDecisionMaker::execute()
}
else if (l1Result->isAccepted()) m_l1_passed++;
- ResultStatus l2Stat = getHLTResult(l2Result, L2);
+ ResultStatus l2Stat = getHLTResult(l2Result, L2, ctx);
if (!l2Result) {
if (l2Stat == NotRequested ) m_l2_notReq++;
else if (l2Stat == SGError || l2Stat == ProcError) m_l2_error++;
@@ -180,7 +172,7 @@ StatusCode TrigDecisionMaker::execute()
}
else if (l2Result->isAccepted()) m_l2_passed++;
- ResultStatus efStat = getHLTResult(efResult, EF);
+ ResultStatus efStat = getHLTResult(efResult, EF, ctx);
if (!efResult) {
if (efStat == NotRequested ) m_ef_notReq++;
else if (efStat == SGError || efStat == ProcError) m_ef_error++;
@@ -189,7 +181,7 @@ StatusCode TrigDecisionMaker::execute()
else if (efResult->isAccepted()) m_ef_passed++;
- ResultStatus hltStat = getHLTResult(hltResult, HLT);
+ ResultStatus hltStat = getHLTResult(hltResult, HLT, ctx);
if (!hltResult) {
if (hltStat == NotRequested ) m_hlt_notReq++;
else if (hltStat == SGError || hltStat == ProcError) m_hlt_error++;
@@ -204,7 +196,7 @@ StatusCode TrigDecisionMaker::execute()
return StatusCode::SUCCESS;
}
- TrigDecision* trigDec = new TrigDecision();
+ std::unique_ptr<TrigDecision> trigDec = std::make_unique<TrigDecision>();
trigDec->m_configMasterKey = m_trigConfigSvc->masterKey();
@@ -218,65 +210,49 @@ StatusCode TrigDecisionMaker::execute()
// get the bunch crossing id
- const EventInfo* eventInfo = 0;
- if ( evtStore()->retrieve(eventInfo).isFailure() ) {
- ATH_MSG_WARNING ( "Failed to retrieve event info" ) ;
- } else {
- const EventID* myEventID = eventInfo->event_ID();
- ATH_MSG_DEBUG ( "Run " << myEventID->run_number()
- << "; Event " << myEventID->event_number()
- << "; BC-ID " << myEventID->bunch_crossing_id() ) ;
- char x = getBGByte(myEventID->bunch_crossing_id());
- trigDec->m_bgCode = x;
- }
-
-
- std::string tdKey = updatedDecisionKey();
- StatusCode sc = evtStore()->record(trigDec, tdKey, true);
-
- if (sc.isFailure()) {
+ ATH_MSG_DEBUG ( "Run " << ctx.eventID().run_number()
+ << "; Event " << ctx.eventID().event_number()
+ << "; BC-ID " << ctx.eventID().bunch_crossing_id() ) ;
+ char x = getBGByte(ctx.eventID().bunch_crossing_id());
+ trigDec->m_bgCode = x;
+
+ SG::WriteHandle<TrigDecision> writeHandle{m_trigDecisionKey, ctx};
+ if (writeHandle.record(std::move(trigDec)).isFailure()) {
ATH_MSG_ERROR ( "Failed to record TrigDecision to StoreGate with key "
- << tdKey << "!" ) ;
+ << m_trigDecisionKey << "!" ) ;
m_td_error++;
return StatusCode::FAILURE;
}
ATH_MSG_DEBUG ( "Recorded TrigDecision to StoreGate with key = "
- << tdKey << "." ) ;
+ << m_trigDecisionKey << "." ) ;
return StatusCode::SUCCESS;
}
-TrigDecisionMaker::ResultStatus TrigDecisionMaker::getL1Result(const LVL1CTP::Lvl1Result*& result)
+TrigDecisionMaker::ResultStatus TrigDecisionMaker::getL1Result(const LVL1CTP::Lvl1Result*& result, const EventContext& ctx) const
{
result = 0;
if (!m_doL1) return NotRequested;
- if ( evtStore()->contains<LVL1CTP::Lvl1Result>("Lvl1Result") ) {
- if ( evtStore()->retrieve(result, "Lvl1Result").isFailure() ) {
- return SGError;
- }
+ SG::ReadHandle<LVL1CTP::Lvl1Result> l1RH{m_l1ResultKey, ctx};
+ if (l1RH.isValid()) {
+ result = l1RH.cptr();
return OK;
}
- if (!evtStore()->contains<ROIB::RoIBResult>(m_l1ResultKey)) {
+ SG::ReadHandle<ROIB::RoIBResult> l1roibRH{m_l1roibResultKey, ctx};
+ if (!l1roibRH.isValid()) {
+ result = nullptr;
ATH_MSG_WARNING ( "Trying to do L1, but RoIBResult not found" ) ;
return NotFound;
}
- const ROIB::RoIBResult* roIBResult = 0;
-
- StatusCode sc = evtStore()->retrieve(roIBResult, m_l1ResultKey);
+ const ROIB::RoIBResult* roIBResult = l1roibRH.cptr();
- if (sc.isFailure() || !roIBResult) {
- ATH_MSG_ERROR ( "Error retrieving RoIBResult from StoreGate" ) ;
- result = 0;
- return SGError;
- }
-
- ATH_MSG_DEBUG ( "Got ROIBResult from StoreGate with key " << m_l1ResultKey ) ;
+ ATH_MSG_DEBUG ( "Got ROIBResult from StoreGate with key " << m_l1roibResultKey ) ;
std::vector< std::unique_ptr<LVL1CTP::Lvl1Item> > itemConfig = m_lvl1Tool->makeLvl1ItemConfig();
@@ -292,7 +268,7 @@ TrigDecisionMaker::ResultStatus TrigDecisionMaker::getL1Result(const LVL1CTP::Lv
TrigDecisionMaker::ResultStatus TrigDecisionMaker::getHLTResult(const HLT::HLTResult*& result,
- TrigLevel level)
+ TrigLevel level, const EventContext& ctx) const
{
result = 0;
@@ -303,46 +279,25 @@ TrigDecisionMaker::ResultStatus TrigDecisionMaker::getHLTResult(const HLT::HLTRe
if ((level == L2 && !m_doL2) || (level == EF && !m_doEF) || (level == HLT && !m_doHLT)) return NotRequested;
- const std::string& key = (level == L2 ? m_l2ResultKey : (level == EF) ? m_efResultKey : m_hltResultKey);
+ const SG::ReadHandleKey<HLT::HLTResult>& key = (level == L2 ? m_l2ResultKey : (level == EF) ? m_efResultKey : m_hltResultKey);
- if (!evtStore()->contains<HLT::HLTResult>(key)) {
- ATH_MSG_WARNING ( "Trying to get HLT result, but not found with key "
- << key ) ;
- return NotFound;
- }
+ SG::ReadHandle<HLT::HLTResult> hltRH{key, ctx};
- StatusCode sc = evtStore()->retrieve(result, key);
- if (sc.isFailure()) {
+ if (!hltRH.isValid()) {
ATH_MSG_ERROR ( "Error retrieving HLTResult from StoreGate" ) ;
- result = 0;
+ result = nullptr;
return SGError;
}
+ result = hltRH.cptr();
+
ATH_MSG_DEBUG ( "Got HLTResult from StoreGate with key " << key ) ;
return OK;
}
-std::string TrigDecisionMaker::updatedDecisionKey()
-{
- std::string key = m_trigDecisionKey;
- bool alreadyThere = true;
-
- while (alreadyThere) {
- if (evtStore()->contains<TrigDecision>( key )) {
- ATH_MSG_WARNING ( key << " already exists: "
- << " using new key " << key << "+." ) ;
- key += "+";
- }
- else alreadyThere = false;
- }
-
- return key;
-}
-
-
-char TrigDecisionMaker::getBGByte(int BCId) {
+char TrigDecisionMaker::getBGByte(int BCId) const {
const TrigConf::BunchGroupSet* bgs = m_trigConfigSvc->bunchGroupSet();
if(!bgs) {
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
index b8a15bf63ef813421a54f19763b311abaf3533af..eb1a4e9c9200257493ca98739eca8ab64cec5170 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/src/TrigDecisionMaker.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**************************************************************************
@@ -27,7 +27,7 @@
#define TrigDecisionMaker_TrigDecisionMaker_H
// Base class
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
// core stuff
@@ -38,11 +38,14 @@
// trigger/configuration stuff
#include "TrigDecisionEvent/TrigDecision.h"
+#include "TrigT1Result/RoIBResult.h"
+
// containers
#include <vector>
#include <string>
#include <map>
+#include <atomic>
@@ -65,6 +68,7 @@ namespace TrigDec {
/**
* @class TrigDecisionMaker
+ * Note: Legacy class. Used to process Run 1 and Run 2 RAW data.
* - Algorithm-derived class to run after the Steering
* - Finds the list of defined signatures at initialization
* - For each event:
@@ -72,12 +76,13 @@ namespace TrigDec {
* * Fills it with the outcome of each defined signature
* * Stores it in StoreGate to be written to ESD/AOD
*
+ * @see TrigDecisionMakerMT
* @author Nicolas Berger <Nicolas.Berger@cern.ch> - CERN
* @author Till Eifert <Till.Eifert@cern.ch> - U. of Geneva, Switzerland
* @author Ricardo Goncalo <Jose.Goncalo@cern.ch> - Royal Holloway, U. of London
* @author Tomasz Bold <Tomasz.Bold@cern.ch> - UC Irvine - AGH-UST Krakow
*/
- class TrigDecisionMaker : public AthAlgorithm
+ class TrigDecisionMaker : public AthReentrantAlgorithm
{
enum ResultStatus { Unknown, OK, NotRequested, NotFound, SGError, ProcError }; //!< errorCode of trigger result retrieval
@@ -86,47 +91,43 @@ namespace TrigDec {
public:
TrigDecisionMaker(const std::string &name, ISvcLocator *pSvcLocator); //!< std Gaudi Algorithm constructor
- ~TrigDecisionMaker(); //!< std deconstructor
+ virtual ~TrigDecisionMaker(); //!< std deconstructor
// IAlgorithm virtual methods to implement
- StatusCode initialize(); //!< std Gaudi initialize method -> read-in trigger configuration
- StatusCode execute(); //!< std Gaudi execute method -> fill event-wise TrigDecision object, save in SG
- StatusCode finalize(); //!< std Gaudi finalize method -> print out statistics
-
- ResultStatus getL1Result (const LVL1CTP::Lvl1Result*& result); //!< retrieve LVL1 result (called in execute)
- ResultStatus getHLTResult(const HLT::HLTResult*& result, TrigLevel level); //!< retrieve HLT results (called in execute)
-
-
- std::string updatedDecisionKey(); //!< make sure, we're not using a SG key twice
-
- char getBGByte(int BCId); //!< to get the BG byte encoded for a given BC
+ virtual StatusCode initialize() override; //!< std Gaudi initialize method -> read-in trigger configuration
+ virtual StatusCode execute(const EventContext& ctx) const override; //!< std Gaudi execute method -> fill event-wise TrigDecision object, save in SG
+ virtual StatusCode finalize() override; //!< std Gaudi finalize method -> print out statistics
+ ResultStatus getL1Result (const LVL1CTP::Lvl1Result*& result, const EventContext& ctx) const; //!< retrieve LVL1 result (called in execute)
+ ResultStatus getHLTResult(const HLT::HLTResult*& result, TrigLevel level, const EventContext& ctx) const; //!< retrieve HLT results (called in execute)
+ char getBGByte(int BCId) const; //!< to get the BG byte encoded for a given BC
private:
- bool m_doL1; //!< flag whether or not to consider L1 trigger information
- bool m_doL2; //!< flag whether or not to consider L2 trigger information
- bool m_doEF; //!< flag whether or not to consider L3 (EF) trigger information
- bool m_doHLT;//!< flag whether or not to consider merged L2EF=HLT trigger information
+ Gaudi::Property<bool> m_doL1{this, "doL1", true, "flag whether or not to consider L1 trigger information"};
+ Gaudi::Property<bool> m_doL2{this, "doL2", true, "flag whether or not to consider L2 trigger information"};
+ Gaudi::Property<bool> m_doEF{this, "doEF", true, "flag whether or not to consider L3 (EF) trigger information"};
+ Gaudi::Property<bool> m_doHLT{this, "doHLT", true, "flag whether or not to consider merged L2EF=HLT trigger information"};
+
// bool m_doEvtInfo;
- std::string m_trigDecisionKey; //!< SG key to save the TrigDecision object
- std::string m_l1ResultKey; //!< SK key to retrieve the L1 result from SG
- std::string m_l2ResultKey; //!< SK key to retrieve the L2 result from SG
- std::string m_efResultKey; //!< SK key to retrieve the EF result from SG
- std::string m_hltResultKey; //!< SK key to retrieve the merged HLT result from SG
-// std::string m_evtInfoKey;
+ SG::WriteHandleKey<TrigDecision> m_trigDecisionKey{this, "TrigDecisionKey", "TrigDecision", "SG key to save the TrigDecision object" };
+ SG::ReadHandleKey<ROIB::RoIBResult> m_l1roibResultKey{this, "L1ROIBResultKey", "RoIBResult", "SK key to retrieve the L1 ROIB result from SG" };
+ SG::ReadHandleKey<LVL1CTP::Lvl1Result> m_l1ResultKey{this, "L1ResultKey", "Lvl1Result", "SK key to retrieve the L1 result from SG" };
+ SG::ReadHandleKey<HLT::HLTResult> m_l2ResultKey{this, "L2ResultKey", "HLTResult_L2", "SK key to retrieve the L2 result from SG" };
+ SG::ReadHandleKey<HLT::HLTResult> m_efResultKey{this, "EFResultKey", "HLTResult_EF", "SK key to retrieve the EF result from SG" };
+ SG::ReadHandleKey<HLT::HLTResult> m_hltResultKey{this, "HLTResultKey", "HLTResult_HLT", " SK key to retrieve the merged HLT result from SG" };
ServiceHandle<TrigConf::ITrigConfigSvc> m_trigConfigSvc; //!< handle to the full (L1 & HLT) trigger config service
ToolHandle<HLT::ILvl1ResultAccessTool> m_lvl1Tool; //!< tool to ease the access to the L1 results (RoIs, items, etc)
// For statistics
- unsigned int m_nEvents; //!< statistics: number of processed events
- unsigned int m_l1_error, m_l2_error, m_ef_error, m_hlt_error, m_td_error, m_td_skip; //!< statistics: error numbers
- unsigned int m_l1_notFound, m_l2_notFound, m_ef_notFound, m_hlt_notFound; //!< statistics: number of events where L1, HLT results were not found
- unsigned int m_l1_notReq, m_l2_notReq, m_ef_notReq, m_hlt_notReq; //!< statistics: number of events where something was not requested
- unsigned int m_l1_passed, m_l2_passed, m_ef_passed, m_hlt_passed; //!< statistics: number of events that passed the given trigger lvl
+ mutable std::atomic<unsigned int> m_nEvents; //!< statistics: number of processed events
+ mutable std::atomic<unsigned int> m_l1_error, m_l2_error, m_ef_error, m_hlt_error, m_td_error, m_td_skip; //!< statistics: error numbers
+ mutable std::atomic<unsigned int> m_l1_notFound, m_l2_notFound, m_ef_notFound, m_hlt_notFound; //!< statistics: number of events where L1, HLT results were not found
+ mutable std::atomic<unsigned int> m_l1_notReq, m_l2_notReq, m_ef_notReq, m_hlt_notReq; //!< statistics: number of events where something was not requested
+ mutable std::atomic<unsigned int> m_l1_passed, m_l2_passed, m_ef_passed, m_hlt_passed; //!< statistics: number of events that passed the given trigger lvl
};
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
index 67dd0cdfe9efcb765d14ec61529377082223b44b..2345a707675093604be779cbfadcc1f30994ebd0 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/CacheGlobalMemory.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**********************************************************************************
@@ -333,6 +333,11 @@ bool Trig::CacheGlobalMemory::assert_decision() {
ATH_MSG_VERBOSE("asserting decision with unpacker " << m_unpacker);
// here we unpack the decision. Note: the navigation will be unpacked only on demand (see navigation())
+ bool contains_xAOD_decision = false;
+ bool is_l1result_configured = false;
+ bool contains_decision = false;
+ bool contains_old_event_info = false;
+
if(!m_unpacker){
ATH_MSG_INFO("decision not set on first (?) assert. deciding how to unpack");
@@ -342,16 +347,12 @@ bool Trig::CacheGlobalMemory::assert_decision() {
//we're hardcoding in order not to require python configuration changes
const EventContext context = Gaudi::Hive::currentContext();
- bool contains_xAOD_decision = false;
if (!m_decisionKeyPtr->empty()) {
SG::ReadHandle<xAOD::TrigDecision> decisionReadHandle = SG::makeHandle(*m_decisionKeyPtr, context);
contains_xAOD_decision = decisionReadHandle.isValid();
}
#ifndef XAOD_ANALYSIS
- bool is_l1result_configured = false;
- bool contains_decision = false;
- bool contains_old_event_info = false;
if (!m_oldDecisionKeyPtr->empty()) {
SG::ReadHandle<TrigDec::TrigDecision> oldDecisionReadHandle = SG::makeHandle(*m_oldDecisionKeyPtr, context);
@@ -393,10 +394,18 @@ bool Trig::CacheGlobalMemory::assert_decision() {
ATH_MSG_ERROR("No source of Trigger Decision in file. "
<< "(Looked for xAOD::TrigDecision? "
<< (m_decisionKeyPtr->empty() ? "NO" : "YES")
- << " Looked for old TrigDec::TrigDecision? "
+ << ", has xAOD::TrigDecision? "
+ << (contains_xAOD_decision ? "YES" : "NO")
+ << ". Looked for old TrigDec::TrigDecision? "
<< (m_oldDecisionKeyPtr->empty() ? "NO" : "YES")
- << ", looked for old EventInfo? "
+ << ", has TrigDec::TrigDecision? "
+ << (contains_decision ? "YES" : "NO")
+ << ", TrigDec::TrigDecision has L1? "
+ << (is_l1result_configured ? "YES" : "NO")
+ << ". Looked for old EventInfo? "
<< (m_oldEventInfoKeyPtr->empty() ? "NO" : "YES")
+ << ", has old EventInto? "
+ << (contains_old_event_info ? "YES" : "NO")
<< ". Check UseRun1DecisionFormat and UseOldEventInfoDecisionFormat flags if reading pre-xAOD or BS input).");
throw std::runtime_error("Trig::CacheGlobalMemory::assert_decision(): No source of Trigger Decision in file.");
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx b/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
index fbf0c1d35716c16d063a0e954ef458ab17a4b244..d1b00685ed246b74dc73c0ebf2d503214d723930 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/Root/TrigDecisionTool.cxx
@@ -59,7 +59,7 @@ Trig::TrigDecisionTool::TrigDecisionTool(const std::string& name) :
#ifndef XAOD_STANDALONE
//just for Athena/AthAnalysisBase
auto props = getProperties();
- for( Property* prop : props ) {
+ for( Gaudi::Details::PropertyBase* prop : props ) {
if( prop->name() != "OutputLevel" ) {
continue;
}
@@ -72,7 +72,7 @@ Trig::TrigDecisionTool::TrigDecisionTool(const std::string& name) :
}
#ifndef XAOD_STANDALONE
-void Trig::TrigDecisionTool::outputlevelupdateHandler(Property& /*p*/) {
+void Trig::TrigDecisionTool::outputlevelupdateHandler(Gaudi::Details::PropertyBase& /*p*/) {
//call the original update handler
Logger::msg().setLevel(AthMessaging::msg().level());
}
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.icc b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.icc
index 43d822bf279cfef18502209ebdd4cdbe2d1fda54..24065ca93391e50715290b985fedaf66f2635ecd 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.icc
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.icc
@@ -16,7 +16,7 @@ std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::ChainGroup::feature
ATH_MSG_ERROR("featureCollectionMode may only be called with: "
"TrigDefs::lastFeatureOfType - stop exploring each route through the navigation once a feature matching all requirements is found. "
"TrigDefs::allFeaturesOfType - always fully explore each route throught the navigation graph and collect all matching features.");
- errState = true;
+ errState = true;
}
// TODO when we decide what happens to CacheGlobalMemory - this needs to be updated to use a ReadHandle
@@ -47,7 +47,7 @@ std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::ChainGroup::feature
}
// For each chain, collect Navigation information
- std::vector< ElementLinkVector<TrigCompositeUtils::DecisionContainer> > allLinearNavigationPaths;
+ TrigCompositeUtils::NavGraph navGraph;
// Loop over HLT chains
TrigCompositeUtils::DecisionIDContainer chainIDs;
@@ -59,10 +59,10 @@ std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::ChainGroup::feature
// Obtain navigation routes for passed chains
// Final parameter TRUE as the chain passed (has its ID in terminusNode)
- TrigCompositeUtils::recursiveGetDecisions(terminusNode, allLinearNavigationPaths, fchain->getChainHashId(), true);
+ TrigCompositeUtils::recursiveGetDecisions(terminusNode, navGraph, fchain->getChainHashId(), true);
- ATH_MSG_DEBUG("Added all passed navigation paths for chain " << fchain->getChainName()
- << ", total paths:" << allLinearNavigationPaths.size());
+ ATH_MSG_DEBUG("Added all passed navigation data for chain " << fchain->getChainName()
+ << ", total nodes:" << navGraph.nodes() << " total edges:" << navGraph.edges());
if (condition == TrigDefs::includeFailedDecisions) {
std::vector<const TrigCompositeUtils::Decision*> rejectedDecisionNodes =
@@ -73,11 +73,11 @@ std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::ChainGroup::feature
for (const TrigCompositeUtils::Decision* rejectedNode : rejectedDecisionNodes) {
// Final parameter FALSE as the chain failed here (its ID was removed from rejectedNode)
- TrigCompositeUtils::recursiveGetDecisions(rejectedNode, allLinearNavigationPaths, fchain->getChainHashId(), false);
+ TrigCompositeUtils::recursiveGetDecisions(rejectedNode, navGraph, fchain->getChainHashId(), false);
}
- ATH_MSG_DEBUG("Added all failed navigation paths for chain " << fchain->getChainName()
- << ", total paths:" << allLinearNavigationPaths.size());
+ ATH_MSG_DEBUG("Added all failed navigation data for chain " << fchain->getChainName()
+ << ", total nodes:" << navGraph.nodes() << " total edges:" << navGraph.edges());
}
} else {
@@ -85,23 +85,19 @@ std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::ChainGroup::feature
}
}
- if (allLinearNavigationPaths.size() == 0) {
- ATH_MSG_DEBUG("No navigation paths found for this chain group of " << names().size() << " chains.");
+ if (navGraph.edges() == 0) {
+ ATH_MSG_DEBUG("No navigation path data found for this chain group of " << names().size() << " chains. "
+ << "Total nodes:" << navGraph.nodes() << " total edges:" << navGraph.edges());
}
if (msg().level() <= MSG::VERBOSE) {
- size_t count = 0;
- for (const ElementLinkVector<TrigCompositeUtils::DecisionContainer>& path : allLinearNavigationPaths) {
- ATH_MSG_VERBOSE("Printing path " << ++count << " of " << allLinearNavigationPaths.size() << ", path has " << path.size() << " elements.");
- for (const ElementLink<TrigCompositeUtils::DecisionContainer>& node : path) {
- ATH_MSG_VERBOSE(" -- " << node.dataID() << " #" << node.index());
- }
- }
+ navGraph.printAllPaths(msg(), MSG::VERBOSE);
}
const bool lastFeatureOfTypeFlag = (featureCollectionMode == TrigDefs::lastFeatureOfType);
+
std::vector<TrigCompositeUtils::LinkInfo<CONTAINER>> returnVector =
- TrigCompositeUtils::getFeaturesOfType<CONTAINER>(allLinearNavigationPaths, containerSGKey, lastFeatureOfTypeFlag, navElementLinkKey, chainIDs);
+ TrigCompositeUtils::recursiveGetFeaturesOfType<CONTAINER>(navGraph, containerSGKey, lastFeatureOfTypeFlag, navElementLinkKey, chainIDs);
// Check for missing navigation data if requesting the default "feature" links
if (navElementLinkKey == TrigCompositeUtils::featureString()) {
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
index 7fd995200016669975644e934985b4d5764494bc..6316ea07216f1048cfa9027459ea9c312af2aea2 100755
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/TrigDecisionTool.h
@@ -87,7 +87,7 @@ namespace Trig {
StatusCode finalize();
#ifndef XAOD_STANDALONE
- void outputlevelupdateHandler(Property& p); //propagates outputlevel changes to the Logger
+ void outputlevelupdateHandler(Gaudi::Details::PropertyBase& p); //propagates outputlevel changes to the Logger
#endif
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
index f7d0bb03f6cd4412c58c97abb7662c997c75785a..2d84ad00cf51de0a4cf527f824ec8ada18591a32 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaAnalysisBaseTool.cxx
@@ -95,7 +95,7 @@ TrigEgammaAnalysisBaseTool( const std::string& myname )
m_forceTrigEmulation=false;
}
-void TrigEgammaAnalysisBaseTool::updateDetail(Property& /*p*/){
+void TrigEgammaAnalysisBaseTool::updateDetail(Gaudi::Details::PropertyBase& /*p*/){
plot()->setDetail(m_detailedHists);
// Detail for tools needs to be reset for every call in Analysis
for( auto& tool : m_tools) {
@@ -103,18 +103,18 @@ void TrigEgammaAnalysisBaseTool::updateDetail(Property& /*p*/){
}
}
-void TrigEgammaAnalysisBaseTool::updateAltBinning(Property& /*p*/){
+void TrigEgammaAnalysisBaseTool::updateAltBinning(Gaudi::Details::PropertyBase& /*p*/){
plot()->setAltBinning(m_doJpsiee);
}
-void TrigEgammaAnalysisBaseTool::updateTP(Property& /*p*/){
+void TrigEgammaAnalysisBaseTool::updateTP(Gaudi::Details::PropertyBase& /*p*/){
plot()->setTP(m_tp);
for( auto& tool : m_tools) {
tool->setTP(m_tp);
}
}
-void TrigEgammaAnalysisBaseTool::updateEmulation(Property& /*p*/){
+void TrigEgammaAnalysisBaseTool::updateEmulation(Gaudi::Details::PropertyBase& /*p*/){
// This may not be set yet if we're in the middle of initialization.
if (!m_plot.typeAndName().empty()) {
plot()->setEmulation(m_doEmulation);
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
index 7b0ad509deff173e7852aea5b5a1a4e6c1c87658..c7101507a40c13c141de18831200f9b73ac55460 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/TrigEgammaAnalysisTools/TrigEgammaAnalysisBaseTool.h
@@ -93,11 +93,11 @@ ASG_TOOL_CLASS(TrigEgammaAnalysisBaseTool, ITrigEgammaAnalysisBaseTool)
private:
/*! Property update handlers */
- void updateDetail(Property& p);
- void updateAltBinning(Property& p);
- void updateTP(Property& p);
- void updateEmulation(Property& p);
- void updateOutputLevel(Property& p);
+ void updateDetail(Gaudi::Details::PropertyBase& p);
+ void updateAltBinning(Gaudi::Details::PropertyBase& p);
+ void updateTP(Gaudi::Details::PropertyBase& p);
+ void updateEmulation(Gaudi::Details::PropertyBase& p);
+ void updateOutputLevel(Gaudi::Details::PropertyBase& p);
std::string m_msg;
/*! creates map of trigger name and TrigInfo struct */
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaAnalysisAlg.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaAnalysisAlg.cxx
index 5bfd6fa6889cae937e2fd9df067f7832522afad1..60316f519ebfcbb7c3f44e8af573bc9f25e9f46c 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaAnalysisAlg.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaAnalysisAlg.cxx
@@ -5,7 +5,7 @@
// TrigEgammaAnalysisAlg.cxx
#include "TrigEgammaAnalysisAlg.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaAnalysisTools/ITrigEgammaAnalysisBaseTool.h"
#include "AsgTools/AsgTool.h"
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
index 238827bf56af669266ff168ede25f594f8876c3d..8408cf31a0e7fb658ffad63f4627a7df7c07b0dc 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/src/TrigEgammaTDToolTest.cxx
@@ -5,7 +5,7 @@
// TrigEgammaTDToolTest.cxx
#include "TrigEgammaTDToolTest.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODEgamma/ElectronContainer.h"
#include "xAODEgamma/PhotonContainer.h"
using std::string;
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
index ae81fc078d2d2e979baf5f3097af126a6d8fed4d..7811bed28011b01eb252f3a950424c45ee387099 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolAlg.cxx
@@ -3,7 +3,7 @@
*/
#include "TrigEgammaEmulationToolAlg.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTrigger/EmTauRoI.h"
#include "xAODTrigCalo/TrigEMCluster.h"
#include "xAODTrigRinger/TrigRingerRings.h"
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
index 73f48b44219399952ce50bb2258ae0bbe6a02abb..f756e23e78cb4fad95ddc7551639c4df70760f0a 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/src/TrigEgammaEmulationToolTest.cxx
@@ -5,7 +5,7 @@
// TrigEgammaMatchingToolTest.cxx
#include "TrigEgammaEmulationToolTest.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTrigger/EmTauRoI.h"
#include "xAODTrigCalo/TrigEMCluster.h"
#include "xAODTrigRinger/TrigRingerRings.h"
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingToolMT.h b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingToolMT.h
index 0d08ee8f4346b78755e2c50b76041bd37253b31e..4a8400b3578b11fef161cce9e0c5276cdb4fcdf9 100644
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingToolMT.h
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/TrigEgammaMatchingTool/TrigEgammaMatchingToolMT.h
@@ -5,7 +5,7 @@
#ifndef TrigEgammaMatchingToolMT_H
#define TrigEgammaMatchingToolMT_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AsgTools/AsgTool.h"
#include "AsgTools/ToolHandle.h"
#include "TrigDecisionTool/TrigDecisionTool.h"
diff --git a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolTest.cxx b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolTest.cxx
index 139d2fcd2bcf4b2a89aeae48b72fe7d8cb980e1f..d70be807b1ed7fa8d05fb65a2ff38d90ab64c6f3 100644
--- a/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolTest.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaMatchingTool/src/TrigEgammaMatchingToolTest.cxx
@@ -5,7 +5,7 @@
// TrigEgammaMatchingToolTest.cxx
#include "TrigEgammaMatchingToolTest.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
using std::string;
//**********************************************************************
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
index 183061cf891c625d86067ee49aa894f95912d41a..016b3d536c6b464e13640fa9106d513f42d2f996 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfigMT_Ntuple.cxx
@@ -38,7 +38,7 @@ void remove_duplicates(std::vector<T>& vec) {
void AnalysisConfigMT_Ntuple::loop() {
- m_provider->msg(MSG::INFO) << "[91;1m" << "AnalysisConfig_Ntuple::loop() for " << m_analysisInstanceName
+ m_provider->msg(MSG::DEBUG) << "[91;1m" << "AnalysisConfig_Ntuple::loop() for " << m_analysisInstanceName
<< " compiled " << __DATE__ << " " << __TIME__ << "\t: " << date() << "[m" << endmsg;
// get (offline) beam position
@@ -56,6 +56,7 @@ void AnalysisConfigMT_Ntuple::loop() {
ybeam = vertex[1];
zbeam = vertex[2];
+ /// leave this code commented here - useful for debugging
// m_provider->msg(MSG::INFO) << " using beam position\tx=" << xbeam << "\ty=" << ybeam << "\tz=" << zbeam <<endmsg;
beamline.push_back(xbeam);
beamline.push_back(ybeam);
@@ -102,11 +103,15 @@ void AnalysisConfigMT_Ntuple::loop() {
std::vector<std::string> configuredChains = (*m_tdt)->getListOfTriggers("L2_.*, EF_.*, HLT_.*");
- m_provider->msg(MSG::VERBOSE) << "[91;1m" << configuredChains.size() << " Configured Chains" << "[m" << endmsg;
+ if (m_provider->msg().level() <= MSG::VERBOSE) {
+ m_provider->msg(MSG::VERBOSE) << "[91;1m" << configuredChains.size() << " Configured Chains" << "[m" << endmsg;
+ }
+
for ( unsigned i=0 ; i<configuredChains.size() ; i++ ) {
- // m_provider->msg(MSG::VERBOSE) << "[91;1m" << "Chain " << configuredChains[i] << " (ACN)[m" << endmsg;
+ if (m_provider->msg().level() <= MSG::VERBOSE) {
+ m_provider->msg(MSG::VERBOSE) << "[91;1m" << "Chain " << configuredChains[i] << " (ACN)[m" << endmsg;
+ }
configuredHLTChains.insert( configuredChains[i] );
-
}
tida_first = false;
@@ -207,9 +212,9 @@ void AnalysisConfigMT_Ntuple::loop() {
mu_val = pEventInfo->averageInteractionsPerCrossing();
}
- m_provider->msg(MSG::INFO) << "run " << run_number
- << "\tevent " << event_number
- << "\tlb " << lumi_block << endmsg;
+ m_provider->msg(MSG::DEBUG) << "run " << run_number
+ << "\tevent " << event_number
+ << "\tlb " << lumi_block << endmsg;
m_event->run_number(run_number);
m_event->event_number(event_number);
@@ -243,7 +248,7 @@ void AnalysisConfigMT_Ntuple::loop() {
int passed_chains = 0;
- m_provider->msg(MSG::INFO) << "Checking " << m_chainNames.size() << " chains" << endmsg;
+ m_provider->msg(MSG::DEBUG) << "Checking " << m_chainNames.size() << " chains" << endmsg;
if ( m_chainNames.empty() ) {
m_provider->msg(MSG::WARNING) << "No chains to check" << endmsg;
@@ -273,7 +278,7 @@ void AnalysisConfigMT_Ntuple::loop() {
bool passPhysics = (*m_tdt)->isPassed(chainName);
- m_provider->msg(MSG::INFO) << "Chain " << chainName << "\troi " << roistring
+ m_provider->msg(MSG::DEBUG) << "Chain " << chainName << "\troi " << roistring
<< "\tpres " << (*m_tdt)->getPrescale(chainName)
<< ( passPhysics ? "[91;1m" : "" ) << "\tpass physics " << passPhysics << ( passPhysics ? "[m" : "" )
<< "\t: ( pass " << (*m_tdt)->isPassed(chainName, decisiontype_ ) << "\tdec type " << decisiontype_ << " ) " << endmsg;
@@ -290,12 +295,12 @@ void AnalysisConfigMT_Ntuple::loop() {
/// bomb out if no chains passed and not told to keep all events and found no
/// offline objects
if ( !analyse && !m_keepAllEvents && !foundOffline ) {
- m_provider->msg(MSG::INFO) << "No chains passed unprescaled - not processing this event: " << run_number << " " << event_number << " " << lumi_block << endmsg;
+ m_provider->msg(MSG::DEBUG) << "No chains passed unprescaled - not processing this event: " << run_number << " " << event_number << " " << lumi_block << endmsg;
return;
}
- m_provider->msg(MSG::INFO) << "Chains passed " << passed_chains << endmsg;
+ m_provider->msg(MSG::DEBUG) << "Chains passed " << passed_chains << endmsg;
/// for Monte Carlo get the truth particles if requested to do so
@@ -304,11 +309,11 @@ void AnalysisConfigMT_Ntuple::loop() {
selectorTruth.clear();
- m_provider->msg(MSG::INFO) << "MC Truth flag " << m_mcTruth << endmsg;
+ m_provider->msg(MSG::DEBUG) << "MC Truth flag " << m_mcTruth << endmsg;
const TrigInDetTrackTruthMap* truthMap = 0;
bool foundTruth = false;
if ( m_mcTruth && m_TruthPdgId!=15) {
- m_provider->msg(MSG::INFO) << "getting Truth" << endmsg;
+ m_provider->msg(MSG::DEBUG) << "getting Truth" << endmsg;
if ( m_provider->evtStore()->retrieve(truthMap, "TrigInDetTrackTruthMap").isFailure()) {
m_hasTruthMap = false;
}
@@ -353,7 +358,7 @@ void AnalysisConfigMT_Ntuple::loop() {
if ( m_mcTruth && !foundTruth ) {
- m_provider->msg(MSG::INFO) << "getting Truth" << endmsg;
+ m_provider->msg(MSG::DEBUG) << "getting Truth" << endmsg;
/// selectTracks<TruthParticleContainer>( &selectorTruth, "INav4MomTruthEvent" );
@@ -369,22 +374,22 @@ void AnalysisConfigMT_Ntuple::loop() {
for ( int ik=0 ; ik<4 ; ik++ ) {
- m_provider->msg(MSG::INFO) << "Try McEventCollection: " << collectionNames[ik] << endmsg;
+ m_provider->msg(MSG::DEBUG) << "Try McEventCollection: " << collectionNames[ik] << endmsg;
if (!m_provider->evtStore()->contains<McEventCollection>(collectionNames[ik]) ) {
- m_provider->msg(MSG::INFO) << "No McEventCollection: " << collectionNames[ik] << endmsg;
+ m_provider->msg(MSG::DEBUG) << "No McEventCollection: " << collectionNames[ik] << endmsg;
continue;
}
- m_provider->msg(MSG::INFO) << "evtStore()->retrieve( mcevent, " << collectionNames[ik] << " )" << endmsg;
+ m_provider->msg(MSG::DEBUG) << "evtStore()->retrieve( mcevent, " << collectionNames[ik] << " )" << endmsg;
if ( m_provider->evtStore()->retrieve( mcevent, collectionNames[ik] ).isFailure() ) {
- m_provider->msg(MSG::INFO) << "Failed to get McEventCollection: " << collectionNames[ik] << endmsg;
+ m_provider->msg(MSG::DEBUG) << "Failed to get McEventCollection: " << collectionNames[ik] << endmsg;
}
else {
// found this collectionName
collectionName = collectionNames[ik];
- m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << endmsg;
+ m_provider->msg(MSG::DEBUG) << "Found McEventCollection: " << collectionName << endmsg;
foundcollection = true;
break;
}
@@ -409,7 +414,7 @@ void AnalysisConfigMT_Ntuple::loop() {
/// it's not at all tidy, and should be rewritten,
/// but probably never will be
- m_provider->msg(MSG::INFO) << "Found McEventCollection: " << collectionName << "\tNevents " << mcevent->size() << endmsg;
+ m_provider->msg(MSG::DEBUG) << "Found McEventCollection: " << collectionName << "\tNevents " << mcevent->size() << endmsg;
/// count the number of interactions of each sort
/// this is actually *very stupid*, there are a *lot*
@@ -472,9 +477,9 @@ void AnalysisConfigMT_Ntuple::loop() {
}
}
- m_provider->msg(MSG::INFO) << "Found " << ip << " TruthParticles (GenParticles) in " << ie_ip << " GenEvents out of " << ie << endmsg;
+ m_provider->msg(MSG::DEBUG) << "Found " << ip << " TruthParticles (GenParticles) in " << ie_ip << " GenEvents out of " << ie << endmsg;
- m_provider->msg(MSG::INFO) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endmsg;
+ m_provider->msg(MSG::DEBUG) << "selected " << selectorTruth.size() << " TruthParticles (GenParticles)" << endmsg;
////////////////////////////////////////////////////////////////////////////////////////
@@ -494,7 +499,7 @@ void AnalysisConfigMT_Ntuple::loop() {
/// get offline tracks
- m_provider->msg(MSG::INFO) << " Offline tracks " << endmsg;
+ m_provider->msg(MSG::DEBUG) << " Offline tracks " << endmsg;
selectorRef.clear();
@@ -525,7 +530,7 @@ void AnalysisConfigMT_Ntuple::loop() {
if ( xaodVtxCollection!=0 ) {
- m_provider->msg(MSG::INFO) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endmsg;
+ m_provider->msg(MSG::DEBUG) << "xAOD Primary vertex container " << xaodVtxCollection->size() << " entries" << endmsg;
xAOD::VertexContainer::const_iterator vtxitr = xaodVtxCollection->begin();
@@ -681,11 +686,11 @@ void AnalysisConfigMT_Ntuple::loop() {
std::vector<TIDA::Vertex> tidavertices;
- m_provider->msg(MSG::INFO) << "\tFetch xAOD::VertexContainer with key " << vtx_name << endmsg;
+ m_provider->msg(MSG::DEBUG) << "\tFetch xAOD::VertexContainer with key " << vtx_name << endmsg;
if ( vtx_name!="" ) {
- m_provider->msg(MSG::INFO) << "\tFetch xAOD::VertexContainer with key " << vtx_name << endmsg;
+ m_provider->msg(MSG::DEBUG) << "\tFetch xAOD::VertexContainer with key " << vtx_name << endmsg;
/// MT Vertex access
@@ -697,8 +702,8 @@ void AnalysisConfigMT_Ntuple::loop() {
if ( xaodVtxCollection!=0 ) {
- m_provider->msg(MSG::INFO) << "\txAOD::VertexContainer found with size " << xaodVtxCollection->size()
- << "\t" << vtx_name << endmsg;
+ m_provider->msg(MSG::DEBUG) << "\txAOD::VertexContainer found with size " << xaodVtxCollection->size()
+ << "\t" << vtx_name << endmsg;
xAOD::VertexContainer::const_iterator vtxitr = xaodVtxCollection->begin();
@@ -755,7 +760,7 @@ void AnalysisConfigMT_Ntuple::loop() {
int Ntest = selectorTest.tracks().size();
- m_provider->msg(MSG::INFO) << "collection " << collectionname << "\ttest tracks.size() " << Ntest << endmsg;
+ m_provider->msg(MSG::DEBUG) << "collection " << collectionname << "\ttest tracks.size() " << Ntest << endmsg;
for ( int ii=Ntest ; ii-- ; ) m_provider->msg(MSG::DEBUG) << " test track " << ii << " " << *selectorTest.tracks()[ii] << endmsg;
}
}
@@ -821,7 +826,7 @@ void AnalysisConfigMT_Ntuple::loop() {
/// get muons
for ( size_t imuon=0 ; imuon<m_muonType.size() ; imuon++ ) {
- m_provider->msg(MSG::INFO) << "fetching offline muons " << endmsg;
+ m_provider->msg(MSG::DEBUG) << "fetching offline muons " << endmsg;
int muonType = -1;
for ( int it=0 ; it<5 ; it++ ) if ( m_muonType[imuon] == MuonRef[it] ) muonType=it;
@@ -833,7 +838,7 @@ void AnalysisConfigMT_Ntuple::loop() {
Nmu += Nmu_;
- m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endmsg;
+ m_provider->msg(MSG::DEBUG) << "found " << Nmu << " offline muons " << endmsg;
std::string mchain = "Muons";
if ( m_muonType[imuon]!="" ) mchain += "_" + m_muonType[imuon];
@@ -853,7 +858,7 @@ void AnalysisConfigMT_Ntuple::loop() {
}
m_provider->msg(MSG::DEBUG) << "ref muon tracks.size() " << selectorRef.tracks().size() << endmsg;
- for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endmsg;
+ for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::DEBUG) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endmsg;
}
@@ -862,20 +867,20 @@ void AnalysisConfigMT_Ntuple::loop() {
/// get muons
if ( m_doMuonsSP ) {
- m_provider->msg(MSG::INFO) << "fetching offline muons " << endmsg;
+ m_provider->msg(MSG::DEBUG) << "fetching offline muons " << endmsg;
int muonType = 0;
Nmu += processMuons( selectorRef, muonType );
- m_provider->msg(MSG::INFO) << "found " << Nmu << " offline muons " << endmsg;
+ m_provider->msg(MSG::DEBUG) << "found " << Nmu << " offline muons " << endmsg;
m_event->addChain("MuonsSP");
m_event->back().addRoi(TIDARoiDescriptor(true));
m_event->back().back().addTracks(selectorRef.tracks());
m_provider->msg(MSG::DEBUG) << "ref muon tracks.size() " << selectorRef.tracks().size() << endmsg;
- for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::INFO) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endmsg;
+ for ( int ii=selectorRef.tracks().size() ; ii-- ; ) m_provider->msg(MSG::DEBUG) << " ref muon track " << ii << " " << *selectorRef.tracks()[ii] << endmsg;
}
@@ -934,7 +939,7 @@ void AnalysisConfigMT_Ntuple::loop() {
/// useful debug information 0 leave here
// std::cout << "SUTT Ntaus: " << Ntau << std::endl;
- if ( Nmu==0 && Noff==0 && Nel==0 && Ntau==0 ) m_provider->msg(MSG::INFO) << "No offline objects found " << endmsg;
+ if ( Nmu==0 && Noff==0 && Nel==0 && Ntau==0 ) m_provider->msg(MSG::DEBUG) << "No offline objects found " << endmsg;
else foundOffline = true;
@@ -998,7 +1003,7 @@ void AnalysisConfigMT_Ntuple::loop() {
roist = comb->get<TrigRoiDescriptor>( roi_name_tmp, decisiontype_, roi_tename );
if ( roist.size()>0 ) {
- for ( unsigned ir=0 ; ir<roist.size() ; ir++ ) m_provider->msg(MSG::INFO) << "\t\tRetrieved roi " << roi_name << "\t" << *roist[ir].cptr() << endmsg;
+ for ( unsigned ir=0 ; ir<roist.size() ; ir++ ) m_provider->msg(MSG::DEBUG) << "\t\tRetrieved roi " << roi_name << "\t" << *roist[ir].cptr() << endmsg;
}
else {
m_provider->msg(MSG::WARNING) << "\t\tRequested roi " << roi_name << " not found" << endmsg;
@@ -1049,6 +1054,9 @@ void AnalysisConfigMT_Ntuple::loop() {
const ElementLink<TrigRoiDescriptorCollection> roi_link = roi_info.link;
+ /// check this is not a spurious TDT match
+ if ( roi_key!="" && roi_link.dataID()!=roi_key ) continue;
+
const TrigRoiDescriptor* const* roiptr = roi_link.cptr();
if ( roiptr == 0 ) {
@@ -1064,13 +1072,8 @@ void AnalysisConfigMT_Ntuple::loop() {
/// get the tracks
- //////////////////////////////////
- /// useful cocumentation line ...
- /// std::string keys[5] = { "TrigJetRec", "TrigSplitJet", "TrigSuperRoi", "forID", "" };
-
- // m_provider->msg(MSG::INFO) << "using chain roi " << *roid << endmsg;
- m_provider->msg(MSG::INFO) << "TIDARoi " << *roi_tmp << "\tcollectionName: " << collectionName << endmsg;
+ m_provider->msg(MSG::VERBOSE) << "TIDARoi " << *roi_tmp << "\tcollectionName: " << collectionName << endmsg;
/// this should *never* be the case, and we should only run this
/// bit of code once the first time round the loop anyhow
@@ -1080,7 +1083,11 @@ void AnalysisConfigMT_Ntuple::loop() {
if ( chainName.find("HLT_")!=std::string::npos ) {
if ( selectTracks<xAOD::TrackParticleContainer>( &selectorTest, roi_link, collectionName ) );
- else m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endmsg;
+ else {
+ if (m_provider->msg().level() <= MSG::DEBUG) {
+ m_provider->msg(MSG::WARNING) << "\tNo track collection " << collectionName << " found" << endmsg;
+ }
+ }
}
/// fetch vertices if available ...
@@ -1089,7 +1096,7 @@ void AnalysisConfigMT_Ntuple::loop() {
if ( vtx_name!="" ) {
- m_provider->msg(MSG::INFO) << "\tFetch xAOD::VertexContainer for chain " << chainName << " with key " << vtx_name << endmsg;
+ m_provider->msg(MSG::DEBUG) << "\tFetch xAOD::VertexContainer for chain " << chainName << " with key " << vtx_name << endmsg;
/// MT Vertex access
@@ -1101,7 +1108,7 @@ void AnalysisConfigMT_Ntuple::loop() {
}
else {
- m_provider->msg(MSG::INFO) << "\txAOD::VertexContainer found with size " << (vtx_itrpair.second - vtx_itrpair.first)
+ m_provider->msg(MSG::DEBUG) << "\txAOD::VertexContainer found with size " << (vtx_itrpair.second - vtx_itrpair.first)
<< "\t" << vtx_name << endmsg;
xAOD::VertexContainer::const_iterator vtxitr = vtx_itrpair.first;
@@ -1177,9 +1184,6 @@ void AnalysisConfigMT_Ntuple::loop() {
if ( beamline_online.size()>3 ) chain.back().addUserData(beamline_online);
}
-
- // m_provider->msg(MSG::INFO) << " done" << endmsg;
-
if ( roi_tmp ) delete roi_tmp;
roi_tmp = 0;
}
@@ -1279,7 +1283,6 @@ void AnalysisConfigMT_Ntuple::loop() {
#endif
- // if ( m_printInfo ) m_provider->msg(MSG::INFO) << "FILL TREE\n" << (*m_event) << endmsg;
if ( mTree ) mTree->Fill();
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
index 1914de2f9f60ce764323c12c0f948e8eed08c2c4..30fb216dc24d3408352de4919a6e33ce84459a9f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
@@ -51,6 +51,8 @@ void Analysis_Tier0::initialise() {
addHistogram(h_chain);
/// variable width bins for track occupancy
+
+#if 0
double vnbins[81] = {
-0.5,
@@ -75,10 +77,27 @@ void Analysis_Tier0::initialise() {
185.5,
192.5,
200.5 };
+#endif
-
-
- h_ntrk = new TH1F( "reftrk_N", "Reference tracks", 80, vnbins );
+ double vnbins[101] = {
+ -0.5,
+ 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 17.5, 18.5, 19.5, 21.5,
+ 23.5, 24.5, 26.5, 28.5, 30.5, 32.5, 35.5, 37.5, 40.5, 43.5, 46.5, 50.5, 53.5, 57.5, 61.5, 66.5, 71.5, 76.5, 81.5, 87.5,
+ 93.5, 100.5, 107.5, 114.5, 123.5, 131.5, 141.5, 150.5, 161.5, 172.5, 185.5, 198.5, 211.5, 226.5, 242.5, 259.5, 277.5, 297.5, 317.5, 340.5,
+ 363.5, 389.5, 416.5, 445.5, 476.5, 509.5,
+ 544.5, 582.5, 623.5, 666.5, 713.5, 762.5, 815.5, 872.5, 933.5, 998.5, 1067.5,
+ 1141.5, 1221.5, 1305.5, 1396.5, 1493.5, 1597.5,
+ 1708.5, 1827.5, 1953.5, 2089.5,
+ 2234.5, 2389.5, 2555.5,
+ 2733.5, 2923.5, 3125.5,
+ 3342.5, 3574.5,
+ 3823.5, 4088.5,
+ 4372.5, 4675.5,
+ 5000.5
+ };
+
+
+ h_ntrk = new TH1F( "reftrk_N", "Reference tracks", 100, vnbins );
addHistogram(h_ntrk);
@@ -130,7 +149,7 @@ void Analysis_Tier0::initialise() {
/// test track distributions
- h_ntrk_rec = new TH1F( "testtrk_N", "Test tracks", 80, vnbins );
+ h_ntrk_rec = new TH1F( "testtrk_N", "Test tracks", 100, vnbins );
addHistogram(h_ntrk_rec);
@@ -179,6 +198,7 @@ void Analysis_Tier0::initialise() {
h_z0eff = new TProfile( "Eff_z0", "z0 efficiency", 50, -225., 225. );
h_nVtxeff = new TProfile( "Eff_nVtx", "nVtx efficiency", 71, -0.5, 70.5 );
+
h_lbeff = new TProfile( "Eff_lb", "efficinecy vs lumiblock", 301, -0.5, 3009.5 );
addHistogram( h_lbeff );
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
index 562d9a1c142505681fc695be6e754b8446f41506..bf7c19102dba107e880ba53197a750e0795c31ac 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
@@ -344,10 +344,9 @@ StatusCode TrigTestMonToolAC::book(bool newEventsBlock, bool newLumiBlock, bool
StatusCode TrigTestMonToolAC::fill() {
- msg(MSG::INFO) << " ----- enter fill() (athena) ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- enter fill() (athena) ----- " << endmsg;
-
- msg(MSG::INFO) << "chains: " << m_chainNames.size() << endmsg;
+ msg(MSG::DEBUG) << "chains: " << m_chainNames.size() << endmsg;
for ( unsigned i=0 ; i<m_chainNames.size() ; i++ ) {
ChainString s = m_chainNames[i];
@@ -357,7 +356,7 @@ StatusCode TrigTestMonToolAC::fill() {
for ( unsigned i=0 ; i<m_sequences.size() ; i++ ) m_sequences[i]->execute();
- msg(MSG::INFO) << " ----- exit fill() ----- " << endmsg;
+ msg(MSG::DEBUG) << " ----- exit fill() ----- " << endmsg;
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/VtxAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/VtxAnalysis.cxx
index 5a353f747909c4e1af58c68f68ffedd56bff7e82..f7e598d41ef8f4f586bf22b62ae81efe47fb563d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/VtxAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/VtxAnalysis.cxx
@@ -26,7 +26,7 @@ void VtxAnalysis::initialise() {
mdir = new TIDDirectory(name());
mdir->push();
-
+#if 0
double vnbins[81] = {
-0.5,
0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5,
@@ -50,13 +50,31 @@ void VtxAnalysis::initialise() {
185.5,
192.5,
200.5 };
+#endif
+
+ double vnbins[101] = {
+ -0.5,
+ 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 17.5, 18.5, 19.5, 21.5,
+ 23.5, 24.5, 26.5, 28.5, 30.5, 32.5, 35.5, 37.5, 40.5, 43.5, 46.5, 50.5, 53.5, 57.5, 61.5, 66.5, 71.5, 76.5, 81.5, 87.5,
+ 93.5, 100.5, 107.5, 114.5, 123.5, 131.5, 141.5, 150.5, 161.5, 172.5, 185.5, 198.5, 211.5, 226.5, 242.5, 259.5, 277.5, 297.5, 317.5, 340.5,
+ 363.5, 389.5, 416.5, 445.5, 476.5, 509.5,
+ 544.5, 582.5, 623.5, 666.5, 713.5, 762.5, 815.5, 872.5, 933.5, 998.5, 1067.5,
+ 1141.5, 1221.5, 1305.5, 1396.5, 1493.5, 1597.5,
+ 1708.5, 1827.5, 1953.5, 2089.5,
+ 2234.5, 2389.5, 2555.5,
+ 2733.5, 2923.5, 3125.5,
+ 3342.5, 3574.5,
+ 3823.5, 4088.5,
+ 4372.5, 4675.5,
+ 5000.5
+ };
hnvtx = new TH1F( "vx_nvtx", ";number of vertices", 100, -0.5, 100.5 );
hzed = new TH1F( "vx_zed", ";vtx z [mm]", 100, -250, 250 );
- hntrax = new TH1F( "vx_ntrax", ";number of tracks", 100, 0.5, 200.5 );
+ hntrax = new TH1F( "vx_ntrax", ";number of tracks", 100, vnbins );
addHistogram( hnvtx );
addHistogram( hzed );
@@ -65,7 +83,7 @@ void VtxAnalysis::initialise() {
hnvtx_rec = new TH1F( "vx_nvtx_rec", ";number of vertices", 100, -0.5, 100.5 );
hzed_rec = new TH1F( "vx_zed_rec", ";vtx z [mm]", 100, -250, 250 );
- hntrax_rec = new TH1F( "vx_ntrax_rec", ";number of tracks", 100, 0.5, 200.5 );
+ hntrax_rec = new TH1F( "vx_ntrax_rec", ";number of tracks", 100, vnbins );
addHistogram( hnvtx_rec );
addHistogram( hzed_rec );
@@ -76,7 +94,7 @@ void VtxAnalysis::initialise() {
addHistogram( hzed_res );
rdz_vs_zed = new TProfile( "vx_rdz_vs_zed", "rdz_vs_zed; vtx z [mm];z residual [mm]", 100, -250, 250 );
- rdz_vs_ntrax = new TProfile( "vx_rdz_vs_ntrax", "rdz_vs_ntrax;number of tracks;z residual [mm]", 80, vnbins );
+ rdz_vs_ntrax = new TProfile( "vx_rdz_vs_ntrax", "rdz_vs_ntrax;number of tracks;z residual [mm]", 100, vnbins );
rdz_vs_nvtx = new TProfile( "vx_rdz_vs_nvtx", "rdz_vs_nvtx;number of vertices;z residual [mm]", 51, -0.125, 50.125 );
addHistogram( rdz_vs_zed );
@@ -86,7 +104,7 @@ void VtxAnalysis::initialise() {
// rdz_vs_mu = new TProfile( "rdz_vs_mu", 30, 0, 30, 400, -20, 20 );
eff_zed = new TProfile( "vx_zed_eff", "zed_eff;efficiency;offline vtx z [mm]", 50, -250, 250 );
- eff_ntrax = new TProfile( "vx_ntrax_eff", "ntrax_eff;number of tracks;efficiency", 80, vnbins );
+ eff_ntrax = new TProfile( "vx_ntrax_eff", "ntrax_eff;number of tracks;efficiency", 100, vnbins );
eff_nvtx = new TProfile( "vx_nvtx_eff", "nvtx_eff;number of vertices;efficiency", 100, -0.5, 100.5 );
eff_mu = new TProfile( "vx_mu_eff", "mu_eff;<#mu>;efficiency", 61, -0.5, 60.5 );
eff_lb = new TProfile( "vx_lb_eff", "lb_eff;lumi block;efficiency", 151, -0.5, 3019.5 );
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
index d9b674b7f2ce33a7f22416159bed37ee181be79c..ba88603d1e7bee289f65f6b2553d0175f0c98800 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
@@ -49,7 +49,7 @@ void ConfVtxAnalysis::initialise() {
61.5, 65.5, 69.5,
74.5,
80.5 };
-#endif
+
double vnbins[81] = {
-0.5,
@@ -75,6 +75,25 @@ void ConfVtxAnalysis::initialise() {
192.5,
200.5 };
+#endif
+
+ double vnbins[101] = {
+ -0.5,
+ 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5, 10.5, 11.5, 12.5, 13.5, 14.5, 15.5, 17.5, 18.5, 19.5, 21.5,
+ 23.5, 24.5, 26.5, 28.5, 30.5, 32.5, 35.5, 37.5, 40.5, 43.5, 46.5, 50.5, 53.5, 57.5, 61.5, 66.5, 71.5, 76.5, 81.5, 87.5,
+ 93.5, 100.5, 107.5, 114.5, 123.5, 131.5, 141.5, 150.5, 161.5, 172.5, 185.5, 198.5, 211.5, 226.5, 242.5, 259.5, 277.5, 297.5, 317.5, 340.5,
+ 363.5, 389.5, 416.5, 445.5, 476.5, 509.5,
+ 544.5, 582.5, 623.5, 666.5, 713.5, 762.5, 815.5, 872.5, 933.5, 998.5, 1067.5,
+ 1141.5, 1221.5, 1305.5, 1396.5, 1493.5, 1597.5,
+ 1708.5, 1827.5, 1953.5, 2089.5,
+ 2234.5, 2389.5, 2555.5,
+ 2733.5, 2923.5, 3125.5,
+ 3342.5, 3574.5,
+ 3823.5, 4088.5,
+ 4372.5, 4675.5,
+ 5000.5
+ };
+
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
index 4634294863a40b1085bcc31b8afe04b02dea42c4..af653dea2a8bd78b78d1fb1f5b97e4984eed9a53 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata-chains-run3.dat
@@ -15,14 +15,13 @@ testChains = {
"HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig",
"HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF",
- "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF:HLT_Roi_TauCore",
"HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauIso_FTF",
- "HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauIso_FTF:HLT_Roi_TauIso",
"HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_FTF",
"HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig",
"HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF",
- "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig"
+ "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig",
+ "HLT_IDTrack_FS_FTF",
};
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
index 21df911dfef92427c35d3d8c62bbdfd6c77795b1..6edbe31658d5b9701e188324fa53666d2ef57bb0 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
@@ -432,7 +432,8 @@ bool TrigTrackSelector::selectTrack( const xAOD::TruthParticle* track ) {
unsigned bitmap = 0;
- int trackAuthor = 0;
+ int trackAuthor = track->pdgId();
+ int barcode = track->barcode();
#if 0
std::cout << "\t\t\tSUTT TP track"
@@ -453,7 +454,7 @@ bool TrigTrackSelector::selectTrack( const xAOD::TruthParticle* track ) {
deta, dphi, dz0, dd0, dpT,
nBlayerHits, nPixelHits, nSctHits, nSiHits,
nStrawHits, nTrtHits, bitmap, 0,
- trackAuthor, false, -1, -1,
+ trackAuthor, false, barcode, -1,
expectBL, id) ;
/// useful debug info - leave in
diff --git a/Trigger/TrigAnalysis/TrigRootAnalysis/src/TrigConfigSvcAthD3PD.cxx b/Trigger/TrigAnalysis/TrigRootAnalysis/src/TrigConfigSvcAthD3PD.cxx
index 85001ae1c18faea6d7140e1092e25b7bb50a28f0..a28b7e08aab3254b829f1bd4719621b0aedf8d10 100644
--- a/Trigger/TrigAnalysis/TrigRootAnalysis/src/TrigConfigSvcAthD3PD.cxx
+++ b/Trigger/TrigAnalysis/TrigRootAnalysis/src/TrigConfigSvcAthD3PD.cxx
@@ -15,7 +15,7 @@
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/Incident.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/System.h"
#include "AthenaKernel/errorcheck.h"
@@ -79,15 +79,15 @@ namespace D3PD {
m_tupleName = "";
ServiceHandle< IJobOptionsSvc > jobOSvc( "JobOptionsSvc", name() );
CHECK( jobOSvc.retrieve() );
- const std::vector< const Property* >* evSelProp =
+ const std::vector< const Gaudi::Details::PropertyBase* >* evSelProp =
jobOSvc->getProperties( "EventSelector" );
if( ! evSelProp ) {
REPORT_MESSAGE( MSG::FATAL )
<< "Didn't find the input file list";
return StatusCode::FAILURE;
}
- std::vector< const Property* >::const_iterator itr = evSelProp->begin();
- std::vector< const Property* >::const_iterator end = evSelProp->end();
+ std::vector< const Gaudi::Details::PropertyBase* >::const_iterator itr = evSelProp->begin();
+ std::vector< const Gaudi::Details::PropertyBase* >::const_iterator end = evSelProp->end();
for( ; itr != end; ++itr ) {
// Look for the "InputCollections" property:
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx b/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx
index 5c9a35b01c089b2281134481c084ebfdbd6faed1..3ebdf9ee50ecf0ce22a647c1ce04eb503298dc96 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/Root/MatchingTool.cxx
@@ -21,7 +21,7 @@ MatchingTool::MatchingTool(const std::string& name) :
}
#ifndef XAOD_STANDALONE
-void MatchingTool::updateThreshold(Property& /*p*/) {
+void MatchingTool::updateThreshold(Gaudi::Details::PropertyBase& /*p*/) {
ATH_MSG_DEBUG("Matching Threshold is updated to:" << m_matchingThreshold);
impl()->setThreshold( m_matchingThreshold );
}
diff --git a/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingTool.h b/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingTool.h
index 0f505b108e6219bffbd022c24be038cc83e1a8b5..6092aed6dde8fa452942785f41b173c43acb6d4c 100644
--- a/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingTool.h
+++ b/Trigger/TrigAnalysis/TriggerMatchingTool/TriggerMatchingTool/MatchingTool.h
@@ -41,7 +41,7 @@ protected:
#ifndef XAOD_STANDALONE
- void updateThreshold(Property& p);
+ void updateThreshold(Gaudi::Details::PropertyBase& p);
#endif
private:
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/DataStructure.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/DataStructure.h
index 40468452f28348b957994e52c30545d0ec3387b3..b08be272fa36c91c716dc1a3e5b2d6a5591ad85e 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/DataStructure.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/DataStructure.h
@@ -106,7 +106,7 @@ namespace TrigConf {
*/
bool hasAttribute(const std::string & key) const;
- /** Check for attribute
+ /** Check if child exists
* @param path The path to the child, relative to the current one in form "path.to.child"
* @return true if path exists
*/
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Board.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Board.h
index d35573036e05488934f72b03fd51e5436b8eb53d..1426611bfb004b08af1e43107f61ffa84a1dbb53 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Board.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Board.h
@@ -45,7 +45,9 @@ namespace TrigConf {
/** Accessor to the number of connectors */
std::size_t size() const;
- BoardType type() const;
+ std::string type() const;
+
+ BoardType boardType() const;
/** Accessor to the connector type */
bool legacy() const;
@@ -58,7 +60,7 @@ namespace TrigConf {
/** Update the internal members */
virtual void update();
- BoardType m_type;
+ BoardType m_boardType;
bool m_legacy;
std::vector<std::string> m_connectorNames;
};
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Connector.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Connector.h
index 557b3cbbbabbbb18a5d92b7147dc19d27a103f0d..7cb5f6fe1e3b827a93623fc052c5cc782427081c 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Connector.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Connector.h
@@ -66,6 +66,9 @@ namespace TrigConf {
/** Accessor to the connector type */
ConnectorType type() const;
+ /** names of all trigger lines */
+ std::vector<std::string> triggerLineNames() const;
+
/** Accessor to the triggerlines on the connector
*
* For electrical connectors from the L1Topo boards a triggerline vector holds up to 16 signals, which come from
@@ -91,6 +94,8 @@ namespace TrigConf {
ConnectorType m_type;
std::vector<TrigConf::TriggerLine> m_triggerLines[2][2];
std::map<std::string, TrigConf::TriggerLine*> m_lineByName;
+ std::size_t m_maxFpga{1};
+ std::size_t m_maxClock{1};
bool m_isLegacy;
};
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h
index 63d95af7fb2ae9fb05c2353fd6d184c64b77605d..41cdf90ea8384ad020e444d5d1207e1bffe66e69 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h
@@ -89,12 +89,35 @@ namespace TrigConf {
/** Access to extra info for threshold types */
const L1ThrExtraInfo & thrExtraInfo() const;
+ /** Access to topo algorithm names
+ * @param category must be one of "TOPO", "MUTOPO", "MULTTOPO", or "R2TOPO"
+ *
+ * TOPO ... new topo algorithms,
+ * R2TOPO ... Run-2 topo algorithms
+ * MUTOPO ... MUCTPI topo algorithms
+ * MULTTOPO ... multiplicity algorithms
+ */
+ std::vector<std::string> topoAlgorithmNames(const std::string & category) const;
+
+ /** Access to topo algoritm output names */
+ std::vector<std::string> topoAlgorithmOutputNames(const std::string & category) const;
+
/** Access to topo algorithm by name */
- const TrigConf::L1TopoAlgorithm & algorithm(const std::string & algoName) const;
+ const TrigConf::L1TopoAlgorithm & algorithm(const std::string & algoName, const std::string & category) const;
- /** Access to topo algorithm by output */
- const TrigConf::L1TopoAlgorithm & algorithmFromOutput(const std::string & outputName) const;
+ /** Access to topo algorithm by name of triggerline as given in topo connector specification
+ * @param triggerlineName string name of the triggerline
+ * @return reference to the algorithm that produces this output
+ *
+ * The name of the triggerline starts with "TOPO_", "MUTOPO_", or "R2TOPO_", except in the case of multiplicity output lines which are just the threshold name
+ */
+ const TrigConf::L1TopoAlgorithm & algorithmFromTriggerline(const std::string & triggerlineName) const;
+ /** Access to topo algorithm by name of the output as given in the algorithm definition
+ * @param fullOutputName string name of the output prefixed with the category, e.g. ("HT150-J20s5.ETA31","TOPO") or ("0INVM9-EM7ab-EMab","R2TOPO")
+ * @return reference to the algorithm that produces this output
+ */
+ const TrigConf::L1TopoAlgorithm & algorithmFromOutput(const std::string & bareOutputName, const std::string & category) const;
/** Access to boards by name */
const TrigConf::L1Board & board(const std::string & boardName) const;
@@ -109,6 +132,8 @@ namespace TrigConf {
/** Connector names */
std::vector<std::string> connectorNames() const;
+ /** Name of connector from name of threshold or triggerline */
+ const std::string & connectorNameFromThreshold(const std::string & thresholdName) const;
/** print overview of L1 Menu */
void printMenu(bool full = false) const;
@@ -121,19 +146,25 @@ namespace TrigConf {
/** the supermasterkey */
unsigned int m_smk {0};
+ /** connector by name */
std::map<std::string, TrigConf::L1Connector> m_connectors{};
+ /** connector name by threshold name */
+ std::map<std::string, std::string> m_threshold2ConnectorName{};
+
+ /** board by name */
std::map<std::string, TrigConf::L1Board> m_boards{};
+ /** threshold maps */
std::map<std::string, std::vector<std::shared_ptr<TrigConf::L1Threshold>>> m_thresholdsByType{};
std::map<std::string, std::shared_ptr<TrigConf::L1Threshold>> m_thresholdsByName{};
TrigConf::L1ThrExtraInfo m_thrExtraInfo;
-
- std::map<std::string, std::vector<TrigConf::L1TopoAlgorithm>> m_algorithmsByType{};
- std::map<std::string, TrigConf::L1TopoAlgorithm*> m_algorithmsByName{};
- std::map<std::string, TrigConf::L1TopoAlgorithm*> m_algorithmsByOutput{};
+ /** algorithm maps */
+ std::map<std::string, std::vector<TrigConf::L1TopoAlgorithm>> m_algorithmsByCategory{}; // primary set of vectors of algos, one per category (TOPO, R2TOPO, MUTOPO, MULTTOPO)
+ std::map<std::string, std::map<std::string, TrigConf::L1TopoAlgorithm*>> m_algorithmsByName{}; // map from category and algorithm name to algorithm
+ std::map<std::string, std::map<std::string, TrigConf::L1TopoAlgorithm*>> m_algorithmsByOutput{}; // map from category and output name to algorithm
};
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1TopoAlgorithm.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1TopoAlgorithm.h
index 6bec18ab6dc10b23a6ba800ed44b202ef6ca5de4..bc172ebd8f9653722d73807a4aca23f961eb24ad 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1TopoAlgorithm.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1TopoAlgorithm.h
@@ -19,10 +19,18 @@ namespace TrigConf {
class L1TopoAlgorithm final : public DataStructure {
public:
- enum class AlgorithmType { SORTING, DECISION, MULTIPLICITY, INIT };
+ enum class AlgorithmType { SORTING, DECISION, MULTIPLICITY, UNKNOWN };
+
+ struct VariableParameter {
+ VariableParameter(const std::string & _name, int _value, unsigned int _selection)
+ : name(_name), value(_value), selection(_selection) {}
+ std::string name{""};
+ int value{0};
+ unsigned int selection{0};
+ };
/** Constructor */
- L1TopoAlgorithm();
+ L1TopoAlgorithm() = default;
L1TopoAlgorithm(const L1TopoAlgorithm &) = delete;
L1TopoAlgorithm& operator=(const L1TopoAlgorithm&) = delete;
@@ -31,7 +39,7 @@ namespace TrigConf {
/** Constructor initialized with configuration data
* @param data The data containing the L1Topo menu
*/
- L1TopoAlgorithm(const std::string & algoName, AlgorithmType algoType, const ptree & data);
+ L1TopoAlgorithm(const std::string & algoName, AlgorithmType algoType, const std::string & algoCategory, const ptree & data);
/** Destructor */
~L1TopoAlgorithm();
@@ -43,30 +51,52 @@ namespace TrigConf {
AlgorithmType type() const;
+ const std::string & category() const;
+
/** Accessor to algorithm class type */
const std::string & klass() const;
- /** Accessor to list of input data collections */
- std::vector<DataStructure> inputs() const;
+ /** Accessor to input collections
+ * Sorting and Multiplicity algorithms have only one input
+ */
+ const std::vector<std::string> & inputs() const;
- /** Accessor to output collection */
+ /** Accessor to output collections
+ * Sorting and Multiplicity algorithms have only one output
+ */
const std::vector<std::string> & outputs() const;
+ std::vector<std::string> fullOutputs() const;
+
+ /** Accessors to generic parameters */
+ DataStructure generics() const;
- /** Accessor to generic parameters */
- std::vector<DataStructure> generics() const;
+ std::string genericParameter(const std::string & parName) const;
+
+ template<class T>
+ T genericParameter(const std::string & parName) const {
+ return getAttribute<T>("fixedParameters.generics." + parName + ".value");
+ }
/** Accessor to register parameters which can change for each algorithm instance */
- std::vector<DataStructure> parameters() const;
+ const std::vector<VariableParameter> & parameters() const;
+
+ /** print main info */
+ void print(std::ostream & os = std::cout) const override;
private:
/** Update the internal data after modification of the data object */
virtual void update() override;
- AlgorithmType m_type{ AlgorithmType::INIT };
+ AlgorithmType m_type{ AlgorithmType::UNKNOWN };
+ std::string m_category{};
+
+ std::vector<std::string> m_inputs{};
std::vector<std::string> m_outputs{};
+ std::vector<VariableParameter> m_parameters;
+
};
}
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/L1Board.cxx b/Trigger/TrigConfiguration/TrigConfData/src/L1Board.cxx
index b8a97c0930c6dbb8cd0dfd5d151de5840be2029d..059497974f3a80a74e7837a2d06d99353b803f08 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/L1Board.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/L1Board.cxx
@@ -38,11 +38,11 @@ TrigConf::L1Board::update()
std::string boardType(getAttribute("type"));
if( boardType == "MUCTPI" ) {
- m_type = BoardType::MUCTPI;
+ m_boardType = BoardType::MUCTPI;
} else if( boardType == "CTPIN" ) {
- m_type = BoardType::CTPIN;
+ m_boardType = BoardType::CTPIN;
} else if( boardType == "TOPO" ) {
- m_type = BoardType::TOPO;
+ m_boardType = BoardType::TOPO;
} else {
throw std::runtime_error("Unknown board type " + boardType);
}
@@ -60,6 +60,25 @@ TrigConf::L1Board::size() const
return m_connectorNames.size();
}
+TrigConf::L1Board::BoardType
+TrigConf::L1Board::boardType() const
+{
+ return m_boardType;
+}
+
+std::string
+TrigConf::L1Board::type() const
+{
+ switch( boardType() ) {
+ case BoardType::CTPIN:
+ return "CTPIN";
+ case BoardType::MUCTPI:
+ return "MUCTPI";
+ case BoardType::TOPO:
+ return "TOPO";
+ }
+ return "";
+}
bool
TrigConf::L1Board::legacy() const
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/L1Connector.cxx b/Trigger/TrigConfiguration/TrigConfData/src/L1Connector.cxx
index a2108e19e1fd3c85bbc9d7a1139c81c3b1214aa2..6a016b7a86c9f6e516b004e5d25c6bd8b9bb63f1 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/L1Connector.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/L1Connector.cxx
@@ -42,10 +42,12 @@ TrigConf::L1Connector::update()
}
// triggerlines
- size_t loopsize = (m_type == ConnectorType::ELECTRICAL) ? 2 : 1;
+ if(m_type == ConnectorType::ELECTRICAL) {
+ m_maxFpga = m_maxClock = 2;
+ }
- for( size_t fpga = 0; fpga < loopsize; ++fpga ) {
- for( size_t clock = 0; clock < loopsize; ++clock ) {
+ for( size_t fpga = 0; fpga < m_maxFpga; ++fpga ) {
+ for( size_t clock = 0; clock < m_maxClock; ++clock ) {
std::string path = "triggerlines";
if( m_type == ConnectorType::ELECTRICAL ) {
path += ".fpga";
@@ -78,7 +80,27 @@ TrigConf::L1Connector::type() const
std::size_t
TrigConf::L1Connector::size() const
{
- return m_triggerLines[0][0].size() + m_triggerLines[0][1].size() + m_triggerLines[1][0].size() + m_triggerLines[1][1].size();
+ size_t nlines{0};
+ for( size_t fpga = 0; fpga<m_maxFpga; ++fpga) {
+ for( size_t clock = 0; clock<m_maxClock; ++clock) {
+ nlines += m_triggerLines[fpga][clock].size();
+ }
+ }
+ return nlines;
+}
+
+std::vector<std::string>
+TrigConf::L1Connector::triggerLineNames() const
+{
+ std::vector<std::string> tln{};
+ for( size_t fpga = 0; fpga<m_maxFpga; ++fpga) {
+ for( size_t clock = 0; clock<m_maxClock; ++clock) {
+ for( auto & tl : m_triggerLines[fpga][clock] ) {
+ tln.emplace_back(tl.name());
+ }
+ }
+ }
+ return tln;
}
const std::vector<TrigConf::TriggerLine> &
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/L1Menu.cxx b/Trigger/TrigConfiguration/TrigConfData/src/L1Menu.cxx
index 5c6d79f08dbb9a4a9c7b4faa1ac92f1cda0a2be8..014f8a7a368d23fa031146e95549a47a4567514e 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/L1Menu.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/L1Menu.cxx
@@ -65,37 +65,46 @@ TrigConf::L1Menu::update()
// connectors
for( auto & conn : data().get_child( "connectors" ) ) {
- m_connectors.emplace( std::piecewise_construct,
- std::forward_as_tuple(conn.first),
- std::forward_as_tuple(conn.first, conn.second) );
+ auto res = m_connectors.emplace( std::piecewise_construct,
+ std::forward_as_tuple(conn.first),
+ std::forward_as_tuple(conn.first, conn.second) );
+
+ for( auto & tl : res.first->second.triggerLineNames() ) {
+ m_threshold2ConnectorName.emplace( std::piecewise_construct,
+ std::forward_as_tuple(tl),
+ std::forward_as_tuple(conn.first));
+ }
}
// algorithms
- for( const std::string & path : { "TOPO", "MULTTOPO", "MUTOPO", "R2TOPO" } ) {
- auto & v = m_algorithmsByType[path] = std::vector<TrigConf::L1TopoAlgorithm>();
- if(path == "MULTTOPO") {
- for( auto & alg : data().get_child( "topoAlgorithms." + path + ".multiplicityAlgorithms" ) ) {
- v.emplace_back( alg.first, L1TopoAlgorithm::AlgorithmType::MULTIPLICITY, alg.second );
+ for( const std::string & algoCategory : { "TOPO", "MULTTOPO", "MUTOPO", "R2TOPO" } ) {
+ auto & v = m_algorithmsByCategory[algoCategory] = std::vector<TrigConf::L1TopoAlgorithm>();
+ if(algoCategory == "MULTTOPO") {
+ for( auto & alg : data().get_child( "topoAlgorithms." + algoCategory + ".multiplicityAlgorithms" ) ) {
+ v.emplace_back( alg.first, L1TopoAlgorithm::AlgorithmType::MULTIPLICITY, algoCategory, alg.second );
}
} else {
for( L1TopoAlgorithm::AlgorithmType algoType : { L1TopoAlgorithm::AlgorithmType::DECISION, L1TopoAlgorithm::AlgorithmType::SORTING } ) {
- std::string subpath = "topoAlgorithms." + path + (algoType==L1TopoAlgorithm::AlgorithmType::DECISION ? ".decisionAlgorithms" : ".sortingAlgorithms" );
+ std::string subpath = "topoAlgorithms." + algoCategory + (algoType==L1TopoAlgorithm::AlgorithmType::DECISION ? ".decisionAlgorithms" : ".sortingAlgorithms" );
for( auto & algorithm : data().get_child( subpath ) ) {
- v.emplace_back( algorithm.first, algoType, algorithm.second );
+ v.emplace_back( algorithm.first, algoType, algoCategory, algorithm.second );
}
}
}
- for( auto & algo : v ) {
- m_algorithmsByName[ algo.name() ] = & algo;
+ for( auto & algo : v ) {
+ if( m_algorithmsByName[algoCategory].count(algo.name()) > 0 ) {
+ std::cerr << "ERROR : Topo algorithm with name " << algo.name() << " and of type " << algoCategory << " already exists" << std::endl;
+ throw std::runtime_error("Found duplicate topo algorithm name " + algo.name() + " of type " + algoCategory);
+ }
+ m_algorithmsByName[ algoCategory ][ algo.name() ] = & algo;
for( const std::string & output : algo.outputs() ) {
- // multiplicity outputs (legacy and from multiplicity L1Topo) just have the name of the threshold
- // outputs from topo algorithms carry the name of the topo board type (TOPO, R2TOPO, MUTOPO) as it is not guarateed that
- // legacy and new topo algorithms define different outputs
- auto key = (path == "MULTTOPO") ? output : (path + "_" + output);
- m_algorithmsByOutput[key] = & algo;
+ if( m_algorithmsByOutput[algoCategory].count(output) > 0 ) {
+ std::cerr << "ERROR : Topo algorithm output " << output << " already exists" << std::endl;
+ throw std::runtime_error("Found duplicate topo algorithm output " + output + " of type " + algoCategory);
+ }
+ m_algorithmsByOutput[algoCategory][output] = & algo;
}
}
-
}
}
@@ -223,6 +232,18 @@ TrigConf::L1Menu::thrExtraInfo() const
return m_thrExtraInfo;
}
+const std::string &
+TrigConf::L1Menu::connectorNameFromThreshold(const std::string & thresholdName) const
+{
+ try {
+ return m_threshold2ConnectorName.at(thresholdName);
+ }
+ catch(...) {
+ std::cerr << "Threshold '" << thresholdName << "' not defined as triggerline in the L1 menu" << std::endl;
+ throw;
+ }
+}
+
std::vector<std::string>
TrigConf::L1Menu::connectorNames() const {
std::vector<std::string> connNames;
@@ -244,26 +265,80 @@ TrigConf::L1Menu::connector(const std::string & connectorName) const {
}
}
+/** Access to topo algorithm names */
+std::vector<std::string>
+TrigConf::L1Menu::topoAlgorithmNames(const std::string & category) const
+{
+ std::vector<std::string> algoNames;
+ try {
+ for(auto & entry : m_algorithmsByName.at(category) ) {
+ algoNames.push_back(entry.first);
+ }
+ }
+ catch(std::exception & ex) {
+ std::cerr << "No algorithm category '" << category << "' defined in the L1 menu" << std::endl;
+ throw;
+ }
+ return algoNames;
+}
+
+/** Access to topo algoritm output names */
+std::vector<std::string>
+TrigConf::L1Menu::topoAlgorithmOutputNames(const std::string & category) const
+{
+ std::vector<std::string> outputNames;
+ try {
+ for(auto & entry : m_algorithmsByOutput.at(category) ) {
+ outputNames.push_back(entry.first);
+ }
+ }
+ catch(std::exception & ex) {
+ std::cerr << "No algorithm category '" << category << "' defined in the L1 menu" << std::endl;
+ throw;
+ }
+ return outputNames;
+}
+
+
+
const TrigConf::L1TopoAlgorithm &
-TrigConf::L1Menu::algorithm(const std::string & algoName) const
+TrigConf::L1Menu::algorithm(const std::string & algoName, const std::string & category) const
{
try {
- return * m_algorithmsByName.at(algoName);
+ return * m_algorithmsByName.at(category).at(algoName);
+ }
+ catch(std::exception & ex) {
+ std::cerr << "No algorithm " << algoName << " of category " << category << " defined in the L1 menu" << std::endl;
+ throw;
+ }
+}
+
+const TrigConf::L1TopoAlgorithm &
+TrigConf::L1Menu::algorithmFromTriggerline(const std::string & triggerlineName) const
+{
+ std::string category {"MULTTOPO"};
+ std::string outputName {triggerlineName};
+ if( std::size_t pos = triggerlineName.find('_'); pos != std::string::npos ) {
+ category = triggerlineName.substr(0,pos);
+ outputName = triggerlineName.substr(pos+1);
+ }
+ try {
+ return * m_algorithmsByOutput.at(category).at(outputName);
}
catch(std::exception & ex) {
- std::cerr << "No algorithm " << algoName << " defined in the L1 menu" << std::endl;
+ std::cerr << "No output " << outputName << " defined by any algorithm of category " << category << " in the L1 menu. (It was asked for " << triggerlineName << ")" << std::endl;
throw;
}
}
const TrigConf::L1TopoAlgorithm &
-TrigConf::L1Menu::algorithmFromOutput(const std::string & outputName) const
+TrigConf::L1Menu::algorithmFromOutput(const std::string & bareOutputName, const std::string & type) const
{
try {
- return * m_algorithmsByOutput.at(outputName);
+ return * m_algorithmsByOutput.at(type).at(bareOutputName);
}
catch(std::exception & ex) {
- std::cerr << "No output '" << outputName << "' defined by any algorithm in the L1 menu" << std::endl;
+ std::cerr << "No output " << bareOutputName << " defined by any algorithm of type " << type << " in the L1 menu" << std::endl;
throw;
}
}
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/L1TopoAlgorithm.cxx b/Trigger/TrigConfiguration/TrigConfData/src/L1TopoAlgorithm.cxx
index 54ccdd1604c970544eb00dc3a069b0edebea36a3..08ad0c1fed737772e9d85531061b48c62dbaf502 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/L1TopoAlgorithm.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/L1TopoAlgorithm.cxx
@@ -3,14 +3,16 @@
*/
#include "TrigConfData/L1TopoAlgorithm.h"
+#include <map>
-TrigConf::L1TopoAlgorithm::L1TopoAlgorithm()
-{}
-
-TrigConf::L1TopoAlgorithm::L1TopoAlgorithm(const std::string & algoName, AlgorithmType algoType, const boost::property_tree::ptree & data)
+TrigConf::L1TopoAlgorithm::L1TopoAlgorithm(const std::string & algoName, AlgorithmType algoType, const std::string & algoCategory, const boost::property_tree::ptree & data)
: DataStructure(data),
- m_type(algoType)
+ m_type(algoType),
+ m_category(algoCategory)
{
+ if( m_category != "TOPO" && m_category != "MUTOPO" && m_category != "R2TOPO" && m_category != "MULTTOPO") {
+ throw std::runtime_error("Algorithm category must be TOPO, R2TOPO, MUTOPO or MULTTOPO, but is '" + algoCategory + "'");
+ }
m_name = algoName;
update();
}
@@ -29,13 +31,41 @@ TrigConf::L1TopoAlgorithm::update()
if(! isInitialized() || empty() ) {
return;
}
- if( m_type == AlgorithmType::DECISION ) {
+ if( m_type == AlgorithmType::DECISION ) { // DECISION algo
+ if( hasChild("input") ) {
+ for( auto & inp : getList("input")) {
+ m_inputs.push_back(inp.getValue());
+ }
+ } else if( hasChild("fixedParameters.inputs") ) { // backwards compatibility, to be removed when we stop using DEV db
+ for( auto & inp : getList("fixedParameters.inputs")) {
+ m_inputs.push_back(inp["value"]);
+ }
+ }
for( auto & o : getList("output")) {
m_outputs.push_back(o.getValue());
}
- } else {
+ } else if( m_type == AlgorithmType::MULTIPLICITY ) { // MULTIPLICITY algo
+ m_inputs.push_back(getAttribute("input"));
m_outputs.push_back(getAttribute("output"));
+ } else { // SORTING algo
+ if( hasAttribute("input") ) {
+ m_inputs.push_back( getAttribute("input") );
+ } else if( hasChild("fixedParameters.input") ) { // backwards compatibility, to be removed when we stop using DEV db
+ auto inp = getObject("fixedParameters.input");
+ for( auto & k : inp.getKeys() ) {
+ m_inputs.push_back(inp[k]);
+ break;
+ }
+ }
+ m_outputs.push_back(getAttribute("output"));
+ }
+
+ if( m_type == AlgorithmType::DECISION || m_type == AlgorithmType::SORTING ) {
+ for( auto & p : getList("variableParameters") ) {
+ m_parameters.emplace_back(p["name"], p.getAttribute<int>("value"), p.getAttribute<unsigned int>("selection", /*ignore-if-missing*/true, 0));
+ }
}
+
}
@@ -51,17 +81,25 @@ TrigConf::L1TopoAlgorithm::type() const
return m_type;
}
+const std::string &
+TrigConf::L1TopoAlgorithm::category() const
+{
+ return m_category;
+}
+
const std::string &
TrigConf::L1TopoAlgorithm::klass() const
{
+ if(hasAttribute("klass")) {
+ return getAttribute("klass");
+ }
return getAttribute("type");
}
-
-std::vector<TrigConf::DataStructure>
+const std::vector<std::string> &
TrigConf::L1TopoAlgorithm::inputs() const
{
- return getList("fixedParameters.inputs");
+ return m_inputs;
}
const std::vector<std::string> &
@@ -70,15 +108,66 @@ TrigConf::L1TopoAlgorithm::outputs() const
return m_outputs;
}
-std::vector<TrigConf::DataStructure>
+std::vector<std::string>
+TrigConf::L1TopoAlgorithm::fullOutputs() const
+{
+ std::vector<std::string> out;
+ for( auto & s : m_outputs ) {
+ out.push_back(m_category + "_" + s);
+ }
+ return out;
+}
+
+std::string
+TrigConf::L1TopoAlgorithm::genericParameter(const std::string & parName) const
+{
+ return operator[]("fixedParameters.generics." + parName + ".value");
+}
+
+TrigConf::DataStructure
TrigConf::L1TopoAlgorithm::generics() const
{
- return getList("fixedParameters.generics");
+ return getObject("fixedParameters.generics");
}
-std::vector<TrigConf::DataStructure>
+const std::vector<TrigConf::L1TopoAlgorithm::VariableParameter> &
TrigConf::L1TopoAlgorithm::parameters() const
{
- return getList("variableParameters.parameters");
+ return m_parameters;
}
+
+void
+TrigConf::L1TopoAlgorithm::print(std::ostream & os) const
+{
+ os << "Algorithm " << name() << " (class " << klass() << ", category " << m_category << ")" << std::endl;
+ os << " input:" << std::endl;
+ for( auto & input : inputs() ) {
+ os << " " << input << std::endl;
+ }
+ os << " output:" << std::endl;
+ for( auto & output : outputs() ) {
+ os << " " << output << std::endl;
+ }
+ os << " full output:" << std::endl;
+ for( auto & output : fullOutputs() ) {
+ os << " " << output << std::endl;
+ }
+ if(type() == AlgorithmType::MULTIPLICITY) {
+ os << " threshold definition: " << getAttribute("threshold") << std::endl;
+ os << " number of output bits: " << getAttribute<unsigned int>("nbits") << std::endl;
+ } else {
+ os << " generic parameters:" << std::endl;
+ auto genPars = generics();
+ for( auto & k : genPars.getKeys() ) {
+ os << " " << k << " ==> " << genericParameter(k) << std::endl;
+ }
+ os << " parameters:" << std::endl;
+ auto pars = parameters();
+ unsigned int idx{0};
+ for( auto & p : pars ) {
+ os << " " << idx++ << " " << p.name << "[" << p.selection << "] ==> " << p.value << std::endl;
+ }
+ }
+ os << std::endl;
+}
diff --git a/Trigger/TrigConfiguration/TrigConfIO/utils/TestTriggerMenuAccess.cxx b/Trigger/TrigConfiguration/TrigConfIO/utils/TestTriggerMenuAccess.cxx
index 5537df0c2ab1a7e3ebd3867b2d6ff59e3290d530..547375efe06246e2bc312fd5f38a7f08c3ded9b9 100644
--- a/Trigger/TrigConfiguration/TrigConfIO/utils/TestTriggerMenuAccess.cxx
+++ b/Trigger/TrigConfiguration/TrigConfIO/utils/TestTriggerMenuAccess.cxx
@@ -4,6 +4,7 @@
#include <cstdlib>
#include <sys/stat.h>
+#include <iomanip>
#include "TrigConfIO/JsonFileLoader.h"
#include "TrigConfData/HLTMenu.h"
@@ -14,23 +15,32 @@
using namespace std;
-void exampleL1Calo(const string & filename) {
-
+using std::cout;
+using std::endl;
+
+void section(const std::string & sec) {
+ cout << "************************************************************" << endl;
+ cout << "** **" << endl;
+ cout << "** " << sec << setw(58-sec.size()) << "**" << endl;
+ cout << "** **" << endl;
+ cout << "************************************************************" << endl;
+
+}
+
+void
+exampleL1Calo(const string & filename) {
cout << endl
<< "===========================" << endl
<< "===== =====" << endl
<< "===== Example L1 Calo =====" << endl
<< "===== =====" << endl
<< "===========================" << endl << endl;
-
TrigConf::L1Menu l1menu;
TrigConf::JsonFileLoader fileLoader;
fileLoader.loadFile( filename, l1menu);
cout << "Loaded the L1 menu " << l1menu.name() << endl;
-
cout << "Information to configure eFEX" << endl;
cout << "For producing eEM objects you need the working points" << endl;
-
auto & ei_eEM = l1menu.thrExtraInfo().eEM();
for( int ieta : { -30, -20, -10, 0, 10, 20, 30 } ) {
unsigned int ptMinToTopo = ei_eEM.ptMinToTopo(); // the minimum energy to send to topo (not eta dependent yet)
@@ -51,27 +61,17 @@ void exampleL1Calo(const string & filename) {
int wstot_tight = iso_tight.wstot();
cout << "ieta=" << ieta << " tight => reta=" << reta_tight << ", had=" << had_tight << ", wstot=" << wstot_tight << endl;
}
-
}
-bool testL1Menu(const string & filename) {
-
- bool printdetail { false };
-
- cout << endl
- << "==========================" << endl
- << "===== =====" << endl
- << "===== Test L1 access =====" << endl
- << "===== =====" << endl
- << "==========================" << endl << endl;
-
- TrigConf::L1Menu l1menu;
- TrigConf::JsonFileLoader fileLoader;
- fileLoader.loadFile( filename, l1menu);
- cout << "Loaded the L1 menu " << l1menu.name() << endl;
-
- // items
+/*****************************************************
+ *
+ * Items
+ *
+ *****************************************************/
+bool
+testL1Menu_Items(const TrigConf::L1Menu & l1menu) {
+ section("Items");
cout << endl << "L1 menu has " << l1menu.size() << " items, going to print the first:" << endl;
int ni = 3; // print only first 1
for(const auto & item : l1menu ) {
@@ -80,16 +80,36 @@ bool testL1Menu(const string & filename) {
item.print();
if(--ni==0) break;
}
+ return true;
+}
- // boards
+
+/*****************************************************
+ *
+ * Boards
+ *
+ *****************************************************/
+bool
+testL1Menu_Boards(const TrigConf::L1Menu & l1menu) {
+ section("Boards");
cout << "L1 menu has " << l1menu.boardNames().size() << " boards configured" << endl;
string boardName("Topo1");
auto & board = l1menu.board(boardName);
- cout << "Board " << boardName << " has " << board.size() << " connectors configured: ";
+ cout << "Board " << boardName << " of type " << board.type() << " has " << board.size() << " connectors configured: ";
for( auto & connName : board.connectorNames() ) { cout << connName << " "; }
cout << endl;
-
- // connectors
+ return true;
+}
+
+
+/*****************************************************
+ *
+ * Connectors
+ *
+ *****************************************************/
+bool
+testL1Menu_Connectors(const TrigConf::L1Menu & l1menu) {
+ section("Connnectors");
cout << "L1 menu has " << l1menu.connectorNames().size() << " connectors configured" << endl;
for( const string & connName : l1menu.connectorNames() ) {
auto & conn = l1menu.connector(connName);
@@ -105,7 +125,7 @@ bool testL1Menu(const string & filename) {
} else if( conn.type() == TrigConf::L1Connector::ConnectorType::OPTICAL ) {
for( auto & tl : conn.triggerLines() ) {
const string & tlName = tl.name();
- auto & topoAlg = l1menu.algorithmFromOutput(tlName);
+ auto & topoAlg = l1menu.algorithmFromTriggerline(tlName);
cout << " Triggerline " << tlName << " bits=[" << tl.startbit() << ".." << tl.endbit()
<< "] is produced by topo algorithm " << topoAlg.name() << endl;
}
@@ -114,7 +134,7 @@ bool testL1Menu(const string & filename) {
for( size_t clock : { 0 ,1 } ) {
for( auto & tl : conn.triggerLines(fpga, clock) ) {
const string & tlName = tl.name();
- auto & topoAlg = l1menu.algorithmFromOutput(tlName);
+ auto & topoAlg = l1menu.algorithmFromTriggerline(tlName);
cout << " Triggerline " << tlName << " bits=[" << tl.startbit() << ".." << tl.endbit()
<< "] is produced by topo algorithm " << topoAlg.name() << endl;
}
@@ -122,21 +142,87 @@ bool testL1Menu(const string & filename) {
}
}
}
+ return true;
+}
+
+
+/*****************************************************
+ *
+ * Topo algorithms
+ *
+ *****************************************************/
+bool
+testL1Menu_Topo(const TrigConf::L1Menu & l1menu, bool printdetail)
+{
+ section("Topo algorithms");
+ {
+ cout << "Number of topo algorithms: " << l1menu.topoAlgorithmNames("TOPO").size() << endl;
+ cout << "Number of topo algorithm outputs: " << l1menu.topoAlgorithmOutputNames("TOPO").size() << endl;
+
+ auto tl = l1menu.connector("LegacyTopo1").triggerLines(0,0)[0];
+ auto & topoAlg = l1menu.algorithmFromTriggerline(tl.name());
+ topoAlg.print();
+
+ auto & topoAlgInvmassLeg = l1menu.algorithmFromTriggerline("R2TOPO_900INVM9999-AJ30s6-AJ20s6");
+ topoAlgInvmassLeg.print();
+ cout << "Explicit access to 'NumResultBits' as unsigned int: " << topoAlgInvmassLeg.genericParameter<unsigned int>("NumResultBits") << endl;
+
+ auto & topoAlgEMJ = l1menu.algorithmFromOutput("0DR03-EM7ab-CJ15ab", "TOPO");
+ topoAlgEMJ.print();
+
+ auto & topoMultAlg = l1menu.algorithm("Mult_eEM22VHI","MULTTOPO");
+ topoMultAlg.print();
+ cout << " threshold definition: " << topoMultAlg.getAttribute("threshold") << endl;
+
+ if(printdetail) {
+ for( auto & algName : l1menu.topoAlgorithmNames("TOPO") ) {
+ auto & alg = l1menu.algorithm( algName, "TOPO" );
+ cout << algName << " has inputs ";
+ for( auto & inp : alg.inputs() ) {
+ cout << inp;
+ }
+ cout << endl;
+ }
+ }
+ }
+ return true;
+}
+
+
+/*****************************************************
+ *
+ * Thresholds
+ *
+ *****************************************************/
+bool
+testL1Menu_Thresholds(const TrigConf::L1Menu & l1menu, bool printdetail)
+{
+ section("Thresholds");
- // thresholds
cout << "L1 menu has " << l1menu.thresholdTypes().size() << " threshold types configured: " << endl << " ";
for( const string & tt : l1menu.thresholdTypes()) { cout << tt << " "; } cout << endl;
- for( const string & tt : { "EM", "eEM", "JET", "jJ", "MU" } ) {
- cout << "L1 menu has " << l1menu.thresholds(tt).size() << " " << tt
- << " thresholds, going to print the first three." << endl;
- int ni = 3; // print the first 3
- for(auto thr : l1menu.thresholds(tt) ) {
- cout << " " << thr->name() << " of type " << thr->type() << " (mapping " << thr->mapping() << ") " << endl;
- if(--ni==0) break;
+ for( const string & tt : l1menu.thresholdTypes()) {
+ cout << "L1 menu has " << l1menu.thresholds(tt).size() << " thresholds of type " << tt;
+ if(printdetail) {
+ cout << " thresholds, going to print the first three." << endl;
+ int ni = 3; // print the first 3
+ for(auto thr : l1menu.thresholds(tt) ) {
+ cout << " " << thr->name() << " of type " << thr->type() << " (mapping " << thr->mapping() << ") " << endl;
+ if(--ni==0) break;
+ }
+ } else {
+ cout << endl;
+ }
+ if(tt != "internal") {
+ for(auto thr : l1menu.thresholds(tt) ) {
+ const std::string & connName = l1menu.connectorNameFromThreshold(thr->name());
+ if(! l1menu.connector(connName).hasLine(thr->name())) {
+ throw std::runtime_error("Threshold " + thr->name() + " does not exist as triggerline of connector " + connName);
+ }
+ }
}
}
- // EM threshold with varying thresholds
const auto & thrEM = dynamic_cast<const TrigConf::L1Threshold_EM&>(l1menu.threshold("EM22VHI"));
thrEM.print();
cout << "XE30 cut: " << l1menu.threshold("XE30").thrValue() << endl;
@@ -150,7 +236,8 @@ bool testL1Menu(const string & filename) {
if(thrJET) {
cout << thrJET->name() << ":" << endl;
for(int eta : {0, 20, 30, 40}) {
- cout << " value at eta = " << eta << ": " << thrJET->thrValue(eta) << " GeV, " << thrJET->thrValueMeV(eta) << " MeV, " << thrJET->thrValueCounts(eta) << " counts" << endl;
+ cout << " value at eta = " << eta << ": " << thrJET->thrValue(eta) << " GeV, "
+ << thrJET->thrValueMeV(eta) << " MeV, " << thrJET->thrValueCounts(eta) << " counts" << endl;
}
}
@@ -159,33 +246,33 @@ bool testL1Menu(const string & filename) {
cout << thrXE->name() << ": value " << thrXE->thrValue() << " GeV, " << thrXE->thrValueMeV() << " MeV, " << thrXE->thrValueCounts() << " counts" << endl;
}
-
auto thrTERR = dynamic_cast<const TrigConf::L1Threshold_TE&>(l1menu.threshold("TE5.0ETA24"));
- if(thrTERR) {
- cout << thrTERR.name() << ":" << endl;
- for(int eta : {0, 20, 30, 40}) {
- cout << " value at eta = " << eta << ": " << thrTERR.thrValue(eta) << " GeV, " << thrTERR.thrValueMeV(eta) << " MeV, " << thrTERR.thrValueCounts(eta) << " counts" << endl;
- }
+ cout << thrTERR.name() << ":" << endl;
+ for(int eta : {0, 20, 30, 40}) {
+ cout << " value at eta = " << eta << ": " << thrTERR.thrValue(eta) << " GeV, " << thrTERR.thrValueMeV(eta) << " MeV, " << thrTERR.thrValueCounts(eta) << " counts" << endl;
}
-
const auto & threEM = dynamic_cast<const TrigConf::L1Threshold_eEM&>(l1menu.threshold("eEM18VHI"));
cout << "eEM18VHI isolation: rhad = " << (int)threEM.rhad() << ", reta = " << (int)threEM.reta() << ", wstot = " << (int)threEM.wstot() << endl;
-
-
-
const auto & thrMU10 = dynamic_cast<const TrigConf::L1Threshold_MU&>(l1menu.threshold("MU10"));
cout << "Threshold MU10 with "
<< "barrel pt=" << thrMU10.ptBarrel() << " (idx " << thrMU10.idxBarrel() << "), "
<< "endcap pt=" << thrMU10.ptEndcap() << " (idx " << thrMU10.idxEndcap() << "), and "
<< "forward pt=" << thrMU10.ptForward() << " (idx " << thrMU10.idxForward() << ")" << endl;
+ return true;
+}
+
- /*****************************************************
- *
- * extra information for certain threshold types
- *
- *****************************************************/
+/*****************************************************
+ *
+ * extra information for certain threshold types
+ *
+ *****************************************************/
+bool
+testL1Menu_Extrainfo(const TrigConf::L1Menu & l1menu)
+{
+ section("Extra information for threholds");
cout << "These threshold types have extra information" << endl << " ";
for( const string & tt : l1menu.thresholdTypes()) {
if( l1menu.thrExtraInfo().hasInfo(tt) ) {
@@ -193,7 +280,6 @@ bool testL1Menu(const string & filename) {
}
}
cout << endl << "going to print details of the extra threshold information" << endl;
-
{
auto & exEM = l1menu.thrExtraInfo().EM();
cout << " EM" << endl;
@@ -207,7 +293,6 @@ bool testL1Menu(const string & filename) {
}
}
}
-
{
auto & ex = l1menu.thrExtraInfo().JET();
cout << " JET" << endl;
@@ -220,7 +305,6 @@ bool testL1Menu(const string & filename) {
cout << " ptMinToTopoSmallWindow (counts) " << ex.ptMinToTopoSmallWindowCounts() << endl;
cout << " ptMinToTopoLargeWindow (counts) " << ex.ptMinToTopoLargeWindowCounts() << endl;
}
-
{
auto & ex = l1menu.thrExtraInfo().TAU();
cout << " TAU" << endl;
@@ -233,7 +317,6 @@ bool testL1Menu(const string & filename) {
cout << " " << ex.isolation("EMIsoForTAUthr", bit) << endl;
}
}
-
{
auto & ex = l1menu.thrExtraInfo().eEM();
cout << " eEM" << endl;
@@ -262,7 +345,6 @@ bool testL1Menu(const string & filename) {
//cout << " working point Medium at eta = -20:" << ex.isolation(TrigConf::Isolation::WP::MEDIUM,-20) << endl;
cout << " working point Medium at eta = 20:" << ex.isolation(TrigConf::Isolation::WP::MEDIUM,20) << endl;
}
-
{
auto & ex = l1menu.thrExtraInfo().jJ();
cout << " jJ" << endl;
@@ -274,7 +356,6 @@ bool testL1Menu(const string & filename) {
cout << " ptMinToTopoSmallWindow (counts) " << ex.ptMinToTopoSmallCounts() << endl;
cout << " ptMinToTopoLargeWindow (counts) " << ex.ptMinToTopoLargeCounts() << endl;
}
-
{
auto & ex = l1menu.thrExtraInfo().eTAU();
cout << " eTAU" << endl;
@@ -302,7 +383,6 @@ bool testL1Menu(const string & filename) {
}
}
-
auto & exMU = l1menu.thrExtraInfo().MU();
cout << " MU" << endl;
cout << " known pt values for rpc ";
@@ -318,11 +398,38 @@ bool testL1Menu(const string & filename) {
cout << endl;
}
}
-
return true;
}
+bool
+testL1Menu(const string & filename, bool printdetail = false)
+{
+ cout << endl
+ << "==========================" << endl
+ << "===== =====" << endl
+ << "===== Test L1 access =====" << endl
+ << "===== =====" << endl
+ << "==========================" << endl << endl;
+
+ cout << "Printing detail " << (printdetail ? "yes" : "no") << endl;
+ section("Menu loading");
+ TrigConf::L1Menu l1menu;
+ TrigConf::JsonFileLoader fileLoader;
+ fileLoader.loadFile( filename, l1menu);
+ cout << "Loaded the L1 menu " << l1menu.name() << endl;
+
+ bool result = true;
+ result &= testL1Menu_Items(l1menu);
+ result &= testL1Menu_Boards(l1menu);
+ result &= testL1Menu_Connectors(l1menu);
+ result &= testL1Menu_Topo(l1menu, printdetail);
+ result &= testL1Menu_Thresholds(l1menu, printdetail);
+ result &= testL1Menu_Extrainfo(l1menu);
+ return result;
+}
+
+
bool testHLTMenu(const string & filename) {
@@ -427,14 +534,14 @@ int main(int argc, char** argv) {
// file loader
TrigConf::JsonFileLoader fileLoader;
string filetype = fileLoader.getFileType( filename );
- int result(1);
+ bool success(false);
if(filetype == "l1menu") {
- result = testL1Menu(filename);
+ success = testL1Menu(filename);
} else if(filetype == "hltmenu") {
- result = testHLTMenu(filename);
+ success = testHLTMenu(filename);
} else {
cout << "File " << filename << " is neither an L1 or an HLT menu json file" << endl;
- }
-
- return result;
+ }
+ cout << "Finished " << (success ? "successfully" : "with failures") << endl;
+ return success ? 0 : 1;
}
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
index 40ffcda519fe1d72c918b60a0b199d90fb373dd4..c8759dd63830c539e2788e8e022291f63c66aaa0 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
@@ -12,65 +12,45 @@ def getHLTPrescaleFolderName():
# L1 Json file name
-def getL1MenuFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- l1MenuFileName = 'L1Menu_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- l1MenuFileName = 'L1Menu_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getL1MenuFileName( flags ):
+ l1MenuFileName = 'L1Menu_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
l1MenuFileName = l1MenuFileName.replace(".xml",".json").replace("LVL1config", "L1Menu")
l1MenuFileName = l1MenuFileName.replace("_newJO","")
return l1MenuFileName
# HLT Json file name
-def getHLTMenuFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- hltMenuFileName = 'HLTMenu_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- hltMenuFileName = 'HLTMenu_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getHLTMenuFileName( flags ):
+ hltMenuFileName = 'HLTMenu_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
hltMenuFileName = hltMenuFileName.replace(".xml",".json").replace("HLTconfig", "HLTMenu").replace("HLTmenu", "HLTMenu")
hltMenuFileName = hltMenuFileName.replace("_newJO","")
return hltMenuFileName
# L1 Prescales set json file name
-def getL1PrescalesSetFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- l1PrescalesSetFileName = 'L1PrescalesSet_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- l1PrescalesSetFileName = 'L1PrescalesSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getL1PrescalesSetFileName( flags ):
+ l1PrescalesSetFileName = 'L1PrescalesSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
return l1PrescalesSetFileName
# HLT Prescales set json file name
-def getHLTPrescalesSetFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- hltPrescalesSetFileName = 'HLTPrescalesSet_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- hltPrescalesSetFileName = 'HLTPrescalesSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getHLTPrescalesSetFileName( flags ):
+ hltPrescalesSetFileName = 'HLTPrescalesSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
return hltPrescalesSetFileName
# L1 Bunchgroups set json file name
-def getBunchGroupSetFileName( flags=None ):
- if flags is None:
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- bunchGroupSetFileName = 'BunchGroupSet_'+tf.triggerMenuSetup()+'_'+tf.menuVersion()+'.json'
- else:
- bunchGroupSetFileName = 'BunchGroupSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
+def getBunchGroupSetFileName( flags ):
+ bunchGroupSetFileName = 'BunchGroupSet_'+flags.Trigger.triggerMenuSetup+'_'+flags.Trigger.menuVersion+'.json'
return bunchGroupSetFileName
# HLT Job options json file name
-def getHLTJobOptionsFileName( flags=None ):
+def getHLTJobOptionsFileName( ):
return 'HLTJobOptions.json'
# Creates an L1 Prescale file from the menu
# this is a temporary solution, in the final version the L1PrescalesSet file should come from the menu
-def createL1PrescalesFileFromMenu( flags=None ):
+def createL1PrescalesFileFromMenu( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
menuFN = getL1MenuFileName( flags )
with open(menuFN,'r') as fh:
@@ -94,13 +74,8 @@ def createL1PrescalesFileFromMenu( flags=None ):
def getTrigConfigFromFlag( flags=None ):
log = logging.getLogger('TrigConfigSvcCfg')
- if flags is None: # old-style TriggerFlags
- from TriggerJobOpts.TriggerFlags import TriggerFlags as tf
- tcflag = tf.triggerConfig() if tf.triggerConfig.statusOn else None
- log.info("Parsing old-style trigger flags 'triggerConfig': %s", tcflag)
- else:
- tcflag = flags.Trigger.triggerConfig
- log.info("Parsing new-style trigger flag 'triggerConfig': %s", tcflag)
+ tcflag = flags.Trigger.triggerConfig
+ log.info("Parsing new-style trigger flag 'triggerConfig': %s", tcflag)
if tcflag is None:
tcflag = "FILE"
source, dbconn, keys = (tcflag+":::").split(":")[:3]
@@ -126,16 +101,12 @@ def getTrigConfigFromFlag( flags=None ):
# L1 menu generation
@memoize
-def generateL1Menu( flags=None ):
+def generateL1Menu( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
- from TriggerJobOpts.TriggerFlags import TriggerFlags
fileName = getL1MenuFileName( flags )
- if flags:
- TriggerFlags.triggerMenuSetup = flags.Trigger.triggerMenuSetup
- menuName = TriggerFlags.triggerMenuSetup() if flags is None else flags.Trigger.triggerMenuSetup
- log.info("Generating L1 menu %s", menuName)
+ log.info("Generating L1 menu %s", flags.Trigger.triggerMenuSetup)
from TriggerMenuMT.L1.L1MenuConfig import L1MenuConfig
- l1cfg = L1MenuConfig( menuName = menuName )
+ l1cfg = L1MenuConfig( menuName = flags.Trigger.triggerMenuSetup)
outfile = l1cfg.writeJSON(outputFile = fileName)
if outfile is not None:
log.info("Wrote L1 menu file %s", outfile)
@@ -144,18 +115,18 @@ def generateL1Menu( flags=None ):
# configuration of L1ConfigSvc
@memoize
-def getL1ConfigSvc( flags = None ):
+def getL1ConfigSvc( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
from AthenaCommon.Logging import log
- from TriggerJobOpts.TriggerFlags import TriggerFlags
# generate menu file
- generatedFile = generateL1Menu( flags=flags )
+ generatedFile = generateL1Menu( flags )
# configure config svc
TrigConf__LVL1ConfigSvc = CompFactory.getComp("TrigConf::LVL1ConfigSvc")
l1ConfigSvc = TrigConf__LVL1ConfigSvc("LVL1ConfigSvc")
l1ConfigSvc.ConfigSource = "XML"
+ from TriggerJobOpts.TriggerFlags import TriggerFlags
l1XMLFile = TriggerFlags.inputLVL1configFile() if flags is None else flags.Trigger.LVL1ConfigFile
# check if file exists in this directory otherwise add the package to aid path resolution
# also a '/' in the file name indicates that no package needs to be added
@@ -182,7 +153,7 @@ def getL1ConfigSvc( flags = None ):
# configuration of HLTConfigSvc
@memoize
-def getHLTConfigSvc( flags = None ):
+def getHLTConfigSvc( flags ):
log = logging.getLogger('TrigConfigSvcCfg')
TrigConf__HLTConfigSvc = CompFactory.getComp("TrigConf::HLTConfigSvc")
hltConfigSvc = TrigConf__HLTConfigSvc("HLTConfigSvc")
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx
index 621a1047ff1382750f1d01e8e2059772e64f880d..62efca7e710e6478339cb974d60558088351d838 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/DSConfigSvc.cxx
@@ -109,7 +109,7 @@ TrigConf::DSConfigSvc::initialize() {
if( jobOptionsSvc.retrieve().isFailure() ) {
ATH_MSG_WARNING( "Cannot retrieve JobOptionsSvc" );
} else {
- const Property* p =
+ const Gaudi::Details::PropertyBase* p =
Gaudi::Utils::getProperty( jobOptionsSvc->getProperties( "IOVDbSvc" ), "Folders" );
if( p ) m_folders = p->toString();
ATH_MSG_DEBUG( "The string 'folders' is: " << m_folders );
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
index 6773a06ab9885d3a3504228fee159dcc84ebbd44..6613ef76b2fb3dde43b198959942f30ef82dd690 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
@@ -205,7 +205,7 @@ HLTConfigSvc::initialize() {
if (jobOptionsSvc.retrieve().isFailure()) {
ATH_MSG_WARNING("Cannot retrieve JobOptionsSvc");
} else {
- const Property* p=Gaudi::Utils::getProperty( jobOptionsSvc->getProperties("DataFlowConfig"), "DF_PartitionName");
+ const Gaudi::Details::PropertyBase* p=Gaudi::Utils::getProperty( jobOptionsSvc->getProperties("DataFlowConfig"), "DF_PartitionName");
if (p != 0) m_partition = p->toString();
}
}
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
index 58cbebc361e403ab0feb18ca273d1fc16580b826..c8e05bdd091ce426e82e6ee174f8526ce82daa74 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.cxx
@@ -7,7 +7,7 @@
#include <nlohmann/json.hpp>
#include "GaudiKernel/IProperty.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigConfIO/TrigDBJobOptionsLoader.h"
#include "TrigConfData/DataStructure.h"
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
index 573b5af122f3e8bee35a73c1b680884fb16645ec..5c87ed49c03504b1b9bb28986e3c0edb0513a307 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/TrigConfJobOptionsSvc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TrigConfigSvc_JobOptionsSvc
@@ -42,38 +42,46 @@ namespace TrigConf {
/// @name IOptionsSvc interface
///@{
- virtual void set( const std::string& key, const std::string& value ) {
+ virtual void set( const std::string& key, const std::string& value ) override
+ {
return m_optsvc->set(key,value);
}
- virtual std::string get( const std::string& key, const std::string& default_ = {} ) const {
+ virtual std::string get( const std::string& key, const std::string& default_ = {} ) const override
+ {
return m_optsvc->get(key,default_);
}
- virtual std::string pop( const std::string& key, const std::string& default_ = {} ) {
+ virtual std::string pop( const std::string& key, const std::string& default_ = {} ) override
+ {
return m_optsvc->pop(key,default_);
}
- virtual bool has( const std::string& key ) const {
+ virtual bool has( const std::string& key ) const override
+ {
return m_optsvc->has(key);
}
- virtual bool isSet( const std::string& key ) const {
+ virtual bool isSet( const std::string& key ) const override
+ {
return m_optsvc->isSet(key);
}
- virtual std::vector<std::tuple<std::string, std::string>> items() const {
+ virtual std::vector<std::tuple<std::string, std::string>> items() const override
+ {
return m_optsvc->items();
}
- virtual void bind( const std::string& prefix, Gaudi::Details::PropertyBase* property ) {
+ virtual void bind( const std::string& prefix, Gaudi::Details::PropertyBase* property ) override
+ {
return m_optsvc->bind(prefix,property);
}
// using OnlyDefaults = Gaudi::tagged_bool<class OnlyDefaults_tag>;
using OnlyDefaults = Gaudi::Interfaces::IOptionsSvc::OnlyDefaults;
virtual void broadcast( const std::regex& filter, const std::string& value,
- OnlyDefaults defaults = OnlyDefaults{true} ) {
+ OnlyDefaults defaults = OnlyDefaults{true} ) override
+ {
return m_optsvc->broadcast(filter, value, defaults);
}
///@}
@@ -104,7 +112,7 @@ namespace TrigConf {
return m_josvc->getProperties(client);
}
- virtual const Property* getClientProperty(const std::string& client,
+ virtual const Gaudi::Details::PropertyBase* getClientProperty(const std::string& client,
const std::string& name) const override
{
return m_josvc->getClientProperty(client, name);
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfxAOD/CMakeLists.txt
index cc1b6dc01c6a830520acef3dc57142c2f87f1325..31390aa07cfd5871b1648fde13d68fd7a87cbfda 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/CMakeLists.txt
@@ -32,8 +32,9 @@ endif()
# Test(s) in the package:
if( XAOD_STANDALONE )
- atlas_add_test( xaodconfigtool_test
- SCRIPT test/ut_trigconfxaod_xaodconfigtool_test.py )
+ # FIX ME: temporarily disabled as it is failing
+ # atlas_add_test( xaodconfigtool_test
+ # SCRIPT test/ut_trigconfxaod_xaodconfigtool_test.py )
endif()
# Install files from the package:
diff --git a/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx b/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx
index 2ecadae82256704452dd298dd8f62d6018f085c3..bda6b320806c441d0c870d85c711ee0388e27d7d 100644
--- a/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx
+++ b/Trigger/TrigFake/src/FakeLvl1MultipleRoIsatFixedEtaPhi.cxx
@@ -24,7 +24,7 @@ Modified :
#include <utility>
// INCLUDE GAUDI HEADER FILES:
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
diff --git a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
index 40d868dd86ddef2995514f2357cffa9001731716..ec18ce9258780bb9d623fc479348d9641efd4d29 100644
--- a/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
+++ b/Trigger/TrigFake/src/FakeLvl1RoIfromKine.cxx
@@ -23,7 +23,7 @@ Modified :
#include <vector>
#include <utility>
// INCLUDE GAUDI HEADER FILES:
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/ISvcLocator.h"
# include "CLHEP/Units/SystemOfUnits.h"
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
index 4d4bc0dd2c0b7ca68fdd0228953e73bc04b2f057..89ed0b26ff68ac3c57a93b45b88a3e178e0825da 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
@@ -5,6 +5,7 @@ atlas_subdir( TrigBjetHypo )
# External dependencies:
find_package( ROOT COMPONENTS MathCore )
+find_package( CLHEP )
# Component(s) in the package:
atlas_add_component( TrigBjetHypo
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..136668950ef97a470a11e4402ef43b8fc53c6309
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.cxx
@@ -0,0 +1,80 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**************************************************************************
+ **
+ ** File: Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h
+ **
+ ** Description: - Hypothesis Tool: search for electron pairs with
+ ** invariant mass in some interval; intended for Z->ee
+ ** - Modified from TrigL2DielectronMassHypo by R. Goncalo
+ ** - Modified from TrigEFDielectronMassHypo by
+ ** Debottam Bakshi Gupta
+ **
+ ** Author: T. Hrynova <thrynova@mail.cern.ch>
+ **
+ ** Created: Nov 13 2009
+ **
+ **************************************************************************/
+
+
+#include "TrigEgammaDielectronMassHypoTool.h"
+
+#include <cmath>
+
+using namespace TrigCompositeUtils;
+
+TrigEgammaDielectronMassHypoTool::TrigEgammaDielectronMassHypoTool(const std::string& type, const std::string& name, const IInterface* parent)
+ : ComboHypoToolBase(type, name, parent) {}
+
+
+StatusCode TrigEgammaDielectronMassHypoTool::initialize()
+{
+ ATH_MSG_DEBUG("AcceptAll = " << m_acceptAll );
+ ATH_MSG_DEBUG("LowerMassCut = " << m_lowerMassElectronClusterCut );
+ ATH_MSG_DEBUG("UpperMassCut = " << m_upperMassElectronClusterCut );
+
+ if ( not m_monTool.name().empty() ) {
+ ATH_CHECK( m_monTool.retrieve() );
+ ATH_MSG_DEBUG("m_monTool name: " << m_monTool);
+ }
+
+ ATH_MSG_DEBUG("Initialization completed successfully");
+
+ return StatusCode::SUCCESS;
+}
+
+bool TrigEgammaDielectronMassHypoTool::executeAlg(std::vector<LegDecision> &combination) const {
+
+//retrieve the electrons
+ std::vector<ElementLink<xAOD::ElectronContainer>> selected_electrons;
+ for (auto el: combination){
+ auto EL= el.second;
+ auto electronLink = TrigCompositeUtils::findLink<xAOD::ElectronContainer>( *EL, featureString() ).link;
+ selected_electrons.push_back(electronLink);
+ }
+ auto electronLink1=selected_electrons[0];
+ auto electronLink2=selected_electrons[1];
+ TLorentzVector hlv1 = (*electronLink1)->p4();
+ TLorentzVector hlv2 = (*electronLink2)->p4();
+ double mass = (hlv1+hlv2).M();
+ ATH_MSG_DEBUG("Found two Electrons with mass " <<mass);
+
+ // apply the cut
+ bool pass=true;
+ if (mass<m_lowerMassElectronClusterCut || mass>m_upperMassElectronClusterCut){
+ ATH_MSG_DEBUG("Combination failed mass cut: " << mass << " not in [" << m_lowerMassElectronClusterCut << "," << m_upperMassElectronClusterCut << "]");
+ pass=false;
+ }
+
+ if (pass)
+ ATH_MSG_DEBUG( " Invariant mass " << mass << " is within [" <<m_lowerMassElectronClusterCut<< "," << m_upperMassElectronClusterCut << "] This seleciton passed! ");
+
+ return pass;
+
+}
+
+
+
+
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..424dea96b825cbe1773d9ff98540fd1b925d298a
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h
@@ -0,0 +1,80 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGEGAMMAHYPO_TRIGEGAMMADIELECTRONMASSHYPOTOOL_H
+#define TRIGEGAMMAHYPO_TRIGEGAMMADIELECTRONMASSHYPOTOOL_H
+
+/**************************************************************************
+ **
+ ** File: Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaDielectronMassHypoTool.h
+ **
+ ** Description: - Hypothesis Tool: search for electron pairs with
+ ** invariant mass in some interval; intended for Z->ee
+ ** - Modified from TrigL2DielectronMassHypo by R. Goncalo
+ ** - Modified from TrigEFDielectronMassHypo by
+ ** Debottam Bakshi Gupta
+ **
+ ** Author: T. Hrynova <thrynova@mail.cern.ch>
+ **
+ ** Created: Nov 13 2009
+ **
+ **************************************************************************/
+
+#include <string>
+#include <vector>
+
+#include "DecisionHandling/ComboHypoToolBase.h"
+
+#include "xAODTracking/TrackParticleContainer.h"
+#include "xAODTrigEgamma/TrigElectron.h"
+#include "xAODEgamma/ElectronContainer.h"
+
+#include "TrigCompositeUtils/HLTIdentifier.h"
+#include "TrigCompositeUtils/TrigCompositeUtils.h"
+
+#include "AthenaMonitoringKernel/Monitored.h"
+#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+
+
+/**
+ * \class TrigEgammaDielectronMassHypoTool
+ * \brief TrigEgammaDielectronMassHypoTool is a ComboHypoTool that calculates the inv mass
+ * Apply inv mass cuts (upper and lower cut) to the two electrons and accepts the event if condition is
+ * satisfied
+ *
+ */
+
+
+class TrigEgammaDielectronMassHypoTool: public ComboHypoToolBase {
+
+ public:
+
+ TrigEgammaDielectronMassHypoTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent);
+
+ virtual ~TrigEgammaDielectronMassHypoTool() {};
+ virtual StatusCode initialize() override;
+
+
+ private:
+
+ virtual bool executeAlg(std::vector<LegDecision>& thecomb) const override;
+
+ // flags
+ Gaudi::Property< bool > m_acceptAll {this, "AcceptAll", false, "Ignore selection" };
+
+ // cuts
+ Gaudi::Property<float> m_lowerMassElectronClusterCut {this,"LowerMassElectronClusterCut", 50000.0, "Lower mass cut for electron-cluster pair"}; //!< lower inv mass cut (e,cluster)
+ Gaudi::Property<float> m_upperMassElectronClusterCut {this,"UpperMassElectronClusterCut", 130000.0, "Upper mass cut for electron-cluster pair"}; //!< upper inv mass cut (e,cluster)
+
+ // monitoring
+ ToolHandle<GenericMonitoringTool> m_monTool { this, "MonTool", "", "Monitoring tool" };
+
+
+}; // TRIGEGAMMAHYPO_TRIGEGAMMADIELECTRONMASSHYPOTOOL_H
+#endif
+
+
+
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoAlgMT.cxx
index e8358950217edbb0aae7fd81ef974dda67e68a06..adfa2745c0d70ebc5bef78809c50ffd0710dd811 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastCaloHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaFastCaloHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
index 44a064fd9ee6066e073224e803d267dee89162b4..6572eac08f2795dab482b2e6fc7ac4364b189265 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include <map>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaFastElectronHypoAlgMT.h"
#include "AthViews/ViewHelper.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.h
index d44c13333af7634945b2d778adba35a9d919c962..93b2a681a8748f9df9eca5e64d5936b35a95fc52 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastElectronHypoTool.h
@@ -4,7 +4,7 @@
#ifndef TRIGEGAMMAHYPO_TRIGEGAMMAFASTELECTRONHYPOTOOL_H
#define TRIGEGAMMAHYPO_TRIGEGAMMAFASTELECTRONHYPOTOOL_H 1
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "xAODTrigCalo/TrigEMCluster.h"
#include "xAODTrigEgamma/TrigElectronContainer.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoAlgMT.cxx
index a57e30b492740a2158f2aabb996e9db308fd5b79..b20937136fba9e15e1bf44bc8aa34d4232a35f02 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaFastPhotonHypoAlgMT.h"
#include "AthViews/ViewHelper.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoTool.h b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoTool.h
index 1803c1e56cc10a9d8f300f603085f0b9aa0d48ae..a2f3a7a313131a13cb2c116ccb0b850800607585 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaFastPhotonHypoTool.h
@@ -4,7 +4,7 @@
#ifndef TRIGEGAMMAHYPO_TRIGEGAMMAFASTPHOTONHYPOTOOL_H
#define TRIGEGAMMAHYPO_TRIGEGAMMAFASTPHOTONHYPOTOOL_H 1
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "CLHEP/Units/SystemOfUnits.h"
#include "xAODTrigCalo/TrigEMCluster.h"
#include "xAODTrigEgamma/TrigPhotonContainer.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
index 60b07defc376c1c1a4abc53a6b9fcf8934ee5069..55fc86417b115a99f5c634bcecf0e44c7130f4a8 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionCaloHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaPrecisionCaloHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
index 8c90e35cbd80304bb2ef58b696e0946ba83632c5..9dbb604bce4556c243291e954cc5bf4929d428ff 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionElectronHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaPrecisionElectronHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
index de8a4a689b5cd47ba86962fe58b1c2227a5d5ab5..6d59b33f34d26405d000e79ec5bac50a7f776865 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/TrigEgammaPrecisionPhotonHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEgammaPrecisionPhotonHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx b/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
index da14c5524812d5eec4f86bc5a307c31425c3858d..0c58c9a66ebc930b5d9974c06abfc92085330f59 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/src/components/TrigEgammaHypo_entries.cxx
@@ -30,6 +30,7 @@
#include "../TrigEgammaPrecisionElectronHypoAlgMT.h"
#include "../TrigEgammaPrecisionPhotonHypoToolMult.h"
#include "../TrigEgammaPrecisionElectronHypoToolMult.h"
+#include "../TrigEgammaDielectronMassHypoTool.h"
DECLARE_COMPONENT( TrigL2CaloHypo )
DECLARE_COMPONENT( TrigL2ElectronFex )
@@ -63,3 +64,5 @@ DECLARE_COMPONENT( TrigEgammaPrecisionPhotonHypoAlgMT )
DECLARE_COMPONENT( TrigEgammaPrecisionElectronHypoAlgMT )
DECLARE_COMPONENT( TrigEgammaPrecisionPhotonHypoToolMult )
DECLARE_COMPONENT( TrigEgammaPrecisionElectronHypoToolMult )
+DECLARE_COMPONENT( TrigEgammaDielectronMassHypoTool )
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
index a7bddb80d573e2048e57189ead7ae51b4465e49a..f7f95d76a10aea8259b1af4c9ecb4049b001d43a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoAlgMT.cxx
@@ -3,7 +3,7 @@
*/
#include <algorithm>
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigJetHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserAlg.h b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserAlg.h
index 50d276dd285a3af5775430db9eb3bb62cb8b783a..c69dea03f8dbfa83e9813c439b1244636109cd18 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserAlg.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserAlg.h
@@ -11,7 +11,7 @@
#include "TrigHLTJetHypoUnitTests/IHypoJetVectorGenerator.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class JetHypoExerciserAlg : public AthAlgorithm {
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserCompareAlg.h b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserCompareAlg.h
index 370a429bde57dd08e757007e02c36cf6e6047041..1da74dbe1090da21662415425ed48f5c563be00e 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserCompareAlg.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/TrigHLTJetHypoUnitTests/JetHypoExerciserCompareAlg.h
@@ -11,7 +11,7 @@
#include "TrigHLTJetHypoUnitTests/IHypoJetVectorGenerator.h"
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
class JetHypoExerciserCompareAlg : public AthAlgorithm {
diff --git a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
index 36e0b2cf7411b17d1286fe7b7c1c6f3f13195dfd..e979887b4abd59e99b8831444e1b3756d996b51b 100644
--- a/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigMissingETHypo/src/TrigMissingETHypoAlgMT.cxx
@@ -3,7 +3,7 @@
*/
#include "TrigMissingETHypoAlgMT.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
index 63b946b06ea934fcb32020b7e8887b4f00374511..b9b828cecc8e399fcda815ea6f84cc13d2aa9a3f 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py
@@ -8,7 +8,6 @@ from TrigMuonHypoMT.TrigMuonHypoMTConf import ( # noqa: F401 (algs not used her
TrigMuisoHypoAlg, TrigMuisoHypoTool,
TrigMuonEFHypoAlg, TrigMuonEFHypoTool,
TrigMuonEFTrackIsolationHypoAlg, TrigMuonEFTrackIsolationHypoTool,
- TrigL2MuonOverlapRemoverMufastAlg, TrigL2MuonOverlapRemoverMucombAlg, TrigL2MuonOverlapRemoverTool,
TrigMuonEFInvMassHypoTool,
TrigMuonLateMuRoIHypoAlg, TrigMuonLateMuRoIHypoTool
)
@@ -251,6 +250,33 @@ def TrigMufastHypoToolFromDict( chainDict ):
return tool
+def TrigMufastHypoToolwORFromDict( chainDict ):
+
+ thresholds = getThresholdsFromDict( chainDict )
+ config = TrigMufastHypoConfig()
+ tool = config.ConfigurationHypoTool( chainDict['chainName'], thresholds )
+ # Setup MonTool for monitored variables in AthenaMonitoring package
+
+ # Overlap Removal
+ tool.ApplyOR = True
+ # cut defintion
+ tool.RequireDR = True
+ tool.RequireMass = True
+ tool.RequireSameSign = True
+ # BB
+ tool.DRThresBB = 0.05
+ tool.MassThresBB = 0.20
+ # BE
+ tool.DRThresBE = 0.05
+ tool.MassThresBE = 0.20
+ # EE
+ tool.EtaBinsEC = [0, 1.9, 2.1, 9.9]
+ tool.DRThresEC = [0.06, 0.05, 0.05]
+ tool.MassThresEC = [0.20, 0.15, 0.10]
+ addMonitoring( tool, TrigL2MuonOverlapRemoverMonitoringMufast, 'TrigMufastHypoTool', chainDict['chainName'] )
+
+ return tool
+
class TrigMufastHypoConfig(object):
@@ -322,75 +348,30 @@ class TrigMufastHypoConfig(object):
return tool
-### for TrigL2MuonOverlapRemoverMufast
-def TrigL2MuonOverlapRemoverMufastToolFromDict( chainDict ):
- thresholds = getThresholdsFromDict( chainDict )
- config = TrigL2MuonOverlapRemoverMufastConfig()
- tool=config.ConfigurationHypoTool( chainDict['chainName'], thresholds)
- # # Setup MonTool for monitored variables in AthenaMonitoring package
- addMonitoring( tool, TrigL2MuonOverlapRemoverMonitoringMufast, 'TrigL2MuonOverlapRemoverMufastTool', chainDict['chainName'] )
-
- return tool
+def TrigmuCombHypoToolFromDict( chainDict ):
+ if 'idperf' in chainDict['chainParts'][0]['chainPartName']:
+ thresholds = ['passthrough']
+ else:
+ thresholds = getThresholdsFromDict( chainDict )
-class TrigL2MuonOverlapRemoverMufastConfig(object):
-
- def ConfigurationHypoTool( self, toolName, thresholds):
- tool = CompFactory.TrigL2MuonOverlapRemoverTool( toolName )
- tool.Multiplicity = len(thresholds)
- tool.DoMufastBasedRemoval = True
-
- # cut defintion
- tool.MufastRequireDR = True
- tool.MufastRequireMass = True
- tool.MufastRequireSameSign = True
- # BB
- tool.MufastDRThresBB = 0.05
- tool.MufastMassThresBB = 0.20
- # BE
- tool.MufastDRThresBE = 0.05
- tool.MufastMassThresBE = 0.20
- # EE
- tool.MufastEtaBinsEC = [0, 1.9, 2.1, 9.9]
- tool.MufastDRThresEC = [0.06, 0.05, 0.05]
- tool.MufastMassThresEC = [0.20, 0.15, 0.10]
+ config = TrigmuCombHypoConfig()
- return tool
+ tight = False # can be probably decoded from some of the proprties of the chain, expert work
+ acceptAll = False
+ if chainDict['chainParts'][0]['signature'] == 'Bphysics':
+ acceptAll = True
-### for TrigL2MuonOverlapRemoverMucomb
-def TrigL2MuonOverlapRemoverMucombToolFromDict( chainDict ):
+ tool=config.ConfigurationHypoTool( chainDict['chainName'], thresholds, tight, acceptAll )
- thresholds = getThresholdsFromDict( chainDict )
- config = TrigL2MuonOverlapRemoverMucombConfig()
- tool=config.ConfigurationHypoTool( chainDict['chainName'], thresholds)
- # # Setup MonTool for monitored variables in AthenaMonitoring package
- addMonitoring( tool, TrigL2MuonOverlapRemoverMonitoringMucomb, 'TrigL2MuonOverlapRemoverMucombTool', chainDict['chainName'] )
+ addMonitoring( tool, TrigmuCombHypoMonitoring, "TrigmuCombHypoTool", chainDict['chainName'] )
return tool
-class TrigL2MuonOverlapRemoverMucombConfig(object):
-
- def ConfigurationHypoTool( self, toolName, thresholds):
- tool = CompFactory.TrigL2MuonOverlapRemoverTool( toolName )
- tool.Multiplicity = len(thresholds)
- tool.DoMucombBasedRemoval = True
- # cut defintion
- tool.MucombRequireDR = True
- tool.MucombRequireMufastDR = True
- tool.MucombRequireMass = True
- tool.MucombRequireSameSign = True
- tool.MucombEtaBins = [0, 0.9, 1.1, 1.9, 2.1, 9.9]
- tool.MucombDRThres = [0.002, 0.001, 0.002, 0.002, 0.002]
- tool.MucombMufastDRThres = [0.4, 0.4, 0.4, 0.4, 0.4]
- tool.MucombMassThres = [0.004, 0.002, 0.006, 0.006, 0.006]
-
- return tool
-
-
-def TrigmuCombHypoToolFromDict( chainDict ):
+def TrigmuCombHypoToolwORFromDict( chainDict ):
if 'idperf' in chainDict['chainParts'][0]['chainPartName']:
thresholds = ['passthrough']
@@ -402,15 +383,25 @@ def TrigmuCombHypoToolFromDict( chainDict ):
tight = False # can be probably decoded from some of the proprties of the chain, expert work
acceptAll = False
- if chainDict['chainParts'][0]['signature'] == 'Bphysics':
- acceptAll = True
tool=config.ConfigurationHypoTool( chainDict['chainName'], thresholds, tight, acceptAll )
- addMonitoring( tool, TrigmuCombHypoMonitoring, "TrigmuCombHypoTool", chainDict['chainName'] )
+ # Overlap Removal
+ tool.ApplyOR = True
+ tool.RequireDR = True
+ tool.RequireMufastDR = True
+ tool.RequireMass = True
+ tool.RequireSameSign = True
+ tool.EtaBins = [0, 0.9, 1.1, 1.9, 2.1, 9.9]
+ tool.DRThres = [0.002, 0.001, 0.002, 0.002, 0.002]
+ tool.MufastDRThres = [0.4, 0.4, 0.4, 0.4, 0.4]
+ tool.MassThres = [0.004, 0.002, 0.006, 0.006, 0.006]
+
+ addMonitoring( tool, TrigL2MuonOverlapRemoverMonitoringMucomb, "TrigmuCombHypoTool", chainDict['chainName'] )
return tool
+
class TrigmuCombHypoConfig(object):
log = logging.getLogger('TrigmuCombHypoConfig')
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py
index 8a74ac1ec0d6005d32be212fc98e18aafb97fb82..7224c2e0d167f96681812f137ac5b48ad612b91a 100755
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMonitoringMT.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -25,7 +25,7 @@ class TrigMufastHypoMonitoring(GenericMonitoringTool):
self.defineHistogram('XatBe', type='TH1F', path='EXPERT', title="DCA along X; X (cm)",
xbins=100, xmin=-1000, xmax=1000)
-class TrigL2MuonOverlapRemoverMonitoringMufast(GenericMonitoringTool):
+class TrigL2MuonOverlapRemoverMonitoringMufast(TrigMufastHypoMonitoring):
def __init__ (self, name):
super(TrigL2MuonOverlapRemoverMonitoringMufast, self).__init__(name)
@@ -71,7 +71,7 @@ class TrigmuCombHypoMonitoring(GenericMonitoringTool):
self.defineHistogram('A0', type='TH1F', path='EXPERT', title="PCA along x-y from ID track from #muComb; PCA(A0) (mm)",
xbins=100, xmin=-0.6, xmax=0.6)
-class TrigL2MuonOverlapRemoverMonitoringMucomb(GenericMonitoringTool):
+class TrigL2MuonOverlapRemoverMonitoringMucomb(TrigmuCombHypoMonitoring):
def __init__ (self, name):
super(TrigL2MuonOverlapRemoverMonitoringMucomb, self).__init__(name)
@@ -136,3 +136,5 @@ class TrigMuonEFInvMassHypoMonitoring(GenericMonitoringTool):
self.defineHistogram('Mass', type='TH1F', path='EXPERT', title="Dimuon mass from #TrigMuonEFInvMHypo; Mass (GeV)",
xbins=200, xmin=0, xmax=200)
+ self.defineHistogram('Mass_sel', type='TH1F', path='EXPERT', title="Dimuon mass for selected events from #TrigMuonEFInvMHypo; Mass (GeV)",
+ xbins=200, xmin=0, xmax=200)
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.cxx
deleted file mode 100644
index 4e5a178b5e5b9834074280a747a7b36fec1049fa..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.cxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigL2MuonOverlapRemoverMucombAlg.h"
-#include "AthViews/ViewHelper.h"
-
-using namespace TrigCompositeUtils;
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-TrigL2MuonOverlapRemoverMucombAlg::TrigL2MuonOverlapRemoverMucombAlg( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::HypoBase( name, pSvcLocator )
-{}
-
-TrigL2MuonOverlapRemoverMucombAlg::~TrigL2MuonOverlapRemoverMucombAlg()
-{}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverMucombAlg::initialize()
-{
- ATH_MSG_DEBUG( "Initializing " << name() << "..." );
- ATH_CHECK(m_OverlapRemoverTools.retrieve());
-
- renounce(m_OverlapRemoverKey);
- ATH_CHECK(m_OverlapRemoverKey.initialize());
-
- ATH_MSG_DEBUG( "Initialization completed successfully" );
- return StatusCode::SUCCESS;
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverMucombAlg::execute(const EventContext& context) const
-{
- ATH_MSG_DEBUG("StatusCode TrigL2MuonOverlapRemoverMucomb::execute start");
- auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context);
- ATH_MSG_DEBUG("Runnung with " << previousDecisionsHandle->size() << " implicit ReadHandles for previous decision");
-
- // new output decisions
- SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context );
- auto decisions = outputHandle.ptr();
- // end of common
-
-
- std::vector<TrigL2MuonOverlapRemoverTool::L2CBMuonOverlapInfo> toolInput;
- // loop over previous decisions
- size_t counter = 0;
-
- for ( const auto previousDecision: *previousDecisionsHandle ) {
- //get RecRoI
- auto RecRoIInfo = TrigCompositeUtils::findLink< DataVector< LVL1::RecMuonRoI > >( previousDecision, initialRecRoIString() );
- auto RecRoIEL = RecRoIInfo.link;
- ATH_CHECK( RecRoIEL.isValid() );
- const LVL1::RecMuonRoI* RecRoI = *RecRoIEL;
-
- // get View
- auto viewELInfo = TrigCompositeUtils::findLink< ViewContainer >( previousDecision, viewString(), /*suppressMultipleLinksWarning = */ true );
- ATH_CHECK( viewELInfo.isValid() );
- auto viewEL = viewELInfo.link;
-
- // get info
- auto L2MuonOverlapRemoverHandle = ViewHelper::makeHandle( *viewEL, m_OverlapRemoverKey, context );
- ATH_CHECK( L2MuonOverlapRemoverHandle.isValid() );
- ATH_MSG_DEBUG( "Muinfo handle size: " << L2MuonOverlapRemoverHandle->size() << "...");
-
- auto overlapEL = ViewHelper::makeLink( *viewEL, L2MuonOverlapRemoverHandle, 0 );
- ATH_CHECK( overlapEL.isValid() );
- const xAOD::L2CombinedMuon* overlap = *overlapEL;
-
- // create new decisions
- auto newd = newDecisionIn( decisions );
-
- if ( decisionIDs( previousDecision ).size() != 0 ) {
- toolInput.emplace_back( TrigL2MuonOverlapRemoverTool::L2CBMuonOverlapInfo{ newd, RecRoI, overlap, previousDecision} );
- }
-
- // set objectLink
- newd->setObjectLink( featureString(), overlapEL );
- TrigCompositeUtils::linkToPrevious( newd, previousDecision, context);
-
- // DEBUG
- auto muFastInfo = (*overlapEL)->muSATrack();
- ATH_MSG_DEBUG("REGTEST: muSATrack pt in " << m_OverlapRemoverKey.key() << " = " << muFastInfo->pt() << " GeV");
- ATH_MSG_DEBUG("REGTEST: muSATrack eta/phi in " << m_OverlapRemoverKey.key() << " = " << muFastInfo->eta() << "/" << muFastInfo->phi());
- ATH_MSG_DEBUG("REGTEST: L2MuonCBTrack pt in " << m_OverlapRemoverKey.key() << " = " << (*overlapEL)->pt() << " GeV");
- ATH_MSG_DEBUG("REGTEST: L2MuonCBTrack eta/phi in " << m_OverlapRemoverKey.key() << " = " << (*overlapEL)->eta() << "/" << (*overlapEL)->phi());
- ATH_MSG_DEBUG("Added view, features, previous decision to new decision "<<counter <<" for view "<<(*viewEL)->name() );
- ATH_MSG_DEBUG("Number of positive previous hypo Decision::" << decisionIDs( previousDecision ).size() );
-
- counter++;
- }
-
- ATH_MSG_DEBUG("Found " << toolInput.size() << " input to tools");
-
- // to TrigL2MuonOverlapRemoverTool
- StatusCode sc = StatusCode::SUCCESS;
- for ( auto& tool: m_OverlapRemoverTools ) {
- ATH_MSG_DEBUG("Go to " << tool );
- sc = tool->decide(toolInput);
- if (!sc.isSuccess()) {
- ATH_MSG_ERROR("MuonHypoTool is failed");
- return StatusCode::FAILURE;
- }
- } // End of tool algorithms */
-
- ATH_CHECK(hypoBaseOutputProcessing(outputHandle));
-
- ATH_MSG_DEBUG("StatusCode TrigL2MuonOverlapRemoverMucombAlg::execute success");
- return StatusCode::SUCCESS;
-
-}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.h
deleted file mode 100644
index f52132ccce6d1d1223c911eff762ff1122184fd1..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMucombAlg.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGL2MUONOVERLAPREMOVER_TRIGL2MUONOVERLAPREMOVERMUCOMBALG_H
-#define TRIGL2MUONOVERLAPREMOVER_TRIGL2MUONOVERLAPREMOVERMUCOMBALG_H 1
-
-#include "TrigL2MuonOverlapRemoverTool.h"
-#include "DecisionHandling/HypoBase.h"
-
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-class TrigL2MuonOverlapRemoverMucombAlg
- : public ::HypoBase
-{
- public:
-
- TrigL2MuonOverlapRemoverMucombAlg( const std::string& name, ISvcLocator* pSvcLocator );
-
- virtual ~TrigL2MuonOverlapRemoverMucombAlg();
-
- virtual StatusCode initialize() override;
- virtual StatusCode execute( const EventContext& context ) const override;
-
- private:
-
- ToolHandleArray<TrigL2MuonOverlapRemoverTool> m_OverlapRemoverTools {this, "HypoTools", {}, "Tools to perform selection"};
-
- SG::ReadHandleKey<xAOD::L2CombinedMuonContainer> m_OverlapRemoverKey {
- this, "L2MuonOverlapInfoFromMuCombAlg", "MuonL2CBInfo", "Key for overlap removal from previousDecisions"};
-
-};
-
-#endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.cxx
deleted file mode 100644
index aac9c75c3dc9ec67b8509d6acc70678f1073c38b..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.cxx
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TrigL2MuonOverlapRemoverMufastAlg.h"
-#include "AthViews/ViewHelper.h"
-
-using namespace TrigCompositeUtils;
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-TrigL2MuonOverlapRemoverMufastAlg::TrigL2MuonOverlapRemoverMufastAlg( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::HypoBase( name, pSvcLocator )
-{}
-
-TrigL2MuonOverlapRemoverMufastAlg::~TrigL2MuonOverlapRemoverMufastAlg()
-{}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverMufastAlg::initialize()
-{
- ATH_MSG_DEBUG( "Initializing " << name() << "..." );
- ATH_CHECK(m_OverlapRemoverTools.retrieve());
-
- renounce(m_OverlapRemoverKey);
- ATH_CHECK(m_OverlapRemoverKey.initialize());
-
- ATH_MSG_DEBUG( "Initialization completed successfully" );
- return StatusCode::SUCCESS;
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverMufastAlg::execute(const EventContext& context) const
-{
- ATH_MSG_DEBUG("StatusCode TrigL2MuonOverlapRemoverMufast::execute start");
- auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context);
- ATH_MSG_DEBUG("Runnung with " << previousDecisionsHandle->size() << " implicit ReadHandles for previous decision");
-
- // new output decisions
- SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context );
- auto decisions = outputHandle.ptr();
- // end of common
-
-
- std::vector<TrigL2MuonOverlapRemoverTool::L2SAMuonOverlapInfo> toolInput;
- // loop over previous decisions
- size_t counter = 0;
-
- for ( const auto previousDecision: *previousDecisionsHandle ) {
- //get RecRoI
- auto RecRoIInfo = TrigCompositeUtils::findLink< DataVector< LVL1::RecMuonRoI > >( previousDecision, initialRecRoIString() );
- auto RecRoIEL = RecRoIInfo.link;
- ATH_CHECK( RecRoIEL.isValid() );
- const LVL1::RecMuonRoI* RecRoI = *RecRoIEL;
-
- // get View
- auto viewELInfo = TrigCompositeUtils::findLink< ViewContainer >( previousDecision, viewString(), /*suppressMultipleLinksWarning = */ true );
- ATH_CHECK( viewELInfo.isValid() );
- auto viewEL = viewELInfo.link;
-
- // get info
- auto L2MuonOverlapRemoverHandle = ViewHelper::makeHandle( *viewEL, m_OverlapRemoverKey, context );
- ATH_CHECK( L2MuonOverlapRemoverHandle.isValid() );
- ATH_MSG_DEBUG( "Muinfo handle size: " << L2MuonOverlapRemoverHandle->size() << "...");
-
- auto overlapEL = ViewHelper::makeLink( *viewEL, L2MuonOverlapRemoverHandle, 0 );
- ATH_CHECK( overlapEL.isValid() );
- const xAOD::L2StandAloneMuon* overlap = *overlapEL;
-
- // create new decisions
- auto newd = newDecisionIn( decisions );
-
- if ( decisionIDs( previousDecision ).size() != 0 ) {
- toolInput.emplace_back( TrigL2MuonOverlapRemoverTool::L2SAMuonOverlapInfo{ newd, RecRoI, overlap, previousDecision} );
- }
-
- // set objectLink
- newd->setObjectLink( featureString(), overlapEL );
- TrigCompositeUtils::linkToPrevious( newd, previousDecision, context);
-
- // DEBUG
- ATH_MSG_DEBUG("REGTEST: L2MuonSATrack pt in " << m_OverlapRemoverKey.key() << " = " << (*overlapEL)->pt() << " GeV");
- ATH_MSG_DEBUG("REGTEST: L2MuonSATrack eta/phi in " << m_OverlapRemoverKey.key() << " = " << (*overlapEL)->eta() << "/" << (*overlapEL)->phi());
- ATH_MSG_DEBUG("Added view, features, previous decision to new decision "<<counter <<" for view "<<(*viewEL)->name() );
- ATH_MSG_DEBUG("Number of positive previous hypo Decision::" << decisionIDs( previousDecision ).size() );
-
- counter++;
- }
-
- ATH_MSG_DEBUG("Found " << toolInput.size() << " input to tools");
-
- // to TrigL2MuonOverlapRemoverTool
- StatusCode sc = StatusCode::SUCCESS;
- for ( auto& tool: m_OverlapRemoverTools ) {
- ATH_MSG_DEBUG("Go to " << tool );
- sc = tool->decide(toolInput);
- if (!sc.isSuccess()) {
- ATH_MSG_ERROR("MuonHypoTool is failed");
- return StatusCode::FAILURE;
- }
- } // End of tool algorithms */
-
- ATH_CHECK(hypoBaseOutputProcessing(outputHandle));
-
- ATH_MSG_DEBUG("StatusCode TrigL2MuonOverlapRemoverAlg::execute success");
- return StatusCode::SUCCESS;
-
-}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.h
deleted file mode 100644
index c7e0eb83837dedc8b7406c531a18f33cac6897b8..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverMufastAlg.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGL2MUONOVERLAPREMOVER_TRIGL2MUONOVERLAPREMOVERMUFASTALG_H
-#define TRIGL2MUONOVERLAPREMOVER_TRIGL2MUONOVERLAPREMOVERMUFASTALG_H 1
-
-#include "TrigL2MuonOverlapRemoverTool.h"
-#include "DecisionHandling/HypoBase.h"
-
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-class TrigL2MuonOverlapRemoverMufastAlg
- : public ::HypoBase
-{
- public:
-
- TrigL2MuonOverlapRemoverMufastAlg( const std::string& name, ISvcLocator* pSvcLocator );
-
- virtual ~TrigL2MuonOverlapRemoverMufastAlg();
-
- virtual StatusCode initialize() override;
- virtual StatusCode execute( const EventContext& context ) const override;
-
- private:
-
- TrigL2MuonOverlapRemoverMufastAlg();
- ToolHandleArray<TrigL2MuonOverlapRemoverTool> m_OverlapRemoverTools {this, "HypoTools", {}, "Tools to perform selection"};
-
- SG::ReadHandleKey<xAOD::L2StandAloneMuonContainer> m_OverlapRemoverKey {
- this, "L2MuonOverlapInfoFromMuFastAlg", "MuonL2SAInfo", "Key for overlap removal from previousDecisions"};
-
-};
-
-#endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx
deleted file mode 100644
index 4ec3e3bfef20b00b6ac778bf0fc66c19b7642b71..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx
+++ /dev/null
@@ -1,858 +0,0 @@
-/*
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/SystemOfUnits.h"
-#include "AthenaMonitoringKernel/Monitored.h"
-#include "CxxUtils/phihelper.h"
-
-#include "TrigL2MuonOverlapRemoverTool.h"
-
-#include <cmath>
-
-using namespace TrigCompositeUtils;
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-TrigL2MuonOverlapRemoverTool::TrigL2MuonOverlapRemoverTool(const std::string& type,
- const std::string & name,
- const IInterface* parent )
- : AthAlgTool( type, name, parent ),
- m_decisionId( HLT::Identifier::fromToolName( name ) )
-{
-}
-
-TrigL2MuonOverlapRemoverTool::~TrigL2MuonOverlapRemoverTool(){
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverTool::initialize()
-{
- ATH_MSG_DEBUG("Initializing " << name() );
-
- ATH_MSG_DEBUG( "Tool configured for chain/id: " << m_decisionId );
-
- // MufastOverlapRemoval
- if( m_doMufastBasedRemoval ) {
- ATH_MSG_DEBUG( "--- muFast based overlap removal as: ---" );
- if( m_muFastRequireDR ) {
- ATH_MSG_DEBUG( "+ dR cut:" );
- if( (m_muFastEtaBinsEC.size()-1) != m_muFastDRThresEC.size() ) {
- ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" );
- return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG( " B-B : dR < " << m_muFastDRThresBB );
- ATH_MSG_DEBUG( " B-E : dR < " << m_muFastDRThresBE );
- ATH_MSG_DEBUG( " E-E : " );
- for(unsigned int i=0; i<m_muFastDRThresEC.size(); i++) {
- ATH_MSG_DEBUG( " EtaBin " << m_muFastEtaBinsEC[i] << " - " << m_muFastEtaBinsEC[i+1]
- << " : dR < " << m_muFastDRThresEC[i] );
- }
- }
- if( m_muFastRequireMass ) {
- ATH_MSG_DEBUG( "+ Mass cut:" );
- if( (m_muFastEtaBinsEC.size()-1) != m_muFastMassThresEC.size() ) {
- ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" );
- return StatusCode::FAILURE;
- }
- ATH_MSG_DEBUG( " B-B : Mass < " << m_muFastMassThresBB );
- ATH_MSG_DEBUG( " B-E : Mass < " << m_muFastMassThresBE );
- ATH_MSG_DEBUG( " E-E : " );
- for(unsigned int i=0; i<m_muFastMassThresEC.size(); i++) {
- ATH_MSG_DEBUG( " EtaBin " << m_muFastEtaBinsEC[i] << " - " << m_muFastEtaBinsEC[i+1]
- << " : Mass < " << m_muFastMassThresEC[i] );
- }
- }
- if( m_muFastRequireSameSign ) ATH_MSG_DEBUG( "+ Same charge sign" );
- }
-
- // MucombOverlapRemoval
- if( m_doMucombBasedRemoval ) {
- ATH_MSG_DEBUG( "--- muComb based overlap removal as: ---" );
- if( m_muCombRequireDR ) {
- ATH_MSG_DEBUG( "+ dR cut:" );
- if( (m_muCombEtaBins.size()-1) != m_muCombDRThres.size() ) {
- ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" );
- return StatusCode::FAILURE;
- }
- for(unsigned int i=0; i<m_muCombDRThres.size(); i++) {
- ATH_MSG_DEBUG( " EtaBin " << m_muCombEtaBins[i] << " - " << m_muCombEtaBins[i+1]
- << " : dR < " << m_muCombDRThres[i] );
- }
- }
- if( m_muCombRequireMufastDR ) {
- ATH_MSG_DEBUG( "+ dr(by mF) cut:" );
- if( (m_muCombEtaBins.size()-1) != m_muCombMufastDRThres.size() ) {
- ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" );
- return StatusCode::FAILURE;
- }
- for(unsigned int i=0; i<m_muCombMufastDRThres.size(); i++) {
- ATH_MSG_DEBUG( " EtaBin " << m_muCombEtaBins[i] << " - " << m_muCombEtaBins[i+1]
- << " : dR(mF) < " << m_muCombMufastDRThres[i] );
- }
- }
- if( m_muCombRequireMass ) {
- ATH_MSG_DEBUG( "+ Mass cut:" );
- if( (m_muCombEtaBins.size()-1) != m_muCombMassThres.size() ) {
- ATH_MSG_DEBUG( "bad thresholds setup .... exiting!" );
- return StatusCode::FAILURE;
- }
- for(unsigned int i=0; i<m_muCombMassThres.size(); i++) {
- ATH_MSG_DEBUG( " EtaBin " << m_muCombEtaBins[i] << " - " << m_muCombEtaBins[i+1]
- << " : Mass < " << m_muCombMassThres[i] );
- }
- }
- if( m_muCombRequireSameSign ) ATH_MSG_DEBUG( "+ Same charge sign" );
- }
-
- if ( not m_monTool.name().empty() ) {
- ATH_CHECK( m_monTool.retrieve() );
- ATH_MSG_DEBUG("MonTool name: " << m_monTool);
- }
-
- ATH_MSG_DEBUG("Initializing" << name() << "successfully");
-
- return StatusCode::SUCCESS;
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverTool::decide(std::vector<L2SAMuonOverlapInfo>& toolInput) const {
-
- ATH_MSG_DEBUG("Retrieved from TrigL2MuonOverlapRemoverMufastAlg and Running TrigL2MuonOverlapRemoverTool for selections.");
-
- std::vector<TrigL2MuonOverlapRemoverTool::L2SAMuonOverlapInfo> input;
-
- for( unsigned int i=0; i<toolInput.size(); ++i ) {
- if ( TrigCompositeUtils::passed( m_decisionId.numeric(), toolInput[i].previousDecisionIDs) ){
- input.emplace_back(toolInput[i]);
- }
- }
-
- size_t numMuon = input.size();
-
- if ( numMuon == 0) {
- ATH_MSG_DEBUG( "No positive previous hypo decision. Not need overlap removal." );
- auto mufastNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.);
- auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mufastNrAllEVs, mufastNrActiveEVs);
- mufastNrActiveEVs = numMuon;
- mufastNrAllEVs = numMuon;
- return StatusCode::SUCCESS;
- }
- else if ( numMuon == 1 ) {
- ATH_MSG_DEBUG("Number of muon event = " << numMuon );
- ATH_MSG_DEBUG("no overlap Removal necessary. exitting with all EventViews active." );
- auto mufastNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.);
- auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mufastNrAllEVs, mufastNrActiveEVs);
- mufastNrActiveEVs = numMuon;
- mufastNrAllEVs = numMuon;
- TrigCompositeUtils::addDecisionID(m_decisionId, input[0].decision);
- return StatusCode::SUCCESS;
- } else {
- ATH_MSG_DEBUG("Number of muon event = " << numMuon );
- auto mufastNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mufastNrAllEVs);
- mufastNrAllEVs = numMuon;
- ATH_CHECK(checkOverlap(input));
- return StatusCode::SUCCESS;
- }
- return StatusCode::SUCCESS;
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverTool::checkOverlap(std::vector<L2SAMuonOverlapInfo>& toolInput) const {
-
- size_t numMuon = toolInput.size();
- unsigned int i,j;
- std::vector<unsigned int> mufastResult;
- std::vector<TrigL2MuonOverlapRemoverTool::L2SAMuonOverlapInfo> uniqueMuon;
-
- bool errorWhenIdentifyingOverlap = false;
-
- for(i=0; i<numMuon; i++) {mufastResult.emplace_back(i); }
- for(i=0; i<numMuon-1; i++){
- for(j=i+1; j<numMuon; j++){
- ATH_MSG_DEBUG("++ i=" << i << " vs j=" << j);
- bool overlapped = isOverlap(toolInput[i].overlap, toolInput[j].overlap);
- if( ! overlapped ){ // judged as different
- ATH_MSG_DEBUG(" judged as: different objects");
- if( mufastResult[i] == mufastResult[j] ) { // but marked as same by someone
- ATH_MSG_DEBUG( "inconsistentency in muFast based overlap removal for more than two objects" );
- ATH_MSG_DEBUG( "two objects are judged as different but both were already marked as identical by someone else as: " );
- ATH_MSG_DEBUG( "i/j/result[i]/result[j]=" << i << " / " << j << " / " << mufastResult[i] << " / " << mufastResult[j] );
- auto mufastError = Monitored::Scalar("MufastError", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mufastError);
- mufastError = TrigL2MuonOverlapRemoverToolConsts::errorCode_inconsistent_overlap1;
- errorWhenIdentifyingOverlap = true;
- }
- }
- else{ // judged as overlap
- if( (mufastResult[j] != j && mufastResult[i] != mufastResult[j]) || (mufastResult[j] == j && mufastResult[i] != i) ){
- ATH_MSG_DEBUG( "inconsistentency in muFast based overlap removal for more than two objects" );
- ATH_MSG_DEBUG( "two objects are judged as overlap but only either was already marked as overlap to someone else: " );
- ATH_MSG_DEBUG( "i/j/result[i]/result[j]=" << i << " / " << j << " / " << mufastResult[i] << " / " << mufastResult[j] );
- auto mufastError = Monitored::Scalar("MufastError", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mufastError);
- mufastError = TrigL2MuonOverlapRemoverToolConsts::errorCode_inconsistent_overlap2;
- errorWhenIdentifyingOverlap = true;
- }
- ATH_MSG_DEBUG(" judged as: overlapped objects");
- if( mufastResult[i] == i ) {
- ATH_MSG_DEBUG( " i is not yet marked as overlap. so, it is a newly found overlap" );
- ATH_MSG_DEBUG( " -> marking mufastResult[j] as i..." );
- mufastResult[j] = i;
- } else {
- ATH_MSG_DEBUG( " both i/j already marked as overlap by: mufastResult[i]=" << mufastResult[i] );
- ATH_MSG_DEBUG( " -> do nothing..." );
- }
- }
- }
- }
-
- if( errorWhenIdentifyingOverlap ) {
- ATH_MSG_WARNING( "error when resolving overlap. exitting with all EVs active..." );
- auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mufastNrActiveEVs);
- mufastNrActiveEVs = numMuon;
- for(i=0; i<numMuon; i++) TrigCompositeUtils::addDecisionID( m_decisionId, toolInput[i].decision );
- return StatusCode::SUCCESS;
- }
-
- unsigned int n_uniqueMuon = 0;
- for(i=0; i<numMuon; i++) {
- ATH_MSG_DEBUG( "muFast based results: i=" << i << ": ");
- if( mufastResult[i] != i ) { ATH_MSG_DEBUG( " overlap to j=" << mufastResult[i] ); }
- else {
- n_uniqueMuon++;
- ATH_MSG_DEBUG( " unique" );
- }
- }
-
- ATH_MSG_DEBUG( "nr of unique Muons after muFast-based removal=" << n_uniqueMuon );
-
- if( numMuon != n_uniqueMuon ){
- chooseBestMuon(toolInput, uniqueMuon, mufastResult);
- } else {
- ATH_MSG_DEBUG( "no overlap identified. exitting with all EventViews active" );
- auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mufastNrActiveEVs);
- mufastNrActiveEVs = n_uniqueMuon;
- for(i=0; i<numMuon; i++) uniqueMuon.emplace_back(toolInput[i]);
- }
-
- if(n_uniqueMuon >= m_multiplicity){
- for(i=0; i<n_uniqueMuon; i++){
- ATH_MSG_DEBUG("Muon event pass through Chain/ID " << m_decisionId );
- TrigCompositeUtils::addDecisionID( m_decisionId, uniqueMuon[i].decision );
- }
- }
- else ATH_MSG_DEBUG("No muon event passed through selection " << m_decisionId << " because not meet the required number of muons");
-
- return StatusCode::SUCCESS;
-}
-
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-bool TrigL2MuonOverlapRemoverTool::isOverlap(const xAOD::L2StandAloneMuon *mf1,
- const xAOD::L2StandAloneMuon *mf2) const
-{
-
- auto mufastDR = Monitored::Scalar("DR", -9999.);
- auto mufastMass = Monitored::Scalar("Mass", -9999.);
- auto mufastDRLog10 = Monitored::Scalar("DRLog10", -9999.);
- auto mufastMassLog10 = Monitored::Scalar("MassLog10", -9999.);
-
- auto monitorIt = Monitored::Group(m_monTool, mufastDR, mufastMass, mufastDRLog10, mufastMassLog10);
-
-
- ATH_MSG_DEBUG( " ...mF1: pt/eta/phi=" << mf1->pt() << " / " << mf1->etaMS() << " / " << mf1->phiMS() );
- ATH_MSG_DEBUG( " ...mF2: pt/eta/phi=" << mf2->pt() << " / " << mf2->etaMS() << " / " << mf2->phiMS() );
-
- // if dR or invMass is necessary but (eta,phi) info is not avaiable
- // (i.e. eta,phi=0,0; rec failed)
- const double ZERO_LIMIT_FOR_ETAPHI = 1e-4;
- if( (fabs(mf1->etaMS()) <ZERO_LIMIT_FOR_ETAPHI && fabs(mf1->phiMS()) < ZERO_LIMIT_FOR_ETAPHI) ||
- (fabs(mf2->etaMS()) <ZERO_LIMIT_FOR_ETAPHI && fabs(mf2->phiMS()) < ZERO_LIMIT_FOR_ETAPHI) ) {
- ATH_MSG_DEBUG( " ...-> (eta,phi) info not available (rec at (eta,phi)=(0,0))" );
- ATH_MSG_DEBUG( " ...-> but dR of invMass check is required. cannot judge overlap -> return with false" );
- return false;
- }
-
- // if charge or invMass is necessary but charge(=pT) info is not avaiable
- const double ZERO_LIMIT_FOR_PT = 1e-4;
- if( (fabs(mf1->pt()) <ZERO_LIMIT_FOR_PT) || (fabs(mf2->pt()) < ZERO_LIMIT_FOR_PT) ) {
- ATH_MSG_DEBUG( " ...-> pT info not available (rec at pT=0)" );
- ATH_MSG_DEBUG( " ...-> but same sign or invMass check is required. cannot judge overlap -> return with false" );
- return false;
- }
-
-
- // determine dR, mass threshold separately for: BB, BE, EE
- double dRThres = 9999;
- double massThres = 9999;
-
- const int SADDRESS_EC = -1;
- bool isBarrel1 = (mf1->sAddress() != SADDRESS_EC ) ? true : false;
- bool isBarrel2 = (mf2->sAddress() != SADDRESS_EC ) ? true : false;
-
- if( isBarrel1 && isBarrel2 ) { // BB
- ATH_MSG_DEBUG( " ...B-B" );
- dRThres =m_muFastDRThresBB;
- massThres=m_muFastMassThresBB;
- }
- else if( (isBarrel1 && ! isBarrel2) || (!isBarrel1 && isBarrel2) ) { // BE
- ATH_MSG_DEBUG( " ...B-E" );
- dRThres =m_muFastDRThresBE;
- massThres=m_muFastMassThresBE;
- }
- else { // EE
- ATH_MSG_DEBUG( " ...E-E" );
- double absEta = (fabs(mf1->pt()) > fabs(mf2->pt())) ? fabs(mf1->etaMS()) : fabs(mf2->etaMS());
- unsigned int iThres=0;
- for(unsigned int i=0; i<(m_muFastEtaBinsEC.size()-1); i++) {
- if ( m_muFastEtaBinsEC[i] <= absEta && absEta < m_muFastEtaBinsEC[i+1] ) iThres = i;
- }
- ATH_MSG_DEBUG( " ...iThres=" << iThres );
- dRThres = m_muFastDRThresEC[iThres];
- massThres = m_muFastMassThresEC[iThres];
- }
- ATH_MSG_DEBUG( " ...dR threshold=" << dRThres );
- ATH_MSG_DEBUG( " ...mass threshold=" << massThres );
-
-
- // same sign cut
- bool sameSign = false;
- if( m_muFastRequireSameSign ) {
- sameSign = ((mf1->pt()*mf2->pt()) > 0) ? true : false;
- ATH_MSG_DEBUG( " ...-> sameSign=" << sameSign );
- }
-
- // dR cut
- bool dRisClose = false;
- double dr = dR(mf1->etaMS(),mf1->phiMS(),mf2->etaMS(),mf2->phiMS());
-
- // for monitoring
- mufastDR = dr;
- const double monitor_limit = 1e-4;
- double dr_mon = (dr>=monitor_limit) ? dr : monitor_limit;
- mufastDRLog10 = log10(dr_mon);
-
- if( m_muFastRequireDR ) {
- if( dr < dRThres ) dRisClose = true;
- ATH_MSG_DEBUG( " ...-> dR=" << dr << " : dRisClose=" << dRisClose );
- }
-
- // mass cut
- const double TRACK_MASS = 0; // just assume zero mass
- bool massIsClose = false;
- double mass = invMass(TRACK_MASS,mf1->pt(),mf1->etaMS(),mf1->phiMS(),TRACK_MASS,mf2->pt(),mf2->etaMS(),mf2->phiMS());
-
- // for monitoring
- mufastMass = mass;
- double mass_mon = (mass>=monitor_limit) ? mass : monitor_limit;
- mufastMassLog10 = log10(mass_mon);
-
- if( m_muFastRequireMass ) {
- if( mass < massThres ) massIsClose = true;
- ATH_MSG_DEBUG( " ...-> mass=" << mass << " : massIsClose=" << massIsClose );
- }
-
- // total judge
- bool overlap = false;
- if( ((m_muFastRequireSameSign && sameSign) || (! m_muFastRequireSameSign)) &&
- ((m_muFastRequireDR && dRisClose) || (! m_muFastRequireDR)) &&
- ((m_muFastRequireMass && massIsClose) || (! m_muFastRequireMass)) ) {
- overlap = true;
- }
-
- ATH_MSG_DEBUG( " ...=> isOverlap=" << overlap );
-
- return overlap;
-
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-double TrigL2MuonOverlapRemoverTool::dR(double eta1, double phi1, double eta2, double phi2) const
-{
- const double deta = eta1 - eta2;
- const double dphi = CxxUtils::deltaPhi(phi1, phi2);
- return std::sqrt(deta*deta + dphi*dphi);
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-double TrigL2MuonOverlapRemoverTool::invMass(double m1, double pt1, double eta1, double phi1,
- double m2, double pt2, double eta2, double phi2) const
-{
- const double ZERO_LIMIT = 1e-12;
-
- double theta1 = 2*atan2((double)exp(-eta1),1.);
- double theta2 = 2*atan2((double)exp(-eta2),1.);
-
- double fpt1 = fabs(pt1);
- double fpt2 = fabs(pt2);
-
- double px1 = fpt1*cos(phi1);
- double py1 = fpt1*sin(phi1);
- double pz1 = fpt1/tan(theta1);
- double e1 = sqrt(px1*px1+py1*py1+pz1*pz1+m1*m1);
-
- double px2 = fpt2*cos(phi2);
- double py2 = fpt2*sin(phi2);
- double pz2 = fpt2/tan(theta2);
- double e2 = sqrt(px2*px2+py2*py2+pz2*pz2+m2*m2);
-
- double pxsum = px1 + px2;
- double pysum = py1 + py2;
- double pzsum = pz1 + pz2;
- double esum = e1 + e2;
-
- double mass = 0;
- double mass2 = esum*esum - pxsum*pxsum - pysum*pysum - pzsum*pzsum;
- if( mass2 > ZERO_LIMIT ) mass = sqrt(mass2);
-
- return mass;
-}
-
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-
-void TrigL2MuonOverlapRemoverTool::chooseBestMuon(std::vector<L2SAMuonOverlapInfo>& toolInput, std::vector<L2SAMuonOverlapInfo>& uniqueMuon, std::vector<unsigned int> mufastResult) const
-{
- size_t numMuon = toolInput.size();
- unsigned int i,j,k;
-
- auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto mufastNrOverlapped = Monitored::Scalar("NrOverlapped", 0);
- auto mufastOverlappedEta = Monitored::Scalar("OverlappedEta", -9999.);
- auto mufastOverlappedPhi = Monitored::Scalar("OverlappedPhi", -9999.);
- auto mufastOverlappedPt = Monitored::Scalar("OverlappedPt", -9999.);
-
- auto monitorIt = Monitored::Group(m_monTool, mufastNrActiveEVs, mufastNrOverlapped,
- mufastOverlappedPt, mufastOverlappedEta, mufastOverlappedPhi);
-
- if( m_doMufastBasedRemoval ) {
- ATH_MSG_DEBUG( "--- choose best among overlaps & disable EVs (muFast based) ---" );
- for(i=0; i<numMuon; i++) {
- ATH_MSG_DEBUG( "++ i=" << i << ": result=" << mufastResult[i] );
- if( mufastResult[i] != i ) {
- ATH_MSG_DEBUG( " overlap to some one. skip." );
- continue;
- }
- std::vector<unsigned int> others;
- for(j=0; j<numMuon; j++) {
- if( mufastResult[j] == mufastResult[i] ) others.emplace_back(j);
- }
- if( others.size() == 1 ) {
- ATH_MSG_DEBUG( " unique object. keep it active." );
- uniqueMuon.emplace_back(toolInput[i]);
- continue;
- }
- else {
- // must choose one best
- ATH_MSG_DEBUG( " overlapped objects among: " << others );
- unsigned int best_ev = 0;
- float maxPtMf = 0;
- float maxPtRoI = 0;
- for(k=0; k<others.size(); k++) {
- j=others[k];
- const LVL1::RecMuonRoI* muonRoI = toolInput[j].RecRoI;
- float ptRoI = muonRoI->getThresholdValue();
- const xAOD::L2StandAloneMuon* mf = toolInput[j].overlap;
- float ptMf = fabs(mf->pt());
- ATH_MSG_DEBUG(" ev/PtRoI/ptMf="<< j << "/" << ptRoI << "/" << ptMf);
- if( (ptRoI-maxPtRoI) > 0.1 ) {
- maxPtRoI = ptRoI;
- maxPtMf = ptMf;
- best_ev = j;
- }
- else if( fabs(ptRoI-maxPtRoI) < 0.1 ) {
- if( ptMf > maxPtMf ) {
- maxPtRoI = ptRoI;
- maxPtMf = ptMf;
- best_ev = j;
- }
- }
- }
- ATH_MSG_DEBUG( " best is: best_ev/maxPtRoI/maxPtMf=" << best_ev << " / " << maxPtRoI << " / " << maxPtMf );
-
- for(k=0; k<others.size(); k++) {
- j=others[k];
- if( j != best_ev ) {
- ATH_MSG_DEBUG( " EventView( j=" << j << " ) is not active" );
-
- // monitoring
- const xAOD::L2StandAloneMuon* mf = toolInput[j].overlap;
- mufastNrOverlapped++;
- mufastOverlappedPt = mf->pt();
- mufastOverlappedEta = mf->etaMS();
- mufastOverlappedPhi = mf->phiMS();
- }
- if( j == best_ev ){
- ATH_MSG_DEBUG( " EventView( j=" << j << " ) is best one" );
- uniqueMuon.emplace_back(toolInput[i]);
- }
- }
- }
- }
- mufastNrActiveEVs = numMuon - mufastNrOverlapped;
- }
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverTool::decide(std::vector<L2CBMuonOverlapInfo>& toolInput) const {
-
- ATH_MSG_DEBUG("Retrieved from TrigL2MuonOverlapRemoverMucombAlg and Running TrigL2MuonOverlapRemoverTool for selections.");
-
- std::vector<TrigL2MuonOverlapRemoverTool::L2CBMuonOverlapInfo> input;
-
- for( unsigned int i=0; i<toolInput.size(); ++i ) {
- if ( TrigCompositeUtils::passed( m_decisionId.numeric(), toolInput[i].previousDecisionIDs) ){
- input.emplace_back(toolInput[i]);
- }
- }
-
- size_t numMuon = input.size();
-
- if ( numMuon == 0) {
- ATH_MSG_DEBUG( "No positive previous hypo decision. Not need overlap removal." );
- auto mucombNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.);
- auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mucombNrAllEVs, mucombNrActiveEVs);
- mucombNrActiveEVs = numMuon;
- mucombNrAllEVs = numMuon;
- return StatusCode::SUCCESS;
- }
- else if ( numMuon == 1 ) {
- ATH_MSG_DEBUG("Number of muon event = " << numMuon );
- ATH_MSG_DEBUG("no overlap Removal necessary. exitting with all EventViews active." );
- auto mucombNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.);
- auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mucombNrAllEVs, mucombNrActiveEVs);
- mucombNrActiveEVs = numMuon;
- mucombNrAllEVs = numMuon;
- TrigCompositeUtils::addDecisionID(m_decisionId, input[0].decision);
- return StatusCode::SUCCESS;
- } else {
- ATH_MSG_DEBUG("Number of muon event = " << numMuon );
- auto mucombNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mucombNrAllEVs);
- mucombNrAllEVs = numMuon;
- ATH_CHECK(checkOverlap(input));
- return StatusCode::SUCCESS;
- }
-
- return StatusCode::SUCCESS;
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-StatusCode TrigL2MuonOverlapRemoverTool::checkOverlap(std::vector<L2CBMuonOverlapInfo>& toolInput) const {
-
- size_t numMuon = toolInput.size();
- unsigned int i,j;
- std::vector<unsigned int> mucombResult;
- std::vector<TrigL2MuonOverlapRemoverTool::L2CBMuonOverlapInfo> uniqueMuon;
-
- bool errorWhenIdentifyingOverlap = false;
-
- for(i=0; i<numMuon; i++) {mucombResult.emplace_back(i); }
- for(i=0; i<numMuon-1; i++){
- for(j=i+1; j<numMuon; j++){
- ATH_MSG_DEBUG("++ i=" << i << " vs j=" << j);
- bool overlapped = isOverlap(toolInput[i].overlap, toolInput[j].overlap);
- if( ! overlapped ){ // judged as different
- ATH_MSG_DEBUG(" judged as: differenr objects");
- if( mucombResult[i] == mucombResult[j] ) { // but marked as same by someone
- ATH_MSG_DEBUG( "inconsistentency in muComb based overlap removal for more than two objects" );
- ATH_MSG_DEBUG( "two objects are judged as different but both were already marked as identical by someone else as: " );
- ATH_MSG_DEBUG( "i/j/result[i]/result[j]=" << i << " / " << j << " / " << mucombResult[i] << " / " << mucombResult[j] );
- auto mucombError = Monitored::Scalar("MucombError", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mucombError);
- mucombError = TrigL2MuonOverlapRemoverToolConsts::errorCode_inconsistent_overlap1;
- errorWhenIdentifyingOverlap = true;
- }
- }
- else{ // judged as overlap
- if( (mucombResult[j] != j && mucombResult[i] != mucombResult[j]) || (mucombResult[j] == j && mucombResult[i] != i) ){
- ATH_MSG_DEBUG( "inconsistentency in muComb based overlap removal for more than two objects" );
- ATH_MSG_DEBUG( "two objects are judged as overlap but only either was already marked as overlap to someone else: " );
- ATH_MSG_DEBUG( "i/j/result[i]/result[j]=" << i << " / " << j << " / " << mucombResult[i] << " / " << mucombResult[j] );
- auto mucombError = Monitored::Scalar("MucombError", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mucombError);
- mucombError = TrigL2MuonOverlapRemoverToolConsts::errorCode_inconsistent_overlap2;
- errorWhenIdentifyingOverlap = true;
- }
- ATH_MSG_DEBUG(" judged as: overlapped objects");
- if( mucombResult[i] == i ) {
- ATH_MSG_DEBUG( " i is not yet marked as overlap. so, it is a newly found overlap" );
- ATH_MSG_DEBUG( " -> marking mucombResult[j] as i..." );
- mucombResult[j] = i;
- } else {
- ATH_MSG_DEBUG( " both i/j already marked as overlap by: mucombResult[i]=" << mucombResult[i] );
- ATH_MSG_DEBUG( " -> do nothing..." );
- }
- }
- }
- }
-
- if( errorWhenIdentifyingOverlap ) {
- ATH_MSG_WARNING( "error when resolving overlap. exitting with all EVs active..." );
- auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mucombNrActiveEVs);
- mucombNrActiveEVs = numMuon;
- for(i=0; i<numMuon; i++) TrigCompositeUtils::addDecisionID( m_decisionId, toolInput[i].decision );
- return StatusCode::SUCCESS;
- }
-
- unsigned int n_uniqueMuon = 0;
- for(i=0; i<numMuon; i++) {
- ATH_MSG_DEBUG( "muComb based results: i=" << i << ": ");
- if( mucombResult[i] != i ) { ATH_MSG_DEBUG( " overlap to j=" << mucombResult[i] ); }
- else {
- n_uniqueMuon++;
- ATH_MSG_DEBUG( " unique" );
- }
- }
-
- ATH_MSG_DEBUG( "nr of unique Muons after muComb-based removal=" << n_uniqueMuon );
-
- if( numMuon != n_uniqueMuon ){
- chooseBestMuon(toolInput, uniqueMuon, mucombResult);
- } else {
- ATH_MSG_DEBUG( "no overlap identified. exitting with all EventViews active" );
- auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto monitorIt = Monitored::Group(m_monTool, mucombNrActiveEVs);
- mucombNrActiveEVs = n_uniqueMuon;
- for(i=0; i<numMuon; i++) uniqueMuon.emplace_back(toolInput[i]);
- }
-
- if(n_uniqueMuon >= m_multiplicity){
- for(i=0; i<n_uniqueMuon; i++){
- ATH_MSG_DEBUG("Muon event pass through Chain/ID " << m_decisionId );
- TrigCompositeUtils::addDecisionID( m_decisionId, uniqueMuon[i].decision );
- }
- }
- else ATH_MSG_DEBUG("No muon event passed through selection " << m_decisionId << " because not meet the required number of muons");
-
- return StatusCode::SUCCESS;
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-bool TrigL2MuonOverlapRemoverTool::isOverlap(const xAOD::L2CombinedMuon *combMf1,
- const xAOD::L2CombinedMuon *combMf2) const
-{
-
- auto mucombDR = Monitored::Scalar("DR", -9999.);
- auto mucombMass = Monitored::Scalar("Mass", -9999.);
- auto mucombDRLog10 = Monitored::Scalar("DRLog10", -9999.);
- auto mucombMassLog10 = Monitored::Scalar("MassLog10", -9999.);
-
- auto monitorIt = Monitored::Group(m_monTool, mucombDR, mucombMass, mucombDRLog10, mucombMassLog10);
-
-
- ATH_MSG_DEBUG( " ...mF1: pt/eta/phi=" << combMf1->pt()/Gaudi::Units::GeV << " / " << combMf1->eta() << " / " << combMf1->phi() );
- ATH_MSG_DEBUG( " ...mF2: pt/eta/phi=" << combMf2->pt()/Gaudi::Units::GeV << " / " << combMf2->eta() << " / " << combMf2->phi() );
-
- // if dR or invMass is necessary but (eta,phi) info is not avaiable
- // (i.e. eta,phi=0,0; rec failed)
- const double ZERO_LIMIT_FOR_ETAPHI = 1e-4;
- if( (fabs(combMf1->eta()) <ZERO_LIMIT_FOR_ETAPHI && fabs(combMf1->phi()) < ZERO_LIMIT_FOR_ETAPHI) ||
- (fabs(combMf2->eta()) <ZERO_LIMIT_FOR_ETAPHI && fabs(combMf2->phi()) < ZERO_LIMIT_FOR_ETAPHI) ) {
- ATH_MSG_DEBUG( " ...-> (eta,phi) info not available (rec at (eta,phi)=(0,0))" );
- if( m_muCombRequireDR || m_muCombRequireMass ) {
- ATH_MSG_DEBUG( " ...-> but dR of invMass check is required. cannot judge overlap -> return with false" );
- return false;
- }
- }
-
- // if charge or invMass is necessary but charge(=pT) info is not avaiable
- const double ZERO_LIMIT_FOR_PT = 1e-4;
- if( (fabs(combMf1->pt()) <ZERO_LIMIT_FOR_PT) || (fabs(combMf2->pt()) < ZERO_LIMIT_FOR_PT) ) {
- ATH_MSG_DEBUG( " ...-> pT info not available (rec at pT=0)" );
- if( m_muCombRequireSameSign || m_muCombRequireMass ) {
- ATH_MSG_DEBUG( " ...-> but same sign or invMass check is required. cannot judge overlap -> return with false" );
- return false;
- }
- }
-
- // determine etabin and thresholds
- double absEta = (fabs(combMf1->pt()) > fabs(combMf2->pt())) ? fabs(combMf1->eta()) : fabs(combMf2->eta());
- unsigned int iThres = 0;
- for(unsigned int i=0; i<(m_muCombEtaBins.size()-1); i++) {
- if ( m_muCombEtaBins[i] <= absEta && absEta < m_muCombEtaBins[i+1] ) iThres = i;
- }
- double dRThres = m_muCombDRThres[iThres];
- double dRbyMFThres = m_muCombMufastDRThres[iThres];
- double massThres = m_muCombMassThres[iThres];
- ATH_MSG_DEBUG( " ...iThres=" << iThres );
- if(m_muCombRequireDR) ATH_MSG_DEBUG( " ...dR threshold=" << dRThres );
- if(m_muCombRequireMufastDR) ATH_MSG_DEBUG( " ...dR(byMF) threshold=" << dRbyMFThres );
- if(m_muCombRequireMass) ATH_MSG_DEBUG( " ...mass threshold=" << massThres );
-
- // same sign cut
- bool sameSign = false;
- if( m_muCombRequireSameSign ) {
- sameSign = ((combMf1->pt()*combMf2->pt()) > 0) ? true : false;
- ATH_MSG_DEBUG( " ...-> sameSign=" << sameSign );
- }
-
- // dR cut
- bool dRisClose = false;
- double dr = dR(combMf1->eta(),combMf1->phi(),combMf2->eta(),combMf2->phi());
-
- mucombDR = dr;
- const double monitor_limit = 1e-4;
- double dr_mon = (dr>=monitor_limit) ? dr : monitor_limit;
- mucombDRLog10 = log10(dr_mon);
-
- if( m_muCombRequireDR ) {
- if( dr < dRThres ) dRisClose = true;
- ATH_MSG_DEBUG( " ...-> dR=" << dr << " : dRisClose=" << dRisClose );
- }
-
- // dR(by MF) cut
- bool dRbyMFisClose = false;
- if( m_muCombRequireMufastDR ) {
- const xAOD::L2StandAloneMuon* mf1 = combMf1->muSATrack();
- const xAOD::L2StandAloneMuon* mf2 = combMf2->muSATrack();
- if( mf1 == 0 || mf2 == 0 ) {
- ATH_MSG_DEBUG( "mF link from combinedMF broken" );
- ATH_MSG_DEBUG( " ...-> mF dR is required but mF link broken. cannot judge overlap -> return with false" );
- return false;
- }
- else {
- // here, we do not check (eta,phi) of mF is not (0,0)
- // (i.e. we apply muComb based cut even if muFast rec is failed)
- double dRByMF = dR(mf1->etaMS(),mf1->phiMS(),mf2->etaMS(),mf2->phiMS());
- if( dRByMF < dRbyMFThres ) dRbyMFisClose = true;
- ATH_MSG_DEBUG( " ...-> dR(by MF)=" << dRByMF << " : dRbyMFisClose=" << dRbyMFisClose );
- }
- }
-
- // mass cut
- const double TRACK_MASS = 0; // just assume zero mass
- bool massIsClose = false;
- double mass = invMass(TRACK_MASS,combMf1->pt()/Gaudi::Units::GeV,combMf1->eta(),combMf1->phi(),TRACK_MASS,combMf2->pt()/Gaudi::Units::GeV,combMf2->eta(),combMf2->phi());
-
- mucombMass = mass;
- double mass_mon = (mass>=monitor_limit) ? mass : monitor_limit;
- mucombMassLog10 = log10(mass_mon);
-
- if( m_muCombRequireMass ) {
- if( mass < massThres ) massIsClose = true;
- ATH_MSG_DEBUG( " ...-> mass=" << mass << " : massIsClose=" << massIsClose );
- }
-
- // total judge
- bool overlap = false;
- if( ((m_muCombRequireSameSign && sameSign) || (! m_muCombRequireSameSign)) &&
- ((m_muCombRequireDR && dRisClose) || (! m_muCombRequireDR)) &&
- ((m_muCombRequireMufastDR && dRbyMFisClose) || (! m_muCombRequireMufastDR)) &&
- ((m_muCombRequireMass && massIsClose) || (! m_muCombRequireMass)) ) {
- overlap = true;
- }
-
- ATH_MSG_DEBUG( " ...=> isOverlap=" << overlap );
-
- return overlap;
-
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-void TrigL2MuonOverlapRemoverTool::chooseBestMuon(std::vector<L2CBMuonOverlapInfo>& toolInput, std::vector<L2CBMuonOverlapInfo>& uniqueMuon, std::vector<unsigned int> mucombResult) const
-{
- size_t numMuon = toolInput.size();
- unsigned int i,j,k;
-
- auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
- auto mucombNrOverlapped = Monitored::Scalar("NrOverlapped", 0);
- auto mucombOverlappedEta = Monitored::Scalar("OverlappedEta", -9999.);
- auto mucombOverlappedPhi = Monitored::Scalar("OverlappedPhi", -9999.);
- auto mucombOverlappedPt = Monitored::Scalar("OverlappedPt", -9999.);
-
- auto monitorIt = Monitored::Group(m_monTool, mucombNrActiveEVs, mucombNrOverlapped,
- mucombOverlappedPt, mucombOverlappedEta, mucombOverlappedPhi);
-
- if( m_doMucombBasedRemoval ) {
- ATH_MSG_DEBUG( "--- choose best among overlaps & disable EVs (muComb based) ---" );
- for(i=0; i<numMuon; i++) {
- ATH_MSG_DEBUG( "++ i=" << i << ": result=" << mucombResult[i] );
- if( mucombResult[i] != i ) {
- ATH_MSG_DEBUG( " overlap to some one. skip." );
- continue;
- }
- std::vector<unsigned int> others;
- for(j=0; j<numMuon; j++) {
- if( mucombResult[j] == mucombResult[i] ) others.emplace_back(j);
- }
- if( others.size() == 1 ) {
- ATH_MSG_DEBUG( " unique object. keep it active." );
- uniqueMuon.emplace_back(toolInput[i]);
- continue;
- }
- else {// must choose one best
- ATH_MSG_DEBUG( " overlapped objects among: " << others );
- unsigned int best_ev = 0;
- float maxPtCombMf = 0;
- for(k=0; k<others.size(); k++) {
- j=others[k];
-
- float ptCombMf = 0.;
- const xAOD::L2CombinedMuon* combMf = toolInput[j].overlap;
- ptCombMf = fabs(combMf->pt()/Gaudi::Units::GeV);
- ATH_MSG_DEBUG(" j="<< j << " , ptCombMf=" << ptCombMf);
- if( ptCombMf > maxPtCombMf ) {
- maxPtCombMf = ptCombMf;
- best_ev = j;
- }
- }
- ATH_MSG_DEBUG( " best is: best_ev/maxPtCombMf=" << best_ev << " / " << maxPtCombMf );
-
- for(k=0; k<others.size(); k++) {
- j=others[k];
- if( j != best_ev ) {
- ATH_MSG_DEBUG( " EventView( j=" << j << " ) is not active" );
-
- // monitoring
- const xAOD::L2CombinedMuon* CombMf = toolInput[j].overlap;
- mucombNrOverlapped++;
- mucombOverlappedPt = CombMf->pt()* CombMf->charge() /Gaudi::Units::GeV;
- mucombOverlappedEta = CombMf->eta();
- mucombOverlappedPhi = CombMf->phi();
- }
- if( j == best_ev ){
- ATH_MSG_DEBUG( " EventView( j=" << j << " ) is best one" );
- uniqueMuon.emplace_back(toolInput[i]);
- }
- }
- }
- }
- mucombNrActiveEVs = numMuon - mucombNrOverlapped;
- }
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h
deleted file mode 100644
index 6fbfd152419e4bd7382fe849a4c4f94a202b3168..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGL2MUONOVERLAPREMOVER_TRIGL2MUONOVERLAPREMOVERTOOL_H
-#define TRIGL2MUONOVERLAPREMOVER_TRIGL2MUONOVERLAPREMOVERTOOL_H 1
-
-#include "TrigCompositeUtils/HLTIdentifier.h"
-
-#include "xAODTrigMuon/L2CombinedMuonContainer.h"
-#include "TrigT1Interfaces/RecMuonRoI.h"
-#include "TrigCompositeUtils/TrigCompositeUtils.h"
-#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
-
-class StoreGateSvc;
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-namespace TrigL2MuonOverlapRemoverToolConsts {
-const int errorCode_cannot_get_EL = 1;
-const int errorCode_EL_not_valid = 2;
-const int errorCode_inconsistent_overlap1 = 3;
-const int errorCode_inconsistent_overlap2 = 4;
-const int errorCode_cannot_get_RoI = 5;
-}
-
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-
-class TrigL2MuonOverlapRemoverTool: public ::AthAlgTool {
-
- public:
-
- TrigL2MuonOverlapRemoverTool(const std::string& type,
- const std::string & name,
- const IInterface* parent );
-
- virtual ~TrigL2MuonOverlapRemoverTool();
-
- struct L2SAMuonOverlapInfo {
- L2SAMuonOverlapInfo( TrigCompositeUtils::Decision* d,
- const LVL1::RecMuonRoI* r,
- const xAOD::L2StandAloneMuon* o,
- const TrigCompositeUtils::Decision* previousDecision )
- : decision( d ),
- RecRoI( r ),
- overlap( o ),
- previousDecisionIDs( TrigCompositeUtils::decisionIDs( previousDecision ).begin(),
- TrigCompositeUtils::decisionIDs( previousDecision ).end() )
- {}
-
-
- TrigCompositeUtils::Decision* decision;
- const LVL1::RecMuonRoI* RecRoI;
- const xAOD::L2StandAloneMuon* overlap;
- const TrigCompositeUtils::DecisionIDContainer previousDecisionIDs;
- };
-
- struct L2CBMuonOverlapInfo {
- L2CBMuonOverlapInfo( TrigCompositeUtils::Decision* d,
- const LVL1::RecMuonRoI* r,
- const xAOD::L2CombinedMuon* o,
- const TrigCompositeUtils::Decision* previousDecision )
- : decision( d ),
- RecRoI( r ),
- overlap( o ),
- previousDecisionIDs( TrigCompositeUtils::decisionIDs( previousDecision ).begin(),
- TrigCompositeUtils::decisionIDs( previousDecision ).end() )
- {}
-
-
- TrigCompositeUtils::Decision* decision;
- const LVL1::RecMuonRoI* RecRoI;
- const xAOD::L2CombinedMuon* overlap;
- const TrigCompositeUtils::DecisionIDContainer previousDecisionIDs;
- };
-
-
- virtual StatusCode initialize() override;
-
- virtual StatusCode decide(std::vector<TrigL2MuonOverlapRemoverTool::L2SAMuonOverlapInfo>& toolInput) const;
- virtual StatusCode decide(std::vector<TrigL2MuonOverlapRemoverTool::L2CBMuonOverlapInfo>& toolInput) const;
-
- virtual StatusCode checkOverlap(std::vector<L2SAMuonOverlapInfo>& toolInput) const;
- virtual StatusCode checkOverlap(std::vector<L2CBMuonOverlapInfo>& toolInput) const;
-
- bool isOverlap(const xAOD::L2StandAloneMuon *mf1, const xAOD::L2StandAloneMuon *mf2) const;
- bool isOverlap(const xAOD::L2CombinedMuon *mf1, const xAOD::L2CombinedMuon *mf2) const;
-
- double dR(double eta1, double phi1, double eta2, double phi2) const;
-
- double invMass(double m1, double pt1, double eta1, double phi1,
- double m2, double pt2, double eta2, double phi2) const;
-
- virtual void chooseBestMuon(std::vector<L2SAMuonOverlapInfo>& toolInput, std::vector<L2SAMuonOverlapInfo>& uniqueMuon, std::vector<unsigned int> mufastResult) const;
- virtual void chooseBestMuon(std::vector<L2CBMuonOverlapInfo>& toolInput, std::vector<L2CBMuonOverlapInfo>& uniqueMuon, std::vector<unsigned int> mucombResult) const;
-
-
- private:
-
- HLT::Identifier m_decisionId;
-
- Gaudi::Property< unsigned int > m_multiplicity {
- this, "Multiplicity", 1, "multiplicity" };
-
- // Mufast based cuts
- Gaudi::Property<bool> m_doMufastBasedRemoval {
- this, "DoMufastBasedRemoval", false, "execute or not mufast overlap removal"};
-
- Gaudi::Property<bool> m_muFastRequireDR{
- this, "MufastRequireDR", true, "require or not DR cut for mufast overlap removal"};
-
- Gaudi::Property<bool> m_muFastRequireMass{
- this, "MufastRequireMass", true, "require or not mass cut for mufast overlap removal"};
-
- Gaudi::Property<bool> m_muFastRequireSameSign{
- this, "MufastRequireSameSign", true, "require or not charge cut for mufast overlap removal"};
-
- Gaudi::Property< float > m_muFastDRThresBB {
- this, "MufastDRThresBB", 0.05, "DR threshold for mufast in barel and barel region"};
-
- Gaudi::Property< float > m_muFastMassThresBB {
- this, "MufastMassThresBB", 0.20, "mass threshold for mufast in barel and barel region"};
-
- Gaudi::Property< float > m_muFastDRThresBE {
- this, "MufastDRThresBE", 0.05, "DR threshold for mufast in barel and barel region"};
-
- Gaudi::Property< float > m_muFastMassThresBE {
- this, "MufastMassThresBE", 0.20, "mass threshold for mufast in barel and endcap region"};
-
- Gaudi::Property< std::vector<float> > m_muFastEtaBinsEC {
- this, "MufastEtaBinsEC", {0, 1.9, 2.1, 9.9}, "eta bins of DR and mass thresholds for mufast in endcap and barel region"};
-
- Gaudi::Property< std::vector<float> > m_muFastDRThresEC {
- this, "MufastDRThresEC", {0.06, 0.05, 0.05}, "DR threshold for mufast in endcap and barel region"};
-
- Gaudi::Property< std::vector<float> > m_muFastMassThresEC {
- this, "MufastMassThresEC", {0.20, 0.15, 0.10}, "mass threshold for mufast in endcap and endcap region"};
-
-
- // Mucomb based cuts
- Gaudi::Property<bool> m_doMucombBasedRemoval {
- this, "DoMucombBasedRemoval", false, "execute or not mucomb overlap removal"};
-
- Gaudi::Property<bool> m_muCombRequireDR{
- this, "MucombRequireDR", true, "require or not DR cut for mucomb overlap removal"};
-
- Gaudi::Property<bool> m_muCombRequireMufastDR{
- this, "MucombRequireMufastDR", true, "require or not mufast DR cut for mucomb overlap removal"};
-
- Gaudi::Property<bool> m_muCombRequireMass{
- this, "MucombRequireMass", true, "require or not mass cut for mucomb overlap removal"};
-
- Gaudi::Property<bool> m_muCombRequireSameSign{
- this, "MucombRequireSameSign", true, "require or not charge cut for mucomb overlap removal"};
-
- Gaudi::Property< std::vector<float> > m_muCombEtaBins {
- this, "MucombEtaBins", {0, 1.9, 2.1, 9.9}, "eta bins of DR and mass thresholds for mucomb"};
-
- Gaudi::Property< std::vector<float> > m_muCombDRThres {
- this, "MucombDRThres", {0.06, 0.05, 0.05}, "DR threshold for mucomb"};
-
- Gaudi::Property< std::vector<float> > m_muCombMufastDRThres {
- this, "MucombMufastDRThres", {0.06, 0.05, 0.05}, "mufast DR threshold for mucomb"};
-
- Gaudi::Property< std::vector<float> > m_muCombMassThres {
- this, "MucombMassThres", {0.20, 0.15, 0.10}, "mass threshold for mucomb"};
-
-
- // Other members:
- std::vector<size_t> m_bins = {0};
-
- ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
-
-};
-
-#endif
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
index f34f21fd7ec24c1fc8ef0a42a7b1a82e10b1fa93..284912df04cb7676d359ea4c17b1927fa1ed4343 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
@@ -2,12 +2,16 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#include "GaudiKernel/SystemOfUnits.h"
#include "AthenaMonitoringKernel/Monitored.h"
#include "TrigCompositeUtils/Combinators.h"
#include "TrigMufastHypoTool.h"
+#include "CxxUtils/phihelper.h"
#include "xAODTrigMuon/TrigMuonDefs.h"
+#include <cmath>
+
using namespace TrigCompositeUtils;
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
@@ -69,6 +73,42 @@ StatusCode TrigMufastHypoTool::initialize()
ATH_MSG_DEBUG("MonTool name: " << m_monTool);
}
+
+ // Overlap Removal
+ if( m_applyOR ) {
+ ATH_MSG_DEBUG( "--- overlap removal as: ---" );
+ if( m_requireDR ) {
+ ATH_MSG_DEBUG( "+ dR cut:" );
+ if( (m_etaBinsEC.size()-1) != m_dRThresEC.size() ) {
+ ATH_MSG_ERROR( "bad thresholds setup .... exiting!" );
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_DEBUG( " B-B : dR < " << m_dRThresBB );
+ ATH_MSG_DEBUG( " B-E : dR < " << m_dRThresBE );
+ ATH_MSG_DEBUG( " E-E : " );
+ for(unsigned int i=0; i<m_dRThresEC.size(); i++) {
+ ATH_MSG_DEBUG( " EtaBin " << m_etaBinsEC[i] << " - " << m_etaBinsEC[i+1]
+ << " : dR < " << m_dRThresEC[i] );
+ }
+ }
+ if( m_requireMass ) {
+ ATH_MSG_DEBUG( "+ Mass cut:" );
+ if( (m_etaBinsEC.size()-1) != m_massThresEC.size() ) {
+ ATH_MSG_ERROR( "bad thresholds setup .... exiting!" );
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_DEBUG( " B-B : Mass < " << m_massThresBB );
+ ATH_MSG_DEBUG( " B-E : Mass < " << m_massThresBE );
+ ATH_MSG_DEBUG( " E-E : " );
+ for(unsigned int i=0; i<m_massThresEC.size(); i++) {
+ ATH_MSG_DEBUG( " EtaBin " << m_etaBinsEC[i] << " - " << m_etaBinsEC[i+1]
+ << " : Mass < " << m_massThresEC[i] );
+ }
+ }
+ if( m_requireSameSign ) ATH_MSG_DEBUG( "+ Same charge sign" );
+ }
+
+
ATH_MSG_DEBUG("Initialization completed successfully");
return StatusCode::SUCCESS;
@@ -248,7 +288,11 @@ StatusCode TrigMufastHypoTool::decide(std::vector<MuonClusterInfo>& toolInput) c
} else { // in case of HLT_2mu6 and so on.
ATH_MSG_DEBUG("Number of muon event = " << numMuon );
ATH_MSG_DEBUG("Applying selection of multiplicity << " << m_decisionId );
- return multiplicitySelection(toolInput);
+
+ if(m_applyOR)
+ ATH_CHECK(applyOverlapRemoval(toolInput));
+
+ return multiplicitySelection(toolInput);
}
return StatusCode::SUCCESS;
@@ -258,7 +302,7 @@ StatusCode TrigMufastHypoTool::decide(std::vector<MuonClusterInfo>& toolInput) c
StatusCode TrigMufastHypoTool::inclusiveSelection(std::vector<TrigMufastHypoTool::MuonClusterInfo>& toolInput) const{
for ( auto& i: toolInput ) {
- // If muon event has defference DecisionID, it shouldn't apply.
+ // If muon event has difference DecisionID, it shouldn't apply.
if ( TrigCompositeUtils::passed( m_decisionId.numeric(), i.previousDecisionIDs ) ) {
if ( decideOnSingleObject( i, 0 )==true ) {
ATH_MSG_DEBUG("Pass through selection " << m_decisionId );
@@ -282,7 +326,13 @@ StatusCode TrigMufastHypoTool::multiplicitySelection(std::vector<TrigMufastHypoT
for ( size_t cutIndex=0; cutIndex < m_ptBins.size(); ++cutIndex ) {
size_t elementIndex{ 0 };
for ( auto& i: toolInput ) {
- // If muon event has defference DecisionID, it shouldn't apply.
+
+ if(!m_acceptAll && m_applyOR && !i.passOR) {
+ ATH_MSG_DEBUG("skip due to overap, DecisionID " << m_decisionId );
+ continue;
+ }
+
+ // If muon event has difference DecisionID, it shouldn't apply.
if ( TrigCompositeUtils::passed( m_decisionId.numeric(), i.previousDecisionIDs ) ) {
if ( decideOnSingleObject( i, cutIndex ) == true ) {
ATH_MSG_DEBUG("Pass through selection " << m_decisionId << " : Event[" << elementIndex << "]" );
@@ -332,3 +382,386 @@ StatusCode TrigMufastHypoTool::multiplicitySelection(std::vector<TrigMufastHypoT
return StatusCode::SUCCESS;
}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+StatusCode TrigMufastHypoTool::applyOverlapRemoval(std::vector<TrigMufastHypoTool::MuonClusterInfo>& toolInput) const{
+
+ ATH_MSG_DEBUG("Running Overlap Removal for muFast");
+
+ std::vector<TrigMufastHypoTool::MuonClusterInfo*> input;
+
+ for ( auto& i: toolInput ) {
+ // If muon event has difference DecisionID, it shouldn't apply.
+ if ( TrigCompositeUtils::passed( m_decisionId.numeric(), i.previousDecisionIDs ) ) {
+ input.emplace_back(&i);
+ }
+ }
+
+ size_t numMuon = input.size();
+
+ auto mufastNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.);
+ auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mufastNrAllEVs, mufastNrActiveEVs);
+ if ( numMuon == 0) {
+ ATH_MSG_DEBUG( "No positive previous hypo decision. Not need overlap removal." );
+ mufastNrActiveEVs = numMuon;
+ mufastNrAllEVs = numMuon;
+ return StatusCode::SUCCESS;
+ }
+ else if ( numMuon == 1 ) {
+ ATH_MSG_DEBUG("Number of muon event = " << numMuon );
+ ATH_MSG_DEBUG("no overlap Removal necessary. exitting with all EventViews active." );
+ mufastNrActiveEVs = numMuon;
+ mufastNrAllEVs = numMuon;
+ return StatusCode::SUCCESS;
+ } else {
+ ATH_MSG_DEBUG("Number of muon event = " << numMuon );
+ mufastNrAllEVs = numMuon;
+ ATH_CHECK(checkOverlap(input));
+ return StatusCode::SUCCESS;
+ }
+
+
+ return StatusCode::SUCCESS;
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+StatusCode TrigMufastHypoTool::checkOverlap(std::vector<TrigMufastHypoTool::MuonClusterInfo*>& input) const {
+
+ size_t numMuon = input.size();
+ unsigned int i,j;
+ std::vector<unsigned int> mufastResult;
+
+ bool errorWhenIdentifyingOverlap = false;
+
+ for(i=0; i<numMuon; i++) {mufastResult.emplace_back(i); }
+ for(i=0; i<numMuon-1; i++){
+ for(j=i+1; j<numMuon; j++){
+ ATH_MSG_DEBUG("++ i=" << i << " vs j=" << j);
+ bool overlapped = isOverlap((*input[i]).muFast, (*input[j]).muFast);
+ if( ! overlapped ){ // judged as different
+ ATH_MSG_DEBUG(" judged as: different objects");
+ if( mufastResult[i] == mufastResult[j] ) { // but marked as same by someone
+ ATH_MSG_DEBUG( "inconsistentency in muFast overlap removal for more than two objects" );
+ ATH_MSG_DEBUG( "two objects are judged as different but both were already marked as identical by someone else as: " );
+ ATH_MSG_DEBUG( "i/j/result[i]/result[j]=" << i << " / " << j << " / " << mufastResult[i] << " / " << mufastResult[j] );
+ auto mufastError = Monitored::Scalar("MufastError", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mufastError);
+ mufastError = TrigMufastHypoToolConsts::errorCode_inconsistent_overlap1;
+ errorWhenIdentifyingOverlap = true;
+ }
+ }
+ else{ // judged as overlap
+ if( (mufastResult[j] != j && mufastResult[i] != mufastResult[j]) || (mufastResult[j] == j && mufastResult[i] != i) ){
+ ATH_MSG_DEBUG( "inconsistentency in muFast overlap removal for more than two objects" );
+ ATH_MSG_DEBUG( "two objects are judged as overlap but only either was already marked as overlap to someone else: " );
+ ATH_MSG_DEBUG( "i/j/result[i]/result[j]=" << i << " / " << j << " / " << mufastResult[i] << " / " << mufastResult[j] );
+ auto mufastError = Monitored::Scalar("MufastError", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mufastError);
+ mufastError = TrigMufastHypoToolConsts::errorCode_inconsistent_overlap2;
+ errorWhenIdentifyingOverlap = true;
+ }
+ ATH_MSG_DEBUG(" judged as: overlapped objects");
+ if( mufastResult[i] == i ) {
+ ATH_MSG_DEBUG( " i is not yet marked as overlap. so, it is a newly found overlap" );
+ ATH_MSG_DEBUG( " -> marking mufastResult[j] as i..." );
+ mufastResult[j] = i;
+ } else {
+ ATH_MSG_DEBUG( " both i/j already marked as overlap by: mufastResult[i]=" << mufastResult[i] );
+ ATH_MSG_DEBUG( " -> do nothing..." );
+ }
+ }
+ }
+ }
+
+ if( errorWhenIdentifyingOverlap ) {
+ ATH_MSG_WARNING( "error when resolving overlap. exitting with all EVs active..." );
+ auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mufastNrActiveEVs);
+ mufastNrActiveEVs = numMuon;
+ // for(i=0; i<numMuon; i++) TrigCompositeUtils::addDecisionID( m_decisionId, toolInput[i].decision );
+ return StatusCode::SUCCESS;
+ }
+
+ unsigned int n_uniqueMuon = 0;
+ for(i=0; i<numMuon; i++) {
+ ATH_MSG_DEBUG( "muFast results: i=" << i << ": ");
+ if( mufastResult[i] != i ) { ATH_MSG_DEBUG( " overlap to j=" << mufastResult[i] ); }
+ else {
+ n_uniqueMuon++;
+ ATH_MSG_DEBUG( " unique" );
+ }
+ }
+
+ ATH_MSG_DEBUG( "nr of unique Muons after muFast overlap removal=" << n_uniqueMuon );
+
+ if( numMuon != n_uniqueMuon ){
+ ATH_CHECK(chooseBestMuon(input, mufastResult));
+ } else {
+ ATH_MSG_DEBUG( "no overlap identified. exitting with all EventViews active" );
+ auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mufastNrActiveEVs);
+ mufastNrActiveEVs = n_uniqueMuon;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+bool TrigMufastHypoTool::isOverlap(const xAOD::L2StandAloneMuon *mf1,
+ const xAOD::L2StandAloneMuon *mf2) const
+{
+
+ auto mufastDR = Monitored::Scalar("DR", -9999.);
+ auto mufastMass = Monitored::Scalar("Mass", -9999.);
+ auto mufastDRLog10 = Monitored::Scalar("DRLog10", -9999.);
+ auto mufastMassLog10 = Monitored::Scalar("MassLog10", -9999.);
+
+ auto monitorIt = Monitored::Group(m_monTool, mufastDR, mufastMass, mufastDRLog10, mufastMassLog10);
+
+ ATH_MSG_DEBUG( " ...mF1: pt/eta/phi=" << mf1->pt() << " / " << mf1->etaMS() << " / " << mf1->phiMS() );
+ ATH_MSG_DEBUG( " ...mF2: pt/eta/phi=" << mf2->pt() << " / " << mf2->etaMS() << " / " << mf2->phiMS() );
+
+ // if dR or invMass is necessary but (eta,phi) info is not avaiable
+ // (i.e. eta,phi=0,0; rec failed)
+ const double ZERO_LIMIT_FOR_ETAPHI = 1e-4;
+ if( (fabs(mf1->etaMS()) <ZERO_LIMIT_FOR_ETAPHI && fabs(mf1->phiMS()) < ZERO_LIMIT_FOR_ETAPHI) ||
+ (fabs(mf2->etaMS()) <ZERO_LIMIT_FOR_ETAPHI && fabs(mf2->phiMS()) < ZERO_LIMIT_FOR_ETAPHI) ) {
+ ATH_MSG_DEBUG( " ...-> (eta,phi) info not available (rec at (eta,phi)=(0,0))" );
+ ATH_MSG_DEBUG( " ...-> but dR of invMass check is required. cannot judge overlap -> return with false" );
+ return false;
+ }
+
+ // if charge or invMass is necessary but charge(=pT) info is not avaiable
+ const double ZERO_LIMIT_FOR_PT = 1e-4;
+ if( (fabs(mf1->pt()) <ZERO_LIMIT_FOR_PT) || (fabs(mf2->pt()) < ZERO_LIMIT_FOR_PT) ) {
+ ATH_MSG_DEBUG( " ...-> pT info not available (rec at pT=0)" );
+ ATH_MSG_DEBUG( " ...-> but same sign or invMass check is required. cannot judge overlap -> return with false" );
+ return false;
+ }
+
+
+ // determine dR, mass threshold separately for: BB, BE, EE
+ double dRThres = 9999;
+ double massThres = 9999;
+
+ const int SADDRESS_EC = -1;
+ bool isBarrel1 = (mf1->sAddress() != SADDRESS_EC ) ? true : false;
+ bool isBarrel2 = (mf2->sAddress() != SADDRESS_EC ) ? true : false;
+
+ if( isBarrel1 && isBarrel2 ) { // BB
+ ATH_MSG_DEBUG( " ...B-B" );
+ dRThres =m_dRThresBB;
+ massThres=m_massThresBB;
+ }
+ else if( (isBarrel1 && ! isBarrel2) || (!isBarrel1 && isBarrel2) ) { // BE
+ ATH_MSG_DEBUG( " ...B-E" );
+ dRThres =m_dRThresBE;
+ massThres=m_massThresBE;
+ }
+ else { // EE
+ ATH_MSG_DEBUG( " ...E-E" );
+ double absEta = (fabs(mf1->pt()) > fabs(mf2->pt())) ? fabs(mf1->etaMS()) : fabs(mf2->etaMS());
+ unsigned int iThres=0;
+ for(unsigned int i=0; i<(m_etaBinsEC.size()-1); i++) {
+ if ( m_etaBinsEC[i] <= absEta && absEta < m_etaBinsEC[i+1] ) iThres = i;
+ }
+ ATH_MSG_DEBUG( " ...iThres=" << iThres );
+ dRThres = m_dRThresEC[iThres];
+ massThres = m_massThresEC[iThres];
+ }
+ ATH_MSG_DEBUG( " ...dR threshold=" << dRThres );
+ ATH_MSG_DEBUG( " ...mass threshold=" << massThres );
+
+
+ // same sign cut
+ bool sameSign = false;
+ if( m_requireSameSign ) {
+ sameSign = ((mf1->pt()*mf2->pt()) > 0) ? true : false;
+ ATH_MSG_DEBUG( " ...-> sameSign=" << sameSign );
+ }
+
+ // dR cut
+ bool dRisClose = false;
+ double dr = dR(mf1->etaMS(),mf1->phiMS(),mf2->etaMS(),mf2->phiMS());
+
+ // for monitoring
+ mufastDR = dr;
+ const double monitor_limit = 1e-4;
+ double dr_mon = (dr>=monitor_limit) ? dr : monitor_limit;
+ mufastDRLog10 = log10(dr_mon);
+
+ if( m_requireDR ) {
+ if( dr < dRThres ) dRisClose = true;
+ ATH_MSG_DEBUG( " ...-> dR=" << dr << " : dRisClose=" << dRisClose );
+ }
+
+ // mass cut
+ const double TRACK_MASS = 0; // just assume zero mass
+ bool massIsClose = false;
+ double mass = invMass(TRACK_MASS,mf1->pt(),mf1->etaMS(),mf1->phiMS(),TRACK_MASS,mf2->pt(),mf2->etaMS(),mf2->phiMS());
+
+ // for monitoring
+ mufastMass = mass;
+ double mass_mon = (mass>=monitor_limit) ? mass : monitor_limit;
+ mufastMassLog10 = log10(mass_mon);
+
+ if( m_requireMass ) {
+ if( mass < massThres ) massIsClose = true;
+ ATH_MSG_DEBUG( " ...-> mass=" << mass << " : massIsClose=" << massIsClose );
+ }
+
+ // total judge
+ bool overlap = false;
+ if( ((m_requireSameSign && sameSign) || (! m_requireSameSign)) &&
+ ((m_requireDR && dRisClose) || (! m_requireDR)) &&
+ ((m_requireMass && massIsClose) || (! m_requireMass)) ) {
+ overlap = true;
+ }
+
+ ATH_MSG_DEBUG( " ...=> isOverlap=" << overlap );
+
+ return overlap;
+
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+double TrigMufastHypoTool::dR(double eta1, double phi1, double eta2, double phi2) const
+{
+ const double deta = eta1 - eta2;
+ const double dphi = CxxUtils::deltaPhi(phi1, phi2);
+ return std::sqrt(deta*deta + dphi*dphi);
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+double TrigMufastHypoTool::invMass(double m1, double pt1, double eta1, double phi1,
+ double m2, double pt2, double eta2, double phi2) const
+{
+ const double ZERO_LIMIT = 1e-12;
+
+ double theta1 = 2*atan2((double)exp(-eta1),1.);
+ double theta2 = 2*atan2((double)exp(-eta2),1.);
+
+ double fpt1 = fabs(pt1);
+ double fpt2 = fabs(pt2);
+
+ double px1 = fpt1*cos(phi1);
+ double py1 = fpt1*sin(phi1);
+ double pz1 = fpt1/tan(theta1);
+ double e1 = sqrt(px1*px1+py1*py1+pz1*pz1+m1*m1);
+
+ double px2 = fpt2*cos(phi2);
+ double py2 = fpt2*sin(phi2);
+ double pz2 = fpt2/tan(theta2);
+ double e2 = sqrt(px2*px2+py2*py2+pz2*pz2+m2*m2);
+
+ double pxsum = px1 + px2;
+ double pysum = py1 + py2;
+ double pzsum = pz1 + pz2;
+ double esum = e1 + e2;
+
+ double mass = 0;
+ double mass2 = esum*esum - pxsum*pxsum - pysum*pysum - pzsum*pzsum;
+ if( mass2 > ZERO_LIMIT ) mass = sqrt(mass2);
+
+ return mass;
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+StatusCode TrigMufastHypoTool::chooseBestMuon(std::vector<TrigMufastHypoTool::MuonClusterInfo*>& input, std::vector<unsigned int> mufastResult) const
+{
+ size_t numMuon = input.size();
+ unsigned int i,j,k;
+
+ auto mufastNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
+ auto mufastNrOverlapped = Monitored::Scalar("NrOverlapped", 0);
+ auto mufastOverlappedEta = Monitored::Scalar("OverlappedEta", -9999.);
+ auto mufastOverlappedPhi = Monitored::Scalar("OverlappedPhi", -9999.);
+ auto mufastOverlappedPt = Monitored::Scalar("OverlappedPt", -9999.);
+
+ auto monitorIt = Monitored::Group(m_monTool, mufastNrActiveEVs, mufastNrOverlapped,
+ mufastOverlappedPt, mufastOverlappedEta, mufastOverlappedPhi);
+
+ ATH_MSG_DEBUG( "--- choose best among overlaps & disable EVs (muFast based) ---" );
+ for(i=0; i<numMuon; i++) {
+ ATH_MSG_DEBUG( "++ i=" << i << ": result=" << mufastResult[i] );
+ if( mufastResult[i] != i ) {
+ ATH_MSG_DEBUG( " overlap to some one. skip." );
+
+ (*input[i]).passOR = false;
+
+ continue;
+ }
+ std::vector<unsigned int> others;
+ for(j=0; j<numMuon; j++) {
+ if( mufastResult[j] == mufastResult[i] ) others.emplace_back(j);
+ }
+ if( others.size() == 1 ) {
+ ATH_MSG_DEBUG( " unique object. keep it active." );
+ continue;
+ }
+ else {
+ // must choose one best
+ ATH_MSG_DEBUG( " overlapped objects among: " << others );
+ unsigned int best_ev = 0;
+ float maxPtMf = 0;
+ float maxPtRoI = 0;
+ for(k=0; k<others.size(); k++) {
+ j=others[k];
+ // const LVL1::RecMuonRoI* muonRoI = input[j].RecRoI;
+ // float ptRoI = muonRoI->getThresholdValue();
+ const xAOD::L2StandAloneMuon* mf = (*input[j]).muFast;
+ float ptMf = fabs(mf->pt());
+ float ptRoI = mf->roiThreshold();
+ ATH_MSG_DEBUG(" ev/PtRoI/ptMf="<< j << "/" << ptRoI << "/" << ptMf);
+ if( (ptRoI-maxPtRoI) > 0.1 ) {
+ maxPtRoI = ptRoI;
+ maxPtMf = ptMf;
+ best_ev = j;
+ }
+ else if( fabs(ptRoI-maxPtRoI) < 0.1 ) {
+ if( ptMf > maxPtMf ) {
+ maxPtRoI = ptRoI;
+ maxPtMf = ptMf;
+ best_ev = j;
+ }
+ }
+ }
+ ATH_MSG_DEBUG( " best is: best_ev/maxPtRoI/maxPtMf=" << best_ev << " / " << maxPtRoI << " / " << maxPtMf );
+
+ for(k=0; k<others.size(); k++) {
+ j=others[k];
+ if( j != best_ev ) {
+ ATH_MSG_DEBUG( " EventView( j=" << j << " ) is not active" );
+
+ (*input[j]).passOR = false;
+
+ // monitoring
+ const xAOD::L2StandAloneMuon* mf = (*input[j]).muFast;
+ mufastNrOverlapped++;
+ mufastOverlappedPt = mf->pt();
+ mufastOverlappedEta = mf->etaMS();
+ mufastOverlappedPhi = mf->phiMS();
+ }
+ if( j == best_ev ){
+ ATH_MSG_DEBUG( " EventView( j=" << j << " ) is best one" );
+ }
+ }
+ }
+ }
+ mufastNrActiveEVs = numMuon - mufastNrOverlapped;
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
index d99a7edc518859030bc72a92e3d4342e7f5dca8d..cd950b6da07e6a81765a9871d37e7f790cbc04f2 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
@@ -20,6 +20,11 @@ class StoreGateSvc;
namespace TrigMufastHypoToolConsts {
enum ECRegions{ Bulk, WeakBFieldA, WeakBFieldB };
+const int errorCode_cannot_get_EL = 1;
+const int errorCode_EL_not_valid = 2;
+const int errorCode_inconsistent_overlap1 = 3;
+const int errorCode_inconsistent_overlap2 = 4;
+const int errorCode_cannot_get_RoI = 5;
}
// --------------------------------------------------------------------------------
@@ -44,13 +49,15 @@ class TrigMufastHypoTool: public ::AthAlgTool {
roi( r ),
muFast( f ),
previousDecisionIDs( TrigCompositeUtils::decisionIDs( previousDecision ).begin(),
- TrigCompositeUtils::decisionIDs( previousDecision ).end() )
+ TrigCompositeUtils::decisionIDs( previousDecision ).end() ),
+ passOR( true )
{}
TrigCompositeUtils::Decision* decision;
const TrigRoiDescriptor* roi;
const xAOD::L2StandAloneMuon* muFast;
const TrigCompositeUtils::DecisionIDContainer previousDecisionIDs;
+ bool passOR;
};
virtual StatusCode initialize() override;
@@ -69,6 +76,14 @@ class TrigMufastHypoTool: public ::AthAlgTool {
// for multipul muon event
StatusCode multiplicitySelection(std::vector<TrigMufastHypoTool::MuonClusterInfo>& toolInput) const;
+ StatusCode applyOverlapRemoval(std::vector<TrigMufastHypoTool::MuonClusterInfo>& toolInput) const;
+ StatusCode checkOverlap(std::vector<TrigMufastHypoTool::MuonClusterInfo*>& input) const;
+ bool isOverlap(const xAOD::L2StandAloneMuon *mf1, const xAOD::L2StandAloneMuon *mf2) const;
+ double dR(double eta1, double phi1, double eta2, double phi2) const;
+ double invMass(double m1, double pt1, double eta1, double phi1,
+ double m2, double pt2, double eta2, double phi2) const;
+ StatusCode chooseBestMuon(std::vector<TrigMufastHypoTool::MuonClusterInfo*>& input, std::vector<unsigned int> mufastResult) const;
+
float getLocalPhi(float, float, float) const;
// Properties:
@@ -102,6 +117,40 @@ class TrigMufastHypoTool: public ::AthAlgTool {
Gaudi::Property< bool > m_doCalib {
this, "DoCalib", false, "muoncalib chain" };
+ // Members for overlap removal
+ Gaudi::Property< bool > m_applyOR {
+ this, "ApplyOR", false, "apply overlap removal for mufast" };
+
+ Gaudi::Property<bool> m_requireDR{
+ this, "RequireDR", true, "require or not DR cut for overlap removal"};
+
+ Gaudi::Property<bool> m_requireMass{
+ this, "RequireMass", true, "require or not mass cut for overlap removal"};
+
+ Gaudi::Property<bool> m_requireSameSign{
+ this, "RequireSameSign", true, "require or not charge cut for overlap removal"};
+
+ Gaudi::Property< float > m_dRThresBB {
+ this, "DRThresBB", 0.05, "DR threshold in barel and barel region"};
+
+ Gaudi::Property< float > m_massThresBB {
+ this, "MassThresBB", 0.20, "mass threshold in barel and barel region"};
+
+ Gaudi::Property< float > m_dRThresBE {
+ this, "DRThresBE", 0.05, "DR threshold in barel and barel region"};
+
+ Gaudi::Property< float > m_massThresBE {
+ this, "MassThresBE", 0.20, "mass threshold in barel and endcap region"};
+
+ Gaudi::Property< std::vector<float> > m_etaBinsEC {
+ this, "EtaBinsEC", {0, 1.9, 2.1, 9.9}, "eta bins of DR and mass thresholds in endcap and barel region"};
+
+ Gaudi::Property< std::vector<float> > m_dRThresEC {
+ this, "DRThresEC", {0.06, 0.05, 0.05}, "DR threshold in endcap and barel region"};
+
+ Gaudi::Property< std::vector<float> > m_massThresEC {
+ this, "MassThresEC", {0.20, 0.15, 0.10}, "mass threshold in endcap and endcap region"};
+
// Other members:
std::vector<size_t> m_bins = {0};
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoAlg.cxx
index c073232c858f4551254811f60e39fea8f041157d..ac3b0c53c43b5a399e7cdc95c3940c19b182753d 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoAlg.cxx
@@ -71,6 +71,19 @@ StatusCode TrigMuonEFHypoAlg::execute( const EventContext& context ) const
// It is posisble that no muons are found, in this case we go to the next decision
if(muonHandle->size()==0) continue;
+ //In cases where IM is using mergeByFeature, and since we can have multiple
+ //muons per view, need to check that we are considering the corresponding muon
+ //from the previous decision. Relevant for combined muons only.
+
+ const xAOD::Muon *muonPrev = nullptr;
+ if(m_mapToPrevDec){
+ auto prevMuInfo = TrigCompositeUtils::findLinks<xAOD::MuonContainer>(previousDecision, TrigCompositeUtils::featureString(), TrigDefs::lastFeatureOfType);
+ ATH_CHECK(prevMuInfo.size()==1);
+ auto prevMuLink = prevMuInfo.at(0).link;
+ ATH_CHECK(prevMuLink.isValid());
+ muonPrev = *prevMuLink;
+ }
+
//loop over muons (more than one muon can be found by EF algos)
for(uint i=0; i<muonHandle->size(); i++){
auto muonEL = ViewHelper::makeLink( *viewEL, muonHandle, i );
@@ -78,6 +91,30 @@ StatusCode TrigMuonEFHypoAlg::execute( const EventContext& context ) const
const xAOD::Muon* muon = *muonEL;
+ //Map muons to the correct decisions from previous step
+ bool matchedToDec = false;
+ if(m_mapToPrevDec){
+ //First try to check if the combined muon has an extrapolated track particle
+ //and if so whether it matches the SA track from the previous decision's muon
+ auto trk1 = muon->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
+ auto trk2 = muonPrev->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
+ if(trk1 && trk2){
+ if(trk1->p4()==trk2->p4()){
+ matchedToDec = true;
+ }
+ }
+ else{
+ //If no extrapolated track particle (combined muon reconstructed by InsdieOutAlg)
+ //do dR matching. dR<0.05 should be sufficient to get correct matching
+ double dr = muon->p4().DeltaR(muonPrev->p4());
+ if(dr<0.05) matchedToDec = true;
+ }
+ }
+ else matchedToDec = true;
+
+ //skip muons not corresponding to previous decisions
+ if(!matchedToDec) continue;
+
// create new decisions
auto newd = newDecisionIn( decisions );
@@ -91,6 +128,9 @@ StatusCode TrigMuonEFHypoAlg::execute( const EventContext& context ) const
ATH_MSG_DEBUG("REGTEST: " << m_muonKey.key() << " eta/phi = " << (*muonEL)->eta() << "/" << (*muonEL)->phi());
ATH_MSG_DEBUG("REGTEST: RoI = eta/phi = " << (*roiEL)->eta() << "/" << (*roiEL)->phi());
ATH_MSG_DEBUG("Added view, roi, feature, previous decision to new decision "<<counter <<" for view "<<(*viewEL)->name() );
+
+ //found muon partnered to previous decision, so don't need to consider the other muons
+ if(m_mapToPrevDec) break;
}
counter++;
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoAlg.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoAlg.h
index fad26e74da4664be76a7bd3bc6c6828370f95b82..bbf5733917991e625804926f30916d32105b9f06 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoAlg.h
@@ -28,6 +28,9 @@ class TrigMuonEFHypoAlg
SG::ReadHandleKey<xAOD::MuonContainer> m_muonKey{
this, "MuonDecisions", "MuonEFCombiner_MuonData", "Name of the input data on xAOD::MuonContainer produced by MuonCreatorAlg"};
+ Gaudi::Property<bool> m_mapToPrevDec{
+ this, "MapToPreviousDecisions", false, "Map to decisions from previous decisions (needed if IM has mergeUsingFeature=True)"};
+
};
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx
index 4e5b030bc25f560401fe520f3040b9dbf0e05c01..b8702b26f95d1df3a8a2e4f9877c3b183335ee52 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx
@@ -34,12 +34,15 @@ if(m_acceptAll) {
bool TrigMuonEFInvMassHypoTool::executeAlg(std::vector<LegDecision> &combination) const{
//Monitored Variables
- std::vector<float> fexInvMass;
- auto muonMassMon = Monitored::Collection("Pt", fexInvMass);
- auto monitorIt = Monitored::Group(m_monTool, muonMassMon);
+ std::vector<float> fexInvMass, fexInvMassSel;
+ auto muonMassMon = Monitored::Collection("Mass", fexInvMass);
+ auto muonMassSelMon = Monitored::Collection("Mass_sel", fexInvMassSel);
+ auto monitorIt = Monitored::Group(m_monTool, muonMassMon, muonMassSelMon);
+
bool result = false;
bool passLow = false;
bool passHigh = false;
+
//for pass through mode
if(m_acceptAll) {
result = true;
@@ -81,7 +84,7 @@ bool TrigMuonEFInvMassHypoTool::executeAlg(std::vector<LegDecision> &combination
//fill monitored variables
fexInvMass.push_back(diMuMass);
-
+
ATH_MSG_DEBUG(" REGTEST diMuon mass is " << diMuMass << " GeV "
<< " and lowMassCut cut is " << m_invMassLow << " GeV"
<< " and highMassCut cut is " << m_invMassHigh << " GeV");
@@ -89,7 +92,11 @@ bool TrigMuonEFInvMassHypoTool::executeAlg(std::vector<LegDecision> &combination
//Apply hypo cuts. If any mass combination is true, then the overall result should be true.
if(m_invMassLow>0 && diMuMass>m_invMassLow) passLow=true;
if(m_invMassHigh>0 && diMuMass<m_invMassHigh) passHigh = true;
- if(passLow && passHigh) result=true;
+ if(passLow && passHigh){
+ result=true;
+ //fill monitored variables
+ fexInvMassSel.push_back(diMuMass);
+ }
}
}
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
index b5ae07ca846df9d0d5680638e6244e67a259e0e9..68d5e2bf4f8e0b2e5f513844538449c7614318ea 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
@@ -2,10 +2,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#include "GaudiKernel/SystemOfUnits.h"
#include "AthenaMonitoringKernel/Monitored.h"
#include "TrigCompositeUtils/Combinators.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "TrigmuCombHypoTool.h"
+#include "CxxUtils/phihelper.h"
+
+#include <cmath>
using namespace TrigCompositeUtils;
// --------------------------------------------------------------------------------
@@ -53,7 +57,46 @@ StatusCode TrigmuCombHypoTool::initialize()
ATH_CHECK( m_monTool.retrieve() );
ATH_MSG_DEBUG("MonTool name: " << m_monTool);
}
-
+
+ // Overlap Removal
+ if( m_applyOR ) {
+ ATH_MSG_DEBUG( "--- overlap removal as: ---" );
+ if( m_requireDR ) {
+ ATH_MSG_DEBUG( "+ dR cut:" );
+ if( (m_etaBins.size()-1) != m_dRThres.size() ) {
+ ATH_MSG_ERROR( "bad thresholds setup .... exiting!" );
+ return StatusCode::FAILURE;
+ }
+ for(unsigned int i=0; i<m_dRThres.size(); i++) {
+ ATH_MSG_DEBUG( " EtaBin " << m_etaBins[i] << " - " << m_etaBins[i+1]
+ << " : dR < " << m_dRThres[i] );
+ }
+ }
+ if( m_requireMufastDR ) {
+ ATH_MSG_DEBUG( "+ dr(by mF) cut:" );
+ if( (m_etaBins.size()-1) != m_mufastDRThres.size() ) {
+ ATH_MSG_ERROR( "bad thresholds setup .... exiting!" );
+ return StatusCode::FAILURE;
+ }
+ for(unsigned int i=0; i<m_mufastDRThres.size(); i++) {
+ ATH_MSG_DEBUG( " EtaBin " << m_etaBins[i] << " - " << m_etaBins[i+1]
+ << " : dR(mF) < " << m_mufastDRThres[i] );
+ }
+ }
+ if( m_requireMass ) {
+ ATH_MSG_DEBUG( "+ Mass cut:" );
+ if( (m_etaBins.size()-1) != m_massThres.size() ) {
+ ATH_MSG_ERROR( "bad thresholds setup .... exiting!" );
+ return StatusCode::FAILURE;
+ }
+ for(unsigned int i=0; i<m_massThres.size(); i++) {
+ ATH_MSG_DEBUG( " EtaBin " << m_etaBins[i] << " - " << m_etaBins[i+1]
+ << " : Mass < " << m_massThres[i] );
+ }
+ }
+ if( m_requireSameSign ) ATH_MSG_DEBUG( "+ Same charge sign" );
+ }
+
return StatusCode::SUCCESS;
}
@@ -181,7 +224,6 @@ bool TrigmuCombHypoTool::decideOnSingleObject(TrigmuCombHypoTool::CombinedMuonIn
return result;
}
-
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
@@ -199,6 +241,10 @@ StatusCode TrigmuCombHypoTool::decide(std::vector<TrigmuCombHypoTool::CombinedMu
} else { // in case of HLT_2mu6 and so on.
ATH_MSG_DEBUG("Number of muon event = " << numMuon );
ATH_MSG_DEBUG("Applying selection of multiplicity << " << m_decisionId );
+
+ if(m_applyOR)
+ ATH_CHECK(applyOverlapRemoval(toolInput));
+
return multiplicitySelection(toolInput);
}
@@ -209,7 +255,7 @@ StatusCode TrigmuCombHypoTool::decide(std::vector<TrigmuCombHypoTool::CombinedMu
StatusCode TrigmuCombHypoTool::inclusiveSelection(std::vector<TrigmuCombHypoTool::CombinedMuonInfo>& input) const
{
for ( auto& i: input) {
- // If muon event has defference DecisionID, it shouldn't apply.
+ // If muon event has difference DecisionID, it shouldn't apply.
if (TrigCompositeUtils::passed(m_decisionId.numeric(), i.previousDecisionIDs)) {
if ( decideOnSingleObject(i, 0)==true ) {
ATH_MSG_DEBUG("Pass through selection " << m_decisionId );
@@ -233,7 +279,13 @@ StatusCode TrigmuCombHypoTool::multiplicitySelection(std::vector<TrigmuCombHypoT
for ( size_t cutIndex=0; cutIndex < m_ptBins.size(); ++cutIndex ) {
size_t elementIndex{ 0 };
for ( auto& i: input ) {
- // If muon event has defference DecisionID, it shouldn't apply.
+
+ if(!m_acceptAll && m_applyOR && !i.passOR) {
+ ATH_MSG_DEBUG("skip due to overap, DecisionID " << m_decisionId );
+ continue;
+ }
+
+ // If muon event has difference DecisionID, it shouldn't apply.
if ( TrigCompositeUtils::passed( m_decisionId.numeric(), i.previousDecisionIDs ) ) {
if ( decideOnSingleObject( i, cutIndex ) == true ) {
ATH_MSG_DEBUG("Pass through selection " << m_decisionId << " : Event[" << elementIndex << "]" );
@@ -284,3 +336,376 @@ StatusCode TrigmuCombHypoTool::multiplicitySelection(std::vector<TrigmuCombHypoT
return StatusCode::SUCCESS;
}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+StatusCode TrigmuCombHypoTool::applyOverlapRemoval(std::vector<TrigmuCombHypoTool::CombinedMuonInfo>& toolInput) const {
+
+ ATH_MSG_DEBUG("Running Overlap Removal for muComb");
+
+ std::vector<TrigmuCombHypoTool::CombinedMuonInfo*> input;
+
+ for ( auto& i: toolInput ) {
+ if ( TrigCompositeUtils::passed( m_decisionId.numeric(), i.previousDecisionIDs) ){
+ input.emplace_back(&i);
+ }
+ }
+
+ size_t numMuon = input.size();
+
+ auto mucombNrAllEVs = Monitored::Scalar("NrAllEVs", -9999.);
+ auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mucombNrAllEVs, mucombNrActiveEVs);
+ if ( numMuon == 0) {
+ ATH_MSG_DEBUG( "No positive previous hypo decision. Not need overlap removal." );
+ mucombNrActiveEVs = numMuon;
+ mucombNrAllEVs = numMuon;
+ return StatusCode::SUCCESS;
+ }
+ else if ( numMuon == 1 ) {
+ ATH_MSG_DEBUG("Number of muon event = " << numMuon );
+ ATH_MSG_DEBUG("no overlap Removal necessary. exitting with all EventViews active." );
+ mucombNrActiveEVs = numMuon;
+ mucombNrAllEVs = numMuon;
+ return StatusCode::SUCCESS;
+ } else {
+ ATH_MSG_DEBUG("Number of muon event = " << numMuon );
+ mucombNrAllEVs = numMuon;
+ ATH_CHECK(checkOverlap(input));
+ return StatusCode::SUCCESS;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+StatusCode TrigmuCombHypoTool::checkOverlap(std::vector<TrigmuCombHypoTool::CombinedMuonInfo*>& input) const {
+
+ size_t numMuon = input.size();
+ unsigned int i,j;
+ std::vector<unsigned int> mucombResult;
+
+ bool errorWhenIdentifyingOverlap = false;
+
+ for(i=0; i<numMuon; i++) {mucombResult.emplace_back(i); }
+ for(i=0; i<numMuon-1; i++){
+ for(j=i+1; j<numMuon; j++){
+ ATH_MSG_DEBUG("++ i=" << i << " vs j=" << j);
+ bool overlapped = isOverlap((*input[i]).muComb, (*input[j]).muComb);
+ if( ! overlapped ){ // judged as different
+ ATH_MSG_DEBUG(" judged as: differenr objects");
+ if( mucombResult[i] == mucombResult[j] ) { // but marked as same by someone
+ ATH_MSG_DEBUG( "inconsistentency in muComb overlap removal for more than two objects" );
+ ATH_MSG_DEBUG( "two objects are judged as different but both were already marked as identical by someone else as: " );
+ ATH_MSG_DEBUG( "i/j/result[i]/result[j]=" << i << " / " << j << " / " << mucombResult[i] << " / " << mucombResult[j] );
+ auto mucombError = Monitored::Scalar("MucombError", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mucombError);
+ mucombError = TrigmuCombHypoToolConsts::errorCode_inconsistent_overlap1;
+ errorWhenIdentifyingOverlap = true;
+ }
+ }
+ else{ // judged as overlap
+ if( (mucombResult[j] != j && mucombResult[i] != mucombResult[j]) || (mucombResult[j] == j && mucombResult[i] != i) ){
+ ATH_MSG_DEBUG( "inconsistentency in muComb based overlap removal for more than two objects" );
+ ATH_MSG_DEBUG( "two objects are judged as overlap but only either was already marked as overlap to someone else: " );
+ ATH_MSG_DEBUG( "i/j/result[i]/result[j]=" << i << " / " << j << " / " << mucombResult[i] << " / " << mucombResult[j] );
+ auto mucombError = Monitored::Scalar("MucombError", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mucombError);
+ mucombError = TrigmuCombHypoToolConsts::errorCode_inconsistent_overlap2;
+ errorWhenIdentifyingOverlap = true;
+ }
+ ATH_MSG_DEBUG(" judged as: overlapped objects");
+ if( mucombResult[i] == i ) {
+ ATH_MSG_DEBUG( " i is not yet marked as overlap. so, it is a newly found overlap" );
+ ATH_MSG_DEBUG( " -> marking mucombResult[j] as i..." );
+ mucombResult[j] = i;
+ } else {
+ ATH_MSG_DEBUG( " both i/j already marked as overlap by: mucombResult[i]=" << mucombResult[i] );
+ ATH_MSG_DEBUG( " -> do nothing..." );
+ }
+ }
+ }
+ }
+
+ if( errorWhenIdentifyingOverlap ) {
+ ATH_MSG_WARNING( "error when resolving overlap. exitting with all EVs active..." );
+ auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mucombNrActiveEVs);
+ mucombNrActiveEVs = numMuon;
+ // for(i=0; i<numMuon; i++) TrigCompositeUtils::addDecisionID( m_decisionId, toolInput[i].decision );
+ return StatusCode::SUCCESS;
+ }
+
+ unsigned int n_uniqueMuon = 0;
+ for(i=0; i<numMuon; i++) {
+ ATH_MSG_DEBUG( "muComb based results: i=" << i << ": ");
+ if( mucombResult[i] != i ) { ATH_MSG_DEBUG( " overlap to j=" << mucombResult[i] ); }
+ else {
+ n_uniqueMuon++;
+ ATH_MSG_DEBUG( " unique" );
+ }
+ }
+
+ ATH_MSG_DEBUG( "nr of unique Muons after muComb-based removal=" << n_uniqueMuon );
+
+ if( numMuon != n_uniqueMuon ){
+ ATH_CHECK(chooseBestMuon(input, mucombResult));
+ } else {
+ ATH_MSG_DEBUG( "no overlap identified. exitting with all EventViews active" );
+ auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
+ auto monitorIt = Monitored::Group(m_monTool, mucombNrActiveEVs);
+ mucombNrActiveEVs = n_uniqueMuon;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+bool TrigmuCombHypoTool::isOverlap(const xAOD::L2CombinedMuon *combMf1,
+ const xAOD::L2CombinedMuon *combMf2) const
+{
+
+ auto mucombDR = Monitored::Scalar("DR", -9999.);
+ auto mucombMass = Monitored::Scalar("Mass", -9999.);
+ auto mucombDRLog10 = Monitored::Scalar("DRLog10", -9999.);
+ auto mucombMassLog10 = Monitored::Scalar("MassLog10", -9999.);
+
+ auto monitorIt = Monitored::Group(m_monTool, mucombDR, mucombMass, mucombDRLog10, mucombMassLog10);
+
+
+ ATH_MSG_DEBUG( " ...mF1: pt/eta/phi=" << combMf1->pt()/Gaudi::Units::GeV << " / " << combMf1->eta() << " / " << combMf1->phi() );
+ ATH_MSG_DEBUG( " ...mF2: pt/eta/phi=" << combMf2->pt()/Gaudi::Units::GeV << " / " << combMf2->eta() << " / " << combMf2->phi() );
+
+ // if dR or invMass is necessary but (eta,phi) info is not avaiable
+ // (i.e. eta,phi=0,0; rec failed)
+ const double ZERO_LIMIT_FOR_ETAPHI = 1e-4;
+ if( (fabs(combMf1->eta()) <ZERO_LIMIT_FOR_ETAPHI && fabs(combMf1->phi()) < ZERO_LIMIT_FOR_ETAPHI) ||
+ (fabs(combMf2->eta()) <ZERO_LIMIT_FOR_ETAPHI && fabs(combMf2->phi()) < ZERO_LIMIT_FOR_ETAPHI) ) {
+ ATH_MSG_DEBUG( " ...-> (eta,phi) info not available (rec at (eta,phi)=(0,0))" );
+ if( m_requireDR || m_requireMass ) {
+ ATH_MSG_DEBUG( " ...-> but dR of invMass check is required. cannot judge overlap -> return with false" );
+ return false;
+ }
+ }
+
+ // if charge or invMass is necessary but charge(=pT) info is not avaiable
+ const double ZERO_LIMIT_FOR_PT = 1e-4;
+ if( (fabs(combMf1->pt()) <ZERO_LIMIT_FOR_PT) || (fabs(combMf2->pt()) < ZERO_LIMIT_FOR_PT) ) {
+ ATH_MSG_DEBUG( " ...-> pT info not available (rec at pT=0)" );
+ if( m_requireSameSign || m_requireMass ) {
+ ATH_MSG_DEBUG( " ...-> but same sign or invMass check is required. cannot judge overlap -> return with false" );
+ return false;
+ }
+ }
+
+ // determine etabin and thresholds
+ double absEta = (fabs(combMf1->pt()) > fabs(combMf2->pt())) ? fabs(combMf1->eta()) : fabs(combMf2->eta());
+ unsigned int iThres = 0;
+ for(unsigned int i=0; i<(m_etaBins.size()-1); i++) {
+ if ( m_etaBins[i] <= absEta && absEta < m_etaBins[i+1] ) iThres = i;
+ }
+ double dRThres = m_dRThres[iThres];
+ double dRbyMFThres = m_mufastDRThres[iThres];
+ double massThres = m_massThres[iThres];
+ ATH_MSG_DEBUG( " ...iThres=" << iThres );
+ if(m_requireDR) ATH_MSG_DEBUG( " ...dR threshold=" << dRThres );
+ if(m_requireMufastDR) ATH_MSG_DEBUG( " ...dR(byMF) threshold=" << dRbyMFThres );
+ if(m_requireMass) ATH_MSG_DEBUG( " ...mass threshold=" << massThres );
+
+ // same sign cut
+ bool sameSign = false;
+ if( m_requireSameSign ) {
+ sameSign = ((combMf1->pt()*combMf2->pt()) > 0) ? true : false;
+ ATH_MSG_DEBUG( " ...-> sameSign=" << sameSign );
+ }
+
+ // dR cut
+ bool dRisClose = false;
+ double dr = dR(combMf1->eta(),combMf1->phi(),combMf2->eta(),combMf2->phi());
+
+ mucombDR = dr;
+ const double monitor_limit = 1e-4;
+ double dr_mon = (dr>=monitor_limit) ? dr : monitor_limit;
+ mucombDRLog10 = log10(dr_mon);
+
+ if( m_requireDR ) {
+ if( dr < dRThres ) dRisClose = true;
+ ATH_MSG_DEBUG( " ...-> dR=" << dr << " : dRisClose=" << dRisClose );
+ }
+
+ // dR(by MF) cut
+ bool dRbyMFisClose = false;
+ if( m_requireMufastDR ) {
+ const xAOD::L2StandAloneMuon* mf1 = combMf1->muSATrack();
+ const xAOD::L2StandAloneMuon* mf2 = combMf2->muSATrack();
+ if( mf1 == 0 || mf2 == 0 ) {
+ ATH_MSG_DEBUG( "mF link from combinedMF broken" );
+ ATH_MSG_DEBUG( " ...-> mF dR is required but mF link broken. cannot judge overlap -> return with false" );
+ return false;
+ }
+ else {
+ // here, we do not check (eta,phi) of mF is not (0,0)
+ // (i.e. we apply muComb based cut even if muFast rec is failed)
+ double dRByMF = dR(mf1->etaMS(),mf1->phiMS(),mf2->etaMS(),mf2->phiMS());
+ if( dRByMF < dRbyMFThres ) dRbyMFisClose = true;
+ ATH_MSG_DEBUG( " ...-> dR(by MF)=" << dRByMF << " : dRbyMFisClose=" << dRbyMFisClose );
+ }
+ }
+
+ // mass cut
+ const double TRACK_MASS = 0; // just assume zero mass
+ bool massIsClose = false;
+ double mass = invMass(TRACK_MASS,combMf1->pt()/Gaudi::Units::GeV,combMf1->eta(),combMf1->phi(),TRACK_MASS,combMf2->pt()/Gaudi::Units::GeV,combMf2->eta(),combMf2->phi());
+
+ mucombMass = mass;
+ double mass_mon = (mass>=monitor_limit) ? mass : monitor_limit;
+ mucombMassLog10 = log10(mass_mon);
+
+ if( m_requireMass ) {
+ if( mass < massThres ) massIsClose = true;
+ ATH_MSG_DEBUG( " ...-> mass=" << mass << " : massIsClose=" << massIsClose );
+ }
+
+ // total judge
+ bool overlap = false;
+ if( ((m_requireSameSign && sameSign) || (! m_requireSameSign)) &&
+ ((m_requireDR && dRisClose) || (! m_requireDR)) &&
+ ((m_requireMufastDR && dRbyMFisClose) || (! m_requireMufastDR)) &&
+ ((m_requireMass && massIsClose) || (! m_requireMass)) ) {
+ overlap = true;
+ }
+
+ ATH_MSG_DEBUG( " ...=> isOverlap=" << overlap );
+
+ return overlap;
+
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+double TrigmuCombHypoTool::dR(double eta1, double phi1, double eta2, double phi2) const
+{
+ const double deta = eta1 - eta2;
+ const double dphi = CxxUtils::deltaPhi(phi1, phi2);
+ return std::sqrt(deta*deta + dphi*dphi);
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+double TrigmuCombHypoTool::invMass(double m1, double pt1, double eta1, double phi1,
+ double m2, double pt2, double eta2, double phi2) const
+{
+ const double ZERO_LIMIT = 1e-12;
+
+ double theta1 = 2*atan2((double)exp(-eta1),1.);
+ double theta2 = 2*atan2((double)exp(-eta2),1.);
+
+ double fpt1 = fabs(pt1);
+ double fpt2 = fabs(pt2);
+
+ double px1 = fpt1*cos(phi1);
+ double py1 = fpt1*sin(phi1);
+ double pz1 = fpt1/tan(theta1);
+ double e1 = sqrt(px1*px1+py1*py1+pz1*pz1+m1*m1);
+
+ double px2 = fpt2*cos(phi2);
+ double py2 = fpt2*sin(phi2);
+ double pz2 = fpt2/tan(theta2);
+ double e2 = sqrt(px2*px2+py2*py2+pz2*pz2+m2*m2);
+
+ double pxsum = px1 + px2;
+ double pysum = py1 + py2;
+ double pzsum = pz1 + pz2;
+ double esum = e1 + e2;
+
+ double mass = 0;
+ double mass2 = esum*esum - pxsum*pxsum - pysum*pysum - pzsum*pzsum;
+ if( mass2 > ZERO_LIMIT ) mass = sqrt(mass2);
+
+ return mass;
+}
+
+// --------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------
+
+StatusCode TrigmuCombHypoTool::chooseBestMuon(std::vector<TrigmuCombHypoTool::CombinedMuonInfo*>& input, std::vector<unsigned int> mucombResult) const
+{
+ size_t numMuon = input.size();
+ unsigned int i,j,k;
+
+ auto mucombNrActiveEVs = Monitored::Scalar("NrActiveEVs", -9999.);
+ auto mucombNrOverlapped = Monitored::Scalar("NrOverlapped", 0);
+ auto mucombOverlappedEta = Monitored::Scalar("OverlappedEta", -9999.);
+ auto mucombOverlappedPhi = Monitored::Scalar("OverlappedPhi", -9999.);
+ auto mucombOverlappedPt = Monitored::Scalar("OverlappedPt", -9999.);
+
+ auto monitorIt = Monitored::Group(m_monTool, mucombNrActiveEVs, mucombNrOverlapped,
+ mucombOverlappedPt, mucombOverlappedEta, mucombOverlappedPhi);
+
+ ATH_MSG_DEBUG( "--- choose best among overlaps & disable EVs (muComb based) ---" );
+ for(i=0; i<numMuon; i++) {
+ ATH_MSG_DEBUG( "++ i=" << i << ": result=" << mucombResult[i] );
+ if( mucombResult[i] != i ) {
+ ATH_MSG_DEBUG( " overlap to some one. skip." );
+
+ (*input[i]).passOR = false;
+
+ continue;
+ }
+ std::vector<unsigned int> others;
+ for(j=0; j<numMuon; j++) {
+ if( mucombResult[j] == mucombResult[i] ) others.emplace_back(j);
+ }
+ if( others.size() == 1 ) {
+ ATH_MSG_DEBUG( " unique object. keep it active." );
+ continue;
+ }
+ else {// must choose one best
+ ATH_MSG_DEBUG( " overlapped objects among: " << others );
+ unsigned int best_ev = 0;
+ float maxPtCombMf = 0;
+ for(k=0; k<others.size(); k++) {
+ j=others[k];
+
+ float ptCombMf = 0.;
+ const xAOD::L2CombinedMuon* combMf = (*input[j]).muComb;
+ ptCombMf = fabs(combMf->pt()/Gaudi::Units::GeV);
+ ATH_MSG_DEBUG(" j="<< j << " , ptCombMf=" << ptCombMf);
+ if( ptCombMf > maxPtCombMf ) {
+ maxPtCombMf = ptCombMf;
+ best_ev = j;
+ }
+ }
+ ATH_MSG_DEBUG( " best is: best_ev/maxPtCombMf=" << best_ev << " / " << maxPtCombMf );
+
+ for(k=0; k<others.size(); k++) {
+ j=others[k];
+ if( j != best_ev ) {
+ ATH_MSG_DEBUG( " EventView( j=" << j << " ) is not active" );
+
+ (*input[j]).passOR = false;
+
+ // monitoring
+ const xAOD::L2CombinedMuon* CombMf = (*input[j]).muComb;
+ mucombNrOverlapped++;
+ mucombOverlappedPt = CombMf->pt()* CombMf->charge() /Gaudi::Units::GeV;
+ mucombOverlappedEta = CombMf->eta();
+ mucombOverlappedPhi = CombMf->phi();
+ }
+ if( j == best_ev ){
+ ATH_MSG_DEBUG( " EventView( j=" << j << " ) is best one" );
+ }
+ }
+ }
+ }
+ mucombNrActiveEVs = numMuon - mucombNrOverlapped;
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
index 10ea1ae595bc4c48e1c62658c931046a0edf4c12..7ed8a0ae554da0f892489bcc2355fd81c12cc383 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
@@ -18,6 +18,11 @@ class StoreGateSvc;
// --------------------------------------------------------------------------------
namespace TrigmuCombHypoToolConsts {
+const int errorCode_cannot_get_EL = 1;
+const int errorCode_EL_not_valid = 2;
+const int errorCode_inconsistent_overlap1 = 3;
+const int errorCode_inconsistent_overlap2 = 4;
+const int errorCode_cannot_get_RoI = 5;
}
// --------------------------------------------------------------------------------
@@ -40,13 +45,15 @@ class TrigmuCombHypoTool: public ::AthAlgTool {
muComb( c ),
muFast( f ),
previousDecisionIDs( TrigCompositeUtils::decisionIDs( previousDecision ).begin(),
- TrigCompositeUtils::decisionIDs( previousDecision ).end() )
+ TrigCompositeUtils::decisionIDs( previousDecision ).end() ),
+ passOR( true )
{}
TrigCompositeUtils::Decision* decision;
const xAOD::L2CombinedMuon* muComb;
const xAOD::L2StandAloneMuon* muFast;
const TrigCompositeUtils::DecisionIDContainer previousDecisionIDs;
+ bool passOR;
};
virtual ~TrigmuCombHypoTool();
@@ -63,6 +70,14 @@ class TrigmuCombHypoTool: public ::AthAlgTool {
StatusCode multiplicitySelection(std::vector<TrigmuCombHypoTool::CombinedMuonInfo>& input) const;
+ StatusCode applyOverlapRemoval(std::vector<TrigmuCombHypoTool::CombinedMuonInfo>& toolInput) const;
+ StatusCode checkOverlap(std::vector<TrigmuCombHypoTool::CombinedMuonInfo*>& input) const;
+ bool isOverlap(const xAOD::L2CombinedMuon *mf1, const xAOD::L2CombinedMuon *mf2) const;
+ double dR(double eta1, double phi1, double eta2, double phi2) const;
+ double invMass(double m1, double pt1, double eta1, double phi1,
+ double m2, double pt2, double eta2, double phi2) const;
+ StatusCode chooseBestMuon(std::vector<TrigmuCombHypoTool::CombinedMuonInfo*>& input, std::vector<unsigned int> mucombResult) const;
+
HLT::Identifier m_decisionId;
ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
@@ -107,6 +122,35 @@ class TrigmuCombHypoTool: public ::AthAlgTool {
this, "DecisionPerCluster", true, "Is multiplicity requirement refering to muons ( false ) or RoIs/clusters with muons ( false ), relevant only in when multiplicity > 1" };
+ // Members for overlap removal
+ Gaudi::Property< bool > m_applyOR {
+ this, "ApplyOR", false, "apply overlap removal for mucomb" };
+
+ Gaudi::Property<bool> m_requireDR{
+ this, "RequireDR", true, "require or not DR cut for overlap removal"};
+
+ Gaudi::Property<bool> m_requireMufastDR{
+ this, "RequireMufastDR", true, "require or not mufast DR cut for overlap removal"};
+
+ Gaudi::Property<bool> m_requireMass{
+ this, "RequireMass", true, "require or not mass cut for overlap removal"};
+
+ Gaudi::Property<bool> m_requireSameSign{
+ this, "RequireSameSign", true, "require or not charge cut for overlap removal"};
+
+ Gaudi::Property< std::vector<float> > m_etaBins {
+ this, "EtaBins", {0, 1.9, 2.1, 9.9}, "eta bins of DR and mass thresholds"};
+
+ Gaudi::Property< std::vector<float> > m_dRThres {
+ this, "DRThres", {0.06, 0.05, 0.05}, "DR threshold"};
+
+ Gaudi::Property< std::vector<float> > m_mufastDRThres {
+ this, "MufastDRThres", {0.06, 0.05, 0.05}, "mufast DR threshold"};
+
+ Gaudi::Property< std::vector<float> > m_massThres {
+ this, "MassThres", {0.20, 0.15, 0.10}, "mass threshold"};
+
+
// Other members:
std::vector<size_t> m_bins = {0};
};
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/components/TrigMuonHypo_entries.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/components/TrigMuonHypo_entries.cxx
index 4c29433bd70f04cdf78e6cf6d1bad96416ad497b..78618c53f35da8507b9f43da5ef19ae8dec12969 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/components/TrigMuonHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/components/TrigMuonHypo_entries.cxx
@@ -8,9 +8,6 @@
#include "src/TrigMuonEFHypoAlg.h"
#include "src/TrigMuonEFHypoTool.h"
#include "src/TrigMuonEFInvMassHypoTool.h"
-#include "src/TrigL2MuonOverlapRemoverMufastAlg.h"
-#include "src/TrigL2MuonOverlapRemoverMucombAlg.h"
-#include "src/TrigL2MuonOverlapRemoverTool.h"
#include "src/TrigMuonLateMuRoIHypoAlg.h"
#include "src/TrigMuonLateMuRoIHypoTool.h"
@@ -26,8 +23,5 @@ DECLARE_COMPONENT( TrigMuonEFTrackIsolationHypoTool )
DECLARE_COMPONENT( TrigMuonEFHypoAlg )
DECLARE_COMPONENT( TrigMuonEFHypoTool )
DECLARE_COMPONENT( TrigMuonEFInvMassHypoTool )
-DECLARE_COMPONENT( TrigL2MuonOverlapRemoverMufastAlg )
-DECLARE_COMPONENT( TrigL2MuonOverlapRemoverMucombAlg )
-DECLARE_COMPONENT( TrigL2MuonOverlapRemoverTool )
DECLARE_COMPONENT( TrigMuonLateMuRoIHypoAlg )
DECLARE_COMPONENT( TrigMuonLateMuRoIHypoTool )
diff --git a/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx
index 066a02dccff666cfd6f17633068238ad14da9b74..a488662a22abf7c778ad16641c951fd7030d14b7 100644
--- a/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigStreamerHypo/src/TrigStreamerHypoAlgMT.cxx
@@ -3,7 +3,7 @@
*/
#include "TrigStreamerHypoAlgMT.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigTauHypo/CMakeLists.txt
index 98744112fb095822121e78da8657ba0e7f25a07a..1f70c5acf6882e11d272a4c471eaa41dbf398038 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigTauHypo/CMakeLists.txt
@@ -4,7 +4,7 @@
atlas_subdir( TrigTauHypo )
# External dependencies:
-find_package( ROOT COMPONENTS Core TMathCore Hist )
+find_package( ROOT COMPONENTS Core MathCore Hist )
# Component(s) in the package:
atlas_add_component( TrigTauHypo
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx
index c760b82a96e7386d56822ffe62880e7d0e8eed07..864a7f045d081228767c4fe94e6cd6cab9642d97 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigEFTauMVHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigEFTauMVHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
index 78428c69df0c4887b5d9844bad469832855df148..edfff434ebfc98d28e7a7c36ce365abe3ab81968 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigTauCaloHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
index fa7ae61a432a7cb7154e899397fb7fa3481ab00a..942c5dd33cfc460f7ecf784e58c5c5e3d5ce9efb 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
@@ -24,7 +24,7 @@
//#include "TrigInterfaces/HypoAlgo.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTau/TauJet.h"
#include "xAODTau/TauJetContainer.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
index 69a6f1419e22991d42375fcec51fb711bed5467a..93e4ed74e7735eba2e580b51f3ed938be26787d4 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoAlgMT.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigTrackPreSelHypoAlgMT.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
index edceb95e28006bf228a68f49e0d9face661a9185..a821cf101fab4b19a953320edace2b447c7066fb 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
@@ -5,7 +5,7 @@
#ifndef TrigTrackPreSelHypoTool_H
#define TrigTrackPreSelHypoTool_H
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "xAODTau/TauJet.h"
#include "xAODTau/TauJetContainer.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/DumpAll.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/DumpAll.cxx
index a6b8e6a31baa509b137178eeef6007371ef923dd..201fcfb83e46eefefd18221c93dcd683a8fcfa64 100644
--- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/DumpAll.cxx
+++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/DumpAll.cxx
@@ -3,7 +3,7 @@
*/
-/**
+/**
* NAME : DumpAll.cxx
* PACKAGE : Trigger/L1CaloUpgrade/DumpAll
*
@@ -38,7 +38,7 @@ DumpAll::DumpAll( const std::string& name, ISvcLocator* pSvcLocator ) : AthAlgor
DumpAll::~DumpAll(){}
StatusCode DumpAll::initialize(){
-
+
MsgStream msg(msgSvc(), name());
msg << MSG::DEBUG << "initializing DumpAll" << endmsg;
m_counter = 0;
@@ -127,7 +127,7 @@ StatusCode DumpAll::finalize(){
}
StatusCode DumpAll::execute(){
-
+
MsgStream msg(msgSvc(), name());
msg << MSG::DEBUG << "execute DumpAll" << endmsg;
std::cout << "DumpAll" << std::endl;
@@ -313,15 +313,15 @@ StatusCode DumpAll::execute(){
m_offel_f1.push_back(el->auxdata<float>("f1") );
m_offel_f3.push_back(el->auxdata<float>("f3") );
m_offel_had.push_back( 0.0 ); // not yet there
- m_offel_istight.push_back( (el->passSelection( xAOD::EgammaParameters::LHTight ) ? 1 : 0 ) );
- m_offel_ismedium.push_back( (el->passSelection( xAOD::EgammaParameters::LHMedium ) ? 1 : 0 ) );
- m_offel_isloose.push_back( (el->passSelection( xAOD::EgammaParameters::LHLoose ) ? 1 : 0 ) );
+ m_offel_istight.push_back( (el->passSelection( "LHTight" ) ? 1 : 0 ) );
+ m_offel_ismedium.push_back( (el->passSelection( "LHMedium" ) ? 1 : 0 ) );
+ m_offel_isloose.push_back( (el->passSelection( "LHLoose" ) ? 1 : 0 ) );
} // end of electron
m_offelectron->Fill();
m_counter++;
-
+
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/EFexAnalysis.cxx b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/EFexAnalysis.cxx
index a7475956760a94f6de5808a3ba2c000009b5a998..f2b1b146c364f039f510e350692148531c0ef69c 100644
--- a/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/EFexAnalysis.cxx
+++ b/Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/src/EFexAnalysis.cxx
@@ -3,7 +3,7 @@
*/
-/**
+/**
* NAME : EFexAnalysis.cxx
* PACKAGE : Trigger/TrigL1Upgrade/TrigL1CaloUpgrade/EFexAnalysis
*
@@ -35,7 +35,7 @@ EFexAnalysis::EFexAnalysis( const std::string& name, ISvcLocator* pSvcLocator )
EFexAnalysis::~EFexAnalysis(){}
StatusCode EFexAnalysis::initialize(){
-
+
MsgStream msg(msgSvc(), name());
msg << MSG::DEBUG << "initializing TrigT1CaloEFex" << endmsg;
if ( m_enableMon ){
@@ -122,7 +122,7 @@ StatusCode EFexAnalysis::finalize(){
}
StatusCode EFexAnalysis::execute(){
-
+
MsgStream msg(msgSvc(), name());
msg << MSG::DEBUG << "execute TrigT1CaloEFex" << endmsg;
const xAOD::TrigEMClusterContainer* scluster(nullptr);
@@ -176,7 +176,7 @@ StatusCode EFexAnalysis::execute(){
m_f3->Fill( (cl->energy( CaloSampling::EMB3 ) + cl->energy( CaloSampling::EME3 ) ) / cl->energy() );
}
}
-
+
}
if ( m_doTruth ) {
const xAOD::TruthParticleContainer* truth;
@@ -208,7 +208,7 @@ StatusCode EFexAnalysis::execute(){
if ( std::abs( tt->eta() )<2.5 ) m_eff_truth_ptA_n->Fill( tt->pt()/1e3 );
m_eff_truth_eta_n->Fill( tt->eta() );
}
-
+
}
} // end of if m_doTruth
@@ -222,7 +222,7 @@ StatusCode EFexAnalysis::execute(){
for( auto el : *electrons ){
if ( el->pt() < 1e3 ) continue;
//if ( !el->passSelection( xAOD::EgammaParameters::LHMedium ) ) continue;
- if ( !el->passSelection( xAOD::EgammaParameters::LHLoose ) ) continue;
+ if ( !el->passSelection( "LHLoose" ) ) continue;
m_eff_off_pt_d->Fill( el->pt()/1e3 );
if ( el->pt() > 16000 ) m_eff_off_eta_d->Fill( el->eta() );
for( auto cl : *scluster ){
@@ -235,7 +235,7 @@ StatusCode EFexAnalysis::execute(){
m_res_off->Fill( resolution );
m_res_off_eta->Fill( el->eta(), resolution );
m_res_off_pt->Fill( el->pt()/1e3, resolution );
-
+
if ( (el->caloCluster()->et() > 9e3) && (std::abs(el->eta())<2.47) )
m_res_off_nvtx->Fill( nvtxs, resolution );
@@ -262,7 +262,7 @@ StatusCode EFexAnalysis::execute(){
if ( cl->e277() > 0.0 )
{ SE_reta = cl->e237()/cl->e277(); }
float resol_reta = -100.0;
- if ( off_reta > 0 ) resol_reta =
+ if ( off_reta > 0 ) resol_reta =
100.0*(off_reta-SE_reta)/off_reta;
m_res_rEta_off->Fill( resol_reta );
m_res_rEta_off_eta->Fill( el->eta(), resol_reta );
@@ -275,7 +275,7 @@ StatusCode EFexAnalysis::execute(){
if ( cl->energy() > 0.0 )
{ SE_f1 = (cl->energy(CaloSampling::EMB1)+cl->energy(CaloSampling::EME1))/cl->energy(); }
float resol_f1 = -100.0;
- if ( fabsf(off_f1) > 0.01 ) resol_f1 =
+ if ( fabsf(off_f1) > 0.01 ) resol_f1 =
100.0*(off_f1-SE_f1)/off_f1;
m_res_f1_off->Fill( resol_f1 );
m_res_f1_off_eta->Fill( el->eta(), resol_f1 );
@@ -289,7 +289,7 @@ StatusCode EFexAnalysis::execute(){
if ( cl->energy() > 0.0 )
{ SE_f3 = (cl->energy(CaloSampling::EMB3)+cl->energy(CaloSampling::EME3))/cl->energy(); }
float resol_f3 = -100.0;
- if ( fabsf(off_f3) > 0.001 ) resol_f3 =
+ if ( fabsf(off_f3) > 0.001 ) resol_f3 =
100.0*(off_f3-SE_f3)/off_f3;
m_res_f3_off->Fill( resol_f3 );
m_res_f3_off_eta->Fill( el->eta(), resol_f3 );
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitorAlgorithm.py
index 9f46002882518f1323a101ff4d0ab00b98e1fe44..5d11dd97c96976e9f9066eb6e26659c6b198f689 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitorAlgorithm.py
@@ -115,7 +115,6 @@ def TrigBjetMonConfig(inputFlags):
# mu-jet histograms
- doRun2 = False
AllChains = []
for chain in bjet_triglist :
AllChains.append(chain[2:])
@@ -304,20 +303,90 @@ def TrigBjetMonConfig(inputFlags):
# b-tagging quantities
- HistName = 'wMV2c20_' + chain[2:]
+ HistName = 'IP3D_pu_tr_' + chain[2:]
if chain[0:1] == "E" :
- BjetMonGroup.defineHistogram(HistName, title='Distribution of MV2c20 discriminant;MV2c20;Events',
+ BjetMonGroup.defineHistogram(HistName, title='IP3D_pu probability distribution;IP3D_pu;Events',
+ path='Expert/'+chain[2:],xbins=200,xmin=0.0,xmax=1.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='IP3D_pu probability distribution;IP3D_pu;Events',
+ path='Shifter/'+chain[2:],xbins=200,xmin=0.0,xmax=1.0)
+
+ HistName = 'IP3D_pb_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='IP3D_pb probability distribution;IP3D_pb;Events',
+ path='Expert/'+chain[2:],xbins=200,xmin=0.0,xmax=1.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='IP3D_pb probability distribution;IP3D_pb;Events',
+ path='Shifter/'+chain[2:],xbins=200,xmin=0.0,xmax=1.0)
+
+ HistName = 'IP3D_pc_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='IP3D_pc probability distribution;IP3D_pc;Events',
+ path='Expert/'+chain[2:],xbins=200,xmin=0.0,xmax=1.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='IP3D_pc probability distribution;IP3D_pc;Events',
+ path='Shifter/'+chain[2:],xbins=200,xmin=0.0,xmax=1.0)
+
+ HistName = 'wIP3D_Rbu_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='LogLH IP3D_pb/IP3D_pu probability ratio distribution;LogLH IP3D_pb/IP3D_pu;Events',
+ path='Expert/'+chain[2:],xbins=200,xmin=-4.0,xmax=6.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='LogLH IP3D_pb/IP3D_pu probability ratio distribution;LogLH IP3D_pb/IP3D_pu;Events',
+ path='Shifter/'+chain[2:],xbins=200,xmin=-4.0,xmax=6.0)
+
+ HistName = 'wSV1_Rbu_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='LogLH SV1_pb/SV1_pu probability ratio distribution;LogLH SV1_pb/SV1_pu;Events',
+ path='Expert/'+chain[2:],xbins=200,xmin=-4.0,xmax=6.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='LogLH SV1_pb/SV1_pu probability ratio distribution;LogLH SV1_pb/SV1_pu;Events',
+ path='Shifter/'+chain[2:],xbins=200,xmin=-4.0,xmax=6.0)
+
+ HistName = 'wCOMB_Rbu_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='LogLH IP3D+SV1 probability ratio distribution;LogLH IP3D+SV1 probability ratio;Events',
+ path='Expert/'+chain[2:],xbins=200,xmin=-4.0,xmax=6.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='LogLH IP3D+SV1 probability ratio distribution;LogLH IP3D+SV1 probability ratio;Events',
+ path='Shifter/'+chain[2:],xbins=200,xmin=-4.0,xmax=6.0)
+
+ HistName = 'wMV2c10_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='Distribution of MV2c10 discriminant;MV2c10;Events',
path='Expert/'+chain[2:],xbins=200,xmin=-1.0,xmax=1.0)
- # print " ==> histogram ",HistName," is defined for Expert folder"
if chain[0:1] == "S" :
- BjetMonGroup.defineHistogram(HistName, title='Distribution of MV2c20 discriminant;MV2c20;Events',
+ BjetMonGroup.defineHistogram(HistName, title='Distribution of MV2c10 discriminant;MV2c10;Events',
path='Shifter/'+chain[2:],xbins=200,xmin=-1.0,xmax=1.0)
+
+ HistName = 'xMVtx_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='SV1 mass distribution;SV1 mass;Events',
+ path='Expert/'+chain[2:],xbins=50,xmin=0.0,xmax=10.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='SV1 mass distribution;SV1 mass;Events',
+ path='Shifter/'+chain[2:],xbins=50,xmin=0.0,xmax=10.0)
+
+ HistName = 'xEVtx_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='SV1 E-fraction distribution;SV1 E-fraction;Events',
+ path='Expert/'+chain[2:],xbins=50,xmin=0.0,xmax=1.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='SV1 E-fraction distribution;SV1 E-fraction;Events',
+ path='Shifter/'+chain[2:],xbins=50,xmin=0.0,xmax=1.0)
+
+ HistName = 'xNVtx_tr_' + chain[2:]
+ if chain[0:1] == "E" :
+ BjetMonGroup.defineHistogram(HistName, title='Distribution of number of 2-track SV1;Number of 2-track SV1;Events',
+ path='Expert/'+chain[2:],xbins=40,xmin=0.0,xmax=40.0)
+ if chain[0:1] == "S" :
+ BjetMonGroup.defineHistogram(HistName, title='Distribution of number of 2-track SV1;Number of 2-track SV1;Events',
+ path='Shifter/'+chain[2:],xbins=40,xmin=0.0,xmax=40.0)
continue
# print " ==> In TrigBjetMonitorAlgorithm.py: AllChains list: ", AllChains
trigBjetMonAlg.AllChains = AllChains
- trigBjetMonAlg.doRun2 = doRun2
### STEP 6 ###
@@ -355,21 +424,9 @@ if __name__=='__main__':
#ConfigFlags.Input.Files = [nightly+file]
#ConfigFlags.Input.isMC = False
- # MC file found by me but can be used only w/ asetup Athena,r2019-06-28,master
- #nightly = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/'
- #file = 'mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1'
- #ConfigFlags.Input.Files = [nightly+file]
- #ConfigFlags.Input.isMC = True
-
- # MC input files proposed by Tim Martin in https://its.cern.ch/jira/browse/ATR-19881 for Run-3
- # file = '/afs/cern.ch/work/e/enagy/public/GenerateAOD/AOD.pool.root'
- # file to be run w/ doRun2 = False
- # file = '/afs/cern.ch/user/e/ebergeas/work/public/triggermonitoring/nightly_2019-10-20T2130/AOD.pool.root'
- # file = '/afs/cern.ch/work/e/enagy/public/GenerateAOD/Gen_MT_240919/AOD.pool.root'
- file = '/afs/cern.ch/work/e/enagy/public/ARTfiles/MCtest010720.AOD.pool.root'
- # file to be run w/ doRun2 = True
- # file = '/afs/cern.ch/work/e/enagy/public/GenerateAOD/Gen_ST_240919/AOD.pool.root'
- # file = '/eos/atlas/atlascerngroupdisk/data-art/build-output/master/Athena/x86_64-centos7-gcc8-opt/2019-09-16T2129/TrigAnalysisTest/test_trigAna_q221_RDOtoAOD_mt1_build/AOD.pool.root'
+ # AOD file to be run w/ MT access
+ file = '/afs/cern.ch/work/e/enagy/public/ARTfiles/MCtest310720.AOD.pool.root'
+
ConfigFlags.Input.Files = [file]
ConfigFlags.Input.isMC = True
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
index 06de7c3a82a2f0c1dc8e981c309c989a85400392..3c2694a6e89569cf106305f2e0b3fc7524a0e6cc 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
@@ -128,6 +128,7 @@ StatusCode HLTBjetMonTool::init() {
ATH_CHECK( m_offlineVertexContainerKey.initialize() );
ATH_CHECK( m_onlineVertexContainerKey.initialize() );
ATH_CHECK( m_onlineTrackContainerKey.initialize() );
+ ATH_CHECK( m_onlineBTaggingContainerKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -1083,6 +1084,8 @@ StatusCode HLTBjetMonTool::book(){
if(HistJet) hist2("jetEtaPhi"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(jet->eta(),jet->phi());
// zPV associated to the jets in the same event: they are the same for every jet in the same event so only the first zPV should be plotted
if (ijet == 0) {
+
+ // Fetch and plot PV
std::string vtxname = m_onlineVertexContainerKey.key();
if ( vtxname.find("HLT_")==0 ) vtxname.erase(0,4);
auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, vtxname ); // CV 200120 & MS 290620
@@ -1090,7 +1093,70 @@ StatusCode HLTBjetMonTool::book(){
const xAOD::Vertex* vtx = *(vertexLinkInfo.link);
ATH_MSG_DEBUG(" PVz_jet from jet link info: " << vtx->z());
// if(HistPV) hist("PVz_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(vtx->z());
- }
+
+ // Fetch and plot BTagging information
+
+ std::string btagname = m_onlineBTaggingContainerKey.key();
+ if ( btagname.find("HLT_")==0 ) btagname.erase(0,4);
+ auto btaggingLinkInfo = TrigCompositeUtils::findLink<xAOD::BTaggingContainer>(jetLinkInfo.source, btagname );
+ ATH_CHECK( btaggingLinkInfo.isValid() ) ;
+ const xAOD::BTagging* btag = *(btaggingLinkInfo.link);
+
+ double wIP3D, wSV1, wCOMB, wMV2c10 = 0.; // discriminant variables
+ float svp_efrc, svp_mass = -1.; int svp_n2t = -1; // SV1 variables
+ btag->loglikelihoodratio("IP3D", wIP3D);
+ btag->loglikelihoodratio("SV1", wSV1);
+ double SV1_loglikelihoodratioLZ = btag->SV1_loglikelihoodratio();
+ wCOMB = wIP3D+wSV1;
+
+ wMV2c10 = btag->auxdata<double>("MV2c10_discriminant");
+
+ // Suggestion of LZ
+ btag->variable<float>("SV1", "masssvx", svp_mass);
+ btag->variable<float>("SV1", "efracsvx", svp_efrc);
+ btag->variable<int>("SV1", "N2Tpair", svp_n2t);
+ ATH_MSG_DEBUG(" - Before SV1 check - MVTX / EVTX / NVTX: " << svp_mass << " / " << svp_efrc << " / " << svp_n2t ) ;
+ if (HistBjet) hist("xNVtx_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(svp_n2t);
+ if ( svp_n2t > 0 ) {
+ if (HistBjet) hist("xMVtx_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill( svp_mass * 1.e-3 );
+ if (HistBjet) hist("xEVtx_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill( svp_efrc );
+ } // if svp_n2t
+ // end of suggestion of LZ
+ ATH_MSG_DEBUG(" - IP3Dpu / IP3Dpb / IP3Dpc: " << btag->IP3D_pu() << " / " << btag->IP3D_pb() << " / " << btag->IP3D_pc() );
+ if (HistBjet) hist("IP3D_pu_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(btag->IP3D_pu());
+ if (HistBjet) hist("IP3D_pb_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(btag->IP3D_pb());
+ if (HistBjet) hist("IP3D_pc_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(btag->IP3D_pc());
+ ATH_MSG_DEBUG(" - IP3D / SV1 / IP3D+SV1: " << wIP3D << " / " << wSV1 << " / " << wCOMB );
+ ATH_MSG_DEBUG(" - SV1 LZ: " << SV1_loglikelihoodratioLZ );
+ ATH_MSG_DEBUG(" - MV2c10 : " << wMV2c10 );
+ if (HistBjet) hist("wIP3D_Rbu_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(wIP3D);
+ if (HistBjet) hist("wSV1_Rbu_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(wSV1);
+ if (HistBjet) hist("wCOMB_Rbu_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(wCOMB);
+ if (HistBjet) hist("wMV2c10_tr"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(wMV2c10);
+
+ // Get SV1 secondary vtx information, see:
+ // /PhysicsAnalysis/JetTagging/JetTagTools/src/MV2Tag.cxx#0486 and
+ // /PhysicsAnalysis/JetTagging/JetTagTools/src/GaiaNNTool.cxx#0349
+ std::vector< ElementLink< xAOD::VertexContainer > > myVertices;
+ ATH_MSG_DEBUG(" SV1 info source name before calling VertexContainer: " << m_sv1_infosource ) ;
+ btag->variable<std::vector<ElementLink<xAOD::VertexContainer> > >(m_sv1_infosource, "vertices", myVertices);
+ ATH_MSG_DEBUG(" SV1 info source name after calling VertexContainer: " << m_sv1_infosource ) ;
+ if ( myVertices.size() > 0 && myVertices[0].isValid() ) {
+ ATH_MSG_DEBUG(" SV1 vertex size: " << myVertices.size() << " is it valid? " << myVertices[0].isValid() ) ;
+ btag->variable<float>(m_sv1_infosource, "masssvx", svp_mass);
+ btag->variable<float>(m_sv1_infosource, "efracsvx", svp_efrc);
+ btag->variable<int>(m_sv1_infosource, "N2Tpair", svp_n2t);
+ ATH_MSG_DEBUG(" - MVTX / EVTX / NVTX: " << svp_mass << " / " << svp_efrc << " / " << svp_n2t ) ;
+ if ( svp_n2t > 0 ) {
+ } // if svp_n2t
+ } else {
+ ATH_MSG_DEBUG(" No valid SV1 vertex found -- SV1 vertex size: " << myVertices.size() );
+ if ( myVertices.size() > 0 ) ATH_MSG_DEBUG(" No valid SV1 vertex found -- myVertices[0].isValid(): " << myVertices[0].isValid() ) ;
+ } // if vertex valid
+
+
+ } // if (ijet == 0)
+
ijet++;
// Tracks associated to triggered jets ( featurs = onlinejets ) courtesy of Tim Martin on 12/05/2020
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h
index 532affe7b5dd9a1191c442f792758e5d660aa0d7..293af2637fb08d70bde621680504169698ba0dfe 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h
@@ -72,6 +72,7 @@ class HLTBjetMonTool : public IHLTMonTool {
SG::ReadHandleKey<xAOD::VertexContainer> m_offlineVertexContainerKey {this,"OfflineVertexContainerName","PrimaryVertices","Key of offline primary vertexes"};
SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_IDVertex_FS","Key of online bjet primary vertexes"}; // MS 290620
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_onlineTrackContainerKey {this,"OnlineTrackContainerName","HLT_IDTrack_Bjet_IDTrig","Key of online tracks of bjets"};
+ SG::ReadHandleKey<xAOD::BTaggingContainer> m_onlineBTaggingContainerKey {this,"OnlineBTaggingContainerName","HLT_BTagging","Key of online b-tagging object"};
ToolHandle<Trig::TrigDecisionTool> m_trigDec; //!
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
index aed70bc5133586888ca19f45bc6b10d93241949f..2a27dfe26bfaa7a716d6d90f7e64c3cded450150 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
@@ -4,12 +4,19 @@
#include "TrigBjetMonitorAlgorithm.h"
+#include "AthenaMonitoring/AthenaMonManager.h"
+#include "AthenaMonitoring/ManagedMonitorToolTest.h"
+#include "AthenaMonitoring/ManagedMonitorToolBase.h" //EN
+
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/VertexContainer.h"
+
#include "xAODBTagging/BTaggingAuxContainer.h"
#include "xAODBTagging/BTaggingContainer.h"
#include "xAODBTagging/BTagging.h"
+#include "EventPrimitives/EventPrimitivesHelpers.h"
+
#include "Particle/TrackParticleContainer.h"
#include "GeoPrimitives/GeoPrimitives.h"
@@ -31,11 +38,9 @@ TrigBjetMonitorAlgorithm::TrigBjetMonitorAlgorithm( const std::string& name, ISv
,m_allChains{}
,m_muonContainerKey("Muons")
,m_trigDec("Trig::TrigDecisionTool/TrigDecisionTool")
- ,m_doRun2(false)
{
declareProperty ("AllChains", m_allChains);
declareProperty("MuonContainerName",m_muonContainerKey);
- declareProperty("doRun2",m_doRun2);
}
@@ -48,6 +53,7 @@ StatusCode TrigBjetMonitorAlgorithm::initialize() {
ATH_CHECK( m_offlineVertexContainerKey.initialize() );
ATH_CHECK( m_onlineVertexContainerKey.initialize() );
ATH_CHECK( m_onlineTrackContainerKey.initialize() );
+ ATH_CHECK( m_onlineBTaggingContainerKey.initialize() );
return AthMonitorAlgorithm::initialize();
}
@@ -83,395 +89,300 @@ StatusCode TrigBjetMonitorAlgorithm::fillHistograms( const EventContext& ctx ) c
// print the trigger chain names
std::string chainName;
-
+
int size_AllChains = m_allChains.size();
ATH_MSG_DEBUG(" Size of the AllChains trigger container: " << size_AllChains );
for (int i =0; i<size_AllChains; i++){
chainName = m_allChains.at(i);
ATH_MSG_DEBUG(" Chain number: " << i << " AllChains Chain Name: " << chainName );
}
-
// Verifiy if the trigger chain was fired and if yes, fill the corresponding histogram
-
- // Define keys of retrival
-
- std::string trackKey = "";
- std::string jetKey = "";
- std::string priVtxKey = "EFHistoPrmVtx";
- bool FTKChain = false;
+
bool mujetChain = false;
bool bjetChain = true;
- bool splitChain = false;
-
+
for ( auto& trigName : m_allChains ) {
- // Access to TrigFeature
- // bool Run2_Access = true;
- // bool Run2_Access = false;
-
-
if ( m_trigDecTool->isPassed(trigName) ) {
ATH_MSG_DEBUG(" Trigger chain from AllChains list: " << trigName << " has fired !!! " );
-
- // Trigger type
-
- // split vs unsplit
- std::size_t found = trigName.find("split");
- if (found!=std::string::npos) {
- splitChain = true;
- jetKey = "SplitJet";
- priVtxKey = "xPrimVx";
- trackKey = "InDetTrigTrackingxAODCnv_Bjet_IDTrig";
- }// found
-
- // FTK vs non FTK
- std::size_t found1 = trigName.find("FTK");
- if (found1!=std::string::npos) {
- priVtxKey = "PrimVertexFTK";
- trackKey = "InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig";
- std::size_t found2 = trigName.find("FTKRefit");
- if (found2!=std::string::npos) {
- trackKey = "InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig";
- }// found2
- std::size_t found3 = trigName.find("FTKVtx");
- if (found3!=std::string::npos) {
- trackKey = "InDetTrigTrackingxAODCnv_Bjet_IDTrig";
- }// found3
- }// found1
-
- // gsc vs non-gsc chain
- std::size_t found4 = trigName.find("gsc");
- if (found4!=std::string::npos) {
- jetKey = "GSCJet";
- }// found4
-
// bjet vs mujet
- found = trigName.find("HLT_mu");
+ std::size_t found = trigName.find("HLT_mu");
if (found!=std::string::npos) {
mujetChain = true;
bjetChain = false;
}// found
+
+
+ ATH_MSG_DEBUG(" ===> Run 3 access to Trigger Item: " << trigName);
+
+ // online track container
+ SG::ReadHandle<xAOD::TrackParticleContainer> theTracks(m_onlineTrackContainerKey, ctx);
+ // verify the content
+ for ( const xAOD::TrackParticle* track : *theTracks ) {
+ ATH_MSG_DEBUG( " Pt of track in TrackParticleContainer: " << track->pt() );
+ }
+
+ // bjet chains
+ if (bjetChain) {
+ // online PV
+ SG::ReadHandle<xAOD::VertexContainer> vtxContainer = SG::makeHandle( m_onlineVertexContainerKey, ctx );
+ int nPV = 0;
+ for (const xAOD::Vertex* vtx : *vtxContainer) {
+ if (vtx->vertexType() == xAOD::VxType::PriVtx) {
+ nPV++;
+ std::string NameH = "PVz_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto PVz_tr = Monitored::Scalar<float>(NameH,0.0);
+ PVz_tr = vtx->z();
+ ATH_MSG_DEBUG(" PVz_tr: " << PVz_tr);
+ fill("TrigBjetMonitor",PVz_tr);
+ NameH = "PVx_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto PVx_tr = Monitored::Scalar<float>(NameH,0.0);
+ PVx_tr = vtx->x();
+ ATH_MSG_DEBUG(" PVx_tr: " << PVx_tr);
+ fill("TrigBjetMonitor",PVx_tr);
+ NameH = "PVy_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto PVy_tr = Monitored::Scalar<float>(NameH,0.0);
+ PVy_tr = vtx->y();
+ ATH_MSG_DEBUG(" PVy_tr: " << PVy_tr);
+ fill("TrigBjetMonitor",PVy_tr);
+ } // if vtx type
+ } // loop on vtxContainer
+ std::string NpvH = "nPV_tr_"+trigName;
+ ATH_MSG_DEBUG( " NpvH: " << NpvH );
+ auto nPV_tr = Monitored::Scalar<int>(NpvH,0.0);
+ nPV_tr = nPV;
+ fill("TrigBjetMonitor",nPV_tr);
+ } // if bjetChain
+
+ //bjet or mujet chains
+ if (bjetChain || mujetChain) {
+
+ // Jets and PV and tracks through jet link
- ATH_MSG_DEBUG( " Trigger type: bjetChain " << bjetChain << " mujetChain " << mujetChain << " FTKChain " << FTKChain << " splitChain " << splitChain );
- ATH_MSG_DEBUG( " Keys -- priVtxKey: " << priVtxKey << " jetKey: " << jetKey << " trackKey: " << trackKey );
-
- // Read the TrigFeature contener
-
- if (m_doRun2) { // Run 2 trigger
-
- ATH_MSG_DEBUG(" ===> Run 2 access to Trigger feature: " );
- Trig::FeatureContainer fc = m_trigDec->features(trigName);
- const std::vector< Trig::Combination >& triggerCombs = fc.getCombinations();
- ATH_MSG_DEBUG("RETRIEVED " << triggerCombs.size() << " COMBINATIONS FOR " << trigName);
- ATH_MSG_DEBUG( " Size of triggerCombs : " << triggerCombs.size() );
- // Take all combinations for this b-jet trigger
- std::vector< Trig::Combination >::const_iterator triggerComb;
- for( triggerComb = triggerCombs.begin(); triggerComb != triggerCombs.end(); ++triggerComb ) {
- const Trig::Combination& comb = *triggerComb;
-
- // bjet chains
- if (bjetChain) {
-
- // online PV
- const std::vector< Trig::Feature<xAOD::VertexContainer> > onlinepvs = comb.get<xAOD::VertexContainer>(priVtxKey);
- ATH_MSG_DEBUG("RETRIEVED PV - size: " << onlinepvs.size());
- if ( not onlinepvs.empty() ) {
- const xAOD::VertexContainer* onlinepv = onlinepvs[0].cptr();
- ATH_MSG_DEBUG(" for VertexContainer: " << priVtxKey << " nVert: " << onlinepv->size());
- if( not onlinepv->empty()) {
- // PVz_tr
- std::string NameH = "PVz_tr_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto PVz_tr = Monitored::Scalar<float>(NameH,0.0);
- PVz_tr = (*(onlinepv))[0]->z();
- ATH_MSG_DEBUG(" PVz_tr: " << PVz_tr);
- fill("TrigBjetMonitor",PVz_tr);
- }// onlinepv
- }// onlinepvs
-
- // Tracks
- const std::vector< Trig::Feature<xAOD::TrackParticleContainer> > onlinetracks = comb.get<xAOD::TrackParticleContainer>(trackKey);
- ATH_MSG_DEBUG("RETRIEVED TRACKS - size: " << onlinetracks.size());
- if ( not onlinetracks.empty() ) {
- const xAOD::TrackParticleContainer* onlinetrack = onlinetracks[0].cptr();
- ATH_MSG_DEBUG(" - nTrack: " << onlinetrack->size());
- for(const auto* trk : *onlinetrack) {
- // d0
- std::string NameH = "d0_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto d0 = Monitored::Scalar<float>(NameH,0.0);
- d0 = trk->d0();
- ATH_MSG_DEBUG(" d0: " << d0);
- fill("TrigBjetMonitor",d0);
- }// onlinetrack
- }// onlinetracks
+ std::vector< TrigCompositeUtils::LinkInfo<xAOD::JetContainer> > onlinejets = m_trigDec->features<xAOD::JetContainer>(trigName, TrigDefs::Physics, m_onlineBjetContainerKey);
+
+ int ijet = 0;
+ int itrack = 0;
+ std::string nJetH = "nJet_"+trigName;
+ auto nJet = Monitored::Scalar<int>(nJetH,0.0);
+ nJet = onlinejets.size();
+ fill("TrigBjetMonitor",nJet);
+ for(const auto& jetLinkInfo : onlinejets) {
+ // jetPt
+ const xAOD::Jet* jet = *(jetLinkInfo.link);
+ std::string NameH = "jetPt_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto jetPt = Monitored::Scalar<float>(NameH,0.0);
+ jetPt = (jet->pt())*1.e-3;
+ ATH_MSG_DEBUG(" jetPt: " << jetPt);
+ fill("TrigBjetMonitor",jetPt);
+ NameH = "jetEta_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto jetEta = Monitored::Scalar<float>(NameH,0.0);
+ jetEta = jet->eta();
+ NameH = "jetPhi_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto jetPhi = Monitored::Scalar<float>(NameH,0.0);
+ jetPhi = jet->phi();
+ ATH_MSG_DEBUG(" jetEta: " << jetEta << " jetPhi : " << jetPhi);
+ fill("TrigBjetMonitor",jetEta,jetPhi);
+ // zPV associated to the jets in the same event: they are the same for every jet in the same event so only the first zPV should be plotted
+ if (ijet == 0) {
- // b-tagged jets
- const std::vector< Trig::Feature<xAOD::BTaggingContainer> > onlinebjets = comb.get<xAOD::BTaggingContainer>();
- ATH_MSG_DEBUG("RETRIEVED BJETS from xAOD BTaggingContainer - size: " << onlinebjets.size());
- if(not onlinebjets.empty()) {
- const xAOD::BTaggingContainer* onlinebjet = onlinebjets[0].cptr();
- ATH_MSG_DEBUG(" - nBjet: " << onlinebjet->size());
- for(const auto* bjet : *onlinebjet) {
- // wMV2c20
- std::string NameH = "wMV2c20_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto wMV2c20 = Monitored::Scalar<double>(NameH,0.0);
- wMV2c20 = bjet->auxdata<double>("MV2c20_discriminant");
- ATH_MSG_DEBUG(" wMV2c20: " << wMV2c20);
- fill("TrigBjetMonitor",wMV2c20);
- }// onlinebjet
- }// onlinebjets
-
- }//bjetChain
-
- //bjet or mujet chains
- if (bjetChain || mujetChain) {
-
- // Jets
- const std::vector< Trig::Feature<xAOD::JetContainer> > onlinejets = comb.get<xAOD::JetContainer>(jetKey);
- ATH_MSG_DEBUG("RETRIEVED JETS - size: " << onlinejets.size());
- if( not onlinejets.empty()) {
- const xAOD::JetContainer* onlinejet = onlinejets[0].cptr();
- ATH_MSG_DEBUG(" - nJet: " << onlinejet->size());
- for(const auto* jet : *onlinejet) {
- // jetPt
- std::string NameH = "jetPt_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto jetPt = Monitored::Scalar<float>(NameH,0.0);
- jetPt = (jet->pt())*1.e-3;
- ATH_MSG_DEBUG(" jetPt: " << jetPt);
- fill("TrigBjetMonitor",jetPt);
- }// onlinejet
- }// onlinejets
+ // Fetch and plot PV
+
+ std::string vtxname = m_onlineVertexContainerKey.key();
+ if ( vtxname.find("HLT_")==0 ) vtxname.erase(0,4);
+ auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, vtxname ); // CV 200120 & MS 290620
+ ATH_CHECK( vertexLinkInfo.isValid() ) ; // TM 200120
+ const xAOD::Vertex* vtx = *(vertexLinkInfo.link);
+ NameH = "PVz_jet_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto PVz_jet = Monitored::Scalar<float>(NameH,0.0);
+ PVz_jet = vtx->z();
+ ATH_MSG_DEBUG(" PVz_jet: " << PVz_jet);
+ fill("TrigBjetMonitor",PVz_jet);
+ NameH = "PVx_jet_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto PVx_jet = Monitored::Scalar<float>(NameH,0.0);
+ PVx_jet = vtx->x();
+ ATH_MSG_DEBUG(" PVx_jet: " << PVx_jet);
+ fill("TrigBjetMonitor",PVx_jet);
+ NameH = "PVy_jet_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto PVy_jet = Monitored::Scalar<float>(NameH,0.0);
+ PVy_jet = vtx->y();
+ ATH_MSG_DEBUG(" PVy_jet: " << PVy_jet);
+ fill("TrigBjetMonitor",PVy_jet);
+
+ // Fetch and plot BTagging information
- }//bjet or mujet
-
- // mujet chains
-
- if (mujetChain) {
-
- // muons and jets
- const std::vector< Trig::Feature<xAOD::JetContainer> > onlinejets = comb.get<xAOD::JetContainer>(jetKey);
- ATH_MSG_DEBUG("RETRIEVED JETS - size: " << onlinejets.size());
- const std::vector< Trig::Feature<xAOD::MuonContainer> > onlinemuons = comb.get<xAOD::MuonContainer>();
- ATH_MSG_DEBUG("RETRIEVED MUONS - size: " << onlinemuons.size());
- if( not onlinemuons.empty()) {
- const xAOD::MuonContainer* onlinemuon = onlinemuons[0].cptr();
- ATH_MSG_DEBUG(" - nMuon: " << onlinemuon->size());
- for(const auto* muon : *onlinemuon) {
- // plot muon attributes: pT, eta, phi, etc .... independently of the muon type
- const xAOD::Muon::MuonType muontype = muon->muonType();
- if( muontype != xAOD::Muon::MuonType::Combined ) continue;
- // if muon type is "Combined" and jet container is not empty loop on jets and plot muon-jet combined quantitites
- // see Run2 code: https://gitlab.cern.ch/atlas/athena/blob/21.3/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
- if( not onlinejets.empty()) {
- const xAOD::JetContainer* onlinejet = onlinejets[0].cptr();
- for(const auto* jet : *onlinejet) {
- // jetPt
- std::string NameH = "jetPt_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto jetPt = Monitored::Scalar<float>(NameH,0.0);
- jetPt = (jet->pt())*1.e-3;
- ATH_MSG_DEBUG(" jetPt: " << jetPt);
- fill("TrigBjetMonitor",jetPt);
- }// onlinejet
- }// onlinejets
- }// onlinemuon
- }// onlinemuons
+ std::string btagname = m_onlineBTaggingContainerKey.key();
+ if ( btagname.find("HLT_")==0 ) btagname.erase(0,4);
+ auto btaggingLinkInfo = TrigCompositeUtils::findLink<xAOD::BTaggingContainer>(jetLinkInfo.source, btagname );
+ ATH_CHECK( btaggingLinkInfo.isValid() ) ;
+ const xAOD::BTagging* btag = *(btaggingLinkInfo.link);
+
+ // IP3D variables
+ NameH = "IP3D_pu_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto IP3D_pu = Monitored::Scalar<float>(NameH,0.0);
+ IP3D_pu = btag->IP3D_pu();
+ ATH_MSG_DEBUG(" IP3D_pu: " << IP3D_pu);
+ fill("TrigBjetMonitor",IP3D_pu);
- }//mujetChain
+ NameH = "IP3D_pb_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto IP3D_pb = Monitored::Scalar<float>(NameH,0.0);
+ IP3D_pb = btag->IP3D_pb();
+ ATH_MSG_DEBUG(" IP3D_pb: " << IP3D_pb);
+ fill("TrigBjetMonitor",IP3D_pb);
+
+ NameH = "IP3D_pc_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto IP3D_pc = Monitored::Scalar<float>(NameH,0.0);
+ IP3D_pc = btag->IP3D_pc();
+ ATH_MSG_DEBUG(" IP3D_pc: " << IP3D_pc);
+ fill("TrigBjetMonitor",IP3D_pc);
+
+ // LogLH variables
+ NameH = "wIP3D_Rbu_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto wIP3D = Monitored::Scalar<double>(NameH,0.0);
+ btag->loglikelihoodratio("IP3D", wIP3D);
+ ATH_MSG_DEBUG(" wIP3D: " << wIP3D);
+ fill("TrigBjetMonitor",wIP3D);
+
+ NameH = "wSV1_Rbu_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto wSV1 = Monitored::Scalar<double>(NameH,0.0);
+ btag->loglikelihoodratio("SV1", wSV1);
+ ATH_MSG_DEBUG(" wSV1: " << wSV1);
+ fill("TrigBjetMonitor",wSV1);
+
+ NameH = "wCOMB_Rbu_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto wCOMB = Monitored::Scalar<double>(NameH,0.0);
+ wCOMB = wIP3D+wSV1;
+ ATH_MSG_DEBUG(" wCOMB: " << wCOMB);
+ fill("TrigBjetMonitor",wCOMB);
+
+ // Discriminants
+ NameH = "wMV2c10_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto wMV2c10 = Monitored::Scalar<double>(NameH,0.0);
+ wMV2c10 = btag->auxdata<double>("MV2c10_discriminant");
+ ATH_MSG_DEBUG(" wMV2c10: " << wMV2c10);
+ fill("TrigBjetMonitor",wMV2c10);
+
+ // SV1 variables (credit LZ)
+ NameH = "xNVtx_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto svp_n2t = Monitored::Scalar<int>(NameH,0.0);
+ btag->variable<int>("SV1", "N2Tpair", svp_n2t);
+ ATH_MSG_DEBUG(" svp_n2t: " << svp_n2t);
+ fill("TrigBjetMonitor",svp_n2t);
+
+ NameH = "xMVtx_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto svp_mass = Monitored::Scalar<float>(NameH,0.0);
+ btag->variable<float>("SV1", "masssvx", svp_mass);
+ svp_mass *= 1.e-3;
+ ATH_MSG_DEBUG(" svp_mass in GeV: " << svp_mass );
+ fill("TrigBjetMonitor",svp_mass);
+
+ NameH = "xEVtx_tr_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto svp_efrc = Monitored::Scalar<float>(NameH,0.0);
+ btag->variable<float>("SV1", "efracsvx", svp_efrc);
+ ATH_MSG_DEBUG(" svp_efrc: " << svp_efrc);
+ fill("TrigBjetMonitor",svp_efrc);
+
+ } // if (ijet == 0)
- }// trigger combinations
-
- } else { // Run 3 trigger
-
- ATH_MSG_DEBUG(" ===> Run 3 access to Trigger Item: " << trigName);
-
- // online track container
- SG::ReadHandle<xAOD::TrackParticleContainer> theTracks(m_onlineTrackContainerKey, ctx);
- // verify the content
- for ( const xAOD::TrackParticle* track : *theTracks ) {
- ATH_MSG_DEBUG( " Pt of track in TrackParticleContainer: " << track->pt() );
- }
-
- // bjet chains
- if (bjetChain) {
- // online PV
- SG::ReadHandle<xAOD::VertexContainer> vtxContainer = SG::makeHandle( m_onlineVertexContainerKey, ctx );
- int nPV = 0;
- for (const xAOD::Vertex* vtx : *vtxContainer) {
- if (vtx->vertexType() == xAOD::VxType::PriVtx) {
- nPV++;
- std::string NameH = "PVz_tr_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto PVz_tr = Monitored::Scalar<float>(NameH,0.0);
- PVz_tr = vtx->z();
- ATH_MSG_DEBUG(" PVz_tr: " << PVz_tr);
- fill("TrigBjetMonitor",PVz_tr);
- NameH = "PVx_tr_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto PVx_tr = Monitored::Scalar<float>(NameH,0.0);
- PVx_tr = vtx->x();
- ATH_MSG_DEBUG(" PVx_tr: " << PVx_tr);
- fill("TrigBjetMonitor",PVx_tr);
- NameH = "PVy_tr_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto PVy_tr = Monitored::Scalar<float>(NameH,0.0);
- PVy_tr = vtx->y();
- ATH_MSG_DEBUG(" PVy_tr: " << PVy_tr);
- fill("TrigBjetMonitor",PVy_tr);
- } // if vtx type
- } // loop on vtxContainer
- std::string NpvH = "nPV_tr_"+trigName;
- ATH_MSG_DEBUG( " NpvH: " << NpvH );
- auto nPV_tr = Monitored::Scalar<int>(NpvH,0.0);
- nPV_tr = nPV;
- fill("TrigBjetMonitor",nPV_tr);
- } // if bjetChain
-
- //bjet or mujet chains
- if (bjetChain || mujetChain) {
-
- // Jets and PV and tracks through jet link
-
- std::vector< TrigCompositeUtils::LinkInfo<xAOD::JetContainer> > onlinejets = m_trigDec->features<xAOD::JetContainer>(trigName, TrigDefs::Physics, m_onlineBjetContainerKey);
-
- int ijet = 0;
- int itrack = 0;
- std::string nJetH = "nJet_"+trigName;
- auto nJet = Monitored::Scalar<int>(nJetH,0.0);
- nJet = onlinejets.size();
- fill("TrigBjetMonitor",nJet);
- for(const auto& jetLinkInfo : onlinejets) {
- // jetPt
- const xAOD::Jet* jet = *(jetLinkInfo.link);
- std::string NameH = "jetPt_"+trigName;
+ ijet++;
+
+ // Tracks associated to triggered jets ( featurs = onlinejets ) courtesy of Tim Martin on 12/05/2020
+ const auto track_it_pair = m_trigDec->associateToEventView(theTracks, jetLinkInfo.source, "roi");
+ const xAOD::TrackParticleContainer::const_iterator start_it = track_it_pair.first;
+ const xAOD::TrackParticleContainer::const_iterator end_it = track_it_pair.second;
+
+ int count = 0;
+ for ( xAOD::TrackParticleContainer::const_iterator it = start_it; it != end_it; ++it) {
+ count++;
+ ATH_MSG_DEBUG( " Track " << count << " with pT " << (*it)->pt() <<" from BJet with pT " << (*jetLinkInfo.link)->pt() );
+ ATH_MSG_DEBUG( " Track " << count << " with pT/eta/phi " << (*it)->pt() << "/" << (*it)->eta() << "/" << (*it)->phi() );
+ ATH_MSG_DEBUG( " Track " << count << " with d0/sigd0 " << (*it)->d0() << "/" << Amg::error((*it)->definingParametersCovMatrix(), 0) );
+ ATH_MSG_DEBUG( " Track " << count << " with z0/sigz0 " << (*it)->z0() << "/" << Amg::error((*it)->definingParametersCovMatrix(), 1) );
+ std::string NameH = "trkPt_"+trigName;
ATH_MSG_DEBUG( " NameH: " << NameH );
- auto jetPt = Monitored::Scalar<float>(NameH,0.0);
- jetPt = (jet->pt())*1.e-3;
- ATH_MSG_DEBUG(" jetPt: " << jetPt);
- fill("TrigBjetMonitor",jetPt);
- NameH = "jetEta_"+trigName;
+ auto trkPt = Monitored::Scalar<float>(NameH,0.0);
+ trkPt = ((*it)->pt())*1.e-3;
+ ATH_MSG_DEBUG(" trkPt: " << trkPt);
+ fill("TrigBjetMonitor",trkPt);
+ NameH = "trkEta_"+trigName;
ATH_MSG_DEBUG( " NameH: " << NameH );
- auto jetEta = Monitored::Scalar<float>(NameH,0.0);
- jetEta = jet->eta();
- NameH = "jetPhi_"+trigName;
+ auto trkEta = Monitored::Scalar<float>(NameH,0.0);
+ trkEta = (*it)->eta();
+ NameH = "trkPhi_"+trigName;
ATH_MSG_DEBUG( " NameH: " << NameH );
- auto jetPhi = Monitored::Scalar<float>(NameH,0.0);
- jetPhi = jet->phi();
- ATH_MSG_DEBUG(" jetEta: " << jetEta << " jetPhi : " << jetPhi);
- fill("TrigBjetMonitor",jetEta,jetPhi);
- // zPV associated to the jets in the same event: they are the same for every jet in the same event so only the first zPV should be plotted
- if (ijet == 0) {
-
- std::string vtxname = m_onlineVertexContainerKey.key();
- if ( vtxname.find("HLT_")==0 ) vtxname.erase(0,4);
-
- auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, vtxname ); // CV 200120 & MS 290620
- ATH_CHECK( vertexLinkInfo.isValid() ) ; // TM 200120
- const xAOD::Vertex* vtx = *(vertexLinkInfo.link);
- NameH = "PVz_jet_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto PVz_jet = Monitored::Scalar<float>(NameH,0.0);
- PVz_jet = vtx->z();
- ATH_MSG_DEBUG(" PVz_jet: " << PVz_jet);
- fill("TrigBjetMonitor",PVz_jet);
- NameH = "PVx_jet_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto PVx_jet = Monitored::Scalar<float>(NameH,0.0);
- PVx_jet = vtx->x();
- ATH_MSG_DEBUG(" PVx_jet: " << PVx_jet);
- fill("TrigBjetMonitor",PVx_jet);
- NameH = "PVy_jet_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto PVy_jet = Monitored::Scalar<float>(NameH,0.0);
- PVy_jet = vtx->y();
- ATH_MSG_DEBUG(" PVy_jet: " << PVy_jet);
- fill("TrigBjetMonitor",PVy_jet);
- }
- ijet++;
-
- // Tracks associated to triggered jets ( featurs = onlinejets ) courtesy of Tim Martin on 12/05/2020
- const auto track_it_pair = m_trigDec->associateToEventView(theTracks, jetLinkInfo.source, "roi");
- const xAOD::TrackParticleContainer::const_iterator start_it = track_it_pair.first;
- const xAOD::TrackParticleContainer::const_iterator end_it = track_it_pair.second;
-
- int count = 0;
- for ( xAOD::TrackParticleContainer::const_iterator it = start_it; it != end_it; ++it) {
- count++;
- ATH_MSG_DEBUG( " Track " << count << " with pT " << (*it)->pt() <<" from BJet with pT " << (*jetLinkInfo.link)->pt() );
- ATH_MSG_DEBUG( " Track " << count << " with pT/eta/phi " << (*it)->pt() << "/" << (*it)->eta() << "/" << (*it)->phi() );
- ATH_MSG_DEBUG( " Track " << count << " with d0/sigd0 " << (*it)->d0() << "/" << Amg::error((*it)->definingParametersCovMatrix(), 0) );
- ATH_MSG_DEBUG( " Track " << count << " with z0/sigz0 " << (*it)->z0() << "/" << Amg::error((*it)->definingParametersCovMatrix(), 1) );
- std::string NameH = "trkPt_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto trkPt = Monitored::Scalar<float>(NameH,0.0);
- trkPt = ((*it)->pt())*1.e-3;
- ATH_MSG_DEBUG(" trkPt: " << trkPt);
- fill("TrigBjetMonitor",trkPt);
- NameH = "trkEta_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto trkEta = Monitored::Scalar<float>(NameH,0.0);
- trkEta = (*it)->eta();
- NameH = "trkPhi_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto trkPhi = Monitored::Scalar<float>(NameH,0.0);
- trkPhi = (*it)->phi();
- ATH_MSG_DEBUG(" trkEta: " << trkEta << " trkPhi : " << trkPhi);
- fill("TrigBjetMonitor",trkEta,trkPhi);
- NameH = "d0_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto d0 = Monitored::Scalar<float>(NameH,0.0);
- d0 = (*it)->d0();
- ATH_MSG_DEBUG(" d0: " << d0);
- fill("TrigBjetMonitor",d0);
- NameH = "z0_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto z0 = Monitored::Scalar<float>(NameH,0.0);
- z0 = (*it)->z0();
- ATH_MSG_DEBUG(" z0: " << z0);
- fill("TrigBjetMonitor",z0);
- NameH = "ed0_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto ed0 = Monitored::Scalar<float>(NameH,0.0);
- ed0 = Amg::error((*it)->definingParametersCovMatrix(), 0);
- ATH_MSG_DEBUG(" ed0: " << ed0);
- fill("TrigBjetMonitor",ed0);
- NameH = "ez0_"+trigName;
- ATH_MSG_DEBUG( " NameH: " << NameH );
- auto ez0 = Monitored::Scalar<float>(NameH,0.0);
- ez0 = Amg::error((*it)->definingParametersCovMatrix(), 1);
- ATH_MSG_DEBUG(" ez0: " << ez0);
- fill("TrigBjetMonitor",ez0);
- } // it on tracks
- ATH_MSG_DEBUG( " Number of tracks: " << count );
- itrack += count;
-
- } // jetLinkInfo from onlinejets
-
- ATH_MSG_DEBUG(" Total number of triggered b-jets: " << ijet << " nJet : " << nJet);
- ATH_MSG_DEBUG(" Total number of triggered tracks associated to the b-jets: " << itrack);
- std::string nTrackH = "nTrack_"+trigName;
- auto nTrack = Monitored::Scalar<int>(nTrackH,0.0);
- nTrack = itrack;
- fill("TrigBjetMonitor",nTrack);
-
- } //bjet or mujet
-
- } // else Run3
-
+ auto trkPhi = Monitored::Scalar<float>(NameH,0.0);
+ trkPhi = (*it)->phi();
+ ATH_MSG_DEBUG(" trkEta: " << trkEta << " trkPhi : " << trkPhi);
+ fill("TrigBjetMonitor",trkEta,trkPhi);
+ NameH = "d0_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto d0 = Monitored::Scalar<float>(NameH,0.0);
+ d0 = (*it)->d0();
+ ATH_MSG_DEBUG(" d0: " << d0);
+ fill("TrigBjetMonitor",d0);
+ NameH = "z0_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto z0 = Monitored::Scalar<float>(NameH,0.0);
+ z0 = (*it)->z0();
+ ATH_MSG_DEBUG(" z0: " << z0);
+ fill("TrigBjetMonitor",z0);
+ NameH = "ed0_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto ed0 = Monitored::Scalar<float>(NameH,0.0);
+ ed0 = Amg::error((*it)->definingParametersCovMatrix(), 0);
+ ATH_MSG_DEBUG(" ed0: " << ed0);
+ fill("TrigBjetMonitor",ed0);
+ NameH = "ez0_"+trigName;
+ ATH_MSG_DEBUG( " NameH: " << NameH );
+ auto ez0 = Monitored::Scalar<float>(NameH,0.0);
+ ez0 = Amg::error((*it)->definingParametersCovMatrix(), 1);
+ ATH_MSG_DEBUG(" ez0: " << ez0);
+ fill("TrigBjetMonitor",ez0);
+ } // it on tracks
+ ATH_MSG_DEBUG( " Number of tracks: " << count );
+ itrack += count;
+
+ } // jetLinkInfo from onlinejets
+
+ ATH_MSG_DEBUG(" Total number of triggered b-jets: " << ijet << " nJet : " << nJet);
+ ATH_MSG_DEBUG(" Total number of triggered tracks associated to the b-jets: " << itrack);
+ std::string nTrackH = "nTrack_"+trigName;
+ auto nTrack = Monitored::Scalar<int>(nTrackH,0.0);
+ nTrack = itrack;
+ fill("TrigBjetMonitor",nTrack);
+
+ } //bjet or mujet
+
} else {
ATH_MSG_DEBUG( " Trigger chain from AllChains list: " << trigName << " has not fired " );
} // trigger not fired
-
+
} // for AllChains
- return StatusCode::SUCCESS;
+ return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
index 9a2f86dd9a72d0f17ec852f349f9785fa0d39dbf..b0ca6ea065d1105142b428d1a7c58addf395ec79 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
@@ -33,9 +33,9 @@ class TrigBjetMonitorAlgorithm : public AthMonitorAlgorithm {
SG::ReadHandleKey<xAOD::VertexContainer> m_offlineVertexContainerKey {this,"OfflineVertexContainerName","PrimaryVertices","Key of offline primary vertexes"};
SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_IDVertex_FS","Key of online bjet primary vertexes"}; // MS 290620
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_onlineTrackContainerKey {this,"OnlineTrackContainerName","HLT_IDTrack_Bjet_IDTrig","Key of online tracks of bjets"};
+ SG::ReadHandleKey<xAOD::BTaggingContainer> m_onlineBTaggingContainerKey {this,"OnlineBTaggingContainerName","HLT_BTagging","Key of online b-tagging object"};
ToolHandle<Trig::TrigDecisionTool> m_trigDec; //!
- bool m_doRun2;
};
#endif
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/HLTXAODBphysMonTool.h b/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/HLTXAODBphysMonTool.h
index c0830ae1f34d545cbbb3693a66aeb3f8562e4353..8f6bdec2115a8e8e13a048c4e8dfb49b077ccb45 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/HLTXAODBphysMonTool.h
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/TrigBphysMonitoring/HLTXAODBphysMonTool.h
@@ -99,11 +99,13 @@ private:
//typedef std::vector<std::pair<std::string, std::string> > Table_t;
Table_t m_dedicated_chains; //! menu-independent labels with matching menu-aware chain names for dedicated monitoring
Table_t m_dedicatedL1Topo_chains; //! menu-independent labels with matching menu-aware chain names for dedicated L1Topo monitoring
+ Table_t m_dedicatedIndividual_chains; //!
Table_t m_efficiency_chains; //! menu-independent labels with matching menu-aware chain names for numerator efficiencies
// patterns for the above, if generated on-the-fly from m_primary_chains list
Table_t m_dedicated_chains_patterns;
Table_t m_dedicatedL1Topo_chains_patterns;
+ Table_t m_dedicatedIndividual_chains_patterns;
Table_t m_efficiency_chains_patterns;
std::vector<std::string> m_containerList; //! Container list
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
index 7c879286c968e1348e6ab01cb305205765f6fc71..bcd080533a137767597a0fd49d6f8aa7b7b465d5 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitCategory.py
@@ -3,7 +3,7 @@
from TriggerJobOpts.TriggerFlags import TriggerFlags
monitoring_bphys = [
- 'HLT_mu11_mu6_bDimu',
+ #'HLT_mu11_mu6_bDimu',
'HLT_mu11_mu6_bBmumuxv2',
'HLT_mu6_2mu4_bJpsi',
'HLT_mu20_bJpsi_Trkloose',
@@ -14,7 +14,7 @@ monitoring_bphys = [
'HLT_mu11_mu6_bTau',
'HLT_2mu6_bDimu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',
'HLT_mu11_mu6_bDimu_novtx_noos',
- 'HLT_mu11_mu6_bJpsimumu',
+ #'HLT_mu11_mu6_bJpsimumu',
'HLT_mu11_mu6_bBmumu',
'HLT_mu6_mu4_bUpsimumu_L1BPH-8M15-MU6MU4_BPH-0DR22-MU6MU4',
'HLT_mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4',
@@ -25,9 +25,27 @@ monitoring_bphys = [
'HLT_2mu6_bBmumux_BsmumuPhi_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',
'HLT_mu6_bJpsi_Trkloose',
'HLT_mu4_mu4_idperf_bJpsimumu_noid',
+ # For individual chain monitoring folders, to fill DetailedIndividualChains
+ 'HLT_2mu4_bJpsimumu',
+ 'HLT_2mu4_bUpsimumu',
+ 'HLT_2mu4_bDimu',
+ 'HLT_mu6_mu4_bJpsimumu',
+ 'HLT_mu6_mu4_bUpsimumu',
+ 'HLT_mu6_mu4_bDimu',
+ 'HLT_2mu6_bJpsimumu',
+ 'HLT_2mu6_bUpsimumu',
+ 'HLT_2mu6_bDimu',
+ 'HLT_mu11_mu6_bJpsimumu',
+ 'HLT_mu11_mu6_bUpsimumu',
+ 'HLT_mu11_mu6_bDimu',
+ 'HLT_2mu4_bBmumux_BsmumuPhi',
+ 'HLT_mu6_mu4_bBmumux_BsmumuPhi_delayed',
+ 'HLT_2mu4_bBmumux_BpmumuKp',
+ 'HLT_mu6_mu4_bBmumux_BpmumuKp',
]
primary_bphys = [
+ # first should go those for generic folders (BMuMu, MultiMu etc)
'HLT_mu11_mu6_bDimu',
'HLT_mu11_mu6_bBmumuxv2',
'HLT_mu6_2mu4_bJpsi',
@@ -37,6 +55,18 @@ primary_bphys = [
'HLT_mu11_mu6_bTau',
'HLT_2mu6_bDimu_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',
'HLT_mu11_mu6_bDimu_novtx_noos',
+ # then others, for individual chain folders
+ 'HLT_2mu4_bJpsimumu',
+ 'HLT_2mu4_bUpsimumu',
+ 'HLT_mu6_mu4_bJpsimumu',
+ 'HLT_mu6_mu4_bUpsimumu',
+ 'HLT_mu6_mu4_bDimu',
+ 'HLT_2mu6_bJpsimumu',
+ 'HLT_2mu6_bUpsimumu',
+ 'HLT_2mu6_bDimu',
+ 'HLT_mu11_mu6_bJpsimumu',
+ 'HLT_mu11_mu6_bUpsimumu',
+ 'HLT_mu11_mu6_bDimu',
]
if TriggerFlags.EDMDecodingVersion == 3 :
@@ -44,6 +74,19 @@ if TriggerFlags.EDMDecodingVersion == 3 :
'HLT_2mu4_bJpsimumu_L12MU4',
'HLT_2mu4_bUpsimumu_L12MU4',
'HLT_2mu4_bDimu_L12MU4',
+ 'HLT_mu6_mu4_bJpsimumu_L1MU6_2MU4',
+ 'HLT_mu6_mu4_bUpsimumu_L1MU6_2MU4',
+ 'HLT_mu6_mu4_bDimu_L1MU6_2MU4',
+ 'HLT_2mu6_bJpsimumu_L12MU6',
+ 'HLT_2mu6_bUpsimumu_L12MU6',
+ 'HLT_2mu6_bDimu_L12MU6',
+ 'HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6',
+ 'HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6',
+ 'HLT_mu11_mu6_bDimu_L1MU11_2MU6',
+ 'HLT_2mu4_bBmumux_BsmumuPhi_L12MU4',
+ 'HLT_mu6_mu4_bBmumux_BsmumuPhi_L1MU6_2MU4',
+ 'HLT_2mu4_bBmumux_BpmumuKp_L12MU4',
+ 'HLT_mu6_mu4_bBmumux_BpmumuKp_L1MU6_2MU4',
]
primary_bphys = [
'HLT_2mu4_bDimu_L12MU4',
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
index ce32dfcc1df499106aa894e08d564ad128964d49..5d3ce0d7874e4fe7c73aba1f3eb22c2a73c111b1 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
@@ -33,6 +33,25 @@ DetailedL1TopoChains = {
"L1BPH-M-DR" : "HLT_2mu6_bUpsimumu_L1BPH-8M15-2MU6_BPH-0DR22-2MU6",
#"L1BPH-M" : "HLT_2mu6_bDimu_L1BPH-8M15-2MU6"
}
+DetailedIndividualChains = {
+ # filled not from primary_bphys but from monitored_bphys
+ "HLT_2mu4_bJpsimumu" : "HLT_2mu4_bJpsimumu(_L1(?!BPH).*)?$",
+ "HLT_2mu4_bUpsimumu" : "HLT_2mu4_bUpsimumu(_L1(?!BPH).*)?$",
+ "HLT_2mu4_bDimu" : "HLT_2mu4_bDimu(_L1(?!BPH).*)?$",
+ "HLT_mu6_mu4_bJpsimumu" : "HLT_mu6_mu4_bJpsimumu(_L1(?!BPH).*)?$",
+ "HLT_mu6_mu4_bUpsimumu" : "HLT_mu6_mu4_bUpsimumu(_L1(?!BPH).*)?$",
+ "HLT_mu6_mu4_bDimu" : "HLT_mu6_mu4_bDimu(_L1(?!BPH).*)?$",
+ "HLT_2mu6_bJpsimumu" : "HLT_2mu6_bJpsimumu(_L1(?!BPH).*)?$",
+ "HLT_2mu6_bUpsimumu" : "HLT_2mu6_bUpsimumu(_L1(?!BPH).*)?$",
+ "HLT_2mu6_bDimu" : "HLT_2mu6_bDimu(_L1(?!BPH).*)?$",
+ "HLT_mu11_mu6_bJpsimumu" : "HLT_mu11_mu6_bJpsimumu(_L1(?!BPH).*)?$",
+ "HLT_mu11_mu6_bUpsimumu" : "HLT_mu11_mu6_bUpsimumu(_L1(?!BPH).*)?$",
+ "HLT_mu11_mu6_bDimu" : "HLT_mu11_mu6_bDimu(_L1(?!BPH).*)?$",
+ "HLT_2mu4_bBmumux_BsmumuPhi" : "HLT_2mu4_bBmumux_BsmumuPhi(_delayed)?(_L1(?!BPH).*)?$",
+ "HLT_mu6_mu4_bBmumux_BsmumuPhi" : "HLT_mu6_mu4_bBmumux_BsmumuPhi(_delayed)?(_L1(?!BPH).*)?$",
+ "HLT_2mu4_bBmumux_BpmumuKp" : "HLT_2mu4_bBmumux_BpmumuKp(_delayed)?(_L1(?!BPH).*)?$",
+ "HLT_mu6_mu4_bBmumux_BpmumuKp" : "HLT_mu6_mu4_bBmumux_BpmumuKp(_delayed)?(_L1(?!BPH).*)?$",
+ }
EfficiencyChains = {
"BMuMu" : "HLT_(2mu[0-9]+|mu[0-9]+_?mu[0-9]+)_(bDimu|bJpsimumu)(_L1[0-9]?MU[0-9]+)?",
"BMuMuX" : "HLT_(2mu[0-9]+|mu[0-9]+_?mu[0-9]+)_bBmumuxv[23](_L1[0-9]?MU[0-9]+)?",
@@ -106,6 +125,7 @@ def TrigBphysMonitoringTool():
ContainerList =containers,
DetailedChains_patterns = DetailedChains,
DetailedL1TopoChains_patterns = DetailedL1TopoChains,
+ DetailedIndividualChains_patterns = DetailedIndividualChains,
EfficiencyChains_patterns = EfficiencyChains,
EffTrigDenom_noVtxOS_pattern = EffTrigDenom_noVtxOS,
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/share/configureBphysTrackingServices.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/share/configureBphysTrackingServices.py
index 9c6cba88c8fa9f46651325f5aee1f63aa2b0258d..c580b2f522914ae49a899ae2d8a66e09b901d95a 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/share/configureBphysTrackingServices.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/share/configureBphysTrackingServices.py
@@ -43,11 +43,18 @@ CountDeadModulesAfterLastHit=False
#rec.Commissioning=False
from AthenaCommon.DetFlags import DetFlags
+from InDetBoundaryCheckTool.InDetBoundaryCheckToolConf import InDet__InDetBoundaryCheckTool
+InDetBoundaryCheck = InDet__InDetBoundaryCheckTool(
+ name="TrigBphysInDetBoundaryCheckTool",
+ UsePixel=DetFlags.haveRIO.pixel_on(),
+ UseSCT=DetFlags.haveRIO.SCT_on()
+)
+ToolSvc += InDetBoundaryCheck
+
from InDetTrackHoleSearch.InDetTrackHoleSearchConf import InDet__InDetTrackHoleSearchTool
InDetHoleSearchTool = InDet__InDetTrackHoleSearchTool(name = "TrigBphysInDetHoleSearchTool",
Extrapolator = InDetExtrapolator,
- usePixel = DetFlags.haveRIO.pixel_on(),
- useSCT = DetFlags.haveRIO.SCT_on(),
+ BoundaryCheckTool=InDetBoundaryCheck,
#Commissioning = rec.Commissioning())
CountDeadModulesAfterLastHit = CountDeadModulesAfterLastHit)
ToolSvc += InDetHoleSearchTool
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDecoratorAlg.cxx b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDecoratorAlg.cxx
index 3d0b7c212fd8a70330a48a3c1b44c75bc7163373..6d7a3a365bbf66847fbdcdfefc4b60ebe1bfa9a3 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDecoratorAlg.cxx
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/BphysTrigDecoratorAlg.cxx
@@ -15,7 +15,7 @@
// STL includes
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaBaseComps/AthCheckMacros.h"
#include "xAODTracking/Vertex.h"
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
index 676d4b8d3a2b218e84985b75d5f4d3687af05b2a..0c069db8bba07d5ffad4d91dbd06864a542e5af5 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
@@ -115,6 +115,7 @@ m_muonMass(105.66)
declareProperty("DetailedChains" ,m_dedicated_chains , "table<string,string> of menu-idep/aware labels/chainnames");
declareProperty("DetailedL1TopoChains" ,m_dedicatedL1Topo_chains , "table<string,string> of menu-idep/aware labels/chainnames for L1Topo");
+ declareProperty("DetailedIndividualChains" ,m_dedicatedIndividual_chains , "table<string,string> of individual chains");
declareProperty("EfficiencyChains" ,m_efficiency_chains, "table<string,string> of menu-idep/aware labels/eff. names");
// ID Tracking efficiency
@@ -136,6 +137,7 @@ m_muonMass(105.66)
// patterns for the above, if generated on-the-fly from m_primary_chains list
declareProperty("DetailedChains_patterns" ,m_dedicated_chains_patterns , "table<string,string> of menu-idep/aware labels/patterns");
declareProperty("DetailedL1TopoChains_patterns" ,m_dedicatedL1Topo_chains_patterns , "table<string,string> of menu-idep/aware labels/patterns for L1Topo");
+ declareProperty("DetailedIndividualChains_patterns" ,m_dedicatedIndividual_chains_patterns , "table<string,string> of individual chains");
declareProperty("EfficiencyChains_patterns" ,m_efficiency_chains_patterns, "table<string,string> of menu-idep/aware labels/eff. patterns");
declareProperty("EffTrigDenom_noVtxOS_pattern" , m_trigchain_denomnoVtxOS_pattern , "Trigger pattern for noVtxOS denominator efficiencies");
@@ -226,6 +228,7 @@ StatusCode HLTXAODBphysMonTool::init()
StatusCode HLTXAODBphysMonTool::generateChainDicts() {
m_dedicated_chains.clear();
m_dedicatedL1Topo_chains.clear();
+ m_dedicatedIndividual_chains.clear();
m_efficiency_chains.clear();
m_trigchain_denomnoVtxOS = "";
@@ -253,6 +256,18 @@ StatusCode HLTXAODBphysMonTool::generateChainDicts() {
}
}
+ ATH_MSG_DEBUG ("Forming DetailedIndividualChains... ");
+ for(const auto& patternPair : m_dedicatedIndividual_chains_patterns) {
+ boost::regex pattern(patternPair.second.c_str());
+ for(const auto& chainName : m_monitored_chains) {
+ if( boost::regex_match(chainName,pattern) ) {
+ m_dedicatedIndividual_chains.insert( Pair_t(patternPair.first,chainName) );
+ ATH_MSG_INFO ("Add " << patternPair.first << " : " << chainName << " to DetailedIndividualChains dictionary");
+ break;
+ }
+ }
+ }
+
ATH_MSG_INFO ("Forming EfficiencyChains... ");
for(const auto& patternPair : m_efficiency_chains_patterns) {
boost::regex pattern(patternPair.second.c_str());
@@ -1535,6 +1550,11 @@ StatusCode HLTXAODBphysMonTool::bookTriggerGroups() {
// groupName, prefix, pathInRoot, chainName
bookTrigBphysHists(trigpair.first, m_prefix, trigpair.first, trigpair.second, false); // book only limited number of histograms
} // for
+ for (const auto& trigpair : m_dedicatedIndividual_chains) {
+ ATH_MSG_DEBUG("Building Dedicated Individual chain monitoring for: " << trigpair.first<< " " <<trigpair.second );
+ // groupName, prefix, pathInRoot, chainName
+ bookTrigBphysHists(trigpair.first, m_prefix, trigpair.first, trigpair.second);
+ } // for
return StatusCode::SUCCESS;
} // bookTriggerGroups
@@ -1554,6 +1574,13 @@ StatusCode HLTXAODBphysMonTool::fillTriggerGroups() {
continue;
}
} // for
+ for (const auto& trigpair : m_dedicatedIndividual_chains) {
+ ATH_MSG_DEBUG("Filling Dedicated Individual chain monitoring for: " << trigpair.first<< " " <<trigpair.second );
+ if (!fillTriggerGroup(trigpair.first,trigpair.second).isSuccess()) {
+ ATH_MSG_WARNING("Problems filling group/chain: " << trigpair.first<< " " <<trigpair.second);
+ continue;
+ }
+ } // for
return StatusCode::SUCCESS;
} // fillTriggerGroups
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
index 385550cc37c974db2c1b6f07ea79db373fbad2a1..9e66019343ac9369f06e0720e4e0012123a9da75 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
@@ -63,7 +63,7 @@ Chain2JetCollDict['Legacy'] = {
'HLT_3j200' : 'HLT_xAOD__JetContainer_a4tcemsubjesISFS',
}
-from JetMonitoring.JetMonitoringConfig import JetMonAlgSpec, HistoSpec, EventHistoSpec, SelectSpec, ToolSpec
+from JetMonitoring.JetMonitoringConfig import JetMonAlgSpec, HistoSpec, EventHistoSpec, SelectSpec, ToolSpec #VarSpec can be added to define specific/custom variables
from AthenaConfiguration.AllConfigFlags import ConfigFlags
def TrigJetMonConfig(inputFlags):
@@ -157,9 +157,13 @@ def basicJetMonAlgSpec(jetcoll,isOnline,athenaMT):
SelectSpec( 'forward', '3.2<|eta|', path, FillerTools = ["pt","et","m"] ),
SelectSpec( 'lowmu', 'avgMu<30', path, isEventVariable=True, FillerTools = ["pt","et","m","phi","eta"]),
SelectSpec( 'highmu', '30<avgMu', path, isEventVariable=True, FillerTools = ["pt","et","m","phi","eta"]),
- EventHistoSpec('njets', (20,0,20), title='NJets;NJets;Entries' ),
+
EventHistoSpec('njetsPt20', (20,0,20), title='NJetsPt20;NJetsPt20;Entries' ),
- EventHistoSpec('njetsEt40Eta1_2', (10,0,10), title='NJetsEt40Eta1_2;NJetsEt40Eta1_2;Entries' ),
+ # Jet multiplicity histograms can be added by using an EventHistoSpec
+ # Their specifications (pT cut, ET cut, eta cuts) must be defined in the knownEventVar dictionary within JetStandardHistoSpecs.py
+ # The following line is an example for a jet multiplicity histogram with ET>40 GeV, 1.0<|eta|<2.0, and binning of (10,0,10):
+ # EventHistoSpec('njetsEt40Eta1_2', (10,0,10), title='NJetsEt40Eta1_2;NJetsEt40Eta1_2;Entries' ),
+
# TProfile2D : just use 3 variables. For now the sytem will automatically
# interpret it as a TProfile2D (the 3rd variable being profiled)
#"phi;eta;e", # --> Average Energy vs pt and eta
@@ -192,6 +196,7 @@ ExtraOfflineHists = [
"NumTrkPt1000[0]",
"TrackWidthPt1000[0]",
"SumPtTrkPt500[0]",
+ SelectSpec( 'LooseBadFailedJets', 'LooseBad', InverseJetSel=True, FillerTools = ["pt","phi","eta"]),
]
# Additional histograms for online jets
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..993633bb31c0da9481fa9b9d5697861076405f8b
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/EFMuonMonConfig.py
@@ -0,0 +1,235 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+import ROOT
+
+def EFMuonMonConfig(helper):
+
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ # HLT_mu6_L1MU6 is test chain for small statistics, so it will be removed.
+ Chains = ['HLT_mu6_L1MU6', 'HLT_mu26_ivarmedium_L1MU20', 'HLT_mu50_L1MU20']
+
+ for chain in Chains:
+
+ GroupName = 'EFMuon_'+chain
+
+ monAlg = helper.addAlgorithm(CompFactory.EFMuonMonMT,'EFMuonMonMT_'+chain)
+ monAlg.MuonType = ROOT.xAOD.Muon_v1.MuonStandAlone
+ monAlg.MonitoredChains = [chain]
+ monAlg.Group = GroupName
+
+ histGroup = helper.addGroup(monAlg, GroupName, 'HLT/MuonMon/EFMuon/'+chain)
+
+
+ # basic EDM variables
+ # EFSA
+ histGroup.defineHistogram(GroupName+'_EFSA_Pt;EFSA_Pt',
+ title='EFSA Pt '+chain+';p_{T} [GeV];Events',
+ type='TH1F', path='',xbins=210,xmin=-105.,xmax=105.)
+
+ histGroup.defineHistogram(GroupName+'_EFSA_Eta;EFSA_Eta',
+ title='EFSA Eta '+chain+';#eta;Events',
+ type='TH1F', path='',xbins=108,xmin=-2.7,xmax=2.7)
+
+ histGroup.defineHistogram(GroupName+'_EFSA_Phi;EFSA_Phi',
+ title='EFSA Phi '+chain+';#phi;Events',
+ type='TH1F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_EFSA_Eta,'+GroupName+'_EFSA_Phi;EFSA_Eta_vs_Phi',
+ title='EFSA Eta vs Phi '+chain+';#eta;#phi',
+ type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+
+
+ # EFCB
+ histGroup.defineHistogram(GroupName+'_EFCB_Pt;EFCB_Pt',
+ title='EFCB Pt '+chain+';p_{T} [GeV];Events',
+ type='TH1F', path='',xbins=210,xmin=-105.,xmax=105.)
+
+ histGroup.defineHistogram(GroupName+'_EFCB_Eta;EFCB_Eta',
+ title='EFCB Eta '+chain+';#eta;Events',
+ type='TH1F', path='',xbins=108,xmin=-2.7,xmax=2.7)
+
+ histGroup.defineHistogram(GroupName+'_EFCB_Phi;EFCB_Phi',
+ title='EFCB Phi '+chain+';#phi;Events',
+ type='TH1F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_EFCB_Eta,'+GroupName+'_EFCB_Phi;EFCB_Eta_vs_Phi',
+ title='EFCB Eta vs Phi '+chain+';#eta;#phi',
+ type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+
+
+ # OfflineSA
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Pt;OfflineSA_Pt',
+ title='OfflineSA Pt '+chain+';p_{T} [GeV];Events',
+ type='TH1F', path='',xbins=210,xmin=-105.,xmax=105.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Eta;OfflineSA_Eta',
+ title='OfflineSA Eta '+chain+';#eta;Events',
+ type='TH1F', path='',xbins=108,xmin=-2.7,xmax=2.7)
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Phi;OfflineSA_Phi',
+ title='OfflineSA Phi '+chain+';#phi;Events',
+ type='TH1F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Eta,'+GroupName+'_OfflineSA_Phi;OfflineSA_Eta_vs_Phi',
+ title='OfflineSA Eta vs Phi '+chain+';#eta;#phi',
+ type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+
+
+ # OfflineCB
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Pt;OfflineCB_Pt',
+ title='OfflineCB Pt '+chain+';p_{T} [GeV];Events',
+ type='TH1F', path='',xbins=210,xmin=-105.,xmax=105.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Eta;OfflineCB_Eta',
+ title='OfflineCB Eta '+chain+';#eta;Events',
+ type='TH1F', path='',xbins=108,xmin=-2.7,xmax=2.7)
+
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Phi;OfflineCB_Phi',
+ title='OfflineCB Phi '+chain+';#phi;Events',
+ type='TH1F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Eta,'+GroupName+'_OfflineCB_Phi;OfflineCB_Eta_vs_Phi',
+ title='OfflineCB Eta vs Phi '+chain+';#eta;#phi',
+ type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+
+
+
+ # correlation histograms
+ # EFSA vs. OfflineSA muons
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Pt,'+GroupName+'_MatchedEFSA_Pt;EFSA_OfflineSA_PtCor',
+ title='PtCor EFSA OfflineSA '+chain+';OfflineSA p_{T} [GeV];EFSA p_{T} [GeV]',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH2F', path='',xbins=210,xmin=-105.,xmax=105., ybins=210,ymin=-105.,ymax=105.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Phi,'+GroupName+'_MatchedEFSA_Phi;EFSA_OfflineSA_PhiCor',
+ title='PhiCor EFSA OfflineSA '+chain+';OfflineSA #phi;EFSA #phi',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH2F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi(), ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Eta,'+GroupName+'_MatchedEFSA_Eta;EFSA_OfflineSA_EtaCor',
+ title='EtaCor EFSA OfflineSA '+chain+';OfflineSA #eta;EFSA #eta',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=108,ymin=-2.7,ymax=2.7)
+
+ histGroup.defineHistogram(GroupName+'_SAdPt;EFSA_OfflineSA_dPt',
+ title='dPt EFSA OfflineSA '+chain+';dPt [GeV];Events',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH1F', path='',xbins=100,xmin=-10.,xmax=10.)
+
+ histGroup.defineHistogram(GroupName+'_SAdEta;EFSA_OfflineSA_dEta',
+ title='dEta EFSA OfflineSA '+chain+';dEta;Events',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH1F', path='',xbins=200,xmin=-5.,xmax=5.)
+
+ histGroup.defineHistogram(GroupName+'_SAdPhi;EFSA_OfflineSA_dPhi',
+ title='dPhi EFSA OfflineSA '+chain+';dPhi;Events',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH1F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_SAdR;EFSA_OfflineSA_dR',
+ title='dR EFSA OfflineSA '+chain+';dR;Events',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH1F', path='',xbins=110,xmin=0.,xmax=11.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Pt;OfflineSA_Pt_AwareEFSA',
+ title='OfflineSA Pt AwareEFSA '+chain+';OfflineSA p_{T} [GeV];Events',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH1F', path='',xbins=210,xmin=-105.,xmax=105.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Phi;OfflineSA_Phi_AwareEFSA',
+ title='OfflineSA Phi AwareEFSA '+chain+';OfflineSA #phi;Events',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH1F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Eta;OfflineSA_Eta_AwareEFSA',
+ title='OfflineSA Eta AwareEFSA '+chain+';OfflineSA #eta;Events',
+ cutmask=GroupName+'_matchedEFSA',
+ type='TH1F', path='',xbins=108,xmin=-2.7,xmax=2.7)
+
+
+ # OfflineSA (matched to EFSA) vs. OfflineSA (matched to L2SA)
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Pt,'+GroupName+'_OfflineSAmatchedL2SA_Pt;OfflineSA_matchedEFSA_matchedL2SA_PtCor',
+ title='PtCor OfflineSA (matched to EFSA) vs. OfflineSA (matched to L2SA) '+chain+';OfflineSA matched to EFSA p_{T} [GeV];OfflineSA matched to L2SA p_{T} [GeV]',
+ cutmask=GroupName+'_matchedL2SA',
+ type='TH2F', path='',xbins=210,xmin=-105.,xmax=105., ybins=210,ymin=-105.,ymax=105.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Phi,'+GroupName+'_OfflineSAmatchedL2SA_Phi;OfflineSA_matchedEFSA_matchedL2SA_PhiCor',
+ title='PhiCor OfflineSA (matched to EFSA) vs. OfflineSA (matched to L2SA) '+chain+';OfflineSA matched to EFSA #phi;OfflineSA matched to L2SA #phi',
+ cutmask=GroupName+'_matchedL2SA',
+ type='TH2F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi(), ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_OfflineSA_Eta,'+GroupName+'_OfflineSAmatchedL2SA_Eta;OfflineSA_matchedEFSA_matchedL2SA_EtaCor',
+ title='EtaCor OfflineSA (matched to EFSA) vs. OfflineSA (matched to L2SA) '+chain+';OfflineSA matched to EFSA #eta;OfflineSA matched to L2SA #eta',
+ cutmask=GroupName+'_matchedL2SA',
+ type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=108,ymin=-2.7,ymax=2.7)
+
+
+ # EFCB vs. OfflineCB muons
+ histGroup.defineHistogram(GroupName+'_EFCB_Pt,'+GroupName+'_OfflineCB_Pt;EFCB_OfflineCB_PtCor',
+ title='PtCor EFCB OfflineCB '+chain+';OfflineCB p_{T} [GeV];EFCB p_{T} [GeV];',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH2F', path='',xbins=210,xmin=-105.,xmax=105., ybins=210,ymin=-105.,ymax=105.)
+
+ histGroup.defineHistogram(GroupName+'_EFCB_Phi,'+GroupName+'_OfflineCB_Phi;EFCB_OfflineCB_PhiCor',
+ title='PhiCor EFCB OfflineCB '+chain+';OfflineCB #phi;EFCB #phi;',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH2F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi(), ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_EFCB_Eta,'+GroupName+'_OfflineCB_Eta;EFCB_OfflineCB_EtaCor',
+ title='EtaCor EFCB OfflineCB '+chain+';OfflineCB #eta;EFCB #eta;',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=108,ymin=-2.7,ymax=2.7)
+
+ histGroup.defineHistogram(GroupName+'_CBdPt;EFCB_OfflineCB_dPt',
+ title='dPt EFCB OfflineCB '+chain+';dPt [GeV];Events',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH1F', path='',xbins=100,xmin=-10.,xmax=10.)
+
+ histGroup.defineHistogram(GroupName+'_CBdEta;EFCB_OfflineCB_dEta',
+ title='dEta EFCB OfflineCB '+chain+';dEta;Events',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH1F', path='',xbins=200,xmin=-5.,xmax=5.)
+
+ histGroup.defineHistogram(GroupName+'_CBdPhi;EFCB_OfflineCB_dPhi',
+ title='dPhi EFCB OfflineCB '+chain+';dPhi;Events',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH1F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_CBdR;EFCB_OfflineCB_dR',
+ title='dR EFCB OfflineCB '+chain+';dR;Events',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH1F', path='',xbins=110,xmin=0.,xmax=11.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Pt;OfflineCB_Pt_AwareEFCB',
+ title='OfflineCB Pt AwareEFCB '+chain+';OfflineCB p_{T} [GeV];Events',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH1F', path='',xbins=210,xmin=-105.,xmax=105.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Phi;OfflineCB_Phi_AwareEFCB',
+ title='OfflineCB Phi AwareEFCB '+chain+';OfflineCB #phi;Events',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH1F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Eta;OfflineCB_Eta_AwareEFCB',
+ title='OfflineCB Eta AwareEFCB '+chain+';OfflineCB #eta;Events',
+ cutmask=GroupName+'_matchedEFCB',
+ type='TH1F', path='',xbins=108,xmin=-2.7,xmax=2.7)
+
+
+ # OfflineCB (matched to EFCB) vs. OfflineCB (matched to L2CB)
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Pt,'+GroupName+'_OfflineCBmatchedL2CB_Pt;OfflineCB_matchedEFCB_matchedL2CB_PtCor',
+ title='PtCor OfflineCB (matched to EFCB) vs. OfflineCB (matched to L2CB) '+chain+';OfflineCB matched to EFCB p_{T} [GeV];OfflineCB matched to L2CB p_{T} [GeV]',
+ cutmask=GroupName+'_matchedL2CB',
+ type='TH2F', path='',xbins=210,xmin=-105.,xmax=105., ybins=210,ymin=-105.,ymax=105.)
+
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Phi,'+GroupName+'_OfflineCBmatchedL2CB_Phi;OfflineCB_matchedEFCB_matchedL2CB_PhiCor',
+ title='PhiCor OfflineCB (matched to EFCB) vs. OfflineCB (matched to L2CB) '+chain+';OfflineCB matched to EFCB #phi;OfflineCB matched to L2CB #phi',
+ cutmask=GroupName+'_matchedL2CB',
+ type='TH2F', path='',xbins=96,xmin=-ROOT.TMath.Pi(),xmax=ROOT.TMath.Pi(), ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
+
+ histGroup.defineHistogram(GroupName+'_OfflineCB_Eta,'+GroupName+'_OfflineCBmatchedL2CB_Eta;OfflineCB_matchedEFCB_matchedL2CB_EtaCor',
+ title='EtaCor OfflineCB (matched to EFCB) vs. OfflineCB (matched to L2CB) '+chain+';OfflineCB matched to EFCB #eta;OfflineCB matched to L2CB #eta',
+ cutmask=GroupName+'_matchedL2CB',
+ type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=108,ymin=-2.7,ymax=2.7)
+
+ return
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAMonConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAMonConfig.py
index 5b60726c934a847a2fb5990c028cf6cc4250d9a0..849df16bc87738d9a7e6787594d1464c6567dd37 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAMonConfig.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/L2MuonSAMonConfig.py
@@ -72,7 +72,7 @@ def L2MuonSAMonConfig(helper):
# L1 RoI eta vs. phi in case mF failed
histGroup.defineHistogram(GroupName+'_roiEta,'+GroupName+'_roiPhi;L2MuonSA_failed_L1_eta_vs_phi',
title='L1 RoI Eta vs. Phi in case of L2MuonSA failure '+chain+';#eta;#phi',
- cutmask=GroupName+'mf_failure',
+ cutmask=GroupName+'_mf_failure',
type='TH2F', path='',xbins=108,xmin=-2.7,xmax=2.7, ybins=96,ymin=-ROOT.TMath.Pi(),ymax=ROOT.TMath.Pi())
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonMonitoringMTConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonMonitoringMTConfig.py
index 2bdde7145b14d4f89b9fa9d9753b2c194e4a1919..b97ef6928ff8f0516307b11173a221a6faf949be 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonMonitoringMTConfig.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/python/TrigMuonMonitoringMTConfig.py
@@ -1,9 +1,10 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-from TrigMuonMonitoringMT.L2muCombMonConfig import L2muCombMonConfig
-from TrigMuonMonitoringMT.L2MuonSAMonConfig import L2MuonSAMonConfig
from TrigMuonMonitoringMT.L1MuonMonConfig import L1MuonMonConfig
+from TrigMuonMonitoringMT.L2MuonSAMonConfig import L2MuonSAMonConfig
+from TrigMuonMonitoringMT.L2muCombMonConfig import L2muCombMonConfig
+from TrigMuonMonitoringMT.EFMuonMonConfig import EFMuonMonConfig
from TrigMuonMonitoringMT.TrigMuonEfficiencyMonConfig import TrigMuonEfficiencyMonConfig
@@ -15,6 +16,7 @@ def TrigMuonMonConfig(inputFlags):
L1MuonMonConfig(helper)
L2MuonSAMonConfig(helper)
L2muCombMonConfig(helper)
+ EFMuonMonConfig(helper)
TrigMuonEfficiencyMonConfig(helper)
return helper.result()
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..3247ad55b4406926e57aeac03244bf55117da617
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.cxx
@@ -0,0 +1,211 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "EFMuonMonMT.h"
+
+#include "xAODTrigMuon/TrigMuonDefs.h"
+#include "MuonMatchingTool.h"
+
+EFMuonMonMT :: EFMuonMonMT(const std::string& name, ISvcLocator* pSvcLocator )
+ : TrigMuonMonitorAlgorithm(name, pSvcLocator)
+{}
+
+StatusCode EFMuonMonMT :: fillVariablesPerChain(const EventContext& , const std::string &chain) const {
+
+ ATH_MSG_DEBUG ("Filling histograms for " << name() << "...");
+
+ // EFSA
+ std::vector< TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> > featureContSA = getTrigDecisionTool()->features<xAOD::MuonContainer>( chain, TrigDefs::includeFailedDecisions, "HLT_Muons_");
+ for (const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muSALinkInfo : featureContSA) {
+ ATH_CHECK( muSALinkInfo.isValid() );
+ const ElementLink<xAOD::MuonContainer> muSAEL = muSALinkInfo.link;
+ if ( ! (*muSAEL)->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle) ) continue;
+
+ // basic EDM variables
+ auto EFSAPt = Monitored::Scalar<float>(m_group+"_EFSA_Pt",-999.);
+ auto EFSAEta = Monitored::Scalar<float>(m_group+"_EFSA_Eta",-999.);
+ auto EFSAPhi = Monitored::Scalar<float>(m_group+"_EFSA_Phi",-999.);
+
+ EFSAPt = (*muSAEL)->pt()/1e3 * (*muSAEL)->charge(); // convert to GeV
+ EFSAEta = (*muSAEL)->eta();
+ EFSAPhi = (*muSAEL)->phi();
+
+ fill(m_group, EFSAPt, EFSAEta, EFSAPhi);
+ }
+
+
+ // EFCB
+ std::vector< TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> > featureContCB = getTrigDecisionTool()->features<xAOD::MuonContainer>( chain, TrigDefs::includeFailedDecisions, "HLT_MuonsCB");
+ for (const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer>& muCBLinkInfo : featureContCB) {
+ ATH_CHECK( muCBLinkInfo.isValid() );
+ const ElementLink<xAOD::MuonContainer> muCBEL = muCBLinkInfo.link;
+ if ( ! (*muCBEL)->trackParticle(xAOD::Muon::TrackParticleType::CombinedTrackParticle) ) continue;
+
+ // basic EDM variables
+ auto EFCBPt = Monitored::Scalar<float>(m_group+"_EFCB_Pt",-999.);
+ auto EFCBEta = Monitored::Scalar<float>(m_group+"_EFCB_Eta",-999.);
+ auto EFCBPhi = Monitored::Scalar<float>(m_group+"_EFCB_Phi",-999.);
+
+ EFCBPt = (*muCBEL)->pt()/1e3 * (*muCBEL)->charge(); // convert to GeV
+ EFCBEta = (*muCBEL)->eta();
+ EFCBPhi = (*muCBEL)->phi();
+
+ fill(m_group, EFCBPt, EFCBEta, EFCBPhi);
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+StatusCode EFMuonMonMT :: fillVariablesPerOfflineMuonPerChain(const EventContext &ctx, const xAOD::Muon* mu, const std::string &chain) const {
+
+ ATH_MSG_DEBUG ("Filling histograms for " << name() << "...");
+
+ const xAOD::TrackParticle* OfflineSATrack = mu->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
+ const xAOD::TrackParticle* OfflineCBTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::CombinedTrackParticle);
+
+
+ // OfflineSA
+ if( OfflineSATrack ){
+ auto OfflineSAPt = Monitored::Scalar<float>(m_group+"_OfflineSA_Pt",-999.);
+ auto OfflineSAEta = Monitored::Scalar<float>(m_group+"_OfflineSA_Eta",-999.);
+ auto OfflineSAPhi = Monitored::Scalar<float>(m_group+"_OfflineSA_Phi",-999.);
+
+ auto matchedEFSA = Monitored::Scalar<bool>(m_group+"_matchedEFSA",false);
+ auto matchedL2SA = Monitored::Scalar<bool>(m_group+"_matchedL2SA",false);
+
+ auto OfflineSAmatchedL2SAPt = Monitored::Scalar<float>(m_group+"_OfflineSAmatchedL2SA_Pt",-999.);
+ auto OfflineSAmatchedL2SAEta = Monitored::Scalar<float>(m_group+"_OfflineSAmatchedL2SA_Eta",-999.);
+ auto OfflineSAmatchedL2SAPhi = Monitored::Scalar<float>(m_group+"_OfflineSAmatchedL2SA_Phi",-999.);
+
+ auto MatchedEFSAPt = Monitored::Scalar<float>(m_group+"_MatchedEFSA_Pt",-999.);
+ auto MatchedEFSAEta = Monitored::Scalar<float>(m_group+"_MatchedEFSA_Eta",-999.);
+ auto MatchedEFSAPhi = Monitored::Scalar<float>(m_group+"_MatchedEFSA_Phi",-999.);
+
+ auto SAdR = Monitored::Scalar<float>(m_group+"_SAdR",1000.);
+ auto SAdPt = Monitored::Scalar<float>(m_group+"_SAdPt",-999.);
+ auto SAdEta = Monitored::Scalar<float>(m_group+"_SAdEta",-999.);
+ auto SAdPhi = Monitored::Scalar<float>(m_group+"_SAdPhi",-999.);
+
+ // basic EDM variables
+ OfflineSAPt = OfflineSATrack->pt()/1e3 * OfflineSATrack->charge(); // convert to GeV
+ OfflineSAEta = OfflineSATrack->eta();
+ OfflineSAPhi = OfflineSATrack->phi();
+
+ // correlation histograms EFSA vs. OfflineSA
+ // get the EFSA muon matched to offlineSA muon
+ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> EFSAMuonLinkInfo = m_matchTool->matchEFSALinkInfo(mu, chain);
+ if( EFSAMuonLinkInfo.isValid() ){
+ const ElementLink<xAOD::MuonContainer> EFSAMuon = EFSAMuonLinkInfo.link;
+ const xAOD::TrackParticle* EFSATrack = (*EFSAMuon)->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
+ if ( EFSATrack ){
+ matchedEFSA = true;
+
+ MatchedEFSAPt = EFSATrack->pt()/1e3 * EFSATrack->charge(); // convert to GeV
+ MatchedEFSAEta = EFSATrack->eta();
+ MatchedEFSAPhi = EFSATrack->phi();
+
+ SAdR = xAOD::P4Helpers::deltaR(OfflineSATrack, EFSATrack, false);
+ SAdPt = std::abs(OfflineSAPt) - std::abs(MatchedEFSAPt);
+ SAdEta = OfflineSAEta - MatchedEFSAEta;
+ SAdPhi = OfflineSAPhi - MatchedEFSAPhi;
+
+
+ // correlation histograms offlineSA (matched to EFSA) vs. offlineSA (matched to L2SA)
+ // get L2SA feature
+ const TrigCompositeUtils::Decision* EFSAMuonDecision = EFSAMuonLinkInfo.source;
+ const TrigCompositeUtils::LinkInfo<xAOD::L2StandAloneMuonContainer> L2SALinkInfo = TrigCompositeUtils::findLink<xAOD::L2StandAloneMuonContainer>(EFSAMuonDecision, "feature");
+ ATH_CHECK( L2SALinkInfo.isValid() );
+ const ElementLink<xAOD::L2StandAloneMuonContainer> L2SAEL = L2SALinkInfo.link;
+
+ // get offline muon matched to L2SA
+ const xAOD::Muon *OfflineSAmatchedL2SA = m_matchTool->matchL2SAtoOff(ctx, (*L2SAEL));
+ if (OfflineSAmatchedL2SA){
+ const xAOD::TrackParticle* OfflineSATrackmatchedL2SA = OfflineSAmatchedL2SA->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
+ if ( OfflineSATrackmatchedL2SA ){
+ matchedL2SA = true;
+ OfflineSAmatchedL2SAPt = OfflineSATrackmatchedL2SA->pt()/1e3 * OfflineSATrackmatchedL2SA->charge(); // convert to GeV
+ OfflineSAmatchedL2SAEta = OfflineSATrackmatchedL2SA->eta();
+ OfflineSAmatchedL2SAPhi = OfflineSATrackmatchedL2SA->phi();
+ }
+ }
+ }
+ }
+ fill(m_group, OfflineSAPt, OfflineSAEta, OfflineSAPhi, OfflineSAmatchedL2SAPt, OfflineSAmatchedL2SAEta, OfflineSAmatchedL2SAPhi,
+ MatchedEFSAPt, MatchedEFSAEta, MatchedEFSAPhi, SAdPt, SAdEta, SAdPhi, SAdR, matchedEFSA, matchedL2SA);
+ }
+
+
+ // OfflineCB
+ if( OfflineCBTrack ){
+ auto OfflineCBPt = Monitored::Scalar<float>(m_group+"_OfflineCB_Pt",-999.);
+ auto OfflineCBEta = Monitored::Scalar<float>(m_group+"_OfflineCB_Eta",-999.);
+ auto OfflineCBPhi = Monitored::Scalar<float>(m_group+"_OfflineCB_Phi",-999.);
+
+ auto matchedEFCB = Monitored::Scalar<bool>(m_group+"_matchedEFCB",false);
+ auto matchedL2CB = Monitored::Scalar<bool>(m_group+"_matchedL2CB",false);
+
+ auto OfflineCBmatchedL2CBPt = Monitored::Scalar<float>(m_group+"_OfflineCBmatchedL2CB_Pt",-999.);
+ auto OfflineCBmatchedL2CBEta = Monitored::Scalar<float>(m_group+"_OfflineCBmatchedL2CB_Eta",-999.);
+ auto OfflineCBmatchedL2CBPhi = Monitored::Scalar<float>(m_group+"_OfflineCBmatchedL2CB_Phi",-999.);
+
+ auto MatchedEFCBPt = Monitored::Scalar<float>(m_group+"_MatchedEFCB_Pt",-999.);
+ auto MatchedEFCBEta = Monitored::Scalar<float>(m_group+"_MatchedEFCB_Eta",-999.);
+ auto MatchedEFCBPhi = Monitored::Scalar<float>(m_group+"_MatchedEFCB_Phi",-999.);
+
+ auto CBdR = Monitored::Scalar<float>(m_group+"_CBdR",1000.);
+ auto CBdPt = Monitored::Scalar<float>(m_group+"_CBdPt",-999.);
+ auto CBdEta = Monitored::Scalar<float>(m_group+"_CBdEta",-999.);
+ auto CBdPhi = Monitored::Scalar<float>(m_group+"_CBdPhi",-999.);
+
+ // basic EDM variables
+ OfflineCBPt = OfflineCBTrack->pt()/1e3 * OfflineCBTrack->charge(); // convert to GeV
+ OfflineCBEta = OfflineCBTrack->eta();
+ OfflineCBPhi = OfflineCBTrack->phi();
+
+ // correlation histograms EFCB vs. OfflineCB
+ // get the closest EFCB muon
+ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> EFCBMuonLinkInfo = m_matchTool->matchEFCBLinkInfo(mu, chain);
+ if( EFCBMuonLinkInfo.isValid() ){
+ const ElementLink<xAOD::MuonContainer> EFCBMuon = EFCBMuonLinkInfo.link;
+ const xAOD::TrackParticle* EFCBTrack = (*EFCBMuon)->trackParticle(xAOD::Muon::TrackParticleType::CombinedTrackParticle);
+ if ( EFCBTrack ){
+ matchedEFCB = true;
+
+ MatchedEFCBPt = EFCBTrack->pt()/1e3 * EFCBTrack->charge(); // convert to GeV
+ MatchedEFCBEta = EFCBTrack->eta();
+ MatchedEFCBPhi = EFCBTrack->phi();
+
+ CBdR = xAOD::P4Helpers::deltaR(OfflineCBTrack, EFCBTrack, false);
+ CBdPt = std::abs(OfflineCBPt) - std::abs(MatchedEFCBPt);
+ CBdEta = OfflineCBEta - MatchedEFCBEta;
+ CBdPhi = OfflineCBPhi - MatchedEFCBPhi;
+
+
+ // correlation histograms offlineCB (matched to EFCB) vs. offlineCB (matched to L2CB)
+ // get L2CB feature
+ const TrigCompositeUtils::Decision* EFCBMuonDecision = EFCBMuonLinkInfo.source;
+ const TrigCompositeUtils::LinkInfo<xAOD::L2CombinedMuonContainer> L2CBLinkInfo = TrigCompositeUtils::findLink<xAOD::L2CombinedMuonContainer>(EFCBMuonDecision, "feature");
+ ATH_CHECK( L2CBLinkInfo.isValid() );
+ const ElementLink<xAOD::L2CombinedMuonContainer> L2CBEL = L2CBLinkInfo.link;
+
+ // get offline muon matched to L2CB
+ const xAOD::Muon *OfflineCBmatchedL2CB = m_matchTool->matchL2CBtoOff(ctx, (*L2CBEL));
+ if (OfflineCBmatchedL2CB){
+ const xAOD::TrackParticle* OfflineCBTrackmatchedL2CB = OfflineCBmatchedL2CB->trackParticle(xAOD::Muon::TrackParticleType::CombinedTrackParticle);
+ if ( OfflineCBTrackmatchedL2CB ){
+ matchedL2CB = true;
+ OfflineCBmatchedL2CBPt = OfflineCBTrackmatchedL2CB->pt()/1e3 * OfflineCBTrackmatchedL2CB->charge(); // convert to GeV
+ OfflineCBmatchedL2CBEta = OfflineCBTrackmatchedL2CB->eta();
+ OfflineCBmatchedL2CBPhi = OfflineCBTrackmatchedL2CB->phi();
+ }
+ }
+ }
+ }
+ fill(m_group, OfflineCBPt, OfflineCBEta, OfflineCBPhi, OfflineCBmatchedL2CBPt, OfflineCBmatchedL2CBEta, OfflineCBmatchedL2CBPhi,
+ MatchedEFCBPt, MatchedEFCBEta, MatchedEFCBPhi, CBdPt, CBdEta, CBdPhi, CBdR, matchedEFCB, matchedL2CB);
+ }
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.h
new file mode 100644
index 0000000000000000000000000000000000000000..24b80ad36ba7a93dc60488d36c1a2ca9d815a6fe
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/EFMuonMonMT.h
@@ -0,0 +1,25 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGMUONMONITORINGMT_EFMUONMONMT_H
+#define TRIGMUONMONITORINGMT_EFMUONMONMT_H
+
+#include "TrigMuonMonitorAlgorithm.h"
+#include "xAODMuon/MuonContainer.h"
+
+/*
+This is a class for monitoring EFMuon.
+ */
+class EFMuonMonMT : public TrigMuonMonitorAlgorithm{
+
+ public:
+ EFMuonMonMT(const std::string& name, ISvcLocator* pSvcLocator );
+
+ protected:
+ virtual StatusCode fillVariablesPerChain(const EventContext &ctx, const std::string &chain) const override;
+ virtual StatusCode fillVariablesPerOfflineMuonPerChain(const EventContext &ctx, const xAOD::Muon* mu, const std::string &chain) const override;
+
+};
+
+#endif //TRIGMUONMONITORINGMT_EFMUONMONMT_H
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.cxx
index 191a7c9c9a3564f8482a8ea5c9e9962ef6d878dc..bbbb10f6010e68dd7c19d7010353ab99e3ef1608 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.cxx
@@ -44,7 +44,7 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerChain(const EventContext &ctx, const
roiPhi = (*muEL)->roiPhi();
ATH_MSG_DEBUG("saPt = " << saPt << ", saEta =" << saEta << ", saPhi = " << saPhi << ", saddr = " << saddr);
- if(fabs(saPt) < ZERO_LIMIT) mf_failure = true;
+ if(std::abs(saPt) < ZERO_LIMIT) mf_failure = true;
fill(m_group, roiEta, roiPhi, mf_failure);
if( mf_failure ) continue;
@@ -91,12 +91,12 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerChain(const EventContext &ctx, const
if(isBarrel){
if( nRPC > 0 ) isL1hitThere = true;
float rpcFitMidSlope = (*muEL)->rpcFitMidSlope();
- if( fabs(rpcFitMidSlope) > ZERO_LIMIT ) isL1emuOkForTriggerPlane = true;
+ if( std::abs(rpcFitMidSlope) > ZERO_LIMIT ) isL1emuOkForTriggerPlane = true;
}
else {
if( nTGCMidRho > 0 && nTGCMidPhi > 0 ) isL1hitThere = true;
float TGCMid1Z = (*muEL)->tgcMid1Z();
- if( fabs(TGCMid1Z) > ZERO_LIMIT ) isL1emuOkForTriggerPlane = true;
+ if( std::abs(TGCMid1Z) > ZERO_LIMIT ) isL1emuOkForTriggerPlane = true;
}
@@ -127,15 +127,15 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerChain(const EventContext &ctx, const
auto mon_sp_r= Monitored::Collection(m_group+"_MDTpoints_r", sp_r);
auto mon_sp_z= Monitored::Collection(m_group+"_MDTpoints_z", sp_z);
- if( fabs((*muEL)->superPointR(inner)) > ZERO_LIMIT ) {
+ if( std::abs((*muEL)->superPointR(inner)) > ZERO_LIMIT ) {
sp_r.push_back( sign * (*muEL)->superPointR(inner) );
sp_z.push_back( (*muEL)->superPointZ(inner) );
}
- if( fabs((*muEL)->superPointR(middle)) > ZERO_LIMIT ) {
+ if( std::abs((*muEL)->superPointR(middle)) > ZERO_LIMIT ) {
sp_r.push_back( sign * (*muEL)->superPointR(middle) );
sp_z.push_back( (*muEL)->superPointZ(middle) );
}
- if( fabs((*muEL)->superPointR(outer)) > ZERO_LIMIT ) {
+ if( std::abs((*muEL)->superPointR(outer)) > ZERO_LIMIT ) {
sp_r.push_back( sign * (*muEL)->superPointR(outer) );
sp_z.push_back( (*muEL)->superPointZ(outer) );
}
@@ -210,7 +210,7 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerChain(const EventContext &ctx, const
// matching to offline
- const xAOD::Muon* RecMuonCB = m_matchTool->matchL2SAtoOff(ctx, saEta, saPhi);
+ const xAOD::Muon* RecMuonCB = m_matchTool->matchL2SAtoOff(ctx, (*muEL));
if(RecMuonCB == nullptr) continue;
std::vector<float> res_inn_OffMatch = res_inn;
@@ -281,8 +281,8 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerOfflineMuonPerChain(const EventConte
// pt resolution, inverse pt resolution
auto ptresol = Monitored::Scalar<float>(m_group+"_ptresol",-999.);
auto invptresol = Monitored::Scalar<float>(m_group+"_invptresol",-999.);
- if ( fabs(offPt) > ZERO_LIMIT && fabs(saPt) > ZERO_LIMIT ) {
- ptresol = fabs(saPt)/fabs(offPt) - 1.;
+ if ( std::abs(offPt) > ZERO_LIMIT && std::abs(saPt) > ZERO_LIMIT ) {
+ ptresol = std::abs(saPt)/std::abs(offPt) - 1.;
invptresol = (1./(offPt * offCharge) - 1./saPt) / (1./(offPt * offCharge));
}
@@ -327,7 +327,7 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerOfflineMuonPerChain(const EventConte
// define region
- if( fabs(offEta) < ETA_OF_BARREL ) {
+ if( std::abs(offEta) < ETA_OF_BARREL ) {
if( offEta > 0. ) isBarrelA = true;
else isBarrelC = true;
}
@@ -337,31 +337,31 @@ StatusCode L2MuonSAMonMT :: fillVariablesPerOfflineMuonPerChain(const EventConte
}
- if( fabs(offEta) < ETA_OF_BARREL ){
+ if( std::abs(offEta) < ETA_OF_BARREL ){
isBarrel = true;
if( offEta > 0. ) isBarrelA = true;
else isBarrelC = true;
}
- else if ( fabs(offEta) < ETA_OF_ENDCAP1 ){
+ else if ( std::abs(offEta) < ETA_OF_ENDCAP1 ){
isEndcap1 = true;
if( offEta > 0. ) isEndcap1A = true;
else isEndcap1C = true;
}
- else if ( fabs(offEta) < ETA_OF_ENDCAP2 ){
+ else if ( std::abs(offEta) < ETA_OF_ENDCAP2 ){
isEndcap2 = true;
if( offEta > 0. ) isEndcap2A = true;
else isEndcap2C = true;
}
- else if ( fabs(offEta) < ETA_OF_ENDCAP3 ){
+ else if ( std::abs(offEta) < ETA_OF_ENDCAP3 ){
isEndcap3 = true;
if( offEta > 0. ) isEndcap3A = true;
else isEndcap3C = true;
}
- if( fabs(offPt) > 4 ){
- if( fabs(offPt) < 6 ) pt4to6 = true;
- else if( fabs(offPt) < 8 ) pt6to8 = true;
+ if( std::abs(offPt) > 4 ){
+ if( std::abs(offPt) < 6 ) pt4to6 = true;
+ else if( std::abs(offPt) < 8 ) pt6to8 = true;
else ptover8 = true;
}
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.h
index 48828390e2fb890b3a017333d12eddee4a3c6a1a..5edf8cc10ba8589a997ea9688245e8acd3255748 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2MuonSAMonMT.h
@@ -8,8 +8,6 @@
#include "TrigMuonMonitorAlgorithm.h"
#include "xAODTrigMuon/L2StandAloneMuonContainer.h"
-class MuonMatchingTool;
-
/*
This is a class for monitoring L2MuonSA.
*/
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
index 815cc28e17a2cf3e60a2a7ecdc2ae654ba45c653..e897b343e88b01f436d1e0f0f132dbeffa25a427 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.cxx
@@ -64,7 +64,7 @@ StatusCode L2muCombMonMT :: fillVariablesPerChain(const EventContext &ctx, const
bool error = false;
if( samu ){
- if(fabs(saELPt - saPt) > ZERO_LIMIT){
+ if(std::abs(saELPt - saPt) > ZERO_LIMIT){
vec_MF_error.push_back(1);
error = true;
}
@@ -72,7 +72,7 @@ StatusCode L2muCombMonMT :: fillVariablesPerChain(const EventContext &ctx, const
vec_MF_error.push_back(1);
error = true;
}
- if(fabs(saELPt) < ZERO_LIMIT){
+ if(std::abs(saELPt) < ZERO_LIMIT){
vec_MF_error.push_back(2);
error = true;
}
@@ -89,13 +89,13 @@ StatusCode L2muCombMonMT :: fillVariablesPerChain(const EventContext &ctx, const
auto L2CB_failure = Monitored::Scalar<bool>(m_group+"_L2CB_failure",false);
bool off_cb_match = false;
bool off_sa_match = false;
- L2SA_success = (fabs(saPt) > ZERO_LIMIT)? true:false;
- L2CB_success = (fabs(cbPt) > ZERO_LIMIT)? true:false;
+ L2SA_success = (std::abs(saPt) > ZERO_LIMIT)? true:false;
+ L2CB_success = (std::abs(cbPt) > ZERO_LIMIT)? true:false;
// matching to offline
- const xAOD::Muon* RecMuonCBmatchL2SA = m_matchTool->matchL2SAtoOff(ctx, saEta, saPhi);
- const xAOD::Muon* RecMuonCBmatchL2CB = m_matchTool->matchL2CBtoOff(ctx, cbEta, cbPhi);
+ const xAOD::Muon* RecMuonCBmatchL2SA = m_matchTool->matchL2SAtoOff(ctx, (*saEL));
+ const xAOD::Muon* RecMuonCBmatchL2CB = m_matchTool->matchL2CBtoOff(ctx, (*muEL));
if( RecMuonCBmatchL2SA && L2SA_success) off_sa_match = true;
if( RecMuonCBmatchL2CB && L2CB_success) off_cb_match = true;
@@ -119,8 +119,8 @@ StatusCode L2muCombMonMT :: fillVariablesPerChain(const EventContext &ctx, const
auto dPhi_toSA = Monitored::Scalar<float>(m_group+"_dPhi_toSA",-999.);
auto dR_toSA = Monitored::Scalar<float>(m_group+"_dR_toSA",-999.);
- if( (*muEL)->muSATrackLink().isValid() && fabs(saPt) > ZERO_LIMIT ){
- ptratio_toSA = fabs(cbPt / saPt);
+ if( (*muEL)->muSATrackLink().isValid() && std::abs(saPt) > ZERO_LIMIT ){
+ ptratio_toSA = std::abs(cbPt / saPt);
dEta_toSA = cbEta - saEta;
dPhi_toSA = xAOD::P4Helpers::deltaPhi(cbPhi, saPhi);
dR_toSA = sqrt(dEta_toSA*dEta_toSA + dPhi_toSA*dPhi_toSA);
@@ -147,7 +147,7 @@ StatusCode L2muCombMonMT :: fillVariablesPerChain(const EventContext &ctx, const
}
fill(m_group, trkPt);
- if( fabs(trkPt) > ZERO_LIMIT) fill(m_group, trkEta, trkPhi, trkZ0, trkChi2);
+ if( std::abs(trkPt) > ZERO_LIMIT) fill(m_group, trkEta, trkPhi, trkZ0, trkChi2);
// comparison L2muComb (IDTrack) vs L2MuonSA
@@ -156,8 +156,8 @@ StatusCode L2muCombMonMT :: fillVariablesPerChain(const EventContext &ctx, const
auto dPhi_TrktoSA = Monitored::Scalar<float>(m_group+"_dPhi_TrktoSA",-999.);
auto dR_TrktoSA = Monitored::Scalar<float>(m_group+"_dR_TrktoSA",-999.);
- if( (*muEL)->idTrackLink().isValid() && fabs(saPt) > ZERO_LIMIT ){
- ptratio_TrktoSA = fabs(cbPt / saPt);
+ if( (*muEL)->idTrackLink().isValid() && std::abs(saPt) > ZERO_LIMIT ){
+ ptratio_TrktoSA = std::abs(cbPt / saPt);
dEta_TrktoSA = cbEta - saEta;
dPhi_TrktoSA = xAOD::P4Helpers::deltaPhi(cbPhi, saPhi);
dR_TrktoSA = sqrt(dEta_TrktoSA*dEta_TrktoSA + dPhi_TrktoSA*dPhi_TrktoSA);
@@ -201,7 +201,7 @@ StatusCode L2muCombMonMT :: fillVariablesPerOfflineMuonPerChain(const EventConte
// pt resolution
float cbPt = (*muEL)->pt()/1e3;
- if ( fabs(offPt) > ZERO_LIMIT && fabs(cbPt) > ZERO_LIMIT ) ptresol = fabs(cbPt)/fabs(offPt) - 1.;
+ if ( std::abs(offPt) > ZERO_LIMIT && std::abs(cbPt) > ZERO_LIMIT ) ptresol = std::abs(cbPt)/std::abs(offPt) - 1.;
fill(m_group, offEta, ptresol);
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.h
index 155e6cb3f1132551ee6967adaa3708938b1f7e38..0e0f5a8629be87f97ce373c16c2e89f53123150c 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/L2muCombMonMT.h
@@ -2,14 +2,12 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TRIGMUONMONITORINGMT_L2MUONCBMONMT_H
-#define TRIGMUONMONITORINGMT_L2MUONCBMONMT_H
+#ifndef TRIGMUONMONITORINGMT_L2MUCOMBMONMT_H
+#define TRIGMUONMONITORINGMT_L2MUCOMBMONMT_H
#include "TrigMuonMonitorAlgorithm.h"
#include "xAODTrigMuon/L2CombinedMuonContainer.h"
-class MuonMatchingTool;
-
/*
This is a class for monitoring L2muComb.
*/
@@ -25,4 +23,4 @@ class L2muCombMonMT : public TrigMuonMonitorAlgorithm{
};
-#endif //TRIGMUONMONITORINGMT_L2MUONCBMONMT_H
+#endif //TRIGMUONMONITORINGMT_L2MUCOMBMONMT_H
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
index 677802dcda9f77d118aa8537b2994ccdb73745a9..d7c643c59e1c8f8753e556b7185b7b53b948a27f 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.cxx
@@ -38,23 +38,60 @@ std::tuple<bool, double,double> MuonMatchingTool :: trigPosForMatch<xAOD::L2Stan
}
-std::tuple<bool, double,double> MuonMatchingTool :: trigPosForMatchEFSA(const xAOD::Muon *trig){
- const xAOD::TrackParticle* mooreMuon = trig->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
- return mooreMuon ? std::forward_as_tuple(true, mooreMuon->eta(), mooreMuon->phi()) : std::forward_as_tuple(false, 0., 0.);
+std::tuple<bool, double,double> MuonMatchingTool :: PosForMatchSATrack(const xAOD::Muon *mu){
+ const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::ExtrapolatedMuonSpectrometerTrackParticle);
+ return MuonTrack ? std::forward_as_tuple(true, MuonTrack->eta(), MuonTrack->phi()) : std::forward_as_tuple(false, 0., 0.);
+}
+
+std::tuple<bool, double,double> MuonMatchingTool :: PosForMatchCBTrack(const xAOD::Muon *mu){
+ const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::CombinedTrackParticle);
+ return MuonTrack ? std::forward_as_tuple(true, MuonTrack->eta(), MuonTrack->phi()) : std::forward_as_tuple(false, 0., 0.);
}
const xAOD::Muon* MuonMatchingTool :: matchEFSA( const xAOD::Muon *mu, std::string trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFSA()");
- float reqdR = 0.03;
- return match<xAOD::Muon>( mu, trig, reqdR, pass, &MuonMatchingTool::trigPosForMatchEFSA);
+ const xAOD::TrackParticle* MuonTrack = nullptr;
+ using Type = xAOD::Muon::TrackParticleType;
+ std::vector<Type> types { Type::ExtrapolatedMuonSpectrometerTrackParticle,
+ Type::MSOnlyExtrapolatedMuonSpectrometerTrackParticle,
+ Type::MuonSpectrometerTrackParticle};
+ for (Type type : types){
+ MuonTrack = mu->trackParticle(type);
+ if (MuonTrack) break;
+ }
+ return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, &MuonMatchingTool::PosForMatchSATrack) : nullptr;
+}
+
+const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matchEFSALinkInfo( const xAOD::Muon *mu, std::string trig) const {
+ ATH_MSG_DEBUG("MuonMonitoring::matchEFSALinkInfo()");
+ bool pass = false;
+ TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> muonLinkInfo;
+ const xAOD::TrackParticle* MuonTrack = nullptr;
+ using Type = xAOD::Muon::TrackParticleType;
+ std::vector<Type> types { Type::ExtrapolatedMuonSpectrometerTrackParticle,
+ Type::MSOnlyExtrapolatedMuonSpectrometerTrackParticle,
+ Type::MuonSpectrometerTrackParticle};
+ for (Type type : types){
+ MuonTrack = mu->trackParticle(type);
+ if (MuonTrack) break;
+ }
+ return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, &MuonMatchingTool::PosForMatchSATrack) : muonLinkInfo;
}
const xAOD::Muon* MuonMatchingTool :: matchEFCB( const xAOD::Muon *mu, std::string trig, bool &pass) const {
ATH_MSG_DEBUG("MuonMonitoring::matchEFCB()");
- float reqdR = 0.03;
- return match<xAOD::Muon>( mu, trig, reqdR, pass);
+ const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
+ return MuonTrack ? match<xAOD::Muon>( MuonTrack, trig, m_EFreqdR, pass, &MuonMatchingTool::PosForMatchCBTrack) : nullptr;
+}
+
+const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> MuonMatchingTool :: matchEFCBLinkInfo( const xAOD::Muon *mu, std::string trig) const {
+ ATH_MSG_DEBUG("MuonMonitoring::matchEFCBLinkInfo()");
+ bool pass = false;
+ TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> muonLinkInfo;
+ const xAOD::TrackParticle* MuonTrack = mu->trackParticle(xAOD::Muon::TrackParticleType::Primary);
+ return MuonTrack ? matchLinkInfo<xAOD::Muon>(MuonTrack, trig, m_EFreqdR, pass, &MuonMatchingTool::PosForMatchCBTrack) : muonLinkInfo;
}
@@ -74,7 +111,7 @@ const xAOD::L2StandAloneMuon* MuonMatchingTool :: matchL2SA( const xAOD::Muon *
const TrigCompositeUtils::LinkInfo<xAOD::L2StandAloneMuonContainer> MuonMatchingTool :: searchL2SALinkInfo( const xAOD::Muon *mu, std::string trig) const {
ATH_MSG_DEBUG("MuonMonitoring::searchL2SALinkInfo()");
bool pass = false;
- return searchLinkInfo<xAOD::L2StandAloneMuon>( mu, trig, 1000., pass);
+ return matchLinkInfo<xAOD::L2StandAloneMuon>( mu, trig, 1000., pass);
}
@@ -86,7 +123,7 @@ const xAOD::L2CombinedMuon* MuonMatchingTool :: matchL2CB( const xAOD::Muon *mu
const TrigCompositeUtils::LinkInfo<xAOD::L2CombinedMuonContainer> MuonMatchingTool :: searchL2CBLinkInfo( const xAOD::Muon *mu, std::string trig) const {
ATH_MSG_DEBUG("MuonMonitoring::searchL2CBLinkInfo()");
bool pass = false;
- return searchLinkInfo<xAOD::L2CombinedMuon>( mu, trig, 1000., pass);
+ return matchLinkInfo<xAOD::L2CombinedMuon>( mu, trig, 1000., pass);
}
@@ -125,7 +162,7 @@ const xAOD::MuonRoI* MuonMatchingTool :: matchL1( const xAOD::Muon *mu, const E
double dphi = xAOD::P4Helpers::deltaPhi(refPhi, roiPhi);
double dR = sqrt(deta*deta + dphi*dphi);
ATH_MSG_VERBOSE("L1 muon candidate eta=" << roiEta << " phi=" << roiPhi << " dR=" << dR);
- if( dR<reqdR && roiThr>=L1ItemSTI(trig)){
+ if( dR<reqdR && roiThr>=L1ItemStringToInt(trig)){
reqdR = dR;
pass = true;
closest = roi;
@@ -137,40 +174,12 @@ const xAOD::MuonRoI* MuonMatchingTool :: matchL1( const xAOD::Muon *mu, const E
}
-const xAOD::Muon* MuonMatchingTool :: matchL2SAtoOff( const EventContext& ctx, float trigEta, float trigPhi) const {
- return matchOff(ctx, trigEta, trigPhi, m_L2SAreqdR);
+const xAOD::Muon* MuonMatchingTool :: matchL2SAtoOff( const EventContext& ctx, const xAOD::L2StandAloneMuon* samu) const {
+ return matchOff(ctx, samu, m_L2SAreqdR, &MuonMatchingTool::PosForMatchSATrack);
}
-const xAOD::Muon* MuonMatchingTool :: matchL2CBtoOff( const EventContext& ctx, float trigEta, float trigPhi) const {
- return matchOff(ctx, trigEta, trigPhi, m_L2CBreqdR);
-}
-
-const xAOD::Muon* MuonMatchingTool :: matchOff( const EventContext& ctx, float trigEta, float trigPhi, float DR_cut) const {
-
- const xAOD::Muon *muon = nullptr;
-
- SG::ReadHandle<xAOD::MuonContainer> muons(m_MuonContainerKey, ctx);
- if (! muons.isValid() ) {
- ATH_MSG_ERROR("evtStore() does not contain muon Collection with name "<< m_MuonContainerKey);
- return muon;
- }
-
- for(const auto &mu : *muons){
- float offEta = mu->eta();
- float offPhi = mu->phi();
-
- float deta = offEta - trigEta;
- float dphi = xAOD::P4Helpers::deltaPhi(offPhi, trigPhi);
- double dR = sqrt(deta*deta + dphi*dphi);
-
- if(dR < DR_cut){
- DR_cut = dR;
- muon = mu;
- ATH_MSG_DEBUG("* Trigger muon eta=" << trigEta << " phi=" << trigPhi << " offEta=" << offEta << " offPhi=" << offPhi << " dR=" << dR);
- }
- }
-
- return muon;
+const xAOD::Muon* MuonMatchingTool :: matchL2CBtoOff( const EventContext& ctx, const xAOD::L2CombinedMuon* cbmu) const {
+ return matchOff(ctx, cbmu, m_L2CBreqdR, &MuonMatchingTool::PosForMatchCBTrack);
}
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
index acc0b914d1c70b7a20e8532ceaecf7ef1e3860da..a46d29dbcd5fbb929d3f5bfedb1d70f143a9067a 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.h
@@ -32,19 +32,6 @@ class MuonMatchingTool : public AthAlgTool {
virtual StatusCode initialize() override;
- enum L1Items{ L1_MU4=1, L1_MU6, L1_MU10, L1_MU11, L1_MU15, L1_MU20, L1_MU21,ERROR};
- int L1ItemSTI(std::string l1item) const {
- if( "L1_MU4"==l1item) return L1Items::L1_MU4;
- if( "L1_MU6"==l1item) return L1Items::L1_MU6;
- if( "L1_MU10"==l1item) return L1Items::L1_MU10;
- if( "L1_MU11"==l1item) return L1Items::L1_MU11;
- if( "L1_MU15"==l1item) return L1Items::L1_MU15;
- if( "L1_MU20"==l1item) return L1Items::L1_MU20;
- if( "L1_MU21"==l1item) return L1Items::L1_MU21;
- return L1Items::ERROR;
- }
-
-
/**
* @brief Function that searches for a Level 1 muon candidate and judges if it is matched to a given offline muon.
* @param mu Offline muon around which Level 1 candidates are searched.
@@ -107,6 +94,15 @@ class MuonMatchingTool : public AthAlgTool {
*/
const xAOD::Muon* matchEFSA(const xAOD::Muon *mu, std::string trigger, bool &pass) const;
+ /**
+ * @brief Function that searches for an EF standalone muon (EFSA) candidate and judges if it is matched to a given track particle.
+ * @param mu Offline muon around which EFSA candidates are searched.
+ * @param trigger Considered chain name, e.g. HLT_mu26_ivarmedium_L1MU20, etc.
+ * @return Pointer to the matched candidate. This is inValid link when there is no candidate found.
+ * Important: a valid pointer doesn't mean that it passed the hypothesis, users should check @c pass for the decision.
+ */
+ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> matchEFSALinkInfo( const xAOD::Muon *mu, std::string trig) const;
+
/**
* @brief Function that searches for an EF combined muon (EFCB) candidate and judges if it is matched to a given offline muon.
* @param mu Offline muon around which EFCB candidates are searched.
@@ -117,33 +113,31 @@ class MuonMatchingTool : public AthAlgTool {
*/
const xAOD::Muon* matchEFCB(const xAOD::Muon *mu, std::string trigger, bool &pass) const;
-
/**
- * @brief Function that searches for an offline muon within @c DR_cut from the given eta-phi (of a online muon)
- * @param ctx Reference to the @c EventContext needed for accessing the @c Muons container.
- * @param trigEta Eta of the given online muon
- * @param trigPhi Phi of the given online muon
- * @return Pointer to the matched offline muon. This is @c nullptr when there is no muon found.
+ * @brief Function that searches for an EF combined muon (EFCB) candidate and judges if it is matched to a given track particle.
+ * @param mu Offline muon around which EFCB candidates are searched.
+ * @param trigger Considered chain name, e.g. HLT_mu26_ivarmedium_L1MU20, etc.
+ * @return Pointer to the matched candidate. This is inValid link when there is no candidate found.
+ * Important: a valid pointer doesn't mean that it passed the hypothesis, users should check @c pass for the decision.
*/
- const xAOD::Muon* matchOff( const EventContext& ctx, float trigEta, float trigPhi, float DR_cut) const;
+ const TrigCompositeUtils::LinkInfo<xAOD::MuonContainer> matchEFCBLinkInfo( const xAOD::Muon *mu, std::string trig) const;
+
/**
- * @brief Function that searches for an offline muon matched to L2SA muon from the given eta-phi (of a online muon)
+ * @brief Function that searches for an offline muon matched to L2SA muon
* @param ctx Reference to the @c EventContext needed for accessing the @c Muons container.
- * @param trigEta Eta of the given online muon
- * @param trigPhi Phi of the given online muon
+ * @param samu the given online muon
* @return Pointer to the matched offline muon. This is @c nullptr when there is no muon found.
*/
- const xAOD::Muon* matchL2SAtoOff( const EventContext& ctx, float trigEta, float trigPhi) const;
+ const xAOD::Muon* matchL2SAtoOff( const EventContext& ctx, const xAOD::L2StandAloneMuon* samu) const;
/**
- * @brief Function that searches for an offline muon matched to L2CB muon from the given eta-phi (of a online muon)
+ * @brief Function that searches for an offline muon matched to L2CB muon
* @param ctx Reference to the @c EventContext needed for accessing the @c Muons container.
- * @param trigEta Eta of the given online muon
- * @param trigPhi Phi of the given online muon
+ * @param cbmu the given online muon
* @return Pointer to the matched offline muon. This is @c nullptr when there is no muon found.
*/
- const xAOD::Muon* matchL2CBtoOff( const EventContext& ctx, float trigEta, float trigPhi) const;
+ const xAOD::Muon* matchL2CBtoOff( const EventContext& ctx, const xAOD::L2CombinedMuon* cbmu) const;
bool isMatchedL2SA(const xAOD::L2StandAloneMuon*, const xAOD::Muon*) const;
@@ -170,8 +164,21 @@ class MuonMatchingTool : public AthAlgTool {
private:
+ enum L1Items{ L1_MU4=1, L1_MU6, L1_MU10, L1_MU11, L1_MU15, L1_MU20, L1_MU21,ERROR};
+ int L1ItemStringToInt(std::string l1item) const {
+ if( "L1_MU4"==l1item) return L1Items::L1_MU4;
+ if( "L1_MU6"==l1item) return L1Items::L1_MU6;
+ if( "L1_MU10"==l1item) return L1Items::L1_MU10;
+ if( "L1_MU11"==l1item) return L1Items::L1_MU11;
+ if( "L1_MU15"==l1item) return L1Items::L1_MU15;
+ if( "L1_MU20"==l1item) return L1Items::L1_MU20;
+ if( "L1_MU21"==l1item) return L1Items::L1_MU21;
+ return L1Items::ERROR;
+ }
+
const float m_L2SAreqdR = 0.25;
const float m_L2CBreqdR = 0.03;
+ const float m_EFreqdR = 0.03;
// private methods
/**
@@ -184,7 +191,7 @@ class MuonMatchingTool : public AthAlgTool {
* @see MuonMatchingTool.icc for the implementation and MuonMatchingTool.cxx for the instantiation.
* @todo Consider improving the argument list.
*/
- template<class T, class OFFL> const TrigCompositeUtils::LinkInfo<DataVector<T> > searchLinkInfo(const OFFL *offl, std::string trigger, float reqdR, bool &pass,
+ template<class T, class OFFL> const TrigCompositeUtils::LinkInfo<DataVector<T> > matchLinkInfo(const OFFL *offl, std::string trigger, float reqdR, bool &pass,
std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*) = &MuonMatchingTool::trigPosForMatch<T>) const;
/**
@@ -201,6 +208,23 @@ class MuonMatchingTool : public AthAlgTool {
*/
template<class T, class OFFL> const T* match(const OFFL *offl, std::string trigger, float reqdR, bool &pass,
std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*) = &MuonMatchingTool::trigPosForMatch<T>) const;
+
+ /**
+ * @brief Function that searches for an offline muon candidate matched to online muon of type T.
+ * @param trig Position of the online muon used for computing dR.
+ * @param reqdR Requirement of dR used for the matching. Note that reqdR is updated with the dR of the found candidate.
+ * @param offlinePosForMatchFunc Function pointer that implements cuts for the offline muon candidates.
+ * @param trigPosForMatchFunc Function pointer that implements cuts for the online muon candidates.
+ * @return Pointer to the matched candidate. This is @c nullptr when there is no candidate found.
+ * Important: a valid pointer doesn't mean that it passed the hypothesis, users should check @c pass for the decision.
+ * @see MuonMatchingTool.icc for the implementation and MuonMatchingTool.cxx for the instantiation.
+ * @todo Consider improving the argument list.
+ */
+ template<class T> const xAOD::Muon* matchOff(const EventContext& ctx, const T* trig, float reqdR,
+ std::tuple<bool,double,double> (*offlinePosForMatchFunc)(const xAOD::Muon*),
+ std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*) = &MuonMatchingTool::trigPosForMatch<T>) const;
+
+
const Amg::Vector3D offlineMuonAtPivot(const xAOD::Muon *mu) const;
double FermiFunction(double x, double x0, double w) const;
const Trk::TrackParameters* extTrackToTGC(const xAOD::TrackParticle *track) const;
@@ -209,7 +233,8 @@ class MuonMatchingTool : public AthAlgTool {
// static methods
// Template methods that perform different matching schemes for T=xAOD::L2StandAloneMuon, xAOD::L2CombinedMuon and xAOD::Muon (EF).
template<class T> static inline std::tuple<bool,double,double> trigPosForMatch(const T *trig);
- static inline std::tuple<bool,double,double> trigPosForMatchEFSA(const xAOD::Muon *trig);
+ static inline std::tuple<bool,double,double> PosForMatchSATrack(const xAOD::Muon *mu);
+ static inline std::tuple<bool,double,double> PosForMatchCBTrack(const xAOD::Muon *mu);
SG::ReadHandleKey<xAOD::MuonRoIContainer> m_MuonRoIContainerKey {this, "MuonRoIContainerName", "LVL1MuonRoIs", "Level 1 muon container"};
SG::ReadHandleKey<xAOD::MuonContainer> m_MuonContainerKey {this, "MuonContainerName", "Muons", "Offline muon container"};
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.icc b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.icc
index afd22dd3d0af65b518ef5be9c7d7524509a1bdcb..19d1383cd791e1758b53588f0d2c3d2703deef14 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.icc
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/MuonMatchingTool.icc
@@ -17,7 +17,7 @@ const T* MuonMatchingTool :: match(const OFFL* offl, std::string trig, float req
using CONTAINER = DataVector<T>;
const T* ptr = nullptr;
- const TrigCompositeUtils::LinkInfo<CONTAINER> featureLinkInfo = searchLinkInfo<T>(offl, trig, reqdR, pass, trigPosForMatchFunc);
+ const TrigCompositeUtils::LinkInfo<CONTAINER> featureLinkInfo = matchLinkInfo<T>(offl, trig, reqdR, pass, trigPosForMatchFunc);
if( featureLinkInfo.isValid() ){
const ElementLink<CONTAINER> link = featureLinkInfo.link;
ptr = *link;
@@ -29,10 +29,10 @@ const T* MuonMatchingTool :: match(const OFFL* offl, std::string trig, float req
template<class T, class OFFL>
-const TrigCompositeUtils::LinkInfo<DataVector<T> > MuonMatchingTool :: searchLinkInfo(const OFFL* offl, std::string trig, float reqdR, bool &pass,
- std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*)) const {
+const TrigCompositeUtils::LinkInfo<DataVector<T> > MuonMatchingTool :: matchLinkInfo(const OFFL* offl, std::string trig, float reqdR, bool &pass,
+ std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*)) const {
- ATH_MSG_DEBUG("MuonMonitoring::searchLinkInfo<T>");
+ ATH_MSG_DEBUG("MuonMonitoring::matchLinkInfo<T>");
using CONTAINER = DataVector<T>;
@@ -63,3 +63,38 @@ const TrigCompositeUtils::LinkInfo<DataVector<T> > MuonMatchingTool :: searchLin
return muonLinkInfo;
}
+
+
+template<class T>
+const xAOD::Muon* MuonMatchingTool :: matchOff(const EventContext& ctx, const T* trig, float reqdR,
+ std::tuple<bool,double,double> (*offlinePosForMatchFunc)(const xAOD::Muon*), std::tuple<bool,double,double> (*trigPosForMatchFunc)(const T*)) const {
+
+ ATH_MSG_DEBUG("MuonMonitoring::matchOff<T>");
+
+ const xAOD::Muon *muon = nullptr;
+
+ SG::ReadHandle<xAOD::MuonContainer> muons(m_MuonContainerKey, ctx);
+ if (! muons.isValid() ) {
+ ATH_MSG_ERROR("evtStore() does not contain muon Collection with name "<< m_MuonContainerKey);
+ return muon;
+ }
+
+ const auto [trigstatus, trigEta, trigPhi] = trigPosForMatchFunc(trig);
+ if(!trigstatus) return muon;
+
+ for(const auto &mu : *muons){
+ const auto [offstatus, offEta, offPhi] = offlinePosForMatchFunc(mu);
+ if(!offstatus) continue;
+ float deta = offEta - trigEta;
+ float dphi = xAOD::P4Helpers::deltaPhi(offPhi, trigPhi);
+ double dR = sqrt(deta*deta + dphi*dphi);
+
+ if(dR < reqdR){
+ reqdR = dR;
+ muon = mu;
+ ATH_MSG_DEBUG("* Trigger muon eta=" << trigEta << " phi=" << trigPhi << " offEta=" << offEta << " offPhi=" << offPhi << " dR=" << dR);
+ }
+ }
+
+ return muon;
+}
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/components/TrigMuonMonintoringMT_entries.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/components/TrigMuonMonintoringMT_entries.cxx
index 661fcb42ca21bf04e631d531083c47345c93acd7..9d72abf92e1f114432d5a9bede845a76166eb63c 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/components/TrigMuonMonintoringMT_entries.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoringMT/src/components/TrigMuonMonintoringMT_entries.cxx
@@ -5,6 +5,7 @@
#include "../L1MuonMonMT.h"
#include "../L2MuonSAMonMT.h"
#include "../L2muCombMonMT.h"
+#include "../EFMuonMonMT.h"
#include "../TrigMuonEfficiencyMonMT.h"
#include "../MuonMatchingTool.h"
@@ -12,4 +13,5 @@ DECLARE_COMPONENT( TrigMuonEfficiencyMonMT )
DECLARE_COMPONENT( L1MuonMonMT )
DECLARE_COMPONENT( L2MuonSAMonMT )
DECLARE_COMPONENT( L2muCombMonMT )
+DECLARE_COMPONENT( EFMuonMonMT )
DECLARE_COMPONENT( MuonMatchingTool )
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigCorMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigCorMoni.cxx
index e16ae118aa668d76284f156c028344b025a2025d..4390ac3cc89ebdd882eaef38ed45cbd67b222375 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigCorMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigCorMoni.cxx
@@ -12,7 +12,7 @@
#include "TH2I.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigConfInterfaces/ITrigConfigSvc.h"
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
index 4bbffb836d5192f641595a56c14525c08937b80c..ca057d9b5d0835768c858a1d092d4efb04d76990 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigRateMoni.cxx
@@ -19,7 +19,7 @@
#include "GaudiKernel/AlgTool.h"
#include "GaudiKernel/Service.h"
#include "GaudiKernel/IJobOptionsSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigInterfaces/AlgoConfig.h"
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx
index 783b82b9df3a9d62e4abee1f2c5f14bd967ea1ac..531bcad231d090353094bd3f7169b93d704222c4 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoni.cxx
@@ -3,7 +3,7 @@
*/
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigSignatureMoni.h"
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
index affd288ed12d2f32cb9881a15b176294779c819b..1c31a75dea4e8f18dcc9fbce4574dca44b276417 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
@@ -7,7 +7,7 @@
#include<boost/algorithm/string.hpp>
#include "GaudiKernel/IIncidentSvc.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "AthenaInterprocess/Incidents.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigSignatureMoniMT.h"
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
index 22f240f03dc21aab1b97fb726031e832e56fee41..532cd77119c09657053c083b43baf2b7e45dd2fc 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitCategory.py
@@ -43,60 +43,49 @@ monitoring_tau = [
monitoring_tau_pp = [
'tau0_perf_ptonly_L1TAU12',
'tau0_perf_ptonly_L1TAU60',
- 'tau25_idperf_track',
- 'tau25_idperf_tracktwo',
- 'tau25_perf_tracktwo',
- 'tau25_medium1_tracktwo',
- 'tau25_medium1_tracktwoEF',
- 'tau25_mediumRNN_tracktwoMVA',
+ 'tau0_perf_ptonly_L1TAU100',
'tau35_mediumRNN_tracktwoMVA_L1TAU12IM',
- 'tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM', #keep this as reference for the L1Topo plots
- 'mu14_iloose_tau25_perf_tracktwo', # need to move to the ivarloose chain
- 'tau160_idperf_track',
- 'tau160_idperf_tracktwo',
- 'tau160_perf_tracktwo',
- 'tau160_medium1_tracktwo',
'tau25_idperf_track_L1TAU12IM',
'tau25_idperf_tracktwo_L1TAU12IM',
'tau25_perf_tracktwo_L1TAU12IM',
'tau25_medium1_tracktwo_L1TAU12IM',
- 'tau25_idperf_tracktwoMVA_L1TAU12IM', #new
- 'tau25_perf_tracktwoMVA_L1TAU12IM', #new
- 'tau25_medium1_tracktwoMVA_L1TAU12IM', #new
- 'tau25_verylooseRNN_tracktwoMVA_L1TAU12IM', #new
- 'tau25_looseRNN_tracktwoMVA_L1TAU12IM', #new
+ 'tau25_idperf_tracktwoMVA_L1TAU12IM',
+ 'tau25_perf_tracktwoMVA_L1TAU12IM',
+ 'tau25_medium1_tracktwoMVA_L1TAU12IM',
+ 'tau25_verylooseRNN_tracktwoMVA_L1TAU12IM',
+ 'tau25_looseRNN_tracktwoMVA_L1TAU12IM',
'tau25_mediumRNN_tracktwoMVA_L1TAU12IM',
- 'tau25_tightRNN_tracktwoMVA_L1TAU12IM', #new
- 'tau25_verylooseRNN_tracktwo_L1TAU12IM', #new
- 'tau25_looseRNN_tracktwo_L1TAU12IM', #new
- 'tau25_mediumRNN_tracktwo_L1TAU12IM', #new
- 'tau25_tightRNN_tracktwo_L1TAU12IM', #new
+ 'tau25_tightRNN_tracktwoMVA_L1TAU12IM',
+ 'tau25_verylooseRNN_tracktwo_L1TAU12IM',
+ 'tau25_looseRNN_tracktwo_L1TAU12IM',
+ 'tau25_mediumRNN_tracktwo_L1TAU12IM',
+ 'tau25_tightRNN_tracktwo_L1TAU12IM',
'tau25_medium1_tracktwoEF_L1TAU12IM',
'tau160_idperf_track_L1TAU100',
- 'tau0_perf_ptonly_L1TAU100', #new
'tau160_idperf_tracktwo_L1TAU100',
'tau160_perf_tracktwo_L1TAU100',
- 'tau160_idperf_tracktwoMVA_L1TAU100', #new
- 'tau160_perf_tracktwoMVA_L1TAU100' #new
+ 'tau160_idperf_tracktwoMVA_L1TAU100',
+ 'tau160_perf_tracktwoMVA_L1TAU100',
+ 'tau160_mediumRNN_tracktwoMVA_L1TAU100'
]
monitoring_tau_validation = [
'tau0_perf_ptonly_L1TAU12',
'tau0_perf_ptonly_L1TAU60',
- 'tau25_idperf_track',
- 'tau25_idperf_tracktwo',
- 'tau25_perf_ptonly',
- 'tau25_perf_tracktwo',
- 'tau25_medium1_tracktwo',
- 'tau25_loose1_tracktwo',
- 'tau25_tight1_tracktwo',
+ 'tau25_idperf_track_L1TAU12IM',
+ 'tau25_idperf_tracktwo_L1TAU12IM',
+ 'tau25_perf_ptonly_L1TAU12IM',
+ 'tau25_perf_tracktwo_L1TAU12IM',
+ 'tau25_medium1_tracktwo_L1TAU12IM',
+ 'tau25_loose1_tracktwo_L1TAU12IM',
+ 'tau25_tight1_tracktwo_L1TAU12IM',
'tau25_medium1_tracktwo_L1TAU12',
'tau25_medium1_tracktwo_L1TAU12IL',
'tau25_medium1_tracktwo_L1TAU12IT',
- 'tau25_loose1_ptonly',
- 'tau25_medium1_ptonly',
- 'tau25_tight1_ptonly',
+ 'tau25_loose1_ptonly_L1TAU12IM',
+ 'tau25_medium1_ptonly_L1TAU12IM',
+ 'tau25_tight1_ptonly_L1TAU12IM',
'mu14_iloose_tau25_perf_tracktwo',
'tau35_perf_tracktwo',
'tau35_perf_ptonly',
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
index 41b89565859bac661f109e4a6b37213c5de7e445..b2f003c7a9daf36bfe71b43a88d6df1526ea207e 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
@@ -61,7 +61,8 @@ def TrigTauMonitoringTool():
'tau25_looseRNN_tracktwoMVA_L1TAU12IM',
'tau25_mediumRNN_tracktwoMVA_L1TAU12IM',
'tau25_tightRNN_tracktwoMVA_L1TAU12IM',
- 'tau35_mediumRNN_tracktwoMVA_L1TAU12IM'
+ 'tau35_mediumRNN_tracktwoMVA_L1TAU12IM',
+ 'tau160_mediumRNN_tracktwoMVA_L1TAU100'
]
BDTRNN_chains = [
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
index 96ff5acb675efcaf060342b57fb541b055c7ac00..28c5a1d905c0a2f01acbb073589f3fff3c9759fb 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx
@@ -413,7 +413,7 @@ StatusCode HLTTauMonTool::fill() {
bool good_tau_BDT = (*offlinetau)->isTau(xAOD::TauJetParameters::JetBDTSigMedium);
bool good_tau_RNN = (*offlinetau)->isTau(xAOD::TauJetParameters::JetRNNSigMedium);
if(!Selection(*offlinetau)) continue;
- if( !(good_tau_BDT || good_tau_BDT) ) continue;
+ if( !(good_tau_BDT || good_tau_RNN) ) continue;
if (good_tau_BDT) m_taus_BDT.push_back( *offlinetau );
if (good_tau_RNN) m_taus_RNN.push_back( *offlinetau );
}
@@ -1155,15 +1155,12 @@ StatusCode HLTTauMonTool::fillL1Tau(const xAOD::EmTauRoI * aL1Tau){
return StatusCode::FAILURE;
}
- ATH_MSG_DEBUG("Check01");
+
hist("hL1RoIEta")->Fill(aL1Tau->eta());
- ATH_MSG_DEBUG("Check02");
hist("hL1RoIPhi")->Fill(aL1Tau->phi());
- ATH_MSG_DEBUG("Check03");
hist2("hL1EtaVsPhi")->Fill(aL1Tau->eta(),aL1Tau->phi());
- ATH_MSG_DEBUG("Check04");
hist("hL1RoIeT")->Fill(aL1Tau->eT()/GeV);
- ATH_MSG_DEBUG("Check05");
+ ATH_MSG_DEBUG("L1Et: " << aL1Tau->eT()/GeV);
uint8_t isoBit = aL1Tau->isol();
if(isoBit/128) hist("hL1RoIisol")->Fill(8);
@@ -1174,22 +1171,15 @@ StatusCode HLTTauMonTool::fillL1Tau(const xAOD::EmTauRoI * aL1Tau){
if((isoBit/4)%2) hist("hL1RoIisol")->Fill(3);
if((isoBit/2)%2) hist("hL1RoIisol")->Fill(2);
if((isoBit/1)%2) hist("hL1RoIisol")->Fill(1);
- ATH_MSG_DEBUG("Check06");
+
hist("hL1RoITauClus")->Fill(aL1Tau->tauClus()/GeV);
- ATH_MSG_DEBUG("Check07");
//hist("hL1RoITauClus2")->Fill(aL1Tau->tauClus()/GeV);
hist("hL1RoIEMIso")->Fill(aL1Tau->emIsol()/GeV);
- ATH_MSG_DEBUG("Check08");
hist("hL1RoIHadCore")->Fill(aL1Tau->hadCore()/GeV);
- ATH_MSG_DEBUG("Check09");
hist("hL1RoIHadIsol")->Fill(aL1Tau->hadIsol()/GeV);
- ATH_MSG_DEBUG("Check10");
hist2("hL1RoITauClusEMIso")->Fill(aL1Tau->tauClus()/GeV,aL1Tau->emIsol()/GeV);
- ATH_MSG_DEBUG("Check11");
hist2("hL1EtVsPhi")->Fill(aL1Tau->tauClus()/CLHEP::GeV,aL1Tau->phi());
- ATH_MSG_DEBUG("Check12");
hist2("hL1EtVsEta")->Fill(aL1Tau->tauClus()/CLHEP::GeV,aL1Tau->eta());
- ATH_MSG_DEBUG("Check13");
const xAOD::JetRoIContainer *l1jets = 0;
if ( !evtStore()->retrieve( l1jets, "LVL1JetRoIs").isSuccess() ){
@@ -1205,12 +1195,10 @@ StatusCode HLTTauMonTool::fillL1Tau(const xAOD::EmTauRoI * aL1Tau){
float dPhi = deltaPhi(aL1Tau->phi(),(*itL1Jet)->phi());
if(deltaR(aL1Tau->eta(), (*itL1Jet)->eta(), aL1Tau->phi(), (*itL1Jet)->phi()) > 0.3) continue;
hist2("hL1RoITauVsJet")->Fill(aL1Tau->eT()/CLHEP::GeV,(*itL1Jet)->etLarge()/CLHEP::GeV);
- ATH_MSG_DEBUG("Check014");
+ ATH_MSG_DEBUG("L1 Jet etLarge" << (*itL1Jet)->etLarge()/CLHEP::GeV);
if(aL1Tau->eT()>(*itL1Jet)->etLarge()) {
hist2("hL1RoITauVsJetMismatch")->Fill(dEta,dPhi);
- ATH_MSG_DEBUG("Check015");
hist2("hL1RoITauVsJetDEt")->Fill(aL1Tau->eT()/CLHEP::GeV,aL1Tau->eT()/CLHEP::GeV-(*itL1Jet)->etLarge()/CLHEP::GeV);
- ATH_MSG_DEBUG("Check016");
}
}
@@ -1436,6 +1424,7 @@ StatusCode HLTTauMonTool::fillEFTau(const xAOD::TauJet *aEFTau, const std::strin
}
if(aEFTau->detail(xAOD::TauJetParameters::centFrac, centFrac))
{
+ ATH_MSG_DEBUG("centFrac: " << centFrac << " " << trigItem);
hist("hEFcentFrac1PNCorr")->Fill(centFrac);
if ((trigItem == "tau25_medium1_tracktwo") || (m_doEFTProfiles)) profile("hEFcentFrac1PNCmu")->Fill(mu, centFrac);
}
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
index 71b897f1783399bb472a146cc71f53f3a92ee7bb..4f886ea39faccbdb87bdc9e5ea6f1ce13a4573e5 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
@@ -9,6 +9,8 @@ using namespace std;
///////////////////////////////////////////////////////////////////
void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
+
+ ATH_MSG_DEBUG("Now booking histograms for chain: " << trigItem);
bool monRNN (false);
for (unsigned int j=0; j<m_trigRNN_chains.size(); j++) {
@@ -28,53 +30,69 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
if ( (!monBDT) && (!monRNN) ) monBDT=true; // if the chain is not listed in BDTRNN, but it is also not in RNN, then it is BDT
std::string trigItemShort=trigItem;
- if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos){
- size_t posit=trigItem.rfind("_");
- if(posit<31)trigItemShort=trigItem.substr(0,posit);
- }
+ if(trigItem.find("tau25")!=string::npos && trigItem.find("L1TAU")!=string::npos)
+ {
+ size_t posit=trigItem.rfind("_");
+ if(posit<31)trigItemShort=trigItem.substr(0,posit);
+ }
- const int nbin_pt = 13;
- double bins_pt[nbin_pt] = {20.,25.,30.,35.,40.,45.,50.,55.,60.,70.,100.,150.,200.};
+ size_t e=trigItem.find("_");
+ std::string thresh = trigItem.substr(3,e-3);
+ ATH_MSG_DEBUG("This is the chain threshold" << thresh << " e" << e);
+ size_t l=trigItem.length();
+ size_t last=trigItem.rfind("_");
+ std::string L1thresh = trigItem.substr(last+6,l);
+ if(L1thresh.find("IM")!=std::string::npos) {L1thresh.pop_back();L1thresh.pop_back();}
-// const int nbin_leppt = 32;
-// double bins_leppt[nbin_leppt] = {10.,11.,12.,13.,14.,15.,16.,17.,18.,19.,20.,21.,22.,23.,24.,25.,26.,27.,28.,29.,30.,32.,34.,36.,38.,40.,45.,50.,60.,70.,80.,100.};
- const int nbin_eta = 9;
- double bins_eta[nbin_eta] = {-2.47,-1.52,-1.37,-0.69,0.,0.69,1.37,1.52,2.47};
- const int nbin_nvtx = 6;
- double bins_nvtx[nbin_nvtx] = {0.,5.,10.,15.,20.,25.};
+ ATH_MSG_DEBUG("This is the L1 threshold" << L1thresh );
+
+ const int nbin_pt = 13;
+ double bins_pt[nbin_pt] = {20.,25.,30.,35.,40.,45.,50.,55.,60.,70.,100.,150.,200.};
+
+
+ // const int nbin_leppt = 32;
+ // double bins_leppt[nbin_leppt] = {10.,11.,12.,13.,14.,15.,16.,17.,18.,19.,20.,21.,22.,23.,24.,25.,26.,27.,28.,29.,30.,32.,34.,36.,38.,40.,45.,50.,60.,70.,80.,100.};
+ const int nbin_eta = 9;
+ double bins_eta[nbin_eta] = {-2.47,-1.52,-1.37,-0.69,0.,0.69,1.37,1.52,2.47};
+ const int nbin_nvtx = 6;
+ double bins_nvtx[nbin_nvtx] = {0.,5.,10.,15.,20.,25.};
for(int i=0;i<nbin_nvtx;i++) bins_nvtx[i] = i*5.;
- const int nbin_mu = 34;
- float bins_mu[nbin_mu] = {0.,2.,4.,6.,8.,10.,12.,14.,16.,18.,20.,22.,24.,26.,28.,30.,32.,34.,36.,38.,40., 42., 44., 44., 46., 48., 50., 52., 54., 56., 58., 60., 62., 72};
+ const int nbin_mu = 34;
+ float bins_mu[nbin_mu] = {0.,2.,4.,6.,8.,10.,12.,14.,16.,18.,20.,22.,24.,26.,28.,30.,32.,34.,36.,38.,40., 42., 44., 44., 46., 48., 50., 52., 54., 56., 58., 60., 62., 72};
for(int i=0;i<nbin_mu;i++) bins_mu[i] = i*2.;
-// const int nbin_met = 14;
-// double bins_met[nbin_met] = {0.,5.,10.,20.,25.,30.,35.,40.,45.,50.,60.,70.,100.,150.};
-// const int nbin_dr = 18;
-// double bins_dr[nbin_dr] = {0.,0.5,1.,1.5,1.8,2.,2.2,2.3,2.4,2.5,2.6,2.7,2.8,2.9,3.0,3.1,3.2,3.4};
+ // const int nbin_met = 14;
+ // double bins_met[nbin_met] = {0.,5.,10.,20.,25.,30.,35.,40.,45.,50.,60.,70.,100.,150.};
+ // const int nbin_dr = 18;
+ // double bins_dr[nbin_dr] = {0.,0.5,1.,1.5,1.8,2.,2.2,2.3,2.4,2.5,2.6,2.7,2.8,2.9,3.0,3.1,3.2,3.4};
- // define here all histograms
- //L1 Roi
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/L1RoI",run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/L1RoI");
- ATH_MSG_DEBUG("After setting CurrentMonGroup" << "HLT/TauMon/Expert/"+trigItemShort+"/L1RoI");
- addHistogram(new TH1F("hL1RoIEta","L1 RoI Eta ; #eta; N RoI",100,-2.6,2.6));
- addHistogram(new TH1F("hL1RoIPhi","L1 RoI Phi ; #phi; N RoI",100,-3.2,3.2));
+ // define here all histograms
+ //L1 Roi
+ float uL1limit = 4*std::stof(L1thresh);
+ float bL1limit = std::stof(L1thresh)-10.;
+ float uEFlimit = 2*std::stof(thresh);
+
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/L1RoI",run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/L1RoI");
+ ATH_MSG_DEBUG("After setting CurrentMonGroup" << "HLT/TauMon/Expert/"+trigItemShort+"/L1RoI");
+ addHistogram(new TH1F("hL1RoIEta","L1 RoI Eta ; #eta; N RoI",100,-2.6,2.6));
+ addHistogram(new TH1F("hL1RoIPhi","L1 RoI Phi ; #phi; N RoI",100,-3.2,3.2));
addHistogram(new TH2F("hL1EtaVsPhi","L1 RoI Eta vs Phi; #eta; #phi",100,-2.6,2.6,100,-3.2,3.2));
addHistogram(new TH1F("hL1RoIisol","L1 RoI Isolation; RoI Isolation Bit; N RoI",10,0.5,9.5));
- addHistogram(new TH1F("hL1RoIeT","L1 RoI Tau Clust Energy; E_{T}[GeV]; N RoI",260,0.,130.));
- addHistogram(new TH1F("hL1RoITauClus","L1 RoI Tau Clust Energy; E_{T}[GeV]; N RoI",260,0.,130.));
- //addHistogram(new TH1F("hL1RoITauClus2","L1 RoI Tau Clust Energy; E_{T}[GeV]; N RoI",200,0.,1000.));
- addHistogram(new TH1F("hL1RoIEMIso","L1 RoI EM Isol ; E_{T}^{EM Isol}[GeV]; N RoI",16,-2,30));
- addHistogram(new TH1F("hL1RoIHadCore","L1 RoI HAD Core ; E_{T}^{HAD}[GeV]; N RoI",16,-2,30));
- addHistogram(new TH1F("hL1RoIHadIsol","L1 RoI HAD Isol ; E_{T}^{HAD Isol}[GeV]; N RoI",16,-2,30));
- addHistogram(new TH2F("hL1RoITauClusEMIso","L1 RoI TauClus vs EMiso ; E_{T}[GeV]; E_{T}^{EM Isol}[GeV]",140.,10.,80.,42,-1.,20.));
- addHistogram(new TH2F("hL1RoITauVsJet","L1 RoI Tau Et vs Jet Et ; Tau E_{T} [GeV]; Jet E_{T} [GeV]",200,0.,100.,200,0.,100));
- addHistogram(new TH2F("hL1RoITauVsJetMismatch","L1 RoI Tau-Jet deta-dphi if Jet Et< Tau Et ; d#eta; d#phi",50,-0.3,0.3,50,-0.3,0.3));
- addHistogram(new TH2F("hL1RoITauVsJetDEt","L1 RoI Tau-Jet dEt if Jet Et< Tau Et ; Tau E_{t}; dE_{T}",200,0.,100.,50,0.,25.));
- addHistogram(new TH2F("hL1EtVsPhi","L1 RoI Et vs Phi; E_{T}[GeV]; #phi",100,0.,100.,100,-3.2,3.2));
- addHistogram(new TH2F("hL1EtVsEta","L1 RoI Et vs Eta; E_{T}[GeV]; #eta",100,0.,100.,100,-2.6,2.6));
+ addHistogram(new TH1F("hL1RoIeT","L1 RoI Tau Clust Energy; E_{T}[GeV]; N RoI",100,bL1limit,uL1limit));
+ addHistogram(new TH1F("hL1RoITauClus","L1 RoI Tau Clust Energy; E_{T}[GeV]; N RoI",100,bL1limit,uL1limit));
+ //addHistogram(new TH1F("hL1RoITauClus2","L1 RoI Tau Clust Energy; E_{T}[GeV]; N RoI",200,0.,1000.));
+ addHistogram(new TH1F("hL1RoIEMIso","L1 RoI EM Isol ; E_{T}^{EM Isol}[GeV]; N RoI",16,-2,30));
+ addHistogram(new TH1F("hL1RoIHadCore","L1 RoI HAD Core ; E_{T}^{HAD}[GeV]; N RoI",16,-2,30));
+ addHistogram(new TH1F("hL1RoIHadIsol","L1 RoI HAD Isol ; E_{T}^{HAD Isol}[GeV]; N RoI",16,-2,30));
+ addHistogram(new TH2F("hL1RoITauClusEMIso","L1 RoI TauClus vs EMiso ; E_{T}[GeV]; E_{T}^{EM Isol}[GeV]",100,bL1limit,uL1limit,42,-1.,20.));
+ addHistogram(new TH2F("hL1EtVsPhi","L1 RoI Et vs Phi; E_{T}[GeV]; #phi",100,bL1limit,uL1limit,100,-3.2,3.2));
+ addHistogram(new TH2F("hL1EtVsEta","L1 RoI Et vs Eta; E_{T}[GeV]; #eta",100,bL1limit,uL1limit,100,-2.6,2.6));
+ addHistogram(new TH2F("hL1RoITauVsJet","L1 RoI Tau Et vs Jet Et ; Tau E_{T} [GeV]; Jet E_{T} [GeV]",100,bL1limit,uL1limit,100,bL1limit,6*std::stof(L1thresh)));
+ addHistogram(new TH2F("hL1RoITauVsJetMismatch","L1 RoI Tau-Jet deta-dphi if Jet Et< Tau Et ; d#eta; d#phi",50,-0.3,0.3,50,-0.3,0.3));
+ addHistogram(new TH2F("hL1RoITauVsJetDEt","L1 RoI Tau-Jet dEt if Jet Et< Tau Et ; Tau E_{t}; dE_{T}",100,bL1limit,uL1limit,100,0.,200.));
if (m_doL1JetPlots)
{
@@ -83,21 +101,21 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
addHistogram(new TH2F("hL1RoITauVsJetDEt","L1 RoI Tau-Jet dEt if Jet Et< Tau Et ; Tau E_{t}; dE_{T}",200,0.,100.,50,0.,25.));
addHistogram(new TH1F("hL1JetRoIEta","L1 Jet RoI Eta ; #eta; N RoI",100,-3.2,3.2));
- addHistogram(new TH1F("hL1JetRoIPhi","L1 Jet RoI Phi ; #phi; N RoI",100,-3.2,3.2));
- addHistogram(new TH2F("hL1JetEtaVsPhi","L1 Jet RoI Eta vs Phi; #eta; #phi",100,-3.2,3.2,100,-3.2,3.2));
- addHistogram(new TH1F("hL1JetRoIeT","L1 Jet RoI Energy; E_{T}[GeV]; N RoI",200,0.,100.));
- addHistogram(new TH2F("hL1JetEtVsPhi","L1 Jet RoI Et vs Phi; E_{T}[GeV]; #phi",100,0.,100.,100,-3.2,3.2));
- addHistogram(new TH2F("hL1JetEtVsEta","L1 Jet RoI Et vs Eta; E_{T}[GeV]; #eta",100,0.,100.,100,-3.2,3.2));
+ addHistogram(new TH1F("hL1JetRoIPhi","L1 Jet RoI Phi ; #phi; N RoI",100,-3.2,3.2));
+ addHistogram(new TH2F("hL1JetEtaVsPhi","L1 Jet RoI Eta vs Phi; #eta; #phi",100,-3.2,3.2,100,-3.2,3.2));
+ addHistogram(new TH1F("hL1JetRoIeT","L1 Jet RoI Energy; E_{T}[GeV]; N RoI",200,0.,100.));
+ addHistogram(new TH2F("hL1JetEtVsPhi","L1 Jet RoI Et vs Phi; E_{T}[GeV]; #phi",100,0.,100.,100,-3.2,3.2));
+ addHistogram(new TH2F("hL1JetEtVsEta","L1 Jet RoI Et vs Eta; E_{T}[GeV]; #eta",100,0.,100.,100,-3.2,3.2));
}
- //--------------------
- //Pre-selection Tau
- //--------------------
+ //--------------------
+ //Pre-selection Tau
+ //--------------------
// no preselection taus for some chains
// tracktwoEFmvaTES catched with tracktwoEF
if(trigItem.find("tracktwoMVA")==string::npos && trigItem.find("tracktwoEF")==string::npos && trigItem.find("ptonly")==string::npos) {
addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/PreselectionTau",run));
setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PreselectionTau");
- addHistogram(new TH1F("hEFEt","EF Et;E_{T}[GeV];Nevents",40,0.0,100.0));
+ addHistogram(new TH1F("hEFEt","EF Et;E_{T}[GeV];Nevents",100,bL1limit,uEFlimit));
addHistogram(new TH1F("hEFEt2","EF Et;E_{T}[GeV];Nevents",100,0.0,1000.0));
addHistogram(new TH1F("hFTFnTrack","EF number of tracks;number of tracks;Nevents",10,0,10));
addHistogram(new TH1F("hEta","EF TrigCaloCluster Eta; #eta ; Nevents",26,-2.6,2.6));
@@ -106,36 +124,36 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
addHistogram(new TH2F("hEFEtaVsPhi","EF TrigCaloCluster Eta vs Phi; #eta ; #phi ; Nevents",
26,-2.6,2.6,32,-3.2,3.2));
addHistogram(new TH2F("hEtVsEta","Et from tau Jet vs #eta; #eta^{EF}; Raw E_{T}[GeV]",
- 26,-2.6,2.6,40,0.0,100.0));
+ 26,-2.6,2.6,100,bL1limit,uEFlimit));
addHistogram(new TH2F("hEtVsPhi","Et from tau Jet vs #phi; #phi^{EF}; Raw E_{T} [GeV]",
- 32,-3.2,3.2,40,0.0,100.0));
+ 32,-3.2,3.2,100,bL1limit,uEFlimit));
addHistogram(new TH1F("hFTFnWideTrack","EF number of wide tracks;number of tracks;Nevents",10,0,10));
}
- //--------------------
- // EF
- //--------------------
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFTau",run));
- ATH_MSG_DEBUG("After adding MonGroup Check21 "<< trigItemShort);
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFTau");
- //Basic kinematic variables
- addHistogram(new TH1F("hEFEt","EF Et;E_{T}[GeV];Nevents",50,0.0,100.0));
- addHistogram(new TH1F("hEFEta","EF TrigCaloCluster Eta; #eta ; Nevents",26,-2.6,2.6));
- addHistogram(new TH1F("hEFNUM","Online mu; Online #mu ; Nevents",100,0,100));
- addHistogram(new TH2F("hEFNUMvsmu","Online vs offline mu; Online #mu ; Offline #mu", 100,0,100,100,0,100));
- addHistogram(new TH1F("hEFPhi","EF TrigCaloCluster Phi; #phi ; Nevents",16,-3.2,3.2));
- addHistogram(new TH1F("hEFnTrack","EF number of tracks;number of tracks;Nevents",10,0,10));
- addHistogram(new TH2F("hEFEtaVsPhi","EF TrigCaloCluster Eta vs Phi; #eta ; #phi ; Nevents",26,-2.6,2.6,16,-3.2,3.2));
- addHistogram(new TH2F("hEFEtVsPhi","Et from tau Jet vs #phi; #phi^{EF}; Raw E_{T} [GeV]",16,-3.2,3.2,50,0.0,100.0));
- addHistogram(new TH2F("hEFEtVsEta","Et from tau Jet vs #eta; #eta^{EF}; Raw E_{T}[GeV]",26,-2.6,2.6,50,0.0,100.0));
- addHistogram(new TH1F("hEFEtRaw","EF Et Raw;Uncalibrated E_{T}[GeV];Nevents",50,0.,100.));
- addHistogram(new TH1F("hEFnWideTrack","EF number of wide tracks;number of tracks;Nevents",10,0,10));
- //other variables not used in BDT
- //addHistogram(new TH1F("hEFEMRadius","EF EMRadius;EM Radius;Clusters",50,-0.1,0.5));
- //addHistogram(new TH1F("hEFHADRadius","EF HADRadius;HAD Radius;Clusters",50,-0.1,0.5));
- addHistogram(new TH1F("hEFIsoFrac", "Iso Fraction at EF; isoFrac at EF; Candidates",50,-0.1,1.1));
- //addHistogram(new TH1F("hEFPSSFraction", "PSS Fraction at EF; PSS at EF; Candidates",50,-0.05,1.1));
- addHistogram(new TH1F("hEFEMFraction", "Em Fraction at EF; EM Fraction at EF; Candidates",50,-0.05,1.1));
+ //--------------------
+ // EF
+ //--------------------
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFTau",run));
+ ATH_MSG_DEBUG("After adding MonGroup Check21 "<< trigItemShort);
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFTau");
+ //Basic kinematic variables
+ addHistogram(new TH1F("hEFEt","EF Et;E_{T}[GeV];Nevents",100,bL1limit,uEFlimit));
+ addHistogram(new TH1F("hEFEta","EF TrigCaloCluster Eta; #eta ; Nevents",26,-2.6,2.6));
+ addHistogram(new TH1F("hEFNUM","Online mu; Online #mu ; Nevents",100,0,100));
+ addHistogram(new TH2F("hEFNUMvsmu","Online vs offline mu; Online #mu ; Offline #mu", 100,0,100,100,0,100));
+ addHistogram(new TH1F("hEFPhi","EF TrigCaloCluster Phi; #phi ; Nevents",16,-3.2,3.2));
+ addHistogram(new TH1F("hEFnTrack","EF number of tracks;number of tracks;Nevents",10,0,10));
+ addHistogram(new TH2F("hEFEtaVsPhi","EF TrigCaloCluster Eta vs Phi; #eta ; #phi ; Nevents",26,-2.6,2.6,16,-3.2,3.2));
+ addHistogram(new TH2F("hEFEtVsPhi","Et from tau Jet vs #phi; #phi^{EF}; Raw E_{T} [GeV]",16,-3.2,3.2,100,bL1limit,uEFlimit));
+ addHistogram(new TH2F("hEFEtVsEta","Et from tau Jet vs #eta; #eta^{EF}; Raw E_{T}[GeV]",26,-2.6,2.6,100,bL1limit,uEFlimit));
+ addHistogram(new TH1F("hEFEtRaw","EF Et Raw;Uncalibrated E_{T}[GeV];Nevents",100,bL1limit,uEFlimit));
+ addHistogram(new TH1F("hEFnWideTrack","EF number of wide tracks;number of tracks;Nevents",10,0,10));
+ //other variables not used in BDT
+ //addHistogram(new TH1F("hEFEMRadius","EF EMRadius;EM Radius;Clusters",50,-0.1,0.5));
+ //addHistogram(new TH1F("hEFHADRadius","EF HADRadius;HAD Radius;Clusters",50,-0.1,0.5));
+ addHistogram(new TH1F("hEFIsoFrac", "Iso Fraction at EF; isoFrac at EF; Candidates",50,-0.1,1.1));
+ //addHistogram(new TH1F("hEFPSSFraction", "PSS Fraction at EF; PSS at EF; Candidates",50,-0.05,1.1));
+ addHistogram(new TH1F("hEFEMFraction", "Em Fraction at EF; EM Fraction at EF; Candidates",50,-0.05,1.1));
if (monBDT) {
addHistogram(new TH1F("hScore1p", "1p BDT Score; HLT BDT Score; Candidates",50,0.,1.));
addHistogram(new TH1F("hScoremp", "mp BDT Score; HLT BDT Score; Candidates",50,0.,1.));
@@ -154,14 +172,14 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
addHistogram(new TH1F("hEFptRatioEflowApprox1PNCorr", "ptRatioEflowApprox at EF 1-prong non-corrected; ptRatioEflowApprox at EF; Candidates",50,0.0,2.0));
if ((trigItem == "tau25_medium1_tracktwo") || (m_doEFTProfiles)) // keep the EF TProfiles of lowest single tau or if flag is turned on for the rest of the chains
{
- addProfile(new TProfile("hEFinnerTrkAvgDist1PNCmu", "InnerTrkAvgDist at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFetOverPtLeadTrk1PNCmu", "EtOverPtLeadTrk at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFipSigLeadTrk1PNCmu", "IpSigLeadTrk at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFSumPtTrkFrac1PNCmu", "SumPtTrkFrac at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFChPiEMEOverCaloEME1PNCmu", "ChPiEMEOverCaloEME at EF vs mu 1p non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFEMPOverTrkSysP1PNCmu", "EMPOverTrkSysP at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFcentFrac1PNCmu", "Centrality Fraction at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFptRatioEflowApprox1PNCmu", "ptRatioEflowApprox at EF vs mu 1p non-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFinnerTrkAvgDist1PNCmu", "InnerTrkAvgDist at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFetOverPtLeadTrk1PNCmu", "EtOverPtLeadTrk at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFipSigLeadTrk1PNCmu", "IpSigLeadTrk at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFSumPtTrkFrac1PNCmu", "SumPtTrkFrac at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFChPiEMEOverCaloEME1PNCmu", "ChPiEMEOverCaloEME at EF vs mu 1p non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFEMPOverTrkSysP1PNCmu", "EMPOverTrkSysP at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFcentFrac1PNCmu", "Centrality Fraction at EF vs mu 1-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFptRatioEflowApprox1PNCmu", "ptRatioEflowApprox at EF vs mu 1p non-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
}
//BDT inputs for 3-prong Non-Corrected
addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFTau/BDT/mp_nonCorrected",run));
@@ -178,16 +196,16 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
addHistogram(new TH1F("hEFmEflowApproxMPNCorr", "mEflowApprox at EF m-prong non-corrected; mEflowApprox at EF ; Candidates",61,-0.2,60.2));
if ((trigItem == "tau25_medium1_tracktwo") || (m_doEFTProfiles)) // keep the EF TProfiles of lowest single tau or if flag is turned on for the rest of the chains
{
- addProfile(new TProfile("hEFinnerTrkAvgDistMPNCmu", "InnerTrkAvgDist at EF vs mu m-prong non-corrected; Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFetOverPtLeadTrkMPNCmu", "EtOverPtLeadTrk at EF vs mu m-prong non-corrected; Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFChPiEMEOverCaloEMEMPNCmu", "ChPiEMEOverCaloEME at EF vs mu mp non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFEMPOverTrkSysPMPNCmu", "EMPOverTrkSysP at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFcentFracMPNCmu", "Centrality Fraction at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFptRatioEflowApproxMPNCmu", "ptRatioEflowApprox at EF vs mu mp non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFdRmaxMPNCmu", "Max dR of associated tracks at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFtrFlightPathSigMPNCmu", "TrFlightPathSig at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFmassTrkSysMPNCmu", "MassTrkSys at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFmEflowApproxMPNCmu", "mEflowApprox at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFinnerTrkAvgDistMPNCmu", "InnerTrkAvgDist at EF vs mu m-prong non-corrected; Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFetOverPtLeadTrkMPNCmu", "EtOverPtLeadTrk at EF vs mu m-prong non-corrected; Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFChPiEMEOverCaloEMEMPNCmu", "ChPiEMEOverCaloEME at EF vs mu mp non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFEMPOverTrkSysPMPNCmu", "EMPOverTrkSysP at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFcentFracMPNCmu", "Centrality Fraction at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFptRatioEflowApproxMPNCmu", "ptRatioEflowApprox at EF vs mu mp non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFdRmaxMPNCmu", "Max dR of associated tracks at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFtrFlightPathSigMPNCmu", "TrFlightPathSig at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFmassTrkSysMPNCmu", "MassTrkSys at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFmEflowApproxMPNCmu", "mEflowApprox at EF vs mu m-prong non-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
}
//BDT inputs for 1-prong mu-Corrected
@@ -202,16 +220,16 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
addHistogram(new TH1F("hEFcentFrac1PCorr", "Centrality Fraction at EF 1-prong mu-corrected; centFrac at EF; Candidates",50,-0.05,1.2));
addHistogram(new TH1F("hEFptRatioEflowApprox1PCorr", "ptRatioEflowApprox at EF 1-prong mu-corrected; ptRatioEflowApprox at EF; Candidates",50,0.0,2.0));
if ((trigItem == "tau25_medium1_tracktwo") || (m_doEFTProfiles)) // keep the EF TProfiles of lowest single tau or if flag is turned on for the rest of the chains
- {
- addProfile(new TProfile("hEFinnerTrkAvgDist1PCmu", "InnerTrkAvgDist at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFetOverPtLeadTrk1PCmu", "EtOverPtLeadTrk at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFipSigLeadTrk1PCmu", "IpSigLeadTrk at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFSumPtTrkFrac1PCmu", "SumPtTrkFrac at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFChPiEMEOverCaloEME1PCmu", "ChPiEMEOverCaloEME at EF vs mu 1p mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFEMPOverTrkSysP1PCmu", "EMPOverTrkSysP at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFcentFrac1PCmu", "Centrality Fraction at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFptRatioEflowApprox1PCmu", "ptRatioEflowApprox at EF vs mu 1p mu-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
- }
+ {
+ addProfile(new TProfile("hEFinnerTrkAvgDist1PCmu", "InnerTrkAvgDist at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFetOverPtLeadTrk1PCmu", "EtOverPtLeadTrk at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFipSigLeadTrk1PCmu", "IpSigLeadTrk at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFSumPtTrkFrac1PCmu", "SumPtTrkFrac at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFChPiEMEOverCaloEME1PCmu", "ChPiEMEOverCaloEME at EF vs mu 1p mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFEMPOverTrkSysP1PCmu", "EMPOverTrkSysP at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFcentFrac1PCmu", "Centrality Fraction at EF vs mu 1-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFptRatioEflowApprox1PCmu", "ptRatioEflowApprox at EF vs mu 1p mu-corrected;Average interactions per bunch crossing ;",nbin_mu-1,bins_mu));
+ }
//BDT inputs for 3-prong mu-Corrected
addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFTau/BDT/mp_Corrected",run));
setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFTau/BDT/mp_Corrected");
@@ -226,18 +244,18 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
addHistogram(new TH1F("hEFmassTrkSysMPCorr", "MassTrkSys at EF m-prong mu-corrected; massTrkSys at EF [GeV]; Candidates",50,-0.1,15.0));
addHistogram(new TH1F("hEFmEflowApproxMPCorr", "mEflowApprox at EF m-prong mu-corrected; mEflowApprox at EF ; Candidates",61,-0.2,60.2));
if ((trigItem == "tau25_medium1_tracktwo") || (m_doEFTProfiles)) // keep the EF TProfiles of lowest single tau or if flag is turned on for the rest of the chains
- {
- addProfile(new TProfile("hEFinnerTrkAvgDistMPCmu", "InnerTrkAvgDist at EF vs mu m-prong mu-corrected; Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFetOverPtLeadTrkMPCmu", "EtOverPtLeadTrk at EF vs mu m-prong mu-corrected; Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFChPiEMEOverCaloEMEMPCmu", "ChPiEMEOverCaloEME at EF vs mu mp mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFEMPOverTrkSysPMPCmu", "EMPOverTrkSysP at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFcentFracMPCmu", "Centrality Fraction at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFptRatioEflowApproxMPCmu", "ptRatioEflowApprox at EF vs mu mp mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFdRmaxMPCmu", "Max dR of associated tracks at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFtrFlightPathSigMPCmu", "TrFlightPathSig at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFmassTrkSysMPCmu", "MassTrkSys at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEFmEflowApproxMPCmu", "mEflowApprox at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- }
+ {
+ addProfile(new TProfile("hEFinnerTrkAvgDistMPCmu", "InnerTrkAvgDist at EF vs mu m-prong mu-corrected; Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFetOverPtLeadTrkMPCmu", "EtOverPtLeadTrk at EF vs mu m-prong mu-corrected; Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFChPiEMEOverCaloEMEMPCmu", "ChPiEMEOverCaloEME at EF vs mu mp mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFEMPOverTrkSysPMPCmu", "EMPOverTrkSysP at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFcentFracMPCmu", "Centrality Fraction at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFptRatioEflowApproxMPCmu", "ptRatioEflowApprox at EF vs mu mp mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFdRmaxMPCmu", "Max dR of associated tracks at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFtrFlightPathSigMPCmu", "TrFlightPathSig at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFmassTrkSysMPCmu", "MassTrkSys at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEFmEflowApproxMPCmu", "mEflowApprox at EF vs mu m-prong mu-corrected;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ }
} // end of if(monBDT)
// RNN variables
if (monRNN)
@@ -308,20 +326,20 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
}
- //--------------------
- // L1 vs Offline
- //--------------------
+ //--------------------
+ // L1 vs Offline
+ //--------------------
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/L1VsOffline",run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/L1VsOffline");
- addHistogram(new TH1F("hL1EtRatio","L1 Et Relative difference; Et relative diff; Et relative diff",50,-0.8,0.8));
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/L1VsOffline",run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/L1VsOffline");
+ addHistogram(new TH1F("hL1EtRatio","L1 Et Relative difference; Et relative diff; Et relative diff",50,-0.8,0.8));
- //--------------------
- //Pre selection vs Offline
- //--------------------
+ //--------------------
+ //Pre selection vs Offline
+ //--------------------
- if(trigItem.find("tracktwoMVA")==string::npos && trigItem.find("tracktwoEF")==string::npos && trigItem.find("ptonly")==string::npos) {
+ if(trigItem.find("tracktwoMVA")==string::npos && trigItem.find("tracktwoEF")==string::npos && trigItem.find("ptonly")==string::npos) {
addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/PreselectionVsOffline",run));
setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/PreselectionVsOffline");
addHistogram(new TH2F("hPreselvsOffnTrks","nTrks at FTF vs Off; nTrks off; nTrks FTF",10,0,10,10,0,10));
@@ -331,275 +349,275 @@ void HLTTauMonTool::bookHistogramsForItem(const std::string & trigItem){
addHistogram(new TH1F("hPhiRatio","FTF-Offline Phi Relative difference; Phi relative diff; Phi relative diff",50,-0.05,0.05));
}
- if(m_truth){
- //----------------
- // EF vs Truth
- //----------------
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFVsTruth",run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFVsTruth");
- addProfile(new TProfile("hEtRatiovspt","Relative difference in Et (EF-Truth)/Truth vs Truth Tau pT;Truth Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hEtRatiovseta","Relative difference in Et (EF-Truth)/Truth vs Truth Tau eta;Truth Tau #eta;",nbin_eta-1,bins_eta));
- addProfile(new TProfile("hEtRatiovsphi","Relative difference in Et (EF-Truth)/Truth vs Truth Tau phi;Truth Tau #phi;",40,-3.2,3.2));
- addProfile(new TProfile("hEtRatiovsmu","Relative difference in Et (EF-Truth)/Truth vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- }
- //-------------------
+ if(m_truth){
+ //----------------
+ // EF vs Truth
+ //----------------
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFVsTruth",run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFVsTruth");
+ addProfile(new TProfile("hEtRatiovspt","Relative difference in Et (EF-Truth)/Truth vs Truth Tau pT;Truth Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hEtRatiovseta","Relative difference in Et (EF-Truth)/Truth vs Truth Tau eta;Truth Tau #eta;",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("hEtRatiovsphi","Relative difference in Et (EF-Truth)/Truth vs Truth Tau phi;Truth Tau #phi;",40,-3.2,3.2));
+ addProfile(new TProfile("hEtRatiovsmu","Relative difference in Et (EF-Truth)/Truth vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ }
+ //-------------------
-//EF vs Offline
- //-------------------
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline",run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline");
- //Basic Kinematic Vars
- addHistogram(new TH1F("hptRatio","Relative difference in pt (EF-Offline)/Offline; pt relative diff;", 100,-0.3,0.3));
- addHistogram(new TH1F("hetaRatio","Relative difference in eta (EF-Offline)/Offline; eta relative diff;", 100,-0.3,0.3));
- addHistogram(new TH1F("hphiRatio","Relative difference in phi (EF-Offline)/Offline; phi relative diff;", 100,-0.2,0.2));
- addHistogram(new TH2F("hEFvsOffnTrks","nTrks at EF vs Off; nTrks off; nTrks EF",10,0,10,10,0,10));
- addHistogram(new TH2F("hEFvsOffnWideTrks","nWideTrks at EF vs Off; nWideTrks off; nWideTrks EF",10,0,10,10,0,10));
- //Other Vars
- //addHistogram(new TH1F("hEMRadiusRatio","Relative difference in EMRadius ;EMRadius relative diff;",50,-0.3,0.3));
- //addHistogram(new TH1F("hHadRadiusRatio","Relative difference in HadRadius ;HadRadius relative diff;",50,-0.3,0.3));
- addHistogram(new TH1F("hIsoFracRatio","Relative difference in IsoFrac;IsoFrac relative diff;",50,-0.3,0.3));
- //addHistogram(new TH1F("hPSSFracRatio","Relative difference in PSSFrac;PSSFrac relative diff;",50,-0.3,0.3));
- addHistogram(new TH1F("hEMFracRatio","Relative difference in EMFrac;EMFrac relative diff;",50,-0.3,0.3));
- addHistogram(new TH1F("hEtRawRatio","Relative difference in EtRaw;EtRaw relative diff;",50,-0.3,0.3));
- addHistogram(new TH1F("hOffEFEMDiff","Relative difference in EM energy (EF-Offline)/Offline; EM energy relative diff;", 50,-0.1,0.1));
- addHistogram(new TH1F("hOffEFHADDiff","Relative difference in HAD energy (EF-Offline)/Offline; HAD energy relative diff;", 50,-0.1,0.1));
+ //EF vs Offline
+ //-------------------
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline",run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline");
+ //Basic Kinematic Vars
+ addHistogram(new TH1F("hptRatio","Relative difference in pt (EF-Offline)/Offline; pt relative diff;", 100,-0.3,0.3));
+ addHistogram(new TH1F("hetaRatio","Relative difference in eta (EF-Offline)/Offline; eta relative diff;", 100,-0.3,0.3));
+ addHistogram(new TH1F("hphiRatio","Relative difference in phi (EF-Offline)/Offline; phi relative diff;", 100,-0.2,0.2));
+ addHistogram(new TH2F("hEFvsOffnTrks","nTrks at EF vs Off; nTrks off; nTrks EF",10,0,10,10,0,10));
+ addHistogram(new TH2F("hEFvsOffnWideTrks","nWideTrks at EF vs Off; nWideTrks off; nWideTrks EF",10,0,10,10,0,10));
+ //Other Vars
+ //addHistogram(new TH1F("hEMRadiusRatio","Relative difference in EMRadius ;EMRadius relative diff;",50,-0.3,0.3));
+ //addHistogram(new TH1F("hHadRadiusRatio","Relative difference in HadRadius ;HadRadius relative diff;",50,-0.3,0.3));
+ addHistogram(new TH1F("hIsoFracRatio","Relative difference in IsoFrac;IsoFrac relative diff;",50,-0.3,0.3));
+ //addHistogram(new TH1F("hPSSFracRatio","Relative difference in PSSFrac;PSSFrac relative diff;",50,-0.3,0.3));
+ addHistogram(new TH1F("hEMFracRatio","Relative difference in EMFrac;EMFrac relative diff;",50,-0.3,0.3));
+ addHistogram(new TH1F("hEtRawRatio","Relative difference in EtRaw;EtRaw relative diff;",50,-0.3,0.3));
+ addHistogram(new TH1F("hOffEFEMDiff","Relative difference in EM energy (EF-Offline)/Offline; EM energy relative diff;", 50,-0.1,0.1));
+ addHistogram(new TH1F("hOffEFHADDiff","Relative difference in HAD energy (EF-Offline)/Offline; HAD energy relative diff;", 50,-0.1,0.1));
if ((trigItem == "tau25_medium1_tracktwo") || (m_doEFTProfiles)) // keep the EF TProfiles of lowest single tau or if flag is turned on for the rest of the chains
{
- //TProfile
- addProfile(new TProfile("hEtRawRatiovspt","Relative difference in EtRaw (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hEtRawRatiovseta","Relative difference in EtRaw (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
- addProfile(new TProfile("hEtRawRatiovsphi","Relative difference in EtRaw (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
- addProfile(new TProfile("hEtRawRatiovsmu","Relative difference in EtRaw (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ //TProfile
+ addProfile(new TProfile("hEtRawRatiovspt","Relative difference in EtRaw (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hEtRawRatiovseta","Relative difference in EtRaw (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("hEtRawRatiovsphi","Relative difference in EtRaw (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
+ addProfile(new TProfile("hEtRawRatiovsmu","Relative difference in EtRaw (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEtRatiovspt","Relative difference in Et (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hEtRatiovseta","Relative difference in Et (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
- addProfile(new TProfile("hEtRatiovsphi","Relative difference in Et (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
- addProfile(new TProfile("hEtRatiovsmu","Relative difference in Et (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEtRatiovspt","Relative difference in Et (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hEtRatiovseta","Relative difference in Et (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("hEtRatiovsphi","Relative difference in Et (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
+ addProfile(new TProfile("hEtRatiovsmu","Relative difference in Et (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- //addProfile(new TProfile("hEMRadiusRatiovspt","Relative difference in EMRadius (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
- //addProfile(new TProfile("hEMRadiusRatiovseta","Relative difference in EMRadius (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
-//addProfile(new TProfile("hEMRadiusRatiovsphi","Relative difference in EMRadius (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
- //addProfile(new TProfile("hEMRadiusRatiovsmu","Relative difference in EMRadius (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ //addProfile(new TProfile("hEMRadiusRatiovspt","Relative difference in EMRadius (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
+ //addProfile(new TProfile("hEMRadiusRatiovseta","Relative difference in EMRadius (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
+ //addProfile(new TProfile("hEMRadiusRatiovsphi","Relative difference in EMRadius (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
+ //addProfile(new TProfile("hEMRadiusRatiovsmu","Relative difference in EMRadius (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- //addProfile(new TProfile("hHADRadiusRatiovspt","Relative difference in HADRadius (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
- //addProfile(new TProfile("hHADRadiusRatiovseta","Relative difference in HADRadius (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
- //addProfile(new TProfile("hHADRadiusRatiovsphi","Relative difference in HADRadius (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
- //addProfile(new TProfile("hHADRadiusRatiovsmu","Relative difference in HADRadius (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ //addProfile(new TProfile("hHADRadiusRatiovspt","Relative difference in HADRadius (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
+ //addProfile(new TProfile("hHADRadiusRatiovseta","Relative difference in HADRadius (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
+ //addProfile(new TProfile("hHADRadiusRatiovsphi","Relative difference in HADRadius (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
+ //addProfile(new TProfile("hHADRadiusRatiovsmu","Relative difference in HADRadius (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hIsoFracRatiovspt","Relative difference in IsoFrac (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hIsoFracRatiovseta","Relative difference in IsoFrac (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
- addProfile(new TProfile("hIsoFracRatiovsphi","Relative difference in IsoFrac (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
- addProfile(new TProfile("hIsoFracRatiovsmu","Relative difference in IsoFrac (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hIsoFracRatiovspt","Relative difference in IsoFrac (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hIsoFracRatiovseta","Relative difference in IsoFrac (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("hIsoFracRatiovsphi","Relative difference in IsoFrac (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
+ addProfile(new TProfile("hIsoFracRatiovsmu","Relative difference in IsoFrac (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hCentFracRatiovspt","Relative difference in CentFrac (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hCentFracRatiovseta","Relative difference in CentFrac (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
- addProfile(new TProfile("hCentFracRatiovsphi","Relative difference in CentFrac (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
- addProfile(new TProfile("hCentFracRatiovsmu","Relative difference in CentFrac (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hCentFracRatiovspt","Relative difference in CentFrac (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hCentFracRatiovseta","Relative difference in CentFrac (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("hCentFracRatiovsphi","Relative difference in CentFrac (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
+ addProfile(new TProfile("hCentFracRatiovsmu","Relative difference in CentFrac (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEMFracRatiovspt","Relative difference in EMFrac (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hEMFracRatiovseta","Relative difference in EMFrac (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
- addProfile(new TProfile("hEMFracRatiovsphi","Relative difference in EMFrac (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
- addProfile(new TProfile("hEMFracRatiovsmu","Relative difference in EMFrac (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEMFracRatiovspt","Relative difference in EMFrac (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hEMFracRatiovseta","Relative difference in EMFrac (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("hEMFracRatiovsphi","Relative difference in EMFrac (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
+ addProfile(new TProfile("hEMFracRatiovsmu","Relative difference in EMFrac (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- //addProfile(new TProfile("hPSSFracRatiovspt","Relative difference in PSSFrac (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
- //addProfile(new TProfile("hPSSFracRatiovseta","Relative difference in PSSFrac (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
- //addProfile(new TProfile("hPSSFracRatiovsphi","Relative difference in PSSFrac (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
- //addProfile(new TProfile("hPSSFracRatiovsmu","Relative difference in PSSFrac (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ //addProfile(new TProfile("hPSSFracRatiovspt","Relative difference in PSSFrac (EF-Offline)/Offline vs Offline Tau pT;Offline Tau pT;",nbin_pt-1,bins_pt));
+ //addProfile(new TProfile("hPSSFracRatiovseta","Relative difference in PSSFrac (EF-Offline)/Offline vs Offline Tau eta;Offline Tau #eta;",nbin_eta-1,bins_eta));
+ //addProfile(new TProfile("hPSSFracRatiovsphi","Relative difference in PSSFrac (EF-Offline)/Offline vs Offline Tau phi;Offline Tau #phi;",40,-3.2,3.2));
+ //addProfile(new TProfile("hPSSFracRatiovsmu","Relative difference in PSSFrac (EF-Offline)/Offline vs mu;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
}
- //BDT inputs 1p non corrected
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline/BDT/1p_nonCorrected",run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline/BDT/1p_nonCorrected");
- addHistogram(new TH1F("hInnerTrkAvgDistRatio1P","Relative diff in innertrkAvgDist (EF-Offline)/Offline; InnerTrkAvgDist 1-prong relative diff;",40,-2.0,2.0));
- addHistogram(new TH1F("hEtOverPtLeadTrkRatio1P","Relative diff in EtOverPtLeadTrk ;EtOverPtLeadTrack 1-prong relative diff;",40,-0.2,0.2));
- addHistogram(new TH1F("hIpSigLeadTrkRatio1P","Relative diff in IpSigLeadTrk (EF-Offline)/Offline; IpSigLeadTrk 1-prong relative diff;",40,-2.0,2.0));
- addHistogram(new TH1F("hSumPtTrkFracRatio1P","Relative diff in SumPtTrkFrac (EF-Offline)/Offline; SumPtTrkFrac 1-prong relative diff;",40,-2.0,2.0));
- addHistogram(new TH1F("hChPiEMEOverCaloEMERatio1P","Relative diff in ChPiEMEOverCaloEME (EF-Offline)/Offline; ChPiEMEOverCaloEME 1-prong relative diff;",40,-1,1));
- addHistogram(new TH1F("hEMPOverTrkSysPRatio1P","Relative diff in EMPOverTrkSysP (EF-Offline)/Offline; EMPOverTrkSysP 1-prong relative diff;",40,-0.2,0.2));
- addHistogram(new TH1F("hCentFracRatio1P","Relative diff in Centrality Fraction (EF-Offline)/Offline; CentFrac 1-prong relative diff;",40,-0.1,0.1));
- addHistogram(new TH1F("hPtRatioEflowApproxRatio1P","Relative diff in ptRatioEflowApprox (EF-Offline)/Offline; ptRatioEflowApprox 1-prong rel diff;", 40,-0.2,0.2));
- addHistogram(new TH1F("hDRmaxRatio1P","Relative diff in DRmax (EF-Offline)/Offline; DRmax 1-prong relative diff;", 40,-2.0,2.0));
- addHistogram(new TH1F("hTopoInvMassRatio1P","Relative diff in TopoInvMass (EF-Offline)/Offline; TopoInvMass 1-prong relative diff;", 40,-1.0,1.0));
+ //BDT inputs 1p non corrected
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline/BDT/1p_nonCorrected",run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline/BDT/1p_nonCorrected");
+ addHistogram(new TH1F("hInnerTrkAvgDistRatio1P","Relative diff in innertrkAvgDist (EF-Offline)/Offline; InnerTrkAvgDist 1-prong relative diff;",40,-2.0,2.0));
+ addHistogram(new TH1F("hEtOverPtLeadTrkRatio1P","Relative diff in EtOverPtLeadTrk ;EtOverPtLeadTrack 1-prong relative diff;",40,-0.2,0.2));
+ addHistogram(new TH1F("hIpSigLeadTrkRatio1P","Relative diff in IpSigLeadTrk (EF-Offline)/Offline; IpSigLeadTrk 1-prong relative diff;",40,-2.0,2.0));
+ addHistogram(new TH1F("hSumPtTrkFracRatio1P","Relative diff in SumPtTrkFrac (EF-Offline)/Offline; SumPtTrkFrac 1-prong relative diff;",40,-2.0,2.0));
+ addHistogram(new TH1F("hChPiEMEOverCaloEMERatio1P","Relative diff in ChPiEMEOverCaloEME (EF-Offline)/Offline; ChPiEMEOverCaloEME 1-prong relative diff;",40,-1,1));
+ addHistogram(new TH1F("hEMPOverTrkSysPRatio1P","Relative diff in EMPOverTrkSysP (EF-Offline)/Offline; EMPOverTrkSysP 1-prong relative diff;",40,-0.2,0.2));
+ addHistogram(new TH1F("hCentFracRatio1P","Relative diff in Centrality Fraction (EF-Offline)/Offline; CentFrac 1-prong relative diff;",40,-0.1,0.1));
+ addHistogram(new TH1F("hPtRatioEflowApproxRatio1P","Relative diff in ptRatioEflowApprox (EF-Offline)/Offline; ptRatioEflowApprox 1-prong rel diff;", 40,-0.2,0.2));
+ addHistogram(new TH1F("hDRmaxRatio1P","Relative diff in DRmax (EF-Offline)/Offline; DRmax 1-prong relative diff;", 40,-2.0,2.0));
+ addHistogram(new TH1F("hTopoInvMassRatio1P","Relative diff in TopoInvMass (EF-Offline)/Offline; TopoInvMass 1-prong relative diff;", 40,-1.0,1.0));
if ((trigItem == "tau25_medium1_tracktwo") || (m_doEFTProfiles)) // keep the EF TProfiles of lowest single tau or if flag is turned on for the rest of the chains
{
- addProfile(new TProfile("hInnerTrkAvgDistVspt1P","Relative diff in innertrkAvgDist (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hInnerTrkAvgDistVsmu1P","Rel diff in innertrkAvgDist (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEtOverPtLeadTrkVspt1P","Relative diff in EtOverPtLeadTrk (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hEtOverPtLeadTrkVsmu1P","Rel diff in EtOverPtLeadTrk (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hIpSigLeadTrkVspt1P","Relative diff in IpSigLeadTrk (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hIpSigLeadTrkVsmu1P","Relative diff in IpSigLeadTrk (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hSumPtTrkFracVspt1P","Relative diff in SumPtTrkFrac (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hSumPtTrkFracVsmu1P","Relative diff in SumPtTrkFrac (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hChPiEMEOvCaloEMEVspt1P","Relative diff in ChPiEMEOverCaloEME (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hChPiEMEOvCaloEMEVsmu1P","Rel diff in ChPiEMEOvCaloEME(EF-Off)/Off vs mu 1p;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEMPOverTrkSysPVspt1P","Relative diff in EMPOverTrkSysP (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hEMPOverTrkSysPVsmu1P","Rel diff in EMPOverTrkSysP (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hCentFracVspt1P","Relative diff in CentFrac (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hCentFracVsmu1P","Relative diff in CentFrac (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hPtRatioEflowApproxVspt1P","Relative diff in PtRatioEflowApprox (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hPtRatioEflowApproxVsmu1P","Rel diff in PtRatioEflowApprox(EF-Off)/Off vs mu 1p;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hDRmaxVspt1P","Relative diff in DRmax (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hDRmaxVsmu1P","Relative diff in DRmax (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hTopoInvMassVspt1P","Relative diff in TopoInvMass (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hTopoInvMassVsmu1P","Relative diff in TopoInvMass (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hInnerTrkAvgDistVspt1P","Relative diff in innertrkAvgDist (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hInnerTrkAvgDistVsmu1P","Rel diff in innertrkAvgDist (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEtOverPtLeadTrkVspt1P","Relative diff in EtOverPtLeadTrk (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hEtOverPtLeadTrkVsmu1P","Rel diff in EtOverPtLeadTrk (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hIpSigLeadTrkVspt1P","Relative diff in IpSigLeadTrk (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hIpSigLeadTrkVsmu1P","Relative diff in IpSigLeadTrk (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hSumPtTrkFracVspt1P","Relative diff in SumPtTrkFrac (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hSumPtTrkFracVsmu1P","Relative diff in SumPtTrkFrac (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hChPiEMEOvCaloEMEVspt1P","Relative diff in ChPiEMEOverCaloEME (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hChPiEMEOvCaloEMEVsmu1P","Rel diff in ChPiEMEOvCaloEME(EF-Off)/Off vs mu 1p;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEMPOverTrkSysPVspt1P","Relative diff in EMPOverTrkSysP (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hEMPOverTrkSysPVsmu1P","Rel diff in EMPOverTrkSysP (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hCentFracVspt1P","Relative diff in CentFrac (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hCentFracVsmu1P","Relative diff in CentFrac (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hPtRatioEflowApproxVspt1P","Relative diff in PtRatioEflowApprox (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hPtRatioEflowApproxVsmu1P","Rel diff in PtRatioEflowApprox(EF-Off)/Off vs mu 1p;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hDRmaxVspt1P","Relative diff in DRmax (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hDRmaxVsmu1P","Relative diff in DRmax (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hTopoInvMassVspt1P","Relative diff in TopoInvMass (EF-Off)/Off vs Off Tau pT 1-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hTopoInvMassVsmu1P","Relative diff in TopoInvMass (EF-Off)/Off vs mu 1-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
}
- //BDT inputs mp non corrected
- addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline/BDT/mp_nonCorrected",run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline/BDT/mp_nonCorrected");
- addHistogram(new TH1F("hInnerTrkAvgDistRatioMP","Relative diff in innertrkAvgDist (EF-Offline)/Offline; InnerTrkAvgDist m-prong relative diff;",40,-2.0,2.0));
- addHistogram(new TH1F("hEtOverPtLeadTrkRatioMP","Relative diff in etOverPtLeadTrk (EF-Offline)/Offline; etOverPtLeadTrk m-prong relative diff;",40,-0.2,0.2));
- addHistogram(new TH1F("hChPiEMEOverCaloEMERatioMP","Relative diff in ChPiEMEOverCaloEME (EF-Offline)/Offline; ChPiEMEOverCaloEME m-prong relative diff;",40,-1,1));
- addHistogram(new TH1F("hEMPOverTrkSysPRatioMP","Relative diff in EMPOverTrkSysP (EF-Offline)/Offline; EMPOverTrkSysP m-prong relative diff;",40,-0.2,0.2));
- addHistogram(new TH1F("hCentFracRatioMP","Relative diff in Centrality Fraction (EF-Offline)/Offline; centFrac m-prong relative diff;",40,-0.1,0.1));
- addHistogram(new TH1F("hPtRatioEflowApproxRatioMP","Relative diff in ptRatioEflowApprox (EF-Offline)/Offline; ptRatioEflowApprox m-prong rel diff;", 40,-0.2,0.2));
- addHistogram(new TH1F("hDRmaxRatioMP","Relative diff in DRmax (EF-Offline)/Offline; dRmax m-prong relative diff;", 40,-1.0,1.0));
- addHistogram(new TH1F("hTrFlightPathSigRatioMP","Relative diff in TrFlightPathSig (EF-Offline)/Offline; trFlightPathSig m-prong relative diff;", 40,-1.0,1.0));
- addHistogram(new TH1F("hMassTrkSysRatioMP","Relative diff in MassTrkSys (EF-Offline)/Offline; MassTrkSys m-prong relative diff;", 40,-0.5,0.5));
- addHistogram(new TH1F("hMEflowApproxRatioMP","Relative diff in mEflowApprox (EF-Offline)/Offline; mEflowApprox m-prong rel diff;", 40,-0.5,0.5));
+ //BDT inputs mp non corrected
+ addMonGroup(new MonGroup(this,"HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline/BDT/mp_nonCorrected",run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/EFVsOffline/BDT/mp_nonCorrected");
+ addHistogram(new TH1F("hInnerTrkAvgDistRatioMP","Relative diff in innertrkAvgDist (EF-Offline)/Offline; InnerTrkAvgDist m-prong relative diff;",40,-2.0,2.0));
+ addHistogram(new TH1F("hEtOverPtLeadTrkRatioMP","Relative diff in etOverPtLeadTrk (EF-Offline)/Offline; etOverPtLeadTrk m-prong relative diff;",40,-0.2,0.2));
+ addHistogram(new TH1F("hChPiEMEOverCaloEMERatioMP","Relative diff in ChPiEMEOverCaloEME (EF-Offline)/Offline; ChPiEMEOverCaloEME m-prong relative diff;",40,-1,1));
+ addHistogram(new TH1F("hEMPOverTrkSysPRatioMP","Relative diff in EMPOverTrkSysP (EF-Offline)/Offline; EMPOverTrkSysP m-prong relative diff;",40,-0.2,0.2));
+ addHistogram(new TH1F("hCentFracRatioMP","Relative diff in Centrality Fraction (EF-Offline)/Offline; centFrac m-prong relative diff;",40,-0.1,0.1));
+ addHistogram(new TH1F("hPtRatioEflowApproxRatioMP","Relative diff in ptRatioEflowApprox (EF-Offline)/Offline; ptRatioEflowApprox m-prong rel diff;", 40,-0.2,0.2));
+ addHistogram(new TH1F("hDRmaxRatioMP","Relative diff in DRmax (EF-Offline)/Offline; dRmax m-prong relative diff;", 40,-1.0,1.0));
+ addHistogram(new TH1F("hTrFlightPathSigRatioMP","Relative diff in TrFlightPathSig (EF-Offline)/Offline; trFlightPathSig m-prong relative diff;", 40,-1.0,1.0));
+ addHistogram(new TH1F("hMassTrkSysRatioMP","Relative diff in MassTrkSys (EF-Offline)/Offline; MassTrkSys m-prong relative diff;", 40,-0.5,0.5));
+ addHistogram(new TH1F("hMEflowApproxRatioMP","Relative diff in mEflowApprox (EF-Offline)/Offline; mEflowApprox m-prong rel diff;", 40,-0.5,0.5));
if ((trigItem == "tau25_medium1_tracktwo") || (m_doEFTProfiles)) // keep the EF TProfiles of lowest single tau or if flag is turned on for the rest of the chains
{
- addProfile(new TProfile("hInnerTrkAvgDistVsptMP","Relative diff in innertrkAvgDist (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hInnerTrkAvgDistVsmuMP","Rel diff in innertrkAvgDist (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEtOverPtLeadTrkVsptMP","Relative diff in EtOverPtLeadTrk (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hEtOverPtLeadTrkVsmuMP","Rel diff in EtOverPtLeadTrk (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hChPiEMEOvCaloEMEVsptMP","Relative diff in ChPiEMEOverCaloEME (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hChPiEMEOvCaloEMEVsmuMP","Rel diff in ChPiEMEOvCaloEME(EF-Off)/Off vs mu mp;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hEMPOverTrkSysPVsptMP","Relative diff in EMPOverTrkSysP (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hEMPOverTrkSysPVsmuMP","Rel diff in EMPOverTrkSysP (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hCentFracVsptMP","Relative diff in CentFrac (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hCentFracVsmuMP","Relative diff in CentFrac (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hPtRatioEflowApproxVsptMP","Relative diff in PtRatioEflowApprox (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hPtRatioEflowApproxVsmuMP","Rel diff in PtRatioEflowApprox(EF-Off)/Off vs mu mp;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hDRmaxVsptMP","Relative diff in DRmax (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hDRmaxVsmuMP","Relative diff in DRmax (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hTrFlightPathSigVsptMP","Relative diff in TrFlightPathSig (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hTrFlightPathSigVsmuMP","Rel diff in TrFlightPathSig (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hMassTrkSysVsptMP","Relative diff in MassTrkSys (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hMassTrkSysVsmuMP","Relative diff in MassTrkSys (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
- addProfile(new TProfile("hMEflowApproxVsptMP","Relative diff in mEflowApprox (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
- addProfile(new TProfile("hMEflowApproxVsmuMP","Relative diff in mEflowApprox (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hInnerTrkAvgDistVsptMP","Relative diff in innertrkAvgDist (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hInnerTrkAvgDistVsmuMP","Rel diff in innertrkAvgDist (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEtOverPtLeadTrkVsptMP","Relative diff in EtOverPtLeadTrk (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hEtOverPtLeadTrkVsmuMP","Rel diff in EtOverPtLeadTrk (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hChPiEMEOvCaloEMEVsptMP","Relative diff in ChPiEMEOverCaloEME (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hChPiEMEOvCaloEMEVsmuMP","Rel diff in ChPiEMEOvCaloEME(EF-Off)/Off vs mu mp;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hEMPOverTrkSysPVsptMP","Relative diff in EMPOverTrkSysP (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hEMPOverTrkSysPVsmuMP","Rel diff in EMPOverTrkSysP (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hCentFracVsptMP","Relative diff in CentFrac (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hCentFracVsmuMP","Relative diff in CentFrac (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hPtRatioEflowApproxVsptMP","Relative diff in PtRatioEflowApprox (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hPtRatioEflowApproxVsmuMP","Rel diff in PtRatioEflowApprox(EF-Off)/Off vs mu mp;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hDRmaxVsptMP","Relative diff in DRmax (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hDRmaxVsmuMP","Relative diff in DRmax (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hTrFlightPathSigVsptMP","Relative diff in TrFlightPathSig (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hTrFlightPathSigVsmuMP","Rel diff in TrFlightPathSig (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hMassTrkSysVsptMP","Relative diff in MassTrkSys (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hMassTrkSysVsmuMP","Relative diff in MassTrkSys (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("hMEflowApproxVsptMP","Relative diff in mEflowApprox (EF-Off)/Off vs Off Tau pT m-prong;Offline Tau pT;",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("hMEflowApproxVsmuMP","Relative diff in mEflowApprox (EF-Off)/Off vs mu m-prong;Average interactions per bunch crossing;",nbin_mu-1,bins_mu));
}
- //--------------------
- //Turn On Curves
- //--------------------
+ //--------------------
+ //Turn On Curves
+ //--------------------
- if(m_turnOnCurves)
+ if(m_turnOnCurves)
{
- if(m_truth){
- //Truth
- addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/TruthEfficiency",run) );
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/TruthEfficiency");
+ if(m_truth){
+ //Truth
+ addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/TruthEfficiency",run) );
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/TruthEfficiency");
- addProfile(new TProfile("TProfTrueL1PtEfficiency","L1 vs Truth Efficiency; Truth p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTrueL1Pt1PEfficiency","L1 vs Truth Efficiency; Truth 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTrueL1Pt3PEfficiency","L1 vs Truth Efficiency; Truth 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTrueL1EtaEfficiency","L1 vs Truth Efficiency; Truth #eta; Efficiency",nbin_eta-1,bins_eta));
- addProfile(new TProfile("TProfTrueL1PhiEfficiency","L1 vs Truth Efficiency; Truth #phi; Efficiency",16,-3.2,3.2));
- addProfile(new TProfile("TProfTrueL1NTrackEfficiency","L1 vs Truth Efficiency; Number of tracks; Efficiency",10,0,10));
- addProfile(new TProfile("TProfTrueL1NVtxEfficiency","L1 vs Truth Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
- addProfile(new TProfile("TProfTrueL1MuEfficiency","L1 vs Truth Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("TProfTrueL1PtEfficiency","L1 vs Truth Efficiency; Truth p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTrueL1Pt1PEfficiency","L1 vs Truth Efficiency; Truth 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTrueL1Pt3PEfficiency","L1 vs Truth Efficiency; Truth 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTrueL1EtaEfficiency","L1 vs Truth Efficiency; Truth #eta; Efficiency",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("TProfTrueL1PhiEfficiency","L1 vs Truth Efficiency; Truth #phi; Efficiency",16,-3.2,3.2));
+ addProfile(new TProfile("TProfTrueL1NTrackEfficiency","L1 vs Truth Efficiency; Number of tracks; Efficiency",10,0,10));
+ addProfile(new TProfile("TProfTrueL1NVtxEfficiency","L1 vs Truth Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
+ addProfile(new TProfile("TProfTrueL1MuEfficiency","L1 vs Truth Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
- addProfile(new TProfile("TProfTrueHLTPtEfficiency","HLT vs Truth Efficiency; Truth p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTrueHLTPt1PEfficiency","HLT vs Truth Efficiency; Truth 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTrueHLTPt3PEfficiency","HLT vs Truth Efficiency; Truth 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTrueHLTEtaEfficiency","HLT vs Truth Efficiency; Truth #eta; Efficiency",nbin_eta-1,bins_eta));
- addProfile(new TProfile("TProfTrueHLTPhiEfficiency","HLT vs Truth Efficiency; Truth #phi; Efficiency",16,-3.2,3.2));
- addProfile(new TProfile("TProfTrueHLTNTrackEfficiency","HLT vs Truth Efficiency; Number of tracks; Efficiency",10,0,10));
- addProfile(new TProfile("TProfTrueHLTNVtxEfficiency","HLT vs Truth Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
- addProfile(new TProfile("TProfTrueHLTMuEfficiency","HLT vs Truth Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("TProfTrueHLTPtEfficiency","HLT vs Truth Efficiency; Truth p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTrueHLTPt1PEfficiency","HLT vs Truth Efficiency; Truth 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTrueHLTPt3PEfficiency","HLT vs Truth Efficiency; Truth 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTrueHLTEtaEfficiency","HLT vs Truth Efficiency; Truth #eta; Efficiency",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("TProfTrueHLTPhiEfficiency","HLT vs Truth Efficiency; Truth #phi; Efficiency",16,-3.2,3.2));
+ addProfile(new TProfile("TProfTrueHLTNTrackEfficiency","HLT vs Truth Efficiency; Number of tracks; Efficiency",10,0,10));
+ addProfile(new TProfile("TProfTrueHLTNVtxEfficiency","HLT vs Truth Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
+ addProfile(new TProfile("TProfTrueHLTMuEfficiency","HLT vs Truth Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
- //Truth+Reco
- addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/Truth+RecoEfficiency",run) );
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/Truth+RecoEfficiency");
-
- addProfile(new TProfile("TProfTruthRecoL1PtEfficiency","L1 vs Truth+Reco Efficiency; Truth p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTruthRecoL1Pt1PEfficiency","L1 vs Truth+Reco Efficiency; Truth 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTruthRecoL1Pt3PEfficiency","L1 vs Truth+Reco Efficiency; Truth 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTruthRecoL1EtaEfficiency","L1 vs Truth+Reco Efficiency; Truth #eta; Efficiency",nbin_eta-1,bins_eta));
- addProfile(new TProfile("TProfTruthRecoL1PhiEfficiency","L1 vs Truth+Reco Efficiency; Truth #phi; Efficiency",16,-3.2,3.2));
- addProfile(new TProfile("TProfTruthRecoL1NTrackEfficiency","L1 vs Truth+Reco Efficiency; Number of tracks; Efficiency",10,0,10));
- addProfile(new TProfile("TProfTruthRecoL1NVtxEfficiency","L1 vs Truth+Reco Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
- addProfile(new TProfile("TProfTruthRecoL1MuEfficiency","L1 vs Truth+Reco Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
+ //Truth+Reco
+ addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/Truth+RecoEfficiency",run) );
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/Truth+RecoEfficiency");
+
+ addProfile(new TProfile("TProfTruthRecoL1PtEfficiency","L1 vs Truth+Reco Efficiency; Truth p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTruthRecoL1Pt1PEfficiency","L1 vs Truth+Reco Efficiency; Truth 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTruthRecoL1Pt3PEfficiency","L1 vs Truth+Reco Efficiency; Truth 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTruthRecoL1EtaEfficiency","L1 vs Truth+Reco Efficiency; Truth #eta; Efficiency",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("TProfTruthRecoL1PhiEfficiency","L1 vs Truth+Reco Efficiency; Truth #phi; Efficiency",16,-3.2,3.2));
+ addProfile(new TProfile("TProfTruthRecoL1NTrackEfficiency","L1 vs Truth+Reco Efficiency; Number of tracks; Efficiency",10,0,10));
+ addProfile(new TProfile("TProfTruthRecoL1NVtxEfficiency","L1 vs Truth+Reco Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
+ addProfile(new TProfile("TProfTruthRecoL1MuEfficiency","L1 vs Truth+Reco Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
- addProfile(new TProfile("TProfTruthRecoHLTPtEfficiency","HLT vs Truth+Reco Efficiency; Truth p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTruthRecoHLTPt1PEfficiency","HLT vs Truth+Reco Efficiency; Truth 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTruthRecoHLTPt3PEfficiency","HLT vs Truth+Reco Efficiency; Truth 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfTruthRecoHLTEtaEfficiency","HLT vs Truth+Reco Efficiency; Truth #eta; Efficiency",nbin_eta-1,bins_eta));
- addProfile(new TProfile("TProfTruthRecoHLTPhiEfficiency","HLT vs Truth+Reco Efficiency; Truth #phi; Efficiency",16,-3.2,3.2));
- addProfile(new TProfile("TProfTruthRecoHLTNTrackEfficiency","HLT vs Truth+Reco Efficiency; Number of tracks; Efficiency",10,0,10));
- addProfile(new TProfile("TProfTruthRecoHLTNVtxEfficiency","HLT vs Truth+Reco Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
- addProfile(new TProfile("TProfTruthRecoHLTMuEfficiency","HLT vs Truth+Reco Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("TProfTruthRecoHLTPtEfficiency","HLT vs Truth+Reco Efficiency; Truth p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTruthRecoHLTPt1PEfficiency","HLT vs Truth+Reco Efficiency; Truth 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTruthRecoHLTPt3PEfficiency","HLT vs Truth+Reco Efficiency; Truth 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfTruthRecoHLTEtaEfficiency","HLT vs Truth+Reco Efficiency; Truth #eta; Efficiency",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("TProfTruthRecoHLTPhiEfficiency","HLT vs Truth+Reco Efficiency; Truth #phi; Efficiency",16,-3.2,3.2));
+ addProfile(new TProfile("TProfTruthRecoHLTNTrackEfficiency","HLT vs Truth+Reco Efficiency; Number of tracks; Efficiency",10,0,10));
+ addProfile(new TProfile("TProfTruthRecoHLTNVtxEfficiency","HLT vs Truth+Reco Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
+ addProfile(new TProfile("TProfTruthRecoHLTMuEfficiency","HLT vs Truth+Reco Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
- }
+ }
- //Reco
- addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/RecoEfficiency",run) );
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/RecoEfficiency");
-
- addProfile(new TProfile("TProfRecoL1PtEfficiency", "L1 Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfRecoL1Pt1PEfficiency", "L1 Vs Reco Efficiency; Reco 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfRecoL1Pt3PEfficiency", "L1 Vs Reco Efficiency; Reco 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfRecoL1EtaEfficiency", "L1 Vs Reco Efficiency; Reco #eta; Efficiency",nbin_eta-1,bins_eta));
- addProfile(new TProfile("TProfRecoL1PhiEfficiency", "L1 Vs Reco Efficiency; Reco #phi; Efficiency",16,-3.2,3.2));
- addProfile(new TProfile("TProfRecoL1NTrackEfficiency", "L1 Vs Reco Efficiency; Number of tracks; Efficiency",10,0,10));
- addProfile(new TProfile("TProfRecoL1NVtxEfficiency", "L1 Vs Reco Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
- addProfile(new TProfile("TProfRecoL1MuEfficiency", "L1 Vs Reco Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
+ //Reco
+ addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/RecoEfficiency",run) );
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/TurnOnCurves/RecoEfficiency");
+
+ addProfile(new TProfile("TProfRecoL1PtEfficiency", "L1 Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfRecoL1Pt1PEfficiency", "L1 Vs Reco Efficiency; Reco 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfRecoL1Pt3PEfficiency", "L1 Vs Reco Efficiency; Reco 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfRecoL1EtaEfficiency", "L1 Vs Reco Efficiency; Reco #eta; Efficiency",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("TProfRecoL1PhiEfficiency", "L1 Vs Reco Efficiency; Reco #phi; Efficiency",16,-3.2,3.2));
+ addProfile(new TProfile("TProfRecoL1NTrackEfficiency", "L1 Vs Reco Efficiency; Number of tracks; Efficiency",10,0,10));
+ addProfile(new TProfile("TProfRecoL1NVtxEfficiency", "L1 Vs Reco Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
+ addProfile(new TProfile("TProfRecoL1MuEfficiency", "L1 Vs Reco Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
- double hbins_pt[nbin_pt] = {20.,30.,50.,70.,100.,150.,200., 250., 300., 350., 400., 500., 600.};
- addProfile(new TProfile("TProfRecoL1HighPtEfficiency", "L1 Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
- addProfile(new TProfile("TProfRecoL1HighPt1PEfficiency", "L1 Vs Reco Efficiency; Reco 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
- addProfile(new TProfile("TProfRecoL1HighPt3PEfficiency", "L1 Vs Reco Efficiency; Reco 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
+ double hbins_pt[nbin_pt] = {20.,30.,50.,70.,100.,150.,200., 250., 300., 350., 400., 500., 600.};
+ addProfile(new TProfile("TProfRecoL1HighPtEfficiency", "L1 Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
+ addProfile(new TProfile("TProfRecoL1HighPt1PEfficiency", "L1 Vs Reco Efficiency; Reco 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
+ addProfile(new TProfile("TProfRecoL1HighPt3PEfficiency", "L1 Vs Reco Efficiency; Reco 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
- addProfile(new TProfile("TProfRecoHLTPtEfficiency", "HLT Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfRecoHLTHighPtEfficiency", "HLT Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
- addProfile(new TProfile("TProfRecoHLTHighPt1pEfficiency", "HLT Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
- addProfile(new TProfile("TProfRecoHLTHighPt3pEfficiency", "HLT Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
- addProfile(new TProfile("TProfRecoHLTPt1PEfficiency", "HLT Vs Reco Efficiency; Reco 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfRecoHLTPt3PEfficiency", "HLT Vs Reco Efficiency; Reco 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
- addProfile(new TProfile("TProfRecoHLTEtaEfficiency", "HLT Vs Reco Efficiency; Reco #eta; Efficiency",nbin_eta-1,bins_eta));
- addProfile(new TProfile("TProfRecoHLTPhiEfficiency", "HLT Vs Reco Efficiency; Reco #phi; Efficiency",16,-3.2,3.2));
- addProfile(new TProfile("TProfRecoHLTNTrackEfficiency", "HLT Vs Reco Efficiency; Number of tracks; Efficiency",10,0,10));
- addProfile(new TProfile("TProfRecoHLTNVtxEfficiency", "HLT Vs Reco Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
- addProfile(new TProfile("TProfRecoHLTMuEfficiency", "HLT Vs Reco Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
+ addProfile(new TProfile("TProfRecoHLTPtEfficiency", "HLT Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfRecoHLTHighPtEfficiency", "HLT Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
+ addProfile(new TProfile("TProfRecoHLTHighPt1pEfficiency", "HLT Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
+ addProfile(new TProfile("TProfRecoHLTHighPt3pEfficiency", "HLT Vs Reco Efficiency; Reco p_{T} [GeV]; Efficiency",nbin_pt-1,hbins_pt));
+ addProfile(new TProfile("TProfRecoHLTPt1PEfficiency", "HLT Vs Reco Efficiency; Reco 1 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfRecoHLTPt3PEfficiency", "HLT Vs Reco Efficiency; Reco 3 prong p_{T} [GeV]; Efficiency",nbin_pt-1,bins_pt));
+ addProfile(new TProfile("TProfRecoHLTEtaEfficiency", "HLT Vs Reco Efficiency; Reco #eta; Efficiency",nbin_eta-1,bins_eta));
+ addProfile(new TProfile("TProfRecoHLTPhiEfficiency", "HLT Vs Reco Efficiency; Reco #phi; Efficiency",16,-3.2,3.2));
+ addProfile(new TProfile("TProfRecoHLTNTrackEfficiency", "HLT Vs Reco Efficiency; Number of tracks; Efficiency",10,0,10));
+ addProfile(new TProfile("TProfRecoHLTNVtxEfficiency", "HLT Vs Reco Efficiency; Number of primary vertices; Efficiency",nbin_nvtx-1,bins_nvtx));
+ addProfile(new TProfile("TProfRecoHLTMuEfficiency", "HLT Vs Reco Efficiency; Average interactions per bunch crossing; Efficiency",nbin_mu-1,bins_mu));
}
- if(m_doTrackCurves)
- {
- addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/"+trigItemShort+"/trackCurves", run));
- setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/trackCurves");
- addHistogram(new TH2I("hreco_vs_pres_coreTracks","Reco vs preselection tau multiplicity;Number of core tracks of reco tau; Number of core tracks of preselection tau",10,0,10,10,0,10));
- addHistogram(new TH2I("hreco_vs_pres_isoTracks","Reco vs preselection tau multiplicity;Number of isolation tracks of reco tau; Number of isolation tracks of preselection tau",10,0,10,10,0,10));
- addHistogram(new TH1F("hpstau_trk_pt","Preselection tau matched to reco+truth; track p_{T} [GeV]; Nevents",20,0.,100.));
- addHistogram(new TH1F("hpstau_trk_eta","Preselection tau matched to reco+truth; track #eta; Nevents",26,-2.6,2.6));
- addHistogram(new TH1F("hpstau_trk_phi","Preselection tau matched to reco+truth; track #phi; Nevents",32,-3.2,3.2));
- addHistogram(new TH1F("hpstau_trk_d0","Preselection tau matched to reco+truth; track d0[mm]",20,-5.,5.));
- addHistogram(new TH1F("hpstau_trk_z0","Preselection tau matched to reco+truth; track z0[mm]",15,-200.,200.));
- addHistogram(new TH2F("hpstau_trk_etaphi","Preselection tau matched to reco+truth; #eta ; #phi",26,-2.6,2.6,32,-3.2,3.2));
+ if(m_doTrackCurves)
+ {
+ addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/"+trigItemShort+"/trackCurves", run));
+ setCurrentMonGroup("HLT/TauMon/Expert/"+trigItemShort+"/trackCurves");
+ addHistogram(new TH2I("hreco_vs_pres_coreTracks","Reco vs preselection tau multiplicity;Number of core tracks of reco tau; Number of core tracks of preselection tau",10,0,10,10,0,10));
+ addHistogram(new TH2I("hreco_vs_pres_isoTracks","Reco vs preselection tau multiplicity;Number of isolation tracks of reco tau; Number of isolation tracks of preselection tau",10,0,10,10,0,10));
+ addHistogram(new TH1F("hpstau_trk_pt","Preselection tau matched to reco+truth; track p_{T} [GeV]; Nevents",20,0.,100.));
+ addHistogram(new TH1F("hpstau_trk_eta","Preselection tau matched to reco+truth; track #eta; Nevents",26,-2.6,2.6));
+ addHistogram(new TH1F("hpstau_trk_phi","Preselection tau matched to reco+truth; track #phi; Nevents",32,-3.2,3.2));
+ addHistogram(new TH1F("hpstau_trk_d0","Preselection tau matched to reco+truth; track d0[mm]",20,-5.,5.));
+ addHistogram(new TH1F("hpstau_trk_z0","Preselection tau matched to reco+truth; track z0[mm]",15,-200.,200.));
+ addHistogram(new TH2F("hpstau_trk_etaphi","Preselection tau matched to reco+truth; #eta ; #phi",26,-2.6,2.6,32,-3.2,3.2));
- addHistogram(new TH1F("hpstau_trkres_pt","Preselection track Resolution wrt reco;track pt resolution;Nevents",40,-0.4,0.4));
- addHistogram(new TH1F("hpstau_trkres_eta","Preselection track Resolution wrt reco;track #eta resolution;Nevents",40,-0.4,0.4));
- addHistogram(new TH1F("hpstau_trkres_phi","Preselection track Resolution wrt reco;track #phi resolution;Nevents",40,-0.4,0.4));
- addHistogram(new TH1F("hpstau_trkres_d0","Preselection track Resolution wrt reco;track d0 resolution;Nevents",40,-0.4,0.4));
- addHistogram(new TH1F("hpstau_trkres_z0","Preselection track Resolution wrt reco;track z0 resolution;Nevents",40,-0.4,0.4));
-
- addHistogram(new TH2F("hpstautrk_vs_recotrk_pt","Preselection Vs Reco tracks; Preselection track p_{T} [GeV]; Reco track p_{T}",20,0.,100.,20,0.,100.));
- addHistogram(new TH2F("hpstautrk_vs_recotrk_eta","Preselection Vs Reco tracks; Preselection track #eta; Reco track #eta",26,-2.6,2.6,26,-2.6,2.6));
- addHistogram(new TH2F("hpstautrk_vs_recotrk_phi","Preselection Vs Reco tracks; Preselection track #phi; Reco track #phi",32,-3.2,3.2,26,-2.6,2.6));
- addHistogram(new TH2F("hpstautrk_vs_recotrk_d0","Preselection Vs Reco tracks; Preselection track d0[mm]; Reco track",20,-5.,5.,20,-5.,5.));
- addHistogram(new TH2F("hpstautrk_vs_recotrk_z0","Preselection Vs Reco tracks; Preselection track z0[mm]; Reco track",15,-200.,200.,15,-200.,200.));
-
- addProfile(new TProfile("TProfPresVsRecoPtEfficiency","Preselection Vs Reco Track Efficiency; Reco track p_{T} [GeV]; Efficiency",20,0.,100.));
- addProfile(new TProfile("TProfPresVsRecoEtaEfficiency","Preselection Vs Reco Track Efficiency; Reco track #eta; Efficiency",26,-2.6,2.6));
- addProfile(new TProfile("TProfPresVsRecoPhiEfficiency","Preselection Vs Reco Track Efficiency; Reco track #phi; Efficiency",32,-3.2,3.2));
- addProfile(new TProfile("TProfPresVsRecod0Efficiency","Preselection Vs Reco Track Efficiency; Reco track d0[mm]; Efficiency",20,-5.,5.));
- addProfile(new TProfile("TProfPresVsRecoz0Efficiency","Preselection Vs Reco Track Efficiency; Reco track z0[mm]; Efficiency",15,-200.,200.));
- }
+ addHistogram(new TH1F("hpstau_trkres_pt","Preselection track Resolution wrt reco;track pt resolution;Nevents",40,-0.4,0.4));
+ addHistogram(new TH1F("hpstau_trkres_eta","Preselection track Resolution wrt reco;track #eta resolution;Nevents",40,-0.4,0.4));
+ addHistogram(new TH1F("hpstau_trkres_phi","Preselection track Resolution wrt reco;track #phi resolution;Nevents",40,-0.4,0.4));
+ addHistogram(new TH1F("hpstau_trkres_d0","Preselection track Resolution wrt reco;track d0 resolution;Nevents",40,-0.4,0.4));
+ addHistogram(new TH1F("hpstau_trkres_z0","Preselection track Resolution wrt reco;track z0 resolution;Nevents",40,-0.4,0.4));
+
+ addHistogram(new TH2F("hpstautrk_vs_recotrk_pt","Preselection Vs Reco tracks; Preselection track p_{T} [GeV]; Reco track p_{T}",20,0.,100.,20,0.,100.));
+ addHistogram(new TH2F("hpstautrk_vs_recotrk_eta","Preselection Vs Reco tracks; Preselection track #eta; Reco track #eta",26,-2.6,2.6,26,-2.6,2.6));
+ addHistogram(new TH2F("hpstautrk_vs_recotrk_phi","Preselection Vs Reco tracks; Preselection track #phi; Reco track #phi",32,-3.2,3.2,26,-2.6,2.6));
+ addHistogram(new TH2F("hpstautrk_vs_recotrk_d0","Preselection Vs Reco tracks; Preselection track d0[mm]; Reco track",20,-5.,5.,20,-5.,5.));
+ addHistogram(new TH2F("hpstautrk_vs_recotrk_z0","Preselection Vs Reco tracks; Preselection track z0[mm]; Reco track",15,-200.,200.,15,-200.,200.));
+
+ addProfile(new TProfile("TProfPresVsRecoPtEfficiency","Preselection Vs Reco Track Efficiency; Reco track p_{T} [GeV]; Efficiency",20,0.,100.));
+ addProfile(new TProfile("TProfPresVsRecoEtaEfficiency","Preselection Vs Reco Track Efficiency; Reco track #eta; Efficiency",26,-2.6,2.6));
+ addProfile(new TProfile("TProfPresVsRecoPhiEfficiency","Preselection Vs Reco Track Efficiency; Reco track #phi; Efficiency",32,-3.2,3.2));
+ addProfile(new TProfile("TProfPresVsRecod0Efficiency","Preselection Vs Reco Track Efficiency; Reco track d0[mm]; Efficiency",20,-5.,5.));
+ addProfile(new TProfile("TProfPresVsRecoz0Efficiency","Preselection Vs Reco Track Efficiency; Reco track z0[mm]; Efficiency",15,-200.,200.));
+ }
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
index 7655152a5ba654e1ea2868892008c6b988d0f159..25472995aabe69b5ed351da5e908bc280c124447 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/TrigTauMonitorAlgorithm.cxx
@@ -41,7 +41,7 @@ StatusCode TrigTauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) co
std::vector< std::pair<const xAOD::TauJet*, const TrigCompositeUtils::Decision*>> pairObjs;
- for(const auto trigger : m_trigInputList){
+ for(const auto& trigger : m_trigInputList){
if ( executeNavigation( ctx, trigger,25,"mediumRNN", pairObjs).isFailure() )
{
diff --git a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
index dd2b5d91ab064eb4abb32e3d6adf47364bc1a94b..cd3a461c851a42aaa9a389121f983f42746664b7 100644
--- a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
+++ b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
@@ -9,6 +9,7 @@ atlas_add_library( DecisionHandlingLib
src/DumpDecisions.cxx
src/HypoBase.cxx
src/InputMakerBase.cxx
+ src/ITestHypoTool.cxx
PUBLIC_HEADERS DecisionHandling
LINK_LIBRARIES AthenaBaseComps AthenaMonitoringKernelLib GaudiKernel StoreGateLib TrigCompositeUtilsLib TrigCostMonitorMTLib TrigSteeringEvent TrigTimeAlgsLib
PRIVATE_LINK_LIBRARIES AthContainers AthViews xAODTrigger )
@@ -21,6 +22,10 @@ atlas_add_component( DecisionHandling
src/TriggerSummaryAlg.cxx
src/RoRSeqFilter.cxx
src/ViewCreator*.cxx
+ src/TestRecoAlg.cxx
+ src/TestInputMaker.cxx
+ src/TestHypoTool.cxx
+ src/TestHypoAlg.cxx
LINK_LIBRARIES DecisionHandlingLib xAODTrigCalo AthViews xAODTracking xAODJet )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h
index af37a4e78322495ef3ce604da7def4c0ab3adf53..c4d5876bc78c7534079e1738d58149c7f0772773 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h
@@ -7,7 +7,7 @@
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
/**
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureConfig.py b/Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py
similarity index 97%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureConfig.py
rename to Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py
index a9431c6c7f78b3f850110770fcaab109757b8909..0c166ad21f60164785b88ba8ab11ae23a55abee0 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureConfig.py
+++ b/Trigger/TrigSteer/DecisionHandling/python/HLTSignatureConfig.py
@@ -2,7 +2,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
-from TrigUpgradeTest.HLTSignatureHypoTools import MuTestHypoTool, ElTestHypoTool
+from DecisionHandling.HLTSignatureHypoTools import MuTestHypoTool, ElTestHypoTool
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, MenuSequence
from AthenaCommon.CFElements import seqAND
from AthenaConfiguration.AllConfigFlags import ConfigFlags
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureHypoTools.py b/Trigger/TrigSteer/DecisionHandling/python/HLTSignatureHypoTools.py
similarity index 95%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureHypoTools.py
rename to Trigger/TrigSteer/DecisionHandling/python/HLTSignatureHypoTools.py
index c4aa432e07bafef8434ba09c87a849657b0876c8..d174a82541e9c33cfb154b5e5308058a15e48eb0 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureHypoTools.py
+++ b/Trigger/TrigSteer/DecisionHandling/python/HLTSignatureHypoTools.py
@@ -2,7 +2,7 @@
# file to simulate the HypoTool configuration of the signatures
def TestHypoTool(name, prop, threshold_value):
- from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoTool
+ from DecisionHandling.DecisionHandlingConf import HLTTest__TestHypoTool
value = int(threshold_value)*1000
UseThisLinkName="initialRoI"
h = HLTTest__TestHypoTool(name, Threshold=value, Property=prop, LinkName=UseThisLinkName)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py b/Trigger/TrigSteer/DecisionHandling/python/TestUtils.py
similarity index 98%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py
rename to Trigger/TrigSteer/DecisionHandling/python/TestUtils.py
index ac41bbdaefb5cd140948f794f4ae86b0a08c1d67..0e39664b7c4196cf5404cdb6c3e61a43a983e210 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py
+++ b/Trigger/TrigSteer/DecisionHandling/python/TestUtils.py
@@ -40,7 +40,7 @@ class L1EmulationTest(L1Decoder):
'-3.2,3.0,2704088841,MU0,MU4,MU6,MU8;3.0,1.6,2972524297,MU0,MU4',
'1.3,1.9,3103727387,MU0,MU10;1.2,2.6,2733969453,MU6;-1.1,2.6,2972524297,MU6; -1.2,2.6,2704088842,MU20']
- from TrigUpgradeTest.TestUtils import writeEmulationFiles
+
writeEmulationFiles(data)
ctpUnpacker = CTPUnpackingEmulationTool(OutputLevel = self.getDefaultProperty("OutputLevel"),
ForceEnableAllChains = True)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py b/Trigger/TrigSteer/DecisionHandling/python/jetMenuHelper.py
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py
rename to Trigger/TrigSteer/DecisionHandling/python/jetMenuHelper.py
diff --git a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
index 1b647936eec7f7c42622ae344dc84260bb350964..5909e49a88dce450a889fd853de10b26254859be 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/DumpDecisions.cxx
@@ -7,7 +7,7 @@
#include "TrigCompositeUtils/HLTIdentifier.h"
// FrameWork includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "DumpDecisions.h"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/ITestHypoTool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ITestHypoTool.cxx
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/ITestHypoTool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ITestHypoTool.cxx
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/ITestHypoTool.h b/Trigger/TrigSteer/DecisionHandling/src/ITestHypoTool.h
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/ITestHypoTool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ITestHypoTool.h
diff --git a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
index ecb012901a29d84399e670888d8512770cb15304..aca57df6f9d01bd89db3876a7099adca6e964923 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/RoRSeqFilter.cxx
@@ -5,7 +5,7 @@
// DecisionHandling includes
#include "RoRSeqFilter.h"
#include "AthenaMonitoringKernel/Monitored.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
using TrigCompositeUtils::DecisionContainer;
using TrigCompositeUtils::Decision;
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TestHypoAlg.cxx
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/TestHypoAlg.cxx
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h b/Trigger/TrigSteer/DecisionHandling/src/TestHypoAlg.h
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoAlg.h
rename to Trigger/TrigSteer/DecisionHandling/src/TestHypoAlg.h
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoTool.cxx b/Trigger/TrigSteer/DecisionHandling/src/TestHypoTool.cxx
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoTool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/TestHypoTool.cxx
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoTool.h b/Trigger/TrigSteer/DecisionHandling/src/TestHypoTool.h
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/TestHypoTool.h
rename to Trigger/TrigSteer/DecisionHandling/src/TestHypoTool.h
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx b/Trigger/TrigSteer/DecisionHandling/src/TestInputMaker.cxx
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/TestInputMaker.cxx
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h b/Trigger/TrigSteer/DecisionHandling/src/TestInputMaker.h
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/TestInputMaker.h
rename to Trigger/TrigSteer/DecisionHandling/src/TestInputMaker.h
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestRecoAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TestRecoAlg.cxx
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/TestRecoAlg.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/TestRecoAlg.cxx
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestRecoAlg.h b/Trigger/TrigSteer/DecisionHandling/src/TestRecoAlg.h
similarity index 100%
rename from Trigger/TrigValidation/TrigUpgradeTest/src/TestRecoAlg.h
rename to Trigger/TrigSteer/DecisionHandling/src/TestRecoAlg.h
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
index 176f7c02fa6823658a64971e16787a24c6df7ff8..e99d24220259f34e5fc7ade0700a42deed45f8ef 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TriggerSummaryAlg.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TriggerSummaryAlg.h"
#include "AthenaMonitoringKernel/Monitored.h"
diff --git a/Trigger/TrigSteer/DecisionHandling/src/components/DecisionHandling_entries.cxx b/Trigger/TrigSteer/DecisionHandling/src/components/DecisionHandling_entries.cxx
index 7a1f0d36154b2180b9fdf99c6db8b3f1c610786f..7f12647651da6dbe4a0ace81a4295b0195cc39a6 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/components/DecisionHandling_entries.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/components/DecisionHandling_entries.cxx
@@ -14,6 +14,17 @@
#include "../ViewCreatorCentredOnIParticleROITool.h"
#include "../ViewCreatorCentredOnClusterROITool.h"
#include "../ViewCreatorCentredOnJetWithPVConstraintROITool.h"
+#include "../ITestHypoTool.h"
+#include "../TestHypoAlg.h"
+#include "../TestHypoTool.h"
+#include "../TestRecoAlg.h"
+#include "../TestInputMaker.h"
+
+
+DECLARE_COMPONENT( HLTTest::TestInputMaker )
+DECLARE_COMPONENT( HLTTest::TestHypoAlg )
+DECLARE_COMPONENT( HLTTest::TestHypoTool )
+DECLARE_COMPONENT( HLTTest::TestRecoAlg )
DECLARE_COMPONENT( DumpDecisions )
DECLARE_COMPONENT( RoRSeqFilter )
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/NavGraph.h b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/NavGraph.h
new file mode 100644
index 0000000000000000000000000000000000000000..6ddb00d9f992c06bc8aa6e4ba9aa33dff8162ed8
--- /dev/null
+++ b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/NavGraph.h
@@ -0,0 +1,124 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TrigCompositeUtils_NavGraph_h
+#define TrigCompositeUtils_NavGraph_h
+
+#include <set>
+
+#include "AthContainers/AuxElement.h"
+#include "xAODTrigger/TrigCompositeContainer.h"
+#include "xAODTrigger/TrigCompositeAuxContainer.h"
+
+
+namespace TrigCompositeUtils {
+
+ /**
+ * @class NavGraphNode
+ * @brief Transient utility class to represent a node in a graph (m_decisionObject), and a set of edges (m_filteredSeeds)
+ * to other nodes which are parents of this node.
+ **/
+ class NavGraphNode {
+ public:
+
+ /**
+ * @brief Construct a NavGraphNode shadowing a node in the full xAOD navigation graph
+ * @param[in] me The Decision object node from the full xAOD navigation graph which this object is representing.
+ **/
+ NavGraphNode(const Decision* me);
+
+ /**
+ * @brief Form an edge in the graph from this node to another one.
+ * @param[in] to The "parent" or "seed" Decision object from the perspective of this Node's shadowed Decision object.
+ * @return True if a new edge was added. False if this was a duplicated call to add this edge.
+ **/
+ bool linksTo(const NavGraphNode* to);
+
+ /**
+ * @brief Return a const pointer to the Decision object node which this NavGraphNode is shadowing.
+ **/
+ const Decision* node() const;
+
+ /**
+ * @brief Return a set of const pointers to the Decision object nodes which this NavGraphNode seeds from.
+ * Note: NavGraph is used to represent a sub-graph of the full navigation graph, hence it is expected that
+ * the set of seeds returned from this function may be smaller than the set of seeds returned from the
+ * shadowed xAOD Decision Object.
+ **/
+ const std::set<const NavGraphNode*>& seeds() const;
+
+ private:
+ const Decision* m_decisionObject; //!< The Decision object node which I shadow
+ std::set<const NavGraphNode*> m_filteredSeeds; //!< My seeds (edges in the graph), filtered on per-chain requirements.
+
+ };
+
+ /**
+ * @class NavGraph
+ * @brief Structure to hold a transient Directed Acyclic Graph (DAG) structure.
+ * NavGraph is populated from, and forms a sub-graph over the full Run 3 trigger navigation graph in a single event.
+ * Requirements on specific chains, and the specification of allowable graph entry-points are considered in the construction of the NavGraph sub-graph.
+ * Once one of these sub-graphs is fully populated to a given specification, it is searched by the feature-retrieval code to find features.
+ **/
+ class NavGraph {
+
+ public:
+
+ /**
+ * @brief Construct an empty NavGraph
+ **/
+ NavGraph();
+
+ /**
+ * @brief Add a new NavGraphNode which shadows the xAOD Decision object "node" from the full navigation graph
+ * @param[in] node The xAOD Decision object which the new node will shadow. Will not cause duplication if node has already been added.
+ * @param[in] comingFrom If not null, used to indicate which xAOD Decision object was the seed of "node". This is used to form an edge in the graph.
+ * Alternately, if comingFrom is null then "node" is taken as a final node (one of the locations from which the graph should be explored) and hence is added
+ * to the finalNodes set.
+ **/
+ void addNode(const Decision* node, const Decision* comingFrom = nullptr);
+
+ /**
+ * @brief Get all final nodes.
+ * @return Set of final nodes. These are the nodes which were added without any "comingFrom".
+ * To explore the NavGraph fully, one should explore recursively from each of the final nodes.
+ **/
+ const std::set<NavGraphNode*>& finalNodes() const;
+
+ /**
+ * @return Total number of unique nodes in the NavGraph.
+ **/
+ size_t nodes() const;
+
+ /**
+ * @return Total number of unique edges in the NavGraph.
+ **/
+ size_t edges() const;
+
+ /**
+ * @bried Helper function. Print the internal graph structure to the terminal.
+ * @param[in] log Athena messaging service reference.
+ * @param[in] msgLevel Athena messaging service verbosity level.
+ **/
+ void printAllPaths(MsgStream& log, MSG::Level msgLevel = MSG::VERBOSE) const;
+
+ private:
+
+ /**
+ * @bried Internal helper function. Recursively print the graph structure from a single given starting node.
+ * @param[in] nav The node to recursively explore.
+ * @param[in] level The current depth of recursion. Used to pad output format.
+ * @param[in] log Athena messaging service reference.
+ * @param[in] msgLevel Athena messaging service verbosity level.
+ **/
+ void recursivePrintNavPath(const NavGraphNode& nav, size_t level, MsgStream& log, MSG::Level msgLevel) const;
+
+ std::map<const Decision*, NavGraphNode> m_nodes; //!< Map of nodes in the graph. Indexed on the underlying Decision object's transient pointer.
+ std::set<NavGraphNode*> m_finalNodes; //!< Entry points into the navigation graph. When iterating over the graph, start from all of these places.
+ size_t m_edges; //!< Statistics on the number of edges, connecting the nodes in the graph.
+ };
+
+}
+
+#endif // TrigCompositeUtils_NavGraph_h
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h
index 1f62fa70f4aadd7dad301cbd3bb6f8baaaf0d750..d2b2e3e81aa00f9f93a6ab3683376b430edc1fed 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h
+++ b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.h
@@ -17,6 +17,7 @@
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandle.h"
#include "GaudiKernel/ThreadLocalContext.h"
+#include "GaudiKernel/MsgStream.h"
#include "AthContainers/AuxElement.h"
#include "xAODTrigger/TrigCompositeContainer.h"
@@ -25,6 +26,7 @@
#include "TrigDecisionInterface/Conditions.h"
#include "HLTIdentifier.h"
+#include "NavGraph.h"
namespace TrigCompositeUtils {
@@ -251,17 +253,20 @@ namespace TrigCompositeUtils {
**/
std::vector<const Decision*> getRejectedDecisionNodes(StoreGateSvc* eventStore, const DecisionID id = 0);
+
+
+
/**
- * @brief Search back in time from "start" and locate all linear paths back through Decision objects for a given chain.
- * @param[in] start The Decision object to start the search from. Typically this will be one of the terminus objects from the HLTNav_Summary (regular or rerun).
- * @param[out] linkVector Each entry in the outer vector represents a path through the graph. For each path, a vector of ElementLinks describing the path is returned.
+ * @brief Search back in time from "node" and locate all paths back through Decision objects for a given chain.
+ * @param[in] node The Decision object to start the search from. Typically this will be one of the terminus objects from the HLTNav_Summary.
+ * @param[inout] navPaths Holds a sub-graph of the full navigation graph, filtered by DecisionID. An already partially populated graph may be provided as input.
* @param[in] id Optional DecisionID of a Chain to trace through the navigation. If omitted, no chain requirement will be applied.
* @param[in] enforceDecisionOnStartNode If the check of DecisionID should be carried out on the start node.
* enforceDecisionOnStartNode should be true if navigating for a trigger which passed (e.g. starting from HLTPassRaw)
* enforceDecisionOnStartNode should be false if navigating for a trigger which failed but whose failing start node(s) were recovered via getRejectedDecisionNodes
**/
- void recursiveGetDecisions(const Decision* start,
- std::vector<ElementLinkVector<DecisionContainer>>& linkVector,
+ void recursiveGetDecisions(const Decision* node,
+ NavGraph& navGraph,
const DecisionID id = 0,
const bool enforceDecisionOnStartNode = true);
@@ -269,12 +274,13 @@ namespace TrigCompositeUtils {
/**
* @brief Used by recursiveGetDecisions
* @see recursiveGetDecisions
+ * @param comingFrom The parent node which has a link in the navigation to this "node"
**/
- void recursiveGetDecisionsInternal(const Decision* start,
- const size_t location,
- std::vector<ElementLinkVector<DecisionContainer>>& linkVector,
- const DecisionID id = 0,
- const bool enforceDecisionOnNode = true);
+ void recursiveGetDecisionsInternal(const Decision* node,
+ const Decision* comingFrom,
+ NavGraph& navGraph,
+ const DecisionID id,
+ const bool enforceDecisionOnNode);
/**
* @brief Additional information returned by the TrigerDecisionTool's feature retrieval, contained within the LinkInfo.
@@ -330,20 +336,37 @@ namespace TrigCompositeUtils {
/**
* @brief Extract features from the supplied linkVector (obtained through recursiveGetDecisions).
- * @param[in] linkVector Vector of paths through the navigation which are to be considered.
+ * @param[in] navPaths Sub-graph of the trigger navigation which is to be considered.
* @param[in] lastFeatureOfType True for TrigDefs::lastFeatureOfType. stops at the first feature (of the correct type) found per path through the navigation.
* @param[in] featureName Optional name of feature link as saved online. The "feature" link is enforced, others may have been added.
* @param[in] chains Optional set of Chain IDs which features are being requested for. Used to set the ActiveState of returned LinkInfo objects.
* @return Typed vector of LinkInfo. Each LinkInfo wraps an ElementLink to a feature and a pointer to the feature's Decision object in the navigation.
**/
template<class CONTAINER>
- const std::vector< LinkInfo<CONTAINER> > getFeaturesOfType(
- const std::vector<ElementLinkVector<DecisionContainer>>& linkVector,
+ const std::vector< LinkInfo<CONTAINER> > recursiveGetFeaturesOfType(
+ const NavGraph& navGraph,
const std::string containerSGKey = "",
const bool lastFeatureOfType = true,
const std::string& navElementLinkKey = featureString(),
const DecisionIDContainer chainIDs = DecisionIDContainer());
+ /**
+ * @see recursiveGetFeaturesOfType
+ * @brief Internal implimentation called by recursiveGetFeaturesOfType, and by itself
+ * @param[inout] features The untimate return vector. New links are to be appended.
+ * @param[inout] fullyExploredFrom Cache of graph nodes which have been fully explored, and hence don't need exploring again should they show up.
+ * @param[in] navGraphNode The current node in the navGraph which is being explored.
+ **/
+ template<class CONTAINER>
+ void recursiveGetFeaturesOfTypeInternal(
+ std::vector< LinkInfo<CONTAINER> >& features,
+ std::set<const NavGraphNode*>& fullyExploredFrom,
+ const NavGraphNode* navGraphNode,
+ const std::string containerSGKey,
+ const bool lastFeatureOfType,
+ const std::string& navElementLinkKey,
+ const DecisionIDContainer chainIDs);
+
/**
* @brief Perform a recursive search for ElementLinks of type T and name 'linkName', starting from Decision object 'start'
* For the case of multiple links, this function only returns the first one found. @see findLinks
@@ -400,11 +423,6 @@ namespace TrigCompositeUtils {
**/
std::string dump( const Decision* tc, std::function< std::string( const Decision* )> printerFnc );
-
-
-
-
-
}
#include "TrigCompositeUtils/TrigCompositeUtils.icc"
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.icc b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.icc
index 87952570993f30e5c47f9f1477c7a0d01eb785a6..2996de9d0cc0d7ac90b85516e5c7d589fcc3d536 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.icc
+++ b/Trigger/TrigSteer/TrigCompositeUtils/TrigCompositeUtils/TrigCompositeUtils.icc
@@ -48,8 +48,6 @@ namespace TrigCompositeUtils {
// We can keep a record of nodes which we have already explored, these we can safely skip over.
if (visitedCache->count(start) == 1) {
return; // Early exit
- } else {
- visitedCache->insert(start);
}
}
ElementLinkVector<T> featureLinks;
@@ -96,6 +94,10 @@ namespace TrigCompositeUtils {
for (const auto& seed : getLinkToPrevious(start)) {
findLinks<T>(*seed, linkName, links, behaviour);
}
+ // Fully explored this node
+ if (visitedCache != nullptr) {
+ visitedCache->insert(start);
+ }
}
template<typename T>
@@ -128,9 +130,10 @@ namespace TrigCompositeUtils {
return LinkInfo<T>(); // invalid link
}
+
template<class CONTAINER>
void filterLinkVectorByContainerKey(const std::string& containerSGKey, ElementLinkVector<CONTAINER>& vector) {
- if (containerSGKey == "") {
+ if (containerSGKey.empty()) {
return;
}
auto it = std::remove_if(vector.begin(), vector.end(), [&](const ElementLink<CONTAINER>& el) {
@@ -140,97 +143,138 @@ namespace TrigCompositeUtils {
vector.erase(it, vector.end());
}
+
template<class CONTAINER>
- const std::vector< LinkInfo<CONTAINER> > getFeaturesOfType(
- const std::vector<ElementLinkVector<DecisionContainer>>& linkVector,
+ const std::vector< LinkInfo<CONTAINER> > recursiveGetFeaturesOfType(
+ const NavGraph& navGraph,
const std::string containerSGKey,
const bool lastFeatureOfType,
const std::string& navElementLinkKey,
const DecisionIDContainer chainIDs) {
- std::vector< LinkInfo<CONTAINER> > features;
- // For each unique path through the navigation for a given chain
- for (const ElementLinkVector<DecisionContainer>& decisionPath : linkVector) {
- // For each step along this path, starting at the terminus and working back towards L1
- for (const ElementLink<DecisionContainer>& decisionObjLink : decisionPath) {
- const Decision* decisionObj = (*decisionObjLink);
- ElementLinkVector<CONTAINER> featureLinks;
-
- // Look up what named links are available in the Decision Object
- std::vector<std::string> availableLinkNames;
- if (navElementLinkKey == "") {
- const std::vector<std::string> getSingleLinkNames = decisionObj->getObjectNames<CONTAINER>();
- const std::vector<std::string> getCollectionLinkNames = decisionObj->getObjectCollectionNames<CONTAINER>();
- std::copy(getSingleLinkNames.begin(), getSingleLinkNames.end(), std::back_inserter(availableLinkNames));
- std::copy(getCollectionLinkNames.begin(), getCollectionLinkNames.end(), std::back_inserter(availableLinkNames));
- } else { // Just looking for an explicitly named feature
- availableLinkNames.push_back( navElementLinkKey );
- }
+ std::vector< LinkInfo<CONTAINER> > features; // The return vector
+ std::set<const NavGraphNode*> fullyExploredFrom; // Lets us navigate more efficiently
- // Fetch the named links that we're interested in
- for (const std::string& featureNameToGet : availableLinkNames) {
- // This try block protects against ExcCLIDMismatch throws from
- // features which do not derive from IParticle, when an IParticle interface is requested.
- try {
- // Slices may have added link collections. These links may have been to objects in different containers.
- if (decisionObj->hasObjectCollectionLinks(featureNameToGet, ClassID_traits< CONTAINER >::ID())) {
- ElementLinkVector<CONTAINER> collectionLinks = decisionObj->objectCollectionLinks<CONTAINER>( featureNameToGet );
- filterLinkVectorByContainerKey<CONTAINER>(containerSGKey, collectionLinks);
- std::copy(collectionLinks.begin(), collectionLinks.end(), std::back_inserter(featureLinks));
- }
- } catch (SG::ExcCLIDMismatch&) {
- // This is in place to catch the exception caused by non-IParticle features when an IParticle interface is requested.
- // We're fine to catch this silently and cary on looking at the next Decision object in the graph
- }
- try {
- // Slices may have added single links. Note: the framework-specified "feature" link is always a single link.
- if (decisionObj->hasObjectLink(featureNameToGet, ClassID_traits< CONTAINER >::ID())) {
- ElementLinkVector<CONTAINER> singleEntryVector; // Filtering function operates on a vector
- singleEntryVector.push_back( decisionObj->objectLink<CONTAINER>( featureNameToGet ) );
- filterLinkVectorByContainerKey<CONTAINER>(containerSGKey, singleEntryVector);
- std::copy(singleEntryVector.begin(), singleEntryVector.end(), std::back_inserter(featureLinks));
- }
- } catch (SG::ExcCLIDMismatch&) {
- // Silently. As above.
- }
- }
+ // For each starting point through the navigation for a given chain-group
+ for (const NavGraphNode* finalNode : navGraph.finalNodes()) {
+ recursiveGetFeaturesOfTypeInternal<CONTAINER>(features,
+ fullyExploredFrom,
+ finalNode,
+ containerSGKey,
+ lastFeatureOfType,
+ navElementLinkKey,
+ chainIDs);
+ }
- // Check if the Decsision object is active for a specific set of Chains-of-interest (as supplied by the TDT)
- ActiveState state = ActiveState::UNSET;
- if (chainIDs.size() > 0) {
- // If we were given a list of chains to consider then we start assuming none passed this decisionObj
- state = ActiveState::INACTIVE;
- for (DecisionID id : chainIDs) {
- if (std::count(decisionObj->decisions().begin(), decisionObj->decisions().end(), id) == 1) {
- state = ActiveState::ACTIVE;
- break;
- }
- }
- }
+ return features;
+ }
- // Copy the fetched links into the return vector
- for (const ElementLink<CONTAINER>& featureLink : featureLinks) {
- typename std::vector<LinkInfo<CONTAINER>>::iterator vecIt = std::find_if(features.begin(), features.end(), [&](const auto& li) { return li.link == featureLink; } );
- if (vecIt == features.end()) {
- // Link did not already exist - add it to the output
- features.emplace_back( decisionObj, featureLink, state );
- } else {
- // Link already existed - if the link's state in the return vector is INACTIVE but is ACTIVE here,
- // then we need to change it to ACTIVE as this denotes one-or-more of the requested chains were active for the object.
- if (vecIt->state == ActiveState::INACTIVE) {
- vecIt->state = ActiveState::ACTIVE;
- }
- }
+
+ template<class CONTAINER>
+ void recursiveGetFeaturesOfTypeInternal(
+ std::vector< LinkInfo<CONTAINER> >& features,
+ std::set<const NavGraphNode*>& fullyExploredFrom,
+ const NavGraphNode* navGraphNode,
+ const std::string containerSGKey,
+ const bool lastFeatureOfType,
+ const std::string& navElementLinkKey,
+ const DecisionIDContainer chainIDs) {
+
+ if (fullyExploredFrom.count(navGraphNode) == 1) {
+ return; // Already explored down from here
+ }
+
+ const Decision* decisionObj = navGraphNode->node();
+ ElementLinkVector<CONTAINER> featureLinks;
+
+ // Look up what named links are available in the Decision Object
+ std::vector<std::string> availableLinkNames;
+ if (navElementLinkKey == "") {
+ const std::vector<std::string> getSingleLinkNames = decisionObj->getObjectNames<CONTAINER>();
+ const std::vector<std::string> getCollectionLinkNames = decisionObj->getObjectCollectionNames<CONTAINER>();
+ std::copy(getSingleLinkNames.begin(), getSingleLinkNames.end(), std::back_inserter(availableLinkNames));
+ std::copy(getCollectionLinkNames.begin(), getCollectionLinkNames.end(), std::back_inserter(availableLinkNames));
+ } else { // Just looking for an explicitly named feature
+ availableLinkNames.push_back( navElementLinkKey );
+ }
+
+ // Fetch the named links that we're interested in
+ for (const std::string& featureNameToGet : availableLinkNames) {
+ // This try block protects against ExcCLIDMismatch throws from
+ // features which do not derive from IParticle, when an IParticle interface is requested.
+ try {
+ // Slices may have added link collections. These links may have been to objects in different containers.
+ if (decisionObj->hasObjectCollectionLinks(featureNameToGet, ClassID_traits< CONTAINER >::ID())) {
+ ElementLinkVector<CONTAINER> collectionLinks = decisionObj->objectCollectionLinks<CONTAINER>( featureNameToGet );
+ filterLinkVectorByContainerKey<CONTAINER>(containerSGKey, collectionLinks);
+ std::copy(collectionLinks.begin(), collectionLinks.end(), std::back_inserter(featureLinks));
+ }
+ } catch (SG::ExcCLIDMismatch&) {
+ // This is in place to catch the exception caused by non-IParticle features when an IParticle interface is requested.
+ // We're fine to catch this silently and cary on looking at the next Decision object in the graph
+ }
+ try {
+ // Slices may have added single links. Note: the framework-specified "feature" link is always a single link.
+ if (decisionObj->hasObjectLink(featureNameToGet, ClassID_traits< CONTAINER >::ID())) {
+ ElementLinkVector<CONTAINER> singleEntryVector; // Filtering function operates on a vector
+ singleEntryVector.push_back( decisionObj->objectLink<CONTAINER>( featureNameToGet ) );
+ filterLinkVectorByContainerKey<CONTAINER>(containerSGKey, singleEntryVector);
+ std::copy(singleEntryVector.begin(), singleEntryVector.end(), std::back_inserter(featureLinks));
}
+ } catch (SG::ExcCLIDMismatch&) {
+ // Silently. As above.
+ }
+ }
- // Stop processing this path through the navigation if the lastFeatureOfType flag is set
- if (featureLinks.size() && lastFeatureOfType) {
+ // Check if the Decsision object is active for a specific set of Chains-of-interest (as supplied by the TDT)
+ ActiveState state = ActiveState::UNSET;
+ if (chainIDs.size() > 0) {
+ // If we were given a list of chains to consider then we start assuming none passed this decisionObj
+ state = ActiveState::INACTIVE;
+ for (DecisionID id : chainIDs) {
+ if (std::count(decisionObj->decisions().begin(), decisionObj->decisions().end(), id) == 1) {
+ state = ActiveState::ACTIVE;
break;
}
+ }
+ }
- } // for (decisionLink : decisionPath)
- } // for (decisionPath : linkVector)
- return features;
+ // Copy the fetched links into the return vector
+ for (const ElementLink<CONTAINER>& featureLink : featureLinks) {
+ typename std::vector<LinkInfo<CONTAINER>>::iterator vecIt = std::find_if(features.begin(), features.end(), [&](const auto& li) { return li.link == featureLink; } );
+ if (vecIt == features.end()) {
+ // Link did not already exist - add it to the output
+ features.emplace_back( decisionObj, featureLink, state );
+ } else {
+ // Link already existed - if the link's state in the return vector is INACTIVE but is ACTIVE here,
+ // then we need to change it to ACTIVE as this denotes one-or-more of the requested chains were active for the object.
+ if (vecIt->state == ActiveState::INACTIVE) {
+ vecIt->state = ActiveState::ACTIVE;
+ }
+ }
+ }
+
+ // Stop processing this path through the navigation if the lastFeatureOfType flag is set
+ if (featureLinks.size() && lastFeatureOfType) {
+ return;
+ }
+
+ // Recurse to decisionObj's seeds
+ for (const NavGraphNode* seedNavNode : navGraphNode->seeds()) {
+ recursiveGetFeaturesOfTypeInternal<CONTAINER>(features,
+ fullyExploredFrom,
+ seedNavNode,
+ containerSGKey,
+ lastFeatureOfType,
+ navElementLinkKey,
+ chainIDs);
+ }
+
+ // If we encounter this node again in the future, we don't need to explore it again as it's now fully explored.
+ fullyExploredFrom.insert( navGraphNode );
+
+ return;
}
+
}
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/share/TrigTraversal_test.ref b/Trigger/TrigSteer/TrigCompositeUtils/share/TrigTraversal_test.ref
index 63640a78da22ac8c89ca98c306a93cb6f6550a2d..b3b56bddf23b14d62ff6b1c71fbbd0e96ba6c10a 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/share/TrigTraversal_test.ref
+++ b/Trigger/TrigSteer/TrigCompositeUtils/share/TrigTraversal_test.ref
@@ -1,131 +1,304 @@
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v32r0)
- running on lxplus713.cern.ch on Thu Aug 8 12:51:31 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
+ running on pc-tbed-pub-21.cern.ch on Mon Aug 3 16:45:27 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
-HistogramPersis...WARNING Histograms saving not required.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-ClassIDSvc INFO getRegistryEntries: read 8743 CLIDRegistry entries for module ALL
-Context: s: 0 e: 0
-Current context: s: 0 e: 0
+ClassIDSvc INFO getRegistryEntries: read 5171 CLIDRegistry entries for module ALL
ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
-1 paths for HLT_mufast_chain
- Path 0[HLTPassRaw -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
-2 paths for HLT_mu_chain
- Path 0[HLTPassRaw -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 1[HLTPassRaw -> MU_H_2__MU1 F(pt:21) -> MU_IM_2__MU1 -> MU_F_2__MU1 -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
-2 paths for HLT_mu_em_chain
- Path 0[HLTPassRaw -> MUEM_CH_2__MU1 -> MUEM_H_2__MU1 F(pt:21) -> MUEM_IM_2__MU1 -> MUEM_F_2__MU1 -> MUEM_CH_1__MU1 -> MUEM_H_1__MU1 F(pt:20) -> MUEM_IM_1__MU1 -> MUEM_F_1__MU1 -> MU1]
- Path 1[HLTPassRaw -> MUEM_CH_2__EM0 -> MUEM_H_2__EM0 F(pt:31) -> MUEM_IM_2__EM0 -> MUEM_F_2__EM0 -> MUEM_CH_1__EM0 -> MUEM_H_1__EM0 F(pt:30) -> MUEM_IM_1__EM0 -> MUEM_F_1__EM0 -> EM0]
-1 paths for HLT_em_chain
- Path 0[HLTPassRaw -> EM_H_2__EM0 F(pt:31) -> EM_IM_2__EM0 -> EM_F_2__EM0 -> EM_H_1__EM0 F(pt:30) -> EM_IM_1__EM0 -> EM_F_1__EM0 -> EM0]
-5 paths for All
- Path 0[HLTPassRaw -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 1[HLTPassRaw -> MU_H_2__MU1 F(pt:21) -> MU_IM_2__MU1 -> MU_F_2__MU1 -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 2[HLTPassRaw -> MUEM_CH_2__MU1 -> MUEM_H_2__MU1 F(pt:21) -> MUEM_IM_2__MU1 -> MUEM_F_2__MU1 -> MUEM_CH_1__MU1 -> MUEM_H_1__MU1 F(pt:20) -> MUEM_IM_1__MU1 -> MUEM_F_1__MU1 -> MU1]
- Path 3[HLTPassRaw -> EM_H_2__EM0 F(pt:31) -> EM_IM_2__EM0 -> EM_F_2__EM0 -> EM_H_1__EM0 F(pt:30) -> EM_IM_1__EM0 -> EM_F_1__EM0 -> EM0]
- Path 4[HLTPassRaw -> MUEM_CH_2__EM0 -> MUEM_H_2__EM0 F(pt:31) -> MUEM_IM_2__EM0 -> MUEM_F_2__EM0 -> MUEM_CH_1__EM0 -> MUEM_H_1__EM0 F(pt:30) -> MUEM_IM_1__EM0 -> MUEM_F_1__EM0 -> EM0]
-[All passing features] HLT_mufast_chain features size:1
+TrigTraversal INFO HLT_mufast_chain
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO HLT_mu_chain
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #16 (MU_H_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #15 (MU_IM_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #14 (MU_F_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO HLT_mu_em_chain
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #24 (MUEM_CH_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #23 (MUEM_H_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #22 (MUEM_IM_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #21 (MUEM_F_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #20 (MUEM_CH_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #19 (MUEM_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #18 (MUEM_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #17 (MUEM_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #38 (MUEM_CH_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #37 (MUEM_H_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #36 (MUEM_IM_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #35 (MUEM_F_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #34 (MUEM_CH_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #33 (MUEM_H_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #32 (MUEM_IM_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #31 (MUEM_F_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
+TrigTraversal INFO HLT_em_chain
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #30 (EM_H_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #29 (EM_IM_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #28 (EM_F_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #27 (EM_H_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #26 (EM_IM_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #25 (EM_F_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
+TrigTraversal INFO All
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #16 (MU_H_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #15 (MU_IM_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #14 (MU_F_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #24 (MUEM_CH_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #23 (MUEM_H_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #22 (MUEM_IM_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #21 (MUEM_F_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #20 (MUEM_CH_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #19 (MUEM_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #18 (MUEM_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #17 (MUEM_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #30 (EM_H_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #29 (EM_IM_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #28 (EM_F_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #27 (EM_H_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #26 (EM_IM_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #25 (EM_F_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #38 (MUEM_CH_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #37 (MUEM_H_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #36 (MUEM_IM_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #35 (MUEM_F_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #34 (MUEM_CH_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #33 (MUEM_H_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #32 (MUEM_IM_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #31 (MUEM_F_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
+TrigTraversal INFO [All passing features] HLT_mufast_chain features size:1
Feature 0 pt:20, state:ACTIVE
-[All passing features] HLT_mu_chain features size:2
+
+TrigTraversal INFO [All passing features] HLT_mu_chain features size:2
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:21, state:ACTIVE
-[All passing features] HLT_mu_em_chain features size:4
+
+TrigTraversal INFO [All passing features] HLT_mu_em_chain features size:4
Feature 0 pt:21, state:ACTIVE
Feature 1 pt:20, state:ACTIVE
Feature 2 pt:31, state:ACTIVE
Feature 3 pt:30, state:ACTIVE
-[All passing features] HLT_em_chain features size:2
+
+TrigTraversal INFO [All passing features] HLT_em_chain features size:2
Feature 0 pt:31, state:ACTIVE
Feature 1 pt:30, state:ACTIVE
-[All passing features] All chains features size:4
+
+TrigTraversal INFO [All passing features] All chains features size:4
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:21, state:ACTIVE
Feature 2 pt:31, state:ACTIVE
Feature 3 pt:30, state:ACTIVE
-[Final passing feature] HLT_mufast_chain features size:1
+
+TrigTraversal INFO [Final passing feature] HLT_mufast_chain features size:1
Feature 0 pt:20, state:ACTIVE
-[Final passing feature] HLT_mu_chain features size:2
+
+TrigTraversal INFO [Final passing feature] HLT_mu_chain features size:2
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:21, state:ACTIVE
-[Final passing feature] HLT_mu_em_chain features size:2
+
+TrigTraversal INFO [Final passing feature] HLT_mu_em_chain features size:2
Feature 0 pt:21, state:ACTIVE
Feature 1 pt:31, state:ACTIVE
-[Final passing feature] HLT_em_chain features size:1
+
+TrigTraversal INFO [Final passing feature] HLT_em_chain features size:1
Feature 0 pt:31, state:ACTIVE
-[Final passing feature] All chains features size:3
+
+TrigTraversal INFO [Final passing feature] All chains features size:3
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:21, state:ACTIVE
Feature 2 pt:31, state:ACTIVE
+
---------- Now Include Failing Features
-2 paths for HLT_mufast_chain
- Path 0[HLTPassRaw -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 1[MU_H_1__MU0 F(pt:5) -> MU_IM_1__MU0 -> MU_F_1__MU0 -> MU0]
-3 paths for HLT_mu_chain
- Path 0[HLTPassRaw -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 1[HLTPassRaw -> MU_H_2__MU1 F(pt:21) -> MU_IM_2__MU1 -> MU_F_2__MU1 -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 2[MU_H_1__MU0 F(pt:5) -> MU_IM_1__MU0 -> MU_F_1__MU0 -> MU0]
-3 paths for HLT_mu_em_chain
- Path 0[HLTPassRaw -> MUEM_CH_2__MU1 -> MUEM_H_2__MU1 F(pt:21) -> MUEM_IM_2__MU1 -> MUEM_F_2__MU1 -> MUEM_CH_1__MU1 -> MUEM_H_1__MU1 F(pt:20) -> MUEM_IM_1__MU1 -> MUEM_F_1__MU1 -> MU1]
- Path 1[HLTPassRaw -> MUEM_CH_2__EM0 -> MUEM_H_2__EM0 F(pt:31) -> MUEM_IM_2__EM0 -> MUEM_F_2__EM0 -> MUEM_CH_1__EM0 -> MUEM_H_1__EM0 F(pt:30) -> MUEM_IM_1__EM0 -> MUEM_F_1__EM0 -> EM0]
- Path 2[MUEM_H_1__MU0 F(pt:5) -> MUEM_IM_1__MU0 -> MUEM_F_1__MU0 -> MU0]
-1 paths for HLT_em_chain
- Path 0[HLTPassRaw -> EM_H_2__EM0 F(pt:31) -> EM_IM_2__EM0 -> EM_F_2__EM0 -> EM_H_1__EM0 F(pt:30) -> EM_IM_1__EM0 -> EM_F_1__EM0 -> EM0]
-7 paths for All
- Path 0[HLTPassRaw -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 1[HLTPassRaw -> MU_H_2__MU1 F(pt:21) -> MU_IM_2__MU1 -> MU_F_2__MU1 -> MU_H_1__MU1 F(pt:20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 2[HLTPassRaw -> MUEM_CH_2__MU1 -> MUEM_H_2__MU1 F(pt:21) -> MUEM_IM_2__MU1 -> MUEM_F_2__MU1 -> MUEM_CH_1__MU1 -> MUEM_H_1__MU1 F(pt:20) -> MUEM_IM_1__MU1 -> MUEM_F_1__MU1 -> MU1]
- Path 3[HLTPassRaw -> EM_H_2__EM0 F(pt:31) -> EM_IM_2__EM0 -> EM_F_2__EM0 -> EM_H_1__EM0 F(pt:30) -> EM_IM_1__EM0 -> EM_F_1__EM0 -> EM0]
- Path 4[HLTPassRaw -> MUEM_CH_2__EM0 -> MUEM_H_2__EM0 F(pt:31) -> MUEM_IM_2__EM0 -> MUEM_F_2__EM0 -> MUEM_CH_1__EM0 -> MUEM_H_1__EM0 F(pt:30) -> MUEM_IM_1__EM0 -> MUEM_F_1__EM0 -> EM0]
- Path 5[MU_H_1__MU0 F(pt:5) -> MU_IM_1__MU0 -> MU_F_1__MU0 -> MU0]
- Path 6[MUEM_H_1__MU0 F(pt:5) -> MUEM_IM_1__MU0 -> MUEM_F_1__MU0 -> MU0]
-[All passing/failing features] HLT_mufast_chain features size:2
+TrigTraversal INFO HLT_mufast_chain
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #6 (MU_H_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #5 (MU_IM_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #4 (MU_F_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #0 (MU0)
+TrigTraversal INFO HLT_mu_chain
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #16 (MU_H_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #15 (MU_IM_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #14 (MU_F_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #6 (MU_H_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #5 (MU_IM_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #4 (MU_F_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #0 (MU0)
+TrigTraversal INFO HLT_mu_em_chain
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #24 (MUEM_CH_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #23 (MUEM_H_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #22 (MUEM_IM_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #21 (MUEM_F_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #20 (MUEM_CH_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #19 (MUEM_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #18 (MUEM_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #17 (MUEM_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #38 (MUEM_CH_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #37 (MUEM_H_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #36 (MUEM_IM_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #35 (MUEM_F_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #34 (MUEM_CH_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #33 (MUEM_H_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #32 (MUEM_IM_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #31 (MUEM_F_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #9 (MUEM_H_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #8 (MUEM_IM_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #7 (MUEM_F_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #0 (MU0)
+TrigTraversal INFO HLT_em_chain
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #30 (EM_H_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #29 (EM_IM_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #28 (EM_F_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #27 (EM_H_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #26 (EM_IM_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #25 (EM_F_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
+TrigTraversal INFO All
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #3 (HLTPassRaw)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #16 (MU_H_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #15 (MU_IM_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #14 (MU_F_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #13 (MU_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #12 (MU_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #11 (MU_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #24 (MUEM_CH_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #23 (MUEM_H_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #22 (MUEM_IM_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #21 (MUEM_F_2__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #20 (MUEM_CH_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #19 (MUEM_H_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #18 (MUEM_IM_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #17 (MUEM_F_1__MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #1 (MU1)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #30 (EM_H_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #29 (EM_IM_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #28 (EM_F_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #27 (EM_H_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #26 (EM_IM_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #25 (EM_F_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #38 (MUEM_CH_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #37 (MUEM_H_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #36 (MUEM_IM_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #35 (MUEM_F_2__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #34 (MUEM_CH_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #33 (MUEM_H_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #32 (MUEM_IM_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #31 (MUEM_F_1__EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #2 (EM0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #6 (MU_H_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #5 (MU_IM_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #4 (MU_F_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #0 (MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #9 (MUEM_H_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #8 (MUEM_IM_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #7 (MUEM_F_1__MU0)
+TrigTraversal INFO |-> HLTNav_MyDecisionContainer #0 (MU0)
+TrigTraversal INFO [All passing/failing features] HLT_mufast_chain features size:2
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:5, state:INACTIVE
-[All passing/failing features] HLT_mu_chain features size:3
+
+TrigTraversal INFO [All passing/failing features] HLT_mu_chain features size:3
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:21, state:ACTIVE
Feature 2 pt:5, state:INACTIVE
-[All passing/failing features] HLT_mu_em_chain features size:5
+
+TrigTraversal INFO [All passing/failing features] HLT_mu_em_chain features size:5
Feature 0 pt:21, state:ACTIVE
Feature 1 pt:20, state:ACTIVE
Feature 2 pt:31, state:ACTIVE
Feature 3 pt:30, state:ACTIVE
Feature 4 pt:5, state:INACTIVE
-[All passing/failing features] HLT_em_chain features size:2
+
+TrigTraversal INFO [All passing/failing features] HLT_em_chain features size:2
Feature 0 pt:31, state:ACTIVE
Feature 1 pt:30, state:ACTIVE
-[All passing/failing features] All chains features size:5
+
+TrigTraversal INFO [All passing/failing features] All chains features size:5
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:21, state:ACTIVE
Feature 2 pt:31, state:ACTIVE
Feature 3 pt:30, state:ACTIVE
Feature 4 pt:5, state:ACTIVE
-[Final passing/failing feature] HLT_mufast_chain features size:2
+
+TrigTraversal INFO [Final passing/failing feature] HLT_mufast_chain features size:2
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:5, state:INACTIVE
-[Final passing/failing feature] HLT_mu_chain features size:3
+
+TrigTraversal INFO [Final passing/failing feature] HLT_mu_chain features size:3
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:21, state:ACTIVE
Feature 2 pt:5, state:INACTIVE
-[Final passing/failing feature] HLT_mu_em_chain features size:3
+
+TrigTraversal INFO [Final passing/failing feature] HLT_mu_em_chain features size:3
Feature 0 pt:21, state:ACTIVE
Feature 1 pt:31, state:ACTIVE
Feature 2 pt:5, state:INACTIVE
-[Final passing/failing feature] HLT_em_chain features size:1
+
+TrigTraversal INFO [Final passing/failing feature] HLT_em_chain features size:1
Feature 0 pt:31, state:ACTIVE
-[Final passing/failing feature] All chains features size:4
+
+TrigTraversal INFO [Final passing/failing feature] All chains features size:4
Feature 0 pt:20, state:ACTIVE
Feature 1 pt:21, state:ACTIVE
Feature 2 pt:31, state:ACTIVE
Feature 3 pt:5, state:ACTIVE
+
---------- Check Explicit Type
-[Explicit Final Muon Features] HLT_mu_em_chain features size:2
+TrigTraversal INFO [Explicit Final Muon Features] HLT_mu_em_chain features size:2
Feature 0 pt:21, state:UNSET
Feature 1 pt:5, state:UNSET
-[Explicit Final Electron Features] HLT_mu_em_chain features size:1
+
+TrigTraversal INFO [Explicit Final Electron Features] HLT_mu_em_chain features size:1
Feature 0 pt:31, state:UNSET
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/src/NavGraph.cxx b/Trigger/TrigSteer/TrigCompositeUtils/src/NavGraph.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..cd7e5476855cef6b2ac5736fddc2b2ffd60bdaa7
--- /dev/null
+++ b/Trigger/TrigSteer/TrigCompositeUtils/src/NavGraph.cxx
@@ -0,0 +1,89 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "TrigCompositeUtils/TrigCompositeUtils.h"
+#include "TrigCompositeUtils/NavGraph.h"
+
+namespace TrigCompositeUtils {
+
+ NavGraphNode::NavGraphNode(const Decision* me) : m_decisionObject(me){
+ }
+
+
+ bool NavGraphNode::linksTo(const NavGraphNode* to) {
+ return (m_filteredSeeds.insert(to)).second; // Return TRUE if a new edge is added
+ }
+
+
+ const Decision* NavGraphNode::node() const {
+ return m_decisionObject;
+ }
+
+
+ const std::set<const NavGraphNode*>& NavGraphNode::seeds() const {
+ return m_filteredSeeds;
+ }
+
+
+ // #################################################
+
+
+ NavGraph::NavGraph() : m_nodes(), m_finalNodes(), m_edges(0) {
+ }
+
+
+ void NavGraph::addNode(const Decision* node, const Decision* comingFrom) {
+ auto nodePairIt = m_nodes.insert( std::make_pair(node, NavGraphNode(node)) );
+ NavGraphNode& nodeObj = nodePairIt.first->second;
+
+ if (comingFrom == nullptr) { // Not coming from anywhere - hence a final node.
+ m_finalNodes.insert( &nodeObj );
+ } else {
+ auto comingFromPairIt = m_nodes.insert( std::make_pair(comingFrom, NavGraphNode(comingFrom)) );
+ NavGraphNode& comingFromNodeObj = comingFromPairIt.first->second;
+ const bool newEdge = comingFromNodeObj.linksTo( &nodeObj );
+ if (newEdge) {
+ ++m_edges;
+ }
+ }
+ }
+
+
+ const std::set<NavGraphNode*>& NavGraph::finalNodes() const {
+ return m_finalNodes;
+ }
+
+
+ size_t NavGraph::nodes() const {
+ return m_nodes.size();
+ }
+
+
+ size_t NavGraph::edges() const {
+ return m_edges;
+ }
+
+
+ void NavGraph::printAllPaths(MsgStream& log, MSG::Level msgLevel) const {
+ for (const NavGraphNode* finalNode : finalNodes()) {
+ recursivePrintNavPath(*finalNode, 0, log, msgLevel);
+ }
+ }
+
+
+ void NavGraph::recursivePrintNavPath(const NavGraphNode& nav, size_t level, MsgStream& log, MSG::Level msgLevel) const {
+ const Decision* node = nav.node();
+ const ElementLink<DecisionContainer> nodeEL = decisionToElementLink( node );
+ std::stringstream ss;
+ for (size_t i = 0; i < level; ++i) {
+ ss << " ";
+ }
+ ss << "|-> " << nodeEL.dataID() << " #" << nodeEL.index() << " (" << node->name() << ")";
+ log << msgLevel << ss.str() << endmsg;
+ for (const NavGraphNode* seed : nav.seeds()) {
+ recursivePrintNavPath(*seed, level + 1, log, msgLevel);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/src/TrigCompositeUtils.cxx b/Trigger/TrigSteer/TrigCompositeUtils/src/TrigCompositeUtils.cxx
index 312d1997ef11d547b98b4c8ee8c1817fe0635c07..e570baed73678d23205a1ce4a02e79790798221a 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/src/TrigCompositeUtils.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/src/TrigCompositeUtils.cxx
@@ -1,6 +1,7 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+
#include "StoreGate/WriteHandle.h"
#include "StoreGate/ReadHandle.h"
#include "AthContainers/AuxElement.h"
@@ -275,94 +276,46 @@ namespace TrigCompositeUtils {
return output;
}
- void recursiveGetDecisionsInternal(const Decision* start,
- const size_t location,
- std::vector<ElementLinkVector<DecisionContainer>>& linkVector,
+ void recursiveGetDecisionsInternal(const Decision* node,
+ const Decision* comingFrom,
+ NavGraph& navGraph,
const DecisionID id,
const bool enforceDecisionOnNode) {
// Does this Decision satisfy the chain requirement?
DecisionIDContainer idSet = {id};
- if (enforceDecisionOnNode && id != 0 && !isAnyIDPassing(start, idSet)) {
+ if (enforceDecisionOnNode && id != 0 && !isAnyIDPassing(node, idSet)) {
return; // Stop propagating down this leg. It does not concern the chain with DecisionID = id
}
- // This Decision object is part of this linear path through the Navigation
- const DecisionContainer* container = dynamic_cast<const DecisionContainer*>( start->container() );
- ElementLink<DecisionContainer> startLink = ElementLink<DecisionContainer>(*container, start->index());
- linkVector.at(location).push_back( startLink );
+ // This Decision object is part of this path through the Navigation
+ navGraph.addNode(node, comingFrom);
// Continue to the path(s) by looking at this Decision object's seed(s)
- if ( hasLinkToPrevious(start) ) {
- const ElementLinkVector<DecisionContainer> seedsVector = getLinkToPrevious(start);
-
- // If there is more than one seed then we need to fork.
- // Each fork implies copying the (linear) vector of links up to this point.
- // As this forking may have happened more than once before, we need to remember which seed
- // corresponds to which fork. Done here via a map.
- std::unordered_map<size_t,size_t> mapSeedToLinkVector;
- for (size_t seed = 0; seed < seedsVector.size(); ++seed) {
- if (seed == 0) {
- mapSeedToLinkVector.insert( std::make_pair(seed, location) );
- } else {
- linkVector.push_back( linkVector.at(location) );
- mapSeedToLinkVector.insert( std::make_pair(seed, linkVector.size() - 1) );
- }
- }
-
+ if ( hasLinkToPrevious(node) ) {
// Do the recursion
- for (size_t seed = 0; seed < seedsVector.size(); ++seed) {
- const Decision* seedDecision = *(seedsVector.at(seed)); // Dereference ElementLink
- size_t linkVectorLocation = mapSeedToLinkVector.find(seed)->second;
+ for ( ElementLink<DecisionContainer> seed : getLinkToPrevious(node)) {
+ const Decision* seedDecision = *(seed); // Dereference ElementLink
// Sending true as final parameter for enforceDecisionOnStartNode as we are recursing away from the supplied start node
- recursiveGetDecisionsInternal(seedDecision, linkVectorLocation, linkVector, id, true);
+ recursiveGetDecisionsInternal(seedDecision, node, navGraph, id, /*enforceDecisionOnNode*/ true);
}
}
return;
}
void recursiveGetDecisions(const Decision* start,
- std::vector<ElementLinkVector<DecisionContainer>>& linkVector,
+ NavGraph& navGraph,
const DecisionID id,
const bool enforceDecisionOnStartNode) {
- // Note: we do not require linkVector to be an empty vector. We can append to it.
- linkVector.push_back( ElementLinkVector<DecisionContainer>() ); // Our starting point
- const size_t startingElement = linkVector.size() - 1;
- recursiveGetDecisionsInternal(start, startingElement, linkVector, id, enforceDecisionOnStartNode);
- // Writing finished.
- // Now - remove defunct branches. These are zero length entries or entries which did not propagate all the way up to the root nodes
- // (this occurs when the decision ID was not valid along a prospective branch)
- std::vector<ElementLinkVector<DecisionContainer>>::iterator vecIt = linkVector.begin();
- std::advance(vecIt, startingElement);
- // vecIt is an iterator which now corresponds to the first element added by this call to recursiveGetDecisions
- for (; vecIt != linkVector.end();) {
- bool shouldRemove = false;
- if (vecIt->size() == 0) {
- // No Decision ELs were added to the inner ElementLinkVector.
- shouldRemove = true;
- } else {
- ElementLink<DecisionContainer> finalDecision = vecIt->back();
- DecisionIDContainer idSet = {id};
- if (hasLinkToPrevious(*finalDecision)) {
- // If the back Decision is not L1 (hence has links), then it's not from the top of the graph. And the path should be removed.
- shouldRemove = true;
- } else if (id != 0 && !isAnyIDPassing(*finalDecision, idSet)) {
- // The final hop to this L1 node was not valid for the chain in question
- shouldRemove = true;
- }
- }
- if (shouldRemove) {
- vecIt = linkVector.erase(vecIt);
- } else {
- ++vecIt;
- }
- }
+ // Note: we do not require navGraph to be an empty graph. We can extend it.
+ recursiveGetDecisionsInternal(start, /*comingFrom*/nullptr, navGraph, id, enforceDecisionOnStartNode);
+
return;
}
- std::string dump( const Decision* tc, std::function< std::string( const Decision* )> printerFnc ) {
+ std::string dump( const Decision* tc, std::function< std::string( const Decision* )> printerFnc ) {
std::string ret;
ret += printerFnc( tc );
if ( hasLinkToPrevious(tc) ) {
diff --git a/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx b/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
index 59c63f8cb65851aa806f3a457aff3a0732e0ecf6..7ae89a7d3f021351bf8af542d667142d981278de 100644
--- a/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
+++ b/Trigger/TrigSteer/TrigCompositeUtils/test/TrigTraversal_test.cxx
@@ -22,10 +22,8 @@
#include "xAODMuon/MuonContainer.h"
#include "xAODMuon/MuonAuxContainer.h"
-void printPaths(const std::vector<ElementLinkVector<TrigCompositeUtils::DecisionContainer>>& paths, const std::string& name);
-
template<class CONTAINER>
-void printFeatures(const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >& featureContainer, const std::string& name);
+void printFeatures(const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >& featureContainer, const std::string& name, MsgStream& log);
/// @brief Test to check traversal functions of a graph of interconnect TrigComposite objects
///
@@ -41,20 +39,22 @@ int main ATLAS_NOT_THREAD_SAFE () {
// initialize Gaudi, SG
ISvcLocator* pSvcLoc;
Athena_test::initGaudi(pSvcLoc);
- StoreGateSvc* pSG(0);
+ StoreGateSvc* pSG(nullptr);
assert( pSvcLoc->service("StoreGateSvc", pSG, true).isSuccess() );
+ MsgStream log(nullptr, "TrigTraversal");
+
// Create a context
IProxyDict* xdict = &*pSG;
xdict = pSG->hiveProxyDict();
EventContext ctx(0,0);
ctx.setExtension( Atlas::ExtendedEventContext(xdict) );
Gaudi::Hive::setCurrentContext (ctx);
- std::cout << "Context: " << ctx << std::endl;
+ log << "Context: " << ctx << endmsg;
// check current context
const EventContext& ctx1 = Gaudi::Hive::currentContext();
- std::cout << "Current context: " << ctx1 << std::endl;
+ log << "Current context: " << ctx1 << endmsg;
SG::WriteHandleKey<DecisionContainer> decisionContainerKey("HLTNav_MyDecisionContainer");
SG::WriteHandleKey<xAOD::ElectronContainer> electronContainerKey("MyElectronContainer");
@@ -374,47 +374,53 @@ int main ATLAS_NOT_THREAD_SAFE () {
// Test the graph
- std::vector<ElementLinkVector<DecisionContainer>> paths_HLT_mufast_chain;
- std::vector<ElementLinkVector<DecisionContainer>> paths_HLT_mu_chain;
- std::vector<ElementLinkVector<DecisionContainer>> paths_HLT_mu_em_chain;
- std::vector<ElementLinkVector<DecisionContainer>> paths_HLT_em_chain;
- std::vector<ElementLinkVector<DecisionContainer>> paths_HLT_all;
-
- recursiveGetDecisions(END, paths_HLT_mufast_chain, HLT_mufast_chain, true);
- recursiveGetDecisions(END, paths_HLT_mu_chain, HLT_mu_chain, true);
- recursiveGetDecisions(END, paths_HLT_mu_em_chain, HLT_mu_em_chain, true);
- recursiveGetDecisions(END, paths_HLT_em_chain, HLT_em_chain, true);
- recursiveGetDecisions(END, paths_HLT_all, 0, true);
-
- printPaths(paths_HLT_mufast_chain, "HLT_mufast_chain");
- printPaths(paths_HLT_mu_chain, "HLT_mu_chain");
- printPaths(paths_HLT_mu_em_chain, "HLT_mu_em_chain");
- printPaths(paths_HLT_em_chain, "HLT_em_chain");
- printPaths(paths_HLT_all, "All");
-
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_mufast_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mufast_chain, "", false, featureString(), mufast_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_mu_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_chain, "", false, featureString(), mu_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_mu_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_em_chain, "", false, featureString(), mu_em_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_em_chain, "", false, featureString(), em_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_all = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_all, "", false, featureString(), all_IDcont);
-
- printFeatures(features_pass_all_HLT_mufast_chain, "[All passing features] HLT_mufast_chain");
- printFeatures(features_pass_all_HLT_mu_chain, "[All passing features] HLT_mu_chain");
- printFeatures(features_pass_all_HLT_mu_em_chain, "[All passing features] HLT_mu_em_chain");
- printFeatures(features_pass_all_HLT_em_chain, "[All passing features] HLT_em_chain");
- printFeatures(features_pass_all_HLT_all, "[All passing features] All chains");
-
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_mufast_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mufast_chain, "", true, featureString(), mufast_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_mu_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_chain, "", true, featureString(), mu_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_mu_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_em_chain, "", true, featureString(), mu_em_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_em_chain, "", true, featureString(), em_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_all = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_all, "", true, featureString(), all_IDcont);
-
- printFeatures(features_pass_final_HLT_mufast_chain, "[Final passing feature] HLT_mufast_chain");
- printFeatures(features_pass_final_HLT_mu_chain, "[Final passing feature] HLT_mu_chain");
- printFeatures(features_pass_final_HLT_mu_em_chain, "[Final passing feature] HLT_mu_em_chain");
- printFeatures(features_pass_final_HLT_em_chain, "[Final passing feature] HLT_em_chain");
- printFeatures(features_pass_final_HLT_all, "[Final passing feature] All chains");
+ NavGraph graph_HLT_mufast_chain;
+ NavGraph graph_HLT_mu_chain;
+ NavGraph graph_HLT_mu_em_chain;
+ NavGraph graph_HLT_em_chain;
+ NavGraph graph_HLT_all;
+
+ recursiveGetDecisions(END, graph_HLT_mufast_chain, HLT_mufast_chain, true);
+ recursiveGetDecisions(END, graph_HLT_mu_chain, HLT_mu_chain, true);
+ recursiveGetDecisions(END, graph_HLT_mu_em_chain, HLT_mu_em_chain, true);
+ recursiveGetDecisions(END, graph_HLT_em_chain, HLT_em_chain, true);
+ recursiveGetDecisions(END, graph_HLT_all, 0, true);
+
+
+ log << MSG::INFO << "HLT_mufast_chain" << endmsg;
+ graph_HLT_mufast_chain.printAllPaths(log, MSG::INFO);
+ log << MSG::INFO << "HLT_mu_chain" << endmsg;
+ graph_HLT_mu_chain.printAllPaths(log, MSG::INFO);
+ log << MSG::INFO << "HLT_mu_em_chain" << endmsg;
+ graph_HLT_mu_em_chain.printAllPaths(log, MSG::INFO);
+ log << MSG::INFO << "HLT_em_chain" << endmsg;
+ graph_HLT_em_chain.printAllPaths(log, MSG::INFO);
+ log << MSG::INFO << "All" << endmsg;
+ graph_HLT_all.printAllPaths(log, MSG::INFO);
+
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_mufast_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mufast_chain, "", false, featureString(), mufast_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_mu_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mu_chain, "", false, featureString(), mu_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_mu_em_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mu_em_chain, "", false, featureString(), mu_em_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_em_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_em_chain, "", false, featureString(), em_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_all_HLT_all = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_all, "", false, featureString(), all_IDcont);
+
+ printFeatures(features_pass_all_HLT_mufast_chain, "[All passing features] HLT_mufast_chain", log);
+ printFeatures(features_pass_all_HLT_mu_chain, "[All passing features] HLT_mu_chain", log);
+ printFeatures(features_pass_all_HLT_mu_em_chain, "[All passing features] HLT_mu_em_chain", log);
+ printFeatures(features_pass_all_HLT_em_chain, "[All passing features] HLT_em_chain", log);
+ printFeatures(features_pass_all_HLT_all, "[All passing features] All chains", log);
+
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_mufast_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mufast_chain, "", true, featureString(), mufast_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_mu_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mu_chain, "", true, featureString(), mu_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_mu_em_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mu_em_chain, "", true, featureString(), mu_em_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_em_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_em_chain, "", true, featureString(), em_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_pass_final_HLT_all = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_all, "", true, featureString(), all_IDcont);
+
+ printFeatures(features_pass_final_HLT_mufast_chain, "[Final passing feature] HLT_mufast_chain", log);
+ printFeatures(features_pass_final_HLT_mu_chain, "[Final passing feature] HLT_mu_chain", log);
+ printFeatures(features_pass_final_HLT_mu_em_chain, "[Final passing feature] HLT_mu_em_chain", log);
+ printFeatures(features_pass_final_HLT_em_chain, "[Final passing feature] HLT_em_chain", log);
+ printFeatures(features_pass_final_HLT_all, "[Final passing feature] All chains", log);
std::cout << " ---------- Now Include Failing Features " << std::endl;
@@ -425,64 +431,69 @@ int main ATLAS_NOT_THREAD_SAFE () {
std::vector<const Decision*> extraStart_HLT_all = getRejectedDecisionNodes(pSG, 0);
for (const Decision* d : extraStart_HLT_mufast_chain) {
- recursiveGetDecisions(d, paths_HLT_mufast_chain, HLT_mufast_chain, false);
+ recursiveGetDecisions(d, graph_HLT_mufast_chain, HLT_mufast_chain, false);
}
for (const Decision* d : extraStart_HLT_mu_chain) {
- recursiveGetDecisions(d, paths_HLT_mu_chain, HLT_mu_chain, false);
+ recursiveGetDecisions(d, graph_HLT_mu_chain, HLT_mu_chain, false);
}
for (const Decision* d : extraStart_HLT_mu_em_chain) {
- recursiveGetDecisions(d, paths_HLT_mu_em_chain, HLT_mu_em_chain, false);
+ recursiveGetDecisions(d, graph_HLT_mu_em_chain, HLT_mu_em_chain, false);
}
for (const Decision* d : extraStart_HLT_em_chain) {
- recursiveGetDecisions(d, paths_HLT_em_chain, HLT_em_chain, false);
+ recursiveGetDecisions(d, graph_HLT_em_chain, HLT_em_chain, false);
}
for (const Decision* d : extraStart_HLT_all) {
- recursiveGetDecisions(d, paths_HLT_all, 0, false);
+ recursiveGetDecisions(d, graph_HLT_all, 0, false);
}
- printPaths(paths_HLT_mufast_chain, "HLT_mufast_chain");
- printPaths(paths_HLT_mu_chain, "HLT_mu_chain");
- printPaths(paths_HLT_mu_em_chain, "HLT_mu_em_chain");
- printPaths(paths_HLT_em_chain, "HLT_em_chain");
- printPaths(paths_HLT_all, "All");
-
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_mufast_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mufast_chain, "", false, featureString(), mufast_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_mu_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_chain, "", false, featureString(), mu_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_mu_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_em_chain, "", false, featureString(), mu_em_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_em_chain, "", false, featureString(), em_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_all = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_all, "", false, featureString(), all_IDcont);
-
- printFeatures(features_passfail_all_HLT_mufast_chain, "[All passing/failing features] HLT_mufast_chain");
- printFeatures(features_passfail_all_HLT_mu_chain, "[All passing/failing features] HLT_mu_chain");
- printFeatures(features_passfail_all_HLT_mu_em_chain, "[All passing/failing features] HLT_mu_em_chain");
- printFeatures(features_passfail_all_HLT_em_chain, "[All passing/failing features] HLT_em_chain");
- printFeatures(features_passfail_all_HLT_all, "[All passing/failing features] All chains");
-
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_mufast_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mufast_chain, "", true, featureString(), mufast_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_mu_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_chain, "", true, featureString(), mu_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_mu_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_em_chain, "", true, featureString(), mu_em_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_em_chain, "", true, featureString(), em_IDcont);
- std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_all = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_all, "", true, featureString(), all_IDcont);
-
- printFeatures(features_passfail_final_HLT_mufast_chain, "[Final passing/failing feature] HLT_mufast_chain");
- printFeatures(features_passfail_final_HLT_mu_chain, "[Final passing/failing feature] HLT_mu_chain");
- printFeatures(features_passfail_final_HLT_mu_em_chain, "[Final passing/failing feature] HLT_mu_em_chain");
- printFeatures(features_passfail_final_HLT_em_chain, "[Final passing/failing feature] HLT_em_chain");
- printFeatures(features_passfail_final_HLT_all, "[Final passing/failing feature] All chains");
+ log << MSG::INFO << "HLT_mufast_chain" << endmsg;
+ graph_HLT_mufast_chain.printAllPaths(log, MSG::INFO);
+ log << MSG::INFO << "HLT_mu_chain" << endmsg;
+ graph_HLT_mu_chain.printAllPaths(log, MSG::INFO);
+ log << MSG::INFO << "HLT_mu_em_chain" << endmsg;
+ graph_HLT_mu_em_chain.printAllPaths(log, MSG::INFO);
+ log << MSG::INFO << "HLT_em_chain" << endmsg;
+ graph_HLT_em_chain.printAllPaths(log, MSG::INFO);
+ log << MSG::INFO << "All" << endmsg;
+ graph_HLT_all.printAllPaths(log, MSG::INFO);
+
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_mufast_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mufast_chain, "", false, featureString(), mufast_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_mu_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mu_chain, "", false, featureString(), mu_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_mu_em_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mu_em_chain, "", false, featureString(), mu_em_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_em_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_em_chain, "", false, featureString(), em_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_all_HLT_all = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_all, "", false, featureString(), all_IDcont);
+
+ printFeatures(features_passfail_all_HLT_mufast_chain, "[All passing/failing features] HLT_mufast_chain", log);
+ printFeatures(features_passfail_all_HLT_mu_chain, "[All passing/failing features] HLT_mu_chain", log);
+ printFeatures(features_passfail_all_HLT_mu_em_chain, "[All passing/failing features] HLT_mu_em_chain", log);
+ printFeatures(features_passfail_all_HLT_em_chain, "[All passing/failing features] HLT_em_chain", log);
+ printFeatures(features_passfail_all_HLT_all, "[All passing/failing features] All chains", log);
+
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_mufast_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mufast_chain, "", true, featureString(), mufast_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_mu_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mu_chain, "", true, featureString(), mu_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_mu_em_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_mu_em_chain, "", true, featureString(), mu_em_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_em_chain = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_em_chain, "", true, featureString(), em_IDcont);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_passfail_final_HLT_all = recursiveGetFeaturesOfType<xAOD::IParticleContainer>(graph_HLT_all, "", true, featureString(), all_IDcont);
+
+ printFeatures(features_passfail_final_HLT_mufast_chain, "[Final passing/failing feature] HLT_mufast_chain", log);
+ printFeatures(features_passfail_final_HLT_mu_chain, "[Final passing/failing feature] HLT_mu_chain", log);
+ printFeatures(features_passfail_final_HLT_mu_em_chain, "[Final passing/failing feature] HLT_mu_em_chain", log);
+ printFeatures(features_passfail_final_HLT_em_chain, "[Final passing/failing feature] HLT_em_chain", log);
+ printFeatures(features_passfail_final_HLT_all, "[Final passing/failing feature] All chains", log);
std::cout << " ---------- Check Explicit Type " << std::endl;
// Check typed retrieval too
// Note we are *not* passing the set of interested chains here so expect the state to be unset
- std::vector< LinkInfo<xAOD::MuonContainer> > features_final_mu = getFeaturesOfType<xAOD::MuonContainer>(paths_HLT_mu_em_chain);
- std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em = getFeaturesOfType<xAOD::ElectronContainer>(paths_HLT_mu_em_chain);
- printFeatures(features_final_mu, "[Explicit Final Muon Features] HLT_mu_em_chain");
- printFeatures(features_final_em, "[Explicit Final Electron Features] HLT_mu_em_chain");
+ std::vector< LinkInfo<xAOD::MuonContainer> > features_final_mu = recursiveGetFeaturesOfType<xAOD::MuonContainer>(graph_HLT_mu_em_chain);
+ std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em = recursiveGetFeaturesOfType<xAOD::ElectronContainer>(graph_HLT_mu_em_chain);
+ printFeatures(features_final_mu, "[Explicit Final Muon Features] HLT_mu_em_chain", log);
+ printFeatures(features_final_em, "[Explicit Final Electron Features] HLT_mu_em_chain", log);
// Check filtering on the collection name. Note sub-string matching, omitting the "My".
- std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em_correctContainer = getFeaturesOfType<xAOD::ElectronContainer>(paths_HLT_mu_em_chain, "ElectronContainer");
- std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em_incorrectContainer = getFeaturesOfType<xAOD::ElectronContainer>(paths_HLT_mu_em_chain, "WrongContainerName");
+ std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em_correctContainer = recursiveGetFeaturesOfType<xAOD::ElectronContainer>(graph_HLT_mu_em_chain, "ElectronContainer");
+ std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em_incorrectContainer = recursiveGetFeaturesOfType<xAOD::ElectronContainer>(graph_HLT_mu_em_chain, "WrongContainerName");
VALUE ( features_final_em_correctContainer.size() ) EXPECTED ( features_final_em.size() );
VALUE ( features_final_em_incorrectContainer.size() ) EXPECTED ( 0 );
@@ -495,9 +506,10 @@ int main ATLAS_NOT_THREAD_SAFE () {
}
template<class CONTAINER>
-void printFeatures(const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >& featureContainer, const std::string& name) {
+void printFeatures(const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >& featureContainer, const std::string& name, MsgStream& log) {
using namespace TrigCompositeUtils;
- std::cout << name << " features size:" << featureContainer.size() << std::endl;
+ std::stringstream ss;
+ ss << name << " features size:" << featureContainer.size() << std::endl;
size_t count = 0;
for (const TrigCompositeUtils::LinkInfo<CONTAINER>& featureLinkInfo : featureContainer) {
std::string stateStr;
@@ -506,27 +518,7 @@ void printFeatures(const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >&
case ActiveState::INACTIVE: stateStr = "INACTIVE"; break;
case ActiveState::UNSET: default: stateStr = "UNSET"; break;
}
- std::cout << " Feature " << count++ << " pt:" << (*featureLinkInfo.link)->pt() << ", state:" << stateStr << std::endl;
+ ss << " Feature " << count++ << " pt:" << (*featureLinkInfo.link)->pt() << ", state:" << stateStr << std::endl;
}
+ log << MSG::INFO << ss.str() << endmsg;
}
-
-void printPaths(const std::vector<ElementLinkVector<TrigCompositeUtils::DecisionContainer>>& paths, const std::string& name) {
- using namespace TrigCompositeUtils;
- std::cout << paths.size() << " paths for " << name << std::endl;
- size_t count = 0;
- for (const ElementLinkVector<DecisionContainer>& path : paths) {
- std::cout << " Path " << count++ << "[";
- bool first = true;
- for (const ElementLink<DecisionContainer>& link : path) {
- if (!first) std::cout << " -> ";
- first = false;
- std::cout << (*link)->name();
- if ((*link)->hasObjectLink(featureString())) {
- ElementLink<xAOD::IParticleContainer> feature = (*link)->objectLink<xAOD::IParticleContainer>(featureString());
- std::cout << " F(pt:" << (*feature)->pt() << ")";
- }
- }
- std::cout << "]" << std::endl;
- }
-}
-
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
index c4a9f0f24ebfa3d9ac3303f78ec23e9ea6a28e4d..8f54c55119779ffa922cb77beed2b9d4eda94a4f 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
@@ -380,7 +380,7 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
if ( not readHandle.isValid() ) { // collection is missing
ATH_MSG_DEBUG( "Creating missing CaloClusterContainerShallowCopy " << m_CaloClusterContainerShallowCopy[index].key() );
auto writeHandle = SG::makeHandle( m_CaloClusterContainerShallowCopyOut[index], context );
- ATH_CHECK( writeHandle.record( std::move( std::make_unique<xAOD::CaloClusterContainer>()), std::move(std::make_unique<xAOD::ShallowAuxContainer>()) ));
+ ATH_CHECK( writeHandle.record( std::make_unique<xAOD::CaloClusterContainer>(), std::make_unique<xAOD::ShallowAuxContainer>() ));
} else {
ATH_MSG_DEBUG( "CaloClusterContainerShallowCopy " << m_CaloClusterContainerShallowCopyOut[index].key() << " present in the event, done nothing");
}
diff --git a/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx b/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
index 698c9223a95805286d7cbcaed30fcdb9d4fee172..273023e802da59ecb3c9425c862e6790902c3911 100755
--- a/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/RandomScaler.cxx
@@ -130,7 +130,7 @@ void HLT::RandomScaler::setSeedFromDataflow()
// Check if application-specific random seed is provided via DataFlowConfig
ServiceHandle<IJobOptionsSvc> jobOptSvc("JobOptionsSvc", name());
if ( jobOptSvc.retrieve().isSuccess() ) {
- const Property* p = Gaudi::Utils::getProperty( jobOptSvc->getProperties("DataFlowConfig"), "DF_RandomSeed");
+ const Gaudi::Details::PropertyBase* p = Gaudi::Utils::getProperty( jobOptSvc->getProperties("DataFlowConfig"), "DF_RandomSeed");
if ( p!=0 ) { // Partition running
IntegerProperty seed;
if ( seed.assign(*p) ) {
diff --git a/Trigger/TrigSteer/ViewAlgs/ViewAlgs/IDCCacheCreatorBase.h b/Trigger/TrigSteer/ViewAlgs/ViewAlgs/IDCCacheCreatorBase.h
index 9398575b4398471868072c932fc229d817f65f68..7cef43d0057ec04b74d09242690438a94ba8f20d 100644
--- a/Trigger/TrigSteer/ViewAlgs/ViewAlgs/IDCCacheCreatorBase.h
+++ b/Trigger/TrigSteer/ViewAlgs/ViewAlgs/IDCCacheCreatorBase.h
@@ -26,7 +26,7 @@ protected:
};
-template<bool checkKey = true, typename T>
+template<bool checkKey, typename T>
StatusCode IDCCacheCreatorBase::createContainer(const SG::WriteHandleKey<T>& containerKey, long unsigned int size, const EventContext& ctx) const{
static_assert(std::is_base_of<EventContainers::IdentifiableCacheBase, T>::value, "Expects a IdentifiableCache Class" );
if constexpr (checkKey){
@@ -41,7 +41,7 @@ StatusCode IDCCacheCreatorBase::createContainer(const SG::WriteHandleKey<T>& con
return StatusCode::SUCCESS;
}
-template<bool checkKey = true, typename T, typename X>
+template<bool checkKey, typename T, typename X>
StatusCode IDCCacheCreatorBase::createValueContainer(const SG::WriteHandleKey<T>& containerKey, long unsigned int size, const EventContext& ctx, const X& defaultValue) const{
static_assert(std::is_base_of<IdentifiableValueCache<X>, T>::value, "Expects a IdentifiableValueCache Class" );
if constexpr (checkKey){
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
index f0572ac9b0e3dc735f7f9969ab7224ff1b7f1722..c124dd085837b1f73626276e89b891d4aebdc37a 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/src/RoiB2TopoInputDataCnv.cxx
@@ -12,7 +12,7 @@
#include "RoiB2TopoInputDataCnv.h"
#include "TrigT1CaloUtils/L1TopoDataMaker.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigT1Interfaces/TrigT1CaloDefs.h"
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
index 6f0e429d3e8cb35129244a217e7f141301532aca..f9bce9a15cf2bfaaef59c517c25d9216f1b28aed 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/src/DeriveSimulationInputs.h
@@ -10,7 +10,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "TrigConfInterfaces/ITrigConfigSvc.h"
#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
diff --git a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
index a99b28ab70b474de22889d79988bcc83cdfc2f2d..d6efae27b3bf51d375cc5c22e685f2c80e4434d5 100644
--- a/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
+++ b/Trigger/TrigT1/TrigT1CTP/src/CTPSimulation.h
@@ -9,7 +9,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "StoreGate/DataHandle.h"
#include "TrigConfInterfaces/ILVL1ConfigSvc.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
index 4a211ebb3404075e6d543a44adfd13c5c5614c48..2d883b93a885052a2c914f05f0b794d93adce9e2 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.cxx
@@ -36,28 +36,8 @@ namespace LVL1 {
// Constructors and destructors
//--------------------------------
-EnergyCMX::EnergyCMX
- ( const std::string& name, ISvcLocator* pSvcLocator )
- : AthAlgorithm( name, pSvcLocator ),
- m_configSvc("TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", name),
- m_EtTool("LVL1::L1EtTools/L1EtTools"),
- m_resultsFull(0),
- m_resultsTrunc(0)
-{
- m_energyCMXDataLocation = TrigT1CaloDefs::EnergyCMXDataLocation;
- m_energyRoILocation = TrigT1CaloDefs::EnergyROILocation ;
- m_energyCTPLocation = TrigT1CaloDefs::EnergyCTPLocation ;
- m_energyTopoLocation = TrigT1CaloDefs::EnergyTopoDataLocation ;
- m_cmxEtsumsLocation = TrigT1CaloDefs::CMXEtSumsLocation ;
- m_cmxRoILocation = TrigT1CaloDefs::CMXRoILocation ;
-
- // This is how you declare the paramembers to Gaudi so that
- // they can be over-written via the job options file
-
- declareProperty("EnergyRoILocation", m_energyRoILocation );
- declareProperty("EnergyCTPLocation", m_energyCTPLocation );
- declareProperty("EnergyCMXDataLocation", m_energyCMXDataLocation );
-}
+EnergyCMX::EnergyCMX (const std::string& name, ISvcLocator* pSvcLocator)
+ : AthReentrantAlgorithm( name, pSvcLocator ) {}
//---------------------------------
@@ -68,6 +48,11 @@ StatusCode EnergyCMX::initialize()
{
ATH_CHECK( m_configSvc.retrieve() );
ATH_CHECK( m_EtTool.retrieve() );
+ ATH_CHECK( m_energyCMXDataLocation.initialize() );
+ ATH_CHECK( m_energyCTPLocation.initialize() );
+ ATH_CHECK( m_energyTopoLocation.initialize() );
+ ATH_CHECK( m_cmxEtsumsLocation.initialize() );
+ ATH_CHECK( m_cmxRoILocation.initialize() );
return StatusCode::SUCCESS ;
}
@@ -90,22 +75,18 @@ StatusCode EnergyCMX::start()
//
-StatusCode EnergyCMX::execute( )
+StatusCode EnergyCMX::execute(const EventContext& ctx) const
{
- //make a message logging stream
-
ATH_MSG_DEBUG( "Executing" );
// form module sums
- EnergyCMXDataCollection* jemContainer = 0;
- ATH_CHECK(evtStore()->retrieve(jemContainer,m_energyCMXDataLocation));
+ SG::ReadHandle<EnergyCMXDataCollection> jemContainer = SG::makeHandle(m_energyCMXDataLocation, ctx);
// form crate sums (full eta range)
DataVector<CrateEnergy>* cratesFull = new DataVector<CrateEnergy>;
- m_EtTool->crateSums(jemContainer, cratesFull);
+ m_EtTool->crateSums(jemContainer.cptr(), cratesFull);
// system summation and threshold tests
- SystemEnergy resultsFull = m_EtTool->systemSums(cratesFull);
- m_resultsFull = &resultsFull;
+ const SystemEnergy resultsFull = m_EtTool->systemSums(cratesFull);
/** Find restructed eta range.
* This will use the min/max values for the first valid threshold in the range 9-16 to define the ranges
@@ -149,19 +130,20 @@ StatusCode EnergyCMX::execute( )
// form crate sums (restricted eta range). Explicitly set restricted eta flag regardless of eta range
DataVector<CrateEnergy>* cratesTrunc = new DataVector<CrateEnergy>;
- m_EtTool->crateSums(jemContainer, cratesTrunc, maskXE, maskTE, true);
+ m_EtTool->crateSums(jemContainer.cptr(), cratesTrunc, maskXE, maskTE, true);
// system summation and threshold tests
- SystemEnergy resultsTrunc = m_EtTool->systemSums(cratesTrunc);
- m_resultsTrunc = &resultsTrunc;
+ const SystemEnergy resultsTrunc = m_EtTool->systemSums(cratesTrunc);
// CTP Data
- saveCTPObjects();
+ ATH_CHECK(saveCTPObjects(resultsFull, resultsTrunc, ctx));
// RoI output
- saveRoIs();
+ ATH_CHECK(saveRoIs(resultsFull, resultsTrunc, ctx));
// Module readout simulation
- DataVector<CMXEtSums>* CMXSums = new DataVector<CMXEtSums>;
+ SG::WriteHandle<CMXEtSumsCollection> CMXSums = SG::makeHandle(m_cmxEtsumsLocation, ctx);
+ ATH_CHECK(CMXSums.record(std::make_unique<CMXEtSumsCollection>()));
+
std::vector<unsigned int> exVec;
std::vector<unsigned int> eyVec;
std::vector<unsigned int> etVec;
@@ -197,11 +179,11 @@ StatusCode EnergyCMX::execute( )
}
exVec.clear();
- exVec.push_back(m_resultsFull->exTC());
+ exVec.push_back(resultsFull.exTC());
eyVec.clear();
- eyVec.push_back(m_resultsFull->eyTC());
+ eyVec.push_back(resultsFull.eyTC());
etVec.clear();
- etVec.push_back(m_resultsFull->et());
+ etVec.push_back(resultsFull.et());
CMXEtSums* systemEtSumFull = new CMXEtSums(system_crate, LVL1::CMXEtSums::TOTAL_STANDARD,
exVec, eyVec, etVec, exErr, eyErr, etErr, peak);
CMXSums->push_back(systemEtSumFull);
@@ -229,51 +211,38 @@ StatusCode EnergyCMX::execute( )
}
exVec.clear();
- exVec.push_back(m_resultsTrunc->exTC());
+ exVec.push_back(resultsTrunc.exTC());
eyVec.clear();
- eyVec.push_back(m_resultsTrunc->eyTC());
+ eyVec.push_back(resultsTrunc.eyTC());
etVec.clear();
- etVec.push_back(m_resultsTrunc->et());
+ etVec.push_back(resultsTrunc.et());
CMXEtSums* systemEtSumTrunc = new CMXEtSums(system_crate, LVL1::CMXEtSums::TOTAL_RESTRICTED,
exVec, eyVec, etVec, exErr, eyErr, etErr, peak);
CMXSums->push_back(systemEtSumTrunc);
-
- // save Sums in SG
- StatusCode sc1 = evtStore()->overwrite(CMXSums, m_cmxEtsumsLocation, true);
- if (!sc1.isSuccess()) ATH_MSG_ERROR ( "Failed to store CMXEtsums" );
-
+
// Topo data
- EnergyTopoData* topoData = new EnergyTopoData();
+ SG::WriteHandle<EnergyTopoData> topoData = SG::makeHandle(m_energyTopoLocation, ctx);
+ ATH_CHECK(topoData.record(std::make_unique<EnergyTopoData>()));
- topoData->addEx(m_resultsFull->exTC(), m_resultsFull->exOverflow(), LVL1::EnergyTopoData::Normal);
- topoData->addEy(m_resultsFull->eyTC(), m_resultsFull->eyOverflow(), LVL1::EnergyTopoData::Normal);
- topoData->addEt(m_resultsFull->et(), m_resultsFull->etOverflow(), LVL1::EnergyTopoData::Normal);
+ topoData->addEx(resultsFull.exTC(), resultsFull.exOverflow(), LVL1::EnergyTopoData::Normal);
+ topoData->addEy(resultsFull.eyTC(), resultsFull.eyOverflow(), LVL1::EnergyTopoData::Normal);
+ topoData->addEt(resultsFull.et(), resultsFull.etOverflow(), LVL1::EnergyTopoData::Normal);
- topoData->addEx(m_resultsTrunc->exTC(), m_resultsTrunc->exOverflow(), LVL1::EnergyTopoData::Restricted);
- topoData->addEy(m_resultsTrunc->eyTC(), m_resultsTrunc->eyOverflow(), LVL1::EnergyTopoData::Restricted);
- topoData->addEt(m_resultsTrunc->et(), m_resultsTrunc->etOverflow(), LVL1::EnergyTopoData::Restricted);
-
- StatusCode sc2 = evtStore()->overwrite(topoData, m_energyTopoLocation, true);
- if (!sc2.isSuccess()) ATH_MSG_ERROR ( "Failed to store EnergyTopoData" );
+ topoData->addEx(resultsTrunc.exTC(), resultsTrunc.exOverflow(), LVL1::EnergyTopoData::Restricted);
+ topoData->addEy(resultsTrunc.eyTC(), resultsTrunc.eyOverflow(), LVL1::EnergyTopoData::Restricted);
+ topoData->addEt(resultsTrunc.et(), resultsTrunc.etOverflow(), LVL1::EnergyTopoData::Restricted);
// tidy up at end of event
delete cratesFull;
delete cratesTrunc;
- cleanup();
return StatusCode::SUCCESS ;
}
-
} // end of LVL1 namespace bracket
-/** delete pointers etc. */
-void LVL1::EnergyCMX::cleanup(){
-
-}
-
/** retrieves the Calo config put into detectorstore by TrigT1CTP and set up trigger menu */
void LVL1::EnergyCMX::setupTriggerMenuFromCTP(){
ATH_MSG_DEBUG("Loading Trigger Menu");
@@ -301,22 +270,25 @@ void LVL1::EnergyCMX::setupTriggerMenuFromCTP(){
}
/** form CMXRoI & save in SG */
-void LVL1::EnergyCMX::saveRoIs(){
+StatusCode LVL1::EnergyCMX::saveRoIs(const SystemEnergy& resultsFull,
+ const SystemEnergy& resultsTrunc,
+ const EventContext& ctx) const {
ATH_MSG_DEBUG("saveRoIs");
// copy values into roi words
- unsigned int roiWord0 = m_resultsFull->roiWord0();
- unsigned int roiWord2 = m_resultsFull->roiWord1();
- unsigned int roiWord4 = m_resultsFull->roiWord2();
+ unsigned int roiWord0 = resultsFull.roiWord0();
+ unsigned int roiWord2 = resultsFull.roiWord1();
+ unsigned int roiWord4 = resultsFull.roiWord2();
// Truncated eta range
- unsigned int roiWord1 = m_resultsTrunc->roiWord0();
- unsigned int roiWord3 = m_resultsTrunc->roiWord1();
- unsigned int roiWord5 = m_resultsTrunc->roiWord2();
+ unsigned int roiWord1 = resultsTrunc.roiWord0();
+ unsigned int roiWord3 = resultsTrunc.roiWord1();
+ unsigned int roiWord5 = resultsTrunc.roiWord2();
// DAQ readout object.
- //CMXRoI* daqRoI = new CMXRoI(roiWord0, roiWord1, roiWord2, roiWord3, roiWord4, roiWord5);
- CMXRoI* daqRoI = new CMXRoI();
+ SG::WriteHandle<CMXRoI> daqRoI = SG::makeHandle(m_cmxRoILocation, ctx);
+ ATH_CHECK(daqRoI.record(std::make_unique<CMXRoI>()));
+
// Add data to RoI object. The object will perform format checks on inputs
bool added = daqRoI->setRoiWord(roiWord0);
if (!added) ATH_MSG_WARNING("Failed to add RoI Word 0: " << MSG::hex << roiWord0 << MSG::dec);
@@ -331,30 +303,30 @@ void LVL1::EnergyCMX::saveRoIs(){
added = daqRoI->setRoiWord(roiWord5);
if (!added) ATH_MSG_WARNING( "Failed to add RoI Word 5: " << MSG::hex << roiWord5 << MSG::dec );
- // save RoIs in SG
- StatusCode sc = evtStore()->overwrite(daqRoI, m_cmxRoILocation, true);
- if (!sc.isSuccess()) ATH_MSG_ERROR ( "Failed to store CMXRoI object" );
-
- return;
+ return StatusCode::SUCCESS;
}
/** form CTP word from ETmiss and ETsum hits */
-unsigned int LVL1::EnergyCMX::ctpWord(unsigned int metSigPassed, unsigned int etMissPassed, unsigned int etSumPassed){
+unsigned int LVL1::EnergyCMX::ctpWord(unsigned int metSigPassed,
+ unsigned int etMissPassed,
+ unsigned int etSumPassed) const {
return ( (metSigPassed<<(m_def.max_TE_Threshold_Number()+m_def.max_XE_Threshold_Number())) +
(etMissPassed<<m_def.max_TE_Threshold_Number()) + etSumPassed );
}
/** form CTP objects and store them in SG. */
-void LVL1::EnergyCMX::saveCTPObjects(){
+StatusCode LVL1::EnergyCMX::saveCTPObjects(const SystemEnergy& resultsFull,
+ const SystemEnergy& resultsTrunc,
+ const EventContext& ctx) const {
ATH_MSG_DEBUG("saveCTPObjects");
// get bit words of thresholds passed
- unsigned int etSumHitsFull = m_resultsFull->etSumHits();
- unsigned int etMissHitsFull = m_resultsFull->etMissHits();
- unsigned int metSigHitsFull = m_resultsFull->metSigHits();
- unsigned int etSumHitsTrunc = m_resultsTrunc->etSumHits();
- unsigned int etMissHitsTrunc = m_resultsTrunc->etMissHits();
+ unsigned int etSumHitsFull = resultsFull.etSumHits();
+ unsigned int etMissHitsFull = resultsFull.etMissHits();
+ unsigned int metSigHitsFull = resultsFull.metSigHits();
+ unsigned int etSumHitsTrunc = resultsTrunc.etSumHits();
+ unsigned int etMissHitsTrunc = resultsTrunc.etMissHits();
// form CTP words
unsigned int word0 = ctpWord(metSigHitsFull, etMissHitsFull, etSumHitsFull);
@@ -364,18 +336,10 @@ void LVL1::EnergyCMX::saveCTPObjects(){
//temp += (genParity.odd(temp)<<31);
// form CTP object
- EnergyCTP* energyCTP = new EnergyCTP( word0, word1 );
-
- // record in SG
- StatusCode sc = evtStore()->overwrite(energyCTP, m_energyCTPLocation);
- if (sc.isSuccess() ){
- ATH_MSG_DEBUG( "Stored energy CTP object with words "<< std::hex
- << (energyCTP->cableWord0()) << ", " << (energyCTP->cableWord1())<< std::dec);
- }else{
- ATH_MSG_ERROR("Failed to store energy CTP object ");
- }
- return;
-}
-
-
+ SG::WriteHandle<EnergyCTP> energyCTP = SG::makeHandle(m_energyCTPLocation, ctx);
+ ATH_CHECK(energyCTP.record(std::make_unique<EnergyCTP>(word0, word1)));
+ ATH_MSG_DEBUG( "Stored energy CTP object with words "<< std::hex
+ << (energyCTP->cableWord0()) << ", " << (energyCTP->cableWord1())<< std::dec);
+ return StatusCode::SUCCESS;
+}
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.h b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.h
index 4cb7152697651ccf763f65574b7e169d3308d833..fc390d5ca315e2a1f160665c40c8e1bbb419d46a 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/EnergyCMX.h
@@ -18,14 +18,12 @@
#include <map>
// Athena/Gaudi
- #include "AthenaBaseComps/AthAlgorithm.h"
+ #include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-
#include "AthContainers/DataVector.h"
-
- // Athena/Gaudi includes
- #include "GaudiKernel/DataSvc.h"
+ #include "StoreGate/ReadHandleKey.h"
+ #include "StoreGate/WriteHandleKey.h"
// LVL1 Calo Trigger
#include "TrigT1CaloUtils/CrateEnergy.h"
@@ -50,9 +48,10 @@
EnergyCMX uses EnergyCrate and JetElement objects in order to closely follow
the layout of the hardware.
*/
- class EnergyCMX : public AthAlgorithm
+ class EnergyCMX : public AthReentrantAlgorithm
{
typedef DataVector<EnergyCMXData> EnergyCMXDataCollection;
+ typedef DataVector<CMXEtSums> CMXEtSumsCollection;
public:
//-------------------------
@@ -71,43 +70,54 @@
virtual StatusCode initialize() override;
virtual StatusCode start() override;
- virtual StatusCode execute() override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
private: // Private attributes
- ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
- ToolHandle<LVL1::IL1EtTools> m_EtTool;
-
- /* StoreGate keys */
- std::string m_energyCMXDataLocation ;
- std::string m_energyRoILocation ;
- std::string m_energyCTPLocation ;
- std::string m_energyTopoLocation ;
- std::string m_cmxEtsumsLocation ;
- std::string m_cmxRoILocation ;
-
- /** SystemEnergy object returns results of ET trigger algorithms */
- SystemEnergy* m_resultsFull;
- SystemEnergy* m_resultsTrunc;
+ /* Service and tool handles */
+ ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc {
+ this, "LVL1ConfigSvc", "TrigConf::LVL1ConfigSvc/LVL1ConfigSvc", "Service providing L1 menu thresholds"};
+ ToolHandle<LVL1::IL1EtTools> m_EtTool {
+ this, "L1EtTools", "LVL1::L1EtTools/L1EtTools", "Tool performing the simulation"};
+
+ /* Input handles */
+ SG::ReadHandleKey<EnergyCMXDataCollection> m_energyCMXDataLocation {
+ this, "EnergyCMXDataLocation", TrigT1CaloDefs::EnergyCMXDataLocation,
+ "Read handle key for EnergyCMXDataCollection"};
+
+ /* Output handles */
+ SG::WriteHandleKey<EnergyCTP> m_energyCTPLocation {
+ this, "EnergyCTPLocation", TrigT1CaloDefs::EnergyCTPLocation,
+ "Write handle key for EnergyCTP"};
+ SG::WriteHandleKey<EnergyTopoData> m_energyTopoLocation {
+ this, "EnergyTopoDataLocation", TrigT1CaloDefs::EnergyTopoDataLocation,
+ "Write handle key for EnergyTopoData"};
+ SG::WriteHandleKey<CMXEtSumsCollection> m_cmxEtsumsLocation {
+ this, "CMXEtSumsLocation", TrigT1CaloDefs::CMXEtSumsLocation,
+ "Write handle key for CMXEtSumsCollection"};
+ SG::WriteHandleKey<CMXRoI> m_cmxRoILocation {
+ this, "CMXRoILocation", TrigT1CaloDefs::CMXRoILocation,
+ "Write handle key for CMXRoI"};
TrigConf::L1DataDef m_def;
private: // Private methods
- /** delete pointers etc. */
- void cleanup();
-
/** find Trigger Menu set by CTP, and set internal TM values from it*/
void setupTriggerMenuFromCTP();
/** form CTP objects and store them in SG. */
- void saveCTPObjects();
- /** put EnergyRoIs into SG */
- void saveRoIs();
+ StatusCode saveCTPObjects(const SystemEnergy& resultsFull,
+ const SystemEnergy& resultsTrunc,
+ const EventContext& ctx) const;
/** put EnergyRoIs into SG */
- void saveJEMEtSums();
+ StatusCode saveRoIs(const SystemEnergy& resultsFull,
+ const SystemEnergy& resultsTrunc,
+ const EventContext& ctx) const;
/** returns the Energy CTP word */
- unsigned int ctpWord(unsigned int metSigPassed, unsigned int etMissPassed, unsigned int etSumPassed);
+ unsigned int ctpWord(unsigned int metSigPassed,
+ unsigned int etMissPassed,
+ unsigned int etSumPassed) const;
};
} // end of namespace bracket
diff --git a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h
index 951b7bac2112e1fd2be863bc6c2ede25993bd1ea..32d94f98d5db8bfcd6ebead6ae552ec9acbb4b3f 100644
--- a/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h
+++ b/Trigger/TrigT1/TrigT1CaloSim/src/TriggerTowerMaker.h
@@ -33,7 +33,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/DataObject.h"
#include "AthContainers/DataVector.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IToolSvc.h"
#include "CLHEP/Random/RandomEngine.h"
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
index 53e2eeae6ae125eaa1bea2f99bf4341268f0e4ca..5945cb6478f5b9991c0e5af90bbc9678d10fb364 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
+++ b/Trigger/TrigT1/TrigT1CaloUtils/TrigT1CaloUtils/SystemEnergy.h
@@ -41,24 +41,24 @@ public:
public:
/** return global et, ex, ey sums */
- int et();
- int ex();
- int ey();
+ int et() const;
+ int ex() const;
+ int ey() const;
/** 15 bit twos-complement format */
- unsigned int exTC();
- unsigned int eyTC();
+ unsigned int exTC() const;
+ unsigned int eyTC() const;
/** Overflow bits */
- unsigned int exOverflow();
- unsigned int eyOverflow();
- unsigned int etOverflow();
+ unsigned int exOverflow() const;
+ unsigned int eyOverflow() const;
+ unsigned int etOverflow() const;
/** Trigger Results */
- unsigned int etMissHits();
- unsigned int etSumHits();
- unsigned int metSigHits();
+ unsigned int etMissHits() const;
+ unsigned int etSumHits() const;
+ unsigned int metSigHits() const;
/** RoI words */
- unsigned int roiWord0();
- unsigned int roiWord1();
- unsigned int roiWord2();
+ unsigned int roiWord0() const;
+ unsigned int roiWord1() const;
+ unsigned int roiWord2() const;
private:
ServiceHandle<TrigConf::ILVL1ConfigSvc> m_configSvc;
@@ -83,8 +83,8 @@ private:
void etMissTrigger();
void etSumTrigger();
void metSigTrigger();
- unsigned int encodeTC(int input);
- int decodeTC(unsigned int input);
+ unsigned int encodeTC(int input) const;
+ int decodeTC(unsigned int input) const;
};
diff --git a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
index b7bb34beb8bc64d9b51eb7a773be83eeaf73f2c2..6566144b9c98f95255a29c91f89220c004774bd1 100755
--- a/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
+++ b/Trigger/TrigT1/TrigT1CaloUtils/src/SystemEnergy.cxx
@@ -144,73 +144,73 @@ SystemEnergy::~SystemEnergy()
}
/** return crate Et */
-int SystemEnergy::et()
+int SystemEnergy::et() const
{
return m_systemEt;
}
/** return crate Ex */
-int SystemEnergy::ex()
+int SystemEnergy::ex() const
{
return m_systemEx;
}
/** return crate Ey */
-int SystemEnergy::ey()
+int SystemEnergy::ey() const
{
return m_systemEy;
}
/** return Et overflow bit */
-unsigned int SystemEnergy::etOverflow()
+unsigned int SystemEnergy::etOverflow() const
{
return m_overflowT & 0x1;
}
/** return Ex overflow bit */
-unsigned int SystemEnergy::exOverflow()
+unsigned int SystemEnergy::exOverflow() const
{
return m_overflowX & 0x1;
}
/** return Ey overflow bit */
-unsigned int SystemEnergy::eyOverflow()
+unsigned int SystemEnergy::eyOverflow() const
{
return m_overflowY & 0x1;
}
/** return crate Ex in 15-bit twos-complement format (hardware format) */
-unsigned int SystemEnergy::exTC()
+unsigned int SystemEnergy::exTC() const
{
return encodeTC(m_systemEx);
}
/** return crate Ey in 15-bit twos-complement format (hardware format) */
-unsigned int SystemEnergy::eyTC()
+unsigned int SystemEnergy::eyTC() const
{
return encodeTC(m_systemEy);
}
/** return EtMiss hits */
-unsigned int SystemEnergy::etMissHits()
+unsigned int SystemEnergy::etMissHits() const
{
return m_etMissHits;
}
/** return EtSum hits */
-unsigned int SystemEnergy::etSumHits()
+unsigned int SystemEnergy::etSumHits() const
{
return m_etSumHits;
}
/** return MEtSig hits */
-unsigned int SystemEnergy::metSigHits()
+unsigned int SystemEnergy::metSigHits() const
{
return m_metSigHits;
}
/** return RoI word 0 (Ex value & overflow) */
-unsigned int SystemEnergy::roiWord0()
+unsigned int SystemEnergy::roiWord0() const
{
// Start by setting up header
unsigned int word = TrigT1CaloDefs::energyRoIType << 30;
@@ -227,7 +227,7 @@ unsigned int SystemEnergy::roiWord0()
}
/** return RoI word 1 (Ey value & overflow, EtSum hits) */
-unsigned int SystemEnergy::roiWord1()
+unsigned int SystemEnergy::roiWord1() const
{
// Start by setting up header
unsigned int word = TrigT1CaloDefs::energyRoIType << 30;
@@ -244,7 +244,7 @@ unsigned int SystemEnergy::roiWord1()
}
/** return RoI word 2 (Et value & overflow, EtMiss hits) */
-unsigned int SystemEnergy::roiWord2()
+unsigned int SystemEnergy::roiWord2() const
{
// Start by setting up header
unsigned int word = TrigT1CaloDefs::energyRoIType << 30;
@@ -426,7 +426,7 @@ void SystemEnergy::metSigTrigger()
}
/** encode int as 15-bit twos-complement format (hardware Ex/Ey format) */
-unsigned int SystemEnergy::encodeTC(int input)
+unsigned int SystemEnergy::encodeTC(int input) const
{
unsigned int value;
@@ -444,7 +444,7 @@ unsigned int SystemEnergy::encodeTC(int input)
}
/** decode 15-bit twos-complement format (hardware Ex/Ey format) as int */
-int SystemEnergy::decodeTC(unsigned int input)
+int SystemEnergy::decodeTC(unsigned int input) const
{
int mask = (1 << m_sumBits) - 1;
diff --git a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
index 33cfef43f5f99080dbd79402697af7f34ab9863c..dad8506f69e581891f7c47a8d61eff0c75226406 100644
--- a/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
+++ b/Trigger/TrigT1/TrigT1NSW/src/NSWL1Simulation.h
@@ -10,7 +10,7 @@
#include "CxxUtils/checker_macros.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// monitoring from HLT
#include "TrigInterfaces/IMonitoredAlgo.h"
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMFPGAOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMFPGAOfflineTool.h
index 64b67218dd162d5cb38f830ab17b54a1f9dbc8fa..15d13f6b27b6d2b27a160c85406d5b1dc6da5727 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMFPGAOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMFPGAOfflineTool.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//local includes
#include "TrigT1NSWSimTools/IMMFPGATool.h"
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMStripTdsOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMStripTdsOfflineTool.h
index 79d38701fad5add17dfc1468c96d30d73a114dbd..edb468731a08bdbe1d130adb3255eb59458915b1 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMStripTdsOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/MMStripTdsOfflineTool.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
//local includes
#include "TrigT1NSWSimTools/IMMStripTdsTool.h"
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
index 9f9c20d7347d08cb3fc8dbdaaf38c1d3d5448e65..af4557fe10478fe327778ad3a9c0c1c8dc60a73d 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h
@@ -8,7 +8,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "MuonSimData/MuonSimData.h" // cannot fw declare typedef MuonSimData::Deposit
#include "TrigT1NSWSimTools/IPadTdsTool.h"
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/src/ExampleL1TriggerByteStreamTool.h b/Trigger/TrigT1/TrigT1ResultByteStream/src/ExampleL1TriggerByteStreamTool.h
index 9bd03e9845465dbc09f7b8c42334658effc7b598..8d554179d03e13e83d64f344dad052f29dc3581d 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/src/ExampleL1TriggerByteStreamTool.h
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/src/ExampleL1TriggerByteStreamTool.h
@@ -13,7 +13,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
/** @class ExampleL1TriggerByteStreamTool
* @brief Example implementation of a tool for L1 RoI conversion from BS to xAOD and from xAOD to BS
diff --git a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
index 078f9ede41aaa0071cd87eae35b1f72690aa2d17..3d6c2c24c5034c4cb37cfce4a8f8938175e182a5 100644
--- a/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
+++ b/Trigger/TrigT1/TrigT1TGC/TrigT1TGC/LVL1TGCTrigger.h
@@ -13,7 +13,7 @@
#include <map>
// Gaudi includes
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
// Other stuff
#include "TrigT1Interfaces/SlinkWord.h"
diff --git a/Trigger/TrigTools/TrigByteStreamTools/CMakeLists.txt b/Trigger/TrigTools/TrigByteStreamTools/CMakeLists.txt
index b8d19c81a18b243b08ac430f2c8c82d5b504af4c..c9139c7ad17255cda70897b5e76f372d135a5abb 100644
--- a/Trigger/TrigTools/TrigByteStreamTools/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigByteStreamTools/CMakeLists.txt
@@ -18,15 +18,18 @@ atlas_add_dictionary( TrigByteStreamToolsDict
LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( bin/*.py python/trigbs_modifyEvent.py python/trigbs_prescaleL1.py python/slimHLTBSFile.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( bin/*.py python/trigbs_modifyEvent.py python/trigbs_prescaleL1.py python/slimHLTBSFile.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_data( share/*.ref )
# Unit tests
+set( trigbs_testFileRun2 "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.merge.RAW._lb0151._SFO-1._0001.1")
+set( trigbs_testFileRun3 "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data20_test/data_test.00374861.physics_Main.daq.RAW._lb0004._SFO-1._0001.data")
atlas_add_test( dumpHLTContentInBS_run3
- SCRIPT trigbs_dumpHLTContentInBS_run3.py -n 5 -s 105 --l1 --hlt --hltres --stag --sizes --sizeSummary
- /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data20_test/data_test.00374861.physics_Main.daq.RAW._lb0004._SFO-1._0001.data
+ SCRIPT trigbs_dumpHLTContentInBS_run3.py -n 5 -s 105 --l1 --hlt --hltres --stag --sizes --sizeSummary ${trigbs_testFileRun3}
LOG_IGNORE_PATTERN "^----" )
-atlas_add_test( flake8
- SCRIPT ${ATLAS_FLAKE8} -- ${CMAKE_CURRENT_SOURCE_DIR}
- POST_EXEC_SCRIPT nopost.sh )
+atlas_add_test( updateMetadata
+ SCRIPT rm -f newMeta.*.data
+ && trigbs_updateBSMetadata.py -n 5 --copyFrom ${trigbs_testFileRun2} --outputName newMeta ${trigbs_testFileRun3}
+ && meta-reader -m full newMeta._0001.data
+ LOG_IGNORE_PATTERN "file_guid" )
diff --git a/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
index f4d3597d029b16616b8f5837cc5ebf74d134b8c8..4724118f9edec033134d296d17add40a92d349b8 100755
--- a/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
+++ b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_dumpHLTContentInBS_run3.py
@@ -170,12 +170,17 @@ def dump_info(bsfile, args):
input = eformat.istream(bsfile)
offset = args.skip if args.skip else 0
max_events = min(args.events, len(input)) if args.events else len(input)
- events = input[offset:offset+max_events]
event_count = 0
+ events = []
# Loop over events
- for event in events:
+ for event in input:
event_count += 1
+ if event_count <= offset:
+ continue
+ if event_count > offset+max_events:
+ break
+ events.append(event)
# Print header info
print('{sep:s} Event: {:{width}d}, {:s} {sep:s}'.format(
diff --git a/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_updateBSMetadata.py b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_updateBSMetadata.py
index e58236fa2cf4e026f2ee3f7f6c8fa508f5a40076..acd58b58251b1f2ada121fdeb2c372b27354a264 100755
--- a/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_updateBSMetadata.py
+++ b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_updateBSMetadata.py
@@ -12,6 +12,7 @@ import argparse
import logging
import eformat
import libpyevent_storage as EventStorage
+import six
# This mapping was found in a comment in PyUtils.MetaReader
@@ -35,6 +36,9 @@ def get_parser():
parser.add_argument('--copyFrom', '-c',
metavar='FILE', action='store',
help='Copy metadata from other ByteStream file')
+ parser.add_argument('--numEvents', '-n',
+ metavar='NUM', action='store', type=int,
+ help='Copy only first NUM events from input to output')
parser.add_argument('--runNumber', '-r',
metavar='NUM', action='store', type=int,
help='Change run number')
@@ -133,7 +137,7 @@ def main():
file_name_base = '.'.join(file_name_list)
# Write the new file
- metadata_extra_strings = ['{:s}={:s}'.format(k, str(v)) for k, v in metadata_extra.iteritems()]
+ metadata_extra_strings = ['{:s}={:s}'.format(k, str(v)) for k, v in six.iteritems(metadata_extra)]
output_stream = eformat.ostream(
core_name = file_name_base,
run_number = metadata_basic['runNumber'],
@@ -144,7 +148,14 @@ def main():
meta_data_strings = metadata_extra_strings)
logging.info('Writing file %s', output_stream.current_filename().replace('.writing', '.data'))
+
+ ievt = 0
+ nmax = args.numEvents or -1
for event in input_stream:
+ ievt+=1
+ if ievt > nmax:
+ break
+ logging.debug('Writing event %d', ievt)
output_stream.write(event)
diff --git a/Trigger/TrigTools/TrigByteStreamTools/share/dumpHLTContentInBS_run3.ref b/Trigger/TrigTools/TrigByteStreamTools/share/dumpHLTContentInBS_run3.ref
index 34a3fa21f3e848b2f84052246243e74d16368e6b..950f23d21b9019e496a28f2391d48047f4ee1635 100644
--- a/Trigger/TrigTools/TrigByteStreamTools/share/dumpHLTContentInBS_run3.ref
+++ b/Trigger/TrigTools/TrigByteStreamTools/share/dumpHLTContentInBS_run3.ref
@@ -1,5 +1,5 @@
Py:dumpHLTContentInBS INFO Opening /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data20_test/data_test.00374861.physics_Main.daq.RAW._lb0004._SFO-1._0001.data
-==================== Event: 1, RunNumber: 374861, LB: 4, Global_ID: 43743, LVL1_ID: 1828817582, BC_ID: 2812, TT: x84 ====================
+==================== Event: 106, RunNumber: 374861, LB: 4, Global_ID: 43743, LVL1_ID: 1828817582, BC_ID: 2812, TT: x84 ====================
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 23, 29, 30, 45, 47, 49, 50, 51, 53, 56, 68, 82, 84, 85, 86, 87, 91, 92, 93, 94, 95, 138, 139, 143, 144, 145, 152, 154, 155, 157, 158, 159, 160, 200, 203, 205, 207, 250, 279, 280, 281, 286, 288, 293, 294, 295, 322, 344, 349, 380, 384, 390, 392, 402, 417, 423, 424, 501, 506]
L1 CTP IDs - TAP: [3, 8, 10, 11, 29, 30, 49, 50, 51, 56, 68, 82, 86, 87, 91, 138, 139, 143, 152, 157, 158, 159, 160, 203, 250, 279, 280, 281, 286, 293, 294, 322, 344, 349, 380, 384, 390, 392, 402, 417, 423, 424, 501, 506]
L1 CTP IDs - TAV: [11, 392, 402]
@@ -8,7 +8,7 @@ Stream Tags: ['calibration_CostMonitoring', 'physics_Main']
Found 2 HLT ROBs
-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 148532 bytes
-- ROBFragment SourceID: TDAQ_HLT, module=1 (opt=0), Size: 6736 bytes
-==================== Event: 2, RunNumber: 374861, LB: 4, Global_ID: 43874, LVL1_ID: 1829041034, BC_ID: 1807, TT: x84 ====================
+==================== Event: 107, RunNumber: 374861, LB: 4, Global_ID: 43874, LVL1_ID: 1829041034, BC_ID: 1807, TT: x84 ====================
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 23, 29, 30, 45, 47, 49, 50, 51, 56, 68, 82, 84, 86, 87, 91, 92, 93, 94, 138, 143, 152, 154, 157, 158, 159, 160, 200, 203, 205, 207, 279, 280, 281, 286, 288, 295, 330, 349, 380, 390, 392, 417, 423, 424, 501, 506]
L1 CTP IDs - TAP: [3, 8, 10, 11, 29, 30, 49, 50, 51, 56, 68, 82, 86, 87, 91, 138, 143, 152, 157, 158, 159, 160, 203, 279, 280, 281, 286, 330, 349, 380, 390, 392, 417, 423, 424, 501, 506]
L1 CTP IDs - TAV: [11, 392]
@@ -17,7 +17,7 @@ Stream Tags: ['calibration_CostMonitoring', 'physics_Main']
Found 2 HLT ROBs
-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 145656 bytes
-- ROBFragment SourceID: TDAQ_HLT, module=1 (opt=0), Size: 7624 bytes
-==================== Event: 3, RunNumber: 374861, LB: 4, Global_ID: 40645, LVL1_ID: 1745098512, BC_ID: 508, TT: x8c ====================
+==================== Event: 108, RunNumber: 374861, LB: 4, Global_ID: 40645, LVL1_ID: 1745098512, BC_ID: 508, TT: x8c ====================
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 14, 15, 16, 17, 18, 23, 24, 25, 27, 28, 29, 30, 31, 42, 43, 44, 45, 47, 49, 50, 51, 52, 53, 54, 55, 56, 58, 59, 60, 61, 62, 63, 64, 65, 67, 68, 70, 72, 73, 74, 76, 78, 81, 82, 83, 84, 85, 86, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 107, 108, 126, 127, 129, 133, 134, 137, 138, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 154, 155, 157, 158, 159, 160, 175, 176, 177, 184, 200, 203, 205, 207, 223, 238, 246, 254, 255, 256, 258, 259, 260, 261, 266, 267, 268, 269, 270, 272, 275, 278, 279, 280, 281, 286, 288, 290, 291, 292, 295, 303, 316, 320, 329, 330, 333, 334, 337, 340, 342, 345, 346, 347, 348, 349, 350, 353, 356, 357, 358, 377, 378, 380, 382, 385, 386, 387, 390, 392, 399, 400, 401, 402, 408, 409, 416, 417, 423, 424, 428, 429, 430, 431, 432, 433, 454, 458, 470, 481, 482, 483, 484, 485, 497, 498, 499, 500, 501, 502, 503, 506, 507, 508]
L1 CTP IDs - TAP: [3, 5, 8, 10, 11, 17, 18, 25, 28, 29, 30, 31, 42, 43, 44, 49, 50, 51, 52, 55, 56, 59, 61, 62, 64, 67, 68, 72, 73, 74, 76, 78, 81, 82, 83, 86, 90, 91, 100, 101, 107, 108, 126, 127, 129, 133, 134, 138, 141, 143, 147, 148, 149, 150, 151, 152, 157, 158, 159, 160, 175, 176, 177, 184, 203, 238, 246, 254, 255, 258, 259, 260, 261, 266, 267, 268, 269, 270, 272, 278, 279, 280, 281, 286, 290, 291, 292, 303, 316, 330, 337, 342, 346, 349, 350, 353, 356, 358, 377, 378, 380, 385, 386, 390, 392, 399, 400, 401, 402, 408, 409, 417, 423, 424, 428, 429, 430, 431, 432, 433, 454, 458, 470, 481, 482, 483, 484, 485, 497, 498, 499, 500, 501, 502, 503, 506, 507, 508]
L1 CTP IDs - TAV: [5, 11, 17, 18, 43, 44, 52, 61, 64, 67, 72, 74, 76, 78, 81, 90, 100, 101, 108, 141, 147, 148, 149, 150, 151, 175, 176, 184, 255, 259, 278, 316, 342, 346, 350, 356, 377, 385, 392, 400, 402, 428, 429, 430, 431, 433, 454, 458, 482, 483, 484]
@@ -26,7 +26,7 @@ Stream Tags: ['physics_Main', 'calibration_RPCSecondaryReadout', 'calibration_Co
Found 2 HLT ROBs
-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 567444 bytes
-- ROBFragment SourceID: TDAQ_HLT, module=1 (opt=0), Size: 22548 bytes
-==================== Event: 4, RunNumber: 374861, LB: 4, Global_ID: 43833, LVL1_ID: 1812336401, BC_ID: 1094, TT: x84 ====================
+==================== Event: 109, RunNumber: 374861, LB: 4, Global_ID: 43833, LVL1_ID: 1812336401, BC_ID: 1094, TT: x84 ====================
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 23, 24, 25, 26, 27, 28, 29, 30, 31, 41, 45, 47, 49, 50, 51, 53, 54, 56, 58, 59, 60, 61, 62, 68, 69, 70, 71, 78, 80, 82, 83, 84, 85, 86, 91, 92, 93, 94, 95, 96, 97, 110, 126, 128, 131, 132, 137, 138, 143, 144, 152, 154, 157, 158, 159, 160, 172, 200, 203, 205, 207, 254, 260, 261, 275, 279, 280, 281, 286, 288, 290, 291, 295, 316, 333, 334, 336, 337, 342, 345, 346, 347, 348, 349, 350, 353, 357, 373, 378, 380, 383, 386, 387, 390, 392, 398, 400, 402, 408, 409, 417, 423, 424, 479, 481, 486, 501, 502, 503, 504, 505, 506, 507]
L1 CTP IDs - TAP: [3, 5, 8, 10, 11, 25, 28, 29, 30, 31, 41, 49, 50, 51, 56, 59, 61, 62, 68, 69, 78, 82, 83, 86, 91, 110, 126, 128, 131, 132, 138, 143, 152, 157, 158, 159, 160, 172, 203, 254, 260, 261, 279, 280, 281, 286, 290, 291, 316, 337, 342, 346, 349, 350, 353, 373, 378, 380, 386, 390, 392, 398, 400, 402, 408, 409, 417, 423, 424, 479, 481, 486, 501, 502, 503, 504, 505, 506, 507]
L1 CTP IDs - TAV: [5, 11, 41, 61, 69, 78, 131, 132, 172, 316, 342, 346, 350, 392, 398, 400, 402]
@@ -35,7 +35,7 @@ Stream Tags: ['calibration_CostMonitoring', 'physics_Main']
Found 2 HLT ROBs
-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 357964 bytes
-- ROBFragment SourceID: TDAQ_HLT, module=1 (opt=0), Size: 7208 bytes
-==================== Event: 5, RunNumber: 374861, LB: 4, Global_ID: 43989, LVL1_ID: 1845635169, BC_ID: 3023, TT: x84 ====================
+==================== Event: 110, RunNumber: 374861, LB: 4, Global_ID: 43989, LVL1_ID: 1845635169, BC_ID: 3023, TT: x84 ====================
L1 CTP IDs - TBP: [0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 23, 29, 30, 45, 47, 49, 50, 51, 56, 68, 82, 84, 86, 87, 91, 92, 93, 94, 138, 139, 152, 154, 155, 157, 158, 159, 160, 200, 203, 205, 207, 250, 279, 280, 281, 286, 288, 293, 294, 295, 322, 330, 344, 349, 380, 384, 390, 392, 402, 417, 423, 424, 474, 501, 506]
L1 CTP IDs - TAP: [3, 8, 10, 11, 29, 30, 49, 50, 51, 56, 68, 82, 86, 87, 91, 138, 139, 152, 157, 158, 159, 160, 203, 250, 279, 280, 281, 286, 293, 294, 322, 330, 344, 349, 380, 384, 390, 392, 402, 417, 423, 424, 474, 501, 506]
L1 CTP IDs - TAV: [11, 392, 402]
@@ -44,8 +44,6 @@ Stream Tags: ['calibration_CostMonitoring', 'physics_Main']
Found 2 HLT ROBs
-- ROBFragment SourceID: TDAQ_HLT, module=0 (opt=0), Size: 150808 bytes
-- ROBFragment SourceID: TDAQ_HLT, module=1 (opt=0), Size: 7624 bytes
-====================
Size summary:
-====================
-- TDAQ_HLT module 0 total size 1370404 bytes, 274080.800 bytes/event
--- TDAQ_HLT module 1 total size 51740 bytes, 10348.000 bytes/event
\ No newline at end of file
+-- TDAQ_HLT module 1 total size 51740 bytes, 10348.000 bytes/event
diff --git a/Trigger/TrigTools/TrigByteStreamTools/share/updateMetadata.ref b/Trigger/TrigTools/TrigByteStreamTools/share/updateMetadata.ref
new file mode 100644
index 0000000000000000000000000000000000000000..127165758ea04c632d7d966aa6047521b1405822
--- /dev/null
+++ b/Trigger/TrigTools/TrigByteStreamTools/share/updateMetadata.ref
@@ -0,0 +1,28 @@
+INFO Reading events from /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data20_test/data_test.00374861.physics_Main.daq.RAW._lb0004._SFO-1._0001.data and metadata from /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data18_13TeV.00360026.physics_EnhancedBias.merge.RAW._lb0151._SFO-1._0001.1
+INFO Writing file ./newMeta._0001.data
+Py:MetaReader INFO Current mode used: full
+Py:MetaReader INFO Current filenames: ['newMeta._0001.data']
+`-- newMeta._0001.data:
+ |-- GeoAtlas : None
+ |-- beam_energy : 6500
+ |-- beam_type : collisions
+ |-- bs_metadata :
+ | |-- beamEnergy : 6500
+ | |-- beamType : collisions
+ | |-- lumiBlockNumbers : 151
+ | |-- projectTag : data18_13TeV
+ | |-- runNumbers : 360026
+ | `-- stream : physics_EnhancedBias
+ |-- conditions_tag : None
+ |-- eventTypes : ['IS_DATA', 'IS_ATLAS', 'IS_PHYSICS']
+ |-- evt_number : [38471]
+ |-- file_guid : AEF2E659-AED8-EA11-BADF-0242AC110002
+ |-- file_size : 5513920
+ |-- file_type : BS
+ |-- lumiBlockNumbers : [151]
+ |-- nentries : 5
+ |-- processingTags : ['CostMonitoring', 'Main']
+ |-- runNumbers : [360026]
+ |-- run_type : ['PHYSICS']
+ `-- stream : physics_EnhancedBias
+
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index 58f15c70652cd61db93087a951256da97a20a09b..5fe6d96a5e009d5e099c4920dd4f195a0b7fe9e8 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -6,8 +6,6 @@ from __future__ import print_function
from AthenaCommon.Include import include
include.block("InDetTrigRecExample/EFInDetConfig.py")
-include("InDetTrigRecExample/InDetTrigRec_jobOptions.py") # this is needed to get InDetTrigFlags
-from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
from AthenaCommon.Logging import logging
log = logging.getLogger("InDetPT")
@@ -106,7 +104,7 @@ def makeInDetPrecisionTracking( whichSignature,
trigTrackSummaryTool = Trk__TrackSummaryTool(name = "%sTrackSummaryToolSharedHitsWithTRT%s"%(algNamePrefix, signature),
InDetSummaryHelperTool = InDetTrigTrackSummaryHelperToolSharedHits,
- doSharedHits = InDetTrigFlags.doSharedHits(),
+ doSharedHits = True,
doHolesInDet = True )
if doTRTextension:
diff --git a/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigPrimaryVertexFitter.h b/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigPrimaryVertexFitter.h
index 10232700af46c709029a36bcd5095bc159ccb121..f234b6a2c2f42b9c9ad8b0730ed9a23a67014739 100644
--- a/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigPrimaryVertexFitter.h
+++ b/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigPrimaryVertexFitter.h
@@ -10,7 +10,6 @@
#include "TrkTrack/TrackCollection.h"
class TrigVertex;
-class TrigInDetTrackCollection;
static const InterfaceID IID_ITrigPrimaryVertexFitter("ITrigPrimaryVertexFitter",1,0);
@@ -21,10 +20,8 @@ class ITrigPrimaryVertexFitter: virtual public IAlgTool
static const InterfaceID& interfaceID() {
return IID_ITrigPrimaryVertexFitter;
}
- virtual TrigVertex* fit(const TrigInDetTrackCollection*, double z=0.0) = 0;
- virtual TrigVertex* fit(const TrigInDetTrackCollection*, std::vector<double>&, double z=0.0) = 0;
- virtual TrigVertex* fit(const TrackCollection*, TrackCollection&, double z=0.0) = 0;
- virtual TrigVertex* fit(const TrackCollection*, std::vector<double>&, double z=0.0) = 0;
+ virtual TrigVertex* fit(const TrackCollection*, TrackCollection&, double z=0.0) const = 0;
+ virtual TrigVertex* fit(const TrackCollection*, std::vector<double>&, double z=0.0) const = 0;
};
#endif
diff --git a/Trigger/TrigTools/TrigVertexFitter/src/TrigPrimaryVertexFitter.cxx b/Trigger/TrigTools/TrigVertexFitter/src/TrigPrimaryVertexFitter.cxx
index 54263f408b25cd79f6e040331f0c0cf4da2fa5ab..49c6af79bbcde507ccaf3ccce5f9330db6800a84 100644
--- a/Trigger/TrigTools/TrigVertexFitter/src/TrigPrimaryVertexFitter.cxx
+++ b/Trigger/TrigTools/TrigVertexFitter/src/TrigPrimaryVertexFitter.cxx
@@ -17,8 +17,6 @@
#include <iostream>
#include <algorithm>
-#include "TrigInDetEvent/TrigInDetTrack.h"
-#include "TrigInDetEvent/TrigInDetTrackCollection.h"
#include "TrigTimeAlgs/TrigTimerSvc.h"
#include "TrigInDetEvent/TrigL2Vertex.h"
#include "TrigInDetEvent/TrigVertex.h"
@@ -54,18 +52,6 @@ StatusCode TrigPrimaryVertexFitter::initialize()
ATH_MSG_INFO( "Number of iterations is set to " << m_numIter );
ATH_MSG_INFO( "Accuracy of starting z-position is " << m_zVariance<<" mm" );
ATH_MSG_INFO( "Track lists created ? " << std::boolalpha<<m_createTrackLists );
- ServiceHandle<ITrigTimerSvc> timerSvc ("TrigTimerSvc", name());
- if( timerSvc.retrieve().isFailure() )
- {
- ATH_MSG_INFO( "Unable to locate Service TrigTimerSvc " );
- m_timers = false;
- }
- else m_timers = true;
- if(m_timers)
- {
- m_timer[0] = timerSvc->addItem("PrimaryVertexFit");
- }
- ATH_MSG_INFO( "TrigPrimaryVertexFitter constructed " );
return StatusCode::SUCCESS;
}
@@ -80,112 +66,8 @@ TrigPrimaryVertexFitter::~TrigPrimaryVertexFitter()
}
-TrigVertex* TrigPrimaryVertexFitter::fit(const TrigInDetTrackCollection* tc, double z0)
-{
-
- TrigVertex* pVertex=NULL;
-
- double chi2;
- int ndof;
-
- if(m_timers) m_timer[0]->start();
-
- bool goodSet=checkTracks(tc);
-
- if(!goodSet)
- {
- ATH_MSG_WARNING( "Bad track set - vertex cannot be fit" );
- return NULL;
- }
-
- std::vector<TrigPrimaryVertexTrack*> tracks;
- tracks.clear();
- int idx=1;
- for(TrigInDetTrackCollection::const_iterator ptIt=tc->begin();ptIt!=tc->end();++ptIt)
- {
- TrigPrimaryVertexTrack* pT= new TrigPrimaryVertexTrack(*ptIt);
- if(pT!=NULL) {
- pT->setIndex(idx++);
- tracks.push_back(pT);
- }
- }
-
- TrigL2Vertex* pV = new TrigL2Vertex();
-
- pV->getParametersVector()[0]=0.0;
- pV->getParametersVector()[1]=0.0;
- pV->getParametersVector()[2]=z0;
- bool fitFailed=false;
- chi2=0.0;ndof=-3;
- for(int nIter=0;nIter<m_numIter;nIter++)
- {
- memset(&pV->m_Gk[0][0],0,sizeof(pV->m_Gk));
- pV->m_Gk[0][0]=m_xyVariance*m_xyVariance;
- pV->m_Gk[1][1]=m_xyVariance*m_xyVariance;
- pV->m_Gk[2][2]=m_zVariance*m_zVariance;
- chi2=0.0;ndof=-3;
- fitFailed=false;
-
- for(std::vector<TrigPrimaryVertexTrack*>::iterator it=tracks.begin();it!=tracks.end();++it)
- {
- if(!(*it)->isActive())
- (*it)->activate();
-
- double dchi2=(*it)->getChi2Distance(pV);
- ATH_MSG_VERBOSE("Track "<<(*it)->getIndex()<<" dchi2="<<dchi2 );
- if(std::isnan(dchi2)||(dchi2<0.0)||(dchi2>m_maxChi2Increase))
- {
- fitFailed=true;
- break;
- }
- if(dchi2<m_chi2cut)
- {
- chi2+=dchi2;ndof+=2;
- (*it)->updateVertex(pV);
- }
- else
- {
- (*it)->mask();
- ATH_MSG_DEBUG("Skipping track "<<(*it)->getIndex()<<"due to large dchi2="<<dchi2 );
- }
- }
- if(fitFailed) break;
- }
-
-
- if(!fitFailed && (ndof>0))
- {
- ATH_MSG_DEBUG("Primary vertex fit OK, chi2 = "<<chi2<<" NDOF = "<<ndof );
- ATH_MSG_DEBUG("x= "<<pV->getParametersVector()[0]<<
- " y= "<<pV->getParametersVector()[1]<<" z= "<<pV->getParametersVector()[2] );
- double cv[6];
- cv[0]=pV->m_Gk[0][0];cv[1]=pV->m_Gk[0][1];cv[2]=pV->m_Gk[1][1];
- cv[3]=pV->m_Gk[0][2];cv[4]=pV->m_Gk[1][2];cv[5]=pV->m_Gk[2][2];
- TrackInVertexList* pTL = NULL;
- if(m_createTrackLists) {
-
- pTL = new TrackInVertexList;
- for(std::vector<TrigPrimaryVertexTrack*>::iterator it=tracks.begin();it!=tracks.end();++it) {
- if ((*it)->isActive())
- pTL->push_back((*it)->getTrigTrack());
- }
- }
- pVertex = new TrigVertex(pV->getParametersVector()[0],
- pV->getParametersVector()[1],
- pV->getParametersVector()[2],cv,chi2,ndof,pTL);
- }
- delete pV;
- for(std::vector<TrigPrimaryVertexTrack*>::iterator it=tracks.begin();it!=tracks.end();++it)
- {
- delete (*it);
- }
- if(m_timers) m_timer[0]->stop();
-
- return pVertex;
-}
-
//TrigVertex has associated TrigInDetTracks, but we want Trk::Tracks
-TrigVertex* TrigPrimaryVertexFitter::fit(const TrackCollection* tc, TrackCollection& output_tc, double z0)
+TrigVertex* TrigPrimaryVertexFitter::fit(const TrackCollection* tc, TrackCollection& output_tc, double z0) const
{
TrigVertex* pVertex=NULL;
@@ -193,8 +75,6 @@ TrigVertex* TrigPrimaryVertexFitter::fit(const TrackCollection* tc, TrackCollect
double chi2;
int ndof;
- if(m_timers) m_timer[0]->start();
-
std::vector<TrigPrimaryVertexTrack*> tracks;
tracks.clear();
int idx=1;
@@ -276,8 +156,6 @@ TrigVertex* TrigPrimaryVertexFitter::fit(const TrackCollection* tc, TrackCollect
{
delete (*it);
}
- if(m_timers) m_timer[0]->stop();
-
return pVertex;
}
@@ -289,7 +167,7 @@ struct TrigPrimaryTrackSortPredicate
}
};
-TrigVertex* TrigPrimaryVertexFitter::fit(const TrigInDetTrackCollection* tc, std::vector<double>& Chi2V, double z0)
+TrigVertex* TrigPrimaryVertexFitter::fit(const TrackCollection* tc, std::vector<double>& Chi2V, double z0) const
{
TrigVertex* pVertex=NULL;
@@ -297,149 +175,6 @@ TrigVertex* TrigPrimaryVertexFitter::fit(const TrigInDetTrackCollection* tc, std
double chi2;
int ndof;
- if(m_timers) m_timer[0]->start();
-
- bool goodSet=checkTracks(tc);
-
- if(!goodSet)
- {
- ATH_MSG_WARNING( "Bad track set - vertex cannot be fit" );
- return NULL;
- }
-
- std::vector<TrigPrimaryVertexTrack*> tracks;
- tracks.clear();
- Chi2V.clear();
- int idx=1;
- for(TrigInDetTrackCollection::const_iterator ptIt=tc->begin();ptIt!=tc->end();++ptIt)
- {
- TrigPrimaryVertexTrack* pT= new TrigPrimaryVertexTrack(*ptIt);
- if(pT!=NULL)
- {
- pT->setIndex(idx++);
- tracks.push_back(pT);
- Chi2V.push_back(-100.0);
- }
- }
-
- TrigL2Vertex* pV = new TrigL2Vertex();
-
- // 1. preliminary fit
-
- pV->getParametersVector()[0]=0.0;
- pV->getParametersVector()[1]=0.0;
- pV->getParametersVector()[2]=z0;
-
- memset(&pV->m_Gk[0][0],0,sizeof(pV->m_Gk));
- pV->m_Gk[0][0]=m_xyVariance*m_xyVariance;
- pV->m_Gk[1][1]=m_xyVariance*m_xyVariance;
- pV->m_Gk[2][2]=m_zVariance*m_zVariance;
-
- bool fitFailed=false;
- for(std::vector<TrigPrimaryVertexTrack*>::iterator it=tracks.begin();it!=tracks.end();++it)
- {
- double dchi2=(*it)->getChi2Distance(pV);
- if(std::isnan(dchi2)||(dchi2<0.0)||(dchi2>m_maxChi2Increase))
- {
- fitFailed=true;
- break;
- }
- if(dchi2<m_chi2cut_loose) (*it)->updateVertex(pV);
- }
- if(fitFailed)
- {
- delete pV;
- for(std::vector<TrigPrimaryVertexTrack*>::iterator it=tracks.begin();
- it!=tracks.end();++it) delete (*it);
- return pVertex;
- }
-
- // 2. calculation of "smoothed" chi2s
-
- memset(&pV->m_Gk[0][0],0,sizeof(pV->m_Gk));
-
- for(std::vector<TrigPrimaryVertexTrack*>::iterator it=tracks.begin();it!=tracks.end();++it)
- {
- double dchi2=(*it)->getChi2Distance(pV);
- ATH_MSG_DEBUG("Track "<<(*it)->getIndex()<<" dchi2="<<dchi2 );
- }
-
- // 3. sort tracks in accordance with their chi2s
-
- std::sort(tracks.begin(),tracks.end(),TrigPrimaryTrackSortPredicate());
-
- // 4. Final track fit
-
- pV->getParametersVector()[0]=0.0;
- pV->getParametersVector()[1]=0.0;
- pV->getParametersVector()[2]=z0;
- fitFailed=false;
- chi2=0.0;ndof=-3;
- for(int nIter=0;nIter<m_numIter;nIter++)
- {
- memset(&pV->m_Gk[0][0],0,sizeof(pV->m_Gk));
- pV->m_Gk[0][0]=100.0;
- pV->m_Gk[1][1]=100.0;
- pV->m_Gk[2][2]=m_zVariance*m_zVariance;
- chi2=0.0;ndof=-3;
- fitFailed=false;
-
- for(std::vector<TrigPrimaryVertexTrack*>::iterator it=tracks.begin();it!=tracks.end();++it)
- {
- double dchi2=(*it)->getChi2Distance(pV);
- Chi2V[(*it)->getIndex()-1]=dchi2;
- ATH_MSG_VERBOSE("Track "<<(*it)->getIndex()<<" dchi2="<<dchi2 );
- if(std::isnan(dchi2)||(dchi2<0.0)||(dchi2>m_maxChi2Increase))
- {
- fitFailed=true;
- break;
- }
- if(dchi2<m_chi2cut)
- {
- chi2+=dchi2;ndof+=2;
- (*it)->updateVertex(pV);
- }
- else
- {
- ATH_MSG_DEBUG("Skipping track "<<(*it)->getIndex()<<"due to large dchi2="<<dchi2 );
- }
- }
- if(fitFailed) break;
- }
- for(std::vector<TrigPrimaryVertexTrack*>::iterator it=tracks.begin();it!=tracks.end();++it)
- {
- delete (*it);
- }
-
- if(!fitFailed && (ndof>0))
- {
- ATH_MSG_DEBUG("Primary vertex fit OK, chi2 = "<<chi2<<" NDOF = "<<ndof );
- ATH_MSG_DEBUG("x= "<<pV->getParametersVector()[0]<<
- " y= "<<pV->getParametersVector()[1]<<" z= "<<pV->getParametersVector()[2] );
- double cv[6];
- cv[0]=pV->m_Gk[0][0];cv[1]=pV->m_Gk[0][1];cv[2]=pV->m_Gk[1][1];
- cv[3]=pV->m_Gk[0][2];cv[4]=pV->m_Gk[1][2];cv[5]=pV->m_Gk[2][2];
- pVertex = new TrigVertex(pV->getParametersVector()[0],
- pV->getParametersVector()[1],
- pV->getParametersVector()[2],cv,chi2,ndof,NULL);
- }
- delete pV;
-
- if(m_timers) m_timer[0]->stop();
-
- return pVertex;
-}
-
-TrigVertex* TrigPrimaryVertexFitter::fit(const TrackCollection* tc, std::vector<double>& Chi2V, double z0)
-{
-
- TrigVertex* pVertex=NULL;
-
- double chi2;
- int ndof;
-
- if(m_timers) m_timer[0]->start();
-
std::vector<TrigPrimaryVertexTrack*> tracks;
tracks.clear();
Chi2V.clear();
@@ -558,33 +293,6 @@ TrigVertex* TrigPrimaryVertexFitter::fit(const TrackCollection* tc, std::vector<
}
delete pV;
- if(m_timers) m_timer[0]->stop();
-
return pVertex;
}
-bool TrigPrimaryVertexFitter::checkTracks(const TrigInDetTrackCollection* tc)
-{
- bool rc=true;
-
- if(tc->size()<2)
- {
- ATH_MSG_WARNING( "Track set contains less than 2 tracks" );
- return false;
- }
- for(TrigInDetTrackCollection::const_iterator ptIt=tc->begin();ptIt!=tc->end();++ptIt)
- {
- const TrigInDetTrackFitPar* p=(*ptIt)->param();
- if(p==NULL)
- {
- ATH_MSG_WARNING( "TrigInDetTrack has no parameters" );
- rc=false;break;
- }
- if(p->cov()==NULL)
- {
- ATH_MSG_WARNING( "TrigInDetTrack covariance is not set" );
- rc=false;break;
- }
- }
- return rc;
-}
diff --git a/Trigger/TrigTools/TrigVertexFitter/src/TrigPrimaryVertexFitter.h b/Trigger/TrigTools/TrigVertexFitter/src/TrigPrimaryVertexFitter.h
index 889547677090298cdd37d5363414b45c6913ebd6..f2fb8ee9a99ebc02f084c090168dcf161a9ae723 100644
--- a/Trigger/TrigTools/TrigVertexFitter/src/TrigPrimaryVertexFitter.h
+++ b/Trigger/TrigTools/TrigVertexFitter/src/TrigPrimaryVertexFitter.h
@@ -18,13 +18,9 @@ class TrigPrimaryVertexFitter: public AthAlgTool, virtual public ITrigPrimaryVer
virtual StatusCode initialize();
virtual StatusCode finalize();
- virtual TrigVertex* fit(const TrigInDetTrackCollection*, double z=0.0);
- virtual TrigVertex* fit(const TrigInDetTrackCollection*, std::vector<double>&, double z=0.0);
-
- virtual TrigVertex* fit(const TrackCollection*, TrackCollection&, double z=0.0);
- virtual TrigVertex* fit(const TrackCollection*, std::vector<double>&, double z=0.0);
+ virtual TrigVertex* fit(const TrackCollection*, TrackCollection&, double z=0.0) const;
+ virtual TrigVertex* fit(const TrackCollection*, std::vector<double>&, double z=0.0) const;
private:
- bool checkTracks(const TrigInDetTrackCollection*);
int m_numIter;
double m_zVariance,m_maxChi2Increase, m_chi2cut, m_chi2cut_loose;
bool m_createTrackLists;
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/python/TrigAnalysisSteps.py b/Trigger/TrigValidation/TrigAnalysisTest/python/TrigAnalysisSteps.py
index 247d9d51b9d9deeb8c1aa757418735a8cd186080..1d0eede3af941e6bb77083bd52eef70cc07d5055 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/python/TrigAnalysisSteps.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/python/TrigAnalysisSteps.py
@@ -7,8 +7,11 @@ Definitions of additional validation steps in Trigger ART tests relevant only fo
The main common check steps are defined in the TrigValSteering.CheckSteps module.
'''
+from TrigValTools.TrigValSteering.Step import Step
from TrigValTools.TrigValSteering.ExecStep import ExecStep
from TrigValTools.TrigValSteering.CheckSteps import CheckFileStep, InputDependentStep, LogMergeStep
+import os
+import re
##################################################
# Additional exec steps
@@ -66,6 +69,92 @@ class CheckFileTrigSizeStep(CheckFileStep):
self.input_file = 'AOD.pool.root,ESD.pool.root,RDO_TRIG.pool.root'
self.executable = 'checkFileTrigSize_RTT.py'
+class PhysValWebStep(Step):
+ '''
+ Execute physval_make_web_display.py to make PhysVal web display from NTUP_PHYSVAL.root
+ '''
+ def __init__(self, name='PhysValWeb'):
+ super(PhysValWebStep, self).__init__(name)
+ self.input_file = 'NTUP_PHYSVAL.pool.root'
+ self.executable = 'physval_make_web_display.py'
+ self.refdir = None
+ self.sig = None
+ self.args = '--ratio --drawopt HISTPE --refdrawopt HIST --title Test '
+ self.auto_report_result = True
+ self.timeout = 30*60
+ self.required = True # whether the full test should fail if physval_make_web_display fails
+ self.required_no_red = False # whether the full test should fail if red histograms are found
+
+ def configure(self, test):
+ assert self.sig, 'sig is a required parameter'
+ outargs = ' --outdir PHYSVAL_WEB/'+self.sig
+ dirargs = ' --startpath run_1/HLT/'+self.sig
+ self.args += ' '+outargs+' '+dirargs
+ super(PhysValWebStep, self).configure(test)
+
+ def get_refdir(self):
+ if self.refdir:
+ return
+ for fname in os.listdir('.'):
+ if fname.startswith('ref-') and os.path.isdir(fname):
+ self.refdir = fname
+
+ def run(self, dry_run=False):
+ if not dry_run and not os.path.exists(self.input_file):
+ self.log.error('Input file does not exist: %s', self.input_file)
+ self.result = 1
+ if self.auto_report_result:
+ self.report_result()
+ return self.result, '# (internal) {} -> failed'.format(self.name)
+
+ if not os.path.exists('PHYSVAL_WEB'):
+ os.mkdir('PHYSVAL_WEB')
+
+ self.get_refdir()
+ if self.refdir:
+ ref_file = self.refdir+'/'+self.input_file
+ if not dry_run and not os.path.exists(ref_file):
+ self.log.warning('Reference file %s does not exist, running without reference', ref_file)
+ else:
+ self.args += ' --reffile Ref:'+ref_file
+ self.args += ' '+self.input_file
+
+ do_report_result = self.auto_report_result
+ self.auto_report_result = False # don't report yet, only after further checks below
+ self.result, cmd = super(PhysValWebStep, self).run(dry_run)
+ cmd += ' # Plus internal post-exec checks'
+ if dry_run:
+ if do_report_result:
+ self.report_result()
+ return self.result, cmd
+
+ fname = 'PHYSVAL_WEB/'+self.sig+'/index.html'
+ if not os.path.exists(fname):
+ self.log.error('Missing output file %s', fname)
+ self.result += 1000
+ if do_report_result:
+ self.report_result()
+ return self.result, cmd
+
+ nred_all = 0
+ with open(fname, 'r') as f:
+ red_lines = re.findall('Red.*$', f.read(), re.MULTILINE)
+ nred = len(red_lines)
+ nred_all += nred
+ if nred > 0:
+ msg = 'Red histograms in display for slice %s: %d'
+ if self.required_no_red:
+ self.log.error(msg, self.sig, nred)
+ else:
+ self.log.info(msg, self.sig, nred)
+
+ if do_report_result:
+ self.report_result(self.result + nred_all)
+ if self.required_no_red:
+ self.result += nred_all
+
+ return self.result, cmd
+
##################################################
# Getter functions
##################################################
@@ -86,13 +175,28 @@ def add_analysis_steps(test, input_file='AOD.pool.root'):
test.check_steps.extend(trig_analysis_check_steps())
# Add the analysis exec step logs for merging
- logmerge = None
- for step in test.check_steps:
- if type(step) == LogMergeStep:
- logmerge = step
- break
+ logmerge = test.get_step_by_type(LogMergeStep)
if not logmerge:
test.log.warning('LogMerge step not found, cannot add TrigAnalysisSteps exec step log files for merging')
else:
for step in analysis_exec_steps:
logmerge.log_files.append(step.get_log_file_name())
+
+def add_physvalweb_steps(test, slice_names, download_step=None):
+ # Collect the steps
+ steps = [download_step] if download_step else []
+ for slice_name in slice_names:
+ sliceweb = PhysValWebStep('PhysValWeb'+slice_name)
+ sliceweb.sig = slice_name
+ steps.append(sliceweb)
+
+ # Add the steps at the beginning of check_steps list
+ test.check_steps = steps + test.check_steps
+
+ # Add the step logs for merging
+ logmerge = test.get_step_by_type(LogMergeStep)
+ if not logmerge:
+ test.log.warning('LogMerge step not found, cannot add PhysValWeb step log files for merging')
+ else:
+ for step in steps:
+ logmerge.log_files.append(step.get_log_file_name())
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
index 14ae6a3342a95da54f9115f65b628ff761ce9f12..6ba1603979a8269f154e00f47909c6a0d2b5a183 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
@@ -1,5 +1,3 @@
-TrigSignatureMoniMT 0 INFO The L1 seed to multi-item-seeded chain HLT_noalg_L1Standby could not be completely resolved. This is currently OK. Exception from menu access: L1Item L1_2EM13VH does not exist in the menu
-TrigSignatureMoniMT 0 INFO The L1 seed to multi-item-seeded chain HLT_noalg_L1Calo could not be completely resolved. This is currently OK. Exception from menu access: L1Item L1_2EM13VH does not exist in the menu
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292
TrigSignatureMoniMT INFO -- #3136730292 Events 2 2 2 2 2 - - - - - - - - - 2
TrigSignatureMoniMT INFO -- #3136730292 Features 12 296 14 - - - - - - - - -
@@ -41,34 +39,34 @@ TrigSignatureMoniMT INFO -- #557204938 Events
TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 12 4 4 4 - - - -
TrigSignatureMoniMT INFO HLT_2mu4_L12MU4 #2999632714
TrigSignatureMoniMT INFO -- #2999632714 Events 4 4 0 0 0 0 4 4 4 4 - - - - 4
-TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 16 16 24 36 - - - -
+TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 16 16 24 20 - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 #1730084172
TrigSignatureMoniMT INFO -- #1730084172 Events 4 4 0 0 0 0 4 4 4 4 - - - - 0
-TrigSignatureMoniMT INFO -- #1730084172 Features 0 0 0 0 16 16 24 18 - - - -
+TrigSignatureMoniMT INFO -- #1730084172 Features 0 0 0 0 16 16 24 10 - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 #4276347155
TrigSignatureMoniMT INFO -- #4276347155 Events 4 4 0 0 0 0 4 4 4 4 - - - - 0
-TrigSignatureMoniMT INFO -- #4276347155 Features 0 0 0 0 16 16 24 18 - - - -
+TrigSignatureMoniMT INFO -- #4276347155 Features 0 0 0 0 16 16 24 10 - - - -
TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 #4008168535
TrigSignatureMoniMT INFO -- #4008168535 Events 4 4 0 0 0 0 4 4 4 4 - - - - 0
-TrigSignatureMoniMT INFO -- #4008168535 Features 0 0 0 0 16 16 24 18 - - - -
+TrigSignatureMoniMT INFO -- #4008168535 Features 0 0 0 0 16 16 24 10 - - - -
TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935
TrigSignatureMoniMT INFO -- #1584776935 Events 4 4 0 0 0 0 4 4 4 4 - - - - 4
-TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 16 16 24 36 - - - -
+TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 16 16 24 20 - - - -
TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508
TrigSignatureMoniMT INFO -- #2046267508 Events 4 4 0 0 0 0 4 3 - - - - - - 3
TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 0 0 16 12 - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871
TrigSignatureMoniMT INFO -- #1316992871 Events 10 10 0 0 0 0 4 3 3 3 - - - - 3
-TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 16 12 18 28 - - - -
+TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 16 12 18 16 - - - -
TrigSignatureMoniMT INFO HLT_2mu6_Dr_L12MU4 #3304584056
TrigSignatureMoniMT INFO -- #3304584056 Events 4 4 0 0 0 0 4 3 - - - - - - 3
TrigSignatureMoniMT INFO -- #3304584056 Features 0 0 0 0 16 12 - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
TrigSignatureMoniMT INFO -- #1747073535 Events 4 4 0 0 0 0 4 3 3 3 - - - - 3
-TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 16 12 18 28 - - - -
+TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 16 12 18 16 - - - -
TrigSignatureMoniMT INFO HLT_2mu6_muonqual_L12MU6 #2398136098
TrigSignatureMoniMT INFO -- #2398136098 Events 4 4 0 0 0 0 4 3 3 3 - - - - 3
-TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 16 12 18 28 - - - -
+TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 16 12 18 16 - - - -
TrigSignatureMoniMT INFO HLT_3j200_L1J100 #2199422919
TrigSignatureMoniMT INFO -- #2199422919 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
TrigSignatureMoniMT INFO -- #2199422919 Features 0 0 0 0 0 0 0 0 0 0 0 -
@@ -111,6 +109,9 @@ TrigSignatureMoniMT INFO -- #899946230 Features
TrigSignatureMoniMT INFO HLT_e17_lhvloose_nod0_L1EM15VH #140779220
TrigSignatureMoniMT INFO -- #140779220 Events 8 8 6 6 6 5 - - - - - - - - 5
TrigSignatureMoniMT INFO -- #140779220 Features 6 78 10 5 - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3 #1784800924
+TrigSignatureMoniMT INFO -- #1784800924 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1784800924 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - - - - - - - - 6
TrigSignatureMoniMT INFO -- #1703681121 Features 7 133 7 - - - - - - - - -
@@ -129,12 +130,6 @@ TrigSignatureMoniMT INFO -- #2128128255 Features
TrigSignatureMoniMT INFO HLT_e3_etcut1step_g5_etcut_L12EM3 #1745513164
TrigSignatureMoniMT INFO -- #1745513164 Events 20 20 17 17 17 - - - - - - - - - 17
TrigSignatureMoniMT INFO -- #1745513164 Features 55 55 55 - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu26_L1EM8I_MU10 #2209076666
-TrigSignatureMoniMT INFO -- #2209076666 Events 5 5 3 0 0 0 3 1 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #2209076666 Features 3 0 0 0 3 1 1 1 - - - -
-TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 #2086577378
-TrigSignatureMoniMT INFO -- #2086577378 Events 5 5 3 0 0 0 3 - - - - - - - 3
-TrigSignatureMoniMT INFO -- #2086577378 Features 3 0 0 0 3 - - - - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
TrigSignatureMoniMT INFO -- #683953566 Events 20 20 20 20 20 - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #683953566 Features 171 1843 390 - - - - - - - - -
@@ -416,22 +411,22 @@ TrigSignatureMoniMT INFO -- #996392590 Events
TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 14 13 - - - - - -
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
TrigSignatureMoniMT INFO -- #2560542253 Events 10 10 0 0 0 0 10 10 10 10 - - - - 10
-TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 14 13 16 21 - - - -
+TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 14 13 16 15 - - - -
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 #934918532
TrigSignatureMoniMT INFO -- #934918532 Events 10 10 0 0 0 0 10 10 10 10 - - - - 10
-TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 14 14 17 27 - - - -
+TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 14 14 17 17 - - - -
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062
TrigSignatureMoniMT INFO -- #1012713062 Events 10 10 0 0 0 0 10 10 10 10 6 - - - 6
-TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 14 13 16 21 6 - - -
+TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 14 13 16 15 6 - - -
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032
TrigSignatureMoniMT INFO -- #3895421032 Events 10 10 0 0 0 0 10 0 10 - - - - - 10
TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 14 0 17 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
TrigSignatureMoniMT INFO -- #1713982776 Events 4 4 0 0 0 0 4 4 4 4 - - - - 4
-TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 8 8 12 18 - - - -
+TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 8 8 12 10 - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
TrigSignatureMoniMT INFO -- #451489897 Events 10 10 0 0 0 0 10 10 10 10 6 4 - - 6
-TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 14 13 16 21 9 7 - -
+TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 14 13 16 15 9 7 - -
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 0 0 0 0 10 - - - - - - - 10
TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 14 - - - - - - -
@@ -449,7 +444,7 @@ TrigSignatureMoniMT INFO -- #761101109 Events
TrigSignatureMoniMT INFO -- #761101109 Features 0 0 0 0 10 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu8_L1MU6 #1467711434
TrigSignatureMoniMT INFO -- #1467711434 Events 10 10 0 0 0 0 10 10 10 10 - - - - 10
-TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 14 13 15 19 - - - -
+TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 14 13 15 15 - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Calo #355689512
TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #355689512 Features - - - - - - - - - - - -
@@ -486,12 +481,6 @@ TrigSignatureMoniMT INFO -- #4065285611 Features
TrigSignatureMoniMT INFO HLT_noalg_L1J100 #1026959128
TrigSignatureMoniMT INFO -- #1026959128 Events 3 3 - - - - - - - - - - - - 3
TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1J12 #2640820608
-TrigSignatureMoniMT INFO -- #2640820608 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2640820608 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1J120 #2116228652
-TrigSignatureMoniMT INFO -- #2116228652 Events 1 1 - - - - - - - - - - - - 1
-TrigSignatureMoniMT INFO -- #2116228652 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J15 #1976430774
TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - - - - - - - -
@@ -534,9 +523,6 @@ TrigSignatureMoniMT INFO -- #4248050338 Features
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12IM #357557968
TrigSignatureMoniMT INFO -- #357557968 Events 14 14 - - - - - - - - - - - - 14
TrigSignatureMoniMT INFO -- #357557968 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1TAU20 #3602376876
-TrigSignatureMoniMT INFO -- #3602376876 Events 14 14 - - - - - - - - - - - - 14
-TrigSignatureMoniMT INFO -- #3602376876 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU20IM #1931583332
TrigSignatureMoniMT INFO -- #1931583332 Events 10 10 - - - - - - - - - - - - 10
TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - - - - - - - -
@@ -549,9 +535,6 @@ TrigSignatureMoniMT INFO -- #1394621652 Features
TrigSignatureMoniMT INFO HLT_noalg_L1TAU60 #3332424451
TrigSignatureMoniMT INFO -- #3332424451 Events 5 5 - - - - - - - - - - - - 5
TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1TAU8 #3165115874
-TrigSignatureMoniMT INFO -- #3165115874 Events 19 19 - - - - - - - - - - - - 19
-TrigSignatureMoniMT INFO -- #3165115874 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE10 #1583053368
TrigSignatureMoniMT INFO -- #1583053368 Events 19 19 - - - - - - - - - - - - 19
TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - - - - - - - -
@@ -609,9 +592,6 @@ TrigSignatureMoniMT INFO -- #2991490897 Features
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_FIRSTEMPTY #2214697960
TrigSignatureMoniMT INFO -- #2214697960 Events 0 0 - - - - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #2214697960 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1RD1_BGRP10 #48519027
-TrigSignatureMoniMT INFO -- #48519027 Events 0 0 - - - - - - - - - - - - 0
-TrigSignatureMoniMT INFO -- #48519027 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1RD1_EMPTY #3925252528
TrigSignatureMoniMT INFO -- #3925252528 Events 0 0 - - - - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #3925252528 Features - - - - - - - - - - - -
@@ -654,6 +634,12 @@ TrigSignatureMoniMT INFO -- #2725693236 Features
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwo_L1TAU100 #886074432
TrigSignatureMoniMT INFO -- #886074432 Events 0 0 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #886074432 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau160_medium1_tracktwoEF_L1TAU100 #1720193283
+TrigSignatureMoniMT INFO -- #1720193283 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1720193283 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau160_medium1_tracktwo_L1TAU100 #4069120574
+TrigSignatureMoniMT INFO -- #4069120574 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4069120574 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 #1747754287
TrigSignatureMoniMT INFO -- #1747754287 Events 0 0 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - - - - - - - -
@@ -663,6 +649,12 @@ TrigSignatureMoniMT INFO -- #2334140248 Features
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwo_L1TAU100 #1799096347
TrigSignatureMoniMT INFO -- #1799096347 Events 0 0 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau200_medium1_tracktwoEF_L1TAU100 #4203471951
+TrigSignatureMoniMT INFO -- #4203471951 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4203471951 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100 #1468926272
+TrigSignatureMoniMT INFO -- #1468926272 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1468926272 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_track_L1TAU12IM #554271976
TrigSignatureMoniMT INFO -- #554271976 Events 14 14 14 14 - - - - - - - - - - 14
TrigSignatureMoniMT INFO -- #554271976 Features 24 24 - - - - - - - - - -
@@ -714,6 +706,9 @@ TrigSignatureMoniMT INFO -- #1275052132 Features
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859
TrigSignatureMoniMT INFO -- #2456480859 Events 14 14 11 10 6 - - - - - - - - - 6
TrigSignatureMoniMT INFO -- #2456480859 Features 20 14 8 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau80_medium1_tracktwo_L1TAU60 #598963338
+TrigSignatureMoniMT INFO -- #598963338 Events 5 5 4 1 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #598963338 Features 4 1 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tilecalib_laser_TilePEB_L1CALREQ2 #1063154655
TrigSignatureMoniMT INFO -- #1063154655 Events 0 0 0 - - - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1063154655 Features 0 - - - - - - - - - - -
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
index f02fd4c7483dec70276bd47e9a7db5422aef16bf..33a7943e29a2d32dc87c91ce353ebd53d3f55295 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
@@ -51,9 +51,10 @@ recoPreExec = ' '.join([
"AODFlags.ThinNegativeEnergyNeutralPFOs.set_Value_and_Lock(False);",
"AODFlags.AddEgammaMuonTracksInAOD.set_Value_and_Lock(False);",
# Trigger flags
+ "from AthenaConfiguration.AllConfigFlags import ConfigFlags;",
+ "ConfigFlags.Trigger.triggerMenuSetup=\'{:s}\';".format(menu_name),
"from TriggerJobOpts.TriggerFlags import TriggerFlags;",
"TriggerFlags.configForStartup=\'HLToffline\';",
- "TriggerFlags.triggerMenuSetup=\'{:s}\';".format(menu_name),
"TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
"TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\');"])
reco = ExecStep.ExecStep('Tier0Reco')
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_grid.py
index ad5e54d785513008a52f6d33eef553b206c31de0..70d873a2f3456063ee91ff8e8a329719c1ea2c09 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_grid.py
@@ -23,6 +23,7 @@
# art-html: PHYSVAL_WEB
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+from TrigAnalysisTest.TrigAnalysisSteps import add_physvalweb_steps
import os
# To run single-process transform on MCORE sites
@@ -50,38 +51,13 @@ test.art_type = 'grid'
test.exec_steps = [rdo2aod,physval]
test.check_steps = CheckSteps.default_check_steps(test)
+# Add web display steps
+slice_names = [
+ 'JetMon', 'TauMon', 'MuonMon', 'IDMon',
+ 'BphysMon', 'HLTCaloESD', 'ResultMon', 'BjetMon',
+ 'METMon', 'MinBiasMon', 'Egamma']
+download = CheckSteps.DownloadRefStep()
+add_physvalweb_steps(test, slice_names, download)
-download=CheckSteps.DownloadRefStep()
-download.artpackage = 'TrigAnalysisTest'
-download.artjobname = 'test_trigAna_PhysValWeb_grid.py'
-download.required=True
-test.check_steps.append(download)
-
-
-if not os.path.exists('PHYSVAL_WEB'):
- os.mkdir('PHYSVAL_WEB')
-
-
-pv=[]
-pv.append(['Jet','JetMon'])
-pv.append(['Tau','TauMon'])
-pv.append(['Muon','MuonMon'])
-pv.append(['ID','IDMon'])
-pv.append(['Bphys','BphysMon'])
-pv.append(['HLTCalo','HLTCaloESD'])
-pv.append(['Result','ResultMon'])
-pv.append(['Bjet','BjetMon'])
-pv.append(['MET','METMon'])
-pv.append(['MinBias','MinBiasMon'])
-pv.append(['Egamma','Egamma'])
-
-for slice in pv:
- name='PhysValWeb'+slice[0]
- sliceweb=CheckSteps.PhysValWebStep(name)
- sliceweb.sig=slice[1]
- sliceweb.required=True
- test.check_steps.append(sliceweb)
-
import sys
sys.exit(test.run())
-
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_mt1_compLegacy_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_mt1_compLegacy_grid.py
index c7314633b91bdde0d0f912f49e14adc7705731b8..2aa9c0cfd7c2311bb14ee76119c0f060acf45553 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_mt1_compLegacy_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_mt1_compLegacy_grid.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# art-description: Test of transform RDO->RDO_TRIG->ESD->AOD with AthenaMT and AOD->NTUP_PHYSVAL with serial athena to produce webdisplay (comparing with legacy menu)
+# art-description: Produce web display comparing Run-3 trigger to Run-2 (legacy) trigger using legacy monitoring NTUP_PHYSVAL from previous nightlies
# art-type: grid
# art-include: master/Athena
# art-output: *.txt
@@ -22,67 +22,29 @@
# art-output: PHYSVAL_WEB
# art-html: PHYSVAL_WEB
-from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
-import os
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigAnalysisTest.TrigAnalysisSteps import add_physvalweb_steps
-# To run single-process transform on MCORE sites
-if 'ATHENA_NPROC_NUM' in os.environ:
- del os.environ['ATHENA_NPROC_NUM']
+downloadLegacyTrig = CheckSteps.DownloadRefStep('DownloadLegacyTriggerNTUP')
+downloadLegacyTrig.artjobname = 'test_trigAna_PhysValWeb_grid.py'
-rdo2aod = ExecStep.ExecStep('RDOtoAOD')
-rdo2aod.type = 'Reco_tf'
-rdo2aod.input = 'ttbar'
-rdo2aod.threads = 1
-rdo2aod.max_events = 500
-rdo2aod.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG" --valid=True'
-rdo2aod.args += ' --preExec="all:from TriggerJobOpts.TriggerFlags import TriggerFlags; TriggerFlags.AODEDMSet.set_Value_and_Lock(\\\"AODFULL\\\");"'
-
-physval = ExecStep.ExecStep('PhysVal')
-physval.type = 'Reco_tf'
-physval.input = ''
-physval.explicit_input = True
-physval.args = '--inputAODFile=AOD.pool.root --outputNTUP_PHYSVALFile=NTUP_PHYSVAL.pool.root --valid=True'
-
-validationFlags = 'doTrigEgamma,doTrigBphys,doTrigMET,doTrigJet,doTrigMuon,doTrigHLTResult,doTrigCalo,doTrigMinBias,doTrigTau,doTrigIDtrk,doTrigBjet'
-physval.args += ' --validationFlags="{:s}"'.format(validationFlags)
+downloadRun3Trig = CheckSteps.DownloadRefStep('DownloadRun3TriggerNTUP')
+downloadRun3Trig.artjobname = 'test_trigAna_PhysValWeb_mt1_grid.py'
+downloadRun3Trig.args += ' --dst="."'
test = Test.Test()
test.art_type = 'grid'
-test.exec_steps = [rdo2aod,physval]
-test.check_steps = CheckSteps.default_check_steps(test)
-
-
-download=CheckSteps.DownloadRefStep()
-download.artpackage = 'TrigAnalysisTest'
-download.artjobname = 'test_trigAna_PhysValWeb_grid.py'
-download.required=True
-test.check_steps.append(download)
-
+test.exec_steps = [downloadLegacyTrig,downloadRun3Trig]
+# Only keep relevant checks from the defaults
+test.check_steps = [chk for chk in CheckSteps.default_check_steps(test)
+ if type(chk) in (CheckSteps.LogMergeStep, CheckSteps.CheckLogStep)]
+
+# Add web display steps
+slice_names = [
+ 'JetMon', 'TauMon', 'MuonMon', 'IDMon',
+ 'BphysMon', 'HLTCaloESD', 'ResultMon', 'BjetMon',
+ 'METMon', 'MinBiasMon', 'Egamma']
+add_physvalweb_steps(test, slice_names)
-if not os.path.exists('PHYSVAL_WEB'):
- os.mkdir('PHYSVAL_WEB')
-
-
-pv=[]
-pv.append(['Jet','JetMon'])
-pv.append(['Tau','TauMon'])
-pv.append(['Muon','MuonMon'])
-pv.append(['ID','IDMon'])
-pv.append(['Bphys','BphysMon'])
-pv.append(['HLTCalo','HLTCaloESD'])
-pv.append(['Result','ResultMon'])
-pv.append(['Bjet','BjetMon'])
-pv.append(['MET','METMon'])
-pv.append(['MinBias','MinBiasMon'])
-pv.append(['Egamma','Egamma'])
-
-for slice in pv:
- name='PhysValWeb'+slice[0]
- sliceweb=CheckSteps.PhysValWebStep(name)
- sliceweb.sig=slice[1]
- sliceweb.required=True
- test.check_steps.append(sliceweb)
-
import sys
sys.exit(test.run())
-
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_mt1_grid.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_mt1_grid.py
index 4b6491272d040944e7949398babe8904747c772d..412ce230290ed8ad9c653765cf9135f6bf3ffefb 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_mt1_grid.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_PhysValWeb_mt1_grid.py
@@ -23,6 +23,7 @@
# art-html: PHYSVAL_WEB
from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+from TrigAnalysisTest.TrigAnalysisSteps import add_physvalweb_steps
import os
# To run single-process transform on MCORE sites
@@ -51,38 +52,13 @@ test.art_type = 'grid'
test.exec_steps = [rdo2aod,physval]
test.check_steps = CheckSteps.default_check_steps(test)
+# Add web display steps
+slice_names = [
+ 'JetMon', 'TauMon', 'MuonMon', 'IDMon',
+ 'BphysMon', 'HLTCaloESD', 'ResultMon', 'BjetMon',
+ 'METMon', 'MinBiasMon', 'Egamma']
+download = CheckSteps.DownloadRefStep()
+add_physvalweb_steps(test, slice_names, download)
-download=CheckSteps.DownloadRefStep()
-download.artpackage = 'TrigAnalysisTest'
-download.artjobname = 'test_trigAna_PhysValWeb_mt1_grid.py'
-download.required=True
-test.check_steps.append(download)
-
-
-if not os.path.exists('PHYSVAL_WEB'):
- os.mkdir('PHYSVAL_WEB')
-
-
-pv=[]
-pv.append(['Jet','JetMon'])
-pv.append(['Tau','TauMon'])
-pv.append(['Muon','MuonMon'])
-pv.append(['ID','IDMon'])
-pv.append(['Bphys','BphysMon'])
-pv.append(['HLTCalo','HLTCaloESD'])
-pv.append(['Result','ResultMon'])
-pv.append(['Bjet','BjetMon'])
-pv.append(['MET','METMon'])
-pv.append(['MinBias','MinBiasMon'])
-pv.append(['Egamma','Egamma'])
-
-for slice in pv:
- name='PhysValWeb'+slice[0]
- sliceweb=CheckSteps.PhysValWebStep(name)
- sliceweb.sig=slice[1]
- sliceweb.required=True
- test.check_steps.append(sliceweb)
-
import sys
sys.exit(test.run())
-
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py
index d757889b79a8e70beec21f41c3ba574d7448e356..36ff6edd29ffe1b593412b08e3b889a79023c56a 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_RDOtoRDOTrig_mt1_build.py
@@ -23,7 +23,7 @@ test.check_steps = CheckSteps.default_check_steps(test)
# Add a step comparing counts in the log against reference
refcomp = CheckSteps.RegTestStep("CountRefComp")
refcomp.input_base_name = 'athena.merged'
-refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
+refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*'
refcomp.reference = 'TrigAnalysisTest/ref_RDOtoRDOTrig_mt1_build.ref'
refcomp.required = True # Final exit code depends on this step
CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index 4de9eb21354d6619e694f43608026e1df85d0919..8f1b961516c58b4a09399505cf62f599773e71ae 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -70,7 +70,7 @@ class TrigInDetReco(ExecStep):
flags += 'doTauSlice=True;'
if (i=='bjet') :
chains += "'HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20',"
- flags += 'doBjetSlice=true;'
+ flags += 'doBjetSlice=True;'
chains += ']'
self.preexec_trig = 'doEmptyMenu=True;'+flags+'selectChains='+chains
@@ -120,6 +120,9 @@ class TrigInDetdictStep(Step):
super(TrigInDetdictStep, self).configure(test)
+
+
+
class TrigInDetCompStep(RefComparisonStep):
'''
Execute TIDAcomparitor for data.root files.
@@ -127,15 +130,63 @@ class TrigInDetCompStep(RefComparisonStep):
def __init__(self, name='TrigInDetComp'):
super(TrigInDetCompStep, self).__init__(name)
self.input_file = 'data-hists.root'
-# self.ref_file = 'data-hists.root' #### need to add reference file here
self.output_dir = 'HLT-plots'
self.chains = ' '
self.args = ''
+ self.test = ' '
self.auto_report_result = True
self.required = True
self.executable = 'TIDAcomparitor'
def configure(self, test):
+ if (self.flag == 'L2muon'):
+ self.chains = 'HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF'
+ self.output_dir = 'HLTL2-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-muon'
+ elif (self.flag == 'EFmuon'):
+ self.chains='HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig'
+ self.output_dir = 'HLTEF-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-muon'
+ elif (self.flag == 'L2bjet'):
+ self.chains='HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF'
+ self.output_dir = 'HLTL2-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-bjet'
+ elif (self.flag == 'EFbjet'):
+ self.chains='HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig'
+ self.output_dir = 'HLTEF-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-bjet'
+ elif (self.flag == 'L2tau'):
+ self.chains = 'HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF'
+ self.output_dir = 'HLTL2-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-tau'
+ elif (self.flag == 'EFtau'):
+ self.chains = 'HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig'
+ self.output_dir = 'HLTEF-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-tau'
+ elif (self.flag == 'L2ele'):
+ self.chains = 'HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF'
+ self.output_dir = 'HLTL2-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-electron'
+ elif (self.flag == 'EFele'):
+ self.chains = 'HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig'
+ self.output_dir = 'HLTEF-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-electron'
+ elif (self.flag == 'L2FS'):
+ self.chains = 'HLT_IDTrack_FS_FTF'
+ self.output_dir = 'HLTL2-plots'
+ if (self.test=='ttbar'):
+ self.output_dir = self.output_dir+'-FS'
+ else:
+ print('Unknown flag for comparitor step ', self.flag)
+
if (self.reference == None):
# if no referenc found, use input file as reference
self.args += self.input_file+' '+self.input_file+' '+self.chains+' -d '+self.output_dir
@@ -144,6 +195,7 @@ class TrigInDetCompStep(RefComparisonStep):
super(TrigInDetCompStep, self).configure(test)
+
class TrigInDetCpuCostStep(RefComparisonStep):
'''
Execute TIDAcpucost for expert-monitoring.root files.
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
index e1fc8bfc1ec8d174de2a0648a60e48e2a56158d1..6bdeccf6197c0dba79b08e17b7d4a522bf19317f 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_AODtoTrkNtuple.py
@@ -150,8 +150,9 @@ if ( True ) :
":HLT_IDTrack_FS_FTF",
"HLT_mu.*_idperf.*:HLT_IDTrack_Muon_FTF",
+ "HLT_mu.*_idperf.*:HLT_IDTrack_Muon_FTF:roi=HLT_Roi_L2SAMuon",
"HLT_mu.*_idperf.*:HLT_IDTrack_Muon_IDTrig",
-
+
"HLT_b.*perf.*:HLT_IDTrack_Bjet_FTF",
"HLT_b.*perf.*:HLT_IDTrack_Bjet_IDTrig",
"HLT_j.*perf.*:HLT_IDTrack_Bjet_FTF",
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py
new file mode 100755
index 0000000000000000000000000000000000000000..69a74405ae6e131896d8cd0c71d27d87cc4270d7
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu40.py
@@ -0,0 +1,138 @@
+#!/usr/bin/env python
+
+# art-description: art job for all_ttbar_pu40
+# art-type: grid
+# art-include: master/Athena
+# art-input-nfiles: 3
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['muon','electron','tau','bjet']
+rdo2aod.max_events = 2000
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+rdo2aod.input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -r Offline -f data-hists.root -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag='L2muon'
+comp.test='ttbar'
+test.check_steps.append(comp)
+
+
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag='EFmuon'
+comp2.test='ttbar'
+test.check_steps.append(comp2)
+
+
+comp3=TrigInDetCompStep('Comp_L2bjet')
+comp3.flag='L2bjet'
+comp3.test='ttbar'
+test.check_steps.append(comp3)
+
+comp4=TrigInDetCompStep('Comp_EFbjet')
+comp4.flag='EFbjet'
+comp4.test='ttbar'
+test.check_steps.append(comp4)
+
+comp5=TrigInDetCompStep('Comp_L2tau')
+comp5.flag='L2tau'
+comp5.test='ttbar'
+test.check_steps.append(comp5)
+
+comp6=TrigInDetCompStep('Comp_EFtau')
+comp6.flag='EFtau'
+comp6.test='ttbar'
+test.check_steps.append(comp6)
+
+comp7=TrigInDetCompStep('Comp_L2ele')
+comp7.flag='L2ele'
+comp7.test='ttbar'
+test.check_steps.append(comp7)
+
+comp8=TrigInDetCompStep('Comp_EFele')
+comp8.flag='EFele'
+comp8.test='ttbar'
+test.check_steps.append(comp8)
+
+comp9=TrigInDetCompStep('Comp_L2FS')
+comp9.flag='L2FS'
+comp9.test='ttbar'
+test.check_steps.append(comp9)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
index 9ad0519a0374370a348ad9eb75f99484ede60fca..3e245532abfa3e47ad528452aba55054b9c4375d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80.py
@@ -1,10 +1,11 @@
#!/usr/bin/env python
-# art-description: art job for all_ttbar_pu80_grid
+# art-description: art job for all_ttbar_pu80
# art-type: grid
# art-include: master/Athena
# art-input-nfiles: 3
# art-athena-mt: 4
+# art-memory: 4096
# art-output: *.txt
# art-output: *.log
# art-output: log.*
@@ -58,7 +59,7 @@ rdo2aod.threads = 1 # TODO: change to 4
rdo2aod.concurrent_events = 1 # TODO: change to 4
rdo2aod.perfmon = False
rdo2aod.timeout = 18*3600
-rdo2aod.input = 'ttbar_pu80'
+rdo2aod.input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
test = Test.Test()
@@ -76,33 +77,49 @@ if ((not exclude) or postproc ):
# Now the comparitor steps
-comp=TrigInDetCompStep('CompareStep1')
-comp.chains = 'HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF'
-comp.output_dir = 'HLTL2-plots-muon'
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag='L2muon'
+comp.test='ttbar'
test.check_steps.append(comp)
-comp2=TrigInDetCompStep('CompareStep2')
-comp2.chains='HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig'
-comp2.output_dir = 'HLTEF-plots-muon'
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag='EFmuon'
+comp2.test='ttbar'
test.check_steps.append(comp2)
-comp3=TrigInDetCompStep('CompareStep3')
-comp3.chains='HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig'
-comp3.output_dir = 'HLTEF-plots-bjet'
+
+comp3=TrigInDetCompStep('Comp_L2bjet')
+comp3.flag='L2bjet'
+comp3.test='ttbar'
test.check_steps.append(comp3)
-comp4=TrigInDetCompStep('CompareStep4')
-comp4.chains='HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig'
-comp4.output_dir = 'HLTEF-plots-electron'
+comp4=TrigInDetCompStep('Comp_EFbjet')
+comp4.flag='EFbjet'
+comp4.test='ttbar'
test.check_steps.append(comp4)
-comp5=TrigInDetCompStep('CompareStep5')
-comp5.chains='HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig'
-comp5.output_dir = 'HLTEF-plots-tau'
+comp5=TrigInDetCompStep('Comp_L2tau')
+comp5.flag='L2tau'
+comp5.test='ttbar'
test.check_steps.append(comp5)
+comp6=TrigInDetCompStep('Comp_EFtau')
+comp6.flag='EFtau'
+comp6.test='ttbar'
+test.check_steps.append(comp6)
+
+comp7=TrigInDetCompStep('Comp_L2ele')
+comp7.flag='L2ele'
+comp7.test='ttbar'
+test.check_steps.append(comp7)
+
+comp8=TrigInDetCompStep('Comp_EFele')
+comp8.flag='EFele'
+comp8.test='ttbar'
+test.check_steps.append(comp8)
+# CPU cost steps
cpucost=TrigInDetCpuCostStep('CpuCostStep1')
test.check_steps.append(cpucost)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py
index b67f68f0561fb368cb66a5a8b28569011fa52e0f..c405eab7dc6d28c479b4fd2d2b5d7d8bc71f8ddc 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt.py
@@ -1,10 +1,11 @@
#!/usr/bin/env python
-# art-description: art job for all_ttbar_pu80_mp_grid
+# art-description: art job for all_ttbar_pu80_mt
# art-type: grid
# art-include: master/Athena
# art-input-nfiles: 3
# art-athena-mt: 4
+# art-memory: 4096
# art-output: *.txt
# art-output: *.log
# art-output: log.*
@@ -15,10 +16,8 @@
# art-output: *.json
# art-output: *.root
# art-output: *.check*
-# art-output: HLTEF-plots
-# art-output: HLTL2-plots
-# art-output: times
-# art-output: times-FTF
+# art-output: HLT*
+# art-output: times*
# art-output: cost-perCall
# art-output: cost-perEvent
# art-output: cost-perCall-chain
@@ -33,68 +32,94 @@ from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, T
import sys,getopt
try:
- opts, args = getopt.getopt(sys.argv[1:],"l",["local"])
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
except getopt.GetoptError:
- print("Usage: -l(--local)")
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
local=False
+exclude=False
+postproc=False
for opt,arg in opts:
if opt in ("-l", "--local"):
local=True
-
-
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
rdo2aod = TrigInDetReco()
rdo2aod.slices = ['muon','electron','tau','bjet']
-rdo2aod.max_events = 1000 # TODO: 2000 events
+rdo2aod.max_events = 2000
rdo2aod.threads = 1 # TODO: change to 4
rdo2aod.concurrent_events = 4
rdo2aod.perfmon = False
rdo2aod.timeout = 18*3600
-rdo2aod.input = 'ttbar_pu80'
+rdo2aod.input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
test = Test.Test()
test.art_type = 'grid'
-test.exec_steps = [rdo2aod]
-test.check_steps = CheckSteps.default_check_steps(test)
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
-# Run analysis to produce TrkNtuple
-test.exec_steps.append(TrigInDetAna())
-
# Run Tidardict
-test.check_steps.append(TrigInDetdictStep())
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -r Offline -f data-hists.root -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
# Now the comparitor steps
-comp=TrigInDetCompStep('CompareStep1')
-comp.chains = 'HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF'
-comp.output_dir = 'HLTL2-plots-muon'
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag='L2muon'
+comp.test='ttbar'
test.check_steps.append(comp)
-comp2=TrigInDetCompStep('CompareStep2')
-comp2.chains='HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_FTF HLT_mu24_idperf_L1MU20:HLT_IDTrack_Muon_IDTrig'
-comp2.output_dir = 'HLTEF-plots-muon'
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag='EFmuon'
+comp2.test='ttbar'
test.check_steps.append(comp2)
-comp3=TrigInDetCompStep('CompareStep3')
-comp3.chains='HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig'
-comp3.output_dir = 'HLTEF-plots-bjet'
+
+comp3=TrigInDetCompStep('Comp_L2bjet')
+comp3.flag='L2bjet'
+comp3.test='ttbar'
test.check_steps.append(comp3)
-comp4=TrigInDetCompStep('CompareStep4')
-comp4.chains='HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_FTF HLT_e5_etcut_L1EM3:HLT_IDTrack_Electron_IDTrig'
-comp4.output_dir = 'HLTEF-plots-electron'
+comp4=TrigInDetCompStep('Comp_EFbjet')
+comp4.flag='EFbjet'
+comp4.test='ttbar'
test.check_steps.append(comp4)
-comp5=TrigInDetCompStep('CompareStep5')
-comp5.chains='HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_TauCore_FTF HLT_tau25_idperf_tracktwo_L1TAU12IM:HLT_IDTrack_Tau_IDTrig'
-comp5.output_dir = 'HLTEF-plots-tau'
+comp5=TrigInDetCompStep('Comp_L2tau')
+comp5.flag='L2tau'
+comp5.test='ttbar'
test.check_steps.append(comp5)
+comp6=TrigInDetCompStep('Comp_EFtau')
+comp6.flag='EFtau'
+comp6.test='ttbar'
+test.check_steps.append(comp6)
+
+comp7=TrigInDetCompStep('Comp_L2ele')
+comp7.flag='L2ele'
+comp7.test='ttbar'
+test.check_steps.append(comp7)
+
+comp8=TrigInDetCompStep('Comp_EFele')
+comp8.flag='EFele'
+comp8.test='ttbar'
+test.check_steps.append(comp8)
+# CPU cost steps
cpucost=TrigInDetCpuCostStep('CpuCostStep1')
test.check_steps.append(cpucost)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py
new file mode 100755
index 0000000000000000000000000000000000000000..284d2f4d37406dba3d485a6dfb2c2ac25b6c772d
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_pu80_mt2.py
@@ -0,0 +1,133 @@
+#!/usr/bin/env python
+
+# art-description: art job for all_ttbar_pu80_mt2
+# art-type: grid
+# art-include: master/Athena
+# art-input-nfiles: 3
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['muon','electron','tau','bjet']
+rdo2aod.max_events = 2000
+rdo2aod.threads = 4
+rdo2aod.concurrent_events = 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+rdo2aod.input = 'ttbar_pu80' # defined in TrigValTools/share/TrigValInputs.json
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -r Offline -f data-hists.root -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag='L2muon'
+comp.test='ttbar'
+test.check_steps.append(comp)
+
+
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag='EFmuon'
+comp2.test='ttbar'
+test.check_steps.append(comp2)
+
+
+comp3=TrigInDetCompStep('Comp_L2bjet')
+comp3.flag='L2bjet'
+comp3.test='ttbar'
+test.check_steps.append(comp3)
+
+comp4=TrigInDetCompStep('Comp_EFbjet')
+comp4.flag='EFbjet'
+comp4.test='ttbar'
+test.check_steps.append(comp4)
+
+comp5=TrigInDetCompStep('Comp_L2tau')
+comp5.flag='L2tau'
+comp5.test='ttbar'
+test.check_steps.append(comp5)
+
+comp6=TrigInDetCompStep('Comp_EFtau')
+comp6.flag='EFtau'
+comp6.test='ttbar'
+test.check_steps.append(comp6)
+
+comp7=TrigInDetCompStep('Comp_L2ele')
+comp7.flag='L2ele'
+comp7.test='ttbar'
+test.check_steps.append(comp7)
+
+comp8=TrigInDetCompStep('Comp_EFele')
+comp8.flag='EFele'
+comp8.test='ttbar'
+test.check_steps.append(comp8)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_olddata_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_olddata_pu40.py
new file mode 100755
index 0000000000000000000000000000000000000000..a69d5becc6e65b2ab3a26143a65eecf0fbda08be
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_olddata_pu40.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python
+
+# art-description: art job for bjet_olddata_pu40
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193
+# art-input-nfiles: 3
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['bjet']
+rdo2aod.max_events = 2000
+rdo2aod.threads = 1
+rdo2aod.concurrent_events = 1
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
+ print ('WARNING not using same datafile locally as grid test')
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp1=TrigInDetCompStep('Comp_L2bjet')
+comp1.flag = 'L2bjet'
+test.check_steps.append(comp1)
+
+comp2=TrigInDetCompStep('Comp_EFbjet')
+comp2.flag = 'EFbjet'
+test.check_steps.append(comp2)
+
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py
index 242cc7286c548101b74a1fee679b8d4354347c13..2e60091c7f9ff5d0f4ab37c668a43d8f4b1bd55d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bjet_pu40.py
@@ -1,10 +1,11 @@
#!/usr/bin/env python
-# art-description: art job for all_ttbar_pu80_grid
+# art-description: art job for bjet_pu40
# art-type: grid
# art-include: master/Athena
# art-input-nfiles: 3
# art-athena-mt: 4
+# art-memory: 4096
# art-output: *.txt
# art-output: *.log
# art-output: log.*
@@ -59,7 +60,7 @@ rdo2aod.threads = 1
rdo2aod.concurrent_events = 1
rdo2aod.perfmon = False
rdo2aod.timeout = 18*3600
-rdo2aod.input = 'ttbar'
+rdo2aod.input = 'ttbar' # defined in TrigValTools/share/TrigValInputs.json
test = Test.Test()
@@ -77,13 +78,16 @@ if ((not exclude) or postproc ):
# Now the comparitor steps
-comp1=TrigInDetCompStep('CompareStep1')
-comp1.chains='HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_FTF HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20:HLT_IDTrack_Bjet_IDTrig'
-comp1.output_dir = 'HLTEF-plots-bjet'
+comp1=TrigInDetCompStep('Comp_L2bjet')
+comp1.flag = 'L2bjet'
test.check_steps.append(comp1)
+comp2=TrigInDetCompStep('Comp_EFbjet')
+comp2.flag = 'EFbjet'
+test.check_steps.append(comp2)
+# CPU cost steps
cpucost=TrigInDetCpuCostStep('CpuCostStep1')
test.check_steps.append(cpucost)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
new file mode 100755
index 0000000000000000000000000000000000000000..e93b1d50cc269d4c8749eaf4c76b35a02806978e
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_jpsiee_pu40.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+# art-description: art job for el_Jpsiee_pu40
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042
+# art-input-nfiles: 16
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['electron']
+rdo2aod.max_events = 8000
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Jpsiee_pu40' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2ele')
+comp.flag = 'L2ele'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFele')
+comp2.flag = 'EFele'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
new file mode 100755
index 0000000000000000000000000000000000000000..8319488e7ac440ba44287f878c70b023506d1b4c
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+# art-description: art job for el_singlee_7-80
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728
+# art-input-nfiles: 10
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['electron']
+rdo2aod.max_events = 5000 # TODO increase to 20k
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Single_el' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2ele')
+comp.flag = 'L2ele'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFele')
+comp2.flag = 'EFele'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
new file mode 100755
index 0000000000000000000000000000000000000000..e7c65c39cb1ee04c06bf304294e63fa3f63d418b
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+# art-description: art job for el_singlee_7-80_larged0
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728
+# art-input-nfiles: 10
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['electron']
+rdo2aod.max_events = 5000 # TODO change to 20k
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Single_el_larged0' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2ele')
+comp.flag = 'L2ele'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFele')
+comp2.flag = 'EFele'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
new file mode 100755
index 0000000000000000000000000000000000000000..034098a929eeed4023dd2e6000294d2126d9c20e
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_larged0_pu.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+# art-description: art job for el_singlee_7-80_larged0_pu
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772
+# art-input-nfiles: 10
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['electron']
+rdo2aod.max_events = 5000 # TODO increase to 20k
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Single_el_larged0_pu' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2ele')
+comp.flag = 'L2ele'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFele')
+comp2.flag = 'EFele'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
new file mode 100755
index 0000000000000000000000000000000000000000..8d3959ddb7055558239bea1ad1191251ab489d05
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_singlee_7-80_pu40.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+# art-description: art job for el_singlee_7-80_pu40
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728
+# art-input-nfiles: 10
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['electron']
+rdo2aod.max_events = 5000 # TODO increase to 20k
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Single_el_pu' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2ele')
+comp.flag = 'L2ele'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFele')
+comp2.flag = 'EFele'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
new file mode 100755
index 0000000000000000000000000000000000000000..f63ba3a27c7ef0c28766feb7ab378cfb2fd89752
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_el_zee_pu40.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+# art-description: art job for el_zee_pu40
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191
+# art-input-nfiles: 8
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['electron']
+rdo2aod.max_events = 5000 #Â TODO increase to 16k
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Zee_pu40' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 11 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2ele')
+comp.flag = 'L2ele'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFele')
+comp2.flag = 'EFele'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
new file mode 100755
index 0000000000000000000000000000000000000000..a55106254356599a30a670f1033f5caa94840dce
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_bphys.py
@@ -0,0 +1,96 @@
+#!/usr/bin/env python
+
+# art-description: art job for mu_bphys
+# art-type: grid
+# art-include: master/Athena
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['muon']
+rdo2aod.max_events = 6000
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+rdo2aod.input = 'Bphys_JpsiPhi' # defined in TrigValTools/share/TrigValInputs.json
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag = 'L2muon'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag = 'EFmuon'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
new file mode 100755
index 0000000000000000000000000000000000000000..a3b851ef0d6a32b8747ba98dfcd8b0db271245e2
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+# art-description: art job for mu_singlemu_larged0_pu
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7772
+# art-input-nfiles: 10
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['muon']
+rdo2aod.max_events = 5000 # TODO increase to 20k
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Single_mu_larged0_pu' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag = 'L2muon'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag = 'EFmuon'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
new file mode 100755
index 0000000000000000000000000000000000000000..51f920136e34b10e0d87510a2e36a4595b42e628
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_singlemu_larged0_pu.py
@@ -0,0 +1,103 @@
+#!/usr/bin/env python
+
+# art-description: art job for mu_singlemu_larged0_pu
+# art-type: grid
+# art-include: master/Athena
+# art-input: mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728
+# art-input-nfiles: 10
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['muon']
+rdo2aod.max_events = 5000 # TODO increase to 20k
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+if local:
+ rdo2aod.input = 'Single_mu_larged0' # defined in TrigValTools/share/TrigValInputs.json
+else:
+ rdo2aod.input = ''
+ rdo2aod.args += '--inputRDOFile=$ArtInFile '
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -p 13 -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag = 'L2muon'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag = 'EFmuon'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
index 7edca3a8bc43bd1748f4830df01720e3ac1e7028..60b3b1df5609ca09fa3a62dc153d33eac71bcceb 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40.py
@@ -6,6 +6,7 @@
# art-input: mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143
# art-input-nfiles: 4
# art-athena-mt: 4
+# art-memory: 4096
# art-output: *.txt
# art-output: *.log
# art-output: log.*
@@ -53,13 +54,13 @@ for opt,arg in opts:
rdo2aod = TrigInDetReco()
rdo2aod.slices = ['muon']
-rdo2aod.max_events = 2000 # TODO: 2000 events
+rdo2aod.max_events = 2000
rdo2aod.threads = 1 # TODO: change to 4
rdo2aod.concurrent_events = 1 # TODO: change to 4
rdo2aod.perfmon = False
rdo2aod.timeout = 18*3600
if local:
- rdo2aod.input = 'Zmumu_pu40'
+ rdo2aod.input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
else:
rdo2aod.input = ''
rdo2aod.args += '--inputRDOFile=$ArtInFile '
@@ -81,18 +82,15 @@ if ((not exclude) or postproc ):
# Now the comparitor steps
-comp=TrigInDetCompStep('CompareStep1')
-comp.chains = 'HLT_mu24_idperf:HLT_IDTrack_Muon_FTF'
-comp.output_dir = 'HLTL2-plots-muon'
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag = 'L2muon'
test.check_steps.append(comp)
-
-
-comp2=TrigInDetCompStep('CompareStep2')
-comp2.chains='HLT_mu24_idperf:HLT_IDTrack_Muon_FTF HLT_mu24_idperf:HLT_IDTrack_Muon_IDTrig'
-comp2.output_dir = 'HLTEF-plots-muon'
+
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag = 'EFmuon'
test.check_steps.append(comp2)
-
+# CPU cost steps
cpucost=TrigInDetCpuCostStep('CpuCostStep1')
test.check_steps.append(cpucost)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
index 7b125971874dbaf40fc9daae3d7c4099b8cb9de6..1c706c4fcfafc3170e5c802fae5a2ce967a5c23d 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mu_zmumu_pu40_build.py
@@ -28,11 +28,11 @@ from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, T
rdo2aod = TrigInDetReco()
rdo2aod.slices = ['muon']
-rdo2aod.max_events = 2000 # TODO: 2000 events
+rdo2aod.max_events = 100 # TODO: 2000 events
rdo2aod.threads = 1 # TODO: change to 4
rdo2aod.concurrent_events = 1 # TODO: change to 4
rdo2aod.perfmon = False
-rdo2aod.input = 'Zmumu_pu40'
+rdo2aod.input = 'Zmumu_pu40' # defined in TrigValTools/share/TrigValInputs.json
test = Test.Test()
@@ -51,17 +51,15 @@ if ((not exclude) or postproc ):
# Now the comparitor steps
-comp=TrigInDetCompStep('CompareStep1')
-comp.chains = 'HLT_mu24_idperf:HLT_IDTrack_Muon_FTF'
-comp.output_dir = 'HLTL2-plots-muon'
+comp=TrigInDetCompStep('Comp_L2muon')
+comp.flag = 'L2muon'
test.check_steps.append(comp)
-
-
-comp2=TrigInDetCompStep('CompareStep2')
-comp2.chains='HLT_mu24_idperf:HLT_IDTrack_Muon_FTF HLT_mu24_idperf:HLT_IDTrack_Muon_IDTrig'
-comp2.output_dir = 'HLTEF-plots-muon'
+
+comp2=TrigInDetCompStep('Comp_EFmuon')
+comp2.flag = 'EFmuon'
test.check_steps.append(comp2)
+# CPU cost steps
cpucost=TrigInDetCpuCostStep('CpuCostStep1')
test.check_steps.append(cpucost)
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py
new file mode 100755
index 0000000000000000000000000000000000000000..8191de37cb9d79542f64b880ca2c3efb3184adba
--- /dev/null
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+
+# art-description: art job for mu_ztautau_pu46
+# art-type: grid
+# art-include: master/Athena
+# art-athena-mt: 4
+# art-memory: 4096
+# art-output: *.txt
+# art-output: *.log
+# art-output: log.*
+# art-output: *.out
+# art-output: *.err
+# art-output: *.log.tar.gz
+# art-output: *.new
+# art-output: *.json
+# art-output: *.root
+# art-output: *.check*
+# art-output: HLT*
+# art-output: times*
+# art-output: cost-perCall
+# art-output: cost-perEvent
+# art-output: cost-perCall-chain
+# art-output: cost-perEvent-chain
+# art-output: *.dat
+
+
+from TrigValTools.TrigValSteering import Test, CheckSteps
+from TrigInDetValidation.TrigInDetArtSteps import TrigInDetReco, TrigInDetAna, TrigInDetdictStep, TrigInDetCompStep, TrigInDetCpuCostStep
+
+import sys,getopt
+
+try:
+ opts, args = getopt.getopt(sys.argv[1:],"lxp",["local"])
+except getopt.GetoptError:
+ print("Usage: ")
+ print("-l(--local) run locally with input file from art eos grid-input")
+ print("-x don't run athena or post post-processing, only plotting")
+ print("-p run post-processing, even if -x is set")
+
+
+local=False
+exclude=False
+postproc=False
+for opt,arg in opts:
+ if opt in ("-l", "--local"):
+ local=True
+ if opt=="-x":
+ exclude=True
+ if opt=="-p":
+ postproc=True
+
+
+rdo2aod = TrigInDetReco()
+rdo2aod.slices = ['muon']
+rdo2aod.max_events = 6000
+rdo2aod.threads = 1 # TODO: change to 4
+rdo2aod.concurrent_events = 1 # TODO: change to 4
+rdo2aod.perfmon = False
+rdo2aod.timeout = 18*3600
+rdo2aod.input = 'Ztautau_pu46' # defined in TrigValTools/share/TrigValInputs.json
+
+
+test = Test.Test()
+test.art_type = 'grid'
+if (not exclude):
+ test.exec_steps = [rdo2aod]
+ test.exec_steps.append(TrigInDetAna()) # Run analysis to produce TrkNtuple
+ test.check_steps = CheckSteps.default_check_steps(test)
+
+
+# Run Tidardict
+if ((not exclude) or postproc ):
+ rdict = TrigInDetdictStep()
+ rdict.args='TIDAdata-run3.dat -f data-hists.root -b Test_bin.dat '
+ test.check_steps.append(rdict)
+
+
+# Now the comparitor steps
+comp=TrigInDetCompStep('Comp_L2tau')
+comp.flag = 'L2tau'
+test.check_steps.append(comp)
+
+comp2=TrigInDetCompStep('Comp_EFtau')
+comp2.flag = 'EFtau'
+test.check_steps.append(comp2)
+
+# CPU cost steps
+cpucost=TrigInDetCpuCostStep('CpuCostStep1')
+test.check_steps.append(cpucost)
+
+cpucost2=TrigInDetCpuCostStep('CpuCostStep2')
+cpucost2.args += ' -p FastTrack'
+cpucost2.output_dir = 'times-FTF'
+test.check_steps.append(cpucost2)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py b/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
index d1fb5984fa7dc7da03a6f9e98d276adeded82b3d..646180b431bad4da4b4d37eed953d2fac0eac9e9 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
+++ b/Trigger/TrigValidation/TrigP1Test/share/PEBDSTest.py
@@ -15,6 +15,7 @@ from TriggerMenuMT.HLTMenuConfig.CommonSequences import EventBuildingSequenceSet
from TrigPartialEventBuilding.TrigPartialEventBuildingConfig import StaticPEBInfoWriterToolCfg, RoIPEBInfoWriterToolCfg
from TriggerJobOpts.TriggerFlags import TriggerFlags
from libpyeformat_helper import SubDetector
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
from AthenaCommon.AlgSequence import dumpSequence
from AthenaCommon.Logging import logging
log = logging.getLogger('dataScoutingTest')
@@ -142,7 +143,7 @@ myAllStreams = [
StreamInfo._all_streams = myAllStreams
# Set trigger flags
-TriggerFlags.triggerMenuSetup = 'LS2_v1'
+ConfigFlags.Trigger.triggerMenuSetup = TriggerFlags.triggerMenuSetup = 'LS2_v1'
TriggerFlags.Slices_all_setOff()
TriggerFlags.EgammaSlice.setAll()
TriggerFlags.MuonSlice.setAll()
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
index a854bae5cc8e33dd618065737605d573d972aee8..1ca2db917dc4604f6b683bfccbd6c1ef1d469a4d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py
@@ -24,9 +24,10 @@ hlt.input = 'data'
#====================================================================================================
# Tier-0 reco step BS->ESD->AOD
tzrecoPreExec = ' '.join([
+ "from AthenaConfiguration.AllConfigFlags import ConfigFlags;",
+ "ConfigFlags.Trigger.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
"from TriggerJobOpts.TriggerFlags import TriggerFlags;",
"TriggerFlags.configForStartup=\'HLToffline\';",
- "TriggerFlags.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
"TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
"TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\')",
])
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
index 2e653ce39fa6933d25fe0cdc9761966727a94e4a..4d59af68a3b0720118b11208e3d27b03b03c1f7c 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
@@ -30,9 +30,10 @@ filter_bs.args = '-s Main ' + findFile('*_HLTMPPy_output.*.data')
# Tier-0 reco step (BS->ESD->AOD)
tzrecoPreExec = ' '.join([
+ "from AthenaConfiguration.AllConfigFlags import ConfigFlags;",
+ "ConfigFlags.Trigger.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
"from TriggerJobOpts.TriggerFlags import TriggerFlags;",
"TriggerFlags.configForStartup=\'HLToffline\';",
- "TriggerFlags.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
"TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
"TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\');"
])
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
index 515305747f9a1be58c32abd7a549a5422c180178..ce139aea52b4be4974d4af673d57611bb824ef1d 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
@@ -39,9 +39,10 @@ filter_bs.args = '-s Main ' + findFile('*_HLTMPPy_output.*.data')
# Tier-0 reco step (BS->ESD->AOD)
tzrecoPreExec = ' '.join([
+ "from AthenaConfiguration.AllConfigFlags import ConfigFlags;",
+ "ConfigFlags.Trigger.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
"from TriggerJobOpts.TriggerFlags import TriggerFlags;",
"TriggerFlags.configForStartup=\'HLToffline\';",
- "TriggerFlags.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
"TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
"TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\');"
])
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 438e90746aca33f15a7f4974171380f98dca6635..e28fc2941e43de09bfbb781d08370dadb504f557 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -3,24 +3,6 @@
# Declare the package name:
atlas_subdir( TrigUpgradeTest )
-atlas_add_component( TrigUpgradeTest
- src/*.cxx
- src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps TrigSteeringEvent DecisionHandlingLib TrigCompositeUtilsLib
- )
-
-foreach(test emu_step_processing emu_step_menu_processing)
- set( rundir ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_${test} )
- file( REMOVE_RECURSE ${rundir} )
- file( MAKE_DIRECTORY ${rundir} )
- atlas_add_test( ${test}
- SCRIPT test/test_${test}.sh
- LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
- PROPERTIES WORKING_DIRECTORY ${rundir}
- )
-endforeach()
-
-
# Install files from the package:
atlas_install_joboptions( share/*.py )
atlas_install_data( share/*.ref share/*.conf )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
deleted file mode 100644
index bab2326aa6bed4ef46d78c8801ed61c9dcc38899..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/EmuStepProcessingConfig.py
+++ /dev/null
@@ -1,366 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.AlgScheduler import AlgScheduler
-from AthenaCommon.CFElements import parOR
-from AthenaCommon.Logging import logging
-from L1Decoder.L1DecoderConf import CTPUnpackingEmulationTool, RoIsUnpackingEmulationTool, L1Decoder
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import EmptyMenuSequence
-log = logging.getLogger('EmuStepProcessingConfig')
-
-###########################################################################
-def thresholdToChains( chains ):
- """
- Produces list "threshod : chain" for all chains passed. Uses the L1Thresholds/vseeds Chain property
- """
- ret = []
- for c in chains:
- for t in c.vseeds:
- ret.append(t+ " : " + c.name)
- return ret
-
-###########################################################################
-def generateL1DecoderAndChainsManually(topSequence):
- generateEmuEvents()
- from AthenaCommon.CFElements import seqOR,parOR
- hltTop = seqOR("HLTTop")
- hltBeginSeq = parOR("HLTBeginSeq")
- hltTop += hltBeginSeq
- topSequence += hltTop
- l1Decoder = generateL1Decoder()
- hltBeginSeq += l1Decoder
- generateChainsManually()
- from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import makeHLTTree
- from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
- makeHLTTree( triggerConfigHLT=TriggerConfigHLT )
-
-
-###########################################################################
-def generateL1DecoderAndChainsByMenu(topSequence):
- generateEmuEvents()
- from AthenaCommon.CFElements import seqOR,parOR
- hltTop = seqOR("HLTTop")
- hltBeginSeq = parOR("HLTBeginSeq")
- hltTop += hltBeginSeq
- topSequence += hltTop
- l1Decoder = generateL1Decoder()
- hltBeginSeq += l1Decoder
- l1Decoder = generateL1Decoder()
- generateEmuMenu()
-
-
-
-###########################################################################
-def generateEmuMenu():
- from TriggerMenuMT.HLTMenuConfig.Menu import LS2_v1
- from TriggerMenuMT.HLTMenuConfig.Menu import LS2_emu_v1
- from TriggerMenuMT.HLTMenuConfig.Menu.GenerateMenuMT import GenerateMenuMT
- from TriggerJobOpts.TriggerFlags import TriggerFlags
- from AthenaCommon.Logging import logging
- log = logging.getLogger('EmuMenuTest')
- log.debug("generateEmuMenu")
-
- # overwrite LS2_v1 menu
- TriggerFlags.triggerMenuSetup = 'LS2_v1'
- LS2_v1.setupMenu = LS2_emu_v1.setupMenu
-
- # switch on only TestSlice
- def signaturesToGenerate():
- TriggerFlags.Slices_all_setOff()
- TriggerFlags.TestSlice.setAll()
- #TriggerFlags.EgammaSlice.setAll()
-
- # Generate the menu
- menu = GenerateMenuMT()
- menu.overwriteSignaturesWith(signaturesToGenerate)
- menu.generateMT()
-
-
-
-###########################################################################
-def generateEmuEvents():
- AlgScheduler.ShowControlFlow( True )
- AlgScheduler.ShowDataFlow( True )
-
- # 4 events
- data = {
- 'noreco': [';', ';', ';',';'],
- 'emclusters': [';', ';', ';',';'],
- 'msmu': [';', ';', ';',';'],
- 'ctp': [';', ';', ';',';'],
- 'l1emroi': [';', ';', ';',';'],
- 'l1muroi': [';', ';', ';',';']
- } # in the lists there are the events
-
- # event 0: empty
- data['ctp'] [0] = 'HLT_TestChain5_ev1_L1EM3 \
- HLT_TestChain8_ev1_L1EM5 \
- HLT_g5_EM7'
- data['l1emroi'][0] = ';'
- data['emclusters'][0]= ';'
- data['l1muroi'][0] = ';'
- data['msmu'][0] = ';'
-
-
- #event 1: 3e (1 not passing at L1, 1 not passing at step1) + 2mu (2 not passing) - HLT_e5_e8_L12EM3 HLT_2TestChain6_muv1_L12MU6
- data['ctp'] [1] = 'HLT_TestChain5_ev1_L1EM3 \
- HLT_TestChain8_ev1_L1EM5 \
- HLT_TestChain5_gv1_L1EM7 \
- HLT_TestChain5_ev3_L1EM7 \
- HLT_2TestChain6_muv1_L12MU6 \
- HLT_TestChain10_muv2_L1MU10 \
- HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 \
- HLT_2TestChain4_muv1_dr_L12MU6'
- data['l1emroi'][1] = '1,1,0,EM3,EM5,EM7,EM20,EM50,EM100; 2.,-1.2,0,EM3,EM5,EM7; 3.,0.2,0,EM3;'
- data['emclusters'][1]= 'eta:1,phi:1,et:180000; eta:1,phi:-1.2,et:6000; eta:0.5,phi:-1.2,et:3000;'
- data['l1muroi'][1] = '2,0.5,0,MU6; 3,0.5,0,MU6;'
- data['msmu'][1] = 'eta:-1.2,phi:0.7,pt:1500,pt2:1500; eta:-1.1,phi:0.6,pt:1500,pt2:1500;'
-
- # event 2: 2e+ 3mu : HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_EM5_L12MU6, HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5
- data['ctp'] [2] = 'HLT_TestChain6_muv1_L1MU6 \
- HLT_TestChain8_muv1_L1MU10 \
- HLT_TestChain10_muv2_L1MU10 \
- HLT_TestChain8_muv1step_L1MU6 \
- HLT_TestChain5_ev1_L1EM3 \
- HLT_TestChain8_ev1_L1EM5 \
- HLT_TestChain6_muEmpty2_L1MU6 \
- HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 \
- HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 \
- HLT_2TestChain6_muv1_L12MU6 \
- HLT_2TestChain6_muEmpty1_L12MU6 \
- HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 \
- HLT_2TestChain4_muv1_dr_L12MU6 HLT_e5_e8_L12EM3 \
- HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 \
- HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 \
- HLT_TestChain10_muv1_TestChain6_muEmpty1_L1MU6 \
- HLT_TestChain6_muv1_TestChain5_ev1_dr_L12MU6'
- data['l1emroi'][2] = '2,0.2,0,EM3,EM5,EM7,EM15,EM20,EM50,EM100; 1,-1.1,0,EM3,EM5,EM7,EM15,EM20,EM50;'
- data['emclusters'][2]= 'eta:0.5,phi:0,et:120000; eta:1,phi:-1.2,et:65000;'
- data['l1muroi'][2] = '2,0.5,0,MU6,MU8; 3,0.5,0,MU6,MU8,MU10;2.2,0.6,0,MU6;'
- data['msmu'][2] = 'eta:-1.2,phi:0.7,pt:6500,pt2:8500; eta:-1.1,phi:0.6,pt:10500,pt2:8500;eta:-1.1,phi:0.6,pt:8500,pt2:8500;'
-
- #event 3: 1e + 1mu; HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 does not pass because of e10
- data['ctp'] [3] = 'HLT_TestChain20_muv1_L1MU10 \
- HLT_TestChain10_muv1_L1MU10 \
- HLT_TestChain8_muv1_L1MU10 \
- HLT_TestChain8_muv1step_L1MU6 \
- HLT_TestChain8_ev1_L1EM5 \
- HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5\
- HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5'
- data['l1emroi'][3] = '1,1.5,0,EM3,EM5,EM7;'
- data['emclusters'][3]= 'eta:-0.6,phi:1.7,et:9000;'
- data['l1muroi'][3] = '2,-0.1,0,MU6,MU8,MU10;'
- data['msmu'][3] = 'eta:-1.7,phi:-0.2,pt:29500,pt2:8500;'
-
- # otehr vectors
-
- data['tracks'] = ['eta:1,phi:1,pt:120000; eta:1,phi:-1.2,et:32000;',
- 'eta:1,phi:1,pt:120000; eta:1,phi:-1.2,et:32000;',
- 'eta:0.5,phi:0,pt:130000; eta:1,phi:-1.2,pt:60000;eta:-1.2,phi:0.7,pt:6700; eta:-1.1,phi:0.6,pt:8600;',
- 'eta:-0.6,phi:1.7,et:9000;'] # no MU track for MS candidate 'eta:-1.7,phi:-0.2,pt:9500;'
-
- data['mucomb'] = [';',
- ';',
- 'eta:-1.2,phi:0.7,pt:6600; eta:-1.1,phi:0.6,pt:8600;',
- ';']
-
- data['electrons'] = [';',
- 'eta:1,phi:1,pt:120000; eta:1,phi:-1.2,et:32000;',
- ';',
- ';']
- data['photons'] = [';',
- 'eta:1,phi:1,pt:130000;',
- ';',
- ';']
-
- from TrigUpgradeTest.TestUtils import writeEmulationFiles
- writeEmulationFiles(data)
-
-
-###########################################################################
-def generateChainsManually():
- from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep
- from TrigUpgradeTest.TestUtils import makeChain
-
-
- doMuon = True
- doElectron = True
- doCombo = True
-
- HLTChains = []
-
- # muon chains
- if doMuon:
- from TrigUpgradeTest.HLTSignatureConfig import muMenuSequence
- #step1
- mu11 = muMenuSequence(step="1",reconame="v1", hyponame="v1")
- mu12 = muMenuSequence(step="1",reconame="v2", hyponame="v2")
-
- #step2
- mu21 = muMenuSequence(step="2",reconame="v1", hyponame="v1")
- mu22 = muMenuSequence(step="2",reconame="v2", hyponame="v2")
- #step3
- mu31 = muMenuSequence(step="3",reconame="v1", hyponame="v1")
- mu32 = muMenuSequence(step="3",reconame="v2", hyponame="v2")
- #step4
- mu41 = muMenuSequence(step="4",reconame="v1", hyponame="v1")
-
- step_mu11 = ChainStep("Step1_mu11", [mu11])
- step_mu21 = ChainStep("Step2_mu21", [mu21] )
- step_mu22 = ChainStep("Step2_mu22", [mu22] )
- step_mu31 = ChainStep("Step3_mu31", [mu31] )
- step_mu32 = ChainStep("Step3_mu32", [mu32] )
- step_mu41 = ChainStep("Step4_mu41", [mu41] )
-
- step_empy= ChainStep("Step2_mu1empty", multiplicity=[])
-
- MuChains = [
- makeChain(name='HLT_TestChain8_muv1step_L1MU6', L1Thresholds=["MU6"], ChainSteps=[step_mu11]),
- makeChain(name='HLT_TestChain8_muv1_L1MU10', L1Thresholds=["MU10"], ChainSteps=[step_mu11 , step_mu21 , step_mu31, step_mu41] ),
- makeChain(name='HLT_TestChain20_muv1_L1MU10', L1Thresholds=["MU10"], ChainSteps=[step_mu11 , step_mu21 , step_mu31, step_mu41] ),
- makeChain(name='HLT_TestChain10_muv2_L1MU10', L1Thresholds=["MU10"], ChainSteps=[step_mu11 , step_mu22 , step_mu31] ),
- makeChain(name='HLT_TestChain6_muEmpty2_L1MU6', L1Thresholds=["MU6"], ChainSteps=[step_mu11 , step_empy , step_mu32, step_mu41] ),
- ]
-
-
- HLTChains += MuChains
-
-
- ## #electron chains
- if doElectron:
- from TrigUpgradeTest.HLTSignatureConfig import elMenuSequence, gamMenuSequence
- el11 = elMenuSequence(step="1",reconame="v1", hyponame="v1")
- el21 = elMenuSequence(step="2",reconame="v1", hyponame="v1")
- el22 = elMenuSequence(step="2",reconame="v2", hyponame="v2")
- el23 = elMenuSequence(step="2",reconame="v2", hyponame="v3")
- el31 = elMenuSequence(step="3",reconame="v1", hyponame="v1")
- el41 = elMenuSequence(step="4",reconame="v1", hyponame="v1")
-
- # gamma
- gamm11 = gamMenuSequence("1", reconame="v1", hyponame="v1")
-
- ElChains = [
- makeChain(name='HLT_TestChain5_ev1_L1EM3', L1Thresholds=["EM3"], ChainSteps=[ ChainStep("Step1_em11", [el11]), ChainStep("Step2_em21", [el21]), ChainStep("Step3_em31", [el31])] ),
- makeChain(name='HLT_TestChain8_ev1_L1EM5', L1Thresholds=["EM5"], ChainSteps=[ ChainStep("Step1_em11", [el11]), ChainStep("Step2_em21", [el21]), ChainStep("Step3_em31", [el31]) ] ),
- makeChain(name='HLT_TestChain5_ev2_L1EM7', L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step1_em11", [el11]), ChainStep("Step2_em22", [el22]) ] ),
- makeChain(name='HLT_TestChain5_ev3_L1EM7', L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step1_em11", [el11]), ChainStep("Step2_em23", [el23]) ] ),
- makeChain(name='HLT_TestChain5_gv1_L1EM7', L1Thresholds=["EM7"], ChainSteps=[ ChainStep("Step1_gam11", [gamm11]) ] )
- ]
-
- HLTChains += ElChains
-
-
- # combined chain
- if doCombo:
- emptySeq1 = EmptyMenuSequence("step1EmptySeqence")
- emptySeq2 = EmptyMenuSequence("step2EmptySeqence")
-
- if not doElectron:
- from TrigUpgradeTest.HLTSignatureConfig import elMenuSequence
- el11 = elMenuSequence(step="1",reconame="v1", hyponame="v1")
- el21 = elMenuSequence(step="2",reconame="v1", hyponame="v1")
- el41 = elMenuSequence(step="4",reconame="v1", hyponame="v1")
-
- if not doMuon:
- from TrigUpgradeTest.HLTSignatureConfig import muMenuSequence
- #step1
- mu11 = muMenuSequence(step="1",reconame="v1", hyponame="v1")
- mu12 = muMenuSequence(step="1",reconame="v2", hyponame="v2")
- #step2
- mu21 = muMenuSequence(step="2",reconame="v1", hyponame="v1")
- mu22 = muMenuSequence(step="2",reconame="v2", hyponame="v2")
- #step3
- mu31 = muMenuSequence(step="3",reconame="v1", hyponame="v1")
- mu32 = muMenuSequence(step="3",reconame="v2", hyponame="v2")
- #step4
- mu41 = muMenuSequence(step="4",reconame="v1", hyponame="v1")
-
-
- from TrigUpgradeTest.HLTSignatureHypoTools import dimuDrComboHypoTool
-
- # multiplicity here indicates the number of objects to be combined:
- # for the chain dictionary, get the sum of the multiplicity in the multiplicy array
- # in symmetric chains, multiplicity=2 but only one sequence is used
-
- CombChains =[
- # This is an example of a chain running in "serial"
- makeChain(name='HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[
- ChainStep("Step1_mu_em_serial", [mu11, emptySeq1], multiplicity=[1,1]),
- ChainStep("Step2_mu_em_serial", [emptySeq2, el21], multiplicity=[1,1]),
- ChainStep("Step3_mu_em_serial", multiplicity=[]),
- ChainStep("Step4_mu_em_serial", [mu41, el41], multiplicity=[1,1])] ),
-
- makeChain(name='HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5', L1Thresholds=["MU6","EM5"], ChainSteps=[
- ChainStep("Step1_mu2_em", [mu12, el11], multiplicity=[1,1]),
- ChainStep("Step2_mu_em", [mu21, el21], multiplicity=[1,1])] ),
-
- makeChain(name='HLT_TestChain5_ev1_TestChain8_ev1_L12EM3', L1Thresholds=["EM3","EM3"], ChainSteps=[ #norun
- ChainStep("Step1_2emAs", [el11, el11], multiplicity=[1,1]),
- ChainStep("Step2_2emAs", [el21, el21], multiplicity=[1,1]) ]),
-
- makeChain(name='HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6', L1Thresholds=["EM3","EM5","MU6"], ChainSteps=[
- ChainStep("Step1_2em_2mu", [el11,el11,mu11], multiplicity=[1,1,2]),
- ChainStep("Step2_2em_2mu", [el21,el21,mu21], multiplicity=[1,1,2]) ]),
-
- makeChain(name='HLT_2TestChain6_muv1_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
- ChainStep("Step1_2mu", [mu11], multiplicity=[2]),
- ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
-
- makeChain(name='HLT_TestChain6_muv1_TestChain10_muv1_L12MU6', L1Thresholds=["MU6", "MU6"], ChainSteps=[
- ChainStep("Step1_2muAs", [mu11,mu11], multiplicity=[1,1]),
- ChainStep("Step2_2muAs", [mu21,mu21], multiplicity=[1,1]) ]),
-
- makeChain(name='HLT_2TestChain6_muEmpty1_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
- ChainStep("Step1_2mu_empty", multiplicity=[]),#[2]
- ChainStep("Step2_2mu", [mu21], multiplicity=[2]) ]),
-
- makeChain(name='HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6', L1Thresholds=["MU6","EM5"], ChainSteps=[
- ChainStep("Step1_mu_em", [mu11, el11], multiplicity=[1,1], comboToolConfs=[dimuDrComboHypoTool]),
- ChainStep("Step2_mu_em", [mu21, el21], multiplicity=[1,1], comboToolConfs=[dimuDrComboHypoTool])] ),
-
- makeChain(name='HLT_2TestChain4_muv1dr_L12MU6', L1Thresholds=["MU6"], ChainSteps=[
- ChainStep("Step1_2mu", [mu11], multiplicity=[2], comboToolConfs=[dimuDrComboHypoTool]),
- ChainStep("Step2_2mu22", [mu22], multiplicity=[2]) ] ),
-
- # FSNOSEED not implemented in emulation
- # L1Thresholds=["MU6", "MU6"],
- makeChain(name='HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6', L1Thresholds=["MU6", "MU6"], ChainSteps=[
- ChainStep("Step1_2muAs_empty", multiplicity=[]),
- ChainStep("Step2_2muAs", [mu21, mu21], multiplicity=[1,1]) ])
-
-
- ]
-
-
- HLTChains += CombChains
-
-
-
-########################## L1 #################################################
-def generateL1Decoder():
-
- L1UnpackingSeq = parOR("L1UnpackingSeq")
-
- l1Decoder = L1Decoder( RoIBResult="", L1TriggerResult="" )
- l1Decoder.L1DecoderSummaryKey = "L1DecoderSummary"
- ctpUnpacker = CTPUnpackingEmulationTool( ForceEnableAllChains=False , InputFilename="ctp.dat" )
- l1Decoder.ctpUnpacker = ctpUnpacker
-
- ## hack to solve the PS crash:
- from L1Decoder.L1DecoderConf import PrescalingEmulationTool
- psEmulation = PrescalingEmulationTool()
- l1Decoder.prescaler = psEmulation
-
- from L1Decoder.L1DecoderConfig import mapThresholdToL1RoICollection, mapThresholdToL1DecisionCollection
-
- emUnpacker = RoIsUnpackingEmulationTool("EMRoIsUnpackingTool", InputFilename="l1emroi.dat", OutputTrigRoIs=mapThresholdToL1RoICollection("EM"), Decisions=mapThresholdToL1DecisionCollection("EM"), ThresholdPrefix="EM" )
-
- muUnpacker = RoIsUnpackingEmulationTool("MURoIsUnpackingTool", InputFilename="l1muroi.dat", OutputTrigRoIs=mapThresholdToL1RoICollection("MU"), Decisions=mapThresholdToL1DecisionCollection("MU"), ThresholdPrefix="MU" )
-
- l1Decoder.roiUnpackers = [emUnpacker, muUnpacker]
-
- L1UnpackingSeq += l1Decoder
- log.debug(L1UnpackingSeq)
-
- return l1Decoder
-
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py
deleted file mode 100644
index 749f814e09d9ede13138d30c9e9e848e650fb238..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuNewJOTest.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.Configurable import Configurable
-Configurable.configurableRun3Behavior=1
-
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
-from AthenaCommon.Constants import INFO, DEBUG, VERBOSE
-from AthenaCommon.Logging import logging
-from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
-from TrigUpgradeTest.TriggerHistSvcConfig import TriggerHistSvcConfig
-from MuonConfig.MuonCablingConfig import RPCCablingConfigCfg, TGCCablingConfigCfg
-from TrigConfigSvc.TrigConfigSvcConfig import TrigConfigSvcCfg
-from TriggerJobOpts.TriggerConfig import triggerSummaryCfg, triggerMonitoringCfg, \
- setupL1DecoderFromMenu, collectHypos, collectFilters
-from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig_newJO import generateDecisionTree
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, createStepView
-from AthenaCommon.CFElements import seqOR
-from RegionSelector.RegSelConfig import regSelCfg
-from TrigInDetConfig.TrigInDetConfig import TrigInDetCondConfig
-from TrigUpgradeTest.EmuStepProcessingConfig import generateL1DecoderAndChains
-
-log = logging.getLogger('EmuNewJOTest')
-
-flags.needFlagsCategory("Trigger")
-flags.Input.isMC = False
-flags.Input.Files= ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
-
-flags.Trigger.L1Decoder.forceEnableAllChains = True
-
-flags.lock()
-
-acc = ComponentAccumulator()
-acc.merge(ByteStreamReadCfg(flags))
-acc.merge(TriggerHistSvcConfig(flags))
-
-l1DecoderAlg, OrigHLTChains = generateL1DecoderAndChains()
-
-setupL1DecoderFromMenu( flags, l1DecoderAlg )
-
-l1DecoderAcc = ComponentAccumulator()
-l1DecoderAcc.merge( TGCCablingConfigCfg( flags ) )
-l1DecoderAcc.merge( RPCCablingConfigCfg( flags ) )
-l1DecoderAcc.merge( TrigConfigSvcCfg( flags ) )
-acc.merge(l1DecoderAcc)
-
-
-from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import DictFromChainName
-toChainDictTranslator = DictFromChainName()
-chainDicts = [toChainDictTranslator.getChainDict(chain.name) for chain in OrigHLTChains]
-
-
-## Set ca in all sequences to none
-changed_sequences = {}
-HLTChains = []
-
-# select only chains that work after the changes in defining the chains in the EmuStep:
-# problem arises when two chains share the same step, exclty the same object, as will happen in the final menu
-# since this function will be changed soon, I did not investigate more
-# for now, I just exclude some chains in the test
-excludeChainNames = ['HLT_mu10', 'HLT_mu20', 'HLT_mu6', 'HLT_mu8_1step', 'HLT_e8', 'HLT_e5_v3', 'HLT_mu8_e8']
-for chain in OrigHLTChains:
- if chain.name not in excludeChainNames:
- HLTChains.append(chain)
- log.info("Selected chain %s", chain.name)
-
-
-for chainIndex, chain in enumerate(HLTChains):
- for stepIndex, step in enumerate(chain.steps):
- for seqIndex, seq in enumerate(step.sequences):
-
-
- hypoAlg = seq.hypo.Alg.__class__(seq.hypo.Alg.name(), **seq.hypo.Alg.getValuedProperties())
-
- if seq.name in changed_sequences:
- hypoTool = changed_sequences[seq.name].hypoToolGen(chainDicts[chainIndex])
- hypoAlg.HypoTools = [hypoTool]
- continue
- else:
- conf = seq.hypoToolConf
- hypoTool = conf.hypoToolGen(chainDicts[chainIndex])
- hypoAlg.HypoTools = [hypoTool]
- changed_sequences[seq.name]=conf
-
-
- stepReco, stepView = createStepView(step.name)
-
- sequenceAcc = ComponentAccumulator()
- sequenceAcc.addSequence(stepView)
- sequenceAcc.addSequence(seq.sequence.Alg, parentName=stepReco.getName())
- sequenceAcc.addEventAlgo(hypoAlg, sequenceName=stepView.getName())
- seq.ca = sequenceAcc
- sequenceAcc.wasMerged()
-
- ms = MenuSequence( Sequence = seq.sequence.Alg,
- Maker = seq.maker.Alg,
- Hypo = hypoAlg,
- HypoToolGen = None,
- CA = sequenceAcc)
-
- step.sequences[seqIndex] = ms
-
-
-menuAcc = generateDecisionTree(HLTChains)
-
-HLTSteps = menuAcc.getSequence("HLTAllSteps")
-hypos = collectHypos(HLTSteps)
-filters = collectFilters(HLTSteps)
-
-summaryAcc, summaryAlg = triggerSummaryCfg(flags, hypos)
-acc.merge(summaryAcc)
-
-monitoringAcc, monitoringAlg = triggerMonitoringCfg( flags, hypos, filters, l1DecoderAlg )
-acc.merge( monitoringAcc )
-
-topSequenceName = "HLTTop"
-HLTTopSequence = seqOR(topSequenceName, [l1DecoderAlg, HLTSteps, summaryAlg, monitoringAlg])
-acc.addSequence(HLTTopSequence)
-
-acc.merge(menuAcc)
-acc.merge(regSelCfg(flags))
-acc.merge(TrigInDetCondConfig(flags))
-
-acc.printConfig()
-
-fname = "EmuNewJOTest.pkl"
-log.debug("Storing config in the config %s", fname)
-with open(fname, "wb") as p:
- acc.store( p, nEvents=4, useBootStrapFile=False, threaded=True )
- p.close()
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
deleted file mode 100644
index 7fdfa90796b57ac6c97171788110e6a745844e4b..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
+++ /dev/null
@@ -1,73 +0,0 @@
-###############################################################
-#
-# Job options file
-#
-# Based on AthExStoreGateExamples
-#
-#==============================================================
-
-#--------------------------------------------------------------
-# ATLAS default Application Configuration options
-#--------------------------------------------------------------
-from __future__ import print_function
-
-# input parameters:
-class opt:
- doMenu = False # use either menu or manual chain building
-
-
-
-from AthenaCommon.Logging import logging
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-from TrigUpgradeTest.EmuStepProcessingConfig import generateL1DecoderAndChainsManually, generateL1DecoderAndChainsByMenu
-from AthenaCommon.AlgSequence import AlgSequence
-from TriggerMenuMT.HLTMenuConfig.Menu.HLTMenuJSON import generateJSON
-
-# signatures
-# steps: sequential AND of 1=Filter 2=Processing
-# chainstep=single chain step
-# global step=joint for all chains
-# filters: one SeqFilter per step, per chain
-# inputMakers: one per each first RecoAlg in a step (so one per step), one input per chain that needs that step
-
-log = logging.getLogger('EmuStepProcessingTest.py')
-log.info('Setup options:')
-defaultOptions = [a for a in dir(opt) if not a.startswith('__')]
-for option in defaultOptions:
- if option in globals():
- setattr(opt, option, globals()[option])
- log.info(' %20s = %s' % (option, getattr(opt, option)))
- else:
- log.info(' %20s = (Default) %s' % (option, getattr(opt, option)))
-
-TriggerFlags.generateMenuDiagnostics=True
-
-topSequence = AlgSequence()
-
-if opt.doMenu is True:
- generateL1DecoderAndChainsByMenu(topSequence)
-else:
- generateL1DecoderAndChainsManually(topSequence)
-
-generateJSON()
-
-from TrigConfigSvc.TrigConfigSvcCfg import getHLTConfigSvc, getL1ConfigSvc
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr += getHLTConfigSvc()
-TriggerFlags.triggerMenuSetup = "LS2_v1"
-svcMgr += getL1ConfigSvc()
-
-from AthenaCommon.AppMgr import theApp, ServiceMgr as svcMgr
-from GaudiSvc.GaudiSvcConf import THistSvc
-svcMgr += THistSvc()
-if hasattr(svcMgr.THistSvc, "Output"):
- from TriggerJobOpts.HLTTriggerGetter import setTHistSvcOutput
- setTHistSvcOutput(svcMgr.THistSvc.Output)
-
-print ("EmuStepProcessing: dump top Sequence after CF/DF Tree build")
-from AthenaCommon.AlgSequence import dumpSequence
-dumpSequence( topSequence )
-#dumpMasterSequence()
-
-theApp.EvtMax = 4
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
deleted file mode 100644
index 55540059ec5ab585a325a341882af25f263534bd..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-#
-
-doWriteRDOTrigger = False
-doWriteBS = False
-include("TriggerJobOpts/runHLT_standalone.py")
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# ----------------------------------------------------------------
-# Setup Views
-# ----------------------------------------------------------------
-from AthenaCommon.AlgSequence import AthSequencer
-viewSeq = AthSequencer("AthViewSeq", Sequential=True, ModeOR=False, StopOverride=False)
-topSequence += viewSeq
-
-from L1Decoder.L1DecoderConfig import mapThresholdToL1RoICollection, mapThresholdToL1DecisionCollection
-roiCollectionName = mapThresholdToL1RoICollection("EM")
-
-# View maker alg
-viewNodeName = "allViewAlgorithms"
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
-from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
-
-inputMakerAlg = EventViewCreatorAlgorithm("viewMaker")
-inputMakerAlg.ViewFallThrough = True
-inputMakerAlg.RoIsLink = roiCollectionName
-inputMakerAlg.InViewRoIs = "EMViewRoIs"
-inputMakerAlg.Views = "testView"
-inputMakerAlg.RoITool = ViewCreatorInitialROITool()
-inputMakerAlg.InputMakerInputDecisions = [ mapThresholdToL1DecisionCollection("EM") ]
-inputMakerAlg.ViewNodeName = viewNodeName
-inputMakerAlg.InputMakerOutputDecisions = 'DUMMYOUTDEC'
-viewSeq += inputMakerAlg
-
-# Set of view algs
-allViewAlgorithms = AthSequencer(viewNodeName, Sequential=False, ModeOR=False, StopOverride=False)
-
-
-if TriggerFlags.doID:
-
- from TrigInDetConfig.InDetSetup import makeInDetAlgs
-
- viewAlgs = makeInDetAlgs("FS", rois= roiCollectionName)
-
- for viewAlg in viewAlgs:
- allViewAlgorithms += viewAlg
-
-
- #Adding vertexing
- from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
- # TODO need to change the name of the output vertex collection to something recordable
- # what is this actually testing ? why do we have FS tracks with egamma and aprimary vertex ???
- vtxAlgs = makeVertices( "bjet", "HLT_IDTrack_FS_FTF", "HLT_IDVertex_FS" )
- allViewAlgorithms += vtxAlgs
-
-
- from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking
- #Adding precision tracking
- PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "bjet", inputFTFtracks="TrigFastTrackFinder_Tracks_Bjet" )
-
- allViewAlgorithms += PTAlgs
-
- #Testing BeamSpotAlg in Run3 configuration
- prefixName = "InDetTrigMT"
- from TrigVertexFitter.TrigVertexFitterConf import TrigPrimaryVertexFitter
- primaryVertexFitter = TrigPrimaryVertexFitter( name = prefixName + "VertexFitter",
- zVariance=3.0,
- CreateTrackLists=True )
-
- #Can it be added to the service when we need to make it private?
- ToolSvc += primaryVertexFitter
-
- from TrigT2BeamSpot.T2VertexBeamSpotMonitoring import T2VertexBeamSpotAlgMonitoring, T2VertexBeamSpotToolMonitoring
- alg = T2VertexBeamSpotAlgMonitoring()
- toolMon = T2VertexBeamSpotToolMonitoring()
-
- from TrigT2BeamSpot.TrigT2BeamSpotConf import PESA__T2VertexBeamSpotTool
- InDetTrigMTBeamSpotTool = PESA__T2VertexBeamSpotTool( name = "TestBeamSpotTool",
- OutputLevel = INFO,
- MonTool = toolMon,
- nSplitVertices = 1, # Turn on (>1) or off vertex splitting
- ReclusterSplit = False, # Recluster split track collections before vertex fitting
- WeightClusterZ = True, # Use the track Z0 weighted cluster Z position as seed
-
- TotalNTrackMin = 4, # Minimum number of tracks required in an event
- TrackMinPt = 0.5, # Minimum track pT to be considered for vertexing
- TrackSeedPt = 0.7, # Minimum track pT to be considered for seeding a vertex fit
- TrackClusterDZ = 0.35, # Maximum distance between tracks considered as a cluster
- TrackMaxZ0 = 200.0, # Maximum track Z0 to be considered for vertexing
- TrackMaxD0 = 10.0, # Maximum track d0 to be considered for vertexing
- TrackMaxZ0err = 5.0, # Maximum track Z0 error to be considered for vertexing
- TrackMaxD0err = 5.0, # Maximum track d0 error to be considered for vertexing
- TrackMinNDF = 2.0, # Minimum track NDF to be considered for vertexing
- TrackMinQual = 0.0, # Minimum track chi^2/NDF to be considered for vertexing
- TrackMaxQual = 10.0, # Maximum track chi^2/NDF to be considered for vertexing
- TrackMinChi2Prob = -10.0, # Minimum track cumulative chi2 probability, from CLHEP/GenericFunctions/CumulativeChiSquare.hh
- TrackMinSiHits = 7, # Minimum # track silicon (PIX + SCT) hits to be considered for vertexing
- TrackMinPIXHits = 0, # Minimum # track silicon (PIX + SCT) hits to be considered for vertexing
- TrackMinSCTHits = 0, # Minimum # track silicon (PIX + SCT) hits to be considered for vertexing
- TrackMinTRTHits = -10, # Minimum # track TRT hits to be considered for vertexing
-
- VertexMinNTrk = 2, # Minimum # tracks in a cluster to be considered for vertexing
- VertexMaxNTrk = 100, # Maximum # tracks in a cluster to be considered for vertexing (saves on time!)
- VertexMaxXerr = 1., # Maximum resulting X error on vertex fit for "good" vertices
- VertexMaxYerr = 1., # Maximum resulting Y error on vertex fit for "good" vertices
- VertexMaxZerr = 10., # Maximum resulting Z error on vertex fit for "good" vertices
- VertexMinQual = 0.0, # Minimum resulting chi^2/NDF on vertex fit for "good" vertices
- VertexMaxQual = 100.0, # Maximum resulting chi^2/NDF on vertex fit for "good" vertices
- VertexMinChi2Prob = -10.0, # Minimum cumulative chi2 probability, from CLHEP/GenericFunctions/CumulativeChiSquare.hh
- VertexBCIDMinNTrk = 10, # Minimum # tracks in a vertex to be used for per-BCID monitoring
- PrimaryVertexFitter = primaryVertexFitter )
-
- ToolSvc += InDetTrigMTBeamSpotTool
-
-
-
-#Testing base default class
- from TrigT2BeamSpot.TrigT2BeamSpotConf import PESA__T2VertexBeamSpot
- InDetTrigMTBeamSpotAlg = PESA__T2VertexBeamSpot( name = "TestBeamSpotAlg",
- OutputLevel =INFO,
- MonTool = alg,
- vertexCollName = "TrigBeamSpotVertex", # Output vertex collection Name
- TrackCollections = [ PTTracks[-1] ], #For now using PT tracks as a test but FTF should be enough
- BeamSpotTool = InDetTrigMTBeamSpotTool )
-
-
-
- allViewAlgorithms += InDetTrigMTBeamSpotAlg
-
- from TrigT2MinBias.TrigT2MinBiasConf import MbtsFexMT
- alg=MbtsFexMT()
- allViewAlgorithms += alg
-
-
- if TriggerFlags.doCalo:
- from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
- algo=T2CaloEgamma_ReFastAlgo("testFastAlgo")
- algo.RoIs="EMViewRoIs"
- allViewAlgorithms += algo
- viewSeq += allViewAlgorithms
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_newjo.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_newjo.ref
deleted file mode 100644
index e28a48c19ca7896c7d3c44e42ebaf56cda348906..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_newjo.ref
+++ /dev/null
@@ -1,12 +0,0 @@
-TrigSignatureMo... INFO HLT_e5_e8 2 2 0 0 0 0 0
-TrigSignatureMo... INFO HLT_e5_e8 decisions 0 0 0 0
-TrigSignatureMo... INFO HLT_mu10 2 2 0 0 0 0 0
-TrigSignatureMo... INFO HLT_mu10 decisions 0 0 0 0
-TrigSignatureMo... INFO HLT_mu20 1 1 0 0 0 0 0
-TrigSignatureMo... INFO HLT_mu20 decisions 0 0 0 0
-TrigSignatureMo... INFO HLT_mu6 1 1 0 0 0 0 0
-TrigSignatureMo... INFO HLT_mu6 decisions 0 0 0 0
-TrigSignatureMo... INFO HLT_mu8 2 2 0 0 0 0 0
-TrigSignatureMo... INFO HLT_mu8 decisions 0 0 0 0
-TrigSignatureMo... INFO HLT_mu8_1step 2 2 0 0 0 0 0
-TrigSignatureMo... INFO HLT_mu8_1step decisions 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref
deleted file mode 100644
index 1f92fac7f8d3341b799da6ac8520b8510bbe7591..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_menu_processing.ref
+++ /dev/null
@@ -1,148 +0,0 @@
-TriggerSummaryStep1 1 0 DEBUG In summary 4 chains passed:
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain5_ev3_L1EM7 ID#2336588294
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain5_gv1_L1EM7 ID#3893303900
-TriggerSummaryStep2 1 0 DEBUG In summary 3 chains passed:
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain5_ev3_L1EM7 ID#2336588294
-TriggerSummaryStep3 1 0 DEBUG In summary 2 chains passed:
-TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG In summary 19 chains passed:
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3196402061
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain10_muv2_L1MU10 ID#3482819675
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1step_L1MU6 ID#3588359947
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3844733695
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep2 2 0 DEBUG In summary 15 chains passed:
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2764921170
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep3 2 0 DEBUG In summary 10 chains passed:
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep3 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
-TriggerSummaryStep3 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep3 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep3 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep4 2 0 DEBUG In summary 5 chains passed:
-TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep4 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep4 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
-TriggerSummaryStep4 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep1 3 0 DEBUG In summary 8 chains passed:
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
-TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep1 3 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain8_muv1step_L1MU6 ID#3588359947
-TriggerSummaryStep1 3 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep2 3 0 DEBUG In summary 6 chains passed:
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
-TriggerSummaryStep2 3 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep2 3 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep3 3 0 DEBUG In summary 6 chains passed:
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
-TriggerSummaryStep3 3 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep3 3 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep4 3 0 DEBUG In summary 2 chains passed:
-TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
-TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TrigSignatureMoniMT INFO HLT_2TestChain4_muv1dr_L12MU6 #3176095517
-TrigSignatureMoniMT INFO -- #3176095517 Events 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3176095517 Features 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty1_L12MU6 #2176116418
-TrigSignatureMoniMT INFO -- #2176116418 Events 1 1 0 1 - - 1
-TrigSignatureMoniMT INFO -- #2176116418 Features 0 6 - -
-TrigSignatureMoniMT INFO HLT_2TestChain6_muv1_L12MU6 #1408409992
-TrigSignatureMoniMT INFO -- #1408409992 Events 2 2 1 1 1 1 1
-TrigSignatureMoniMT INFO -- #1408409992 Features 6 6 6 6
-TrigSignatureMoniMT INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170
-TrigSignatureMoniMT INFO -- #2764921170 Events 1 1 0 1 - - 1
-TrigSignatureMoniMT INFO -- #2764921170 Features 0 3 - -
-TrigSignatureMoniMT INFO HLT_TestChain10_muv2_L1MU10 #3482819675
-TrigSignatureMoniMT INFO -- #3482819675 Events 2 2 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #3482819675 Features 1 0 0 -
-TrigSignatureMoniMT INFO HLT_TestChain20_muv1_L1MU10 #356594709
-TrigSignatureMoniMT INFO -- #356594709 Events 1 1 1 1 1 1 1
-TrigSignatureMoniMT INFO -- #356594709 Features 1 1 1 1
-TrigSignatureMoniMT INFO HLT_TestChain5_ev1_L1EM3 #1756953305
-TrigSignatureMoniMT INFO -- #1756953305 Events 3 3 2 2 2 - 2
-TrigSignatureMoniMT INFO -- #1756953305 Features 4 4 4 -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009
-TrigSignatureMoniMT INFO -- #2709794009 Events 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2709794009 Features 0 0 0 -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev2_L1EM7 #1760405581
-TrigSignatureMoniMT INFO -- #1760405581 Events 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1760405581 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev3_L1EM7 #2336588294
-TrigSignatureMoniMT INFO -- #2336588294 Events 1 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #2336588294 Features 2 2 - -
-TrigSignatureMoniMT INFO HLT_TestChain5_gv1_L1EM7 #3893303900
-TrigSignatureMoniMT INFO -- #3893303900 Events 1 1 1 - - - 1
-TrigSignatureMoniMT INFO -- #3893303900 Features 2 - - -
-TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty2_L1MU6 #2511524900
-TrigSignatureMoniMT INFO -- #2511524900 Events 1 1 1 0 1 1 1
-TrigSignatureMoniMT INFO -- #2511524900 Features 3 0 3 3
-TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772
-TrigSignatureMoniMT INFO -- #64374772 Events 2 2 1 1 1 1 1
-TrigSignatureMoniMT INFO -- #64374772 Features 3 3 3 3
-TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061
-TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #3196402061 Features 3 0 0 0
-TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L1MU6_EM5 #1237112870
-TrigSignatureMoniMT INFO -- #1237112870 Events 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #1237112870 Features 0 0 0 0
-TrigSignatureMoniMT INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373
-TrigSignatureMoniMT INFO -- #3476793373 Events 2 2 2 2 2 - 2
-TrigSignatureMoniMT INFO -- #3476793373 Features 4 4 4 -
-TrigSignatureMoniMT INFO HLT_TestChain8_ev1_L1EM5 #1677577445
-TrigSignatureMoniMT INFO -- #1677577445 Events 4 4 3 3 3 - 3
-TrigSignatureMoniMT INFO -- #1677577445 Features 4 4 4 -
-TrigSignatureMoniMT INFO HLT_TestChain8_muv1_L1MU10 #2288364952
-TrigSignatureMoniMT INFO -- #2288364952 Events 2 2 2 1 1 1 1
-TrigSignatureMoniMT INFO -- #2288364952 Features 2 1 1 1
-TrigSignatureMoniMT INFO HLT_TestChain8_muv1step_L1MU6 #3588359947
-TrigSignatureMoniMT INFO -- #3588359947 Events 2 2 2 - - - 2
-TrigSignatureMoniMT INFO -- #3588359947 Features 3 - - -
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
deleted file mode 100644
index a81860b7412a01ba01f9c6c032debb3f98c34321..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/emu_step_processing.ref
+++ /dev/null
@@ -1,152 +0,0 @@
-TriggerSummaryStep1 1 0 DEBUG In summary 4 chains passed:
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain5_ev3_L1EM7 ID#2336588294
-TriggerSummaryStep1 1 0 DEBUG +++ HLT_TestChain5_gv1_L1EM7 ID#3893303900
-TriggerSummaryStep2 1 0 DEBUG In summary 3 chains passed:
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep2 1 0 DEBUG +++ HLT_TestChain5_ev3_L1EM7 ID#2336588294
-TriggerSummaryStep3 1 0 DEBUG In summary 2 chains passed:
-TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep3 1 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG In summary 23 chains passed:
-TriggerSummaryStep1 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#56278684
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#133619581
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#1820214917
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#3037831603
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3196402061
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain10_muv2_L1MU10 ID#3482819675
-TriggerSummaryStep1 2 0 DEBUG +++ HLT_TestChain8_muv1step_L1MU6 ID#3588359947
-TriggerSummaryStep1 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#3844733695
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
-TriggerSummaryStep1 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep2 2 0 DEBUG In summary 19 chains passed:
-TriggerSummaryStep2 2 0 DEBUG +++ leg002_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#56278684
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#133619581
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muv1_L12MU6 ID#1408409992
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 ID#1790520567
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#1820214917
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_2TestChain6_muEmpty1_L12MU6 ID#2176116418
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep2 2 0 DEBUG +++ leg001_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2599553377
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#2764921170
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 ID#3037831603
-TriggerSummaryStep2 2 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 ID#4097287954
-TriggerSummaryStep2 2 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep3 2 0 DEBUG In summary 5 chains passed:
-TriggerSummaryStep3 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain5_ev1_L1EM3 ID#1756953305
-TriggerSummaryStep3 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep3 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep4 2 0 DEBUG In summary 4 chains passed:
-TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep4 2 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep4 2 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep4 2 0 DEBUG +++ HLT_TestChain6_muEmpty2_L1MU6 ID#2511524900
-TriggerSummaryStep1 3 0 DEBUG In summary 10 chains passed:
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#64374772
-TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#122300819
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
-TriggerSummaryStep1 3 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep1 3 0 DEBUG +++ leg000_HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 ID#1827802456
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep1 3 0 DEBUG +++ HLT_TestChain8_muv1step_L1MU6 ID#3588359947
-TriggerSummaryStep1 3 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep2 3 0 DEBUG In summary 6 chains passed:
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
-TriggerSummaryStep2 3 0 DEBUG +++ leg001_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#1546253468
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TriggerSummaryStep2 3 0 DEBUG +++ HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#3476793373
-TriggerSummaryStep2 3 0 DEBUG +++ leg000_HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 ID#4283304400
-TriggerSummaryStep3 3 0 DEBUG In summary 3 chains passed:
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain8_ev1_L1EM5 ID#1677577445
-TriggerSummaryStep3 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TriggerSummaryStep4 3 0 DEBUG In summary 2 chains passed:
-TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain20_muv1_L1MU10 ID#356594709
-TriggerSummaryStep4 3 0 DEBUG +++ HLT_TestChain8_muv1_L1MU10 ID#2288364952
-TrigSignatureMoniMT INFO HLT_2TestChain4_muv1dr_L12MU6 #3176095517
-TrigSignatureMoniMT INFO -- #3176095517 Events 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3176095517 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_2TestChain6_muEmpty1_L12MU6 #2176116418
-TrigSignatureMoniMT INFO -- #2176116418 Events 1 1 0 1 - - 1
-TrigSignatureMoniMT INFO -- #2176116418 Features 0 6 - -
-TrigSignatureMoniMT INFO HLT_2TestChain6_muv1_L12MU6 #1408409992
-TrigSignatureMoniMT INFO -- #1408409992 Events 2 2 1 1 - - 1
-TrigSignatureMoniMT INFO -- #1408409992 Features 6 6 - -
-TrigSignatureMoniMT INFO HLT_TestChain10_muEmpty1_TestChain6_muEmpty1_L12MU6 #2764921170
-TrigSignatureMoniMT INFO -- #2764921170 Events 1 1 0 1 - - 1
-TrigSignatureMoniMT INFO -- #2764921170 Features 0 3 - -
-TrigSignatureMoniMT INFO HLT_TestChain10_muv2_L1MU10 #3482819675
-TrigSignatureMoniMT INFO -- #3482819675 Events 2 2 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #3482819675 Features 1 0 0 -
-TrigSignatureMoniMT INFO HLT_TestChain20_muv1_L1MU10 #356594709
-TrigSignatureMoniMT INFO -- #356594709 Events 1 1 1 1 1 1 1
-TrigSignatureMoniMT INFO -- #356594709 Features 1 1 1 1
-TrigSignatureMoniMT INFO HLT_TestChain5_ev1_L1EM3 #1756953305
-TrigSignatureMoniMT INFO -- #1756953305 Events 3 3 2 2 2 - 2
-TrigSignatureMoniMT INFO -- #1756953305 Features 4 4 4 -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_2TestChain6_muv1_L1EM3_L1EM5_L12MU6 #1820214917
-TrigSignatureMoniMT INFO -- #1820214917 Events 1 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #1820214917 Features 2 2 - -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev1_TestChain8_ev1_L12EM3 #2709794009
-TrigSignatureMoniMT INFO -- #2709794009 Events 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2709794009 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev2_L1EM7 #1760405581
-TrigSignatureMoniMT INFO -- #1760405581 Events 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1760405581 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_TestChain5_ev3_L1EM7 #2336588294
-TrigSignatureMoniMT INFO -- #2336588294 Events 1 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #2336588294 Features 2 2 - -
-TrigSignatureMoniMT INFO HLT_TestChain5_gv1_L1EM7 #3893303900
-TrigSignatureMoniMT INFO -- #3893303900 Events 1 1 1 - - - 1
-TrigSignatureMoniMT INFO -- #3893303900 Features 2 - - -
-TrigSignatureMoniMT INFO HLT_TestChain6_muEmpty2_L1MU6 #2511524900
-TrigSignatureMoniMT INFO -- #2511524900 Events 1 1 1 0 1 1 1
-TrigSignatureMoniMT INFO -- #2511524900 Features 3 0 3 3
-TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_ev1_L1MU6_EM5 #64374772
-TrigSignatureMoniMT INFO -- #64374772 Events 2 2 2 1 0 1 1
-TrigSignatureMoniMT INFO -- #64374772 Features 4 3 0 3
-TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain10_muv1_L12MU6 #3196402061
-TrigSignatureMoniMT INFO -- #3196402061 Events 2 2 1 0 - - 0
-TrigSignatureMoniMT INFO -- #3196402061 Features 3 0 - -
-TrigSignatureMoniMT INFO HLT_TestChain6_muv1_TestChain5_ev1dr_L12MU6 #3205587050
-TrigSignatureMoniMT INFO -- #3205587050 Events 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3205587050 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_TestChain6_muv2_TestChain8_ev2_L1MU6_EM5 #3476793373
-TrigSignatureMoniMT INFO -- #3476793373 Events 2 2 2 2 - - 2
-TrigSignatureMoniMT INFO -- #3476793373 Features 4 4 - -
-TrigSignatureMoniMT INFO HLT_TestChain8_ev1_L1EM5 #1677577445
-TrigSignatureMoniMT INFO -- #1677577445 Events 4 4 3 3 3 - 3
-TrigSignatureMoniMT INFO -- #1677577445 Features 4 4 4 -
-TrigSignatureMoniMT INFO HLT_TestChain8_muv1_L1MU10 #2288364952
-TrigSignatureMoniMT INFO -- #2288364952 Events 2 2 2 1 1 1 1
-TrigSignatureMoniMT INFO -- #2288364952 Features 2 1 1 1
-TrigSignatureMoniMT INFO HLT_TestChain8_muv1step_L1MU6 #3588359947
-TrigSignatureMoniMT INFO -- #3588359947 Events 2 2 2 - - - 2
-TrigSignatureMoniMT INFO -- #3588359947 Features 3 - - -
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf_build.ref
deleted file mode 100644
index 16c0e9822e25c0ba7c9dd6a6b0a43e1d9d3d64a2..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf_build.ref
+++ /dev/null
@@ -1,129 +0,0 @@
-TrigSignatureMoniMT INFO Sequence ElectronFastCaloStep (step ) used at step 1 in chain HLT_e3_etcut1step_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronFastCaloStep (step ) used at step 1 in chain HLT_e3_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronFastTrackStep (step ) used at step 2 in chain HLT_e3_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronPrecisionCaloStep (step ) used at step 3 in chain HLT_e3_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronFastCaloStep (step ) used at step 1 in chain HLT_e5_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronFastTrackStep (step ) used at step 2 in chain HLT_e5_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronPrecisionCaloStep (step ) used at step 3 in chain HLT_e5_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronFastCaloStep (step ) used at step 1 in chain HLT_e7_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronFastTrackStep (step ) used at step 2 in chain HLT_e7_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence ElectronPrecisionCaloStep (step ) used at step 3 in chain HLT_e7_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence PhotonFastCaloStep (step ) used at step 1 in chain HLT_g5_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence precisionCaloPhotonStep (step ) used at step 3 in chain HLT_g5_etcut_L1EM3
-TrigSignatureMoniMT INFO Sequence Step1_2muComb_asym (step Step1) used at step 2 in chain HLT_mu6_mu4_L12MU4
-TrigSignatureMoniMT INFO Sequence Step_FSmuEFSA (step ) used at step 1 in chain HLT_mu6noL1_L1MU6
-TrigSignatureMoniMT INFO Sequence Step_FSmuEFCB (step ) used at step 2 in chain HLT_mu6noL1_L1MU6
-TrigSignatureMoniMT INFO Sequence Step_jet_a4_tc_em (step ) used at step 1 in chain HLT_j45_L1J20
-TrigSignatureMoniMT INFO Sequence Step_jet_a4_tc_em (step ) used at step 1 in chain HLT_j85_L1J20
-TrigSignatureMoniMT INFO Sequence Step_jet_a4_tc_em (step ) used at step 1 in chain HLT_j420_L1J20
-TrigSignatureMoniMT INFO Sequence Step_jet_a4_tc_em (step ) used at step 1 in chain HLT_j260_320eta490_L1J20
-TrigSignatureMoniMT INFO Sequence Step_jet_a4_tc_em (step ) used at step 1 in chain HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20
-TrigSignatureMoniMT INFO Sequence Step_jet_a10_subjes_tc_lcw (step ) used at step 1 in chain HLT_j460_a10_lcw_subjes_L1J20
-TrigSignatureMoniMT INFO Sequence Step_jet_a10r (step ) used at step 1 in chain HLT_j460_a10r_L1J20
-TrigSignatureMoniMT INFO Sequence Step_jet_a4_tc_em (step ) used at step 1 in chain HLT_3j200_L1J20
-TrigSignatureMoniMT INFO Sequence Step_jet_a4_tc_em (step ) used at step 1 in chain HLT_5j70_0eta240_L1J20
-TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 #3163510355
-TrigSignatureMoniMT INFO -- #3163510355 Events 20 20 1 1 0 0 0
-TrigSignatureMoniMT INFO -- #3163510355 Features 4 2 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 #1730084172
-TrigSignatureMoniMT INFO -- #1730084172 Events 20 20 1 1 0 0 0
-TrigSignatureMoniMT INFO -- #1730084172 Features 4 2 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 #4276347155
-TrigSignatureMoniMT INFO -- #4276347155 Events 20 20 1 1 0 0 0
-TrigSignatureMoniMT INFO -- #4276347155 Features 4 2 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 #4008168535
-TrigSignatureMoniMT INFO -- #4008168535 Events 20 20 1 1 0 0 0
-TrigSignatureMoniMT INFO -- #4008168535 Features 4 2 0 0
-TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508
-TrigSignatureMoniMT INFO -- #2046267508 Events 20 20 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 - -
-TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 #1924924067
-TrigSignatureMoniMT INFO -- #1924924067 Events 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #1924924067 Features 0 0 0 0
-TrigSignatureMoniMT INFO HLT_3j200_L1J20 #493765146
-TrigSignatureMoniMT INFO -- #493765146 Events 20 20 0 - - - 0
-TrigSignatureMoniMT INFO -- #493765146 Features 0 - - -
-TrigSignatureMoniMT INFO HLT_5j70_0eta240_L1J20 #4050408395
-TrigSignatureMoniMT INFO -- #4050408395 Events 20 20 0 - - - 0
-TrigSignatureMoniMT INFO -- #4050408395 Features 0 - - -
-TrigSignatureMoniMT INFO HLT_e3_etcut1step_L1EM3 #999988353
-TrigSignatureMoniMT INFO -- #999988353 Events 20 20 13 - - - 13
-TrigSignatureMoniMT INFO -- #999988353 Features 27 - - -
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
-TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - 14
-TrigSignatureMoniMT INFO -- #683953566 Features 48 156 87 -
-TrigSignatureMoniMT INFO HLT_e3_etcut_mu6_L1EM8I_MU10 #3997258299
-TrigSignatureMoniMT INFO -- #3997258299 Events 20 20 0 - - - 0
-TrigSignatureMoniMT INFO -- #3997258299 Features 0 - - -
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - 13
-TrigSignatureMoniMT INFO -- #324908483 Features 41 141 47 -
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - 11
-TrigSignatureMoniMT INFO -- #1959043579 Features 26 90 20 -
-TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 #471243435
-TrigSignatureMoniMT INFO -- #471243435 Events 20 20 13 13 13 - 13
-TrigSignatureMoniMT INFO -- #471243435 Features 41 41 50 -
-TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
-TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 2 - - - 2
-TrigSignatureMoniMT INFO -- #4034799151 Features 34 - - -
-TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
-TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 - - - 0
-TrigSignatureMoniMT INFO -- #3084792704 Features 0 - - -
-TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
-TrigSignatureMoniMT INFO -- #2205518067 Events 20 20 0 - - - 0
-TrigSignatureMoniMT INFO -- #2205518067 Features 0 - - -
-TrigSignatureMoniMT INFO HLT_j45_L1J20 #1247336154
-TrigSignatureMoniMT INFO -- #1247336154 Events 20 20 5 - - - 5
-TrigSignatureMoniMT INFO -- #1247336154 Features 5 - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20 #4088855158
-TrigSignatureMoniMT INFO -- #4088855158 Events 20 20 5 5 - - 5
-TrigSignatureMoniMT INFO -- #4088855158 Features 5 5 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
-TrigSignatureMoniMT INFO -- #991419339 Events 20 20 5 5 - - 5
-TrigSignatureMoniMT INFO -- #991419339 Features 5 5 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 #1961149049
-TrigSignatureMoniMT INFO -- #1961149049 Events 20 20 5 5 - - 5
-TrigSignatureMoniMT INFO -- #1961149049 Features 5 5 - -
-TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 #215408633
-TrigSignatureMoniMT INFO -- #215408633 Events 20 20 0 - - - 0
-TrigSignatureMoniMT INFO -- #215408633 Features 0 - - -
-TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
-TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 - - - 0
-TrigSignatureMoniMT INFO -- #3875082669 Features 0 - - -
-TrigSignatureMoniMT INFO HLT_j85_L1J20 #510475538
-TrigSignatureMoniMT INFO -- #510475538 Events 20 20 3 - - - 3
-TrigSignatureMoniMT INFO -- #510475538 Features 3 - - -
-TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526
-TrigSignatureMoniMT INFO -- #2083734526 Events 20 20 1 1 1 - 1
-TrigSignatureMoniMT INFO -- #2083734526 Features 1 1 1 -
-TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590
-TrigSignatureMoniMT INFO -- #996392590 Events 20 20 1 1 - - 1
-TrigSignatureMoniMT INFO -- #996392590 Features 1 1 - -
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 1 1 0 0 0
-TrigSignatureMoniMT INFO -- #2560542253 Features 1 1 0 0
-TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
-TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 1 0 - - 0
-TrigSignatureMoniMT INFO -- #1713982776 Features 2 0 - -
-TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
-TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 1 - - - 1
-TrigSignatureMoniMT INFO -- #3518031697 Features 1 - - -
-TrigSignatureMoniMT INFO HLT_mu6msonly_L1MU6 #2316111217
-TrigSignatureMoniMT INFO -- #2316111217 Events 20 20 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #2316111217 Features 1 0 0 -
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 #1631468602
-TrigSignatureMoniMT INFO -- #1631468602 Events 20 20 1 0 - - 0
-TrigSignatureMoniMT INFO -- #1631468602 Features 1 0 - -
-TrigSignatureMoniMT INFO HLT_xe30_L1XE10 #347649004
-TrigSignatureMoniMT INFO -- #347649004 Events 20 20 3 - - - 3
-TrigSignatureMoniMT INFO -- #347649004 Features 3 - - -
-TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 #3768353779
-TrigSignatureMoniMT INFO -- #3768353779 Events 20 20 2 - - - 2
-TrigSignatureMoniMT INFO -- #3768353779 Features 2 - - -
-TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
-TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 2 - - - 2
-TrigSignatureMoniMT INFO -- #1583719916 Features 2 - - -
-TrigSignatureMoniMT INFO HLT_xe65_L1XE50 #1283272884
-TrigSignatureMoniMT INFO -- #1283272884 Events 20 20 0 - - - 0
-TrigSignatureMoniMT INFO -- #1283272884 Features 0 - - -
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf_configOnly.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf_configOnly.ref
deleted file mode 100644
index 6596c67af4d31062c79fa2db644fb510c767aa67..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf_configOnly.ref
+++ /dev/null
@@ -1 +0,0 @@
-Py:Athena INFO configuration complete, now exiting ...
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx
deleted file mode 100644
index 4c73f25453729d263b8b9797a785fd25860129b3..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.cxx
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-#include "TrigCompositeUtils/HLTIdentifier.h"
-#include "TestComboHypoAlg.h"
-
-
-
-namespace HLTTest {
-
- TestComboHypoAlg::TestComboHypoAlg( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::AthReentrantAlgorithm( name, pSvcLocator ) {
- declareProperty( "Property1", m_property1 );
- declareProperty( "Property2", m_property2 );
- declareProperty( "Threshold1", m_threshold1 = 0);
- declareProperty( "Threshold2", m_threshold2 = 0);
- declareProperty( "DecisionLabel", m_decisionLabel );
- }
-
- TestComboHypoAlg::~TestComboHypoAlg() {}
-
- StatusCode TestComboHypoAlg::initialize() {
- ATH_MSG_INFO ("Initializing " << name() << "...");
- CHECK( m_recoInput1.initialize() );
- CHECK( m_recoInput2.initialize() );
- CHECK( m_output1.initialize() );
- CHECK( m_output2.initialize() );
- CHECK( m_previousDecisions1.initialize() );
- renounce(m_previousDecisions1);
- CHECK( m_previousDecisions2.initialize() );
- renounce(m_previousDecisions2);
-
- CHECK( not m_chainsProperty.empty() );
-
- for ( const std::string& el: m_chainsProperty )
- m_chains.insert( HLT::Identifier( el ).numeric() );
-
- for ( const HLT::Identifier& id: m_chains )
- ATH_MSG_DEBUG( "Configured to require chain " << id );
-
- return StatusCode::SUCCESS;
- }
-
- StatusCode TestComboHypoAlg::finalize() {
- ATH_MSG_INFO ("Finalizing " << name() << "...");
-
- return StatusCode::SUCCESS;
- }
-
- bool TestComboHypoAlg::passed( const Decision* d1, const Decision* d2 ) const {
- {
- auto featureInfo = TrigCompositeUtils::findLink<xAOD::TrigCompositeContainer>( d1, "feature" );
- auto feature1 = featureInfo.link;
-
- if ( not feature1.isValid() ) {
- ATH_MSG_ERROR( "Can not find reference to the object from the decision1" );
- return false;
- }
- if ( (*feature1)->hasDetail<float>(m_property1 ) ){
- float v = (*feature1)->getDetail<float>( m_property1 );
- ATH_MSG_DEBUG("Prop1="<<v);
- if ( v < m_threshold1 )
- return false;
- }
- else ATH_MSG_ERROR( "Cannot find detail "<<m_property1<<" in feature1");
- }
-
- {
- auto featureInfo = TrigCompositeUtils::findLink<xAOD::TrigCompositeContainer>( d2, "feature" );
- auto feature2 = featureInfo.link;
-
- if ( not feature2.isValid() ) {
- ATH_MSG_ERROR( "Can not find reference to the object from the decision2" );
- return false;//StatusCode::FAILURE;
- }
- if ( (*feature2)->hasDetail<float>(m_property2 ) ){
- float v = (*feature2)->getDetail<float>( m_property2 );
- ATH_MSG_DEBUG("Prop2="<<v);
- if ( v < m_threshold2 )
- return false;
- } else ATH_MSG_ERROR( "Cannot find detail "<<m_property2<<" in feature2");
- }
-
- return true;
- }
-
-
-
- StatusCode TestComboHypoAlg::execute( const EventContext& context ) const {
-
- ATH_MSG_DEBUG ("Executing " << name() << "...");
-
- auto previousDecisionsHandle1 = SG::makeHandle( m_previousDecisions1, context );
- if( not previousDecisionsHandle1.isValid() ) {//implicit
- ATH_MSG_DEBUG( "No implicit RH for previous decisions1: is this expected?" );
- return StatusCode::SUCCESS;
- }
- ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle1->size() <<" implicit " <<previousDecisionsHandle1.key()<<" for previous decisions of input 1");
-
- auto previousDecisionsHandle2 = SG::makeHandle( m_previousDecisions2, context );
- if( not previousDecisionsHandle2.isValid() ) {//implicit
- ATH_MSG_DEBUG( "No implicit RH for previous decisions2: is this expected?" );
- return StatusCode::SUCCESS;
- }
- ATH_MSG_DEBUG( "Running with "<< previousDecisionsHandle2->size() <<" implicit "<<previousDecisionsHandle2.key()<<" for previous decisions of input 2");
-
- auto recoInput1 = SG::makeHandle(m_recoInput1, context);
- auto recoInput2 = SG::makeHandle(m_recoInput2, context);
-
- ATH_MSG_DEBUG( "and with "<< recoInput1->size() <<" reco1 inputs, and "<<recoInput2->size() <<" reco2 inputs");
-
- SG::WriteHandle<DecisionContainer> outputHandle1 = createAndStore(m_output1, context );
- auto decisions1 = outputHandle1.ptr();
- SG::WriteHandle<DecisionContainer> outputHandle2 = createAndStore(m_output1, context );
- auto decisions2 = outputHandle2.ptr();
-
- // find RoIs from previous decisions
- std::vector<const FeatureOBJ*> featureFromDecision1;
- for ( auto previousDecision: *previousDecisionsHandle1 ) {
- auto featureInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( previousDecision, "initialRoI" );
- auto featurelink = featureInfo.link;
-
- CHECK( featurelink.isValid() );
- const FeatureOBJ* feature = *featurelink;
- featureFromDecision1.push_back( feature);
- }
- ATH_MSG_DEBUG("Found "<<featureFromDecision1.size()<<" RoIs from decision input1");
-
- std::vector<const FeatureOBJ*> featureFromDecision2;
- for ( auto previousDecision: *previousDecisionsHandle2 ) {
- auto featureInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( previousDecision, "initialRoI" );
- auto featurelink = featureInfo.link;
-
- CHECK( featurelink.isValid() );
- const FeatureOBJ* feature = *featurelink;
- featureFromDecision2.push_back( feature);
- }
- ATH_MSG_DEBUG("Found "<<featureFromDecision2.size()<<" RoIs from decision input2");
-
- //map reco object and decision: find in reco obejct the initial RoI and map it to the correct decision
- size_t counter1 = 0;
- for (auto recoobj: *recoInput1){
- auto featureInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( recoobj, "initialRoI" );
- auto featurelink = featureInfo.link;
- CHECK( featurelink.isValid() );
- ATH_MSG_DEBUG("Found link from the reco object1 to RoI" );
- const FeatureOBJ* feature = *featurelink;
- // find the same roi in the previous decisions
- bool foundRoIInDecision=false;
- size_t pos=distance(featureFromDecision1.begin(), find(featureFromDecision1.begin(), featureFromDecision1.end(), feature));
- if (pos < featureFromDecision1.size()){
- foundRoIInDecision=true;
- }
-
- if (foundRoIInDecision){
- ATH_MSG_DEBUG("Found the same RoI on decision at pos "<<pos);
- auto d = newDecisionIn(decisions1);
- d->setObjectLink( "feature", ElementLink<xAOD::TrigCompositeContainer>(m_recoInput1.key(), counter1) );// feature used by the Tool
- d->setObjectLink( "initialRoI", featurelink );// this is used by the InputMaker
- d->setObjectLink( "previousDecisions", ElementLink<DecisionContainer>(m_previousDecisions1.key(), pos) );// link to previous decision object
- }
- else{
- ATH_MSG_ERROR( " Can not find reference to previous decision from RoI from reco object " << counter1 );
- return StatusCode::FAILURE;
- }
- counter1++;
- }
-
-
- size_t counter2 = 0;
- for (auto recoobj: *recoInput2){
- auto featureInfo = TrigCompositeUtils::findLink<TrigRoiDescriptorCollection>( recoobj, "initialRoI" );
- auto featurelink = featureInfo.link;
-
- CHECK( featurelink.isValid() );
- ATH_MSG_DEBUG("Found link from the reco object2 to RoI" );
- const FeatureOBJ* feature = *featurelink;
- // find the same roi in the previous decisions
- bool foundRoIInDecision=false;
- size_t pos=distance(featureFromDecision2.begin(), find(featureFromDecision2.begin(), featureFromDecision2.end(), feature));
- if (pos < featureFromDecision2.size()){
- foundRoIInDecision=true;
- }
-
- if (foundRoIInDecision){
- ATH_MSG_DEBUG("Found the same RoI on decision at pos "<<pos);
- auto d = newDecisionIn(decisions2);
- d->setObjectLink( "feature", ElementLink<xAOD::TrigCompositeContainer>(m_recoInput2.key(), counter2) );// feature used by the Tool
- d->setObjectLink( "initialRoI", featurelink );// this is used by the InputMaker
- d->setObjectLink( "previousDecisions", ElementLink<DecisionContainer>(m_previousDecisions2.key(), pos) );// link to previous decision object
- }
- else{
- ATH_MSG_ERROR( " Can not find reference to previous decision from RoI from reco object " << counter2 );
- return StatusCode::FAILURE;
- }
- counter2++;
- }
-
-
- ATH_MSG_DEBUG( "Found "<<counter1<<" rois from input 1 " );
- ATH_MSG_DEBUG( "Found "<<counter2<<" rois from input 2 " );
-
- // this is the tool
- if (decisions1->size() ==0 || decisions2->size() == 0)
- ATH_MSG_DEBUG("No combined hypo found, Do not go to the tool since n.dec1="<< decisions1->size() << " and n.dec2="<< decisions2->size() <<" ");
- else
- ATH_MSG_DEBUG("Go to the tool with n.dec1="<< decisions1->size() << " and n.dec2="<< decisions2->size() <<" ");
-
- counter1 = 0;
- for ( auto obj1Iter = decisions1->begin(); obj1Iter != decisions1->end(); ++obj1Iter, ++counter1 ) {
- auto previousDecisions1 = (*obj1Iter)->objectLink<DecisionContainer>( "previousDecisions" );
- TrigCompositeUtils::DecisionIDContainer objDecisions1;
- TrigCompositeUtils::decisionIDs( *previousDecisions1, objDecisions1 );
-
- ATH_MSG_DEBUG("Number of previous decisions for input1: " << objDecisions1.size() );
-
- for ( TrigCompositeUtils::DecisionID id : objDecisions1 ) {
- ATH_MSG_DEBUG( " -- found decision " << HLT::Identifier( id ) );
- }
-
- std::vector<TrigCompositeUtils::DecisionID> intersection1;
- std::set_intersection( m_chains.begin(), m_chains.end(),
- objDecisions1.begin(), objDecisions1.end(),
- std::back_inserter( intersection1 ) );
-
- if ( not intersection1.empty() ) {
-
- for ( const HLT::Identifier& did: intersection1 ){
- ATH_MSG_DEBUG("Found "<<did<<" to candidate "<< counter1 << " in input1");
- }
- counter2 = 0;
- for ( auto obj2Iter = decisions2->begin(); obj2Iter != decisions2->end(); ++obj2Iter, ++counter2 ) {
- auto previousDecisions2 = (*obj2Iter)->objectLink<DecisionContainer>( "previousDecisions" );
- TrigCompositeUtils::DecisionIDContainer objDecisions2;
- TrigCompositeUtils::decisionIDs( *previousDecisions2, objDecisions2 );
-
- ATH_MSG_DEBUG("Number of previous decisions for input2: " << objDecisions2.size() );
-
- for ( TrigCompositeUtils::DecisionID id : objDecisions2 ) {
- ATH_MSG_DEBUG( " -- found decision " << HLT::Identifier( id ) );
- }
-
- // check that the same chain is in this decisions
- std::vector<TrigCompositeUtils::DecisionID> intersection2;
- std::set_intersection( objDecisions1.begin(), objDecisions1.end(),
- objDecisions2.begin(), objDecisions2.end(),
- std::back_inserter( intersection2 ) );
-
- if ( not intersection2.empty() ) {
- for ( const HLT::Identifier& did: intersection2 ){
- ATH_MSG_DEBUG("Found "<<did<<" to both candidates for "<< counter2 << " in input2");
- }
- ATH_MSG_DEBUG("Found good combined candidate");
-
-
- if ( passed(*obj1Iter, *obj2Iter) ) {
- for ( const HLT::Identifier& did: intersection2 ){
- // auto did = HLT::Identifier( m_decisionLabel ).numeric();
- ATH_MSG_DEBUG("Adding "<<did<<" to both candaites");
- addDecisionID( did, decisions1->at(counter1) );
- addDecisionID( did, decisions2->at(counter2) );
- }
- }
-
- }
- }
- }
- }
-
- return StatusCode::SUCCESS;
- }
-
-} //> end namespace HLTTest
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h
deleted file mode 100644
index c398289dc2bab4d4a86ed21bfcb47be9e4114b12..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestComboHypoAlg.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef TRIGUPGRADETEST_TESTCOMBOHYPOALG_H
-#define TRIGUPGRADETEST_TESTCOMBOHYPOALG_H 1
-
-
-#include <string>
-#include "xAODTrigger/TrigCompositeContainer.h"
-#include "TrigCompositeUtils/TrigCompositeUtils.h"
-//#include "AthenaBaseComps/AthAlgorithm.h"
-#include "AthenaBaseComps/AthReentrantAlgorithm.h"
-#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
-
-namespace HLTTest {
-
-/**
- * @class $(klass)s
- * @brief
- **/
- using namespace TrigCompositeUtils;
- class TestComboHypoAlg : public ::AthReentrantAlgorithm
-{
- public:
- TestComboHypoAlg( const std::string& name, ISvcLocator* pSvcLocator );
-
- virtual ~TestComboHypoAlg();
-
- //TestComboHypoAlg &operator=(const TestComboHypoAlg &alg);
-
- StatusCode initialize() override;
- virtual StatusCode execute( const EventContext& context ) const override;
- //StatusCode execute() override;
- StatusCode finalize() override;
-
- private:
-
- typedef TrigRoiDescriptor FeatureOBJ;
- typedef TrigRoiDescriptorCollection FeatureContainer;
-
- SG::ReadHandleKey<xAOD::TrigCompositeContainer> m_recoInput1 { this, "Input1", "first input", "Key for reco input 1" };
- SG::ReadHandleKey<xAOD::TrigCompositeContainer> m_recoInput2 { this, "Input2", "second input", "Key for reco input 2" };
- SG::ReadHandleKey <DecisionContainer> m_previousDecisions1 { this, "previousDecisions1", "previousDecisions1", "Key for decisions per RoI for input 1" };
- SG::ReadHandleKey <DecisionContainer> m_previousDecisions2 { this, "previousDecisions2", "previousDecisions2", "Key for decisions per RoI for input 2" };
-
- SG::WriteHandleKey<DecisionContainer> m_output1 { this, "Output1", "decision1", "Key for decision input 1" };
- SG::WriteHandleKey<DecisionContainer> m_output2 { this, "Output2", "decision2", "Key for decision input 2" };
-
- Gaudi::Property<std::vector<std::string> > m_chainsProperty{ this, "Chains", {}, "Chains of whihc this Hypo is concerned" };
-
- // equivalent to tools:
- std::string m_decisionLabel; // I am lazy and do not create tools for now, alg is able to make just one decision
- std::string m_property1;
- std::string m_property2;
- float m_threshold1;
- float m_threshold2;
-
- std::set<HLT::Identifier> m_chains;
- bool passed( const Decision* d1, const Decision* d2 ) const;
-};
-
-} //> end namespace HLTTest
-#endif //> !TRIGUPGRADETEST_TESTCOMBOHYPOALG_H
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMHypoTool.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestMHypoTool.cxx
deleted file mode 100644
index c8f195e2f649a9760aebe3747ba03ad4b1cb64a5..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMHypoTool.cxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-// TrigUpgradeTest includes
-#include "TestMHypoTool.h"
-
-
-namespace HLTTest {
-
- TestMHypoTool::TestMHypoTool( const std::string& type,
- const std::string& name,
- const IInterface* parent ) :
- ITestHypoTool( name ),
- AthAlgTool( type, name, parent )
- {
- declareProperty( "Threshold", m_threshold = 0);
- declareProperty( "Multiplicity", m_multiplicity = 0 );
- declareProperty( "Property", m_property );
- }
-
- TestMHypoTool::~TestMHypoTool()
- {}
-
- StatusCode TestMHypoTool::initialize()
- {
- ATH_MSG_INFO( "Initializing " << name() << "..." );
-
- return StatusCode::SUCCESS;
- }
-
- StatusCode TestMHypoTool::iterate( DecisionContainer* decisions, std::function<void(Decision*)> f) const {
- ATH_MSG_DEBUG( "Making decisions " << name() );
- for ( auto d: *decisions ) {
- auto feature = d->objectLink<xAOD::TrigCompositeContainer>( "feature" );
- if ( not feature.isValid() ) {
- ATH_MSG_ERROR( " Can not find reference to the object from the decision" );
- return StatusCode::FAILURE;
- }
- float v = (*feature)->getDetail<float>( m_property );
- if ( v > m_threshold ) { // actual cut will be more complex of course
- ATH_MSG_DEBUG( " threshold " << m_threshold << " passed by value: " << v );
- f(d); // here we inject the functional code
- }
- }
- return StatusCode::SUCCESS;
-
- }
-
-
- StatusCode TestMHypoTool::decide( DecisionContainer* decisions ) const {
-
- size_t candidates = 0;
-
- CHECK( iterate(decisions,
- [&](Decision*){ candidates++; } ) );
- if ( candidates >= m_multiplicity )
- CHECK( iterate(decisions,
- [&](Decision* d) { addDecisionID( decisionId().numeric(), d ); } ) );
- return StatusCode::SUCCESS;
- }
-
-
- StatusCode TestMHypoTool::finalize()
- {
- ATH_MSG_INFO( "Finalizing " << name() << "..." );
-
- return StatusCode::SUCCESS;
- }
-
-} //> end namespace HLTTest
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMHypoTool.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestMHypoTool.h
deleted file mode 100644
index e1f395ecb81ff42a7ba0982bc2204020e71a151d..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMHypoTool.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef TRIGUPGRADETEST_TESTMHYPOTOOL_H
-#define TRIGUPGRADETEST_TESTMHYPOTOOL_H 1
-
-// STL includes
-#include <string>
-
-
-#include "AthenaBaseComps/AthAlgTool.h"
-
-#include "TrigCompositeUtils/HLTIdentifier.h"
-
-#include "./ITestHypoTool.h"
-
-namespace HLTTest {
-
- /**
- * @class TestMHypoTool
- * @brief Tool taking the decision for multiplicity selection (one decision per object)
- * The implementation is limited to same threshold only (it is a test).
- **/
-
- class TestMHypoTool : virtual public ITestHypoTool, public AthAlgTool
- {
- public:
- TestMHypoTool( const std::string& type,
- const std::string& name,
- const IInterface* parent );
-
- virtual ~TestMHypoTool();
-
- StatusCode initialize() override;
- StatusCode finalize() override;
- StatusCode decide( DecisionContainer* decisions ) const override;
-
- private:
-
- // TestMHypoTool();
- float m_threshold;
- size_t m_multiplicity;
- std::string m_property;
- StatusCode iterate( DecisionContainer* decisions, std::function<void(Decision*)> f) const;
- };
-
-} //> end namespace HLTTest
-#endif //> !TRIGUPGRADETEST_TESTMHYPOTOOL_H
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.cxx
deleted file mode 100644
index 7a0af223d1a2d903634619ddedad3006511346fb..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-// TrigUpgradeTest includes
-#include "TestMerger.h"
-
-// STL includes
-
-
-
-namespace HLTTest {
-
- ///////////////////////////////////////////////////////////////////
- // Public methods:
- ///////////////////////////////////////////////////////////////////
-
- // Constructors
- ////////////////
- TestMerger::TestMerger( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::AthAlgorithm( name, pSvcLocator )
- {
- declareProperty( "Inputs", m_inputs );
- declareProperty( "Output", m_outputKey );
- }
-
-
- // TestMerger::~TestMerger()
- // {}
-
-
- StatusCode TestMerger::initialize()
- {
- ATH_MSG_INFO ("Initializing " << name() << "...");
- CHECK( m_outputKey.initialize() );
- return StatusCode::SUCCESS;
- }
-
- StatusCode TestMerger::finalize()
- {
- ATH_MSG_INFO ("Finalizing " << name() << "...");
-
- return StatusCode::SUCCESS;
- }
-
- StatusCode TestMerger::execute()
- {
- ATH_MSG_DEBUG ("Executing " << name() << "...");
-
- auto output = std::make_unique<DecisionContainer>();
- auto aux = std::make_unique<DecisionAuxContainer>();
- output->setStore( aux.get() );
-
- for (const auto input: m_inputs ) {
- auto iHandle = SG::ReadHandle<DecisionContainer>(input);
- if ( iHandle.isValid() ) {
- size_t counter = 0;
- for ( auto iDecisionIter = iHandle->begin(); iDecisionIter != iHandle->end(); ++iDecisionIter, ++counter ) {
- auto d = newDecisionIn(output.get());
- linkToPrevious(d, *iDecisionIter );
- }
- ATH_MSG_DEBUG( "Input " << input << " present, linked " << counter << " inputs" );
- } else {
- ATH_MSG_DEBUG( "Input " << input << " absent" );
- }
- }
-
- auto outputHandle = SG::makeHandle(m_outputKey);
- CHECK( outputHandle.record( std::move(output), std::move(aux) ) );
- return StatusCode::SUCCESS;
- }
-
-
-} //> end namespace HLTTest
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.h
deleted file mode 100644
index f448b1b8d6b220e6dc058cc093854be32a4634ff..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestMerger.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef TRIGUPGRADETEST_TESTMERGER_H
-#define TRIGUPGRADETEST_TESTMERGER_H 1
-
-// STL includes
-#include <string>
-
-// FrameWork includes
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "TrigCompositeUtils/TrigCompositeUtils.h"
-namespace HLTTest {
- using namespace TrigCompositeUtils;
- class TestMerger
- : public ::AthAlgorithm
- {
-
- public:
-
- TestMerger( const std::string& name, ISvcLocator* pSvcLocator );
-
- // virtual ~TestMerger(){}
-
-
- StatusCode initialize() override;
- StatusCode execute() override;
- StatusCode finalize() override;
-
- private:
-
-
- TestMerger();
- std::vector<std::string> m_inputs;
- SG::WriteHandleKey<DecisionContainer> m_outputKey;
- };
-
-} //> end namespace HLTTest
-#endif //> !TRIGUPGRADETEST_TESTMERGER_H
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.cxx
deleted file mode 100644
index f2e9d9e100df7e97242a6ae4a1b3d3e42f75f6ab..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.cxx
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include <iterator>
-#include <algorithm>
-
-#include "TrigCompositeUtils/HLTIdentifier.h"
-#include "TestRoRSeqFilter.h"
-
-#include "GaudiKernel/Property.h"
-
-using namespace TrigCompositeUtils;
-
-namespace HLTTest {
-
- TestRoRSeqFilter::TestRoRSeqFilter( const std::string& name,
- ISvcLocator* pSvcLocator ) :
- ::AthAlgorithm( name, pSvcLocator )
- {
- declareProperty( "Inputs", m_inputs );
- declareProperty( "Outputs", m_outputs );
- declareProperty( "Chains", m_chainsProperty, "Chains to filter the object on" );
- declareProperty( "AlwaysPass", m_alwaysPass, "Override negative decision" );
- }
-
- TestRoRSeqFilter::~TestRoRSeqFilter()
- {}
-
- StatusCode TestRoRSeqFilter::initialize()
- {
- ATH_MSG_INFO ("Initializing " << name() << "...");
-
- ATH_MSG_DEBUG("Will consume the input data: " << m_inputs << " and produce " << m_outputs );
- ATH_MSG_DEBUG("This filter has alwaysPass=" << m_alwaysPass);
- ATH_MSG_DEBUG("Configured chains are:");
- for ( auto& el: m_chainsProperty ) {
- ATH_MSG_DEBUG(el);
- }
- // if ( m_inputs.size() != m_outputs.size() ) {
- // ATH_MSG_ERROR("Inputs and Outputs have different size, the mapping is unclear");
- // return StatusCode::FAILURE;
- // }
-
- for ( auto& el: m_chainsProperty ) {
- m_chains.insert( HLT::Identifier(el).numeric() );
- }
-
- // minimal validity crosscheck
- if ( m_chainsProperty.size() == 0 and m_alwaysPass == false ) {
- ATH_MSG_WARNING("This filter will always reject as it has no chains of interest configured");
- }
-
- if ( m_chains.size() != m_chainsProperty.size() ) {
- ATH_MSG_ERROR("Repeated chain requirements (annoyance) or chain to hash conversion clash (major configuration issue therefore can not run)");
- return StatusCode::FAILURE;
- }
-
- return StatusCode::SUCCESS;
- }
-
- StatusCode TestRoRSeqFilter::finalize()
- {
- ATH_MSG_INFO ("Finalizing " << name() << "...");
-
- return StatusCode::SUCCESS;
- }
-
- StatusCode TestRoRSeqFilter::execute()
- {
- ATH_MSG_DEBUG ( "Executing " << name() << "..." );
- bool pass = false;
-
- for ( size_t inputIndex = 0; inputIndex < m_inputs.size(); ++inputIndex ) {
- auto input = m_inputs[inputIndex];
- ATH_MSG_DEBUG( "Processing input " << input );
- // this will only store links to the inputs that are passing
- auto decisionOutput = std::make_unique<DecisionContainer>();
- auto decisionAux = std::make_unique<DecisionAuxContainer>();
- decisionOutput->setStore( decisionAux.get() );
- copyPassing( input, decisionOutput.get() );
-
- // not bother recording if there is no output
- if ( not decisionOutput->empty() ) {
- ATH_MSG_DEBUG( "Saving output " << m_outputs[inputIndex] );
- pass = true;
- SG::WriteHandle<DecisionContainer> outputDH( m_outputs[inputIndex] );
- CHECK( outputDH.record( std::move( decisionOutput ), std::move( decisionAux ) ) );
- } else {
- ATH_MSG_DEBUG( "None of the decisions in the input " << input << " passed, skipping recording output " );
- }
- }
-
- ATH_MSG_DEBUG( "The overall decision is : " << ( pass or m_alwaysPass ? "positive" : "negative") );
-
- setFilterPassed( pass or m_alwaysPass );
- return StatusCode::SUCCESS;
- }
-
- void TestRoRSeqFilter::copyPassing( const std::string& inputKey, DecisionContainer* output ) const {
- SG::ReadHandle<DecisionContainer> inputDH( inputKey );
- if ( not inputDH.isValid() ) {
- ATH_MSG_DEBUG( "Void input: " << inputKey );
- return;
- }
-
- ATH_MSG_DEBUG( "Filtering "<<inputDH->size()<<" obejcts with key "<<inputKey);
-
- size_t counter=0;
- for ( auto objIter = inputDH->begin(); objIter != inputDH->end(); ++objIter, ++counter ) {
- DecisionIDContainer objDecisions;
- decisionIDs( *objIter, objDecisions ); // this should be replaced in production code by method passingIDs but the later is not printing so in tests we want the IDs
- // here we have to sets of IDs, those we are interested in (via chain property) and those comming from the decision obj
-
- std::vector<DecisionID> intersection;
- std::set_intersection( m_chains.begin(), m_chains.end(),
- objDecisions.begin(), objDecisions.end(),
- std::back_inserter( intersection ) );
-
- ATH_MSG_DEBUG( "Found "<<intersection.size()<<" objects of interest for key "<<inputKey);
- for ( auto positive: intersection ) {
- ATH_MSG_DEBUG( "Found positive decision for chain " << HLT::Identifier( positive ) );
- }
-
- const bool positiveObjectDecision = not intersection.empty();
- if ( positiveObjectDecision ) {
- auto d = newDecisionIn( output );
- linkToPrevious( d, *objIter );
- } else {
- ATH_MSG_DEBUG( "Skipping objects with key " << inputKey <<" as they passed no chain of interest to this filter" );
- }
- }
- }
-
-} //> end namespace HLTTest
-
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.h b/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.h
deleted file mode 100644
index c3d6a1d58aa967b391b6aa58af7bd4a9743ad461..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/TestRoRSeqFilter.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-#ifndef TRIGUPGRADETEST_TESTRORSEQFILTER_H
-#define TRIGUPGRADETEST_TESTRORSEQFILTER_H 1
-
-
-#include <string>
-#include "TrigCompositeUtils/TrigCompositeUtils.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-namespace HLTTest {
-
- /**
- * @class TestRoRSeqFilter for validation of the CF sequencers barrier concept
- * @brief This alg will read in implicit data, potentially merge, but above all it will decide to accep/reject
- * and thus to continue reco in the sequence
- **/
-
-
- class TestRoRSeqFilter
- : public ::AthAlgorithm
- {
- public:
- TestRoRSeqFilter( const std::string& name, ISvcLocator* pSvcLocator );
-
- virtual ~TestRoRSeqFilter();
-
- //TestRoRSeqFilter &operator=(const TestRoRSeqFilter &alg);
-
- StatusCode initialize() override;
- StatusCode execute( ) override;
- StatusCode finalize() override;
-
- private:
- TestRoRSeqFilter();
- std::vector<std::string> m_inputs;
- std::vector<std::string> m_outputs;
-
- std::vector<std::string> m_chainsProperty;
- TrigCompositeUtils::DecisionIDContainer m_chains; // this is the set of chains we care about in this filter
- bool m_alwaysPass = false; // override decision
-
- /*
- @brief fills the output with decision objects lining back to the succesfully passing objs
- NB> The positive/negative decision can be red from the output.size()
- */
- void copyPassing(const std::string& inputKey,
- TrigCompositeUtils::DecisionContainer* output) const;
- };
-
-} //> end namespace HLTTest
-#endif //> !TRIGUPGRADETEST_TESTRORSEQFILTER_H
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/src/components/TrigUpgradeTest_entries.cxx b/Trigger/TrigValidation/TrigUpgradeTest/src/components/TrigUpgradeTest_entries.cxx
deleted file mode 100644
index fd90b375c035b4fe8df0a207317b12901a5a9a0a..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/src/components/TrigUpgradeTest_entries.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "../ITestHypoTool.h"
-#include "../TestHypoAlg.h"
-#include "../TestHypoTool.h"
-#include "../TestMHypoTool.h"
-#include "../TestRecoAlg.h"
-#include "../TestRoRSeqFilter.h"
-#include "../TestMerger.h"
-#include "../TestComboHypoAlg.h"
-#include "../TestInputMaker.h"
-
-
-DECLARE_COMPONENT( HLTTest::TestInputMaker )
-DECLARE_COMPONENT( HLTTest::TestHypoAlg )
-DECLARE_COMPONENT( HLTTest::TestHypoTool )
-DECLARE_COMPONENT( HLTTest::TestMHypoTool )
-DECLARE_COMPONENT( HLTTest::TestRecoAlg )
-DECLARE_COMPONENT( HLTTest::TestRoRSeqFilter )
-DECLARE_COMPONENT( HLTTest::TestMerger )
-DECLARE_COMPONENT( HLTTest::TestComboHypoAlg )
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_menu_processing.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_menu_processing.sh
deleted file mode 100755
index 2b42b6743d9ce9b9610c6ec213ae1c75340ae520..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_menu_processing.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# This is not an ART test, but a unit test
-
-# This is a unit test of HLT Control Flow and should be moved to TriggerMenuMT
-
-athena.py -l DEBUG --imf --threads=1 -c "doMenu=True" TrigUpgradeTest/EmuStepProcessingTest.py
-
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_processing.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_processing.sh
deleted file mode 100755
index c2bd92730f8c6c10fdb79d7438f590a68bef9fbd..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_emu_step_processing.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# This is not an ART test, but a unit test
-
-# This is a unit test of HLT Control Flow and should be moved to TriggerMenuMT
-
-athena.py -l DEBUG --imf --threads=1 -c "doMenu=False" TrigUpgradeTest/EmuStepProcessingTest.py
-
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
deleted file mode 100755
index 4a140764cf13520c8582a518c9ee9d35c2d97798..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using the full menu from TrigUpgradeTest job options
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/full_menu_cf.py"
-export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*"
-export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;"
-
-# Find the regtest reference installed with the release
-export REGTESTREF=`find_data.py TrigUpgradeTest/full_menu_cf_build.ref`
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_configOnly_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_configOnly_build.sh
deleted file mode 100755
index 7a8d73fba8486873a455b1c252b8689a84193ab7..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_configOnly_build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test checking only configuration of the full_menu_cf job options
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/full_menu_cf.py"
-export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;"
-export ATHENAOPTS="--config-only=config.pkl"
-
-# This test doesn't produce any output useful for RegTest, so do a dummy reference comparison
-export REGTESTEXP="configuration complete, now exiting|ERROR"
-export REGTESTREF=`find_data.py TrigUpgradeTest/full_menu_cf_configOnly.ref`
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
deleted file mode 100755
index bd31c3e5778f151568a7e60bc0ffa90a70724197..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_calo_cf_build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using IDCalo job options
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/IDCalo.py"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
deleted file mode 100755
index 1f5a29c977e585fbf04d5b0abd5d690866a37970..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using IDCalo job options with doCalo=False
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TrigUpgradeTest/IDCalo.py"
-export EXTRA="doCalo=False"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
deleted file mode 100755
index 989f8c1638a0e0b7c5fe1d6f9f2a85ac8e3322d6..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_id_cf_mc_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test on MC using IDCalo job options with doCalo=False
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export INPUT="ttbar"
-export JOBOPTION="TrigUpgradeTest/IDCalo.py"
-export EXTRA="doCalo=False"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigValTools/CMakeLists.txt b/Trigger/TrigValidation/TrigValTools/CMakeLists.txt
index 81fe27447d39a72dfa3298da4c4c6374f6116ce5..7eb8cae993f06f84f8fac26c2ebe03ace7245b71 100644
--- a/Trigger/TrigValidation/TrigValTools/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigValTools/CMakeLists.txt
@@ -34,3 +34,7 @@ atlas_add_test( rootcomp
SCRIPT test/test_rootcomp.sh ${CMAKE_CURRENT_SOURCE_DIR}/test/test_rootcomp.C
PROPERTIES TIMEOUT 450
POST_EXEC_SCRIPT nopost.sh )
+
+atlas_add_test( chainDump
+ SCRIPT test/test_chainDump.sh ${CMAKE_CURRENT_SOURCE_DIR}/test/test_chainDump.C
+ LOG_IGNORE_PATTERN "Processing.*test_chainDump" )
diff --git a/Trigger/TrigValidation/TrigValTools/bin/chainDump.py b/Trigger/TrigValidation/TrigValTools/bin/chainDump.py
index dfa4f637d7d812cbe1c6a96853ef73f53d985657..af98ec9f7f78394620d58cb82993f730b12c283d 100755
--- a/Trigger/TrigValidation/TrigValTools/bin/chainDump.py
+++ b/Trigger/TrigValidation/TrigValTools/bin/chainDump.py
@@ -45,11 +45,13 @@ def get_parser():
help='Save outputs also to a json file with the given name or %(const)s if no name is given')
parser.add_argument('--fracTolerance',
metavar='FRAC',
+ type=float,
default=0.001,
help='Tolerance as a fraction, default = %(default)s. '
'Flagged diffs must exceed all tolerances')
parser.add_argument('--intTolerance',
metavar='NUM',
+ type=int,
default=2,
help='Tolerance as a number of counts, default = %(default)s. '
'Flagged diffs must exceed all tolerances')
@@ -258,13 +260,14 @@ def print_counts(json_dict):
dump_lines = []
for item_name, item_counts in counts.items():
v = item_counts['count']
- line = ' {name:{nw}s} {val:>{w}d}'.format(name=item_name, val=v, nw=name_width, w=column_width)
+ line = ' {name:{nw}s} {val:>{w}s}'.format(name=item_name, val=str(v), nw=name_width, w=column_width)
if not no_ref:
ref_v = item_counts['ref_count']
diff = item_counts['ref_diff']
- line += ' {val:>{w}d}'.format(val=ref_v, w=column_width)
+ line += ' {val:>{w}s}'.format(val=str(ref_v), w=column_width)
if diff:
line += ' <<<<<<<<<<'
+ dump_lines.append(line)
logging.info('Writing %s counts from histogram %s:\n%s', text_name, hist_name, '\n'.join(dump_lines))
@@ -343,7 +346,7 @@ def main():
if len(in_hists) == 0:
logging.error('No count histograms could be loaded.')
return 1
- logging.info('Loaded count histograms: %s', in_hists.keys())
+ logging.info('Loaded count histograms: %s', list(in_hists.keys()))
in_total_hists = load_histograms(in_file, args.totalHists)
if len(in_total_hists) == 0:
@@ -359,7 +362,7 @@ def main():
ref_total = None
if args.referenceFile:
ref_hists = load_histograms(ref_file, args.countHists)
- logging.info('Loaded reference count histograms: %s', ref_hists.keys())
+ logging.info('Loaded reference count histograms: %s', list(ref_hists.keys()))
missing_refs = [k for k in in_hists.keys() if k not in ref_hists.keys()]
if len(missing_refs) > 0:
logging.error('Count histogram(s) %s missing in the reference', missing_refs)
@@ -368,9 +371,9 @@ def main():
if len(ref_total_hists) == 0:
logging.error('No total-events reference histogram could be loaded')
return 1
- ref_total = ref_total_hists.values()[0].GetEntries()
+ ref_total = list(ref_total_hists.values())[0].GetEntries()
logging.info('Loaded total-events reference histogram %s, number of events: %d',
- ref_total_hists.keys()[0], ref_total)
+ list(ref_total_hists.keys())[0], ref_total)
##################################################
# Extract counts from histograms
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
index 460afdbca8cae9b36fe2691ef2f4ec9ef96d9f6f..624f35c396a4e0acb449bcbe5398d0c8c3dbd3c0 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
@@ -56,12 +56,19 @@ class RefComparisonStep(Step):
self.misconfig_abort('input_file not specified')
branch = os.environ.get('AtlasBuildBranch') # Available after asetup
- if branch is None:
+ if not branch:
branch = os.environ.get('gitlabTargetBranch') # Available in CI
- if branch is None:
- self.log.warning('Cannot determine the branch name, both variables '
- 'AtlasBuildBranch and gitlabTargetBranch are empty')
- branch = 'UNKNOWN_BRANCH'
+ if not branch:
+ jobName = os.environ.get('JOB_NAME') # Available in nightly build system (ATR-21836)
+ if jobName:
+ branch = jobName.split('_')[0].split('--')[0]
+ if not branch:
+ msg = 'Cannot determine the branch name, all variables are empty: AtlasBuildBranch, gitlabTargetBranch, JOB_NAME'
+ if self.required:
+ self.misconfig_abort(msg)
+ else:
+ self.log.warning(msg)
+ branch = 'UNKNOWN_BRANCH'
sub_path = '{}/ref/{}/test_{}/'.format(
test.package_name, branch, self.ref_test_name)
@@ -362,7 +369,8 @@ class RootCompStep(RefComparisonStep):
self.log.debug(
'Skipping %s because both reference and input are missing',
self.name)
- return 0, '# (internal) {} -> skipped'.format(self.name)
+ self.result = 0
+ return self.result, '# (internal) {} -> skipped'.format(self.name)
else: # input exists but reference not
self.log.error('Missing reference for %s', self.name)
self.result = 999
@@ -415,25 +423,29 @@ class TailStep(Step):
self.args += ' >'+self.output_name
super(TailStep, self).configure(test)
+
class DownloadRefStep(Step):
- '''Execute art.py download to downlaod results from previous day '''
+ '''Execute art.py download to get results from previous days'''
- def __init__(self, name='DownloadRefWeb'):
+ def __init__(self, name='DownloadRef'):
super(DownloadRefStep, self).__init__(name)
self.executable = 'art.py'
- self.artpackage = ' '
- self.artjobname = ' '
- self.args = 'download '
+ self.args = 'download'
+ self.artpackage = None
+ self.artjobname = None
self.timeout = 20*60
self.required = True
self.auto_report_result = True
def configure(self, test):
+ if not self.artpackage:
+ self.artpackage = test.package_name
+ if not self.artjobname:
+ self.artjobname = 'test_'+test.name+'.py'
self.args += ' '+self.artpackage+' '+self.artjobname
super(DownloadRefStep, self).configure(test)
-
class HistCountStep(InputDependentStep):
'''Execute histSizes.py to count histograms in a ROOT file'''
@@ -448,50 +460,6 @@ class HistCountStep(InputDependentStep):
super(HistCountStep, self).configure(test)
-class PhysValWebStep(InputDependentStep):
- '''Execute physval_make_web_display.py to make PhysVal web display from NTUP_PHYSVAL.root'''
-
- def __init__(self, name='PhysValWeb'):
- super(PhysValWebStep, self).__init__(name)
- self.input_file = 'NTUP_PHYSVAL.pool.root'
- self.executable = 'physval_make_web_display.py'
- self.refdir = ' '
- self.sig=' '
- self.args = '--ratio --drawopt HISTPE --refdrawopt HIST --title Test '
- self.auto_report_result = True
- self.timeout = 30*60
- self.required = True
-
- def configure(self, test):
- outargs = ' --outdir PHYSVAL_WEB/'+self.sig
- dirargs = ' --startpath run_1/HLT/'+self.sig
- self.args += ' '+outargs+' '+dirargs
- super(PhysValWebStep, self).configure(test)
-
- def run(self, dry_run=False):
- for fname in os.listdir('.'):
- if fname.startswith('ref-'):
- self.refdir = fname
- refargs = ' --reffile Ref:'+self.refdir+'/NTUP_PHYSVAL.pool.root '
- self.args += ' '+refargs+' '+self.input_file
- retcode, cmd = super(PhysValWebStep, self).run(dry_run)
- fname='PHYSVAL_WEB/'+self.sig+'/index.html'
- if os.path.exists(fname):
- f=open(fname,"r")
- nred=0
- for line in f:
- if (line.find('Red') != -1):
- nred+=1
- if nred > 0:
- self.log.debug("red histograms in display for slice %s %d",self.sig,nred)
- retcode+=nred
- else:
- retcode+=1000
- self.log.debug("missing index.html file for slice: %s ",self.sig)
- self.report_result(retcode,"CheckWeb"+self.sig)
- return retcode, cmd
-
-
class ChainDumpStep(InputDependentStep):
'''
Execute chainDump.py to print trigger counts from histograms to text files
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Step.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Step.py
index d8348957484ac6c7f5c69325d78ba842e9bab711..58bcaf906843d30d39bef4365ec1a50ee7984bb9 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Step.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Step.py
@@ -219,3 +219,14 @@ def get_step_from_list(step_name, step_list):
if step.name is not None and step_name in step.name:
return step
return None
+
+
+def get_step_type_from_list(step_type, step_list):
+ '''
+ Retrieve the first test matching the type from the list. Returns None if
+ no match is found.
+ '''
+ for step in step_list:
+ if isinstance(step, step_type):
+ return step
+ return None
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Test.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Test.py
index 99127722069aaa181af6a0eb550710201482761f..9edb3268b47006bcdf479f4c21aeebd0e2e1f762 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Test.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/Test.py
@@ -13,7 +13,7 @@ import subprocess
from collections import OrderedDict
from TrigValTools.TrigValSteering.Common import get_logger, art_result, clear_art_summary, package_prefix_dict
-from TrigValTools.TrigValSteering.Step import get_step_from_list
+from TrigValTools.TrigValSteering.Step import get_step_from_list, get_step_type_from_list
class Test(object):
@@ -196,6 +196,12 @@ class Test(object):
step = get_step_from_list(step_name, self.check_steps)
return step
+ def get_step_by_type(self, step_type):
+ step = get_step_type_from_list(step_type, self.exec_steps)
+ if step is None:
+ step = get_step_type_from_list(step_type, self.check_steps)
+ return step
+
def pre_exec(self):
'''Extra pre-exec function executed just before the steps'''
cmd_list = []
diff --git a/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json b/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json
index a0c441349b541a04e1d80f7e873df8e2d19bcf54..052c31a0e3690490b53b053a4731ae152d9bd839 100644
--- a/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json
+++ b/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json
@@ -131,7 +131,81 @@
"source": "mc",
"format": "RDO",
"paths": [
- "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"
+ ]
+ },
+ "Single_mu_larged0": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240174._000001.pool.root.1"
+ ]
+ },
+ "Single_mu_larged0_pu": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.107237.ParticleGenerator_mu_Pt4to100_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945423._000001.pool.root.1"
+ ]
+ },
+ "Bphys_JpsiPhi": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.300401.Pythia8BPhotospp_A14_CTEQ6L1_Bs_Jpsimu3p5mu3p5_phi.recon.RDO.e4397_s2608_r6869/RDO.06461186._000001.pool.root.1",
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.300401.Pythia8BPhotospp_A14_CTEQ6L1_Bs_Jpsimu3p5mu3p5_phi.recon.RDO.e4397_s2608_r6869/RDO.06461186._000002.pool.root.1",
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.300401.Pythia8BPhotospp_A14_CTEQ6L1_Bs_Jpsimu3p5mu3p5_phi.recon.RDO.e4397_s2608_r6869/RDO.06461186._000003.pool.root.1"
+ ]
+ },
+ "Zee_pu40": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"
+ ]
+ },
+ "Jpsiee_pu40": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.129190.Pythia8_AU2CTEQ6L1_ppToJpsie3e3.recon.RDO.e3802_s2608_s2183_r7042/RDO.06758877._000006.pool.root.1"
+ ]
+ },
+ "Single_el": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7728/RDO.10240159._000001.pool.root.1"
+ ]
+ },
+ "Single_el_pu40": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.159010.ParticleGenerator_e_Et7to80.recon.RDO.e1948_s2726_r7772/RDO.09929877._000001.pool.root.1"
+ ]
+ },
+ "Single_el_larged0": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7728/RDO.10240167._000001.pool.root.1"
+ ]
+ },
+ "Single_el_larged0_pu40": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc15_13TeV.159053.ParticleGenerator_e_Et7to80_vertxy20.recon.RDO.e3603_s2726_r7772/RDO.09945414._000001.pool.root.1"
+ ]
+ },
+ "Ztautau_pu46": {
+ "source": "mc",
+ "format": "RDO",
+ "paths": [
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s3126_r9546/RDO.11373415._000001.pool.root.1",
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s3126_r9546/RDO.11373415._000002.pool.root.1",
+ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigInDetValidation/samples/mc16_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s3126_r9546/RDO.11373415._000003.pool.root.1"
]
}
}
diff --git a/Trigger/TrigValidation/TrigValTools/share/chainDump.ref b/Trigger/TrigValidation/TrigValTools/share/chainDump.ref
new file mode 100644
index 0000000000000000000000000000000000000000..341afb013671ecf3d2ff37e8b9f9ec97d78742ff
--- /dev/null
+++ b/Trigger/TrigValidation/TrigValTools/share/chainDump.ref
@@ -0,0 +1,36 @@
+
+Info in <test_chainDump>: Creating test file testChainDump1.root
+Info in <test_chainDump>: Creating test file testChainDump2.root
+INFO Loaded count histograms: ['chains', 'decisions']
+INFO Loaded total-events histogram total, number of events: 100
+INFO Loaded reference count histograms: ['chains', 'decisions']
+INFO Loaded total-events reference histogram total, number of events: 100
+INFO Comparing counts to reference
+INFO HLTChain has 1 item(s) out of tolerance:
+ HLT_testChain1 26 5
+INFO HLTDecision has 7 item(s) out of tolerance:
+ HLT_testChain1_Step0 96 18
+ HLT_testChain1_Step1 66 10
+ HLT_testChain1_Step2 57 7
+ HLT_testChain2_Step1 101 53
+ HLT_testChain3_Step0 76 179
+ HLT_testChain3_Step1 92 163
+ HLT_testChain3_Step2 96 112
+INFO Writing total event count to file TotalEventsProcessed.txt
+INFO Writing counts from histogram chains to file HLTChain.txt
+INFO Writing counts from histogram decisions to file HLTDecision.txt
+INFO Writing results to chainDump.json
+100
+HLT_testChain1 26 5 <<<<<<<<<<
+HLT_testChain2 30 40
+HLT_testChain3 62 52
+HLT_testChain1_Step0 96 18 <<<<<<<<<<
+HLT_testChain1_Step1 66 10 <<<<<<<<<<
+HLT_testChain1_Step2 57 7 <<<<<<<<<<
+HLT_testChain2_Step0 82 86
+HLT_testChain2_Step1 101 53 <<<<<<<<<<
+HLT_testChain2_Step2 71 72
+HLT_testChain3_Step0 76 179 <<<<<<<<<<
+HLT_testChain3_Step1 92 163 <<<<<<<<<<
+HLT_testChain3_Step2 96 112 <<<<<<<<<<
+{"TotalEventsProcessed": {"hist_name": "total", "count": 100, "ref_count": 100}, "HLTChain": {"hist_name": "chains", "counts": {"HLT_testChain1": {"count": 26, "ref_count": 5, "ref_diff": true}, "HLT_testChain2": {"count": 30, "ref_count": 40, "ref_diff": false}, "HLT_testChain3": {"count": 62, "ref_count": 52, "ref_diff": false}}}, "HLTDecision": {"hist_name": "decisions", "counts": {"HLT_testChain1_Step0": {"count": 96, "ref_count": 18, "ref_diff": true}, "HLT_testChain1_Step1": {"count": 66, "ref_count": 10, "ref_diff": true}, "HLT_testChain1_Step2": {"count": 57, "ref_count": 7, "ref_diff": true}, "HLT_testChain2_Step0": {"count": 82, "ref_count": 86, "ref_diff": false}, "HLT_testChain2_Step1": {"count": 101, "ref_count": 53, "ref_diff": true}, "HLT_testChain2_Step2": {"count": 71, "ref_count": 72, "ref_diff": false}, "HLT_testChain3_Step0": {"count": 76, "ref_count": 179, "ref_diff": true}, "HLT_testChain3_Step1": {"count": 92, "ref_count": 163, "ref_diff": true}, "HLT_testChain3_Step2": {"count": 96, "ref_count": 112, "ref_diff": true}}}}
diff --git a/Trigger/TrigValidation/TrigValTools/test/test_chainDump.C b/Trigger/TrigValidation/TrigValTools/test/test_chainDump.C
new file mode 100644
index 0000000000000000000000000000000000000000..560451e28e3282f5efaf2e4795dccfd5ed45679b
--- /dev/null
+++ b/Trigger/TrigValidation/TrigValTools/test/test_chainDump.C
@@ -0,0 +1,58 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+void fillBin(TH2& h, const char* xlabel, const char* ylabel, size_t n) {
+ h.SetBinContent(h.GetXaxis()->FindBin(xlabel), h.GetYaxis()->FindBin(ylabel), n);
+}
+
+void makeTestFile(const char* fileName) {
+ TFile f(fileName, "RECREATE");
+ size_t nTotal = 100;
+
+ TH1D total("total", "", 10, 0, 10);
+ total.FillRandom("gaus", nTotal);
+
+ TH2D chains("chains", "chains;chain;step", 3, 0, 3, 6, 0, 6);
+ TH2D decisions("decisions", "decisions;chain;step", 3, 0, 3, 6, 0, 6);
+ for (TH2D* h : {&chains, &decisions}) {
+ h->GetXaxis()->SetBinLabel(1, "HLT_testChain1");
+ h->GetXaxis()->SetBinLabel(2, "HLT_testChain2");
+ h->GetXaxis()->SetBinLabel(3, "HLT_testChain3");
+ h->GetYaxis()->SetBinLabel(1, "L1");
+ h->GetYaxis()->SetBinLabel(2, "AfterPS");
+ h->GetYaxis()->SetBinLabel(3, "Step 0");
+ h->GetYaxis()->SetBinLabel(4, "Step 1");
+ h->GetYaxis()->SetBinLabel(5, "Step 2");
+ h->GetYaxis()->SetBinLabel(6, "Output");
+ }
+ for (size_t iChain=1; iChain<4; ++iChain) {
+ TString chainName = TString::Format("HLT_testChain%lu", iChain);
+ size_t nInput = gRandom->Uniform(nTotal);
+ size_t nOutput = gRandom->Uniform(nInput/2, nInput);
+ fillBin(chains, chainName.Data(), "L1", nInput);
+ fillBin(chains, chainName.Data(), "AfterPS", nInput);
+ fillBin(chains, chainName.Data(), "Output", nOutput);
+ for (size_t iStep=0; iStep<3; ++iStep) {
+ TString stepName = TString::Format("Step %lu", iStep);
+ size_t nStepMin = (8-iStep)*nInput/10;
+ size_t nStepMax = (9-iStep)*nInput/10;
+ size_t nStep = gRandom->Uniform(nStepMin, nStepMax);
+ size_t nDecisions = gRandom->Uniform(nStepMax, 2*nInput);
+ fillBin(chains, chainName.Data(), stepName.Data(), nStep);
+ fillBin(decisions, chainName.Data(), stepName.Data(), nDecisions);
+ }
+ }
+
+ f.Write();
+}
+
+void test_chainDump() {
+ delete gRandom;
+ gRandom = new TRandom3(1234); // arbitrary fixed seed
+ Info("test_chainDump", "Creating test file testChainDump1.root");
+ makeTestFile("testChainDump1.root");
+ gRandom->SetSeed(12345); // different arbitrary fixed seed
+ Info("test_chainDump", "Creating test file testChainDump2.root");
+ makeTestFile("testChainDump2.root");
+}
diff --git a/Trigger/TrigValidation/TrigValTools/test/test_chainDump.sh b/Trigger/TrigValidation/TrigValTools/test/test_chainDump.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c3e8aad0d581d339062bba5d73429cfb75ce92ba
--- /dev/null
+++ b/Trigger/TrigValidation/TrigValTools/test/test_chainDump.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+# Unit test for chainDump.py
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 root.C"
+ exit 1
+fi
+
+# Helpers:
+assert_pass() {
+ eval $@ || exit 1
+}
+
+assert_fail() {
+ eval $@ && exit 1
+}
+
+# Clean up files
+rm -f testChainDump1.root testChainDump2.root TotalEventsProcessed.txt HLTChain.txt HLTDecision.txt chainDump.json
+
+# Create histogram files:
+assert_pass root -l -b -n -q $1
+
+# Run chainDump
+assert_fail chainDump.py --json --fracTolerance=0.1 --intTolerance=10 \
+--totalHists total --countHists chains decisions \
+--histDict chains:HLTChain decisions:HLTDecision \
+-r testChainDump1.root -f testChainDump2.root
+
+# Print output files
+assert_pass cat TotalEventsProcessed.txt
+assert_pass cat HLTChain.txt
+assert_pass cat HLTDecision.txt
+assert_pass cat chainDump.json
+
+# If we get here all tests succeeded:
+exit 0
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 127d6bc21d33f5b464c754d0adb7d5c742607376..bf68a61cfcc7993a5481e54a9a5ca9a059574f06 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1,5 +1,3 @@
-TrigSignatureMoniMT 0 INFO The L1 seed to multi-item-seeded chain HLT_noalg_L1Standby could not be completely resolved. This is currently OK. Exception from menu access: L1Item L1_2EM13VH does not exist in the menu
-TrigSignatureMoniMT 0 INFO The L1 seed to multi-item-seeded chain HLT_noalg_L1Calo could not be completely resolved. This is currently OK. Exception from menu access: L1Item L1_2EM13VH does not exist in the menu
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292
TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #3136730292 Features 0 0 0 - - - - - - - - -
@@ -111,6 +109,9 @@ TrigSignatureMoniMT INFO -- #899946230 Features
TrigSignatureMoniMT INFO HLT_e17_lhvloose_nod0_L1EM15VH #140779220
TrigSignatureMoniMT INFO -- #140779220 Events 20 20 0 0 0 0 - - - - - - - - 0
TrigSignatureMoniMT INFO -- #140779220 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3 #1784800924
+TrigSignatureMoniMT INFO -- #1784800924 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1784800924 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1703681121 Features 1 2 0 - - - - - - - - -
@@ -129,12 +130,6 @@ TrigSignatureMoniMT INFO -- #2128128255 Features
TrigSignatureMoniMT INFO HLT_e3_etcut1step_g5_etcut_L12EM3 #1745513164
TrigSignatureMoniMT INFO -- #1745513164 Events 20 20 10 10 10 - - - - - - - - - 10
TrigSignatureMoniMT INFO -- #1745513164 Features 23 23 23 - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu26_L1EM8I_MU10 #2209076666
-TrigSignatureMoniMT INFO -- #2209076666 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2209076666 Features 0 0 0 0 0 0 0 0 - - - -
-TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 #2086577378
-TrigSignatureMoniMT INFO -- #2086577378 Events 20 20 0 0 0 0 0 - - - - - - - 0
-TrigSignatureMoniMT INFO -- #2086577378 Features 0 0 0 0 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - - - - - - - - - 14
TrigSignatureMoniMT INFO -- #683953566 Features 48 163 90 - - - - - - - - -
@@ -486,12 +481,6 @@ TrigSignatureMoniMT INFO -- #4065285611 Features
TrigSignatureMoniMT INFO HLT_noalg_L1J100 #1026959128
TrigSignatureMoniMT INFO -- #1026959128 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1J12 #2640820608
-TrigSignatureMoniMT INFO -- #2640820608 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2640820608 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1J120 #2116228652
-TrigSignatureMoniMT INFO -- #2116228652 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #2116228652 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J15 #1976430774
TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - - - - - - - -
@@ -534,9 +523,6 @@ TrigSignatureMoniMT INFO -- #4248050338 Features
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12IM #357557968
TrigSignatureMoniMT INFO -- #357557968 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #357557968 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1TAU20 #3602376876
-TrigSignatureMoniMT INFO -- #3602376876 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3602376876 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU20IM #1931583332
TrigSignatureMoniMT INFO -- #1931583332 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - - - - - - - -
@@ -549,9 +535,6 @@ TrigSignatureMoniMT INFO -- #1394621652 Features
TrigSignatureMoniMT INFO HLT_noalg_L1TAU60 #3332424451
TrigSignatureMoniMT INFO -- #3332424451 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1TAU8 #3165115874
-TrigSignatureMoniMT INFO -- #3165115874 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #3165115874 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE10 #1583053368
TrigSignatureMoniMT INFO -- #1583053368 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - - - - - - - -
@@ -609,9 +592,6 @@ TrigSignatureMoniMT INFO -- #2991490897 Features
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_FIRSTEMPTY #2214697960
TrigSignatureMoniMT INFO -- #2214697960 Events 20 20 - - - - - - - - - - - - 4
TrigSignatureMoniMT INFO -- #2214697960 Features - - - - - - - - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1RD1_BGRP10 #48519027
-TrigSignatureMoniMT INFO -- #48519027 Events 20 20 - - - - - - - - - - - - 20
-TrigSignatureMoniMT INFO -- #48519027 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1RD1_EMPTY #3925252528
TrigSignatureMoniMT INFO -- #3925252528 Events 20 20 - - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #3925252528 Features - - - - - - - - - - - -
@@ -654,6 +634,12 @@ TrigSignatureMoniMT INFO -- #2725693236 Features
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwo_L1TAU100 #886074432
TrigSignatureMoniMT INFO -- #886074432 Events 20 20 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #886074432 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau160_medium1_tracktwoEF_L1TAU100 #1720193283
+TrigSignatureMoniMT INFO -- #1720193283 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1720193283 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau160_medium1_tracktwo_L1TAU100 #4069120574
+TrigSignatureMoniMT INFO -- #4069120574 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4069120574 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 #1747754287
TrigSignatureMoniMT INFO -- #1747754287 Events 20 20 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - - - - - - - -
@@ -663,6 +649,12 @@ TrigSignatureMoniMT INFO -- #2334140248 Features
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwo_L1TAU100 #1799096347
TrigSignatureMoniMT INFO -- #1799096347 Events 20 20 0 0 0 - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau200_medium1_tracktwoEF_L1TAU100 #4203471951
+TrigSignatureMoniMT INFO -- #4203471951 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4203471951 Features 0 0 0 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100 #1468926272
+TrigSignatureMoniMT INFO -- #1468926272 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1468926272 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_track_L1TAU12IM #554271976
TrigSignatureMoniMT INFO -- #554271976 Events 20 20 3 3 - - - - - - - - - - 3
TrigSignatureMoniMT INFO -- #554271976 Features 4 4 - - - - - - - - - -
@@ -714,6 +706,9 @@ TrigSignatureMoniMT INFO -- #1275052132 Features
TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859
TrigSignatureMoniMT INFO -- #2456480859 Events 20 20 3 3 3 - - - - - - - - - 3
TrigSignatureMoniMT INFO -- #2456480859 Features 4 4 4 - - - - - - - - -
+TrigSignatureMoniMT INFO HLT_tau80_medium1_tracktwo_L1TAU60 #598963338
+TrigSignatureMoniMT INFO -- #598963338 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #598963338 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tilecalib_laser_TilePEB_L1CALREQ2 #1063154655
TrigSignatureMoniMT INFO -- #1063154655 Events 20 20 20 - - - - - - - - - - - 20
TrigSignatureMoniMT INFO -- #1063154655 Features 20 - - - - - - - - - - -
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
index 4d36210cf52b17683ab12dc6f359d8cd2a2f4b19..2a84539455c6a0a93f605d9da65f190d131783a8 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_newJO_build.py
@@ -46,7 +46,7 @@ test.check_steps = [check_log]
# Change RegTest pattern
#regtest = test.get_step('RegTest')
-#regtest.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
+#regtest.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*'
import sys
sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py
index 6eb24083fd91c9ff7a5acd4562bd188dec87cb2c..9e97298e354f41bbf184d2c0ab2d7323ec469191 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py
@@ -31,7 +31,7 @@ test.check_steps = CheckSteps.default_check_steps(test)
# Add a step comparing counts in the log against reference from test_trig_data_v1Dev_build
refcomp = CheckSteps.RegTestStep("CountRefComp")
-refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
+refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*'
refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
refcomp.required = True # Final exit code depends on this step
CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
index 04ba3739ca88c8bd104be6a124134530eda0dca6..606462a0cc42f12d9b4481801b52f89c5cfd67fd 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
@@ -42,7 +42,7 @@ msgcount.required = True # make the test exit code depend on this step
# Add a step comparing counts in the log against reference
refcomp = CheckSteps.RegTestStep("CountRefComp")
-refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
+refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*'
refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
refcomp.required = True # Final exit code depends on this step
CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py
index 5cb1502620d6ceb44966eb6c0301d3951d0af49e..55c710bd709a6f8da0079ddb2d5b05e15349a081 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py
@@ -31,7 +31,7 @@ test.check_steps = CheckSteps.default_check_steps(test)
# Add a step comparing counts in the log against reference from test_trig_data_v1Dev_build
refcomp = CheckSteps.RegTestStep("CountRefComp")
-refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
+refcomp.regex = r'TrigSignatureMoniMT\s*INFO\sHLT_.*|TrigSignatureMoniMT\s*INFO\s-- #[0-9]+ (Events|Features).*'
refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
refcomp.required = True # Final exit code depends on this step
CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 45852ae263f8c3bf8a7672904c74d9eee4ef9ff4..c490b065d94eeabeb95a38f12877e6815c61257d 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -137,6 +137,9 @@ TriggerHLTListRun3 = [
('xAOD::CaloClusterContainer#HLT_TopoCaloClustersLCFS', 'BS ESD AODFULL', 'Jet', 'alias:CaloClusterContainerShallowCopy'), # special argument indicating that this collection has a different Aux
('xAOD::ShallowAuxContainer#HLT_TopoCaloClustersLCFSAux.calE.calEta.calPhi', 'BS ESD AODFULL', 'Jet'),
+ # fullscan Jet Roi
+ ('TrigRoiDescriptorCollection#HLT_FSJETRoI', 'BS ESD AODFULL', 'Jet'),
+
# Not sure we need these two...
('xAOD::CaloClusterContainer#HLT_TopoCaloClustersRoI', 'BS ESD AODFULL', 'Egamma', 'inViews:precisionCaloViews'),
('xAOD::CaloClusterTrigAuxContainer#HLT_TopoCaloClustersRoIAux.nCells', 'BS ESD AODFULL', 'Egamma'),
@@ -235,7 +238,8 @@ TriggerHLTListRun3 = [
('xAOD::L2IsoMuonAuxContainer#HLT_MuonL2ISInfoAux.', 'BS ESD AODFULL', 'Muon'),
('TrigRoiDescriptorCollection#HLT_Roi_L2SAMuon', 'BS ESD AODFULL', 'Muon'),
- ('TrigRoiDescriptorCollection#HLT_Roi_L2SAMuonForEF', 'BS ESD AODFULL', 'Muon'),
+ ('TrigRoiDescriptorCollection#HLT_Roi_L2SAMuonForEF', 'BS ESD AODFULL', 'Muon'),
+ ('TrigRoiDescriptorCollection#HLT_Roi_MuonIso', 'BS ESD AODFULL', 'Muon'),
# Tau
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
index 7b875313fab3d499b0022cc44cb38e0e422826a7..f4cfb67c00b7a58b1fc49ea1deb959353540f061 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
@@ -4,7 +4,6 @@ from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.Logging import logging # loads logger
from PerfMonComps.PerfMonFlags import jobproperties
from AthenaCommon.Include import include
-from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
from RecExConfig.Configured import Configured
@@ -145,6 +144,7 @@ class HLTSimulationGetter(Configured):
log.info("Loading RegionSelector")
from AthenaCommon.AppMgr import ServiceMgr
+ from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
ServiceMgr += RegSelSvcDefault()
# Configure the Data Preparation for Calo
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
index fd2bf326217f050bae698eff97ee1b5bd20ddaf7..ca55bbce74f11ed655b2de815fec2e7387a19f1e 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerResultGetter.py
@@ -312,14 +312,16 @@ class TrigDecisionGetterRun2(Configured):
from TrigDecisionMaker.TrigDecisionMakerConfig import WriteTrigDecision
trigDecWriter = WriteTrigDecision() # noqa: F841
-# from TrigDecisionMaker.TrigDecisionMakerConfig import WritexAODTrigDecision
-# trigDecWriter = WritexAODTrigDecision()
+# WritexAODTrigDecision() is called within WriteTrigDecision()
# inform TD maker that some parts may be missing
if TriggerFlags.dataTakingConditions()=='Lvl1Only':
topSequence.TrigDecMaker.doL2=False
topSequence.TrigDecMaker.doEF=False
topSequence.TrigDecMaker.doHLT=False
+ topSequence.TrigNavigationCnvAlg.doL2 = False
+ topSequence.TrigNavigationCnvAlg.doEF = False
+ topSequence.TrigNavigationCnvAlg.doHLT = False
elif TriggerFlags.dataTakingConditions()=='HltOnly':
from AthenaCommon.AlgSequence import AlgSequence
topSequence.TrigDecMaker.doL1=False
@@ -327,9 +329,13 @@ class TrigDecisionGetterRun2(Configured):
# split HLT:
if not TriggerFlags.doMergedHLTResult():
topSequence.TrigDecMaker.doHLT = False
+ topSequence.TrigNavigationCnvAlg.doL2 = False
+ topSequence.TrigNavigationCnvAlg.doHLT = False
else:
topSequence.TrigDecMaker.doL2 = False
topSequence.TrigDecMaker.doEF = False
+ topSequence.TrigNavigationCnvAlg.doL2 = False
+ topSequence.TrigNavigationCnvAlg.doEF = False
pass
else:
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
index d8193e398fed470a9c34a618eb849d6f9afc3164..5a4a05121083f370ec9b4e8b2dbbb64861890de5 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
@@ -175,9 +175,9 @@ def Lvl1SimulationSequence( flags = None ):
# Topo
##################################################
+ l1TopoSim = None
if flags.Trigger.enableL1Phase1:
- log.info("No phase1 configuration for L1Topo simulation is available, adding L1TopoSimPlaceholder")
- l1TopoSim = AthSequencer("L1TopoSimPlaceholder")
+ log.info("No phase1 configuration for L1Topo simulation is available")
else:
from L1TopoSimulation.L1TopoSimulationConfig import L1TopoSimulation
l1TopoSim = L1TopoSimulation()
@@ -214,5 +214,9 @@ def Lvl1SimulationSequence( flags = None ):
ctpSim += [roib]
#l1Sim = seqAND("l1Sim", [caloTowerMaker] )
- l1Sim = seqAND("l1Sim", [l1CaloSim, l1MuonSim, l1TopoSim, ctpSim] )
+ if l1TopoSim:
+ l1Sim = seqAND("l1Sim", [l1CaloSim, l1MuonSim, l1TopoSim, ctpSim] )
+ else:
+ l1Sim = seqAND("l1Sim", [l1CaloSim, l1MuonSim, ctpSim] )
+
return l1Sim
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
index 7e1fadfdff17145a92721b86275866248a2c4d7f..7d0f92762e85bf7ee13f04f0140867600885abd5 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigGetter.py
@@ -250,8 +250,9 @@ class TriggerConfigGetter(Configured):
else: # Does not have xAODMeta
# Run-3 Trigger Configuration Services
from TrigConfigSvc.TrigConfigSvcCfg import getL1ConfigSvc, getHLTConfigSvc
- svcMgr += getL1ConfigSvc()
- svcMgr += getHLTConfigSvc()
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ svcMgr += getL1ConfigSvc(ConfigFlags)
+ svcMgr += getHLTConfigSvc(ConfigFlags)
# Needed for TrigConf::xAODMenuWriterMT
from TrigConfigSvc.TrigConfigSvcConfig import TrigConfigSvc
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/TriggerConfigCheckMetadata.py b/Trigger/TriggerCommon/TriggerJobOpts/share/TriggerConfigCheckMetadata.py
index f3fefa918577da8f85c8156d2ccc95b6ad24118e..1496a80e29639d37c4acef6e94501d1f59cb4fde 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/TriggerConfigCheckMetadata.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/TriggerConfigCheckMetadata.py
@@ -28,13 +28,11 @@ if len(athenaCommonFlags.PoolESDInput())>0 or len(athenaCommonFlags.PoolAODInput
TriggerFlags.dataTakingConditions.set_Value_and_Lock('Lvl1Only')
DQMonFlags.doHLTMon.set_Value_and_Lock(False) # now that some hltmon moved to ESDtoAOD
DQMonFlags.useTrigger.set_Value_and_Lock(False)
- TriggerFlags.NtupleProductionFlags.ProductionLocation.set_Value_and_Lock('')
if hasHLT and not hasLVL1:
log.error("This pool file does not contain LVL1 trigger information ")
log.info("Disabling trigger ntuples and trigger aware DQMonitoring but not HLT monitoring.")
TriggerFlags.dataTakingConditions.set_Value_and_Lock('HltOnly')
- TriggerFlags.NtupleProductionFlags.ProductionLocation.set_Value_and_Lock('')
DQMonFlags.useTrigger.set_Value_and_Lock(False)
DQMonFlags.doLVL1CaloMon.set_Value_and_Lock(False)
DQMonFlags.doCTPMon.set_Value_and_Lock(False)
@@ -56,7 +54,6 @@ if len(athenaCommonFlags.PoolESDInput())>0 or len(athenaCommonFlags.PoolAODInput
DQMonFlags.useTrigger.set_Value_and_Lock(False)
DQMonFlags.doLVL1CaloMon.set_Value_and_Lock(False)
DQMonFlags.doCTPMon.set_Value_and_Lock(False)
- TriggerFlags.NtupleProductionFlags.ProductionLocation.set_Value_and_Lock('')
try:
from MuonDQAMonFlags.MuonDQAProperFlags import MuonDQADetFlags
MuonDQADetFlags.doTGCL1Mon.set_Value_and_Lock(False)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index fda9b1d4e650ba9eed0fe2a8b654e989e638c0fd..9e450d8ff70e38b40c06d4f411ef4a071dec931a 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -25,9 +25,9 @@ class opt:
useCONDBR2 = True # if False, use run-1 conditions DB
condOverride = {} # overwrite conditions folder tags e.g. '{"Folder1":"Tag1", "Folder2":"Tag2"}'
doHLT = True # run HLT?
- doID = True # TriggerFlags.doID
- doCalo = True # TriggerFlags.doCalo
- doMuon = True # TriggerFlags.doMuon
+ doID = True # ConfigFlags.Trigger.doID
+ doCalo = True # ConfigFlags.Trigger.doCalo
+ doMuon = True # ConfigFlags.Trigger.doMuon
doDBConfig = None # dump trigger configuration
trigBase = None # file name for trigger config dump
enableCostD3PD = False # enable cost monitoring
@@ -142,7 +142,7 @@ if len(athenaCommonFlags.FilesInput())>0:
opt.setDetDescr = af.fileinfos.get('geometry',None)
if opt.setGlobalTag is None:
opt.setGlobalTag = af.fileinfos.get('conditions_tag',None) or \
- (TriggerFlags.OnlineCondTag() if opt.isOnline else 'CONDBR2-BLKPA-2018-13')
+ (ConfigFlags.Trigger.OnlineCondTag if opt.isOnline else 'CONDBR2-BLKPA-2018-13')
TriggerJobOpts.Modifiers._run_number = af.fileinfos['run_number'][0]
else: # athenaHLT
@@ -165,14 +165,13 @@ ConfigFlags.Input.Format = 'BS' if globalflags.InputFormat=='bytestream' else 'P
# Set final Cond/Geo tag based on input file, command line or default
-globalflags.DetDescrVersion = opt.setDetDescr or TriggerFlags.OnlineGeoTag()
+globalflags.DetDescrVersion = opt.setDetDescr or ConfigFlags.Trigger.OnlineGeoTag
ConfigFlags.GeoModel.AtlasVersion = globalflags.DetDescrVersion()
-globalflags.ConditionsTag = opt.setGlobalTag or TriggerFlags.OnlineCondTag()
+globalflags.ConditionsTag = opt.setGlobalTag or ConfigFlags.Trigger.OnlineCondTag
ConfigFlags.IOVDb.GlobalTag = globalflags.ConditionsTag()
# Other defaults
-jobproperties.Beam.beamType = 'collisions'
-ConfigFlags.Beam.Type = jobproperties.Beam.beamType()
+ConfigFlags.Beam.Type = jobproperties.Beam.beamType = 'collisions'
jobproperties.Beam.bunchSpacing = 25
globalflags.DatabaseInstance='CONDBR2' if opt.useCONDBR2 else 'COMP200'
ConfigFlags.IOVDb.DatabaseInstance=globalflags.DatabaseInstance()
@@ -183,8 +182,8 @@ globalflags.print_JobProperties()
# Set default doL1Sim option depending on input type (if not set explicitly)
if 'doL1Sim' not in globals():
- opt.doL1Sim = globalflags.DataSource != 'data'
- log.info('Setting default doL1Sim=%s because globalflags.DataSource=%s', opt.doL1Sim, globalflags.DataSource())
+ opt.doL1Sim = ConfigFlags.Input.isMC
+ log.info('Setting default doL1Sim=%s because ConfigFlags.Input.isMC=%s', opt.doL1Sim, ConfigFlags.Input.isMC)
# Translate opts to flags for LVL1
ConfigFlags.Trigger.doLVL1 = opt.doL1Sim
@@ -275,23 +274,23 @@ include.block("RecExCond/RecExCommon_flags.py")
#-------------------------------------------------------------
# Setting DetFlags
#-------------------------------------------------------------
-if globalflags.InputFormat.is_bytestream():
- TriggerFlags.doLVL1 = False
+if ConfigFlags.Input.Format == 'BS':
+ ConfigFlags.Trigger.doLVL1 = False
from AthenaCommon.DetFlags import DetFlags
-if TriggerFlags.doLVL1():
+if ConfigFlags.Trigger.doLVL1:
DetFlags.detdescr.all_setOn()
-if TriggerFlags.doID():
+if ConfigFlags.Trigger.doID:
DetFlags.detdescr.ID_setOn()
DetFlags.makeRIO.ID_setOn()
else:
DetFlags.ID_setOff()
-if TriggerFlags.doMuon():
+if ConfigFlags.Trigger.doMuon:
DetFlags.detdescr.Muon_setOn()
DetFlags.makeRIO.all_setOn()
else:
DetFlags.Muon_setOff()
-if TriggerFlags.doCalo():
+if ConfigFlags.Trigger.doCalo:
DetFlags.detdescr.Calo_setOn()
from LArConditionsCommon.LArCondFlags import larCondFlags
larCondFlags.LoadElecCalib.set_Value_and_Lock(False)
@@ -371,21 +370,18 @@ from AthenaCommon.DetFlags import DetFlags
DetFlags.BField_setOn()
include ("RecExCond/AllDet_detDescr.py")
-from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
-svcMgr += RegSelSvcDefault()
-
-if TriggerFlags.doID():
+if ConfigFlags.Trigger.doID:
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doPrintConfigurables = log.getEffectiveLevel() <= logging.DEBUG
include( "InDetRecExample/InDetRecCabling.py" )
-if TriggerFlags.doCalo():
+if ConfigFlags.Trigger.doCalo:
from TrigT2CaloCommon.TrigT2CaloCommonConfig import TrigDataAccess
svcMgr.ToolSvc += TrigDataAccess()
- if globalflags.InputFormat.is_pool():
- TriggerFlags.doTransientByteStream = True # enable transient BS if TrigDataAccess is used with pool data
+ if ConfigFlags.Input.Format == 'POOL':
+ ConfigFlags.Trigger.doTransientByteStream = True # enable transient BS if TrigDataAccess is used with pool data
-if TriggerFlags.doMuon():
+if ConfigFlags.Trigger.doMuon:
TriggerFlags.MuonSlice.doTrigMuonConfig=True
import MuonCnvExample.MuonCablingConfig # noqa: F401
import MuonRecExample.MuonReadCalib # noqa: F401
@@ -395,7 +391,7 @@ if TriggerFlags.doMuon():
# ---------------------------------------------------------------
# ID conditions
# ---------------------------------------------------------------
-if TriggerFlags.doID:
+if ConfigFlags.Trigger.doID:
from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
InDetTrigFlags.doPixelClusterSplitting = False
@@ -406,12 +402,12 @@ if TriggerFlags.doID:
# ----------------------------------------------------------------
# Pool input
# ----------------------------------------------------------------
-if globalflags.InputFormat.is_pool():
+if ConfigFlags.Input.Format == 'POOL':
import AthenaPoolCnvSvc.ReadAthenaPool # noqa
svcMgr.AthenaPoolCnvSvc.PoolAttributes = [ "DEFAULT_BUFFERSIZE = '2048'" ]
svcMgr.PoolSvc.AttemptCatalogPatch=True
# enable transient BS
- if TriggerFlags.doTransientByteStream():
+ if ConfigFlags.Trigger.doTransientByteStream:
log.info("setting up transient BS")
include( "TriggerJobOpts/jobOfragment_TransBS_standalone.py" )
@@ -431,7 +427,7 @@ elif globalflags.InputFormat.is_bytestream() and not ConfigFlags.Trigger.Online.
# ---------------------------------------------------------------
# Trigger config
# ---------------------------------------------------------------
-TriggerFlags.triggerMenuSetup = opt.setMenu
+ConfigFlags.Trigger.triggerMenuSetup = TriggerFlags.triggerMenuSetup = opt.setMenu
TriggerFlags.readLVL1configFromXML = True
TriggerFlags.outputLVL1configFile = None
@@ -454,12 +450,12 @@ hltTop += hltBeginSeq
topSequence += hltTop
if opt.doL1Unpacking:
- if globalflags.InputFormat.is_bytestream() or opt.doL1Sim:
+ if ConfigFlags.Input.Format == 'BS' or opt.doL1Sim:
ConfigFlags.Trigger.L1Decoder.forceEnableAllChains = opt.forceEnableAllChains
from L1Decoder.L1DecoderConfig import L1DecoderCfg
CAtoGlobalWrapper(L1DecoderCfg, ConfigFlags, seqName="HLTBeginSeq")
else:
- from TrigUpgradeTest.TestUtils import L1EmulationTest
+ from DecisionHandling.TestUtils import L1EmulationTest
hltBeginSeq += L1EmulationTest()
# ---------------------------------------------------------------
@@ -511,14 +507,14 @@ svcMgr.MessageSvc.infoLimit=10000
from TrigConfigSvc.TrigConfigSvcCfg import getHLTConfigSvc
-svcMgr += conf2toConfigurable( getHLTConfigSvc() )
+svcMgr += conf2toConfigurable( getHLTConfigSvc(ConfigFlags) )
if not opt.createHLTMenuExternally:
# the generation of the prescale set file from the menu (with all prescales set to 1)
# is not really needed. If no file is provided all chains are either enabled or disabled,
# depending on the property L1Decoder.PrescalingTool.KeepUnknownChains being True or False
from TrigConfigSvc.TrigConfigSvcCfg import createHLTPrescalesFileFromMenu
- createHLTPrescalesFileFromMenu()
+ createHLTPrescalesFileFromMenu(ConfigFlags)
@@ -622,6 +618,12 @@ if opt.reverseViews or opt.filterViews:
#-------------------------------------------------------------
include("TriggerTest/disableChronoStatSvcPrintout.py")
+#-------------------------------------------------------------
+# Disable spurious warnings from HepMcParticleLink, ATR-21838
+#-------------------------------------------------------------
+if ConfigFlags.Input.isMC:
+ svcMgr.MessageSvc.setError += ['HepMcParticleLink']
+
#-------------------------------------------------------------
# Enable xAOD::EventInfo decorations for pileup values
#-------------------------------------------------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
index 3c7c5270dc497fe07f440145bef4ad10ef0f3785..1e33b8641977d28194261d161bbd9399009e711c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerMenuMT/CMakeLists.txt
@@ -1,14 +1,8 @@
-################################################################################
-# Package: TriggerMenuMT
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TriggerMenuMT )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Trigger/TriggerCommon/TriggerJobOpts)
-
# External dependencies:
find_package( six )
@@ -49,8 +43,8 @@ function( atlas_build_lvl1_trigger_menu menu )
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_BINARY_DIR}/Menus/${menu}/
${CMAKE_XML_OUTPUT_DIRECTORY}/TriggerMenuMT
- COMMAND ${CMAKE_COMMAND} -E touch
- ${CMAKE_CURRENT_BINARY_DIR}/${menu}.stamp
+ #COMMAND ${CMAKE_COMMAND} -E touch # do not create stamp file to force rebuild every time
+ #${CMAKE_CURRENT_BINARY_DIR}/${menu}.stamp
DEPENDS "Package_$<JOIN:$<TARGET_PROPERTY:ATLAS_PACKAGES_TARGET,ATLAS_PACKAGES>,;Package_>" )
# Create custom target and add it to package dependencies
@@ -108,40 +102,45 @@ atlas_install_python_modules( python/*.py
python/LVL1MenuConfig
python/L1
python/HLTMenuConfig
- POST_BUILD_CMD ${ATLAS_FLAKE8})
-atlas_install_joboptions( share/*.py )
-
-atlas_install_scripts( scripts/generateMenuMT.py )
-atlas_install_scripts( scripts/generateL1MenuMT.sh )
-atlas_install_scripts( scripts/generateLVL1MenuMT.py )
-atlas_install_scripts( scripts/generateL1TopoMenuMT.py )
-atlas_install_scripts( scripts/test_HLTmenu.sh )
-atlas_install_scripts( scripts/generateL1MenuRun3.py )
-atlas_install_scripts( scripts/trigCompareOldandNewL1Menus.py )
-atlas_install_scripts( scripts/verify_menu_config.py )
+ POST_BUILD_CMD ${ATLAS_FLAKE8})
+
+atlas_install_scripts( scripts/generateMenuMT.py
+ scripts/generateL1MenuMT.sh
+ scripts/generateLVL1MenuMT.py
+ scripts/generateL1TopoMenuMT.py
+ scripts/test_HLTmenu.sh
+ scripts/generateL1MenuRun3.py
+ scripts/trigCompareOldandNewL1Menus.py
+ scripts/verify_menu_config.py
+ scripts/test_full_menu_cf.py )
+atlas_install_joboptions( share/*.py )
atlas_install_xmls( data/*.dtd data/*.xml )
-atlas_add_test( generateMenuMT_newJO SCRIPT python -m TriggerMenuMT.HLTMenuConfig.Menu.LS2_v1_newJO
- PROPERTIES TIMEOUT 500
- )
-
-atlas_add_test( ViewCFTest SCRIPT python -m unittest -v TriggerMenuMT.HLTMenuConfig.Test.ViewCFTest POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( generateMenuMT SCRIPT bash test_HLTmenu.sh
- PROPERTIES TIMEOUT 4000
- )
-
-# prparing to move the emulation tests from TUT
-#atlas_add_test( emu_step_processing
-# SCRIPT scripts/test_emu_step_processing.sh
-# LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
-# )
-
-#atlas_add_test( emu_step_menu_processing
-# SCRIPT scripts/test_emu_step_menu_processing.sh
-# LOG_SELECT_PATTERN "TrigSignatureMoniMT.*INFO HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*|TriggerSummaryStep.* chains passed:|TriggerSummaryStep.*+++ HLT_.*|TriggerSummaryStep.*+++ leg.*"
-# )
+#----------------------------------
+# Tests:
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_generateMenuMT_newJO )
+atlas_add_test( generateMenuMT_newJO
+ SCRIPT python -m TriggerMenuMT.HLTMenuConfig.Menu.LS2_v1_newJO
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_generateMenuMT_newJO
+ PROPERTIES TIMEOUT 500 )
+
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_ViewCFTest )
+atlas_add_test( ViewCFTest
+ SCRIPT python -m unittest -v TriggerMenuMT.HLTMenuConfig.Test.ViewCFTest
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_ViewCFTest
+ POST_EXEC_SCRIPT nopost.sh )
+
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_generateMenuMT )
+atlas_add_test( generateMenuMT
+ SCRIPT bash test_HLTmenu.sh
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_generateMenuMT
+ PROPERTIES TIMEOUT 4000 )
+
+file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_full_menu_cf )
+atlas_add_test( full_menu_cf
+ SCRIPT scripts/test_full_menu_cf.sh
+ PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_full_menu_cf )
#----------------------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
index 416d23ad7d36d25f14ee9a3a8e482a22ec431a58..a85e4eb3a139154550a6444c9cb1b8c546d75cdf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
@@ -38,7 +38,7 @@ def allTE_trkfast( signature="FS" ):
viewAlgs, viewVerify = makeInDetAlgs( whichSignature=signature, rois=inputMakerAlg.InViewRoIs )
vertexAlg = T2VertexBeamSpot_activeAllTE( "vertex_"+signature )
- vertexAlg.TrackCollections = ["TrigFastTrackFinder_Tracks_"+signature]
+ vertexAlg.TrackCollection = "TrigFastTrackFinder_Tracks_"+signature
viewVerify.DataObjects += [( 'TrigRoiDescriptorCollection' , 'StoreGateSvc+beamspotViewRoI_'+signature ),
( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
index 0b47542aaf456a1b0ed8f083cf4be66579afb1d2..abf095945895292f15dea693d496380d28e639da 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/CaloSequenceSetup.py
@@ -49,7 +49,7 @@ def fastCaloMenuSequence(name, doRinger):
HypoToolGen = TrigEgammaFastCaloHypoToolFromDict )
-def cellRecoSequence(flags, name="HLTCaloCellMakerFS", RoIs="FSJETRoI", outputName="CaloCellsFS"):
+def cellRecoSequence(flags, name="HLTCaloCellMakerFS", RoIs="HLT_FSJETRoI", outputName="CaloCellsFS"):
""" Produce the full scan cell collection """
if not RoIs:
from L1Decoder.L1DecoderConfig import mapThresholdToL1RoICollection
@@ -65,7 +65,7 @@ def cellRecoSequence(flags, name="HLTCaloCellMakerFS", RoIs="FSJETRoI", outputNa
return parOR(name+"RecoSequence", [alg]), alg.CellsName
def caloClusterRecoSequence(
- flags, name="HLTCaloClusterMakerFS", RoIs="FSJETRoI",
+ flags, name="HLTCaloClusterMakerFS", RoIs="HLT_FSJETRoI",
outputName="HLT_TopoCaloClustersFS"):
""" Create the EM-level fullscan clusters """
cell_sequence, cells_name = RecoFragmentsPool.retrieve(cellRecoSequence, flags=None, RoIs=RoIs)
@@ -79,7 +79,7 @@ def caloClusterRecoSequence(
return parOR(name+"RecoSequence", [cell_sequence, alg]), alg.CaloClusters
def LCCaloClusterRecoSequence(
- flags, name="HLTCaloClusterCalibratorLCFS", RoIs="FSJETRoI",
+ flags, name="HLTCaloClusterCalibratorLCFS", RoIs="HLT_FSJETRoI",
outputName="HLT_TopoCaloClustersLCFS"):
""" Create the LC calibrated fullscan clusters
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index b0f1d7e2a281316d128e4dc3916ef91583e6a9df..b76f533dc6654e2b47ede7196d75e4a53569433b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
@@ -33,6 +33,15 @@ def precisionCaloSequenceCfg( flags ):
def precisionElectronSequenceCfg( flags ):
return precisionElectronMenuSequence()
+# this must be moved to the HypoTool file:
+def diElectronMassComboHypoToolFromDict(chainDict):
+ from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaDielectronMassHypoTool
+ name = chainDict['chainName']
+ tool= TrigEgammaDielectronMassHypoTool(name)
+ tool.LowerMassElectronClusterCut = 50000
+ tool.UpperMassElectronClusterCut = 130000
+ return tool
+
#----------------------------------------------------------------
# Class to configure chain
#----------------------------------------------------------------
@@ -68,7 +77,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
log.debug('electron chain part = ' + str(self.chainPart))
key = self.chainPart['extra'] + self.chainPart['IDinfo'] + self.chainPart['L2IDAlg'] + self.chainPart['isoInfo']
-
+
for addInfo in self.chainPart['addInfo']:
key+=addInfo
@@ -110,6 +119,10 @@ class ElectronChainConfiguration(ChainConfigurationBase):
return self.getStep(3,stepName,[ precisionCaloSequenceCfg])
def getPrecisionElectron(self):
- stepName = "precision_electron"
- return self.getStep(4,stepName,[ precisionElectronSequenceCfg])
+ if "Zee" in self.chainName:
+ stepName = "precision_topoelectron"
+ return self.getStep(4,stepName,sequenceCfgArray=[precisionElectronSequenceCfg], comboTools=[diElectronMassComboHypoToolFromDict])
+ else:
+ stepName = "precision_electron"
+ return self.getStep(4,stepName,[ precisionElectronSequenceCfg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
index 719f2074bbbd17e8a5eb45e0fdbbb5fcb3cdbcd6..c73c0b8d6f7aa7b2c489d50aee9ce16373b8b6a2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
@@ -33,7 +33,6 @@ def precisionElectronRecoSequence(RoIs):
ViewVerifyTrk.DataObjects = [( 'TrackCollection' , 'StoreGateSvc+' + TrackCollection ),
( 'xAOD::CaloClusterContainer' , 'StoreGateSvc+' + precisionCaloMenuDefs.precisionCaloClusters ),
- ( 'CaloAffectedRegionInfoVec' , 'ConditionStore+LArAffectedRegionInfo' ),
( 'CaloCellContainer' , 'StoreGateSvc+CaloCells' ),
( 'SG::AuxElement' , 'StoreGateSvc+EventInfo.AveIntPerXDecor' ),
( 'SCT_FlaggedCondData' , 'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
@@ -43,7 +42,6 @@ def precisionElectronRecoSequence(RoIs):
# These objects must be loaded from SGIL if not from CondInputLoader
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
- topSequence.SGInputLoader.Load += [( 'CaloAffectedRegionInfoVec' , 'ConditionStore+LArAffectedRegionInfo' )]
from IOVDbSvc.CondDB import conddb
if not conddb.folderRequested( "PixelClustering/PixelClusNNCalib" ):
ViewVerifyTrk.DataObjects += [( 'TTrainedNetworkCollection' , 'ConditionStore+PixelClusterNN' ),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
index dd8227c24b0d3499db66fec55509f5eded8610ad..3810184c44cfa502bbf4ca5fc52a3d99dde83213 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
@@ -34,7 +34,7 @@ def jetAthSequence(dummyFlags, **jetRecoDict):
# Dummy flag arg needed so that each reco sequence is held separately
# in the RecoFragmentsPool -- only the kwargs are used to distinguish
# different sequences. New convention is just to pass "None" for flags
-def jetRecoSequence( dummyFlags, dataSource, RoIs = 'FSJETRoI', **jetRecoDict):
+def jetRecoSequence( dummyFlags, dataSource, RoIs = 'HLT_FSJETRoI', **jetRecoDict):
jetDefString = jetRecoDictToString(jetRecoDict)
recoSeq = parOR( "JetRecSeq_"+jetDefString, [])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
index 97789cf114ee819440148b76cdcfb02ce60e326c..e1ea95fc9a18559d9a7a51d53fe39404b13730cd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
@@ -17,7 +17,7 @@ def JetTrackingSequence(dummyFlags,trkopt,RoIs):
if trkopt=="ftf":
from TrigInDetConfig.InDetSetup import makeInDetAlgsNoView
# Guess FS rather than making it jet-specific?
- viewAlgs = makeInDetAlgsNoView( "JetFS", "FS", rois=RoIs )
+ viewAlgs = makeInDetAlgsNoView( "JetFS", "FS", rois=recordable(RoIs) )
jetTrkSeq += viewAlgs
tracksname = recordable("HLT_IDTrack_FS_FTF")
verticesname = recordable("HLT_IDVertex_FS")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
index 613bde8fab3bd9e5366404f090eb765951c2d438..bfd4ab99895c5d299b8cf18b1059117315989840 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/generateJet.py
@@ -10,11 +10,11 @@ log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Jet.generateJet' )
def HLTCaloCellMakerCfg( cellsname, cdaSvc ):
result = ComponentAccumulator()
verifier = CompFactory.AthViews.ViewDataVerifier( name = 'VDVFSCaloJet',
- DataObjects = [('TrigRoiDescriptorCollection', 'StoreGateSvc+FSJETRoI'),
+ DataObjects = [('TrigRoiDescriptorCollection', 'StoreGateSvc+HLT_FSJETRoI'),
('CaloBCIDAverage', 'StoreGateSvc+CaloBCIDAverage') ])
result.addEventAlgo( verifier )
cellmaker = CompFactory.HLTCaloCellMaker("HLTCaloCellMaker_FS")
- cellmaker.RoIs = "FSJETRoI"
+ cellmaker.RoIs = "HLT_FSJETRoI"
cellmaker.TrigDataAccessMT = cdaSvc
cellmaker.CellsName = cellsname
@@ -61,16 +61,17 @@ def generateChains( flags, chainDict ):
#hardcoded jet collection for now
clustermods = ["ECPSFrac","ClusterMoments"]
trigMinPt = 7e3
- TrigEMTopo = JetConstit( xAODType.CaloCluster, ["EM"])
- TrigEMTopo.rawname = clustersname
- TrigEMTopo.inputname = clustersname
- TrigAntiKt4EMTopoSubJES = JetDefinition( "AntiKt", 0.4, TrigEMTopo, ptmin=trigMinPt,ptminfilter=trigMinPt)
- TrigAntiKt4EMTopoSubJES.modifiers = ["Calib:TrigRun2:data:JetArea_EtaJES_GSC_Insitu","Sort"] + clustermods
-
- jetprefix="Trig"
- jetsuffix="subjesIS"
+ HLT_EMTopo = JetConstit( xAODType.CaloCluster, ["EM"])
+ HLT_EMTopo.rawname = clustersname
+ HLT_EMTopo.inputname = clustersname
+ HLT_AntiKt4EMTopo_subjesIS = JetDefinition( "AntiKt", 0.4, HLT_EMTopo, ptmin=trigMinPt,ptminfilter=trigMinPt)
+ HLT_AntiKt4EMTopo_subjesIS.modifiers = ["Calib:TrigRun2:data:JetArea_EtaJES_GSC_Insitu:HLT_Kt4EMTopoEventShape","Sort"] + clustermods
+
+ jetprefix="HLT_"
+ jetsuffix="_subjesIS"
+ evsprefix="HLT_"
# May need a switch to disable automatic modifier prerequisite generation
- jetRecoComps = JetRecConfig.JetRecCfg(TrigAntiKt4EMTopoSubJES, flags, jetprefix, jetsuffix)
+ jetRecoComps = JetRecConfig.JetRecCfg(HLT_AntiKt4EMTopo_subjesIS, flags, jetprefix, jetsuffix, evsprefix)
inEventReco.mergeReco(jetRecoComps)
acc.merge(inEventReco,stepReco.getName())
@@ -78,7 +79,7 @@ def generateChains( flags, chainDict ):
#hypo
from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetHypoToolFromDict
hypo = CompFactory.TrigJetHypoAlgMT("TrigJetHypoAlgMT_a4tcem_subjesIS")
- jetsfullname = jetprefix+TrigAntiKt4EMTopoSubJES.basename+jetsuffix+"Jets"
+ jetsfullname = jetprefix+HLT_AntiKt4EMTopo_subjesIS.basename+"Jets"+jetsuffix
hypo.Jets = jetsfullname
acc.addEventAlgo(hypo)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CFValidation.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CFValidation.py
index ded5ba448285c2075dbe9b458d99ce99ee71327d..b9afdb1b78c5353dbdef6f8d99eb46ae9d5b335d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CFValidation.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/CFValidation.py
@@ -20,6 +20,11 @@ def findViewAlgs( inputNodes, viewNodes ):
# If node is a sequence, explore further
if isSequence( node ):
+ # Empty nodes can cause Gaudi scheduler bug https://gitlab.cern.ch/gaudi/Gaudi/-/issues/135
+ if len( node.getChildren() ) == 0 and ( hasattr( node, "ModeOR" ) and node.ModeOR ):
+
+ raise RuntimeError( "Empty CF sequence in OR mode can cause Gaudi scheduler bug. Please remove " + node.getName() )
+
# Identify view CF nodes
if node.getName() in viewNodes.keys():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py
index 7de45793b0915579365da11e30560581d57666b4..a8eba131f7f89ccf29b8721b6e8143a0d0e5d57a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Cosmic_run3_v1.py
@@ -40,8 +40,9 @@ def setupMenu():
TriggerFlags.CosmicSlice.signatures = []
TriggerFlags.StreamingSlice.signatures = [
- ChainProp(name='HLT_noalg_idcosmic_L1TRT_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['IDCosmic','express'],groups=['RATE:SeededStreamers','BW:Other']),
- ChainProp(name='HLT_noalg_idcosmic_L1TRT_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['IDCosmic'],groups=['RATE:SeededStreamers','BW:Other']),
+ # Commented out due to ATR-21884
+ # ChainProp(name='HLT_noalg_idcosmic_L1TRT_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['IDCosmic','express'],groups=['RATE:SeededStreamers','BW:Other']),
+ # ChainProp(name='HLT_noalg_idcosmic_L1TRT_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['IDCosmic'],groups=['RATE:SeededStreamers','BW:Other']),
ChainProp(name='HLT_noalg_cosmicmuons_L1MU4_EMPTY', stream=['CosmicMuons','express'],groups=['RATE:Cosmic_Muon','BW:Muon']),
ChainProp(name='HLT_noalg_cosmiccalo_L1MU11_EMPTY', stream=['CosmicMuons','express'],groups=['RATE:Cosmic_Muon','BW:Muon']),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTMenuJSON.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTMenuJSON.py
index dba04e5537aaec87019e30822a24a9e3c41c1558..3ec6987198d595e9bef54649e388d4ab08f986d4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTMenuJSON.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTMenuJSON.py
@@ -128,7 +128,7 @@ def __generateJSON( chainDicts, chainConfigs, HLTAllSteps, menuName, fileName ):
def generateJSON():
__log.info("Generating HLT Menu JSON in the rec-ex-common job")
- from TriggerJobOpts.TriggerFlags import TriggerFlags
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
from AthenaCommon.AlgSequence import AlgSequence
from AthenaCommon.CFElements import findSubSequence
@@ -136,8 +136,8 @@ def generateJSON():
return __generateJSON( TriggerConfigHLT.dictsList(),
TriggerConfigHLT.configsList(),
findSubSequence(AlgSequence(), "HLTAllSteps"),
- TriggerFlags.triggerMenuSetup(),
- getHLTMenuFileName() )
+ ConfigFlags.Trigger.triggerMenuSetup,
+ getHLTMenuFileName(ConfigFlags) )
def generateJSON_newJO( chainDicts, chainConfigs, HLTAllSteps ):
__log.info("Generating HLT Menu JSON in the new JO")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 2120f5af3ac3c38b841167ce42b0a9efacad0d52..65f64887b1e6ee2349c3180bb95cbd1efe3013de 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -109,6 +109,7 @@ def setupMenu():
ChainProp(name='HLT_e5_lhmedium_noringer_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhtight_noringer_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_lhtight_noringer_nod0_L1EM3', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e20_lhmedium_e15_lhmedium_Zee_L12EM3', groups=MultiPhotonGroup),
# Primary
ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=SingleElectronGroup),
@@ -229,10 +230,17 @@ def setupMenu():
ChainProp(name="HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM", groups=SingleTauGroup),
ChainProp(name="HLT_tau160_idperf_track_L1TAU100",groups=SingleTauGroup),
ChainProp(name="HLT_tau0_perf_ptonly_L1TAU100",groups=SingleTauGroup),
+ ChainProp(name="HLT_tau80_medium1_tracktwo_L1TAU60",groups=SingleTauGroup),
ChainProp(name="HLT_tau160_idperf_tracktwo_L1TAU100",groups=SingleTauGroup),
ChainProp(name="HLT_tau160_perf_tracktwo_L1TAU100",groups=SingleTauGroup),
ChainProp(name="HLT_tau160_idperf_tracktwoMVA_L1TAU100",groups=SingleTauGroup),
ChainProp(name="HLT_tau160_perf_tracktwoMVA_L1TAU100",groups=SingleTauGroup),
+ ChainProp(name="HLT_tau160_medium1_tracktwo_L1TAU100",groups=SingleTauGroup),
+ ChainProp(name="HLT_tau160_medium1_tracktwoEF_L1TAU100",groups=SingleTauGroup),
+ ChainProp(name="HLT_tau200_medium1_tracktwoEF_L1TAU100",groups=SingleTauGroup),
+ ChainProp(name="HLT_tau200_mediumRNN_tracktwoMVA_L1TAU100",groups=SingleTauGroup),
+
+
]
TriggerFlags.BphysicsSlice.signatures = TriggerFlags.BphysicsSlice.signatures() + [
@@ -245,9 +253,6 @@ def setupMenu():
TriggerFlags.CombinedSlice.signatures = TriggerFlags.CombinedSlice.signatures() + [
# groups need to be properly assigned here later
-
- # Test chain that was using parallel merging with different number of steps, now serial merged with new menu
- ChainProp(name='HLT_e3_etcut1step_mu26_L1EM8I_MU10', l1SeedThresholds=['EM8I', 'MU10'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup),
# Primary e-mu chains
ChainProp(name='HLT_e17_lhloose_mu14_L1EM15VH_MU10', l1SeedThresholds=['EM15VH','MU10'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup),
ChainProp(name='HLT_e7_lhmedium_mu24_L1MU20',l1SeedThresholds=['EM3','MU20'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py
index 4b3a1f0fcd864263fef989008be777056195e32d..b6bb2353252746e2efde74b321ddee5ac85286fd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py
@@ -81,16 +81,16 @@ def addP1Signatures():
ChainProp(name='HLT_noalg_L1EM20VH', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=EgammaStreamersGroup),
ChainProp(name='HLT_noalg_L1EM22VHI', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=EgammaStreamersGroup),
- ChainProp(name='HLT_noalg_L1TAU8', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
+# ChainProp(name='HLT_noalg_L1TAU8', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
ChainProp(name='HLT_noalg_L1TAU12', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
- ChainProp(name='HLT_noalg_L1TAU20', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
+# ChainProp(name='HLT_noalg_L1TAU20', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
ChainProp(name='HLT_noalg_L1TAU30', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
ChainProp(name='HLT_noalg_L1TAU40', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
ChainProp(name='HLT_noalg_L1TAU60', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
ChainProp(name='HLT_noalg_L1TAU12IM', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
ChainProp(name='HLT_noalg_L1TAU20IM', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=TauStreamersGroup),
- ChainProp(name='HLT_noalg_L1J12', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
+# ChainProp(name='HLT_noalg_L1J12', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
ChainProp(name='HLT_noalg_L1J15', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
ChainProp(name='HLT_noalg_L1J20', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
ChainProp(name='HLT_noalg_L1J25', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
@@ -100,7 +100,7 @@ def addP1Signatures():
ChainProp(name='HLT_noalg_L1J75', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
ChainProp(name='HLT_noalg_L1J85', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
ChainProp(name='HLT_noalg_L1J100', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
- ChainProp(name='HLT_noalg_L1J120', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
+# ChainProp(name='HLT_noalg_L1J120', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
ChainProp(name='HLT_noalg_L1J400', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=JetStreamersGroup),
ChainProp(name='HLT_noalg_L1XE10', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=METStreamersGroup),
@@ -124,7 +124,7 @@ def addP1Signatures():
ChainProp(name='HLT_noalg_cosmiccalo_L1J30_EMPTY', stream=['CosmicCalo','express'],groups=['RATE:Cosmic_Calo','BW:Jet']),
ChainProp(name='HLT_noalg_cosmiccalo_L1J12_FIRSTEMPTY', stream=['CosmicCalo','express'],groups=['RATE:Cosmic_Calo','BW:Jet']),
ChainProp(name='HLT_noalg_cosmiccalo_L1J30_FIRSTEMPTY', stream=['CosmicCalo','express'],groups=['RATE:Cosmic_Calo','BW:Jet']),
- ChainProp(name='HLT_noalg_cosmiccalo_L1RD1_BGRP10', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo','express'],groups=['RATE:Calibration','BW:Detector']),
+# ChainProp(name='HLT_noalg_cosmiccalo_L1RD1_BGRP10', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo','express'],groups=['RATE:Calibration','BW:Detector']),
]
TriggerFlags.MonitorSlice.signatures = TriggerFlags.MonitorSlice.signatures() + [
ChainProp(name='HLT_costmonitor_CostMonDS_L1All', l1SeedThresholds=['FSNOSEED'], stream=['CostMonitoring'], groups=['RATE:Monitoring','BW:Other']),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index 0a1a4163edabdb01d7e564b8e39ce6b61832af8a..863a711fb1094a4efeee231f10fe91e7c38980a0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -116,7 +116,7 @@ def setupMenu():
ChainProp(name='HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6', groups=BphysicsGroup),
]
TriggerFlags.CombinedSlice.signatures = [
- ChainProp(name='HLT_e3_etcut1step_mu6fast_L1EM8I_MU10', l1SeedThresholds=['EM8I', 'MU10'], mergingStrategy='serial',stream=[PhysicsStream], groups=MultiElectronGroup), #L1 item thresholds in wrong order (EM first, then MU)
+# ChainProp(name='HLT_e3_etcut1step_mu6fast_L1EM8I_MU10', l1SeedThresholds=['EM8I', 'MU10'], mergingStrategy='serial',stream=[PhysicsStream], groups=MultiElectronGroup), #L1 item thresholds in wrong order (EM first, then MU)
]
TriggerFlags.HeavyIonSlice.signatures = []
TriggerFlags.BeamspotSlice.signatures = []
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 1018c922d09bd6492c744a620d2da9ebb5ebb65c..eb42124b4c2a12dd84790d0cdc3b881171dff538 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -840,3 +840,4 @@ def getBasePattern():
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
index 92e9b57bb62f20b718e8413c68b2c14f76f68888..8b80aeabf3a7ab93dff16e687f22055141b5d973 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
@@ -135,12 +135,6 @@ class MuonChainConfiguration(ChainConfigurationBase):
else:
doOvlpRm = False
-
-
- # tmp comment out OverlapRm /FP:
- doOvlpRm= False
-
-
if doOvlpRm:
return self.getStep(1,"mufast", [muFastOvlpRmSequenceCfg] )
else:
@@ -158,11 +152,6 @@ class MuonChainConfiguration(ChainConfigurationBase):
else:
doOvlpRm = False
-
- # tmp comment out OverlapRm /FP:
- doOvlpRm= False
-
-
if doOvlpRm:
return self.getStep(2, 'muComb', [muCombOvlpRmSequenceCfg] )
else:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
index 19bbc092b6f02992294cffe3518aee841dc3132d..6e74f9bf4a14ab6d6a19bfc51ccd7ef9714a979f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
@@ -86,19 +86,12 @@ def muFastOvlpRmSequence():
trigMufastHypo = TrigMufastHypoAlg("TrigL2MufastHypoAlg")
trigMufastHypo.MuonL2SAInfoFromMuFastAlg = sequenceOut
- from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolFromDict
-
- ### set up MuSAOverlapRemoval ###
- from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigL2MuonOverlapRemoverMufastAlg
- trigL2MuonOverlapRemover = TrigL2MuonOverlapRemoverMufastAlg("TrigL2MuonOverlapRemoverMufastAlg")
- trigL2MuonOverlapRemover.L2MuonOverlapInfoFromMuFastAlg = sequenceOut
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMufastHypoToolwORFromDict
- from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigL2MuonOverlapRemoverMufastToolFromDict
-
return MenuSequence( Sequence = l2muFastSequence,
Maker = l2MuViewsMaker,
- Hypo = [trigMufastHypo, trigL2MuonOverlapRemover],
- HypoToolGen = [TrigMufastHypoToolFromDict, TrigL2MuonOverlapRemoverMufastToolFromDict] )
+ Hypo = trigMufastHypo,
+ HypoToolGen = TrigMufastHypoToolwORFromDict )
#-----------------------------------------------------#
@@ -185,20 +178,13 @@ def muCombOvlpRmSequence():
trigmuCombHypo = TrigmuCombHypoAlg("TrigL2MuCBHypoAlg")
trigmuCombHypo.MuonL2CBInfoFromMuCombAlg = sequenceOut
- from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigmuCombHypoToolFromDict
-
- ### set up MuSAOverlapRemoval ###
- from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigL2MuonOverlapRemoverMucombAlg
- trigL2MuonOverlapRemover = TrigL2MuonOverlapRemoverMucombAlg("TrigL2MuonOverlapRemoverMucombAlg")
- trigL2MuonOverlapRemover.L2MuonOverlapInfoFromMuCombAlg = sequenceOut
-
- from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigL2MuonOverlapRemoverMucombToolFromDict
+ from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigmuCombHypoToolwORFromDict
return MenuSequence( Sequence = l2muCombSequence,
Maker = l2muCombViewsMaker,
- Hypo = [trigmuCombHypo, trigL2MuonOverlapRemover],
- HypoToolGen = [TrigmuCombHypoToolFromDict, TrigL2MuonOverlapRemoverMucombToolFromDict] )
-
+ Hypo = trigmuCombHypo,
+ HypoToolGen = TrigmuCombHypoToolwORFromDict )
+
######################
@@ -327,6 +313,7 @@ def muEFCBSequence():
from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFHypoAlg
trigMuonEFCBHypo = TrigMuonEFHypoAlg( "TrigMuonEFCombinerHypoAlg" )
trigMuonEFCBHypo.MuonDecisions = sequenceOut
+ trigMuonEFCBHypo.MapToPreviousDecisions=True
from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFCombinerHypoToolFromDict
@@ -568,7 +555,7 @@ def muEFIsoAlgSequence(ConfigFlags):
newRoITool = ViewCreatorCentredOnIParticleROITool()
newRoITool.RoIEtaWidth=0.15
newRoITool.RoIPhiWidth=0.15
- newRoITool.RoisWriteHandleKey = "IsoMuRoIs"
+ newRoITool.RoisWriteHandleKey = recordable("HLT_Roi_MuonIso")
#
efmuIsoViewsMaker.mergeUsingFeature = True
efmuIsoViewsMaker.RoITool = newRoITool
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index a2fe1fa9b5495dc481205e008c4ade4cadbf3540..18459b37953b4e59b1bb901fd87187f213fd2d27 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -731,10 +731,10 @@ def muEFCBRecoSequence( RoIs, name ):
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigConditionsAccess import SCT_ConditionsSetup
from SCT_ConditionsTools.SCT_ConditionsToolsConf import SCT_ConditionsSummaryTool
- ToolSvc.AtlasHoleSearchTool.SctSummaryTool = SCT_ConditionsSummaryTool(SCT_ConditionsSetup.instanceName('InDetSCT_ConditionsSummaryToolWithoutFlagged'))
+ ToolSvc.AtlasHoleSearchTool.BoundaryCheckTool.SctSummaryTool = SCT_ConditionsSummaryTool(SCT_ConditionsSetup.instanceName('InDetSCT_ConditionsSummaryToolWithoutFlagged'))
from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSCTConditionsSummaryTool
- ToolSvc.CombinedMuonIDHoleSearch.SctSummaryTool = InDetTrigSCTConditionsSummaryTool
+ ToolSvc.CombinedMuonIDHoleSearch.BoundaryCheckTool.SctSummaryTool = InDetTrigSCTConditionsSummaryTool
#MS ID combination
candidatesName = "MuonCandidates"
@@ -775,6 +775,7 @@ def muEFInsideOutRecoSequence(RoIs, name):
from MuonRecExample.MuonStandalone import MooSegmentFinderAlg
from MuonCombinedRecExample.MuonCombinedAlgs import MuonCombinedInDetCandidateAlg, MuonInsideOutRecoAlg, MuGirlStauAlg, MuonCreatorAlg, StauCreatorAlg
from MuonCombinedAlgs.MuonCombinedAlgsMonitoring import MuonCreatorAlgMonitoring
+ from MuonRecExample.MuonRecFlags import muonRecFlags
efAlgs = []
@@ -789,6 +790,7 @@ def muEFInsideOutRecoSequence(RoIs, name):
#need MdtCondDbAlg for the MuonStationIntersectSvc (required by segment and track finding)
from AthenaCommon.AlgSequence import AthSequencer
from MuonCondAlg.MuonTopCondAlgConfigRUN2 import MdtCondDbAlg
+ import AthenaCommon.CfgGetter as CfgGetter
if not athenaCommonFlags.isOnline:
condSequence = AthSequencer("AthCondSeq")
if not hasattr(condSequence,"MdtCondDbAlg"):
@@ -796,8 +798,34 @@ def muEFInsideOutRecoSequence(RoIs, name):
# Sets up and configures the muon alignment:
from MuonRecExample import MuonAlignConfig # noqa: F401
- theSegmentFinderAlg = MooSegmentFinderAlg("TrigLateMuonSegmentMaker_"+name)
- efAlgs.append(theSegmentFinderAlg)
+ if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
+ theMuonLayerHough = CfgMgr.MuonLayerHoughAlg( "MuonLayerHoughAlg")
+ efAlgs.append(theMuonLayerHough)
+ SegmentFinder = CfgGetter.getPublicTool("MuonClusterSegmentFinderTool")
+ Cleaner = CfgGetter.getPublicToolClone("MuonTrackCleaner_seg","MuonTrackCleaner")
+ Cleaner.Extrapolator = CfgGetter.getPublicTool("MuonStraightLineExtrapolator")
+ Cleaner.Fitter = CfgGetter.getPublicTool("MCTBSLFitterMaterialFromTrack")
+ Cleaner.PullCut = 3
+ Cleaner.PullCutPhi = 3
+ SegmentFinder.TrackCleaner = Cleaner
+
+ theSegmentFinderAlg = CfgMgr.MuonSegmentFinderAlg( "TrigMuonSegmentMaker_"+name,SegmentCollectionName="MuonSegments",
+ MuonPatternCalibration = CfgGetter.getPublicTool("MuonPatternCalibration"),
+ MuonPatternSegmentMaker = CfgGetter.getPublicTool("MuonPatternSegmentMaker"),
+ MuonTruthSummaryTool = None)
+ # we check whether the layout contains any CSC chamber and if yes, we check that the user also wants to use the CSCs in reconstruction
+ if MuonGeometryFlags.hasCSC() and muonRecFlags.doCSCs():
+ CfgGetter.getPublicTool("CscSegmentUtilTool")
+ CfgGetter.getPublicTool("Csc2dSegmentMaker")
+ CfgGetter.getPublicTool("Csc4dSegmentMaker")
+ else:
+ theSegmentFinderAlg.Csc2dSegmentMaker = ""
+ theSegmentFinderAlg.Csc4dSegmentMaker = ""
+
+ else:
+ theSegmentFinderAlg = MooSegmentFinderAlg("TrigLateMuonSegmentMaker_"+name)
+
+ efAlgs.append(theSegmentFinderAlg)
# need to run precisions tracking for late muons, since we don't run it anywhere else
TrackCollection="TrigFastTrackFinder_Tracks_MuonLate"
@@ -821,7 +849,7 @@ def muEFInsideOutRecoSequence(RoIs, name):
from AthenaCommon.AppMgr import ToolSvc
from InDetTrigRecExample.InDetTrigConditionsAccess import SCT_ConditionsSetup
from SCT_ConditionsTools.SCT_ConditionsToolsConf import SCT_ConditionsSummaryTool
- ToolSvc.CombinedMuonIDHoleSearch.SctSummaryTool = SCT_ConditionsSummaryTool(SCT_ConditionsSetup.instanceName('InDetSCT_ConditionsSummaryToolWithoutFlagged'))
+ ToolSvc.CombinedMuonIDHoleSearch.BoundaryCheckTool.SctSummaryTool = SCT_ConditionsSummaryTool(SCT_ConditionsSetup.instanceName('InDetSCT_ConditionsSummaryToolWithoutFlagged'))
efAlgs.append(theIndetCandidateAlg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
index efc54c001babceceed00d6955b6b8092692e23eb..4384df2ad8b894829ef6791211c3530ac2e658bd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Photon/PhotonRecoSequences.py
@@ -28,13 +28,7 @@ def precisionPhotonRecoSequence(RoIs):
import AthenaCommon.CfgMgr as CfgMgr
ViewVerify = CfgMgr.AthViews__ViewDataVerifier("PrecisionPhotonPhotonViewDataVerifier")
ViewVerify.DataObjects = [( 'xAOD::CaloClusterContainer' , 'StoreGateSvc+' + precisionCaloMenuDefs.precisionCaloClusters ),
- ( 'CaloCellContainer' , 'StoreGateSvc+CaloCells' ),
- ( 'CaloAffectedRegionInfoVec' , 'ConditionStore+LArAffectedRegionInfo' )]
-
- # Make sure the required objects are still available at whole-event level
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
- topSequence.SGInputLoader.Load += [( 'CaloAffectedRegionInfoVec' , 'ConditionStore+LArAffectedRegionInfo' )]
+ ( 'CaloCellContainer' , 'StoreGateSvc+CaloCells' )]
# Retrieve the factories now
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
index a6328ace435f7038a9ee21011b43c8f71436432e..f1aa4c6eb47b6cca1620c3035fbd48e164440bf7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
@@ -7,8 +7,8 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Test.TestDef")
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
-from TrigUpgradeTest.HLTSignatureConfig import muMenuSequence, elMenuSequence, gamMenuSequence
-from TrigUpgradeTest.HLTSignatureHypoTools import dimuDrComboHypoTool
+from DecisionHandling.HLTSignatureConfig import muMenuSequence, elMenuSequence, gamMenuSequence
+from DecisionHandling.HLTSignatureHypoTools import dimuDrComboHypoTool
#--------------------------------------------------------
# fragments generating config will be functions in new JO
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/ViewCFTest.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/ViewCFTest.py
index 5b5dbf7b3b5459f22189690bd6631d3c5160435a..4721965a9c2ce6cb8b8d716c346223636a997ca7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/ViewCFTest.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/ViewCFTest.py
@@ -20,8 +20,12 @@ class ViewCFTest( unittest.TestCase ):
vdv1 = CfgMgr.AthViews__ViewDataVerifier("vdv1")
vdv2 = CfgMgr.AthViews__ViewDataVerifier("vdv2")
- # Add an algorithm to a sequence
+ # Test error for empty sequence
topSequence += seqOR( "makeViewSequence" )
+ with self.assertRaisesRegex( RuntimeError, "Please remove makeViewSequence" ):
+ findViewAlgs( topSequence.getChildren(), {} )
+
+ # Add an algorithm to the sequence
topSequence.makeViewSequence += evca1
#topSequence.makeViewSequence += evca2
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
index cca5145d6be95dbc4d794dee142ee1db48e2d8b4..4752255af54200376c797cb875febe4445a77cee 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Items.py
@@ -183,3 +183,29 @@ class PrescaleHandler(object):
for itemList in self.itemsByPartition.values():
itemList.sort(lambda x,y: cmp(x.ctpid,y.ctpid))
+
+class meta_d(type):
+ def __getattr__(cls, attr):
+ import traceback
+ isTopo = any(filter(lambda x: attr.startswith(x), ["R2TOPO_", "TOPO_", "MUTOPO_", "MULTTOPO_"]))
+ fs = traceback.extract_stack()[-2]
+ expProdFile = "L1/Config/"
+ if isTopo:
+ if attr.startswith("R2TOPO_"):
+ expProdFile += "TopoAlgoDefLegacy.py"
+ elif attr.startswith("TOPO_"):
+ expProdFile += "TopoAlgoDef.py"
+ elif attr.startswith("MUTOPO_"):
+ expProdFile += "TopoAlgoDefMuctpi.py"
+ elif attr.startswith("MULTTOPO_"):
+ expProdFile += "TopoMultiplicityAlgoDef.py"
+ else:
+ isLegacyThr = any(filter(lambda x: attr.startswith(x), ["EM", "TAU", "J", "XE", "TE", "XS"]))
+ if isLegacyThr:
+ expProdFile += "ThresholdDefLegacy.py"
+ else:
+ expProdFile += "ThresholdDef.py"
+
+ msg = "Item definition issue in file %s, line %i. Threshold %s has not been defined in %s" % ('/'.join(fs.filename.rsplit('/',4)[1:]),fs.lineno, attr, expProdFile)
+ log.error(msg)
+ raise RuntimeError(msg)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu.py
index 645350d48005bd71e24c4a48d978dd70d4f4e160..d00b2c1d597586a84a3317ea985b237e2c48d645 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/L1Menu.py
@@ -68,7 +68,7 @@ class L1Menu(object):
def addTopoAlgo(self, algo, category):
- algo.setThresholds( self.thresholds )
+ algo.setThresholds( self.thresholds ) # each algo gets a pointer to the full thresholds definition (for the extrainfo)
self.topoAlgos.addAlgo(algo, category)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
index c8a591d92c4760ae998b9088bf09095eb8a6a6bd..08566f9453239705742959d64156b92626df3da8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/MenuConfObj.py
@@ -4,13 +4,13 @@ from AthenaCommon.Logging import logging
log = logging.getLogger("Menu.L1.Base.MenuConfObj")
class TopoMenuDef:
+
__slots__ = [ "algoname", "outputlines", "outputbits" ]
def __init__(self, algoname, outputlines = None, outputbits = None):
if outputlines and len(outputlines) == 1 and algoname == outputlines[0]:
log.info("... outputlines can be ommitted for topo algo %s", algoname)
-
if outputlines is None:
outputlines = [ algoname ]
# check that there is no ',' in any of the output names
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
index e2948d0dc93029cabc9da8984524c289ddf8e997..fb8a2a6f2d1dac158c027f7624cd8766a8c8fb58 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
@@ -65,7 +65,7 @@ class MenuThresholdsCollection( object ):
def json(self):
confObj = odict()
- for ttype in (ThrType.Run3Types() + ThrType.NIMTypes() + [ThrType.TOPO, ThrType.MUTOPO, ThrType.MULTTOPO ]):
+ for ttype in (ThrType.Run3Types() + ThrType.NIMTypes() + [ThrType.TOPO, ThrType.MUTOPO ]):
confObj[ttype.name] = odict()
confObj[ttype.name]["type"] = ttype.name
confObj[ttype.name]["thresholds"] = odict()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgorithms.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgorithms.py
index 7fd14b6c9d47bb348ba75a1cbf26c4a30cccec36..604ae7398dda7d086781921a30d3e8085a875726 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgorithms.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgorithms.py
@@ -18,15 +18,16 @@ class AlgType(Enum):
self.key = key
class AlgCategory(Enum):
- TOPO = (1, 'TOPO', 'new topo')
- MUCTPI = (2, 'MUTOPO', 'muctpi topo')
- LEGACY = (3, 'R2TOPO', 'legacy topo')
- MULTI = (4, 'MULTTOPO', 'multiplicity topo')
+ TOPO = (1, 'TOPO', 'new topo', 'TopoAlgoDef')
+ MUCTPI = (2, 'MUTOPO', 'muctpi topo', 'TopoAlgoDefMuctpi')
+ LEGACY = (3, 'R2TOPO', 'legacy topo', 'TopoAlgoDefLegacy')
+ MULTI = (4, 'MULTTOPO', 'multiplicity topo', 'TopoAlgoDefMultiplicity')
- def __init__(self, _, key, desc ):
+ def __init__(self, _, key, desc, defFile ):
self.key = key
self.prefix = key + '_' if key else ''
self.desc = desc
+ self.defFile = defFile
def __str__(self):
return self.desc
@@ -71,9 +72,6 @@ class MenuTopoAlgorithmsCollection(object):
else:
raise RuntimeError("Trying to add topo algorithm %s of unknown type %s to the menu" % (algo.name, type(algo)))
- if category != AlgCategory.MULTI and algo.name.startswith(category.prefix):
- algo.name = algo.name.split(category.prefix,1)[-1]
-
if algType not in self.topoAlgos[category]:
self.topoAlgos[category][algType] = odict()
@@ -84,6 +82,13 @@ class MenuTopoAlgorithmsCollection(object):
def json(self):
+ def idGenerator(usedIds, start):
+ while True:
+ while start in usedIds:
+ start += 1
+ yield start
+ start += 1
+
confObj = odict()
for cat in self.topoAlgos:
confObj[cat.key] = odict()
@@ -92,4 +97,11 @@ class MenuTopoAlgorithmsCollection(object):
for alg in sorted(self.topoAlgos[cat][typ].values(), key=attrgetter('name')):
confObj[cat.key][typ.key][alg.name] = alg.json()
+ # set unspecified algoIds to a unique value
+ usedAlgIds = set([x["algId"] for x in confObj[cat.key][typ.key].values() if x["algId"]>=0])
+ autoId = idGenerator(usedAlgIds, 0)
+ for algJsonEntry in confObj[cat.key][typ.key].values():
+ if algJsonEntry["algId"] < 0:
+ algJsonEntry["algId"] = next(autoId)
+
return confObj
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
index 0c065499e90f1622642c324e29d64f81126f1f9a..0d59427cd81e70c84bcb73c824fa0b182245a51e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/TopoAlgos.py
@@ -1,5 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+from collections import OrderedDict as odict
+
from AthenaCommon.Logging import logging
from TriggerJobOpts.TriggerFlags import TriggerFlags
import re
@@ -8,15 +10,22 @@ from .ThresholdType import ThrType
log = logging.getLogger("Menu.L1.Base.TopoAlgos")
+##
+## These classes are base classes for the auto-generated algorithm python representations
+##
+## C++ L1Topo algorithms are defined in Trigger/TrigT1/L1Topo/L1TopoAlgorithms
+## During the build, from each class a python class is generated and put in the release
+## Those generated python classes derive fro SortingAlgo and DecisionAlgo below.
+
class TopoAlgo(object):
_availableVars = []
#__slots__ = ['_name', '_selection', '_value', '_generic']
- def __init__(self, classtype, name, algoId=0):
+ def __init__(self, classtype, name, algoId=-1):
self.classtype = classtype
self.name = name
- self.algoId = int(algoId)
+ self.algoId = algoId
self.generics = []
self.variables = []
@@ -51,14 +60,14 @@ class TopoAlgo(object):
return self
def json(self):
- from collections import OrderedDict as odict
confObj = odict()
confObj["algId"] = self.algoId
+ confObj["klass"] = self.classtype
return confObj
def getScaleToCountsEM(self):
tw = self.menuThr.typeWideThresholdConfig(ThrType["EM"])
- return 1000 / tw["resolutionMeV"]
+ return 1000 // tw["resolutionMeV"]
class Variable(object):
def __init__(self, name, selection, value):
@@ -73,7 +82,7 @@ class Generic(object):
if isinstance(value,HardwareConstrainedParameter):
self.value = ":%s:" % value.name
else:
- self.value = str(int(value))
+ self.value = value
class SortingAlgo(TopoAlgo):
@@ -85,7 +94,7 @@ class SortingAlgo(TopoAlgo):
self.inputvalue= self.inputs
if self.inputs.find("Cluster")>=0: # to extract inputvalue (for FW) from output name
if self.outputs.find("TAU")>=0:
- self.inputvalue= self.inputvalue.replace("Cluster","Tau")
+ self.inputvalue= self.inputvalue.replace("Cluster","Tau")
if self.outputs.find("EM")>=0:
self.inputvalue= self.inputvalue.replace("Cluster","Em")
@@ -93,16 +102,10 @@ class SortingAlgo(TopoAlgo):
return True
def json(self):
- from collections import OrderedDict as odict
- confObj = odict()
- confObj["algId"] = self.algoId
+ confObj = super(SortingAlgo, self).json()
+ confObj["input"] = self.inputvalue
confObj["output"] = self.outputs
- confObj["type"] = self.classtype
confObj["fixedParameters"] = odict()
- confObj["fixedParameters"]["input"] = odict([(self.inputs,self.inputvalue)])
- confObj["fixedParameters"]["output"] = odict([("TobArrayOut",self.outputs)])
- confObj["fixedParameters"]["generics"] = [(genParm.name, genParm.value) for genParm in self.generics]
-
confObj["fixedParameters"]["generics"] = odict()
for (pos, genParm) in enumerate(self.generics):
confObj["fixedParameters"]["generics"][genParm.name] = odict([("value", genParm.value), ("position", pos)])
@@ -118,6 +121,9 @@ class SortingAlgo(TopoAlgo):
if "MU" in self.outputs and variable.value > _mu_for_decision:
variable.value -= _mu_for_decision
confObj["variableParameters"].append(odict([("name", variable.name),("value", variable.value)]))
+
+ if type(variable.value) == float:
+ raise RuntimeError("In algorithm %s the variable %s with value %r is of type float but must be int" % (self.name,variable.name,variable.value))
return confObj
def xml(self):
@@ -160,25 +166,11 @@ class DecisionAlgo(TopoAlgo):
return True
def json(self):
- from collections import OrderedDict as odict
- confObj = odict()
- confObj["algId"] = self.algoId
- confObj["type"] = self.classtype
+ confObj = super(DecisionAlgo, self).json()
+ confObj["input"] = self.inputs # list of input names
confObj["output"] = self.outputs # list of output names
# fixed parameters
confObj["fixedParameters"] = odict()
- if len(self.inputs)==1:
- confObj["fixedParameters"]["inputs"] = [ odict([ ("name","Tob"), ("value",self.inputs[0]), ("position",0) ]) ]
- else:
- confObj["fixedParameters"]["inputs"] = list()
- input_woovlp = set()
- for (tobid, input) in enumerate(self.inputs):
- if input in input_woovlp:
- continue
- input_woovlp.add(input)
- confObj["fixedParameters"]["inputs"] += [ odict( [ ("name","Tob%i" % (tobid+1) ), ("value",input), ("position",tobid) ] ) ]
-
- #confObj["fixedParameters"]["outputs"] = [odict([("selection",bit),("name", name)]) for bit,name in enumerate(self.outputs)]
confObj["fixedParameters"]["generics"] = odict()
for (pos, genParm) in enumerate(self.generics):
confObj["fixedParameters"]["generics"][genParm.name] = odict([("value", genParm.value), ("position", pos)])
@@ -200,6 +192,9 @@ class DecisionAlgo(TopoAlgo):
if (len(self.inputs)>1 and (variable.name==_minet+str(tobid+1) or (tobid==0 and variable.name==_minet))) or (len(self.inputs)==1 and (variable.name.find(_minet)>=0)):
variable.value = ((variable.value - _mu_for_decision ) if variable.value>0 else variable.value)
+ if type(variable.value) == float:
+ raise RuntimeError("In algorithm %s the variable %s with value %r is of type float but must be int" % (self.name,variable.name,variable.value))
+
if variable.selection >= 0:
confObj["variableParameters"].append(odict([("name", variable.name), ("selection",variable.selection), ("value", variable.value)]))
else:
@@ -274,9 +269,7 @@ class MultiplicityAlgo(TopoAlgo):
pass
def json(self):
- from collections import OrderedDict as odict
- confObj = odict()
- confObj["type"] = self.classtype
+ confObj = super(MultiplicityAlgo, self).json()
confObj["threshold"] = self.threshold
confObj["input"] = self.input
confObj["output"] = self.outputs
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index 91548a3eb5a6d64e010429d7447fec0546e2e7a4..f81b7801a308a3faca5b55f4d6667639b86a3531 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -16,7 +16,7 @@ log = logging.getLogger('Menu.L1.Config.ItemDef')
# The trigger types
from ..Base.Limits import Limits
from ..Base.Logic import Logic, Not
-from ..Base.Items import MenuItem
+from ..Base.Items import MenuItem, meta_d
from ..Base.Thresholds import TopoThreshold
from ..Base.CTPCondition import ThrCondition, InternalTrigger # noqa: F401
from .TriggerTypeDef import TT
@@ -44,7 +44,7 @@ class ItemDef:
isHIV5 = 'HI_v5' in menuName
isPhaseII = '_PhaseII' in menuName
- class d: pass
+ class d(metaclass=meta_d): pass
# ... and make them accessible by their name
for thr in tc.getDefinedThresholds():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
index 838d14f797beb6875bc539e4f58872f87f5e5ced..b5529c93639072cf445f622dda65dad1a7d1b803 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
@@ -15,8 +15,6 @@ class TopoAlgoDef:
@staticmethod
def registerTopoAlgos(tm):
- currentAlgoId = 0
-
_etamax = 49
_minet = 0
@@ -27,16 +25,14 @@ class TopoAlgoDef:
_emscale_for_decision = 1000 / getTypeWideThresholdConfig("EM")["resolutionMeV"]
- alg = AlgConf.ClusterNoSort( name = 'EMall', inputs = 'ClusterTobArray', outputs = 'EMall', algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.ClusterNoSort( name = 'EMall', inputs = 'ClusterTobArray', outputs = 'EMall', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('OutputWidth', HW.InputWidthEM)
alg.addvariable('IsoMask', 0)
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSelect( name = 'TAUabi', inputs = 'ClusterTobArray', outputs = 'TAUabi', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.ClusterSelect( name = 'TAUabi', inputs = 'ClusterTobArray', outputs = 'TAUabi', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectTAU )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
@@ -48,8 +44,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSelect( name = 'EMabi', inputs = 'ClusterTobArray', outputs = 'EMabi', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.ClusterSelect( name = 'EMabi', inputs = 'ClusterTobArray', outputs = 'EMabi', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
@@ -61,8 +56,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSelect( name = 'EMabhi', inputs = 'ClusterTobArray', outputs = 'EMabhi', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.ClusterSelect( name = 'EMabhi', inputs = 'ClusterTobArray', outputs = 'EMabhi', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
@@ -74,8 +68,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSelect( name = 'TAUab', inputs = 'ClusterTobArray', outputs = 'TAUab', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.ClusterSelect( name = 'TAUab', inputs = 'ClusterTobArray', outputs = 'TAUab', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectTAU )
alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
@@ -87,8 +80,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSort( name = 'EMs', inputs = 'ClusterTobArray', outputs = 'EMs', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.ClusterSort( name = 'EMs', inputs = 'ClusterTobArray', outputs = 'EMs', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortEM)
alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
@@ -100,8 +92,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSort( name = 'EMshi', inputs = 'ClusterTobArray', outputs = 'EMshi', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.ClusterSort( name = 'EMshi', inputs = 'ClusterTobArray', outputs = 'EMshi', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortEM)
alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
@@ -113,8 +104,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.ClusterSort( name = 'TAUsi', inputs = 'ClusterTobArray', outputs = 'TAUsi', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.ClusterSort( name = 'TAUsi', inputs = 'ClusterTobArray', outputs = 'TAUsi', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortTAU)
alg.addgeneric('OutputWidth', HW.OutputWidthSortTAU)
@@ -126,16 +116,14 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetNoSort( name = 'AJall', inputs = 'JetTobArray', outputs = 'AJall', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.JetNoSort( name = 'AJall', inputs = 'JetTobArray', outputs = 'AJall', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.InputWidthJET)
alg.addgeneric('JetSize', HW.DefaultJetSize)
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetNoSort( name = 'AJjall', inputs = 'JetTobArray', outputs = 'AJjall', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.JetNoSort( name = 'AJjall', inputs = 'JetTobArray', outputs = 'AJjall', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.InputWidthJET)
alg.addgeneric('JetSize', 1 if HW.DefaultJetSize.value==2 else 2)
@@ -144,8 +132,7 @@ class TopoAlgoDef:
# for 0MATCH-4AJ20-4AJj15
#if not usev8:
- alg = AlgConf.JetNoSortMatch( name = 'AJMatchall', inputs = 'JetTobArray', outputs = 'AJMatchall', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.JetNoSortMatch( name = 'AJMatchall', inputs = 'JetTobArray', outputs = 'AJMatchall', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('OutputWidth', HW.InputWidthJET)
alg.addgeneric('JetSize', 2 if HW.DefaultJetSize.value==2 else 1)
@@ -169,8 +156,7 @@ class TopoAlgoDef:
_minet = 15
- alg = AlgConf.JetSelect( name = jet_type+'ab', inputs = 'JetTobArray', outputs = jet_type+'ab', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.JetSelect( name = jet_type+'ab', inputs = 'JetTobArray', outputs = jet_type+'ab', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectJET )
@@ -182,8 +168,7 @@ class TopoAlgoDef:
alg.addgeneric('DoEtaCut', 1)
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetSort( name = 'AJjs', inputs = 'JetTobArray', outputs = 'AJjs', algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.JetSort( name = 'AJjs', inputs = 'JetTobArray', outputs = 'AJjs', algoId = -1)
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -197,8 +182,7 @@ class TopoAlgoDef:
#input list needed for ATR-18824
if usev8:
- alg = AlgConf.JetSort( name = 'FJjs23ETA49', inputs = 'JetTobArray', outputs = 'FJjs23ETA49', algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.JetSort( name = 'FJjs23ETA49', inputs = 'JetTobArray', outputs = 'FJjs23ETA49', algoId = -1)
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -210,8 +194,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.JetSort( name = 'CJsETA21', inputs = 'JetTobArray', outputs = 'CJsETA21', algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.JetSort( name = 'CJsETA21', inputs = 'JetTobArray', outputs = 'CJsETA21', algoId = -1)
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
@@ -235,8 +218,7 @@ class TopoAlgoDef:
_mineta = 31
_minet = 15
- alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -260,8 +242,7 @@ class TopoAlgoDef:
jetabseta = 26
_minet = 15
- alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -273,23 +254,20 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.METNoSort( name = 'XENoSort', inputs = 'MetTobArray', outputs = 'XENoSort', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.METNoSort( name = 'XENoSort', inputs = 'MetTobArray', outputs = 'XENoSort', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthMET)
alg.addgeneric('OutputWidth', HW.OutputWidthMET)
tm.registerTopoAlgo(alg)
- alg = AlgConf.MetSort( name = 'XE', inputs = 'MetTobArray', outputs = 'XE', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MetSort( name = 'XE', inputs = 'MetTobArray', outputs = 'XE', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthMET)
alg.addgeneric('OutputWidth', HW.OutputWidthMET)
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSelect( name = 'MUab', inputs = 'MuonTobArray', outputs = 'MUab', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MuonSelect( name = 'MUab', inputs = 'MuonTobArray', outputs = 'MUab', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthMU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
@@ -300,8 +278,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSort( name = 'MUs', inputs = 'MuonTobArray', outputs = 'MUs', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MuonSort( name = 'MUs', inputs = 'MuonTobArray', outputs = 'MUs', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthMU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortMU )
@@ -312,8 +289,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSelect( name = 'CMUab', inputs = 'MuonTobArray', outputs = 'CMUab', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MuonSelect( name = 'CMUab', inputs = 'MuonTobArray', outputs = 'CMUab', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthMU)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
@@ -324,8 +300,7 @@ class TopoAlgoDef:
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonSort_1BC( name = 'LMUs', inputs = 'LateMuonTobArray', outputs = 'LMUs', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MuonSort_1BC( name = 'LMUs', inputs = 'LateMuonTobArray', outputs = 'LMUs', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthMU)
#alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortMU )
@@ -337,8 +312,7 @@ class TopoAlgoDef:
# Abbreviated lists:
- alg = AlgConf.ClusterSelect( name = 'EMab', inputs = 'ClusterTobArray', outputs = 'EMab', algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.ClusterSelect( name = 'EMab', inputs = 'ClusterTobArray', outputs = 'EMab', algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthEM)
alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM )
@@ -353,25 +327,20 @@ class TopoAlgoDef:
# All lists:
- alg = AlgConf.ClusterNoSort( name = 'TAUall', inputs = 'ClusterTobArray', outputs = 'TAUall', algoId = currentAlgoId)
- currentAlgoId += 1
-
+ alg = AlgConf.ClusterNoSort( name = 'TAUall', inputs = 'ClusterTobArray', outputs = 'TAUall', algoId = -1)
alg.addgeneric('InputWidth', HW.InputWidthTAU)
alg.addgeneric('OutputWidth', HW.InputWidthTAU)
alg.addvariable('IsoMask', 0)
tm.registerTopoAlgo(alg)
- alg = AlgConf.MuonNoSort( name = 'MUall', inputs = 'MuonTobArray', outputs = 'MUall',algoId = currentAlgoId)
- currentAlgoId += 1
-
+ alg = AlgConf.MuonNoSort( name = 'MUall', inputs = 'MuonTobArray', outputs = 'MUall', algoId = -1)
alg.addgeneric('InputWidth', HW.InputWidthMU)
alg.addgeneric('OutputWidth', HW.InputWidthMU)
tm.registerTopoAlgo(alg)
# Decision algorithms
- currentAlgoId = 0
# VBF items
if usev8:
@@ -401,8 +370,7 @@ class TopoAlgoDef:
d.otype, str(d.ocut2) , d.olist, str(d.nleading2) if d.olist=="s" else "")
toponames.append(toponame)
- alg = AlgConf.InvariantMassInclusive1( name = d.algoname, inputs = inputList, outputs = toponames, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusive1( name = d.algoname, inputs = inputList, outputs = toponames, algoId = -1)
alg.addgeneric('InputWidth', d.inputwidth1)
alg.addgeneric('MaxTob', d.nleading1)
@@ -450,8 +418,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.InvariantMassInclusive1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.InvariantMassInclusive2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
@@ -503,8 +470,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.DeltaRSqrIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaRSqrIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
@@ -549,8 +515,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist1, d.otype2 + d.olist2]
algoname = AlgConf.DeltaEtaPhiIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaEtaPhiIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('NumResultBits', 1)
@@ -600,8 +565,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1] if d.otype1==d.otype2 else [d.otype1 + d.olist1, d.otype2 + d.olist2]
algoname = AlgConf.DeltaRSqrIncl1 if d.otype1==d.otype2 else AlgConf.DeltaRSqrIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
if d.otype1==d.otype2:
@@ -656,8 +620,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.JetHT( name = toponame, inputs = inputList, outputs = [toponame], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.JetHT( name = toponame, inputs = inputList, outputs = [toponame], algoId = -1 )
alg.addgeneric('InputWidth', d.inputwidth)
@@ -691,8 +654,7 @@ class TopoAlgoDef:
toponame = "%iINVM%i-%s%s%s%s-EMs6" % (d.minInvm, d.maxInvm, d.otype, str(ocut) if ocut > 0 else "", d.olist, str(d.nleading) if d.olist=="s" else "")
toponames.append(toponame)
- alg = AlgConf.InvariantMassInclusive2( name = d.algoname, inputs = [inputList, 'EMs'], outputs = toponames, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusive2( name = d.algoname, inputs = [inputList, 'EMs'], outputs = toponames, algoId = -1)
alg.addgeneric('InputWidth1', d.inputwidth)
@@ -738,8 +700,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', d.inputwidth)
@@ -772,8 +733,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.TransverseMassInclusive1( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.TransverseMassInclusive1( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
@@ -812,8 +772,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = d.otype + d.olist
- alg = AlgConf.DeltaEtaIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.DeltaEtaIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
@@ -854,8 +813,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', d.inputwidth)
alg.addgeneric('InputWidth2', 1)
@@ -891,8 +849,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.DeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('InputWidth1', HW.OutputWidthSelectMU)
alg.addgeneric('InputWidth2', HW.OutputWidthSelectJET)
@@ -945,8 +902,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.InvariantMassInclusive1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.InvariantMassInclusive2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
@@ -992,8 +948,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.DeltaRSqrIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaRSqrIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
@@ -1044,8 +999,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist1, d.otype2 + d.olist2]
algoname = AlgConf.DeltaEtaPhiIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaEtaPhiIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('NumResultBits', 1)
if (d.mult>1 or d.otype1==d.otype2):
@@ -1093,8 +1047,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DeltaEtaIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.DeltaEtaIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('NumResultBits', 1)
alg.addgeneric('InputWidth1', d.nleading1)
@@ -1128,8 +1081,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DeltaPhiIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.DeltaPhiIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('NumResultBits', 1)
alg.addgeneric('InputWidth1', d.nleading1)
@@ -1146,8 +1098,7 @@ class TopoAlgoDef:
# JetMatch
if not usev8:
toponame = "0MATCH-4AJ20.ETA31-4AJj15.ETA31"
- alg = AlgConf.MultiplicityCustom( name = toponame, inputs = [ 'AJMatchall' ], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MultiplicityCustom( name = toponame, inputs = [ 'AJMatchall' ], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('NumResultBits', 1)
alg.addvariable('MinET', 0)
@@ -1159,8 +1110,7 @@ class TopoAlgoDef:
# NoMatch for W T&P
if not usev8:
toponame = "NOT-02MATCH-EM10s1-AJj15all.ETA49"
- alg = AlgConf.NotMatch( name = toponame, inputs = [ 'EMs', 'AJjall'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.NotMatch( name = toponame, inputs = [ 'EMs', 'AJjall'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
alg.addgeneric('InputWidth2', HW.InputWidthJET)
alg.addgeneric('MaxTob1', 1)
@@ -1177,7 +1127,7 @@ class TopoAlgoDef:
# RATIO SUM for W T&P
#toponame = "05RATIO-XE0-SUM0-EM10s1-HT0-AJj15all.ETA49"
- #alg = AlgConf.RatioSum( name = toponame, inputs = ['XE', 'AJjall', 'EMs'], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
+ #alg = AlgConf.RatioSum( name = toponame, inputs = ['XE', 'AJjall', 'EMs'], outputs = [ toponame ], algoId = -1 );
#alg.addgeneric('InputWidth1', 1)
#alg.addgeneric('InputWidth2', HW.InputWidthJET)
#alg.addgeneric('InputWidth3', HW.OutputWidthSortEM)
@@ -1218,8 +1168,7 @@ class TopoAlgoDef:
toponame = "%02d%s-XE0-HT0-AJj%sall.ETA49" % (d.minRatio, d.Ratio, str(d.ocut))
log.debug("Define %s", toponame)
- alg = AlgConf.Ratio( name = toponame, inputs = ['XE', 'AJjall'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.Ratio( name = toponame, inputs = ['XE', 'AJjall'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', 1)
alg.addgeneric('InputWidth2', HW.InputWidthJET)
alg.addgeneric('MaxTob1', 1)
@@ -1236,8 +1185,7 @@ class TopoAlgoDef:
# RATIO MATCH dedicated to Exotic
toponame = '100RATIO-0MATCH-TAU30si2-EMall'
- alg = AlgConf.RatioMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.RatioMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', HW.OutputWidthSortTAU)
alg.addgeneric('InputWidth2', HW.InputWidthEM)
alg.addgeneric('MaxTob1', 2)
@@ -1250,8 +1198,7 @@ class TopoAlgoDef:
# NOT MATCH dedicated to Exotic
toponame = 'NOT-0MATCH-TAU30si1-EMall'
- alg = AlgConf.NotMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.NotMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', HW.OutputWidthSortTAU)
alg.addgeneric('InputWidth2', HW.InputWidthEM)
alg.addgeneric('MaxTob1', 1)
@@ -1286,8 +1233,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DisambiguationIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.DisambiguationIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('InputWidth1', d.nleading1 if d.olist1.find("ab")>=0 else -1000)
alg.addgeneric('InputWidth2', d.nleading2 if d.olist2.find("ab")>=0 else -1000)
alg.addgeneric('MaxTob1', d.nleading1)
@@ -1324,8 +1270,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2, d.otype3 + d.olist3]
- alg = AlgConf.DisambiguationIncl3( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.DisambiguationIncl3( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('InputWidth1', d.inputwidth1)
alg.addgeneric('InputWidth2', d.inputwidth2)
alg.addgeneric('InputWidth3', d.inputwidth3)
@@ -1370,8 +1315,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2, d.otype3 + d.olist3]
- alg = AlgConf.DisambiguationDRIncl3( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.DisambiguationDRIncl3( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('InputWidth1', d.inputwidth1)
alg.addgeneric('InputWidth2', d.inputwidth2)
alg.addgeneric('InputWidth3', d.inputwidth3)
@@ -1410,8 +1354,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.EtaPhiWindow( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.EtaPhiWindow( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', d.inputwidth)
alg.addgeneric('MaxTob', 0)
alg.addgeneric('NumResultBits', 1)
@@ -1440,8 +1383,7 @@ class TopoAlgoDef:
for minxe in d.Threlist:
toponames.append("KF-XE%s-AJall" % (minxe))
- alg = AlgConf.KalmanMETCorrection( name = "KF-XE-AJall", inputs = inputList, outputs = toponames, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.KalmanMETCorrection( name = "KF-XE-AJall", inputs = inputList, outputs = toponames, algoId = -1 )
alg.addgeneric('InputWidth', HW.InputWidthJET)
alg.addgeneric('NumResultBits', len(toponames))
alg.addvariable('MinET', 0)
@@ -1472,8 +1414,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', d.inputwidth)
@@ -1506,8 +1447,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.TransverseMassInclusive1( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.TransverseMassInclusive1( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
@@ -1541,8 +1481,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DisambiguationDRIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.DisambiguationDRIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('InputWidth1', d.inputwidth1)
alg.addgeneric('InputWidth2', d.inputwidth2)
alg.addgeneric('MaxTob1', d.nleading1)
@@ -1574,8 +1513,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ], algoId = -1 )
alg.addgeneric('InputWidth1', d.inputwidth)
alg.addgeneric('InputWidth2', 1)
@@ -1604,8 +1542,7 @@ class TopoAlgoDef:
inputList = 'LMUs'
- alg = AlgConf.EtCut( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.EtCut( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', d.inputwidth)
alg.addgeneric('MaxTob', 1)
alg.addgeneric('NumResultBits', 1)
@@ -1636,8 +1573,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.SimpleCone( name = toponame, inputs = inputList, outputs = [toponame], algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.SimpleCone( name = toponame, inputs = inputList, outputs = [toponame], algoId = -1 )
alg.addgeneric('InputWidth', d.inputwidth)
@@ -1663,10 +1599,8 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- #alg = AlgConf.DisambiguationInvariantMass2( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId); currentAlgoId += 1
- alg = AlgConf.DisambiguationInvmIncl2( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId)
- currentAlgoId += 1
-
+ alg = AlgConf.DisambiguationInvmIncl2( name = toponame, inputs = inputList, outputs = toponame, algoId = -1)
+
alg.addgeneric('InputWidth1', d.inputwidth1)
alg.addgeneric('InputWidth2', d.inputwidth2)
alg.addgeneric('MaxTob1', d.nleading1)
@@ -1696,8 +1630,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
toponame = "%iINVM%i-%s%s" % (d.minInvm, d.maxInvm, obj1, obj2)
- alg = AlgConf.InvariantMassInclusive2( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusive2( name = toponame, inputs = inputList, outputs = toponame, algoId = -1)
alg.addgeneric('InputWidth1', d.inputwidth1)
@@ -1743,8 +1676,7 @@ class TopoAlgoDef:
inputList = d.otype + d.olist
- alg = AlgConf.InvariantMassInclusive1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusive1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1)
alg.addgeneric('InputWidth', d.inputwidth)
alg.addgeneric('MaxTob', d.nleading1)
@@ -1773,8 +1705,7 @@ class TopoAlgoDef:
d.otype, str(d.ocut1) , d.olist,
d.otype, d.olist)
- alg = AlgConf.InvariantMassInclusive1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusive1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1)
alg.addgeneric('InputWidth', d.inputwidth)
alg.addgeneric('MaxTob', HW.OutputWidthSelectEM)
alg.addgeneric('NumResultBits', 1)
@@ -1803,8 +1734,7 @@ class TopoAlgoDef:
inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2]
- alg = AlgConf.DeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.DeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
alg.addgeneric('InputWidth1', HW.OutputWidthSelectEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSelectJET)
@@ -1843,8 +1773,7 @@ class TopoAlgoDef:
toponames.append(toponame)
- alg = AlgConf.InvariantMassInclusive2( name = d.algoname, inputs = inputList, outputs = toponames, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusive2( name = d.algoname, inputs = inputList, outputs = toponames, algoId = -1)
alg.addgeneric('InputWidth1', d.inputwidth)
@@ -1884,8 +1813,7 @@ class TopoAlgoDef:
log.debug("Define %s", toponame)
inputList = d.otype + d.olist
- alg = AlgConf.DeltaPhiIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.DeltaPhiIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', d.inputwidth1)
alg.addgeneric('MaxTob', d.nleading2)
@@ -1919,8 +1847,7 @@ class TopoAlgoDef:
d.otype1, str(d.ocut1) , d.olist1, str(d.nleading1) if d.olist1=="s" else "",
d.otype2, str(d.ocut2) , d.olist2, str(d.nleading2) if d.olist2=="s" else ""))
- alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'INVM_DPHI_NFF', inputs = inputList, outputs = toponames, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'INVM_DPHI_NFF', inputs = inputList, outputs = toponames, algoId = -1)
alg.addgeneric('InputWidth1', d.inputwidth)
@@ -1946,8 +1873,7 @@ class TopoAlgoDef:
inputList = 'MUab'
- alg = AlgConf.InvariantMassThreeTOBsIncl( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassThreeTOBsIncl( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
@@ -1965,8 +1891,7 @@ class TopoAlgoDef:
inputList = ['EMabi','MUab']
- alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth1', HW.OutputWidthSelectEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob1', HW.OutputWidthSortEM)
@@ -1992,8 +1917,7 @@ class TopoAlgoDef:
inputList = ['EMabi','MUab']
- alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth1', HW.OutputWidthSelectEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob1', HW.OutputWidthSortEM)
@@ -2041,8 +1965,7 @@ class TopoAlgoDef:
str(d.ocut2) , str(d.nleading2) , d.minEta2, d.maxEta2))
- alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'ZAFB_DPHI', inputs = inputList, outputs = toponames, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = 'ZAFB_DPHI', inputs = inputList, outputs = toponames, algoId = -1)
alg.addgeneric('InputWidth1', d.inputwidth1)
@@ -2070,8 +1993,7 @@ class TopoAlgoDef:
toponame = "0INVM70-27DPHI32-EM10his1-EM10his6"
log.debug("Define %s", toponame)
inputList = ['EMshi','EMshi']
- alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSortEM)
alg.addgeneric('MaxTob1', 1)
@@ -2094,8 +2016,7 @@ class TopoAlgoDef:
toponame = "0INVM70-27DPHI32-EM12his1-EM12his6"
log.debug("Define %s", toponame)
inputList = ['EMshi','EMshi']
- alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassDeltaPhiInclusive2( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
alg.addgeneric('InputWidth2', HW.OutputWidthSortEM)
alg.addgeneric('MaxTob1', 1)
@@ -2122,8 +2043,7 @@ class TopoAlgoDef:
inputList = ['MUab']
- alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
@@ -2142,8 +2062,7 @@ class TopoAlgoDef:
inputList = ['MUab']
- alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
@@ -2162,8 +2081,7 @@ class TopoAlgoDef:
inputList = ['MUab']
- alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
@@ -2182,8 +2100,7 @@ class TopoAlgoDef:
inputList = ['MUab']
- alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
@@ -2202,8 +2119,7 @@ class TopoAlgoDef:
inputList = ['MUab']
- alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId )
- currentAlgoId += 1
+ alg = AlgConf.InvariantMassInclusiveDeltaRSqrIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = -1 )
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
alg.addgeneric('NumResultBits', 1)
@@ -2222,8 +2138,7 @@ class TopoAlgoDef:
inputList = ['CJs']
- alg = AlgConf.ExclusiveJets( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.ExclusiveJets( name = toponame, inputs = inputList, outputs = toponame, algoId = -1)
alg.addvariable('MinET1', x)
alg.addvariable('MinXi', 13000.0*0.02)
alg.addvariable('MaxXi', 13000.0*0.05)
@@ -2236,8 +2151,7 @@ class TopoAlgoDef:
inputList = ['CJsETA21']
- alg = AlgConf.ExclusiveJets( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = AlgConf.ExclusiveJets( name = toponame, inputs = inputList, outputs = toponame, algoId = -1)
alg.addvariable('MinET1', x)
alg.addvariable('MinXi', 13000.0*0.02)
alg.addvariable('MaxXi', 13000.0*0.05)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py
index 55efbbb5b758b7b693ca01afa7fde0cd0cc1d287..ae6f85499290900f16776b7d3aa299d4b1dd7bd7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py
@@ -13,8 +13,6 @@ class TopoAlgoDefMuctpi:
@staticmethod
def registerTopoAlgos(tm):
- currentAlgoId = 0
-
# dimu DR items
listofalgos=[
{ "minDr": 0, "maxDr": 15, "mult": 2,
@@ -36,8 +34,7 @@ class TopoAlgoDefMuctpi:
inputList = [d.otype1 + d.olist] if (d.mult>1 or d.otype1==d.otype2) else [d.otype1 + d.olist, d.otype2 + d.olist]
algoname = AlgConf.DeltaRSqrIncl1 if (d.mult>1 or d.otype1==d.otype2) else AlgConf.DeltaRSqrIncl2
- alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId)
- currentAlgoId += 1
+ alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = -1)
if (d.mult>1 or d.otype1==d.otype2):
alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoMultiplicityAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
similarity index 87%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoMultiplicityAlgoDef.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
index e2f15f87278c9ed704d15a7285ecb22fc675c479..9f405d85cbe91a89bafb2cb1fc42155f4b23e6d4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoMultiplicityAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
@@ -5,7 +5,7 @@ log = logging.getLogger('Menu.L1.Config.TopoMultiplicityAlgoDef')
from ..Base.TopoAlgos import EMMultiplicityAlgo, TauMultiplicityAlgo, JetMultiplicityAlgo, XEMultiplicityAlgo
-class TopoMultiplicityAlgoDef(object):
+class TopoAlgoDefMultiplicity(object):
"""
Defines the TopoAlgorithms that calculate multiplicities for L1Calo thresholds
The thresholds have to be explicitly defined here.
@@ -20,7 +20,7 @@ class TopoMultiplicityAlgoDef(object):
]
for em in emThresholds:
- alg = EMMultiplicityAlgo( name = "Mult_%s" % em,
+ alg = EMMultiplicityAlgo( name = em,
algoId = currentAlgoId,
threshold = em,
nbits = 3)
@@ -30,7 +30,7 @@ class TopoMultiplicityAlgoDef(object):
tauThresholds = [ "eTAU12", "eTAU12IM", "eTAU20", "eTAU20IM", "eTAU25IM", "eTAU40", "eTAU60", "eTAU100" ]
for tau in tauThresholds:
- alg = TauMultiplicityAlgo( name = "Mult_%s" % tau,
+ alg = TauMultiplicityAlgo( name = tau,
algoId = currentAlgoId,
threshold = tau,
nbits = 3)
@@ -40,7 +40,7 @@ class TopoMultiplicityAlgoDef(object):
"jJ35.0ETA23", "jJ40.0ETA25", "jJ40", "jJ50", "jJ85", "jJ100", "jJ15.31ETA49", "jJ20.31ETA49", "jJ75.31ETA49" ]
for jJet in jJThresholds:
- alg = JetMultiplicityAlgo( name = "Mult_%s" % jJet,
+ alg = JetMultiplicityAlgo( name = jJet,
algoId = currentAlgoId,
threshold = jJet,
nbits = 3)
@@ -50,7 +50,7 @@ class TopoMultiplicityAlgoDef(object):
gXEThresholds = [ "gXERHO20", "gXERHO30", "gXERHO35", "gXERHO40", "gXERHO45", "gXERHO50", "gXEPUFIT20", "gXEPUFIT50", "gXE50" ]
for gXE in gXEThresholds:
- alg = XEMultiplicityAlgo( name = "Mult_%s" % gXE,
+ alg = XEMultiplicityAlgo( name = gXE,
algoId = currentAlgoId,
threshold = gXE,
nbits = 1)
@@ -60,7 +60,7 @@ class TopoMultiplicityAlgoDef(object):
jXEThresholds = [ "jXE50" ]
for jXE in jXEThresholds:
- alg = XEMultiplicityAlgo( name = "Mult_%s" % jXE,
+ alg = XEMultiplicityAlgo( name = jXE,
algoId = currentAlgoId,
threshold = jXE,
nbits = 1)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
index 10715faf01bc9b8706dcf1cd385da8abd1f4901f..565e6c24858d8fe995ea16b64f392305360746e1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py
@@ -1,6 +1,7 @@
-6# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
import re
+from importlib import import_module
from collections import defaultdict as ddict
from AthenaCommon.Logging import logging
@@ -52,9 +53,9 @@ class L1MenuConfig(object):
AlgCategory.TOPO : 0, AlgCategory.MUCTPI : 0, AlgCategory.LEGACY : 0 }
# all registered topo algos
- self._definedTopoAlgos = {}
+ self._registeredTopoAlgos = {}
for cat in AlgCategory.getAllCategories():
- self._definedTopoAlgos[cat] = {}
+ self._registeredTopoAlgos[cat] = {}
# menu
L1MenuFlags.CTPVersion = 4 # this needs to be done here already, since L1Menu depends on it during init
@@ -109,29 +110,13 @@ class L1MenuConfig(object):
def registerTopoAlgo(self, algo):
""" Add a L1Topo algo to the set of algos which are registered for further use"""
- if self.currentAlgoDef == "multi":
- if algo.name in self._definedTopoAlgos[AlgCategory.MULTI]:
- raise RuntimeError('L1Topo multiplicity algo %s is already registered as such' % algo.name)
- self._definedTopoAlgos[AlgCategory.MULTI][algo.name] = algo
- log.debug("Added in the multiplicity topo algo list: {0}, ID:{1}" .format(algo.name,algo.algoId))
-
- elif self.currentAlgoDef == "muctpi":
- if algo.name in self._definedTopoAlgos[AlgCategory.MUCTPI]:
- raise RuntimeError('L1Topo MuCTPi algo %s is already registered as such' % algo.name)
- self._definedTopoAlgos[AlgCategory.MUCTPI][algo.name] = algo
- log.debug("Added in the MuCTPi topo algo list: {0}, ID:{1}" .format(algo.name,algo.algoId))
-
- elif self.currentAlgoDef == "topo":
- if algo.name in self._definedTopoAlgos[AlgCategory.TOPO]:
- raise RuntimeError('L1Topo algo %s is already registered as such' % algo.name)
- self._definedTopoAlgos[AlgCategory.TOPO][algo.name] = algo
- log.debug("Added in the topo algo list: {0}, ID:{1}" .format(algo.name,algo.algoId))
-
- elif self.currentAlgoDef == "legacy":
- if algo.name in self._definedTopoAlgos[AlgCategory.LEGACY]:
- raise RuntimeError('L1Topo legacy algo %s is already registered as such' % algo.name)
- self._definedTopoAlgos[AlgCategory.LEGACY][algo.name] = algo
- log.debug("Added in the legacy topo algo list: {0}, ID:{1}" .format(algo.name,algo.algoId))
+ if self.currentAlgoDef == AlgCategory.MULTI:
+ algo.name = "Mult_" + algo.name
+
+ if algo.name in self._registeredTopoAlgos[self.currentAlgoDef]:
+ raise RuntimeError('%s algo %s is already registered as such' % (self.currentAlgoDef.desc, algo.name))
+ self._registeredTopoAlgos[self.currentAlgoDef][algo.name] = algo
+ log.debug("Added in the %s algo list: {0}, ID:{1}" .format(self.currentAlgoDef.desc, algo.name,algo.algoId))
return algo
@@ -145,6 +130,7 @@ class L1MenuConfig(object):
self._addThrToRegistry(thr)
else:
raise RuntimeError("For threshold %s the run (=2 or 3) was not set!" % thr.name)
+ return thr
def _addThrToRegistry(self, thr):
if self.thresholdExists(thr.name):
@@ -181,7 +167,7 @@ class L1MenuConfig(object):
# for all topo algorithm categories the outputs (sometimes multiple) are defined as thresholds
for cat in AlgCategory.getAllCategories():
outputLines = []
- for algo in self._definedTopoAlgos[cat].values():
+ for algo in self._registeredTopoAlgos[cat].values():
outputLines += algo.outputs if (type(algo.outputs) == list) else [ algo.outputs ]
self._topoTriggers[cat] = sorted(outputLines)
log.info("... found %i topo triggerlines (source: %s)", len(self._topoTriggers[cat]), cat )
@@ -303,31 +289,15 @@ class L1MenuConfig(object):
from .Base.Items import MenuItem
MenuItem.setMenuConfig(self) # from now on all newly created MenuItems are automatically registered here
from .Base.Thresholds import Threshold
- Threshold.setMenuConfig(self) # from now on all newly created MenuItems are automatically registered here
-
- log.info("Reading TriggerMenuMT.Config.TopoAlgoDef")
- self.currentAlgoDef = "topo"
- from .Config.TopoAlgoDef import TopoAlgoDef
- TopoAlgoDef.registerTopoAlgos(self)
- log.info("... registered %i defined topo algos for the new topo boards", len(self._definedTopoAlgos[AlgCategory.TOPO]))
-
- log.info("Reading TriggerMenuMT.Config.TopoAlgoDefMuctpi")
- self.currentAlgoDef = "muctpi"
- from .Config.TopoAlgoDefMuctpi import TopoAlgoDefMuctpi
- TopoAlgoDefMuctpi.registerTopoAlgos(self)
- log.info("... registered %i defined topo algos for the MuCTPi", len(self._definedTopoAlgos[AlgCategory.MUCTPI]))
-
- log.info("Reading TriggerMenuMT.Config.TopoMultiplicityAlgoDef")
- self.currentAlgoDef = "multi"
- from .Config.TopoMultiplicityAlgoDef import TopoMultiplicityAlgoDef
- TopoMultiplicityAlgoDef.registerTopoAlgos(self)
- log.info("... registered %i defined topo multiplicity algos for the new topo boards", len(self._definedTopoAlgos[AlgCategory.MULTI]))
-
- log.info("Reading TriggerMenuMT.Config.TopoAlgoDefLegacy")
- self.currentAlgoDef = "legacy"
- from .Config.TopoAlgoDefLegacy import TopoAlgoDefLegacy
- TopoAlgoDefLegacy.registerTopoAlgos(self)
- log.info("... registered %i defined topo algos for the legacy topo boards", len(self._definedTopoAlgos[AlgCategory.LEGACY]))
+ Threshold.setMenuConfig(self) # from now on all newly created Thresholds definitions are automatically registered here
+
+ # register Topo algorithms
+ for algCat in [AlgCategory.TOPO, AlgCategory.MUCTPI, AlgCategory.MULTI, AlgCategory.LEGACY]:
+ self.currentAlgoDef = algCat
+ defFile = "TriggerMenuMT.L1.Config.%s" % self.currentAlgoDef.defFile
+ log.info("Reading %s", defFile)
+ import_module(defFile).__getattribute__(self.currentAlgoDef.defFile).registerTopoAlgos(self)
+ log.info("... registered %i defined topo algos for the %s board(s)", len(self._registeredTopoAlgos[self.currentAlgoDef]), self.currentAlgoDef.desc)
log.info("Reading TriggerMenuMT.Config.ThreholdDef")
from .Config.ThresholdDef import ThresholdDef
@@ -354,19 +324,22 @@ class L1MenuConfig(object):
def _getTopoAlgo(self, algoName, category):
- if algoName in self._definedTopoAlgos[category]:
- return self._definedTopoAlgos[category][algoName]
- raise RuntimeError("Algorithm of name %s is not defined in category %s" % (algoName, category) )
+ if algoName in self._registeredTopoAlgos[category]:
+ return self._registeredTopoAlgos[category][algoName]
+ msg = "Algorithm of name %s in category %s is not registered. Please add the algorithm to L1/Config/%s.py" % (algoName, category, category.defFile)
+ log.error(msg)
+ log.info("Available algorithms in this category are %s", ",".join(self._registeredTopoAlgos[category].keys()))
+ raise RuntimeError(msg)
- def _getSortingAlgoThatProvides(self, input):
+ def _getSortingAlgoThatProvides(self, input, topoAlgCategory):
"""
returns a list of all sorting algorithms that are needed to
produce the required output. A missing input will raise a
runtime exception
"""
sortingAlgs = []
- for name, alg in self._definedTopoAlgos[AlgCategory.TOPO].items(): # TODO: extend to legacy topo
+ for name, alg in self._registeredTopoAlgos[topoAlgCategory].items():
if type(alg.outputs)==list:
foundOutput = (input in alg.outputs)
else:
@@ -375,9 +348,11 @@ class L1MenuConfig(object):
sortingAlgs += [alg]
if len(sortingAlgs)==0:
- raise RuntimeError("No sorting algorithm is providing this output: %s" % input)
+ msg = "No topo sorting algorithm is providing this output: %s. Please add the sorting algorithm to L1/Config/%s.py" % (input, topoAlgCategory.defFile)
+ raise RuntimeError(msg)
if len(sortingAlgs)>1:
- raise RuntimeError("More than one sorting algorithm is providing this output: %s. Here the list: %s" % (input, ', '.join(sortingAlgs)))
+ msg = "More than one sorting algorithm is providing this output: %s. Here the list: %s" % (input, ', '.join(sortingAlgs))
+ raise RuntimeError(msg)
return sortingAlgs[0]
@@ -436,6 +411,7 @@ class L1MenuConfig(object):
AlgCategory.LEGACY : set()
}
+ # loop over all topo boards and their connectors
for (boardName, boardDef) in allBoardsWithTopo:
for connDef in boardDef["connectors"]:
if ('muctpi' in boardName.lower()) and (connDef["format"]=='multiplicity'):
@@ -468,13 +444,13 @@ class L1MenuConfig(object):
# now also add the sorting algorithms to the menu
for cat in allRequiredSortedInputs:
for input in allRequiredSortedInputs[cat]:
- sortingAlgo = self._getSortingAlgoThatProvides(input)
+ searchCat = cat
+ if cat == AlgCategory.MUCTPI:
+ searchCat = AlgCategory.TOPO
+ sortingAlgo = self._getSortingAlgoThatProvides(input, searchCat)
self.l1menu.addTopoAlgo( sortingAlgo, category = cat )
-
-
-
def _generateMenu(self):
if len(self.l1menu.items) > 0:
@@ -492,43 +468,6 @@ class L1MenuConfig(object):
self.l1menu.ctp.bunchGroupSet = createDefaultBunchGroupSet()
- # ------------------
- # Items
- # ------------------
-
- # build list of items for the menu from the list of requested names
- itemsForMenu = []
- ctpIdMap = L1MenuFlags.CtpIdMap()
- for itemName in L1MenuFlags.items():
- registeredItem = self.getRegisteredItem(itemName)
- if registeredItem is None:
- msg = "L1 item '%s' has not been defined in L1/Config/ItemDef.py" % itemName
- log.error(msg)
- raise RuntimeError(msg)
-
- if itemName in ctpIdMap:
- newCTPID = ctpIdMap[itemName]
- registeredItem.setCtpid(newCTPID)
-
- itemsForMenu += [ registeredItem ]
-
-
- # CTP IDs available for assignment
- assigned_ctpids = set([item.ctpid for item in itemsForMenu])
- available_ctpids = sorted( list( set(range(Limits.MaxTrigItems)) - assigned_ctpids ), reverse=True )
-
- # add the items to the menu
- for item in itemsForMenu:
- # set the physics bit
- if not item.name.startswith('L1_CALREQ'):
- item.setTriggerType( item.trigger_type | TT.phys )
- # assign ctp IDs to items that don't have one
- if item.ctpid == -1:
- item.setCtpid( available_ctpids.pop() )
- # add the items into the menu
- self.l1menu.addItem( item )
-
-
# ------------------
# Thresholds
# ------------------
@@ -594,6 +533,51 @@ class L1MenuConfig(object):
(self.l1menu.menuName, ', '.join(list_of_undefined_thresholds)) )
+ # ------------------
+ # Items
+ # ------------------
+
+ # build list of items for the menu from the list of requested names
+ itemsForMenu = []
+ ctpIdMap = L1MenuFlags.CtpIdMap()
+ for itemName in L1MenuFlags.items():
+ registeredItem = self.getRegisteredItem(itemName)
+ if registeredItem is None:
+ msg = "L1 item '%s' has not been defined in L1/Config/ItemDef.py" % itemName
+ log.error(msg)
+ raise RuntimeError(msg)
+
+ if itemName in ctpIdMap:
+ newCTPID = ctpIdMap[itemName]
+ registeredItem.setCtpid(newCTPID)
+
+ for thrName in registeredItem.thresholdNames():
+ if thrName not in self.l1menu.thresholds:
+ isLegacyThr = any(filter(lambda x: thrName.startswith(x), ["R2TOPO_", "EM", "TAU", "J", "XE", "TE", "XS"]))
+
+ msg = "L1 item {item} has been added to the menu L1/Menu/Menu_{menu}.py, but the required threshold {thr} is not listed as input in L1/Menu/Menu_{menu}_inputs{legacy}.py".format(item=itemName, thr=thrName, menu=self.menuToLoad(), legacy = "_legacy" if isLegacyThr else "")
+ log.error(msg)
+ raise RuntimeError(msg)
+
+ itemsForMenu += [ registeredItem ]
+
+
+
+ # CTP IDs available for assignment
+ assigned_ctpids = set([item.ctpid for item in itemsForMenu])
+ available_ctpids = sorted( list( set(range(Limits.MaxTrigItems)) - assigned_ctpids ), reverse=True )
+
+ # add the items to the menu
+ for item in itemsForMenu:
+ # set the physics bit
+ if not item.name.startswith('L1_CALREQ'):
+ item.setTriggerType( item.trigger_type | TT.phys )
+ # assign ctp IDs to items that don't have one
+ if item.ctpid == -1:
+ item.setCtpid( available_ctpids.pop() )
+ # add the items into the menu
+ self.l1menu.addItem( item )
+
# ------------------
# Connectors
# ------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
index 94807fe6b3a1fcc349bfe7e232bb39925e1fa8fb..2f2ec498cbd67785b442c950793806e44c58b8f5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs.py
@@ -59,7 +59,7 @@ def defineInputsMenu():
"type" : "ctpin",
"legacy" : False,
"thresholds" : [
- 'MBTS_C0', 'MBTS_C1', 'MBTS_C2', 'MBTS_C3', 'MBTS_C4' , 'MBTS_C5', 'MBTS_C6', 'MBTS_C7', 'MBTS_C8', 'MBTS_C10', 'MBTS_C12', 'MBTS_C14',
+ 'MBTS_C0', 'MBTS_C1', 'MBTS_C2', 'MBTS_C3', 'MBTS_C4', 'MBTS_C5', 'MBTS_C6', 'MBTS_C7', 'MBTS_C8', 'MBTS_C10', 'MBTS_C12', 'MBTS_C14',
'MBTS_C9', 'MBTS_C11', 'MBTS_C13', 'MBTS_C15', # 16x MBTSSI
('MBTS_C',3), # 1x MBTS_C
'NIMTGC', # TGC
@@ -126,7 +126,6 @@ def defineInputsMenu():
]
})
-
topoBoards["Topo2"] = odict()
topoBoards["Topo2"]["connectors"] = []
topoBoards["Topo2"]["connectors"].append({
@@ -275,7 +274,6 @@ def defineInputsMenu():
})
-
muctpiBoard["MuCTPi"]["connectors"].append({
"name" : "MuCTPiEl",
"format" : "topological",
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py
index 3744b48776b337d94d1e9c4be003e944cfddd9fa..8f9235ad985d3d244278236a1ec4b91fa0bbcda0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8_inputs_legacy.py
@@ -5,7 +5,6 @@ from collections import OrderedDict as odict
from ..Base.L1MenuFlags import L1MenuFlags
from ..Base.MenuConfObj import TopoMenuDef
-
def defineLegacyInputsMenu():
legacyBoards = odict()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/Menu_LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/Menu_LS2_v1.py
index 76f404101f7afa22858a9ff5f480b29cc26e5d48..94f697d7e9804a9ef35c349d9cfeb03a74e65305 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/Menu_LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/Menu_LS2_v1.py
@@ -11,7 +11,6 @@ def defineMenu():
from ..L1Topo.L1TopoFlags import L1TopoFlags
from ..L1Topo.TopoOutput import TopoOutput
-# from TriggerJobOpts.TriggerFlags import TriggerFlags
L1TopoFlags.algos = [
@@ -23,7 +22,7 @@ def defineMenu():
TopoOutput( algoname='2DISAMB-J25ab-0DR25-TAU20abi-TAU12abi', module=0, fpga=0, clock=0, firstbit=2 ),
TopoOutput( algoname='2DISAMB-J25ab-0DR28-TAU20abi-TAU12abi', module=0, fpga=0, clock=0, firstbit=3 ),
TopoOutput( algoname='INVM_DPHI_NFF', module=0, fpga=0, clock=0, firstbit=4 ), # 4 bits
- TopoOutput( algoname='0INVM10-3MU4ab', module=0, fpga=0, clock=0, firstbit=9 ),
+ TopoOutput( algoname='0INVM10-3MU4ab', module=0, fpga=0, clock=0, firstbit=8 ),
@@ -52,6 +51,8 @@ def defineMenu():
TopoOutput( algoname='2DISAMB-J25ab-0DR28-EM15his2-TAU12abi', module=1, fpga=0, clock=0, firstbit=11 ),
TopoOutput( algoname='0INVM9-EM7ab-EMab', module=1, fpga=0, clock=0, firstbit=12 ),
TopoOutput( algoname='2DISAMB-TAU12abi-J25ab', module=1, fpga=0, clock=0, firstbit=13 ),
+ TopoOutput( algoname='0DR04-MU4ab-CJ15ab', module=1, fpga=0, clock=0, firstbit=14 ),
+ TopoOutput( algoname='0DR04-MU6ab-CJ20ab', module=1, fpga=0, clock=0, firstbit=15 ),
# module: 1, FPGA: 1
@@ -62,25 +63,24 @@ def defineMenu():
TopoOutput( algoname='MULT-CMU4ab', module=1, fpga=1, clock=0, firstbit=4 ),#2bits
TopoOutput( algoname='MULT-CMU6ab', module=1, fpga=1, clock=0, firstbit=6 ),#2bits
TopoOutput( algoname='0DR15-2MU6ab', module=1, fpga=1, clock=0, firstbit=8 ),
- TopoOutput( algoname='8INVM15-0DR22-2MU6ab', module=1, fpga=1, clock=0, firstbit=9 ),
+# TopoOutput( algoname='8INVM15-0DR22-2MU6ab', module=1, fpga=1, clock=0, firstbit=9 ),
- TopoOutput( algoname='8INVM15-0DR22-MU6ab-MU4ab', module=1, fpga=1, clock=1, firstbit=0 ),
- TopoOutput( algoname='2INVM9-0DR15-MU6ab-MU4ab', module=1, fpga=1, clock=1, firstbit=1 ),
- TopoOutput( algoname='2INVM9-0DR15-2MU4ab', module=1, fpga=1, clock=1, firstbit=2 ),
- TopoOutput( algoname='2INVM9-2DR15-2MU6ab', module=1, fpga=1, clock=1, firstbit=3 ),
- TopoOutput( algoname='5DETA99-5DPHI99-2MU4ab', module=1, fpga=1, clock=1, firstbit=4 ),
- TopoOutput( algoname='5DETA99-5DPHI99-MU6ab-MU4ab', module=1, fpga=1, clock=1, firstbit=5 ),
- TopoOutput( algoname='5DETA99-5DPHI99-2MU6ab', module=1, fpga=1, clock=1, firstbit=6 ),
- TopoOutput( algoname='0DETA04-EM8abi-MU10ab', module=1, fpga=1, clock=1, firstbit=7 ),
- TopoOutput( algoname='0DPHI03-EM8abi-MU10ab', module=1, fpga=1, clock=1, firstbit=8 ),
-#maybe for combination part next two can be useful
- TopoOutput( algoname='0DETA04-EM15abi-MUab', module=1, fpga=1, clock=1, firstbit=9 ),
- TopoOutput( algoname='0DPHI03-EM15abi-MUab', module=1, fpga=1, clock=1, firstbit=10 ),
- TopoOutput( algoname='0INVM70-27DPHI32-EM10his1-EM10his6', module=1, fpga=1, clock=1, firstbit=11 ),
- TopoOutput( algoname='0INVM70-27DPHI32-EM12his1-EM12his6', module=1, fpga=1, clock=1, firstbit=12 ),
- TopoOutput( algoname='0INVM10-0DR15-EM8abi-MU10ab', module=1, fpga=1, clock=1, firstbit=13 ),
- TopoOutput( algoname='0INVM10-0DR15-EM12abi-MU6ab', module=1, fpga=1, clock=1, firstbit=14 ),
- TopoOutput( algoname='8INVM15-2CMU4ab', module=1, fpga=1, clock=1, firstbit=15 ),
+# TopoOutput( algoname='8INVM15-0DR22-MU6ab-MU4ab', module=1, fpga=1, clock=1, firstbit=0 ),
+# TopoOutput( algoname='2INVM9-0DR15-MU6ab-MU4ab', module=1, fpga=1, clock=1, firstbit=1 ),
+# TopoOutput( algoname='2INVM9-0DR15-2MU4ab', module=1, fpga=1, clock=1, firstbit=2 ),
+# TopoOutput( algoname='2INVM9-2DR15-2MU6ab', module=1, fpga=1, clock=1, firstbit=3 ),
+ TopoOutput( algoname='5DETA99-5DPHI99-2MU4ab', module=1, fpga=1, clock=1, firstbit=0 ),
+ TopoOutput( algoname='5DETA99-5DPHI99-MU6ab-MU4ab', module=1, fpga=1, clock=1, firstbit=1 ),
+ TopoOutput( algoname='5DETA99-5DPHI99-2MU6ab', module=1, fpga=1, clock=1, firstbit=2 ),
+ TopoOutput( algoname='0DETA04-EM8abi-MU10ab', module=1, fpga=1, clock=1, firstbit=3 ),
+ TopoOutput( algoname='0DPHI03-EM8abi-MU10ab', module=1, fpga=1, clock=1, firstbit=4 ),
+ TopoOutput( algoname='0DETA04-EM15abi-MUab', module=1, fpga=1, clock=1, firstbit=5 ),
+ TopoOutput( algoname='0DPHI03-EM15abi-MUab', module=1, fpga=1, clock=1, firstbit=6 ),
+ TopoOutput( algoname='0INVM70-27DPHI32-EM10his1-EM10his6', module=1, fpga=1, clock=1, firstbit=7 ),
+ TopoOutput( algoname='0INVM70-27DPHI32-EM12his1-EM12his6', module=1, fpga=1, clock=1, firstbit=8 ),
+# TopoOutput( algoname='0INVM10-0DR15-EM8abi-MU10ab', module=1, fpga=1, clock=1, firstbit=13 ),
+# TopoOutput( algoname='0INVM10-0DR15-EM12abi-MU6ab', module=1, fpga=1, clock=1, firstbit=14 ),
+ TopoOutput( algoname='8INVM15-2CMU4ab', module=1, fpga=1, clock=1, firstbit=9 ),
]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
index 219dd755baa36c41dc3ed9d924751ff834ad5ab2..1c7e9516df6d6cf9545417f8b22c6dbf95688b0c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/L1TopoMenu/TopoAlgoDef.py
@@ -425,7 +425,9 @@ class TopoAlgoDef(object):
# deta-dphi with ab+ab
for x in [
- {"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 2, "otype1" : "MU", "ocut1": 4, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "", "ocut2": 4, "olist2": "", "nleading2": HW.OutputWidthSelectMU}, #5DETA99-5DPHI99-2MU4ab
+ {"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 1, "otype1" : "MU", "ocut1": 6, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "MU", "ocut2": 4, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU}, #5DETA99-5DPHI99-MU6ab-MU4ab
+ {"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 2, "otype1" : "MU", "ocut1": 6, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "", "ocut2": 6, "olist2": "", "nleading2": HW.OutputWidthSelectMU}, #5DETA99-5DPHI99-2MU6ab
+ {"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 2, "otype1" : "MU", "ocut1": 4, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "", "ocut2": 4, "olist2": "", "nleading2": HW.OutputWidthSelectMU}, #5DETA99-5DPHI99-2MU4ab
]:
class d : pass
@@ -606,6 +608,8 @@ class TopoAlgoDef(object):
alg = AlgConf.DeltaEtaIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId ); currentAlgoId += 1
+ log.info("Current algo ID %i" % currentAlgoId )
+
alg.addgeneric('InputWidth', d.inputwidth1) # noqa: F821
@@ -638,6 +642,8 @@ class TopoAlgoDef(object):
alg = AlgConf.MinDeltaPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
+ log.info("Current algo ID %i" % currentAlgoId )
+
alg.addgeneric('InputWidth1', d.inputwidth) # noqa: F821
alg.addgeneric('InputWidth2', 1)
alg.addgeneric('MaxTob1', d.nleading) # noqa: F821
@@ -649,7 +655,38 @@ class TopoAlgoDef(object):
tm.registerAlgo(alg)
+ # added for muon-jet:
+ algoList = [
+ {"minDr": 0, "maxDr": 4, "otype1" : "MU" ,"ocut1": 4, "olist1" : "ab", "otype2" : "CJ", "ocut2": 15, "olist2" : "ab"}, #0DR04-MU4ab-CJ15ab
+ {"minDr": 0, "maxDr": 4, "otype1" : "MU" ,"ocut1": 6, "olist1" : "ab", "otype2" : "CJ", "ocut2": 20, "olist2" : "ab"}, #0DR04-MU6ab-CJ20ab
+ ]
+
+
+ for x in algoList:
+ class d : pass
+ for k in x:
+ setattr (d, k, x[k])
+
+
+ toponame = "%iDR%02d-%s%s%s-%s%s%s" % (d.minDr, d.maxDr, d.otype1, str(d.ocut1), d.olist1, d.otype2, str(d.ocut2), d.olist2) # noqa: F821
+ log.info("Define %s" % toponame)
+ inputList = [d.otype1 + d.olist1, d.otype2 + d.olist2] # noqa: F821
+
+ alg = AlgConf.DeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
+
+ log.info("Current algo ID %i" % currentAlgoId )
+
+ alg.addgeneric('InputWidth1', HW.OutputWidthSelectMU)
+ alg.addgeneric('InputWidth2', HW.OutputWidthSelectJET)
+ alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
+ alg.addgeneric('MaxTob2', HW.OutputWidthSelectJET)
+ alg.addgeneric('NumResultBits', 1)
+ alg.addvariable('MinET1', d.ocut1, 0) # noqa: F821
+ alg.addvariable('MinET2', d.ocut2, 0) # noqa: F821
+ alg.addvariable('DeltaRMin', d.minDr*d.minDr, 0) # noqa: F821
+ alg.addvariable('DeltaRMax', d.maxDr*d.maxDr, 0) # noqa: F821
+ tm.registerAlgo(alg)
# LFV DETA ATR-14282
@@ -774,7 +811,7 @@ class TopoAlgoDef(object):
# DISAMB 2 lists
algolist=[
- {"disamb": 2, "otype1" : "TAU", "ocut1": 12, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU, "otype2" : "J", "ocut2": 25, "olist2": "ab", "nleading2": HW.OutputWidthSelectJET}, #1DISAMB-TAU12abi-J25ab
+ {"disamb": 2, "otype1" : "TAU", "ocut1": 12, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU, "otype2" : "J", "ocut2": 25, "olist2": "ab", "nleading2": HW.OutputWidthSelectJET}, #2DISAMB-TAU12abi-J25ab
]
for x in algolist :
@@ -805,7 +842,7 @@ class TopoAlgoDef(object):
alg.addvariable('DisambDRSqrMin', d.disamb*d.disamb) # noqa: F821
tm.registerAlgo(alg)
- # DISAMB 3 lists with DR cut to 2nd and 3rd lists Lidija
+ # DISAMB 3 lists with DR cut to 2nd and 3rd lists
algolist=[
{"disamb": 2, "otype1" : "TAU", "ocut1": 20, "olist1": "abi","nleading1": HW.OutputWidthSelectTAU, "inputwidth1": HW.OutputWidthSelectTAU, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab", "nleading3": HW.OutputWidthSelectJET, "inputwidth3": HW.OutputWidthSelectJET, "drcutmin": 0, "drcutmax": 25}, # 2DISAMB-J25ab-0DR25-TAU20abi-TAU12abi
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
index edb3890b65ab7700ed5ecc37478e69931a71ebbd..e39990685260604f8e15ba506b3f14ec6fe7b26e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1/Cabling.py
@@ -1,13 +1,10 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-#
-# Disable flake8 checking due to the use of 'exec':
-# flake8: noqa
-#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from .Limits import Limits
from AthenaCommon.Logging import logging
log = logging.getLogger("Cabling")
+log.setLevel(logging.INFO)
"""
Thilo's proposal in the CTP meeting Oct 13
@@ -78,7 +75,7 @@ def getLutInput(connector):
-class Cabling(object):
+class Cabling:
@staticmethod
def getInputCable(threshold):
return InputCable( threshold )
@@ -90,6 +87,16 @@ class Cabling(object):
from .Lvl1Flags import Lvl1Flags
run1 = Lvl1Flags.CTPVersion()<=3
+
+
+ if thrtype == 'EM' and mapping >= 16:
+ mapping = 15
+ elif thrtype == 'TAU' and mapping >= 16:
+ mapping = 15
+ elif thrtype == 'JET' and mapping >= 25:
+ mapping = 24
+ elif thrtype == 'XE' and mapping >=16:
+ mapping = 15
if run1:
type2cablename = { 'MUON' : [(0,6,'MUCTPI')],
@@ -115,13 +122,13 @@ class Cabling(object):
}
else:
type2cablename = { 'MUON' : [(0,6,'MUCTPI')],
- 'EM' : [(0,8,'EM1'), (8,16,'EM2')],
- 'TAU' : [(0,8,'TAU1'), (8,16,'TAU2')],
- 'JET' : [(0,10,'JET1'), (10,25,'JET2')],
+ 'EM' : [(0,8,'EM1'), (8,16,'EM2'), (16, 20, 'EM1'), (20, 26, 'EM2')],
+ 'TAU' : [(0,8,'TAU1'), (8,16,'TAU2'), (16, 19, 'TAU1'), (19, 24, 'TAU2')],
+ 'JET' : [(0,10,'JET1'), (10,25,'JET2'), (25, 33, 'JET1'), (33, 42, 'JET2')],
'TE' : [(0,8,'EN1'),(8,16,'EN2')],
- 'XE' : [(0,8,'EN1'),(8,16,'EN2')],
+ 'XE' : [(0,8,'EN1'),(8,16,'EN2'), (16, 24, 'EN1')],
'XS' : [(0,8,'EN1')],
- 'MBTSSI' : [(0,12,'NIM1'),(12,24,'NIM2')],
+ 'MBTSSI' : [(0,16,'NIM1'),(16,32,'NIM2')],
'MBTS' : [(0,1,'NIM1'), (1,2,'NIM2')],
'LUCID' : [(0,6,'CTPCAL')],
'ZDC' : [(0,3,'CTPCAL')],
@@ -150,11 +157,12 @@ class Cabling(object):
@staticmethod
def calcBitnum(thrtype):
# get the widths for the threshold types is defined in L1Common
- return getattr (Limits, '%s_bitnum' % thrtype)
+ nbits = getattr(Limits,'%s_bitnum' % thrtype)
+ return nbits
-class InputCable(object):
+class InputCable:
def __fillTopoInputs(self, threshold):
# CTPCORE
@@ -166,11 +174,12 @@ class InputCable(object):
self.clock = threshold.clock
self.range_begin = threshold.bitOnCable
self.range_end = threshold.bitOnCable+self.bitnum-1
-
+
log.debug( 'Threshold type %s (mapping=%i) comes in on CTPCore on cable %s, bit %s, clock %i',
self.thrtype, self.mapping, self.connector,
("%i" % self.range_begin) if self.bitnum==1 else ("%i-%i" % (self.range_begin, self.range_end)), self.clock )
+
def __fillAlfaInputs(self, threshold):
# CTPCORE
self.isDirectIn = True
@@ -180,11 +189,13 @@ class InputCable(object):
self.clock = self.mapping / 32
self.range_begin = self.mapping % 32
self.range_end = self.range_begin
-
+
log.debug( 'Threshold type %s (mapping=%i) comes in on CTPCore on cable %s, bit %s, clock %i',
self.thrtype, self.mapping, self.connector,
("%i" % self.range_begin) if self.bitnum==1 else ("%i-%i" % (self.range_begin, self.range_end)), self.clock )
+
+
def __fillCTPIn(self):
self.name = Cabling.getCableName(self.thrtype,self.mapping)
@@ -194,6 +205,7 @@ class InputCable(object):
("%i" % self.range_begin) if self.bitnum==1 else ("%i-%i" % (self.range_begin, self.range_end)) )
+
def __init__(self, threshold ):
if threshold.ttype == 'ZB':
@@ -201,6 +213,17 @@ class InputCable(object):
else:
self.thrtype = threshold.ttype
self.mapping = int(threshold.mapping)
+ thrtype = self.thrtype
+ mapping = self.mapping
+ if thrtype == 'EM' and mapping >= 16:
+ mapping = 15
+ elif thrtype == 'TAU' and mapping >= 16:
+ mapping = 15
+ elif thrtype == 'JET' and mapping >= 25:
+ mapping = 24
+ elif thrtype == 'XE' and mapping >=16:
+ mapping = 15
+ self.mapping = mapping
self.isDirectIn = False # True for TOPO and ALFA which go into CTPCore
self.slot = None # input cable slot, possible values 7..9
@@ -236,6 +259,21 @@ class InputCable(object):
cableAssign += self.getCTPINCableAssignment("TAU")
offset = self.mapping
+ name = Cabling.getCableName(self.thrtype,self.mapping)
+ if name == 'EM1' and self.mapping >= 16:
+ offset -= 16
+ elif name == 'EM2' and self.mapping >= 20:
+ offset -= 12
+ elif name == 'TAU1' and self.mapping >= 16:
+ offset -= 16
+ elif name == 'TAU2' and self.mapping >= 19:
+ offset -= 11
+ elif name == 'JET1' and self.mapping >= 25:
+ offset -= 25
+ elif name == 'JET2' and self.mapping >= 33:
+ offset -= 23
+ elif self.thrtype == 'XE' and name == 'EN1' and self.mapping >= 16:
+ offset -= 16
for (slot, connector, start, stop, bitnum) in cableAssign:
self.bitnum = bitnum
@@ -243,6 +281,7 @@ class InputCable(object):
delta = (stop - start + 1) / self.bitnum
log.debug( 'Cable SLOT%i / CON%i has room for %i thresholds of type %s', slot, connector, delta, self.thrtype )
+
if offset >= delta: # does not fit on this connector (only 0 to offset-1 will fit)
offset -= delta # move to the next cable for checking
continue
@@ -252,7 +291,6 @@ class InputCable(object):
self.range_begin = start + offset * self.bitnum
self.range_end = self.range_begin + self.bitnum-1
break
-
if not self.connector:
log.error("Cable mapping ERROR %s", cableAssign)
raise RuntimeError("No cable has been assigned to threshold type '%s' with mapping %i" % (self.thrtype,self.mapping))
@@ -266,8 +304,7 @@ class InputCable(object):
"""
Gets the cable assignment from L1Common
"""
- cable = getattr (Limits, "%s_cable" % thrtype)
-
+ cable = getattr(Limits,'%s_cable' % thrtype)
# we change the format for run 2, the tuple now contains also the bit multiplicity, as it is not constant per type
infosize = (len(cable)-1)/cable[0]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py
index bbf15795bf8ad05609f1b99f71b6df1c7d8f5af9..a1c06071100e05964d84b4f61ea2478018ca40a4 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/ItemDef.py
@@ -83,21 +83,16 @@ class ItemDef(object):
LVL1MenuItem('L1_EM10' ).setLogic( d.EM10 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM24VHI' ).setLogic( d.EM24VHI & physcond).setTriggerType( TT.calo)
LVL1MenuItem('L1_EM8' ).setLogic( d.EM8 & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM8I' ).setLogic( d.EM8I & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM12' ).setLogic( d.EM12 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM14' ).setLogic( d.EM14 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15' ).setLogic( d.EM15 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15_BGRP7').setLogic( d.EM15 & bgrp7cond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15I' ).setLogic( d.EM15 & d.EM8I & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI' ).setLogic( d.EM15HI & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VHI' ).setLogic( d.EM15VHI & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM26VHI' ).setLogic( d.EM26VHI & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM16' ).setLogic( d.EM16 & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM8VH' ).setLogic( d.EM8VH & physcond).setTriggerType( TT.calo )
+ LVL1MenuItem('L1_EM8VH' ).setLogic( d.EM8VH & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_EM10VH' ).setLogic( d.EM10VH & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM20A' ).setLogic( d.EM20A & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM20C' ).setLogic( d.EM20C & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM13VH' ).setLogic( d.EM13VH & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VH' ).setLogic( d.EM15VH & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM18' ).setLogic( d.EM18 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM18VH' ).setLogic( d.EM18VH & physcond).setTriggerType( TT.calo )
@@ -124,26 +119,25 @@ class ItemDef(object):
LVL1MenuItem('L1_2EM7' ).setLogic( d.EM7.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_2EM10' ).setLogic( d.EM10.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_2EM10VH' ).setLogic( d.EM10VH.x(2) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_2EM13VH' ).setLogic( d.EM13VH.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_2EM15' ).setLogic( d.EM15.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_2EM15VH' ).setLogic( d.EM15VH.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_2EM15VHI' ).setLogic( d.EM15VHI.x(2) & physcond).setTriggerType( TT.calo ) # noqa: F821
- LVL1MenuItem('L1_2EM18VH' ).setLogic( d.EM18VH.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_2EM20VH' ).setLogic( d.EM20VH.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM7_2EM3' ).setLogic( d.EM7 & d.EM3.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM12_2EM3' ).setLogic( d.EM12 & d.EM3.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM20VH_2EM7' ).setLogic( d.EM20VH & d.EM7.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM20VH_3EM10VH' ).setLogic( d.EM20VH & d.EM10VH.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM20VH_2EM10VH_3EM8VH' ).setLogic( d.EM20VH & d.EM10VH.x(2) & d.EM8VH.x(3) & physcond).setTriggerType( TT.calo )
+ LVL1MenuItem('L1_EM20VH_2EM10VH_3EM8VH' ).setLogic( d.EM20VH & d.EM10VH.x(2) & d.EM8VH.x(3) & physcond).setTriggerType( TT.calo )
+
+
+
# 4xEM
LVL1MenuItem('L1_EM15VH_3EM7' ).setLogic( d.EM15VH & d.EM7.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VH_3EM8VH' ).setLogic( d.EM15VH & d.EM8VH.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VH_3EM10VH' ).setLogic( d.EM15VH & d.EM10VH.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VH_2EM10VH_3EM7' ).setLogic( d.EM15VH & d.EM10VH.x(2) & d.EM7.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM18VH_3EM8VH' ).setLogic( d.EM18VH & d.EM8VH.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM18VH_2EM10VH_3EM7' ).setLogic( d.EM18VH & d.EM10VH.x(2) & d.EM7.x(3) & physcond).setTriggerType( TT.calo )
# EM and jet
LVL1MenuItem('L1_JJ15.23ETA49' ).setLogic( d.JJ1523ETA49 & physcond).setTriggerType(TT.calo)
@@ -162,18 +156,10 @@ class ItemDef(object):
LVL1MenuItem('L1_J20.0ETA28' ).setLogic( d.J200ETA28 & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_J25.0ETA23' ).setLogic( d.J250ETA23 & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_J35.0ETA23' ).setLogic( d.J350ETA23 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_J20.0ETA49' ).setLogic( d.J200ETA49 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_J30.0ETA49' ).setLogic( d.J300ETA49 & physcond).setTriggerType(TT.calo)
-
-
-
-
-
-
# HI
LVL1MenuItem('L1_EM3_NZ' ).setLogic( d.EM3 & Not(d.ZDC_AND) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_2EM3_NZ' ).setLogic( d.EM3.x(2) & Not(d.ZDC_AND) & physcond).setTriggerType( TT.calo )
@@ -267,13 +253,6 @@ class ItemDef(object):
LVL1MenuItem('L1_MU4_TE120' ).setLogic( d.MU4 & d.TE120 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_MU4_TE160' ).setLogic( d.MU4 & d.TE160 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_MU4_TE10.0ETA24' ).setLogic( d.MU4 & d.TE100ETA24 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_MU4_TE15.0ETA24' ).setLogic( d.MU4 & d.TE150ETA24 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_MU4_TE20.0ETA24' ).setLogic( d.MU4 & d.TE200ETA24 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_MU4_TE25.0ETA24' ).setLogic( d.MU4 & d.TE250ETA24 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_MU4_TE30.0ETA24' ).setLogic( d.MU4 & d.TE300ETA24 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_MU4_TE35.0ETA24' ).setLogic( d.MU4 & d.TE350ETA24 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_MU4_TE40.0ETA24' ).setLogic( d.MU4 & d.TE400ETA24 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_MU0_VTE50').setLogic( d.MU0 & Not(d.TE50) & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_MU4_VTE50').setLogic( d.MU4 & Not(d.TE50) & physcond).setTriggerType(TT.muon)
@@ -311,10 +290,8 @@ class ItemDef(object):
LVL1MenuItem('L1_EM7_MU15' ).setLogic( d.EM7 & d.MU15 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM7_MU20' ).setLogic( d.EM7 & d.MU20 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM8VH_MU15' ).setLogic( d.EM8VH & d.MU15 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_EM8VH_MU20' ).setLogic( d.EM8VH & d.MU20 & physcond).setTriggerType(TT.muon)
+ LVL1MenuItem('L1_EM8VH_MU20' ).setLogic( d.EM8VH & d.MU20 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM8_MU10' ).setLogic( d.EM8 & d.MU10 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_EM8I_MU10' ).setLogic( d.EM8I & d.MU10 & physcond).setTriggerType(TT.muon)
- LVL1MenuItem('L1_EM15I_MU4' ).setLogic( d.EM15 & d.EM8I & d.MU4 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM15VH_MU10').setLogic( d.EM15VH & d.MU10 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM3_MU20' ).setLogic( d.EM3 & d.MU20 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_2EM8VH_MU10').setLogic( d.EM8VH.x(2) & d.MU10 & physcond).setTriggerType(TT.muon)
@@ -333,7 +310,6 @@ class ItemDef(object):
LVL1MenuItem('L1_TAU12IL').setLogic( d.HA12IL & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU12IM').setLogic( d.HA12IM & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_TAU12IT').setLogic( d.HA12IT & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU12I').setLogic( d.HA12I & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU15' ).setLogic( d.HA15 & physcond).setTriggerType( TT.calo )
@@ -341,13 +317,11 @@ class ItemDef(object):
LVL1MenuItem('L1_TAU20' ).setLogic( d.HA20 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20IL' ).setLogic( d.HA20IL & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20IM' ).setLogic( d.HA20IM & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_TAU20IT' ).setLogic( d.HA20IT & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20A' ).setLogic( d.HA20A & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20C' ).setLogic( d.HA20C & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU25' ).setLogic( d.HA25 & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_TAU25IT' ).setLogic( d.HA25IT & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU30' ).setLogic( d.HA30 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU40' ).setLogic( d.HA40 & physcond).setTriggerType( TT.calo )
@@ -379,9 +353,6 @@ class ItemDef(object):
# mixed tau
LVL1MenuItem('L1_EM15VH_2TAU12' ).setLogic( d.EM15VH & d.HA12.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VH_2TAU12IL' ).setLogic( d.EM15VH & d.HA12IL.x(2) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12' ).setLogic( d.EM15HI & d.HA12.x(2) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12IL' ).setLogic( d.EM15HI & d.HA12IL.x(2) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12IM' ).setLogic( d.EM15HI & d.HA12IM.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15_2TAU12' ).setLogic( d.EM15 & d.HA12.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15_2TAU20' ).setLogic( d.EM15 & d.HA20.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VH_2TAU20' ).setLogic( d.EM15VH & d.HA20.x(2) & physcond).setTriggerType( TT.calo )
@@ -389,10 +360,6 @@ class ItemDef(object):
LVL1MenuItem('L1_EM15HI_TAU40_2TAU15' ).setLogic( d.EM15HI & d.HA40 & d.HA15.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15_2TAU12_J25_2J15_3J12' ).setLogic( d.EM15 & d.HA12.x(2) & d.J25 & d.J15.x(2) & d.J12.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12I_J25_2J15_3J12' ).setLogic( d.EM15HI & d.HA12I.x(2) & d.J25 & d.J15.x(2) & d.J12.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12IM_J25_3J12' ).setLogic( d.EM15HI & d.HA12IM.x(2) & d.J25 & d.J12.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12IL_J25_3J12' ).setLogic( d.EM15HI & d.HA12IL.x(2) & d.J25 & d.J12.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12_J25_3J12' ).setLogic( d.EM15HI & d.HA12.x(2) & d.J25 & d.J12.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_MU10_TAU12' ).setLogic( d.MU10 & d.HA12 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_MU10_TAU12I' ).setLogic( d.MU10 & d.HA12I & physcond).setTriggerType( TT.calo )
@@ -419,7 +386,6 @@ class ItemDef(object):
LVL1MenuItem('L1_TAU20IM_2TAU12IM_J25_2J20_3J12').setLogic( d.HA20IM & d.HA12IM.x(2) & d.J25 & d.J20.x(2) & d.J12.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20IL_2TAU12IL_J25_2J20_3J12').setLogic( d.HA20IL & d.HA12IL.x(2) & d.J25 & d.J20.x(2) & d.J12.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_TAU25IT_2TAU12IT_2J25_3J12').setLogic( d.HA25IT & d.HA12IT.x(2) & d.J25.x(2) & d.J12.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_2TAU12I_TAU20_J25_2J15_3J12' ).setLogic( d.HA12I.x(2) & d.HA20 & d.J25 & d.J15.x(2) & d.J12.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20_2J20_XE45' ).setLogic( d.HA20 & d.J20.x(2) & d.XE45 & physcond).setTriggerType( TT.calo )
@@ -429,25 +395,18 @@ class ItemDef(object):
LVL1MenuItem('L1_TAU20_2TAU12_XE35' ).setLogic( d.HA20 & d.HA12.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20IM_2TAU12IM_XE35' ).setLogic( d.HA20IM & d.HA12IM.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20IL_2TAU12IL_XE35' ).setLogic( d.HA20IL & d.HA12IL.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_TAU20IT_2TAU12IT_XE35' ).setLogic( d.HA20IT & d.HA12IT.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20IM_2TAU12IM_XE40' ).setLogic( d.HA20IM & d.HA12IM.x(2) & d.XE40 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU40_2TAU12IM_XE40' ).setLogic( d.HA40 & d.HA12IM.x(2) & d.XE40 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VHI_2TAU12IM' ).setLogic( d.EM15VHI & d.HA12IM.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VHI_TAU40_2TAU15' ).setLogic( d.EM15VHI & d.HA40 & d.HA15.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VHI_2TAU12IM_J25_3J12' ).setLogic( d.EM15VHI & d.HA12IM.x(2) & d.J25 & d.J12.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VHI_2TAU12IM_4J12' ).setLogic( d.EM15VHI & d.HA12IM.x(2) & d.J12.x(4) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_TAU20IM_2TAU15_J25_2J20_3J15' ).setLogic( d.EM15HI & d.HA20IM & d.HA15.x(2) & d.J25 & d.J20.x(2) & d.J15.x(3) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM20VHI_TAU20IM_2TAU20_J25_3J20' ).setLogic( d.EM20VHI & d.HA20IM & d.HA20.x(2) & d.J25 & d.J20.x(3) & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12I_XE35' ).setLogic( d.EM15HI & d.HA12I.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12IM_XE35' ).setLogic( d.EM15HI & d.HA12IM.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12IL_XE35' ).setLogic( d.EM15HI & d.HA12IL.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_EM15HI_2TAU12_XE35' ).setLogic( d.EM15HI & d.HA12.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_EM15VHI_2TAU12IM_XE35' ).setLogic( d.EM15VHI & d.HA12IM.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_MU10_TAU12I_XE35' ).setLogic( d.MU10 & d.HA12I & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_MU10_TAU12_XE35' ).setLogic( d.MU10 & d.HA12 & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_MU10_TAU12IL_XE35' ).setLogic( d.MU10 & d.HA12IL & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_MU10_TAU12IM_XE35' ).setLogic( d.MU10 & d.HA12IM & d.XE35 & physcond).setTriggerType( TT.calo )
- LVL1MenuItem('L1_MU10_TAU12IT_XE35' ).setLogic( d.MU10 & d.HA12IT & d.XE35 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_MU10_TAU12IM_XE40' ).setLogic( d.MU10 & d.HA12IM & d.XE40 & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20I_2TAU12I_XE35' ).setLogic( d.HA20I & d.HA12I.x(2) & d.XE35 & physcond).setTriggerType( TT.calo )
@@ -531,12 +490,12 @@ class ItemDef(object):
LVL1MenuItem('L1_4J10' ).setLogic( d.J10.x(4) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_4J15' ).setLogic( d.J15.x(4) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_4J20' ).setLogic( d.J20.x(4) & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_4J20.0ETA49').setLogic( d.J200ETA49.x(4) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_4J30' ).setLogic( d.J30.x(4) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_6J15' ).setLogic( d.J15.x(6) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_J75_3J20' ).setLogic( d.J75 & d.J20.x(3) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_J85_3J30' ).setLogic( d.J85 & d.J30.x(3) & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_J30.0ETA49_2J20.0ETA49' ).setLogic( d.J300ETA49 & d.J200ETA49.x(2) & physcond).setTriggerType(TT.calo)
+# LVL1MenuItem('L1_4J20.0ETA49').setLogic( d.J200ETA49.x(4) & physcond).setTriggerType(TT.calo) # noqa: F821
+ LVL1MenuItem('L1_J30.0ETA49_2J20.0ETA49' ).setLogic( d.J300ETA49 & d.J200ETA49.x(2) & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_J15.0ETA25_2J15.31ETA49' ).setLogic( d.J150ETA25 & d.J1531ETA49.x(2) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_J40.0ETA25_2J15.31ETA49' ).setLogic( d.J400ETA25 & d.J1531ETA49.x(2) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_J40.0ETA25_2J25_J20.31ETA49' ).setLogic( d.J400ETA25 & d.J25.x(2) & d.J2031ETA49 & physcond).setTriggerType(TT.calo)
@@ -569,23 +528,20 @@ class ItemDef(object):
LVL1MenuItem('L1_2J40_XE45').setLogic( d.J40.x(2) & d.XE45 & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_2J50_XE40').setLogic( d.J50.x(2) & d.XE50 & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_J40_XE60').setLogic( d.J40 & d.XE60 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_J30.0ETA49_XE50').setLogic( d.J300ETA49 & d.XE50 & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_3J15.0ETA25_XE40').setLogic( d.J150ETA25.x(3) & d.XE40 & physcond).setTriggerType(TT.calo)
# combined em - jet
LVL1MenuItem('L1_EM15VH_JJ15.23ETA49' ).setLogic( d.EM15VH & d.JJ1523ETA49 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_EM13VH_3J20' ).setLogic( d.EM13VH & d.J20.x(3) & physcond).setTriggerType(TT.calo)
### ATR-15524
- LVL1MenuItem('L1_EM18VH_3J20' ).setLogic( d.EM18VH & d.J20.x(3) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_EM18VHI_3J20' ).setLogic( d.EM18VHI & d.J20.x(3) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_EM20VH_3J20' ).setLogic( d.EM20VH & d.J20.x(3) & physcond).setTriggerType(TT.calo)
# combined mu - jet
LVL1MenuItem('L1_MU4_J12' ).setLogic( d.MU4 & d.J12 & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_MU6_J20' ).setLogic( d.MU6 & d.J20 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_MU6_J30.0ETA49_2J20.0ETA49').setLogic( d.MU6 & d.J300ETA49 & d.J200ETA49.x(2) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_MU6_J40' ).setLogic( d.MU6 & d.J40 & physcond).setTriggerType(TT.calo)
+ LVL1MenuItem('L1_MU6_J30.0ETA49_2J20.0ETA49').setLogic( d.MU6 & d.J300ETA49 & d.J200ETA49.x(2) & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_MU6_J75' ).setLogic( d.MU6 & d.J75 & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_MU4_3J15' ).setLogic( d.MU4 & d.J15.x(3) & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_MU4_3J20' ).setLogic( d.MU4 & d.J20.x(3) & physcond).setTriggerType(TT.calo)
@@ -681,31 +637,6 @@ class ItemDef(object):
LVL1MenuItem('L1_TE12000').setLogic( d.TE12000 & physcond).setTriggerType(TT.calo)
LVL1MenuItem('L1_TE14000').setLogic( d.TE14000 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE0.0ETA24').setLogic( d.TE00ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE3.0ETA24').setLogic( d.TE30ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE5.0ETA24').setLogic( d.TE50ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE10.0ETA24').setLogic( d.TE100ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE15.0ETA24').setLogic( d.TE150ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE20.0ETA24').setLogic( d.TE200ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE25.0ETA24').setLogic( d.TE250ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE30.0ETA24').setLogic( d.TE300ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE35.0ETA24').setLogic( d.TE350ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE40.0ETA24').setLogic( d.TE400ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE45.0ETA24').setLogic( d.TE450ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE50.0ETA24').setLogic( d.TE500ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE55.0ETA24').setLogic( d.TE550ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE60.0ETA24').setLogic( d.TE600ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE65.0ETA24').setLogic( d.TE650ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE70.0ETA24').setLogic( d.TE700ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE80.0ETA24').setLogic( d.TE800ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE110.0ETA24').setLogic( d.TE1100ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE150.0ETA24').setLogic( d.TE1500ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE180.0ETA24').setLogic( d.TE1800ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE2000.0ETA24').setLogic( d.TE20000ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE5000.0ETA24').setLogic( d.TE20000ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE6500.0ETA24').setLogic( d.TE20000ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE8000.0ETA24').setLogic( d.TE20000ETA24 & physcond).setTriggerType(TT.calo)
- LVL1MenuItem('L1_TE9000.0ETA24').setLogic( d.TE20000ETA24 & physcond).setTriggerType(TT.calo)
# HI items
LVL1MenuItem('L1_TE500.0ETA49').setLogic( d.TE5000ETA49 & physcond).setTriggerType(TT.calo)
@@ -1293,19 +1224,11 @@ class ItemDef(object):
# B-jet
LVL1MenuItem('L1_BTAG-MU4J15').setLogic( d.TOPO_0DR04_MU4ab_CJ15ab & physcond)
- LVL1MenuItem('L1_BTAG-MU4J30').setLogic( d.TOPO_0DR04_MU4ab_CJ30ab & physcond)
LVL1MenuItem('L1_BTAG-MU6J20').setLogic( d.TOPO_0DR04_MU6ab_CJ20ab & physcond)
- LVL1MenuItem('L1_BTAG-MU6J25').setLogic( d.TOPO_0DR04_MU6ab_CJ25ab & physcond)
- LVL1MenuItem('L1_BTAG-MU4J20').setLogic( d.TOPO_0DR04_MU4ab_CJ20ab & physcond)
- LVL1MenuItem('L1_3J15_BTAG-MU4J15').setLogic( d.J15.x(3) & d.TOPO_0DR04_MU4ab_CJ15ab & physcond)
- LVL1MenuItem('L1_3J15_BTAG-MU4J30').setLogic( d.J15.x(3) & d.TOPO_0DR04_MU4ab_CJ30ab & physcond)
- LVL1MenuItem('L1_3J15_BTAG-MU6J25').setLogic( d.J15.x(3) & d.TOPO_0DR04_MU6ab_CJ25ab & physcond)
- LVL1MenuItem('L1_3J20_BTAG-MU4J20').setLogic( d.J20.x(3) & d.TOPO_0DR04_MU4ab_CJ20ab & physcond)
- #LVL1MenuItem('L1_3J20_BTAG-MU4J30').setLogic( d.J20.x(3) & d.TOPO_0DR04_MU4ab_CJ30ab & physcond)
- #LVL1MenuItem('L1_3J20_BTAG-MU6J25').setLogic( d.J20.x(3) & d.TOPO_0DR04_MU6ab_CJ25ab & physcond)
+
# ZH
- LVL1MenuItem('L1_DPHI-AJ20s2XE50' ).setLogic( d.TOPO_10MINDPHI_AJ20s2_XE50 & physcond)
+ #LVL1MenuItem('L1_DPHI-AJ20s2XE50' ).setLogic( d.TOPO_10MINDPHI_AJ20s2_XE50 & physcond)
#LVL1MenuItem('L1_J40_DPHI-Js2XE50' ).setLogic( d.J40 & d.TOPO_10MINDPHI_Js2_XE50 & physcond)
LVL1MenuItem('L1_J40_DPHI-J20s2XE50').setLogic( d.J40 & d.TOPO_10MINDPHI_J20s2_XE50 & physcond)
@@ -1317,21 +1240,26 @@ class ItemDef(object):
LVL1MenuItem('L1_J40_XE50_DPHI-J20s2XE50').setLogic( d.J40 & d.XE50 & d.TOPO_10MINDPHI_J20s2_XE50 & physcond)
- LVL1MenuItem('L1_J40_DPHI-J20XE50' ).setLogic( d.J40 & d.TOPO_10MINDPHI_J20ab_XE50 & physcond)
- LVL1MenuItem('L1_J40_DPHI-CJ20XE50' ).setLogic( d.J40 & d.TOPO_10MINDPHI_CJ20ab_XE50 & physcond)
+ #LVL1MenuItem('L1_J40_DPHI-J20XE50' ).setLogic( d.J40 & d.TOPO_10MINDPHI_J20ab_XE50 & physcond)
+ #LVL1MenuItem('L1_J40_DPHI-CJ20XE50' ).setLogic( d.J40 & d.TOPO_10MINDPHI_CJ20ab_XE50 & physcond)
# HT
#LVL1MenuItem('L1_HT0-J0.ETA49' ).setLogic( d.TOPO_HT0_AJ0allETA49 & physcond)
- LVL1MenuItem('L1_HT190-J15.ETA21' ).setLogic( d.TOPO_HT190_AJ15allETA21 & physcond)
+ #LVL1MenuItem('L1_HT190-J15.ETA21' ).setLogic( d.TOPO_HT190_AJ15allETA21 & physcond)
LVL1MenuItem('L1_HT190-J15s5.ETA21').setLogic( d.TOPO_HT190_J15s5ETA21 & physcond)
- LVL1MenuItem('L1_HT150-J20.ETA31' ).setLogic( d.TOPO_HT150_AJ20allETA31 & physcond)
+ #LVL1MenuItem('L1_HT150-J20.ETA31' ).setLogic( d.TOPO_HT150_AJ20allETA31 & physcond)
LVL1MenuItem('L1_HT150-J20s5.ETA31').setLogic( d.TOPO_HT150_J20s5ETA31 & physcond)
- LVL1MenuItem('L1_HT150-J20s5.ETA31_MJJ-400').setLogic( d.TOPO_HT150_J20s5ETA31 & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)# new
- LVL1MenuItem('L1_HT150-J20s5.ETA31_MJJ-400-CF').setLogic( d.TOPO_HT150_J20s5ETA31 & d.TOPO_400INVM9999_AJ30s6ETA31_AJ20s631ETA49 & physcond) #new
+ #LVL1MenuItem('L1_HT150-J20s5.ETA31_MJJ-400').setLogic( d.TOPO_HT150_J20s5ETA31 & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)# new
+ LVL1MenuItem('L1_HT150-J20s5.ETA31_MJJ-400-CF').setLogic( d.TOPO_HT150_J20s5ETA31 & d.TOPO_400INVM9999_AJ30s6ETA31_AJ20s631ETA49 & physcond) #new
+ LVL1MenuItem('L1_MJJ-400-NFF-0DPHI20').setLogic( d.TOPO_400INVM9999_0DPHI20_J30s6_AJ20s6 & physcond) # noqa: F821
+ LVL1MenuItem('L1_MJJ-400-NFF-0DPHI22').setLogic( d.TOPO_400INVM9999_0DPHI22_J30s6_AJ20s6 & physcond) # noqa: F821
+ LVL1MenuItem('L1_MJJ-400-NFF-0DPHI24').setLogic( d.TOPO_400INVM9999_0DPHI24_J30s6_AJ20s6 & physcond) # noqa: F821
+ LVL1MenuItem('L1_MJJ-400-NFF-0DPHI26').setLogic( d.TOPO_400INVM9999_0DPHI26_J30s6_AJ20s6 & physcond) # noqa: F821
+
# Jpsi T&P
- LVL1MenuItem("L1_JPSI-1M5" ).setLogic( d.TOPO_1INVM5_EMs1_EMs6 & physcond)
+ #LVL1MenuItem("L1_JPSI-1M5" ).setLogic( d.TOPO_1INVM5_EMs1_EMs6 & physcond)
LVL1MenuItem("L1_JPSI-1M5-EM7" ).setLogic( d.TOPO_1INVM5_EM7s1_EMs6 & physcond)
LVL1MenuItem("L1_JPSI-1M5-EM12").setLogic( d.TOPO_1INVM5_EM12s1_EMs6 & physcond)
@@ -1361,58 +1289,58 @@ class ItemDef(object):
# LVL1MenuItem("L1_EM15_W-MT35_W-05DPHI-JXE-0_W-05DPHI-EMXE_XS30" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_05MINDPHI_AJj20s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & d.XS30 & physcond)
# LVL1MenuItem("L1_EM15_W-MT35_W-05DPHI-JXE-0_W-05DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_05MINDPHI_AJj20s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
#else:
- LVL1MenuItem("L1_W-05DPHI-JXE-0" ).setLogic( d.TOPO_05MINDPHI_AJj10s6_XE0 & physcond)
- LVL1MenuItem("L1_W-10DPHI-JXE-0" ).setLogic( d.TOPO_10MINDPHI_AJj10s6_XE0 & physcond)
- LVL1MenuItem("L1_W-15DPHI-JXE-0" ).setLogic( d.TOPO_15MINDPHI_AJj10s6_XE0 & physcond)
- LVL1MenuItem("L1_W-05DPHI-EMXE-1" ).setLogic( d.TOPO_05MINDPHI_EM12s6_XE0 & physcond)
-
- LVL1MenuItem("L1_W-05DPHI-EM15XE-1" ).setLogic( d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
-
- LVL1MenuItem("L1_W-15DPHI-EM15XE-1" ).setLogic( d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
- LVL1MenuItem("L1_W-15DPHI-EMXE-1" ).setLogic( d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
- LVL1MenuItem("L1_W-05RO-XEHT-0" ).setLogic( d.TOPO_05RATIO_XE0_HT0_AJj15allETA49 & physcond)
- LVL1MenuItem("L1_W-90RO2-XEHT-0" ).setLogic( d.TOPO_90RATIO2_XE0_HT0_AJj15allETA49 & physcond)
- LVL1MenuItem("L1_W-250RO2-XEHT-0" ).setLogic( d.TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & physcond)
- LVL1MenuItem("L1_W-HT20-JJ15.ETA49").setLogic( d.TOPO_HT20_AJj15allETA49 & physcond)
- LVL1MenuItem("L1_W-NOMATCH" ).setLogic( d.TOPO_NOT_02MATCH_EM10s1_AJj15allETA49 & physcond)
- #LVL1MenuItem("L1_W-NOMATCH_W-05RO-XEEMHT").setLogic( d.TOPO_NOT_02MATCH_EM10s1_AJj15allETA49 & d.TOPO_05RATIO_XE0_SUM0_EM10s1_HT0_AJj15allETA49 & physcond)
- LVL1MenuItem("L1_EM12_W-MT25").setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & physcond)
+# LVL1MenuItem("L1_W-05DPHI-JXE-0" ).setLogic( d.TOPO_05MINDPHI_AJj10s6_XE0 & physcond)
+# LVL1MenuItem("L1_W-10DPHI-JXE-0" ).setLogic( d.TOPO_10MINDPHI_AJj10s6_XE0 & physcond)
+# LVL1MenuItem("L1_W-15DPHI-JXE-0" ).setLogic( d.TOPO_15MINDPHI_AJj10s6_XE0 & physcond)
+# LVL1MenuItem("L1_W-05DPHI-EMXE-1" ).setLogic( d.TOPO_05MINDPHI_EM12s6_XE0 & physcond)
+#
+# LVL1MenuItem("L1_W-05DPHI-EM15XE-1" ).setLogic( d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
+#
+# LVL1MenuItem("L1_W-15DPHI-EM15XE-1" ).setLogic( d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
+# LVL1MenuItem("L1_W-15DPHI-EMXE-1" ).setLogic( d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
+# LVL1MenuItem("L1_W-05RO-XEHT-0" ).setLogic( d.TOPO_05RATIO_XE0_HT0_AJj15allETA49 & physcond)
+# LVL1MenuItem("L1_W-90RO2-XEHT-0" ).setLogic( d.TOPO_90RATIO2_XE0_HT0_AJj15allETA49 & physcond)
+# LVL1MenuItem("L1_W-250RO2-XEHT-0" ).setLogic( d.TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & physcond)
+# LVL1MenuItem("L1_W-HT20-JJ15.ETA49").setLogic( d.TOPO_HT20_AJj15allETA49 & physcond)
+# LVL1MenuItem("L1_W-NOMATCH" ).setLogic( d.TOPO_NOT_02MATCH_EM10s1_AJj15allETA49 & physcond)
+# #LVL1MenuItem("L1_W-NOMATCH_W-05RO-XEEMHT").setLogic( d.TOPO_NOT_02MATCH_EM10s1_AJj15allETA49 & d.TOPO_05RATIO_XE0_SUM0_EM10s1_HT0_AJj15allETA49 & physcond)
+ #LVL1MenuItem("L1_EM12_W-MT25").setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & physcond)
#LVL1MenuItem("L1_EM12_W-MT30").setLogic( d.TOPO_30MT_EM12s6_XE0 & d.EM12 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & physcond)
+ #LVL1MenuItem("L1_EM15_W-MT35").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35_W-250RO2-XEHT-0_W-05DPHI-JXE-0_W-05DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35_XS60_W-05DPHI-JXE-0_W-05DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS60 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35_XS40_W-05DPHI-JXE-0_W-05DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS40 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35_XS60").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS60 & physcond)
+ #LVL1MenuItem("L1_EM15_W-MT35_W-250RO2-XEHT-0_W-05DPHI-JXE-0_W-05DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
+ #LVL1MenuItem("L1_EM15_W-MT35_XS60_W-05DPHI-JXE-0_W-05DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS60 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
+ #LVL1MenuItem("L1_EM15_W-MT35_XS40_W-05DPHI-JXE-0_W-05DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS40 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
+ #LVL1MenuItem("L1_EM15_W-MT35_XS60").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS60 & physcond)
- LVL1MenuItem("L1_EM15VH_W-MT35_XS60").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15VH & d.XS60 & physcond)
- LVL1MenuItem("L1_EM20VH_W-MT35_XS60").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM20VH & d.XS60 & physcond)
- LVL1MenuItem("L1_EM22VHI_W-MT35_XS40").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM22VHI & d.XS40 & physcond)
+ #LVL1MenuItem("L1_EM15VH_W-MT35_XS60").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15VH & d.XS60 & physcond)
+ #LVL1MenuItem("L1_EM20VH_W-MT35_XS60").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM20VH & d.XS60 & physcond)
+ #LVL1MenuItem("L1_EM22VHI_W-MT35_XS40").setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM22VHI & d.XS40 & physcond)
- LVL1MenuItem("L1_EM12_W-MT35_XS40_W-05DPHI-JXE-0_W-05DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.XS40 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM12s6_XE0 & physcond)
- LVL1MenuItem("L1_EM12_W-MT35").setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & physcond)
- LVL1MenuItem("L1_EM12_W-MT35_W-250RO2-XEHT-0_W-05DPHI-JXE-0_W-05DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM12s6_XE0 & physcond)
- LVL1MenuItem("L1_EM12_W-MT35_XS50").setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.XS50 & physcond)
- LVL1MenuItem("L1_EM10VH_W-MT35_XS50").setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM10VH & d.XS50 & physcond)
- LVL1MenuItem("L1_W-15DPHI-EM15XE-0" ).setLogic( d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35_W-250RO2-XEHT-0_W-15DPHI-JXE-0_W-15DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35_XS60_W-15DPHI-JXE-0_W-15DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS60 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35_XS40_W-15DPHI-JXE-0_W-15DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS40 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
- LVL1MenuItem("L1_W-15DPHI-EMXE-0" ).setLogic( d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
- LVL1MenuItem("L1_EM12_W-MT35_XS30_W-15DPHI-JXE-0_W-15DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.XS30 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
- LVL1MenuItem("L1_EM12_W-MT35_W-90RO2-XEHT-0_W-15DPHI-JXE-0_W-15DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.TOPO_90RATIO2_XE0_HT0_AJj15allETA49 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
- # Old
- LVL1MenuItem("L1_EM12_W-MT25_W-15DPHI-JXE-0_W-15DPHI-EMXE_W-90RO2-XEHT-0" ).setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & d.TOPO_90RATIO2_XE0_HT0_AJj15allETA49 & physcond)
- LVL1MenuItem("L1_EM12_W-MT25_W-15DPHI-JXE-0_W-15DPHI-EMXE_XS30" ).setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & d.XS30 & physcond)
- LVL1MenuItem("L1_EM12_W-MT25_W-15DPHI-JXE-0_W-15DPHI-EMXE_XS20" ).setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & d.XS20 & physcond)
- LVL1MenuItem("L1_EM12_W-MT25_W-15DPHI-JXE-0_W-15DPHI-EMXE" ).setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
-
-
- LVL1MenuItem("L1_EM15_W-MT35_W-05DPHI-JXE-0_W-05DPHI-EM15XE_XS30" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & d.XS30 & physcond)
- LVL1MenuItem("L1_EM15_W-MT35_W-05DPHI-JXE-0_W-05DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
-
+ #LVL1MenuItem("L1_EM12_W-MT35_XS40_W-05DPHI-JXE-0_W-05DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.XS40 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM12s6_XE0 & physcond)
+# LVL1MenuItem("L1_EM12_W-MT35").setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & physcond)
+# #LVL1MenuItem("L1_EM12_W-MT35_W-250RO2-XEHT-0_W-05DPHI-JXE-0_W-05DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM12s6_XE0 & physcond)
+# #LVL1MenuItem("L1_EM12_W-MT35_XS50").setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.XS50 & physcond)
+# #LVL1MenuItem("L1_EM10VH_W-MT35_XS50").setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM10VH & d.XS50 & physcond)
+# #LVL1MenuItem("L1_W-15DPHI-EM15XE-0" ).setLogic( d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
+# LVL1MenuItem("L1_EM15_W-MT35_W-250RO2-XEHT-0_W-15DPHI-JXE-0_W-15DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_250RATIO2_XE0_HT0_AJj15allETA49 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
+# LVL1MenuItem("L1_EM15_W-MT35_XS60_W-15DPHI-JXE-0_W-15DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS60 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
+# LVL1MenuItem("L1_EM15_W-MT35_XS40_W-15DPHI-JXE-0_W-15DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.XS40 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM15s6_XE0 & physcond)
+# LVL1MenuItem("L1_W-15DPHI-EMXE-0" ).setLogic( d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
+# LVL1MenuItem("L1_EM12_W-MT35_XS30_W-15DPHI-JXE-0_W-15DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.XS30 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
+# LVL1MenuItem("L1_EM12_W-MT35_W-90RO2-XEHT-0_W-15DPHI-JXE-0_W-15DPHI-EMXE" ).setLogic( d.TOPO_35MT_EM12s6_XE0 & d.EM12 & d.TOPO_90RATIO2_XE0_HT0_AJj15allETA49 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
+# # Old
+# LVL1MenuItem("L1_EM12_W-MT25_W-15DPHI-JXE-0_W-15DPHI-EMXE_W-90RO2-XEHT-0" ).setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & d.TOPO_90RATIO2_XE0_HT0_AJj15allETA49 & physcond)
+# LVL1MenuItem("L1_EM12_W-MT25_W-15DPHI-JXE-0_W-15DPHI-EMXE_XS30" ).setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & d.XS30 & physcond)
+# LVL1MenuItem("L1_EM12_W-MT25_W-15DPHI-JXE-0_W-15DPHI-EMXE_XS20" ).setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & d.XS20 & physcond)
+# LVL1MenuItem("L1_EM12_W-MT25_W-15DPHI-JXE-0_W-15DPHI-EMXE" ).setLogic( d.TOPO_25MT_EM12s6_XE0 & d.EM12 & d.TOPO_15MINDPHI_AJj10s6_XE0 & d.TOPO_15MINDPHI_EM12s6_XE0 & physcond)
+#
+#
+# LVL1MenuItem("L1_EM15_W-MT35_W-05DPHI-JXE-0_W-05DPHI-EM15XE_XS30" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & d.XS30 & physcond)
+# LVL1MenuItem("L1_EM15_W-MT35_W-05DPHI-JXE-0_W-05DPHI-EM15XE" ).setLogic( d.TOPO_35MT_EM15s6_XE0 & d.EM15 & d.TOPO_05MINDPHI_AJj10s6_XE0 & d.TOPO_05MINDPHI_EM15s6_XE0 & physcond)
+#
#LVL1MenuItem("L1_W-10DPHI-JXE-0").setLogic( d.TOPO_10MINDPHI_AJj15s2_XE0 & physcond)
#LVL1MenuItem("L1_W-20DPHI-JXE-1").setLogic( d.TOPO_20MINDPHI_AJjs6_XE0 & physcond)
#LVL1MenuItem("L1_W-20DPHI-JXE-0").setLogic( d.TOPO_20MINDPHI_AJj15s2_XE0 & physcond)
@@ -1445,35 +1373,34 @@ class ItemDef(object):
# LVL1MenuItem("L1_BPH-DR-2MU6_BPH-4M8-2MU6").setLogic( d.TOPO_2DR15_2MU6ab & d.TOPO_4INVM8_2MU6ab & physcond)
##Combined L1Top
- LVL1MenuItem('L1_DR-MU10TAU12I_TAU12I-J25').setLogic( d.TOPO_0DR28_MU10ab_TAU12abi & d.TOPO_1DISAMB_TAU12abi_J25ab & physcond)
- LVL1MenuItem('L1_MU10_TAU12I-J25').setLogic( d.MU10 & d.TOPO_1DISAMB_TAU12abi_J25ab & physcond)
+ #LVL1MenuItem('L1_DR-MU10TAU12I_TAU12I-J25').setLogic( d.TOPO_0DR28_MU10ab_TAU12abi & d.TOPO_1DISAMB_TAU12abi_J25ab & physcond)
+ #LVL1MenuItem('L1_MU10_TAU12I-J25').setLogic( d.MU10 & d.TOPO_1DISAMB_TAU12abi_J25ab & physcond)
#LVL1MenuItem('L1_XE35_EM15-TAU12I').setLogic( d.XE35 & d.TOPO_DISAMB_EM15abhi_TAU12abi & physcond)
#LVL1MenuItem('L1_XE40_EM15-TAU12I').setLogic( d.XE40 & d.TOPO_DISAMB_EM15abhi_TAU12abiOB & physcond)
#LVL1MenuItem('L1_XE45_TAU20-J20').setLogic( d.XE45 & d.TOPO_1DISAMB_TAU20ab_J20ab & physcond)
LVL1MenuItem('L1_J25_2J20_3J12_DR-TAU20ITAU12I').setLogic( d.J25 & d.J20.x(2) & d.J12.x(3) & d.TOPO_0DR28_TAU20abi_TAU12abi & physcond)
#LVL1MenuItem('L1_J25_3J12_EM15-TAU12I').setLogic( d.J25 & d.J12.x(3) & d.TOPO_DISAMB_EM15abhi_TAU12abi & physcond)
- LVL1MenuItem('L1_J25_2J12_DR-MU10TAU12I').setLogic( d.J25 & d.J12.x(2) & d.TOPO_0DR28_MU10ab_TAU12abi & physcond)
- LVL1MenuItem('L1_J25_2J20_3J12_BOX-TAU20ITAU12I').setLogic( d.J25 & d.J20.x(2) & d.J12.x(3) & d.TOPO_0DETA20_0DPHI20_TAU20abi_TAU12abi & physcond)
+ #LVL1MenuItem('L1_J25_2J12_DR-MU10TAU12I').setLogic( d.J25 & d.J12.x(2) & d.TOPO_0DR28_MU10ab_TAU12abi & physcond)
+ #LVL1MenuItem('L1_J25_2J20_3J12_BOX-TAU20ITAU12I').setLogic( d.J25 & d.J20.x(2) & d.J12.x(3) & d.TOPO_0DETA20_0DPHI20_TAU20abi_TAU12abi & physcond)
- LVL1MenuItem('L1_MU6_MJJ-200').setLogic( d.MU6 & d.TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_MU6_MJJ-200').setLogic( d.MU6 & d.TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
LVL1MenuItem('L1_MU6_MJJ-300').setLogic( d.MU6 & d.TOPO_300INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_MU6_MJJ-400').setLogic( d.MU6 & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_MU6_MJJ-500').setLogic( d.MU6 & d.TOPO_500INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_MU6_MJJ-400').setLogic( d.MU6 & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_MU6_MJJ-500').setLogic( d.MU6 & d.TOPO_500INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_MJJ-400').setLogic( d.J30 & d.J20.x(2) & d.J200ETA49.x(4) & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_MJJ-700').setLogic( d.J30 & d.J20.x(2) & d.J200ETA49.x(4) & d.TOPO_700INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_MJJ-800').setLogic( d.J30 & d.J20.x(2) & d.J200ETA49.x(4) & d.TOPO_800INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_MJJ-900').setLogic( d.J30 & d.J20.x(2) & d.J200ETA49.x(4) & d.TOPO_900INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_MJJ-400').setLogic( d.J30 & d.J20.x(2) & d.J200ETA49.x(4) & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_MJJ-700').setLogic( d.J30 & d.J20.x(2) & d.J200ETA49.x(4) & d.TOPO_700INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_MJJ-800').setLogic( d.J30 & d.J20.x(2) & d.J200ETA49.x(4) & d.TOPO_800INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_MJJ-900').setLogic( d.J30 & d.J20.x(2) & d.J200ETA49.x(4) & d.TOPO_900INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_3J20_4J20.0ETA49_MJJ-400').setLogic( d.J20.x(3) & d.J200ETA49.x(4) & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_3J20_4J20.0ETA49_MJJ-700').setLogic( d.J20.x(3) & d.J200ETA49.x(4) & d.TOPO_700INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_3J20_4J20.0ETA49_MJJ-800').setLogic( d.J20.x(3) & d.J200ETA49.x(4) & d.TOPO_800INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_3J20_4J20.0ETA49_MJJ-900').setLogic( d.J20.x(3) & d.J200ETA49.x(4) & d.TOPO_900INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_XE35_MJJ-200').setLogic( d.XE35 & d.TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
-
+ #LVL1MenuItem('L1_XE35_MJJ-200').setLogic( d.XE35 & d.TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
+ #
### ATR-15062
- LVL1MenuItem('L1_EM18VH_MJJ-300').setLogic( d.EM18VH & d.TOPO_300INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_EM18VH_MJJ-300').setLogic( d.EM18VH & d.TOPO_300INVM9999_AJ30s6_AJ20s6 & physcond)
+ LVL1MenuItem('L1_EM18VHI_MJJ-300').setLogic( d.EM18VHI & d.TOPO_300INVM9999_AJ30s6_AJ20s6 & physcond) # noqa: F821
+
+
# CTP items for L1Topo streamers
#LVL1MenuItem('L1_DPhi_AJsAJs').setLogic( d.TOPO_DPhi_AJsAJs & physcond)
@@ -1493,12 +1420,33 @@ class ItemDef(object):
# LVL1MenuItem('L1_BPH-4M8-MU6MU4-B').setLogic( d.TOPO_4INVM8_ONEBARREL_MU6ab_MU4ab & physcond)
# LVL1MenuItem('L1_BPH-4M8-MU6MU4-BO').setLogic( d.TOPO_4INVM8_CMU6ab_CMU4ab & physcond)
- LVL1MenuItem('L1_DY-DR-2MU4').setLogic( d.TOPO_2DR99_2MU4ab & physcond)
+# LVL1MenuItem('L1_DY-DR-2MU4').setLogic( d.TOPO_2DR99_2MU4ab & physcond)
LVL1MenuItem('L1_DY-BOX-MU6MU4').setLogic( d.TOPO_5DETA99_5DPHI99_MU6ab_MU4ab & physcond)
LVL1MenuItem('L1_DY-BOX-2MU6').setLogic( d.TOPO_5DETA99_5DPHI99_2MU6ab & physcond)
-
+
+ LVL1MenuItem('L1_BPH-0M10-3MU4' ).setLogic( d.TOPO_0INVM10_3MU4ab & physcond)# noqa: F821
+
+ #LVL1MenuItem('L1_LFV-EM8I-MU11' ).setLogic( d.TOPO_0INVM10_0DR15_EM8abi_MU10ab & d.MU11 & physcond) # noqa: F821
+ #LVL1MenuItem('L1_LFV-EM12I-MU6' ).setLogic( d.TOPO_0INVM10_0DR15_EM12abi_MU6ab & physcond) # noqa: F821
+
+ LVL1MenuItem('L1_ZAFB-04DPHI-EM15I' ).setLogic( d.TOPO_60INVM9999_04DPHI32_EM15abhi_FJj15s623ETA49 & physcond) # noqa: F821
+ LVL1MenuItem('L1_ZAFB-25DPHI-EM15I' ).setLogic( d.TOPO_60INVM9999_25DPHI32_EM15abhi_FJj15s623ETA49 & physcond) # noqa: F821
+ #LVL1MenuItem('L1_DPHI-M70-2EM12I' ).setLogic( d.TOPO_0INVM70_27DPHI32_EM12his1_EM12his6 & physcond) # noqa: F821
+
+
+
+ LVL1MenuItem('L1_DPHI-M70-2EM12I' ).setLogic( d.TOPO_0INVM70_27DPHI32_EM12his1_EM12his6 & physcond) # noqa: F821
+
+ LVL1MenuItem('L1_DY-BOX-2MU4' ).setLogic( d.TOPO_5DETA99_5DPHI99_2MU4ab & d.MU4.x(2) & physcond) # noqa: F821
+
+
+
+
+
+
+
LVL1MenuItem('L1_LFV-MU6').setLogic( d.TOPO_0DR15_2MU6ab & physcond)
- LVL1MenuItem('L1_LFV-MU').setLogic( d.TOPO_0DR10_MU10ab_MU6ab & physcond)
+ #LVL1MenuItem('L1_LFV-MU').setLogic( d.TOPO_0DR10_MU10ab_MU6ab & physcond)
LVL1MenuItem('L1_LFV-MU11').setLogic( d.TOPO_0DR15_2MU6ab & d.MU11 & d.MU6.x(2) & physcond)
if not '_v7' in TriggerFlags.triggerMenuSetup() and not 'LS2_v' in TriggerFlags.triggerMenuSetup() and not 'run3_v' in TriggerFlags.triggerMenuSetup():
LVL1MenuItem('L1_LFV-EM8I').setLogic( d.TOPO_0DETA04_0DPHI03_EM8abi_MU10ab & physcond)
@@ -1509,50 +1457,53 @@ class ItemDef(object):
else:
LVL1MenuItem('L1_LFV-EM15I').setLogic( d.TOPO_0DETA04_EM15abi_MUab & d.TOPO_0DPHI03_EM15abi_MUab & physcond) #ATR-14282
LVL1MenuItem('L1_DPHI-J20s2XE50').setLogic( d.TOPO_10MINDPHI_J20s2_XE50 & physcond)
- LVL1MenuItem('L1_DPHI-J20XE50').setLogic( d.TOPO_10MINDPHI_J20ab_XE50 & physcond)
- LVL1MenuItem('L1_DPHI-CJ20XE50').setLogic( d.TOPO_10MINDPHI_CJ20ab_XE50 & physcond)
+ #LVL1MenuItem('L1_DPHI-J20XE50').setLogic( d.TOPO_10MINDPHI_J20ab_XE50 & physcond)
+ #LVL1MenuItem('L1_DPHI-CJ20XE50').setLogic( d.TOPO_10MINDPHI_CJ20ab_XE50 & physcond)
- LVL1MenuItem('L1_MJJ-900').setLogic( d.TOPO_900INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_MJJ-800').setLogic( d.TOPO_800INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_MJJ-900').setLogic( d.TOPO_900INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_MJJ-800').setLogic( d.TOPO_800INVM9999_AJ30s6_AJ20s6 & physcond)
LVL1MenuItem('L1_MJJ-700').setLogic( d.TOPO_700INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_MJJ-400').setLogic( d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_MJJ-400').setLogic( d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
#LVL1MenuItem('L1_MJJ-350').setLogic( d.TOPO_350INVM9999_AJ30s6_AJ20s6 & physcond)
LVL1MenuItem('L1_MJJ-300').setLogic( d.TOPO_300INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_MJJ-200').setLogic( d.TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
- LVL1MenuItem('L1_MJJ-100').setLogic( d.TOPO_100INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_MJJ-200').setLogic( d.TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_MJJ-100').setLogic( d.TOPO_100INVM9999_AJ30s6_AJ20s6 & physcond)
#LVL1MenuItem('L1_MJJ-350-0').setLogic( d.TOPO_350INVM9999_J30s6_J20s6 & physcond)
#LVL1MenuItem('L1_MJJ-300-0').setLogic( d.TOPO_300INVM9999_J30s6_J20s6 & physcond)
#LVL1MenuItem('L1_MJJ-250-0').setLogic( d.TOPO_250INVM9999_J30s6_J20s6 & physcond)
#LVL1MenuItem('L1_MJJ-200-0').setLogic( d.TOPO_200INVM9999_J30s6_J20s6 & physcond)
- LVL1MenuItem('L1_HT150-JJ15.ETA49').setLogic( d.TOPO_HT150_AJj15allETA49 & physcond)
- LVL1MenuItem('L1_HT150-JJ15.ETA49_MJJ-400').setLogic( d.TOPO_HT150_AJj15allETA49 & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+ #LVL1MenuItem('L1_HT150-JJ15.ETA49').setLogic( d.TOPO_HT150_AJj15allETA49 & physcond)
+ #LVL1MenuItem('L1_HT150-JJ15.ETA49_MJJ-400').setLogic( d.TOPO_HT150_AJj15allETA49 & d.TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
LVL1MenuItem('L1_MJJ-500-NFF').setLogic( d.TOPO_500INVM9999_J30s6_AJ20s6 & physcond)
+ LVL1MenuItem('L1_J50_DETA20-J50J').setLogic( d.J50 & d.TOPO_0DETA20_J50s1_Js2 & physcond) # noqa: F821
+ LVL1MenuItem('L1_DPHI-2EM3').setLogic( d.TOPO_27DPHI32_EMs1_EMs6 & physcond) # noqa: F821
- LVL1MenuItem('L1_J4-MATCH').setLogic( d.TOPO_0MATCH_4AJ20ETA31_4AJj15ETA31 & physcond)
+ #LVL1MenuItem('L1_J4-MATCH').setLogic( d.TOPO_0MATCH_4AJ20ETA31_4AJj15ETA31 & physcond)
LVL1MenuItem('L1_LLP-RO').setLogic( d.TOPO_100RATIO_0MATCH_TAU30si2_EMall & physcond)
- LVL1MenuItem('L1_LLP-NOMATCH').setLogic( d.TOPO_NOT_0MATCH_TAU30si2_EMall & physcond)
- LVL1MenuItem('L1_DR-MU10TAU12I').setLogic( d.TOPO_0DR28_MU10ab_TAU12abi & physcond)
- LVL1MenuItem('L1_TAU12I-J25').setLogic( d.TOPO_1DISAMB_TAU12abi_J25ab & physcond)
- LVL1MenuItem('L1_EM15TAU12I-J25').setLogic( d.TOPO_1DISAMB_EM15his2_TAU12abi_J25ab & physcond)
+ #LVL1MenuItem('L1_LLP-NOMATCH').setLogic( d.TOPO_NOT_0MATCH_TAU30si2_EMall & physcond)
+ #LVL1MenuItem('L1_DR-MU10TAU12I').setLogic( d.TOPO_0DR28_MU10ab_TAU12abi & physcond)
+ #LVL1MenuItem('L1_TAU12I-J25').setLogic( d.TOPO_1DISAMB_TAU12abi_J25ab & physcond)
+ #LVL1MenuItem('L1_EM15TAU12I-J25').setLogic( d.TOPO_1DISAMB_EM15his2_TAU12abi_J25ab & physcond)
- LVL1MenuItem('L1_DR-EM15TAU12I').setLogic( d.TOPO_DISAMB_0DR28_EM15his2_TAU12abi & physcond)
- LVL1MenuItem('L1_DR-EM15TAU12I-J25').setLogic( d.TOPO_1DISAMB_J25ab_0DR28_EM15his2_TAU12abi & physcond)
- LVL1MenuItem('L1_TAU20ITAU12I-J25').setLogic( d.TOPO_1DISAMB_TAU20abi_TAU12abi_J25ab & physcond)
+ #LVL1MenuItem('L1_DR-EM15TAU12I').setLogic( d.TOPO_DISAMB_0DR28_EM15his2_TAU12abi & physcond)
+ #LVL1MenuItem('L1_DR-EM15TAU12I-J25').setLogic( d.TOPO_1DISAMB_J25ab_0DR28_EM15his2_TAU12abi & physcond)
+ #LVL1MenuItem('L1_TAU20ITAU12I-J25').setLogic( d.TOPO_1DISAMB_TAU20abi_TAU12abi_J25ab & physcond)
LVL1MenuItem('L1_DR25-TAU20ITAU12I').setLogic( d.TOPO_0DR25_TAU20abi_TAU12abi & physcond)
LVL1MenuItem('L1_30M-EM20ITAU12').setLogic( d.TOPO_DISAMB_30INVM_EM20his2_TAU12ab & physcond)
LVL1MenuItem('L1_MJJ-400-CF').setLogic( d.TOPO_400INVM9999_AJ30s6ETA31_AJ20s631ETA49 & physcond)
LVL1MenuItem('L1_DR-TAU20ITAU12I').setLogic( d.TOPO_0DR28_TAU20abi_TAU12abi & physcond)
- LVL1MenuItem('L1_BOX-TAU20ITAU12I').setLogic( d.TOPO_0DETA20_0DPHI20_TAU20abi_TAU12abi & physcond)
- LVL1MenuItem('L1_DR-TAU20ITAU12I-J25').setLogic( d.TOPO_1DISAMB_J25ab_0DR28_TAU20abi_TAU12abi & physcond)
+ #LVL1MenuItem('L1_BOX-TAU20ITAU12I').setLogic( d.TOPO_0DETA20_0DPHI20_TAU20abi_TAU12abi & physcond)
+ LVL1MenuItem('L1_DR-TAU20ITAU12I-J25').setLogic( d.TOPO_2DISAMB_J25ab_0DR28_TAU20abi_TAU12abi & physcond) # noqa: F821
- LVL1MenuItem('L1_DR25-TAU20ITAU12I-J25').setLogic( d.TOPO_1DISAMB_J25ab_0DR25_TAU20abi_TAU12abi & physcond)
- LVL1MenuItem('L1_LAR-EM').setLogic( d.TOPO_LAR_EM50s1 & physcond).setTriggerType( TT.lardemo ) # LAr demo (ATR-11897)
- LVL1MenuItem('L1_LAR-J').setLogic( d.TOPO_LAR_J100s1 & physcond).setTriggerType( TT.lardemo ) # LAr demo (ATR-11897)
+ LVL1MenuItem('L1_DR25-TAU20ITAU12I-J25').setLogic( d.TOPO_2DISAMB_J25ab_0DR25_TAU20abi_TAU12abi & physcond) # noqa: F821
+ LVL1MenuItem('L1_DR-EM15TAU12I-J25').setLogic( d.TOPO_2DISAMB_J25ab_0DR28_EM15his2_TAU12abi & physcond) # noqa: F821
+# LVL1MenuItem('L1_LAR-EM').setLogic( d.TOPO_LAR_EM50s1 & physcond).setTriggerType( TT.lardemo ) # LAr demo (ATR-11897)
+# LVL1MenuItem('L1_LAR-J').setLogic( d.TOPO_LAR_J100s1 & physcond).setTriggerType( TT.lardemo ) # LAr demo (ATR-11897)
# if not '_v6' in TriggerFlags.triggerMenuSetup():
# LVL1MenuItem('L1_BPH-DR-2MU4-B').setLogic( d.TOPO_2DR15_CMU4ab_MU4ab & physcond)
# LVL1MenuItem('L1_BPH-DR-2MU4-BO').setLogic( d.TOPO_2DR15_2CMU4ab & physcond)
@@ -1576,16 +1527,16 @@ class ItemDef(object):
# nominal L1-topo items
#LVL1MenuItem('L1_BPH-1M19-2MU4_BPH-0DR34-2MU4' ).setLogic( d.TOPO_1INVM19_2MU4ab & d.TOPO_0DR34_2MU4ab & physcond) # 50% for Bs,J/psi,Upsi
- LVL1MenuItem('L1_BPH-2M8-2MU4_BPH-0DR15-2MU4' ).setLogic( d.TOPO_2INVM8_2MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi
- LVL1MenuItem('L1_BPH-2M9-2MU4_BPH-0DR15-2MU4' ).setLogic( d.TOPO_2INVM9_2MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi
- LVL1MenuItem('L1_BPH-7M15-2MU4_BPH-0DR24-2MU4' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_2MU4ab & physcond) # 78% for Upsi
- LVL1MenuItem('L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4' ).setLogic( d.TOPO_2INVM8_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & physcond) # 86% for Bs,J/psi
- LVL1MenuItem('L1_BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4' ).setLogic( d.TOPO_2INVM9_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & physcond)
-
- LVL1MenuItem('L1_BPH-8M15-MU6MU4_BPH-0DR22-MU6MU4').setLogic( d.TOPO_8INVM15_MU6ab_MU4ab & d.TOPO_0DR22_MU6ab_MU4ab & physcond) # 86% for Upsi
- LVL1MenuItem('L1_BPH-2M9-2MU6_BPH-2DR15-2MU6' ).setLogic( d.TOPO_2INVM9_2MU6ab & d.TOPO_2DR15_2MU6ab & physcond) # 96% for Bs,J/psi
+# LVL1MenuItem('L1_BPH-2M8-2MU4_BPH-0DR15-2MU4' ).setLogic( d.TOPO_2INVM8_2MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi
+# LVL1MenuItem('L1_BPH-2M9-2MU4_BPH-0DR15-2MU4' ).setLogic( d.TOPO_2INVM9_2MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi
+# LVL1MenuItem('L1_BPH-7M15-2MU4_BPH-0DR24-2MU4' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_2MU4ab & physcond) # 78% for Upsi
+# LVL1MenuItem('L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4' ).setLogic( d.TOPO_2INVM8_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & physcond) # 86% for Bs,J/psi
+# LVL1MenuItem('L1_BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4' ).setLogic( d.TOPO_2INVM9_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & physcond)
+#
+ #LVL1MenuItem('L1_BPH-8M15-MU6MU4_BPH-0DR22-MU6MU4').setLogic( d.TOPO_8INVM15_MU6ab_MU4ab & d.TOPO_0DR22_MU6ab_MU4ab & physcond) # 86% for Upsi
+ #LVL1MenuItem('L1_BPH-2M9-2MU6_BPH-2DR15-2MU6' ).setLogic( d.TOPO_2INVM9_2MU6ab & d.TOPO_2DR15_2MU6ab & physcond) # 96% for Bs,J/psi
- LVL1MenuItem('L1_BPH-8M15-2MU6_BPH-0DR22-2MU6' ).setLogic( d.TOPO_8INVM15_2MU6ab & d.TOPO_0DR22_2MU6ab & physcond) # 96% for Upsi
+ #LVL1MenuItem('L1_BPH-8M15-2MU6_BPH-0DR22-2MU6' ).setLogic( d.TOPO_8INVM15_2MU6ab & d.TOPO_0DR22_2MU6ab & physcond) # 96% for Upsi
# Barrel and BarrelOnly items w/o topo selection
# LVL1MenuItem('L1_CMU6_2CMU4').setLogic( d.TOPO_MULT_CMU4ab.x(2) & d.TOPO_MULT_CMU6ab & physcond) # d.MU6_2MU4_BarrelOnly
@@ -1596,28 +1547,36 @@ class ItemDef(object):
# Barrel and BarrelOnly variants of L1Topo items
#LVL1MenuItem('L1_BPH-1M19-2MU4-B_BPH-0DR34-2MU4' ).setLogic( d.TOPO_1INVM19_CMU4ab_MU4ab & d.TOPO_0DR34_2MU4ab & physcond) # 50% for Bs,J/psi,Upsi + OneBarrel
- LVL1MenuItem('L1_BPH-2M8-2MU4-B_BPH-0DR15-2MU4' ).setLogic( d.TOPO_2INVM8_CMU4ab_MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi + OneBarrel
+ #LVL1MenuItem('L1_BPH-2M8-2MU4-B_BPH-0DR15-2MU4' ).setLogic( d.TOPO_2INVM8_CMU4ab_MU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi + OneBarrel
- LVL1MenuItem('L1_BPH-7M15-2MU4_BPH-0DR24-2MU4-B' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_CMU4ab_MU4ab & physcond) # 78% for Upsi + OneBarrel
- #LVL1MenuItem('L1_BPH-1M19-2MU4-BO_BPH-0DR34-2MU4' ).setLogic( d.TOPO_1INVM19_2CMU4ab & d.TOPO_0DR34_2MU4ab & physcond) # 50% for Bs,J/psi,Upsi + BarrelOnly
+ #LVL1MenuItem('L1_BPH-7M15-2MU4_BPH-0DR24-2MU4-B' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_CMU4ab_MU4ab & physcond) # 78% for Upsi + OneBarrel
+ ##LVL1MenuItem('L1_BPH-1M19-2MU4-BO_BPH-0DR34-2MU4' ).setLogic( d.TOPO_1INVM19_2CMU4ab & d.TOPO_0DR34_2MU4ab & physcond) # 50% for Bs,J/psi,Upsi + BarrelOnly
- #LVL1MenuItem('L1_BPH-2M8-2MU4-BO_BPH-0DR15-2MU4' ).setLogic( d.TOPO_2INVM8_2CMU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi + BarrelOnly
- LVL1MenuItem('L1_BPH-7M15-2MU4_BPH-0DR24-2MU4-BO' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_2CMU4ab & physcond) # 78% for Upsi + BarrelOnly
- LVL1MenuItem('L1_BPH-2M8-MU6MU4-B_BPH-0DR15-MU6MU4' ).setLogic( d.TOPO_2INVM8_ONEBARREL_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & physcond) # 86% for Bs,J/psi + OneBarrel
+ # #LVL1MenuItem('L1_BPH-2M8-2MU4-BO_BPH-0DR15-2MU4' ).setLogic( d.TOPO_2INVM8_2CMU4ab & d.TOPO_0DR15_2MU4ab & physcond) # 78% for Bs,J/psi + BarrelOnly
+ #LVL1MenuItem('L1_BPH-7M15-2MU4_BPH-0DR24-2MU4-BO' ).setLogic( d.TOPO_7INVM15_2MU4ab & d.TOPO_0DR24_2CMU4ab & physcond) # 78% for Upsi + BarrelOnly
+ #LVL1MenuItem('L1_BPH-2M8-MU6MU4-B_BPH-0DR15-MU6MU4' ).setLogic( d.TOPO_2INVM8_ONEBARREL_MU6ab_MU4ab & d.TOPO_0DR15_MU6ab_MU4ab & physcond) # 86% for Bs,J/psi + OneBarrel
- LVL1MenuItem('L1_BPH-2M8-2MU4' ).setLogic( d.TOPO_2INVM8_2MU4ab & physcond) # backup 71% for Bs,J/psi
- #LVL1MenuItem('L1_BPH-2M9-2MU4' ).setLogic( d.TOPO_2INVM9_2MU4ab & physcond)
- LVL1MenuItem('L1_BPH-8M15-MU6MU4' ).setLogic( d.TOPO_8INVM15_MU6ab_MU4ab & physcond) # backup 71% for Upsi
- LVL1MenuItem('L1_BPH-8M15-2MU6' ).setLogic( d.TOPO_8INVM15_2MU6ab & physcond) # backup 95% for Upsi
+ #LVL1MenuItem('L1_BPH-2M8-2MU4' ).setLogic( d.TOPO_2INVM8_2MU4ab & physcond) # backup 71% for Bs,J/psi
+ ##LVL1MenuItem('L1_BPH-2M9-2MU4' ).setLogic( d.TOPO_2INVM9_2MU4ab & physcond)
+ #LVL1MenuItem('L1_BPH-8M15-MU6MU4' ).setLogic( d.TOPO_8INVM15_MU6ab_MU4ab & physcond) # backup 71% for Upsi
+ #LVL1MenuItem('L1_BPH-8M15-2MU6' ).setLogic( d.TOPO_8INVM15_2MU6ab & physcond) # backup 95% for Upsi
#SX end ATR-12789
+ LVL1MenuItem('L1_LATE-MU10_XE40').setLogic( d.TOPO_LATE_MU10s1 & d.XE40 & physcond) # noqa: F821
LVL1MenuItem('L1_LATE-MU10_XE50').setLogic( d.TOPO_LATE_MU10s1 & d.XE50 & physcond)
LVL1MenuItem('L1_LATE-MU10_J50').setLogic( d.TOPO_LATE_MU10s1 & d.J50 & physcond)
LVL1MenuItem('L1_SC111').setLogic( d.TOPO_SC111_CJ15abETA26 & physcond)
- LVL1MenuItem('L1_SC85').setLogic( d.TOPO_SC85_CJ15abETA26 & physcond)
+ #LVL1MenuItem('L1_SC85').setLogic( d.TOPO_SC85_CJ15abETA26 & physcond)
+ LVL1MenuItem('L1_SC111-CJ15').setLogic( d.TOPO_SC111_CJ15abETA26 & physcond) # noqa: F821
LVL1MenuItem('L1_TAU60_DR-TAU20ITAU12I' ).setLogic( d.HA60 & d.TOPO_0DR28_TAU20abi_TAU12abi & physcond)
+ LVL1MenuItem('L1_CEP-CJ60').setLogic( d.TOPO_CEP_CJ60s6 & physcond ) # noqa: F821
+ LVL1MenuItem('L1_CEP-CJ50').setLogic( d.TOPO_CEP_CJ50s6 & physcond ) # noqa: F821
+
+ LVL1MenuItem('L1_BPH-8M15-2MU4-BO' ).setLogic( d.TOPO_8INVM15_2CMU4ab & physcond) # noqa: F821
+
+
except Exception as ex:
print ("Creation of L1Topo item failed, will abort! Exception is : " , ex)
raise RuntimeError("Creation of L1Topo item failed, will not continue")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/Menu_LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/Menu_LS2_v1.py
index b1371e1a85cf31ca23be4fb02c51898d525e62a0..269dade098bc6928afc1a1513925f2569b7a5ad9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/Menu_LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/LVL1MenuConfig/LVL1Menu/Menu_LS2_v1.py
@@ -63,7 +63,7 @@ def defineMenu():
# 8 x JETs and central jets
'J12', 'J12.0ETA23', 'J15', 'J15.0ETA25','J20', 'J25','J25.0ETA23','J30',
# 2 x Central Jets
- 'J12.0ETA25', 'J12.0ETA28',
+ 'J12.0ETA28', #'J12.0ETA25',
# VBF Jets
'J20.0ETA49', 'J30.0ETA49',
@@ -78,7 +78,7 @@ def defineMenu():
'J35.0ETA23','J40.0ETA25', #'J20.28ETA31',
# 6 Jets # replace J400 with J45.0ETA20 - ATR-19309
- 'J40', 'J50', 'J75', 'J85', 'J100', 'J45.0ETA20', 'J120', 'J400',
+ 'J40', 'J50', 'J75', 'J85', 'J100', 'J45.0ETA20', 'J400', #'J120',
# 6 x FJ
@@ -111,7 +111,7 @@ def defineMenu():
#'RXE35', 'RXE40', 'RXE45', 'RXE50', 'RXE55', 'RXE60', 'RXE70', 'RXE80', # FTHR
# 8 x restricted eta range
- 'TE5.24ETA49', 'TE10.24ETA49', 'TE15.24ETA49', 'TE20.24ETA49', 'TE25.24ETA49', 'TE30.24ETA49', 'TE40.24ETA49', 'TE70.24ETA49',
+ #'TE5.24ETA49', 'TE10.24ETA49', 'TE15.24ETA49', 'TE20.24ETA49', 'TE25.24ETA49', 'TE30.24ETA49', 'TE40.24ETA49', 'TE70.24ETA49',
@@ -185,8 +185,8 @@ def defineMenu():
# AFP
'AFP_NSC', 'AFP_NSA',
- 'AFP_FSA_SIT', 'AFP_FSA_TOF', 'AFP_FSA_LOG',
- 'AFP_FSC_SIT', 'AFP_FSC_LOG', 'AFP_FSC_TOF',
+ #'AFP_FSA_SIT', 'AFP_FSA_TOF', 'AFP_FSA_LOG',
+ #'AFP_FSC_SIT', 'AFP_FSC_LOG', 'AFP_FSC_TOF',
#-------------------------------------------------------------------
@@ -194,8 +194,8 @@ def defineMenu():
#-------------------------------------------------------------------
#B-jets
- 'BTAG-MU4J15',
- 'BTAG-MU6J20',
+ #'BTAG-MU4J15',
+ #'BTAG-MU6J20',
#HT
'HT190-J15s5.ETA21',
@@ -222,7 +222,7 @@ def defineMenu():
# L1 thresholds for L1Topo streamers
- '2DR99_2MU4ab',
+ #'2DR99_2MU4ab',
'5DETA99-5DPHI99-MU6ab-MU4ab',
'5DETA99-5DPHI99-2MU6ab',
'0DR15-2MU6ab',
@@ -230,24 +230,24 @@ def defineMenu():
'0DPHI03-EM8abi-MU10ab',
'0DETA04-EM15abi-MUab',
'0DPHI03-EM15abi-MUab',
- '800INVM9999-AJ30s6-AJ20s6',
+ #'800INVM9999-AJ30s6-AJ20s6',
'700INVM9999-AJ30s6-AJ20s6',
'300INVM9999-AJ30s6-AJ20s6',
- '400INVM9999-AJ30s6-AJ20s6',
+ #'400INVM9999-AJ30s6-AJ20s6',
'500INVM9999-J30s6-AJ20s6',
- '100INVM9999-AJ30s6-AJ20s6',
+ #'100INVM9999-AJ30s6-AJ20s6',
'0DETA20-J50s1-Js2',
'27DPHI32-EMs1-EMs6',
- 'HT150-AJj15all.ETA49',
- '0MATCH-4AJ20.ETA31-4AJj15.ETA31',
+ #'HT150-AJj15all.ETA49',
+ #'0MATCH-4AJ20.ETA31-4AJj15.ETA31',
'100RATIO-0MATCH-TAU30si2-EMall',
'NOT-0MATCH-TAU30si1-EMall',
- '1DISAMB-TAU12abi-J25ab',
- '1DISAMB-EM15his2-TAU12abi-J25ab',
+ #'1DISAMB-TAU12abi-J25ab',
+ #'1DISAMB-EM15his2-TAU12abi-J25ab',
'2DISAMB-TAU12abi-J25ab',
'2DISAMB-J25ab-0DR28-EM15his2-TAU12abi',
- '0DR28-MU10ab-TAU12abi',
- '1DISAMB-TAU20abi-TAU12abi-J25ab',
+ #'0DR28-MU10ab-TAU12abi', # add back if needed
+ #'1DISAMB-TAU20abi-TAU12abi-J25ab',
'0DR25-TAU20abi-TAU12abi',
'0DR28-TAU20abi-TAU12abi',
'2DISAMB-J25ab-0DR25-TAU20abi-TAU12abi',
@@ -287,11 +287,11 @@ def defineMenu():
'0INVM70-27DPHI32-EM12his1-EM12his6',
#ATR-19720
- '8INVM15-0DR22-2MU6ab',
- '2INVM9-2DR15-2MU6ab',
- '2INVM9-0DR15-MU6ab-MU4ab',
- '8INVM15-0DR22-MU6ab-MU4ab',
- '2INVM9-0DR15-2MU4ab',
+ #'8INVM15-0DR22-2MU6ab',
+ #'2INVM9-2DR15-2MU6ab',
+ #'2INVM9-0DR15-MU6ab-MU4ab',
+ #'8INVM15-0DR22-MU6ab-MU4ab',
+ #'2INVM9-0DR15-2MU4ab',
#ATR-19510
'5DETA99-5DPHI99-2MU4ab',
@@ -355,7 +355,7 @@ def defineMenu():
"L1_MU10_TAU12IM",
"L1_MU10_TAU12IM_J25_2J12",
"L1_MU10_TAU12IM_3J12",
- 'L1_DR-MU10TAU12I_TAU12I-J25',
+ #'L1_DR-MU10TAU12I_TAU12I-J25',
"L1_MU10_TAU20IM",
"L1_MU11_TAU20IM",
"L1_MU10_TAU20IM_J25_2J20",
@@ -364,7 +364,7 @@ def defineMenu():
"L1_TAU20IM_2TAU12IM_J25_2J20_3J12",
"L1_TAU20IM_2TAU12IM_4J12.0ETA23",
- "L1_TAU20IM_2TAU12IM_4J12.0ETA25",
+ #"L1_TAU20IM_2TAU12IM_4J12.0ETA25",
"L1_TAU20IM_2TAU12IM_4J12.0ETA28",
"L1_TAU25IM_2TAU20IM_2J25_3J20",
@@ -401,7 +401,7 @@ def defineMenu():
'L1_MU20_J50',
# single jet
- "L1_J15","L1_J20","L1_J25", "L1_J30", "L1_J40", "L1_J50" ,"L1_J75","L1_J85", "L1_J100", "L1_J120", "L1_J400",
+ "L1_J15","L1_J20","L1_J25", "L1_J30", "L1_J40", "L1_J50" ,"L1_J75","L1_J85", "L1_J100", "L1_J400", #"L1_J120",
"L1_J20.31ETA49", "L1_J30.31ETA49", "L1_J50.31ETA49", "L1_J75.31ETA49",
'L1_J15.31ETA49',
"L1_J12_EMPTY","L1_J12_FIRSTEMPTY", "L1_J12_UNPAIRED_ISO", "L1_J12_UNPAIRED_NONISO", "L1_J12_ABORTGAPNOTCALIB",
@@ -415,7 +415,7 @@ def defineMenu():
# multi jet
"L1_J45.0ETA20_3J15.0ETA25",
"L1_J50_2J40.0ETA25_3J15.0ETA25",
- "L1_3J50", "L1_4J15", "L1_4J20", "L1_4J20.0ETA49",
+ "L1_3J50", "L1_4J15", "L1_4J20", #"L1_4J20.0ETA49",
"L1_3J15.0ETA25_XE40",
"L1_6J15",
@@ -442,6 +442,7 @@ def defineMenu():
"L1_XE35", "L1_XE40", "L1_XE45", "L1_XE50",
"L1_XE55", "L1_XE60", "L1_XE70", "L1_XE80",
'L1_XE30', 'L1_XE300',
+ "L1_XE10",
#XS
'L1_EM12_XS20', 'L1_EM15_XS30',
@@ -469,7 +470,7 @@ def defineMenu():
# RNDM
'L1_RD0_FILLED', 'L1_RD0_UNPAIRED_ISO', 'L1_RD0_EMPTY',
- "L1_RD1_EMPTY",
+ "L1_RD1_EMPTY","L1_RD2_EMPTY",
# 'L1_RD0_FIRSTEMPTY',
'L1_RD0_ABORTGAPNOTCALIB',
# 'L1_RD2_FILLED', # This is not needed?
@@ -523,8 +524,8 @@ def defineMenu():
#--------------------------------
# B-jet
- 'L1_BTAG-MU4J15',
- 'L1_BTAG-MU6J20',
+ #'L1_BTAG-MU4J15',
+ #'L1_BTAG-MU6J20',
# ZH - all removed
@@ -554,35 +555,35 @@ def defineMenu():
'L1_2MU4_J20_XE30_DPHI-J20s2XE30',
'L1_MJJ-700',
'L1_MJJ-300',
- 'L1_MJJ-100',
- 'L1_MJJ-400',
- 'L1_MJJ-800',
+ #'L1_MJJ-100',
+ #'L1_MJJ-400',
+ #'L1_MJJ-800',
'L1_MJJ-500-NFF',
'L1_J50_DETA20-J50J',
'L1_DPHI-2EM3',
- 'L1_HT150-JJ15.ETA49',
- 'L1_HT150-JJ15.ETA49_MJJ-400',
- 'L1_J4-MATCH',
+ #'L1_HT150-JJ15.ETA49',
+ #'L1_HT150-JJ15.ETA49_MJJ-400',
+ #'L1_J4-MATCH',
'L1_LLP-RO',
- 'L1_LLP-NOMATCH',
- 'L1_EM15TAU12I-J25',
+ #'L1_LLP-NOMATCH',
+ #'L1_EM15TAU12I-J25',
'L1_DR-EM15TAU12I-J25',
- 'L1_TAU20ITAU12I-J25',
+ #'L1_TAU20ITAU12I-J25',
'L1_DR-TAU20ITAU12I',
'L1_DR-TAU20ITAU12I-J25',
- 'L1_DR-MU10TAU12I',
+ #'L1_DR-MU10TAU12I',
'L1_30M-EM20ITAU12',
'L1_MJJ-400-CF',
- 'L1_LAR-EM',
- 'L1_LAR-J',
- 'L1_LAR-ZEE',
- 'L1_LAR-ZEE_LAR-EM',
- 'L1_BPH-2M9-2MU4_BPH-0DR15-2MU4',
- 'L1_BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4',
- 'L1_BPH-8M15-2MU6_BPH-0DR22-2MU6',
- 'L1_BPH-8M15-MU6MU4_BPH-0DR22-MU6MU4-BO',
+ #'L1_LAR-EM',
+ #'L1_LAR-J',
+ #'L1_LAR-ZEE',
+ #'L1_LAR-ZEE_LAR-EM',
+ #'L1_BPH-2M9-2MU4_BPH-0DR15-2MU4',
+ #'L1_BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4',
+ #'L1_BPH-8M15-2MU6_BPH-0DR22-2MU6',
+ #'L1_BPH-8M15-MU6MU4_BPH-0DR22-MU6MU4-BO',
#ATR-19720 - no algorithm in master
# 'L1_BPH-8M15-0DR22-2MU6',
@@ -601,7 +602,7 @@ def defineMenu():
# combined L1Topo for VBF
# INVM + DPHI
- 'L1_MJJ-400-NFF-0DPHI20',
+ #'L1_MJJ-400-NFF-0DPHI20',
'L1_MJJ-400-NFF-0DPHI22',
'L1_MJJ-400-NFF-0DPHI24',
'L1_MJJ-400-NFF-0DPHI26',
@@ -663,8 +664,8 @@ def defineMenu():
#ATR-18815
- 'L1_LFV-EM8I-MU11',
- 'L1_LFV-EM12I-MU6',
+ #'L1_LFV-EM8I-MU11',
+ #'L1_LFV-EM12I-MU6',
#ATR-19355
'L1_BPH-0M10-3MU4',
@@ -672,7 +673,7 @@ def defineMenu():
#ATR-18824
'L1_ZAFB-04DPHI-EM15I',
'L1_ZAFB-25DPHI-EM15I',
- 'L1_ZAFB-25DPHI-EM18I',
+ #'L1_ZAFB-25DPHI-EM18I',
#ATR-19302:
# 'L1_DPHI-M70-2EM10I',
@@ -680,7 +681,7 @@ def defineMenu():
#ATR-19510
'L1_DY-BOX-2MU4',
- 'L1_DY-DR-2MU4',
+ #'L1_DY-DR-2MU4',
'L1_DY-BOX-2MU6',
@@ -779,7 +780,7 @@ def defineMenu():
'L1_TAU20IM_2TAU12IM' : 58,
'L1_TAU60_2TAU40' : 458,
'L1_2TAU5' : 59,
- 'L1_2TAU8' : 68,
+ 'L1_2TAU8' : 166,
'L1_EM15VHI_2TAU12IM' : 60,
'L1_EM15VHI_2TAU12IM_J25_3J12' : 61,
'L1_EM15VHI_2TAU12IM_4J12' : 5,
@@ -792,7 +793,7 @@ def defineMenu():
'L1_MU10_TAU20IM_J25_2J20' : 377,
'L1_TAU20IM_2TAU12IM_J25_2J20_3J12' : 70,
'L1_TAU20IM_2TAU12IM_4J12.0ETA23' : 316,
- 'L1_TAU20IM_2TAU12IM_4J12.0ETA25' : 73,
+ #'L1_TAU20IM_2TAU12IM_4J12.0ETA25' : 73,
'L1_TAU20IM_2TAU12IM_4J12.0ETA28' : 77,
'L1_TAU25IM_2TAU20IM_2J25_3J20' : 398,
'L1_TAU20IM_2J20_XE45' : 74,
@@ -823,9 +824,9 @@ def defineMenu():
'L1_J75' : 98,
'L1_J85' : 99,
'L1_J100' : 100,
- 'L1_J120' : 101,
+ #'L1_J120' : 101,
'L1_J400' : 102,
- 'L1_4J20.0ETA49' : 383,
+ #'L1_4J20.0ETA49' : 383,
'L1_J20.31ETA49' : 103,
'L1_J30.31ETA49' : 104,
'L1_J50.31ETA49' : 105,
@@ -866,6 +867,7 @@ def defineMenu():
'L1_J40_XE50' : 142,
'L1_2J50_XE40' : 175,
'L1_J40_XE60' : 176,
+ 'L1_XE10': 68,
'L1_XE35' : 144,
'L1_XE40' : 145,
'L1_XE45' : 146,
@@ -882,6 +884,7 @@ def defineMenu():
'L1_RD0_UNPAIRED_ISO' : 201,
'L1_RD0_EMPTY' : 202,
'L1_RD1_EMPTY' : 204,
+ 'L1_RD2_EMPTY' : 206,
'L1_RD0_ABORTGAPNOTCALIB' : 372,
'L1_TGC_BURST' : 220,
'L1_ZB' : 240,
@@ -899,8 +902,8 @@ def defineMenu():
'L1_BCM_AC_CALIB' : 235,
'L1_BCM_CA_CALIB' : 236,
'L1_BCM_Wide_CALIB' : 237,
- 'L1_BTAG-MU4J15' : 238,
- 'L1_BTAG-MU6J20' : 243,
+ #'L1_BTAG-MU4J15' : 238,
+ #'L1_BTAG-MU6J20' : 243,
'L1_2MU4_J40_XE50' : 449,
'L1_MU4_J30_XE40_DPHI-J20s2XE30' : 452,
'L1_MU4_J50_XE50_DPHI-J20s2XE30' : 453,
@@ -918,34 +921,34 @@ def defineMenu():
'L1_2MU4_J20_XE30_DPHI-J20s2XE30' : 271,
'L1_MJJ-700' : 216,
'L1_MJJ-300' : 331,
- 'L1_MJJ-100' : 333,
- 'L1_MJJ-400' : 329,
- 'L1_MJJ-800' : 327,
+ #'L1_MJJ-100' : 333,
+ #'L1_MJJ-400' : 329,
+ #'L1_MJJ-800' : 327,
'L1_MJJ-500-NFF' : 108,
'L1_J50_DETA20-J50J' : 275,
'L1_DPHI-2EM3' : 288,
- 'L1_HT150-JJ15.ETA49' : 334,
- 'L1_HT150-JJ15.ETA49_MJJ-400' : 416,
- 'L1_J4-MATCH' : 336,
+ #'L1_HT150-JJ15.ETA49' : 334,
+ #'L1_HT150-JJ15.ETA49_MJJ-400' : 416,
+ #'L1_J4-MATCH' : 336,
'L1_LLP-RO' : 338,
- 'L1_LLP-NOMATCH' : 339,
- 'L1_EM15TAU12I-J25' : 345,
- 'L1_DR-MU10TAU12I' : 340,
- 'L1_DR-MU10TAU12I_TAU12I-J25' : 72,
+ #'L1_LLP-NOMATCH' : 339,
+ #'L1_EM15TAU12I-J25' : 345,
+ #'L1_DR-MU10TAU12I' : 340,
+ #'L1_DR-MU10TAU12I_TAU12I-J25' : 72,
'L1_DR-EM15TAU12I-J25' : 346,
- 'L1_TAU20ITAU12I-J25' : 347,
+ #'L1_TAU20ITAU12I-J25' : 347,
'L1_DR-TAU20ITAU12I' : 348,
'L1_DR-TAU20ITAU12I-J25' : 350,
'L1_30M-EM20ITAU12' : 387,
'L1_MJJ-400-CF' : 397,
- 'L1_LAR-EM' : 351,
- 'L1_LAR-J' : 352,
- 'L1_LAR-ZEE' : 71,
- 'L1_LAR-ZEE_LAR-EM' : 285,
- 'L1_BPH-2M9-2MU4_BPH-0DR15-2MU4' : 426,
- 'L1_BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4' : 427,
+ #'L1_LAR-EM' : 351,
+ #'L1_LAR-J' : 352,
+ #'L1_LAR-ZEE' : 71,
+ #'L1_LAR-ZEE_LAR-EM' : 285,
+ #'L1_BPH-2M9-2MU4_BPH-0DR15-2MU4' : 426,
+ #'L1_BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4' : 427,
'L1_BPH-8M15-MU6MU4_BPH-0DR22-MU6MU4-BO' : 488,
- 'L1_BPH-8M15-2MU6_BPH-0DR22-2MU6' : 301,
+ #'L1_BPH-8M15-2MU6_BPH-0DR22-2MU6' : 301,
'L1_BPH-8M15-0DR22-2MU6' : 107,
'L1_BPH-2M9-2DR15-2MU6' : 110,
'L1_BPH-2M9-0DR15-MU6MU4' : 125,
@@ -957,7 +960,7 @@ def defineMenu():
'L1_BPH-0DR3-EM7J15_MU6' : 134,
'L1_BPH-0M9-EM7-EM5_2MU4' : 153,
'L1_BPH-0DR3-EM7J15_2MU4' : 156,
- 'L1_MJJ-400-NFF-0DPHI20' : 128,
+ #'L1_MJJ-400-NFF-0DPHI20' : 128,
'L1_MJJ-400-NFF-0DPHI22' : 129,
'L1_MJJ-400-NFF-0DPHI24' : 133,
'L1_MJJ-400-NFF-0DPHI26' : 136,
@@ -967,14 +970,14 @@ def defineMenu():
'L1_LATE-MU10_J50' : 355,
'L1_TAU60_DR-TAU20ITAU12I' : 76,
'L1_SC111-CJ15' : 356,
- 'L1_LFV-EM8I-MU11' : 138,
- 'L1_LFV-EM12I-MU6' : 139,
+ #'L1_LFV-EM8I-MU11' : 138,
+ #'L1_LFV-EM12I-MU6' : 139,
'L1_BPH-0M10-3MU4' : 143,
'L1_ZAFB-04DPHI-EM15I' : 152,
'L1_ZAFB-25DPHI-EM15I' : 157,
- 'L1_ZAFB-25DPHI-EM18I' : 158,
+ #'L1_ZAFB-25DPHI-EM18I' : 158,
'L1_DPHI-M70-2EM12I' : 159,
- 'L1_DY-DR-2MU4' : 315,
+ #'L1_DY-DR-2MU4' : 315,
'L1_DY-BOX-2MU6' : 318,
'L1_DY-BOX-2MU4' : 160,
'L1_CEP-CJ60' : 162,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py
index ef15de84de698b7e0d43e63bd10fe0e8076e51ec..2a86b823ae9ee074512added99c322ebea49bbd1 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/generateL1MenuRun3.py
@@ -29,9 +29,9 @@ def generateL1Menu(menu, cmdline):
l1cfg = L1MenuConfig( menu )
from TrigConfigSvc.TrigConfigSvcCfg import getL1MenuFileName
- from TriggerJobOpts.TriggerFlags import TriggerFlags
- TriggerFlags.triggerMenuSetup = menu
- l1cfg.writeJSON( outputFile = getL1MenuFileName(), destdir = cmdline.dest)
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ ConfigFlags.Trigger.triggerMenuSetup = menu
+ l1cfg.writeJSON( outputFile = getL1MenuFileName(ConfigFlags), destdir = cmdline.dest)
return l1cfg.l1menu
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_full_menu_cf.sh b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_full_menu_cf.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9b360d1fc1bf2f5619d0964aa29a88cd8b1db429
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_full_menu_cf.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# This is not an ART test, but a unit test
+
+# This is a unit test of HLT Control Flow
+
+
+athena.py --imf --threads=1 --evtMax 5 --filesInput /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1 --config-only=config.pkl -c "doWriteBS=False;doWriteRDOTrigger=True;" TriggerMenuMT/full_menu_cf.py
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py b/Trigger/TriggerCommon/TriggerMenuMT/share/full_menu_cf.py
similarity index 97%
rename from Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
rename to Trigger/TriggerCommon/TriggerMenuMT/share/full_menu_cf.py
index 6cd3ef7e08e343fb231477f2b30b3cbcb08d182d..bea915b129bd6ed4a98e60b8aea6f8cdf32ddafb 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/share/full_menu_cf.py
@@ -14,7 +14,7 @@
def generateChains():
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, RecoFragmentsPool
- from TrigUpgradeTest.TestUtils import makeChain
+ from DecisionHandling.TestUtils import makeChain
testChains = []
##################################################################
@@ -119,7 +119,7 @@ def generateChains():
# jet chains
##################################################################
if opt.doJetSlice == True:
- from TrigUpgradeTest.jetMenuHelper import jetMenuSequenceFromString
+ from DecisionHandling.jetMenuHelper import jetMenuSequenceFromString
# small-R jets, different calibrations HLT_AntiKt4EMTopoJets_subjesIS
jetSeq_a4_tc_em = jetMenuSequenceFromString("a4_tc_em_subjesIS")
@@ -161,7 +161,7 @@ def generateChains():
# bjet chains
##################################################################
if opt.doBjetSlice == True:
- from TrigUpgradeTest.jetMenuHelper import jetMenuSequenceFromString
+ from DecisionHandling.jetMenuHelper import jetMenuSequenceFromString
from TriggerMenuMT.HLTMenuConfig.Bjet.BjetSequenceSetup import getBJetSequence
jetSequence = jetMenuSequenceFromString("a4_tc_em_subjesgscIS_ftf")
@@ -271,10 +271,12 @@ def generateChains():
from AthenaCommon.Logging import logging
__log = logging.getLogger('full_menu')
+from TriggerJobOpts.TriggerFlags import TriggerFlags
createHLTMenuExternally=True # menu will be build up explicitly here
doWriteRDOTrigger = False
doWriteBS = False
forceEnableAllChains=True
+TriggerFlags.triggerMenuSetup = "LS2_v1"
include("TriggerJobOpts/runHLT_standalone.py")
@@ -285,12 +287,14 @@ from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
generateChains()
makeHLTTree( triggerConfigHLT=TriggerConfigHLT )
-from TrigConfigSvc.TrigConfigSvcCfg import createHLTPrescalesFileFromMenu
-createHLTPrescalesFileFromMenu()
from TriggerMenuMT.HLTMenuConfig.Menu.HLTMenuJSON import generateJSON
generateJSON()
-
+
+from TrigConfigSvc.TrigConfigSvcCfg import createHLTPrescalesFileFromMenu
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+createHLTPrescalesFileFromMenu(ConfigFlags)
+
from AthenaCommon.AlgSequence import dumpSequence, AthSequencer
dumpSequence(topSequence)
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.h b/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.h
index 03a0033772496e9c9f4eee0074256c347f87b561..7fc85792445852c868910e13b83a89bd144fd79c 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.h
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/src/MergingEventLoopMgr.h
@@ -10,7 +10,7 @@
#include "GaudiKernel/MinimalEventLoopMgr.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/MsgStream.h"
-#include "GaudiKernel/Property.h"
+#include "Gaudi/Property.h"
#include "GaudiKernel/IEvtSelector.h"
#include "GaudiKernel/IIncidentSvc.h"
#include "GaudiKernel/EventContext.h"
diff --git a/graphics/JiveXML/share/DataTypes_All.py b/graphics/JiveXML/share/DataTypes_All.py
index cbf7f862bc56cf6282b17cb02f22eae26c9d526d..68a1ee5be4fb8f82d2fd8263927cf45f8c6a54df 100755
--- a/graphics/JiveXML/share/DataTypes_All.py
+++ b/graphics/JiveXML/share/DataTypes_All.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
#=================================================================
#Run the Full Reconstruction -> XML converter
#=================================================================
@@ -12,4 +13,4 @@ include ("AnalysisJiveXML/AnalysisJiveXML_DataTypes.py")
include ("TruthJiveXML/TruthJiveXML_DataTypes.py")
include ("xAODJiveXML/xAODJiveXML_DataTypes.py")
-print theEventData2XML
+print(theEventData2XML)
diff --git a/graphics/JiveXML/share/JiveXML_fromAOD.py b/graphics/JiveXML/share/JiveXML_fromAOD.py
index 8809257d548c84f4e62d19d0da47c3bbed69f8b7..f601c050491b06ed3b9919f26a5ded89ff60ba0a 100755
--- a/graphics/JiveXML/share/JiveXML_fromAOD.py
+++ b/graphics/JiveXML/share/JiveXML_fromAOD.py
@@ -1,11 +1,12 @@
-print "=== JiveXML_fromAOD.py: "
-print "=== Producing XML output for Atlantis event display"
-print "=== 25 events processed by default."
-print "=== Make sure you have a file AOD.pool.root connected with "
-print "=== symbolic link in this directory, e.g."
-print "=== ln -sf myAOD_runNumber.pool.root AOD.pool.root "
-print "=== Make sure you have matching geometry, check with: "
-print "=== os.system('dumpVersionTags.py AOD.pool.root | grep \"GeoAtlas \"') "
+from __future__ import print_function
+print("=== JiveXML_fromAOD.py: ")
+print("=== Producing XML output for Atlantis event display")
+print("=== 25 events processed by default.")
+print("=== Make sure you have a file AOD.pool.root connected with ")
+print("=== symbolic link in this directory, e.g.")
+print("=== ln -sf myAOD_runNumber.pool.root AOD.pool.root ")
+print("=== Make sure you have matching geometry, check with: ")
+print("=== os.system('dumpVersionTags.py AOD.pool.root | grep \"GeoAtlas \"') ")
import os
import sys
from RecExConfig.RecFlags import rec
@@ -14,13 +15,13 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
from AthenaCommon.GlobalFlags import globalflags
if os.path.isfile("AOD.pool.root"):
athenaCommonFlags.PoolAODInput.set_Value_and_Lock(['AOD.pool.root'])
- print "=== AOD file found ! "
+ print("=== AOD file found ! ")
#### EDIT geometry version here if necessary:
#globalflags.DetDescrVersion.set_Value_and_Lock('ATLAS-GEONF-08-00-00')
#### EDIT number of events here, default 25:
athenaCommonFlags.EvtMax.set_Value_and_Lock(25)
include ("JiveXML/JiveXML_jobOptions_AODRecEx.py")
else:
- print "=== AOD.pool.root not found. Exiting."
+ print("=== AOD.pool.root not found. Exiting.")
sys.exit(0)