diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadDoubleSelector.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadDoubleSelector.py
index 620cb10f8c0179a34ca21c14896e0d73fa895308..30a5ee5da0f9fa3e26d56bdeb151fd8b8b55ec3d 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadDoubleSelector.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadDoubleSelector.py
@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
## get a handle to the ApplicationManager
from AthenaCommon.AppMgr import theApp
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
#--------------------------------------------------------------
# Load POOL support for DoubleEventSelector
#--------------------------------------------------------------
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py
index 3e02a527833f7445986bb1b81e7151209557603d..705fac1159e50ab19a57d09e74ea4594459ebc06 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py
@@ -24,6 +24,11 @@ from AthenaCommon.AppMgr import theApp
## get a handle to the ServiceManager
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
#--------------------------------------------------------------
# Load POOL support for DoubleEventSelector
#--------------------------------------------------------------
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py
index 1d4973c2165c302ffdf6d93b73a5884e6d5e22f3..244b2c99d0dd56bd1301b87bc69d4edb4d913d82 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py
@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
# get a handle to the ApplicationManager
from AthenaCommon.AppMgr import theApp
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
#--------------------------------------------------------------
# Load POOL support for DoubleEventSelector
#--------------------------------------------------------------
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/ReadRDODoubleSelector.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/ReadRDODoubleSelector.py
index 50f812c8b82b374cd8ea6fcb1a72732f8d5cb1df..1cfb91e267f8aff94b5d5bb73f208aa2be72029e 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/ReadRDODoubleSelector.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/ReadRDODoubleSelector.py
@@ -23,6 +23,11 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
## get a handle to the ApplicationManager
from AthenaCommon.AppMgr import theApp
+# Set that we are running MC+MC overlay in MT mode
+from OverlayCommonAlgs.OverlayFlags import overlayFlags
+overlayFlags.isDataOverlay.set_Value_and_Lock(False)
+overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+
#--------------------------------------------------------------
# Load POOL support for DoubleEventSelector
#--------------------------------------------------------------
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
index 9bec7ae15bba9bd9390e3cfb0bea5d791992e050..7eeadb16aa4f3203560e3ff63f36328e7997e237 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CMakeLists.txt
@@ -1,39 +1,14 @@
-################################################################################
-# Package: CaloDetMgrDetDescrCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloDetMgrDetDescrCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/DetDescrCnvSvc
- DetectorDescription/Identifier
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- Control/StoreGate
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- LArCalorimeter/LArGeoModel/LArReadoutGeometry
- TileCalorimeter/TileDetDescr )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-
# Component(s) in the package:
atlas_add_component( CaloDetMgrDetDescrCnv
src/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} DetDescrCnvSvcLib Identifier GaudiKernel CaloDetDescrLib CaloIdentifier AthenaKernel StoreGateLib SGtests GeoModelUtilities LArReadoutGeometry TileDetDescr )
+ LINK_LIBRARIES DetDescrCnvSvcLib Identifier GaudiKernel CaloDetDescrLib CaloIdentifier AthenaKernel StoreGateLib SGtests GeoModelUtilities LArReadoutGeometry TileDetDescr )
# Install files from the package:
-atlas_install_headers( CaloDetMgrDetDescrCnv )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloCellVolumes.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloCellVolumes.cxx
index e0ae16125cdc3f62642b78bbb6902a934ac9a2ad..c5d1f5a4747825b6c36fb756d121983f7ddca052 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloCellVolumes.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloCellVolumes.cxx
@@ -1,8 +1,8 @@
/*
- 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 "CaloDetMgrDetDescrCnv/CaloCellVolumes.h"
+#include "CaloCellVolumes.h"
#include "Identifier/Identifier.h"
#include "CaloIdentifier/CaloCell_ID.h"
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloCellVolumes.h b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloCellVolumes.h
similarity index 100%
rename from Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloCellVolumes.h
rename to Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloCellVolumes.h
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
index e30f411dfa43c887daa7848bd2b90a710fc6df7f..30372d2d41aa109977169e36d6ee6f52a17d6dd1 100644
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloDetMgrDetDescrCnv_entries.cxx
@@ -1,8 +1,8 @@
/*
- 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 "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
-#include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
+#include "CaloMgrDetDescrCnv.h"
+#include "CaloSuperCellMgrDetDescrCnv.h"
DECLARE_CONVERTER( CaloMgrDetDescrCnv )
DECLARE_CONVERTER( CaloSuperCellMgrDetDescrCnv )
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
index 3687f86f0ec1cee8428c59ad8c6a4432fb595611..54760df0cf5e3182ba963bf45b76b4a3ffe8cf73 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.cxx
@@ -1,9 +1,9 @@
/*
- 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 "CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h"
-#include "CaloDetMgrDetDescrCnv/CaloCellVolumes.h"
+#include "CaloMgrDetDescrCnv.h"
+#include "CaloCellVolumes.h"
#include "DetDescrCnvSvc/DetDescrConverter.h"
#include "DetDescrCnvSvc/DetDescrAddress.h"
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.h
similarity index 100%
rename from Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloMgrDetDescrCnv.h
rename to Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloMgrDetDescrCnv.h
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.cxx b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.cxx
index 88f81fb38e237779f8df52df8a10daa7aa9023b5..8ddff395fe68fc04c236f719066ee762f9779433 100755
--- a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.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
*/
// $Id$
@@ -15,7 +15,7 @@
#undef NDEBUG
-#include "CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h"
+#include "CaloSuperCellMgrDetDescrCnv.h"
#include "CaloDetDescr/ICaloSuperCellIDTool.h"
#include "TileDetDescr/TileDetDescrManager.h"
#include "CaloDetDescr/CaloDetDescrManager.h"
diff --git a/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h b/Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.h
similarity index 100%
rename from Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/CaloDetMgrDetDescrCnv/CaloSuperCellMgrDetDescrCnv.h
rename to Calorimeter/CaloCnv/CaloDetMgrDetDescrCnv/src/CaloSuperCellMgrDetDescrCnv.h
diff --git a/Calorimeter/CaloUtils/CMakeLists.txt b/Calorimeter/CaloUtils/CMakeLists.txt
index 2f5116be2162b4807d3d1f6cd157ace86309950f..3dfcd9b94bcde61752282d5dc82d606c74d0b523 100644
--- a/Calorimeter/CaloUtils/CMakeLists.txt
+++ b/Calorimeter/CaloUtils/CMakeLists.txt
@@ -1,35 +1,8 @@
-################################################################################
-# Package: CaloUtils
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( CaloUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloDetDescr
- Calorimeter/CaloEvent
- Calorimeter/CaloGeoHelpers
- Calorimeter/CaloIdentifier
- Calorimeter/CaloInterface
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/Navigation
- Control/StoreGate
- Control/CxxUtils
- Event/FourMom
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODCore
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/SGTools
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/IdDictParser
- DetectorDescription/Identifier )
-
# External dependencies:
find_package( Boost )
find_package( CLHEP )
@@ -93,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-11"
+ ENVIRONMENT "ATLAS_REFERENCE_TAG=CaloUtils/CaloUtils-01-00-12"
PROPERTIES TIMEOUT 500 )
atlas_add_test( ToolWithConstants_test
diff --git a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
index 934c2aa895b8fe0fb24685d4840d44314b612dc5..e1a355baef8b8ee34aeaa39b12c9659b697a5416 100644
--- a/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
+++ b/Calorimeter/CaloUtils/share/CaloTowerStore_test.ref
@@ -31,7 +31,6 @@ StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
ClassIDSvc INFO getRegistryEntries: read 3542 CLIDRegistry entries for module ALL
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
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
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index a4b9b4cf06bca91c0dd5f3db0c93754b41c4fe1e..e5be898d987fa04e401a946c05a89c91c1d5664a 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -198,6 +198,11 @@ def _createCfgFlags():
return dqf
_addFlagsCategory(acf, "DQ", __dq, 'AthenaMonitoring' )
+ def __perfmon():
+ from PerfMonComps.PerfMonConfigFlags import createPerfMonConfigFlags
+ return createPerfMonConfigFlags()
+ _addFlagsCategory(acf, "PerfMon", __perfmon, 'PerfMonComps')
+
return acf
diff --git a/Control/CxxUtils/CxxUtils/vec.h b/Control/CxxUtils/CxxUtils/vec.h
index 37c09fa75e0921473e28a14345a6f651330f7425..0f536c8d43770204b4e86bdddbc16f66f3a51afb 100644
--- a/Control/CxxUtils/CxxUtils/vec.h
+++ b/Control/CxxUtils/CxxUtils/vec.h
@@ -24,16 +24,35 @@
* attribute is supported or a fallback C++ class intended to be
* (mostly) functionally equivalent.
*
- * We also support these additional operations:
+ * We also support additional operations.
*
+ * Deducing useful types:
* - @c CxxUtils::vec_type_t<VEC> is the element type of @c VEC.
+ * - @c CxxUtils::mask_type_t<VEC> is the vector type return by relational
+ * 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
* - @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)
+ * loads elements from @c mem_addr
+ * to @c dst
+ * - @c CxxUtils::vstore (vec_type_t<VEC>* mem_addr, VEC& src)
+ * 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)
+ * copies to @c dst[i] the min(a[i],b[i])
+ *
*/
-
#ifndef CXXUTILS_VEC_H
#define CXXUTILS_VEC_H
@@ -41,6 +60,7 @@
#include "CxxUtils/features.h"
#include "boost/integer.hpp"
#include <cstdlib>
+#include <cstring>
#include <initializer_list>
#include <algorithm>
#include <type_traits>
@@ -177,7 +197,7 @@ UNOP(~)
#undef UNOP
-
+
// Define relational operations.
@@ -330,13 +350,30 @@ constexpr size_t vec_size(const VEC&)
return sizeof(VEC) / sizeof(ELT);
}
+/**
+ * brief Deduce the type of a mask , type returned by relational operations,
+ * for a vectorized type.
+ */
+template<class VEC>
+struct mask_type
+{
+ static auto maskt(const VEC& v1, const VEC& v2) -> decltype(v1 < v2);
+ typedef
+ typename std::invoke_result<decltype(maskt), const VEC&, const VEC&>::type
+ type1;
+ typedef std::remove_cv_t<std::remove_reference_t<type1>> type;
+};
+template<class VEC>
+/// Deduce the mask type for a vectorized type.
+using mask_type_t = typename mask_type<VEC>::type;
/**
* brief Copy a scalar to each element of a vectorized type.
+ * Similar functionality to _mm_set/_mm_broadcast x86-64 intrinsics.
*/
-template <typename VEC, typename T>
-inline
-void vbroadcast (VEC& v, T x)
+template<typename VEC, typename T>
+inline void
+vbroadcast(VEC& v, T x)
{
// This may look inefficient, but the loop goes away when we
// compile with optimization.
@@ -346,6 +383,66 @@ void vbroadcast (VEC& v, T x)
}
}
+/*
+ * @brief load elements from memory address (C-array)
+ * to a vectorized type. Similar to _mm_load intrinsics
+ */
+template<typename VEC>
+inline void
+vload(VEC& dst, vec_type_t<VEC>* mem_addr)
+{
+ std::memcpy(&dst, mem_addr, sizeof(VEC));
+}
+
+/*
+ * @brief load elements from a vectorized type to
+ * a memory address (C-array).
+ * Similar to _mm_store intrinsics
+ */
+template<typename VEC>
+inline void
+vstore(vec_type_t<VEC>* mem_addr, VEC& src)
+{
+ std::memcpy(mem_addr, &src, sizeof(VEC));
+}
+
+/*
+ * @brief select/blend function.
+ * Similar _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)) || \
+ !HAVE_VECTOR_SIZE_ATTRIBUTE || WANT_VECTOR_FALLBACK
+ constexpr size_t N = vec_size<VEC>();
+ for (size_t i = 0; i < N; i++) {
+ dst[i] = mask[i] ? a[i] : b[i];
+ }
+#else
+ dst = mask ? a : b;
+#endif
+}
+
+/*
+ * @brief vectorized min.
+ * Similar to _mm_min intrinsics
+ */
+template<typename VEC>
+inline void
+vmin(VEC& dst, const VEC& a, const VEC& b)
+{
+#if (defined(__clang__) && (__clang_major__ < 10)) || \
+ !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
+}
} // namespace CxxUtils
diff --git a/Control/CxxUtils/test/vec_test.cxx b/Control/CxxUtils/test/vec_test.cxx
index 277b0877bb79cd038f6f5459825df25d6d78f541..1fde7ecb02d3c5011dd2bca7240038c6f4e0dcda 100644
--- a/Control/CxxUtils/test/vec_test.cxx
+++ b/Control/CxxUtils/test/vec_test.cxx
@@ -22,7 +22,7 @@
#include <type_traits>
#include <limits>
-
+#include <array>
#include <valarray>
@@ -269,6 +269,66 @@ void test_broadcast (const VEC& v1)
}
}
+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()
@@ -279,13 +339,16 @@ void test1a()
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 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);
@@ -303,6 +366,9 @@ void test1a()
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)
diff --git a/Control/PerformanceMonitoring/PerfMonComps/python/PerfMonCompsConfig.py b/Control/PerformanceMonitoring/PerfMonComps/python/PerfMonCompsConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..8f41afd32b225f955498a2fc3069139e79572ffd
--- /dev/null
+++ b/Control/PerformanceMonitoring/PerfMonComps/python/PerfMonCompsConfig.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaCommon.Logging import logging
+
+## A minimal new-style configuration for PerfMonMTSvc
+def PerfMonMTSvcCfg(flags, **kwargs):
+ """ Configuring PerfMonMTSvc """
+
+ # Get the logger
+ log = logging.getLogger("PerfMonMTSvcCfg")
+ log.info("Configuring PerfMonMTSvc with flags:")
+ log.info(" >> doFastMonMT {}".format(flags.PerfMon.doFastMonMT))
+ log.info(" >> doFullMonMT {}".format(flags.PerfMon.doFullMonMT))
+
+ # Check if basic monitoring is asked for
+ if not flags.PerfMon.doFastMonMT and not flags.PerfMon.doFullMonMT:
+ log.info("Nothing to be done...")
+ return ComponentAccumulator()
+
+ # Hook to PerfMonMTSvc
+ PerfMonMTSvc = CompFactory.PerfMonMTSvc
+
+ # Set the main properties for the service
+ import os,psutil
+ kwargs.setdefault("wallTimeOffset",
+ psutil.Process(os.getpid()).create_time() * 1000)
+ kwargs.setdefault("numberOfThreads",
+ max(1,flags.Concurrency.NumThreads))
+ kwargs.setdefault("numberOfSlots",
+ max(1,flags.Concurrency.NumConcurrentEvents))
+ kwargs.setdefault("doComponentLevelMonitoring",
+ flags.PerfMon.doFullMonMT)
+
+ # Get CA and add the service
+ acc = ComponentAccumulator()
+ acc.addService(PerfMonMTSvc(**kwargs), create=True)
+
+ # Enable the auditors that are necessarry for the service
+ acc.setAppProperty("AuditAlgorithms", True)
+ acc.setAppProperty("AuditTools", True)
+ acc.setAppProperty("AuditServices", True)
+
+ # Add the algorithm that is necessary for the service
+ PerfMonMTAlg = CompFactory.PerfMonMTAlg
+ acc.addEventAlgo(PerfMonMTAlg(), sequenceName='AthAlgSeq')
+
+ # Return the CA
+ return acc
diff --git a/Control/PerformanceMonitoring/PerfMonComps/python/PerfMonConfigFlags.py b/Control/PerformanceMonitoring/PerfMonComps/python/PerfMonConfigFlags.py
new file mode 100644
index 0000000000000000000000000000000000000000..353af4479999516aaa9078ef398d8d691e12bed8
--- /dev/null
+++ b/Control/PerformanceMonitoring/PerfMonComps/python/PerfMonConfigFlags.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration.AthConfigFlags import AthConfigFlags
+
+def createPerfMonConfigFlags():
+ pcf = AthConfigFlags()
+
+ # Two basic flags for PerfMonMT
+ pcf.addFlag('PerfMon.doFastMonMT', False)
+ pcf.addFlag('PerfMon.doFullMonMT', False)
+
+ return pcf
diff --git a/Control/SGTools/CMakeLists.txt b/Control/SGTools/CMakeLists.txt
index 675a3669644cf7d018e66974df29373019126bae..70140c28792bd978cdecb47ba16c78cb82684dc1 100644
--- a/Control/SGTools/CMakeLists.txt
+++ b/Control/SGTools/CMakeLists.txt
@@ -1,89 +1,66 @@
-################################################################################
-# Package: SGTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( SGTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/CxxUtils
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools
- Control/SGMon/SGAudCore )
-
# External dependencies:
-find_package( Boost COMPONENTS thread filesystem system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost )
# Component(s) in the package:
atlas_add_library( SGTools
src/*.cxx
PUBLIC_HEADERS SGTools
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} AthenaKernel CxxUtils GaudiKernel
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools SGAudCore )
+ PRIVATE_LINK_LIBRARIES SGAudCore )
atlas_add_dictionary( SGToolsDict
SGTools/SGToolsDict.h
SGTools/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
+# Tests in the package:
atlas_add_test( VersionedKey_test
SOURCES
test/VersionedKey_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
atlas_add_test( safe_clid_test
SOURCES
test/safe_clid_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
atlas_add_test( exceptions_test
SOURCES
test/exceptions_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
atlas_add_test( StringPool_test
SOURCES
test/StringPool_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
atlas_add_test( DataProxy_test
SOURCES
test/DataProxy_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
atlas_add_test( DataStore_test
SOURCES
test/DataStore_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
atlas_add_test( TransientAddress_test
SOURCES
test/TransientAddress_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
atlas_add_test( CurrentEventStore_test
SOURCES
test/CurrentEventStore_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
+ LINK_LIBRARIES SGTools )
atlas_add_test( SGFolderItem_test
SOURCES
test/SGFolderItem_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel CxxUtils GaudiKernel TestTools SGAudCore SGTools )
-
+ LINK_LIBRARIES SGTools )
diff --git a/Control/StoreGate/CMakeLists.txt b/Control/StoreGate/CMakeLists.txt
index eeb5cbcf2056caf341e0d4aabc2c9db7cc099de9..0f774c3a3cb863ae411d09b8b64e77c0c4cd3e1f 100644
--- a/Control/StoreGate/CMakeLists.txt
+++ b/Control/StoreGate/CMakeLists.txt
@@ -1,35 +1,17 @@
-################################################################################
-# Package: StoreGate
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( StoreGate )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthAllocators
- Control/AthContainersInterfaces
- Control/AthContainers
- Control/AthenaKernel
- Control/SGTools
- Control/CxxUtils
- Database/PersistentDataModel
- GaudiKernel
- PRIVATE
- AtlasTest/TestTools )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase )
-find_package( TBB )
+find_package( Boost )
# Component(s) in the package:
atlas_add_library( StoreGateLib src/*.cxx
PUBLIC_HEADERS StoreGate
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TBB_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TBB_LIBRARIES} ${CORAL_LIBRARIES} AthAllocators AthenaKernel AthContainers
- SGTools GaudiKernel PersistentDataModel
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthAllocators AthenaKernel AthContainers
+ AthContainersInterfaces SGTools GaudiKernel PersistentDataModel
PRIVATE_LINK_LIBRARIES CxxUtils TestTools )
atlas_add_component( StoreGate src/components/*.cxx
@@ -38,7 +20,7 @@ atlas_add_component( StoreGate src/components/*.cxx
# Test library used by the package's unit tests:
atlas_add_library( SGtests test/SGtests.cxx
NO_PUBLIC_HEADERS
- LINK_LIBRARIES StoreGateLib TestTools )
+ LINK_LIBRARIES CxxUtils StoreGateLib TestTools )
# Declare the package's tests:o
atlas_add_test( ActiveStore_test
diff --git a/Control/StoreGateBindings/CMakeLists.txt b/Control/StoreGateBindings/CMakeLists.txt
index a201fe65165a4e4cfddfae6360cd58cd9ee5cf61..b9f81df4b96b607db48e5b04f10077fb90b8d6ca 100644
--- a/Control/StoreGateBindings/CMakeLists.txt
+++ b/Control/StoreGateBindings/CMakeLists.txt
@@ -1,19 +1,8 @@
-################################################################################
-# Package: StoreGateBindings
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( StoreGateBindings )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthenaKernel
- Control/DataModelRoot
- Control/SGTools
- Control/StoreGate
- Control/RootUtils
- GaudiKernel )
-
# External dependencies:
find_package( Python COMPONENTS Development )
find_package( ROOT COMPONENTS PyROOT Core Tree MathCore Hist RIO pthread )
@@ -23,15 +12,12 @@ atlas_add_library( StoreGateBindings
src/*.cxx
PUBLIC_HEADERS StoreGateBindings
PRIVATE_INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib SGtests RootUtils
- PRIVATE_LINK_LIBRARIES ${Python_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel DataModelRoot SGTools GaudiKernel )
+ PRIVATE_LINK_LIBRARIES ${Python_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel DataModelRoot GaudiKernel RootUtils SGTools StoreGateLib )
atlas_add_dictionary( StoreGateBindingsDict
src/StoreGateBindingsDict.h
StoreGateBindings/selection.xml
- INCLUDE_DIRS ${Python_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Python_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel DataModelRoot SGTools StoreGateLib SGtests GaudiKernel StoreGateBindings )
+ LINK_LIBRARIES StoreGateLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py
- POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Event/EventBookkeeperTools/src/BookkeeperTool.cxx b/Event/EventBookkeeperTools/src/BookkeeperTool.cxx
index 6023023eb8cf949f1b9e5625648d1b7d9828e0fb..ac8ce9e8f80cb1bab716d3a820832908ee91bb8f 100644
--- a/Event/EventBookkeeperTools/src/BookkeeperTool.cxx
+++ b/Event/EventBookkeeperTools/src/BookkeeperTool.cxx
@@ -388,9 +388,9 @@ StatusCode BookkeeperTool::copyContainerToOutput(const std::string& outname)
// Get the tmp bookkeeper from the input
const xAOD::CutBookkeeperContainer* tmpBook(NULL);
- if ( outputMetaStore()->contains<xAOD::CutBookkeeperContainer>(outname+"tmp") ) {
+ if ( outputMetaStore()->contains<xAOD::CutBookkeeperContainer>(m_outputCollName+"tmp") ) {
ATH_MSG_DEBUG("Copying data to the output container " << outname);
- if( !(outputMetaStore()->retrieve( tmpBook, outname+"tmp") ).isSuccess() ) {
+ if( !(outputMetaStore()->retrieve( tmpBook, m_outputCollName+"tmp") ).isSuccess() ) {
ATH_MSG_WARNING( "Could not get tmp CutBookkeepers from output MetaDataStore" );
}
else {
diff --git a/Event/EventInfoMgt/src/TagInfoMgr.cxx b/Event/EventInfoMgt/src/TagInfoMgr.cxx
index c710c665db032d637ba2bd88d61717a6292ffe2d..dc50fbc4fad928af2f18d62bebe232c92cd7a708 100755
--- a/Event/EventInfoMgt/src/TagInfoMgr.cxx
+++ b/Event/EventInfoMgt/src/TagInfoMgr.cxx
@@ -48,15 +48,7 @@ long TagInfoMgr_StorageType = 0x50;
// Constructor with parameters:
TagInfoMgr::TagInfoMgr(const std::string &name,
ISvcLocator *pSvcLocator) :
- AthCnvSvc(name, pSvcLocator, TagInfoMgr_StorageType),
- m_storeGate("StoreGateSvc", name),
- m_detStore("DetectorStore", name),
- m_iovDbSvc("IOVDbSvc", name),
- m_metaDataTool("IOVDbMetaDataTool"),
- m_isFirstBeginRun(true),
- m_conditionsRun(EventIDBase::UNDEFNUM),
- m_newFileIncidentSeen(false),
- m_lastIOVRange(IOVRange(IOVTime(),IOVTime()))
+ AthCnvSvc(name, pSvcLocator, TagInfoMgr_StorageType)
{}
TagInfoMgr::~TagInfoMgr()
@@ -138,7 +130,7 @@ StatusCode TagInfoMgr::initialize()
}
// To copy TagInfo to EventInfo, we set listener to the
- // IncidentSvc for BeginEvent and BeginRun
+ // IncidentSvc for BeginRun and BeginInputFile
ServiceHandle<IIncidentSvc> incSvc("IncidentSvc", name());
long int pri=1000;
@@ -146,12 +138,11 @@ StatusCode TagInfoMgr::initialize()
// file meta data
incSvc->addListener( this, "BeginRun", pri);
- // Add BeginEvent to trigger refilling meta data store after a new
- // input file
- incSvc->addListener( this, "BeginEvent", pri);
-
- // Set to be listener for BeginInputFile
- incSvc->addListener(this, "BeginInputFile", 50); // pri has to be < 50 to be after IOVDbMetaDataTool.
+ // Add BeginInputFile to trigger refilling meta data store after a new input
+ // file - priority has to be < 50 to be run after IOVDbMetaDataTool, which
+ // has mergeing into the output file medat data the input meta data of the
+ // new file.
+ incSvc->addListener(this, "BeginInputFile", 50); //
return StatusCode::SUCCESS;
}
@@ -297,7 +288,7 @@ TagInfoMgr::fillTagInfo(const CondAttrListCollection* tagInfoCond, TagInfo* tagI
EventType::NameTagPairVec pairs1;
evtH->event_type()->get_detdescr_tags(pairs1);
- if (msgLevel() <= MSG::DEBUG) {
+ if (msgLvl(MSG::DEBUG)) {
if(pairs1.size()) {
ATH_MSG_DEBUG( "fillTagInfo: Pairs from EventType:");
}
@@ -351,9 +342,9 @@ TagInfoMgr::fillTagInfo(const CondAttrListCollection* tagInfoCond, TagInfo* tagI
}
// Dump out contents of TagInfo
- if (msgLevel() <= MSG::DEBUG) {
- MsgStream log1(Athena::getMessageSvc(), "TagInfo");
- tagInfo->printTags(log1);
+ if (msgLvl(MSG::DEBUG)) {
+ ATH_MSG_DEBUG( "fillTagInfo: print out tags before adding extra tags");
+ ATH_MSG_DEBUG(tagInfo->str());
}
@@ -373,9 +364,9 @@ TagInfoMgr::fillTagInfo(const CondAttrListCollection* tagInfoCond, TagInfo* tagI
}
// Dump out contents of TagInfo
- if( msgLevel() <= MSG::DEBUG ) {
- MsgStream log1(Athena::getMessageSvc(), "TagInfo");
- tagInfo->printTags(log1);
+ if (msgLvl(MSG::DEBUG)) {
+ ATH_MSG_DEBUG( "fillTagInfo: print out tags");
+ ATH_MSG_DEBUG(tagInfo->str());
}
return StatusCode::SUCCESS;
@@ -388,31 +379,16 @@ TagInfoMgr::fillMetaData (const TagInfo* tagInfo, const CondAttrListCollection
// fillMetaData is called at the beginning of the job and for each
// new file being read in.
//
-
// Fill IOV object in metadata store with information from tag
// info.
- // For the IOV, we have two choices:
//
- // 1) If there are input tags from file meta data, then we use
- // the IOV from the input conditions. For the first input
- // file, we use the incoming IOV if the current run falls
- // within the IOV range. If not we set the IOV to runNumber
- // to runNumber + 1. For subsequent input files, if the
- // runNumber falls within the previous IOV range, then we set
- // the new IOV to [runNumber, lastStop), otherwise the IOV is
- // set to [runNumber, runNumber+1). This latter is used for
- // the zerobias overlaying.
- //
- // 2) If we are taking them from the incoming events, then we
- // simply assume that the tags are valid for one run. (This
- // is the old way of doing things, no longer valid since
- // storing TagInfo in the MetaData
- //
- // Notes:
- //
- // The add of tags to the file meta data will merge different
- // IOVs together if the payloads are identical, so doing this
- // run by run is ok for 2)
+ // For the IOV we use the IOV from the input conditions. For the first input
+ // file, we use the incoming IOV if the current run falls within the IOV
+ // range. If not we set the IOV to runNumber to runNumber + 1. For
+ // subsequent input files, if the runNumber falls within the previous IOV
+ // range, then we set the new IOV to [runNumber, lastStop), otherwise the
+ // IOV is set to [runNumber, runNumber+1). This latter is used for the
+ // zerobias overlaying.
//
ATH_MSG_DEBUG( "entering fillMetaData");
@@ -450,6 +426,7 @@ TagInfoMgr::fillMetaData (const TagInfo* tagInfo, const CondAttrListCollection
CondAttrListCollection* attrListColl = new CondAttrListCollection(true);
attrListColl->add(0, attrList);
// Set IOV:
+
if (tagInfoCond) {
// set to the IOV of the incoming conditions
// if run num is in previous IOV, set new IOV to be [runNum, lastStop)
@@ -568,22 +545,24 @@ void
TagInfoMgr::handle(const Incident& inc) {
/**
-
- ** This method is called at the BeginRun incident:
+ ** This method is called at the both the BeginRun and BeginInputFile incidents:
**
** 1) For the first begin run, we retrieve the TagInfo and set
** up IOVDbSvc so that is can use TagInfo to define its
** hierarchical tags.
+ ** Note: the detector store 'retrieve' of the TagInfo will call
+ ** TagInfoMgr::createObj to do the first creation and filling it
+ ** accordingly. And this also fills the output file metadata with
+ ** contents of the TagInfo object.
**
- ** 2) For (old) input files where the TagInfo is stored in each
- ** event, subsequent begin runs will fill the file meta data
- ** for output. This is done because the IOV is incremented by
- ** one each run.
+ ** 2) Then whenever a new file is opened (BeginInputFile), we
+ ** use the TagInfo object from the detector store to "re-fill"
+ ** and override the newly merged TagInfo meta data in the output
+ ** meta data store. We receive BeginInputFile AFTER the
+ ** IOVDbMetaDataTool has done this automatic merging, so that we
+ ** can safely overwrite with the desired TagInfo information for
+ ** this job/run.
**
- ** Note that if the input has TagInfo in the file meta data, the
- ** output will be written via the checkTagInfo callback - called
- ** each time the input TagInfo object changes.
- **
**/
// Get the messaging service, print where you are
@@ -591,8 +570,9 @@ TagInfoMgr::handle(const Incident& inc) {
<< " from " << inc.source());
// Return quickly for BeginEvent if not needed
- if (!m_newFileIncidentSeen && inc.type() == IncidentType::BeginEvent) return;
+ if (!m_isFirstBeginRun && inc.type() == IncidentType::BeginEvent) return;
+
// At first BeginRun we retrieve TagInfo and trigger IOVDbSvc to
// use it
if (inc.type() == IncidentType::BeginRun && m_isFirstBeginRun) {
@@ -600,9 +580,6 @@ TagInfoMgr::handle(const Incident& inc) {
// No longer first BeginRun
m_isFirstBeginRun = false;
- // reset flags
- m_newFileIncidentSeen = false;
-
// get conditionsRun from the Context - can be used if no EventID in the SG (for HLT)
m_conditionsRun = Atlas::getExtendedEventContext(inc.context()).conditionsRun();
@@ -610,7 +587,7 @@ TagInfoMgr::handle(const Incident& inc) {
// can't use a ref here!
const EventIDBase eventID = inc.context().eventID();
- if (msgLevel() <= MSG::DEBUG) {
+ if (msgLvl(MSG::DEBUG)) {
msg() << MSG::DEBUG << "handle: First BeginRun incident - Event ID: ["
<< eventID.run_number() << ","
<< eventID.event_number() << ":"
@@ -656,7 +633,6 @@ TagInfoMgr::handle(const Incident& inc) {
ATH_MSG_DEBUG( "handle: Try dropping /TagInfo - " << sc);
if (m_detStore->retrieve( tagInfo, m_tagInfoKeyValue ).isFailure() ) {
ATH_MSG_ERROR( "handle: Could not retrieve TagInfo object from the detector store");
-
return;
}
}
@@ -670,53 +646,11 @@ TagInfoMgr::handle(const Incident& inc) {
ATH_MSG_DEBUG( "handle: TagInfo successfully processed by IOVDbSvc to register callback");
}
}
- else if (inc.type() == IncidentType::BeginRun) {
- // For subsequent BeginRuns, check whether the /TagInfo folder
- // exists, and if so return. We only treat the case where
- // TagInfo is coming in with each event. In this case we fill
- // file meta data and increment IOV to cover each run
-
- // reset flags
- m_newFileIncidentSeen = false;
- // Return if /TagInfo exists
- const CondAttrListCollection* attrListColl = 0;
- if (m_detStore->contains<CondAttrListCollection>("/TagInfo")) {
- ATH_MSG_DEBUG( "handle: TagInfo input from meta data - no need to fill output file meta data");
- return;
- }
-
- const TagInfo* tagInfo = 0;
- if (m_detStore->retrieve( tagInfo, m_tagInfoKeyValue ).isFailure() ) {
- ATH_MSG_ERROR( "handle: Could not retrieve TagInfo object from the detector store");
- throw GaudiException( "Could not retrieve TagInfo object from the detector store", "TagInfoMgr::handle", StatusCode::FAILURE );
- }
-
- // Copy TagInfo to meta data store for writing to file meta data
- if (StatusCode::SUCCESS != fillMetaData(tagInfo, attrListColl)) {
- ATH_MSG_ERROR( "handle: Unable to write TagInfo to MetaDataStore !");
- throw GaudiException( "Unable to write TagInfo to MetaDataStore !", "TagInfoMgr::handle", StatusCode::FAILURE );
- }
- else {
- ATH_MSG_DEBUG( "handle: Wrote TagInfo to MetaDataStore ");
- }
- }
else if (inc.type() == "BeginInputFile" && !m_isFirstBeginRun) {
- // We must keep track of BeginInputFile incidents because they
- // will override the TagInfo in the file meta data. This flag
- // will be used to restore the TagInfo folder in the meta data
- // store at the next BeginEvent if and only if BeginRun has
- // NOT already been called. (BeginRun will also reset the
- // TagInfo in the meta data store.)
- m_newFileIncidentSeen = true;
- }
- else if (m_newFileIncidentSeen && inc.type() == "BeginEvent") {
- // If a new file incident has been seen and there is NOT a
- // BeginRun before the next BeginEvent, then we "refill" the
+ // For a new file incident, we must "refill" the
// meta data store with the current value of the TagInfo
// folder in the detector store.
- // reset flags
- m_newFileIncidentSeen = false;
// Return if /TagInfo does NOT exists
const CondAttrListCollection* attrListColl = 0;
if (m_detStore->contains<CondAttrListCollection>("/TagInfo")) {
@@ -911,7 +845,7 @@ TagInfoMgr::createObj(IOpaqueAddress* addr, DataObject*& dataObj) {
// most likely not used anymore. RDS 08/2012).
if (attrListColl && attrListColl->size() == 0) {
tagInfo = std::make_unique<TagInfo>(m_lastTagInfo);
- if (msgLevel() <= MSG::DEBUG) {
+ if (msgLvl(MSG::DEBUG)) {
ATH_MSG_DEBUG( "createObj: recreate tagInfo from saved info");
if (msgLevel()>=MSG::DEBUG) {
MsgStream log1(Athena::getMessageSvc(), "TagInfo");
@@ -925,7 +859,7 @@ TagInfoMgr::createObj(IOpaqueAddress* addr, DataObject*& dataObj) {
ATH_MSG_DEBUG( "createObj: Unable to fill TagInfo !");
return StatusCode::FAILURE;
}
- if (msgLevel() <= MSG::DEBUG) {
+ if (msgLvl(MSG::DEBUG)) {
if (attrListColl) ATH_MSG_DEBUG( "createObj: Filled TagInfo from file meta data ");
else ATH_MSG_DEBUG( "createObj: Filled TagInfo from input event ");
}
@@ -943,7 +877,7 @@ TagInfoMgr::createObj(IOpaqueAddress* addr, DataObject*& dataObj) {
// Do standard conversion to data object
dataObj = SG::asStorable(std::move(tagInfo));
- if (outputLevel() <= MSG::DEBUG) {
+ if (msgLvl(MSG::DEBUG)) {
ATH_MSG_DEBUG( "createObj: created new TagInfo object ");
}
return StatusCode::SUCCESS;
diff --git a/Event/EventInfoMgt/src/TagInfoMgr.h b/Event/EventInfoMgt/src/TagInfoMgr.h
index 09a29d7c3125f202b14266f37feb6d227096ac74..32aab1c333270b9b4c3a9441fbccb0f61470c0f2 100755
--- a/Event/EventInfoMgt/src/TagInfoMgr.h
+++ b/Event/EventInfoMgt/src/TagInfoMgr.h
@@ -28,17 +28,16 @@
#include "GaudiKernel/IIncidentListener.h"
#include "AthenaKernel/IAddressProvider.h"
#include "AthenaKernel/IOVRange.h"
+#include "AthenaKernel/IIOVDbSvc.h"
#include "GaudiKernel/MsgStream.h"
#include "EventInfo/TagInfo.h"
+#include "IOVDbMetaDataTools/IIOVDbMetaDataTool.h"
#include <map>
//<<<<<< PUBLIC TYPES >>>>>>
class StoreGateSvc;
-class TagInfo;
-class IIOVDbSvc;
-class IIOVDbMetaDataTool;
class CondAttrListCollection;
//<<<<<< CLASS DECLARATIONS >>>>>>
@@ -192,11 +191,11 @@ private:
/// Flag to add override the tags from EventInfo from other
/// sources
- Gaudi::Property<bool> m_overrideEventInfoTags{this,"OverrideEventInfoTags",true,"Override tags yes/no"};
+ Gaudi::Property<bool> m_overrideEventInfoTags { this, "OverrideEventInfoTags", true, "Override tags yes/no" };
/// Extra tags/values pairs added in my jobOptions
Gaudi::Property<std::map<std::string,std::string> >
- m_extraTagValuePairs{this,"ExtraTagValuePairs",{},"key/value pairs to be added", "mapMergeNoReplace<T,T>"};
+ m_extraTagValuePairs { this, "ExtraTagValuePairs", {}, "key/value pairs to be added", "mapMergeNoReplace<T,T>" };
/// Extra tags/values pairs added in via interface
std::map<std::string,std::string> m_extraTagValuePairsViaInterface;
@@ -205,33 +204,30 @@ private:
std::set<std::string> m_tagsToBeRemoved;
/// The StoreGate key for the TagInfo
- Gaudi::Property<std::string> m_tagInfoKey{this,"TagInfoKey","ProcessingTags","SG key for TagInfo"};
+ Gaudi::Property<std::string> m_tagInfoKey{ this, "TagInfoKey", "ProcessingTags", "SG key for TagInfo" };
std::string m_tagInfoKeyValue;
/// The event store
- ServiceHandle<StoreGateSvc> m_storeGate;
+ ServiceHandle<StoreGateSvc> m_storeGate { this, "StoreGateSvc", "StoreGateSvc" };
/// The detector store
- ServiceHandle<StoreGateSvc> m_detStore;
+ ServiceHandle<StoreGateSvc> m_detStore { this, "DetectorStore", "DetectorStore" };
/// Access to IOVDbSvc interface - used to register callback
- ServiceHandle<IIOVDbSvc> m_iovDbSvc;
+ ServiceHandle<IIOVDbSvc> m_iovDbSvc { this, "IOVDbSvc", "IOVDbSvc" };
/// Access to iov meta data tool
- ToolHandle<IIOVDbMetaDataTool> m_metaDataTool;
+ ToolHandle<IIOVDbMetaDataTool> m_metaDataTool { this, "IOVDbMetaDataTool", "IOVDbMetaDataTool" };
/// Flag to identify the first BeginRun incident
- bool m_isFirstBeginRun;
+ bool m_isFirstBeginRun { true };
/// conditionsRun from the first BeginRun incident (HLT)
- EventIDBase::number_type m_conditionsRun;
-
- /// Flag to identify a new file incident
- bool m_newFileIncidentSeen;
+ EventIDBase::number_type m_conditionsRun { EventIDBase::UNDEFNUM };
/// IOVRange of last TagInfo added to the file meta data
- IOVRange m_lastIOVRange;
+ IOVRange m_lastIOVRange { IOVRange(IOVTime(), IOVTime()) };
/// Last TagInfo added to the detector store
TagInfo m_lastTagInfo;
diff --git a/Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayLegacyTest.py b/Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayLegacyTest.py
index d2f60f1475313bbea2ec05936258bcc4a185ed1b..e55a048638fcc22d8103d6001f44c8e89e8a55b4 100644
--- a/Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayLegacyTest.py
+++ b/Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayLegacyTest.py
@@ -24,11 +24,6 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
# get a handle to the ApplicationManager
from AthenaCommon.AppMgr import theApp
-#--------------------------------------------------------------
-# Load POOL support for DoubleEventSelector
-#--------------------------------------------------------------
-import AthenaPoolCnvSvc.ReadAthenaPoolDouble
-
#--------------------------------------------------------------
# Set flags and load det descr
#--------------------------------------------------------------
@@ -41,6 +36,11 @@ globalflags.isOverlay.set_Value_and_Lock(True)
overlayFlags.isDataOverlay.set_Value_and_Lock(False)
overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+#--------------------------------------------------------------
+# Load POOL support for DoubleEventSelector
+#--------------------------------------------------------------
+import AthenaPoolCnvSvc.ReadAthenaPoolDouble
+
# For general flags
rec.doAOD = False
rec.doTrigger = False
diff --git a/Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayTest.py b/Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayTest.py
index 10206682f9ae6801309f360fae04843b1ed86000..219e82f0bd64ec05e628c8934cf0f88b86d1aa56 100644
--- a/Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayTest.py
+++ b/Event/xAOD/xAODEventInfoCnv/share/EventInfoOverlayTest.py
@@ -24,11 +24,6 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
# get a handle to the ApplicationManager
from AthenaCommon.AppMgr import theApp
-#--------------------------------------------------------------
-# Load POOL support for DoubleEventSelector
-#--------------------------------------------------------------
-import AthenaPoolCnvSvc.ReadAthenaPoolDouble
-
#--------------------------------------------------------------
# Set flags and load det descr
#--------------------------------------------------------------
@@ -41,6 +36,11 @@ globalflags.isOverlay.set_Value_and_Lock(True)
overlayFlags.isDataOverlay.set_Value_and_Lock(False)
overlayFlags.isOverlayMT.set_Value_and_Lock(True)
+#--------------------------------------------------------------
+# Load POOL support for DoubleEventSelector
+#--------------------------------------------------------------
+import AthenaPoolCnvSvc.ReadAthenaPoolDouble
+
# For general flags
rec.doAOD = False
rec.doTrigger = False
diff --git a/Event/xAOD/xAODTrigBphysAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigBphysAthenaPool/CMakeLists.txt
index 5027e3827403d1848a2f570d42df29082ba7fa60..213f8afe49f2fc302314d2ccae2d89e4b2ed1da3 100644
--- a/Event/xAOD/xAODTrigBphysAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigBphysAthenaPool/CMakeLists.txt
@@ -1,23 +1,12 @@
-################################################################################
-# Package: xAODTrigBphysAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigBphysAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthContainers
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/xAOD/xAODTrigBphys )
-
# Component(s) in the package:
atlas_add_poolcnv_library( xAODTrigBphysAthenaPoolPoolCnv
src/*.cxx
FILES xAODTrigBphys/TrigBphysContainer.h xAODTrigBphys/TrigBphysAuxContainer.h
TYPES_WITH_NAMESPACE xAOD::TrigBphysContainer xAOD::TrigBphysAuxContainer
CNV_PFX xAOD
- LINK_LIBRARIES AthContainers AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities xAODTrigBphys )
-
+ LINK_LIBRARIES AthenaPoolCnvSvcLib xAODTrigBphys )
diff --git a/Event/xAOD/xAODTrigBphysCnv/CMakeLists.txt b/Event/xAOD/xAODTrigBphysCnv/CMakeLists.txt
index 749dbed45f7205ac5ce2d0deaae42798d3418d80..dae581dc7675c970d3f40c18d57dbf2257a6d3d4 100644
--- a/Event/xAOD/xAODTrigBphysCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigBphysCnv/CMakeLists.txt
@@ -1,32 +1,19 @@
-################################################################################
-# Package: xAODTrigBphysCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigBphysCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigBphys
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigEvent/TrigParticle )
-
atlas_add_library( xAODTrigBphysCnvLib
xAODTrigBphysCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigBphysCnv
LINK_LIBRARIES GaudiKernel xAODTrigBphys )
-
# Component(s) in the package:
atlas_add_component( xAODTrigBphysCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigBphysCnvLib xAODTrigBphys GaudiKernel AthenaBaseComps AthenaKernel TrigParticle )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigParticle xAODTrigBphysCnvLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-
diff --git a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
index 1d0af5f488d40a17d955444145ab2968c27076fa..40221bee08af176568ea7ebe10f716fb93306f84 100644
--- a/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigCaloCnv/CMakeLists.txt
@@ -1,31 +1,19 @@
-################################################################################
-# Package: xAODTrigCaloCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigCaloCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigCalo
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigEvent/TrigCaloEvent )
-
atlas_add_library( xAODTrigCaloCnvLib
xAODTrigCaloCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigCaloCnv
LINK_LIBRARIES GaudiKernel xAODTrigCalo )
-
# Component(s) in the package:
atlas_add_component( xAODTrigCaloCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigCaloCnvLib xAODTrigCalo GaudiKernel AthenaBaseComps AthenaKernel TrigCaloEvent )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigCaloEvent xAODTrigCaloCnvLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Event/xAOD/xAODTrigL1CaloAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigL1CaloAthenaPool/CMakeLists.txt
index 985dafe746091c407d601f35056f029fc8ae73e7..001dbd74ef28217c7fc0a50203f1811ad03fa9fb 100644
--- a/Event/xAOD/xAODTrigL1CaloAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigL1CaloAthenaPool/CMakeLists.txt
@@ -1,27 +1,12 @@
-################################################################################
-# Package: xAODTrigL1CaloAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigL1CaloAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/AthContainers
- Control/AthenaKernel
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/xAOD/xAODTrigL1Calo )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_poolcnv_library( xAODTrigL1CaloAthenaPoolPoolCnv
src/*.cxx
FILES xAODTrigL1Calo/JEMHitsContainer.h xAODTrigL1Calo/JEMHitsAuxContainer.h xAODTrigL1Calo/JEMEtSumsContainer.h xAODTrigL1Calo/JEMEtSumsAuxContainer.h xAODTrigL1Calo/JEMRoIContainer.h xAODTrigL1Calo/JEMRoIAuxContainer.h xAODTrigL1Calo/CPMHitsContainer.h xAODTrigL1Calo/CPMHitsAuxContainer.h xAODTrigL1Calo/CPMTowerContainer.h xAODTrigL1Calo/CPMTowerAuxContainer.h xAODTrigL1Calo/CPMRoIContainer.h xAODTrigL1Calo/CPMRoIAuxContainer.h xAODTrigL1Calo/CMMCPHitsContainer.h xAODTrigL1Calo/CMMCPHitsAuxContainer.h xAODTrigL1Calo/CMMEtSumsContainer.h xAODTrigL1Calo/CMMEtSumsAuxContainer.h xAODTrigL1Calo/CMMJetHitsContainer.h xAODTrigL1Calo/CMMJetHitsAuxContainer.h xAODTrigL1Calo/CMMRoI.h xAODTrigL1Calo/CMMRoIAuxInfo.h xAODTrigL1Calo/JetElementContainer.h xAODTrigL1Calo/JetElementAuxContainer.h xAODTrigL1Calo/RODHeaderContainer.h xAODTrigL1Calo/RODHeaderAuxContainer.h xAODTrigL1Calo/TriggerTowerContainer.h xAODTrigL1Calo/TriggerTowerAuxContainer.h xAODTrigL1Calo/CMXCPHitsContainer.h xAODTrigL1Calo/CMXCPHitsAuxContainer.h xAODTrigL1Calo/CMXCPTobContainer.h xAODTrigL1Calo/CMXCPTobAuxContainer.h xAODTrigL1Calo/CMXJetHitsContainer.h xAODTrigL1Calo/CMXJetHitsAuxContainer.h xAODTrigL1Calo/CMXJetTobContainer.h xAODTrigL1Calo/CMXJetTobAuxContainer.h xAODTrigL1Calo/CMXEtSumsContainer.h xAODTrigL1Calo/CMXEtSumsAuxContainer.h xAODTrigL1Calo/CMXRoIContainer.h xAODTrigL1Calo/CMXRoIAuxContainer.h xAODTrigL1Calo/CPMTobRoIContainer.h xAODTrigL1Calo/CPMTobRoIAuxContainer.h xAODTrigL1Calo/JEMTobRoIContainer.h xAODTrigL1Calo/JEMTobRoIAuxContainer.h xAODTrigL1Calo/L1TopoRawDataContainer.h xAODTrigL1Calo/L1TopoRawDataAuxContainer.h
TYPES_WITH_NAMESPACE xAOD::JEMHitsContainer xAOD::JEMHitsAuxContainer xAOD::JEMEtSumsContainer xAOD::JEMEtSumsAuxContainer xAOD::JEMRoIContainer xAOD::JEMRoIAuxContainer xAOD::CPMHitsContainer xAOD::CPMHitsAuxContainer xAOD::CPMTowerContainer xAOD::CPMTowerAuxContainer xAOD::CPMRoIContainer xAOD::CPMRoIAuxContainer xAOD::CMMCPHitsContainer xAOD::CMMCPHitsAuxContainer xAOD::CMMEtSumsContainer xAOD::CMMEtSumsAuxContainer xAOD::CMMJetHitsContainer xAOD::CMMJetHitsAuxContainer xAOD::CMMRoI xAOD::CMMRoIAuxInfo xAOD::JetElementContainer xAOD::JetElementAuxContainer xAOD::RODHeaderContainer xAOD::RODHeaderAuxContainer xAOD::TriggerTowerContainer xAOD::TriggerTowerAuxContainer xAOD::CMXCPHitsContainer xAOD::CMXCPHitsAuxContainer xAOD::CMXCPTobContainer xAOD::CMXCPTobAuxContainer xAOD::CMXJetHitsContainer xAOD::CMXJetHitsAuxContainer xAOD::CMXJetTobContainer xAOD::CMXJetTobAuxContainer xAOD::CMXEtSumsContainer xAOD::CMXEtSumsAuxContainer xAOD::CMXRoIContainer xAOD::CMXRoIAuxContainer xAOD::CPMTobRoIContainer xAOD::CPMTobRoIAuxContainer xAOD::JEMTobRoIContainer xAOD::JEMTobRoIAuxContainer xAOD::L1TopoRawDataContainer xAOD::L1TopoRawDataAuxContainer
CNV_PFX xAOD
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel AthenaPoolCnvSvcLib AthenaPoolUtilities xAODTrigL1Calo )
-
+ LINK_LIBRARIES AthContainers AthenaKernel AthenaPoolCnvSvcLib GaudiKernel xAODTrigL1Calo )
diff --git a/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt b/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
index a0a88146da219b5382910a06ef41f6c768527c49..10a5ded9a648415f0eae2afeed44bdb9080b9d97 100644
--- a/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigL1CaloCnv/CMakeLists.txt
@@ -1,27 +1,21 @@
-################################################################################
-# Package: xAODTrigL1CaloCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigL1CaloCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigL1Calo
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigT1/TrigT1CaloEvent )
-
# Component(s) in the package:
+atlas_add_library( xAODTrigL1CaloCnvLib
+ xAODTrigL1CaloCnv/*.h
+ INTERFACE
+ PUBLIC_HEADERS xAODTrigL1CaloCnv
+ LINK_LIBRARIES GaudiKernel xAODTrigL1Calo )
+
atlas_add_component( xAODTrigL1CaloCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigL1Calo GaudiKernel AthenaBaseComps AthenaKernel TrigT1CaloEventLib )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigT1CaloEventLib xAODTrigL1CaloCnvLib )
# Install files from the package:
-atlas_install_headers( xAODTrigL1CaloCnv )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/Event/xAOD/xAODTrigMinBiasAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigMinBiasAthenaPool/CMakeLists.txt
index e80b9c5749fff0f59f2a73bd1cf76714ddcc1430..a9434c46f4fb1c87d08428d37992cdaf67493a73 100644
--- a/Event/xAOD/xAODTrigMinBiasAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMinBiasAthenaPool/CMakeLists.txt
@@ -1,16 +1,8 @@
-################################################################################
-# Package: xAODTrigMinBiasAthenaPool
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigMinBiasAthenaPool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Database/AthenaPOOL/AthenaPoolUtilities
- Event/xAOD/xAODTrigMinBias )
-
# Component(s) in the package:
atlas_add_poolcnv_library( xAODTrigMinBiasAthenaPoolPoolCnv
src/*.cxx
diff --git a/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
index 1e3d86d02bf7b15987c860ff691b9e6f0d8cac5e..1c68a2ad46ed51ca83109e60dbae69958fa544ec 100644
--- a/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMinBiasCnv/CMakeLists.txt
@@ -1,32 +1,19 @@
-################################################################################
-# Package: xAODTrigMinBiasCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigMinBiasCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigMinBias
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent )
-
atlas_add_library( xAODTrigMinBiasCnvLib
xAODTrigMinBiasCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigMinBiasCnv
LINK_LIBRARIES GaudiKernel xAODTrigMinBias )
-
# Component(s) in the package:
atlas_add_component( xAODTrigMinBiasCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigMinBiasCnvLib xAODTrigMinBias GaudiKernel AthenaBaseComps AthenaKernel TrigCaloEvent TrigInDetEvent )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigCaloEvent TrigInDetEvent xAODTrigMinBiasCnvLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
index 996cd386454a797688efb1ce0e0b65b06a049175..d2ec3e0748cb6c35f728becf62006bcf0361f587 100644
--- a/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMissingETCnv/CMakeLists.txt
@@ -1,31 +1,19 @@
-################################################################################
-# Package: xAODTrigMissingETCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigMissingETCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigMissingET
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigEvent/TrigMissingEtEvent )
-
atlas_add_library( xAODTrigMissingETCnvLib
xAODTrigMissingETCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigMissingETCnv
- LINK_LIBRARIES GaudiKernel xAODTrigMissingET xAODCore )
-
+ LINK_LIBRARIES GaudiKernel xAODTrigMissingET )
# Component(s) in the package:
atlas_add_component( xAODTrigMissingETCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigMissingETCnvLib xAODTrigMissingET GaudiKernel AthenaBaseComps AthenaKernel TrigMissingEtEvent )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigMissingEtEvent xAODTrigMissingETCnvLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt b/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
index f5a08b0976a4f1fbd1898fcced17e1cba6adec77..b9a603df5ea5d7a5bc07433b7541891498db23d5 100644
--- a/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMuonCnv/CMakeLists.txt
@@ -1,35 +1,19 @@
-################################################################################
-# Package: xAODTrigMuonCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTrigMuonCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigMuon
- GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/AthLinks
- Event/FourMomUtils
- Trigger/TrigEvent/TrigMuonEvent )
-
atlas_add_library( xAODTrigMuonCnvLib
xAODTringMuonCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTrigMuonCnv
LINK_LIBRARIES GaudiKernel xAODTrigMuon xAODMuon xAODTracking )
-
# Component(s) in the package:
atlas_add_component( xAODTrigMuonCnv
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES xAODTrigMuonCnvLib xAODMuon xAODTracking xAODTrigMuon GaudiKernel AthenaBaseComps AthenaKernel AthLinks FourMomUtils TrigMuonEvent )
+ LINK_LIBRARIES AthLinks AthenaBaseComps AthenaKernel FourMomUtils TrigMuonEvent xAODTrigMuonCnvLib )
# Install files from the package:
atlas_install_python_modules( python/xAODTrigMuonCnvConfig.py python/xAODTrigMuonCnvConfigDb.py )
diff --git a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
index b4ebe224944dd2392132da7bded34f4d10ea9bb6..6dc5bfbac1f21b90276be590e316827a883fc182 100644
--- a/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODTriggerCnv/CMakeLists.txt
@@ -1,50 +1,23 @@
-# $Id: CMakeLists.txt 782320 2016-11-04 10:28:41Z krasznaa $
-################################################################################
-# Package: xAODTriggerCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( xAODTriggerCnv )
# Extra dependencies, based on the build environment:
if( XAOD_STANDALONE )
- set( extra_deps PRIVATE Control/xAODRootAccess )
set( interface_extra_libs )
elseif( XAOD_ANALYSIS )
- set( extra_deps GaudiKernel Control/AthenaKernel )
set( interface_extra_libs GaudiKernel )
else()
- set( extra_deps GaudiKernel
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Event/EventInfo
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
- Trigger/TrigAnalysis/TrigAnalysisInterfaces
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigConfiguration/TrigConfInterfaces
- Trigger/TrigEvent/TrigDecisionEvent
- Trigger/TrigEvent/TrigDecisionInterface
- Trigger/TrigEvent/TrigSteeringEvent )
set( interface_extra_libs GaudiKernel )
endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODTrigger
- ${extra_deps} )
-
atlas_add_library( xAODTriggerCnvLib
xAODTriggerCnv/*.h
INTERFACE
PUBLIC_HEADERS xAODTriggerCnv
LINK_LIBRARIES ${interface_extra_libs} xAODTrigger AsgTools )
-
# Build the package differently in standalone and Athena modes:
if( XAOD_STANDALONE )
diff --git a/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h
index 6a98c51ae21ddbff28d83e359c5694abcf3437a0..d51d7cfaac126e68dce6d8164315165f09497dc9 100644
--- a/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h
+++ b/HLT/Trigger/TrigControl/TrigKernel/TrigKernel/ITrigEventLoopMgr.h
@@ -22,7 +22,12 @@ public:
DeclareInterfaceID(ITrigEventLoopMgr, 21, 0);
/**
- * prepareForRun method invoked by framework
+ * invoked py the PSC before calling start() on all components
+ */
+ virtual StatusCode prepareForStart (const boost::property_tree::ptree &) = 0;
+
+ /**
+ * invoked by the PSC before event loop (before forking)
*/
virtual StatusCode prepareForRun ATLAS_NOT_THREAD_SAFE (const boost::property_tree::ptree &) = 0;
diff --git a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
index 034e6ca0d8e32fd6174f5c334e78d7cbcff8d725..a72394136831af9ab62dd751ba70617fa9a34204 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
+++ b/HLT/Trigger/TrigControl/TrigPSC/src/Psc.cxx
@@ -506,14 +506,18 @@ bool psc::Psc::prepareForRun (const ptree& args)
{
ERS_PSC_ERROR("Bad ptree path: \"" << e.path<ptree::path_type>().dump()
<< "\" - " << e.what())
-
return false;
}
catch(const ptree_bad_data & e)
{
ERS_PSC_ERROR("Bad ptree data: \"" << e.data<ptree::data_type>() << "\" - "
<< e.what())
+ return false;
+ }
+ // Initializations needed for start()
+ if(!callOnEventLoopMgr<ITrigEventLoopMgr>([&args](ITrigEventLoopMgr* mgr) {return mgr->prepareForStart(args);},
+ "prepareForStart").isSuccess()) {
return false;
}
@@ -539,9 +543,7 @@ bool psc::Psc::prepareForRun (const ptree& args)
}
return ret;
};
- if(!callOnEventLoopMgr<ITrigEventLoopMgr>(prep, "prepareForRun").isSuccess())
- {
- ERS_PSC_ERROR("Error preparing the EventLoopMgr");
+ if(!callOnEventLoopMgr<ITrigEventLoopMgr>(prep, "prepareForRun").isSuccess()) {
return false;
}
@@ -559,7 +561,6 @@ bool psc::Psc::stopRun (const ptree& /*args*/)
if(!callOnEventLoopMgr<IService>(&IService::sysStop, "sysStop").isSuccess())
{
- ERS_PSC_ERROR("Error stopping the EventLoopManager");
return false;
}
@@ -737,7 +738,6 @@ bool psc::Psc::prepareWorker (const boost::property_tree::ptree& args)
{return mgr->hltUpdateAfterFork(args);};
if(!callOnEventLoopMgr<ITrigEventLoopMgr>(upd, "hltUpdateAfterFork").isSuccess())
{
- ERS_PSC_ERROR("Error updating EventLoopMgr after fork");
return false;
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
index 25c9f2392f002d6f8896979f18efba9c19b53455..50c589da8c7c810102f992a2d4a907d796569892 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
@@ -264,6 +264,43 @@ StatusCode HltEventLoopMgr::finalize()
return StatusCode::SUCCESS;
}
+// =============================================================================
+// Implementation of ITrigEventLoopMgr::prepareForStart
+// =============================================================================
+StatusCode HltEventLoopMgr::prepareForStart(const ptree& pt)
+{
+ try {
+ const auto& rparams = pt.get_child("RunParams");
+ m_sorHelper = std::make_unique<TrigSORFromPtreeHelper>(msgSvc(), m_detectorStore, m_sorPath, rparams);
+ }
+ catch(ptree_bad_path& e) {
+ ATH_MSG_ERROR("Bad ptree path: \"" << e.path<ptree::path_type>().dump() << "\" - " << e.what());
+ return StatusCode::FAILURE;
+ }
+
+ // Override run/timestamp if needed
+ if (m_forceRunNumber > 0) {
+ m_sorHelper->setRunNumber(m_forceRunNumber);
+ ATH_MSG_WARNING("Run number overwrite:" << m_forceRunNumber);
+ }
+ if (m_forceSOR_ns > 0) {
+ m_sorHelper->setSORtime_ns(m_forceSOR_ns);
+ ATH_MSG_WARNING("SOR time overwrite:" << m_forceSOR_ns);
+ }
+
+ // Set our "run context" (invalid event/slot)
+ m_currentRunCtx.setEventID( m_sorHelper->eventID() );
+ m_currentRunCtx.setExtension(Atlas::ExtendedEventContext(m_evtStore->hiveProxyDict(),
+ m_currentRunCtx.eventID().run_number()));
+
+ // Some algorithms expect a valid context during start()
+ ATH_MSG_DEBUG("Setting context for start transition: " << m_currentRunCtx.eventID());
+ Gaudi::Hive::setCurrentContext(m_currentRunCtx);
+
+ return StatusCode::SUCCESS;
+}
+
+
// =============================================================================
// Implementation of ITrigEventLoopMgr::prepareForRun
// =============================================================================
@@ -276,9 +313,9 @@ StatusCode HltEventLoopMgr::prepareForRun(const ptree& pt)
// (void)TClass::GetClass("vector<unsigned short>"); // preload to overcome an issue with dangling references in serialization
// (void)TClass::GetClass("vector<unsigned long>");
- ATH_CHECK(clearTemporaryStores()); // do the necessary resets
- ATH_CHECK( processRunParams(pt) ); // update SOR in det store
- ATH_CHECK( updateMagField(pt) ); // update magnetic field
+ ATH_CHECK( clearTemporaryStores() ); // do the necessary resets
+ ATH_CHECK( m_sorHelper->fillSOR(m_currentRunCtx) ); // update SOR in det store
+ ATH_CHECK( updateMagField(pt) ); // update magnetic field
auto& soral = getSorAttrList();
@@ -306,14 +343,6 @@ StatusCode HltEventLoopMgr::prepareForRun(const ptree& pt)
ATH_MSG_VERBOSE("end of " << __FUNCTION__);
return StatusCode::SUCCESS;
}
- catch(const ptree_bad_path & e)
- {
- ATH_MSG_ERROR("Bad ptree path: \"" << e.path<ptree::path_type>().dump() << "\" - " << e.what());
- }
- catch(const ptree_bad_data & e)
- {
- ATH_MSG_ERROR("Bad ptree data: \"" << e.data<ptree::data_type>() << "\" - " << e.what());
- }
catch(const std::runtime_error& e)
{
ATH_MSG_ERROR("Runtime error: " << e.what());
@@ -734,36 +763,6 @@ void HltEventLoopMgr::updateDFProps()
if (!wpid.empty()) m_workerPID = std::stoi(wpid);
}
-// =============================================================================
-StatusCode HltEventLoopMgr::processRunParams(const ptree & pt)
-{
- ATH_MSG_VERBOSE("start of " << __FUNCTION__);
-
- const auto& rparams = pt.get_child("RunParams");
- TrigSORFromPtreeHelper sorhelp(msgSvc(), m_detectorStore, m_sorPath, rparams);
-
- // Override run/timestamp if needed
- if (m_forceRunNumber > 0) {
- sorhelp.setRunNumber(m_forceRunNumber);
- ATH_MSG_WARNING("Run number overwrite:" << m_forceRunNumber);
- }
- if (m_forceSOR_ns > 0) {
- sorhelp.setSORtime_ns(m_forceSOR_ns);
- ATH_MSG_WARNING("SOR time overwrite:" << m_forceSOR_ns);
- }
-
- // Set our "run context" (invalid event/slot)
- m_currentRunCtx.setEventID( sorhelp.eventID() );
- m_currentRunCtx.setExtension(Atlas::ExtendedEventContext(m_evtStore->hiveProxyDict(),
- m_currentRunCtx.eventID().run_number()));
-
- // Fill SOR parameters from ptree and inform IOVDbSvc
- ATH_CHECK( sorhelp.fillSOR(m_currentRunCtx) );
-
- ATH_MSG_VERBOSE("end of " << __FUNCTION__);
- return StatusCode::SUCCESS;
-}
-
// =============================================================================
void HltEventLoopMgr::updateInternal(const coral::AttributeList & sor_attrlist)
{
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
index 7c1703c343bc7b07df3f0dc02b527ade7acef2d0..6a6360f476e832b19d30852dc26190ae97a9e481 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
@@ -49,6 +49,7 @@ class IJobOptionsSvc;
class IScheduler;
class StoreGateSvc;
class TrigCOOLUpdateHelper;
+class TrigSORFromPtreeHelper;
class IIoComponentMgr;
namespace coral {
@@ -81,6 +82,7 @@ public:
/// @name State transitions of ITrigEventLoopMgr interface
///@{
+ virtual StatusCode prepareForStart (const boost::property_tree::ptree &) override;
virtual StatusCode prepareForRun ATLAS_NOT_THREAD_SAFE (const boost::property_tree::ptree& pt) override;
virtual StatusCode hltUpdateAfterFork(const boost::property_tree::ptree& pt) override;
///@}
@@ -123,9 +125,6 @@ private:
/// Read DataFlow configuration properties
void updateDFProps();
- /// Do whatever is necessary with RunParams (prepare) ptree
- StatusCode processRunParams(const boost::property_tree::ptree& pt);
-
// Update internally kept data from new sor
void updateInternal(const coral::AttributeList & sor_attrlist);
@@ -191,6 +190,8 @@ private:
SmartIF<IAlgExecStateSvc> m_aess;
SmartIF<IScheduler> m_schedulerSvc;
+ std::unique_ptr<TrigSORFromPtreeHelper> m_sorHelper;
+
// ------------------------- Other properties --------------------------------------
Gaudi::Property<std::string> m_schedulerName{
this, "SchedulerSvc", "AvalancheSchedulerSvc", "Name of the scheduler"};
diff --git a/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py b/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py
index e0a690c3174b5ce687de9d3b26fdc87b9feaf72a..d334b1a5dab42e763c29c970b073c75e7f66ccf3 100644
--- a/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py
+++ b/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py
@@ -212,21 +212,21 @@ class trigRecoExecutor(athenaExecutor):
matchedOutputFileNames.append(file)
return matchedOutputFileNames
- #run athenaHLT-select-PEB-stream.py to split a stream out of the BS file
+ #run trigbs_extractStream.py to split a stream out of the BS file
#renames the split file afterwards
def _splitBSfile(self, outputStream, allStreamsFileName, splitFileName):
msg.info('Splitting stream %s from BS file' % outputStream)
splitStreamFailure=0
try:
- cmd = 'athenaHLT-select-PEB-stream.py -s ' + outputStream + ' ' + allStreamsFileName
+ cmd = 'trigbs_extractStream.py -s ' + outputStream + ' ' + allStreamsFileName
msg.info('running command for splitting (in original asetup env): %s' % cmd)
splitStreamFailure = subprocess.call(cmd, shell=True)
- msg.debug('athenaHLT-select-PEB-stream.py splitting return code %s' % (splitStreamFailure) )
+ msg.debug('trigbs_extractStream.py splitting return code %s' % (splitStreamFailure) )
except OSError as e:
raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_OUTPUT_FILE_ERROR'),
- 'Exception raised when selecting stream with athenaHLT-select-PEB-stream.py in file {0}: {1}'.format(allStreamsFileName, e))
+ 'Exception raised when selecting stream with trigbs_extractStream.py in file {0}: {1}'.format(allStreamsFileName, e))
if splitStreamFailure != 0:
- msg.error('athenaHLT-select-PEB-stream.py returned error (%s) no split BS file created' % splitStreamFailure)
+ msg.error('trigbs_extractStream.py returned error (%s) no split BS file created' % splitStreamFailure)
return 1
else:
#know that the format will be of the form ####._athenaHLT.####.data
@@ -237,7 +237,7 @@ class trigRecoExecutor(athenaExecutor):
self._renamefile(matchedOutputFileName[0], splitFileName)
return 0
else:
- msg.error('athenaHLT-select-PEB-stream.py did not created expected file (%s)' % expectedStreamFileName)
+ msg.error('trigbs_extractStream.py did not created expected file (%s)' % expectedStreamFileName)
return 1
#rename a created file - used to overwrite filenames from athenaHLT into the requested argument name
@@ -366,14 +366,14 @@ class trigRecoExecutor(athenaExecutor):
# splitFailed = self._splitBSfile('Cost', matchedOutputFileNames[0],self.conf.dataDictionary['COST'].value[0])
# if(splitFailed):
# raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_OUTPUT_FILE_ERROR'),
- # 'Did not produce any BS file when selecting stream with athenaHLT-select-PEB-stream.py in file')
+ # 'Did not produce any BS file when selecting stream with trigbs_extractStream.py in file')
# If a stream (not All) is selected then slim the output to the particular stream out of the original BS file with many streams
if 'streamSelection' in self.conf.argdict and self.conf.argdict['streamSelection'].value != "All":
splitFailed = self._splitBSfile(self.conf.argdict['streamSelection'].value, matchedOutputFileNames[0], argInDict.value[0])
if(splitFailed):
raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_OUTPUT_FILE_ERROR'),
- 'Did not produce any BS file when selecting stream with athenaHLT-select-PEB-stream.py in file')
+ 'Did not produce any BS file when selecting stream with trigbs_extractStream.py in file')
else:
msg.info('Stream "All" requested, so not splitting BS file')
self._renamefile(matchedOutputFileNames[0], argInDict.value[0])
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index 7c6a85cbd4f4f45b1f6dd62b506ff9de24e68a94..7eadfc2fc9d0b328aa048bcbe99a176bbf296550 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -1181,6 +1181,11 @@ class doDigitalROTCreation(InDetFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = False
+class nnCutLargeD0Threshold(InDetFlagsJobProperty):
+ """ Threshold for NN cut in large D0 tracking for tracks in ambi"""
+ statusOn = True
+ allowedTypes = ['float']
+ StoredValue = -1.0
##-----------------------------------------------------------------------------
## 2nd step
@@ -2761,6 +2766,7 @@ _list_InDetJobProperties = [Enabled,
doHIP300,
checkDeadElementsOnTrack,
doDigitalROTCreation,
+ nnCutLargeD0Threshold,
useMuForTRTErrorScaling
]
for j in _list_InDetJobProperties:
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
index 55e1033987f25a195e30627c379d48a1e09a6441..de8e47974b79935a896ebc1925a654d03e4dd15d 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
@@ -1280,6 +1280,50 @@ def getInDetAmbiScoringTool(NewTrackingCuts, name='InDetAmbiScoringTool', **kwar
maxSCTHoles = NewTrackingCuts.maxSCTHoles(),
maxDoubleHoles = NewTrackingCuts.maxDoubleHoles()))
+@makePublicTool
+def getInDetNNScoringToolBase(name='InDetNNScoringTool', **kwargs) :
+ NewTrackingCuts = kwargs.pop("NewTrackingCuts")
+ the_name=makeName(name,kwargs)
+ from InDetRecExample.InDetJobProperties import InDetFlags
+ from AthenaCommon.DetFlags import DetFlags
+ have_calo_rois = InDetFlags.doBremRecovery() and InDetFlags.doCaloSeededBrem() and DetFlags.detdescr.Calo_allOn()
+ if have_calo_rois :
+ alg=createAndAddEventAlg(getInDetROIInfoVecCondAlg,"InDetROIInfoVecCondAlg")
+ kwargs=setDefaults(kwargs, CaloROIInfoName = alg.WriteKey )
+ from InDetTrackScoringTools.InDetTrackScoringToolsConf import InDet__InDetNNScoringTool
+ return InDet__InDetNNScoringTool(the_name,
+ **setDefaults(kwargs,
+ nnCutConfig = "dev/TrackingCP/LRTAmbiNetwork/20200727_225401/nn-config.json",
+ nnCutThreshold = InDetFlags.nnCutLargeD0Threshold(),
+ Extrapolator = getInDetExtrapolator(),
+ SummaryTool = getInDetTrackSummaryTool(),
+ DriftCircleCutTool = getInDetTRTDriftCircleCutForPatternReco(),
+ useAmbigFcn = True, # this is NewTracking
+ useTRT_AmbigFcn = False,
+ maxZImp = NewTrackingCuts.maxZImpact(),
+ maxEta = NewTrackingCuts.maxEta(),
+ usePixel = NewTrackingCuts.usePixel(),
+ useSCT = NewTrackingCuts.useSCT(),
+ doEmCaloSeed = have_calo_rois)
+ )
+
+def getInDetNNScoringTool(NewTrackingCuts, name='InDetNNScoringTool', **kwargs) :
+ return getInDetNNScoringToolBase(name+NewTrackingCuts.extension(),
+ **setDefaults( kwargs,
+ NewTrackingCuts = NewTrackingCuts,
+ useAmbigFcn = True, # this is NewTracking
+ useTRT_AmbigFcn = False,
+ minTRTonTrk = 0,
+ minTRTPrecisionFraction = 0,
+ minPt = NewTrackingCuts.minPT(),
+ maxRPhiImp = NewTrackingCuts.maxPrimaryImpact(),
+ minSiClusters = NewTrackingCuts.minClusters(),
+ minPixel = NewTrackingCuts.minPixel(),
+ maxSiHoles = NewTrackingCuts.maxHoles(),
+ maxPixelHoles = NewTrackingCuts.maxPixelHoles(),
+ maxSCTHoles = NewTrackingCuts.maxSCTHoles(),
+ maxDoubleHoles = NewTrackingCuts.maxDoubleHoles()))
+
def getInDetTRT_SeededScoringTool(NewTrackingCuts, name='InDetTRT_SeededScoringTool',**kwargs) :
from InDetRecExample.InDetJobProperties import InDetFlags
return getInDetAmbiScoringToolBase('InDetTRT_SeededScoringTool',
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
index 3e35f6f2984935505a73acd67057922cee790213..a214edabc0506b133086b68e384c8a9e8379abbc 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
@@ -463,9 +463,12 @@ class ConfiguredNewTrackingSiPattern:
#
if InDetFlags.doCosmics() and NewTrackingCuts.mode() != "DBM":
InDetAmbiScoringTool = TrackingCommon.getInDetCosmicsScoringTool(NewTrackingCuts)
+ elif(NewTrackingCuts.mode() == "R3LargeD0" and InDetFlags.nnCutLargeD0Threshold > 0):
+ # Set up NN config
+ InDetAmbiScoringTool = TrackingCommon.getInDetNNScoringTool(NewTrackingCuts)
else:
InDetAmbiScoringTool = TrackingCommon.getInDetAmbiScoringTool(NewTrackingCuts)
-
+
#
# --- load Ambiguity Processor
#
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTErrMonAlg_jobOptions.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTErrMonAlg_jobOptions.py
index 59ba0e9a53baaf4dedf40ae621c7886c3e658ccd..8c227248501f84c937f39e8154da6f80ee608d18 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTErrMonAlg_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTErrMonAlg_jobOptions.py
@@ -35,7 +35,7 @@ myMonGroup = helper.addGroup(myMonAlg, "SCTErrMonitor", "SCT/")
# Configure histograms
-from ROOT import SCT_Monitoring as sctMon
+from ROOT import SCT_Monitoring as sctMon #import SCT_MonitoringNumbers.h
# Filled in fillHistograms
myMonGroup.defineHistogram(varname = "lumiBlock;NumberOfEventsVsLB",
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTHitEffMonAlg_jobOptions.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTHitEffMonAlg_jobOptions.py
index d8ac262b86e1e66c9aa3b8a195a1eb522bad8055..92958dcde1a5191bc4a16e1c4bc8001d80a8e7e7 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTHitEffMonAlg_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTHitEffMonAlg_jobOptions.py
@@ -31,7 +31,7 @@ BunchCrossingCondAlgDefault()
# Add a generic monitoring tool (a "group" in old language). The returned
# object here is the standard GenericMonitoringTool.
-from ROOT import SCT_Monitoring as sctMon
+from ROOT import SCT_Monitoring as sctMon #import SCT_MonitoringNumbers.h
myMonGroup = [
helper.addGroup(
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTHitsNoiseMonAlg_jobOptions.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTHitsNoiseMonAlg_jobOptions.py
index 2567c5a6d7d94e38270061c9b42faef1e7b55ba8..0c403b106778f1525d6312d44f3c694f72b51dab 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTHitsNoiseMonAlg_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTHitsNoiseMonAlg_jobOptions.py
@@ -34,15 +34,13 @@ if globalflags.DataSource == "data":
doTrigger = True
myMonAlg.doTrigger = doTrigger
-from ROOT import SCT_Monitoring as sctMon
+from ROOT import SCT_Monitoring as sctMon #import SCT_MonitoringNumbers.h
# Add a generic monitoring tool (a "group" in old language). The returned
# object here is the standard GenericMonitoringTool.
dimension = [sctMon.N_REGIONS]
-MonGroupArray = helper.addArray(dimension,myMonAlg,"SCTHitsNoiseMonitor","SCT") #This puts SCTHitsNoiseMonitor_3 on index 0 !!
-
-
+MonGroupArray = helper.addArray(dimension,myMonAlg,"SCTHitsNoiseMonitor","SCT") # SCTHitsNoiseMonitor_3 on index 0 !!
myMonGroupGeneral = helper.addGroup(
myMonAlg,
@@ -50,10 +48,7 @@ myMonGroupGeneral = helper.addGroup(
"SCT/GENERAL/"
)
-### STEP 5 ###
# Configure histograms
-#####
-
abbreviations = ["ECp", "", "ECm"]
names = ["Endcap A", "Barrel", "Endcap C"]
@@ -63,10 +58,10 @@ titleAbbreviations = ["ECp","BAR","ECm"]
layerDisk = [ "layer","disk","layer"]
limits = [ sctMon.N_DISKS*2, sctMon.N_BARRELS*2, sctMon.N_DISKS*2 ]
tbinsNames = ["000", "001", "010", "011", "100", "101", "110", "111"]
+
for isub in range(sctMon.N_REGIONS):
for i in range(limits[isub]):
-
HitsMapName = "hitsmap" + abbreviations[isub] + "_" + str(i/2) + "_" + str(i%2)
HitsMapTitle = "SCT Hitmap for " + names[isub] + ": " + Title(i,isub)
MonGroupArray.__getitem__(isub).defineHistogram(varname= "eta_"+HitsMapName+",phi_"+HitsMapName+";"+HitsMapName,
@@ -165,7 +160,6 @@ for isub in range(sctMon.N_REGIONS):
xbins=sctMon.NBINS_LBs, xmin = 0.5, xmax = sctMon.NBINS_LBs + 0.5)
#GENERAL
-#clu_size
myMonGroupGeneral.defineHistogram(varname= "clu_size",
type= "TH1F",
title= "SCT Cluster Size" + ";Cluster Size;Num of Events",
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTLorentzMonAlg_jobOptions.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTLorentzMonAlg_jobOptions.py
index 6e6c0f3b8378d93f1e02f93d49c92be18d7862cc..f4526114a0e97c86a9795baaa69f8c7df606caec 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTLorentzMonAlg_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTLorentzMonAlg_jobOptions.py
@@ -30,10 +30,10 @@ myMonGroup = helper.addGroup(
"SCT/GENERAL/"
)
-### STEP 5 ###
+
# Configure histograms
-from ROOT import SCT_Monitoring as sctMon
+from ROOT import SCT_Monitoring as sctMon #import SCT_MonitoringNumbers.h
nProfileBins = 360
nSides = 2 # 0: Side 0, 1: Side 1
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTTracksMonAlg_jobOptions.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTTracksMonAlg_jobOptions.py
index e5ff3b6a94b4c6480d5071f0ff0b818964fac3f9..dfcf45a815af2f635d1587b3c0d3ad663dd7797e 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTTracksMonAlg_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTTracksMonAlg_jobOptions.py
@@ -38,7 +38,6 @@ myMonGroup = helper.addGroup(
"SCT/GENERAL/"
)
-### STEP 5 ###
# Configure histograms
regionNames = ["EndCapC", "Barrel", "EndCapA"]
s_triggerNames = ["RNDM", "BPTX", "L1CAL", "TGC", "RPC", "MBTS", "COSM", "Calib"]
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.cxx
index 3c70c2afc558443f03eb5c09d40ac82ae538e6b4..970b7bd7cd29edd41d0764ba6bf7bdacd894ba77 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitEffMonAlg.cxx
@@ -740,6 +740,7 @@ StatusCode SCTHitEffMonAlg::fillHistograms(const EventContext& ctx) const {
auto sideHashAcc{Monitored::Scalar<int>("sideHash", sideHash)};
auto isFirstBCIDAcc{Monitored::Scalar<bool>("isFirstBCID", (BCIDpos <= 0))};
+ //fill the histograms
fill(regionNames[isub].data(), effAcc, ineffAcc, ietaAcc, iphiAcc, layerAcc, lumiAcc, isFirstBCIDAcc);
fill("SCTHitEffMonitor", effAcc, lumiAcc, isubAcc, sideHashAcc, isFirstBCIDAcc);
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonAlg.cxx b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonAlg.cxx
index 2882091e789b0c464076cd4a98c179e5caac7606..f178fe5aad0496fddb2514cf53e19d3d8c10fda3 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/src/SCTHitsNoiseMonAlg.cxx
@@ -157,7 +157,7 @@ StatusCode SCTHitsNoiseMonAlg::generalHistsandNoise(const std::array<std::unorde
const bool doThisSubsystem[N_REGIONS] = {
m_doNegativeEndcap, true, m_doPositiveEndcap
};
-
+ // vectors to store data to decrease number of fill() calls for better perfomance
std::vector<int> vLumiBlock[N_REGIONS];
std::vector<int> vNumberOfHitsFromAllRDOs[N_REGIONS];
std::vector<int> vNumberOfHitsFromSPs[N_REGIONS];
@@ -329,6 +329,7 @@ StatusCode SCTHitsNoiseMonAlg::generalHistsandNoise(const std::array<std::unorde
fill("SCTHitsNoiseMonitorGeneral", hitsAcc);
// Fill hit occupancy and noise occupancy plots
+ // vectors for storing the data and then use only one fill call to decrease time
std::vector<int> vLB[N_REGIONS_INC_GENERAL];
std::vector<float> vNO[N_REGIONS_INC_GENERAL];
std::vector<float> vHO[N_REGIONS_INC_GENERAL];
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetTrackScoringTools/CMakeLists.txt
index 0bd16b4251c657a712ad32c48297b4866ee46b2f..bcb33444dd932ddd4119508644d88a8360c39f81 100644
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/CMakeLists.txt
@@ -25,8 +25,9 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkEvent/TrkTrackSummary
Tracking/TrkExtrapolation/TrkExInterfaces
Tracking/TrkEvent/TrkCaloClusterROI
- MagneticField/MagFieldElements
+ MagneticField/MagFieldElements
MagneticField/MagFieldConditions
+ Tools/PathResolver
)
@@ -34,6 +35,7 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
find_package( Eigen )
+find_package( lwtnn )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# tag rootMathLibs was not recognized in automatic conversion in cmt2cmake
@@ -42,8 +44,8 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
atlas_add_component( InDetTrackScoringTools
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkEventPrimitives TrkToolInterfaces GeoPrimitives InDetIdentifier InDetRIO_OnTrack InDetRecToolInterfaces TrkParameters TrkPseudoMeasurementOnTrack TrkTrack TrkTrackSummary TrkExInterfaces TrkCaloClusterROI MagFieldElements MagFieldConditions BeamSpotConditionsData )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${LWTNN_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkEventPrimitives TrkToolInterfaces GeoPrimitives InDetIdentifier InDetRIO_OnTrack InDetRecToolInterfaces TrkParameters TrkPseudoMeasurementOnTrack TrkTrack TrkTrackSummary TrkExInterfaces TrkCaloClusterROI MagFieldElements MagFieldConditions BeamSpotConditionsData PathResolver )
# Install files from the package:
atlas_install_headers( InDetTrackScoringTools )
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/InDetTrackScoringTools/InDetNNScoringTool.h b/InnerDetector/InDetRecTools/InDetTrackScoringTools/InDetTrackScoringTools/InDetNNScoringTool.h
new file mode 100755
index 0000000000000000000000000000000000000000..330763ca60491561fe64fe5832ed36180c0aa725
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/InDetTrackScoringTools/InDetNNScoringTool.h
@@ -0,0 +1,139 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////
+// Markus Elsing
+/////////////////////////////////
+
+#ifndef INDETNNSCORINGTOOL_H
+#define INDETNNSCORINGTOOL_H
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "InDetTrackScoringTools/ROIInfoVec.h"
+#include "TrkEventPrimitives/TrackScore.h"
+#include "TrkToolInterfaces/ITrackScoringTool.h"
+#include "TrkToolInterfaces/ITrackSummaryTool.h"
+#include "lwtnn/lightweight_network_config.hh"
+#include "lwtnn/LightweightNeuralNetwork.hh"
+#include "lwtnn/LightweightGraph.hh"
+#include "lwtnn/parse_json.hh"
+#include "PathResolver/PathResolver.h"
+#include "TrkParameters/TrackParameters.h"
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/IOVSvcDefs.h"
+// MagField cache
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "MagFieldElements/AtlasFieldCache.h"
+#include <fstream>
+#include <vector>
+#include <string>
+#include "BeamSpotConditionsData/BeamSpotData.h"
+#include "ROIInfoVec.h"
+
+namespace Trk {
+ class IExtrapolator;
+ class Track;
+ class TrackSummary;
+
+}
+
+namespace InDet {
+class ITrtDriftCircleCutTool;
+
+/**Concrete implementation of the ITrackScoringTool pABC*/
+class InDetNNScoringTool : virtual public Trk::ITrackScoringTool,
+ public AthAlgTool
+{
+
+ public:
+ InDetNNScoringTool(const std::string&,const std::string&,const IInterface*);
+ virtual ~InDetNNScoringTool ();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize () override;
+ /** create a score based on how good the passed track is*/
+ virtual Trk::TrackScore score( const Trk::Track& track, const bool suppressHoleSearch ) const override;
+
+ /** create a score based on how good the passed TrackSummary is*/
+ virtual Trk::TrackScore simpleScore( const Trk::Track& track, const Trk::TrackSummary& trackSum ) const override;
+ Trk::TrackScore ambigScore( const Trk::Track& track, const Trk::TrackSummary& trackSum ) const;
+ Trk::TrackScore calcNnScore( const Trk::Track &track, const Trk::TrackSummary& trackSum , const Trk::Perigee *extrapolatedPerigee) const;
+
+
+ private:
+ void setupScoreModifiers();
+
+ // DNN tools
+ std::unique_ptr<lwt::LightweightGraph> m_graph;
+ std::map<std::string, double> m_DNN_inputValues;
+
+ /** Check if the cluster is compatible with a EM cluster*/
+ bool isEmCaloCompatible(const Trk::Track& track) const;
+
+
+ //these are used for ScoreModifiers
+ int m_maxDblHoles, m_maxPixHoles, m_maxSCT_Holes, m_maxHits, m_maxSigmaChi2, m_maxTrtRatio, m_maxTrtFittedRatio,
+ m_maxB_LayerHits, m_maxPixelHits, m_maxPixLay, m_maxGangedFakes;
+ std::vector<double> m_factorDblHoles, m_factorPixHoles, m_factorSCT_Holes, m_factorHits,
+ m_factorSigmaChi2, m_factorB_LayerHits, m_factorPixelHits, m_factorPixLay, m_factorHoles, m_factorGangedFakes;
+ std::vector<double> m_boundsSigmaChi2, m_boundsHits,
+ m_boundsTrtRatio, m_factorTrtRatio, m_boundsTrtFittedRatio, m_factorTrtFittedRatio;
+
+ /**\todo make this const, once createSummary method is const*/
+ ToolHandle<Trk::ITrackSummaryTool> m_trkSummaryTool;
+
+ /** Returns minimum number of expected TRT drift circles depending on eta. */
+ ToolHandle<ITrtDriftCircleCutTool> m_selectortool;
+
+ /**holds the scores assigned to each Trk::SummaryType from the track's Trk::TrackSummary*/
+ std::vector<Trk::TrackScore> m_summaryTypeScore;
+
+ SG::ReadCondHandleKey<InDet::BeamSpotData> m_beamSpotKey { this, "BeamSpotKey", "BeamSpotData", "SG key for beam spot" };
+
+ ToolHandle<Trk::IExtrapolator> m_extrapolator;
+
+ // Read handle for conditions object to get the field cache
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey {this, "AtlasFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"};
+
+
+ /** use the scoring tuned to Ambiguity processing or not */
+ bool m_useAmbigFcn;
+ bool m_useTRT_AmbigFcn;
+ bool m_useSigmaChi2;
+ std::string m_nnCutConfig;
+ double m_nnCutThreshold;
+
+ bool m_usePixel;
+ bool m_useSCT;
+
+ /** cuts for selecting good tracks*/
+ double m_minPt; //!< minimal Pt cut
+ double m_maxEta; //!< maximal Eta cut
+ double m_maxRPhiImp; //!< maximal RPhi impact parameter cut
+ double m_maxZImp; //!< maximal z impact parameter cut
+ int m_minSiClusters; //!< minimal number of Si clusters
+ int m_maxDoubleHoles;//|< maximum number of SCT double holes
+ int m_maxSiHoles; //!< maximal number of holes (Pixel+SCT)
+ int m_maxPixelHoles; //!< maximal number of Pixel holes
+ int m_maxSctHoles; //!< maximal number of SCT holes
+ int m_minTRTonTrk; //!< minimum number of TRT hits
+ double m_minTRTprecision; //!< minimum fraction of TRT precision hits
+ int m_minPixel; //!< minimum number of pixel clusters
+ double m_maxRPhiImpEM; //!< maximal RPhi impact parameter cut track that match EM clusters
+
+ bool m_useEmClusSeed;
+ float m_phiWidthEm;
+ float m_etaWidthEm;
+
+ SG::ReadHandleKey<InDet::ROIInfoVec> m_caloROIInfoKey
+ {this,"CaloROIInfoName", "ROIInfoVec","Name of the calo cluster ROI vector."};
+};
+
+
+} // namespace InDet
+
+
+#endif
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/InDetNNScoringTool.cxx b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/InDetNNScoringTool.cxx
new file mode 100755
index 0000000000000000000000000000000000000000..88180f46a28044e16e052ee5c4a73fdcd3271f4a
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/InDetNNScoringTool.cxx
@@ -0,0 +1,944 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////
+// Markus Elsing
+/////////////////////////////////
+
+#include "InDetTrackScoringTools/InDetNNScoringTool.h"
+#include "InDetRecToolInterfaces/ITrtDriftCircleCutTool.h"
+#include "TrkTrack/Track.h"
+#include "TrkTrackSummary/TrackSummary.h"
+#include "TrkEventPrimitives/FitQuality.h"
+#include "TrkParameters/TrackParameters.h"
+#include "TrkExInterfaces/IExtrapolator.h"
+#include "CLHEP/GenericFunctions/CumulativeChiSquare.hh"
+#include "GeoPrimitives/GeoPrimitives.h"
+#include "TrkCaloClusterROI/CaloClusterROI.h"
+#include "TrkCaloClusterROI/CaloClusterROI_Collection.h"
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/WriteHandle.h"
+
+
+//---------------------------------------------------------------------------------------------------------------------
+
+InDet::InDetNNScoringTool::InDetNNScoringTool(const std::string& t,
+ const std::string& n,
+ const IInterface* p ) :
+ AthAlgTool(t,n,p),
+ // Initialization of ScoreModifiers variables
+ m_maxDblHoles(-1),
+ m_maxPixHoles(-1),
+ m_maxSCT_Holes(-1),
+ m_maxHits(-1),
+ m_maxSigmaChi2(-1),
+ m_maxTrtRatio(-1),
+ m_maxTrtFittedRatio(-1),
+ m_maxB_LayerHits(-1),
+ m_maxPixelHits(-1),
+ m_maxPixLay(-1),
+ m_maxGangedFakes(-1),
+ m_trkSummaryTool("Trk::TrackSummaryTool", this),
+ m_selectortool("InDet::InDetTrtDriftCircleCutTool", this),
+ m_summaryTypeScore(Trk::numberOfTrackSummaryTypes),
+ m_extrapolator("Trk::Extrapolator", this)
+{
+ declareInterface<Trk::ITrackScoringTool>(this);
+
+ // declare properties
+ declareProperty("minPt", m_minPt = 500.);
+ declareProperty("maxEta", m_maxEta = 2.7);
+ declareProperty("maxRPhiImp", m_maxRPhiImp = 10.);
+ declareProperty("maxZImp", m_maxZImp = 250.);
+
+ // changed cuts on the selction of tracks
+ declareProperty("minSiClusters", m_minSiClusters = 7);
+ declareProperty("maxDoubleHoles", m_maxDoubleHoles = 2);
+ declareProperty("maxSiHoles", m_maxSiHoles = 5, "max number of Silicon (Pixel+SCT) holes");
+ declareProperty("maxPixelHoles", m_maxPixelHoles = 5, "max number of Pixel holes");
+ declareProperty("maxSCTHoles", m_maxSctHoles = 5, "max number of SCT holes");
+ declareProperty("minTRTonTrk", m_minTRTonTrk = 9);
+ declareProperty("minTRTPrecisionFraction", m_minTRTprecision = 0.5);
+ declareProperty("minPixel", m_minPixel = 0);
+ declareProperty("nnCutConfig", m_nnCutConfig = "");
+ declareProperty("nnCutThreshold", m_nnCutThreshold = -0.1);
+
+ // which detectors to use
+ declareProperty("usePixel", m_usePixel = true);
+ declareProperty("useSCT", m_useSCT = true);
+
+ // switches and tools
+ declareProperty("useAmbigFcn", m_useAmbigFcn = true);
+ declareProperty("useTRT_AmbigFcn", m_useTRT_AmbigFcn = false);
+ declareProperty("useSigmaChi2", m_useSigmaChi2 = false);
+
+ // tools
+ declareProperty("Extrapolator", m_extrapolator);
+ declareProperty("SummaryTool" , m_trkSummaryTool);
+ declareProperty("DriftCircleCutTool",m_selectortool );
+
+ declareProperty("maxRPhiImpEM", m_maxRPhiImpEM = 50. );
+ declareProperty("doEmCaloSeed", m_useEmClusSeed = true );
+ declareProperty("phiWidthEM", m_phiWidthEm = 0.075 );
+ declareProperty("etaWidthEM", m_etaWidthEm = 0.05 );
+
+ //set values for scores
+ m_summaryTypeScore[Trk::numberOfPixelHits] = 20;
+ m_summaryTypeScore[Trk::numberOfPixelSharedHits] = -10; // NOT USED --- a shared hit is only half the weight
+ m_summaryTypeScore[Trk::numberOfPixelHoles] = -10; // a hole is bad
+ m_summaryTypeScore[Trk::numberOfInnermostPixelLayerHits] = 10; // addition for being b-layer
+ m_summaryTypeScore[Trk::numberOfInnermostPixelLayerSharedHits] = -5; // NOT USED --- a shared hit is only half the weight
+ m_summaryTypeScore[Trk::numberOfGangedPixels] = -5; // decrease for being ganged
+ m_summaryTypeScore[Trk::numberOfGangedFlaggedFakes] = -10; // decrease for being ganged fake
+ m_summaryTypeScore[Trk::numberOfSCTHits] = 10; // half of a pixel, since only 1dim
+ m_summaryTypeScore[Trk::numberOfSCTSharedHits] = -5; // NOT USED -- a shared hit is only half the weight
+ m_summaryTypeScore[Trk::numberOfSCTHoles] = -5; // a hole is bad !
+ m_summaryTypeScore[Trk::numberOfSCTDoubleHoles] = -15; // a double hole is even worse !
+ m_summaryTypeScore[Trk::numberOfTRTHits] = 1; // 10 straws ~ 1 SCT
+ m_summaryTypeScore[Trk::numberOfTRTHighThresholdHits] = 0; // addition for being TR
+ m_summaryTypeScore[Trk::numberOfOutliersOnTrack] = -1; // -ME- TRT oulier should not kill 5 TRT on track (was -5)
+
+ // scoring for Muons not needed
+ m_summaryTypeScore[Trk::numberOfMdtHits] = 0;
+ m_summaryTypeScore[Trk::numberOfTgcPhiHits] = 0;
+ m_summaryTypeScore[Trk::numberOfTgcEtaHits] = 0;
+ m_summaryTypeScore[Trk::numberOfCscPhiHits] = 0;
+ m_summaryTypeScore[Trk::numberOfCscEtaHits] = 0;
+ m_summaryTypeScore[Trk::numberOfRpcPhiHits] = 0;
+ m_summaryTypeScore[Trk::numberOfRpcEtaHits] = 0;
+
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+
+InDet::InDetNNScoringTool::~InDetNNScoringTool()
+{
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+
+StatusCode InDet::InDetNNScoringTool::initialize()
+{
+ StatusCode sc = AlgTool::initialize();
+ if (sc.isFailure()) return sc;
+
+ sc = m_trkSummaryTool.retrieve();
+ if (sc.isFailure()) {
+ msg(MSG::FATAL) << "Failed to retrieve tool " << m_trkSummaryTool << endmsg;
+ return StatusCode::FAILURE;
+ } else
+ msg(MSG::DEBUG) << "Retrieved tool " << m_trkSummaryTool << endmsg;
+
+ sc = m_extrapolator.retrieve();
+ if (sc.isFailure()) {
+ msg(MSG::FATAL) << "Failed to retrieve tool " << m_extrapolator << endmsg;
+ return StatusCode::FAILURE;
+ } else
+ msg(MSG::DEBUG) << "Retrieved tool " << m_extrapolator << endmsg;
+
+ // Get segment selector tool
+ //
+ if(m_selectortool.retrieve().isFailure()) {
+ msg(MSG::FATAL)<<"Failed to retrieve tool "<< m_selectortool <<endmsg;
+ return StatusCode::FAILURE;
+ } else {
+ msg(MSG::DEBUG) << "Retrieved tool " << m_selectortool << endmsg;
+ }
+
+ ATH_CHECK(m_beamSpotKey.initialize());
+
+ if (m_useAmbigFcn && m_useTRT_AmbigFcn) {
+ msg(MSG::FATAL) << "Both on, normal ambi funciton and the one for back tracking, configuration problem, not recoverable" << endmsg;
+ return StatusCode::FAILURE;
+ }
+
+ // Read handle for AtlasFieldCacheCondObj
+ ATH_CHECK( m_fieldCacheCondObjInputKey.initialize() );
+
+ if (m_useAmbigFcn || m_useTRT_AmbigFcn) setupScoreModifiers();
+
+ // lwtnn initialization
+ if (m_nnCutThreshold > 0.0) { // Load NN only if it will be used
+ // Locate configuration file
+ std::string nnCutConfigPath = PathResolverFindCalibFile(m_nnCutConfig); //returns "" if file not found
+ if (nnCutConfigPath.empty()){
+ ATH_MSG_FATAL ( "Failed to find configuration file: " << m_nnCutConfig);
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_DEBUG ("Loading configuration file:" << nnCutConfigPath);
+ // Load NN weights
+ std::ifstream inFile(nnCutConfigPath);
+ lwt::GraphConfig config(lwt::parse_json_graph(inFile));
+ m_graph = std::make_unique<lwt::LightweightGraph>(config);
+ ATH_MSG_DEBUG ("NN configuration loaded");
+ inFile.close();
+ }
+
+ ATH_CHECK( m_caloROIInfoKey.initialize(m_useEmClusSeed) );
+
+ return StatusCode::SUCCESS;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+
+StatusCode InDet::InDetNNScoringTool::finalize()
+{
+ StatusCode sc = AlgTool::finalize();
+ return sc;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+
+Trk::TrackScore InDet::InDetNNScoringTool::score( const Trk::Track& track, const bool suppressHoleSearch ) const
+{
+ std::unique_ptr<const Trk::TrackSummary> summary;
+ if ( suppressHoleSearch) {
+ ATH_MSG_DEBUG ("Get summary for new Track, suppress HoleSearch");
+ summary = m_trkSummaryTool->summaryNoHoleSearch(track);
+ } else {
+ ATH_MSG_DEBUG ("Get summary for new Track with HoleSearch");
+ summary = m_trkSummaryTool->summary(track);
+ }
+
+ ATH_MSG_VERBOSE ("Track has TrackSummary "<<*summary);
+ Trk::TrackScore score = Trk::TrackScore( simpleScore(track, *summary) );
+ ATH_MSG_DEBUG ("Track has Score: "<<score);
+
+ return score;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+
+Trk::TrackScore InDet::InDetNNScoringTool::simpleScore( const Trk::Track& track, const Trk::TrackSummary& trackSummary ) const
+{
+ int numPixel = trackSummary.get(Trk::numberOfPixelHits);
+ int numSCT = trackSummary.get(Trk::numberOfSCTHits);
+ int numTRT = trackSummary.get(Trk::numberOfTRTHits);
+ int numTRTTube = trackSummary.get(Trk::numberOfTRTTubeHits);
+ int numPixelHoles = trackSummary.get(Trk::numberOfPixelHoles);
+ int numSCTHoles = trackSummary.get(Trk::numberOfSCTHoles);
+ int numSCTDoubleHoles = trackSummary.get(Trk::numberOfSCTDoubleHoles);
+ int numPixelDead = trackSummary.get(Trk::numberOfPixelDeadSensors);
+ int numSCTDead = trackSummary.get(Trk::numberOfSCTDeadSensors);
+
+ if (numPixelDead<0) numPixelDead = 0;
+ if (numSCTDead<0) numSCTDead = 0;
+
+ // is this a track from the pattern or a fitted track ?
+ bool ispatterntrack = (track.info().trackFitter()==Trk::TrackInfo::Unknown);
+ //
+ // --- reject bad tracks
+ //
+ //
+ // --- the following cuts we only apply to fitted tracks
+ //
+ if (ispatterntrack) {
+ ATH_MSG_DEBUG ("==> this is a pattern track, no hit cuts !");
+ } else {
+ ATH_MSG_DEBUG ("==> this is a refitted track, so we can use the chi2 and other stuff ! ");
+
+ // NdF cut :
+ if (track.fitQuality()) {
+ ATH_MSG_DEBUG ("numberDoF = "<<track.fitQuality()->numberDoF());
+ }
+ // Number of double Holes
+ if (numSCTDoubleHoles>=0) {
+ if (numSCTDoubleHoles > m_maxDoubleHoles ) {
+ ATH_MSG_DEBUG ("Track has "<< numSCTDoubleHoles <<" double holes, reject it!");
+ return Trk::TrackScore(0);
+ }
+ }
+ // Number of Si (Pixel+SCT) Holes
+ if (numSCTHoles>=0 && numPixelHoles>=0) {
+ if (numPixelHoles+numSCTHoles > m_maxSiHoles ) {
+ ATH_MSG_DEBUG ("Track has "<< numPixelHoles <<" Pixel and " << numSCTHoles << " SCT holes, reject it!");
+ return Trk::TrackScore(0);
+ }
+ }
+ // Number of Pixel Holes
+ if ( numPixelHoles>=0 ) {
+ if (numPixelHoles > m_maxPixelHoles ) {
+ ATH_MSG_DEBUG ("Track has "<< numPixelHoles <<" Pixel holes, reject it!");
+ return Trk::TrackScore(0);
+ }
+ }
+ // Number of SCT Holes
+ if ( numSCTHoles>=0 ) {
+ if ( numSCTHoles > m_maxSctHoles ) {
+ ATH_MSG_DEBUG ("Track has "<< numSCTHoles << " SCT holes, reject it!");
+ return Trk::TrackScore(0);
+ }
+ }
+ // TRT cut
+ if (numTRT > 0 && numTRT < m_minTRTonTrk) {
+ ATH_MSG_DEBUG ("Track has " << numTRT << " TRT hits, reject it");
+ return Trk::TrackScore(0);
+ }
+ // TRT precision hits cut
+ if (numTRT >= 15 && ((double)(numTRT-numTRTTube))/numTRT < m_minTRTprecision) {
+ ATH_MSG_DEBUG ("Track has " << ((double)numTRTTube)/numTRT << " TRT tube hit fraction, reject it");
+ return Trk::TrackScore(0);
+ }
+ // Number of Si Clusters
+ if ( numSCT>=0 && numPixel>=0) {
+ if (numPixel+numSCT+numPixelDead+numSCTDead < m_minSiClusters) {
+ ATH_MSG_DEBUG ("Track has " << numPixel+numSCT << " Si clusters and " << numPixelDead+numSCTDead << " dead sensors, reject it");
+ return Trk::TrackScore(0);
+ }
+ }
+ // Number of pixel clusters
+ if (numPixel>=0 && numPixel < m_minPixel) {
+ ATH_MSG_DEBUG ("Track has " << numPixel << " pixel hits, reject it");
+ return Trk::TrackScore(0);
+ }
+ }
+ //
+ // --- kinematic selection (done as well on input ?)
+ //
+ // --- beam spot position
+ Amg::Vector3D beamSpotPosition(0,0,0);
+ SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
+ if (beamSpotHandle.isValid()) beamSpotPosition = beamSpotHandle->beamVtx().position();
+ // --- create surface
+ Trk::PerigeeSurface perigeeSurface(beamSpotPosition);
+
+ const Trk::TrackParameters* input = track.trackParameters()->front();
+
+ // cuts on parameters
+ EventContext ctx = Gaudi::Hive::currentContext();
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCacheCondObjInputKey, ctx};
+ const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
+ if (fieldCondObj == nullptr) {
+ ATH_MSG_ERROR("simpleScore: Failed to retrieve AtlasFieldCacheCondObj with key " << m_fieldCacheCondObjInputKey.key());
+ return Trk::TrackScore(0);
+ }
+ MagField::AtlasFieldCache fieldCache;
+ fieldCondObj->getInitializedCache (fieldCache);
+
+ if (fieldCache.solenoidOn()){
+ if (fabs(input->pT()) < m_minPt) {
+ ATH_MSG_DEBUG ("Track pt < "<<m_minPt<<", reject it");
+ return Trk::TrackScore(0);
+ }
+ }
+ if (fabs(input->eta()) > m_maxEta) {
+ ATH_MSG_DEBUG ("Track eta > "<<m_maxEta<<", reject it");
+ return Trk::TrackScore(0);
+ }
+
+ // uses perigee on track or extrapolates, no material in any case, we cut on impacts
+ // add back extrapolation without errors
+ {
+ std::unique_ptr<const Trk::TrackParameters> parm( m_extrapolator->extrapolateDirectly(*input, perigeeSurface) );
+
+ const Trk::Perigee*extrapolatedPerigee = dynamic_cast<const Trk::Perigee*> (parm.get());
+ if (!extrapolatedPerigee) {
+ ATH_MSG_WARNING( "Extrapolation of perigee failed, this should never happen" );
+ return Trk::TrackScore(0);
+ }
+
+ ATH_MSG_VERBOSE ("extrapolated perigee: "<<*extrapolatedPerigee);
+ if (fabs(extrapolatedPerigee->parameters()[Trk::z0]) > m_maxZImp) {
+ ATH_MSG_DEBUG ("Track Z impact > "<<m_maxZImp<<", reject it");
+ return Trk::TrackScore(0);
+ }
+
+ double maxD0 = m_maxRPhiImp;
+ if(m_useEmClusSeed) {
+ if (isEmCaloCompatible( track ) ) {
+ maxD0 = m_maxRPhiImpEM;
+ }
+ }
+ if (fabs(extrapolatedPerigee->parameters()[Trk::d0]) > maxD0) {
+ ATH_MSG_DEBUG ("Track Rphi impact > "<<m_maxRPhiImp<<", reject it");
+ return Trk::TrackScore(0);
+ }
+
+ if (m_useAmbigFcn) {
+ if (m_nnCutThreshold > 0.0) { // check if nn cut is enabled
+ if (track.fitQuality()) { // check if track has been fitted
+ if (calcNnScore(track, trackSummary, extrapolatedPerigee) < m_nnCutThreshold) {
+ ATH_MSG_DEBUG ("Rejecting track for falling below nn threshold");
+ return Trk::TrackScore(0); // scores of 0 are rejected by ambisolver
+ }
+ }
+ }
+ }
+ }
+
+ //
+ // --- now start scoring
+ //
+
+ if ( m_useAmbigFcn || m_useTRT_AmbigFcn) {
+
+ //
+ // --- use scoring function
+ //
+
+ return ambigScore(track,trackSummary);
+
+ } else {
+
+ //
+ // use classical score
+ //
+ // score of 100 per track
+ Trk::TrackScore score (100);
+ // --- summary score analysis
+ for (int i=0; i<Trk::numberOfTrackSummaryTypes; ++i) {
+ int value = trackSummary.get(static_cast<Trk::SummaryType>(i));
+ //value is -1 if undefined.
+ if (value>0) {
+ score+=m_summaryTypeScore[i]*value;
+ ATH_MSG_DEBUG ("\tType ["<<i<<"], value \t= "<<value<<"], score \t="<<score);
+ }
+ }
+ // --- prob(chi2,NDF), protect for chi2 <= 0
+ if (track.fitQuality()!=0 && track.fitQuality()->chiSquared()>0 && track.fitQuality()->numberDoF()>0 ) {
+ double p = 1.0-Genfun::CumulativeChiSquare(track.fitQuality()->numberDoF())(track.fitQuality()->chiSquared());
+ if ( p > 0 )
+ score += log10( p );
+ else
+ score -= 50;
+ }
+
+ return score;
+ }
+
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+
+Trk::TrackScore InDet::InDetNNScoringTool::ambigScore( const Trk::Track& track, const Trk::TrackSummary& trackSummary ) const
+{
+ //
+ // --- start with bonus for high pt tracks
+ //
+ // double prob = 1.;
+ double pt = fabs(track.trackParameters()->front()->pT());
+ double prob = log10( pt ) - 1.; // 100 MeV is min and gets score 1
+ ATH_MSG_DEBUG ("Modifier for pt = " << pt / 1000. << " GeV is: "<< prob);
+
+ //
+ // --- prob and cuts on holes
+ //
+ if (m_usePixel) {
+ // --- Pixel holes
+ int iPixHoles = trackSummary.get(Trk::numberOfPixelHoles);
+ if ( iPixHoles > -1 && m_maxPixHoles > 0) {
+ if (iPixHoles > m_maxPixHoles) {
+ prob /= (iPixHoles - m_maxPixHoles + 1); // holes are bad !
+ iPixHoles = m_maxPixHoles;
+ }
+ prob *= m_factorPixHoles[iPixHoles];
+ ATH_MSG_DEBUG ("Modifier for " << iPixHoles << " Pixel holes: "<<m_factorPixHoles[iPixHoles]
+ << " New score now: " << prob);
+ }
+ }
+
+ if (m_useSCT) {
+ // --- SCT holes
+ int iSCT_Holes = trackSummary.get(Trk::numberOfSCTHoles);
+ if (iSCT_Holes > -1 && m_maxSCT_Holes > 0) {
+ if (iSCT_Holes > m_maxSCT_Holes) {
+ prob /= (iSCT_Holes - m_maxSCT_Holes + 1); // holes are bad !
+ iSCT_Holes = m_maxSCT_Holes;
+ }
+ prob *= m_factorSCT_Holes[iSCT_Holes];
+ ATH_MSG_DEBUG ("Modifier for " << iSCT_Holes << " SCT holes: "<<m_factorSCT_Holes[iSCT_Holes]
+ << " New score now: " << prob);
+ }
+ // --- SCT double holes
+ int iDblHoles = trackSummary.get(Trk::numberOfSCTDoubleHoles);
+ if (iDblHoles > -1 && m_maxDblHoles > 0) {
+ if (iDblHoles > m_maxDblHoles) {
+ prob /= (iDblHoles - m_maxDblHoles + 1); // holes are bad !
+ iDblHoles = m_maxDblHoles;
+ }
+ prob *= m_factorDblHoles[iDblHoles];
+ ATH_MSG_DEBUG ("Modifier for " << iDblHoles << " double holes: "<<m_factorDblHoles[iDblHoles]
+ << " New score now: " << prob);
+ }
+ }
+ //
+ // --- prob for other counters
+ //
+ if (m_usePixel) {
+
+ // ME: this if statement needs to be removed...
+ // --- count layers only if holes are not searched for
+ // if (trackSummary.get(Trk::numberOfPixelHoles) == -1) {
+
+ // --- Pixel layers
+ int iPixLay = trackSummary.get(Trk::numberOfContribPixelLayers);
+ if (iPixLay > -1 && m_maxPixLay > 0) {
+ if (iPixLay > m_maxPixLay) {
+ prob *= (iPixLay - m_maxPixLay + 1); // layers are good !
+ iPixLay = m_maxPixLay;
+ }
+ prob *= m_factorPixLay[iPixLay];
+ ATH_MSG_DEBUG ("Modifier for " << iPixLay << " Pixel layers: "<<m_factorPixLay[iPixLay]
+ << " New score now: " << prob);
+ }
+
+ // --- Pixel hits
+ int pixelHits = trackSummary.get(Trk::numberOfPixelHits);
+ if (pixelHits > -1 && m_maxPixelHits > 0) {
+ if (pixelHits > m_maxPixelHits) {
+ prob *= (pixelHits - m_maxPixelHits + 1); // hits are good !
+ pixelHits = m_maxPixelHits;
+ }
+ prob *= m_factorPixelHits[pixelHits];
+ ATH_MSG_DEBUG ("Modifier for " << pixelHits << " Pixel hits: "<<m_factorPixelHits[pixelHits]
+ << " New score now: " << prob);
+ }
+ // --- Pixel blayer hits
+ int bLayerHits = trackSummary.get(Trk::numberOfInnermostPixelLayerHits);
+ if (bLayerHits > -1 && m_maxB_LayerHits > 0) {
+ if (bLayerHits > m_maxB_LayerHits) {
+ prob *= (bLayerHits - m_maxB_LayerHits + 1); // hits are good !
+ bLayerHits = m_maxB_LayerHits;
+ }
+ prob *= m_factorB_LayerHits[bLayerHits];
+ ATH_MSG_DEBUG ("Modifier for " << bLayerHits << " b-layer hits: "<<m_factorB_LayerHits[bLayerHits]
+ << " New score now: " << prob);
+ }
+ // --- Pixel Ganged fakes
+ int pixelGangedFakes = trackSummary.get(Trk::numberOfGangedFlaggedFakes);
+ if (pixelGangedFakes > -1 && m_maxGangedFakes > 0) {
+ if (pixelGangedFakes > m_maxGangedFakes) {
+ prob /= (pixelGangedFakes - m_maxGangedFakes + 1); // ganged are bad !
+ pixelGangedFakes = m_maxGangedFakes;
+ }
+ prob *= m_factorGangedFakes[pixelGangedFakes];
+ ATH_MSG_DEBUG ("Modifier for " << pixelGangedFakes << " ganged fakes hits: "<<m_factorGangedFakes[pixelGangedFakes]
+ << " New score now: " << prob);
+ }
+ }
+
+ int iHits = 0;
+ iHits += m_usePixel ? trackSummary.get(Trk::numberOfPixelHits) : 3; // if Pixel off, do not count as inefficient
+ iHits += m_useSCT ? trackSummary.get(Trk::numberOfSCTHits) : 8; // if SCT off, do not count as inefficient
+ if (iHits > -1 && m_maxHits > 0) {
+ if (iHits > m_maxHits) {
+ prob *= (iHits - m_maxHits + 1); // hits are good !
+ iHits = m_maxHits;
+ }
+ prob *= m_factorHits[iHits];
+ ATH_MSG_DEBUG ("Modifier for " << iHits << " Sihits: "<<m_factorHits[iHits]
+ << " New score now: " << prob);
+ }
+
+ //
+ // --- special treatment for TRT hits
+ //
+ int iTRT_Hits = trackSummary.get(Trk::numberOfTRTHits);
+ int iTRT_Outliers = trackSummary.get(Trk::numberOfTRTOutliers);
+ //
+ if ( iTRT_Hits > 0 && m_maxTrtRatio > 0) {
+ // get expected number of TRT hits
+ double nTrtExpected = 30.;
+ nTrtExpected = m_selectortool->minNumberDCs(track.trackParameters()->front());
+ ATH_MSG_DEBUG ("Expected number of TRT hits: " << nTrtExpected << " for eta: "
+ << fabs(track.trackParameters()->front()->eta()));
+ double ratio = (nTrtExpected != 0) ? iTRT_Hits / nTrtExpected : 0;
+ if (ratio > m_boundsTrtRatio[m_maxTrtRatio]) ratio = m_boundsTrtRatio[m_maxTrtRatio];
+ for (int i=0; i<m_maxTrtRatio; ++i) {
+ if ( m_boundsTrtRatio[i] < ratio && ratio <= m_boundsTrtRatio[i+1]) {
+ prob*= m_factorTrtRatio[i];
+ ATH_MSG_DEBUG ("Modifier for " << iTRT_Hits << " TRT hits (ratio " << ratio
+ << ") is : "<< m_factorTrtRatio[i] << " New score now: " << prob);
+ break;
+ }
+ }
+ }
+ //
+ if ( iTRT_Hits > 0 && iTRT_Outliers >= 0 && m_maxTrtFittedRatio > 0) {
+ double fitted = double(iTRT_Hits) / double(iTRT_Hits + iTRT_Outliers);
+ if (fitted > m_boundsTrtFittedRatio[m_maxTrtFittedRatio]) fitted = m_boundsTrtFittedRatio[m_maxTrtFittedRatio];
+ for (int i=0; i<m_maxTrtFittedRatio; ++i) {
+ if (fitted <= m_boundsTrtFittedRatio[i+1]) {
+ prob*= m_factorTrtFittedRatio[i];
+ ATH_MSG_DEBUG ("Modifier for TRT fitted ratio of " << fitted
+ << " is : "<< m_factorTrtFittedRatio[i] << " New score now: " << prob);
+ break;
+ }
+ }
+ }
+
+ // is this a track from the pattern or a fitted track ?
+ bool ispatterntrack = (track.info().trackFitter()==Trk::TrackInfo::Unknown);
+
+ //
+ // --- non binned Chi2
+ //
+ if (!ispatterntrack) {
+ if (track.fitQuality()!=0 && track.fitQuality()->chiSquared()>0 && track.fitQuality()->numberDoF()>0 ) {
+ int indf = track.fitQuality()->numberDoF();
+ double chi2 = track.fitQuality()->chiSquared();
+ double fac = 1. / log10 (10. + 10. * chi2 / indf); // very soft chi2
+ prob *= fac;
+ ATH_MSG_DEBUG ("Modifier for chi2 = " << chi2 << " and NDF = " << indf
+ << " is : "<< fac << " New score now: " << prob);
+
+ }
+ }
+ //
+ // --- fit quality prob
+ //
+ if ( !ispatterntrack && (m_useSigmaChi2) && track.fitQuality() ) {
+
+ int ndf = track.fitQuality()->numberDoF();
+ double chi2 = track.fitQuality()->chiSquared();
+ if (ndf > 0) {
+ //
+ // --- special variable for bad chi2 distribution
+ //
+ if (m_useSigmaChi2) {
+ int sigmaChi2times100 = trackSummary.get(Trk::standardDeviationOfChi2OS);
+ if (sigmaChi2times100 > 0) {
+ double testvar = double(sigmaChi2times100)/100. - sqrt(2.*chi2/ndf);
+ if (msgLvl(MSG::VERBOSE)) msg(MSG::VERBOSE) << "sigma chi2 = " << testvar << endmsg;
+ if ( testvar< m_boundsSigmaChi2[0] ) {
+ prob *= m_factorSigmaChi2[0];
+ ATH_MSG_DEBUG ("Modifier for " << testvar << " sigma chi2: "<< m_factorSigmaChi2[0]
+ << " New score now: " << prob);
+ } else if (m_boundsSigmaChi2[m_maxSigmaChi2] <= testvar) {
+ prob *= m_factorSigmaChi2[m_maxSigmaChi2-1];
+ ATH_MSG_DEBUG ("Modifier for " << testvar << " sigma chi2: "<< m_factorSigmaChi2[m_maxSigmaChi2-1]
+ << " New score now: " << prob);
+ } else {
+ for (int i = 0 ; i<m_maxSigmaChi2 ; ++i ) {
+ if ( m_boundsSigmaChi2[i]<=testvar && testvar<m_boundsSigmaChi2[i+1] ) {
+ prob *= m_factorSigmaChi2[i];
+ ATH_MSG_DEBUG ("Modifier for " << testvar << " sigma chi2: "<< m_factorSigmaChi2[i]
+ << " New score now: " << prob);
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return Trk::TrackScore(prob);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+
+void InDet::InDetNNScoringTool::setupScoreModifiers()
+{
+ //
+ // --- number of Pixel holes
+ //
+ // --- NewTracking and BackTracking
+ const int maxPixHoles = 2; // there is an explicit cut
+ const double goodPixHoles[maxPixHoles+1] = {1.0 , 0.04 , 0.004 };
+ const double fakePixHoles[maxPixHoles+1] = {1.0 , 0.30 , 0.200 };
+ // put it into the private members
+ m_maxPixHoles = maxPixHoles;
+ for (int i=0; i<=m_maxPixHoles; ++i) m_factorPixHoles.push_back(goodPixHoles[i]/fakePixHoles[i]);
+
+ //
+ // --- number of SCT holes
+ //
+ if (!m_useTRT_AmbigFcn) {
+ // --- NewTracking
+ const int maxSCT_Holes = 5; // moved from 3 -> 5 , there is an explicit cut anyway
+ const double goodSCT_Holes[maxSCT_Holes+1] = { 1.0 , 0.06 , 0.010 , 0.0007, 0.0005, 0.0003 };
+ const double fakeSCT_Holes[maxSCT_Holes+1] = { 1.0 , 0.15 , 0.100 , 0.0100, 0.0100, 0.0100 };
+ // put it into the private members
+ m_maxSCT_Holes = maxSCT_Holes;
+ for (int i=0; i<=m_maxSCT_Holes; ++i) m_factorSCT_Holes.push_back(goodSCT_Holes[i]/fakeSCT_Holes[i]);
+ } else {
+ // --- BackTracking
+ const int maxSCT_Holes = 6;
+ const double goodSCT_Holes[maxSCT_Holes+1] = {0.910, 0.074, 0.014, 0.001, 0.001, 0.00001, 0.00001};
+ const double fakeSCT_Holes[maxSCT_Holes+1] = {0.910, 0.192, 0.229, 0.061, 0.065, 0.016 , 0.025};
+ // put it into the private members
+ m_maxSCT_Holes = maxSCT_Holes;
+ for (int i=0; i<=m_maxSCT_Holes; ++i) m_factorSCT_Holes.push_back(goodSCT_Holes[i]/fakeSCT_Holes[i]);
+ }
+
+ //
+ // --- number of SCT double holes
+ //
+ // --- NewTracking and BackTracking
+ const int maxDblHoles = 3; // there is a cut on this anyway !
+ const double goodDblHoles[maxDblHoles+1] = { 1. , 0.03 , 0.007 , 0.0003 };
+ const double fakeDblHoles[maxDblHoles+1] = { 1. , 0.09 , 0.09 , 0.008 };
+ // put it into the private members
+ m_maxDblHoles = maxDblHoles;
+ for (int i=0; i<=m_maxDblHoles; ++i) m_factorDblHoles.push_back(goodDblHoles[i]/fakeDblHoles[i]);
+
+ //
+ // --- number of Blayer hits
+ //
+ if (!m_useTRT_AmbigFcn) {
+ // --- NewTracking
+ const int maxB_LayerHits = 3;
+ const double goodB_LayerHits[maxB_LayerHits+1] = {0.203, 0.732, 0.081, 0.010};
+ const double fakeB_LayerHits[maxB_LayerHits+1] = {0.808, 0.174, 0.018, 0.002};
+ // put it into the private members
+ m_maxB_LayerHits = maxB_LayerHits;
+ for (int i=0; i<=m_maxB_LayerHits; ++i) m_factorB_LayerHits.push_back(goodB_LayerHits[i]/fakeB_LayerHits[i]);
+ } else {
+ // --- BackTracking
+ const int maxB_LayerHits = 3;
+ const double goodB_LayerHits[maxB_LayerHits+1] = {0.605, 0.349, 0.044, 0.010};
+ const double fakeB_LayerHits[maxB_LayerHits+1] = {0.865, 0.124, 0.011, 0.002};
+ // put it into the private members
+ m_maxB_LayerHits = maxB_LayerHits;
+ for (int i=0; i<=m_maxB_LayerHits; ++i) m_factorB_LayerHits.push_back(goodB_LayerHits[i]/fakeB_LayerHits[i]);
+ }
+
+ //
+ // --- number of Pixel hits without Blayer
+ //
+ if (!m_useTRT_AmbigFcn) {
+ // --- NewTracking
+ const int maxPixelHits = 8; // we see up to 8 with IBL (was 6)
+ const double goodPixelHits[maxPixelHits+1] = {0.095, 0.031, 0.118, 0.615, 0.137, 0.011, 0.01 , 0.011, 0.012};
+ const double fakePixelHits[maxPixelHits+1] = {0.658, 0.100, 0.091, 0.124, 0.026, 0.002, 0.001 , 0.001, 0.001};
+ m_maxPixelHits = maxPixelHits;
+ for (int i=0; i<=m_maxPixelHits; ++i) m_factorPixelHits.push_back(goodPixelHits[i]/fakePixelHits[i]);
+ } else {
+ // --- BackTracking
+ const int maxPixelHits = 8; // we see up to 8 with IBL (was 6)
+ const double goodPixelHits[maxPixelHits+1] = {0.401, 0.079, 0.140, 0.291, 0.011, 0.078, 0.01 , 0.011, 0.012};
+ const double fakePixelHits[maxPixelHits+1] = {0.673, 0.138, 0.113, 0.057, 0.002, 0.011, 0.001 , 0.001, 0.001};
+ m_maxPixelHits = maxPixelHits;
+ for (int i=0; i<=m_maxPixelHits; ++i) m_factorPixelHits.push_back(goodPixelHits[i]/fakePixelHits[i]);
+ }
+
+ //
+ // --- number of Pixel layers
+ //
+ if (!m_useTRT_AmbigFcn) {
+ // --- NewTracking
+ const int maxPixLay = 7; // 3 barrel, 3 endcap, IBL, in practice one should see maybe 5 (was 3)
+ const double goodPixLay[maxPixLay+1] = {0.095, 0.033, 0.131, 0.740, 0.840, 0.940, 1.040,1.140};
+ const double fakePixLay[maxPixLay+1] = {0.658, 0.106, 0.092, 0.144, 0.144, 0.144, 0.144,0.144};
+ // put it into the private members
+ m_maxPixLay = maxPixLay;
+ for (int i=0; i<=m_maxPixLay; ++i) m_factorPixLay.push_back(goodPixLay[i]/fakePixLay[i]);
+ } else {
+ // --- BackTracking
+ const int maxPixLay = 7; // 3 barrel, 3 endcap, IBL, in practice one should see maybe 5 (was 5)
+ const double goodPixLay[maxPixLay+1] = {0.401, 0.088, 0.152, 0.355, 0.405, 0.455, 0.505, 0.555};
+ const double fakePixLay[maxPixLay+1] = {0.673, 0.146, 0.115, 0.065, 0.065, 0.065, 0.065, 0.065};
+ // put it into the private members
+ m_maxPixLay = maxPixLay;
+ for (int i=0; i<=m_maxPixLay; ++i) m_factorPixLay.push_back(goodPixLay[i]/fakePixLay[i]);
+ }
+
+ //
+ // --- number of Pixel Ganged Fakes
+ //
+ // --- NewTracking and BackTracking
+ const int maxGangedFakes = 2; // there is an explicit cut
+ const double goodGangedFakes[maxGangedFakes+1] = {0.62 , 0.23 , 0.15 };
+ const double fakeGangedFakes[maxGangedFakes+1] = {0.12 , 0.41 , 0.47 };
+ // put it into the private members
+ m_maxGangedFakes = maxGangedFakes;
+ for (int i=0; i<=m_maxGangedFakes; ++i) m_factorGangedFakes.push_back(goodGangedFakes[i]/fakeGangedFakes[i]);
+
+ //
+ // --- total number of SCT+Pixel hits
+ //
+ // --- NewTracking and BackTracking
+ const int maxHits = 19; // there is a min cut on this anyway !
+ const double goodSiHits[maxHits+1] = { 0.001 , 0.002 , 0.003 , 0.004 , 0.01 , 0.01 , 0.01 ,
+ 0.015 , 0.02 , 0.06 , 0.1 , 0.3 , 0.2 , 0.50 , 0.055,
+ 0.03 , 0.015 , 0.010 , 0.002 , 0.0005 };
+ const double fakeSiHits[maxHits+1] = { 1.0 , 1.0 , 1.0 , 1.0 , 0.5 , 0.25 , 0.15 ,
+ 0.20 , 0.1 , 0.2 , 0.08 , 0.07 , 0.035 , 0.08 , 0.008,
+ 0.004 , 0.0015 , 0.0008 , 0.0001 , 0.00001 };
+ // put it into the private members
+ m_maxHits = maxHits;
+ for (int i=0; i<=m_maxHits; ++i) m_factorHits.push_back(goodSiHits[i]/fakeSiHits[i]);
+
+ //
+ // --- ratio of TRT hits over expected
+ //
+ // --- NewTracking and BackTracking
+ const int maxTrtRatio = 7 ;
+ const double TrtRatioBounds[maxTrtRatio+1] = { 0, 0.2, 0.4, 0.6, 0.8, 1.0, 1.2, 2.4};
+ // this needs tuning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ const double goodTrtRatio[maxTrtRatio] = { 0.05, 0.11, 0.12, 0.15, 0.20, 0.16, 0.17};
+ const double fakeTrtRatio[maxTrtRatio] = { 0.6 , 0.08, 0.06, 0.05, 0.04, 0.03, 0.03};
+ // put it into the private members
+ m_maxTrtRatio = maxTrtRatio;
+ for (int i=0; i<m_maxTrtRatio; ++i) m_factorTrtRatio.push_back(goodTrtRatio[i]/fakeTrtRatio[i]);
+ for (int i=0; i<=m_maxTrtRatio; ++i) m_boundsTrtRatio.push_back(TrtRatioBounds[i]);
+
+ //
+ // --- ratio of TRT fitted to (fitted+outliers)
+ //
+ // --- NewTracking and BackTracking
+ const int maxTrtFittedRatio = 4;
+ const double TrtFittedRatioBounds[maxTrtFittedRatio+1] = { 0, 0.3, 0.6, 0.9, 1.0};
+ // this needs tuning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ const double goodTrtFittedRatio[maxTrtFittedRatio] = { 0.1, 0.2, 0.3, 0.5};
+ const double fakeTrtFittedRatio[maxTrtFittedRatio] = { 0.6, 0.1, 0.1, 0.1};
+ // put it into the private members
+ m_maxTrtFittedRatio = maxTrtFittedRatio;
+ for (int i=0; i<m_maxTrtFittedRatio; ++i) m_factorTrtFittedRatio.push_back(goodTrtFittedRatio[i]/fakeTrtFittedRatio[i]);
+ for (int i=0; i<=m_maxTrtFittedRatio; ++i) m_boundsTrtFittedRatio.push_back(TrtFittedRatioBounds[i]);
+
+
+ //
+ // --- sigma chi2
+ //
+ if (!m_useSigmaChi2) {
+ m_maxSigmaChi2 = -1 ;
+ } else {
+ // --- NewTracking and BackTracking
+ const int maxSigmaChi2 = 13 ;
+ const double SigmaChi2Bounds[maxSigmaChi2+1] = { -5.,-4.,-3.,-2.,-1.,0.,1.,2.,3.,4.,5.,6.,7.,8.};
+ const double goodSigmaChi2[maxSigmaChi2] = {0.00004, 0.0004, 0.002, 0.15, 0.8, 0.015, 0.01 , 0.009, 0.008, 0.0007 , 0.0006 , 0.0005, 0.00004};
+ const double fakeSigmaChi2[maxSigmaChi2] = {0.0008 , 0.005 , 0.02 , 0.2 , 0.3, 0.1 , 0.1 , 0.1 , 0.1 , 0.01 , 0.01 , 0.01 , 0.001};
+ // put it into the private members
+ m_maxSigmaChi2 = maxSigmaChi2;
+ for (int i=0; i<m_maxSigmaChi2; ++i) m_factorSigmaChi2.push_back(goodSigmaChi2[i]/fakeSigmaChi2[i]);
+ for (int i=0; i<=m_maxSigmaChi2; ++i) m_boundsSigmaChi2.push_back(SigmaChi2Bounds[i]);
+ }
+
+ //
+ // --- debug output
+ //
+ if (msgLvl(MSG::VERBOSE)) {
+
+ for (int i=0; i<=m_maxPixHoles; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << i << " Pixel holes: " << m_factorPixHoles[i] <<endmsg;
+
+ for (int i=0; i<=m_maxSCT_Holes; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << i << " SCT holes: " << m_factorSCT_Holes[i] <<endmsg;
+
+ for (int i=0; i<=m_maxDblHoles; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << i << " double SCT holes: " << m_factorDblHoles[i] <<endmsg;
+
+ for (int i=0; i<=m_maxPixLay; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << i << " Pixel layers: " << m_factorPixLay[i] <<endmsg;
+
+ for (int i=0; i<=m_maxB_LayerHits; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << i << " b-layer hits: " << m_factorB_LayerHits[i] <<endmsg;
+
+ for (int i=0; i<=m_maxPixelHits; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << i << " Pixel hits: " << m_factorPixelHits[i] <<endmsg;
+
+ for (int i=0; i<=m_maxGangedFakes; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << i << " ganged fakes: " << m_factorGangedFakes[i] <<endmsg;
+
+ for (int i=0; i<=m_maxHits; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << i << " Si hits: " << m_factorHits[i] <<endmsg;
+
+ for (int i=0; i<m_maxTrtRatio; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << m_boundsTrtRatio[i] << " < TRT ratio < "
+ << m_boundsTrtRatio[i+1] <<" : " <<m_factorTrtRatio[i] <<endmsg;
+
+ for (int i=0; i<m_maxTrtFittedRatio; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << m_boundsTrtFittedRatio[i] << " < TRT fitted ratio < "
+ << m_boundsTrtFittedRatio[i+1] <<" : " <<m_factorTrtFittedRatio[i] <<endmsg;
+
+
+ // only if used
+ for (int i=0; i<m_maxSigmaChi2; ++i)
+ msg(MSG::VERBOSE) << "Modifier for " << m_boundsSigmaChi2[i] << " < sigma(chi2) - sqrt(2chi2) < " << m_boundsSigmaChi2[i+1]
+ <<" : " <<m_factorSigmaChi2[i] <<endmsg;
+ }
+
+}
+
+bool InDet::InDetNNScoringTool::isEmCaloCompatible(const Trk::Track& track) const
+{
+ const Trk::TrackParameters * Tp = track.trackParameters()->front();
+
+ //Switch to the track parameters of the first measurment instead of the perigee parameters
+ ATH_MSG_VERBOSE ("--> Looping over TSOS's");
+ for (auto tsos : *track.trackStateOnSurfaces() ) {
+ // get measurment from TSOS
+ auto meas = tsos->measurementOnTrack();
+ auto tp = tsos->trackParameters();
+ // if we do not have a measurement, we should just mark it
+ if (!meas || !tp) {
+ continue;
+ } else {
+ Tp = tp;
+ break;
+ }
+ }
+
+ const double pi = M_PI, pi2 = 2.*M_PI;
+
+ double F = Tp->momentum().phi();
+ double E = Tp->momentum().eta();
+ double R = Tp->position().perp();
+ double Z = Tp->position().z();
+
+ SG::ReadHandle<InDet::ROIInfoVec> calo(m_caloROIInfoKey);
+ for( const InDet::ROIInfo &ccROI : *calo) {
+
+ double df = fabs(F-ccROI.emF);
+ if(df > pi ) df = fabs(pi2-df);
+ if(df < m_phiWidthEm) {
+ //Correct eta of cluster to take into account the z postion of the track
+ double newZ = ccROI.emZ - Z;
+ double newR = ccROI.emR - R;
+ double newEta = atanh( newZ / sqrt( newR*newR + newZ*newZ ) );
+ double de = fabs(E-newEta);
+
+ if(de < m_etaWidthEm) return true;
+ }
+ }
+ return false;
+}
+
+Trk::TrackScore InDet::InDetNNScoringTool::calcNnScore(const Trk::Track &track, const Trk::TrackSummary &trackSummary, const Trk::Perigee *extrapolatedPerigee) const
+{
+ ATH_MSG_DEBUG("Using NN Score Function");
+ // initialize with dummy score
+ double DNNscore(-1.0);
+
+ // This calculates a variant of the delta-eta variable used in large-d0 seeding
+ double d0 = extrapolatedPerigee->parameters()[Trk::d0];
+ double z0 = extrapolatedPerigee->parameters()[Trk::z0];
+ double deltaEta = std::abs(std::atan2(fabs(d0), z0) - 2 * std::atan(std::exp(-track.trackParameters()->front()->eta())));
+
+ // Build dictionary of inputs for lwtnn to use
+ // It is ok to fill this with more variables than the model uses
+ // as long as no variables are missing
+ std::map<std::string, double> trackInputs{
+ {"pT", track.trackParameters()->front()->pT()},
+ {"eta", track.trackParameters()->front()->eta()},
+ {"numberOfSCTHoles", (double) trackSummary.get(Trk::numberOfSCTHoles)},
+ {"numberOfSCTHits", (double) trackSummary.get(Trk::numberOfSCTHits)},
+ {"numberDoF", (double) track.fitQuality()->numberDoF()},
+ {"Sihits", (double) (trackSummary.get(Trk::numberOfPixelHits) + trackSummary.get(Trk::numberOfSCTHits))},
+ {"d0", d0},
+ {"z0", z0},
+ {"deltaEta", deltaEta}
+ };
+
+ // Set up the nodes used for inputs
+ std::map<std::string, std::map<std::string, double> > inputs{
+ {"trackInputs", trackInputs}
+ };
+
+ // Evaluate the network
+ lwt::ValueMap output = m_graph->compute(inputs);
+
+ // Obtain the discriminant associated with the single output node
+ DNNscore = output["nnScore"];
+ // Return the discriminant as the score
+ ATH_MSG_DEBUG("DNNscore: " << DNNscore);
+ if (DNNscore < m_nnCutThreshold)
+ ATH_MSG_DEBUG("DNNscore is below threshold of " << m_nnCutThreshold << ", rejecting track. ");
+ if (DNNscore < 0)
+ ATH_MSG_ERROR("DNNscore should be 0 or greater.");
+ return Trk::TrackScore(DNNscore);
+}
+
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
index 955e13e7ff36227651882df26f486a12b0d348a4..42d50f576f6b184dd8f89369efecc8e874eb87b1 100644
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/components/InDetTrackScoringTools_entries.cxx
@@ -1,9 +1,11 @@
#include "InDetTrackScoringTools/InDetAmbiScoringTool.h"
+#include "InDetTrackScoringTools/InDetNNScoringTool.h"
#include "InDetTrackScoringTools/InDetCosmicScoringTool.h"
#include "InDetTrackScoringTools/InDetTrtTrackScoringTool.h"
#include "../ROIInfoVecAlg.h"
DECLARE_COMPONENT( InDet::InDetAmbiScoringTool )
+DECLARE_COMPONENT( InDet::InDetNNScoringTool )
DECLARE_COMPONENT( InDet::InDetCosmicScoringTool )
DECLARE_COMPONENT( InDet::InDetTrtTrackScoringTool )
DECLARE_COMPONENT( ROIInfoVecAlg )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt
index b377202b33f3260ebc5c7a8f2e2878099767fc04..2fb0bc94a89b068a8495cd4d1b73e4b3cc90e2f5 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/CMakeLists.txt
@@ -1,20 +1,17 @@
-################################################################################
-# Package: LArGeoAlgsNV
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoAlgsNV )
# External dependencies:
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( LArGeoAlgsNV
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} ${EIGEN_LIBRARIES} GeoModelUtilities LArReadoutGeometry SGTools StoreGateLib SGtests DetDescrConditions GaudiKernel LArGeoBarrel LArGeoCode LArGeoEndcap LArGeoRAL LArGeoTBBarrel LArHV RDBAccessSvcLib )
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GeoModelUtilities LArReadoutGeometry SGTools StoreGateLib SGtests DetDescrConditions GaudiKernel LArGeoBarrel LArGeoCode LArGeoEndcap LArGeoRAL LArGeoTBBarrel LArHV RDBAccessSvcLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt
index 605a22567505769caa9c7712d842a245c302c0d5..428c469718b123ce4f218facf4dc9399b46d3871 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoBarrel/CMakeLists.txt
@@ -1,19 +1,16 @@
-################################################################################
-# Package: LArGeoBarrel
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoBarrel )
# External dependencies:
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( LArGeoBarrel
src/*.cxx
PUBLIC_HEADERS LArGeoBarrel
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} LArGeoCode StoreGateLib SGtests
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} LArGeoCode StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES GeoModelUtilities GaudiKernel LArReadoutGeometry RDBAccessSvcLib )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
index 9c90099e7495b30fa22cd96754cf7ad5947e1bf6..2d15b97aa584c913811fb9f6fa0e5cc3c978b217 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoCode/CMakeLists.txt
@@ -1,6 +1,4 @@
-################################################################################
-# Package: LArGeoCode
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoCode )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoEndcap/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoEndcap/CMakeLists.txt
index bd34b62ceef547769063c91133965ced5646f7ae..990847ecdbbe6e28d5690f955e56e401507fff8d 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoEndcap/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoEndcap/CMakeLists.txt
@@ -1,19 +1,16 @@
-################################################################################
-# Package: LArGeoEndcap
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoEndcap )
# External dependencies:
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( LArGeoEndcap
src/*.cxx
PUBLIC_HEADERS LArGeoEndcap
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} LArGeoFcal LArGeoHec StoreGateLib SGtests CaloDetDescrLib
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} LArGeoFcal LArGeoHec StoreGateLib SGtests CaloDetDescrLib
PRIVATE_LINK_LIBRARIES CaloIdentifier GeoModelUtilities GeoSpecialShapes GaudiKernel LArGeoCode LArGeoMiniFcal RDBAccessSvcLib )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoFcal/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoFcal/CMakeLists.txt
index c201654de36acc019add99b9e3133e535d1d564c..65c2869089569a99107a4f2693ec0d0b469f6602 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoFcal/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoFcal/CMakeLists.txt
@@ -1,12 +1,9 @@
-################################################################################
-# Package: LArGeoFcal
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoFcal )
# External dependencies:
-find_package( Eigen )
find_package( GeoModelCore )
# tag NEEDS_CORAL_BASE was not recognized in automatic conversion in cmt2cmake
@@ -16,7 +13,6 @@ atlas_add_library( LArGeoFcal
src/*.cxx
PUBLIC_HEADERS LArGeoFcal
INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoModelUtilities GaudiKernel LArReadoutGeometry RDBAccessSvcLib )
+ PRIVATE_LINK_LIBRARIES GeoModelUtilities GaudiKernel LArReadoutGeometry RDBAccessSvcLib )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/CMakeLists.txt
index b03d70eb2a8142ceb13f66b896adbe1f384f5553..9d95a52b2f34574008d9ce79146136e84993332b 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/CMakeLists.txt
@@ -1,33 +1,14 @@
-################################################################################
-# Package: LArGeoH62002Algs
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoH62002Algs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoModel/GeoModelUtilities
- LArCalorimeter/LArGeoModel/LArReadoutGeometry
- PRIVATE
- Control/StoreGate
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel
- LArCalorimeter/LArG4/LArG4RunControl
- LArCalorimeter/LArGeoModel/LArGeoCode
- LArCalorimeter/LArGeoModel/LArGeoEndcap
- LArCalorimeter/LArGeoModel/LArGeoH6Cryostats )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( LArGeoH62002Algs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities LArReadoutGeometry StoreGateLib SGtests GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoH6Cryostats RDBAccessSvcLib )
+ PRIVATE_INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ PRIVATE_LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GeoModelUtilities LArReadoutGeometry StoreGateLib SGtests GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoH6Cryostats RDBAccessSvcLib )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/CMakeLists.txt
index 2b6c64ca13cbe3b8bbf359028ad4182e92a95ce8..d8185218197e6d032fcb208bb29938cc9a1fc5bb 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/CMakeLists.txt
@@ -1,32 +1,14 @@
-################################################################################
-# Package: LArGeoH62003Algs
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoH62003Algs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoModel/GeoModelUtilities
- LArCalorimeter/LArGeoModel/LArReadoutGeometry
- PRIVATE
- Control/StoreGate
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel
- LArCalorimeter/LArG4/LArG4RunControl
- LArCalorimeter/LArGeoModel/LArGeoFcal
- LArCalorimeter/LArGeoModel/LArGeoH6Cryostats )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( LArGeoH62003Algs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} GeoModelUtilities LArReadoutGeometry StoreGateLib SGtests GaudiKernel LArG4RunControl LArGeoFcal LArGeoH6Cryostats RDBAccessSvcLib )
+ PRIVATE_INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ PRIVATE_LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GeoModelUtilities LArReadoutGeometry StoreGateLib SGtests GaudiKernel LArG4RunControl LArGeoFcal LArGeoH6Cryostats RDBAccessSvcLib )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt
index 2455af7cbcf276c49f5a94ef2777321049143a54..bef244ad12b4a48ba7e2f51a13f6bbd8655d9911 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/CMakeLists.txt
@@ -1,39 +1,17 @@
-################################################################################
-# Package: LArGeoH62004Algs
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoH62004Algs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/StoreGate
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- LArCalorimeter/LArGeoModel/LArReadoutGeometry
- PRIVATE
- Calorimeter/CaloDetDescr
- Control/AthContainers
- Database/RDBAccessSvc
- GaudiKernel
- LArCalorimeter/LArG4/LArG4RunControl
- LArCalorimeter/LArGeoModel/LArGeoCode
- LArCalorimeter/LArGeoModel/LArGeoEndcap
- LArCalorimeter/LArGeoModel/LArGeoH6Cryostats
- LArCalorimeter/LArGeoModel/LArGeoTBEC )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_component( LArGeoH62004Algs
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests GeoModelUtilities LArReadoutGeometry CaloDetDescrLib AthContainers GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoH6Cryostats LArGeoTBECLib RDBAccessSvcLib )
+ PRIVATE_INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ PRIVATE_LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests GeoModelUtilities LArReadoutGeometry CaloDetDescrLib AthContainers GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoH6Cryostats LArGeoTBECLib RDBAccessSvcLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt
index 7c2b9517bb811920cc4d08db3bf46969e0c4fecf..2003ba0a87a49c99432038fe7bf5cba96089f1ab 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoH6Cryostats/CMakeLists.txt
@@ -1,20 +1,9 @@
-################################################################################
-# Package: LArGeoH6Cryostats
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoH6Cryostats )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/StoreGate
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
find_package( Eigen )
find_package( GeoModelCore )
@@ -22,7 +11,7 @@ find_package( GeoModelCore )
atlas_add_library( LArGeoH6Cryostats
src/*.cxx
PUBLIC_HEADERS LArGeoH6Cryostats
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} GaudiKernel GeoModelInterfaces RDBAccessSvcLib )
+ PRIVATE_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests
+ PRIVATE_LINK_LIBRARIES GaudiKernel GeoModelInterfaces RDBAccessSvcLib )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt
index 998da7a407b6c7c2d6af913d5af6f685b30f0456..a00736eb75618b3d7ce2f9c3b8ee0093dd884359 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoHec/CMakeLists.txt
@@ -1,19 +1,16 @@
-################################################################################
-# Package: LArGeoHec
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoHec )
# External dependencies:
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( LArGeoHec
src/*.cxx
PUBLIC_HEADERS LArGeoHec
- PRIVATE_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
LINK_LIBRARIES StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel RDBAccessSvcLib )
+ PRIVATE_LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoModelUtilities GaudiKernel RDBAccessSvcLib )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoRAL/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoRAL/CMakeLists.txt
index d0be64f66917a982fa67b4bc352a07c82f9ad17e..c31ec831a811dd3265767fa3cd43ad81bb5dd30d 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoRAL/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoRAL/CMakeLists.txt
@@ -1,30 +1,18 @@
-################################################################################
-# Package: LArGeoRAL
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoRAL )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- LArCalorimeter/LArGeoModel/LArGeoCode
- PRIVATE
- Control/StoreGate
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- GaudiKernel )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost COMPONENTS system )
find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
# Component(s) in the package:
atlas_add_library( LArGeoRAL
src/*.cxx
PUBLIC_HEADERS LArGeoRAL
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES LArGeoCode StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel RDBAccessSvcLib GeoModelInterfaces )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel RDBAccessSvcLib GeoModelInterfaces )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/CMakeLists.txt
index ba856353119d54e428eafcb728f69825e9d61974..28833dfb5ff13cfb5370dea49d2f3d3ffeda3972 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBBarrel/CMakeLists.txt
@@ -1,27 +1,16 @@
-################################################################################
-# Package: LArGeoTBBarrel
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoTBBarrel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/StoreGate
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- GaudiKernel
- LArCalorimeter/LArGeoModel/LArGeoBarrel )
-
# External dependencies:
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( LArGeoTBBarrel
src/*.cxx
PUBLIC_HEADERS LArGeoTBBarrel
- PRIVATE_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoModelUtilities GaudiKernel LArGeoBarrel )
+ PRIVATE_LINK_LIBRARIES GeoModelUtilities GaudiKernel LArGeoBarrel )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
index a9b59c86669fa5e8430d919d951387a73e982e58..f581a4b4f94d8c92bbc72f6594d3c4c8312ada0c 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/CMakeLists.txt
@@ -1,41 +1,20 @@
-################################################################################
-# Package: LArGeoTBEC
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArGeoTBEC )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoModel/GeoModelUtilities
- LArCalorimeter/LArGeoModel/LArReadoutGeometry
- PRIVATE
- Control/StoreGate
- Database/RDBAccessSvc
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoSpecialShapes
- GaudiKernel
- LArCalorimeter/LArG4/LArG4RunControl
- LArCalorimeter/LArGeoModel/LArGeoCode
- LArCalorimeter/LArGeoModel/LArGeoEndcap
- LArCalorimeter/LArGeoModel/LArGeoRAL )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( LArGeoTBECLib
src/*.cxx
PUBLIC_HEADERS LArGeoTBEC
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GeoModelUtilities LArReadoutGeometry StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} GeoSpecialShapes GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoRAL RDBAccessSvcLib )
+ PRIVATE_LINK_LIBRARIES GeoSpecialShapes GaudiKernel LArG4RunControl LArGeoCode LArGeoEndcap LArGeoRAL RDBAccessSvcLib )
atlas_add_component( LArGeoTBEC
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES LArGeoTBECLib )
diff --git a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/CMakeLists.txt b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/CMakeLists.txt
index 65e1a56fc48f225ae3c3bcedc114cc584e0db74b..cf7e9856a6fc2db628bd78c85d2699da2bf2a9bf 100644
--- a/LArCalorimeter/LArGeoModel/LArReadoutGeometry/CMakeLists.txt
+++ b/LArCalorimeter/LArGeoModel/LArReadoutGeometry/CMakeLists.txt
@@ -1,23 +1,19 @@
-################################################################################
-# Package: LArReadoutGeometry
-################################################################################
+#Copyright (C) 2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( LArReadoutGeometry )
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost COMPONENTS system )
find_package( CLHEP )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( LArReadoutGeometry
src/*.cxx
PUBLIC_HEADERS LArReadoutGeometry
- INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoPrimitives Identifier LArHV StoreGateLib SGtests
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} AthenaKernel GeoPrimitives Identifier LArHV StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} GeoModelUtilities GaudiKernel RDBAccessSvcLib GeoModelInterfaces )
diff --git a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/CMakeLists.txt b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/CMakeLists.txt
index ef994e65d8c8b66c151da619cbff27cb962a4c1b..13801223f245c328655867097fb9d4593293bdaa 100644
--- a/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorTool/CMakeLists.txt
@@ -5,24 +5,6 @@
# Declare the package name:
atlas_subdir( MuonAlignErrorTool )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- DetectorDescription/GeoPrimitives
- GaudiKernel
- MuonSpectrometer/MuonAlignment/MuonAlignError/MuonAlignErrorBase
- MuonSpectrometer/MuonCalib/MuonCalibITools
- MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg
- MuonSpectrometer/MuonIdHelpers
- Tracking/TrkTools/TrkToolInterfaces
- PRIVATE
- Control/StoreGate
- Tools/PathResolver
- Tracking/TrkEvent/TrkCompetingRIOsOnTrack
- Tracking/TrkEvent/TrkPrepRawData
- Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkTrack )
-
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( Eigen )
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibITools/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibITools/CMakeLists.txt
index 1b87c4498374a9a1bbb08384e3a26d993efee140..23cd9207844d1dc748b2c4db23482411eeac99d6 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibITools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibITools/CMakeLists.txt
@@ -5,13 +5,6 @@
# Declare the package name:
atlas_subdir( MuonCalibITools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/Identifier
- GaudiKernel
- MuonSpectrometer/MuonCalib/MuonCalibEventBase
- MuonSpectrometer/MuonCalib/MuonCalibIdentifier )
-
# Component(s) in the package:
atlas_add_library( MuonCalibITools
PUBLIC_HEADERS MuonCalibITools
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MdtCalibDbAlg.h b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MdtCalibDbAlg.h
index 7e7f2c036ca05c51d2c33141cd97ecccd2baeba4..9b35d0a3c25a5b211c4507e313cf100014b53cc1 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MdtCalibDbAlg.h
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/MdtCalibDbAlg.h
@@ -10,16 +10,13 @@
#define MDTCALIBDBCOOLSTRTOOL_MDTCALIBDBALG_H
#include "AthenaBaseComps/AthAlgorithm.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/WriteCondHandleKey.h"
#include "GaudiKernel/ICondSvc.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-
-//from MdtCalibDbCoolStrTool.h
-//removing obsolete ones
-
#include "AthenaBaseComps/AthAlgTool.h"
#include "MdtCalibInterfaces/IMdtCalibDBTool.h"
#include "MdtCalibData/MdtTubeCalibContainerCollection.h"
@@ -29,27 +26,20 @@
#include "CLHEP/Random/RandomEngine.h"
#include "AthenaKernel/IAthRNGSvc.h"
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
-
-//c - c++
-#include "zlib.h"
-#include "vector"
-
#include "MdtCalibSvc/MdtCalibrationRegionSvc.h"
+#include "MuonReadoutGeometry/MuonDetectorManager.h"
+#include "MdtCalibData/RtResolutionLookUp.h"
+#include "MuonCalibMath/SamplePoint.h"
-class MdtCalibrationRegionSvc;
-class IIOVDbSvc;
+#include "zlib.h"
-namespace MuonGM{
- class MuonDetectorManager;
-}
+#include <string>
+#include <vector>
namespace coral {
class Blob;
}
-#include "MdtCalibData/RtResolutionLookUp.h"
-#include "MuonCalibMath/SamplePoint.h"
-
class MdtCalibDbAlg: public AthAlgorithm {
public:
@@ -62,24 +52,20 @@ class MdtCalibDbAlg: public AthAlgorithm {
private:
ServiceHandle<ICondSvc> m_condSvc;
-
- //like MdtCalibDbCoolStrTool
- //removing obsolete ones
-
- MuonCalib::MdtTubeCalibContainer* buildMdtTubeCalibContainer(const Identifier &id);
+ MuonCalib::MdtTubeCalibContainer* buildMdtTubeCalibContainer(const Identifier &id, const MuonGM::MuonDetectorManager* muDetMgr);
- StatusCode loadRt();
+ StatusCode loadRt(const MuonGM::MuonDetectorManager* muDetMgr);
StatusCode defaultRt(std::unique_ptr<MdtRtRelationCollection>& writeCdoRt);
- StatusCode loadTube();
- StatusCode defaultT0s(std::unique_ptr<MdtTubeCalibContainerCollection>& writeCdoTube);
+ StatusCode loadTube(const MuonGM::MuonDetectorManager* muDetMgr);
+ StatusCode defaultT0s(std::unique_ptr<MdtTubeCalibContainerCollection>& writeCdoTube, const MuonGM::MuonDetectorManager* muDetMgr);
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
- const MuonGM::MuonDetectorManager *m_detMgr;
- ToolHandle<MuonCalib::IIdToFixedIdTool> m_idToFixedIdTool;
- ServiceHandle<MdtCalibrationRegionSvc> m_regionSvc;
+ SG::ReadCondHandleKey<MuonGM::MuonDetectorManager> m_muDetMgrKey {this, "DetectorManagerKey", "MuonDetectorManager", "Key of input MuonDetectorManager condition data"};
+ ToolHandle<MuonCalib::IIdToFixedIdTool> m_idToFixedIdTool {this, "IdToFixedIdTool", "MuonCalib::IdToFixedIdTool"};
+ ServiceHandle<MdtCalibrationRegionSvc> m_regionSvc {this, "MdtCalibrationRegionSvc", "MdtCalibrationRegionSvc"};
- std::string m_rtFolder;
- std::string m_tubeFolder;
+ std::string m_rtFolder;
+ std::string m_tubeFolder;
//like MdtCalibrationDbSvc
//for corData in loadRt
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
index ec3a6df50bdb844f3b9200388742781c50834562..2845ef680bb07b5ae42f37b52c14bd530332aa77 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCalibDbAlg.cxx
@@ -10,7 +10,6 @@
#include "CoralBase/Blob.h"
#include "AthenaPoolUtilities/AthenaAttributeList.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-
#include "MdtCalibData/CalibFunc.h"
#include "MuonCalibStl/ToString.h"
#include "MdtCalibUtils/RtDataFromFile.h"
@@ -22,48 +21,34 @@
#include "MuonCalibTools/IdToFixedIdTool.h"
#include "MuonCalibIdentifier/MuonFixedId.h"
#include "MuonCalibIdentifier/MdtCalibCreationFlags.h"
-#include <fstream>
-#include <string>
-#include <vector>
-
#include "MdtCalibSvc/MdtCalibrationRegionSvc.h"
-
#include "MdtCalibData/MdtRtRelationCollection.h"
#include "MdtCalibData/MdtTubeCalibContainerCollection.h"
#include "MdtCalibData/RtFromPoints.h"
#include "MdtCalibData/RtResolutionFromPoints.h"
-
-#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonReadoutGeometry/MdtReadoutElement.h"
-
#include "AthenaKernel/IIOVDbSvc.h"
#include "CLHEP/Random/RandGaussZiggurat.h"
#include "AthenaKernel/RNGWrapper.h"
-
-#include "TSpline.h"
-#include "TFile.h"
-
-//like MdtCalibrationDbSvc
-//for corData in loadRt
-
#include "MdtCalibData/MdtCorFuncSetCollection.h"
#include "MdtCalibData/MdtFullCalibData.h"
#include "MdtCalibData/BFieldCorFunc.h"
#include "MdtCalibData/WireSagCorFunc.h"
#include "MdtCalibData/MdtSlewCorFuncHardcoded.h"
#include "MdtCalibData/CalibFunc.h"
+#include "GaudiKernel/PhysicalConstants.h"
//TODO: use smart pointers
//TODO: avoid dynamic char array
//TODO: check if temporary things can be removed
-#include "GaudiKernel/PhysicalConstants.h"
+#include "TSpline.h"
+#include "TFile.h"
+#include <fstream>
MdtCalibDbAlg::MdtCalibDbAlg(const std::string& name, ISvcLocator* pSvcLocator) :
AthAlgorithm(name, pSvcLocator),
m_condSvc{"CondSvc", name},
- m_idToFixedIdTool("MuonCalib::IdToFixedIdTool"),
- m_regionSvc("MdtCalibrationRegionSvc", name),
m_rtFolder("/MDT/RTBLOB"),
m_tubeFolder("/MDT/T0BLOB"),
m_TimeSlewingCorrection(false),
@@ -141,7 +126,6 @@ StatusCode MdtCalibDbAlg::initialize(){
}
ATH_CHECK( m_idHelperSvc.retrieve() );
- ATH_CHECK( detStore()->retrieve( m_detMgr ) );
ATH_CHECK( m_regionSvc.retrieve() );
ATH_CHECK( m_idToFixedIdTool.retrieve() );
@@ -184,6 +168,7 @@ StatusCode MdtCalibDbAlg::initialize(){
ATH_CHECK(m_writeKeyRt.initialize());
ATH_CHECK(m_writeKeyTube.initialize());
ATH_CHECK(m_writeKeyCor.initialize());
+ ATH_CHECK(m_muDetMgrKey.initialize());
if(m_condSvc->regHandle(this, m_writeKeyRt).isFailure()) {
ATH_MSG_FATAL("unable to register WriteCondHandle " << m_writeKeyRt.fullKey() << " with CondSvc");
@@ -203,14 +188,17 @@ StatusCode MdtCalibDbAlg::initialize(){
StatusCode MdtCalibDbAlg::execute(){
- ATH_MSG_DEBUG( "execute " << name() );
+ ATH_MSG_DEBUG( "execute " << name() );
+
+ SG::ReadCondHandle<MuonGM::MuonDetectorManager> muDetMgrHandle{m_muDetMgrKey};
+ const MuonGM::MuonDetectorManager* muDetMgr = muDetMgrHandle.cptr();
- if ( loadRt().isFailure() ) {
+ if ( loadRt(muDetMgr).isFailure() ) {
ATH_MSG_FATAL("loadRt().isFailure()");
return StatusCode::FAILURE;
}
- if ( loadTube().isFailure() ) {
+ if ( loadTube(muDetMgr).isFailure() ) {
ATH_MSG_FATAL("loadTube().isFailure()");
return StatusCode::FAILURE;
}
@@ -359,7 +347,7 @@ StatusCode MdtCalibDbAlg::defaultRt(std::unique_ptr<MdtRtRelationCollection>& wr
}
-StatusCode MdtCalibDbAlg::loadRt(){
+StatusCode MdtCalibDbAlg::loadRt(const MuonGM::MuonDetectorManager* muDetMgr){
ATH_MSG_DEBUG( "loadRt " << name() );
SG::WriteCondHandle<MdtRtRelationCollection> writeHandleRt{m_writeKeyRt};
@@ -475,7 +463,7 @@ StatusCode MdtCalibDbAlg::loadRt(){
float multilayer_tmax_diff(-9e9);
double innerTubeRadius = -9999.;
- const MuonGM::MdtReadoutElement *detEl = m_detMgr->getMdtReadoutElement( m_idHelperSvc->mdtIdHelper().channelID(athenaId,1,1,1) );
+ const MuonGM::MdtReadoutElement *detEl = muDetMgr->getMdtReadoutElement( m_idHelperSvc->mdtIdHelper().channelID(athenaId,1,1,1) );
if( !detEl ){
ATH_MSG_INFO( "Ignoring nonexistant station in calibration DB: " << m_idHelperSvc->mdtIdHelper().print_to_string(athenaId) );
} else {
@@ -664,7 +652,7 @@ StatusCode MdtCalibDbAlg::loadRt(){
// build the transient structure and load some defaults for T0s
-StatusCode MdtCalibDbAlg::defaultT0s(std::unique_ptr<MdtTubeCalibContainerCollection>& writeCdoTube) {
+StatusCode MdtCalibDbAlg::defaultT0s(std::unique_ptr<MdtTubeCalibContainerCollection>& writeCdoTube, const MuonGM::MuonDetectorManager* muDetMgr) {
if ( writeCdoTube == nullptr ) {
ATH_MSG_ERROR("writeCdoTube == nullptr");
@@ -686,7 +674,7 @@ StatusCode MdtCalibDbAlg::defaultT0s(std::unique_ptr<MdtTubeCalibContainerCollec
for(; it!=it_end;++it ) {
MuonCalib::MdtTubeCalibContainer *tubes=0;
//create an MdtTubeContainer
- tubes = buildMdtTubeCalibContainer(*it);
+ tubes = buildMdtTubeCalibContainer(*it, muDetMgr);
// is tubes ever 0? how could that happen?
if(tubes) {
@@ -741,7 +729,7 @@ StatusCode MdtCalibDbAlg::defaultT0s(std::unique_ptr<MdtTubeCalibContainerCollec
} //end MdtCalibDbAlg::defaultT0s
-StatusCode MdtCalibDbAlg::loadTube(){
+StatusCode MdtCalibDbAlg::loadTube(const MuonGM::MuonDetectorManager* muDetMgr){
ATH_MSG_DEBUG( "loadTube " << name() );
SG::WriteCondHandle<MdtTubeCalibContainerCollection> writeHandleTube{m_writeKeyTube};
@@ -755,7 +743,7 @@ StatusCode MdtCalibDbAlg::loadTube(){
//m_tubeData is writeCdoTube here
//atrc is readCdoTube here
- if ( defaultT0s(writeCdoTube).isFailure() ) {
+ if ( defaultT0s(writeCdoTube, muDetMgr).isFailure() ) {
ATH_MSG_FATAL("defaultT0s().isFailure()");
return StatusCode::FAILURE;
}
@@ -972,13 +960,13 @@ StatusCode MdtCalibDbAlg::loadTube(){
// Build a MuonCalib::MdtTubeCalibContainer for a given Identifier
-MuonCalib::MdtTubeCalibContainer* MdtCalibDbAlg::buildMdtTubeCalibContainer(const Identifier &id) {
+MuonCalib::MdtTubeCalibContainer* MdtCalibDbAlg::buildMdtTubeCalibContainer(const Identifier &id, const MuonGM::MuonDetectorManager* muDetMgr) {
MuonCalib::MdtTubeCalibContainer *tubes = 0;
- const MuonGM::MdtReadoutElement *detEl = m_detMgr->getMdtReadoutElement( m_idHelperSvc->mdtIdHelper().channelID(id,1,1,1) );
+ const MuonGM::MdtReadoutElement *detEl = muDetMgr->getMdtReadoutElement( m_idHelperSvc->mdtIdHelper().channelID(id,1,1,1) );
const MuonGM::MdtReadoutElement *detEl2 = 0;
if (m_idHelperSvc->mdtIdHelper().numberOfMultilayers(id) == 2){
- detEl2 = m_detMgr->getMdtReadoutElement(m_idHelperSvc->mdtIdHelper().channelID(id,2,1,1) );
+ detEl2 = muDetMgr->getMdtReadoutElement(m_idHelperSvc->mdtIdHelper().channelID(id,2,1,1) );
} else {
ATH_MSG_VERBOSE( "A single multilayer for this station " << m_idHelperSvc->mdtIdHelper().stationNameString(m_idHelperSvc->mdtIdHelper().stationName(id))<<","<< m_idHelperSvc->mdtIdHelper().stationPhi(id) <<","<< m_idHelperSvc->mdtIdHelper().stationEta(id) );
}
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
index 0ea9e5bcc7b9ef2e8eb8edcb3181e7edc14a355e..b87693472b6e1616ea9f9337c0a77bc55c5e9121 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
@@ -42,6 +42,7 @@ def MdtPrepDataProviderTool(name="MdtPrepDataProviderTool", **kwargs):
# setup dependencies which are not yet in C++
import MuonCnvExample.MuonCablingConfig
+ from MuonRecExample import MuonAlignConfig
from MuonCnvExample import MuonCalibConfig
MuonCalibConfig.setupMdtCondDB()
include("AmdcAth/AmdcAth_jobOptions.py")
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonReadCalib.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonReadCalib.py
index fe79af5b5315eddd9f74ddf378649a41da08398e..9fd0975139fc517258b3972ca83fd9c85d379650 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonReadCalib.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonReadCalib.py
@@ -14,5 +14,6 @@ if muonRecFlags.doCSCs():
CscCalibTool = getPublicTool("CscCalibTool")
if muonRecFlags.doMDTs():
+ from MuonRecExample import MuonAlignConfig
from MuonCnvExample import MuonCalibConfig
MuonCalibConfig.setupMdtCondDB()
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
index 7f950dfa1d08baecb3d9300a321fd95c0fed63dc..f798354065f9ed5cd101cfe40f213b123eed5074 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecTools.py
@@ -21,9 +21,6 @@ muonRecFlags.setDefaults()
from MuonRecExample.MuonStandaloneFlags import muonStandaloneFlags
muonStandaloneFlags.setDefaults()
-from MuonCnvExample.MuonCalibFlags import mdtCalibFlags
-mdtCalibFlags.setDefaults()
-
from RecExConfig.RecFlags import rec
@@ -80,9 +77,11 @@ def CscBroadClusterOnTrackCreator(name="CscBroadClusterOnTrackCreator",**kwargs)
def MdtDriftCircleOnTrackCreator(name="MdtDriftCircleOnTrackCreator",**kwargs):
# setup dependencies missing in C++. TODO: fix in C++
+ from MuonRecExample import MuonAlignConfig
from MuonCnvExample import MuonCalibConfig
MuonCalibConfig.setupMdtCondDB()
-
+ from MuonCnvExample.MuonCalibFlags import mdtCalibFlags
+ mdtCalibFlags.setDefaults()
kwargs.setdefault("DoMagneticFieldCorrection", mdtCalibFlags.correctMdtRtForBField())
kwargs.setdefault("DoWireSag", muonRecFlags.useWireSagCorrections())
kwargs.setdefault("DoSlewingCorrection", mdtCalibFlags.correctMdtRtForTimeSlewing())
@@ -351,6 +350,7 @@ def MuonSegmentMomentum(name="MuonSegmentMomentum",**kwargs):
def MdtSegmentT0Fitter(name="MdtSegmentT0Fitter",**kwargs):
# setup dependencies missing in C++. TODO: fix in C++
+ from MuonRecExample import MuonAlignConfig
from MuonCnvExample import MuonCalibConfig
MuonCalibConfig.setupMdtCondDB()
return CfgMgr.TrkDriftCircleMath__MdtSegmentT0Fitter(name,**kwargs)
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecUtils.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecUtils.py
index 88d73cc9ff6fc6ca02abbc29423c024095a9224e..c1529c4ea9e7369903508b36870f181c078e6072 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecUtils.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecUtils.py
@@ -19,9 +19,6 @@ import os,sys,copy,re,subprocess
# for backwards compat of clients. TO BE REMOVED !!!
from AthenaCommon.ConfiguredFactory import getProperty
-# for backwards compat of clients. TO BE REMOVED !!!
-from MuonCnvExample.MuonCnvUtils import mdtCalibWindowNumber
-
# logger to use for normal output
logMuon = logging.getLogger("MuonRec")
# logger to use for resilience output
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
index 4d9c301ea0e3a4f120b2d692f7b8c482b049990a..cfa9c78c7c529cfaeca6711f42a07cd100b90612 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
@@ -186,9 +186,9 @@ if muonRecFlags.useAlignmentCorrections():
# Make Calibration Ntuple or run Calibration Algorithm
#--------------------------------------------------------------------------
if muonRecFlags.doCalib() or muonRecFlags.doCalibNtuple():
+ from MuonRecExample import MuonAlignConfig
from MuonRecExample import MuonCalibConfig
-
#--------------------------------------------------------------------------
# Evaluate tracking performance
#--------------------------------------------------------------------------
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/CscSegmentUtilTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/CscSegmentUtilTool.cxx
index 56d228703c016da837fb959b41e53bd984bf8125..b0ddd8e772a3ef59e65ff43794c20d9fc3596108 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/CscSegmentUtilTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/CscSegmentUtilTool.cxx
@@ -4,30 +4,23 @@
#include "CscSegmentUtilTool.h"
-#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonReadoutGeometry/CscReadoutElement.h"
-
#include "MuonSegment/MuonSegment.h"
#include "MuonSegment/MuonSegmentCombination.h"
#include "TrkEventPrimitives/ParamDefs.h"
-
#include "TrkEventPrimitives/FitQuality.h"
#include "MuonPrepRawData/CscPrepDataContainer.h"
#include "MuonPrepRawData/CscPrepData.h"
#include "MuonPrepRawData/CscStripPrepData.h"
#include "MuonSegment/MuonSegmentCombinationCollection.h"
-
#include "MuonRIO_OnTrack/CscClusterOnTrack.h"
-
#include "TrkEventPrimitives/LocalDirection.h"
#include "TrkSurfaces/PlaneSurface.h"
#include "TrkSurfaces/TrapezoidBounds.h"
#include "TrkSurfaces/RotatedTrapezoidBounds.h"
-
#include "CscSegmentMakers/ICscSegmentFinder.h"
#include "CscClusterization/ICscClusterFitter.h"
#include "CscClusterization/ICscStripFitter.h"
-
#include "EventPrimitives/EventPrimitivesHelpers.h"
#include "TMath.h" // for TMath::Landau()
@@ -35,7 +28,6 @@
#include <iostream>
-using MuonGM::MuonDetectorManager;
using MuonGM::CscReadoutElement;
using Muon::MuonSegment;
using Muon::CscPrepData;
@@ -45,78 +37,45 @@ using Trk::RIO_OnTrack;
using Trk::PlaneSurface;
namespace {
- std::string station_name(int station) {
+ std::string station_name(const int station) {
if ( station == 1 ) return "CSS";
- if ( station == 2 ) return "CSL";
- return "UNKNOWN_STATION";
+ else if ( station == 2 ) return "CSL";
+ else return "UNKNOWN_STATION";
}
- std::string measphi_name(bool measphi) {
+ std::string measphi_name(const bool measphi) {
if ( measphi ) return "phi";
- return "eta";
+ else return "eta";
}
- double alignConst(bool measphi, int wlay) {
+ double alignConst(const bool measphi, const int wlay) {
if (measphi) return 0.;
const double aConst[4] = { 0, -0.2289, -0.620181, -0.6534445 };
return aConst[wlay-1];
}
- bool enoughHitLayers (ICscSegmentFinder::ChamberTrkClusters& eta_clus,
- ICscSegmentFinder::ChamberTrkClusters& phi_clus) {
-
+ bool enoughHitLayers(const ICscSegmentFinder::ChamberTrkClusters& eta_clus, const ICscSegmentFinder::ChamberTrkClusters& phi_clus) {
int nHitLayer_eta =0;
int nHitLayer_phi =0;
for (int i=0; i<4; ++i) {
- // ATH_MSG_DEBUG ( "No of clusters in layer " << i << " " << eta_clus[i].size() << " " << phi_clus[i].size() );
if (eta_clus[i].size() >0) ++nHitLayer_eta;
if (phi_clus[i].size() >0) ++nHitLayer_phi;
}
-
- if (nHitLayer_eta <2 && nHitLayer_phi <2)
- return false;
- else
- return true;
+ if (nHitLayer_eta <2 && nHitLayer_phi <2) return false;
+ else return true;
}
- bool IsUnspoiled ( Muon::CscClusterStatus status ) {
- if (status == Muon::CscStatusUnspoiled || status == Muon::CscStatusSplitUnspoiled )
- return true;
-
- return false;
+ bool IsUnspoiled(const Muon::CscClusterStatus status) {
+ if (status == Muon::CscStatusUnspoiled || status == Muon::CscStatusSplitUnspoiled ) return true;
+ else return false;
}
-
}
//******************************************************************************
// Constructor.
-CscSegmentUtilTool::CscSegmentUtilTool
-(const std::string& type, const std::string& name, const IInterface* parent)
- : AthAlgTool(type,name,parent)
-{
+CscSegmentUtilTool::CscSegmentUtilTool(const std::string& type, const std::string& name, const IInterface* parent) :
+ AthAlgTool(type,name,parent) {
declareInterface<ICscSegmentUtilTool>(this);
- declareProperty("max_chisquare_tight", m_max_chisquare_tight = 16.); // 16 for outlier removal...
- declareProperty("max_chisquare_loose", m_max_chisquare_loose = 2000.); // 2000 for outlier removal...
- declareProperty("max_chisquare", m_max_chisquare = 25.);
- declareProperty("max_slope_r", m_max_slope_r = 0.20);
- declareProperty("max_slope_phi", m_max_slope_phi = 0.20);
- declareProperty("max_seg_per_chamber", m_max_seg_per_chamber = 50);
- declareProperty("min_xylike", m_min_xylike = -1);
- declareProperty("X5data", m_x5data = false);
- declareProperty("max_3hitseg_sharedhit", m_max_3hitseg_sharehit =0);
-
- declareProperty("tantheta_update_tolerance", m_fitsegment_tantheta_tolerance = 0.0001);
- declareProperty("cluster_error_scaler", m_cluster_error_scaler=1.0);
-
- declareProperty("zshift", m_zshift = true);
- declareProperty("IPconstraint", m_IPconstraint = true);
- declareProperty("IPerror", m_IPerror = 250.);
- declareProperty("allEtaPhiMatches", m_allEtaPhiMatches = true);
- declareProperty("TightenChi2", m_TightenChi2 = true);
- declareProperty("Remove4Overlap", m_remove4Overlap = true);
- declareProperty("Remove3Overlap", m_remove3Overlap = true);
- declareProperty("UnspoiledHits", m_nunspoil = -1);
-
}
/*********************************/
@@ -126,20 +85,17 @@ StatusCode CscSegmentUtilTool::initialize()
ATH_MSG_DEBUG ( " Max chi-square: " << m_max_chisquare );
ATH_MSG_DEBUG ( " chi-square tight: " << m_max_chisquare_tight );
ATH_MSG_DEBUG ( " chi-square loose: " << m_max_chisquare_loose );
- ATH_MSG_DEBUG ( " Max r:phi slope: " << m_max_slope_r << " : "
- << m_max_slope_phi );
+ ATH_MSG_DEBUG ( " Max r:phi slope: " << m_max_slope_r << " : " << m_max_slope_phi );
ATH_MSG_DEBUG ( " Max segments/chamber: " << m_max_seg_per_chamber );
- ATH_MSG_DEBUG ( " ROT tan(theta) tolerance: "
- << m_fitsegment_tantheta_tolerance );
- ATH_MSG_DEBUG ( " cluster_error_scaler " << m_cluster_error_scaler);
+ ATH_MSG_DEBUG ( " ROT tan(theta) tolerance: " << m_fitsegment_tantheta_tolerance );
+ ATH_MSG_DEBUG ( " cluster_error_scaler " << m_cluster_error_scaler);
ATH_MSG_DEBUG ( " ROT creator: " << m_rotCreator.typeAndName() );
if(m_TightenChi2) m_IPerror = 2.;
if(m_TightenChi2) ATH_MSG_DEBUG ( " Chi2 cuts are tightened and m_IPerror is: " << m_IPerror);
- if (m_x5data)
- ATH_MSG_DEBUG (" Things for X5Data analysis is applied such as alignment ");
+ if (m_x5data) ATH_MSG_DEBUG (" Things for X5Data analysis is applied such as alignment ");
ATH_CHECK(m_rotCreator.retrieve());
@@ -179,18 +135,6 @@ getMuonSegments(Identifier eta_id, Identifier phi_id,
ATH_MSG_DEBUG ("getMuonSegments called get4dMuonSegmentCombination");
std::unique_ptr<MuonSegmentCombination> Muon4dSegComb(get4dMuonSegmentCombination(Muon2dSegComb.get()));
- // delete 4dMuonSegComb; WP careful...
-
- // Add the case for only 2d segments following the idea below ??
- /*
- if (!rsg && psg) {
- segments->push_back(psg);
- return segments;
- } else if (rsg && !psg) {
- segments->push_back(rsg);
- return segments;
- }
- */
std::unique_ptr<std::vector<std::unique_ptr<MuonSegment> > > segments_clone (new std::vector<std::unique_ptr<MuonSegment> >);
if (Muon4dSegComb) {
@@ -219,8 +163,8 @@ get2dMuonSegmentCombination( Identifier eta_id, Identifier phi_id,
int nGoodEta=0,nGoodPhi=0;
for (int i=0; i<4; ++i){
ATH_MSG_DEBUG ( "get2dMuonSegmentCombination2: No of clusters in layer " << i << " " << eta_clus[i].size() << " " << phi_clus[i].size() );
- if((etaStat%(int)pow(10,i+1))/(int)pow(10,i)==0) nGoodEta++;
- if((phiStat%(int)pow(10,i+1))/(int)pow(10,i)==0) nGoodPhi++;
+ if((etaStat%(int)std::pow(10,i+1))/(int)std::pow(10,i)==0) nGoodEta++;
+ if((phiStat%(int)std::pow(10,i+1))/(int)std::pow(10,i)==0) nGoodPhi++;
}
if(nGoodEta<2 && nGoodPhi<2){
@@ -243,7 +187,6 @@ get2dMuonSegmentCombination( Identifier eta_id, Identifier phi_id,
if (pseg) {
ATH_MSG_DEBUG( " =============================> get2dMuonSegmentCombination:: MuonSegment time (eta) from build_segment is " << pseg->time() );
psegs->push_back(std::move(pseg));
- // pseg->dump(cout);
}
}
ATH_MSG_DEBUG("added "<<psegs->size()<<" eta segments");
@@ -272,10 +215,7 @@ get2dMuonSegmentCombination( Identifier eta_id, Identifier phi_id,
// Fit a segment using a list of clusters.
// Filling is least squares with the usual 1/d**2 weighting.
// local z = -38.51 -12.82 12.87 38.56
-void CscSegmentUtilTool::
-//fit_segment(const ICscSegmentFinder::TrkClusters& clus, double& s0, double& s1,
-// double& d0, double& d1, double& d01, double& chsq) const { old one....
-fit_segment(const ICscSegmentFinder::TrkClusters& clus, const Amg::Vector3D& lpos000, double& s0, double& s1,
+void CscSegmentUtilTool::fit_segment(const ICscSegmentFinder::TrkClusters& clus, const Amg::Vector3D& lpos000, double& s0, double& s1,
double& d0, double& d1, double& d01, double& chsq, double& time, double& dtime,
double& zshift, int outlierHitLayer) const {
@@ -330,10 +270,7 @@ fit_detailCalcPart1(const ICscSegmentFinder::TrkClusters& clus, const Amg::Vecto
if (isunspoiled) {
if ( IsSlopeGiven && outlierHitLayer != ( iclu - clus.begin() ) )
d = m_rotCreator->GetICscClusterFitter()->getCorrectedError(prd, s1);
-// if ( outlierHitLayer == ( iclu - clus.begin() ) )
-// d = getDefaultError(id, measphi, prd);
}
-
d *= m_cluster_error_scaler; // This is for error scaler for cosmic!!!
double w = 1.0/(d*d);
@@ -441,7 +378,7 @@ fit_detailCalcPart1(const ICscSegmentFinder::TrkClusters& clus, const Amg::Vecto
float timeSquare = sumHitTimeSquares/float(cntSuccessHit);
dtime = timeSquare - time*time;
if (dtime<0.0) dtime = 0.0;
- else dtime = sqrt(dtime);
+ else dtime = std::sqrt(dtime);
} else {
if (cntEarlyHit >0 && cntLateHit >0) {
time = 99999;
@@ -449,7 +386,7 @@ fit_detailCalcPart1(const ICscSegmentFinder::TrkClusters& clus, const Amg::Vecto
ATH_MSG_DEBUG ("Segment has nonzero earlyHits and nonzero lateHits. This should be backgrounds!!");
} else if (cntEarlyHit >0) {
time = latestEarlyTime;
- dtime = fabs(latestEarlyTime);
+ dtime = std::abs(latestEarlyTime);
} else if (cntLateHit >0) {
time = earliestLateTime;
dtime = earliestLateTime;
@@ -564,11 +501,6 @@ fit_residual(const ICscSegmentFinder::TrkClusters& clus, const Amg::Vector3D& lp
double d = Amg::error(cot->localCovariance(),ierr)*m_cluster_error_scaler;
// This is for CscClusterCollection
- // const Amg::Vector3D lpos = pro->localPos(clu.position());
- // double y = lpos.y();
- // double x = lpos.x();
- // double d = clu.sigma();
-
if (d0 <0 || d1 <0) {
res =-99.;
dres=-9.;
@@ -585,9 +517,9 @@ fit_residual(const ICscSegmentFinder::TrkClusters& clus, const Amg::Vector3D& lp
<< seg_dsquare << " " << dres );
if (dres < 0)
- dres = -1.0*sqrt(-1.0*dres);
+ dres = -1.0*std::sqrt(-1.0*dres);
else if (dres >= 0)
- dres = sqrt(dres);
+ dres = std::sqrt(dres);
else // in case of nan
dres = -9.;
}
@@ -628,10 +560,10 @@ fit_rio_segment(const Trk::PlaneSurface& ssrf, bool /*dump*/,
const Amg::Vector3D& gpos = rio.globalPosition();
Amg::Vector3D lpos = ssrf.transform().inverse()*gpos;
double x = lpos.z();
- ATH_MSG_VERBOSE ( " RIO global pos: "
- << gpos.x() << " " << gpos.y() << " " << gpos.z() );
- ATH_MSG_VERBOSE ( " RIO local pos: "
- << lpos.x() << " " << lpos.y() << " " << lpos.z() );
+ if (msgLvl(MSG::VERBOSE)) {
+ ATH_MSG_VERBOSE ( " RIO global pos: " << gpos.x() << " " << gpos.y() << " " << gpos.z() );
+ ATH_MSG_VERBOSE ( " RIO local pos: " << lpos.x() << " " << lpos.y() << " " << lpos.z() );
+ }
ATH_MSG_DEBUG ( " RIO: " << x << " " << y << " " << d );
// Update least-square sums.
@@ -672,10 +604,10 @@ fit_rio_segment(const Trk::PlaneSurface& ssrf, bool /*dump*/,
const Amg::Vector3D& gpos = rio.globalPosition();
Amg::Vector3D lpos = ssrf.transform().inverse()*gpos;
double x = lpos.z();
- ATH_MSG_VERBOSE ( " RIO global pos: "
- << gpos.x() << " " << gpos.y() << " " << gpos.z() );
- ATH_MSG_VERBOSE ( " RIO local pos: "
- << lpos.x() << " " << lpos.y() << " " << lpos.z() );
+ if (msgLvl(MSG::VERBOSE)) {
+ ATH_MSG_VERBOSE ( " RIO global pos: " << gpos.x() << " " << gpos.y() << " " << gpos.z() );
+ ATH_MSG_VERBOSE ( " RIO local pos: " << lpos.x() << " " << lpos.y() << " " << lpos.z() );
+ }
ATH_MSG_DEBUG ( " RIO: " << x << " " << y << " " << d );
// Update least-square sums.
@@ -753,9 +685,9 @@ fit_rio_residual(const Trk::PlaneSurface& ssrf, bool dump,
<< seg_dsquare << " " << dres );
if (dres < 0)
- dres = -1.0*sqrt(-1.0*dres);
+ dres = -1.0*std::sqrt(-1.0*dres);
else if ( dres>=0 )
- dres = sqrt(dres);
+ dres = std::sqrt(dres);
else // in case of nan
dres = -9.;
@@ -781,9 +713,9 @@ fit_rio_residual(const Trk::PlaneSurface& ssrf, bool dump,
<< seg_dsquare << " " << drs );
if (drs < 0)
- drs = -1.0*sqrt(-1.0*drs);
+ drs = -1.0*std::sqrt(-1.0*drs);
else if (drs >= 0)
- drs = sqrt(drs);
+ drs = std::sqrt(drs);
else // in case of nan
drs = -999.;
}
@@ -881,8 +813,6 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
ATH_MSG_DEBUG ( "Building csc segment." );
- const double pi = acos(-1.0);
- const double pi2 = 0.5*pi;
SG::ReadCondHandle<MuonGM::MuonDetectorManager> DetectorManagerHandle{m_DetectorManagerKey};
const MuonGM::MuonDetectorManager* MuonDetMgr{*DetectorManagerHandle};
if(MuonDetMgr==nullptr){
@@ -905,7 +835,6 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
Amg::Transform3D* pxf = new Amg::Transform3D();
*pxf = pro->transform(chid).rotation();
pxf->pretranslate(glop);
- //Amg::Transform3D* pxf = new Amg::Transform3D(pro->transform(chid));
// Use chamber bounds.
Trk::SurfaceBounds* pbnd = pro->bounds(chid).clone();
Trk::TrapezoidBounds* pbnd_trap =
@@ -944,30 +873,9 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
Amg::Vector3D lposRefShift = lposRef - ldirRef*lposRef.z();
ATH_MSG_VERBOSE ( " extrapolation to lposRef.z() " << lposRef.z() );
- //std::cout << " local pos " << lposAMDB << " locref " << lposRef << " ldir ref " << ldirRef << " lpos shift " << lposRefShift
- //<< " segpos " << seg.s0 << " angle " << seg.s1 << std::endl;
double s0 = lposRefShift.x();
-// for ( int iclu=0; iclu<seg.nclus; ++iclu ) {
-// double seg_y = seg.s0 + seg.s1*seg.clus[iclu].locX();
-// Amg::Vector3D lposHit = gToSurf*seg.clus[iclu].cl->globalPosition();
-// Amg::Vector3D lposSeg = lposRefShift + ldirRef*(lposHit.z()-lposRefShift.z());
-// std::cout << " cl pos (" << seg.clus[iclu].locY() << "," << seg.clus[iclu].locX() << ") residual " << seg.clus[iclu].locY() - seg_y
-// << " lpos ref " << lposHit << " lposSeg " << lposSeg << " res " << lposHit.x() - lposSeg.x() << std::endl;
-// }
-
ATH_MSG_VERBOSE ( " Input position, slope: " << s0 << " " << seg.s1 );
ATH_MSG_VERBOSE ( " Error: " << seg.d0 << " " << seg.d1 << " " << seg.d01 );
- //std::cout<<" Input position, slope: " << s0 << " " << seg.s1<<std::endl;
- //std::cout<<" Error: " << seg.d0 << " " << seg.d1 << " " << seg.d01<<std::endl;
- // ATH_MSG_VERBOSE ( " Orientation: " << measphi_name(measphi) );
-
-
- // const DataHandle<CscStripPrepDataContainer> colldig;
- // if (evtStore()->retrieve(colldig, m_cscdig_sg_inkey).isFailure()) {
- // ATH_MSG_FATAL << " Cannot retrieve CscStripPrepData Collection " );
- // return StatusCode::FAILURE;
- // }
-
// Build list of RIO on track objects.
ICscSegmentFinder::MbaseList* prios = new ICscSegmentFinder::MbaseList;
@@ -982,8 +890,8 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
// Build position vector.
Amg::Vector2D pos(s0, 0.0);
// Build direction vector.
- double ameas = atan2(1.0, seg.s1);
- Trk::LocalDirection pdir(ameas, pi2);
+ double ameas = std::atan2(1.0, seg.s1);
+ Trk::LocalDirection pdir(ameas, M_PI_2);
// Error matrix.
double dfac = -1.0/(1 + seg.s1*seg.s1);
double e_pos_pos = seg.d0*seg.d0;
@@ -1007,11 +915,11 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
Amg::Transform3D globalToLocal = pro->transform(chid).inverse();
Amg::Vector3D d(globalToLocal.linear()*pseg_ref->globalDirection());
- //std::cout<<"d.x()="<<d.x()<<"; d.z()="<<d.z()<<std::endl;
- //std::cout<<" Position: " << pos[Trk::loc1] << " " << pos[Trk::loc2]<<std::endl;
- //std::cout<<"seg.s1 : ameas " << seg.s1 << " " << ameas<<std::endl;
- //std::cout<<" Direction: " << pdir.angleXZ() << " " << pdir.angleYZ()<<std::endl;
- double tantheta = d.x()/d.z(); // is equal to seg.s1
+
+ double tantheta = 0;
+ if (d.z()==0) {
+ ATH_MSG_WARNING("build_segment() - segment z is 0, set tantheta=0");
+ } else tantheta = d.x()/d.z(); // is equal to seg.s1
ATH_MSG_VERBOSE ( " Position: " << pos[Trk::loc1] << " " << pos[Trk::loc2] );
ATH_MSG_VERBOSE ("seg.s1 : ameas " << seg.s1 << " " << ameas );
@@ -1023,9 +931,11 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
MuonSegment* pseg =pseg_ref->clone();
ATH_MSG_DEBUG ( " build_segment:: right after copying * " << pseg->time() );
- double diff_tantheta = 99;
- int n_update =0;
- while (diff_tantheta > m_fitsegment_tantheta_tolerance && n_update<10) {
+ const double initialDiffTanTheta = 99;
+ double diff_tantheta = initialDiffTanTheta;
+ const unsigned int nTrials = 10;
+ unsigned int n_update =0;
+ while (diff_tantheta > m_fitsegment_tantheta_tolerance && n_update<nTrials) {
// Loop over collections in the container.
ICscSegmentFinder::MbaseList* prios_new = new ICscSegmentFinder::MbaseList;
ICscSegmentFinder::TrkClusters fitclus;
@@ -1034,7 +944,6 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
int cnt =0;
for ( ICscSegmentFinder::RioList::size_type irio=0; irio<prios->size(); ++irio ) {
- // const Trk::RIO_OnTrack* pold = oldrios[irio];
const Trk::RIO_OnTrack* pold = oldrios[irio];
const Trk::RIO_OnTrack* cot = (seg.outlierid == cnt) ? pold->clone() // No update for outlier owing to error blown up
: m_rotCreator->createRIO_OnTrack( *pold->prepRawData(),
@@ -1094,14 +1003,12 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
Amg::Vector3D gdir = lToGlobal.linear()*ldirAMDB;
Amg::Vector3D ldirRef = gToSurf.linear()*gdir;
Amg::Vector3D lposRefShift = lposRef - ldirRef*lposRef.z();
-// std::cout << " local pos " << lposAMDB << " locref " << lposRef << " ldir ref " << ldirRef << " lpos shift " << lposRefShift
-// << " segpos " << seg_new.s0 << " angle " << seg_new.s1 << std::endl;
double s0 = lposRefShift.x();
Amg::Vector2D pos_new(s0, 0.0);
// Build direction vector.
double ameas_new = atan2(1.0, seg_new.s1);
- Trk::LocalDirection pdir_new(ameas_new, pi2);
+ Trk::LocalDirection pdir_new(ameas_new, M_PI_2);
// Error matrix.
double dfac_new = -1.0/(1 + seg_new.s1*seg_new.s1);
double e_pos_pos_new = seg_new.d0*seg_new.d0;
@@ -1121,15 +1028,31 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
pseg_new->setT0Error(float(seg_new.time), float(seg_new.dtime));
ATH_MSG_DEBUG ( " build_segment:: right after recreating * " << pseg_new->time() );
+ Amg::Vector3D dnew(globalToLocal.linear()*pseg->globalDirection());
+ double tanthetanew = 0;
+ if (dnew.z()==0) {
+ ATH_MSG_WARNING("build_segment() - new segment z is 0, staying with old segment and continue loop");
+ // we need to delete the new segment we just created
+ delete pseg_new;
+ // we set diff_tantheta again to its initial value and continue the loop
+ diff_tantheta = initialDiffTanTheta;
+ // if nTrials is reached anyway in the next iteration, break
+ if (n_update==(nTrials-1)) break;
+ continue;
+ } else tanthetanew = dnew.x()/dnew.z();
+
+ // this gets only called if the new segment did not have tanthetanew=0
delete pseg;
pseg = pseg_new;
- // ATH_MSG_DEBUG ( " build_segment:: right after new assigning * " << pseg->time() );
- // pseg->setT0Error(float(seg_new.time), float(seg_new.dtime));
ATH_MSG_DEBUG ( " build_segment:: right after new assigning and resetting * " << pseg->time() );
- Amg::Vector3D dnew(globalToLocal.linear()*pseg->globalDirection());
- double tanthetanew = dnew.x()/dnew.z();
- diff_tantheta = fabs(tanthetanew-tantheta)/tantheta;
+ if (tantheta==0) {
+ ATH_MSG_WARNING("build_segment() - tantheta=0 but tanthetanew="<<tanthetanew<<", set diff_tantheta=tanthetanew");
+ diff_tantheta=tanthetanew;
+ } else {
+ // both tanthetanew and tantheta are not 0
+ diff_tantheta = std::abs(tanthetanew-tantheta)/tantheta;
+ }
ATH_MSG_VERBOSE ( " tantheta change in segment: "
<< tantheta << " ==> " << tanthetanew << " -ratio- " << diff_tantheta );
@@ -1156,8 +1079,6 @@ build_segment(const ICscSegmentFinder::Segment& seg, bool measphi, Identifier ch
ATH_MSG_VERBOSE ( " Seg global pos: " << g.x() << " " << g.y() << " " << g.z() );
delete pseg_ref;
-
- // pseg->dump(cout);
ATH_MSG_DEBUG ( " build_segment:: right just before returning * " << pseg->time() );
return pseg;
@@ -1170,17 +1091,11 @@ find_2dsegments(bool measphi, int station, int eta, int phi,
ICscSegmentFinder::Segments& segs,
double lpos, double lslope) const {
- ATH_MSG_DEBUG ( "find_2dsegments called!! ID: " << measphi_name(measphi) << " " << std::showpos << eta
- << " " << station_name(station) << " " << phi << " " );
- ATH_MSG_DEBUG ( " Counts: " << chclus[0].size() << " " << chclus[1].size() << " "
- << chclus[2].size() << " " << chclus[3].size() );
-
- // for (ICscSegmentFinder::TrkClusters::const_iterator iclu=chclus.begin(); iclu!=chclus.end(); ++iclu ) {
- // Trk::ParamDefs ierr = Trk::loc1;
- // double d = (*iclu)->localErrorMatrix().error(ierr);
-
+ if (msgLvl(MSG::DEBUG)) {
+ ATH_MSG_DEBUG ( "find_2dsegments called!! ID: " << measphi_name(measphi) << " " << std::showpos << eta << " " << station_name(station) << " " << phi << " " );
+ ATH_MSG_DEBUG ( " Counts: " << chclus[0].size() << " " << chclus[1].size() << " " << chclus[2].size() << " " << chclus[3].size() );
+ }
-
const ICscSegmentFinder::TrkClusters& clus1 = chclus[0];
const ICscSegmentFinder::TrkClusters& clus2 = chclus[1];
const ICscSegmentFinder::TrkClusters& clus3 = chclus[2];
@@ -1408,13 +1323,13 @@ void CscSegmentUtilTool::add_2dseg2hits(ICscSegmentFinder::Segments &segs, ICscS
int lay0=-1, lay1=-1;
for(int i=0;i<4;i++){
- if((layStat%(int)pow(10,i+1))/(int)pow(10,i)==0){
+ if((layStat%(int)std::pow(10,i+1))/(int)std::pow(10,i)==0){
if(lay0==-1) lay0=i;
else if(lay1==-1) lay1=i;
}
}
bool checkCrossTalk=false;
- if(fabs(lay0-lay1)==1 && lay0+lay1!=3) checkCrossTalk=true; //if we have layers 0 and 1 or 2 and 3 there could be cross-talk creating fake 2-layer segments
+ if(std::abs(lay0-lay1)==1 && lay0+lay1!=3) checkCrossTalk=true; //if we have layers 0 and 1 or 2 and 3 there could be cross-talk creating fake 2-layer segments
std::vector <int> isegs2OK(segs2.size(),1);
ICscSegmentFinder::Segments::const_iterator iseg;
@@ -1484,7 +1399,7 @@ void CscSegmentUtilTool::add_2dseg2hits(ICscSegmentFinder::Segments &segs, ICscS
for (int iclus=0; iclus<iseg->nclus; iclus++) {
const Muon::CscClusterOnTrack* cot = iseg->clus[iclus].cl;
int wlay=m_idHelperSvc->cscIdHelper().wireLayer(cot->identify());
- if((layStat%(int)pow(10,wlay+1))/(int)pow(10,wlay)==1){ //this 3-layer segment has a hit in a bad layer: dump it
+ if((layStat%(int)std::pow(10,wlay+1))/(int)std::pow(10,wlay)==1){ //this 3-layer segment has a hit in a bad layer: dump it
nhits_common=-1;
break;
}
@@ -1646,7 +1561,7 @@ find_2dseg2hit(bool measphi, int station, int eta, int phi, int layStat,
int lay0=-1, lay1=-1;
for(int i=0;i<4;i++){
- if((layStat%(int)pow(10,i+1))/(int)pow(10,i)==0){
+ if((layStat%(int)std::pow(10,i+1))/(int)std::pow(10,i)==0){
if(lay0==-1) lay0=i;
else if(lay1==-1) lay1=i;
else{
@@ -1755,15 +1670,15 @@ fit_detailCalcPart2(double q0, double q1, double q2, double q01, double q11, dou
s1 = r11*q11 + r10*q01;
d0 = r01*r01*q2 + 2.0*r00*r01*q1 + r00*r00*q0;
if (d0<0)
- d0 = -1.0*sqrt(-1.0*d0);
+ d0 = -1.0*std::sqrt(-1.0*d0);
else
- d0 = sqrt(d0);
+ d0 = std::sqrt(d0);
d1 = r11*r11*q2 + 2.0*r10*r11*q1 + r10*r10*q0;
if (d1<0)
- d1 = -1.0*sqrt(-1.0*d1);
+ d1 = -1.0*std::sqrt(-1.0*d1);
else
- d1 = sqrt(d1);
+ d1 = std::sqrt(d1);
d01 = r01*r11*q2 + (r01*r10+r00*r11)*q1 + r00*r10*q0;
chsq = q02 + s1*s1*q2 + 2*s0*s1*q1 + s0*s0*q0 - 2*s0*q01 - 2*s1*q11;
@@ -1908,7 +1823,6 @@ MuonSegment* CscSegmentUtilTool::
make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LaySegsEta, bool use2LaySegsPhi) const {
ATH_MSG_DEBUG("make_4dMuonSegment called");
- // if(use2LaySegs) std::cout<<"make 4d segment"<<std::endl;
double rpos = rsg.localParameters()[Trk::locX];
double rdir = rsg.localDirection().angleXZ();
@@ -1978,9 +1892,6 @@ make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LayS
Amg::Vector3D phietalpos = psrf->transform().inverse()*phigpos;
ATH_MSG_VERBOSE ( " positions in NEW Eta frame for phi measurement x " << phietalpos.x() << " y " << phietalpos.y() << " z shift " << phietalpos.z() << " angleXZ " << phidir );
- // if(use2LaySegs)
- // std::cout<<" positions in NEW Eta frame for phi measurement x "<<phietalpos.x()<<" y " <<phietalpos.y()<<" z shift "<<phietalpos.z()<<" angleXZ "<<phidir<<std::endl;
-
double phiposNew = phietalpos.x() - phidir*phietalpos.z();
ATH_MSG_VERBOSE ( " positions old z " << phipos << " New frame " << phietalpos.x() << " corrected " << phiposNew );
@@ -1999,7 +1910,6 @@ make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LayS
if ( etarios.size()>=nMinRIOsEta && phirios.size()>=nMinRIOsPhi ) {
ATH_MSG_DEBUG ( "Using new RIO order." );
ATH_MSG_DEBUG ( " eta/phi segment sizes: " << etarios.size() << " " << phirios.size() );
- // if(use2LaySegs) std::cout<<" eta/phi segment sizes: " << etarios.size() << " " << phirios.size()<<std::endl;
// ECC - try to match eta and phi layers
// for ( RioList::size_type irio=0; irio<4; ++irio ) {
int maxeta = etarios.size();
@@ -2031,18 +1941,6 @@ make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LayS
ATH_MSG_DEBUG ( " id_eta: " << m_idHelperSvc->toString(id_eta) << " " <<
" id_phi: " << m_idHelperSvc->toString(id_phi) );
- /* commenting out because : 1/ coverity defect 13763+4 "Unchecked dynamic_cast"
- 2/ segment finding must be fast, dynamic cast is time consuming, here only used for dbg cout ...
-
- const CscClusterOnTrack* csceta = dynamic_cast<const Muon::CscClusterOnTrack*>(etapold);
- const CscClusterOnTrack* cscphi = dynamic_cast<const Muon::CscClusterOnTrack*>(phipold);
- ATH_MSG_DEBUG ( "make_4dMuonSegment:: ieta/iphi: " << ieta << "/" << iphi
- << " iw_eta, iw_phi: " << iw_eta << " " << iw_phi
- << " rio times r/phi: "
- << csceta->time() << " " << cscphi->time()
- );
- */
-
// get the reference surface of the eta hit
const Trk::Surface& surf = etapold->associatedSurface();
@@ -2064,7 +1962,6 @@ make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LayS
" inbounds " << surf.insideBounds(lpn) << " normals " << std::setprecision(9) << surf.normal().dot(phipold->associatedSurface().normal()) <<
" locN " << locNorm.x() << " " << locNorm.y() << " " << locNorm.z()
);
- // if(use2LaySegs) std::cout<<"failed to get local position, skip"<<std::endl;
continue;
}
@@ -2105,8 +2002,6 @@ make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LayS
} // end loop over phi
} // end loop over eta
- // if(use2LaySegs) std::cout<<"matched "<<eta_match<<" eta hits and "<<phi_match<<" phi hits"<<std::endl;
-
// Handle unmatched hits here.
int eta_single = maxeta - eta_match;
int phi_single = maxphi - phi_match;
@@ -2159,7 +2054,7 @@ make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LayS
return 0;
}
}
- } //if ( etarios.size()>2 && phirios.size()>2 ) {
+ }
else { // We should never get here!
ATH_MSG_WARNING ( "Unexpected input RIO counts: " << etarios.size()
<< " " << phirios.size() );
@@ -2175,7 +2070,7 @@ make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LayS
Trk::RIO_OnTrack* pnew = pold->clone();
rios->push_back(pnew);
}
- } //if ( etarios.size()>2 && phirios.size()>2 )
+ }
unsigned int nMinRIOsTot=5;
if(use2LaySegsEta || use2LaySegsPhi) nMinRIOsTot=4;
@@ -2191,9 +2086,7 @@ make_4dMuonSegment(const MuonSegment& rsg, const MuonSegment& psg, bool use2LayS
MuonSegment* pseg = new MuonSegment(pos, pdir, cov, psrf, rios, pfq, Trk::Segment::Csc4dSegmentMaker);
pseg->setT0Error(rtime, rerrorTime);
- ATH_MSG_DEBUG ( "Segment " << rios->size() << " : ");
- // if(use2LaySegs) std::cout<<"segment from "<< rios->size()<<" rios"<<std::endl;
-
+ ATH_MSG_DEBUG ( "Segment " << rios->size() << " : ");
return pseg;
}
@@ -2245,8 +2138,8 @@ get2dSegments( Identifier eta_id, Identifier phi_id,
int nGoodEta=0,nGoodPhi=0;
for (int i=0; i<4; ++i){
- if((etaStat%(int)pow(10,i+1))/(int)pow(10,i)==0) nGoodEta++;
- if((phiStat%(int)pow(10,i+1))/(int)pow(10,i)==0) nGoodPhi++;
+ if((etaStat%(int)std::pow(10,i+1))/(int)std::pow(10,i)==0) nGoodEta++;
+ if((phiStat%(int)std::pow(10,i+1))/(int)std::pow(10,i)==0) nGoodPhi++;
}
if(nGoodEta==2){
// Find 2-hit 2D segments for eta.
@@ -2329,9 +2222,6 @@ void CscSegmentUtilTool::getRios(const ICscSegmentFinder::Segment& seg,
Trk::DefinedParameter locPar(lpos.x(),Trk::locX);
Trk::LocalParameters ppars(locPar);
- // Trk::ParamDefs icor = Trk::loc1;
- // double positionAlongStrip = lpos.get(icor); // should be carefully implemented
-
Trk::RIO_OnTrack* pclu2 = new CscClusterOnTrack(prd, ppars, cov, 0.0, prd->status(), prd->timeStatus(), prd->time());
prios->push_back(pclu2);
}
@@ -2359,10 +2249,10 @@ getDefaultError (Identifier id, bool measphi, const CscPrepData *prd ) const {
double pitch = pro->cathodeReadoutPitch(0, measphi);
// Assign position error.
double wmeas = pitch*nstrip;
- double weff = wmeas - 20; // wmeas - m_intrinsic_cluster_width;
+ double weff = wmeas - 20;
double weffmin = 0.5*wmeas;
if ( weff < weffmin ) weff = weffmin;
- double err = weff/sqrt(12.0);
+ double err = weff/std::sqrt(12.0);
return err;
}
@@ -2439,7 +2329,7 @@ matchLikelihood(const MuonSegment& rsg, const MuonSegment& psg) const {
}
// Function to return pdf value for signal distribution in xy matching.
-double CscSegmentUtilTool::pdf_sig(double x) const {
+double CscSegmentUtilTool::pdf_sig(const double x) const {
double f1, f2;
double par[6] = {1.25049, 1.02934, 0.0517436, 0.0229711, 0.900799, 0.374422};
@@ -2458,7 +2348,7 @@ double CscSegmentUtilTool::pdf_sig(double x) const {
}
// function to return pdf value for background distribution.
-double CscSegmentUtilTool::pdf_bkg(double x) const {
+double CscSegmentUtilTool::pdf_bkg(const double x) const {
double e1, e2;
double par[8] = {0.0394188, 0.0486057, 0.0869231, 1.16153, -0.109998, 0.009729, 0.36183,0.228344};
@@ -2479,7 +2369,7 @@ double CscSegmentUtilTool::pdf_bkg(double x) const {
}
// likelihood function for charge ratio
-double CscSegmentUtilTool::qratio_like(double pdf_sig, double pdf_bkg) const {
+double CscSegmentUtilTool::qratio_like(const double pdf_sig, const double pdf_bkg) const {
double like = 0;
// return zero if both probability distribution functions are zero.
@@ -2489,15 +2379,13 @@ double CscSegmentUtilTool::qratio_like(double pdf_sig, double pdf_bkg) const {
return like;
}
-bool CscSegmentUtilTool::isGood(uint32_t stripHashId) const {
- //ATH_MSG_VERBOSE ( "The strip hash id is " << stripHashId );
-
+bool CscSegmentUtilTool::isGood(const uint32_t stripHashId) const {
unsigned int status = stripStatusBit(stripHashId);
bool is_good = !( (status & 0x1) || ((status >> 1) & 0x1) ); // test for hot/dead channel
return is_good;
}
-int CscSegmentUtilTool::stripStatusBit ( uint32_t stripHashId ) const {
+int CscSegmentUtilTool::stripStatusBit (const uint32_t stripHashId ) const {
SG::ReadCondHandle<CscCondDbData> readHandle{m_readKey};
const CscCondDbData* readCdo{*readHandle};
diff --git a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/CscSegmentUtilTool.h b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/CscSegmentUtilTool.h
index 40f24ac6748fd00f4fbc80da9f2eebc40fe9c9bc..a6ad623a4f2e5739769adcf215acb6065e36c10e 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/CscSegmentUtilTool.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonSegmentMakers/MuonSegmentMakerAlgs/CscSegmentMakers/src/CscSegmentUtilTool.h
@@ -6,25 +6,25 @@
#define CscSegmentUtilTool_H
// Utilities for building segments.
-#include <string>
-#include <vector>
+#include "CscSegmentMakers/ICscSegmentUtilTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ToolHandle.h"
+
#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "MuonRIO_OnTrack/CscClusterOnTrack.h"
-#include "CscSegmentMakers/ICscSegmentUtilTool.h"
#include "CscClusterization/ICscClusterUtilTool.h"
#include "MuonRecToolInterfaces/ICscClusterOnTrackCreator.h"
#include "MuonCondData/CscCondDbData.h"
#include "xAODEventInfo/EventInfo.h"
#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "MuonReadoutGeometry/MuonDetectorManager.h"
+
+#include <string>
+#include <vector>
-namespace MuonGM {
- class MuonDetectorManager;
-}
namespace Trk {
- class RIO_OnTrack;
class PlaneSurface;
}
namespace Muon {
@@ -32,7 +32,6 @@ namespace Muon {
class CscPrepData;
}
class ICscSegmentFinder;
-class CscCondDbData;
class CscSegmentUtilTool : virtual public ICscSegmentUtilTool, public AthAlgTool {
@@ -43,7 +42,7 @@ public:
const IInterface* parent );
// Destructor.
- virtual ~CscSegmentUtilTool() {};
+ virtual ~CscSegmentUtilTool()=default;
virtual StatusCode initialize();
@@ -88,28 +87,31 @@ public:
) const;
-private: // data
-
- double m_max_chisquare_tight;
- double m_max_chisquare_loose;
- double m_max_chisquare;
- double m_max_slope_r;
- double m_max_slope_phi;
- double m_min_xylike; // Minimum value used for xy matching of 4D segments.
- float m_cluster_error_scaler;
- bool m_x5data;
- unsigned int m_max_seg_per_chamber;
- int m_max_3hitseg_sharehit;
- double m_fitsegment_tantheta_tolerance;
- bool m_zshift;
- bool m_IPconstraint;
- double m_IPerror;
- bool m_allEtaPhiMatches;
- bool m_TightenChi2;
- bool m_remove4Overlap;
- bool m_remove3Overlap;
- int m_nunspoil;
-
+private:
+ Gaudi::Property<double> m_max_chisquare_tight {this, "max_chisquare_tight", 16, "for outlier removal"};
+ Gaudi::Property<double> m_max_chisquare_loose {this, "max_chisquare_loose", 2000, "for outlier removal"};
+ Gaudi::Property<double> m_max_chisquare {this, "max_chisquare", 25};
+ Gaudi::Property<double> m_max_slope_r {this, "max_slope_r", 0.2};
+ Gaudi::Property<double> m_max_slope_phi {this, "max_slope_phi", 0.2};
+ Gaudi::Property<double> m_min_xylike {this, "min_xylike", -1, "Minimum value used for xy matching of 4D segments"};
+ Gaudi::Property<double> m_fitsegment_tantheta_tolerance {this, "tantheta_update_tolerance", 0.0001};
+ Gaudi::Property<double> m_IPerror {this, "IPerror", 250};
+
+ Gaudi::Property<float> m_cluster_error_scaler {this, "cluster_error_scaler", 1};
+
+ Gaudi::Property<int> m_nunspoil {this, "UnspoiledHits", -1};
+ Gaudi::Property<int> m_max_3hitseg_sharehit {this, "max_3hitseg_sharedhit", 0};
+
+ Gaudi::Property<unsigned int> m_max_seg_per_chamber {this, "max_seg_per_chamber", 50};
+
+ Gaudi::Property<bool> m_x5data {this, "X5data", false};
+ Gaudi::Property<bool> m_zshift {this, "zshift", true};
+ Gaudi::Property<bool> m_IPconstraint {this, "IPconstraint", true};
+ Gaudi::Property<bool> m_allEtaPhiMatches {this, "allEtaPhiMatches", true};
+ Gaudi::Property<bool> m_TightenChi2 {this, "TightenChi2", true};
+ Gaudi::Property<bool> m_remove4Overlap {this, "Remove4Overlap", true};
+ Gaudi::Property<bool> m_remove3Overlap {this, "Remove3Overlap", true};
+
ToolHandle<Muon::ICscClusterOnTrackCreator> m_rotCreator{this, "rot_creator", "Muon::CscClusterOnTrackCreator/CscClusterOnTrackCreator"};
ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
@@ -218,16 +220,16 @@ private: // data
double matchLikelihood(const Muon::MuonSegment& rsg, const Muon::MuonSegment& psg) const;
// pdf distribution function for signal events.
- double pdf_sig(double x) const;
+ double pdf_sig(const double x) const;
// pdf distribution function for background events.
- double pdf_bkg(double x) const;
+ double pdf_bkg(const double x) const;
// Likelihood function = psig/(psig +pbkg)
- double qratio_like(double pdf_sig, double pdf_bkg) const;
+ double qratio_like(const double pdf_sig, const double pdf_bkg) const;
- bool isGood(uint32_t stripHashId) const;
- int stripStatusBit(uint32_t stripHashId) const;
+ bool isGood(const uint32_t stripHashId) const;
+ int stripStatusBit(const uint32_t stripHashId) const;
};
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh
index 822632f832874a276d478c6bd10c6eb8b74c231c..c62e7cbd50f0f8e7b19b8f44d8991eb2afc3516a 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt200gev.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
-#
+# art-memory: 4096
# art-input: user.zhidong.SingleMuon_200GeV_task12089651.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 3
# art-output: trk*.txt
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh
index d62d2f0a5b8e48def1ef9e68ef0522fa0f4b51d0..bc15c8a062f9ddc1848a72b2d51cc854370fad95 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt20gev.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
-#
+# art-memory: 4096
# art-input: user.zhidong.SingleMuon_20GeV_task12089632.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 3
# art-output: trk*.txt
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh
index ad9f92eb1ea489f36411997da1b57be831014f35..e5476d4ca2e4d6fa88b3f507d2f972353eece83f 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3gev.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
-#
+# art-memory: 4096
# art-input: user.zhidong.SingleMuon_3GeV_task12089572.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 3
# art-output: trk*.txt
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh
index e2ee83e9a5c1737480917dd4759fe923557c3714..159bdbb47722a2a3a58bae504c8604ee371e8f13 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt3tev.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
-#
+# art-memory: 4096
# art-input: user.zhidong.SingleMuon_3TeV_task12089649.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 3
# art-output: trk*.txt
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh
index e66ac294e76b0b5055a84bb1a44cf272b094050d..3d309b4e5aabec3bbb001e106bf2bee88de9dbd0 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt500gev.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
-#
+# art-memory: 4096
# art-input: user.zhidong.SingleMuon_500GeV_task12089642.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 3
# art-output: trk*.txt
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh
index aad6ce2d285d8e69c7bc12c9d8b51461929eec3b..50f347ca3193b11c3c396ff3cdbf7144046ac6ce 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MooPerformance/test/test_singlemuon-mc12-pt50gev.sh
@@ -6,7 +6,7 @@
# art-include: master/Athena
# art-include: 21.0/Athena
# art-include: 21.3/Athena
-#
+# art-memory: 4096
# art-input: user.zhidong.SingleMuon_50GeV_task12089639.nopileup.HITStoRDO.r9707.20170907.v01_EXT0
# art-input-nfiles: 3
# art-output: trk*.txt
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/share/SkimmingExampleStrings.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/share/SkimmingExampleStrings.py
index 3af66cfabbbfac39b4b82b78a39e30aefa7ec946..83589dba418d20abd46ab318643519c4d687f25c 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/share/SkimmingExampleStrings.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkExamples/share/SkimmingExampleStrings.py
@@ -19,7 +19,7 @@ TEST2StringSkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "TE
#expression = "EventInfo.eventNumber")
ToolSvc += TEST2StringSkimmingTool
-print TEST2StringSkimmingTool
+printfunc(TEST2StringSkimmingTool)
#====================================================================
# CREATE THE DERIVATION KERNEL ALGORITHM AND PASS THE ABOVE TOOLS
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DL2.h b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DL2.h
index 1427d6c572c1acaba99041c242faf78df3b3b60d..e150d0c4edd7046f4343435bdc2151513d2c5ab0 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DL2.h
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DL2.h
@@ -22,6 +22,7 @@
#include <vector>
#include <functional>
#include <exception>
+#include <type_traits>
// forward declarations
namespace lwt {
@@ -122,7 +123,17 @@ namespace FlavorTagDiscriminants {
NamedVar operator()(const xAOD::Jet& jet) const {
const xAOD::BTagging* btag = jet.btagging();
if (!btag) throw std::runtime_error("can't find btagging object");
- return {m_name, m_default_flag(*btag) ? NAN : m_getter(*btag)};
+ T ret_value = m_getter(*btag);
+ bool is_default = m_default_flag(*btag);
+ if constexpr (std::is_floating_point<T>::value) {
+ if (std::isnan(ret_value) && !is_default) {
+ throw std::runtime_error(
+ "Found NAN value for '" + m_name
+ + "'. This is only allowed when using a default"
+ " value for this input");
+ }
+ }
+ return {m_name, is_default ? NAN : ret_value};
}
};
@@ -142,7 +153,14 @@ namespace FlavorTagDiscriminants {
NamedVar operator()(const xAOD::Jet& jet) const {
const xAOD::BTagging* btag = jet.btagging();
if (!btag) throw std::runtime_error("can't find btagging object");
- return {m_name, m_getter(*btag)};
+ T ret_value = m_getter(*btag);
+ if constexpr (std::is_floating_point<T>::value) {
+ if (std::isnan(ret_value)) {
+ throw std::runtime_error(
+ "Found NAN value for '" + m_name + "'.");
+ }
+ }
+ return {m_name, ret_value};
}
};
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2HighLevel.cxx b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2HighLevel.cxx
index 339a116cc4ea5ec2fddce1ff6a97b81263e4895d..127db489ca7696ff32650dd311722ba374926e9c 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2HighLevel.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2HighLevel.cxx
@@ -100,7 +100,8 @@ namespace FlavorTagDiscriminants {
{"JetFitterFlip_.*"_r, "JetFitterFlip_isDefaults"},
{"JetFitterSecondaryVertex_.*"_r, "JetFitterSecondaryVertex_isDefaults"},
{"JetFitterSecondaryVertexFlip_.*"_r, "JetFitterSecondaryVertexFlip_isDefaults"},
- {".*TrackRelativeEta(Flip)?"_r, ""},
+ {".*TrackRelativeEta"_r, "JetFitterSecondaryVertex_isDefaults"},
+ {".*TrackRelativeEtaFlip"_r, "JetFitterSecondaryVertexFlip_isDefaults"},
{"rnnip_.*"_r, "rnnip_isDefaults"},
{"rnnipflip_.*"_r, "rnnipflip_isDefaults"},
{"iprnn_.*"_r, ""},
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/HighLevelBTagAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/HighLevelBTagAlg.cxx
index 444b50c7a58072fb85b62a68ef00755a12a7ab26..0f88f4e5737182dfb6525c49194d7f9ce826962c 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/HighLevelBTagAlg.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/HighLevelBTagAlg.cxx
@@ -68,11 +68,17 @@ namespace Analysis {
StatusCode HighLevelBTagAlg::execute() {
//retrieve the BTagging container
SG::ReadHandle< xAOD::BTaggingContainer > h_btagContainer( m_BTagCollectionName);
- SG::ReadDecorHandle<xAOD::BTaggingContainer, ElementLink< xAOD::JetContainer > > h_btagJetLinkName (m_btagJetLinkName);
if (!h_btagContainer.isValid()) {
ATH_MSG_ERROR( " cannot retrieve BTagging container with key " << m_BTagCollectionName.key() );
return StatusCode::FAILURE;
}
+
+ if (h_btagContainer->size() == 0) {
+ ATH_MSG_DEBUG("#BTAG# Empty BTagging collection");
+ return StatusCode::SUCCESS;
+ }
+
+ SG::ReadDecorHandle<xAOD::BTaggingContainer, ElementLink< xAOD::JetContainer > > h_btagJetLinkName (m_btagJetLinkName);
if (!h_btagJetLinkName.isAvailable()) {
ATH_MSG_ERROR( " cannot retrieve Jet container EL decoration with key " << m_btagJetLinkName.key() );
return StatusCode::FAILURE;
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx
index 0d22f0481711d62f1a777b0b389ae6d1e0a6dd63..486a60655e39efe9f667f34f7e1362f51ad6f694 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx
@@ -98,6 +98,31 @@ namespace Analysis {
return StatusCode::FAILURE;
}
+ SG::WriteHandle<xAOD::VertexContainer> h_BTagSVCollectionName;
+ SG::WriteHandle<xAOD::BTagVertexContainer> h_BTagJFVtxCollectionName;
+
+ std::string basename = m_secVertexFinderBaseName;
+ /* Record the BTagging JF Vertex output container */
+ if (basename == "JetFitter") {
+ ATH_MSG_DEBUG("#BTAG# Record the BTagging JF Vertex output container");
+ h_BTagJFVtxCollectionName = SG::WriteHandle<xAOD::BTagVertexContainer>(m_BTagJFVtxCollectionName);
+ ATH_CHECK( h_BTagJFVtxCollectionName.record(std::make_unique<xAOD::BTagVertexContainer>(),
+ std::make_unique<xAOD::BTagVertexAuxContainer>()) );
+ }
+
+ /* Record the BTagging Secondary Vertex output container */
+ if ((basename == "SV1") || (basename == "MSV")) {
+ ATH_MSG_DEBUG("#BTAG# Record the BTagging Secondary Vertex output container");
+ h_BTagSVCollectionName = SG::WriteHandle<xAOD::VertexContainer>(m_BTagSVCollectionName);
+ ATH_CHECK( h_BTagSVCollectionName.record(std::make_unique<xAOD::VertexContainer>(),
+ std::make_unique<xAOD::VertexAuxContainer>()) );
+ }
+
+ if (h_JetCollectionName->size() == 0) {
+ ATH_MSG_DEBUG("#BTAG# Empty Jet collection");
+ return StatusCode::SUCCESS;
+ }
+
SG::ReadDecorHandle<xAOD::JetContainer, std::vector<ElementLink< xAOD::TrackParticleContainer> > > h_jetParticleLinkName (m_jetParticleLinkName);
if (!h_jetParticleLinkName.isAvailable()) {
ATH_MSG_ERROR( " cannot retrieve jet container particle EL decoration with key " << m_jetParticleLinkName.key() );
@@ -138,7 +163,6 @@ namespace Analysis {
}
}
-
if (! primaryVertex) {
ATH_MSG_DEBUG("#BTAG# No vertex labeled as VxType::PriVtx!");
xAOD::VertexContainer::const_iterator fz = h_VertexCollectionName->begin();
@@ -149,26 +173,6 @@ namespace Analysis {
}
const xAOD::Vertex& PrimaryVtx = *primaryVertex;
- std::string basename = m_secVertexFinderBaseName;
-
- SG::WriteHandle<xAOD::VertexContainer> h_BTagSVCollectionName;
- SG::WriteHandle<xAOD::BTagVertexContainer> h_BTagJFVtxCollectionName;
-
- /* Record the BTagging JF Vertex output container */
- if (basename == "JetFitter") {
- ATH_MSG_DEBUG("#BTAG# Record the BTagging JF Vertex output container");
- h_BTagJFVtxCollectionName = SG::WriteHandle<xAOD::BTagVertexContainer>(m_BTagJFVtxCollectionName);
- ATH_CHECK( h_BTagJFVtxCollectionName.record(std::make_unique<xAOD::BTagVertexContainer>(),
- std::make_unique<xAOD::BTagVertexAuxContainer>()) );
- }
-
- /* Record the BTagging Secondary Vertex output container */
- if ((basename == "SV1") || (basename == "MSV")) {
- ATH_MSG_DEBUG("#BTAG# Record the BTagging Secondary Vertex output container");
- h_BTagSVCollectionName = SG::WriteHandle<xAOD::VertexContainer>(m_BTagSVCollectionName);
- ATH_CHECK( h_BTagSVCollectionName.record(std::make_unique<xAOD::VertexContainer>(),
- std::make_unique<xAOD::VertexAuxContainer>()) );
- }
Trk::VxSecVertexInfoContainer::const_iterator infoSVIter = h_VxSecVertexInfoName->begin();
for (xAOD::JetContainer::const_iterator jetIter = h_JetCollectionName->begin(); jetIter != h_JetCollectionName->end(); ++jetIter, ++infoSVIter) {
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVtxFindingAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVtxFindingAlg.cxx
index 2156aa32e257b6497069fd4f909a6b3554187805..7f1ac927e0ec7978ff905cc9e3f36558fc827251 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVtxFindingAlg.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVtxFindingAlg.cxx
@@ -58,6 +58,15 @@ namespace Analysis {
return StatusCode::FAILURE;
}
+ /* Record the VxSecVertexInfo output container */
+ SG::WriteHandle<Trk::VxSecVertexInfoContainer> h_VxSecVertexInfoName (m_VxSecVertexInfoName);
+ ATH_CHECK( h_VxSecVertexInfoName.record(std::make_unique<Trk::VxSecVertexInfoContainer>()));
+
+ if (h_JetCollectionName->size() == 0) {
+ ATH_MSG_DEBUG("#BTAG# Empty Jet collection");
+ return StatusCode::SUCCESS;
+ }
+
SG::ReadDecorHandle<xAOD::JetContainer, std::vector<ElementLink< xAOD::TrackParticleContainer> > > h_jetParticleLinkName (m_jetParticleLinkName);
if (!h_jetParticleLinkName.isAvailable()) {
ATH_MSG_ERROR( " cannot retrieve jet container particle EL decoration with key " << m_jetParticleLinkName.key() );
@@ -96,10 +105,6 @@ namespace Analysis {
const xAOD::Vertex& PrimaryVtx = *primaryVertex;
- /* Record the VxSecVertexInfo output container */
- SG::WriteHandle<Trk::VxSecVertexInfoContainer> h_VxSecVertexInfoName (m_VxSecVertexInfoName);
- ATH_CHECK( h_VxSecVertexInfoName.record(std::make_unique<Trk::VxSecVertexInfoContainer>()));
-
for (xAOD::JetContainer::const_iterator jetIter = h_JetCollectionName->begin(); jetIter != h_JetCollectionName->end(); ++jetIter) {
const xAOD::Jet& jetToTag = **jetIter;
diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index d52c8479ca1c32edd2ccd6ca8b632f1cd328741f..9f696a894ef5d094fc8c666ecbccacd1b238b4eb 100644
--- a/Projects/Athena/package_filters.txt
+++ b/Projects/Athena/package_filters.txt
@@ -62,3 +62,7 @@
# Old packages that don't work with AthenaMT
- LArCalorimeter/LArSim
- PhysicsAnalysis/HiggsPhys/HSG5/HSG5DPDUtils
+
+# remove unused mdt calibration package
+- MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibITools
+
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h
index e64099668fb17c6158d97f8e8378581bc64e6561..60192db003db861549d50582a12e491f31f0dcd4 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.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 CALOTRKMUIDTOOLS_TRACKDEPOSITINCALOTOOL_H
@@ -49,10 +49,9 @@ class TrackDepositInCaloTool: public AthAlgTool, virtual public ITrackDepositInC
*/
public:
TrackDepositInCaloTool(const std::string& type, const std::string& name, const IInterface* pInterface);
- virtual ~TrackDepositInCaloTool();
+ virtual ~TrackDepositInCaloTool()=default;
virtual StatusCode initialize();
- virtual StatusCode finalize();
/**
Deprecated method, do not use. This method will be removed soon.
@@ -162,13 +161,13 @@ class TrackDepositInCaloTool: public AthAlgTool, virtual public ITrackDepositInC
private:
// Services & Tools
- ITHistSvc* m_histSvc{}; //!< Pointer to THistSvc
- ToolHandle<Trk::IExtrapolator> m_extrapolator{this, "ExtrapolatorHandle", ""}; //!< Extrapolator tool
+ ITHistSvc* m_histSvc{};
+ ToolHandle<Trk::IExtrapolator> m_extrapolator{this, "ExtrapolatorHandle", ""};
const 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", ""}; //!< Tool to make the step-wise extrapolation
+ 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.
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackEnergyInCaloTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackEnergyInCaloTool.h
index 424c7c62574dbdfaa1101d43059dc79e787f2edc..f9a3c3c738326e803dd272627fbb1cf95776bbac 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackEnergyInCaloTool.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackEnergyInCaloTool.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 CALOTRKMUIDTOOLS_TRACKENERGYINCALOTOOL_H
@@ -29,10 +29,9 @@ class TrackEnergyInCaloTool: public AthAlgTool, virtual public ITrackEnergyInCa
public:
TrackEnergyInCaloTool(const std::string& type, const std::string& name, const IInterface* pInterface);
/** default destructor */
- virtual ~ TrackEnergyInCaloTool();
+ virtual ~TrackEnergyInCaloTool()=default;
virtual StatusCode initialize();
- virtual StatusCode finalize();
/**
Extrapolate to a given sample using track as input
*/
@@ -133,18 +132,11 @@ class TrackEnergyInCaloTool: public AthAlgTool, virtual public ITrackEnergyInCa
private:
CaloCell_ID::CaloSample getSample( double eta, const int layer) const;
-
-
-
- /** Class member version of retrieving MsgStream */
- //int m_outputlevel;
-
+
const CaloDetDescrManager* m_calo_dd{};
- // Pre-configured extrapolator : will be choosen via jobOpt
- ToolHandle<Trk::IExtrapolator> m_extrapolator;
- // Defines the surfaces for extrapolation :
- ToolHandle<ICaloSurfaceBuilder> m_calosurf;
+ ToolHandle<Trk::IExtrapolator> m_extrapolator{this, "ExtrapolatorHandle", "Trk::Extrapolator/AtlasExtrapolator", "Pre-configured extrapolator: will be choosen via jobOpt"};
+ ToolHandle<ICaloSurfaceBuilder> m_calosurf{this, "CaloSurfaceBuilder", "CaloSurfaceBuilder", "Defines the surfaces for extrapolation"};
const Trk::ParticleMasses m_particlemasses;
};
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
index ec8235dbbfe59d6e872b2dcfe458aa3a82107f40..ae1dcac120dc916a04d4a8bb1c2fac257b5e3273 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
@@ -51,11 +51,6 @@ TrackDepositInCaloTool::TrackDepositInCaloTool( const std::string& type, const s
declareProperty("ShowNeighbours", m_showNeighbours = false);
}
-///////////////////////////////////////////////////////////////////////////////
-// Destructor
-///////////////////////////////////////////////////////////////////////////////
-TrackDepositInCaloTool::~TrackDepositInCaloTool(){}
-
///////////////////////////////////////////////////////////////////////////////
// Initialize
///////////////////////////////////////////////////////////////////////////////
@@ -111,20 +106,6 @@ StatusCode TrackDepositInCaloTool::initialize() {
}
-///////////////////////////////////////////////////////////////////////////////
-// Finalize
-///////////////////////////////////////////////////////////////////////////////
-StatusCode TrackDepositInCaloTool::finalize() {
-
- if (AlgTool::finalize().isFailure()) {
- ATH_MSG_ERROR("AlgTool couldn't be finalized()!");
- return StatusCode::FAILURE;
- }
-
- ATH_MSG_INFO("finalize() successful in " << name());
- return StatusCode::SUCCESS;
-}
-
///////////////////////////////////////////////////////////////////////////////
// getDeposits
///////////////////////////////////////////////////////////////////////////////
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackEnergyInCaloTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackEnergyInCaloTool.cxx
index a18e5a0fbceac8ab2ebf1d94a1e37331eeb99fcc..d0ecf90943596700a1b625ee5b5ffc9179354d18 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackEnergyInCaloTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackEnergyInCaloTool.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 "CaloTrkMuIdTools/TrackEnergyInCaloTool.h"
@@ -16,20 +16,10 @@
// TrackEnergyInCaloTool constructor
///////////////////////////////////////////////////////////////////////////////
TrackEnergyInCaloTool::TrackEnergyInCaloTool(const std::string& type, const std::string& name, const IInterface* pInterface) :
- AthAlgTool(type, name, pInterface),
- m_extrapolator("Trk::Extrapolator/AtlasExtrapolator"),
- m_calosurf("CaloSurfaceBuilder")
-{
+ AthAlgTool(type, name, pInterface) {
declareInterface<ITrackEnergyInCaloTool>(this);
- declareProperty("ExtrapolatorHandle", m_extrapolator);
- declareProperty("CaloSurfaceBuilder", m_calosurf);
}
-///////////////////////////////////////////////////////////////////////////////
-// TrackEnergyInCaloTool destructor
-///////////////////////////////////////////////////////////////////////////////
-TrackEnergyInCaloTool::~TrackEnergyInCaloTool(){}
-
///////////////////////////////////////////////////////////////////////////////
// TrackEnergyInCaloTool::initialize()
///////////////////////////////////////////////////////////////////////////////
@@ -37,11 +27,6 @@ StatusCode TrackEnergyInCaloTool::initialize() {
ATH_MSG_INFO("initialize() " << name());
- if ( AlgTool::initialize().isFailure() ) {
- ATH_MSG_ERROR("AlgTool couldn't be initialized!");
- return StatusCode::FAILURE;
- }
-
if ( detStore()->retrieve(m_calo_dd).isFailure() ) {
ATH_MSG_WARNING(" Unable to retrieve CaloDetDescrManager from DetectorStore calling the CaloDetDescrManager::instance() method");
m_calo_dd = CaloDetDescrManager::instance();
@@ -50,42 +35,16 @@ StatusCode TrackEnergyInCaloTool::initialize() {
return StatusCode::FAILURE;
}
- if ( m_extrapolator.retrieve().isFailure() ) {
- ATH_MSG_FATAL("Could not find Tool " << m_extrapolator.typeAndName() <<". Exiting.");
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_DEBUG("Successfully created tool " << m_extrapolator.typeAndName());
- }
+ ATH_CHECK(m_extrapolator.retrieve());
+ ATH_MSG_DEBUG("Successfully created tool " << m_extrapolator.typeAndName());
- if( m_calosurf.retrieve().isFailure() ){
- ATH_MSG_FATAL("Could not find Tool " << m_calosurf);
- return StatusCode::FAILURE;
- }
- else {
- ATH_MSG_INFO("Successfully created tool "<< m_calosurf);
- }
+ ATH_CHECK(m_calosurf.retrieve());
+ ATH_MSG_INFO("Successfully created tool "<< m_calosurf);
ATH_MSG_INFO("initialize() successful in " << name());
return StatusCode::SUCCESS;
}
-
-///////////////////////////////////////////////////////////////////////////////
-// TrackEnergyInCaloTool::finalize()
-///////////////////////////////////////////////////////////////////////////////
-StatusCode TrackEnergyInCaloTool::finalize() {
-
- if (AlgTool::finalize().isFailure()) {
- ATH_MSG_ERROR("AlgTool couldn't be finalized()!");
- return StatusCode::FAILURE;
- }
-
- ATH_MSG_INFO("finalize() successful in " << name());
- return StatusCode::SUCCESS;
-}
-
-
///////////////////////////////////////////////////////////////////////////////
// TrackEnergyInCaloTool::paramInSample
///////////////////////////////////////////////////////////////////////////////
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index a5624da3b662f00ef17b766f1bd64c0c0793cfe8..bee7b31c20d38ded5859b283cbd0a1a96711305d 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -112,12 +112,15 @@ def MuonCombinedInDetDetailedTrackSelectorToolCfg(flags, name="MuonCombinedInDet
def MuonCombinedParticleCreatorCfg(flags, name="MuonCombinedParticleCreator",**kwargs):
- # FIXME - not sure how to handle the trigger bit below (from the old configuration)
- # if TriggerFlags.MuonSlice.doTrigMuonConfig:
- # kwargs.setdefault("TrackSummaryTool" , getPublicTool("MuonTrackSummaryTool") )
-
- result = MuonCombinedTrackSummaryToolCfg(flags)
- kwargs.setdefault("TrackSummaryTool", result.getPrimary() )
+ result = ComponentAccumulator()
+ if flags.Muon.MuonTrigger:
+ from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryToolCfg
+ acc = MuonTrackSummaryToolCfg(flags)
+ kwargs.setdefault("TrackSummaryTool", acc.popPrivateTools())
+ result.merge(acc)
+ else:
+ acc = MuonCombinedTrackSummaryToolCfg(flags)
+ kwargs.setdefault("TrackSummaryTool", acc.getPrimary() )
acc = AtlasExtrapolatorCfg(flags)
kwargs.setdefault("Extrapolator", acc.getPrimary() )
@@ -176,10 +179,16 @@ def MuonMaterialProviderToolCfg(flags, name = "MuonMaterialProviderTool"):
result.addPublicTool(atlas_extrapolator)
kwargs = dict()
kwargs["Extrapolator"] = atlas_extrapolator
- acc = MuonCombinedTrackSummaryToolCfg(flags)
- muon_combined_track_summary_tool = acc.popPrivateTools()
- result.merge(acc)
- kwargs["TrackSummaryTool"] = muon_combined_track_summary_tool
+ if flags.Muon.SAMuonTrigger:
+ from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryToolCfg
+ acc = MuonTrackSummaryToolCfg(flags)
+ kwargs.setdefault("TrackSummaryTool", acc.popPrivateTools())
+ result.merge(acc)
+ else:
+ acc = MuonCombinedTrackSummaryToolCfg(flags)
+ muon_combined_track_summary_tool = acc.popPrivateTools()
+ result.merge(acc)
+ kwargs["TrackSummaryTool"] = muon_combined_track_summary_tool
kwargs["KeepAllPerigee"] = True
kwargs["PerigeeExpression"] = "Origin"
track_particle_creator = CompFactory.Trk.TrackParticleCreatorTool(name="MuonCaloParticleCreator",**kwargs)
@@ -203,11 +212,13 @@ def MuonCreatorToolCfg(flags, name="MuonCreatorTool", **kwargs):
from TrackToCalo.TrackToCaloConfig import ParticleCaloExtensionToolCfg
result = MuonMaterialProviderToolCfg(flags)
kwargs.setdefault( "CaloMaterialProvider", result.getPrimary() )
- # if TriggerFlags.MuonSlice.doTrigMuonConfig:
- # kwargs.setdefault('MakeTrackAtMSLink',True)
- # kwargs.setdefault("FillTimingInformation",False)
- # kwargs.setdefault("MuonSelectionTool", "")
- # else:
+ if flags.Muon.MuonTrigger:
+ kwargs.setdefault('MakeTrackAtMSLink',True)
+ kwargs.setdefault("FillTimingInformation",False)
+ kwargs.setdefault("MuonSelectionTool", "")
+ kwargs.setdefault("UseCaloCells", False)
+ kwargs.setdefault("TrackSegmentAssociationTool", "")
+
acc = MuonCombinedParticleCreatorCfg(flags)
kwargs.setdefault("TrackParticleCreator", acc.getPrimary() )
result.merge(acc)
@@ -237,8 +248,13 @@ def MuonCreatorToolCfg(flags, name="MuonCreatorTool", **kwargs):
def ExtrapolateMuonToIPToolCfg(flags, name="ExtrapolateMuonToIPTool", **kwargs):
#FIXME complete this configuration
- result = MuonCombinedTrackSummaryToolCfg(flags)
- kwargs.setdefault("TrackSummaryTool", result.popPrivateTools() )
+ if flags.Muon.MuonTrigger:
+ from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryToolCfg
+ result = MuonTrackSummaryToolCfg(flags)
+ kwargs.setdefault("TrackSummaryTool", result.popPrivateTools())
+ else:
+ result = MuonCombinedTrackSummaryToolCfg(flags)
+ kwargs.setdefault("TrackSummaryTool", result.popPrivateTools() )
result.setPrivateTools(CompFactory.ExtrapolateMuonToIPTool(name,**kwargs))
return result
@@ -249,13 +265,17 @@ def MuonCandidateToolCfg(flags, name="MuonCandidateTool",**kwargs):
result = CombinedMuonTrackBuilderCfg(flags, name="CombinedMuonTrackBuilder")
kwargs.setdefault("TrackBuilder", result.popPrivateTools() )
-# Why was this dependent on cosmics? will now always create this
-# if flags.Beam.Type=="cosmics":
- acc = ExtrapolateMuonToIPToolCfg(flags)
- extrapolator = acc.popPrivateTools()
- result.addPublicTool(extrapolator)
- kwargs.setdefault("TrackExtrapolationTool", extrapolator )
- result.merge(acc)
+ # Why was this dependent on cosmics? will now always create this
+ # if flags.Beam.Type=="cosmics":
+ if flags.Muon.MuonTrigger and flags.Beam.Type!="cosmics":
+ #trigger definitely only uses the ExtrapolateToIPtool in cosmics mode
+ kwargs.setdefault("TrackExtrapolationTool", "")
+ else:
+ acc = ExtrapolateMuonToIPToolCfg(flags)
+ extrapolator = acc.popPrivateTools()
+ result.addPublicTool(extrapolator)
+ kwargs.setdefault("TrackExtrapolationTool", extrapolator )
+ result.merge(acc)
# if cosmics was until here
acc = MuonAmbiProcessorCfg(flags)
@@ -360,11 +380,16 @@ def iPatFitterCfg(flags, name='iPatFitter', **kwargs):
kwargs.setdefault("FullCombinedFit", True )
result = MuidMaterialAllocatorCfg(flags)
kwargs.setdefault("MaterialAllocator",result.popPrivateTools() )
- # if TriggerFlags.MuonSlice.doTrigMuonConfig:
- # kwargs.setdefault("MaxIterations", 15)
- acc = MuonCombinedTrackSummaryToolCfg(flags)
- kwargs.setdefault("TrackSummaryTool", acc.getPrimary() )
- result.merge(acc)
+ if flags.Muon.MuonTrigger:
+ kwargs.setdefault("MaxIterations", 15)
+ from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryToolCfg
+ acc = MuonTrackSummaryToolCfg(flags)
+ kwargs.setdefault("TrackSummaryTool", acc.popPrivateTools())
+ result.merge(acc)
+ else:
+ acc = MuonCombinedTrackSummaryToolCfg(flags)
+ kwargs.setdefault("TrackSummaryTool", acc.getPrimary() )
+ result.merge(acc)
tool = CompFactory.Trk.iPatFitter(name,**kwargs)
result.setPrivateTools(tool)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
index 4533997e04666ecfc3626f680e055d7981ee4b9a..f95b8b148d193d2164ed7331059313188cd331bc 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedReconstructionConfig.py
@@ -232,9 +232,13 @@ def MuonCreatorAlgCfg( flags, name="MuonCreatorAlg",**kwargs ):
# but don't set this default in case the StauCreatorAlg is created (see below)
if not flags.MuonCombined.doMuGirl and not name=="StauCreatorAlg":
kwargs.setdefault("TagMaps",["muidcoTagMap","stacoTagMap","caloTagMap","segmentTagMap"])
- # if TriggerFlags.MuonSlice.doTrigMuonConfig:
- # kwargs.setdefault("MakeClusters", False)
- # kwargs.setdefault("ClusterContainerName", "")
+ if flags.Muon.MuonTrigger:
+ kwargs.setdefault("MakeClusters", False)
+ kwargs.setdefault("ClusterContainerName", "")
+ if flags.Muon.SAMuonTrigger:
+ kwargs.setdefault("CreateSAmuons", True)
+ kwargs.setdefault("TagMaps", [])
+
alg = CompFactory.MuonCreatorAlg(name,**kwargs)
result.addEventAlgo( alg, primary=True )
return result
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py b/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
index 91f41f9df1424ae6736c06dde157cb9d7c367ecf..e0c49adb64615745d03ad7629ab073549a4f5514 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtriggerLegacy.py
@@ -198,6 +198,9 @@ if _streamRDO:
_streamRDO.ItemList +=["2927#*"]
_streamRDO.ItemList +=["2934#*"]
_streamRDO.ItemList += [ "xAOD::EventInfo#*", "xAOD::EventAuxInfo#*" ]
+ # Never store wildcarded legacy EventInfo
+ if "EventInfo#*" in _streamRDO.ItemList:
+ _streamRDO.ItemList.remove("EventInfo#*")
condSeq = AthSequencer("AthCondSeq")
if not hasattr( condSeq, "LumiBlockMuWriter" ):
diff --git a/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx b/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
index 431a2b088f65fe1205e2cd70290b4a5f9a60927c..08b349310712a0e093a821f816bf52ee3ec22421 100644
--- a/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
+++ b/Reconstruction/egamma/egammaValidation/src/EfficiencyPlot.cxx
@@ -33,7 +33,7 @@ namespace egammaMonitoring {
TH1D *efficiency = (TH1D*) p.second->Clone(Form("%s_%s",m_name.c_str(),p.first.c_str()));
- efficiency->Divide(total->histoMap[p.first]);
+ efficiency->Divide(p.second, total->histoMap[p.first], 1, 1, "B");
efficiency->GetYaxis()->SetTitle("Efficiency");
efficiency->GetYaxis()->SetRangeUser(0,1.1);
ATH_CHECK(m_rootHistSvc->regHist(Form("%sEff_%s", m_folder.c_str(), p.first.c_str()), efficiency));
diff --git a/Simulation/Digitization/python/DigitizationReadMetaData.py b/Simulation/Digitization/python/DigitizationReadMetaData.py
index 539ad9ff71ee1dd3ae2a5149ac4be55aaf6acf17..ceaeeecfb25fea335ca6bcfcaa8fdcbc7059bb53 100644
--- a/Simulation/Digitization/python/DigitizationReadMetaData.py
+++ b/Simulation/Digitization/python/DigitizationReadMetaData.py
@@ -4,6 +4,18 @@ from __future__ import print_function
from AthenaCommon.Logging import logging
logDigitizationReadMetadata = logging.getLogger( 'DigitizationReadMetadata' )
+def checkLegacyEventInfo(inputlist):
+ """ Check for legacy EventInfo """
+ present = False
+ for entry in inputlist:
+ if entry[0] != 'EventInfo':
+ continue
+
+ print(entry)
+ present = True
+
+ return present
+
def hitColls2SimulatedDetectors(inputlist):
"""Build a dictionary from the list of containers in the metadata"""
simulatedDetectors = []
@@ -194,6 +206,11 @@ def buildDict(inputtype, inputfile):
else :
from Digitization.DigitizationFlags import digitizationFlags
digitizationFlags.experimentalDigi += ['OldTileCalibHitContainers']
+ ## Check for legacy EventInfo
+ if 'eventdata_items' in f.infos.keys():
+ metadatadict['LegacyEventInfo'] = checkLegacyEventInfo(f.infos['eventdata_items'])
+ else:
+ metadatadict['LegacyEventInfo'] = False
##End of Patch for older hit files
logDigitizationReadMetadata.debug("%s Simulation MetaData Dictionary Successfully Created.",inputtype)
logDigitizationReadMetadata.debug("Found %s KEY:VALUE pairs in %s Simulation MetaData." , Nkvp,inputtype)
@@ -302,6 +319,12 @@ def signalMetaDataCheck(metadatadict):
logDigitizationReadMetadata.info("All sub-detectors were simulated, so none needed to be switched off in digitization.")
DetFlags.Print()
+ # Check for legacy EventInfo presence
+ if not skipCheck('LegacyEventInfo'):
+ if metadatadict['LegacyEventInfo']:
+ from Digitization.DigitizationFlags import digitizationFlags
+ digitizationFlags.experimentalDigi += ['LegacyEventInfo']
+
## Any other checks here
logDigitizationReadMetadata.info("Completed checks of Digitization properties against Signal Simulation MetaData.")
diff --git a/Simulation/Digitization/share/DetectorDigitization.py b/Simulation/Digitization/share/DetectorDigitization.py
index bc96f48b528eae6096bfebed6a94a8ea37ff619d..820e1b04ac2a6a49480c5da7f50e342cf6cf4fa2 100755
--- a/Simulation/Digitization/share/DetectorDigitization.py
+++ b/Simulation/Digitization/share/DetectorDigitization.py
@@ -33,7 +33,14 @@ if jobproperties.Beam.beamType == "cosmics" :
from AthenaCommon.AlgSequence import AlgSequence
job = AlgSequence()
+
+# Convert old legacy EventInfo if needed
from Digitization.DigitizationFlags import digitizationFlags
+if 'LegacyEventInfo' in digitizationFlags.experimentalDigi() and \
+ not (DetFlags.pileup.any_on() or digitizationFlags.doXingByXingPileUp()):
+ from xAODEventInfoCnv.xAODEventInfoCnvAlgDefault import xAODEventInfoCnvAlgDefault
+ xAODEventInfoCnvAlgDefault (sequence = job)
+
job += CfgGetter.getAlgorithm(digitizationFlags.digiSteeringConf.get_Value(), tryDefaultConfigurable=True)
if 'doFastPixelDigi' in digitizationFlags.experimentalDigi() or 'doFastSCT_Digi' in digitizationFlags.experimentalDigi() or 'doFastTRT_Digi' in digitizationFlags.experimentalDigi():
print ("WARNING Setting doFastPixelDigi ,doFastSCT_Digi or doFastTRT_Digi in digitizationFlags.experimentalDigi no longer overrides digitizationFlags.digiSteeringConf.")
diff --git a/Simulation/Digitization/share/Digitization.py b/Simulation/Digitization/share/Digitization.py
index 534c8748992405951dd05311a346eb26a406f90b..342346ac376860e39bf2c02b730a2523a01ab11c 100755
--- a/Simulation/Digitization/share/Digitization.py
+++ b/Simulation/Digitization/share/Digitization.py
@@ -123,7 +123,7 @@ if DetFlags.writeRDOPool.any_on():
eventInfoKey = overlayFlags.bkgPrefix() + "EventInfo"
else:
eventInfoKey = "EventInfo"
- streamRDO = AthenaPoolOutputStream("StreamRDO", athenaCommonFlags.PoolRDOOutput.get_Value(), asAlg=True, noTag=not premixing, eventInfoKey=eventInfoKey)
+ streamRDO = AthenaPoolOutputStream("StreamRDO", athenaCommonFlags.PoolRDOOutput.get_Value(), asAlg=True, eventInfoKey=eventInfoKey)
from Digitization.DigiOutput import getStreamRDO_ItemList
streamRDO.ItemList = getStreamRDO_ItemList(logDigitization_flags)
streamRDO.AcceptAlgs += [ digitizationFlags.digiSteeringConf.get_Value() ]
diff --git a/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py b/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py
index 51d3efbd297b60bc56119c115a2dcab55b54a7fc..8155a366e6b12aa2c8031d04fca86d7787bf7ea4 100644
--- a/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py
+++ b/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.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 AthenaConfiguration.AthConfigFlags import AthConfigFlags
@@ -80,6 +80,7 @@ def createSimConfigFlags():
scf.addFlag("Sim.ISF.HITSMergingRequired", True)
scf.addFlag("Sim.ISF.Simulator", "ATLFASTII")
scf.addFlag("Sim.ISF.DoTimeMonitoring", True) # bool: run time monitoring
+ scf.addFlag("Sim.ISF.DoMemoryMonitoring", True) # bool: run time monitoring
scf.addFlag("Sim.ISF.ValidationMode", False) # bool: run ISF internal validation checks
scf.addFlag("Sim.FastCalo.ParamsInputFilename", "FastCaloSim/MC16/TFCSparam_v011.root") # filename of the input parametrizations file
@@ -95,5 +96,15 @@ def createSimConfigFlags():
scf.addFlag("Sim.FastChain.PUWeights_lar_hec", [1.0]) # LAr HEC
scf.addFlag("Sim.FastChain.PUWeights_lar_bapre", [1.0]) # LAr Barrel presampler
scf.addFlag("Sim.FastChain.PUWeights_tile", [1.0]) # Tile
+
+ # Fatras
+ scf.addFlag("Sim.Fatras.RandomStreamName", "FatrasRnd")
+ scf.addFlag("Sim.Fatras.G4RandomStreamName", "FatrasG4")
+ scf.addFlag("Sim.Fatras.TrkExRandomStreamName", "TrkExRnd")
+ # Fatras fine tuning
+ scf.addFlag("Sim.Fatras.MomCutOffSec", 50.) # common momentum cut-off for secondaries
+ scf.addFlag("Sim.Fatras.HadronIntProb", 1.) # hadronic interaction scale factor
+ scf.addFlag("Sim.Fatras.GaussianMixtureModel", True) # use Gaussian mixture model for Multiple Scattering
+ scf.addFlag("Sim.Fatras.BetheHeitlerScale", 1.) # scale to Bethe-Heitler contribution
return scf
diff --git a/Simulation/ISF/ISF_Config/python/ISF_MainConfigNew.py b/Simulation/ISF/ISF_Config/python/ISF_MainConfigNew.py
new file mode 100644
index 0000000000000000000000000000000000000000..e64ea1a71dadeae4cd11114490c6981d996fb990
--- /dev/null
+++ b/Simulation/ISF/ISF_Config/python/ISF_MainConfigNew.py
@@ -0,0 +1,163 @@
+"""Main ISF tools configuration with ComponentAccumulator
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+from ISF_Services.ISF_ServicesCoreConfigNew import GeoIDSvcCfg
+from ISF_Services.ISF_ServicesConfigNew import (
+ InputConverterCfg, ParticleBrokerSvcCfg,
+ TruthServiceCfg, LongLivedInputConverterCfg,
+)
+from ISF_Tools.ISF_ToolsConfigNew import (
+ MemoryMonitorToolCfg, ParticleKillerToolCfg,
+ EnergyParticleOrderingToolCfg,
+)
+from ISF_SimulationSelectors.ISF_SimulationSelectorsConfigNew import (
+ FullGeant4SelectorCfg,
+ DefaultParticleKillerSelectorCfg,
+ PassBackGeant4SelectorCfg,
+)
+from ISF_Geant4Tools.ISF_Geant4ToolsConfigNew import (
+ FullGeant4ToolCfg, LongLivedGeant4ToolCfg,
+ PassBackGeant4ToolCfg,
+)
+from ISF_FastCaloSimServices.ISF_FastCaloSimServicesConfigNew import (
+ FastCaloToolBaseCfg,
+)
+
+# MT
+def Kernel_GenericSimulatorMTCfg(flags, name="ISF_Kernel_GenericSimulatorMT", **kwargs):
+ acc = ComponentAccumulator()
+
+ tool = acc.popToolsAndMerge(ParticleKillerToolCfg(flags))
+ kwargs.setdefault("ParticleKillerTool", tool)
+
+ acc.merge(GeoIDSvcCfg(flags))
+ kwargs.setdefault("GeoIDSvc", acc.getService("ISF_GeoIDSvc"))
+ acc.merge(InputConverterCfg(flags))
+
+ kwargs.setdefault("InputConverter", acc.getService("ISF_InputConverter"))
+
+ truthacc = TruthServiceCfg(flags)
+ kwargs.setdefault("TruthRecordService", truthacc.getPrimary())
+ acc.merge(truthacc)
+
+ kwargs.setdefault("Cardinality", flags.Concurrency.NumThreads)
+ kwargs.setdefault("OutputLevel", 1)
+ kwargs.setdefault("InputEvgenCollection", "BeamTruthEvent")
+ kwargs.setdefault("OutputTruthCollection", "TruthEvent")
+
+ acc.addEventAlgo(CompFactory.ISF.SimKernelMTCfg(name, **kwargs))
+ return acc
+
+
+def Kernel_GenericSimulatorNoG4MTCfg(flags, name="ISF_Kernel_GenericSimulatorNoG4MT", **kwargs):
+ return Kernel_GenericSimulatorMTCfg(flags, name, **kwargs)
+
+
+def Kernel_GenericG4OnlyMTCfg(flags, name="ISF_Kernel_GenericG4OnlyMT", **kwargs):
+ acc = ComponentAccumulator()
+
+ tool = acc.popToolsAndMerge(FullGeant4SelectorCfg(flags))
+ kwargs.setdefault("BeamPipeSimulationSelectors", [tool])
+ kwargs.setdefault("IDSimulationSelectors", [tool])
+ kwargs.setdefault("CaloSimulationSelectors", [tool])
+ kwargs.setdefault("MSSimulationSelectors", [tool])
+
+ tool = acc.popToolsAndMerge(DefaultParticleKillerSelectorCfg(flags))
+ kwargs.setdefault("CavernSimulationSelectors", [tool])
+
+ return Kernel_GenericSimulatorMTCfg(flags, name, **kwargs)
+
+
+def Kernel_FullG4MTCfg(flags, name="ISF_Kernel_FullG4MT", **kwargs):
+ acc = ComponentAccumulator()
+
+ PKtool = acc.popToolsAndMerge(ParticleKillerToolCfg(flags))
+ Fulltool = acc.popToolsAndMerge(FullGeant4ToolCfg(flags))
+ kwargs.setdefault("SimulationTools", [PKtool, Fulltool])
+
+ return Kernel_GenericG4OnlyMTCfg(flags, name, **kwargs)
+
+
+def Kernel_FullG4MT_LongLivedCfg(flags, name="ISF_Kernel_FullG4MT_LongLived", **kwargs):
+ acc = ComponentAccumulator()
+
+ PKtool = acc.popToolsAndMerge(ParticleKillerToolCfg(flags))
+ LLtool = acc.popToolsAndMerge(LongLivedGeant4ToolCfg(flags))
+ kwargs.setdefault("SimulationTools", [PKtool, LLtool])
+
+ acc.merge(LongLivedInputConverterCfg(flags))
+ kwargs.setdefault("InputConverter",
+ acc.getService("ISF_LongLivedInputConverter"))
+
+ return Kernel_GenericG4OnlyMTCfg(flags, name, **kwargs)
+
+
+def Kernel_PassBackG4MTCfg(flags, name="ISF_Kernel_PassBackG4MT", **kwargs):
+ acc = ComponentAccumulator()
+
+ tool = acc.popToolsAndMerge(PassBackGeant4SelectorCfg(flags))
+ kwargs.setdefault("BeamPipeSimulationSelectors", [tool])
+ kwargs.setdefault("IDSimulationSelectors", [tool])
+ kwargs.setdefault("CaloSimulationSelectors", [tool])
+ kwargs.setdefault("MSSimulationSelectors", [tool])
+
+ tool = acc.popToolsAndMerge(DefaultParticleKillerSelectorCfg(flags))
+ kwargs.setdefault("CavernSimulationSelectors", [tool])
+
+ PKtool = acc.popToolsAndMerge(ParticleKillerToolCfg(flags))
+ PBtool = acc.popToolsAndMerge(PassBackGeant4ToolCfg(flags))
+ kwargs.setdefault("SimulationTools", [PKtool, PBtool])
+
+ tool = acc.popToolsAndMerge(EnergyParticleOrderingToolCfg(flags))
+ kwargs.setdefault("ParticleOrderingTool", tool)
+
+ return Kernel_GenericSimulatorMTCfg(flags, name, **kwargs)
+
+
+def Kernel_ATLFASTIIFMTCfg(flags, name="ISF_Kernel_ATLFASTIIFMT", **kwargs):
+ acc = ComponentAccumulator()
+
+ PKtool = acc.popToolsAndMerge(ParticleKillerToolCfg(flags))
+ FastCalotool = acc.popToolsAndMerge(FastCaloToolBaseCfg(flags))
+ # TODO resolve this missing config
+ raise NotImplementedError("No configuration for \"ISF_FatrasTool\"")
+ Fatrastool = None
+ # Fatrastool = acc.popToolsAndMerge(FatrasToolCfg(flags))
+ kwargs.setdefault("SimulationTools", [PKtool, FastCalotool, Fatrastool])
+
+ # not migrated 'simFlags.SimulationFlavour = "ATLFASTIIF"'
+ return Kernel_GenericSimulatorNoG4MTCfg(flags, name, **kwargs)
+
+
+# non-MT
+# Note: mostly not migrated
+def Kernel_GenericSimulatorCfg(flags, name="ISF_Kernel_GenericSimulator", **kwargs):
+ acc = ComponentAccumulator()
+
+ acc.merge(InputConverterCfg(flags))
+ kwargs.setdefault("InputConverter", acc.getService("ISF_InputConverter"))
+
+ acc.merge(ParticleBrokerSvcCfg(flags))
+ kwargs.setdefault("ParticleBroker", acc.getService("ISF_ParticleBrokerSvc"))
+
+ truthacc = TruthServiceCfg(flags)
+ kwargs.setdefault("TruthRecordService", truthacc.getPrimary())
+ acc.merge(truthacc)
+
+ tool = acc.popToolsAndMerge(MemoryMonitorToolCfg(flags))
+ kwargs.setdefault("MemoryMonitoringTool", tool)
+
+ kwargs.setdefault("DoCPUMonitoring", flags.Sim.ISF.DoTimeMonitoring)
+ kwargs.setdefault("DoMemoryMonitoring", flags.Sim.ISF.DoMemoryMonitoring)
+ kwargs.setdefault("InputHardScatterCollection", "BeamTruthEvent")
+ kwargs.setdefault("OutputHardScatterTruthCollection", "TruthEvent")
+
+ acc.addEventAlgo(CompFactory.ISF.SimKernelCfg(name, **kwargs))
+ return acc
+
+
+def Kernel_GenericSimulatorNoG4Cfg(flags, name="ISF_Kernel_GenericSimulatorNoG4", **kwargs):
+ return Kernel_GenericSimulatorCfg(flags, name, **kwargs)
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/python/CollectionMergerConfig.py b/Simulation/ISF/ISF_Core/ISF_Algorithms/python/CollectionMergerConfig.py
index 1233f619d19883bd0e9b23b9aea88d2b9179bed8..d9950f5254b337762e4a90fd1215b5f8500460d0 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/python/CollectionMergerConfig.py
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/python/CollectionMergerConfig.py
@@ -1,6 +1,8 @@
-# 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 AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaCommon.Logging import logging
+
def ISFCollectionMergerCfg(flags,name="ISF_CollectionMerger", **kwargs):
kwargs.setdefault( "InputBCMHits", [ ] )
@@ -22,8 +24,16 @@ def ISFCollectionMergerCfg(flags,name="ISF_CollectionMerger", **kwargs):
kwargs.setdefault( "InputRPCHits", [ ] )
kwargs.setdefault( "InputTGCHits", [ ] )
hardscatterSG=""
- if flags.Digitization.Pileup is True:
- hardscatterSG = "OriginalEvent_SG+"
+ try:
+ if flags.Digitization.Pileup is True:
+ hardscatterSG = "OriginalEvent_SG+"
+ except RuntimeError as err:
+ msg = logging.getLogger(name)
+ msg.info("Caught {!r}. "
+ "Digitization flags are unavailable in AthSimulation."
+ .format(err))
+ # FIXME: Digitization is not the AthSimulation project;
+ # support for FastChain may need to be added in the future.
kwargs.setdefault( "OutputBCMHits", hardscatterSG+"BCMHits" )
kwargs.setdefault( "OutputBLMHits", hardscatterSG+"BLMHits" )
kwargs.setdefault( "OutputPixelHits", hardscatterSG+"PixelHits" )
diff --git a/Simulation/ISF/ISF_Core/ISF_Tools/python/ISF_ToolsConfigNew.py b/Simulation/ISF/ISF_Core/ISF_Tools/python/ISF_ToolsConfigNew.py
index b985690499a3fa81502c990370cb3ef0d3709ee2..a06608032d58c8ef9e501ca75e392a37dfb4c844 100644
--- a/Simulation/ISF/ISF_Core/ISF_Tools/python/ISF_ToolsConfigNew.py
+++ b/Simulation/ISF/ISF_Core/ISF_Tools/python/ISF_ToolsConfigNew.py
@@ -11,7 +11,7 @@ from BarcodeServices.BarcodeServicesConfigNew import BarcodeSvcCfg
def ParticleHelperCfg(flags, name="ISF_ParticleHelper", **kwargs):
acc = BarcodeSvcCfg(flags)
kwargs.setdefault("BarcodeSvc", acc.getPrimary())
- acc.setPrivateTools(CompFactory.ISF.ParticleHelper(name, **kwargs))
+ acc.addPublicTool(CompFactory.ISF.ParticleHelper(name, **kwargs))
return acc
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
index cbf9e11127292880badd463b50c117ce15feb209..5f5c8c28792993b0b3cd4e26d0cd85b04c8eaea2 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/CMakeLists.txt
@@ -12,5 +12,5 @@ atlas_add_component( ISF_FatrasServices
LINK_LIBRARIES AthenaBaseComps AtlasDetDescr GaudiKernel ISF_InterfacesLib TrkTrack ISF_Event )
# 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/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTrackingGeometrySvc.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTrackingGeometrySvc.py
index 6a34bd8309613baf61608685fa59c80749076846..6426782625052ac08464e63c37ff0e5bd0e75dad 100755
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTrackingGeometrySvc.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/FatrasTrackingGeometrySvc.py
@@ -4,7 +4,6 @@ from __future__ import print_function
class FatrasTrackingGeometrySvc:
def __init__(self):
- from AthenaCommon.Include import include
from AthenaCommon.AppMgr import ToolSvc
##################################################################################
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
index 8916d22761bad1fd1257aa56ba2717ac34b4707b..5444dd2e3555772700b37ed5d1f75f1ba3343750 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
@@ -6,6 +6,12 @@ from AthenaCommon.Logging import logging
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from ISF_Algorithms.collection_merger_helpers import generate_mergeable_collection_name
+from ISF_Tools.ISF_ToolsConfigNew import ParticleHelperCfg
+from ISF_Services.ISF_ServicesCoreConfigNew import (
+ ParticleBrokerSvcCfg, TruthServiceCfg,
+)
+from RngComps.RandomServices import RNG
+from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
################################################################################
# HIT CREATION SECTION
@@ -20,12 +26,15 @@ def fatrasHitCreatorPixelCfg(flags, name="ISF_FatrasHitCreatorPixel", **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
- acc = ComponentAccumulator()
+ result = ComponentAccumulator()
hits_collection_name = generate_mergeable_collection_name(bare_collection_name="PixelHits",
mergeable_collection_suffix="_Fatras",
merger_input_property="PixelHits")
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
kwargs.setdefault("IdHelperName", 'PixelID')
kwargs.setdefault("CollectionName", hits_collection_name)
@@ -34,8 +43,8 @@ def fatrasHitCreatorPixelCfg(flags, name="ISF_FatrasHitCreatorPixel", **kwargs):
kwargs.setdefault("UseConditionsTool", False)
iFatras__HitCreatorSilicon = CompFactory.iFatras.HitCreatorSilicon
- acc.addPublicTool(iFatras__HitCreatorSilicon(name=name, **kwargs))
- return acc
+ result.addPublicTool(iFatras__HitCreatorSilicon(name=name, **kwargs))
+ return result
def fatrasHitCreatorSCTCfg(flags, name="ISF_FatrasHitCreatorSCT", **kwargs):
@@ -43,34 +52,59 @@ def fatrasHitCreatorSCTCfg(flags, name="ISF_FatrasHitCreatorSCT", **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
- acc = ComponentAccumulator()
+ result = ComponentAccumulator()
hits_collection_name = generate_mergeable_collection_name(bare_collection_name="SCT_Hits",
mergeable_collection_suffix="_Fatras",
merger_input_property="SCTHits")
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
kwargs.setdefault("IdHelperName", 'SCT_ID')
kwargs.setdefault("CollectionName", hits_collection_name)
kwargs.setdefault("UseConditionsTool", False)
iFatras__HitCreatorSilicon = CompFactory.iFatras.HitCreatorSilicon
- acc.addPublicTool(iFatras__HitCreatorSilicon(name=name, **kwargs))
- return acc
+ result.addPublicTool(iFatras__HitCreatorSilicon(name=name, **kwargs))
+ return result
def fatrasHitCreatorTRTCfg(flags, name="ISF_FatrasHitCreatorTRT", **kwargs):
+ """Return ISF_FatrasHitCreatorTRT configured with ComponentAccumulator"""
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
- acc = ComponentAccumulator()
+ result = ComponentAccumulator()
hits_collection_name = generate_mergeable_collection_name(bare_collection_name="TRTUncompressedHits",
mergeable_collection_suffix="_Fatras",
merger_input_property="TRTUncompressedHits")
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
kwargs.setdefault("CollectionName", hits_collection_name)
iFatras__HitCreatorTRT = CompFactory.iFatras.HitCreatorTRT
- acc.addPublicTool(iFatras__HitCreatorTRT(name=name, **kwargs))
- return acc
+ result.addPublicTool(iFatras__HitCreatorTRT(name=name, **kwargs))
+ return result
+
+
+def fatrasPileupHitCreatorPixelCfg(flags, name="ISF_FatrasPileupHitCreatorPixel", **kwargs):
+ """Return ISF_FatrasHitCreatorPixel configured for pileup with ComponentAccumulator"""
+ kwargs.setdefault("CollectionName", "PileupPixelHits")
+ return fatrasHitCreatorPixelCfg(flags, name, **kwargs)
+
+
+def fatrasPileupHitCreatorSCTCfg(flags, name="ISF_FatrasPileupHitCreatorSCT", **kwargs):
+ """Return ISF_FatrasHitCreatorSCT configured for pileup with ComponentAccumulator"""
+ kwargs.setdefault("CollectionName", "PileupSCT_Hits")
+ return fatrasHitCreatorSCTCfg(flags, name, **kwargs)
+
+
+def fatrasPileupHitCreatorTRTCfg(flags, name="ISF_FatrasPileupHitCreatorTRT", **kwargs):
+ """Return ISF_FatrasHitCreatorTRT configured with ComponentAccumulator"""
+ kwargs.setdefault("CollectionName", "PileupTRTUncompressedHits")
+ return fatrasHitCreatorTRTCfg(flags, name, **kwargs)
################################################################################
@@ -100,13 +134,39 @@ def fatrasSimHitCreatorIDCfg(flags, name="ISF_FatrasSimHitCreatorID", **kwargs):
result.merge(acc)
kwargs.setdefault("TrtHitCreator", trt_hit_cfg)
- kwargs.setdefault("OutputLevel", 3)
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
iFatras__SimHitCreatorID = CompFactory.iFatras.SimHitCreatorID
result.addPublicTool(iFatras__SimHitCreatorID(name=name, **kwargs))
return result
+def fatrasPileupSimHitCreatorIDCfg(flags, name="ISF_FatrasPileupSimHitCreatorID", **kwargs):
+ """Return ISF_FatrasSimHitCreatorID configured for pileup with ComponentAccumulator"""
+
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ acc = fatrasPileupHitCreatorPixelCfg(flags)
+ pixel_hit_cfg = acc.getPublicTool('ISF_FatrasHitCreatorPixel')
+ result.merge(acc)
+ kwargs.setdefault("PixelHitCreator", pixel_hit_cfg)
+
+ acc = fatrasPileupHitCreatorSCTCfg(flags)
+ sct_hit_cfg = acc.getPublicTool('ISF_FatrasHitCreatorSCT')
+ result.merge(acc)
+ kwargs.setdefault("SctHitCreator", sct_hit_cfg)
+
+ acc = fatrasPileupHitCreatorTRTCfg(flags)
+ trt_hit_cfg = acc.getPublicTool("ISF_FatrasHitCreatorTRT")
+ result.merge(acc)
+ kwargs.setdefault("TrtHitCreator", trt_hit_cfg)
+
+ return fatrasSimHitCreatorIDCfg(flags, name, **kwargs)
+
+
def fatrasSimHitCreatorMSCfg(flags, name="ISF_FatrasSimHitCreatorMS", **kwargs):
"""Return ISF_FatrasSimHitCreatorMS configured with ComponentAccumulator"""
@@ -132,9 +192,11 @@ def fatrasSimHitCreatorMSCfg(flags, name="ISF_FatrasSimHitCreatorMS", **kwargs):
csc_hits_collection_name = generate_mergeable_collection_name(bare_collection_name="CSC_Hits",
mergeable_collection_suffix=mergeable_collection_suffix,
merger_input_property="CSCHits")
-
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
#####
- # Extrapolator from ACTS to be added
+ # Extrapolator from ACTS to be added TODO
# kwargs.setdefault("Extrapolator" , getPublicTool('ISF_FatrasExtrapolator'))
#####
kwargs.setdefault("MDTCollectionName", mdt_hits_collection_name)
@@ -192,23 +254,20 @@ def G4RunManagerHelperCfg(flags, name="ISF_G4RunManagerHelper", **kwargs):
return result
-def fatrasParticleHelperCfg(flags, name="ISF_ParticleHelper", **kwargs):
+def fatrasParticleDecayHelperCfg(flags, name="ISF_FatrasParticleDecayHelper", **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
result = ComponentAccumulator()
- ISF__ParticleHelper = CompFactory.ISF.ParticleHelper
- result.addPublicTool(ISF__ParticleHelper(name=name, **kwargs))
-
- return result
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
+ kwargs.setdefault("G4RandomStreamName", flags.Sim.Fatras.G4RandomStreamName)
+ kwargs.setdefault("ValidationMode", flags.Sim.ISF.ValidationMode)
-
-def fatrasParticleDecayHelperCfg(flags, name="ISF_FatrasParticleDecayHelper", **kwargs):
- mlog = logging.getLogger(name)
- mlog.debug('Start configuration')
-
- result = ComponentAccumulator()
+ result.merge(ParticleBrokerSvcCfg(flags))
+ kwargs.setdefault("ParticleBroker", result.getService("ISF_ParticleBrokerSvc"))
acc = fatrasPdgG4ParticleCfg(flags)
pdg_g4part_cfg = acc.getPublicTool('ISF_FatrasPdgG4Particle')
@@ -223,13 +282,14 @@ def fatrasParticleDecayHelperCfg(flags, name="ISF_FatrasParticleDecayHelper", **
acc = G4RunManagerHelperCfg(flags)
g4run_man_cfg = acc.getPublicTool('ISF_G4RunManagerHelper')
result.merge(acc)
- kwargs.setdefault("PDGToG4ParticleConverter", g4run_man_cfg)
+ kwargs.setdefault("G4RunManagerHelper", g4run_man_cfg)
iFatras__G4ParticleDecayHelper = CompFactory.iFatras.G4ParticleDecayHelper
result.addPublicTool(iFatras__G4ParticleDecayHelper(name=name, **kwargs))
return result
+
################################################################################
# Extrapolator
################################################################################
@@ -238,9 +298,8 @@ def fatrasNavigatorCfg(flags, name="ISF_FatrasNavigator", **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
- result = ComponentAccumulator()
+ result = ComponentAccumulator()
- from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
acc = TrackingGeometrySvcCfg(flags)
kwargs.setdefault("TrackingGeometrySvc", acc.getPrimary())
result.merge(acc)
@@ -250,32 +309,178 @@ def fatrasNavigatorCfg(flags, name="ISF_FatrasNavigator", **kwargs):
return result
+
+def fatrasNeutralPropagatorIDCfg(flags, name="ISF_FatrasNeutralPropagatorID", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ Trk__StraightLinePropagator = CompFactory.Trk.StraightLinePropagator
+ result.addPublicTool(Trk__StraightLinePropagator(name=name, **kwargs))
+
+ return result
+
+
+def fatrasPropagatorCfg(flags, name="ISF_FatrasPropagator", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ Trk__RungeKuttaPropagator = CompFactory.Trk.RungeKuttaPropagator
+ result.addPublicTool(Trk__RungeKuttaPropagator(name=name, **kwargs))
+
+ return result
+
+
+# from the Propagator create a Propagation engine to handle path length
+def fatrasStaticPropagatorCfg(flags, name="ISF_FatrasStaticPropagator", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasPropagatorCfg(flags))
+ kwargs.setdefault("Propagator", result.getPublicTool("ISF_FatrasPropagator"))
+
+ # configure output formatting
+ kwargs.setdefault("OutputPrefix", "[SP] - ")
+ kwargs.setdefault("OutputPostfix", " - ")
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
+
+ Trk__PropagationEngine = CompFactory.Trk.PropagationEngine
+ result.addPublicTool(Trk__PropagationEngine(name, **kwargs))
+
+ return result
+
+
+# load the static navigation engine
+def fatrasStaticNavigationEngineCfg(flags, name="ISF_FatrasStaticNavigationEngine", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasStaticPropagatorCfg(flags))
+ kwargs.setdefault("PropagationEngine", result.getPublicTool("ISF_FatrasStaticPropagator"))
+ result.merge(fatrasMaterialEffectsEngineCfg(flags))
+ kwargs.setdefault("MaterialEffectsEngine", result.getPublicTool("ISF_FatrasMaterialEffectsEngine"))
+ acc = TrackingGeometrySvcCfg(flags)
+ kwargs.setdefault("TrackingGeometrySvc", acc.getPrimary())
+ result.merge(acc)
+
+ # configure output formatting
+ kwargs.setdefault("OutputPrefix", "[SN] - ")
+ kwargs.setdefault("OutputPostfix", " - ")
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
+ Trk__StaticNavigationEngine = CompFactory.Trk.StaticNavigationEngine
+ acc.setPrivateTools(Trk__StaticNavigationEngine(name, **kwargs))
+ return acc
+
+
def fatrasEnergyLossUpdatorCfg(flags, name="ISF_FatrasEnergyLossUpdator", **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
result = ComponentAccumulator()
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
+
kwargs.setdefault("UsePDG_EnergyLossFormula", True)
kwargs.setdefault("EnergyLossDistribution", 2)
-
+
iFatras__McEnergyLossUpdator = CompFactory.iFatras.McEnergyLossUpdator
result.addPublicTool(iFatras__McEnergyLossUpdator(name=name, **kwargs))
return result
+
+def fatrasEnergyLossSamplerBetheHeitlerCfg(flags, name="ISF_FatrasEnergyLossSamplerBetheHeitler", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
+
+ kwargs.setdefault("ScaleFactor", flags.Sim.Fatras.BetheHeitlerScale)
+
+ iFatras__EnergyLossSamplerBetheHeitler = CompFactory.iFatras.EnergyLossSamplerBetheHeitler
+ result.addPublicTool(iFatras__EnergyLossSamplerBetheHeitler(name=name, **kwargs))
+
+ return result
+
+
def fatrasMultipleScatteringUpdatorCfg(flags, name="ISF_FatrasMultipleScatteringUpdator", **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
result = ComponentAccumulator()
- kwargs.setdefault("GaussianMixtureModel", True)
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.TrkExRandomStreamName)
+ kwargs.setdefault("GaussianMixtureModel", flags.Sim.Fatras.GaussianMixtureModel)
Trk__MultipleScatteringUpdator = CompFactory.Trk.MultipleScatteringUpdator
result.addPublicTool(Trk__MultipleScatteringUpdator(name=name, **kwargs))
return result
+
+def fatrasMultipleScatteringSamplerHighlandCfg(flags, name="ISF_MultipleScatteringSamplerHighland", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.TrkExRandomStreamName)
+
+ Trk__MultipleScatteringSamplerHighland = CompFactory.Trk.MultipleScatteringSamplerHighland
+ result.addPublicTool(Trk__MultipleScatteringSamplerHighland(name=name, **kwargs))
+
+ return result
+
+
+def fatrasMultipleScatteringSamplerGaussianMixtureCfg(flags, name="ISF_MultipleScatteringSamplerGaussianMixture", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.TrkExRandomStreamName)
+
+ Trk__MultipleScatteringSamplerGaussianMixture = CompFactory.Trk.MultipleScatteringSamplerGaussianMixture
+ result.addPublicTool(Trk__MultipleScatteringSamplerGaussianMixture(name=name, **kwargs))
+
+ return result
+
+
+def fatrasMultipleScatteringSamplerGeneralMixtureCfg(flags, name="ISF_MultipleScatteringSamplerGeneralMixture", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.TrkExRandomStreamName)
+
+ Trk__MultipleScatteringSamplerGeneralMixture = CompFactory.Trk.MultipleScatteringSamplerGeneralMixture
+ result.addPublicTool(Trk__MultipleScatteringSamplerGeneralMixture(name=name, **kwargs))
+
+ return result
+
+
# Combining all in the MaterialEffectsUpdator
def fatrasMaterialUpdatorCfg(flags, name="ISF_FatrasMaterialUpdator", **kwargs):
mlog = logging.getLogger(name)
@@ -283,12 +488,15 @@ def fatrasMaterialUpdatorCfg(flags, name="ISF_FatrasMaterialUpdator", **kwargs):
result = ComponentAccumulator()
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
+
# Geometry Svc
- from TrkConfig.AtlasTrackingGeometrySvcConfig import TrackingGeometrySvcCfg
acc = TrackingGeometrySvcCfg(flags)
kwargs.setdefault("TrackingGeometrySvc", acc.getPrimary())
result.merge(acc)
-
+
# hadronic interactions
kwargs.setdefault("HadronicInteraction", True)
acc = fatrasG4HadIntProcessorCfg(flags)
@@ -315,10 +523,14 @@ def fatrasMaterialUpdatorCfg(flags, name="ISF_FatrasMaterialUpdator", **kwargs):
ph_conv_cfg = acc.getPublicTool('ISF_FatrasConversionCreator')
result.merge(acc)
kwargs.setdefault("PhotonConversionTool", ph_conv_cfg)
-
+
# the validation output
- ## NOTE to be checked
- ### kwargs.setdefault("ValidationMode", ISF_Flags.ValidationMode())
+ kwargs.setdefault("ValidationMode", flags.Sim.ISF.ValidationMode)
+ kwargs.setdefault("BremPhotonValidation", False)
+ kwargs.setdefault("EnergyDepositValidation", False)
+
+ kwargs.setdefault("MomentumCut", flags.Sim.Fatras.MomCutOffSec)
+ kwargs.setdefault("MinimumBremPhotonMomentum", flags.Sim.Fatras.MomCutOffSec)
acc = fatrasPhysicsValidationToolCfg(flags)
phys_val_cfg = acc.getPublicTool('ISF_FatrasPhysicsValidationTool')
@@ -335,12 +547,82 @@ def fatrasMaterialUpdatorCfg(flags, name="ISF_FatrasMaterialUpdator", **kwargs):
result.merge(acc)
kwargs.setdefault("ParticleDecayHelper", pdhelper_cfg)
+ # MCTruth Process Code
+ kwargs.setdefault("BremProcessCode", 3) # TODO: to be taken from central definition
+ acc = TrackingGeometrySvcCfg(flags)
+ kwargs.setdefault("TrackingGeometrySvc", acc.getPrimary())
+ result.merge(acc)
iFatras__McMaterialEffectsUpdator = CompFactory.iFatras.McMaterialEffectsUpdator
result.addPublicTool(iFatras__McMaterialEffectsUpdator(name=name, **kwargs))
return result
+
+
+def fatrasMaterialEffectsEngineCfg(flags, name="ISF_FatrasMaterialEffectsEngine", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
+
+ result.merge(ParticleBrokerSvcCfg(flags))
+ kwargs.setdefault("ParticleBroker", result.getService("ISF_ParticleBrokerSvc"))
+
+ acc = TruthServiceCfg(flags)
+ kwargs.setdefault("TruthRecordSvc", acc.getPrimary())
+ result.merge(acc)
+
+ result.merge(fatrasProcessSamplingToolCfg(flags))
+ kwargs.setdefault("ProcessSamplingTool", result.getPublicTool("ISF_FatrasProcessSamplingTool"))
+
+ result.merge(fatrasParticleDecayHelperCfg(flags))
+ kwargs.setdefault("ParticleDecayHelper", result.getPublicTool("ISF_FatrasParticleDecayHelper"))
+
+ # energy loss
+ result.merge(fatrasEnergyLossUpdatorCfg(flags))
+ kwargs.setdefault("EnergyLossSampler", result.getPublicTool("ISF_FatrasEnergyLossUpdator"))
+ kwargs.setdefault("EnergyLoss", True)
+
+ result.merge(fatrasEnergyLossSamplerBetheHeitlerCfg(flags))
+ tool = result.getPublicTool("ISF_FatrasEnergyLossSamplerBetheHeitler")
+ kwargs.setdefault("ElectronEnergyLossSampler", tool)
+ kwargs.setdefault("UseElectronSampler", True)
+ kwargs.setdefault("CreateBremPhotons", True)
+
+ # multiple scattering
+ result.merge(fatrasMultipleScatteringSamplerHighlandCfg(flags))
+ tool = result.getPublicTool("ISF_MultipleScatteringSamplerHighland")
+ kwargs.setdefault("MultipleScatteringSampler", tool)
+ kwargs.setdefault("MultipleScattering", True)
+
+ # the properties given throuth the JobProperties interface
+ kwargs.setdefault("MomentumCut", flags.Sim.Fatras.MomCutOffSec)
+ kwargs.setdefault("MinimumBremPhotonMomentum", flags.Sim.Fatras.MomCutOffSec)
+
+ # MCTruth Process Code
+ kwargs.setdefault("BremProcessCode", 3) # TODO: to be taken from central definition
+
+ # the validation output
+ result.merge(fatrasPhysicsValidationToolCfg(flags))
+ tool = acc.getPublicTool('ISF_FatrasPhysicsValidationTool')
+ kwargs.setdefault("PhysicsValidationTool", tool)
+ kwargs.setdefault("ValidationMode", flags.Sim.ISF.ValidationMode)
+
+ kwargs.setdefault("OutputPrefix", "[McME] - ")
+ kwargs.setdefault("OutputPostfix", " - ")
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
+
+ iFatras__McMaterialEffectsEngine = CompFactory.iFatras.McMaterialEffectsEngine
+ result.setPublicTool(iFatras__McMaterialEffectsEngine(name, **kwargs))
+
+ return result
+
+
def fatrasChargedPropagatorCfg(flags, name="ISF_FatrasChargedPropagator", **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
@@ -357,6 +639,7 @@ def fatrasSTEP_PropagatorCfg(flags, name="ISF_FatrasSTEP_Propagator", **kwargs):
mlog.debug('Start configuration')
result = ComponentAccumulator()
+ kwargs.setdefault("MomentumCutOff", flags.Sim.Fatras.MomCutOffSec)
kwargs.setdefault("SimulationMode", True)
acc = fatrasMaterialUpdatorCfg(flags)
@@ -402,6 +685,7 @@ def fatrasExtrapolatorCfg(flags, name="ISF_FatrasExtrapolator", **kwargs):
# Fatras specific: stop the trajectory
kwargs.setdefault("StopWithNavigationBreak", True)
kwargs.setdefault("StopWithUpdateKill", True)
+ kwargs.setdefault("RobustSampling", True)
kwargs.setdefault("ResolveMuonStation", True)
kwargs.setdefault("UseMuonMatApproximation", True)
@@ -410,6 +694,56 @@ def fatrasExtrapolatorCfg(flags, name="ISF_FatrasExtrapolator", **kwargs):
return result
+
+def fatrasStaticExtrapolatorCfg(flags, name="ISF_FatrasStaticExEngine", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasStaticPropagatorCfg(flags))
+ kwargs.setdefault("PropagationEngine", result.getPublicTool("ISF_FatrasStaticPropagator"))
+ result.merge(fatrasMaterialEffectsEngineCfg(flags))
+ kwargs.setdefault("MaterialEffectsEngine", result.getPublicTool("ISF_FatrasMaterialEffectsEngine"))
+ result.merge(fatrasStaticNavigationEngineCfg(flags))
+ kwargs.setdefault("NavigationEngine", result.getPublicTool("ISF_FatrasStaticNavigationEngine"))
+
+ # configure output formatting
+ kwargs.setdefault("OutputPrefix", "[SE] - ")
+ kwargs.setdefault("OutputPostfix", " - ")
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
+
+ Trk__StaticEngine = CompFactory.Trk.StaticEngine
+ result.setPrivateTools(Trk__StaticEngine(name, **kwargs))
+ return result
+
+
+def fatrasExEngineCfg(flags, name="ISF_FatrasExEngine", **kwargs):
+ # load the tracking geometry service
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ # assign the tools
+ result.merge(fatrasStaticExtrapolatorCfg(flags))
+ tool = result.getPublicTool("ISF_FatrasStaticExEngine")
+ kwargs.setdefault("ExtrapolationEngines", [tool])
+ acc = TrackingGeometrySvcCfg(flags)
+ kwargs.setdefault("TrackingGeometrySvc", acc.getPrimary())
+ result.merge(acc)
+ result.merge(fatrasStaticPropagatorCfg(flags))
+ kwargs.setdefault("PropagationEngine", result.getPublicTool("ISF_FatrasStaticPropagator"))
+
+ # configure output formatting
+ kwargs.setdefault("OutputPrefix", "[ME] - ")
+ kwargs.setdefault("OutputPostfix", " - ")
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
+
+ Trk__ExtrapolationEngine = CompFactory.Trk.ExtrapolationEngine
+ result.setPrivateTools(Trk__ExtrapolationEngine(name, **kwargs))
+ return result
+
################################################################################
# SIMULATION TOOL and SERVICE
################################################################################
@@ -421,6 +755,7 @@ def fatrasKinematicFilterCfg(flags, name="ISF_FatrasKinematicFilter", **kwargs):
result = ComponentAccumulator()
kwargs.setdefault("MaxEtaSymmetric", 10.)
+ kwargs.setdefault("MinMomentum", flags.Sim.Fatras.MomCutOffSec)
ISF__KinematicParticleFilter = CompFactory.ISF.KinematicParticleFilter
result.addPublicTool(ISF__KinematicParticleFilter(name=name, **kwargs))
@@ -435,11 +770,21 @@ def fatrasConversionCreatorCfg(flags, name="ISF_FatrasConversionCreator", **kwar
result = ComponentAccumulator()
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
+
+ result.merge(ParticleBrokerSvcCfg(flags))
+ kwargs.setdefault("ParticleBroker", result.getService("ISF_ParticleBrokerSvc"))
+
acc = fatrasPhysicsValidationToolCfg(flags)
phys_val_cfg = acc.getPublicTool('ISF_FatrasPhysicsValidationTool')
result.merge(acc)
kwargs.setdefault("PhysicsValidationTool", phys_val_cfg)
+ kwargs.setdefault("PhysicsProcessCode", 14) # TODO: to be taken from central definition
+ kwargs.setdefault("ValidationMode", flags.Sim.ISF.ValidationMode)
+
iFatras__PhotonConversionTool = CompFactory.iFatras.PhotonConversionTool
result.addPublicTool(iFatras__PhotonConversionTool(name=name, **kwargs))
@@ -452,23 +797,79 @@ def fatrasG4HadIntProcessorCfg(flags, name="ISF_FatrasG4HadIntProcessor", **kwar
result = ComponentAccumulator()
- acc = fatrasPhysicsValidationToolCfg(flags)
- phys_val_cfg = acc.getPublicTool('ISF_FatrasPhysicsValidationTool')
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
+
+ result.merge(ParticleBrokerSvcCfg(flags))
+ kwargs.setdefault("ParticleBroker", result.getService("ISF_ParticleBrokerSvc"))
+
+ acc = TruthServiceCfg(flags)
+ kwargs.setdefault("TruthRecordSvc", acc.getPrimary())
result.merge(acc)
+
+ result.merge(fatrasPhysicsValidationToolCfg(flags))
+ phys_val_cfg = acc.getPublicTool('ISF_FatrasPhysicsValidationTool')
kwargs.setdefault("PhysicsValidationTool", phys_val_cfg)
+ kwargs.setdefault("ValidationMode", flags.Sim.ISF.ValidationMode)
+ kwargs.setdefault("MomentumCut", flags.Sim.Fatras.MomCutOffSec)
+
iFatras__G4HadIntProcessor = CompFactory.iFatras.G4HadIntProcessor
result.addPublicTool(iFatras__G4HadIntProcessor(name=name, **kwargs))
return result
+# Fatras Hadronic Interaction Processor
+def fatrasParametricHadIntProcessorCfg(flags, name="ISF_FatrasParametricHadIntProcessor", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+ kwargs.setdefault("RandomStreamName", flags.Sim.Fatras.RandomStreamName)
+
+ result.merge(ParticleBrokerSvcCfg(flags))
+ kwargs.setdefault("ParticleBroker", result.getService("ISF_ParticleBrokerSvc"))
+
+ acc = TruthServiceCfg(flags)
+ kwargs.setdefault("TruthRecordSvc", acc.getPrimary())
+ result.merge(acc)
+
+ kwargs.setdefault("HadronicInteractionScaleFactor", flags.Sim.Fatras.HadronIntProb)
+ kwargs.setdefault("MinimumHadronicInitialEnergy", flags.Sim.Fatras.MomCutOffSec)
+ kwargs.setdefault("MinimumHadronicOutEnergy", flags.Sim.Fatras.MomCutOffSec)
+ kwargs.setdefault("HadronicInteractionValidation", False)
+ kwargs.setdefault("PhysicsProcessCode", 121) # TODO: to be taken from central definition
+
+ result.merge(fatrasPhysicsValidationToolCfg(flags))
+ phys_val_cfg = acc.getPublicTool('ISF_FatrasPhysicsValidationTool')
+ kwargs.setdefault("PhysicsValidationTool", phys_val_cfg)
+ kwargs.setdefault("ValidationMode", flags.Sim.ISF.ValidationMode)
+
+ iFatras__HadIntProcessorParametric = CompFactory.iFatras.HadIntProcessorParametric
+ result.setPrivateTools(iFatras__HadIntProcessorParametric(name, **kwargs))
+
+ return result
+
+
def fatrasProcessSamplingToolCfg(flags, name="ISF_FatrasProcessSamplingTool", **kwargs):
mlog = logging.getLogger(name)
mlog.debug('Start configuration')
result = ComponentAccumulator()
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+
+ # truth record
+ acc = TruthServiceCfg(flags)
+ kwargs.setdefault("TruthRecordSvc", acc.getPrimary())
+ result.merge(acc)
+
# decays
acc = fatrasParticleDecayHelperCfg(flags)
pd_helper_cfg = acc.getPublicTool('ISF_FatrasParticleDecayHelper')
@@ -486,12 +887,14 @@ def fatrasProcessSamplingToolCfg(flags, name="ISF_FatrasProcessSamplingTool", **
g4had_proc_cfg = acc.getPublicTool('ISF_FatrasG4HadIntProcessor')
result.merge(acc)
kwargs.setdefault("HadronicInteractionProcessor", g4had_proc_cfg)
+ kwargs.setdefault("HadronicInteraction", True)
# Validation Tool
acc = fatrasPhysicsValidationToolCfg(flags)
phys_val_cfg = acc.getPublicTool('ISF_FatrasPhysicsValidationTool')
result.merge(acc)
kwargs.setdefault("PhysicsValidationTool", phys_val_cfg)
+ kwargs.setdefault("ValidationMode", flags.Sim.ISF.ValidationMode)
iFatras__ProcessSamplingTool = CompFactory.iFatras.ProcessSamplingTool
result.addPublicTool(iFatras__ProcessSamplingTool(name=name, **kwargs))
@@ -505,10 +908,11 @@ def fatrasSimToolCfg(flags, name="ISF_FatrasSimTool", **kwargs):
result = ComponentAccumulator()
- acc = fatrasSimHitCreatorIDCfg(flags)
- id_cfg = acc.getPublicTool('ISF_FatrasSimHitCreatorID')
- result.merge(acc)
- kwargs.setdefault("SimHitCreatorID", id_cfg)
+ if "SimHitCreatorID" not in kwargs:
+ acc = fatrasSimHitCreatorIDCfg(flags)
+ id_cfg = acc.getPublicTool('ISF_FatrasSimHitCreatorID')
+ result.merge(acc)
+ kwargs.setdefault("SimHitCreatorID", id_cfg)
acc = fatrasSimHitCreatorMSCfg(flags)
ms_cfg = acc.getPublicTool('ISF_FatrasSimHitCreatorMS')
@@ -520,7 +924,7 @@ def fatrasSimToolCfg(flags, name="ISF_FatrasSimTool", **kwargs):
result.merge(acc)
kwargs.setdefault("ParticleDecayHelper", pdhelper_cfg)
- acc = fatrasParticleHelperCfg(flags)
+ acc = ParticleHelperCfg(flags)
part_helper_cfg = acc.getPublicTool('ISF_ParticleHelper')
result.merge(acc)
kwargs.setdefault("ParticleHelper", part_helper_cfg)
@@ -547,6 +951,188 @@ def fatrasSimToolCfg(flags, name="ISF_FatrasSimTool", **kwargs):
result.merge(acc)
kwargs.setdefault("ProcessSamplingTool", proc_samp_cfg)
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
+ kwargs.setdefault("ValidationOutput", flags.Sim.ISF.ValidationMode)
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+
iFatras__TransportTool = CompFactory.iFatras.TransportTool
- result.setPrivateTools(iFatras__TransportTool(name=name, **kwargs))
+ result.addPublicTool(iFatras__TransportTool(name=name, **kwargs))
+ return result
+
+
+def fatrasSimEngineCfg(flags, name="ISF_FatrasSimEngine", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ acc = fatrasSimHitCreatorIDCfg(flags)
+ id_cfg = acc.getPublicTool('ISF_FatrasSimHitCreatorID')
+ result.merge(acc)
+ kwargs.setdefault("SimHitCreatorID", id_cfg)
+
+ acc = fatrasParticleDecayHelperCfg(flags)
+ pdhelper_cfg = acc.getPublicTool('ISF_FatrasParticleDecayHelper')
+ result.merge(acc)
+ kwargs.setdefault("ParticleDecayHelper", pdhelper_cfg)
+
+ acc = fatrasKinematicFilterCfg(flags)
+ kin_filter_cfg = acc.getPublicTool('ISF_FatrasKinematicFilter')
+ result.merge(acc)
+ kwargs.setdefault("TrackFilter", kin_filter_cfg)
+ kwargs.setdefault("NeutralFilter", kin_filter_cfg)
+ kwargs.setdefault("PhotonFilter", kin_filter_cfg)
+
+ acc = fatrasExEngineCfg(flags)
+ extrapolator_cfg = acc.getPublicTool('ISF_FatrasExEngine')
+ kwargs.setdefault("Extrapolator", extrapolator_cfg)
+ result.merge(acc)
+
+ acc = fatrasProcessSamplingToolCfg(flags)
+ proc_samp_cfg = acc.getPublicTool('ISF_FatrasProcessSamplingTool')
+ result.merge(acc)
+ kwargs.setdefault("ProcessSamplingTool", proc_samp_cfg)
+
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
+ kwargs.setdefault("ValidationOutput", flags.Sim.ISF.ValidationMode)
+
+ result.merge(fatrasPhysicsValidationToolCfg(flags))
+ tool = result.getPublicTool("ISF_FatrasPhysicsValidationTool")
+ kwargs.setdefault("PhysicsValidationTool", tool)
+
+ result.merge(RNG(flags.Random.Engine))
+ kwargs.setdefault("RandomNumberService", result.getService("AthRNGSvc"))
+
+ iFatras__TransportEngine = CompFactory.iFatras.TransportEngine
+ result.addPublicTool(iFatras__TransportEngine(name=name, **kwargs))
+ return result
+
+
+def fatrasPileupSimToolCfg(flags, name="ISF_FatrasPileupSimTool", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasPileupSimHitCreatorIDCfg(flags))
+ tool = result.getPublicTool("ISF_FatrasPileupSimHitCreatorID")
+ kwargs.setdefault("SimHitCreatorID", tool)
+
+ result.merge(fatrasSimToolCfg(flags, name, **kwargs))
+ return result
+
+
+# FatrasSimulatorTool
+def fatrasSimulatorToolSTCfg(flags, name="ISF_FatrasSimulatorToolST", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasSimToolCfg(flags))
+ tool = result.getPublicTool("ISF_FatrasSimTool")
+ kwargs.setdefault("IDSimulationTool", tool)
+ kwargs.setdefault("SimulationTool", tool)
+
+ kwargs.setdefault("OutputLevel", flags.Exec.OutputLevel)
+
+ ISF__FatrasSimTool = CompFactory.ISF.FatrasSimTool
+ result.addPublicTool(ISF__FatrasSimTool(name, **kwargs))
+ return result
+
+
+def fatrasNewExtrapolationSimulatorToolSTCfg(flags, name="ISF_FatrasNewExtrapolationSimulatorToolST", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasSimEngineCfg(flags))
+ tool = result.getPrivateTool("ISF_FatrasSimEngine")
+ kwargs.setdefault("IDSimulationTool", tool)
+ kwargs.setdefault("UseSimulationTool", True)
+
+ result.merge(fatrasSimulatorToolSTCfg(flags, name, **kwargs))
+ return result
+
+
+def fatrasPileupSimulatorToolSTCfg(flags, name="ISF_FatrasPileupSimulatorToolST", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasPileupSimToolCfg(flags))
+ tool = result.getPrivateTool("ISF_FatrasPileupSimTool")
+ kwargs.setdefault("IDSimulationTool", tool)
+
+ result.merge(fatrasSimToolCfg(flags))
+ tool = result.getPrivateTool("ISF_FatrasSimTool")
+ kwargs.setdefault("SimulationTool", tool)
+
+ result.merge(fatrasSimulatorToolSTCfg(flags, name, **kwargs))
+ return result
+
+
+# FatrasSimulationSvc
+def fatrasSimServiceIDCfg(flags, name="ISF_FatrasSimSvc", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ kwargs.setdefault("Identifier", "Fatras")
+
+ result.merge(fatrasSimulatorToolSTCfg(flags))
+ tool = result.getPublicTool("ISF_FatrasSimulatorToolST")
+ kwargs.setdefault("SimulatorTool", tool)
+
+ result.addService(CompFactory.ISF.LegacySimSvc(name, **kwargs))
+
+ return result
+
+
+def fatrasNewExtrapolationSimServiceIDCfg(flags, name="ISF_FatrasNewExtrapolationSimSvc", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasNewExtrapolationSimulatorToolSTCfg(flags))
+ tool = result.getPublicTool("ISF_FatrasNewExtrapolationSimulatorToolST")
+ kwargs.setdefault("SimulatorTool", tool)
+
+ result.merge(fatrasSimServiceIDCfg(flags, name, **kwargs))
+
+ return result
+
+
+def fatrasGeoIDFixSimServiceIDCfg(flags, name="ISF_FatrasGeoIDFixSimSvc", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ kwargs.setdefault("EnableGeoIDOverride", True)
+ kwargs.setdefault("GeoIDOverrideZ", 3150.)
+ kwargs.setdefault("GeoIDOverride", 3) # ISF::fAtlasCalo
+
+ result.merge(fatrasSimServiceIDCfg(flags, name, **kwargs))
+
+ return result
+
+
+def fatrasPileupSimServiceIDCfg(flags, name="ISF_FatrasPileupSimSvc", **kwargs):
+ mlog = logging.getLogger(name)
+ mlog.debug('Start configuration')
+
+ result = ComponentAccumulator()
+
+ result.merge(fatrasPileupSimulatorToolSTCfg(flags))
+ tool = result.getPublicTool("ISF_FatrasPileupSimulatorToolST")
+ kwargs.setdefault("SimulatorTool", tool)
+
+ result.merge(fatrasSimServiceIDCfg(flags, name, **kwargs))
return result
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
index 48393250ef1e45f32ca9d78c8e9c4d023a2a6d42..88d3c195bc7c78979b699a1ec3cfadd93947bc40 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfig.py
@@ -8,18 +8,14 @@ KG Tan, 04/12/2012
from __future__ import print_function
from AthenaCommon import CfgMgr
-from AthenaCommon.CfgGetter import getPrivateTool,getPrivateToolClone,getPublicTool,getPublicToolClone,\
- getService,getServiceClone,getAlgorithm,getAlgorithmClone
+from AthenaCommon.CfgGetter import getPublicTool
-from AthenaCommon.Constants import * # FATAL,ERROR etc.
-from AthenaCommon.SystemOfUnits import *
from AthenaCommon.DetFlags import DetFlags
from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
from ISF_Config.ISF_jobProperties import ISF_Flags # IMPORTANT: Flags must be set before tools are retrieved
from ISF_FatrasServices.ISF_FatrasJobProperties import ISF_FatrasFlags
from ISF_FatrasServices.FatrasTuning import FatrasTuningFlags
-from ISF_FatrasServices.FatrasValidation import FatrasValidationFlags
from ISF_Algorithms.collection_merger_helpers import generate_mergeable_collection_name
#################################################################################
@@ -36,7 +32,7 @@ def initialiseCoolDataBaseFolder():
print ('[ TrackingGeometrySvc ]')
# check whether the material retrieval is ment to be from COOL
- if TrkDetFlags.MaterialSource() is 'COOL' :
+ if TrkDetFlags.MaterialSource() == 'COOL' :
# the tag names
CoolDataBaseFolder = TrkDetFlags.MaterialStoreGateKey()
AtlasMaterialTag = TrkDetFlags.MaterialTagBase()+str(TrkDetFlags.MaterialVersion())+'_'
@@ -238,7 +234,7 @@ def getFatrasPdgG4Particle(name="ISF_FatrasPdgG4Particle", **kwargs):
return iFatras__PDGToG4Particle(name, **kwargs )
def getFatrasParticleDecayHelper(name="ISF_FatrasParticleDecayHelper", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
if not simFlags.RandomSeedList.checkForExistingSeed( "FatrasG4" ):
simFlags.RandomSeedList.addSeed( "FatrasG4" , 23491234, 23470291 )
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
@@ -265,7 +261,7 @@ def getFatrasParticleDecayHelper(name="ISF_FatrasParticleDecayHelper", **kwargs)
# the G4 MaterialEffectsUpdator
def getFatrasG4HadIntProcessor(name="ISF_FatrasG4HadIntProcessor", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ParticleBroker" , ISF_Flags.ParticleBroker())
@@ -278,7 +274,7 @@ def getFatrasG4HadIntProcessor(name="ISF_FatrasG4HadIntProcessor", **kwargs):
return iFatras__G4HadIntProcessor(name, **kwargs )
def getFatrasParametricHadIntProcessor(name="ISF_FatrasParametricHadIntProcessor", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
# Fatras Hadronic Interaction Processor
# hadronic interaction creator
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
@@ -301,7 +297,7 @@ def getFatrasParametricHadIntProcessor(name="ISF_FatrasParametricHadIntProcessor
def getFatrasConversionCreator(name="ISF_FatrasConversionCreator", **kwargs):
# Fatras Hadronic Interaction Processor
# hadronic interaction creator
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ParticleBroker" , ISF_Flags.ParticleBroker())
@@ -316,7 +312,7 @@ def getFatrasConversionCreator(name="ISF_FatrasConversionCreator", **kwargs):
def getFatrasProcessSamplingTool(name="ISF_FatrasProcessSamplingTool", **kwargs):
# random number service
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault( "RandomNumberService", simFlags.RandomSvc())
# truth record
kwargs.setdefault("TruthRecordSvc" , simFlags.TruthStrategy.TruthServiceName())
@@ -339,7 +335,7 @@ def getFatrasProcessSamplingTool(name="ISF_FatrasProcessSamplingTool", **kwargs)
# - Ionization and Bremstrahlung loss
# - assing the Bethe-Heitler Eloss updator
def getFatrasEnergyLossUpdator(name="ISF_FatrasEnergyLossUpdator", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("UsePDG_EnergyLossFormula", True)
@@ -350,7 +346,7 @@ def getFatrasEnergyLossUpdator(name="ISF_FatrasEnergyLossUpdator", **kwargs):
return iFatras__McEnergyLossUpdator(name, **kwargs )
def getFatrasEnergyLossSamplerBetheHeitler(name="ISF_FatrasEnergyLossSamplerBetheHeitler", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ScaleFactor" , FatrasTuningFlags.BetheHeitlerScalor())
@@ -361,7 +357,7 @@ def getFatrasEnergyLossSamplerBetheHeitler(name="ISF_FatrasEnergyLossSamplerBeth
#
# (iii) Multiple scattering
def getFatrasMultipleScatteringUpdator(name="ISF_FatrasMultipleScatteringUpdator", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
if not simFlags.RandomSeedList.checkForExistingSeed( "TrkExRnd" ):
simFlags.RandomSeedList.addSeed( "TrkExRnd" , 12412330, 37849324 )
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
@@ -372,7 +368,7 @@ def getFatrasMultipleScatteringUpdator(name="ISF_FatrasMultipleScatteringUpdator
return Trk__MultipleScatteringUpdator(name, **kwargs )
def getFatrasMultipleScatteringSamplerHighland(name="ISF_MultipleScatteringSamplerHighland", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
if not simFlags.RandomSeedList.checkForExistingSeed( "TrkExRnd" ):
simFlags.RandomSeedList.addSeed( "TrkExRnd" , 12412330, 37849324 )
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
@@ -381,7 +377,7 @@ def getFatrasMultipleScatteringSamplerHighland(name="ISF_MultipleScatteringSampl
return iFatras__MultipleScatteringSamplerHighland(name, **kwargs )
def getFatrasMultipleScatteringSamplerGaussianMixture(name="ISF_MultipleScatteringSamplerGaussianMixture", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
if not simFlags.RandomSeedList.checkForExistingSeed( "TrkExRnd" ):
simFlags.RandomSeedList.addSeed( "TrkExRnd" , 12412330, 37849324 )
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
@@ -390,7 +386,7 @@ def getFatrasMultipleScatteringSamplerGaussianMixture(name="ISF_MultipleScatteri
return iFatras__MultipleScatteringSamplerGaussianMixture(name, **kwargs )
def getFatrasMultipleScatteringSamplerGeneralMixture(name="ISF_MultipleScatteringSamplerGeneralMixture", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
if not simFlags.RandomSeedList.checkForExistingSeed( "TrkExRnd" ):
simFlags.RandomSeedList.addSeed( "TrkExRnd" , 12412330, 37849324 )
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
@@ -400,7 +396,7 @@ def getFatrasMultipleScatteringSamplerGeneralMixture(name="ISF_MultipleScatterin
# Combining all in the MaterialEffectsUpdator
def getFatrasMaterialUpdator(name="ISF_FatrasMaterialUpdator", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
from TrkDetDescrSvc.AtlasTrackingGeometrySvc import AtlasTrackingGeometrySvc
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
@@ -437,7 +433,7 @@ def getFatrasMaterialUpdator(name="ISF_FatrasMaterialUpdator", **kwargs):
return iFatras__McMaterialEffectsUpdator(name, **kwargs )
def getFatrasMaterialEffectsEngine(name="ISF_FatrasMaterialEffectsEngine", **kwargs):
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("ParticleBroker" , ISF_Flags.ParticleBroker())
@@ -538,13 +534,12 @@ def getFatrasHitCreatorPixel(name="ISF_FatrasHitCreatorPixel", **kwargs):
mergeable_collection_suffix,
merger_input_property)
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("IdHelperName" , 'PixelID')
kwargs.setdefault("CollectionName" , hits_collection_name)
- from FastCaloSimHit.FastCaloSimHitConf import FastHitConvertTool
kwargs.setdefault("UseConditionsTool", False)
from ISF_FatrasToolsID.ISF_FatrasToolsIDConf import iFatras__HitCreatorSilicon
@@ -557,7 +552,7 @@ def getFatrasHitCreatorSCT(name="ISF_FatrasHitCreatorSCT", **kwargs):
hits_collection_name = generate_mergeable_collection_name(bare_collection_name,
mergeable_collection_suffix,
merger_input_property)
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("IdHelperName" , 'SCT_ID')
@@ -574,7 +569,7 @@ def getFatrasHitCreatorTRT(name="ISF_FatrasHitCreatorTRT", **kwargs):
hits_collection_name = generate_mergeable_collection_name(bare_collection_name,
mergeable_collection_suffix,
merger_input_property)
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("CollectionName" , hits_collection_name)
@@ -636,7 +631,7 @@ def getFatrasSimHitCreatorMS(name="ISF_FatrasSimHitCreatorMS", **kwargs):
mergeable_collection_suffix,
csc_merger_input_property)
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault("RandomNumberService" , simFlags.RandomSvc() )
kwargs.setdefault("RandomStreamName" , ISF_FatrasFlags.RandomStreamName())
kwargs.setdefault("Extrapolator" , getPublicTool('ISF_FatrasExtrapolator'))
@@ -684,7 +679,7 @@ def getFatrasSimTool(name="ISF_FatrasSimTool", **kwargs):
kwargs.setdefault("OutputLevel" , ISF_FatrasFlags.OutputLevelGeneral())
kwargs.setdefault("ValidationOutput" , ISF_Flags.ValidationMode())
# random number service
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault( "RandomNumberService", simFlags.RandomSvc())
from ISF_FatrasTools.ISF_FatrasToolsConf import iFatras__TransportTool
@@ -708,7 +703,7 @@ def getFatrasSimEngine(name="ISF_FatrasSimEngine", **kwargs):
kwargs.setdefault("ValidationMode" , ISF_Flags.ValidationMode())
kwargs.setdefault("PhysicsValidationTool" , getPublicTool('ISF_FatrasPhysicsValidationTool'))
# random number service
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
kwargs.setdefault( "RandomNumberService", simFlags.RandomSvc())
from ISF_FatrasTools.ISF_FatrasToolsConf import iFatras__TransportEngine
@@ -752,7 +747,7 @@ def getFatrasSimulatorToolST(name="ISF_FatrasSimulatorToolST", **kwargs):
# set the output level
kwargs.setdefault("OutputLevel" , ISF_FatrasFlags.OutputLevelGeneral())
# register Fatras random number stream if not already registered
- from G4AtlasApps.SimFlags import SimFlags,simFlags
+ from G4AtlasApps.SimFlags import simFlags
if not simFlags.RandomSeedList.checkForExistingSeed( "FatrasRnd" ):
simFlags.RandomSeedList.addSeed( "FatrasRnd", 81234740, 23474923 )
return CfgMgr.ISF__FatrasSimTool(name, **kwargs)
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfigDb.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfigDb.py
index 5cbb63294b86e1f07ea62867bd8fde906ea14413..254e92cd4c060d9a39e3a06a205947aed794f0e4 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfigDb.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesConfigDb.py
@@ -1,19 +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 ISF
Elmar Ritsch, 10/11/2014
"""
-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 addTool, addService
addTool("ISF_FatrasServices.ISF_FatrasServicesConfig.getInDetTrackingGeometryBuilder", "ISF_InDetTrackingGeometryBuilder")
addTool("ISF_FatrasServices.ISF_FatrasServicesConfig.getFatrasCaloTrackingGeometryBuilder", "ISF_FatrasCaloTrackingGeometryBuilder")
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesSimConfigNew.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesSimConfigNew.py
new file mode 100644
index 0000000000000000000000000000000000000000..dfb396b461341e785188ac3e99fd0a90dc985545
--- /dev/null
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasServicesSimConfigNew.py
@@ -0,0 +1,49 @@
+"""
+ComponentAccumulator service configuration for ISF_Fatras simulator tool FatrasSimTool
+Separated from main config to avoid circular dependences
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from ISF_FatrasServices.ISF_FatrasServicesConfigNew import (
+ FatrasSimulatorToolSTCfg,
+ FatrasNewExtrapolationSimulatorToolSTCfg,
+ FatrasPileupSimulatorToolSTCfg,
+)
+from ISF_SimulationSelectors.ISF_SimulationSelectorsConfigNew import (
+ DefaultFatrasSelectorCfg, MuonFatrasSelectorCfg,
+)
+
+def FatrasSimulatorToolCfg(flags, name="ISF_FatrasSimulatorTool", **kwargs):
+ acc = ComponentAccumulator()
+ deftool = acc.popToolsAndMerge(DefaultFatrasSelectorCfg(flags))
+ muontool = acc.popToolsAndMerge(MuonFatrasSelectorCfg(flags))
+ kwargs.setdefault("IDSimulationSelectors", [deftool])
+ kwargs.setdefault("CaloSimulationSelectors", [muontool])
+ kwargs.setdefault("MSSimulationSelectors", [deftool])
+ tool = acc.popToolsAndMerge(FatrasSimulatorToolSTCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
+
+
+def FatrasNewExtrapolationSimulatorToolCfg(flags, name="ISF_FatrasSNewExtrapolationimulatorTool", **kwargs):
+ acc = ComponentAccumulator()
+ deftool = acc.popToolsAndMerge(DefaultFatrasSelectorCfg(flags))
+ muontool = acc.popToolsAndMerge(MuonFatrasSelectorCfg(flags))
+ kwargs.setdefault("IDSimulationSelectors", [deftool])
+ kwargs.setdefault("CaloSimulationSelectors", [muontool])
+ kwargs.setdefault("MSSimulationSelectors", [deftool])
+ tool = acc.popToolsAndMerge(FatrasNewExtrapolationSimulatorToolSTCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return tool
+
+def FatrasPileupSimulatorToolCfg(flags, name="ISF_FatrasPileupSimulatorTool", **kwargs):
+ acc = ComponentAccumulator()
+ deftool = acc.popToolsAndMerge(DefaultFatrasSelectorCfg(flags))
+ muontool = acc.popToolsAndMerge(MuonFatrasSelectorCfg(flags))
+ kwargs.setdefault("IDSimulationSelectors", [deftool])
+ kwargs.setdefault("CaloSimulationSelectors", [muontool])
+ kwargs.setdefault("MSSimulationSelectors", [deftool])
+ tool = acc.popToolsAndMerge(FatrasPileupSimulatorToolSTCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return tool
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigNew.py b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigNew.py
index 1f909f69cb9ebf69ed4b50eff6f22fa3d7a1ce1f..a97702b95b0439bf6c1edd1dd9a44fe7c5b5546e 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigNew.py
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigNew.py
@@ -4,8 +4,8 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
-from ISF_Geant4Tools.ISF_Geant4ToolsConfig import (
- Geant4ToolCfg, FullGeant4ToolCfg, ISF_LongLivedGeant4Tool, PassBackGeant4ToolCfg,
+from ISF_Geant4Tools.ISF_Geant4ToolsConfigNew import (
+ Geant4ToolCfg, FullGeant4ToolCfg, LongLivedGeant4ToolCfg, PassBackGeant4ToolCfg,
AFIIGeant4ToolCfg, AFII_QS_Geant4ToolCfg
)
@@ -40,7 +40,7 @@ def FullGeant4SimCfg(flags, name="ISF_FullGeant4SimSvc", **kwargs):
def LongLivedGeant4SimCfg(flags, name="ISF_LongLivedGeant4SimSvc", **kwargs):
- acc = ISF_LongLivedGeant4Tool(flags)
+ acc = LongLivedGeant4ToolCfg(flags)
kwargs.setdefault("SimulatorTool", acc.popPrivateTools())
acc.merge(FullGeant4SimCfg(name, **kwargs))
return acc
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.cxx
index 96971e087ab78a3faca5b56f9a2b3d7b5c285222..b98cc9d2876aa22b3ad15ebbc5f018b39f40a0a7 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.cxx
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.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
*/
///////////////////////////////////////////////////////////////////
@@ -20,16 +20,9 @@
#include "G4PVPlacement.hh"
#include "globals.hh"
-// G4 material : vacuum setup
-G4Material* G4DetectorConstruction::s_g4vacuum = new G4Material("Vacuum",1.,1.01*CLHEP::g/CLHEP::mole,
- CLHEP::universe_mean_density,
- kStateGas,0.1*CLHEP::kelvin, 1.e-19*CLHEP::pascal);
-
G4DetectorConstruction::G4DetectorConstruction()
: m_worldLog(nullptr),
- //m_detectorLog(nullptr),
m_worldPhys(nullptr)
- ///m_detectorPhys(nullptr),
{}
@@ -44,8 +37,15 @@ void G4DetectorConstruction::dummyDetector()
// (1) WORLD
// create the world setup
G4Box* worldBox = new G4Box("WorldBox",25000.,25000.,25000.);
- m_worldLog = m_worldLog ? new(m_worldLog) G4LogicalVolume(worldBox,s_g4vacuum,"WorldLogical", 0, 0, 0) :
- new G4LogicalVolume(worldBox,s_g4vacuum,"WorldLogical", 0, 0, 0);
+
+ // G4 material : vacuum setup
+ G4Material* g4vacuum = G4Material::GetMaterial("Vacuum",false);
+ if(!g4vacuum) g4vacuum = new G4Material("FatrasDummyVacuum",1.,1.01*CLHEP::g/CLHEP::mole,
+ CLHEP::universe_mean_density,
+ kStateGas,0.1*CLHEP::kelvin, 1.e-19*CLHEP::pascal);
+
+ m_worldLog = m_worldLog ? new(m_worldLog) G4LogicalVolume(worldBox,g4vacuum,"WorldLogical", 0, 0, 0) :
+ new G4LogicalVolume(worldBox,g4vacuum,"WorldLogical", 0, 0, 0);
m_worldPhys = m_worldPhys ? new(m_worldPhys) G4PVPlacement(0,G4ThreeVector(0.,0.,0),"WorldPhysical",m_worldLog,0,false,0) :
new G4PVPlacement(0,materialPosition,"WorldPhysical",m_worldLog,0,false,0);
diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.h b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.h
index 885f2b3222a45631bf583305b46284daa8225ad3..90107de37e12aa43248f9130dde989d7fc8f5e33 100644
--- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.h
+++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4DetectorConstruction.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
*/
///////////////////////////////////////////////////////////////////
@@ -36,17 +36,10 @@ private:
// Logical volumes
//
G4LogicalVolume* m_worldLog;
- //G4LogicalVolume* m_detectorLog;
// Physical volumes
//
G4VPhysicalVolume* m_worldPhys;
- //G4VPhysicalVolume* m_detectorPhys;
-
- // Vaccum material
- //
- static G4Material* s_g4vacuum;
-
};
#endif
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
index f8974a2b0b839ee879963e5ffb3c7f704f47dfd7..c59950c012e8dadb49f48ba814a7b06b937a3498 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/CMakeLists.txt
@@ -38,5 +38,5 @@ atlas_add_test( GenParticleLifetimeFilter_test
LINK_LIBRARIES ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} AtlasHepMCLib AthenaBaseComps TruthUtils ISF_HepMC_Interfaces )
# 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/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py
index 34bbfc0de3245fe120bbf65b3c53956789aa1586..1b1bbf1f607732586501714eb5ae3ba81a82e718 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfig.py
@@ -6,7 +6,6 @@ KG Tan, 17/06/2012
"""
from AthenaCommon import CfgMgr
-from AthenaCommon.Constants import * # FATAL,ERROR etc.
from AthenaCommon.SystemOfUnits import MeV, mm
#--------------------------------------------------------------------------------------------------
@@ -132,7 +131,7 @@ def getTruthStrategyGroupID_MC15(name="ISF_MCTruthStrategyGroupID_MC15", **kwarg
kwargs.setdefault('VertexTypeRangeLow' , 201) # All kinds of decay processes
kwargs.setdefault('VertexTypeRangeHigh' , 298) # ...
kwargs.setdefault('Regions', [1,2]) # Could import AtlasDetDescr::AtlasRegion enum as in TruthService CfgGetter methods here
- return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs)
def getTruthStrategyGroupID(name="ISF_MCTruthStrategyGroupID", **kwargs):
@@ -142,7 +141,7 @@ def getTruthStrategyGroupID(name="ISF_MCTruthStrategyGroupID", **kwargs):
kwargs.setdefault('VertexTypeRangeLow' , 201) # All kinds of decay processes
kwargs.setdefault('VertexTypeRangeHigh' , 298) # ...
kwargs.setdefault('Regions', [1,2])
- return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs)
def getTruthStrategyGroupIDHadInt_MC15(name="ISF_MCTruthStrategyGroupIDHadInt_MC15", **kwargs):
@@ -151,7 +150,7 @@ def getTruthStrategyGroupIDHadInt_MC15(name="ISF_MCTruthStrategyGroupIDHadInt_MC
kwargs.setdefault('VertexTypes' , [ 111, 121, 131, 141, 151, 161, 210 ])
kwargs.setdefault('AllowChildrenOrParentPassKineticCuts' , True)
kwargs.setdefault('Regions', [1])
- return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs)
def getTruthStrategyGroupIDHadInt(name="ISF_MCTruthStrategyGroupIDHadInt", **kwargs):
@@ -160,7 +159,7 @@ def getTruthStrategyGroupIDHadInt(name="ISF_MCTruthStrategyGroupIDHadInt", **kwa
kwargs.setdefault('VertexTypes' , [ 111, 121, 131, 141, 151, 161, 210 ])
kwargs.setdefault('AllowChildrenOrParentPassKineticCuts' , True)
kwargs.setdefault('Regions', [1])
- return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs)
def getTruthStrategyGroupCaloMuBrem_MC15(name="ISF_MCTruthStrategyGroupCaloMuBrem_MC15", **kwargs):
@@ -169,7 +168,7 @@ def getTruthStrategyGroupCaloMuBrem_MC15(name="ISF_MCTruthStrategyGroupCaloMuBre
kwargs.setdefault('VertexTypes' , [ 3 ])
kwargs.setdefault('ParentPDGCodes' , [ 13, -13 ])
kwargs.setdefault('Regions', [3])
- return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs)
def getTruthStrategyGroupCaloMuBrem(name="ISF_MCTruthStrategyGroupCaloMuBrem", **kwargs):
kwargs.setdefault('ParentMinEkin' , 500.*MeV)
@@ -177,7 +176,7 @@ def getTruthStrategyGroupCaloMuBrem(name="ISF_MCTruthStrategyGroupCaloMuBrem", *
kwargs.setdefault('VertexTypes' , [ 3 ])
kwargs.setdefault('ParentPDGCodes' , [ 13, -13 ])
kwargs.setdefault('Regions', [3])
- return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs)
def getTruthStrategyGroupCaloDecay_MC15(name="ISF_MCTruthStrategyGroupCaloDecay_MC15", **kwargs):
kwargs.setdefault('ParentMinEkin' , 1000.*MeV)
@@ -186,7 +185,7 @@ def getTruthStrategyGroupCaloDecay_MC15(name="ISF_MCTruthStrategyGroupCaloDecay_
kwargs.setdefault('VertexTypeRangeLow' , 201) # All kinds of decay processes
kwargs.setdefault('VertexTypeRangeHigh' , 298) # ...
kwargs.setdefault('Regions', [3])
- return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs)
def getTruthStrategyGroupCaloDecay(name="ISF_MCTruthStrategyGroupCaloDecay", **kwargs):
kwargs.setdefault('ParentMinPt' , 1000.*MeV)
@@ -195,12 +194,12 @@ def getTruthStrategyGroupCaloDecay(name="ISF_MCTruthStrategyGroupCaloDecay", **k
kwargs.setdefault('VertexTypeRangeLow' , 201) # All kinds of decay processes
kwargs.setdefault('VertexTypeRangeHigh' , 298) # ...
kwargs.setdefault('Regions', [3])
- return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__GenericTruthStrategy(name, **kwargs)
def getValidationTruthStrategy(name="ISF_ValidationTruthStrategy", **kwargs):
kwargs.setdefault('ParentMinP' , 50.*MeV)
kwargs.setdefault('Regions', [1,3])
- return CfgMgr.ISF__ValidationTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__ValidationTruthStrategy(name, **kwargs)
def getLLPTruthStrategy(name="ISF_LLPTruthStrategy", **kwargs):
kwargs.setdefault('PassProcessCodeRangeLow', 200 )
@@ -209,7 +208,7 @@ def getLLPTruthStrategy(name="ISF_LLPTruthStrategy", **kwargs):
# http://www-geant4.kek.jp/lxr/source//processes/management/include/G4ProcessType.hh
kwargs.setdefault('PassProcessCategory', 9 ) # ==
kwargs.setdefault('Regions', [1,2,3,4])
- return CfgMgr.ISF__LLPTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__LLPTruthStrategy(name, **kwargs)
def getKeepLLPDecayChildrenStrategy(name="ISF_KeepLLPDecayChildrenStrategy", **kwargs):
# ProcessCategory==9 corresponds to the 'fUserDefined' G4ProcessType:
@@ -218,12 +217,12 @@ def getKeepLLPDecayChildrenStrategy(name="ISF_KeepLLPDecayChildrenStrategy", **k
kwargs.setdefault('VertexTypeRangeLow' , 200) # All kinds of decay processes
kwargs.setdefault('VertexTypeRangeHigh' , 299) # ...
kwargs.setdefault('BSMParent' , True)
- return CfgMgr.ISF__KeepChildrenTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__KeepChildrenTruthStrategy(name, **kwargs)
def getKeepLLPHadronicInteractionChildrenStrategy(name="ISF_KeepLLPHadronicInteractionChildrenStrategy", **kwargs):
kwargs.setdefault('VertexTypes' , [ 111, 121, 131, 141, 151, 161, 210 ])
kwargs.setdefault('BSMParent' , True)
- return CfgMgr.ISF__KeepChildrenTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__KeepChildrenTruthStrategy(name, **kwargs)
def getKeepAllDecayChildrenStrategy(name="ISF_KeepAllDecayChildrenStrategy", **kwargs):
# ProcessCategory==9 corresponds to the 'fUserDefined' G4ProcessType:
@@ -231,8 +230,8 @@ def getKeepAllDecayChildrenStrategy(name="ISF_KeepAllDecayChildrenStrategy", **k
kwargs.setdefault('PassProcessCategory' , 9 ) # ==
kwargs.setdefault('VertexTypeRangeLow' , 200) # All kinds of decay processes
kwargs.setdefault('VertexTypeRangeHigh' , 299) # ...
- return CfgMgr.ISF__KeepChildrenTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__KeepChildrenTruthStrategy(name, **kwargs)
def getKeepHadronicInteractionChildrenStrategy(name="ISF_KeepHadronicInteractionChildrenStrategy", **kwargs):
kwargs.setdefault('VertexTypes' , [ 111, 121, 131, 141, 151, 161, 210 ])
- return CfgMgr.ISF__KeepChildrenTruthStrategy(name, **kwargs);
+ return CfgMgr.ISF__KeepChildrenTruthStrategy(name, **kwargs)
diff --git a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfigNew.py b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfigNew.py
index 554e8709079ae4dc6af1fb634d5356dedb5258f1..c95349dde3b0373fe5adc9192ff0165748adc13c 100644
--- a/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfigNew.py
+++ b/Simulation/ISF/ISF_HepMC/ISF_HepMC_Tools/python/ISF_HepMC_ToolsConfigNew.py
@@ -7,9 +7,6 @@ from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaCommon.SystemOfUnits import MeV, mm
from ISF_Services.ISF_ServicesCoreConfigNew import GeoIDSvcCfg
-#Functions yet to be migrated:
-#getParticlePositionFilterMS
-#getTruthStrategyGroupID, getTruthStrategyGroupIDHadInt, getTruthStrategyGroupCaloMuBrem_MC15, getTruthStrategyGroupCaloDecay, getValidationTruthStrategy, getLLPTruthStrategy
# GenParticleFilters
def ParticleFinalStateFilterCfg(ConfigFlags, name="ISF_ParticleFinalStateFilter", **kwargs):
diff --git a/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt b/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
index c45118e877e807a7f3c8c74598fdf6d69aa81a02..9aea9edd2017c1d57320aa97605bbf4d3f2ccee1 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
+++ b/Simulation/ISF/ISF_SimulationSelectors/CMakeLists.txt
@@ -17,5 +17,5 @@ atlas_add_component( ISF_SimulationSelectors
LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} AtlasHepMCLib GaudiKernel BarcodeServicesLib ISF_Event ISF_InterfacesLib ISF_TrackingInterfacesLib )
# 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/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfig.py b/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfig.py
index ac7fb2086c9dca5953dc68ecb5b35450bb095c2a..f253c348e765ed0f8327ab9b5f3cf511a1e25971 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfig.py
+++ b/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfig.py
@@ -6,8 +6,6 @@ Elmar Ritsch, 04/02/2013
from AthenaCommon import CfgMgr
-from AthenaCommon.Constants import * # FATAL,ERROR etc.
-from AthenaCommon.SystemOfUnits import *
from ISF_SimulationSelectors import SimulationFlavor
### DefaultSimSelector configurations
diff --git a/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigNew.py b/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigNew.py
index fde6340e3d45cb4c6cfd7d46ca7c1f6fc28c72a2..d949da49de020f40a0364001ff2433c796fb7958 100644
--- a/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigNew.py
+++ b/Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigNew.py
@@ -7,10 +7,21 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaCommon.SystemOfUnits import GeV
from ISF_SimulationSelectors import SimulationFlavor
-from ISF_Services.ISF_ServicesConfigNew import ParticleKillerSvcCfg
+from ISF_Services.ISF_ServicesCoreConfigNew import ParticleKillerSvcCfg
from ISF_Geant4Services.ISF_Geant4ServicesConfigNew import (
Geant4SimCfg, AFIIGeant4SimCfg, LongLivedGeant4SimCfg, AFII_QS_Geant4SimCfg,
- FullGeant4SimCfg, PassBackGeant4SimCfg
+ FullGeant4SimCfg, PassBackGeant4SimCfg,
+)
+from ISF_FastCaloSimServices.ISF_FastCaloSimServicesConfigNew import (
+ FastCaloSimSvcCfg, LegacyAFIIFastCaloSimSvcCfg,
+ FastCaloSimSvcV2Cfg, DNNCaloSimSvcCfg,
+ FastHitConvAlgFastCaloSimSvcCfg,
+ FastHitConvAlgLegacyAFIIFastCaloSimSvcCfg,
+ FastCaloSimPileupSvcCfg, FastCaloSimPileupOTSvcCfg,
+)
+from ISF_FatrasServices.ISF_FatrasServicesConfigNew import (
+ FatrasSimServiceIDCfg, FatrasNewExtrapolationSimServiceIDCfg,
+ FatrasPileupSimServiceIDCfg,
)
@@ -22,16 +33,19 @@ def DefaultSimSelectorCfg(flags, name="ISF_DefaultSimSelector", **kwargs):
def DefaultParticleKillerSelectorCfg(flags, name="ISF_DefaultParticleKillerSelector", **kwargs):
acc = ParticleKillerSvcCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.ParticleKiller)
- acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def PileupParticleKillerSelectorCfg(flags, name="ISF_PileupParticleKillerSelector", **kwargs):
acc = ParticleKillerSvcCfg(flags)
kwargs.setdefault("PileupBCID", [1])
- kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.ParticleKiller)
acc.setPrivateTools(CompFactory.ISF.KinematicPileupSimSelector(name, **kwargs))
return acc
@@ -39,99 +53,151 @@ def PileupParticleKillerSelectorCfg(flags, name="ISF_PileupParticleKillerSelecto
def DefaultGeant4SelectorCfg(flags, name="ISF_DefaultGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
- acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def DefaultAFIIGeant4SelectorCfg(flags, name="ISF_DefaultAFIIGeant4Selector", **kwargs):
acc = AFIIGeant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
- acc.merge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ tool = acc.popToolsAndMerge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def DefaultLongLivedGeant4SelectorCfg(flags, name="ISF_DefaultLongLivedGeant4Selector", **kwargs):
acc = LongLivedGeant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_LongLivedGeant4SimSvc"))
- acc.merge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_LongLivedGeant4SimSvc"))
+ tool = acc.popToolsAndMerge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def DefaultAFII_QS_Geant4SelectorCfg(flags, name="ISF_DefaultAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
- acc.merge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
+ tool = acc.popToolsAndMerge(DefaultGeant4SelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def FullGeant4SelectorCfg(flags, name="ISF_FullGeant4Selector", **kwargs):
acc = FullGeant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_FullGeant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FullGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
- acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def PassBackGeant4SelectorCfg(flags, name="ISF_PassBackGeant4Selector", **kwargs):
acc = PassBackGeant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_PassBackGeant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_PassBackGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
- acc.merge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def DefaultFastCaloSimSelectorCfg(flags, name="ISF_DefaultFastCaloSimSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FastCaloSimSvc") # TODO
+ acc = FastCaloSimSvcCfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def DefaultLegacyAFIIFastCaloSimSelectorCfg(flags, name="ISF_DefaultLegacyAFIIFastCaloSimSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_LegacyAFIIFastCaloSimSvc") # TODO
+ acc = LegacyAFIIFastCaloSimSvcCfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_LegacyAFIIFastCaloSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def DefaultFastCaloSimV2SelectorCfg(flags, name="ISF_DefaultFastCaloSimV2Selector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FastCaloSimSvcV2") # TODO
+ acc = FastCaloSimSvcV2Cfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimSvcV2"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSimV2)
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def DefaultDNNCaloSimSelectorCfg(flags, name="ISF_DefaultDNNCaloSimSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_DNNCaloSimSvc") # TODO
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ acc = DNNCaloSimSvcCfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_DNNCaloSimSvc"))
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def FastHitConvAlgFastCaloSimSelectorCfg(flags, name="ISF_FastHitConvAlgFastCaloSimSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FastHitConvAlgFastCaloSimSvc") # TODO
+ acc = ComponentAccumulator()
+ acc.merge(FastHitConvAlgFastCaloSimSvcCfg(flags))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FastHitConvAlgFastCaloSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
+
def FastHitConvAlgLegacyAFIIFastCaloSimSelectorCfg(flags, name="ISF_FastHitConvAlgLegacyAFIIFastCaloSimSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FastHitConvAlgLegacyAFIIFastCaloSimSvc") # TODO
+ acc = ComponentAccumulator()
+ acc.merge(FastHitConvAlgLegacyAFIIFastCaloSimSvcCfg(flags))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FastHitConvAlgLegacyAFIIFastCaloSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def DefaultFatrasSelectorCfg(flags, name="ISF_DefaultFatrasSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FatrasSimSvc") # TODO
+ acc = FatrasSimServiceIDCfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FatrasSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def DefaultFatrasNewExtrapolationSelectorCfg(flags, name="ISF_DefaultFatrasNewExtrapolationSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FatrasNewExtrapolationSimSvc") # TODO
+ acc = ComponentAccumulator()
+ acc.merge(FatrasNewExtrapolationSimServiceIDCfg(flags))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FatrasNewExtrapolationSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def DefaultParametricSimulationSelectorCfg(flags, name="ISF_DefaultParametricSimulationSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_ParametricSimSvc") # TODO
+ acc = ComponentAccumulator()
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", "ISF_ParametricSimSvc") # TODO
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Parametric)
- return DefaultSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(DefaultSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
# PileUpSimSelector Configurations
@@ -142,38 +208,50 @@ def PileupSimSelectorCfg(flags, name="ISF_PileupSimSelector", **kwargs):
def FatrasPileupSelectorCfg(flags, name="ISF_FatrasPileupSelector", **kwargs):
+ acc = ComponentAccumulator()
+ acc.merge(FatrasPileupSimServiceIDCfg(flags))
kwargs.setdefault("PileupBCID", [1])
- kwargs.setdefault("Simulator", "ISF_FatrasPileupSimSvc") # TODO
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FatrasPileupSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FatrasPileup)
- return PileupSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(PileupSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
-def FatrasPileupSelector_noHits(flags, name="ISF_FatrasPileupSelector_noHits", **kwargs):
- kwargs.setdefault("PileupBCID", [2])
- kwargs.setdefault("Simulator", "ISF_FatrasPileupSimSvc_noHits") # TODO
- kwargs.setdefault("SimulationFlavor", SimulationFlavor.FatrasPileup)
- return PileupSimSelectorCfg(flags, name, **kwargs)
+# FatrasPileupSelector_noHits not migrated
+# due to missing getter for Simulator "ISF_FatrasPileupSimSvc_noHits"
def FastCaloSimPileupSelectorCfg(flags, name="ISF_FastCaloSimPileupSelector", **kwargs):
+ acc = FastCaloSimPileupSvcCfg(flags)
kwargs.setdefault("PileupBCID" , flags.Sim.FastChain.BCID)
- kwargs.setdefault("Simulator", "ISF_FastCaloSimPileupSvc") # TODO
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimPileupSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSimPileup)
- return PileupSimSelectorCfg(flags, name, **kwargs)
+ acc.merge(PileupSimSelectorCfg(flags, name, **kwargs))
+ tool = acc.popToolsAndMerge(PileupSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def FastCaloSimPileupOTSelectorCfg(flags, name="ISF_FastCaloSimPileupOTSelector", **kwargs):
+ acc = FastCaloSimPileupOTSvcCfg(flags)
kwargs.setdefault("PileupBCID", flags.Sim.FastChain.BCID)
- kwargs.setdefault("Simulator", "ISF_FastCaloSimPileupOTSvc") # TODO
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimPileupOTSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSimPileup)
- return PileupSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(PileupSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
# KinematicSimSelector Configurations
def ElectronGeant4SelectorCfg(flags, name="ISF_ElectronGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
kwargs.setdefault("ParticlePDG", 11)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -182,7 +260,8 @@ def ElectronGeant4SelectorCfg(flags, name="ISF_ElectronGeant4Selector", **kwargs
def NeutralGeant4SelectorCfg(flags, name="ISF_NeutralGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
kwargs.setdefault("Charge", 0)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -192,7 +271,8 @@ def ProtonAFIIGeant4SelectorCfg(flags, name="ISF_ProtonAFIIGeant4Selector", **kw
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxMom", 750)
kwargs.setdefault("ParticlePDG", 2212)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -200,7 +280,8 @@ def ProtonAFIIGeant4SelectorCfg(flags, name="ISF_ProtonAFIIGeant4Selector", **kw
def ProtonAFII_QS_Geant4SelectorCfg(flags, name="ISF_ProtonAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(ProtonAFIIGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -209,15 +290,67 @@ def PionAFIIGeant4SelectorCfg(flags, name="ISF_PionAFIIGeant4Selector", **kwargs
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxMom", 200)
kwargs.setdefault("ParticlePDG", 211)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
+def PionG4FastCaloGeant4Selector(flags, name="ISF_PionG4FastCaloGeant4Selector", **kwargs):
+ acc = AFIIGeant4SimCfg(flags)
+ kwargs.setdefault("MaxEkin", 200)
+ kwargs.setdefault("ParticlePDG", 211)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
+ return acc
+
+
+def ProtonG4FastCaloGeant4Selector(flags, name="ISF_ProtonG4FastCaloGeant4Selector", **kwargs):
+ acc = AFIIGeant4SimCfg(flags)
+ kwargs.setdefault("MaxEkin", 400)
+ kwargs.setdefault("ParticlePDG", 2212)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
+ return acc
+
+
+def NeutronG4FastCaloGeant4Selector(flags, name="ISF_NeutronG4FastCaloGeant4Selector", **kwargs):
+ acc = AFIIGeant4SimCfg(flags)
+ kwargs.setdefault("MaxEkin", 400)
+ kwargs.setdefault("ParticlePDG", 2112)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
+ return acc
+
+
+def ChargedKaonG4FastCaloGeant4Selector(flags, name="ISF_ChargedKaonG4FastCaloGeant4Selector", **kwargs):
+ acc = AFIIGeant4SimCfg(flags)
+ kwargs.setdefault("MaxEkin", 400)
+ kwargs.setdefault("ParticlePDG", 321)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
+ return acc
+
+
+def KLongG4FastCaloGeant4Selector(flags, name="ISF_KLongG4FastCaloGeant4Selector", **kwargs):
+ acc = AFIIGeant4SimCfg(flags)
+ kwargs.setdefault("MaxEkin", 400)
+ kwargs.setdefault("ParticlePDG", 130)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
+ return acc
+
+
def PionAFII_QS_Geant4SelectorCfg(flags, name="ISF_PionAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(PionAFIIGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -226,7 +359,8 @@ def ChargedKaonAFIIGeant4SelectorCfg(flags, name="ISF_ChargedKaonAFIIGeant4Selec
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxMom", 750)
kwargs.setdefault("ParticlePDG", 321)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -234,7 +368,8 @@ def ChargedKaonAFIIGeant4SelectorCfg(flags, name="ISF_ChargedKaonAFIIGeant4Selec
def ChargedKaonAFII_QS_Geant4SelectorCfg(flags, name="ISF_ChargedKaonAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(ChargedKaonAFIIGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -243,7 +378,8 @@ def KLongAFIIGeant4SelectorCfg(flags, name="ISF_KLongAFIIGeant4Selector", **kwar
acc = AFIIGeant4SimCfg(flags)
kwargs.setdefault("MaxMom", 750)
kwargs.setdefault("ParticlePDG", 130)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
@@ -251,7 +387,8 @@ def KLongAFIIGeant4SelectorCfg(flags, name="ISF_KLongAFIIGeant4Selector", **kwar
def KLongAFII_QS_Geant4SelectorCfg(flags, name="ISF_KLongAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
acc.merge(KLongAFIIGeant4SelectorCfg(flags, name, **kwargs))
return acc
@@ -262,46 +399,63 @@ def MuonSelectorCfg(flags, name="ISF_MuonSelector", **kwargs):
acc.setPrivateTools(CompFactory.ISF.KinematicSimSelector(name, **kwargs))
return acc
+
def MuonGeant4SelectorCfg(flags, name="ISF_MuonGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
- acc.merge(MuonSelectorCfg(flags, name, **kwargs))
+ tool = acc.popToolsAndMerge(MuonSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def MuonAFIIGeant4SelectorCfg(flags, name="ISF_MuonAFIIGeant4Selector", **kwargs):
acc = AFIIGeant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFIIGeant4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
- acc.merge(MuonGeant4SelectorCfg(flags, name, **kwargs))
+ tool = acc.popToolsAndMerge(MuonGeant4SelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def MuonAFII_QS_Geant4SelectorCfg(flags, name="ISF_MuonAFII_QS_Geant4Selector", **kwargs):
acc = AFII_QS_Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
- acc.merge(MuonGeant4SelectorCfg(flags, name, **kwargs))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_AFII_QS_Geant4SimSvc"))
+ tool = acc.popToolsAndMerge(MuonGeant4SelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def MuonFatrasSelectorCfg(flags, name="ISF_MuonFatrasSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FatrasSimSvc") # TODO
+ acc = FatrasSimServiceIDCfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FatrasSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
- return MuonSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(MuonSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def MuonFatrasPileupSelectorCfg(flags, name="ISF_MuonFatrasPileupSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FatrasPileupSimSvc") # TODO
+ acc = ComponentAccumulator()
+ acc.merge(FatrasPileupSimServiceIDCfg(flags))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FatrasPileupSimSvc"))
kwargs.setdefault("PileupBCID", [1])
kwargs.setdefault("ParticlePDG", 13)
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
- return PileupSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(PileupSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def WithinEta5FastCaloSimSelectorCfg(flags, name="ISF_WithinEta5FastCaloSimSelector", **kwargs):
- acc = ComponentAccumulator()
- kwargs.setdefault("Simulator", "ISF_FastCaloSimSvc") # TODO
+ acc = FastCaloSimSvcCfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FastCaloSimSvc"))
kwargs.setdefault("MinPosEta", -5.0)
kwargs.setdefault("MaxPosEta", 5.0)
kwargs.setdefault("SimulationFlavor", SimulationFlavor.FastCaloSim)
@@ -311,7 +465,8 @@ def WithinEta5FastCaloSimSelectorCfg(flags, name="ISF_WithinEta5FastCaloSimSelec
def EtaGreater5ParticleKillerSimSelectorCfg(flags, name="ISF_EtaGreater5ParticleKillerSimSelector", **kwargs):
acc = ParticleKillerSvcCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
kwargs.setdefault("MinPosEta", -5.0)
kwargs.setdefault("MaxPosEta", 5.0)
kwargs.setdefault("InvertCuts", True)
@@ -322,7 +477,8 @@ def EtaGreater5ParticleKillerSimSelectorCfg(flags, name="ISF_EtaGreater5Particle
def EtaGreater5PileupParticleKillerSimSelectorCfg(flags, name="ISF_EtaGreater5PileupParticleKillerSimSelector", **kwargs):
acc = ParticleKillerSvcCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_ParticleKillerSvc"))
kwargs.setdefault("MinPosEta", -5.0)
kwargs.setdefault("MaxPosEta", 5.0)
kwargs.setdefault("InvertCuts", True)
@@ -343,14 +499,19 @@ def PhotonConeSelectorCfg(flags, name="ISF_PhotonConeSelector", **kwargs):
def PhotonConeFatrasSelectorCfg(flags, name="ISF_PhotonConeFatrasSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FatrasSimSvc") # TODO
+ acc = FatrasSimServiceIDCfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FatrasSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
- return PhotonConeSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(PhotonConeSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def PhotonConeGeant4SelectorCfg(flags, name="ISF_PhotonConeGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(PhotonConeSelectorCfg(flags, name, **kwargs))
return acc
@@ -372,7 +533,8 @@ def HiggsLeptonsConeSimSelectorCfg(flags, name="ISF_HiggsLeptonsConeSimSelector"
def HiggsLeptonsConeGeant4SelectorCfg(flags, name="ISF_HiggsLeptonsConeGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(HiggsLeptonsConeSimSelectorCfg(flags, name, **kwargs))
return acc
@@ -393,7 +555,8 @@ def HiggsLeptonsConeGeant4CaloSelectorCfg(flags, name="ISF_HiggsLeptonsConeGeant
def WLeptonsConeGeant4SelectorCfg(flags, name="ISF_WLeptonsConeGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
kwargs.setdefault("ConeCreatorMinPt", 0.)
kwargs.setdefault("ConeSize", 0.4)
@@ -410,7 +573,8 @@ def ZLeptonsDirectionConeGeant4SelectorCfg(flags, name="ISF_ZLeptonsDirectionCon
# this selector picks all particles with a mometum direction
# within DeltaR<ConeSize relative to the Z decay lepton directions
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
kwargs.setdefault("ConeCreatorMinPt", 0.)
kwargs.setdefault("ConeSize", 0.4)
@@ -432,7 +596,8 @@ def ZLeptonsPositionConeGeant4SelectorCfg(flags, name="ISF_ZLeptonsPositionConeG
def JPsiLeptonsConeGeant4SelectorCfg(flags, name="ISF_JPsiLeptonsConeGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
kwargs.setdefault("ConeCreatorMinPt", 0.)
kwargs.setdefault("ConeSize", 0.4)
@@ -463,16 +628,22 @@ def BHadronProductsSimSelectorCfg(flags, name="ISF_BHadronProductsSimSelector",
def BHadronProductsGeant4SelectorCfg(flags, name="ISF_BHadronProductsGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
- acc.merge(BHadronProductsSimSelectorCfg(flags, name, **kwargs))
+ tool = acc.popToolsAndMerge(BHadronProductsSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
return acc
def BHadronProductsFatrasSelectorCfg(flags, name="ISF_BHadronProductsFatrasSelector", **kwargs):
- kwargs.setdefault("Simulator", "ISF_FatrasSimSvc") # TODO
+ acc = FatrasSimServiceIDCfg(flags)
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISF_FatrasSimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Fatras)
- return BHadronProductsSimSelectorCfg(flags, name, **kwargs)
+ tool = acc.popToolsAndMerge(BHadronProductsSimSelectorCfg(flags, name, **kwargs))
+ acc.setPrivateTools(tool)
+ return acc
def TauProductsSimSelectorCfg(flags, name="ISF_TauProductsSimSelector", **kwargs):
@@ -487,7 +658,8 @@ def TauProductsSimSelectorCfg(flags, name="ISF_TauProductsSimSelector", **kwargs
def TauProductsGeant4SelectorCfg(flags, name="ISF_TauProductsGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(TauProductsSimSelectorCfg(flags, name, **kwargs))
return acc
@@ -505,7 +677,8 @@ def ZProductsSimSelectorCfg(flags, name="ISF_ZProductsSimSelector", **kwargs):
def ZProductsGeant4SelectorCfg(flags, name="ISF_ZProductsGeant4Selector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.merge(ZProductsSimSelectorCfg(flags, name, **kwargs))
return acc
@@ -514,10 +687,10 @@ def ZProductsGeant4SelectorCfg(flags, name="ISF_ZProductsGeant4Selector", **kwar
# HistorySimSelector Configurations
def SubDetStickyGeant4SimSelectorCfg(flags, name="ISF_SubDetStickyGeant4SimSelector", **kwargs):
acc = Geant4SimCfg(flags)
- kwargs.setdefault("PrevSimSvc", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("RequiresUnchangedGeoID", True)
- kwargs.setdefault("Simulator", "ISF_Geant4SimSvc")
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("PrevSimSvc", acc.getService("ISFG4SimSvc"))
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.setPrivateTools(CompFactory.ISF.HistorySimSelector(name, **kwargs))
return acc
@@ -527,7 +700,8 @@ def GlobalStickyGeant4SimSelectorCfg(flags, name="ISF_GlobalStickyGeant4SimSelec
acc = Geant4SimCfg(flags)
kwargs.setdefault("PrevSimSvc", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("RequiresUnchangedGeoID", False)
- kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
+ if flags.Concurrency.NumThreads == 0:
+ kwargs.setdefault("Simulator", acc.getService("ISFG4SimSvc"))
kwargs.setdefault("SimulationFlavor", SimulationFlavor.Geant4)
acc.setPrivateTools(CompFactory.ISF.HistorySimSelector(name, **kwargs))
return acc
diff --git a/TileCalorimeter/TileConditions/CMakeLists.txt b/TileCalorimeter/TileConditions/CMakeLists.txt
index d36e537a108c2a26d6f7cb8845c8d5642e7d0bfa..6e9a16196cf4480cca7bba3b866c53b13be35463 100644
--- a/TileCalorimeter/TileConditions/CMakeLists.txt
+++ b/TileCalorimeter/TileConditions/CMakeLists.txt
@@ -1,36 +1,11 @@
-################################################################################
-# Package: TileConditions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TileConditions )
-atlas_depends_on_subdirs( PRIVATE
- AtlasTest/TestTools
- DetectorDescription/IdDictParser )
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloConditions
- Calorimeter/CaloIdentifier
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/Identifier
- GaudiKernel
- TileCalorimeter/TileCalib/TileCalibBlobObjs
- TileCalorimeter/TileIdentifier
- PRIVATE
- Calorimeter/CaloDetDescr
- DetectorDescription/GeoModel/GeoModelInterfaces
- TileCalorimeter/TileDetDescr
- Tools/PathResolver )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
find_package( CLHEP )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
+find_package( CORAL COMPONENTS CoralBase )
find_package( ROOT COMPONENTS Matrix Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Physics HistPainter Rint )
# tag NEEDS_CORAL_BASE was not recognized in automatic conversion in cmt2cmake
@@ -40,21 +15,21 @@ atlas_add_library( TileConditionsLib
src/Tile*.cxx
PUBLIC_HEADERS TileConditions
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier AthenaBaseComps AthenaKernel AthenaPoolUtilities Identifier GaudiKernel TileCalibBlobObjs TileIdentifier StoreGateLib SGtests CaloDetDescrLib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} TileDetDescr PathResolver )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TileDetDescr PathResolver )
atlas_add_component( TileConditions
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES TileConditionsLib )
atlas_add_dictionary( TileConditionsDict
TileConditions/TileConditionsDict.h
TileConditions/selection.xml
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel TileCalibBlobObjs TileIdentifier CaloDetDescrLib TileDetDescr PathResolver TileConditionsLib )
+ INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel TileCalibBlobObjs TileIdentifier CaloDetDescrLib TileDetDescr PathResolver TileConditionsLib )
# Test(s) in the package:
atlas_add_test( TileCondToolTMDB_test
diff --git a/TileCalorimeter/TileConditions/src/TileInfo.cxx b/TileCalorimeter/TileConditions/src/TileInfo.cxx
index 995d617627156b28e3b8ae8211382a2ee47d379c..2eecd7e2c3db563565c93d5824be2e15ce595ff4 100644
--- a/TileCalorimeter/TileConditions/src/TileInfo.cxx
+++ b/TileCalorimeter/TileConditions/src/TileInfo.cxx
@@ -36,7 +36,6 @@
#include "TileIdentifier/TileFragHash.h"
#include "AthenaKernel/errorcheck.h"
#include "AthenaKernel/IClassIDSvc.h"
-#include <boost/preprocessor/stringize.hpp>
#include <cmath>
#include <fstream>
diff --git a/TileCalorimeter/TileDetDescr/CMakeLists.txt b/TileCalorimeter/TileDetDescr/CMakeLists.txt
index d6051a78b1d80c5717937dc42e7a294726f7c6b2..1fe07edb6f9eb0803eb97a87af0e6c6db5f32eb8 100644
--- a/TileCalorimeter/TileDetDescr/CMakeLists.txt
+++ b/TileCalorimeter/TileDetDescr/CMakeLists.txt
@@ -1,33 +1,16 @@
-################################################################################
-# Package: TileDetDescr
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TileDetDescr )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- Database/RDBAccessSvc
- DetectorDescription/Identifier
- PRIVATE
- Calorimeter/CaloDetDescr
- DetectorDescription/AtlasDetDescr
- GaudiKernel
- TileCalorimeter/TileIdentifier )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( TileDetDescr
src/Tile*.cxx
PUBLIC_HEADERS TileDetDescr
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${GEOMODELCORE_LIBRARIES} CaloIdentifier AthenaKernel Identifier CaloDetDescrLib RDBAccessSvcLib
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
+ LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} CaloIdentifier AthenaKernel Identifier CaloDetDescrLib RDBAccessSvcLib
PRIVATE_LINK_LIBRARIES AtlasDetDescr GaudiKernel TileIdentifier )
diff --git a/TileCalorimeter/TileDetDescr/TileDetDescr/TileDetDescrManager.h b/TileCalorimeter/TileDetDescr/TileDetDescr/TileDetDescrManager.h
index 3fe94129f3d4bd56372e582e7034f982e72ddf93..0fe740f1e7e8357010e6b15e01ab5f77fc35d8eb 100755
--- a/TileCalorimeter/TileDetDescr/TileDetDescr/TileDetDescrManager.h
+++ b/TileCalorimeter/TileDetDescr/TileDetDescr/TileDetDescrManager.h
@@ -1,9 +1,9 @@
/*
- 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 TileDetDescrManager_h
-#define TileDetDescrManager_h 1
+#ifndef TILEDETDESCR_TILEDETDESCRMANAGER_H
+#define TILEDETDESCR_TILEDETDESCRMANAGER_H
#include "GeoModelKernel/GeoVDetectorManager.h"
#include "Identifier/IdentifierHash.h"
@@ -13,8 +13,7 @@
#include <vector>
#include <map>
#include <cmath>
-
-#include "boost/shared_ptr.hpp"
+#include <memory>
class TileDddbManager;
class TileDetDescrRegion;
@@ -26,7 +25,7 @@ class CaloDetDescrElement;
class TileCellDim;
class MsgStream;
-typedef boost::shared_ptr<TileDddbManager> TileDddbManager_ptr;
+typedef std::shared_ptr<TileDddbManager> TileDddbManager_ptr;
class TileDetDescrManager : public GeoVDetectorManager
{
diff --git a/TileCalorimeter/TileGeoModel/CMakeLists.txt b/TileCalorimeter/TileGeoModel/CMakeLists.txt
index aaa8e9356a9374734d019d7166f91a5202b6115b..f6a5a8aaa9c9733ea30e343abf17b4d9eca89cc4 100644
--- a/TileCalorimeter/TileGeoModel/CMakeLists.txt
+++ b/TileCalorimeter/TileGeoModel/CMakeLists.txt
@@ -1,43 +1,22 @@
-################################################################################
-# Package: TileGeoModel
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TileGeoModel )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/StoreGate
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/GeoModel/GeoModelUtilities
- TileCalorimeter/TileDetDescr
- PRIVATE
- Calorimeter/CaloDetDescr
- Calorimeter/CaloIdentifier
- Control/AthenaKernel
- Control/SGTools
- Database/RDBAccessSvc
- GaudiKernel
- TileCalorimeter/TileConditions
- TileCalorimeter/TileIdentifier )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( CORAL COMPONENTS CoralBase CoralKernel RelationalAccess )
-find_package( Eigen )
find_package( GeoModelCore )
# Component(s) in the package:
atlas_add_library( TileGeoModelLib
src/*.cxx
PUBLIC_HEADERS TileGeoModel
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
LINK_LIBRARIES ${GEOMODELCORE_LIBRARIES} GeoModelUtilities TileDetDescr StoreGateLib SGtests CaloDetDescrLib TileConditionsLib
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${EIGEN_LIBRARIES} CaloIdentifier SGTools GaudiKernel TileIdentifier )
+ PRIVATE_LINK_LIBRARIES CaloIdentifier SGTools GaudiKernel TileIdentifier )
atlas_add_component( TileGeoModel
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
+ INCLUDE_DIRS ${GEOMODELCORE_INCLUDE_DIRS}
LINK_LIBRARIES TileGeoModelLib )
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 1550daabc9b3abedf19379469f004816cf949755..ecf1561ef033d53f47a29f2b00e2f5b5b6250f30 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -25,7 +25,7 @@ ciRefFileMap = {
's3505-21.0' : 'v1',
's3505-21.3' : 'v1',
's3505-21.9' : 'v1',
- 's3505-22.0' : 'v5',
+ 's3505-22.0' : 'v6',
# OverlayTier0Test_required-test
'overlay-d1498-21.0' : 'v2',
'overlay-d1498-22.0' : 'v33',
diff --git a/Trigger/TrigConfiguration/TrigConfIO/python/TriggerConfigAccessBase.py b/Trigger/TrigConfiguration/TrigConfIO/python/TriggerConfigAccessBase.py
index 26107bee74831856411206a02ea687b8a0ed1bd6..5bf1fff4605a4c8ccafd75d23f023af0a11a8a37 100644
--- a/Trigger/TrigConfiguration/TrigConfIO/python/TriggerConfigAccessBase.py
+++ b/Trigger/TrigConfiguration/TrigConfIO/python/TriggerConfigAccessBase.py
@@ -145,7 +145,7 @@ class ConfigDBLoader(ConfigLoader):
failures += [ (q.format(**qdict), str(e)) ]
else:
configblob = cursor.fetchall()[0][0]
- config = json.loads(str(configblob), object_pairs_hook = odict)
+ config = json.loads(configblob.read().decode("utf-8"), object_pairs_hook = odict)
break
if not config:
for q,f in failures:
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
index 0a88e3db38c05e26360c91bf3b1c8e8dff12a312..53f9ec62020b7b0b3121b168676f6778461494f3 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
@@ -82,7 +82,7 @@ def trigJetHypoToolHelperFromDict(chain_dict):
A Helper Tool returned by this function may be the root of a Helper
Tool tree structure."""
- log.info('trigJetHypoToolFromDictc chainDict %s', str(chain_dict))
+ log.debug('trigJetHypoToolFromDictc chainDict %s', str(chain_dict))
try:
chain_label = chainDict2jetLabel(chain_dict)
@@ -113,7 +113,7 @@ def trigJetHypoToolHelperFromDict(chain_dict):
def trigJetHypoToolFromDict(chain_dict):
"""Produce a jet trigger hypo tool from a chainDict"""
- log.info('trigJetHypoToolFromDict chainDict %s', str(chain_dict))
+ log.debug('trigJetHypoToolFromDict chainDict %s', str(chain_dict))
chain_name = chain_dict['chainName']
tool = CompFactory.TrigJetHypoToolMT(name=chain_name)
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx
index 1e054c510fcb1a0609dd999da0fc2b5ffad57911..c597198892fec86f1eb4613cf97dc0b197d69d39 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/src/CommonMon.cxx
@@ -9,14 +9,11 @@
*/
#include "GaudiKernel/IJobOptionsSvc.h"
+#include "GaudiKernel/ThreadLocalContext.h"
+#include "GaudiKernel/EventIDBase.h"
#include "AthenaMonitoring/AthenaMonManager.h"
#include "AthenaMonitoring/ManagedMonitorToolTest.h"
-#include "EventInfo/EventInfo.h"
-#include "EventInfo/EventID.h"
-#include "EventInfo/EventType.h"
-#include "EventInfo/TriggerInfo.h"
-
#include "TrigSteeringEvent/TrigOperationalInfo.h"
#include "TrigSteeringEvent/TrigOperationalInfoCollection.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
@@ -42,6 +39,8 @@
//#include "muonEvent/MuonContainer.h"
#include "muonEvent/MuonParamDefs.h"
+#include "xAODEventInfo/EventInfo.h"
+
#include "xAODTrigger/MuonRoIContainer.h"
#include "xAODTrigger/MuonRoI.h"
@@ -1346,31 +1345,17 @@ StatusCode HLTMuonMonTool::fillCommonDQA()
}
}
- //get Event Info
- const DataHandle<EventInfo> evt;
- StatusCode sc = evtStore()->retrieve(evt);
- if ( sc.isFailure() ) {
- ATH_MSG_ERROR(" Cannot retrieve EventInfo ");
- hist("Number_Of_Events", m_histdirrate )->Fill( m_lumiblock );
- return StatusCode::FAILURE;
- }
+ // Get EventID
+ const EventIDBase& evtid = Gaudi::Hive::currentContext().eventID();
- if( !evt.isValid() ){
- ATH_MSG_FATAL(" Could not find event");
+ if(! evtid.isValid() ){
+ ATH_MSG_FATAL(" Invalid EventID object");
hist("Number_Of_Events", m_histdirrate )->Fill( m_lumiblock );
return StatusCode::FAILURE;
}
- const EventID* evtid = evt->event_ID();
-
- if(! evtid ){
- ATH_MSG_FATAL(" no evtid object");
- hist("Number_Of_Events", m_histdirrate )->Fill( m_lumiblock );
- return StatusCode::FAILURE;
- }
-
- m_lumiblock = evtid->lumi_block() ;
- m_event = evtid->event_number() ;
+ m_lumiblock = evtid.lumi_block() ;
+ m_event = evtid.event_number() ;
hist("Number_Of_Events", m_histdirrate )->Fill( m_lumiblock );
@@ -1536,8 +1521,7 @@ StatusCode HLTMuonMonTool::fillCommonDQA()
fillTriggerOverlap();
//new check L1 flag
- sc = fillL1MuRoI();
- if ( sc.isFailure() ) {
+ if ( fillL1MuRoI().isFailure() ) {
ATH_MSG_ERROR(" Cannot retrieve MuonRoIInfo ");
return StatusCode::FAILURE;
}
@@ -2626,12 +2610,6 @@ StatusCode HLTMuonMonTool::fillChainDQA_standard(const std::string& chainName, c
}
}
- const DataHandle<EventInfo> evt;
- sc = evtStore()->retrieve(evt);
- if ( sc.isFailure() ) {
- ATH_MSG_ERROR(" Cannot retrieve EventInfo ");
- return StatusCode::FAILURE;
- }
float mean_mu = lbAverageInteractionsPerCrossing();
// start to dump the probe muon information //
if(tag_muon_index > -1){
@@ -4315,32 +4293,18 @@ std::vector<std::string> HLTMuonMonTool::getESbits()
//
// Process current event
//
-
- const EventInfo* event_handle(nullptr);
- if(StatusCode::FAILURE==evtStore() -> retrieve(event_handle)){
- if (errcnt < 1) {
- ATH_MSG_DEBUG("Failed to read EventInfo");
- errcnt++;
- }
- return retvect;
- }
- //
- // Print EventInfo and stream tags
- //
- const TriggerInfo *trig = event_handle->trigger_info();
- if(!trig) {
+ const xAOD::EventInfo* eventInfo = nullptr;
+ if (evtStore()->retrieve(eventInfo, "EventInfo").isFailure()) {
if (errcnt < 1) {
- ATH_MSG_DEBUG("Failed to get TriggerInfo");
+ ATH_MSG_DEBUG("Failed to read EventInfo");
errcnt++;
}
return retvect;
}
- const std::vector<TriggerInfo::StreamTag> &streams = trig->streamTags();
bool found_express_stream = false;
- for(unsigned i = 0; i < streams.size(); ++i) {
- const TriggerInfo::StreamTag &stag = streams.at(i);
+ for (const xAOD::EventInfo::StreamTag& stag : eventInfo->streamTags()) {
if(stag.type() == "express" && stag.name() == "express") {
found_express_stream = true;
break;
@@ -4355,12 +4319,6 @@ std::vector<std::string> HLTMuonMonTool::getESbits()
return retvect;
}
- /* ATH_MSG_INFO (">>>>>>>>>>>>>>>>"
- << " run #" << event_handle->event_ID()->run_number()
- << " lumi #" << event_handle->event_ID()->lumi_block()
- << " event #" << event_handle->event_ID()->event_number()
- << " has express stream tag"); */
-
//const std::string key = "HLT_EXPRESS_OPI_HLT";
const std::string key = "HLT_TrigOperationalInfoCollection_EXPRESS_OPI_HLT";
@@ -4526,16 +4484,7 @@ StatusCode HLTMuonMonTool::fillL1MuRoI()
return StatusCode::FAILURE;
}
-
- const DataHandle<EventInfo> eventInfo;
- sc = evtStore()->retrieve(eventInfo);
- if ( sc.isFailure() ) {
- ATH_MSG_ERROR(" Cannot retrieve EventInfo ");
- hist("Number_Of_Events", m_histdirrate )->Fill( m_lumiblock );
- return StatusCode::FAILURE;
- }
-
- EventID::number_type bcid = eventInfo->event_ID()->bunch_crossing_id();
+ EventIDBase::number_type bcid = Gaudi::Hive::currentContext().eventID().bunch_crossing_id();
bool filled = m_bunchTool->isFilled(bcid);
bool unpaired = m_bunchTool->isUnpaired(bcid);
diff --git a/Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py b/Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py
index a774de1d5ae7eef2c23ca3bcd2e441a75a70ffff..e731a2875e62d198aba8c1da0bd75770ca0ef087 100644
--- a/Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py
+++ b/Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py
@@ -179,13 +179,15 @@ def L1DecoderCfg(flags, seqName = None):
decoderAlg.roiUnpackers += [ CompFactory.FSRoIsUnpackingTool("FSRoIsUnpackingTool", Decisions=mapThresholdToL1DecisionCollection("FSNOSEED"),
OutputTrigRoIs = recordable(mapThresholdToL1RoICollection("FSNOSEED")) ) ]
- unpackers, rerunUnpackers = createCaloRoIUnpackers()
- decoderAlg.roiUnpackers += unpackers
- decoderAlg.rerunRoiUnpackers += rerunUnpackers
-
- unpackers, rerunUnpackers = createMuonRoIUnpackers()
- decoderAlg.roiUnpackers += unpackers
- decoderAlg.rerunRoiUnpackers += rerunUnpackers
+ if flags.Trigger.doCalo:
+ unpackers, rerunUnpackers = createCaloRoIUnpackers()
+ decoderAlg.roiUnpackers += unpackers
+ decoderAlg.rerunRoiUnpackers += rerunUnpackers
+
+ if flags.Trigger.doMuon:
+ unpackers, rerunUnpackers = createMuonRoIUnpackers()
+ decoderAlg.roiUnpackers += unpackers
+ decoderAlg.rerunRoiUnpackers += rerunUnpackers
decoderAlg.prescaler = createPrescalingTool()
decoderAlg.DoCostMonitoring = flags.Trigger.CostMonitoring.doCostMonitoring
diff --git a/Trigger/TrigSteer/TrigSteering/CMakeLists.txt b/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
index 6ecf729df5d10e7f4dbe8a4e137ce15be309d3f5..73a50b5d879ca2b9403a8f924d95ef825cdd420d 100644
--- a/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
+++ b/Trigger/TrigSteer/TrigSteering/CMakeLists.txt
@@ -15,7 +15,7 @@ atlas_add_library( TrigSteeringLib
PUBLIC_HEADERS TrigSteering
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthContainers AthenaBaseComps AthenaKernel AthenaMonitoringLib ByteStreamCnvSvcBaseLib EventInfo GaudiKernel L1TopoAlgorithms L1TopoCoreSim L1TopoEvent L1TopoSimulationLib TrigConfBase TrigConfHLTData TrigConfInterfaces TrigNavigationLib TrigSteeringEvent TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Result TrigTimeAlgsLib xAODEventInfo TrigInterfacesLib
+ LINK_LIBRARIES AthContainers AthenaBaseComps AthenaKernel AthenaMonitoringLib ByteStreamCnvSvcBaseLib EventInfo EventInfoUtils GaudiKernel L1TopoAlgorithms L1TopoCoreSim L1TopoEvent L1TopoSimulationLib TrigConfBase TrigConfHLTData TrigConfInterfaces TrigNavigationLib TrigSteeringEvent TrigT1CaloEventLib TrigT1CaloToolInterfaces TrigT1Result TrigTimeAlgsLib xAODEventInfo TrigInterfacesLib
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaMonitoringKernelLib L1TopoCommon L1TopoConfig TrigConfL1Data TrigMonitorBaseLib TrigSerializeResultLib TrigStorageDefinitions TrigT1Interfaces xAODTrigger )
atlas_add_component( TrigSteering
diff --git a/Trigger/TrigSteer/TrigSteering/src/ResultBuilder.cxx b/Trigger/TrigSteer/TrigSteering/src/ResultBuilder.cxx
index 67341734852d9491fe450acc9b8e34cd7fba0f32..fc5a02b646631164495909222cbddbda5073ea0d 100755
--- a/Trigger/TrigSteer/TrigSteering/src/ResultBuilder.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/ResultBuilder.cxx
@@ -13,6 +13,7 @@
#include "TrigSteeringEvent/PartialEventBuildingInfo.h"
#include "TrigConfHLTData/HLTTriggerType.h"
#include "EventInfo/EventInfo.h"
+#include "EventInfoUtils/EventInfoFromxAOD.h"
#include "TrigSteeringEvent/ScoutingInfo.h"
#include "eformat/SourceIdentifier.h"
@@ -511,16 +512,36 @@ ErrorCode ResultBuilder::fillTriggerInfo(const std::vector<SteeringChain*>& acti
// recording
////////////////////////////////////////////////////////////////////
+ // Retrieve xAOD::EventInfo
+ const xAOD::EventInfo* constxEventInfo(0);
+ if (evtStore()->retrieve(constxEventInfo).isFailure()) {
+ ATH_MSG_FATAL("Can't get xAOD::EventInfo object");
+ return HLT::FATAL;
+ }
+
+ // Create old EventInfo if not present in the event store
+ StatusCode sc = StatusCode::SUCCESS;
+ const EventInfo* constEventInfo{nullptr};
+ if (evtStore()->retrieve(constEventInfo).isFailure()) {
+ sc = evtStore()->record<EventInfo>(
+ std::make_unique<EventInfo>(
+ new EventID(eventIDFromxAOD(constxEventInfo)),
+ new EventType(eventTypeFromxAOD(constxEventInfo))
+ ), "EventInfo"
+ );
+ if (sc.isFailure()) {
+ ATH_MSG_FATAL("Can't record EventInfo created from xAOD::EventInfo");
+ return HLT::FATAL;
+ }
+ ATH_MSG_DEBUG("Recorded EventInfo created from xAOD::EventInfo");
+ }
- // put it all to SG EventInfo object
- // get EventInfo
- const EventInfo* constEventInfo(0);
- StatusCode sc = evtStore()->retrieve(constEventInfo);
- if(sc.isFailure()){
+ // Get the EventInfo to update StreamTag and TriggerInfo
+ if(!constEventInfo && evtStore()->retrieve(constEventInfo).isFailure()){
ATH_MSG_FATAL("Can't get EventInfo object for update of the StreamTag and TriggerInfo");
return HLT::FATAL;
}
-
+ ATH_MSG_DEBUG("Retrieved EventInfo for updating with EventID " << *(constEventInfo->event_ID()));
ATH_MSG_VERBOSE("Updating TriggerInfo");
EventInfo* eventInfo = const_cast<EventInfo*>(constEventInfo);
@@ -603,14 +624,6 @@ ErrorCode ResultBuilder::fillTriggerInfo(const std::vector<SteeringChain*>& acti
//// Recording in xAODEventInfo
////////////////////////////////
// put it all to SG xAOD::EventInfo object
-
- const xAOD::EventInfo* constxEventInfo(0);
- sc = evtStore()->retrieve(constxEventInfo);
-
- if (sc.isFailure()) {
- ATH_MSG_FATAL("Can't get xAOD::EventInfo object for update of the StreamTag");
- return HLT::FATAL;
- }
#if 0
diff --git a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
index b0515f0b78e7d868bb5cb6c2b8bce20329a5b725..06eaf63eeff0900ea4a6390d4393f7f314a9254a 100755
--- a/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
+++ b/Trigger/TrigSteer/TrigSteering/src/TrigSteer.cxx
@@ -67,6 +67,8 @@
#include "TrigTimeAlgs/TrigTimer.h"
#include "GaudiKernel/StatusCode.h"
+#include "GaudiKernel/EventContext.h"
+#include "GaudiKernel/ThreadLocalContext.h"
#include "TrigSteeringEvent/TrigOperationalInfo.h"
@@ -1290,21 +1292,22 @@ bool TrigSteer::canContinueJob() {
HLT::ErrorCode TrigSteer::setEvent() {
- const EventInfo* einfo(0);
- StatusCode sc = m_config->getStoreGate()->retrieve(einfo);
- if(sc.isFailure()){
- ATH_MSG_FATAL("Can't get EventInfo object for update event information" );
+ const EventContext& ctx = Gaudi::Hive::currentContext();
+ if (!ctx.valid()) {
+ ATH_MSG_FATAL("No valid EventContext to update event information" );
return HLT::ErrorCode(Action::ABORT_EVENT, Reason::USERDEF_1, SteeringInternalReason::UNKNOWN);
} else {
- if ( einfo->event_ID() ) {
- m_config->setLumiBlockNumber( einfo->event_ID()->lumi_block() );
+ if ( ctx.eventID().isValid() ) {
+ ATH_MSG_DEBUG("Setting event information from eventID " << ctx.eventID());
+
+ m_config->setLumiBlockNumber( ctx.eventID().lumi_block() );
ITrigLBNHist::set_lbn( m_config->getLumiBlockNumber() ); // this is setting LBN for all trigger monitoring tools
- m_config->setLvl1Id( einfo->event_ID()->event_number() );
+ m_config->setLvl1Id(ctx.eventID().event_number() );
// request the config service to set the correct prescales for the lumiblock
- StatusCode sc = m_configSvc->assignPrescalesToChains( einfo->event_ID()->lumi_block() );
+ StatusCode sc = m_configSvc->assignPrescalesToChains( ctx.eventID().lumi_block() );
if (sc.isFailure()) {
ATH_MSG_FATAL("ConfigSvc failed to assign HLT prescales to chains.");
return HLT::ErrorCode(Action::ABORT_JOB, Reason::USERDEF_1, SteeringInternalReason::BAD_JOB_SETUP);
@@ -1318,7 +1321,7 @@ HLT::ErrorCode TrigSteer::setEvent() {
m_lvlCnvTool->setConfigurationKeys(m_configSvc->masterKey(), m_configSvc->hltPrescaleKey());
} else {
- ATH_MSG_ERROR("EventNumber&LBN not possible because missing event_ID");
+ ATH_MSG_ERROR("EventNumber&LBN not possible because missing eventID");
return HLT::ErrorCode(Action::ABORT_EVENT, Reason::USERDEF_2, SteeringInternalReason::UNKNOWN);
}
}
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/PprMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/PprMonitorAlgorithm.py
index e45055c60fd38d68c7325a3e925f72e1bf23c6f0..34d39834237ef615cfbaf2d344dfad9d85c8eca5 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/PprMonitorAlgorithm.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/PprMonitorAlgorithm.py
@@ -57,52 +57,72 @@ def PprMonitoringConfig(inputFlags):
#######################
# PPM inputs (LUT-CP) #
#######################
- histPath = trigPath+'/LUT-CP'
+ histPath = trigPath+'/LUT-CP/Distributions'
# EM distributions
- myGroup.defineHistogram('etaTT_EM;h_ppm_em_1d_tt_lutcp_Eta', title='EM LUT-CP: Distribution of peak in #eta; #eta', type='TH1F', path=histPath+'/Distributions', xbins=etabins, cutmask='mask_EM_cpET_0_noPhi')
+ myGroup.defineHistogram('etaTT_EM;h_ppm_em_1d_tt_lutcp_Eta', title='EM LUT-CP: Distribution of peak in #eta; #eta', type='TH1F', path=histPath, xbins=etabins, cutmask='mask_EM_cpET_0_noPhi')
- myGroup.defineHistogram('phiTT_1d_EM;h_ppm_em_1d_tt_lutcp_Phi', title='EM LUT-CP: Distribution of peak in #phi; #phi', type='TH1F', path=histPath+'/Distributions', xbins=phibins, xmin=phimin, xmax=phimax_1d, cutmask='mask_EM_cpET_0_phiBins')
+ myGroup.defineHistogram('phiTT_1d_EM;h_ppm_em_1d_tt_lutcp_Phi', title='EM LUT-CP: Distribution of peak in #phi; #phi', type='TH1F', path=histPath, xbins=phibins, xmin=phimin, xmax=phimax_1d, cutmask='mask_EM_cpET_0_phiBins')
- myGroup.defineHistogram('cpET_EM;h_ppm_em_1d_tt_lutcp_Et', title='EM LUT-CP: Distribution of peak; EM LUT peak [GeV/2]', type='TH1F', path=histPath+'/Distributions', xbins=maxEnergyRange-1, xmin=1, xmax=maxEnergyRange, cutmask='mask_EM_cpET_0_noPhi')
+ myGroup.defineHistogram('cpET_EM;h_ppm_em_1d_tt_lutcp_Et', title='EM LUT-CP: Distribution of peak; EM LUT peak [GeV/2]', type='TH1F', path=histPath, xbins=maxEnergyRange-1, xmin=1, xmax=maxEnergyRange, cutmask='mask_EM_cpET_0_noPhi')
+ # HAD distributions
+ myGroup.defineHistogram('etaTT_HAD;h_ppm_had_1d_tt_lutcp_Eta', title='HAD LUT-CP: Distribution of peak in #eta; #eta', type='TH1F', path=histPath, xbins=etabins, cutmask='mask_HAD_cpET_0_noPhi')
+
+ myGroup.defineHistogram('phiTT_1d_HAD;h_ppm_had_1d_tt_lutcp_Phi', title='HAD LUT-CP: Distribution of peak in #phi; #phi', type='TH1F', path=histPath, xbins=phibins, xmin=phimin, xmax=phimax_1d, cutmask='mask_HAD_cpET_0_phiBins')
+
+ myGroup.defineHistogram('cpET_HAD;h_ppm_had_1d_tt_lutcp_Et', title='HAD LUT-CP: Distribution of peak; HAD LUT peak [GeV/2]', type='TH1F', path=histPath, xbins=maxEnergyRange-1, xmin=1, xmax=maxEnergyRange, cutmask='mask_HAD_cpET_0_noPhi')
# Eta-phi maps
- myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_lutcp_AverageEt', title='EM Average LUT-CP Et for Et > 5 GeV/2', type='TH2F', path=histPath+'/EtaPhiMaps', xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_cpET_5_phiBins', weight='cpET_EM')
+ histPath = trigPath+'/LUT-CP/EtaPhiMaps'
+
+ myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_lutcp_AverageEt', title='EM Average LUT-CP Et for Et > 5 GeV/2', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_cpET_5_phiBins', weight='cpET_EM')
+
+ myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_lutcp_AverageEt', title='HAD Average LUT-CP Et for Et > 5 GeV/2', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_cpET_5_phiBins', weight='cpET_HAD')
+
-
########################
# PPM inputs (LUT-JEP) #
########################
- histPath = trigPath+'/LUT-JEP'
+ histPath = trigPath+'/LUT-JEP/Distributions'
# EM distributions
- myGroup.defineHistogram('etaTT_EM;h_ppm_em_1d_tt_lutjep_Eta', title='EM LUT-JEP: Distribution of peak in #eta', type='TH1F', path=histPath+'/Distributions', xbins=etabins, cutmask='mask_EM_jepET_0_noPhi')
+ myGroup.defineHistogram('etaTT_EM;h_ppm_em_1d_tt_lutjep_Eta', title='EM LUT-JEP: Distribution of peak in #eta', type='TH1F', path=histPath, xbins=etabins, cutmask='mask_EM_jepET_0_noPhi')
- myGroup.defineHistogram('phiTT_1d_EM;h_ppm_em_1d_tt_lutjep_Phi', title='EM LUT-JEP: Distribution of peak in #phi; #phi', type='TH1F', path=histPath+'/Distributions', xbins=phibins, xmin=phimin, xmax=phimax_1d, cutmask='mask_EM_jepET_0_phiBins')
+ myGroup.defineHistogram('phiTT_1d_EM;h_ppm_em_1d_tt_lutjep_Phi', title='EM LUT-JEP: Distribution of peak in #phi; #phi', type='TH1F', path=histPath, xbins=phibins, xmin=phimin, xmax=phimax_1d, cutmask='mask_EM_jepET_0_phiBins')
- myGroup.defineHistogram('jepET_EM;h_ppm_em_1d_tt_lutjep_Et', title='EM LUT-JEP: Distribution of peak; EM LUT peak [GeV]', type='TH1F', path=histPath+'/Distributions', xbins=maxEnergyRange-1, xmin=1, xmax=maxEnergyRange, cutmask='mask_EM_jepET_0_noPhi')
+ myGroup.defineHistogram('jepET_EM;h_ppm_em_1d_tt_lutjep_Et', title='EM LUT-JEP: Distribution of peak; EM LUT peak [GeV]', type='TH1F', path=histPath, xbins=maxEnergyRange-1, xmin=1, xmax=maxEnergyRange, cutmask='mask_EM_jepET_0_noPhi')
+
+ # HAD distributions
+ myGroup.defineHistogram('etaTT_HAD;h_ppm_had_1d_tt_lutjep_Eta', title='HAD LUT-JEP: Distribution of peak in #eta', type='TH1F', path=histPath, xbins=etabins, cutmask='mask_HAD_jepET_0_noPhi')
+
+ myGroup.defineHistogram('phiTT_1d_HAD;h_ppm_had_1d_tt_lutjep_Phi', title='HAD LUT-JEP: Distribution of peak in #phi; #phi', type='TH1F', path=histPath, xbins=phibins, xmin=phimin, xmax=phimax_1d, cutmask='mask_HAD_jepET_0_phiBins')
+
+ myGroup.defineHistogram('jepET_HAD;h_ppm_had_1d_tt_lutjep_Et', title='HAD LUT-JEP: Distribution of peak; HAD LUT peak [GeV]', type='TH1F', path=histPath, xbins=maxEnergyRange-1, xmin=1, xmax=maxEnergyRange, cutmask='mask_HAD_jepET_0_noPhi')
# Eta-phi maps
- myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_lutjep_AverageEt', title='EM Average LUT-JEP Et for Et > 5 GeV', type='TH2F', path=histPath+'/EtaPhiMaps', xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_jepET_5_phiBins', weight='jepET_EM')
+ histPath = trigPath+'/LUT-JEP/EtaPhiMaps'
+
+ myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_lutjep_AverageEt', title='EM Average LUT-JEP Et for Et > 5 GeV', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_jepET_5_phiBins', weight='jepET_EM')
+
+ myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_lutjep_AverageEt', title='HAD Average LUT-JEP Et for Et > 5 GeV', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_jepET_5_phiBins', weight='jepET_HAD')
-
####################
# PPM inputs (ADC) #
####################
- histPath = trigPath+'/ADC'
+ histPath = trigPath+'/ADC/EtaPhiMaps'
# EM tower maps
- myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_adc_HitMap', title='#eta - #phi map of EM FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath+'/EtaPhiMaps', xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_timeslice')
+ myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_adc_HitMap', title='#eta - #phi map of EM FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_timeslice')
- myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_adc_ProfileHitMap', title='#eta - #phi profile map of EM FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath+'/EtaPhiMaps', xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_timeslice', weight='emTT_ADC')
+ myGroup.defineHistogram('etaTT_EM,phiTT_2d_EM;h_ppm_em_2d_etaPhi_tt_adc_ProfileHitMap', title='#eta - #phi profile map of EM FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_EM_timeslice', weight='emTT_ADC')
# HAD tower maps
- myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_adc_HitMap', title='#eta - #phi map of HAD FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath+'/EtaPhiMaps', xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_timeslice')
+ myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_adc_HitMap', title='#eta - #phi map of HAD FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_timeslice')
- myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_adc_ProfileHitMap', title='#eta - #phi profile map of HAD FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath+'/EtaPhiMaps', xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_timeslice', weight='hadTT_ADC')
+ myGroup.defineHistogram('etaTT_HAD,phiTT_2d_HAD;h_ppm_had_2d_etaPhi_tt_adc_ProfileHitMap', title='#eta - #phi profile map of HAD FADC > ' +str(threshADC)+ ' for triggered timeslice; Tower #eta; Tower #phi', type='TH2F', path=histPath, xbins=etabins, ybins=phibins, ymin=phimin, ymax=phimax_2d, cutmask='mask_HAD_timeslice', weight='hadTT_ADC')
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PprMonitorAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PprMonitorAlgorithm.cxx
index 9ec864201c7db8aa10af47dda8fef25717b3a0be..831506ae818541562945776ef81ac53c7d874a4d 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/PprMonitorAlgorithm.cxx
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/PprMonitorAlgorithm.cxx
@@ -98,7 +98,13 @@ StatusCode PprMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
auto phiTT_1d_HAD = Monitored::Collection("phiTT_1d_HAD", vecMonTT_HAD, []( const auto &hadTower ){return hadTower.phi1d;});
variables.push_back(phiTT_1d_HAD);
- // Cutmasks
+ auto cpET_HAD = Monitored::Collection("cpET_HAD", vecMonTT_HAD, []( const auto &hadTower ){return hadTower.tower->cpET();});
+ variables.push_back(cpET_HAD);
+
+ auto jepET_HAD = Monitored::Collection("jepET_HAD", vecMonTT_HAD, []( const auto &hadTower ){return hadTower.jepET;});
+ variables.push_back(jepET_HAD);
+
+ // Cutmasks (EM)
std::vector<int> vec_EM_timeslice = {};
std::vector<int> vec_EM_cpET_0 = {}; // includes "duplicate" towers for phi maps
std::vector<int> vec_EM_cpET_0_noDuplicates = {}; // no duplicates: for plots not binned in phi
@@ -115,8 +121,6 @@ StatusCode PprMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
for (auto& emTower : vecMonTT_EM) {
-
-
// -------- LUT --------
int cpET = (emTower.tower)->cpET();
int jepET = emTower.jepET;
@@ -155,15 +159,41 @@ StatusCode PprMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
} // End loop over vector of EM towers
- // HAD cutmasks
+ // Cutmasks (HAD)
std::vector<int> vec_HAD_timeslice = {};
+ std::vector<int> vec_HAD_cpET_0 = {}; // includes "duplicate" towers for phi maps
+ std::vector<int> vec_HAD_cpET_0_noDuplicates = {}; // no duplicates: for plots not binned in phi
+ std::vector<int> vec_HAD_cpET_5 = {};
+ std::vector<int> vec_HAD_cpET_5_noDuplicates = {};
+ std::vector<int> vec_HAD_jepET_0 = {};
+ std::vector<int> vec_HAD_jepET_0_noDuplicates = {};
+ std::vector<int> vec_HAD_jepET_5 = {};
+ std::vector<int> vec_HAD_jepET_5_noDuplicates = {};
+
// HAD weights
std::vector<int> vec_HAD_ADC = {};
for (auto& hadTower : vecMonTT_HAD) {
- // Timeslice
+ // -------- LUT --------
+ int cpET = (hadTower.tower)->cpET();
+ int jepET = hadTower.jepET;
+ bool isDuplicate = hadTower.isDuplicate;
+
+ if (cpET > 0) ATH_MSG_DEBUG("HAD tower cpET: " << cpET << " jepET: " << jepET);
+
+ // Fill the cutmasks for HAD LUT-CP and LUT-JEP energy distributions
+ vec_HAD_cpET_0.push_back(cpET > 0); // For phi distributions / maps
+ vec_HAD_cpET_0_noDuplicates.push_back((cpET > 0) && !isDuplicate); // For plots not binned in phi
+ vec_HAD_cpET_5.push_back(cpET > 5);
+ vec_HAD_cpET_5_noDuplicates.push_back((cpET > 5) && !isDuplicate);
+ vec_HAD_jepET_0.push_back(jepET > 0);
+ vec_HAD_jepET_0_noDuplicates.push_back((jepET > 0) && !isDuplicate);
+ vec_HAD_jepET_5.push_back(jepET > 5);
+ vec_HAD_jepET_5_noDuplicates.push_back((jepET > 5) && !isDuplicate);
+
+ // -------- ADC hitmaps per timeslice --------
unsigned int tslice = (hadTower.tower)->adcPeak();
unsigned int adcSize = ((hadTower.tower)->adc()).size();
@@ -223,6 +253,31 @@ StatusCode PprMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
auto hadTT_ADC = Monitored::Collection("hadTT_ADC", vec_HAD_ADC);
variables.push_back(hadTT_ADC);
+ auto mask_HAD_cpET_0_phiBins = Monitored::Collection("mask_HAD_cpET_0_phiBins", vec_HAD_cpET_0);
+ variables.push_back(mask_HAD_cpET_0_phiBins);
+
+ auto mask_HAD_cpET_0_noPhi = Monitored::Collection("mask_HAD_cpET_0_noPhi", vec_HAD_cpET_0_noDuplicates);
+ variables.push_back(mask_HAD_cpET_0_noPhi);
+
+ auto mask_HAD_cpET_5_phiBins = Monitored::Collection("mask_HAD_cpET_5_phiBins", vec_HAD_cpET_5);
+ variables.push_back(mask_HAD_cpET_5_phiBins);
+
+ auto mask_HAD_cpET_5_noPhi = Monitored::Collection("mask_HAD_cpET_5_noPhi", vec_HAD_cpET_5_noDuplicates);
+ variables.push_back(mask_HAD_cpET_5_noPhi);
+
+ auto mask_HAD_jepET_0_phiBins = Monitored::Collection("mask_HAD_jepET_0_phiBins", vec_HAD_jepET_0);
+ variables.push_back(mask_HAD_jepET_0_phiBins);
+
+ auto mask_HAD_jepET_0_noPhi = Monitored::Collection("mask_HAD_jepET_0_noPhi", vec_HAD_jepET_0_noDuplicates);
+ variables.push_back(mask_HAD_jepET_0_noPhi);
+
+ auto mask_HAD_jepET_5_phiBins = Monitored::Collection("mask_HAD_jepET_5_phiBins", vec_HAD_jepET_5);
+ variables.push_back(mask_HAD_jepET_5_phiBins);
+
+ auto mask_HAD_jepET_5_noPhi = Monitored::Collection("mask_HAD_jepET_5_noPhi", vec_HAD_jepET_5_noDuplicates);
+ variables.push_back(mask_HAD_jepET_5_noPhi);
+
+
fill(m_packageName, variables);
variables.clear();
return StatusCode::SUCCESS;
diff --git a/HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT-select-PEB-stream.py b/Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_extractStream.py
similarity index 100%
rename from HLT/Trigger/TrigControl/TrigCommon/bin/athenaHLT-select-PEB-stream.py
rename to Trigger/TrigTools/TrigByteStreamTools/bin/trigbs_extractStream.py
diff --git a/HLT/Trigger/TrigControl/TrigCommon/doc/athenaHLT-select-PEB-stream.txt b/Trigger/TrigTools/TrigByteStreamTools/doc/trigbs_extractStream.txt
similarity index 78%
rename from HLT/Trigger/TrigControl/TrigCommon/doc/athenaHLT-select-PEB-stream.txt
rename to Trigger/TrigTools/TrigByteStreamTools/doc/trigbs_extractStream.txt
index 0d8f4a7310db06ec2128213dd7185693d087e97b..1d4eee06a936f5a78970197892b71c7bc765b700 100644
--- a/HLT/Trigger/TrigControl/TrigCommon/doc/athenaHLT-select-PEB-stream.txt
+++ b/Trigger/TrigTools/TrigByteStreamTools/doc/trigbs_extractStream.txt
@@ -1,16 +1,16 @@
The script
-athenaHLT-select-PEB-stream.py
+trigbs_extractStream.py
allows to select from a bytestream file events which belong to a given stream and to write them to a bytestream output file which
obeys the same conventions as the files produced in P1.
-athenaHLT-select-PEB-stream.py -h
+trigbs_extractStream.py -h
gives a list of options which can be used:
-./athenaHLT-select-PEB-stream.py -h
-global "./athenaHLT-select-PEB-stream.py" options: -[DFPadhlnpsv] | --[dump-options,help,lumi-block,max-events,option-file,output-dir,progress-bar,project-tag,start-event,stream-name,verbosity] [arguments]+
+./trigbs_extractStream.py -h
+global "./trigbs_extractStream.py" options: -[DFPadhlnpsv] | --[dump-options,help,lumi-block,max-events,option-file,output-dir,progress-bar,project-tag,start-event,stream-name,verbosity] [arguments]+
[Global options]
@@ -50,9 +50,9 @@ Typical workflow for developers:
The <athenaHLT-output-file> will contain all events which have triggered, including also DataScouting events.
-3) Generate a P1 stream file with "athenaHLT-select-PEB-stream.py" from the athenaHLT output file
+3) Generate a P1 stream file with "trigbs_extractStream.py" from the athenaHLT output file
-> athenaHLT-select-PEB-stream.py -s <my-preferred-stream> <athenaHLT-output-file>
+> trigbs_extractStream.py -s <my-preferred-stream> <athenaHLT-output-file>
There will be an output file produced of the form
@@ -69,9 +69,9 @@ All input events have to be for the same run number, but can have different lumi
Some Remarks:
-------------
-1) athenaHLT-select-PEB-stream.py allows to read multiple input files
+1) trigbs_extractStream.py allows to read multiple input files
-> athenaHLT-select-PEB-stream.py <file1> <file2> ... <fileN>
+> trigbs_extractStream.py <file1> <file2> ... <fileN>
All events have to be however from the same run. Events from different runs are skipped and an ERROR message is printed.
@@ -81,10 +81,10 @@ All events have to be however from the same run. Events from different runs are
4) For repeated running with the same options a standard option file can be generated:
-athenaHLT-select-PEB-stream.py -D <various options> <input files> > my-opt-file.py
+trigbs_extractStream.py -D <various options> <input files> > my-opt-file.py
and the run can be repeated with
-athenaHLT-select-PEB-stream.py -F my-opt-file.py
+trigbs_extractStream.py -F my-opt-file.py
The file my-opt-file.py can be also edited and modified with Python commands.
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index 408a5bef8f00696b5ed9e43ca8c5d828c226cd33..4e68aecdec7afffe5f372385d05c1bfecca616e4 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -438,8 +438,7 @@ if __name__ == "__main__":
#from AthenaConfiguration.MainServicesConfig import MainServicesCfg
#acc.merge( MainServicesCfg( ConfigFlags ) )
from L1Decoder.L1DecoderConfig import L1DecoderCfg
- l1DecoderAcc, l1DecoderAlg = L1DecoderCfg( ConfigFlags )
- acc.addEventAlgo(l1DecoderAlg)
+ l1DecoderAcc = L1DecoderCfg( ConfigFlags )
acc.merge(l1DecoderAcc)
from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
acc.merge(ByteStreamReadCfg(ConfigFlags))
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
index d4fe1cbdc793a36680455f0b1daec9cd23424e32..4ceb03769136600fd83b4e79e1c9de55a96170fc 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
@@ -1,758 +1,767 @@
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 - - -
+TrigSignatureMoniMT INFO -- #3136730292 Events 2 2 2 2 2 - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #3136730292 Features 12 296 14 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM15VH #2280638160
-TrigSignatureMoniMT INFO -- #2280638160 Events 2 2 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2280638160 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2280638160 Events 2 2 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2280638160 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
-TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113
-TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 20 20 20 - - - 20
-TrigSignatureMoniMT INFO -- #2613484113 Features 342 3686 780 - - -
+TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 20 20 20 - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2613484113 Features 342 3686 780 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM15VH #3837353071
-TrigSignatureMoniMT INFO -- #3837353071 Events 2 2 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3837353071 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3837353071 Events 2 2 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3837353071 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH #58053304
-TrigSignatureMoniMT INFO -- #58053304 Events 2 2 1 1 0 - - - 0
-TrigSignatureMoniMT INFO -- #58053304 Features 4 4 0 - - -
+TrigSignatureMoniMT INFO -- #58053304 Events 2 2 1 1 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #58053304 Features 4 4 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH #3965466087
-TrigSignatureMoniMT INFO -- #3965466087 Events 2 2 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3965466087 Events 2 2 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
-TrigSignatureMoniMT INFO -- #1295975955 Events 3 3 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1295975955 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1295975955 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1295975955 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_2j60_L1J15 #927735533
-TrigSignatureMoniMT INFO -- #927735533 Events 20 20 10 - - - - - 10
-TrigSignatureMoniMT INFO -- #927735533 Features 28 - - - - -
+TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 0 0 0 0 0 0 0 0 0 10 - 10
+TrigSignatureMoniMT INFO -- #927735533 Features 0 0 0 0 0 0 0 0 0 0 28 -
TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 #3498558358
-TrigSignatureMoniMT INFO -- #3498558358 Events 3 3 3 3 3 2 - - 0
-TrigSignatureMoniMT INFO -- #3498558358 Features 12 12 16 4 - -
+TrigSignatureMoniMT INFO -- #3498558358 Events 3 3 0 0 0 0 3 3 3 2 - - - - 0
+TrigSignatureMoniMT INFO -- #3498558358 Features 0 0 0 0 12 12 16 4 - - - -
TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 #234102568
-TrigSignatureMoniMT INFO -- #234102568 Events 3 3 3 3 3 2 - - 0
-TrigSignatureMoniMT INFO -- #234102568 Features 12 12 16 4 - -
+TrigSignatureMoniMT INFO -- #234102568 Events 3 3 0 0 0 0 3 3 3 2 - - - - 0
+TrigSignatureMoniMT INFO -- #234102568 Features 0 0 0 0 12 12 16 4 - - - -
TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 #2619091790
-TrigSignatureMoniMT INFO -- #2619091790 Events 3 3 3 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #2619091790 Features 12 4 4 4 - -
+TrigSignatureMoniMT INFO -- #2619091790 Events 3 3 0 0 0 0 3 1 1 1 - - - - 1
+TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 12 4 4 4 - - - -
TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 #557204938
-TrigSignatureMoniMT INFO -- #557204938 Events 3 3 3 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #557204938 Features 12 4 4 4 - -
+TrigSignatureMoniMT INFO -- #557204938 Events 3 3 0 0 0 0 3 1 1 1 - - - - 1
+TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 12 4 4 4 - - - -
TrigSignatureMoniMT INFO HLT_2mu4_L12MU4 #2999632714
-TrigSignatureMoniMT INFO -- #2999632714 Events 4 4 4 4 4 4 - - 4
-TrigSignatureMoniMT INFO -- #2999632714 Features 16 16 24 36 - -
+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 HLT_2mu4_bDimu_L12MU4 #1730084172
-TrigSignatureMoniMT INFO -- #1730084172 Events 4 4 4 4 4 4 - - 0
-TrigSignatureMoniMT INFO -- #1730084172 Features 16 16 24 18 - -
+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 HLT_2mu4_bJpsimumu_L12MU4 #4276347155
-TrigSignatureMoniMT INFO -- #4276347155 Events 4 4 4 4 4 4 - - 0
-TrigSignatureMoniMT INFO -- #4276347155 Features 16 16 24 18 - -
+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 HLT_2mu4_bUpsimumu_L12MU4 #4008168535
-TrigSignatureMoniMT INFO -- #4008168535 Events 4 4 4 4 4 4 - - 0
-TrigSignatureMoniMT INFO -- #4008168535 Features 16 16 24 18 - -
+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 HLT_2mu4_muonqual_L12MU4 #1584776935
-TrigSignatureMoniMT INFO -- #1584776935 Events 4 4 4 4 4 4 - - 4
-TrigSignatureMoniMT INFO -- #1584776935 Features 16 16 24 36 - -
+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 HLT_2mu6Comb_L12MU6 #2046267508
-TrigSignatureMoniMT INFO -- #2046267508 Events 4 4 4 3 - - - - 3
-TrigSignatureMoniMT INFO -- #2046267508 Features 16 12 - - - -
+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 4 3 3 3 - - 3
-TrigSignatureMoniMT INFO -- #1316992871 Features 16 12 18 28 - -
+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 HLT_2mu6_Dr_L12MU4 #3304584056
-TrigSignatureMoniMT INFO -- #3304584056 Events 4 4 4 3 - - - - 3
-TrigSignatureMoniMT INFO -- #3304584056 Features 16 12 - - - -
+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 4 3 3 3 - - 3
-TrigSignatureMoniMT INFO -- #1747073535 Features 16 12 18 28 - -
+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 HLT_2mu6_muonqual_L12MU6 #2398136098
-TrigSignatureMoniMT INFO -- #2398136098 Events 4 4 4 3 3 3 - - 3
-TrigSignatureMoniMT INFO -- #2398136098 Features 16 12 18 28 - -
+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 HLT_3j200_L1J100 #2199422919
-TrigSignatureMoniMT INFO -- #2199422919 Events 3 3 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2199422919 Features 0 - - - - -
+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 -
TrigSignatureMoniMT INFO HLT_3j200_L1J20 #493765146
-TrigSignatureMoniMT INFO -- #493765146 Events 19 19 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #493765146 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #493765146 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #493765146 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 #1832399408
-TrigSignatureMoniMT INFO -- #1832399408 Events 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1832399408 Events 0 0 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 #1199773318
-TrigSignatureMoniMT INFO -- #1199773318 Events 0 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #1199773318 Events 0 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_3mu8_msonly_L13MU6 #424835335
-TrigSignatureMoniMT INFO -- #424835335 Events 0 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #424835335 Events 0 0 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 #1834383636
-TrigSignatureMoniMT INFO -- #1834383636 Events 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1834383636 Events 0 0 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 #1175391812
-TrigSignatureMoniMT INFO -- #1175391812 Events 7 7 1 - - - - - 1
-TrigSignatureMoniMT INFO -- #1175391812 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #1175391812 Events 7 7 0 0 0 0 0 0 0 0 0 0 1 - 1
+TrigSignatureMoniMT INFO -- #1175391812 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15 #3989372080
-TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - - 20
-TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - - -
+TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_beamspot_trkFS_trkfast_BeamSpotPEB_L1J15 #628534730
-TrigSignatureMoniMT INFO -- #628534730 Events 20 20 20 20 - - - - 20
-TrigSignatureMoniMT INFO -- #628534730 Features 20 20 - - - -
+TrigSignatureMoniMT INFO -- #628534730 Events 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #628534730 Features 20 20 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1All #843341480
-TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - -
+TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM22VHI #3471067710
-TrigSignatureMoniMT INFO -- #3471067710 Events 6 6 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3471067710 Events 6 6 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_nod0_L1EM22VHI #4128870680
-TrigSignatureMoniMT INFO -- #4128870680 Events 6 6 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #4128870680 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #4128870680 Events 6 6 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4128870680 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e17_lhloose_mu14_L1EM15VH_MU10 #899946230
-TrigSignatureMoniMT INFO -- #899946230 Events 3 3 2 2 2 2 - - 2
-TrigSignatureMoniMT INFO -- #899946230 Features 2 45 4 2 - -
+TrigSignatureMoniMT INFO -- #899946230 Events 3 3 2 2 2 2 2 2 2 2 - - - - 2
+TrigSignatureMoniMT INFO -- #899946230 Features 2 45 4 2 2 2 2 2 - - - -
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 -- #140779220 Events 8 8 6 6 6 5 - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #140779220 Features 6 78 10 5 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
-TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - - 6
-TrigSignatureMoniMT INFO -- #1703681121 Features 7 133 7 - - -
+TrigSignatureMoniMT INFO -- #1703681121 Events 6 6 6 6 6 - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #1703681121 Features 7 133 7 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM22VHI #1995263521
-TrigSignatureMoniMT INFO -- #1995263521 Events 6 6 5 5 5 4 - - 4
-TrigSignatureMoniMT INFO -- #1995263521 Features 5 64 8 4 - -
+TrigSignatureMoniMT INFO -- #1995263521 Events 6 6 5 5 5 4 - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #1995263521 Features 5 64 8 4 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM22VHI #939763520
-TrigSignatureMoniMT INFO -- #939763520 Events 6 6 5 5 5 4 - - 4
-TrigSignatureMoniMT INFO -- #939763520 Features 5 64 8 4 - -
+TrigSignatureMoniMT INFO -- #939763520 Events 6 6 5 5 5 4 - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #939763520 Features 5 64 8 4 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM24VHI #4227411116
-TrigSignatureMoniMT INFO -- #4227411116 Events 6 6 5 5 5 4 - - 4
-TrigSignatureMoniMT INFO -- #4227411116 Features 5 64 8 4 - -
+TrigSignatureMoniMT INFO -- #4227411116 Events 6 6 5 5 5 4 - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #4227411116 Features 5 64 8 4 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM22VHI #2128128255
-TrigSignatureMoniMT INFO -- #2128128255 Events 6 6 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2128128255 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #2128128255 Events 6 6 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2128128255 Features 0 0 0 - - - - - - - - -
+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 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #2209076666 Features 3 1 1 1 - -
+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 - - - - - 3
-TrigSignatureMoniMT INFO -- #2086577378 Features 3 - - - - -
+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 - - -
+TrigSignatureMoniMT INFO -- #683953566 Events 20 20 20 20 20 - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #683953566 Features 171 1843 390 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 20 20 20 - - - 20
-TrigSignatureMoniMT INFO -- #324908483 Features 137 1654 190 - - -
+TrigSignatureMoniMT INFO -- #324908483 Events 20 20 20 20 20 - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #324908483 Features 137 1654 190 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 17 17 17 4 - - 4
-TrigSignatureMoniMT INFO -- #1053337356 Features 56 651 116 5 - -
+TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 17 17 17 4 - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #1053337356 Features 56 651 116 5 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
-TrigSignatureMoniMT INFO -- #176627878 Events 20 20 16 16 16 4 - - 4
-TrigSignatureMoniMT INFO -- #176627878 Features 48 531 93 5 - -
+TrigSignatureMoniMT INFO -- #176627878 Events 20 20 16 16 16 4 - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #176627878 Features 48 531 93 5 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 16 16 16 4 - - 4
-TrigSignatureMoniMT INFO -- #2758326765 Features 45 513 84 5 - -
+TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 16 16 16 4 - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #2758326765 Features 45 513 84 5 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_nod0_L1EM3 #1690619419
-TrigSignatureMoniMT INFO -- #1690619419 Events 20 20 16 16 16 4 - - 4
-TrigSignatureMoniMT INFO -- #1690619419 Features 45 513 84 5 - -
+TrigSignatureMoniMT INFO -- #1690619419 Events 20 20 16 16 16 4 - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #1690619419 Features 45 513 84 5 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM22VHI #298591874
-TrigSignatureMoniMT INFO -- #298591874 Events 6 6 2 2 2 2 - - 2
-TrigSignatureMoniMT INFO -- #298591874 Features 2 33 4 2 - -
+TrigSignatureMoniMT INFO -- #298591874 Events 6 6 2 2 2 2 - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #298591874 Features 2 33 4 2 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_nod0_L1EM22VHI #4115486024
-TrigSignatureMoniMT INFO -- #4115486024 Events 6 6 2 2 2 2 - - 2
-TrigSignatureMoniMT INFO -- #4115486024 Features 2 33 4 2 - -
+TrigSignatureMoniMT INFO -- #4115486024 Events 6 6 2 2 2 2 - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #4115486024 Features 2 33 4 2 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 20 20 20 - - - 20
-TrigSignatureMoniMT INFO -- #1959043579 Features 89 1135 112 - - -
+TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 20 20 20 - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1959043579 Features 89 1135 112 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e7_lhmedium_mu24_L1MU20 #2970063918
-TrigSignatureMoniMT INFO -- #2970063918 Events 8 8 7 5 5 1 - - 1
-TrigSignatureMoniMT INFO -- #2970063918 Features 9 72 14 1 - -
+TrigSignatureMoniMT INFO -- #2970063918 Events 8 8 7 7 7 2 2 1 1 1 - - - - 1
+TrigSignatureMoniMT INFO -- #2970063918 Features 9 92 17 2 2 1 1 1 - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM22VHI #3879926061
-TrigSignatureMoniMT INFO -- #3879926061 Events 6 6 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #3879926061 Events 6 6 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI #1045486446
-TrigSignatureMoniMT INFO -- #1045486446 Events 6 6 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #1045486446 Events 6 6 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_loose_L1EM22VHI #1776910226
-TrigSignatureMoniMT INFO -- #1776910226 Events 6 6 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1776910226 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1776910226 Events 6 6 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1776910226 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
-TrigSignatureMoniMT INFO -- #2706532790 Events 14 14 14 14 12 12 - - 12
-TrigSignatureMoniMT INFO -- #2706532790 Features 24 24 22 20 - -
+TrigSignatureMoniMT INFO -- #2706532790 Events 14 14 14 14 12 12 - - - - - - - - 12
+TrigSignatureMoniMT INFO -- #2706532790 Features 24 24 22 20 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_loose_L1EM15VH #531040386
-TrigSignatureMoniMT INFO -- #531040386 Events 8 8 7 7 7 6 - - 6
-TrigSignatureMoniMT INFO -- #531040386 Features 9 9 18 7 - -
+TrigSignatureMoniMT INFO -- #531040386 Events 8 8 7 7 7 6 - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #531040386 Features 9 9 18 7 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_medium_L1EM15VH #3776886359
-TrigSignatureMoniMT INFO -- #3776886359 Events 8 8 7 7 7 6 - - 6
-TrigSignatureMoniMT INFO -- #3776886359 Features 7 7 13 6 - -
+TrigSignatureMoniMT INFO -- #3776886359 Events 8 8 7 7 7 6 - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #3776886359 Features 7 7 13 6 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_medium_mu24_ivarmedium_L1MU20 #1007052793
-TrigSignatureMoniMT INFO -- #1007052793 Events 8 8 2 1 1 1 0 - 0
-TrigSignatureMoniMT INFO -- #1007052793 Features 2 1 3 1 0 -
+TrigSignatureMoniMT INFO -- #1007052793 Events 8 8 2 2 2 2 2 1 1 1 0 - - - 0
+TrigSignatureMoniMT INFO -- #1007052793 Features 2 2 4 2 2 1 1 1 0 - - -
TrigSignatureMoniMT INFO HLT_g25_tight_L1EM15VH #3691147775
-TrigSignatureMoniMT INFO -- #3691147775 Events 8 8 7 7 7 5 - - 5
-TrigSignatureMoniMT INFO -- #3691147775 Features 7 7 13 5 - -
+TrigSignatureMoniMT INFO -- #3691147775 Events 8 8 7 7 7 5 - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #3691147775 Features 7 7 13 5 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
-TrigSignatureMoniMT INFO -- #1158879722 Events 2 2 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1158879722 Events 2 2 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 #471243435
-TrigSignatureMoniMT INFO -- #471243435 Events 20 20 20 20 20 - - - 20
-TrigSignatureMoniMT INFO -- #471243435 Features 137 137 190 - - -
+TrigSignatureMoniMT INFO -- #471243435 Events 20 20 20 20 20 - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #471243435 Features 137 137 190 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 #3486231698
-TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 20 20 20 20 - - 20
-TrigSignatureMoniMT INFO -- #3486231698 Features 137 137 190 118 - -
+TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 20 20 20 20 - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3486231698 Features 137 137 190 118 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 #3230088967
-TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 17 17 17 9 - - 9
-TrigSignatureMoniMT INFO -- #3230088967 Features 56 56 116 12 - -
+TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 17 17 17 9 - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #3230088967 Features 56 56 116 12 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 #385248610
-TrigSignatureMoniMT INFO -- #385248610 Events 20 20 16 16 16 9 - - 9
-TrigSignatureMoniMT INFO -- #385248610 Features 48 48 93 12 - -
+TrigSignatureMoniMT INFO -- #385248610 Events 20 20 16 16 16 9 - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #385248610 Features 48 48 93 12 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
-TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 16 16 16 9 - - 9
-TrigSignatureMoniMT INFO -- #3280865118 Features 45 45 84 9 - -
+TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 16 16 16 9 - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #3280865118 Features 45 45 84 9 - - - - - - - -
TrigSignatureMoniMT INFO HLT_j0_perf_L1J12_EMPTY #1341875780
-TrigSignatureMoniMT INFO -- #1341875780 Events 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1341875780 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1341875780 Events 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1341875780 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
-TrigSignatureMoniMT INFO -- #4034799151 Events 19 19 15 - - - - - 15
-TrigSignatureMoniMT INFO -- #4034799151 Features 425 - - - - -
+TrigSignatureMoniMT INFO -- #4034799151 Events 19 19 0 0 0 0 0 0 0 0 0 0 15 - 15
+TrigSignatureMoniMT INFO -- #4034799151 Features 0 0 0 0 0 0 0 0 0 0 425 -
TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 #3992507557
-TrigSignatureMoniMT INFO -- #3992507557 Events 3 3 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3992507557 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
-TrigSignatureMoniMT INFO -- #3084792704 Events 19 19 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3084792704 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3084792704 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3084792704 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
-TrigSignatureMoniMT INFO -- #3769257182 Events 2 2 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3769257182 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3769257182 Events 2 2 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3769257182 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 #1211559599
-TrigSignatureMoniMT INFO -- #1211559599 Events 3 3 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1211559599 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 #3706723666
-TrigSignatureMoniMT INFO -- #3706723666 Events 3 3 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3706723666 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 #1837565816
-TrigSignatureMoniMT INFO -- #1837565816 Events 3 3 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1837565816 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
-TrigSignatureMoniMT INFO -- #2659902019 Events 3 3 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2659902019 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #2659902019 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2659902019 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
-TrigSignatureMoniMT INFO -- #2205518067 Events 19 19 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2205518067 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #2205518067 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2205518067 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j420_ftf_subjesgscIS_L1J20 #4179085188
-TrigSignatureMoniMT INFO -- #4179085188 Events 19 19 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #4179085188 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #4179085188 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #4179085188 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
-TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 19 - - - - - 19
-TrigSignatureMoniMT INFO -- #1364976160 Features 50 - - - - -
+TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 0 0 0 0 0 0 0 0 0 0 19 - 19
+TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 0 50 -
TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
-TrigSignatureMoniMT INFO -- #3295122398 Events 19 19 15 - - - - - 15
-TrigSignatureMoniMT INFO -- #3295122398 Features 27 - - - - -
+TrigSignatureMoniMT INFO -- #3295122398 Events 19 19 0 0 0 0 0 0 0 0 0 0 15 - 15
+TrigSignatureMoniMT INFO -- #3295122398 Features 0 0 0 0 0 0 0 0 0 0 27 -
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
-TrigSignatureMoniMT INFO -- #868405538 Events 20 20 19 - - - - - 19
-TrigSignatureMoniMT INFO -- #868405538 Features 50 - - - - -
+TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 0 19 - 19
+TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 0 50 -
TrigSignatureMoniMT INFO HLT_j45_ftf_csskpf_nojcalib_L1J20 #3533281867
-TrigSignatureMoniMT INFO -- #3533281867 Events 19 19 15 - - - - - 15
-TrigSignatureMoniMT INFO -- #3533281867 Features 25 - - - - -
+TrigSignatureMoniMT INFO -- #3533281867 Events 19 19 0 0 0 0 0 0 0 0 0 0 15 - 15
+TrigSignatureMoniMT INFO -- #3533281867 Features 0 0 0 0 0 0 0 0 0 0 25 -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 #1335156103
-TrigSignatureMoniMT INFO -- #1335156103 Events 19 19 16 - - - - - 16
-TrigSignatureMoniMT INFO -- #1335156103 Features 31 - - - - -
+TrigSignatureMoniMT INFO -- #1335156103 Events 19 19 0 0 0 0 0 0 0 0 0 0 16 - 16
+TrigSignatureMoniMT INFO -- #1335156103 Features 0 0 0 0 0 0 0 0 0 0 31 -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_nojcalib_L1J20 #3658890913
-TrigSignatureMoniMT INFO -- #3658890913 Events 19 19 15 - - - - - 15
-TrigSignatureMoniMT INFO -- #3658890913 Features 29 - - - - -
+TrigSignatureMoniMT INFO -- #3658890913 Events 19 19 0 0 0 0 0 0 0 0 0 0 15 - 15
+TrigSignatureMoniMT INFO -- #3658890913 Features 0 0 0 0 0 0 0 0 0 0 29 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 #2857031468
-TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 12 - - - - - 12
-TrigSignatureMoniMT INFO -- #2857031468 Features 20 - - - - -
+TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 0 0 0 0 0 0 0 0 0 0 12 - 12
+TrigSignatureMoniMT INFO -- #2857031468 Features 0 0 0 0 0 0 0 0 0 0 20 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J15 #2938374624
-TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 12 - - - - - 12
-TrigSignatureMoniMT INFO -- #2938374624 Features 19 - - - - -
+TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 0 0 0 0 0 0 0 0 0 0 12 - 12
+TrigSignatureMoniMT INFO -- #2938374624 Features 0 0 0 0 0 0 0 0 0 0 19 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_059jvt_L1J15 #1593009344
-TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 12 - - - - - 12
-TrigSignatureMoniMT INFO -- #1593009344 Features 19 - - - - -
+TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 0 0 0 0 0 0 0 0 0 0 12 - 12
+TrigSignatureMoniMT INFO -- #1593009344 Features 0 0 0 0 0 0 0 0 0 0 19 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 #3341539267
-TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 19 - - - - - 19
-TrigSignatureMoniMT INFO -- #3341539267 Features 51 - - - - -
+TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 0 0 0 0 0 0 0 0 0 0 19 - 19
+TrigSignatureMoniMT INFO -- #3341539267 Features 0 0 0 0 0 0 0 0 0 0 51 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
-TrigSignatureMoniMT INFO -- #991419339 Events 19 19 19 4 - - - - 4
-TrigSignatureMoniMT INFO -- #991419339 Features 50 8 - - - -
+TrigSignatureMoniMT INFO -- #991419339 Events 19 19 0 0 0 0 0 0 0 0 0 0 19 4 4
+TrigSignatureMoniMT INFO -- #991419339 Features 0 0 0 0 0 0 0 0 0 0 50 8
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 #1961149049
-TrigSignatureMoniMT INFO -- #1961149049 Events 19 19 19 19 - - - - 19
-TrigSignatureMoniMT INFO -- #1961149049 Features 50 50 - - - -
+TrigSignatureMoniMT INFO -- #1961149049 Events 19 19 0 0 0 0 0 0 0 0 0 0 19 19 19
+TrigSignatureMoniMT INFO -- #1961149049 Features 0 0 0 0 0 0 0 0 0 0 50 50
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 #761060030
-TrigSignatureMoniMT INFO -- #761060030 Events 19 19 16 - - - - - 16
-TrigSignatureMoniMT INFO -- #761060030 Features 31 - - - - -
+TrigSignatureMoniMT INFO -- #761060030 Events 19 19 0 0 0 0 0 0 0 0 0 0 16 - 16
+TrigSignatureMoniMT INFO -- #761060030 Features 0 0 0 0 0 0 0 0 0 0 31 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 #1509925407
-TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 18 - - - - - 18
-TrigSignatureMoniMT INFO -- #1509925407 Features 44 - - - - -
+TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 0 0 0 0 0 0 0 0 0 0 18 - 18
+TrigSignatureMoniMT INFO -- #1509925407 Features 0 0 0 0 0 0 0 0 0 0 44 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J20 #4012311417
-TrigSignatureMoniMT INFO -- #4012311417 Events 19 19 16 - - - - - 16
-TrigSignatureMoniMT INFO -- #4012311417 Features 31 - - - - -
+TrigSignatureMoniMT INFO -- #4012311417 Events 19 19 0 0 0 0 0 0 0 0 0 0 16 - 16
+TrigSignatureMoniMT INFO -- #4012311417 Features 0 0 0 0 0 0 0 0 0 0 31 -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
-TrigSignatureMoniMT INFO -- #2042444294 Events 19 19 17 - - - - - 17
-TrigSignatureMoniMT INFO -- #2042444294 Features 39 - - - - -
+TrigSignatureMoniMT INFO -- #2042444294 Events 19 19 0 0 0 0 0 0 0 0 0 0 17 - 17
+TrigSignatureMoniMT INFO -- #2042444294 Features 0 0 0 0 0 0 0 0 0 0 39 -
TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
-TrigSignatureMoniMT INFO -- #1542468090 Events 19 19 15 - - - - - 15
-TrigSignatureMoniMT INFO -- #1542468090 Features 26 - - - - -
+TrigSignatureMoniMT INFO -- #1542468090 Events 19 19 0 0 0 0 0 0 0 0 0 0 15 - 15
+TrigSignatureMoniMT INFO -- #1542468090 Features 0 0 0 0 0 0 0 0 0 0 26 -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
-TrigSignatureMoniMT INFO -- #3327656707 Events 3 3 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3327656707 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3327656707 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3327656707 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 #215408633
-TrigSignatureMoniMT INFO -- #215408633 Events 19 19 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #215408633 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #215408633 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #215408633 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 #1151767619
-TrigSignatureMoniMT INFO -- #1151767619 Events 3 3 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1151767619 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1151767619 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1151767619 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
-TrigSignatureMoniMT INFO -- #3875082669 Events 19 19 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3875082669 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3875082669 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3875082669 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
-TrigSignatureMoniMT INFO -- #2296827117 Events 3 3 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2296827117 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #2296827117 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2296827117 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
-TrigSignatureMoniMT INFO -- #436385969 Events 3 3 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #436385969 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #436385969 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #436385969 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
-TrigSignatureMoniMT INFO -- #3634067472 Events 19 19 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3634067472 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3634067472 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3634067472 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j80_L1J15 #2440872308
-TrigSignatureMoniMT INFO -- #2440872308 Events 20 20 13 - - - - - 13
-TrigSignatureMoniMT INFO -- #2440872308 Features 23 - - - - -
+TrigSignatureMoniMT INFO -- #2440872308 Events 20 20 0 0 0 0 0 0 0 0 0 0 13 - 13
+TrigSignatureMoniMT INFO -- #2440872308 Features 0 0 0 0 0 0 0 0 0 0 23 -
TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 #582699527
-TrigSignatureMoniMT INFO -- #582699527 Events 20 20 8 - - - - - 8
-TrigSignatureMoniMT INFO -- #582699527 Features 23 - - - - -
+TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #582699527 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j85_L1J20 #510475538
-TrigSignatureMoniMT INFO -- #510475538 Events 19 19 13 - - - - - 13
-TrigSignatureMoniMT INFO -- #510475538 Features 21 - - - - -
+TrigSignatureMoniMT INFO -- #510475538 Events 19 19 0 0 0 0 0 0 0 0 0 0 13 - 13
+TrigSignatureMoniMT INFO -- #510475538 Features 0 0 0 0 0 0 0 0 0 0 21 -
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
-TrigSignatureMoniMT INFO -- #877042532 Events 19 19 13 - - - - - 13
-TrigSignatureMoniMT INFO -- #877042532 Features 21 - - - - -
+TrigSignatureMoniMT INFO -- #877042532 Events 19 19 0 0 0 0 0 0 0 0 0 0 13 - 13
+TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 0 21 -
TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 #1538535401
-TrigSignatureMoniMT INFO -- #1538535401 Events 19 19 8 - - - - - 8
-TrigSignatureMoniMT INFO -- #1538535401 Features 13 - - - - -
+TrigSignatureMoniMT INFO -- #1538535401 Events 19 19 0 0 0 0 0 0 0 0 0 0 8 - 8
+TrigSignatureMoniMT INFO -- #1538535401 Features 0 0 0 0 0 0 0 0 0 0 13 -
TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED #4097312640
-TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 20 20 - - - - 20
-TrigSignatureMoniMT INFO -- #4097312640 Features 20 20 - - - -
+TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4097312640 Features 20 20 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU20 #997163309
-TrigSignatureMoniMT INFO -- #997163309 Events 8 8 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #997163309 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #997163309 Events 8 8 0 0 0 0 0 - - - - - - - 0
+TrigSignatureMoniMT INFO -- #997163309 Features 0 0 0 0 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU4_EMPTY #782182242
-TrigSignatureMoniMT INFO -- #782182242 Events 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #782182242 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #782182242 Events 0 0 0 0 0 0 0 - - - - - - - 0
+TrigSignatureMoniMT INFO -- #782182242 Features 0 0 0 0 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_mu10_L1MU10 #209090273
-TrigSignatureMoniMT INFO -- #209090273 Events 10 10 10 10 10 9 - - 9
-TrigSignatureMoniMT INFO -- #209090273 Features 13 12 13 11 - -
+TrigSignatureMoniMT INFO -- #209090273 Events 10 10 0 0 0 0 10 10 10 9 - - - - 9
+TrigSignatureMoniMT INFO -- #209090273 Features 0 0 0 0 13 12 13 11 - - - -
TrigSignatureMoniMT INFO HLT_mu10_ivarmedium_mu10_10invm70_L12MU10 #2386882549
-TrigSignatureMoniMT INFO -- #2386882549 Events 3 3 3 2 2 2 2 - 2
-TrigSignatureMoniMT INFO -- #2386882549 Features 6 4 4 4 2 -
+TrigSignatureMoniMT INFO -- #2386882549 Events 3 3 0 0 0 0 3 2 2 2 2 - - - 2
+TrigSignatureMoniMT INFO -- #2386882549 Features 0 0 0 0 6 4 4 4 2 - - -
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 #48780310
-TrigSignatureMoniMT INFO -- #48780310 Events 10 10 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #48780310 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #48780310 Events 10 10 0 0 0 0 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #48780310 Features 0 0 0 0 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6 #2504965945
-TrigSignatureMoniMT INFO -- #2504965945 Events 4 4 4 0 3 0 - - 0
-TrigSignatureMoniMT INFO -- #2504965945 Features 8 0 6 0 - -
+TrigSignatureMoniMT INFO -- #2504965945 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2504965945 Features 0 0 0 0 8 0 6 0 - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6 #1171632195
-TrigSignatureMoniMT INFO -- #1171632195 Events 4 4 4 0 3 0 - - 0
-TrigSignatureMoniMT INFO -- #1171632195 Features 8 0 6 0 - -
+TrigSignatureMoniMT INFO -- #1171632195 Events 4 4 0 0 0 0 4 0 3 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1171632195 Features 0 0 0 0 8 0 6 0 - - - -
TrigSignatureMoniMT INFO HLT_mu14_L1MU10 #1696906927
-TrigSignatureMoniMT INFO -- #1696906927 Events 10 10 10 7 7 7 - - 7
-TrigSignatureMoniMT INFO -- #1696906927 Features 13 8 8 8 - -
+TrigSignatureMoniMT INFO -- #1696906927 Events 10 10 0 0 0 0 10 7 7 7 - - - - 7
+TrigSignatureMoniMT INFO -- #1696906927 Features 0 0 0 0 13 8 8 8 - - - -
TrigSignatureMoniMT INFO HLT_mu20_2mu4noL1_L1MU20 #1029128679
-TrigSignatureMoniMT INFO -- #1029128679 Events 8 8 8 5 5 5 1 1 1
-TrigSignatureMoniMT INFO -- #1029128679 Features 10 6 6 6 2 2
+TrigSignatureMoniMT INFO -- #1029128679 Events 8 8 0 0 0 0 8 5 5 5 1 1 - - 1
+TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 10 6 6 6 2 2 - -
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526
-TrigSignatureMoniMT INFO -- #2083734526 Events 10 10 10 5 5 - - - 5
-TrigSignatureMoniMT INFO -- #2083734526 Features 14 6 5 - - -
+TrigSignatureMoniMT INFO -- #2083734526 Events 10 10 0 0 0 0 10 5 5 - - - - - 5
+TrigSignatureMoniMT INFO -- #2083734526 Features 0 0 0 0 14 6 5 - - - - -
TrigSignatureMoniMT INFO HLT_mu22_2mu4noL1_L1MU20 #3427670100
-TrigSignatureMoniMT INFO -- #3427670100 Events 8 8 8 5 5 5 1 1 1
-TrigSignatureMoniMT INFO -- #3427670100 Features 10 6 6 6 2 2
+TrigSignatureMoniMT INFO -- #3427670100 Events 8 8 0 0 0 0 8 5 5 5 1 1 - - 1
+TrigSignatureMoniMT INFO -- #3427670100 Features 0 0 0 0 10 6 6 6 2 2 - -
TrigSignatureMoniMT INFO HLT_mu22_mu8noL1_L1MU20 #3165652409
-TrigSignatureMoniMT INFO -- #3165652409 Events 8 8 8 5 5 5 2 2 2
-TrigSignatureMoniMT INFO -- #3165652409 Features 10 6 6 6 3 3
+TrigSignatureMoniMT INFO -- #3165652409 Events 8 8 0 0 0 0 8 5 5 5 2 2 - - 2
+TrigSignatureMoniMT INFO -- #3165652409 Features 0 0 0 0 10 6 6 6 3 3 - -
TrigSignatureMoniMT INFO HLT_mu24_2mu4noL1_L1MU20 #3233544630
-TrigSignatureMoniMT INFO -- #3233544630 Events 8 8 8 5 5 5 1 1 1
-TrigSignatureMoniMT INFO -- #3233544630 Features 10 6 6 6 2 2
+TrigSignatureMoniMT INFO -- #3233544630 Events 8 8 0 0 0 0 8 5 5 5 1 1 - - 1
+TrigSignatureMoniMT INFO -- #3233544630 Features 0 0 0 0 10 6 6 6 2 2 - -
TrigSignatureMoniMT INFO HLT_mu24_L1MU20 #417425162
-TrigSignatureMoniMT INFO -- #417425162 Events 8 8 8 5 5 5 - - 5
-TrigSignatureMoniMT INFO -- #417425162 Features 10 6 6 6 - -
+TrigSignatureMoniMT INFO -- #417425162 Events 8 8 0 0 0 0 8 5 5 5 - - - - 5
+TrigSignatureMoniMT INFO -- #417425162 Features 0 0 0 0 10 6 6 6 - - - -
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 #677658909
-TrigSignatureMoniMT INFO -- #677658909 Events 8 8 6 6 6 6 - - 6
-TrigSignatureMoniMT INFO -- #677658909 Features 7 7 7 7 - -
+TrigSignatureMoniMT INFO -- #677658909 Events 8 8 0 0 0 0 6 6 6 6 - - - - 6
+TrigSignatureMoniMT INFO -- #677658909 Features 0 0 0 0 7 7 7 7 - - - -
TrigSignatureMoniMT INFO HLT_mu24_mu10noL1_L1MU20 #2563354236
-TrigSignatureMoniMT INFO -- #2563354236 Events 8 8 8 5 5 5 2 2 2
-TrigSignatureMoniMT INFO -- #2563354236 Features 10 6 6 6 3 3
+TrigSignatureMoniMT INFO -- #2563354236 Events 8 8 0 0 0 0 8 5 5 5 2 2 - - 2
+TrigSignatureMoniMT INFO -- #2563354236 Features 0 0 0 0 10 6 6 6 3 3 - -
TrigSignatureMoniMT INFO HLT_mu26_L1MU20 #311138376
-TrigSignatureMoniMT INFO -- #311138376 Events 8 8 8 5 4 3 - - 3
-TrigSignatureMoniMT INFO -- #311138376 Features 10 6 5 4 - -
+TrigSignatureMoniMT INFO -- #311138376 Events 8 8 0 0 0 0 8 5 4 3 - - - - 3
+TrigSignatureMoniMT INFO -- #311138376 Features 0 0 0 0 10 6 5 4 - - - -
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 #3411723090
-TrigSignatureMoniMT INFO -- #3411723090 Events 8 8 8 5 4 3 2 - 2
-TrigSignatureMoniMT INFO -- #3411723090 Features 10 6 5 4 2 -
+TrigSignatureMoniMT INFO -- #3411723090 Events 8 8 0 0 0 0 8 5 4 3 2 - - - 2
+TrigSignatureMoniMT INFO -- #3411723090 Features 0 0 0 0 10 6 5 4 2 - - -
TrigSignatureMoniMT INFO HLT_mu26_mu10noL1_L1MU20 #2318302287
-TrigSignatureMoniMT INFO -- #2318302287 Events 8 8 8 5 4 3 1 1 1
-TrigSignatureMoniMT INFO -- #2318302287 Features 10 6 5 4 2 2
+TrigSignatureMoniMT INFO -- #2318302287 Events 8 8 0 0 0 0 8 5 4 3 1 1 - - 1
+TrigSignatureMoniMT INFO -- #2318302287 Features 0 0 0 0 10 6 5 4 2 2 - -
TrigSignatureMoniMT INFO HLT_mu26_mu8noL1_L1MU20 #2233067926
-TrigSignatureMoniMT INFO -- #2233067926 Events 8 8 8 5 4 3 1 1 1
-TrigSignatureMoniMT INFO -- #2233067926 Features 10 6 5 4 2 2
+TrigSignatureMoniMT INFO -- #2233067926 Events 8 8 0 0 0 0 8 5 4 3 1 1 - - 1
+TrigSignatureMoniMT INFO -- #2233067926 Features 0 0 0 0 10 6 5 4 2 2 - -
TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 #1963262787
-TrigSignatureMoniMT INFO -- #1963262787 Events 8 8 8 5 4 3 2 - 2
-TrigSignatureMoniMT INFO -- #1963262787 Features 10 6 5 3 2 -
+TrigSignatureMoniMT INFO -- #1963262787 Events 8 8 0 0 0 0 8 5 4 3 2 - - - 2
+TrigSignatureMoniMT INFO -- #1963262787 Features 0 0 0 0 10 6 5 3 2 - - -
TrigSignatureMoniMT INFO HLT_mu28_mu8noL1_L1MU20 #86648125
-TrigSignatureMoniMT INFO -- #86648125 Events 8 8 8 5 4 3 1 1 1
-TrigSignatureMoniMT INFO -- #86648125 Features 10 6 5 3 1 1
+TrigSignatureMoniMT INFO -- #86648125 Events 8 8 0 0 0 0 8 5 4 3 1 1 - - 1
+TrigSignatureMoniMT INFO -- #86648125 Features 0 0 0 0 10 6 5 3 1 1 - -
TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 #597064890
-TrigSignatureMoniMT INFO -- #597064890 Events 8 8 8 5 3 2 1 - 1
-TrigSignatureMoniMT INFO -- #597064890 Features 10 6 4 2 1 -
+TrigSignatureMoniMT INFO -- #597064890 Events 8 8 0 0 0 0 8 5 3 2 1 - - - 1
+TrigSignatureMoniMT INFO -- #597064890 Features 0 0 0 0 10 6 4 2 1 - - -
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
-TrigSignatureMoniMT INFO -- #3657158931 Events 8 8 8 5 1 1 - - 1
-TrigSignatureMoniMT INFO -- #3657158931 Features 10 6 1 1 - -
+TrigSignatureMoniMT INFO -- #3657158931 Events 8 8 0 0 0 0 8 5 1 1 - - - - 1
+TrigSignatureMoniMT INFO -- #3657158931 Features 0 0 0 0 10 6 1 1 - - - -
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 #827327262
-TrigSignatureMoniMT INFO -- #827327262 Events 8 8 8 5 1 1 1 - 1
-TrigSignatureMoniMT INFO -- #827327262 Features 10 6 1 1 1 -
+TrigSignatureMoniMT INFO -- #827327262 Events 8 8 0 0 0 0 8 5 1 1 1 - - - 1
+TrigSignatureMoniMT INFO -- #827327262 Features 0 0 0 0 10 6 1 1 1 - - -
TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 #1642591450
-TrigSignatureMoniMT INFO -- #1642591450 Events 8 8 1 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1642591450 Features 2 0 0 - - -
+TrigSignatureMoniMT INFO -- #1642591450 Events 8 8 0 0 0 0 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 0 2 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu60_L1MU20 #2871837722
-TrigSignatureMoniMT INFO -- #2871837722 Events 8 8 8 5 1 1 - - 1
-TrigSignatureMoniMT INFO -- #2871837722 Features 10 6 1 1 - -
+TrigSignatureMoniMT INFO -- #2871837722 Events 8 8 0 0 0 0 8 5 1 1 - - - - 1
+TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 10 6 1 1 - - - -
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590
-TrigSignatureMoniMT INFO -- #996392590 Events 10 10 10 10 - - - - 10
-TrigSignatureMoniMT INFO -- #996392590 Features 14 13 - - - -
+TrigSignatureMoniMT INFO -- #996392590 Events 10 10 0 0 0 0 10 10 - - - - - - 10
+TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 14 13 - - - - - -
TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 10 10 10 10 10 10 - - 10
-TrigSignatureMoniMT INFO -- #2560542253 Features 14 13 16 21 - -
+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 HLT_mu6_idperf_L1MU6 #934918532
-TrigSignatureMoniMT INFO -- #934918532 Events 10 10 10 10 10 10 - - 10
-TrigSignatureMoniMT INFO -- #934918532 Features 14 14 17 27 - -
+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 HLT_mu6_ivarmedium_L1MU6 #1012713062
-TrigSignatureMoniMT INFO -- #1012713062 Events 10 10 10 10 10 10 6 - 6
-TrigSignatureMoniMT INFO -- #1012713062 Features 14 13 16 21 6 -
+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 HLT_mu6_msonly_L1MU6 #3895421032
-TrigSignatureMoniMT INFO -- #3895421032 Events 10 10 10 0 10 - - - 10
-TrigSignatureMoniMT INFO -- #3895421032 Features 14 0 17 - - -
+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 4 4 4 4 - - 4
-TrigSignatureMoniMT INFO -- #1713982776 Features 8 8 12 18 - -
+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 HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT INFO -- #451489897 Events 10 10 10 10 10 10 6 4 4
-TrigSignatureMoniMT INFO -- #451489897 Features 14 13 16 21 9 7
+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 HLT_mu6fast_L1MU6 #3518031697
-TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 10 - - - - - 10
-TrigSignatureMoniMT INFO -- #3518031697 Features 14 - - - - -
+TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 0 0 0 0 10 - - - - - - - 10
+TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 14 - - - - - - -
+TrigSignatureMoniMT INFO HLT_mu6fast_j45_nojcalib_L1J20 #1776326110
+TrigSignatureMoniMT INFO -- #1776326110 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1776326110 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_mu6fast_xe30_mht_L1XE10 #1876869651
+TrigSignatureMoniMT INFO -- #1876869651 Events 19 19 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1876869651 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_mu80_L1MU20 #387900377
-TrigSignatureMoniMT INFO -- #387900377 Events 8 8 8 5 0 0 - - 0
-TrigSignatureMoniMT INFO -- #387900377 Features 10 6 0 0 - -
+TrigSignatureMoniMT INFO -- #387900377 Events 8 8 0 0 0 0 8 5 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 10 6 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 #761101109
-TrigSignatureMoniMT INFO -- #761101109 Events 8 8 8 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #761101109 Features 10 0 0 - - -
+TrigSignatureMoniMT INFO -- #761101109 Events 8 8 0 0 0 0 8 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #761101109 Features 0 0 0 0 10 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu8_L1MU6 #1467711434
-TrigSignatureMoniMT INFO -- #1467711434 Events 10 10 10 10 10 10 - - 10
-TrigSignatureMoniMT INFO -- #1467711434 Features 14 13 15 19 - -
+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 HLT_noalg_L1Calo #355689512
-TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #355689512 Features - - - - - -
+TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #355689512 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Calo_EMPTY #3717801557
-TrigSignatureMoniMT INFO -- #3717801557 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #3717801557 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3717801557 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3717801557 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM10VH #314199913
-TrigSignatureMoniMT INFO -- #314199913 Events 11 11 - - - - - - 11
-TrigSignatureMoniMT INFO -- #314199913 Features - - - - - -
+TrigSignatureMoniMT INFO -- #314199913 Events 11 11 - - - - - - - - - - - - 11
+TrigSignatureMoniMT INFO -- #314199913 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM12 #3885916609
-TrigSignatureMoniMT INFO -- #3885916609 Events 16 16 - - - - - - 16
-TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3885916609 Events 16 16 - - - - - - - - - - - - 16
+TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15 #480733925
-TrigSignatureMoniMT INFO -- #480733925 Events 14 14 - - - - - - 14
-TrigSignatureMoniMT INFO -- #480733925 Features - - - - - -
+TrigSignatureMoniMT INFO -- #480733925 Events 14 14 - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #480733925 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15VH #2374865899
-TrigSignatureMoniMT INFO -- #2374865899 Events 8 8 - - - - - - 8
-TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2374865899 Events 8 8 - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM20VH #3719542824
-TrigSignatureMoniMT INFO -- #3719542824 Events 7 7 - - - - - - 7
-TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3719542824 Events 7 7 - - - - - - - - - - - - 7
+TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM22VHI #1723589313
-TrigSignatureMoniMT INFO -- #1723589313 Events 6 6 - - - - - - 6
-TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1723589313 Events 6 6 - - - - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM3 #4169267792
-TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM7 #3226970354
-TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM8VH #4065285611
-TrigSignatureMoniMT INFO -- #4065285611 Events 14 14 - - - - - - 14
-TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4065285611 Events 14 14 - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J100 #1026959128
-TrigSignatureMoniMT INFO -- #1026959128 Events 3 3 - - - - - - 3
-TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - -
+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 -- #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 -- #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 - - - - - -
+TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J20 #2241112369
-TrigSignatureMoniMT INFO -- #2241112369 Events 19 19 - - - - - - 19
-TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2241112369 Events 19 19 - - - - - - - - - - - - 19
+TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J25 #39428635
-TrigSignatureMoniMT INFO -- #39428635 Events 17 17 - - - - - - 17
-TrigSignatureMoniMT INFO -- #39428635 Features - - - - - -
+TrigSignatureMoniMT INFO -- #39428635 Events 17 17 - - - - - - - - - - - - 17
+TrigSignatureMoniMT INFO -- #39428635 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J30 #3523994129
-TrigSignatureMoniMT INFO -- #3523994129 Events 17 17 - - - - - - 17
-TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3523994129 Events 17 17 - - - - - - - - - - - - 17
+TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J40 #1497591431
-TrigSignatureMoniMT INFO -- #1497591431 Events 14 14 - - - - - - 14
-TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1497591431 Events 14 14 - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J400 #2494874701
-TrigSignatureMoniMT INFO -- #2494874701 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2494874701 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J50 #3346352675
-TrigSignatureMoniMT INFO -- #3346352675 Events 14 14 - - - - - - 14
-TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3346352675 Events 14 14 - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J75 #1651897827
-TrigSignatureMoniMT INFO -- #1651897827 Events 6 6 - - - - - - 6
-TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1651897827 Events 6 6 - - - - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J85 #166231461
-TrigSignatureMoniMT INFO -- #166231461 Events 5 5 - - - - - - 5
-TrigSignatureMoniMT INFO -- #166231461 Features - - - - - -
+TrigSignatureMoniMT INFO -- #166231461 Events 5 5 - - - - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #166231461 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_EMPTY #914660695
-TrigSignatureMoniMT INFO -- #914660695 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #914660695 Features - - - - - -
+TrigSignatureMoniMT INFO -- #914660695 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #914660695 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_FILLED #211699639
-TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #211699639 Features - - - - - -
+TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #211699639 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Standby #420861540
-TrigSignatureMoniMT INFO -- #420861540 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #420861540 Features - - - - - -
+TrigSignatureMoniMT INFO -- #420861540 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #420861540 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12 #4248050338
-TrigSignatureMoniMT INFO -- #4248050338 Events 18 18 - - - - - - 18
-TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4248050338 Events 18 18 - - - - - - - - - - - - 18
+TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12IM #357557968
-TrigSignatureMoniMT INFO -- #357557968 Events 14 14 - - - - - - 14
-TrigSignatureMoniMT INFO -- #357557968 Features - - - - - -
+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 -- #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 - - - - - -
+TrigSignatureMoniMT INFO -- #1931583332 Events 10 10 - - - - - - - - - - - - 10
+TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU30 #1944789678
-TrigSignatureMoniMT INFO -- #1944789678 Events 13 13 - - - - - - 13
-TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1944789678 Events 13 13 - - - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU40 #1394621652
-TrigSignatureMoniMT INFO -- #1394621652 Events 7 7 - - - - - - 7
-TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1394621652 Events 7 7 - - - - - - - - - - - - 7
+TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU60 #3332424451
-TrigSignatureMoniMT INFO -- #3332424451 Events 5 5 - - - - - - 5
-TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - -
+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 -- #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 - - - - - -
+TrigSignatureMoniMT INFO -- #1583053368 Events 19 19 - - - - - - - - - - - - 19
+TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE30 #2047368922
-TrigSignatureMoniMT INFO -- #2047368922 Events 14 14 - - - - - - 14
-TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2047368922 Events 14 14 - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE300 #1315853555
-TrigSignatureMoniMT INFO -- #1315853555 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1315853555 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE35 #2313039014
-TrigSignatureMoniMT INFO -- #2313039014 Events 14 14 - - - - - - 14
-TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2313039014 Events 14 14 - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE40 #4293469116
-TrigSignatureMoniMT INFO -- #4293469116 Events 14 14 - - - - - - 14
-TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4293469116 Events 14 14 - - - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE45 #2365048177
-TrigSignatureMoniMT INFO -- #2365048177 Events 13 13 - - - - - - 13
-TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2365048177 Events 13 13 - - - - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE50 #1168752081
-TrigSignatureMoniMT INFO -- #1168752081 Events 10 10 - - - - - - 10
-TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1168752081 Events 10 10 - - - - - - - - - - - - 10
+TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE55 #268928384
-TrigSignatureMoniMT INFO -- #268928384 Events 8 8 - - - - - - 8
-TrigSignatureMoniMT INFO -- #268928384 Features - - - - - -
+TrigSignatureMoniMT INFO -- #268928384 Events 8 8 - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #268928384 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE60 #4154240531
-TrigSignatureMoniMT INFO -- #4154240531 Events 8 8 - - - - - - 8
-TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4154240531 Events 8 8 - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE70 #3765216228
-TrigSignatureMoniMT INFO -- #3765216228 Events 4 4 - - - - - - 4
-TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3765216228 Events 4 4 - - - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE80 #2742079961
-TrigSignatureMoniMT INFO -- #2742079961 Events 3 3 - - - - - - 3
-TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2742079961 Events 3 3 - - - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_bkg_L1Bkg #2032528907
-TrigSignatureMoniMT INFO -- #2032528907 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #2032528907 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2032528907 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2032528907 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1EM3_EMPTY #2458124284
-TrigSignatureMoniMT INFO -- #2458124284 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #2458124284 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2458124284 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2458124284 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1EM7_EMPTY #299938202
-TrigSignatureMoniMT INFO -- #299938202 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #299938202 Features - - - - - -
+TrigSignatureMoniMT INFO -- #299938202 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #299938202 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J12_EMPTY #3144024902
-TrigSignatureMoniMT INFO -- #3144024902 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #3144024902 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3144024902 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3144024902 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J12_FIRSTEMPTY #3840098930
-TrigSignatureMoniMT INFO -- #3840098930 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #3840098930 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3840098930 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3840098930 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_31ETA49_EMPTY #4143623058
-TrigSignatureMoniMT INFO -- #4143623058 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #4143623058 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4143623058 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4143623058 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_EMPTY #2991490897
-TrigSignatureMoniMT INFO -- #2991490897 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #2991490897 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2991490897 Events 0 0 - - - - - - - - - - - - 0
+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 -- #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 -- #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 - - - - - -
+TrigSignatureMoniMT INFO -- #3925252528 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3925252528 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_EMPTY #56818284
-TrigSignatureMoniMT INFO -- #56818284 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #56818284 Features - - - - - -
+TrigSignatureMoniMT INFO -- #56818284 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #56818284 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_FILLED #1198298874
-TrigSignatureMoniMT INFO -- #1198298874 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1198298874 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1198298874 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1198298874 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_UNPAIRED_ISO #2536676873
-TrigSignatureMoniMT INFO -- #2536676873 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #2536676873 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2536676873 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2536676873 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_l1calo_L1J400 #1694511185
-TrigSignatureMoniMT INFO -- #1694511185 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #1694511185 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1694511185 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1694511185 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_mb_L1RD2_EMPTY #3788962163
-TrigSignatureMoniMT INFO -- #3788962163 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #3788962163 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3788962163 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3788962163 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_zb_L1ZB #1289992951
-TrigSignatureMoniMT INFO -- #1289992951 Events 0 0 - - - - - - 0
-TrigSignatureMoniMT INFO -- #1289992951 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1289992951 Events 0 0 - - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1289992951 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_sct_noise_SCTPEB_L1RD0_EMPTY #3024203296
-TrigSignatureMoniMT INFO -- #3024203296 Events 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3024203296 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3024203296 Events 0 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3024203296 Features 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 #2342716369
-TrigSignatureMoniMT INFO -- #2342716369 Events 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2342716369 Events 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 #372992233
-TrigSignatureMoniMT INFO -- #372992233 Events 18 18 18 18 - - - - 18
-TrigSignatureMoniMT INFO -- #372992233 Features 42 42 - - - -
+TrigSignatureMoniMT INFO -- #372992233 Events 18 18 18 18 - - - - - - - - - - 18
+TrigSignatureMoniMT INFO -- #372992233 Features 42 42 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU60 #1376650121
-TrigSignatureMoniMT INFO -- #1376650121 Events 5 5 5 5 - - - - 5
-TrigSignatureMoniMT INFO -- #1376650121 Features 6 6 - - - -
+TrigSignatureMoniMT INFO -- #1376650121 Events 5 5 5 5 - - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #1376650121 Features 6 6 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_track_L1TAU100 #714660857
-TrigSignatureMoniMT INFO -- #714660857 Events 0 0 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #714660857 Events 0 0 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwoMVA_L1TAU100 #2725693236
-TrigSignatureMoniMT INFO -- #2725693236 Events 0 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #2725693236 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - - - - - - - -
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 -- #886074432 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #886074432 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 - - -
+TrigSignatureMoniMT INFO -- #1747754287 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwoMVA_L1TAU100 #2334140248
-TrigSignatureMoniMT INFO -- #2334140248 Events 0 0 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #2334140248 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - - - - - - - -
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 -- #1799096347 Events 0 0 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1799096347 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 - - - -
+TrigSignatureMoniMT INFO -- #554271976 Events 14 14 14 14 - - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #554271976 Features 24 24 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM #988149859
-TrigSignatureMoniMT INFO -- #988149859 Events 14 14 14 13 13 - - - 13
-TrigSignatureMoniMT INFO -- #988149859 Features 24 17 17 - - -
+TrigSignatureMoniMT INFO -- #988149859 Events 14 14 14 13 13 - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #988149859 Features 24 17 17 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM #3346942453
-TrigSignatureMoniMT INFO -- #3346942453 Events 14 14 14 13 13 - - - 13
-TrigSignatureMoniMT INFO -- #3346942453 Features 24 17 17 - - -
+TrigSignatureMoniMT INFO -- #3346942453 Events 14 14 14 13 13 - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #3346942453 Features 24 17 17 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM #169452969
-TrigSignatureMoniMT INFO -- #169452969 Events 14 14 12 11 10 - - - 10
-TrigSignatureMoniMT INFO -- #169452969 Features 22 15 13 - - -
+TrigSignatureMoniMT INFO -- #169452969 Events 14 14 12 11 10 - - - - - - - - - 10
+TrigSignatureMoniMT INFO -- #169452969 Features 22 15 13 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwo_L1TAU12IM #2490017573
-TrigSignatureMoniMT INFO -- #2490017573 Events 14 14 12 11 0 - - - 0
-TrigSignatureMoniMT INFO -- #2490017573 Features 22 15 0 - - -
+TrigSignatureMoniMT INFO -- #2490017573 Events 14 14 12 11 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2490017573 Features 22 15 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoEF_L1TAU12IM #506456080
-TrigSignatureMoniMT INFO -- #506456080 Events 14 14 12 11 0 - - - 0
-TrigSignatureMoniMT INFO -- #506456080 Features 22 15 0 - - -
+TrigSignatureMoniMT INFO -- #506456080 Events 14 14 12 11 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #506456080 Features 22 15 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoMVA_L1TAU12IM #4055280067
-TrigSignatureMoniMT INFO -- #4055280067 Events 14 14 12 11 0 - - - 0
-TrigSignatureMoniMT INFO -- #4055280067 Features 22 15 0 - - -
+TrigSignatureMoniMT INFO -- #4055280067 Events 14 14 12 11 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4055280067 Features 22 15 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM #1433975745
-TrigSignatureMoniMT INFO -- #1433975745 Events 14 14 12 11 7 - - - 7
-TrigSignatureMoniMT INFO -- #1433975745 Features 22 15 7 - - -
+TrigSignatureMoniMT INFO -- #1433975745 Events 14 14 12 11 7 - - - - - - - - - 7
+TrigSignatureMoniMT INFO -- #1433975745 Features 22 15 7 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM #2222894847
-TrigSignatureMoniMT INFO -- #2222894847 Events 14 14 12 11 7 - - - 7
-TrigSignatureMoniMT INFO -- #2222894847 Features 22 15 9 - - -
+TrigSignatureMoniMT INFO -- #2222894847 Events 14 14 12 11 7 - - - - - - - - - 7
+TrigSignatureMoniMT INFO -- #2222894847 Features 22 15 9 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwo_L1TAU12IM #698603885
-TrigSignatureMoniMT INFO -- #698603885 Events 14 14 12 11 0 - - - 0
-TrigSignatureMoniMT INFO -- #698603885 Features 22 15 0 - - -
+TrigSignatureMoniMT INFO -- #698603885 Events 14 14 12 11 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #698603885 Features 22 15 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwoMVA_L1TAU12IM #112814536
-TrigSignatureMoniMT INFO -- #112814536 Events 14 14 14 13 13 - - - 13
-TrigSignatureMoniMT INFO -- #112814536 Features 24 17 17 - - -
+TrigSignatureMoniMT INFO -- #112814536 Events 14 14 14 13 13 - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #112814536 Features 24 17 17 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwo_L1TAU12IM #1129072492
-TrigSignatureMoniMT INFO -- #1129072492 Events 14 14 14 13 13 - - - 13
-TrigSignatureMoniMT INFO -- #1129072492 Features 24 17 17 - - -
+TrigSignatureMoniMT INFO -- #1129072492 Events 14 14 14 13 13 - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #1129072492 Features 24 17 17 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM #2472860683
-TrigSignatureMoniMT INFO -- #2472860683 Events 14 14 12 11 5 - - - 5
-TrigSignatureMoniMT INFO -- #2472860683 Features 22 15 6 - - -
+TrigSignatureMoniMT INFO -- #2472860683 Events 14 14 12 11 5 - - - - - - - - - 5
+TrigSignatureMoniMT INFO -- #2472860683 Features 22 15 6 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwo_L1TAU12IM #2537544560
-TrigSignatureMoniMT INFO -- #2537544560 Events 14 14 12 11 0 - - - 0
-TrigSignatureMoniMT INFO -- #2537544560 Features 22 15 0 - - -
+TrigSignatureMoniMT INFO -- #2537544560 Events 14 14 12 11 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2537544560 Features 22 15 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM #2992830434
-TrigSignatureMoniMT INFO -- #2992830434 Events 14 14 12 11 10 - - - 10
-TrigSignatureMoniMT INFO -- #2992830434 Features 22 15 14 - - -
+TrigSignatureMoniMT INFO -- #2992830434 Events 14 14 12 11 10 - - - - - - - - - 10
+TrigSignatureMoniMT INFO -- #2992830434 Features 22 15 14 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM #1275052132
-TrigSignatureMoniMT INFO -- #1275052132 Events 14 14 12 11 0 - - - 0
-TrigSignatureMoniMT INFO -- #1275052132 Features 22 15 0 - - -
+TrigSignatureMoniMT INFO -- #1275052132 Events 14 14 12 11 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1275052132 Features 22 15 0 - - - - - - - - -
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 -- #2456480859 Events 14 14 11 10 6 - - - - - - - - - 6
+TrigSignatureMoniMT INFO -- #2456480859 Features 20 14 8 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tilecalib_laser_TilePEB_L1CALREQ2 #1063154655
-TrigSignatureMoniMT INFO -- #1063154655 Events 0 0 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1063154655 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1063154655 Events 0 0 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1063154655 Features 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_timeburner_L1All #819160059
-TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988
-TrigSignatureMoniMT INFO -- #532175988 Events 10 10 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #532175988 Features 6 - - - - -
+TrigSignatureMoniMT INFO -- #532175988 Events 10 10 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #532175988 Features 0 0 0 0 0 0 0 0 0 0 6 -
TrigSignatureMoniMT INFO HLT_xe100_pfsum_L1XE50 #1890237897
-TrigSignatureMoniMT INFO -- #1890237897 Events 10 10 2 - - - - - 2
-TrigSignatureMoniMT INFO -- #1890237897 Features 2 - - - - -
+TrigSignatureMoniMT INFO -- #1890237897 Events 10 10 0 0 0 0 0 0 0 0 0 0 2 - 2
+TrigSignatureMoniMT INFO -- #1890237897 Features 0 0 0 0 0 0 0 0 0 0 2 -
TrigSignatureMoniMT INFO HLT_xe100_tcpufit_L1XE50 #2803198799
-TrigSignatureMoniMT INFO -- #2803198799 Events 10 10 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #2803198799 Features 6 - - - - -
+TrigSignatureMoniMT INFO -- #2803198799 Events 10 10 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #2803198799 Features 0 0 0 0 0 0 0 0 0 0 6 -
TrigSignatureMoniMT INFO HLT_xe100_trkmht_L1XE50 #1055916731
-TrigSignatureMoniMT INFO -- #1055916731 Events 10 10 4 - - - - - 4
-TrigSignatureMoniMT INFO -- #1055916731 Features 4 - - - - -
+TrigSignatureMoniMT INFO -- #1055916731 Events 10 10 0 0 0 0 0 0 0 0 0 0 4 - 4
+TrigSignatureMoniMT INFO -- #1055916731 Features 0 0 0 0 0 0 0 0 0 0 4 -
TrigSignatureMoniMT INFO HLT_xe110_mht_L1XE50 #3030733259
-TrigSignatureMoniMT INFO -- #3030733259 Events 10 10 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #3030733259 Features 6 - - - - -
+TrigSignatureMoniMT INFO -- #3030733259 Events 10 10 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #3030733259 Features 0 0 0 0 0 0 0 0 0 0 6 -
TrigSignatureMoniMT INFO HLT_xe110_tc_em_L1XE50 #607113828
-TrigSignatureMoniMT INFO -- #607113828 Events 10 10 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #607113828 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #607113828 Events 10 10 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #607113828 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_xe110_tcpufit_L1XE50 #892853397
-TrigSignatureMoniMT INFO -- #892853397 Events 10 10 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #892853397 Features 6 - - - - -
+TrigSignatureMoniMT INFO -- #892853397 Events 10 10 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #892853397 Features 0 0 0 0 0 0 0 0 0 0 6 -
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 #1649696554
-TrigSignatureMoniMT INFO -- #1649696554 Events 19 19 17 - - - - - 17
-TrigSignatureMoniMT INFO -- #1649696554 Features 17 - - - - -
+TrigSignatureMoniMT INFO -- #1649696554 Events 19 19 0 0 0 0 0 0 0 0 0 0 17 - 17
+TrigSignatureMoniMT INFO -- #1649696554 Features 0 0 0 0 0 0 0 0 0 0 17 -
TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 #3768353779
-TrigSignatureMoniMT INFO -- #3768353779 Events 19 19 14 - - - - - 14
-TrigSignatureMoniMT INFO -- #3768353779 Features 14 - - - - -
+TrigSignatureMoniMT INFO -- #3768353779 Events 19 19 0 0 0 0 0 0 0 0 0 0 14 - 14
+TrigSignatureMoniMT INFO -- #3768353779 Features 0 0 0 0 0 0 0 0 0 0 14 -
TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #3626903018
-TrigSignatureMoniMT INFO -- #3626903018 Events 19 19 19 - - - - - 19
-TrigSignatureMoniMT INFO -- #3626903018 Features 19 - - - - -
+TrigSignatureMoniMT INFO -- #3626903018 Events 19 19 0 0 0 0 0 0 0 0 0 0 19 - 19
+TrigSignatureMoniMT INFO -- #3626903018 Features 0 0 0 0 0 0 0 0 0 0 19 -
TrigSignatureMoniMT INFO HLT_xe30_pfsum_L1XE10 #998713382
-TrigSignatureMoniMT INFO -- #998713382 Events 19 19 14 - - - - - 14
-TrigSignatureMoniMT INFO -- #998713382 Features 14 - - - - -
+TrigSignatureMoniMT INFO -- #998713382 Events 19 19 0 0 0 0 0 0 0 0 0 0 14 - 14
+TrigSignatureMoniMT INFO -- #998713382 Features 0 0 0 0 0 0 0 0 0 0 14 -
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
-TrigSignatureMoniMT INFO -- #1583719916 Events 19 19 14 - - - - - 14
-TrigSignatureMoniMT INFO -- #1583719916 Features 14 - - - - -
+TrigSignatureMoniMT INFO -- #1583719916 Events 19 19 0 0 0 0 0 0 0 0 0 0 14 - 14
+TrigSignatureMoniMT INFO -- #1583719916 Features 0 0 0 0 0 0 0 0 0 0 14 -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 19 19 17 - - - - - 17
-TrigSignatureMoniMT INFO -- #2468872349 Features 17 - - - - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 19 19 0 0 0 0 0 0 0 0 0 0 17 - 17
+TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 0 17 -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
-TrigSignatureMoniMT INFO -- #531141817 Events 10 10 7 - - - - - 7
-TrigSignatureMoniMT INFO -- #531141817 Features 7 - - - - -
+TrigSignatureMoniMT INFO -- #531141817 Events 10 10 0 0 0 0 0 0 0 0 0 0 7 - 7
+TrigSignatureMoniMT INFO -- #531141817 Features 0 0 0 0 0 0 0 0 0 0 7 -
TrigSignatureMoniMT INFO HLT_xe65_cell_xe110_tcpufit_L1XE50 #115518400
-TrigSignatureMoniMT INFO -- #115518400 Events 10 10 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #115518400 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #115518400 Events 10 10 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #115518400 Features 0 0 0 0 0 0 0 0 0 0 5 -
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 38c051550fa7fb55851e4f5c5332d5bb475e2c41..f02fd4c7483dec70276bd47e9a7db5422aef16bf 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
@@ -30,7 +30,7 @@ BStoBS.args = ' -c "{:s}"'.format(BStoBSPreExec)
# Extract the Main stream data
filterBS = ExecStep.ExecStep('FilterBS')
filterBS.type = 'other'
-filterBS.executable = 'athenaHLT-select-PEB-stream.py'
+filterBS.executable = 'trigbs_extractStream.py'
filterBS.input = ''
filterBS.args = '-s Main ' + findFile('data_test.*.Single_Stream.daq.RAW.*.data')
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
index f197cf8f7c2964109eabafcca04adab8e80d41bc..371bda8684c53fd30d751a0d5b8d611c4faae89f 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_build.py
@@ -19,7 +19,7 @@ def filterBS(stream_name):
'''Extract ByteStream data for a given stream from a file with multiple streams'''
filterStep = ExecStep.ExecStep('FilterBS_'+stream_name)
filterStep.type = 'other'
- filterStep.executable = 'athenaHLT-select-PEB-stream.py'
+ filterStep.executable = 'trigbs_extractStream.py'
filterStep.input = ''
filterStep.args = '-s ' + stream_name + ' ' + findFile('*_HLTMPPy_output.*.data')
return filterStep
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py
index d8fab1bab1d981238f9d574913ddd3ae3f2e5e34..bf04221d9833fbaa4f77b16756415c37a4941650 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1Dev_decodeBS_grid.py
@@ -32,7 +32,7 @@ def filterBS(stream_name):
'''Extract ByteStream data for a given stream from a file with multiple streams'''
filterStep = ExecStep.ExecStep('FilterBS_'+stream_name)
filterStep.type = 'other'
- filterStep.executable = 'athenaHLT-select-PEB-stream.py'
+ filterStep.executable = 'trigbs_extractStream.py'
filterStep.input = ''
filterStep.args = '-s ' + stream_name + ' ' + findFile('*_HLTMPPy_output.*.data')
return filterStep
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 b0c9cd512790df0ffe9cc2595aa6ac490dab6143..2e653ce39fa6933d25fe0cdc9761966727a94e4a 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py
@@ -24,7 +24,7 @@ hlt.args += ' -o output'
# Extract the physics_Main stream out of the BS file with many streams
filter_bs = ExecStep.ExecStep('FilterBS')
filter_bs.type = 'other'
-filter_bs.executable = 'athenaHLT-select-PEB-stream.py'
+filter_bs.executable = 'trigbs_extractStream.py'
filter_bs.input = ''
filter_bs.args = '-s Main ' + findFile('*_HLTMPPy_output.*.data')
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 f45e1fb9c5734bb51f1dcbbf92c21cab9aa67a70..515305747f9a1be58c32abd7a549a5422c180178 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py
@@ -33,7 +33,7 @@ hlt.args += ' -o output'
# Extract the physics_Main stream out of the BS file with many streams
filter_bs = ExecStep.ExecStep('FilterBS')
filter_bs.type = 'other'
-filter_bs.executable = 'athenaHLT-select-PEB-stream.py'
+filter_bs.executable = 'trigbs_extractStream.py'
filter_bs.input = ''
filter_bs.args = '-s Main ' + findFile('*_HLTMPPy_output.*.data')
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/__init__.py b/Trigger/TrigValidation/TrigUpgradeTest/python/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
index 56e9eda2d1e4e1f95284db68c2b67b6cc5253f13..62710f0657c12fb0901c6b6d5acbf7230dcb1aeb 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
@@ -662,7 +662,7 @@ class MessageCountStep(Step):
ret, cmd = super(MessageCountStep, self).run(dry_run)
self.auto_report_result = auto_report
if ret != 0:
- self.log.error('%s failed')
+ self.log.error('%s failed', self.name)
self.result = 1
if self.auto_report_result:
self.report_result()
@@ -742,12 +742,12 @@ def default_check_steps(test):
log_to_zip = check_steps[-1].merged_name
# Reco_tf log merging
- reco_tf_steps = [step for step in test.exec_steps if step.type=='Reco_tf']
+ reco_tf_steps = [step for step in test.exec_steps if step.type in ['Reco_tf', 'Trig_reco_tf']]
if len(reco_tf_steps) > 0:
reco_tf_logmerge = LogMergeStep('LogMerge_Reco_tf')
reco_tf_logmerge.warn_if_missing = False
tf_names = ['HITtoRDO', 'RDOtoRDOTrigger', 'RAWtoESD', 'ESDtoAOD',
- 'PhysicsValidation', 'RAWtoALL']
+ 'PhysicsValidation', 'RAWtoALL', 'BSRDOtoRAW']
reco_tf_logmerge.log_files = ['log.'+tf_name for tf_name in tf_names]
if not get_step_from_list('LogMerge', check_steps):
for step in reco_tf_steps:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index f2155d1a1bde7b6348713ab212c5d0a13e3aa6e2..eaabbf36b5a0c2e595247af7e89ef07311962ed7 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1,758 +1,767 @@
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 - - -
+TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3136730292 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM15VH #2280638160
-TrigSignatureMoniMT INFO -- #2280638160 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2280638160 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2280638160 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2280638160 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
-TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113
-TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 13 13 13 - - - 13
-TrigSignatureMoniMT INFO -- #2613484113 Features 92 324 178 - - -
+TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 13 13 13 - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #2613484113 Features 92 324 178 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM15VH #3837353071
-TrigSignatureMoniMT INFO -- #3837353071 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3837353071 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3837353071 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3837353071 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH #58053304
-TrigSignatureMoniMT INFO -- #58053304 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #58053304 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #58053304 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #58053304 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH #3965466087
-TrigSignatureMoniMT INFO -- #3965466087 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3965466087 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
-TrigSignatureMoniMT INFO -- #1295975955 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1295975955 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1295975955 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1295975955 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_2j60_L1J15 #927735533
-TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #927735533 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #927735533 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 #3498558358
-TrigSignatureMoniMT INFO -- #3498558358 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3498558358 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3498558358 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #3498558358 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 #234102568
-TrigSignatureMoniMT INFO -- #234102568 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #234102568 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #234102568 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #234102568 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 #2619091790
-TrigSignatureMoniMT INFO -- #2619091790 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2619091790 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 #557204938
-TrigSignatureMoniMT INFO -- #557204938 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #557204938 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu4_L12MU4 #2999632714
-TrigSignatureMoniMT INFO -- #2999632714 Events 20 20 1 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2999632714 Features 4 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2999632714 Events 20 20 0 0 0 0 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2999632714 Features 0 0 0 0 4 0 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 -- #1730084172 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1730084172 Features 0 0 0 0 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 -- #4276347155 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #4276347155 Features 0 0 0 0 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 -- #4008168535 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #4008168535 Features 0 0 0 0 4 2 0 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935
-TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 1 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1584776935 Features 4 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 0 0 0 0 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 4 0 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 -- #2046267508 Events 20 20 0 0 0 0 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 0 0 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871
-TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu6_Dr_L12MU4 #3304584056
-TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 1 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3304584056 Features 4 0 - - - -
+TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 0 0 0 0 1 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #3304584056 Features 0 0 0 0 4 0 - - - - - -
TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
-TrigSignatureMoniMT INFO -- #1747073535 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1747073535 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_2mu6_muonqual_L12MU6 #2398136098
-TrigSignatureMoniMT INFO -- #2398136098 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2398136098 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_3j200_L1J100 #2199422919
-TrigSignatureMoniMT INFO -- #2199422919 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2199422919 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #2199422919 Events 20 20 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 -
TrigSignatureMoniMT INFO HLT_3j200_L1J20 #493765146
-TrigSignatureMoniMT INFO -- #493765146 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #493765146 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #493765146 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #493765146 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 #1832399408
-TrigSignatureMoniMT INFO -- #1832399408 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1832399408 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 #1199773318
-TrigSignatureMoniMT INFO -- #1199773318 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #1199773318 Events 20 20 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_3mu8_msonly_L13MU6 #424835335
-TrigSignatureMoniMT INFO -- #424835335 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #424835335 Events 20 20 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 #1834383636
-TrigSignatureMoniMT INFO -- #1834383636 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1834383636 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 #1175391812
-TrigSignatureMoniMT INFO -- #1175391812 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1175391812 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1175391812 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1175391812 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15 #3989372080
-TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - - 20
-TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - - -
+TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_beamspot_trkFS_trkfast_BeamSpotPEB_L1J15 #628534730
-TrigSignatureMoniMT INFO -- #628534730 Events 20 20 20 20 - - - - 20
-TrigSignatureMoniMT INFO -- #628534730 Features 20 20 - - - -
+TrigSignatureMoniMT INFO -- #628534730 Events 20 20 20 20 - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #628534730 Features 20 20 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1All #843341480
-TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - -
+TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #843341480 Features 20 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM22VHI #3471067710
-TrigSignatureMoniMT INFO -- #3471067710 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3471067710 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3471067710 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e140_lhloose_nod0_L1EM22VHI #4128870680
-TrigSignatureMoniMT INFO -- #4128870680 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #4128870680 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #4128870680 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4128870680 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e17_lhloose_mu14_L1EM15VH_MU10 #899946230
-TrigSignatureMoniMT INFO -- #899946230 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #899946230 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #899946230 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #899946230 Features 0 0 0 0 0 0 0 0 - - - -
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 -- #140779220 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #140779220 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 - - -
+TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1703681121 Features 1 2 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM22VHI #1995263521
-TrigSignatureMoniMT INFO -- #1995263521 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1995263521 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1995263521 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1995263521 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM22VHI #939763520
-TrigSignatureMoniMT INFO -- #939763520 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #939763520 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #939763520 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #939763520 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e26_lhtight_nod0_L1EM24VHI #4227411116
-TrigSignatureMoniMT INFO -- #4227411116 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #4227411116 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #4227411116 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4227411116 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM22VHI #2128128255
-TrigSignatureMoniMT INFO -- #2128128255 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2128128255 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #2128128255 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2128128255 Features 0 0 0 - - - - - - - - -
+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
-TrigSignatureMoniMT INFO -- #2209076666 Features 0 0 0 0 - -
+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
-TrigSignatureMoniMT INFO -- #2086577378 Features 0 - - - - -
+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 - - -
+TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - - - - - - - - - 14
+TrigSignatureMoniMT INFO -- #683953566 Features 48 163 90 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - - 13
-TrigSignatureMoniMT INFO -- #324908483 Features 41 148 49 - - -
+TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #324908483 Features 41 148 49 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 1 - - 1
-TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 31 1 - -
+TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 1 - - - - - - - - 1
+TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 31 1 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
-TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - - 0
-TrigSignatureMoniMT INFO -- #176627878 Features 13 51 30 0 - -
+TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #176627878 Features 13 51 30 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 9 9 0 - - 0
-TrigSignatureMoniMT INFO -- #2758326765 Features 13 51 30 0 - -
+TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 9 9 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2758326765 Features 13 51 30 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_nod0_L1EM3 #1690619419
-TrigSignatureMoniMT INFO -- #1690619419 Events 20 20 9 9 9 0 - - 0
-TrigSignatureMoniMT INFO -- #1690619419 Features 13 51 30 0 - -
+TrigSignatureMoniMT INFO -- #1690619419 Events 20 20 9 9 9 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1690619419 Features 13 51 30 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM22VHI #298591874
-TrigSignatureMoniMT INFO -- #298591874 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #298591874 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #298591874 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #298591874 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e60_lhmedium_nod0_L1EM22VHI #4115486024
-TrigSignatureMoniMT INFO -- #4115486024 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #4115486024 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #4115486024 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4115486024 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - - - 11
-TrigSignatureMoniMT INFO -- #1959043579 Features 26 96 21 - - -
+TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - - - - - - - - - 11
+TrigSignatureMoniMT INFO -- #1959043579 Features 26 96 21 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_e7_lhmedium_mu24_L1MU20 #2970063918
-TrigSignatureMoniMT INFO -- #2970063918 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2970063918 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2970063918 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2970063918 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM22VHI #3879926061
-TrigSignatureMoniMT INFO -- #3879926061 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #3879926061 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3879926061 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI #1045486446
-TrigSignatureMoniMT INFO -- #1045486446 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #1045486446 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g140_loose_L1EM22VHI #1776910226
-TrigSignatureMoniMT INFO -- #1776910226 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1776910226 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1776910226 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1776910226 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
-TrigSignatureMoniMT INFO -- #2706532790 Events 20 20 4 4 3 3 - - 3
-TrigSignatureMoniMT INFO -- #2706532790 Features 5 5 4 4 - -
+TrigSignatureMoniMT INFO -- #2706532790 Events 20 20 4 4 3 3 - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2706532790 Features 5 5 4 4 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_loose_L1EM15VH #531040386
-TrigSignatureMoniMT INFO -- #531040386 Events 20 20 2 2 2 0 - - 0
-TrigSignatureMoniMT INFO -- #531040386 Features 2 2 6 0 - -
+TrigSignatureMoniMT INFO -- #531040386 Events 20 20 2 2 2 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #531040386 Features 2 2 6 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_medium_L1EM15VH #3776886359
-TrigSignatureMoniMT INFO -- #3776886359 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3776886359 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3776886359 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3776886359 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g25_medium_mu24_ivarmedium_L1MU20 #1007052793
-TrigSignatureMoniMT INFO -- #1007052793 Events 20 20 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1007052793 Features 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #1007052793 Events 20 20 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1007052793 Features 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_g25_tight_L1EM15VH #3691147775
-TrigSignatureMoniMT INFO -- #3691147775 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3691147775 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #3691147775 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #3691147775 Features 0 0 0 0 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
-TrigSignatureMoniMT INFO -- #1158879722 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1158879722 Events 20 20 0 0 0 0 - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 - - - - - - - -
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 -- #471243435 Events 20 20 13 13 13 - - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #471243435 Features 41 41 50 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 #3486231698
-TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 13 13 13 13 - - 13
-TrigSignatureMoniMT INFO -- #3486231698 Features 41 41 50 36 - -
+TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 13 13 13 13 - - - - - - - - 13
+TrigSignatureMoniMT INFO -- #3486231698 Features 41 41 50 36 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 #3230088967
-TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 10 10 10 2 - - 2
-TrigSignatureMoniMT INFO -- #3230088967 Features 15 15 31 2 - -
+TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 10 10 10 2 - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #3230088967 Features 15 15 31 2 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 #385248610
-TrigSignatureMoniMT INFO -- #385248610 Events 20 20 9 9 9 2 - - 2
-TrigSignatureMoniMT INFO -- #385248610 Features 13 13 30 2 - -
+TrigSignatureMoniMT INFO -- #385248610 Events 20 20 9 9 9 2 - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #385248610 Features 13 13 30 2 - - - - - - - -
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
-TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 9 9 9 1 - - 1
-TrigSignatureMoniMT INFO -- #3280865118 Features 13 13 30 1 - -
+TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 9 9 9 1 - - - - - - - - 1
+TrigSignatureMoniMT INFO -- #3280865118 Features 13 13 30 1 - - - - - - - -
TrigSignatureMoniMT INFO HLT_j0_perf_L1J12_EMPTY #1341875780
-TrigSignatureMoniMT INFO -- #1341875780 Events 20 20 8 - - - - - 8
-TrigSignatureMoniMT INFO -- #1341875780 Features 174 - - - - -
+TrigSignatureMoniMT INFO -- #1341875780 Events 20 20 0 0 0 0 0 0 0 0 0 0 8 - 8
+TrigSignatureMoniMT INFO -- #1341875780 Features 0 0 0 0 0 0 0 0 0 0 174 -
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
-TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 2 - - - - - 2
-TrigSignatureMoniMT INFO -- #4034799151 Features 34 - - - - -
+TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 0 0 0 0 0 0 0 0 0 0 2 - 2
+TrigSignatureMoniMT INFO -- #4034799151 Features 0 0 0 0 0 0 0 0 0 0 34 -
TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 #3992507557
-TrigSignatureMoniMT INFO -- #3992507557 Events 20 20 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3992507557 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
-TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3084792704 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3084792704 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
-TrigSignatureMoniMT INFO -- #3769257182 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3769257182 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3769257182 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3769257182 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 #1211559599
-TrigSignatureMoniMT INFO -- #1211559599 Events 20 20 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1211559599 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 #3706723666
-TrigSignatureMoniMT INFO -- #3706723666 Events 20 20 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #3706723666 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 #1837565816
-TrigSignatureMoniMT INFO -- #1837565816 Events 20 20 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1837565816 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 0 0 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
-TrigSignatureMoniMT INFO -- #2659902019 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2659902019 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #2659902019 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2659902019 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
-TrigSignatureMoniMT INFO -- #2205518067 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2205518067 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #2205518067 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2205518067 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j420_ftf_subjesgscIS_L1J20 #4179085188
-TrigSignatureMoniMT INFO -- #4179085188 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #4179085188 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #4179085188 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #4179085188 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
-TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #1364976160 Features 6 - - - - -
+TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 0 6 -
TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
-TrigSignatureMoniMT INFO -- #3295122398 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #3295122398 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #3295122398 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #3295122398 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
-TrigSignatureMoniMT INFO -- #868405538 Events 20 20 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #868405538 Features 6 - - - - -
+TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 0 6 -
TrigSignatureMoniMT INFO HLT_j45_ftf_csskpf_nojcalib_L1J20 #3533281867
-TrigSignatureMoniMT INFO -- #3533281867 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #3533281867 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #3533281867 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #3533281867 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 #1335156103
-TrigSignatureMoniMT INFO -- #1335156103 Events 20 20 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #1335156103 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #1335156103 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #1335156103 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_j45_ftf_pf_nojcalib_L1J20 #3658890913
-TrigSignatureMoniMT INFO -- #3658890913 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #3658890913 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #3658890913 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #3658890913 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 #2857031468
-TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #2857031468 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #2857031468 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J15 #2938374624
-TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #2938374624 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #2938374624 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_059jvt_L1J15 #1593009344
-TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #1593009344 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #1593009344 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 #3341539267
-TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #3341539267 Features 6 - - - - -
+TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #3341539267 Features 0 0 0 0 0 0 0 0 0 0 6 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
-TrigSignatureMoniMT INFO -- #991419339 Events 20 20 5 2 - - - - 2
-TrigSignatureMoniMT INFO -- #991419339 Features 5 2 - - - -
+TrigSignatureMoniMT INFO -- #991419339 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 2 2
+TrigSignatureMoniMT INFO -- #991419339 Features 0 0 0 0 0 0 0 0 0 0 5 2
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 -- #1961149049 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 5 5
+TrigSignatureMoniMT INFO -- #1961149049 Features 0 0 0 0 0 0 0 0 0 0 5 5
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 #761060030
-TrigSignatureMoniMT INFO -- #761060030 Events 20 20 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #761060030 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #761060030 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #761060030 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 #1509925407
-TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #1509925407 Features 7 - - - - -
+TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #1509925407 Features 0 0 0 0 0 0 0 0 0 0 7 -
TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J20 #4012311417
-TrigSignatureMoniMT INFO -- #4012311417 Events 20 20 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #4012311417 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #4012311417 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #4012311417 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
-TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #2042444294 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #2042444294 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
-TrigSignatureMoniMT INFO -- #1542468090 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #1542468090 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #1542468090 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #1542468090 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
-TrigSignatureMoniMT INFO -- #3327656707 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3327656707 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3327656707 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3327656707 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 #215408633
-TrigSignatureMoniMT INFO -- #215408633 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #215408633 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #215408633 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #215408633 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 #1151767619
-TrigSignatureMoniMT INFO -- #1151767619 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1151767619 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1151767619 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1151767619 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
-TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3875082669 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3875082669 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
-TrigSignatureMoniMT INFO -- #2296827117 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2296827117 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #2296827117 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2296827117 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
-TrigSignatureMoniMT INFO -- #436385969 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #436385969 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #436385969 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #436385969 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
-TrigSignatureMoniMT INFO -- #3634067472 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #3634067472 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #3634067472 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #3634067472 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j80_L1J15 #2440872308
-TrigSignatureMoniMT INFO -- #2440872308 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #2440872308 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #2440872308 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #2440872308 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 #582699527
-TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #582699527 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #582699527 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j85_L1J20 #510475538
-TrigSignatureMoniMT INFO -- #510475538 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #510475538 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #510475538 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #510475538 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
-TrigSignatureMoniMT INFO -- #877042532 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #877042532 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #877042532 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 #1538535401
-TrigSignatureMoniMT INFO -- #1538535401 Events 20 20 2 - - - - - 2
-TrigSignatureMoniMT INFO -- #1538535401 Features 2 - - - - -
+TrigSignatureMoniMT INFO -- #1538535401 Events 20 20 0 0 0 0 0 0 0 0 0 0 2 - 2
+TrigSignatureMoniMT INFO -- #1538535401 Features 0 0 0 0 0 0 0 0 0 0 2 -
TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED #4097312640
-TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 20 19 - - - - 19
-TrigSignatureMoniMT INFO -- #4097312640 Features 20 19 - - - -
+TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 20 19 - - - - - - - - - - 19
+TrigSignatureMoniMT INFO -- #4097312640 Features 20 19 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU20 #997163309
-TrigSignatureMoniMT INFO -- #997163309 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #997163309 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #997163309 Events 20 20 0 0 0 0 0 - - - - - - - 0
+TrigSignatureMoniMT INFO -- #997163309 Features 0 0 0 0 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU4_EMPTY #782182242
-TrigSignatureMoniMT INFO -- #782182242 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #782182242 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #782182242 Events 20 20 0 0 0 0 0 - - - - - - - 0
+TrigSignatureMoniMT INFO -- #782182242 Features 0 0 0 0 0 - - - - - - -
TrigSignatureMoniMT INFO HLT_mu10_L1MU10 #209090273
-TrigSignatureMoniMT INFO -- #209090273 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #209090273 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #209090273 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #209090273 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu10_ivarmedium_mu10_10invm70_L12MU10 #2386882549
-TrigSignatureMoniMT INFO -- #2386882549 Events 20 20 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2386882549 Features 0 0 0 0 0 -
+TrigSignatureMoniMT INFO -- #2386882549 Events 20 20 0 0 0 0 0 0 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #2386882549 Features 0 0 0 0 0 0 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 #48780310
-TrigSignatureMoniMT INFO -- #48780310 Events 20 20 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #48780310 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #48780310 Events 20 20 0 0 0 0 0 0 - - - - - - 0
+TrigSignatureMoniMT INFO -- #48780310 Features 0 0 0 0 0 0 - - - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bJpsimumu_L1MU11_2MU6 #2504965945
-TrigSignatureMoniMT INFO -- #2504965945 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2504965945 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #2504965945 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2504965945 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu11_mu6_bUpsimumu_L1MU11_2MU6 #1171632195
-TrigSignatureMoniMT INFO -- #1171632195 Events 20 20 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1171632195 Features 0 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1171632195 Events 20 20 0 0 0 0 0 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1171632195 Features 0 0 0 0 0 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu14_L1MU10 #1696906927
-TrigSignatureMoniMT INFO -- #1696906927 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1696906927 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #1696906927 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1696906927 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu20_2mu4noL1_L1MU20 #1029128679
-TrigSignatureMoniMT INFO -- #1029128679 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #1029128679 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #1029128679 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 1 1 0 0 0 0 - -
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 -- #2083734526 Events 20 20 0 0 0 0 1 1 1 - - - - - 1
+TrigSignatureMoniMT INFO -- #2083734526 Features 0 0 0 0 1 1 1 - - - - -
TrigSignatureMoniMT INFO HLT_mu22_2mu4noL1_L1MU20 #3427670100
-TrigSignatureMoniMT INFO -- #3427670100 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3427670100 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #3427670100 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3427670100 Features 0 0 0 0 1 1 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu22_mu8noL1_L1MU20 #3165652409
-TrigSignatureMoniMT INFO -- #3165652409 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3165652409 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #3165652409 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3165652409 Features 0 0 0 0 1 1 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu24_2mu4noL1_L1MU20 #3233544630
-TrigSignatureMoniMT INFO -- #3233544630 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #3233544630 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #3233544630 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3233544630 Features 0 0 0 0 1 1 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu24_L1MU20 #417425162
-TrigSignatureMoniMT INFO -- #417425162 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #417425162 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #417425162 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #417425162 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 #677658909
-TrigSignatureMoniMT INFO -- #677658909 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #677658909 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #677658909 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #677658909 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu24_mu10noL1_L1MU20 #2563354236
-TrigSignatureMoniMT INFO -- #2563354236 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #2563354236 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #2563354236 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2563354236 Features 0 0 0 0 1 1 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu26_L1MU20 #311138376
-TrigSignatureMoniMT INFO -- #311138376 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #311138376 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #311138376 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #311138376 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 #3411723090
-TrigSignatureMoniMT INFO -- #3411723090 Events 20 20 1 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3411723090 Features 1 1 0 0 0 -
+TrigSignatureMoniMT INFO -- #3411723090 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #3411723090 Features 0 0 0 0 1 1 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu26_mu10noL1_L1MU20 #2318302287
-TrigSignatureMoniMT INFO -- #2318302287 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #2318302287 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #2318302287 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2318302287 Features 0 0 0 0 1 1 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu26_mu8noL1_L1MU20 #2233067926
-TrigSignatureMoniMT INFO -- #2233067926 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #2233067926 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #2233067926 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2233067926 Features 0 0 0 0 1 1 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 #1963262787
-TrigSignatureMoniMT INFO -- #1963262787 Events 20 20 1 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1963262787 Features 1 1 0 0 0 -
+TrigSignatureMoniMT INFO -- #1963262787 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1963262787 Features 0 0 0 0 1 1 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu28_mu8noL1_L1MU20 #86648125
-TrigSignatureMoniMT INFO -- #86648125 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #86648125 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #86648125 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #86648125 Features 0 0 0 0 1 1 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 #597064890
-TrigSignatureMoniMT INFO -- #597064890 Events 20 20 1 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #597064890 Features 1 1 0 0 0 -
+TrigSignatureMoniMT INFO -- #597064890 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #597064890 Features 0 0 0 0 1 1 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
-TrigSignatureMoniMT INFO -- #3657158931 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3657158931 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #3657158931 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #3657158931 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 #827327262
-TrigSignatureMoniMT INFO -- #827327262 Events 20 20 1 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #827327262 Features 1 1 0 0 0 -
+TrigSignatureMoniMT INFO -- #827327262 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #827327262 Features 0 0 0 0 1 1 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 #1642591450
-TrigSignatureMoniMT INFO -- #1642591450 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #1642591450 Events 20 20 0 0 0 0 0 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 0 0 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu60_L1MU20 #2871837722
-TrigSignatureMoniMT INFO -- #2871837722 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #2871837722 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #2871837722 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590
-TrigSignatureMoniMT INFO -- #996392590 Events 20 20 1 1 - - - - 1
-TrigSignatureMoniMT INFO -- #996392590 Features 1 1 - - - -
+TrigSignatureMoniMT INFO -- #996392590 Events 20 20 0 0 0 0 1 1 - - - - - - 1
+TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 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 -- #2560542253 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 #934918532
-TrigSignatureMoniMT INFO -- #934918532 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #934918532 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #934918532 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #934918532 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062
-TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 1 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1012713062 Features 1 1 0 0 0 -
+TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 0 0 0 0 1 1 0 0 0 - - - 0
+TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 1 1 0 0 0 - - -
TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032
-TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 1 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #3895421032 Features 1 0 0 - - -
+TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 0 0 0 0 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
-TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 1 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1713982776 Features 2 0 0 0 - -
+TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 0 0 0 0 1 0 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1713982776 Features 0 0 0 0 2 0 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT INFO -- #451489897 Events 20 20 1 1 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #451489897 Features 1 1 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Events 20 20 0 0 0 0 1 1 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 1 1 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
-TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 1 - - - - - 1
-TrigSignatureMoniMT INFO -- #3518031697 Features 1 - - - - -
+TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 0 0 0 0 1 - - - - - - - 1
+TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 1 - - - - - - -
+TrigSignatureMoniMT INFO HLT_mu6fast_j45_nojcalib_L1J20 #1776326110
+TrigSignatureMoniMT INFO -- #1776326110 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1776326110 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_mu6fast_xe30_mht_L1XE10 #1876869651
+TrigSignatureMoniMT INFO -- #1876869651 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1876869651 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_mu80_L1MU20 #387900377
-TrigSignatureMoniMT INFO -- #387900377 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #387900377 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #387900377 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 #761101109
-TrigSignatureMoniMT INFO -- #761101109 Events 20 20 1 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #761101109 Features 1 0 0 - - -
+TrigSignatureMoniMT INFO -- #761101109 Events 20 20 0 0 0 0 1 0 0 - - - - - 0
+TrigSignatureMoniMT INFO -- #761101109 Features 0 0 0 0 1 0 0 - - - - -
TrigSignatureMoniMT INFO HLT_mu8_L1MU6 #1467711434
-TrigSignatureMoniMT INFO -- #1467711434 Events 20 20 1 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1467711434 Features 1 1 0 0 - -
+TrigSignatureMoniMT INFO -- #1467711434 Events 20 20 0 0 0 0 1 1 0 0 - - - - 0
+TrigSignatureMoniMT INFO -- #1467711434 Features 0 0 0 0 1 1 0 0 - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Calo #355689512
-TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #355689512 Features - - - - - -
+TrigSignatureMoniMT INFO -- #355689512 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #355689512 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Calo_EMPTY #3717801557
-TrigSignatureMoniMT INFO -- #3717801557 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3717801557 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3717801557 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3717801557 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM10VH #314199913
-TrigSignatureMoniMT INFO -- #314199913 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #314199913 Features - - - - - -
+TrigSignatureMoniMT INFO -- #314199913 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #314199913 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM12 #3885916609
-TrigSignatureMoniMT INFO -- #3885916609 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3885916609 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3885916609 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15 #480733925
-TrigSignatureMoniMT INFO -- #480733925 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #480733925 Features - - - - - -
+TrigSignatureMoniMT INFO -- #480733925 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #480733925 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM15VH #2374865899
-TrigSignatureMoniMT INFO -- #2374865899 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2374865899 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2374865899 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM20VH #3719542824
-TrigSignatureMoniMT INFO -- #3719542824 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3719542824 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3719542824 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM22VHI #1723589313
-TrigSignatureMoniMT INFO -- #1723589313 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1723589313 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1723589313 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM3 #4169267792
-TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4169267792 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM7 #3226970354
-TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3226970354 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3226970354 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1EM8VH #4065285611
-TrigSignatureMoniMT INFO -- #4065285611 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4065285611 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4065285611 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J100 #1026959128
-TrigSignatureMoniMT INFO -- #1026959128 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1026959128 Features - - - - - -
+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 -- #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 -- #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 - - - - - -
+TrigSignatureMoniMT INFO -- #1976430774 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1976430774 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J20 #2241112369
-TrigSignatureMoniMT INFO -- #2241112369 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2241112369 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2241112369 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J25 #39428635
-TrigSignatureMoniMT INFO -- #39428635 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #39428635 Features - - - - - -
+TrigSignatureMoniMT INFO -- #39428635 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #39428635 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J30 #3523994129
-TrigSignatureMoniMT INFO -- #3523994129 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3523994129 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3523994129 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J40 #1497591431
-TrigSignatureMoniMT INFO -- #1497591431 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1497591431 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1497591431 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J400 #2494874701
-TrigSignatureMoniMT INFO -- #2494874701 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2494874701 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2494874701 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J50 #3346352675
-TrigSignatureMoniMT INFO -- #3346352675 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3346352675 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3346352675 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J75 #1651897827
-TrigSignatureMoniMT INFO -- #1651897827 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1651897827 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1651897827 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1J85 #166231461
-TrigSignatureMoniMT INFO -- #166231461 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #166231461 Features - - - - - -
+TrigSignatureMoniMT INFO -- #166231461 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #166231461 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_EMPTY #914660695
-TrigSignatureMoniMT INFO -- #914660695 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #914660695 Features - - - - - -
+TrigSignatureMoniMT INFO -- #914660695 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #914660695 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1RD0_FILLED #211699639
-TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #211699639 Features - - - - - -
+TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #211699639 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1Standby #420861540
-TrigSignatureMoniMT INFO -- #420861540 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #420861540 Features - - - - - -
+TrigSignatureMoniMT INFO -- #420861540 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #420861540 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12 #4248050338
-TrigSignatureMoniMT INFO -- #4248050338 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4248050338 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4248050338 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU12IM #357557968
-TrigSignatureMoniMT INFO -- #357557968 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #357557968 Features - - - - - -
+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 -- #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 - - - - - -
+TrigSignatureMoniMT INFO -- #1931583332 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1931583332 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU30 #1944789678
-TrigSignatureMoniMT INFO -- #1944789678 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1944789678 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1944789678 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU40 #1394621652
-TrigSignatureMoniMT INFO -- #1394621652 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1394621652 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1394621652 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1TAU60 #3332424451
-TrigSignatureMoniMT INFO -- #3332424451 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3332424451 Features - - - - - -
+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 -- #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 - - - - - -
+TrigSignatureMoniMT INFO -- #1583053368 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1583053368 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE30 #2047368922
-TrigSignatureMoniMT INFO -- #2047368922 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2047368922 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2047368922 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE300 #1315853555
-TrigSignatureMoniMT INFO -- #1315853555 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1315853555 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1315853555 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE35 #2313039014
-TrigSignatureMoniMT INFO -- #2313039014 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2313039014 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2313039014 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE40 #4293469116
-TrigSignatureMoniMT INFO -- #4293469116 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4293469116 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4293469116 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE45 #2365048177
-TrigSignatureMoniMT INFO -- #2365048177 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2365048177 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2365048177 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE50 #1168752081
-TrigSignatureMoniMT INFO -- #1168752081 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1168752081 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1168752081 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE55 #268928384
-TrigSignatureMoniMT INFO -- #268928384 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #268928384 Features - - - - - -
+TrigSignatureMoniMT INFO -- #268928384 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #268928384 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE60 #4154240531
-TrigSignatureMoniMT INFO -- #4154240531 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4154240531 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #4154240531 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE70 #3765216228
-TrigSignatureMoniMT INFO -- #3765216228 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3765216228 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3765216228 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_L1XE80 #2742079961
-TrigSignatureMoniMT INFO -- #2742079961 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2742079961 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2742079961 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_bkg_L1Bkg #2032528907
-TrigSignatureMoniMT INFO -- #2032528907 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2032528907 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2032528907 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2032528907 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1EM3_EMPTY #2458124284
-TrigSignatureMoniMT INFO -- #2458124284 Events 20 20 - - - - - - 15
-TrigSignatureMoniMT INFO -- #2458124284 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2458124284 Events 20 20 - - - - - - - - - - - - 15
+TrigSignatureMoniMT INFO -- #2458124284 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1EM7_EMPTY #299938202
-TrigSignatureMoniMT INFO -- #299938202 Events 20 20 - - - - - - 9
-TrigSignatureMoniMT INFO -- #299938202 Features - - - - - -
+TrigSignatureMoniMT INFO -- #299938202 Events 20 20 - - - - - - - - - - - - 9
+TrigSignatureMoniMT INFO -- #299938202 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J12_EMPTY #3144024902
-TrigSignatureMoniMT INFO -- #3144024902 Events 20 20 - - - - - - 8
-TrigSignatureMoniMT INFO -- #3144024902 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3144024902 Events 20 20 - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #3144024902 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J12_FIRSTEMPTY #3840098930
-TrigSignatureMoniMT INFO -- #3840098930 Events 20 20 - - - - - - 8
-TrigSignatureMoniMT INFO -- #3840098930 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3840098930 Events 20 20 - - - - - - - - - - - - 8
+TrigSignatureMoniMT INFO -- #3840098930 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_31ETA49_EMPTY #4143623058
-TrigSignatureMoniMT INFO -- #4143623058 Events 20 20 - - - - - - 1
-TrigSignatureMoniMT INFO -- #4143623058 Features - - - - - -
+TrigSignatureMoniMT INFO -- #4143623058 Events 20 20 - - - - - - - - - - - - 1
+TrigSignatureMoniMT INFO -- #4143623058 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_cosmiccalo_L1J30_EMPTY #2991490897
-TrigSignatureMoniMT INFO -- #2991490897 Events 20 20 - - - - - - 4
-TrigSignatureMoniMT INFO -- #2991490897 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2991490897 Events 20 20 - - - - - - - - - - - - 4
+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 -- #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 -- #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 - - - - - -
+TrigSignatureMoniMT INFO -- #3925252528 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3925252528 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_EMPTY #56818284
-TrigSignatureMoniMT INFO -- #56818284 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #56818284 Features - - - - - -
+TrigSignatureMoniMT INFO -- #56818284 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #56818284 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_FILLED #1198298874
-TrigSignatureMoniMT INFO -- #1198298874 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1198298874 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1198298874 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1198298874 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_idmon_L1RD0_UNPAIRED_ISO #2536676873
-TrigSignatureMoniMT INFO -- #2536676873 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #2536676873 Features - - - - - -
+TrigSignatureMoniMT INFO -- #2536676873 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #2536676873 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_l1calo_L1J400 #1694511185
-TrigSignatureMoniMT INFO -- #1694511185 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1694511185 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1694511185 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1694511185 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_mb_L1RD2_EMPTY #3788962163
-TrigSignatureMoniMT INFO -- #3788962163 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #3788962163 Features - - - - - -
+TrigSignatureMoniMT INFO -- #3788962163 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3788962163 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_noalg_zb_L1ZB #1289992951
-TrigSignatureMoniMT INFO -- #1289992951 Events 20 20 - - - - - - 20
-TrigSignatureMoniMT INFO -- #1289992951 Features - - - - - -
+TrigSignatureMoniMT INFO -- #1289992951 Events 20 20 - - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1289992951 Features - - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_sct_noise_SCTPEB_L1RD0_EMPTY #3024203296
-TrigSignatureMoniMT INFO -- #3024203296 Events 20 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #3024203296 Features 20 - - - - -
+TrigSignatureMoniMT INFO -- #3024203296 Events 20 20 20 - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #3024203296 Features 20 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 #2342716369
-TrigSignatureMoniMT INFO -- #2342716369 Events 20 20 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #2342716369 Events 20 20 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2342716369 Features 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 #372992233
-TrigSignatureMoniMT INFO -- #372992233 Events 20 20 4 4 - - - - 4
-TrigSignatureMoniMT INFO -- #372992233 Features 5 5 - - - -
+TrigSignatureMoniMT INFO -- #372992233 Events 20 20 4 4 - - - - - - - - - - 4
+TrigSignatureMoniMT INFO -- #372992233 Features 5 5 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU60 #1376650121
-TrigSignatureMoniMT INFO -- #1376650121 Events 20 20 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1376650121 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #1376650121 Events 20 20 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1376650121 Features 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_track_L1TAU100 #714660857
-TrigSignatureMoniMT INFO -- #714660857 Events 20 20 0 0 - - - - 0
-TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - -
+TrigSignatureMoniMT INFO -- #714660857 Events 20 20 0 0 - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #714660857 Features 0 0 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwoMVA_L1TAU100 #2725693236
-TrigSignatureMoniMT INFO -- #2725693236 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #2725693236 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 0 - - - - - - - - -
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 -- #886074432 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #886074432 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 - - -
+TrigSignatureMoniMT INFO -- #1747754287 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwoMVA_L1TAU100 #2334140248
-TrigSignatureMoniMT INFO -- #2334140248 Events 20 20 0 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - -
+TrigSignatureMoniMT INFO -- #2334140248 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 0 - - - - - - - - -
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 -- #1799096347 Events 20 20 0 0 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1799096347 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 - - - -
+TrigSignatureMoniMT INFO -- #554271976 Events 20 20 3 3 - - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #554271976 Features 4 4 - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM #988149859
-TrigSignatureMoniMT INFO -- #988149859 Events 20 20 3 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #988149859 Features 4 4 4 - - -
+TrigSignatureMoniMT INFO -- #988149859 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #988149859 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM #3346942453
-TrigSignatureMoniMT INFO -- #3346942453 Events 20 20 3 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #3346942453 Features 4 4 4 - - -
+TrigSignatureMoniMT INFO -- #3346942453 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #3346942453 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM #169452969
-TrigSignatureMoniMT INFO -- #169452969 Events 20 20 3 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #169452969 Features 4 4 4 - - -
+TrigSignatureMoniMT INFO -- #169452969 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #169452969 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwo_L1TAU12IM #2490017573
-TrigSignatureMoniMT INFO -- #2490017573 Events 20 20 3 3 0 - - - 0
-TrigSignatureMoniMT INFO -- #2490017573 Features 4 4 0 - - -
+TrigSignatureMoniMT INFO -- #2490017573 Events 20 20 3 3 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2490017573 Features 4 4 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoEF_L1TAU12IM #506456080
-TrigSignatureMoniMT INFO -- #506456080 Events 20 20 3 3 0 - - - 0
-TrigSignatureMoniMT INFO -- #506456080 Features 4 4 0 - - -
+TrigSignatureMoniMT INFO -- #506456080 Events 20 20 3 3 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #506456080 Features 4 4 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoMVA_L1TAU12IM #4055280067
-TrigSignatureMoniMT INFO -- #4055280067 Events 20 20 3 3 0 - - - 0
-TrigSignatureMoniMT INFO -- #4055280067 Features 4 4 0 - - -
+TrigSignatureMoniMT INFO -- #4055280067 Events 20 20 3 3 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #4055280067 Features 4 4 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM #1433975745
-TrigSignatureMoniMT INFO -- #1433975745 Events 20 20 3 3 2 - - - 2
-TrigSignatureMoniMT INFO -- #1433975745 Features 4 4 2 - - -
+TrigSignatureMoniMT INFO -- #1433975745 Events 20 20 3 3 2 - - - - - - - - - 2
+TrigSignatureMoniMT INFO -- #1433975745 Features 4 4 2 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM #2222894847
-TrigSignatureMoniMT INFO -- #2222894847 Events 20 20 3 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2222894847 Features 4 4 4 - - -
+TrigSignatureMoniMT INFO -- #2222894847 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2222894847 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwo_L1TAU12IM #698603885
-TrigSignatureMoniMT INFO -- #698603885 Events 20 20 3 3 0 - - - 0
-TrigSignatureMoniMT INFO -- #698603885 Features 4 4 0 - - -
+TrigSignatureMoniMT INFO -- #698603885 Events 20 20 3 3 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #698603885 Features 4 4 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwoMVA_L1TAU12IM #112814536
-TrigSignatureMoniMT INFO -- #112814536 Events 20 20 3 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #112814536 Features 4 4 4 - - -
+TrigSignatureMoniMT INFO -- #112814536 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #112814536 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwo_L1TAU12IM #1129072492
-TrigSignatureMoniMT INFO -- #1129072492 Events 20 20 3 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #1129072492 Features 4 4 4 - - -
+TrigSignatureMoniMT INFO -- #1129072492 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #1129072492 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM #2472860683
-TrigSignatureMoniMT INFO -- #2472860683 Events 20 20 3 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2472860683 Features 4 4 4 - - -
+TrigSignatureMoniMT INFO -- #2472860683 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2472860683 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwo_L1TAU12IM #2537544560
-TrigSignatureMoniMT INFO -- #2537544560 Events 20 20 3 3 0 - - - 0
-TrigSignatureMoniMT INFO -- #2537544560 Features 4 4 0 - - -
+TrigSignatureMoniMT INFO -- #2537544560 Events 20 20 3 3 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #2537544560 Features 4 4 0 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM #2992830434
-TrigSignatureMoniMT INFO -- #2992830434 Events 20 20 3 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2992830434 Features 4 4 4 - - -
+TrigSignatureMoniMT INFO -- #2992830434 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2992830434 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM #1275052132
-TrigSignatureMoniMT INFO -- #1275052132 Events 20 20 3 3 0 - - - 0
-TrigSignatureMoniMT INFO -- #1275052132 Features 4 4 0 - - -
+TrigSignatureMoniMT INFO -- #1275052132 Events 20 20 3 3 0 - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #1275052132 Features 4 4 0 - - - - - - - - -
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 -- #2456480859 Events 20 20 3 3 3 - - - - - - - - - 3
+TrigSignatureMoniMT INFO -- #2456480859 Features 4 4 4 - - - - - - - - -
TrigSignatureMoniMT INFO HLT_tilecalib_laser_TilePEB_L1CALREQ2 #1063154655
-TrigSignatureMoniMT INFO -- #1063154655 Events 20 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #1063154655 Features 20 - - - - -
+TrigSignatureMoniMT INFO -- #1063154655 Events 20 20 20 - - - - - - - - - - - 20
+TrigSignatureMoniMT INFO -- #1063154655 Features 20 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_timeburner_L1All #819160059
-TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #819160059 Events 20 20 0 - - - - - - - - - - - 0
+TrigSignatureMoniMT INFO -- #819160059 Features 0 - - - - - - - - - - -
TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988
-TrigSignatureMoniMT INFO -- #532175988 Events 20 20 2 - - - - - 2
-TrigSignatureMoniMT INFO -- #532175988 Features 2 - - - - -
+TrigSignatureMoniMT INFO -- #532175988 Events 20 20 0 0 0 0 0 0 0 0 0 0 2 - 2
+TrigSignatureMoniMT INFO -- #532175988 Features 0 0 0 0 0 0 0 0 0 0 2 -
TrigSignatureMoniMT INFO HLT_xe100_pfsum_L1XE50 #1890237897
-TrigSignatureMoniMT INFO -- #1890237897 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1890237897 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1890237897 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1890237897 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_xe100_tcpufit_L1XE50 #2803198799
-TrigSignatureMoniMT INFO -- #2803198799 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #2803198799 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #2803198799 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2803198799 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_xe100_trkmht_L1XE50 #1055916731
-TrigSignatureMoniMT INFO -- #1055916731 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #1055916731 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #1055916731 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #1055916731 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_xe110_mht_L1XE50 #3030733259
-TrigSignatureMoniMT INFO -- #3030733259 Events 20 20 2 - - - - - 2
-TrigSignatureMoniMT INFO -- #3030733259 Features 2 - - - - -
+TrigSignatureMoniMT INFO -- #3030733259 Events 20 20 0 0 0 0 0 0 0 0 0 0 2 - 2
+TrigSignatureMoniMT INFO -- #3030733259 Features 0 0 0 0 0 0 0 0 0 0 2 -
TrigSignatureMoniMT INFO HLT_xe110_tc_em_L1XE50 #607113828
-TrigSignatureMoniMT INFO -- #607113828 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #607113828 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #607113828 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #607113828 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_xe110_tcpufit_L1XE50 #892853397
-TrigSignatureMoniMT INFO -- #892853397 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #892853397 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #892853397 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #892853397 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 #1649696554
-TrigSignatureMoniMT INFO -- #1649696554 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #1649696554 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #1649696554 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #1649696554 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 #3768353779
-TrigSignatureMoniMT INFO -- #3768353779 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #3768353779 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #3768353779 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #3768353779 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #3626903018
-TrigSignatureMoniMT INFO -- #3626903018 Events 20 20 16 - - - - - 16
-TrigSignatureMoniMT INFO -- #3626903018 Features 16 - - - - -
+TrigSignatureMoniMT INFO -- #3626903018 Events 20 20 0 0 0 0 0 0 0 0 0 0 16 - 16
+TrigSignatureMoniMT INFO -- #3626903018 Features 0 0 0 0 0 0 0 0 0 0 16 -
TrigSignatureMoniMT INFO HLT_xe30_pfsum_L1XE10 #998713382
-TrigSignatureMoniMT INFO -- #998713382 Events 20 20 3 - - - - - 3
-TrigSignatureMoniMT INFO -- #998713382 Features 3 - - - - -
+TrigSignatureMoniMT INFO -- #998713382 Events 20 20 0 0 0 0 0 0 0 0 0 0 3 - 3
+TrigSignatureMoniMT INFO -- #998713382 Features 0 0 0 0 0 0 0 0 0 0 3 -
TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
-TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 6 - - - - - 6
-TrigSignatureMoniMT INFO -- #1583719916 Features 6 - - - - -
+TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 0 0 0 0 0 0 0 0 0 0 6 - 6
+TrigSignatureMoniMT INFO -- #1583719916 Features 0 0 0 0 0 0 0 0 0 0 6 -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 5 - - - - - 5
-TrigSignatureMoniMT INFO -- #2468872349 Features 5 - - - - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 0 0 0 0 0 0 0 0 0 0 5 - 5
+TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 0 5 -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
-TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #531141817 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #531141817 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_xe65_cell_xe110_tcpufit_L1XE50 #115518400
-TrigSignatureMoniMT INFO -- #115518400 Events 20 20 0 - - - - - 0
-TrigSignatureMoniMT INFO -- #115518400 Features 0 - - - - -
+TrigSignatureMoniMT INFO -- #115518400 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #115518400 Features 0 0 0 0 0 0 0 0 0 0 0 -
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index 1386aed88deaf5b9dbe741cc7c54db16d00dc8cb..57d15e63bde84224531a50413092722a9919f2b7 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -27,10 +27,10 @@ def collectHypos( steps ):
continue
if "filter" in stepSeq.getName():
- __log.info("Skipping filtering steps " +stepSeq.getName() )
+ __log.debug("Skipping filtering steps " +stepSeq.getName() )
continue
- __log.info( "collecting hypos from step " + stepSeq.getName() )
+ __log.debug( "collecting hypos from step " + stepSeq.getName() )
# start = {}
for seq,algs in six.iteritems (flatAlgorithmSequences( stepSeq )):
for alg in algs:
@@ -38,9 +38,9 @@ def collectHypos( steps ):
continue
# will replace by function once dependencies are sorted
if hasProp( alg, 'HypoInputDecisions'):
- __log.info( "found hypo " + alg.getName() + " in " +stepSeq.getName() )
+ __log.debug( "found hypo " + alg.getName() + " in " +stepSeq.getName() )
if __isCombo( alg ) and len(alg.ComboHypoTools):
- __log.info( " with %d comboHypoTools: %s", len(alg.ComboHypoTools), ' '.join(map(str, [tool.getName() for tool in alg.ComboHypoTools])))
+ __log.debug( " with %d comboHypoTools: %s", len(alg.ComboHypoTools), ' '.join(map(str, [tool.getName() for tool in alg.ComboHypoTools])))
hypos[stepSeq.getName()].append( alg )
else:
__log.verbose("Not a hypo" + alg.getName())
@@ -93,7 +93,7 @@ def collectFilters( steps ):
for stepSeq in getSequenceChildren( steps ):
if "filter" in stepSeq.getName():
filters[stepSeq.getName()] = getSequenceChildren( stepSeq )
- __log.info("Found Filters in Step {} : {}".format(stepSeq.getName(), getSequenceChildren( stepSeq )))
+ __log.debug("Found Filters in Step {} : {}".format(stepSeq.getName(), getSequenceChildren( stepSeq )))
return filters
@@ -187,7 +187,7 @@ def triggerSummaryCfg(flags, hypos):
else:
for chainName, chainDict in six.iteritems (TriggerConfigHLT.dicts()):
if chainName not in allChains:
- __log.warn("The chain %s is not mentioned in any step", chainName)
+ __log.debug("The chain %s is not mentioned in any step", chainName)
# TODO once sequences available in the menu we need to crosscheck it here
assert len(chainDict['chainParts']) == 1, "Chains w/o the steps can not have mutiple parts in chainDict, it makes no sense: %s"%chainName
allChains[chainName] = mapThresholdToL1DecisionCollection( chainDict['chainParts'][0]['L1threshold'] )
@@ -218,7 +218,9 @@ def triggerMonitoringCfg(flags, hypos, filters, l1Decoder):
return acc, mon
allChains = set() # collects the last decision obj for each chain
- for stepName, stepHypos in sorted( hypos.items() ):
+ # lambda sort because we have strings Step1 Step2 ... Step10 Step11 and python sorts that
+ # to Step10 Step11 Step1 Step2
+ for stepName, stepHypos in sorted( hypos.items(), key=lambda x : int(x[0].split('_')[0][4:]) ):
stepDecisionKeys = []
for hypo in stepHypos:
hypoChains, hypoOutputKey = __decisionsFromHypo( hypo )
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 7b4f3765a754a53b6bfbc32260c439155d30729b..2b72c2132477a88d514e8ff1435950400320b372 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -34,6 +34,15 @@ def createTriggerFlags():
# Enable Run-2 L1Calo simulation and/or decoding (possible even if enablePhase1 is True)
flags.addFlag('Trigger.enableL1CaloLegacy', True)
+ # Enable Inner Detector
+ flags.addFlag('Trigger.doID', True)
+
+ # Enable muon system
+ flags.addFlag('Trigger.doMuon', True)
+
+ # Enable calorimeters
+ flags.addFlag('Trigger.doCalo', True)
+
# if 1, Run1 decoding version is set; if 2, Run2; if 3, Run 3
def EDMDecodingVersion(flags):
log.debug("Attempting to determine EDMDecodingVersion.")
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 3af59c670234c906b2404e5b9e724611c0783260..9c3191559b6606cd7d86ec02eda3b684f0b84633 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -72,6 +72,7 @@ from AthenaConfiguration.ComponentAccumulator import CAtoGlobalWrapper, conf2toC
from AthenaCommon.AppMgr import theApp, ServiceMgr as svcMgr
from AthenaCommon.Include import include
from AthenaCommon.Logging import logging
+from AthenaCommon import Constants
log = logging.getLogger('runHLT_standalone.py')
#-------------------------------------------------------------
@@ -239,9 +240,9 @@ else: # More data modifiers
'forceTileRODMap',
]
-TriggerFlags.doID = opt.doID
-TriggerFlags.doMuon = opt.doMuon
-TriggerFlags.doCalo = opt.doCalo
+TriggerFlags.doID = ConfigFlags.Trigger.doID = opt.doID
+TriggerFlags.doMuon = ConfigFlags.Trigger.doMuon = opt.doMuon
+TriggerFlags.doCalo = ConfigFlags.Trigger.doCalo = opt.doCalo
#-------------------------------------------------------------
# Modifiers
@@ -534,7 +535,7 @@ if len(opt.condOverride)>0:
log.warning('Overriding folder %s with tag %s', folder, tag)
conddb.addOverride(folder,tag)
-if svcMgr.MessageSvc.OutputLevel < logging.INFO:
+if svcMgr.MessageSvc.OutputLevel < Constants.INFO:
from AthenaCommon.JobProperties import jobproperties
jobproperties.print_JobProperties('tree&value')
print(svcMgr)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
index 3dd2db8533559edaaad8134438514d3c18521751..e2752a8dcdfeba96e95041d573d167496a34cd65 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
@@ -70,7 +70,7 @@ def splitInterSignatureChainDict(chainDict):
if "mergingOrder" not in chainDict:
log.debug("No merging order given for chain %s.", chainDict['chainName'])
elif chainDict["mergingOrder"] == []:
- log.info("No merging order given for chain %s.", chainDict['chainName'])
+ log.debug("No merging order given for chain %s.", chainDict['chainName'])
else:
for chainPartName in chainDict["mergingOrder"]:
for splitChainDict in listOfSplitChainDicts:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
index cf91f5c6ff61d10e44636f1a817c94cb64472ee8..5664e5881d459434525d7a706ae69f3751817205 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
@@ -6,7 +6,7 @@ log = logging.getLogger( __name__ )
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep, EmptyMenuSequence, RecoFragmentsPool
from copy import deepcopy
-
+import re
def mergeChainDefs(listOfChainDefs, chainDict):
@@ -52,11 +52,10 @@ def mergeParallel(chainDefList, offset):
from itertools import izip_longest as zip_longest
# Use zip_longest so that we get None in case one chain has more steps than the other
orderedSteps = list(zip_longest(*allSteps))
- myOrderedSteps = deepcopy(orderedSteps)
combChainSteps =[]
- log.debug("len(myOrderedSteps): %d", len(myOrderedSteps))
- for step_index, steps in enumerate(myOrderedSteps):
+ log.debug("len(orderedSteps): %d", len(orderedSteps))
+ for step_index, steps in enumerate(orderedSteps):
mySteps = list(steps)
log.debug("Merging step counter %d", step_index+1)
combStep = makeCombinedStep(mySteps, step_index+1, chainDefList)
@@ -64,14 +63,18 @@ def mergeParallel(chainDefList, offset):
combinedChainDef = Chain(chainName, ChainSteps=combChainSteps, L1Thresholds=l1Thresholds)
- log.info("Parallel merged chain %s with these steps:", chainName)
+ log.debug("Parallel merged chain %s with these steps:", chainName)
for step in combinedChainDef.steps:
- log.info('\n %s', step)
+ log.debug('\n %s', step)
return combinedChainDef
def getEmptySeqName(stepName, chain_index, step_number):
- seqName = stepName + '_leg' + str(chain_index) + '_EmptySeqStep' + str(step_number)
+ #remove redundant instances of StepN
+ if re.search('^Step[0-9]_',stepName):
+ stepName = stepName[6:]
+
+ seqName = 'EmptySeq'+str(step_number)+ '_'+ stepName + '_leg' + str(chain_index)
return seqName
@@ -84,19 +87,19 @@ def serial_zip(allSteps, chainName):
newsteps = []
for chain_index, chainsteps in enumerate(allSteps):
for step_index, step in enumerate(chainsteps):
- log.info('chain_index: ' + str(chain_index) + " step_index: " + str(step_index))
+ log.debug('chain_index: ' + str(chain_index) + " step_index: " + str(step_index))
# create list of correct length
stepList = [None]*n_chains
# put the step from the current sub-chain into the right place
stepList[chain_index] = step
- log.info('Put step: ' + str(step.name))
+ log.debug('Put step: ' + str(step.name))
# all other steps should contain an empty sequence
for step_index2, emptyStep in enumerate(stepList):
if emptyStep is None:
seqName = getEmptySeqName(step.name, chain_index, step_index+1)
- emptySeq = RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqName)
+ emptySeq = RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqName)
stepList[step_index2] = ChainStep( seqName, Sequences=[emptySeq], chainDicts=step.chainDicts)
newsteps.append(stepList)
@@ -111,8 +114,8 @@ def mergeSerial(chainDefList):
chainName = ''
l1Thresholds = []
- log.info('Merge chainDefList:')
- log.info(chainDefList)
+ log.debug('Merge chainDefList:')
+ log.debug(chainDefList)
for cConfig in chainDefList:
if chainName == '':
@@ -141,17 +144,16 @@ def mergeSerial(chainDefList):
combinedChainDef = Chain(chainName, ChainSteps=combChainSteps, L1Thresholds=l1Thresholds)
- log.info("Serial merged chain %s with these steps:", chainName)
+ log.debug("Serial merged chain %s with these steps:", chainName)
for step in combinedChainDef.steps:
- log.info(' %s', step)
+ log.debug(' %s', step)
return combinedChainDef
def makeCombinedStep(steps, stepNumber, chainDefList):
- from copy import deepcopy
from TrigCompositeUtils.TrigCompositeUtils import legName
- stepName = 'merged_Step' + str(stepNumber)
+ stepName = 'merged' #we will renumber all steps after chains are aligned #Step' + str(stepNumber)
stepSeq = []
stepMult = []
log.verbose(" steps %s ", steps)
@@ -165,25 +167,30 @@ def makeCombinedStep(steps, stepNumber, chainDefList):
for chain_index, step in enumerate(steps):
if step is None:
# this happens for merging chains with different numbers of steps, we need to "pad" out with empty sequences to propogate the decisions
- currentStep = "Step" + str(stepNumber) + "_Empty" + str(chain_index)
- seqName = getEmptySeqName(currentStep, chain_index, stepNumber)
- log.info(" step %s, empty sequence %s", currentStep, seqName)
+ currentStepName = "Step" + str(stepNumber) + "_Empty" + str(chain_index)
+ seqName = getEmptySeqName(currentStepName, chain_index, stepNumber)
+ log.debug(" step %s, empty sequence %s", currentStepName, seqName)
emptySeq = RecoFragmentsPool.retrieve(getEmptyMenuSequence, flags=None, name=seqName)
+
+
stepSeq.append(emptySeq)
stepMult.append(1)
# we need a chain dict here, use the one corresponding to this leg of the chain
stepDicts.append(deepcopy(chainDefList[chain_index].steps[-1].chainDicts[-1]))
else:
# Standard step, append it to the combined step
- log.info(" step %s, multiplicity = %s", step.name, str(step.multiplicity))
+ log.debug(" step %s, multiplicity = %s", step.name, str(step.multiplicity))
if len(step.sequences):
- log.info(" with sequences = %s", ' '.join(map(str, [seq.name for seq in step.sequences])))
+ log.debug(" with sequences = %s", ' '.join(map(str, [seq.name for seq in step.sequences])))
# this function only works if the input chains are single-object chains (one menu seuqnce)
if len(step.sequences) > 1:
log.error("More than one menu sequence found in combined chain!!")
comboHypo = step.comboHypoCfg
- currentStep = step.name
+ currentStepName = step.name
+ #remove redundant instances of StepN_
+ if re.search('^Step[0-9]_',currentStepName):
+ currentStepName = currentStepName[6:]
if len(step.sequences):
seq = step.sequences[0]
@@ -193,10 +200,10 @@ def makeCombinedStep(steps, stepNumber, chainDefList):
comboHypoTools.extend(step.comboToolConfs)
# update the chain dict list for the combined step with the chain dict from this step
stepDicts += deepcopy(step.chainDicts)
-
- # the step naming for combined chains needs to be revisted!!
- stepName += '_' + currentStep
+
+ # the step naming for combined chains needs to be revisted!!
+ stepName += '_' + currentStepName
# for merged steps, we need to update the name to add the leg name
stepDicts[-1]['chainName'] = legName(stepDicts[-1]['chainName'], chain_index)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index fa7e32f0ef0bdcbafa21d4f8a94ed7d4403de4a2..3ad2a6e75e0030781b64dafb8d1bb3d660b1e7e5 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.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 PyUtils.Decorators import memoize
from six import add_metaclass
@@ -8,7 +8,7 @@ from AthenaCommon.AlgScheduler import AlgScheduler
AlgScheduler.ShowControlFlow( True )
AlgScheduler.ShowDataFlow( True )
-from TriggerJobOpts.TriggerFlags import TriggerFlags
+from TriggerJobOpts.TriggerFlags import TriggerFlags
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import makeHLTTree
@@ -16,14 +16,16 @@ from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import dictFromChainName
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitInterSignatureChainDict
from TriggerMenuMT.HLTMenuConfig.Menu.MenuPrescaleConfig import MenuPrescaleConfig
from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
-
-
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuAlignmentTools import analyseCombinations, groupSignatures, setChainSignatures
from AthenaCommon.Logging import logging
log = logging.getLogger( __name__ )
_func_to_modify_signatures = None
+
+
+
class Singleton(type):
_instances = {}
def __call__(cls, *args, **kwargs):
@@ -150,7 +152,7 @@ class GenerateMenuMT(object):
log.info("ReadingLVL1cofnigFromXML currently not implemented")
else:
log.info("Doing nothing with L1 menu configuration...")
-
+
@memoize
def generateAllChainConfigs(self):
"""
@@ -164,6 +166,10 @@ class GenerateMenuMT(object):
# decoding of the chain name
chainCounter = 0
+ all_chains = []
+ combinations_in_menu = []
+ signatures_to_align = set()
+ length_of_configs = {}
for chain in chainsInMenu:
log.debug("Now processing chain: %s ", chain)
chainDict = dictFromChainName(chain)
@@ -172,12 +178,171 @@ class GenerateMenuMT(object):
chainDict['chainCounter'] = chainCounter
log.debug("Next: getting chain configuration for chain %s ", chain.name)
- chainConfig= self.__generateChainConfig(chainDict)
-
- log.debug("Finished with retrieving chain configuration for chain %s", chain.name)
- TriggerConfigHLT.registerChain( chainDict, chainConfig )
-
-
+ chainConfig,lengthOfChainConfigs = self.__generateChainConfig(chainDict)
+
+ all_chains += [(chainDict,chainConfig,lengthOfChainConfigs)]
+
+ #update the signature length dictionary if we have a longer number of steps
+ #or the signature isn't registered in the dictionary yet
+ for config_length, config_sig in lengthOfChainConfigs:
+ if config_sig in length_of_configs:
+ if config_length > length_of_configs[config_sig]:
+ length_of_configs[config_sig] = config_length
+ else:
+ length_of_configs[config_sig] = config_length
+
+ # find the chains that contain more than one signature - what combinations do we need to deal with?
+ # using sets here so we don't end up with duplicates - though in the future this may have to be revisited
+ # if we split signatures into multiple types of algorithm
+ if len(set(chainDict['signatures'])) > 1:
+ combinations_in_menu += [list(set(chainDict['signatures']))]
+ for sig in list(set(chainDict['signatures'])):
+ signatures_to_align.update([sig])
+
+ #will likely always be true, but the grouping could be redefined
+ groupPeskySignatures = True
+
+ if groupPeskySignatures:
+ # do some replacing of Electron --> Egamma, Photon --> Egamma
+ # Jet/MET/b-jet --> JetMET
+ # B-physics chains are hard-coded as muon chains, since they run muons
+ # --> any B-->ee chains would need to be set as egamma!
+
+ # these modified signatures are only used for the aligning! We don't overwrite
+ # any of the signatures the chains are in.
+ combinations_in_menu,signatures_to_align,length_of_configs = groupSignatures(combinations_in_menu, signatures_to_align,length_of_configs)
+
+
+ #dict of signature: set it belongs to
+ #e.g. {'Electron': ['Electron','Muon','Photon']}
+ signature_sets_to_align = analyseCombinations(combinations_in_menu, signatures_to_align, doGroupSignatures = groupPeskySignatures)
+
+ log.debug('Aligning the following signatures with sets: %s',signature_sets_to_align)
+
+ for chainDict,chainConfig,lengthOfChainConfigs in all_chains:
+
+ # start by ordering electron, photon, muon by having e+mu, g+mu, e+g chains
+ # desired ordering: electron, photon, muon, tau, jet, met, b-jet
+
+ # lengthOfChainConfigs is something like this: [(4, 'Photon'), (5, 'Muon')]
+ # needs to match up with the maximum number of steps in a signature in the menu (length_of_configs)
+ # start with electron! Only need to add post-steps for combined electron chains if the max length in a combined chain
+ # is greater than the number of electron steps combined chain. Assume that the max length of an electron chain occurs
+ # in a combined chain.
+
+ signatures = chainDict['signatures']
+
+ if groupPeskySignatures:
+ signatures, lengthOfChainConfigs = setChainSignatures(signatures, lengthOfChainConfigs)
+
+ #parallel-merged single-signature chains or single signature chains. Anything that needs no splitting!
+ if len(set(signatures)) == 1:
+ if signatures[0] not in signature_sets_to_align or len(signature_sets_to_align[signatures[0]]) == 1:
+ # no need to align lonely signatures
+ # the latter condition should never happen, because we only put in signatures that are
+ # in combined chains, and thus will need *some* aligning. but good to check in any case.
+ log.debug("Finished with retrieving chain configuration for chain %s", chain.name)
+ chainConfig.numberAllSteps()
+ TriggerConfigHLT.registerChain( chainDict, chainConfig )
+ continue
+ elif signatures[0] == signature_sets_to_align[signatures[0]][0]:
+ # if it's the first chain in the set to be aligned, again - nothing to do here.
+ log.debug("Finished with retrieving chain configuration for chain %s", chain.name)
+ chainConfig.numberAllSteps()
+ TriggerConfigHLT.registerChain( chainDict, chainConfig )
+ continue
+ else:
+ # now we know that empty steps are necessary before this chain. we can loop through and add accordingly
+ # but we want to do this in reverse
+ the_align_sigs = signature_sets_to_align[signatures[0]][:signature_sets_to_align[signatures[0]].index(signatures[0])]
+ the_align_sigs.reverse()
+
+ for align_sig in the_align_sigs:
+ chainConfig.insertEmptySteps(chainDict,'Empty'+align_sig+'Align',length_of_configs[align_sig],0)
+
+ log.debug("Finished with retrieving chain configuration for chain %s", chain.name)
+ chainConfig.numberAllSteps()
+ TriggerConfigHLT.registerChain( chainDict, chainConfig )
+
+ elif len(signatures) == 2:
+ #check for a few bad conditions first:
+ if(signatures[0] not in signature_sets_to_align or signatures[1] not in signature_sets_to_align):
+ log.error(" one of the signatures in %s is not available in the sets to align dictionary!", signatures)
+ elif signature_sets_to_align[signatures[0]] != signature_sets_to_align[signatures[1]]:
+ log.error(" the two signatures %s point to different sets in the sets to align dictionary. Set1: %s, set2: %s!",
+ signatures, signature_sets_to_align[signatures[0]],signature_sets_to_align[signatures[1]])
+
+ if len(signature_sets_to_align[signatures[0]]) == 2:
+
+ # if the pair is on its own, then we just make sure the first signature's number
+ # of steps is equal to the max in that signature (so the next signature starts at the right step)
+
+ # not a dictionary because we could have a chain mu_jet_munoL1? Not sure. But don't want to
+ # overwrite duplicates yet.
+ # probably, at some point, will need to divide this beyond signature but instead as unique sequence within a signature.
+ # munoL1 is already one case...
+ length_firstsig = 0
+ max_length_firstsig = length_of_configs[signature_sets_to_align[signatures[0]][0]]
+ for config_length,config_sig in lengthOfChainConfigs:
+ if config_sig == signature_sets_to_align[signatures[0]][0]:
+ length_firstsig = config_length
+ if length_firstsig < max_length_firstsig:
+ #too short! gotta add padding steps between two signatures...
+ needed_steps = max_length_firstsig - length_firstsig
+ chainConfig.insertEmptySteps(chainDict,'Empty'+signature_sets_to_align[signatures[0]][0]+'Align',needed_steps,length_firstsig)
+
+ elif length_firstsig > max_length_firstsig:
+ log.error("%s first signature length %d is greater than the max calculated, %d",chainDict.name,length_firstsig, max_length_firstsig)
+
+ log.debug("Finished with retrieving chain configuration for chain %s", chain.name)
+ chainConfig.numberAllSteps()
+ TriggerConfigHLT.registerChain( chainDict, chainConfig )
+
+
+ #this should probably work for signatures > 2, but might be a few gotchas (and errors need updating)
+ if len(signature_sets_to_align[signatures[0]]) > 2:
+ if(signatures[0] not in signature_sets_to_align or signatures[1] not in signature_sets_to_align):
+ log.error(" one of the signatures in %s is not available in the sets to align dictionary!", signatures)
+ elif signature_sets_to_align[signatures[0]] != signature_sets_to_align[signatures[1]]:
+ log.error(" the two signatures %s point to different sets in the sets to align dictionary. Set1: %s, set2: %s!",
+ signatures, signature_sets_to_align[signatures[0]], signature_sets_to_align[signatures[1]])
+
+ # we need to know which signatures are in the chain in which order. Assume this is always stored correctly.
+ # (this should be true)
+
+ # never need to align the last chain - it can end a different length, no problem.
+ # ignore any signatures after the end of those in this chain
+
+ the_align_sigs = signature_sets_to_align[signatures[1]][:signature_sets_to_align[signatures[1]].index(signatures[1])]
+ the_align_sigs.reverse()
+
+ for align_sig in the_align_sigs:
+ max_length_sig = length_of_configs[align_sig]
+ if align_sig in signatures:
+ length_sig = 0
+ for config_length,config_sig in lengthOfChainConfigs:
+ if config_sig == align_sig:
+ length_sig = config_length
+ if length_sig < max_length_sig:
+ #too short! gotta add padding steps between two signatures...
+ needed_steps = max_length_sig - length_sig
+ chainConfig.insertEmptySteps(chainDict,'Empty'+align_sig+'Align',needed_steps,length_sig)
+ else:
+ # this sig isn't in the chain, but we still will need empty steps for it
+ # always add them to the start, because we're running in reverse order
+ chainConfig.insertEmptySteps(chainDict,'Empty'+align_sig+'Align',length_of_configs[align_sig],0)
+
+ log.debug("Finished with retrieving chain configuration for chain %s", chain.name)
+ chainConfig.numberAllSteps()
+ TriggerConfigHLT.registerChain( chainDict, chainConfig )
+
+ else:
+ log.error("Menu can't deal with combined chains with more than two signatures at the moment. oops...")
+
+ if not TriggerConfigHLT.isChainRegistered(chainDict['chainName']):
+ log.error("Chain %s has not been registered in the menu!", chainDict['chainName'])
+
+
return TriggerConfigHLT.configsList()
@memoize
@@ -274,6 +439,7 @@ class GenerateMenuMT(object):
# Loop over all chainDicts and send them off to their respective assembly code
listOfChainConfigs = []
+ lengthOfChainConfigs = []
for chainDict in chainDicts:
chainConfigs = None
@@ -300,6 +466,7 @@ class GenerateMenuMT(object):
else:
log.error('Chain %s ignored - Signature not available', chainDict['chainName'])
listOfChainConfigs.append(chainConfigs)
+ lengthOfChainConfigs.append((len(chainConfigs.steps),currentSig))
## if log.isEnabledFor(logging.DEBUG):
## import pprint
@@ -332,7 +499,7 @@ class GenerateMenuMT(object):
addEventBuildingSequence(theChainConfig, eventBuildType)
log.debug('ChainConfigs %s ', theChainConfig)
- return theChainConfig
+ return theChainConfig,lengthOfChainConfigs
@memoize
def generateMT(self):
@@ -358,10 +525,10 @@ class GenerateMenuMT(object):
log.debug("finalListOfChainConfig %s", finalListOfChainConfigs)
for cc in finalListOfChainConfigs:
- log.debug('ChainName %s', cc.name)
- log.debug(' ChainSteps %s', cc.steps)
+ log.info('ChainName %s', cc.name)
+ log.info(' ChainSteps %s', cc.steps)
for step in cc.steps:
- log.debug(step)
+ log.info(step)
makeHLTTree(newJO=False, triggerConfigHLT = TriggerConfigHLT)
# the return values used for debugging, might be removed later
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
index 1d39d07b34b3256d827d232c9ab449c8a957c8ea..8374df12dd59a39ad6a5c54b0209ab787b203508 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
@@ -330,7 +330,7 @@ def createDataFlow(chains, allDicts):
# loop over chains
for chain in chains:
- log.info("\n Configuring chain %s with %d steps: \n - %s ", chain.name,len(chain.steps),'\n - '.join(map(str, [{step.name:step.multiplicity} for step in chain.steps])))
+ log.debug("\n Configuring chain %s with %d steps: \n - %s ", chain.name,len(chain.steps),'\n - '.join(map(str, [{step.name:step.multiplicity} for step in chain.steps])))
lastCFseq = None
for nstep, chainStep in enumerate( chain.steps ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
index e936754bc87aff643c94f210fea5162098e8337b..4a8fa7f68983d7793361bea0f79cb0167ccfaf7a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig_newJO.py
@@ -4,7 +4,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import isInputMakerBase, isHypoBase
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import isInputMakerBase, isHypoBase, isComboHypoAlg
from AthenaCommon.CFElements import parOR, seqAND, findAllAlgorithms
from AthenaCommon.Logging import logging
log = logging.getLogger( __name__ )
@@ -93,6 +93,20 @@ def generateDecisionTree(chains):
return alg
raise Exception("No input maker in seq "+seq.name)
+ @memoize
+ def findAllInputMakers( stepCounter, stepName ):
+ seq = getSingleMenuSeq( stepCounter, stepName )
+ algs = findAllAlgorithms( seq )
+ result = []
+ for alg in algs:
+ if isInputMakerBase(alg):
+ result.append(alg)
+
+ if result:
+ return result
+ else:
+ raise Exception("No input maker in seq "+seq.name)
+
@memoize
def findHypoAlg( stepCounter, stepName ):
seq = getSingleMenuSeq( stepCounter, stepName )
@@ -102,6 +116,29 @@ def generateDecisionTree(chains):
return alg
raise Exception("No hypo alg in seq "+seq.name)
+ @memoize
+ def findAllHypoAlgs( stepCounter, stepName ):
+ seq = getSingleMenuSeq( stepCounter, stepName )
+ algs = findAllAlgorithms( seq )
+ result = []
+ for alg in algs:
+ if isHypoBase(alg):
+ result.append(alg)
+
+ if result:
+ return result
+ else:
+ raise Exception("No hypo alg in seq "+seq.name)
+
+ @memoize
+ def findComboHypoAlg( stepCounter, stepName ):
+ seq = getSingleMenuSeq( stepCounter, stepName )
+ algs = findAllAlgorithms( seq )
+ for alg in algs:
+ if isComboHypoAlg(alg):
+ return alg
+ raise Exception("No combo hypo alg in seq "+seq.name)
+
def addAndAssureUniqness( prop, toadd, context="" ):
if toadd not in prop:
log.info("{} value {} not there".format(context, toadd))
@@ -120,13 +157,44 @@ def generateDecisionTree(chains):
raise Exception("{}, when setting property found conflicting values, existing {} and new {}".format(context, prop, toadd))
- #create all sequences and filter algs, merge CAs from signatures (decision CF)
+ # create all sequences and filter algs, merge CAs from signatures (decision CF)
for chain in chains:
for stepCounter, step in enumerate( chain.steps, 1 ):
- for sequence in step.sequences:
- getFilterAlg( stepCounter, step.name )
- recoSeqName = getSingleMenuSeq( stepCounter, step.name ).name
- acc.merge( sequence.ca, sequenceName=recoSeqName )
+ getFilterAlg( stepCounter, step.name )
+ recoSeqName = getSingleMenuSeq( stepCounter, step.name ).name
+
+ if step.isCombo:
+ # add merged reco sequence
+ stepRecoName = step.name + CFNaming.RECO_POSTFIX
+ stepViewName = step.name + CFNaming.VIEW_POSTFIX
+
+ acc.addSequence( seqAND(stepViewName), parentName=recoSeqName )
+ acc.addSequence( parOR(stepRecoName), parentName=stepViewName )
+
+ for sequence in step.sequences:
+ for stepView in sequence.ca.getSequence().Members:
+ for viewMember in stepView.Members:
+ if isHypoBase(viewMember):
+ # add hypo alg to view sequence
+ acc.addEventAlgo( viewMember, sequenceName=stepViewName )
+ else:
+ # add reco sequence to merged _reco
+ for recoAlg in viewMember.Members:
+ acc.addSequence( recoAlg, parentName=stepRecoName )
+
+ # elements from ca were moved above to the appropriate sequences
+ # so sequence and algorithms are considered as merged
+ sequence.ca._algorithms = {}
+ sequence.ca._sequence.Members = []
+ acc.merge(sequence.ca, sequenceName=recoSeqName)
+
+ # create combo hypo
+ comboHypo = CompFactory.ComboHypo( step.combo.Alg.getName() )
+ acc.addEventAlgo( comboHypo, sequenceName=stepViewName )
+
+ else:
+ acc.merge( step.sequences[0].ca, sequenceName=recoSeqName )
+
# cleanup settings made by Chain & related objects (can be removed in the future)
for chain in chains:
@@ -135,13 +203,22 @@ def generateDecisionTree(chains):
filterAlg.Input = []
filterAlg.Output = []
- imAlg = findInputMaker( stepCounter, step.name )
- imAlg.InputMakerInputDecisions = []
- imAlg.InputMakerOutputDecisions = ""
+ imAlgs = findAllInputMakers( stepCounter, step.name )
+ for imAlg in imAlgs:
+ imAlg.InputMakerInputDecisions = []
+ imAlg.InputMakerOutputDecisions = ""
+
+ hypoAlgs = findAllHypoAlgs( stepCounter, step.name )
+ for hypoAlg in hypoAlgs:
+ hypoAlg.HypoInputDecisions = ""
+ hypoAlg.HypoOutputDecisions = ""
+
+ if step.isCombo:
+ comboHypoAlg = findComboHypoAlg( stepCounter, step.name )
+ comboHypoAlg.MultiplicitiesMap = {}
+ comboHypoAlg.HypoInputDecisions = []
+ comboHypoAlg.HypoOutputDecisions = []
- hypoAlg = findHypoAlg( stepCounter, step.name )
- hypoAlg.HypoInputDecisions = ""
- hypoAlg.HypoOutputDecisions = ""
# connect all outputs (decision DF)
for chain in chains:
@@ -150,7 +227,11 @@ def generateDecisionTree(chains):
# Filters linking
filterAlg = getFilterAlg( stepCounter, step.name )
- filterAlg.Chains = addAndAssureUniqness( filterAlg.Chains, chain.name, "{} filter alg chains".format( filterAlg.name ) )
+ if step.isCombo:
+ chainDictLegs = ' '.join(map(str, [dic['chainName'] for dic in step.chainDicts]))
+ filterAlg.Chains = addAndAssureUniqness( filterAlg.Chains, chainDictLegs, "{} filter alg chains".format( filterAlg.name ) )
+ else:
+ filterAlg.Chains = addAndAssureUniqness( filterAlg.Chains, chain.name, "{} filter alg chains".format( filterAlg.name ) )
if stepCounter == 1:
filterAlg.Input = addAndAssureUniqness( filterAlg.Input, chain.L1decisions[0], "{} L1 input".format( filterAlg.name ) )
@@ -159,7 +240,7 @@ def generateDecisionTree(chains):
filterAlg.Input = addAndAssureUniqness( filterAlg.Input, hypoOutput, "{} input".format( filterAlg.name ) )
# Input Maker linking
- im = findInputMaker( stepCounter, step.name )
+ im = findAllInputMakers( stepCounter, step.name )[seqCounter]
for i in filterAlg.Input:
filterOutputName = CFNaming.filterOutName( filterAlg.name, i )
filterAlg.Output = addAndAssureUniqness( filterAlg.Output, filterOutputName, "{} output".format( filterAlg.name ) )
@@ -167,8 +248,9 @@ def generateDecisionTree(chains):
imOutputName = CFNaming.inputMakerOutName( im.name )
im.InputMakerOutputDecisions = assureUnsetOrTheSame( im.InputMakerOutputDecisions, imOutputName, "{} IM output".format( im.name ) )
+
# Hypo linking
- hypoAlg = findHypoAlg( stepCounter, step.name )
+ hypoAlg = findAllHypoAlgs( stepCounter, step.name )[seqCounter]
hypoAlg.HypoInputDecisions = assureUnsetOrTheSame( hypoAlg.HypoInputDecisions, im.InputMakerOutputDecisions,
"{} hypo input".format( hypoAlg.name ) )
hypoOutName = CFNaming.hypoAlgOutName( hypoAlg.name )
@@ -186,6 +268,24 @@ def generateDecisionTree(chains):
else:
hypoAlg.HypoTools.append( sequence._hypoToolConf.confAndCreate( TriggerConfigHLT.getChainDictFromChainName( chain.name ) ) )
+ # Combo Hypo linking
+ if step.isCombo:
+ comboHypoAlg = findComboHypoAlg( stepCounter, step.name )
+ comboHypoAlg.MultiplicitiesMap[chain.name] = step.multiplicity
+
+ comboInputList = findAllHypoAlgs( stepCounter, step.name )
+ for comboInput in comboInputList:
+ comboHypoAlg.HypoInputDecisions = addAndAssureUniqness( comboHypoAlg.HypoInputDecisions, comboInput.name,
+ "{} comboHypo input".format( comboHypoAlg.name ) )
+
+ comboOutName = CFNaming.comboHypoOutputName( comboHypoAlg.name, comboInput.name )
+ comboHypoAlg.HypoOutputDecisions = addAndAssureUniqness( comboHypoAlg.HypoOutputDecisions, comboOutName,
+ "{} comboHypo output".format( comboHypoAlg.name ) )
+
+ # Combo Hypo Tools
+ for comboToolConf in step.comboToolConfs:
+ comboHypoAlg.ComboHypoTools.append( comboToolConf.confAndCreate( TriggerConfigHLT.getChainDictFromChainName( chain.name ) ) )
+
for chain in chains:
for stepCounter, step in enumerate( chain.steps, 1 ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
index ef8e0e1988fc62522ac2aa73e93414ccaeaac2ef..1945ec1794156d86e821bb9aef67eb2eff1dc4f4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_emu_v1.py
@@ -24,6 +24,7 @@ def setupMenu():
# be aware that it is necessary to leave at least one chain in the muon slice
# otherwise athenaHLT will seg-fault
#---------------------------------------------------------------------
+
log = logging.getLogger( __name__ )
log.info('Executing menu....')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 0fdbdb8ba949b608f186600a6bc18463322fe6e2..98a597cd13611207dc29896ab367985f5880ae34 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -233,8 +233,8 @@ def setupMenu():
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),
-
]
+
TriggerFlags.BphysicsSlice.signatures = TriggerFlags.BphysicsSlice.signatures() + [
#ATR-20603
ChainProp(name='HLT_2mu4_bJpsimumu_L12MU4', groups=BphysicsGroup),
@@ -242,16 +242,26 @@ def setupMenu():
#ATR-20839
ChainProp(name='HLT_2mu4_bDimu_L12MU4', groups=BphysicsGroup),
]
+
TriggerFlags.CombinedSlice.signatures = TriggerFlags.CombinedSlice.signatures() + [
# groups need to be properly assigned here later
- # Test chain that is using parallel merging with different number of steps
- ChainProp(name='HLT_e3_etcut1step_mu26_L1EM8I_MU10', l1SeedThresholds=['EM8I', 'MU10'], stream=[PhysicsStream], groups=MultiElectronGroup),
+ # 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'], stream=[PhysicsStream], groups=MultiElectronGroup),
- ChainProp(name='HLT_e7_lhmedium_mu24_L1MU20',l1SeedThresholds=['EM3','MU20'], stream=[PhysicsStream], groups=MultiElectronGroup),
+ 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),
# Test photon-muon chain (isolation is there to have different number of steps)
- ChainProp(name='HLT_g25_medium_mu24_ivarmedium_L1MU20',l1SeedThresholds=['EM15VH','MU20'], stream=[PhysicsStream], groups=MultiElectronGroup),
+ ChainProp(name='HLT_g25_medium_mu24_ivarmedium_L1MU20',l1SeedThresholds=['EM15VH','MU20'], mergingStrategy='serial', stream=[PhysicsStream], groups=MultiElectronGroup),
+
+ # electron + photon stay in the same step - these need to be parallel merged!
+ ChainProp(name='HLT_e3_etcut1step_g5_etcut_L12EM3',l1SeedThresholds=['EM3','EM3'], mergingStrategy='parallel', stream=[PhysicsStream], groups=MultiElectronGroup),
+
+ # Test chains for muon + jet/MET merging/aligning
+ ChainProp(name='HLT_mu6fast_xe30_mht_L1XE10', l1SeedThresholds=['MU6','XE10'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup),
+ ChainProp(name='HLT_mu6fast_j45_nojcalib_L1J20', l1SeedThresholds=['MU6','J20'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup),
+
+
]
TriggerFlags.HeavyIonSlice.signatures = TriggerFlags.HeavyIonSlice.signatures() + []
TriggerFlags.BeamspotSlice.signatures = TriggerFlags.BeamspotSlice.signatures() + [
@@ -284,6 +294,7 @@ def setupMenu():
# Random Seeded EB chains which select at the HLT based on L1 TBP bits
TriggerFlags.EnhancedBiasSlice.signatures = TriggerFlags.EnhancedBiasSlice.signatures() + [ ]
+
addSliceChainsToPrescales(TriggerFlags, Prescales.HLTPrescales_cosmics)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
index a729b66262cf3bca0108d729ae90d29d2b9d8ced..24f9c763c64d311622e145ab523c2e512e0a5199 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1_newJO.py
@@ -61,8 +61,7 @@ def setupMenu(flags):
]
flags.Trigger.menu.combined = [
-# ChainProp(name='HLT_e7_mu10_L1EM7_MU10', groups=SingleElectronGroup),
-# ChainProp(name='HLT_e5_mu5_L1EM7_MU10', groups=SingleElectronGroup),
+ ChainProp(name='HLT_e7_mu10_L1EM7_MU10', groups=SingleElectronGroup)
]
if __name__ == "__main__":
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
new file mode 100644
index 0000000000000000000000000000000000000000..42273176c43f246d61bc3387c791679822f1ee61
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuAlignmentTools.py
@@ -0,0 +1,146 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+import numpy as np
+from collections import OrderedDict
+from AthenaCommon.Logging import logging
+log = logging.getLogger( __name__ )
+
+# Warning: If the grouping of signatures changes in *one* of these functions,
+# it needs to change in ALL of them
+# They should all group using the same dictionary
+
+# The ordering here is VERY important - a set made from the keys will define the order the
+# chains will run in!
+# have to use OrderedDict because ordering is not preserved in a standard dictionary!
+the_signature_grouping = OrderedDict([
+ ('Electron', 'Egamma'),
+ ('Photon' , 'Egamma'),
+ ('Muon' , 'Muon'),
+ ('Bphysics', 'Muon'),
+ ('Tau','Tau'),
+ ('Jet','JetMET'),
+ ('MET','JetMET'),
+ ('Bjet','JetMET'),
+ ])
+
+# Here, we use a list of all the signature combinations in the menu and the signature
+# groupings/orderings we've defined in the_signature_grouping to calculate which signatures
+# need to be ordered compared to which others.
+# The function returns a dictionary of an ordered list of signatures each signature belongs to
+# e.g. 'Muon' : ['Egamma','Muon']
+def analyseCombinations(combinations_in_menu, signatures_in_combinations, doGroupSignatures = True):
+
+ # need to find out of if a signature, or anything in combination with that signature,
+ # is in combination with any other signature
+ # 1 electron, 2 photon, 3 muon, 4 tau, 5 jet, 6 met, 7 b-jet, 8 B-physics
+ # but some of these share input makers and algorithms, so they need to be grouped!
+ # alternatively, the IMs/signatures/etc. could have their names unique for each signature
+ sig_dict = {"Electron":0,"Photon":1,"Muon":2,"Tau":3,"Jet":4,"MET":5,"Bjet":6,"Bphysics":7}
+
+ # Egamma = Electron+Photon, JetMET = Jet/MET/Bjet shared for now, because they share an input maker!
+ # HT chain are (will be) part of the jet signature.
+ if doGroupSignatures:
+ seen = set()
+ sig_dict = dict((x,len(seen)-1) for x in the_signature_grouping.values() if not (x in seen or seen.add(x)))
+ log.debug('Grouping of signatures to align: %s',sig_dict)
+ inv_sig_dict = {v: k for k, v in sig_dict.items()}
+
+ the_matrix = np.eye((len(sig_dict)))
+
+ for comb in combinations_in_menu:
+ if len(comb) > 2:
+ log.error("Not setup for chains with more than two signatures yet!")
+ else:
+ the_matrix[sig_dict[comb[0]]][sig_dict[comb[1]]] = 1
+ the_matrix[sig_dict[comb[1]]][sig_dict[comb[0]]] = 1
+
+ _,eigenvecs = np.linalg.eig(the_matrix)
+ # eigenvecs: The normalized (unit length) eigenvectors, such that the column v[:,i]
+ # is the eigenvector corresponding to the eigenvalue w[i].
+ # so we do the transpose!
+ eigenvecs = np.transpose(eigenvecs)
+
+ # find the indices filled by each eigenvector, and make a unique list of these
+ pre_unique_sets = list(set([tuple(np.nonzero(eigenvec)[0]) for eigenvec in eigenvecs]))
+
+ # remove any that are subsets of another (e.g. because something like (1,1,1), (1,-1,1),(0,1,1)
+ # could be an answer but (0,1,1) clearly is not spanning a unique subspace from (1,1,1))
+ unique_sets = []
+ for aset in pre_unique_sets:
+ if len(unique_sets) == 0 :
+ unique_sets +=[aset]
+ else:
+ inlist = True
+ for ibset,bset in enumerate(unique_sets):
+ if aset == bset:
+ continue
+ elif set(aset).issubset(set(bset)):
+ continue
+ elif set(bset).issubset(set(aset)):
+ unique_sets.pop(ibset)
+ unique_sets += [aset]
+ else:
+ inlist = False
+ if not inlist:
+ unique_sets +=[aset]
+
+ # convert the indices back to actual signature names
+ unique_by_sig = [[ inv_sig_dict[sig_int] for sig_int in setlist ] for setlist in unique_sets]
+
+ sig_to_set = {}
+ for sig in signatures_in_combinations:
+ for aset in unique_by_sig:
+ if sig in aset:
+ sig_to_set[sig] = aset
+
+ return sig_to_set
+
+# redefine the various signature lists/dicts to use the grouped signatures (e.g. not
+# electron, photon but instead egamma)
+def groupSignatures(combinations_in_menu, signatures_to_align, length_of_configs):
+ for icomb,comb in enumerate(combinations_in_menu):
+ if any([acomb in the_signature_grouping for acomb in comb]):
+ tmpcomb = []
+ for asig in comb:
+ if asig in the_signature_grouping:
+ tmpcomb += [the_signature_grouping[asig]]
+ else:
+ # not sure this could come up - but if we have something random like minbias + muon chains?
+ tmpcomb += [asig]
+
+ combinations_in_menu[icomb] = tmpcomb
+
+ signatures_to_align = list(signatures_to_align) #was a set, make a list!
+ for isig, asig in enumerate(signatures_to_align):
+ if asig in the_signature_grouping:
+ signatures_to_align[isig] = the_signature_grouping[asig]
+
+ signatures_to_align = list(set(signatures_to_align)) #get rid of duplicates
+
+ log.debug('Signatures that are going to be aligned: %s',signatures_to_align)
+ log.debug('Signature combinations that are in the menu: %s',combinations_in_menu)
+
+ for newsig in set(the_signature_grouping.values()):
+ if newsig not in length_of_configs:
+ # get all the signatures in the new sig:
+ corresponding_sig_lengths = [length_of_configs.get(oldsig,0) for oldsig in the_signature_grouping if the_signature_grouping[oldsig] == newsig]
+ length_of_configs[newsig] = max(corresponding_sig_lengths)
+
+ return combinations_in_menu, signatures_to_align, length_of_configs
+
+# takes the list of signatures in a chain and changes it to be the post-grouping signatures
+# e.g. ['Electron','Muon'] ==> ['Egamma','Muon]
+def setChainSignatures(signatures, lengthOfChainConfigs):
+
+ for i, asig in enumerate(signatures):
+ if asig in the_signature_grouping:
+ signatures[i] = the_signature_grouping[asig]
+
+ # this will be funny for e.g. Electron-Photon chains, or others grouped together
+ # but we won't use this for these chains so it's ok
+ for iCC,(config_length,asig) in enumerate(lengthOfChainConfigs):
+ if asig in the_signature_grouping:
+ lengthOfChainConfigs[iCC] = (config_length,the_signature_grouping[asig])
+ # else it'll be a signature that doesn't need aligning, like beamspot or something.
+ # maybe they should all be added to the_signature_grouping, even if they never
+ # need to be merged together
+ return signatures, lengthOfChainConfigs
\ No newline at end of file
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 7668d2ebc2a20d595d6cb3efda23ef55926d0734..de4c92295ad723e622c33bba2e45d109ff7a28fb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -317,14 +317,14 @@ class EmptyMenuSequence(object):
""" Class to emulate reco sequences with no Hypo"""
""" By construction it has no Hypo;"""
- def __init__(self, name):
- self._name = name
- Maker = CompFactory.InputMakerForRoI("IM"+name)
+ def __init__(self, the_name):
+ self._name = the_name
+ Maker = CompFactory.InputMakerForRoI("IM"+the_name)
Maker.RoITool = CompFactory.ViewCreatorInitialROITool()
self._maker = InputMakerNode( Alg = Maker )
self._seed=''
- self._sequence = Node( Alg = seqAND(name, [Maker]))
- log.debug("Made EmptySequence %s",name)
+ self._sequence = Node( Alg = seqAND(the_name, [Maker]))
+ log.debug("Made EmptySequence %s",the_name)
@property
def sequence(self):
@@ -377,9 +377,7 @@ class EmptyMenuSequence(object):
def __repr__(self):
return "MenuSequence::%s \n Hypo::%s \n Maker::%s \n Sequence::%s \n HypoTool::%s\n"\
- %(self.name(), "Empty", self._maker.Alg.getName(), self.sequence.Alg.getName(), "None")
-
-
+ %(self.name, "Empty", self._maker.Alg.getName(), self.sequence.Alg.getName(), "None")
class MenuSequence(object):
""" Class to group reco sequences with the Hypo"""
@@ -641,6 +639,7 @@ class Chain(object):
"""
self.name = name
self.steps=ChainSteps
+
self.vseeds=L1Thresholds
from L1Decoder.L1DecoderConfig import mapThresholdToL1DecisionCollection
@@ -658,6 +657,57 @@ class Chain(object):
log.debug("Made %s Chain %s with seeds: %s ", "combo" if isCombo else "", name, self.L1decisions)
+ def numberAllSteps(self):
+ if len(self.steps)==0:
+ return
+ else:
+ import re
+ for stepID,step in enumerate(self.steps):
+ step_name = step.name
+ if re.search('^Step[0-9]_',step_name):
+ step_name = step_name[6:]
+ step.name = 'Step%d_'%(stepID+1)+step_name
+ return
+
+ def insertEmptySteps(self, chainDict, empty_step_name, n_new_steps, start_position):
+ #start position indexed from 0. if start position is 3 and length is 2, it works like:
+ # [old1,old2,old3,old4,old5,old6] ==> [old1,old2,old3,empty1,empty2,old4,old5,old6]
+ import re
+
+ if len(self.steps) == 0 :
+ log.error("I can't insert empty steps because the chain doesn't have any steps yet!")
+
+ if len(self.steps) < start_position :
+ log.error("I can't insert empty steps at step %d because the chain doesn't have that many steps!", start_position)
+
+
+ chain_steps_pre_split = self.steps[:start_position]
+ chain_steps_post_split = self.steps[start_position:]
+
+ next_step_name = ''
+ prev_step_name = ''
+ if start_position == 0:
+ next_step_name = chain_steps_post_split[0].name
+ if re.search('^Step[0-9]_',next_step_name):
+ next_step_name = next_step_name[6:]
+ prev_step_name = 'empty_'+str(len(self.L1decisions))+'L1in'
+ else:
+ if len(chain_steps_post_split) == 0:
+ log.error("Adding empty steps to the end of a chain - why would you do this?")
+ else:
+ prev_step_name = chain_steps_pre_split[-1].name
+ next_step_name = chain_steps_post_split[0].name
+
+ steps_to_add = []
+ for stepID in range(1,n_new_steps+1):
+ new_step_name = prev_step_name+'_'+empty_step_name+'%d_'%stepID+next_step_name
+
+ log.debug("Configuring empty step " + new_step_name)
+ steps_to_add += [ChainStep(new_step_name, [], [], [chainDict], comboHypoCfg=ComboHypoCfg)]
+
+ self.steps = chain_steps_pre_split + steps_to_add + chain_steps_post_split
+
+ return
def checkMultiplicity(self):
if len(self.steps) == 0:
@@ -716,18 +766,18 @@ class Chain(object):
if len(step.chainDicts) > 0:
# new way to configure hypo tools, works if the chain dictionaries have been attached to the steps
- log.info('%s in new hypo tool creation method, step mult= %d, isCombo=%d', self.name, sum(step.multiplicity), step.isCombo)
- log.info("N(seq)=%d, N(chainDicts)=%d", len(step.sequences), len(step.chainDicts))
+ log.debug('%s in new hypo tool creation method, step mult= %d, isCombo=%d', self.name, sum(step.multiplicity), step.isCombo)
+ log.debug("N(seq)=%d, N(chainDicts)=%d", len(step.sequences), len(step.chainDicts))
assert len(step.sequences)==len(step.chainDicts), "createHypoTools only makes sense if number of sequences == number of chain dicts"
for seq, onePartChainDict in zip(step.sequences, step.chainDicts):
- log.info(' seq: %s, onePartChainDict:', seq.name)
- log.info(' ' + str(onePartChainDict))
+ log.debug(' seq: %s, onePartChainDict:', seq.name)
+ log.debug(' ' + str(onePartChainDict))
seq.createHypoTools( onePartChainDict )
else:
# legacy way, to be removed once all signatures pass the chainDicts to the steps
step_mult = [str(m) for m in step.multiplicity]
- log.info('%s in old hypo tool creation method', self.name)
+ log.debug('%s in old hypo tool creation method', self.name)
menu_mult = [ part['chainParts'][0]['multiplicity'] for part in listOfChainDictsLegs ]
if step_mult != menu_mult:
# Probably this shouldn't happen, but it currently does
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 22b06fb939072ceadc278e6d91c25ed850790d55..cfd244c609fefc64058e5d928d65eddf827375b4 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'], 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/TriggerConfigHLT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py
index 64b6a9697c703b73ba904d29e045f007463a32a1..f38ec5923883904704c02bea0145d6539de4b8fd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/TriggerConfigHLT.py
@@ -34,6 +34,12 @@ class TriggerConfigHLT(object):
cls.__allChainDicts[chainDict['chainName']] = chainDict
log.debug("Registered chain %s", chainConfig.name )
+ @classmethod
+ def isChainRegistered(cls, chainName):
+ if chainName in cls.__allChainDicts:
+ return True
+ return False
+
@classmethod
def dicts(cls):
return cls.__allChainDicts
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
index e3b0f4093020fe0b36bd5e45841e7620fc169fb6..9c0fc82c8dea356d11a51909f994fc9aff742777 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/generateMuon.py
@@ -25,7 +25,9 @@ def EFMuonViewDataVerifierCfg():
( 'Muon::TgcPrepDataContainer' , 'StoreGateSvc+TGC_Measurements' ),
( 'Muon::RpcPrepDataContainer' , 'StoreGateSvc+RPC_Measurements' ),
( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ),
- ( 'Muon::CscPrepDataContainer' , 'StoreGateSvc+CSC_Clusters' )]
+ ( 'Muon::CscPrepDataContainer' , 'StoreGateSvc+CSC_Clusters' ),
+ ( 'Trk::SolenoidParametrization' , 'ConditionStore+SolenoidParametrization' ) #TODO schedule the correct condAlg to produce this
+ ]
result = ComponentAccumulator()
result.addEventAlgo(EFMuonViewDataVerifier)
return result
@@ -46,6 +48,62 @@ def MuFastViewDataVerifier():
result.addEventAlgo(alg)
return result
+#Not the ideal place to keep the track cnv alg configuration. Temproarily adding it here
+#until a better location can be found
+def MuonTrackCollectionCnvToolCfg(flags, name = "MuonTrackCollectionCnvTool", **kwargs):
+ TrackCollectionCnvTool = CompFactory.xAODMaker.TrackCollectionCnvTool
+
+ result = ComponentAccumulator()
+ from MuonCombinedConfig.MuonCombinedRecToolsConfig import MuonCombinedParticleCreatorCfg
+ acc = MuonCombinedParticleCreatorCfg(flags)
+ kwargs.setdefault("TrackParticleCreator", acc.popPrivateTools())
+ result.merge(acc)
+
+ result.setPrivateTools(TrackCollectionCnvTool(name=name, **kwargs))
+ return result
+
+def MuonRecTrackParticleContainerCnvToolCfg(flags, name = "MuonRecTrackParticleContainerCnvTool", **kwargs):
+ RecTrackParticleCnvTool = CompFactory.xAODMaker.RecTrackParticleContainerCnvTool
+
+ result = ComponentAccumulator()
+ from MuonCombinedConfig.MuonCombinedRecToolsConfig import MuonCombinedParticleCreatorCfg
+ acc = MuonCombinedParticleCreatorCfg(flags)
+ kwargs.setdefault("TrackParticleCreator", acc.popPrivateTools())
+ result.merge(acc)
+
+ result.setPrivateTools(RecTrackParticleCnvTool(name=name, **kwargs))
+ return result
+
+def MuonTrackParticleCnvCfg(flags, name = "MuonTrackParticleCnvAlg",**kwargs):
+ TrackParticleCnv = CompFactory.xAODMaker.TrackParticleCnvAlg
+ result=ComponentAccumulator()
+
+ from MuonCombinedConfig.MuonCombinedRecToolsConfig import MuonCombinedParticleCreatorCfg
+ acc = MuonCombinedParticleCreatorCfg(flags)
+ kwargs.setdefault("TrackParticleCreator", acc.popPrivateTools())
+ result.merge(acc)
+
+ acc = MuonTrackCollectionCnvToolCfg(flags)
+ kwargs.setdefault("TrackCollectionCnvTool", acc.popPrivateTools())
+ result.merge(acc)
+
+ acc = MuonRecTrackParticleContainerCnvToolCfg(flags)
+ kwargs.setdefault("RecTrackParticleContainerCnvTool", acc.popPrivateTools())
+ result.merge(acc)
+
+ kwargs.setdefault("TrackContainerName", "MuonSpectrometerTracks")
+ kwargs.setdefault("xAODTrackParticlesFromTracksContainerName", "MuonSpectrometerTrackParticles")
+ kwargs.setdefault("AODContainerName", "")
+ kwargs.setdefault("AODTruthContainerName", "")
+ kwargs.setdefault("xAODTruthLinkVector", "")
+ kwargs.setdefault("ConvertTrackParticles", False)
+ kwargs.setdefault("ConvertTracks", True)
+
+ trackcnv = TrackParticleCnv(name=name, **kwargs )
+
+ result.addEventAlgo( trackcnv, primary=True )
+ return result
+
def generateChains( flags, chainDict ):
chainDict = splitChainDict(chainDict)[0]
@@ -179,10 +237,16 @@ def generateChains( flags, chainDict ):
trkCfg = MuonTrackBuildingCfg(muonflags, name="TrigMuPatTrackBuilder")
recoMS.mergeReco(trkCfg)
- #The MuonCandidateAlg is not quite fully working yet
- #from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedMuonCandidateAlgCfg
- #candCfg = MuonCombinedMuonCandidateAlgCfg(muonflags, name = "TrigMuonCandidateAlg")
- #recoMS.mergeReco(candCfg)
+ cnvCfg = MuonTrackParticleCnvCfg(muonflags, name = "TrigMuonTrackParticleCnvAlg")
+ recoMS.mergeReco(cnvCfg)
+
+ from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedMuonCandidateAlgCfg
+ candCfg = MuonCombinedMuonCandidateAlgCfg(muonflags, name = "TrigMuonCandidateAlg")
+ recoMS.mergeReco(candCfg)
+
+ from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCreatorAlgCfg
+ creatorCfg = MuonCreatorAlgCfg(muonflags, name = "TrigMuonCreatorAlg")
+ recoMS.mergeReco(creatorCfg)
accMS.merge(recoMS, sequenceName=stepEFMSReco.getName())
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
index 3d645f7317c1d6dc0e65d539b40080db3ea1fb15..a6328ace435f7038a9ee21011b43c8f71436432e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Test/TestDef.py
@@ -120,9 +120,6 @@ class TestChainConfiguration(ChainConfigurationBase):
}
return stepDictionary
-
-
-
## Muons
def Step_mu11(self):