diff --git a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
index 2850c027cbb92b26c16dca896e0910442822ca93..0bf87fcaf6184272c1add35b300e3bc7516666c8 100644
--- a/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
+++ b/Control/AthenaServices/src/DelayedConditionsCleanerSvc.h
@@ -1,6 +1,6 @@
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
*/
@@ -48,7 +48,7 @@ class DelayedConditionsCleanerSvcProps;
* On each event (@c event interface) we put the current IOV keys
* (run+LBN and timestamp) into ring buffers (of size RingSize).
* If the topmost entry of the priority queue has come due, then we
- * pull of that entry and other entries due up to LookAhead events later.
+ * pull off that entry and other entries due up to LookAhead events later.
* We then do a trim operation on each of the conditions containers,
* removing conditions objects from the oldest first that do not
* match any of the IOV keys in the ring buffer.
diff --git a/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx b/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx
index 92a9803ee9df0c22fd09cf68c48a63e7de0cd324..b6c305affd2998b977c213822fcbfeba52a542b6 100644
--- a/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx
+++ b/Control/AthenaServices/test/DelayedConditionsCleanerSvc_test.cxx
@@ -26,7 +26,7 @@
#include "GaudiKernel/Service.h"
#include "tbb/global_control.h"
#include "tbb/concurrent_queue.h"
-#include "tbb/task.h"
+#include "tbb/task_group.h"
#include <list>
#include <algorithm>
#include <iostream>
@@ -490,47 +490,17 @@ void CCS::checkFin (bool threaded) const
}
-class EventTask
- : public tbb::task
-{
-public:
- EventTask (const EventContext& ctx,
- CCS& ccs,
- Athena::IRCUSvc& rcu,
- work_queue_t& wqueue);
-
- tbb::task* execute() override;
-
-
-private:
- EventContext m_ctx;
- CCS& m_ccs;
- IIncidentListener& m_rcu;
- work_queue_t& m_wqueue;
-};
-
-
-EventTask::EventTask (const EventContext& ctx,
- CCS& ccs,
- Athena::IRCUSvc& rcu,
- work_queue_t& wqueue)
- : m_ctx (ctx),
- m_ccs (ccs),
- m_rcu (dynamic_cast<IIncidentListener&>(rcu)),
- m_wqueue (wqueue)
-{
-}
-
-
-tbb::task* EventTask::execute()
+void eventTask (const EventContext& ctx,
+ CCS& ccs,
+ Athena::IRCUSvc& rcu,
+ work_queue_t& wqueue)
{
- m_ccs.load (m_ctx);
- m_ccs.check (m_ctx);
+ ccs.load (ctx);
+ ccs.check (ctx);
- Incident inc ("test", IncidentType::EndEvent, m_ctx);
- m_rcu.handle (inc);
- m_wqueue.push (m_ctx.slot());
- return nullptr;
+ Incident inc ("test", IncidentType::EndEvent, ctx);
+ dynamic_cast<IIncidentListener&>(rcu).handle (inc);
+ wqueue.push (ctx.slot());
}
@@ -599,6 +569,7 @@ void Tester::event_loop (CCS& ccs, const std::vector<size_t>& evnums)
m_ready.push (i);
}
+ tbb::task_group tg;
size_t nev = evnums.size();
for (size_t ievt=0; ievt < nev; ievt++) {
size_t slot;
@@ -608,9 +579,7 @@ void Tester::event_loop (CCS& ccs, const std::vector<size_t>& evnums)
assert (m_cleaner.event (ctx, m_allowAsync).isSuccess() );
- tbb::task* t = new (tbb::task::allocate_root())
- EventTask (ctx, ccs, m_rcu, m_ready);
- tbb::task::enqueue (*t);
+ tg.run ([&, ctx] { eventTask (ctx, ccs, m_rcu, m_ready); });
}
// Wait for all tasks to complete.
@@ -618,6 +587,7 @@ void Tester::event_loop (CCS& ccs, const std::vector<size_t>& evnums)
size_t slot;
m_ready.pop (slot);
}
+ tg.wait();
ccs.checkFin (true);
}
diff --git a/Control/PerformanceMonitoring/PerfMonAna/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonAna/CMakeLists.txt
index 704b336ba5ea0452902d27306dea02508f315651..4427629d39627b13bd5dc75965d1dcb2d3b569b3 100644
--- a/Control/PerformanceMonitoring/PerfMonAna/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonAna/CMakeLists.txt
@@ -24,4 +24,3 @@ atlas_add_alias( pmontree "pmontree.py" )
atlas_add_alias( perfrtt "perfrtt.py" )
atlas_add_alias( perfmon "perfmon.py" )
atlas_add_alias( perf-dpmon "perf-dpmon.py" )
-atlas_add_alias( perfmonmt-plotter "perfmonmt-plotter.py" )
diff --git a/Control/PerformanceMonitoring/PerfMonAna/bin/perfmonmt-printer.py b/Control/PerformanceMonitoring/PerfMonAna/bin/perfmonmt-printer.py
new file mode 100755
index 0000000000000000000000000000000000000000..507fbaf6c16ae399520209a58d10ca9a2ab82f4a
--- /dev/null
+++ b/Control/PerformanceMonitoring/PerfMonAna/bin/perfmonmt-printer.py
@@ -0,0 +1,184 @@
+#! /usr/bin/env python
+
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+import json
+import argparse
+
+# Print Header
+def printHeader():
+ print('='*105)
+ print('{0:^105}'.format('PerfMonMTSvc Report'))
+ print('='*105)
+ print('{0:<105}'.format('IMPORTANT : PLEASE NOTE THAT THIS SERVICE IS CURRENTLY IN R&D PHASE.'))
+ print('{0:<105}'.format(' FOR FURTHER INFORMATION/QUERIES PLEASE GET IN TOUCH WITH THE SPOT TEAM.'))
+ print('='*105)
+
+# Print Footer
+def printFooter():
+ print('='*105)
+ print('{0:^105}'.format('ALL DONE!'))
+ print('='*105)
+
+# Print Component Level Data in Descending Order
+def printComponentLevelInfo(execOnly = True, orderBy = 'cpuTime', maxComps = -1):
+ if 'componentLevel' not in data:
+ return
+ print('='*105)
+ print('{0:^105}'.format('Component Level Monitoring'))
+ print('='*105)
+ print('{0:<18}{1:<10}{2:<20}{3:<20}{4:<20}{5:<20}'.format('Step',
+ 'Count',
+ 'CPU Time [ms]',
+ 'Vmem [kB]',
+ 'Malloc [kB]',
+ 'Component'))
+ print('='*105)
+ steps = ['Initialize', 'Execute', 'Finalize', 'Callback', 'preLoadProxy']
+ if execOnly:
+ steps = ['Execute']
+ ncomps = 0
+ for step in steps:
+ for entry in sorted(data['componentLevel'][step],
+ key=lambda x: data['componentLevel'][step][x][orderBy], reverse = True):
+ print('{0:<18}{1:<10}{2:<20.2f}{3:<20}{4:<20}{5:<20}'.format(step,
+ data['componentLevel'][step][entry]['count'],
+ data['componentLevel'][step][entry]['cpuTime'],
+ data['componentLevel'][step][entry]['vmem'],
+ data['componentLevel'][step][entry]['malloc'],
+ entry))
+ ncomps += 1
+ if (ncomps == maxComps):
+ break
+ print('='*105)
+
+# Event Level Data in Ascending Order
+def printEventLevelInfo():
+ if 'eventLevel' not in data:
+ return
+ print('='*105)
+ print('{0:^105}'.format('Event Level Monitoring'))
+ print('='*105)
+ print('{0:^15}{1:^15}{2:^15}{3:^15}{4:^15}{5:^15}{6:^15}'.format('Event',
+ 'CPU [s]',
+ 'Wall [s]',
+ 'Vmem [kB]',
+ 'Rss [kB]',
+ 'Pss [kB]',
+ 'Swap [kB]'))
+ print('='*105)
+ for entry in sorted(data['eventLevel'], key=float):
+ print('{0:^15}{1:^15.2f}{2:^15.2f}{3:^15}{4:^15}{5:^15}{6:^15}'.format(entry,
+ data['eventLevel'][entry]['cpuTime']*0.001,
+ data['eventLevel'][entry]['wallTime']*0.001,
+ data['eventLevel'][entry]['vmem'],
+ data['eventLevel'][entry]['rss'],
+ data['eventLevel'][entry]['pss'],
+ data['eventLevel'][entry]['swap']))
+# Snapshots Summary
+def printSnapshotsInfo():
+ if 'summary' not in data:
+ return
+ if 'snapshotLevel' not in data['summary']:
+ return
+ print('='*105)
+ print('{0:^105}'.format('Snapshots Summary'))
+ print('='*105)
+ print('{0:<14}{1:<13}{2:<13}{3:<13}{4:<13}{5:<13}{6:<13}{7:<13}'.format('Step',
+ 'dCPU [s]',
+ 'dWall [s]',
+ '<CPU>',
+ 'dVmem [kB]',
+ 'dRss [kB]',
+ 'dPss [kB]',
+ 'dSwap [kB]'))
+ print('-'*105)
+ for entry in ['Configure','Initialize','Execute','Finalize']:
+ print('{0:<14}{1:<13.2f}{2:<13.2f}{3:<13.2f}{4:<13}{5:<13}{6:<13}{7:<13}'.format(entry,
+ data['summary']['snapshotLevel'][entry]['dCPU']*0.001,
+ data['summary']['snapshotLevel'][entry]['dWall']*0.001,
+ data['summary']['snapshotLevel'][entry]['cpuUtil'],
+ data['summary']['snapshotLevel'][entry]['dVmem'],
+ data['summary']['snapshotLevel'][entry]['dRss'],
+ data['summary']['snapshotLevel'][entry]['dPss'],
+ data['summary']['snapshotLevel'][entry]['dSwap']))
+ print('*'*105)
+ print('{0:<40}{1:<}'.format('Number of events processed:',
+ data['summary']['nEvents']))
+ print('{0:<40}{1:<.0f}'.format('CPU usage per event[ms]:',
+ float(data['summary']['snapshotLevel']['Execute']['dCPU'])/float(data['summary']['nEvents'])))
+ print('{0:<40}{1:<.3f}'.format('Events per second:',
+ float(data['summary']['nEvents'])/float(data['summary']['snapshotLevel']['Execute']['dWall']*0.001)))
+ print('*'*105)
+ print('{0:<40}{1:<.2f} GB'.format('Max Vmem:',
+ float(data['summary']['peaks']['vmemPeak'])/1024./1024.))
+ print('{0:<40}{1:<.2f} GB'.format('Max Rss:',
+ float(data['summary']['peaks']['rssPeak'])/1024./1024))
+ print('{0:<40}{1:<.2f} GB'.format('Max Pss:',
+ float(data['summary']['peaks']['pssPeak'])/1024./1024.))
+ print('*'*105)
+ print('{0:<40}{1:<.2f} MB'.format('Leak estimate per event Vmem:',
+ float(data['summary']['leakEstimates']['vmemLeak'])/1024.))
+ print('{0:<40}{1:<.2f} MB'.format('Leak estimate per event Pss:',
+ float(data['summary']['leakEstimates']['pssLeak'])/1024.))
+ print(' >> Estimated using the last {0} measurements from the Event Level Monitoring'.format(data['summary']['leakEstimates']['nPoints']))
+ print(' >> Events prior to the first 25 are omitted...')
+
+# Print System Info
+def printSystemInfo():
+ print('='*105)
+ print('{0:^105}'.format('System Information'))
+ print('='*105)
+ print('{0:<40}{1:<}'.format('CPU Model:',data['summary']['sysInfo']['cpuModel'].lstrip()))
+ print('{0:<40}{1:<}'.format('Number of Available Cores:',data['summary']['sysInfo']['coreNum']))
+ print('='*105)
+
+# Main function
+if '__main__' in __name__:
+
+ # Parse the user input
+ parser = argparse.ArgumentParser(description = 'Script to print tables using PerfMonMTSvc JSON')
+
+ parser.add_argument('-i', '--input', type = str, required = True,
+ help = 'PerfMonMTSvc JSON file')
+ parser.add_argument('-l', '--level', nargs = '?', default = 'All',
+ choices = ['All', 'SummaryLevel', 'EventLevel', 'ComponentLevel'],
+ help = 'Sets the level of detail in the printout')
+ parser.add_argument('-e', '--exec-only', dest = 'exec_only', action = 'store_true',
+ help = 'Print only the execute step for the components')
+ parser.add_argument('-o', '--order-by', dest = 'order_by', nargs = '?', default = 'cpuTime',
+ choices = ['cpuTime', 'vmem', 'malloc'],
+ help = 'Order components by a specific metric')
+ parser.add_argument('-m', '--max-components', dest = 'max_comps', type = int, default = -1,
+ help = 'The maximum number of compoments to be printed '
+ '(default: -1)')
+
+ args = parser.parse_args()
+
+ # Load the data and print the requested information
+ with(open(args.input)) as json_file:
+
+ data = json.load(json_file)
+
+ # Print Header
+ printHeader()
+
+ # Print Component Level Data
+ if args.level in ['All', 'ComponentLevel']:
+ printComponentLevelInfo(args.exec_only,
+ args.order_by,
+ args.max_comps)
+
+ # Print Event Level Data
+ if args.level in ['All', 'EventLevel']:
+ printEventLevelInfo()
+
+ # Print Snapshots Summary
+ if args.level in ['All', 'SummaryLevel']:
+ printSnapshotsInfo()
+
+ # Print System Information
+ if args.level in ['All']:
+ printSystemInfo()
+ # Print Footer
+ printFooter()
diff --git a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
index adc829f41103336b980df256d3e87bcf136b57b1..82c788c2cb3bcb2caca82995e0e0a05326b0d4b3 100644
--- a/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
+++ b/Control/PerformanceMonitoring/PerfMonComps/src/PerfMonMTSvc.cxx
@@ -360,7 +360,9 @@ void PerfMonMTSvc::report2Log_Description() const {
if (m_reportResultsToJSON) {
ATH_MSG_INFO("*** Full set of information can also be found in: " << m_jsonFileName.toString());
ATH_MSG_INFO("*** In order to make plots using the results run the following commands:");
- ATH_MSG_INFO("*** $ perfmonmt-plotter -i " << m_jsonFileName.toString());
+ ATH_MSG_INFO("*** $ perfmonmt-plotter.py -i " << m_jsonFileName.toString());
+ ATH_MSG_INFO("*** In order to print tables using the results run the following commands:");
+ ATH_MSG_INFO("*** $ perfmonmt-printer.py -i " << m_jsonFileName.toString());
ATH_MSG_INFO("=======================================================================================");
}
}
@@ -402,7 +404,7 @@ void PerfMonMTSvc::report2Log_ComponentLevel() {
}
counter++;
- ATH_MSG_INFO(format("%1% %|15t|%2% %|25t|%3% %|40t|%4% %|55t|%5% %|75t|%6%") % it.first.stepName %
+ ATH_MSG_INFO(format("%1% %|15t|%2% %|25t|%3$.2f %|40t|%4$.0f %|55t|%5$.0f %|75t|%6%") % it.first.stepName %
it.second->getCallCount() % it.second->getDeltaCPU() % it.second->getDeltaVmem() %
it.second->getDeltaMalloc() % it.first.compName);
}
@@ -440,7 +442,7 @@ void PerfMonMTSvc::report2Log_EventLevel() {
" measurements are explicitly printed)");
ATH_MSG_INFO("=======================================================================================");
- ATH_MSG_INFO(format("%1% %|16t|%2$.2f %|28t|%3$.2f %|40t|%4% %|52t|%5% %|64t|%6% %|76t|%7%") % "Event" % "CPU [s]" %
+ ATH_MSG_INFO(format("%1% %|16t|%2% %|28t|%3% %|40t|%4% %|52t|%5% %|64t|%6% %|76t|%7%") % "Event" % "CPU [s]" %
"Wall [s]" % "Vmem [kB]" % "Rss [kB]" % "Pss [kB]" % "Swap [kB]");
ATH_MSG_INFO("---------------------------------------------------------------------------------------");
@@ -574,6 +576,10 @@ void PerfMonMTSvc::report2JsonFile_Summary(nlohmann::json& j) const {
}
+ // Report the total number of events
+ const long nEvents = m_eventCounter;
+ j["summary"]["nEvents"] = nEvents;
+
// Report Peaks
const long vmemPeak = m_measurement_events.vmemPeak;
const long rssPeak = m_measurement_events.rssPeak;
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
index 30bc1109b79107e11505a35ef31a9a3197755054..b5d5ef95e328a36f556013a650bc3857959b07e1 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/CMakeLists.txt
@@ -66,3 +66,16 @@ atlas_add_library( GeoModelUtilities
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} )
endif()
+
+# Code in this file makes heavy use of eigen and runs orders of magnitude
+# more slowly without optimization. So force this to be optimized even
+# in debug builds. If you need to debug it you might want to change this.
+# Specifying optimization via an attribute on the particular
+# function didn't work, because that still didn't allow inlining.
+if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
+ set_source_files_properties(
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/GeoVisitVolumes.cxx
+ PROPERTIES
+ COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
+ COMPILE_DEFINITIONS "FLATTEN" )
+endif()
diff --git a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx
index 73b88e4353677bebb237bb7e05a3271bc8e25c2d..e1cb4ef40a8f433a920292f61426a0c1408594c6 100644
--- a/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.cxx
+++ b/DetectorDescription/GeoModel/GeoModelUtilities/src/GeoVisitVolumes.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.
*/
/**
* @file GeoModelUtilities/src/GeoVisitVolumes.cxx
@@ -102,6 +102,14 @@ void GeoVisitVolumes::handleSerialDenominator (const GeoSerialDenominator *sD)
}
+#if defined(FLATTEN) && defined(__GNUC__)
+// We compile this package with optimization, even in debug builds; otherwise,
+// the heavy use of Eigen makes it too slow. However, from here we may call
+// to out-of-line Eigen code that is linked from other DSOs; in that case,
+// it would not be optimized. Avoid this by forcing all Eigen code
+// to be inlined here if possible.
+__attribute__ ((flatten))
+#endif
void GeoVisitVolumes::handleSerialTransformer (const GeoSerialTransformer *sT)
{
const GeoVPhysVol* vol = &*sT->getVolume();
diff --git a/DetectorDescription/IdDict/CMakeLists.txt b/DetectorDescription/IdDict/CMakeLists.txt
index 005d4a5c3ea9c788aa3dc1f07e2964a2d5ffb253..30002ee5b0378ba8ef20afb692aeae57f6fa7a51 100644
--- a/DetectorDescription/IdDict/CMakeLists.txt
+++ b/DetectorDescription/IdDict/CMakeLists.txt
@@ -16,3 +16,16 @@ atlas_add_library( IdDict
PUBLIC_HEADERS IdDict
LINK_LIBRARIES Identifier )
+
+# Code in this file makes heavy use of eigen and runs orders of magnitude
+# more slowly without optimization. So force this to be optimized even
+# in debug builds. If you need to debug it you might want to change this.
+# Specifying optimization via an attribute on the particular
+# function didn't work, because that still didn't allow inlining.
+if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
+ set_source_files_properties(
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/IdDictMgr.cxx
+ PROPERTIES
+ COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
+ COMPILE_DEFINITIONS "FLATTEN" )
+endif()
diff --git a/DetectorDescription/IdDict/src/IdDictMgr.cxx b/DetectorDescription/IdDict/src/IdDictMgr.cxx
index a6256fce4f876b70cdf9302d819032cf8db63515..0cfc90a3b7de7268af09c8dcee09575846ddba74 100755
--- a/DetectorDescription/IdDict/src/IdDictMgr.cxx
+++ b/DetectorDescription/IdDict/src/IdDictMgr.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
*/
// $Header: /build/atlas/cvs/atlas/offline/DetectorDescription/IdDict/src/IdDictMgr.cxx,v 1.43 2008-12-09 09:49:43 dquarrie Exp $
@@ -1498,6 +1498,14 @@ int IdDictDictionary::reset (size_t index1,
* Unpack the bits32 id to an expanded Identifier, considering the
* provided prefix (result will include the prefix)
*/
+#if defined(FLATTEN) && defined(__GNUC__)
+// We compile this package with optimization, even in debug builds; otherwise,
+// the heavy use of Eigen makes it too slow. However, from here we may call
+// to out-of-line Eigen code that is linked from other DSOs; in that case,
+// it would not be optimized. Avoid this by forcing all Eigen code
+// to be inlined here if possible.
+__attribute__ ((flatten))
+#endif
int
IdDictDictionary::unpack (const Identifier& id,
const ExpandedIdentifier& prefix,
diff --git a/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h b/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h
index f8123fe9aaa23c7325f4628a471e3900a628b29a..3afd7827940a8d42569143d13f9bd0500366d821 100644
--- a/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h
+++ b/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamCnvSvc.h
@@ -82,6 +82,14 @@ private:
/// @brief common FEA, indexed by string key
std::map<std::string, FullEventAssemblerBase*> m_feaMap;
+
+ /// Cache for serialised event header data
+ std::vector<std::unique_ptr<uint32_t[]>> m_serialiseCache;
+
+ /// Add new array to the cache
+ uint32_t* newCachedArray(const size_t size) {
+ return m_serialiseCache.emplace_back(std::make_unique<uint32_t[]>(size)).get();
+ }
};
// Implementation of template method:
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx
index f70cabf4a83156eed6d6dd7df5a7e480641af595..c3182d8eeb70865350c39ef83b78ef3d0a169ddc 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamCnvSvc.cxx
@@ -20,6 +20,16 @@
#include <algorithm>
+namespace {
+ /// Convert set<uint32_t> to set<SubDetector>
+ std::set<eformat::SubDetector> detsOnline(const std::set<uint32_t>& detsOffline) {
+ std::set<eformat::SubDetector> out;
+ for (const uint32_t detid : detsOffline)
+ out.insert(static_cast<eformat::SubDetector>(detid));
+ return out;
+ }
+}
+
/// Standard constructor
ByteStreamCnvSvc::ByteStreamCnvSvc(const std::string& name, ISvcLocator* pSvcLocator)
: ByteStreamCnvSvcBase(name, pSvcLocator),
@@ -110,7 +120,7 @@ StatusCode ByteStreamCnvSvc::connectOutput(const std::string& /*t*/) {
if (lvl1_id == 0) {
lvl1_id = event;
}
- uint32_t lvl1_type = evtInfo->level1TriggerType();
+ uint8_t lvl1_type = evtInfo->level1TriggerType();
uint64_t global_id = event;
uint16_t lumi_block = evtInfo->lumiBlock();
uint16_t bc_id = evtInfo->bcid();
@@ -119,112 +129,75 @@ StatusCode ByteStreamCnvSvc::connectOutput(const std::string& /*t*/) {
// create an empty RawEvent
eformat::helper::SourceIdentifier sid = eformat::helper::SourceIdentifier(eformat::FULL_SD_EVENT, nevt);
m_rawEventWrite = new RawEventWrite(sid.code(), bc_time_sec, bc_time_ns, global_id, run_type, run_no, lumi_block, lvl1_id, bc_id, lvl1_type);
- return(StatusCode::SUCCESS);
-}
-StatusCode ByteStreamCnvSvc::commitOutput(const std::string& outputConnection, bool /*b*/) {
- ATH_MSG_DEBUG("In flushOutput " << outputConnection);
-
- if (m_ioSvcMap.size() == 0) {
- ATH_MSG_ERROR("ByteStreamCnvSvc not configure for output");
- return(StatusCode::FAILURE);
+ // set stream tags
+ std::vector<eformat::helper::StreamTag> on_streamTags;
+ for (const auto& sTag : evtInfo->streamTags()) {
+ on_streamTags.emplace_back(sTag.name(), sTag.type(), sTag.obeysLumiblock(), sTag.robs(), detsOnline(sTag.dets()));
}
- writeFEA();
-
- // Get EventInfo
- const xAOD::EventInfo* evtInfo{nullptr};
- ATH_CHECK( m_evtStore->retrieve(evtInfo) );
-
- // Try to get TrigDecision
- const xAOD::TrigDecision* trigDecision{nullptr};
- if(m_evtStore->retrieve(trigDecision)!=StatusCode::SUCCESS) {
- ATH_MSG_WARNING("Failed to retrieve xAOD::TrigDecision. Will write empty trigger decision vectors");
- trigDecision = nullptr;
+ uint32_t nStreamTagWords = eformat::helper::size_word(on_streamTags);
+ uint32_t* sTagBuff = newCachedArray(nStreamTagWords);
+ eformat::helper::encode(on_streamTags, nStreamTagWords, sTagBuff);
+ m_rawEventWrite->stream_tag(nStreamTagWords, sTagBuff);
+
+ // try to get TrigDecision
+ const xAOD::TrigDecision *trigDecision{nullptr};
+ if (m_evtStore->retrieve(trigDecision, "xTrigDecision") != StatusCode::SUCCESS) {
+ ATH_MSG_DEBUG("Failed to retrieve xAOD::TrigDecision. Leaving empty trigger decision vectors");
+ return StatusCode::SUCCESS;
}
- // change trigger info in Header
- uint32_t *l1Buff{nullptr};
- uint32_t *l2Buff{nullptr};
- uint32_t *efBuff{nullptr};
- uint32_t *encTag{nullptr};
-
- m_rawEventWrite->lvl1_id(evtInfo->extendedLevel1ID());
- m_rawEventWrite->lvl1_trigger_type((uint8_t)(evtInfo->level1TriggerType()));
-
// LVL1 info
- uint32_t l1Size{0};
- if(trigDecision) {
- const std::vector<uint32_t>& tbp = trigDecision->tbp();
- const std::vector<uint32_t>& tap = trigDecision->tap();
- const std::vector<uint32_t>& tav = trigDecision->tav();
- size_t l1TotSize = tbp.size()+tap.size()+tav.size();
- if(l1TotSize>0) {
- l1Buff = new uint32_t[l1TotSize];
- for(uint32_t tb : tbp) {
- l1Buff[l1Size++] = tb;
- }
- for(uint32_t tb : tap) {
- l1Buff[l1Size++] = tb;
- }
- for(uint32_t tb : tav) {
- l1Buff[l1Size++] = tb;
- }
- }
+ const std::vector<uint32_t> &tbp = trigDecision->tbp();
+ const std::vector<uint32_t> &tap = trigDecision->tap();
+ const std::vector<uint32_t> &tav = trigDecision->tav();
+ const size_t l1TotSize = tbp.size() + tap.size() + tav.size();
+ if (l1TotSize > 0) {
+ uint32_t* l1Buff = newCachedArray(l1TotSize);
+ size_t l1Size{0};
+ for (const uint32_t tb : tbp) {
+ l1Buff[l1Size++] = tb;
+ }
+ for (const uint32_t tb : tap) {
+ l1Buff[l1Size++] = tb;
+ }
+ for (const uint32_t tb : tav) {
+ l1Buff[l1Size++] = tb;
+ }
+ m_rawEventWrite->lvl1_trigger_info(l1TotSize, l1Buff);
}
- m_rawEventWrite->lvl1_trigger_info(l1Size, l1Buff);
// LVL2 info
- uint32_t l2Size{0};
- if(trigDecision) {
- const std::vector<uint32_t>& lvl2PP = trigDecision->lvl2PassedPhysics();
- if(lvl2PP.size()>0) {
- l2Buff = new uint32_t[lvl2PP.size()];
- for(uint32_t tb : lvl2PP) {
- l2Buff[l2Size++] = tb;
- }
- }
+ const std::vector<uint32_t>& lvl2PP = trigDecision->lvl2PassedPhysics();
+ if (lvl2PP.size() > 0) {
+ uint32_t* l2Buff = newCachedArray(lvl2PP.size());
+ std::copy(lvl2PP.begin(), lvl2PP.end(), l2Buff);
+ m_rawEventWrite->lvl2_trigger_info(lvl2PP.size(), l2Buff);
}
- m_rawEventWrite->lvl2_trigger_info(l2Size, l2Buff);
// EF info
- uint32_t efSize{0};
- if(trigDecision) {
- const std::vector<uint32_t>& efPP = trigDecision->efPassedPhysics();
- if(efPP.size()>0) {
- efBuff = new uint32_t[efPP.size()];
- for(uint32_t tb : efPP) {
- efBuff[efSize++] = tb;
- }
- }
+ const std::vector<uint32_t>& efPP = trigDecision->efPassedPhysics();
+ if (efPP.size() > 0) {
+ uint32_t* efBuff = newCachedArray(efPP.size());
+ std::copy(efPP.begin(), efPP.end(), efBuff);
+ m_rawEventWrite->event_filter_info(efPP.size(), efBuff);
}
- m_rawEventWrite->event_filter_info(efSize, efBuff);
- // stream tag
- std::vector<eformat::helper::StreamTag> on_streamTags;
- const std::vector<xAOD::EventInfo::StreamTag>& off_streamTags = evtInfo->streamTags();
- for(const auto& sTag : off_streamTags) {
- // convert offline -> online
- eformat::helper::StreamTag tmpTag;
- tmpTag.name = sTag.name();
- tmpTag.type = sTag.type();
- tmpTag.obeys_lumiblock = sTag.obeysLumiblock();
- for(uint32_t rob : sTag.robs()) {
- tmpTag.robs.insert(rob);
- }
- for(uint32_t det : sTag.dets()) {
- tmpTag.dets.insert((eformat::SubDetector)det);
- }
- on_streamTags.push_back(tmpTag);
+ return(StatusCode::SUCCESS);
+}
+
+StatusCode ByteStreamCnvSvc::commitOutput(const std::string& outputConnection, bool /*b*/) {
+ ATH_MSG_DEBUG("In flushOutput " << outputConnection);
+
+ if (m_ioSvcMap.size() == 0) {
+ ATH_MSG_ERROR("ByteStreamCnvSvc not configure for output");
+ return(StatusCode::FAILURE);
}
- // encode
- uint32_t encSize = eformat::helper::size_word(on_streamTags);
- encTag = new uint32_t[encSize];
- eformat::helper::encode(on_streamTags, encSize, encTag);
- m_rawEventWrite->stream_tag(encSize, encTag);
+ writeFEA();
// convert RawEventWrite to RawEvent
uint32_t rawSize = m_rawEventWrite->size_word();
- OFFLINE_FRAGMENTS_NAMESPACE::DataType* buffer = new OFFLINE_FRAGMENTS_NAMESPACE::DataType[rawSize];
+ uint32_t* buffer = newCachedArray(rawSize);
uint32_t count = eformat::write::copy(*(m_rawEventWrite->bind()), buffer, rawSize);
if (count != rawSize) {
ATH_MSG_ERROR("Memcopy failed");
@@ -252,19 +225,16 @@ StatusCode ByteStreamCnvSvc::commitOutput(const std::string& outputConnection, b
return(StatusCode::FAILURE);
}
}
- // delete
- delete [] buffer; buffer = 0;
+ // delete RawEventWrite
delete m_rawEventWrite; m_rawEventWrite = 0;
- delete [] l1Buff; l1Buff = 0;
- delete [] l2Buff; l2Buff = 0;
- delete [] efBuff; efBuff = 0;
- delete [] encTag; encTag = 0;
// delete FEA
for (std::map<std::string, FullEventAssemblerBase*>::const_iterator it = m_feaMap.begin(),
itE = m_feaMap.end(); it != itE; it++) {
delete it->second;
}
m_feaMap.clear();
+ // delete cache
+ m_serialiseCache.clear();
return(StatusCode::SUCCESS);
}
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/doWriteNtuple.C b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/doWriteNtuple.C
index 4548e8ebea800a04d55e42c1d98ba81c0ac0ad82..ada36714f4ff6b20144e21f23c356aa6e4d4891f 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/doWriteNtuple.C
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/NNClusteringCalibration_RunI/validation/doWriteNtuple.C
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
void doWriteNtuple(int nParticles, bool useTrackEstimate )
@@ -21,7 +21,7 @@ void doWriteNtuple(int nParticles, bool useTrackEstimate )
// split by ','
std::vector<std::string> fileList;
- for (size_t i=0,n; i <= argStr.length(); i=n+1)
+ for (size_t i=0, n=0; i <= argStr.length(); i=n+1)
{
n = argStr.find_first_of(',',i);
if (n == string::npos)
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixMapDBWriter.h b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixMapDBWriter.h
index f90cbf9b3503fdf2421582680b9591f3488545c8..9f1b8cfc17bbf14adbfb76f50cd60fd3d5f26b05 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixMapDBWriter.h
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixMapDBWriter.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 PIXELCONDITIONSSERVICES_PIXMAPDBWRITER_H
@@ -61,7 +61,7 @@ class PixMapDBWriter : public AthAlgorithm{
SG::ReadCondHandleKey<InDetDD::SiDetectorElementCollection> m_pixelDetEleCollKey{this, "PixelDetEleCollKey", "PixelDetectorElementCollection", "Key of SiDetectorElementCollection for Pixel"};
std::vector< std::pair< std::string, std::vector<int> > > m_pixelMapping;
- std::vector<int> getPositionFromDCSID (std::string DCSID);
+ std::vector<int> getPositionFromDCSID (const std::string& DCSID);
std::string getDCSIDFromPosition (int barrel_ec, int layer, int module_phi, int module_eta);
std::vector<std::string> &splitter(const std::string &s, char delim, std::vector<std::string> &elems) {
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/NoiseMapBuilder.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/NoiseMapBuilder.cxx
index ed97603f243535f4134d59aed73c5b1c2e283448..ecf3ed5321b93487c28fb93a21b028d7443bd2b2 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/NoiseMapBuilder.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/NoiseMapBuilder.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
*/
// PixelCalibAlgs
@@ -340,7 +340,7 @@ StatusCode NoiseMapBuilder::execute(){
// loop in RDO container
for(PixelRDO_Container::const_iterator coll=pixelRDOs->begin();
- coll!=pixelRDOs->end(); coll++){
+ coll!=pixelRDOs->end(); ++coll){
const InDetRawDataCollection<PixelRDORawData>* PixelRDOCollection(*coll);
if(PixelRDOCollection != 0){
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixMapDBWriter.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixMapDBWriter.cxx
index cc254d89bfab71883ca5525d9b915b66d81023f3..04d482b9e1fbd2b5ca5cb9e12cb50479f57e65e1 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixMapDBWriter.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixMapDBWriter.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
*/
// PixelCalibAlgs
@@ -683,7 +683,7 @@ std::string PixMapDBWriter::getDCSIDFromPosition (int barrel_ec, int layer, int
return std::string("Error!");
}
-std::vector<int> PixMapDBWriter::getPositionFromDCSID (std::string DCSID){
+std::vector<int> PixMapDBWriter::getPositionFromDCSID (const std::string& DCSID){
for(unsigned int ii = 0; ii < m_pixelMapping.size(); ii++) {
if (m_pixelMapping[ii].first == DCSID)
return m_pixelMapping[ii].second;
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelBarrelSurvey.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelBarrelSurvey.cxx
index 432d3e75cf78f430e1a1da57a6504fb07a370e5f..c4888073914929efe276a6d35dd2cd209c83a0f1 100755
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelBarrelSurvey.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelBarrelSurvey.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 "PixelCalibAlgs/PixelBarrelSurvey.h"
@@ -164,7 +164,7 @@ StatusCode PixelBarrelSurvey::execute() {
disto[j]=theStave->module[i].disto[j];
m_distorsions->add(hashID,disto);
}
- theStave++;
+ ++theStave;
}
delete[] disto;
@@ -240,7 +240,7 @@ StatusCode PixelBarrelSurvey::finalize() {
distfile << std::hex << "0x" << id;
for ( int j=0; j<m_distorsions->size(); j++) distfile << " " << disto[j];
distfile << std::endl;
- i++;
+ ++i;
}
outfile.close();
distfile.close();
diff --git a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx
index 2c75e5570af92b1c0a2a4a1e8638d70f3c43b08f..b65cb83002c793470330c5bfbf8a8a7928dbda29 100644
--- a/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx
+++ b/InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx
@@ -86,6 +86,7 @@ StatusCode PixelChargeToTConversion::execute(){
const PixelID* pixelIDp=dynamic_cast<const PixelID*>(aid);
if (!pixelIDp){
ATH_MSG_ERROR("Could not get PixelID pointer");
+ return StatusCode::FAILURE;
}
const PixelID& pixelID = *pixelIDp;
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
index 9ce495a8826499a2256f4433ab55252118e4232f..fc34a7f05e23fffbc5cadcaef5bbe755a2c16db8 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.cxx
@@ -49,8 +49,6 @@
#include "CxxUtils/checker_macros.h"
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used.
-
using eformat::helper::SourceIdentifier;
using namespace std;
@@ -81,7 +79,7 @@ const InterfaceID& TRT_FillCablingData_DC3::interfaceID( )
// Initialisation
-StatusCode TRT_FillCablingData_DC3::initialize( )
+StatusCode TRT_FillCablingData_DC3::initialize ATLAS_NOT_THREAD_SAFE ( ) // thread unsafe TRT_FillCablingData_DC3::defineTables is used.
{
ATH_MSG_INFO( "TRT_FillCablingData_DC3::initialize" );
@@ -175,7 +173,7 @@ void TRT_FillCablingData_DC3::defineParameters()
// Fill Tables with IDs for all straws
-void TRT_FillCablingData_DC3::defineTables()
+void TRT_FillCablingData_DC3::defineTables ATLAS_NOT_THREAD_SAFE () // thread unsafe std::exit is used.
{
ATH_MSG_INFO( "In defineTables" );
diff --git a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
index 3e31ac729bbd87567ae7965d15c9e421eeefb8a8..119bfff7999742b23606da12be6a1a769da56fee 100644
--- a/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
+++ b/InnerDetector/InDetDetDescr/TRT_Cabling/src/TRT_FillCablingData_DC3.h
@@ -15,8 +15,6 @@
*/
#include "AthenaBaseComps/AthAlgTool.h"
-#include "CxxUtils/checker_macros.h"
-
#include "Identifier/Identifier.h"
#include "Identifier/IdentifierHash.h"
#include "Identifier/IdContext.h"
@@ -32,8 +30,6 @@
#include <vector>
#include <stdint.h>
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used.
-
class TRT_FillCablingData_DC3: public AthAlgTool {
public:
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetDigitization/TRT_Digitization/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..ab973ecc9bb9307ebeaf18c7ab449403f9b48f1b
--- /dev/null
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetDigitization/TRT_Digitization
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
index bf77d0b070d71dcf581ef33aa248b51c8020f4b9..f199a3bcb639619d73eff36c8a5cc17e3c533d3c 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
@@ -45,7 +45,7 @@ atlas_add_component( TRT_Digitization
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} GaudiKernel AthenaBaseComps AthenaKernel CxxUtils PileUpToolsLib AthenaPoolUtilities GeoModelUtilities GeoPrimitives Identifier EventInfo GeneratorObjects TRT_ConditionsData TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetRawData InDetSimData InDetSimEvent HitManagement MagFieldElements MagFieldConditions)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${HEPPDT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} GaudiKernel AthenaBaseComps AthenaKernel CxxUtils PileUpToolsLib AthenaPoolUtilities GeoModelUtilities GeoPrimitives Identifier EventInfo GeneratorObjects TRT_ConditionsData TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetRawData InDetSimData InDetSimEvent HitManagement MagFieldElements MagFieldConditions TRT_PAI_ProcessLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx
index 5660feadd6f90db695bf362f8234d0921e7c7717..d87795874cf05536fef5258d57338fd5e35ec529 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.cxx
@@ -18,7 +18,6 @@
/////////////////////////////////////////////////////////////////
#include "TRTDigSettings.h"
-#include "CxxUtils/checker_macros.h"
#include "TRT_ReadoutGeometry/TRT_DetectorManager.h"
//Geomodel
@@ -34,8 +33,6 @@
#include <iostream>
#include <limits>
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used.
-
// RDBAccessSvc (Interface to the DD database) has been removed since
// TRT_Digitization-01-00-11 because the fetched values are correctly
// hard-coded already. See TRT_Digitization-01-00-10 for an example of
@@ -325,10 +322,10 @@ void TRTDigSettings::defineNewVariable(std::string name, double * datamember,std
//sanity checks:
if (m_intboolparMap.find(name)!=m_intboolparMap.end() || m_doubleparMap.find(name)!=m_doubleparMap.end()) {
- std::cout << "TRTDigSettings: Multiple definitions of "<<name<<std::endl; exit(1);
+ msg(MSG::FATAL) << "TRTDigSettings: Multiple definitions of "<<name<<endmsg; return;
}
if (lowrange > highrange || lowrange*unitval<=m_propertyNotSetMagicNumber ) {
- std::cout << "TRTDigSettings: Problem in range of par "<<name<<std::endl; exit(1);
+ msg(MSG::FATAL) << "TRTDigSettings: Problem in range of par "<<name<<endmsg; return;
}
doubleparameter p;
@@ -349,10 +346,10 @@ void TRTDigSettings::defineNewUIntVariable(std::string name,unsigned int * datam
unsigned int lowrange, unsigned int highrange) {
//sanity checks:
if (m_intboolparMap.find(name)!=m_intboolparMap.end() || m_doubleparMap.find(name)!=m_doubleparMap.end()) {
- std::cout << "TRTDigSettings: Multiple definitions of "<<name<<std::endl; exit(1);
+ msg(MSG::FATAL) << "TRTDigSettings: Multiple definitions of "<<name<<endmsg; return;
}
if (lowrange > highrange ) {
- std::cout << "TRTDigSettings: Problem in range of par "<<name<<std::endl; exit(1);
+ msg(MSG::FATAL) << "TRTDigSettings: Problem in range of par "<<name<<endmsg; return;
}
intboolparameter p;
@@ -374,10 +371,10 @@ void TRTDigSettings::defineNewIntVariable(std::string name,int * datamember,std:
int lowrange, int highrange) {
//sanity checks:
if (m_intboolparMap.find(name)!=m_intboolparMap.end() || m_doubleparMap.find(name)!=m_doubleparMap.end()) {
- std::cout << "TRTDigSettings: Multiple definitions of "<<name<<std::endl; exit(1);
+ msg(MSG::FATAL) << "TRTDigSettings: Multiple definitions of "<<name<<endmsg; return;
}
if (lowrange > highrange || lowrange<=m_propertyNotSetMagicNumber_int ) {
- std::cout << "TRTDigSettings: Problem in range of par "<<name<<std::endl; exit(1);
+ msg(MSG::FATAL) << "TRTDigSettings: Problem in range of par "<<name<<endmsg; return;
}
intboolparameter p;
@@ -398,7 +395,7 @@ void TRTDigSettings::defineNewIntVariable(std::string name,int * datamember,std:
void TRTDigSettings::defineNewBoolVariable(std::string name,bool * datamember,std::string description) {
//sanity checks:
if (m_intboolparMap.find(name)!=m_intboolparMap.end() || m_doubleparMap.find(name)!=m_doubleparMap.end()) {
- std::cout << "TRTDigSettings: Multiple definitions of "<<name<<std::endl; exit(1);
+ msg(MSG::FATAL) << "TRTDigSettings: Multiple definitions of "<<name<<endmsg; return;
}
intboolparameter p;
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h
index 4a0737ed9f014014e8ae7956bdd9b69945d81ab5..31495bf0c14d2066255ed9d6d70e53b324c17cc9 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigSettings.h
@@ -25,8 +25,6 @@
#include <string>
#include <vector>
-ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // std::exit is used.
-
class Algorithm;
class AlgTool;
namespace InDetDD { class TRT_DetectorManager; }
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/CMakeLists.txt b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/CMakeLists.txt
index e86580b4de7cbf8e5175d2d6b6b21185df2764ae..5c04aa542f3c53cf97dfc36711a997730bbcdebf 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/CMakeLists.txt
@@ -12,6 +12,8 @@ atlas_depends_on_subdirs( PUBLIC
Event/ByteStreamData
InnerDetector/InDetRawEvent/InDetRawData
PRIVATE
+ Control/AthenaKernel
+ Control/CxxUtils
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
Event/ByteStreamCnvSvcBase
@@ -37,7 +39,7 @@ atlas_add_component( TRT_RawDataByteStreamCnv
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${COOL_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${COOL_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps Identifier ByteStreamData ByteStreamData_test InDetRawData StoreGateLib SGtests AthenaPoolUtilities ByteStreamCnvSvcBaseLib GaudiKernel TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver IRegionSelector TrigSteeringEvent TRT_CablingLib )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${COOL_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps Identifier ByteStreamData ByteStreamData_test InDetRawData AthenaKernel CxxUtils StoreGateLib SGtests AthenaPoolUtilities ByteStreamCnvSvcBaseLib GaudiKernel TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry PathResolver IRegionSelector TrigSteeringEvent TRT_CablingLib )
# Install files from the package:
atlas_install_headers( TRT_RawDataByteStreamCnv )
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/TRT_RawDataByteStreamCnv/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/TRT_RawDataByteStreamCnv/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..a0119e0dee67c295c992fd52f2956d5107540791
--- /dev/null
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/TRT_RawDataByteStreamCnv/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.cxx b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.cxx
index 8d98a5277484c1aef45af2d0185b963f51b70794..fdbfed9102d96b6550abbeb799d3ab4d85ec9be6 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.cxx
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.cxx
@@ -248,10 +248,11 @@ StatusCode TRT_RodDecoder::finalize() {
* ----------------------------------------------------------
*/
StatusCode
-TRT_RodDecoder::fillCollection ( const ROBFragment* robFrag,
+TRT_RodDecoder::fillCollection ATLAS_NOT_THREAD_SAFE ( const ROBFragment* robFrag,
TRT_RDO_Container* rdoIdc,
TRT_BSErrContainer* bsErr,
const std::vector<IdentifierHash>* vecHash )
+// Non-thread-safe function 'StatusCode TRT_RodDecoder::update()' called
{
std::lock_guard<std::mutex> lock(m_cacheMutex);
@@ -271,8 +272,6 @@ TRT_RodDecoder::fillCollection ( const ROBFragment* robFrag,
// << robid << " L1ID = " << robFrag->rod_lvl1_id()
// << MSG::dec );
- static int err_count = 0;
-
/*
* Save non-zero rob status to TRT BS Conditions Services
*/
@@ -292,14 +291,19 @@ TRT_RodDecoder::fillCollection ( const ROBFragment* robFrag,
* This is a hack to only print once per event. It will work the
* vast majority of the time, but it may miss an occasional event.
*/
- static uint32_t Last_print_L1ID = 0xffffffff;
- static uint32_t Last_print_BCID = 0xffffffff;
- if ( (Last_print_L1ID != robFrag->rod_lvl1_id()) ||
- (Last_print_BCID != robFrag->rod_bc_id()) )
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ CacheEntry* ent{m_cache.get(ctx)};
+ if (ent->m_evt!=ctx.evt()) { // New event in this slot
+ ent->reset();
+ ent->m_evt = ctx.evt();
+ }
+
+ if ( (ent->Last_print_L1ID != robFrag->rod_lvl1_id()) ||
+ (ent->Last_print_BCID != robFrag->rod_bc_id()) )
{
- Last_print_L1ID = robFrag->rod_lvl1_id();
- Last_print_BCID = robFrag->rod_bc_id();
+ ent->Last_print_L1ID = robFrag->rod_lvl1_id();
+ ent->Last_print_BCID = robFrag->rod_bc_id();
ATH_MSG_INFO( "Non-Zero ROB status word for ROB "
<< MSG::hex
@@ -324,18 +328,18 @@ TRT_RodDecoder::fillCollection ( const ROBFragment* robFrag,
vecHash );
else
{
- if ( err_count < 100 )
+ if ( m_err_count_fillCollection < 100 )
{
ATH_MSG_WARNING( "Rod Version: " << RodBlockVersion \
<< ", but Compression Table not loaded! ROD ID = " \
<< MSG::hex << robid << MSG::dec );
- err_count++;
+ m_err_count_fillCollection++;
}
- else if ( 100 == err_count )
+ else if ( 100 == m_err_count_fillCollection )
{
ATH_MSG_WARNING( "Too many Rod Version messages. " \
<< "Turning message off." );
- err_count++;
+ m_err_count_fillCollection++;
}
sc = StatusCode::FAILURE;
@@ -707,8 +711,6 @@ TRT_RodDecoder::int_fillMinimalCompress( const ROBFragment *robFrag,
TRT_RDO_Container* rdoIdc,
const std::vector<IdentifierHash>* vecHash)
{
- static int err_count = 0;
-
uint32_t robid = robFrag->rod_source_id();
// get the ROD version. It could be used to decode the data in one
@@ -775,14 +777,14 @@ TRT_RodDecoder::int_fillMinimalCompress( const ROBFragment *robFrag,
// ATH_MSG_WARNING( "vint[" << in_ptr << "] = " << MSG::hex << vint[in_ptr] << MSG::dec );
}
if ( v ) {
- if ( err_count < 100 ) {
+ if ( m_err_count_int_fillMinimalCompress < 100 ) {
ATH_MSG_WARNING( "Invalid ByteStream, ROD ID = " \
<< MSG::hex << robid << MSG::dec );
- err_count++;
- } else if ( 100 == err_count ) {
+ m_err_count_int_fillMinimalCompress++;
+ } else if ( 100 == m_err_count_int_fillMinimalCompress ) {
ATH_MSG_WARNING( "Too many Invalid ByteStream messages " \
<< "Turning message off." );
- err_count++;
+ m_err_count_int_fillMinimalCompress++;
}
return StatusCode::RECOVERABLE;
}
@@ -938,8 +940,6 @@ TRT_RodDecoder::int_fillFullCompress( const ROBFragment *robFrag,
t_CompressTable* Ctable,
const std::vector<IdentifierHash>* vecHash)
{
- static int err_count = 0;
-
int phase;
for ( phase=0; phase<2; phase++ )
{
@@ -1033,17 +1033,17 @@ TRT_RodDecoder::int_fillFullCompress( const ROBFragment *robFrag,
word = Ctable->m_syms[idx];
else
{
- if ( err_count < 100 )
+ if ( m_err_count_int_fillFullCompress < 100 )
{
ATH_MSG_WARNING( "Invalid ByteStream, ROD ID = " \
<< MSG::hex << robid << MSG::dec );
- err_count++;
+ m_err_count_int_fillFullCompress++;
}
- else if ( 100 == err_count )
+ else if ( 100 == m_err_count_int_fillFullCompress )
{
ATH_MSG_WARNING( "Too many Invalid ByteStream messages " \
<< "Turning message off." );
- err_count++;
+ m_err_count_int_fillFullCompress++;
}
return StatusCode::RECOVERABLE;
@@ -1700,7 +1700,8 @@ TableFilename
* Read Compression Table from DB on IOV change
*/
StatusCode
-TRT_RodDecoder::update()
+TRT_RodDecoder::update ATLAS_NOT_THREAD_SAFE ()
+// Non-thread-safe function 'AthenaAttributeList::AthenaAttributeList(const coral::AttributeList&)' called
{
/*
diff --git a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.h b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.h
index 9d7103b9527732130ed046b74fd677d6e7a89217..0a0d47657d6584da455bc365c9f182c2606f145c 100644
--- a/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.h
+++ b/InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_RAWDATABYTESTREAM_TRT_RODDECODER_H
@@ -61,12 +61,19 @@
*/
#include "InDetIdentifier/TRT_ID.h"
+/*
+ * For cache
+ */
+#include "AthenaKernel/SlotSpecificObj.h"
+#include "CxxUtils/checker_macros.h"
+
/*
* STL
*/
-#include <vector>
+#include <atomic>
#include <map>
-
+#include <mutex>
+#include <vector>
// the tool to decode a ROB frament
@@ -155,6 +162,10 @@ public:
uint32_t m_Nrdos; // Number of RDOs created
+ mutable std::atomic<int> m_err_count_fillCollection{0};
+ mutable std::atomic<int> m_err_count_int_fillMinimalCompress{0};
+ mutable std::atomic<int> m_err_count_int_fillFullCompress{0};
+
// This replaces the IOVCALLBACK
SG::ReadCondHandleKey<CondAttrListCollection> m_CompressKey{this,"keyName","/TRT/Onl/ROD/Compress","in-key"};
mutable std::mutex m_cacheMutex;
@@ -178,7 +189,19 @@ private:
StatusCode ReadCompressTableFile( std::string TableFilename );
StatusCode ReadCompressTableDB( std::string Tag );
-
+
+ // Struct for event cache
+ struct CacheEntry {
+ EventContext::ContextEvt_t m_evt{EventContext::INVALID_CONTEXT_EVT};
+ uint32_t Last_print_L1ID = 0xffffffff;
+ uint32_t Last_print_BCID = 0xffffffff;
+ void reset() {
+ Last_print_L1ID = 0xffffffff;
+ Last_print_BCID = 0xffffffff;
+ }
+ };
+ mutable SG::SlotSpecificObj<CacheEntry> m_cache ATLAS_THREAD_SAFE; // Guarded by m_cacheMutex
+
};
#endif
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
index 558c5376729c6485d36f79674d1829966580b50e..03800a50999144a60392305eeda607b69e3b3a6c 100755
--- a/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/ConfiguredNewTrackingCuts.py
@@ -221,6 +221,21 @@ class ConfiguredNewTrackingCuts :
self.__maxPrimaryImpact = 5.0 * Units.mm #based on studies by T.Strebler
if self.__indetflags.cutLevel() >= 17:
+ # Tuning of the search road and strip seed IP in the track finder.
+ # Designed to speed up reconstruction at minimal performance impact.
+ self.__roadWidth = 12
+ self.__maxdImpactSSSSeeds = 5.0 * Units.mm
+
+ if self.__indetflags.cutLevel() >= 18:
+ # Further tuning of the pattern recognition designed to
+ # speed up reconstruction compared to 17 with minimal additional
+ # impact. Kept as separate level pending cross-check of
+ # seed confirmation robustness with end-of-run-3 radiation
+ # damage.
+ self.__keepAllConfirmedSeeds = True
+ self.__maxSeedsPerSP = 1
+
+ if self.__indetflags.cutLevel() >= 19:
print('--------> FATAL ERROR, cut level undefined, abort !')
import sys
sys.exit()
@@ -356,12 +371,12 @@ class ConfiguredNewTrackingCuts :
self.__minPT = 1.0 * Units.GeV
self.__maxEta = 3
self.__maxPrimaryImpact = 300.0 * Units.mm
- self.__maxZImpact = 750 * Units.mm
+ self.__maxZImpact = 500 * Units.mm
self.__maxSecondaryImpact = 300.0 * Units.mm
self.__minSecondaryPt = 1000.0 * Units.MeV
self.__minClusters = 8
self.__minSiNotShared = 6
- self.__maxShared = 2 # cut is now on number of shared modules
+ self.__maxShared = 2 # cut is now on number of shared modules
self.__minPixel = 0
self.__maxHoles = 2
self.__maxPixelHoles = 1
@@ -374,10 +389,13 @@ class ConfiguredNewTrackingCuts :
self.__maxTracksPerSharedPRD = 2
self.__Xi2max = 9.0
self.__Xi2maxNoAdd = 25.0
- self.__roadWidth = 10.
+ self.__roadWidth = 5.
self.__nWeightedClustersMin = 8
self.__maxdImpactSSSSeeds = 300.0
self.__doZBoundary = True
+ self.__keepAllConfirmedSeeds = True
+ self.__maxSeedsPerSP = 1
+
# --- mode for high-d0 tracks down to 100 MeV (minPT, minClusters, minSecondaryPt cuts loosened to MinBias level)
if mode == "LowPtLargeD0":
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index 6763a49094d6e71886b3bc727cdbd66dc1b9bd38..740a6bebad07d9d1cd48dc9b35a985e9412084f3 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -302,8 +302,8 @@ class cutLevel(InDetFlagsJobProperty):
"""
statusOn = True
allowedTypes = ['int']
- allowedValues= [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]
- StoredValue = 16
+ allowedValues= [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]
+ StoredValue = 18
class doBremRecovery(InDetFlagsJobProperty):
"""Turn on running of Brem Recover in tracking"""
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
index 74ce2050aab70f8bd8a5762d5b826d09ce3b4c9c..3e35f6f2984935505a73acd67057922cee790213 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
@@ -94,10 +94,14 @@ class ConfiguredNewTrackingSiPattern:
InDetSiSpacePointsSeedMaker.maxdImpactSSS = NewTrackingCuts.maxdImpactSSSSeeds()
InDetSiSpacePointsSeedMaker.maxSeedsForSpacePoint = NewTrackingCuts.MaxSeedsPerSP()
InDetSiSpacePointsSeedMaker.alwaysKeepConfirmedSeeds = NewTrackingCuts.KeepAllConfirmedSeeds()
-
+
if NewTrackingCuts.mode() == "R3LargeD0":
InDetSiSpacePointsSeedMaker.usePixel = False
InDetSiSpacePointsSeedMaker.etaMax = NewTrackingCuts.maxEta()
+ InDetSiSpacePointsSeedMaker.maxSeedsForSpacePoint = NewTrackingCuts.MaxSeedsPerSP()
+ InDetSiSpacePointsSeedMaker.alwaysKeepConfirmedSeeds = NewTrackingCuts.KeepAllConfirmedSeeds()
+ InDetSiSpacePointsSeedMaker.maxdRadius = 150
+ InDetSiSpacePointsSeedMaker.seedScoreBonusConfirmationSeed = -2000 #let's be generous
if usePrdAssociationTool:
# not all classes have that property !!!
diff --git a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/CMakeLists.txt b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/CMakeLists.txt
index 51a7228809b56d3da6c015826f918b52c8174330..19e5971aee6ee058803fc7f3e37079f0b6235020 100644
--- a/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/CMakeLists.txt
+++ b/InnerDetector/InDetRecAlgs/InDetLowBetaFinder/CMakeLists.txt
@@ -33,7 +33,7 @@ atlas_add_component( InDetLowBetaFinder
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel TRT_ConditionsServicesLib StoreGateLib SGtests TRT_ConditionsData InDetIdentifier InDetLowBetaInfo InDetRIO_OnTrack TrkParameters xAODTracking TrkRIO_OnTrack TrkTrack MagFieldElements MagFieldConditions )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps GaudiKernel TRT_ConditionsServicesLib StoreGateLib SGtests TRT_ConditionsData InDetIdentifier InDetLowBetaInfo InDetRIO_OnTrack TrkParameters xAODTracking TrkRIO_OnTrack TrkTrack MagFieldElements MagFieldConditions TRT_ElectronPidToolsLib )
# Install files from the package:
atlas_install_headers( InDetLowBetaFinder )
diff --git a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/CMakeLists.txt b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/CMakeLists.txt
index dc60da07323b97681a23c1fe29b8b6628a105a2b..a4391bfad7f2db59cab14f05a0761a49a1be0b0f 100644
--- a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/CMakeLists.txt
@@ -12,12 +12,14 @@ atlas_depends_on_subdirs( )
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Control/AthenaKernel
+ Control/CxxUtils
GaudiKernel )
# External dependencies:
find_package( CLHEP )
find_package( Eigen )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( Boost COMPONENTS unit_test_framework )
# tag rootMathLibs was not recognized in automatic conversion in cmt2cmake
@@ -30,3 +32,11 @@ atlas_add_component( InDetEtaDependentCuts
# Install files from the package:
atlas_install_headers( InDetEtaDependentCuts )
+atlas_install_joboptions( share/*.txt )
+
+atlas_add_test( InDetEtaDependentCutsSvc_test
+ SOURCES test/InDetEtaDependentCutsSvc_test.cxx
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AthenaKernel AthenaBaseComps GaudiKernel TestTools CxxUtils InDetRecToolInterfaces
+ POST_EXEC_SCRIPT "nopost.sh" )
+
diff --git a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h
index dd628f66ab0a1baf0c6720b78cc75e2b14ef341c..b9105c840ebd4b5466cebdc0196c6fbbd373a711 100644
--- a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h
+++ b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h
@@ -30,15 +30,15 @@ namespace InDet {
InDetEtaDependentCutsSvc(const std::string& name, ISvcLocator* sl);
/// Destructor:
- virtual ~InDetEtaDependentCutsSvc();
+ virtual ~InDetEtaDependentCutsSvc() override final;
- virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvIF);
+ virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvIF) final;
- StatusCode initialize();
- StatusCode finalize();
+ StatusCode initialize() override final;
+ StatusCode finalize() override final;
- void getValue(const InDet::CutName cutName, std::vector < double >& cut);
- void getValue(const InDet::CutName cutName, std::vector < int >& cut);
+ void getValue(const InDet::CutName cutName, std::vector < double >& cut) override final;
+ void getValue(const InDet::CutName cutName, std::vector < int >& cut) override final;
template <class T>
T getValueAtEta(const std::vector< T > cuts, const double eta) const;
@@ -46,18 +46,18 @@ namespace InDet {
template <class T>
void getValue(const InDet::CutName cutName, T& cut, const double eta);
- double getMaxEta() const;
- double getMinPtAtEta (const double eta) const;
- double getMaxZImpactAtEta (const double eta) const;
- double getMaxPrimaryImpactAtEta(const double eta) const;
- int getMinSiHitsAtEta (const double eta) const;
- int getMinSiNotSharedAtEta (const double eta) const;
- int getMaxSharedAtEta (const double eta) const;
- int getMinPixelHitsAtEta (const double eta) const;
- int getMaxSiHolesAtEta (const double eta) const;
- int getMaxPixelHolesAtEta (const double eta) const;
- int getMaxSctHolesAtEta (const double eta) const;
- int getMaxDoubleHolesAtEta (const double eta) const;
+ double getMaxEta() const override final;
+ double getMinPtAtEta (const double eta) const override final;
+ double getMaxZImpactAtEta (const double eta) const override final;
+ double getMaxPrimaryImpactAtEta(const double eta) const override final;
+ int getMinSiHitsAtEta (const double eta) const override final;
+ int getMinSiNotSharedAtEta (const double eta) const override final;
+ int getMaxSharedAtEta (const double eta) const override final;
+ int getMinPixelHitsAtEta (const double eta) const override final;
+ int getMaxSiHolesAtEta (const double eta) const override final;
+ int getMaxPixelHolesAtEta (const double eta) const override final;
+ int getMaxSctHolesAtEta (const double eta) const override final;
+ int getMaxDoubleHolesAtEta (const double eta) const override final;
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/share/InDetEtaDependentCutsTestJobOpts.txt b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/share/InDetEtaDependentCutsTestJobOpts.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a6c30adcc5e2d503810789f76e83f0b9728d1dce
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/share/InDetEtaDependentCutsTestJobOpts.txt
@@ -0,0 +1,3 @@
+ApplicationMgr.OutputLevel = 5;
+ApplicationMgr.CreateSvc += { "InDet::InDetEtaDependentCutsSvc" };
+MessageSvc.OutputLevel = 5;
diff --git a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/src/InDetEtaDependentCutsSvc.cxx b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/src/InDetEtaDependentCutsSvc.cxx
index 941bc8d3fcd51ea4428767fd9d1380b4e3b319c7..69fddc30421d0b8e729e9709f757706207a5afdb 100644
--- a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/src/InDetEtaDependentCutsSvc.cxx
+++ b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/src/InDetEtaDependentCutsSvc.cxx
@@ -47,13 +47,13 @@ namespace InDet {
ATH_MSG_INFO ("Initializing " << name() << "...");
if ((m_etaBins.size()-1) <= 0) {
- ATH_MSG_ERROR( "Wrong inizialisation of eta bins. Check the eta bin values in " << name() );
+ ATH_MSG_ERROR( "Wrong initialisation of eta bins. Check the eta bin values in " << name() );
return StatusCode::FAILURE;
}
// expecting eta bins in ascending order
if (not std::is_sorted(m_etaBins.value().begin(), m_etaBins.value().end())) {
- ATH_MSG_ERROR( "Wrong inizialisation of eta bins in " << name() << ". Values are not sorted!" );
+ ATH_MSG_ERROR( "Wrong initialisation of eta bins in " << name() << ". Values are not sorted!" );
return StatusCode::FAILURE;
}
@@ -140,14 +140,14 @@ namespace InDet {
}
int InDetEtaDependentCutsSvc::getIndexByEta(const double eta) const {
- double absEta = std::abs(eta);
+ const double absEta = std::abs(eta);
if (absEta > m_etaBins.value().back()) {
ATH_MSG_ERROR("Requesting cut value for eta outside expected range!! ");
return -1;
}
- auto pVal = std::lower_bound(m_etaBins.value().begin(), m_etaBins.value().end(), absEta);
- int bin = std::distance(m_etaBins.value().begin(), pVal) - 1;
+ const auto pVal = std::lower_bound(m_etaBins.value().begin(), m_etaBins.value().end(), absEta);
+ const int bin = std::distance(m_etaBins.value().begin(), pVal) - 1;
ATH_MSG_DEBUG("Checking (abs(eta)/bin) = (" << absEta << "," << bin << ")");
return bin;
}
diff --git a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/test/IDEDCSvc_GaudiFixtureBase.h b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/test/IDEDCSvc_GaudiFixtureBase.h
new file mode 100644
index 0000000000000000000000000000000000000000..230e1299f4f63aa466341ea0178d762e4afbbe1e
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/test/IDEDCSvc_GaudiFixtureBase.h
@@ -0,0 +1,40 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/*
+ */
+/**
+ * @file InDetEtaDependentCuts/test/IDEDC_GaudiFixtureBase.h
+ * @author Shaun Roe
+ * @date June 2020
+ * @brief Base class for initialising Gaudi in fixtures
+ */
+
+#ifndef InDetPhysValMonitoring_IDPVM_GaudiFixtureBase_h
+#define InDetPhysValMonitoring_IDPVM_GaudiFixtureBase_h
+
+
+#include "TestTools/initGaudi.h"
+#include "TInterpreter.h"
+#include "CxxUtils/checker_macros.h"
+#include "CxxUtils/ubsan_suppress.h"
+#include <string>
+
+ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // This is for unit tests and a static variable IDEDC_GaudiFixtureBase::gaudiIsInitialised is used.
+
+struct IDEDC_GaudiFixtureBase{
+ ISvcLocator* svcLoc{};
+ static bool gaudiIsInitialised;
+ const std::string jobOpts{};
+ IDEDC_GaudiFixtureBase(const std::string & jobOptionFile = "InDetEtaDependentCutsTestJobOpts.txt"):jobOpts(jobOptionFile){
+ CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); } );
+ if (not gaudiIsInitialised){
+ std::string fullJobOptsName="InDetEtaDependentCuts/" + jobOpts;
+ gaudiIsInitialised=Athena_test::initGaudi(fullJobOptsName, svcLoc);
+ }
+ }
+};
+
+bool IDEDC_GaudiFixtureBase::gaudiIsInitialised=false;
+
+#endif
diff --git a/InnerDetector/InDetRecTools/InDetEtaDependentCuts/test/InDetEtaDependentCutsSvc_test.cxx b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/test/InDetEtaDependentCutsSvc_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..014bd39057b303cf241e45f7ad09158833f592e2
--- /dev/null
+++ b/InnerDetector/InDetRecTools/InDetEtaDependentCuts/test/InDetEtaDependentCutsSvc_test.cxx
@@ -0,0 +1,57 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file InDetEtaDependentCuts/test/InDetEtaDependentCutsSvc_test.cxx
+ * @author Shaun Roe
+ * @date June, 2020
+ * @brief Some tests for InDetEtaDependentCutsSvc
+ */
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MAIN
+#define BOOST_TEST_MODULE TEST_ETADEPENDENTCUTSSVC
+
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
+#include <boost/test/unit_test.hpp>
+#pragma GCC diagnostic pop
+
+#include "IDEDCSvc_GaudiFixtureBase.h"
+#include "../InDetEtaDependentCuts/InDetEtaDependentCutsSvc.h"
+
+#include "CxxUtils/checker_macros.h"
+ATLAS_NO_CHECK_FILE_THREAD_SAFETY; // This is unit test and a static variable is used in IDEDC_GaudiFixtureBase.
+
+static const std::string testJobOptionsFile("InDetEtaDependentCutsTestJobOpts.txt");
+
+struct GaudiKernelFixture:public IDEDC_GaudiFixtureBase{
+ GaudiKernelFixture(const std::string & joFilename):IDEDC_GaudiFixtureBase(joFilename){
+ //nop, everything in base.
+ }
+};
+
+using namespace InDet;
+
+BOOST_AUTO_TEST_SUITE(EtaDependentCutsSvcTest)
+ GaudiKernelFixture g(testJobOptionsFile);
+ const auto & svcLoc=g.svcLoc;
+ ServiceHandle<IInDetEtaDependentCutsSvc> idEDCSvc ("InDet::InDetEtaDependentCutsSvc", "test");
+
+ BOOST_AUTO_TEST_CASE( sanityCheck ){
+ const bool svcLocatorIsOk=(svcLoc != nullptr);
+ BOOST_TEST(svcLocatorIsOk);
+ }
+ BOOST_AUTO_TEST_CASE( retrieveSvc ){
+ BOOST_TEST (idEDCSvc.retrieve().isSuccess());
+ }
+ BOOST_AUTO_TEST_CASE( interfaceID ){
+ InterfaceID testId("IInDetEtaDependentCutsSvc",1,0);
+ BOOST_TEST(idEDCSvc->interfaceID()==testId);
+ }
+ BOOST_AUTO_TEST_CASE(publicMethods){
+ BOOST_TEST(idEDCSvc->getMaxEta() == 4.0);
+ }
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetVKalVxInJetTool.h b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetVKalVxInJetTool.h
index fdf8c1b8b848fa74ee84e82dca0a7a41476d2143..b6e88bc5a331e3bde70e31a58b2d7bbd1bd98c22 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetVKalVxInJetTool.h
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/InDetVKalVxInJetTool/InDetVKalVxInJetTool.h
@@ -405,7 +405,7 @@ namespace InDet {
//
//
- void printWrkSet(const std::vector<WrkVrt> * WrkSet, const std::string name ) const;
+ void printWrkSet(const std::vector<WrkVrt> * WrkSet, const std::string& name ) const;
StatusCode CutTrk(double,double, double , double , double ,
@@ -443,15 +443,15 @@ namespace InDet {
double JetProjDist(Amg::Vector3D &SecVrt, const xAOD::Vertex &PrimVrt, const TLorentzVector &JetDir) const;
double VrtVrtDist(const Trk::RecVertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> VrtErr,double& Signif ) const;
+ const std::vector<double>& VrtErr,double& Signif ) const;
double VrtVrtDist(const xAOD::Vertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> VrtErr,double& Signif ) const;
+ const std::vector<double>& VrtErr,double& Signif ) const;
double VrtVrtDist2D(const xAOD::Vertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> VrtErr,double& Signif ) const;
+ const std::vector<double>& VrtErr,double& Signif ) const;
double VrtVrtDist(const Trk::RecVertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> SecVrtErr, const TLorentzVector & JetDir) const;
+ const std::vector<double>& SecVrtErr, const TLorentzVector & JetDir) const;
double VrtVrtDist(const xAOD::Vertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> SecVrtErr, const TLorentzVector & JetDir) const;
+ const std::vector<double>& SecVrtErr, const TLorentzVector & JetDir) const;
double VrtVrtDist(const Amg::Vector3D & Vrt1, const std::vector<double>& VrtErr1,
const Amg::Vector3D & Vrt2, const std::vector<double>& VrtErr2) const;
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSec.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSec.cxx
index ff9afe1b914aa0eeef14dbb7e82a23a86f7a1bf2..1b28eaca35269914d4d07ce8cd0b20005c66fc21 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSec.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSec.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
*/
// Header include
@@ -706,7 +706,7 @@ namespace InDet{
std::vector<double> Chi2PerTrk,VKPerigee,CovPerigee,closeVrtSig(0),closeVrtCh2(0);
//TLorentzVector Momentum;
std::vector<double> Impact,ImpactError;
- double Chi2, Signif3D, Dist2D, JetVrtDir;
+ double Signif3D, Dist2D, JetVrtDir;
long int Charge;
int i,j;
StatusCode sc; sc.setChecked();
@@ -726,7 +726,7 @@ namespace InDet{
std::vector<int> hitIBL(NTracks,0), hitBL(NTracks,0);
std::vector<double> TrackSignif(NTracks),TrkSig3D(NTracks);
std::vector< std::vector<float> > trkScore(NTracks);
- AmgVector(5) tmpPerigee; tmpPerigee<<0.,0.,0.,0.,0.;
+ AmgVector(5) tmpPerigee; tmpPerigee.setZero();
for (i=0; i<NTracks; i++) {
TrkSig3D[i] = m_fitSvc->VKalGetImpact(SelectedTracks[i], PrimVrt.position(), 1, Impact, ImpactError);
tmpPerigee = GetPerigee(SelectedTracks[i])->parameters();
@@ -948,7 +948,7 @@ namespace InDet{
ListSecondTracks.push_back(SelectedTracks[i]);
ListSecondTracks.push_back(SelectedTracks[j]);
closeVrtSig.push_back(Signif3D);
- closeVrtCh2.push_back(Chi2);
+ closeVrtCh2.push_back(tmpVrt.Chi2);
}
}
}
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSecMulti.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSecMulti.cxx
index 2ed426626b48ef82bee2b6b39438e74f2143432e..0b80fcf4533128670a506e2ee2dd3188f4897ae2 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSecMulti.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/BTagVrtSecMulti.cxx
@@ -267,7 +267,7 @@ const double c_vrtBCMassLimit=5500.; // Mass limit to consider a vertex not com
//printWrkSet(WrkVrtSet,"InitialVrts");
//for(auto ku : vrtWithCommonTrk)std::cout<<" nCom="<<ku.first<<" v1="<<ku.second.first<<" v2="<<ku.second.second<<'\n';
//===========================================
- for(icvrt=vrtWithCommonTrk.rbegin(); icvrt!=vrtWithCommonTrk.rend(); icvrt++){
+ for(icvrt=vrtWithCommonTrk.rbegin(); icvrt!=vrtWithCommonTrk.rend(); ++icvrt){
int nTCom=(*icvrt).first;
int iv=(*icvrt).second.first;
int jv=(*icvrt).second.second;
@@ -656,7 +656,7 @@ const double c_vrtBCMassLimit=5500.; // Mass limit to consider a vertex not com
for(int it=0; it<(int)nonusedTrk.size(); it++){ if(matchSV[it].indVrt==iv){addTrk[matchSV[it].Signif3D]=it;} }
std::map<double,int>::iterator atrk=addTrk.begin();
if(addTrk.size()>0){ if(atrk->first<4.){newV.SelTrk.push_back(nonusedTrk[atrk->second]);addedT=true;}}
- if(addTrk.size()>1){atrk++;if(atrk->first<4.){newV.SelTrk.push_back(nonusedTrk[atrk->second]);}}
+ if(addTrk.size()>1){++atrk;if(atrk->first<4.){newV.SelTrk.push_back(nonusedTrk[atrk->second]);}}
if(addedT){ if (xAODwrk)vProb = RefitVertex( newV, xAODwrk->listJetTracks, *state, true);
else if(RECwork)vProb = RefitVertex( newV, RECwork->listJetTracks, *state, true);
if(vProb>0.01)GoodVertices[iv]=newV;
@@ -1019,7 +1019,7 @@ const double c_vrtBCMassLimit=5500.; // Mass limit to consider a vertex not com
std::deque<long int>::iterator it;
//std::cout<<" In Found ="<<SelectedTrack<<", "<<SelectedVertex<<'\n';
for(it=(*WrkVrtSet).at(SelectedVertex).SelTrk.begin();
- it!=(*WrkVrtSet)[SelectedVertex].SelTrk.end(); it++) {
+ it!=(*WrkVrtSet)[SelectedVertex].SelTrk.end(); ++it) {
if( (*it) == SelectedTrack ) {
(*WrkVrtSet)[SelectedVertex].SelTrk.erase(it); break;
}
@@ -1027,7 +1027,7 @@ const double c_vrtBCMassLimit=5500.; // Mass limit to consider a vertex not com
}
for(it=(*TrkInVrt).at(SelectedTrack).begin();
- it!=(*TrkInVrt)[SelectedTrack].end(); it++) {
+ it!=(*TrkInVrt)[SelectedTrack].end(); ++it) {
if( (*it) == SelectedVertex ) {
(*TrkInVrt)[SelectedTrack].erase(it); break;
}
@@ -1036,7 +1036,7 @@ const double c_vrtBCMassLimit=5500.; // Mass limit to consider a vertex not com
//Check if track is removed from 2tr vertex => then sharing of track left should also be decreased
if( (*WrkVrtSet)[SelectedVertex].SelTrk.size() == 1){
long int LeftTrack=(*WrkVrtSet)[SelectedVertex].SelTrk[0]; // track left in 1tr vertex
- for(it=(*TrkInVrt).at(LeftTrack).begin(); it!=(*TrkInVrt)[LeftTrack].end(); it++) {
+ for(it=(*TrkInVrt).at(LeftTrack).begin(); it!=(*TrkInVrt)[LeftTrack].end(); ++it) {
if( (*it) == SelectedVertex ) {
(*TrkInVrt)[LeftTrack].erase(it); break;
}
@@ -1377,7 +1377,7 @@ const double c_vrtBCMassLimit=5500.; // Mass limit to consider a vertex not com
const
{
std::deque<long int>::iterator trk=test.begin();
- for(trk=test.begin(); trk!=test.end(); trk++)
+ for(trk=test.begin(); trk!=test.end(); ++trk)
if(std::find(base.begin(), base.end(), (*trk)) == base.end()) return false; //element not found => test is not part of base
return true;
}
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/CutTrk.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/CutTrk.cxx
index ae1d7c7e3d947fb7515244c3b6eea179e4b7fee5..f8905ae52b22a60b28cf53f216fac31bdea1d8d7 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/CutTrk.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/CutTrk.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
*/
// Header include
@@ -53,7 +53,7 @@ namespace InDet{
{
std::vector<const Rec::TrackParticle*>::const_iterator i_ntrk;
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
const Trk::Perigee* mPer;
const Trk::FitQuality* TrkQual;
std::vector<double> Impact,ImpactError;
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/Utilities.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/Utilities.cxx
index 59d38fa4a2ab613d4f92842dbc6bb5b324cab2d1..b7069acde9af707b46429c02bcee62e83cd9d7aa 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/Utilities.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/Utilities.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
*/
// Header include
@@ -73,7 +73,7 @@ namespace InDet{
return tl;
}
- void InDetVKalVxInJetTool::printWrkSet(const std::vector<WrkVrt> *, const std::string ) const {
+ void InDetVKalVxInJetTool::printWrkSet(const std::vector<WrkVrt> *, const std::string& ) const {
/* void InDetVKalVxInJetTool::printWrkSet(const std::vector<WrkVrt> *WrkVrtSet, const std::string name) const {
int nGoodV=0;
for(int iv=0; iv<(int)WrkVrtSet->size(); iv++) {
@@ -127,7 +127,7 @@ namespace InDet{
}
double InDetVKalVxInJetTool::VrtVrtDist(const Trk::RecVertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> SecVrtErr, double& Signif)
+ const std::vector<double>& SecVrtErr, double& Signif)
const
{
double distx = PrimVrt.position().x()- SecVrt.x();
@@ -159,7 +159,7 @@ namespace InDet{
}
double InDetVKalVxInJetTool::VrtVrtDist(const xAOD::Vertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> SecVrtErr, double& Signif)
+ const std::vector<double>& SecVrtErr, double& Signif)
const
{
double distx = PrimVrt.x()- SecVrt.x();
@@ -192,7 +192,7 @@ namespace InDet{
}
double InDetVKalVxInJetTool::VrtVrtDist2D(const xAOD::Vertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> SecVrtErr, double& Signif)
+ const std::vector<double>& SecVrtErr, double& Signif)
const
{
double distx = PrimVrt.x()- SecVrt.x();
@@ -220,7 +220,7 @@ namespace InDet{
// Significance along jet direction
//--------------------------------------------------
double InDetVKalVxInJetTool::VrtVrtDist(const Trk::RecVertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> SecVrtErr, const TLorentzVector & JetDir)
+ const std::vector<double>& SecVrtErr, const TLorentzVector & JetDir)
const
{
Amg::Vector3D jetDir(JetDir.Vect().Unit().X(), JetDir.Vect().Unit().Y(), JetDir.Vect().Unit().Z());
@@ -258,7 +258,7 @@ namespace InDet{
// Significance along jet direction
//--------------------------------------------------
double InDetVKalVxInJetTool::VrtVrtDist(const xAOD::Vertex & PrimVrt, const Amg::Vector3D & SecVrt,
- const std::vector<double> SecVrtErr, const TLorentzVector & JetDir)
+ const std::vector<double>& SecVrtErr, const TLorentzVector & JetDir)
const
{
Amg::Vector3D jetDir(JetDir.Vect().Unit().X(), JetDir.Vect().Unit().Y(), JetDir.Vect().Unit().Z());
@@ -401,7 +401,7 @@ namespace InDet{
double sx=SumP.Px()/Norm; double sy=SumP.Py()/Norm; double sz=SumP.Pz()/Norm;
double px=0.,py=0.,pz=0.,ee=0.; double scale;
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
for (int i = 0; i < (int)InpTrk.size(); ++i) {
if( InpTrk[i]== NULL ){ continue; }
VectPerig = InpTrk[i]->parameters();
@@ -428,7 +428,7 @@ namespace InDet{
double sx=Dir.x()/Norm; double sy=Dir.y()/Norm; double sz=Dir.z()/Norm;
double px=0.,py=0.,pz=0.,ee=0.; double scale;
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
for (int i = 0; i < (int)InpTrk.size(); ++i) {
if( InpTrk[i] == NULL ){ continue; }
VectPerig = InpTrk[i]->parameters();
@@ -466,7 +466,7 @@ namespace InDet{
TLorentzVector InDetVKalVxInJetTool::TotalMom(const std::vector<const Trk::Perigee*>& InpTrk)
const
{
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
double px=0.,py=0.,pz=0.,ee=0.;
for (int i = 0; i < (int)InpTrk.size(); ++i) {
if( InpTrk[i] == NULL ){ continue; }
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..b9f7598d95ed1dd3b4e00515ed10c3f845741aff
--- /dev/null
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetRecTools/PixelToTPIDTool
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/PixeldEdxAODFix.h b/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/PixeldEdxAODFix.h
deleted file mode 100644
index 1f0cad39ed3957f2901167e6651b629fcc581ce1..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/PixelToTPIDTool/PixeldEdxAODFix.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELTOTPIDTOOL_PIXELDEDXAODFIX_H
-#define PIXELTOTPIDTOOL_PIXELDEDXAODFIX_H
-
-#include "AthenaBaseComps/AthAlgorithm.h"
-#include "GaudiKernel/ToolHandle.h"
-
-namespace Trk {
- class ITrackSummaryHelperTool;
-}
-
-namespace InDet {
- class PixeldEdxAODFix : public AthAlgorithm
- {
- public:
- PixeldEdxAODFix(const std::string &name, ISvcLocator *pSvcLocator);
- virtual ~PixeldEdxAODFix();
- StatusCode initialize();
- StatusCode execute();
- StatusCode finalize();
-
- private:
- ToolHandle< Trk::ITrackSummaryHelperTool > m_summarytool;
- std::vector<std::string> m_tpcontainernames;
- };
-
-}
-
-#endif
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixeldEdxAODFix.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixeldEdxAODFix.cxx
deleted file mode 100644
index b2b12a635e909be31c5178b43906fa96ab83a493..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/PixeldEdxAODFix.cxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "PixelToTPIDTool/PixeldEdxAODFix.h"
-#include "TrkTrackSummary/TrackSummary.h"
-#include "TrkTrackSummary/InDetTrackSummary.h"
-#include "TrkToolInterfaces/ITrackSummaryHelperTool.h"
-#include "Particle/TrackParticleContainer.h"
-#include "Particle/TrackParticle.h"
-#include "TrkTrack/Track.h"
-#include "TrkTrack/TrackStateOnSurface.h"
-
-namespace InDet
-{
-PixeldEdxAODFix::PixeldEdxAODFix(const std::string &name, ISvcLocator *pSvcLocator)
- : AthAlgorithm (name, pSvcLocator),
- m_summarytool("") {
-
- declareProperty("TrackParticleContainers",m_tpcontainernames);
- declareProperty("SummaryHelperTool",m_summarytool);
-}
-
-PixeldEdxAODFix::~PixeldEdxAODFix() {
-}
-
-StatusCode PixeldEdxAODFix::initialize() {
- msg(MSG::INFO) << "PixeldEdxAODFix::initialize()" << endmsg;
- if ( m_summarytool.retrieve().isFailure() ) {
- msg(MSG:: FATAL) << m_summarytool.propertyName() << ": Failed to retrieve tool " << m_summarytool.type() << endmsg;
- return StatusCode::FAILURE;
- } else {
- msg(MSG::INFO) << m_summarytool.propertyName() << ": Retrieved tool " << m_summarytool.type() << endmsg;
- }
- return StatusCode::SUCCESS;
-
-}
-
-StatusCode PixeldEdxAODFix::execute() {
-
- for (int i=0;i<(int)m_tpcontainernames.size();i++){
- const Rec::TrackParticleContainer *tpcontainer=0;
- StatusCode sc=evtStore()->retrieve(tpcontainer,m_tpcontainernames[i]);
- if (sc.isFailure()){
- msg(MSG::WARNING) << "Could not retrieve " << m_tpcontainernames[i] << endmsg;
- return sc;
- }
-
- for (Rec::TrackParticleContainer::const_iterator it = tpcontainer->begin(); it != tpcontainer->end(); it++) {
- const Rec::TrackParticle* particle = *it;
- Trk::TrackSummary *summ=const_cast<Trk::TrackSummary *>(particle->trackSummary());
- if (!summ->indetTrackSummary()) continue;
- std::bitset<Trk::TrackStateOnSurface::NumberOfTrackStateOnSurfaceTypes> typePattern;
- typePattern.set(Trk::TrackStateOnSurface::Perigee);
- const Trk::TrackStateOnSurface *pertsos=new Trk::TrackStateOnSurface(0,particle->perigee()->clone(),0,0,typePattern);
- DataVector<const Trk::TrackStateOnSurface>*dv=new DataVector<const Trk::TrackStateOnSurface>;
- dv->push_back(pertsos);
- Trk::TrackInfo info(Trk::TrackInfo::GlobalChi2Fitter,Trk::pion);
-
- Trk::Track tmptrack(info,dv,0);
- m_summarytool->addDetailedTrackSummary(tmptrack,*summ);
-
- }
- }
- return StatusCode::SUCCESS;
-}
-
-StatusCode PixeldEdxAODFix::finalize() {
-
- return StatusCode::SUCCESS;
-
-}
-
-}
diff --git a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
index 52ee9bda88d7068eeb01323bafff189c7cf38608..2f37c6790bb52e221327a7e7047a0f5ddce729c7 100644
--- a/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/PixelToTPIDTool/src/components/PixelToTPIDTool_entries.cxx
@@ -1,6 +1,3 @@
#include "PixelToTPIDTool/PixelToTPIDTool.h"
-#include "PixelToTPIDTool/PixeldEdxAODFix.h"
DECLARE_COMPONENT( InDet::PixelToTPIDTool )
-DECLARE_COMPONENT( InDet::PixeldEdxAODFix )
-
diff --git a/InnerDetector/InDetTruth/InDetTruthAlgs/CMakeLists.txt b/InnerDetector/InDetTruth/InDetTruthAlgs/CMakeLists.txt
index b0e804c2c0a54b89a31c7fafe43ecc5d4899eedb..1e4faf8284b2d5874defcf84e61d5f6a2cfd7fee 100644
--- a/InnerDetector/InDetTruth/InDetTruthAlgs/CMakeLists.txt
+++ b/InnerDetector/InDetTruth/InDetTruthAlgs/CMakeLists.txt
@@ -23,7 +23,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( InDetTruthAlgs
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel InDetSimData InDetPrepRawData TrkTruthData TrkToolInterfaces TrkTrack EventContainers )
+ LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel InDetSimData InDetPrepRawData TrkTruthData TrkToolInterfaces TrkTrack EventContainers InDetTruthInterfaces )
# Install files from the package:
atlas_install_headers( InDetTruthAlgs )
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecoration.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecoration.py
index a95f6b552495eeef19ba12e35de1a7bc8c20c6c7..2dc4fc298f19c42e1a0ef6aa45cd8994d76cde6e 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecoration.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/python/InDetPhysValDecoration.py
@@ -149,7 +149,7 @@ def getInDetRttTruthSelectionTool(**kwargs) :
requireStatus1 = True,
requireCharged = True,
maxBarcode = ( 200*1000 if kwargs.pop("OnlyDressPrimaryTracks",True) else 2**31-1 ),
- maxProdVertRadius = 110.,
+ maxProdVertRadius = 300.,
maxEta = 2.5,
minPt = 400. )
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
index e7cc7e5953197a2ae6802f6a9735fc329e83293b..79abfa53da330a99f80bc5d7b41da40c58c90770 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/InDetPVMPlotDefCommon.xml
@@ -630,6 +630,10 @@
<x title="p_{T} [GeV]" n="25" lo="0" hi="50"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
</h>
+<h id="efficiency_vs_pt_low" type="TEfficiency" title="Fraction of reco-matched truth track">
+ <x title="p_{T} [GeV]" n="52" lo="0.4" hi="3"/>
+ <y title="Efficiency" lo="0.0" hi="2.0"/>
+</h>
<h id="efficiency_vs_phi" type="TEfficiency" title="Fraction of reco-matched truth track">
<x title="#phi [rads]" n="25" lo="-&PI;" hi="&PI;"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
@@ -650,6 +654,14 @@
<x title="Z [mm]" n="100" lo="-350" hi="350"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
</h>
+<h id="extended_efficiency_vs_d0" type="TEfficiency" title="Fraction of reco-matched truth track">
+ <x title="d_{0} [mm]" n="50" lo="-300" hi="300"/>
+ <y title="Efficiency" lo="0.0" hi="2.0"/>
+</h>
+<h id="extended_efficiency_vs_z0" type="TEfficiency" title="Fraction of reco-matched truth track">
+ <x title="z_{0} [mm]" n="50" lo="-750" hi="750"/>
+ <y title="Efficiency" lo="0.0" hi="2.0"/>
+</h>
<h id="efficiency_vs_prodR" type="TEfficiency" title="Track Efficiency vs Production Vertex Radius">
<x title="prod_R [mm]" n="100" lo="0" hi="1500"/>
<y title="Efficiency" lo="0.0" hi="2.0"/>
@@ -1066,7 +1078,7 @@
<h id="pullHelper_eta_ptqopt" type="TH2F" title="pull vs #eta for p_{T} #times q/p_{T}">
<x title="#eta" n="&NETA;" lo="-&ETA;" hi="&ETA;"/>
- <y title="(reco_{q/p_{T}} - truth_{q/p_{T}) / #sigma(q/p_{T})" n="100" lo="-10.0" hi="10.0"/>
+ <y title="(reco_{q/p_{T}} - truth_{q/p_{T}}) / #sigma(q/p_{T})" n="100" lo="-10.0" hi="10.0"/>
</h>
<h id="pullHelper_eta_theta" type="TH2F" title="pull vs #eta for #theta">
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Efficiency.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Efficiency.cxx
index 8e67ab65728c7a15ed2d026fde9e4e06fb61f858..e62298d7631a5b31d89a632159d4ccb24497d9b7 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Efficiency.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Efficiency.cxx
@@ -14,11 +14,14 @@ InDetPerfPlot_Efficiency::InDetPerfPlot_Efficiency(InDetPlotBase* pParent, const
InDetPlotBase(pParent, sDir),
m_efficiency_vs_eta{},
m_efficiency_vs_pt{},
+ m_efficiency_vs_pt_low{},
m_efficiency_vs_phi{},
m_efficiency_vs_d0{},
m_efficiency_vs_z0{},
m_efficiency_vs_R{},
m_efficiency_vs_Z{},
+ m_extended_efficiency_vs_d0{},
+ m_extended_efficiency_vs_z0{},
m_efficiency_vs_prodR{},
m_efficiency_vs_prodZ{} {
// nop
@@ -29,12 +32,15 @@ InDetPerfPlot_Efficiency::initializePlots() {
book(m_efficiency_vs_eta, "efficiency_vs_eta");
book(m_efficiency_vs_pt, "efficiency_vs_pt");
+ book(m_efficiency_vs_pt_low, "efficiency_vs_pt_low");
book(m_efficiency_vs_phi, "efficiency_vs_phi");
book(m_efficiency_vs_d0, "efficiency_vs_d0");
book(m_efficiency_vs_z0, "efficiency_vs_z0");
book(m_efficiency_vs_R, "efficiency_vs_R");
book(m_efficiency_vs_Z, "efficiency_vs_Z");
+ book(m_extended_efficiency_vs_d0, "extended_efficiency_vs_d0");
+ book(m_extended_efficiency_vs_z0, "extended_efficiency_vs_z0");
book(m_efficiency_vs_prodR, "efficiency_vs_prodR");
book(m_efficiency_vs_prodZ, "efficiency_vs_prodZ");
@@ -48,6 +54,7 @@ InDetPerfPlot_Efficiency::fill(const xAOD::TruthParticle& truth, const bool isGo
fillHisto(m_efficiency_vs_eta, eta, isGood);
fillHisto(m_efficiency_vs_pt, pt, isGood);
+ fillHisto(m_efficiency_vs_pt_low, pt, isGood);
fillHisto(m_efficiency_vs_phi, phi, isGood);
double d0 = truth.auxdata<float>("d0");
@@ -59,6 +66,8 @@ InDetPerfPlot_Efficiency::fill(const xAOD::TruthParticle& truth, const bool isGo
fillHisto(m_efficiency_vs_R, R, isGood);
fillHisto(m_efficiency_vs_Z, Z, isGood);
+ fillHisto(m_extended_efficiency_vs_d0, d0, isGood);
+ fillHisto(m_extended_efficiency_vs_z0, z0, isGood);
if (truth.hasProdVtx()) {
const xAOD::TruthVertex* vtx = truth.prodVtx();
double prod_rad = vtx->perp();
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Efficiency.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Efficiency.h
index b07f687e3ae53135b75e066cab249574cdf29f74..e075aedf929f56d62a51c9a543c7f35a9e76e43f 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Efficiency.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Efficiency.h
@@ -33,12 +33,15 @@ public:
private:
TEfficiency* m_efficiency_vs_eta;
TEfficiency* m_efficiency_vs_pt;
+ TEfficiency* m_efficiency_vs_pt_low;
TEfficiency* m_efficiency_vs_phi;
TEfficiency* m_efficiency_vs_d0;
TEfficiency* m_efficiency_vs_z0;
TEfficiency* m_efficiency_vs_R;
TEfficiency* m_efficiency_vs_Z;
+ TEfficiency* m_extended_efficiency_vs_d0;
+ TEfficiency* m_extended_efficiency_vs_z0;
TEfficiency* m_efficiency_vs_prodR;
TEfficiency* m_efficiency_vs_prodZ;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.cxx
index d7eaa5113295b5f9bbc06bf19e56e1b0698b8015..ab319b3d7957eb849ef90c7c513b80977ad22ca2 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_Resolution.cxx
@@ -367,7 +367,7 @@ InDetPerfPlot_Resolution::getTrackParameters(const xAOD::TruthParticle& truthprt
}
}
//rescale Pt
- if (m_truetrkP[PT] != undefinedValue) m_truetrkP[PT] = truthprt.pt() / Gaudi::Units::GeV;
+ m_truetrkP[PT] = truthprt.pt() / Gaudi::Units::GeV;
//special cases
//need both theta and qOverP for qOverPT
//we didnt check qOverP yet, since the closest named variable (strangely; see header) is ptqopt
@@ -422,4 +422,4 @@ InDetPerfPlot_Resolution::finalizePlots() {
}
-}
\ No newline at end of file
+}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
index 80be6f74dcd152b3ee590798875253f5a00219f1..f88dfc4668250d1026433cfd290e9319653b8072 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPhysValMonitoringTool.cxx
@@ -343,18 +343,20 @@ InDetPhysValMonitoringTool::fillHistograms() {
//
//Loop over reco tracks to find the match
//
+ const xAOD::TrackParticle* matchedTrack = nullptr;
for (const auto& thisTrack: selectedTracks) { // Inner loop over selected track particles
const xAOD::TruthParticle* associatedTruth = getAsTruth.getTruth(thisTrack);
if (associatedTruth && associatedTruth == thisTruth) {
float prob = getMatchingProbability(*thisTrack);
if (not std::isnan(prob) && prob > m_lowProb) {
isEfficient = true;
+ matchedTrack = thisTrack;
break;
}
}
}
ATH_MSG_DEBUG("Filling efficiency plots info monitoring plots");
- m_monPlots->fillEfficiency(*thisTruth, isEfficient, puEvents);
+ m_monPlots->fillEfficiency(*thisTruth, *matchedTrack, isEfficient, puEvents);
}
}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
index 547002cf1a89e1264ae5d7d63f7b6f7d3cf4a969..f74928bc807cbcaab76769325548c55338640935 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.cxx
@@ -40,6 +40,32 @@ InDetRttPlots::InDetRttPlots(InDetPlotBase* pParent, const std::string& sDir, co
m_resolutionPlotSecd = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "Tracks/Matched/Resolutions/Secondary"));
m_hitsMatchedTracksPlots = std::unique_ptr<InDetPerfPlot_Hits>(new InDetPerfPlot_Hits(this, "Tracks/Matched/HitsOnTracks"));
m_vertexTruthMatchingPlots = std::unique_ptr<InDetPerfPlot_VertexTruthMatching>(new InDetPerfPlot_VertexTruthMatching(this, "Vertices/AllPrimaryVertices", m_iDetailLevel));
+
+ //Split by track author
+ m_effSiSPSeededFinderPlots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Efficiency"));
+ m_effInDetExtensionProcessorPlots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Efficiency"));
+ m_effTRTSeededTrackFinderPlots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Efficiency"));
+ m_effTRTStandalonePlots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/TRTStandalone/Tracks/Efficiency"));
+ m_effSiSpacePointsSeedMaker_LargeD0Plots = std::unique_ptr<InDetPerfPlot_Efficiency>(new InDetPerfPlot_Efficiency(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Efficiency"));
+
+ m_fakeSiSPSeededFinderPlots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/SiSPSeededFinder/Tracks/FakeRate"));
+ m_fakeInDetExtensionProcessorPlots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/FakeRate"));
+ m_fakeTRTSeededTrackFinderPlots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/FakeRate"));
+ m_fakeTRTStandalonePlots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/TRTStandalone/Tracks/FakeRate"));
+ m_fakeSiSpacePointsSeedMaker_LargeD0Plots = std::unique_ptr<InDetPerfPlot_FakeRate>(new InDetPerfPlot_FakeRate(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/FakeRate"));
+
+ m_trkParaSiSPSeededFinderPlots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Parameters"));
+ m_trkParaInDetExtensionProcessorPlots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Parameters"));
+ m_trkParaTRTSeededTrackFinderPlots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Parameters"));
+ m_trkParaTRTStandalonePlots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/TRTStandalone/Tracks/Parameters"));
+ m_trkParaSiSpacePointsSeedMaker_LargeD0Plots = std::unique_ptr<InDetPerfPlot_TrackParameters>(new InDetPerfPlot_TrackParameters(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Parameters"));
+
+ m_resSiSPSeededFinderPlots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/SiSPSeededFinder/Tracks/Resolution"));
+ m_resInDetExtensionProcessorPlots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/InDetExtensionProcessor/Tracks/Resolution"));
+ m_resTRTSeededTrackFinderPlots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/TRTSeededTrackFinder/Tracks/Resolution"));
+ m_resTRTStandalonePlots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/TRTStandalone/Tracks/Resolution"));
+ m_resSiSpacePointsSeedMaker_LargeD0Plots = std::unique_ptr<InDetPerfPlot_Resolution>(new InDetPerfPlot_Resolution(this, "TracksByAuthor/SiSpacePointsSeedMaker_LargeD0/Tracks/Resolution"));
+
}
//A lot of Jets... do we need these at all???
@@ -65,6 +91,26 @@ InDetRttPlots::fill(const xAOD::TrackParticle& particle, const xAOD::TruthPartic
} else if (barcode >= 200000 && prob > 0.7 && m_iDetailLevel >= 200) {
m_resolutionPlotSecd->fill(particle, truthParticle);
}
+
+ if(m_iDetailLevel >= 200 and (barcode < 200000 and barcode != 0 and prob > 0.5)){
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = particle.patternRecoInfo();
+
+ bool isSiSpSeededFinder = patternInfo.test(0);
+ bool isInDetExtensionProcessor = patternInfo.test(3);
+ bool isTRTSeededTrackFinder = patternInfo.test(4);
+ bool isTRTStandalone = patternInfo.test(20);
+ bool isSiSpacePointsSeedMaker_LargeD0 = patternInfo.test(49);
+
+ if(isSiSpSeededFinder and not isInDetExtensionProcessor) m_resSiSPSeededFinderPlots->fill(particle, truthParticle);
+ if(isInDetExtensionProcessor and not (isTRTSeededTrackFinder or isSiSpacePointsSeedMaker_LargeD0)) m_resInDetExtensionProcessorPlots->fill(particle, truthParticle);
+ if(isTRTSeededTrackFinder and not isTRTStandalone) m_resTRTSeededTrackFinderPlots->fill(particle, truthParticle);
+ if(isTRTStandalone) m_resTRTStandalonePlots->fill(particle, truthParticle);
+ if(isSiSpacePointsSeedMaker_LargeD0) m_resSiSpacePointsSeedMaker_LargeD0Plots->fill(particle, truthParticle);
+
+ }
+
+
+
}
if(m_iDetailLevel >= 200){
@@ -85,6 +131,24 @@ InDetRttPlots::fill(const xAOD::TrackParticle& particle) {
m_hitEffPlot.fill(particle);
// fill pt plots
m_trackParameters.fill(particle);
+ if(m_iDetailLevel >= 200){
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = particle.patternRecoInfo();
+
+ bool isSiSpSeededFinder = patternInfo.test(0);
+ bool isInDetExtensionProcessor = patternInfo.test(3);
+ bool isTRTSeededTrackFinder = patternInfo.test(4);
+ bool isTRTStandalone = patternInfo.test(20);
+ bool isSiSpacePointsSeedMaker_LargeD0 = patternInfo.test(49);
+
+ if(isSiSpSeededFinder and not isInDetExtensionProcessor) m_trkParaSiSPSeededFinderPlots->fill(particle);
+ else if(isInDetExtensionProcessor and not (isTRTSeededTrackFinder or isSiSpacePointsSeedMaker_LargeD0)) m_trkParaInDetExtensionProcessorPlots->fill(particle);
+ else if(isTRTSeededTrackFinder and not isTRTStandalone) m_trkParaTRTSeededTrackFinderPlots->fill(particle);
+ else if(isTRTStandalone) m_trkParaTRTStandalonePlots->fill(particle);
+ else if(isSiSpacePointsSeedMaker_LargeD0) m_trkParaSiSpacePointsSeedMaker_LargeD0Plots->fill(particle);
+
+ }
+
+
m_hitsRecoTracksPlots.fill(particle);
}
@@ -104,8 +168,35 @@ InDetRttPlots::fill(const xAOD::TruthParticle& truthParticle) {
void
-InDetRttPlots::fillEfficiency(const xAOD::TruthParticle& truth, const bool isGood, const unsigned int /*nMuEvents*/) {
+InDetRttPlots::fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::TrackParticle& track, const bool isGood, const unsigned int /*nMuEvents*/) {
m_effPlots.fill(truth, isGood);
+
+ if(m_iDetailLevel >= 200){
+ if(isGood){
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = track.patternRecoInfo();
+
+ bool isSiSpSeededFinder = patternInfo.test(0);
+ bool isInDetExtensionProcessor = patternInfo.test(3);
+ bool isTRTSeededTrackFinder = patternInfo.test(4);
+ bool isTRTStandalone = patternInfo.test(20);
+ bool isSiSpacePointsSeedMaker_LargeD0 = patternInfo.test(49);
+
+ if(isSiSpSeededFinder and not isInDetExtensionProcessor) m_effSiSPSeededFinderPlots->fill(truth, isGood);
+ if(isInDetExtensionProcessor and not (isTRTSeededTrackFinder or isSiSpacePointsSeedMaker_LargeD0)) m_effInDetExtensionProcessorPlots->fill(truth, isGood);
+ if(isTRTSeededTrackFinder and not isTRTStandalone) m_effTRTSeededTrackFinderPlots->fill(truth, isGood);
+ if(isTRTStandalone) m_effTRTStandalonePlots->fill(truth, isGood);
+ if(isSiSpacePointsSeedMaker_LargeD0) m_effSiSpacePointsSeedMaker_LargeD0Plots->fill(truth, isGood);
+ } else {
+ m_effSiSPSeededFinderPlots->fill(truth, isGood);
+ m_effInDetExtensionProcessorPlots->fill(truth, isGood);
+ m_effTRTSeededTrackFinderPlots->fill(truth, isGood);
+ m_effTRTStandalonePlots->fill(truth, isGood);
+ m_effSiSpacePointsSeedMaker_LargeD0Plots->fill(truth, isGood);
+
+ }
+
+ }
+
}
//
@@ -116,7 +207,25 @@ void
InDetRttPlots::fillFakeRate(const xAOD::TrackParticle& track, const bool isFake, const bool isAssociatedTruth){
m_missingTruthFakePlots.fill(track, !isAssociatedTruth);
- if(isAssociatedTruth) m_fakePlots.fill(track, isFake);
+ if(isAssociatedTruth) {
+ m_fakePlots.fill(track, isFake);
+
+ if(m_iDetailLevel >= 200){
+ std::bitset<xAOD::TrackPatternRecoInfo::NumberOfTrackRecoInfo> patternInfo = track.patternRecoInfo();
+
+ bool isSiSpSeededFinder = patternInfo.test(0);
+ bool isInDetExtensionProcessor = patternInfo.test(3);
+ bool isTRTSeededTrackFinder = patternInfo.test(4);
+ bool isTRTStandalone = patternInfo.test(20);
+ bool isSiSpacePointsSeedMaker_LargeD0 = patternInfo.test(49);
+
+ if(isSiSpSeededFinder and not isInDetExtensionProcessor) m_fakeSiSPSeededFinderPlots->fill(track, isFake); //No extensions
+ if(isInDetExtensionProcessor and not (isTRTSeededTrackFinder or isSiSpacePointsSeedMaker_LargeD0)) m_fakeInDetExtensionProcessorPlots->fill(track, isFake); //Extensions but not Back-tracking
+ if(isTRTSeededTrackFinder and not isTRTStandalone) m_fakeTRTSeededTrackFinderPlots->fill(track, isFake); //BackTracking
+ if(isTRTStandalone) m_fakeTRTStandalonePlots->fill(track, isFake); //TRT standalone
+ if(isSiSpacePointsSeedMaker_LargeD0) m_fakeSiSpacePointsSeedMaker_LargeD0Plots->fill(track, isFake); //ANT
+ }
+ }
}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
index c4302232d859cc4ba1e7067e17b916e5a7769b11..d666f14c5612e63200da194f5afacd550a61acbf 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetRttPlots.h
@@ -56,7 +56,7 @@ public:
///fill for things needing truth only
void fill(const xAOD::TruthParticle& particle);
///Fill for efficiency plots
- void fillEfficiency(const xAOD::TruthParticle& truth, const bool isGood, unsigned int /*mu=0*/);
+ void fillEfficiency(const xAOD::TruthParticle& truth, const xAOD::TrackParticle& track, const bool isGood, unsigned int /*mu=0*/);
///fill for things needing all truth - not just the ones from the reco tracks
@@ -97,6 +97,34 @@ private:
bool m_doTrackInJetPlots;
std::unique_ptr<InDetPerfPlot_TrkInJet> m_trkInJetPlots;
+ //By track authors
+ std::unique_ptr<InDetPerfPlot_Efficiency> m_effSiSPSeededFinderPlots;
+ std::unique_ptr<InDetPerfPlot_Efficiency> m_effInDetExtensionProcessorPlots;
+ std::unique_ptr<InDetPerfPlot_Efficiency> m_effTRTSeededTrackFinderPlots;
+ std::unique_ptr<InDetPerfPlot_Efficiency> m_effTRTStandalonePlots;
+ std::unique_ptr<InDetPerfPlot_Efficiency> m_effSiSpacePointsSeedMaker_LargeD0Plots;
+
+ std::unique_ptr<InDetPerfPlot_FakeRate> m_fakeSiSPSeededFinderPlots;
+ std::unique_ptr<InDetPerfPlot_FakeRate> m_fakeInDetExtensionProcessorPlots;
+ std::unique_ptr<InDetPerfPlot_FakeRate> m_fakeTRTSeededTrackFinderPlots;
+ std::unique_ptr<InDetPerfPlot_FakeRate> m_fakeTRTStandalonePlots;
+ std::unique_ptr<InDetPerfPlot_FakeRate> m_fakeSiSpacePointsSeedMaker_LargeD0Plots;
+
+ std::unique_ptr<InDetPerfPlot_TrackParameters> m_trkParaSiSPSeededFinderPlots;
+ std::unique_ptr<InDetPerfPlot_TrackParameters> m_trkParaInDetExtensionProcessorPlots;
+ std::unique_ptr<InDetPerfPlot_TrackParameters> m_trkParaTRTSeededTrackFinderPlots;
+ std::unique_ptr<InDetPerfPlot_TrackParameters> m_trkParaTRTStandalonePlots;
+ std::unique_ptr<InDetPerfPlot_TrackParameters> m_trkParaSiSpacePointsSeedMaker_LargeD0Plots;
+
+ std::unique_ptr<InDetPerfPlot_Resolution> m_resSiSPSeededFinderPlots;
+ std::unique_ptr<InDetPerfPlot_Resolution> m_resInDetExtensionProcessorPlots;
+ std::unique_ptr<InDetPerfPlot_Resolution> m_resTRTSeededTrackFinderPlots;
+ std::unique_ptr<InDetPerfPlot_Resolution> m_resTRTStandalonePlots;
+ std::unique_ptr<InDetPerfPlot_Resolution> m_resSiSpacePointsSeedMaker_LargeD0Plots;
+
+
+
+
std::string m_trackParticleTruthProbKey;
float m_truthProbLowThreshold;
};
diff --git a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.py b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.py
index 7ecee46bc48a4569d334f32dfdb9eb393f53d258..c142444f30e47e3d3a8b8078a95b678ed311af9a 100644
--- a/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.py
+++ b/LArCalorimeter/LArCellRec/share/LArCellDeadOTXCorr_test.py
@@ -7,6 +7,7 @@
# Brief: Unit test for LArCellDeadOTXCorr.
#
+from __future__ import print_function
import ROOT
ROOT.TH1F
@@ -72,7 +73,7 @@ def make_bad_channel_condalg (name, badfebs = []):
febfile = name + '.badfebs'
f = open (febfile, 'w')
for (feb, err) in badfebs:
- print >> f, feb[0], feb[1], feb[2], feb[3], err
+ print (feb[0], feb[1], feb[2], feb[3], err, file=f)
f.close()
alg = LArBadFebCondAlg ('LArBadFebCondAlg' + name,
ReadKey = '',
@@ -346,10 +347,10 @@ class TestAlg (Alg):
cabling = self.condStore()['LArOnOffIdMap'].find (ctx.eventID())
for tt in tt_table:
emid, hadid, febs = self.tt_to_febs (cabling, tt[0], tt[1])
- print 'tt ', tt[0], tt[1], hex(emid), hex(hadid),
+ print ('tt ', tt[0], tt[1], hex(emid), hex(hadid), end='')
for feb, idv in febs.items():
- print feb, hex(idv),
- print
+ print (feb, hex(idv), end='')
+ print()
return
def tt_to_febs (self, cabling, eta, phi):
diff --git a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataToolCore.cxx
index 5ef7c5f25e392fbd1ca0c7a8aeb9cc1d11dc0a3f..d7ebd8e5deb38ac52f210933acc335e4cb3240d3 100644
--- a/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MdtRdoToPrepDataToolCore.cxx
@@ -221,7 +221,10 @@ bool Muon::MdtRdoToPrepDataToolCore::handlePRDHash( IdentifierHash hash, const M
if (m_BMEpresent) { // after BMEs were installed, the RDOs are indexed by the detectorElement hash of a multilayer
Identifier elementId;
IdContext tmp_context = m_idHelperSvc->mdtIdHelper().module_context();
- m_idHelperSvc->mdtIdHelper().get_id(hash, elementId, &tmp_context);
+ if(m_idHelperSvc->mdtIdHelper().get_id(hash, elementId, &tmp_context)){
+ ATH_MSG_DEBUG("Found invalid elementId");
+ return false;
+ }
Identifier multilayerId = m_idHelperSvc->mdtIdHelper().multilayerID(elementId, 1); //first multilayer
IdentifierHash multilayerHash;
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.cxx
index 8b98396e024cbc4948837369226557d180e99cf4..07ef4788a7e1c37d0a40c450e87ea08c26c34b44 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.cxx
@@ -40,12 +40,13 @@ Muon::MmRdoToPrepDataToolCore::MmRdoToPrepDataToolCore(const std::string& t,
declareProperty("MergePrds", m_merge = true);
declareProperty("ClusterBuilderTool",m_clusterBuilderTool);
declareProperty("NSWCalibTool", m_calibTool);
+ declareProperty("singleStripChargeCut", m_singleStripChargeCut = 6241 * 0.4); // 0.4 fC from BB5 cosmics
}
StatusCode Muon::MmRdoToPrepDataToolCore::initialize()
{
ATH_MSG_DEBUG(" in initialize()");
-
+
ATH_CHECK(detStore()->retrieve(m_muonMgr));
ATH_CHECK(m_idHelperSvc.retrieve());
@@ -182,6 +183,7 @@ StatusCode Muon::MmRdoToPrepDataToolCore::processCollection(const MM_RawDataColl
} else {
MMPrepData mpd = MMPrepData(prdId, hash, localPos, rdoList, cov, detEl, calibStrip.time, calibStrip.charge, calibStrip.distDrift);
+ if(mpd.charge() < m_singleStripChargeCut) continue;
// set the hash of the MMPrepData such that it contains the correct value in case it gets used in SimpleMMClusterBuilderTool::getClusters
mpd.setHashAndIndex(hash,0);
mpd.setAuthor(Muon::MMPrepData::Author::RDOTOPRDConverter);
diff --git a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.h b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.h
index 5fbd33447e13f2e14605b9ef824f0ab61accaa15..467fee554b7bec244e6249045781d9b4eb63b445 100644
--- a/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.h
+++ b/MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolCore.h
@@ -84,6 +84,7 @@ namespace Muon
ToolHandle<IMMClusterBuilderTool> m_clusterBuilderTool;
ToolHandle<INSWCalibTool> m_calibTool;
+ float m_singleStripChargeCut;
};
} // end of namespace
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/CMakeLists.txt b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/CMakeLists.txt
index a6ecb61e6508b94f22aef4370d9becf032fc4942..faa73eb878112be069714cf6e1d1faabc8684ddf 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/CMakeLists.txt
@@ -53,6 +53,7 @@ atlas_add_library( MuonReadoutGeometry
if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
set_source_files_properties(
${CMAKE_CURRENT_SOURCE_DIR}/src/MdtReadoutElement.cxx
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/RpcReadoutElement.cxx
${CMAKE_CURRENT_SOURCE_DIR}/src/MuonStation.cxx
PROPERTIES
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
index bde06552445c5e9ee9e34e720d75fb3b762d4b93..d87a01243480d027c251b93cb5c7d8ef58095d56 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/RpcReadoutElement.cxx
@@ -889,6 +889,14 @@ namespace MuonGM {
}
+#if defined(FLATTEN) && defined(__GNUC__)
+// We compile this package with optimization, even in debug builds; otherwise,
+// the heavy use of Eigen makes it too slow. However, from here we may call
+// to out-of-line Eigen code that is linked from other DSOs; in that case,
+// it would not be optimized. Avoid this by forcing all Eigen code
+// to be inlined here if possible.
+__attribute__ ((flatten))
+#endif
void RpcReadoutElement::fillCache()
{
diff --git a/PhysicsAnalysis/RingerSelectorTools/CMakeLists.txt b/PhysicsAnalysis/RingerSelectorTools/CMakeLists.txt
index 1f8a28b71bbd04c8cc19f09e959b074f73f44654..f7d8411db70d24f85f2dcfa0186afcc0026b9cc6 100644
--- a/PhysicsAnalysis/RingerSelectorTools/CMakeLists.txt
+++ b/PhysicsAnalysis/RingerSelectorTools/CMakeLists.txt
@@ -42,7 +42,7 @@ atlas_add_library( RingerSelectorToolsEnumsLib
Root/enums/*.cxx
PUBLIC_HEADERS RingerSelectorTools
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} PATCoreLib )
atlas_add_library( RingerSelectorToolsLib
Root/*.cxx
@@ -50,8 +50,8 @@ atlas_add_library( RingerSelectorToolsLib
Root/tools/*.cxx
PUBLIC_HEADERS RingerSelectorTools
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AsgTools CxxUtils xAODCaloRings xAODEgamma xAODTracking PATCoreLib EgammaAnalysisInterfacesLib RingerSelectorToolsEnumsLib
- PRIVATE_LINK_LIBRARIES xAODBase PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} AsgTools CxxUtils xAODCaloRings xAODEgamma xAODTracking PATCoreLib EgammaAnalysisInterfacesLib RingerSelectorToolsEnumsLib
+ PRIVATE_LINK_LIBRARIES xAODBase PathResolver TrkTrackSummary )
if( NOT XAOD_STANDALONE )
atlas_add_component( RingerSelectorTools
src/components/*.cxx
diff --git a/Reconstruction/Jet/JetRec/CMakeLists.txt b/Reconstruction/Jet/JetRec/CMakeLists.txt
index e85c9f87c0f54903651add011102aad70545ab0e..ff8000133ec7e963eb4fb241335fd8cf8e3845f4 100644
--- a/Reconstruction/Jet/JetRec/CMakeLists.txt
+++ b/Reconstruction/Jet/JetRec/CMakeLists.txt
@@ -68,7 +68,7 @@ endif()
atlas_add_dictionary( JetRecDict
JetRec/JetRecDict.h
JetRec/selection.xml
- LINK_LIBRARIES JetRecLib )
+ LINK_LIBRARIES JetRecLib ${mon_lib} )
# Test(s) in the package:
atlas_add_test( TestTests
diff --git a/Reconstruction/RecoTools/CaloRingerTools/CMakeLists.txt b/Reconstruction/RecoTools/CaloRingerTools/CMakeLists.txt
index c96fcd64df8ff668e9bfe6213d1b91e132b6f455..893fcf0eedc02a7dfbe8c77971d6ad28be6b848e 100644
--- a/Reconstruction/RecoTools/CaloRingerTools/CMakeLists.txt
+++ b/Reconstruction/RecoTools/CaloRingerTools/CMakeLists.txt
@@ -23,13 +23,18 @@ atlas_depends_on_subdirs( PUBLIC
PhysicsAnalysis/AnalysisCommon/PATCore
PhysicsAnalysis/RingerSelectorTools )
+atlas_add_library( CaloRingerToolsLib
+ CaloRingerTools/*.h
+ INTERFACE
+ PUBLIC_HEADERS CaloRingerTools
+ LINK_LIBRARIES GaudiKernel AthLinks StoreGateLib xAODBase xAODCaloRings xAODCaloEvent )
+
# Component(s) in the package:
atlas_add_component( CaloRingerTools
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthLinks xAODBase xAODCaloEvent xAODCaloRings GaudiKernel CaloEvent CaloGeoHelpers CaloUtilsLib AthenaBaseComps AthenaKernel CxxUtils xAODEgamma PATCoreLib RingerSelectorToolsLib )
+ LINK_LIBRARIES CaloRingerToolsLib xAODCaloRings CaloEvent CaloGeoHelpers CaloUtilsLib AthenaBaseComps AthenaKernel CxxUtils xAODEgamma PATCoreLib RingerSelectorToolsLib )
# Install files from the package:
-atlas_install_headers( CaloRingerTools )
atlas_install_python_modules( python/*.py )
diff --git a/Reconstruction/eflowRec/eflowRec/EtaPhiLUT.h b/Reconstruction/eflowRec/eflowRec/EtaPhiLUT.h
new file mode 100644
index 0000000000000000000000000000000000000000..13d2ffd26832a88b317c8ef07db0addbece460fd
--- /dev/null
+++ b/Reconstruction/eflowRec/eflowRec/EtaPhiLUT.h
@@ -0,0 +1,45 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+// EtaPhi Look-up table for eflowRecClusters
+// author: Teng Jian Khoo
+// date: Jun 2020
+//
+// Inspired by IParticlesLookUpTable from ParticlesInConeTools
+// By binning in phi and sorting in eta, extraction of objects in
+// a small eta/phi region can be accelerated.
+// Useful to reduce the number of distance computations needed
+// for e.g. track-cluster matching
+
+#ifndef EFLOWREC_ETAPHILOOKUPTABLE_H
+#define EFLOWREC_ETAPHILOOKUPTABLE_H
+
+#include <vector>
+
+#include "xAODCaloEvent/CaloCluster.h"
+#include "eflowRec/eflowRecCluster.h"
+
+namespace eflowRec {
+
+ /** 2D look up table for eflowRecClusters */
+ class EtaPhiLUT {
+ public:
+ /** constructor taking the desired binsize */
+ EtaPhiLUT( unsigned int nbins = 50 );
+
+ void fill(eflowRecClusterContainer& clustersin);
+
+ /** collect eflowRecClusters in a given cone */
+ std::vector<eflowRecCluster*> clustersInCone( float eta, float phi, float dr ) const;
+
+ private:
+
+ unsigned int m_nphiBins; /// number of bins
+ float m_phiBinSize; /// bin size
+ std::vector< std::vector<eflowRecCluster*> > m_phiBinnedLookUpTable; /// the look-up table
+ };
+
+} // end of namespace
+
+#endif
diff --git a/Reconstruction/eflowRec/eflowRec/PFCellLevelSubtractionTool.h b/Reconstruction/eflowRec/eflowRec/PFCellLevelSubtractionTool.h
index 622bb23af016a153f02cb089ad34d393424c601c..dbbe152db7693fd25eabfab3d664b5389654aea1 100644
--- a/Reconstruction/eflowRec/eflowRec/PFCellLevelSubtractionTool.h
+++ b/Reconstruction/eflowRec/eflowRec/PFCellLevelSubtractionTool.h
@@ -9,11 +9,14 @@
#include "eflowRec/IPFSubtractionTool.h"
#include "GaudiKernel/ToolHandle.h"
+#include "xAODCaloEvent/CaloCluster.h"
+#include "xAODTracking/TrackParticle.h"
+
#include "eflowRec/eflowCaloObject.h"
#include "eflowRec/eflowCellList.h"
#include "eflowRec/eflowEEtaBinnedParameters.h"
-#include "xAODCaloEvent/CaloCluster.h"
-#include "xAODTracking/TrackParticle.h"
+#include "eflowRec/PFMatchPositions.h"
+#include "eflowRec/EtaPhiLUT.h"
#include <vector>
@@ -24,6 +27,14 @@ class IEFlowCellEOverPTool;
class PFTrackClusterMatchingTool;
class eflowRecTrack;
+namespace PFMatch {
+ class TrackEtaPhiInFixedLayersProvider;
+}
+
+namespace eflowRec {
+ class EtaPhiLUT;
+}
+
class PFCellLevelSubtractionTool : public extends<AthAlgTool, IPFSubtractionTool> {
public:
@@ -41,6 +52,7 @@ public:
eflowCaloObjectContainer* caloObjects;
eflowRecTrackContainer* tracks;
eflowRecClusterContainer* clusters;
+ eflowRec::EtaPhiLUT clusterLUT;
};
void calculateRadialEnergyProfiles(eflowData& data) const;
@@ -53,6 +65,9 @@ public:
std::string printCluster(const xAOD::CaloCluster* cluster) const;
void printAllClusters(const eflowRecClusterContainer& recClusterContainer) const;
+ // Need a track position provider to preselect clusters
+ std::unique_ptr<PFMatch::TrackEtaPhiInFixedLayersProvider> m_trkpos;
+
/** Default track-cluster matching tool */
ToolHandle<PFTrackClusterMatchingTool> m_matchingTool{this,"PFTrackClusterMatchingTool","PFTrackClusterMatchingTool/CalObjBldMatchingTool","The track-cluster matching tool"};
/* Track-cluster matching tools for calculating the pull */
diff --git a/Reconstruction/eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h b/Reconstruction/eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h
index a97a52392c333f41b65407dfd0c1b598da8c5286..a1b989446149ac9a04c0c55e90ebdba60aceeab1 100644
--- a/Reconstruction/eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h
+++ b/Reconstruction/eflowRec/eflowRec/PFOChargedCreatorAlgorithm.h
@@ -1,18 +1,18 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PFOCHARGEDCREATORALGORITHM_H
#define PFOCHARGEDCREATORALGORITHM_H
#include "eflowRec/eflowCaloObject.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
#include "xAODPFlow/PFOContainer.h"
-class PFOChargedCreatorAlgorithm : public AthAlgorithm {
+class PFOChargedCreatorAlgorithm : public AthReentrantAlgorithm {
public:
@@ -21,14 +21,12 @@ public:
~PFOChargedCreatorAlgorithm() {}
StatusCode initialize();
- StatusCode execute();
+ StatusCode execute(const EventContext&) const;
StatusCode finalize();
private:
/** Create the charged PFO */
- void createChargedPFO(const eflowCaloObject& energyFlowCaloObject, bool addClusters, SG::WriteHandle<xAOD::PFOContainer>& chargedPFOContainerWriteHandle);
- /** Function to add links to the vertex to which a charged PFO is matched (using the tracking CP loose vertex association tool) */
- void addVertexLinksToChargedPFO(const xAOD::VertexContainer* theVertexContainer, SG::WriteHandle<xAOD::PFOContainer>& chargedPFOContainerWriteHandle);
+ void createChargedPFO(const eflowCaloObject& energyFlowCaloObject, bool addClusters, SG::WriteHandle<xAOD::PFOContainer>& chargedPFOContainerWriteHandle) const;
/** Toggle EOverP algorithm mode, whereby no charged shower subtraction is performed */
Gaudi::Property<bool> m_eOverPMode{this,"EOverPMode",false,"Toggle EOverP algorithm mode, whereby no charged shower subtraction is performed"};
diff --git a/Reconstruction/eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h b/Reconstruction/eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h
index eb930ce28e471bcbfc6938236264dd3ad183b87f..40b7b7c2d558d51536dc21b0d1db187a8927de79 100644
--- a/Reconstruction/eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h
+++ b/Reconstruction/eflowRec/eflowRec/PFONeutralCreatorAlgorithm.h
@@ -1,12 +1,12 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PFONEUTRALCREATORALGORITHM_H
#define PFONEUTRALCREATORALGORITHM_H
#include "eflowRec/eflowCaloObject.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/DataHandle.h"
@@ -14,7 +14,7 @@
#include "xAODPFlow/PFO.h"
#include "xAODPFlow/PFOContainer.h"
-class PFONeutralCreatorAlgorithm : public AthAlgorithm {
+class PFONeutralCreatorAlgorithm : public AthReentrantAlgorithm {
public:
@@ -25,16 +25,16 @@ public:
static const InterfaceID& interfaceID();
StatusCode initialize();
- StatusCode execute();
+ StatusCode execute(const EventContext& ctx) const;
StatusCode finalize();
private:
/** Create the chargedneutral PFO */
- void createNeutralPFO(const eflowCaloObject& energyFlowCaloObject,SG::WriteHandle<xAOD::PFOContainer>& neutralPFOContainerWriteHandle, SG::WriteHandle<xAOD::PFOContainer>* neutralPFOContainerWriteHandle_nonModified);
+ StatusCode createNeutralPFO(const eflowCaloObject& energyFlowCaloObject, xAOD::PFOContainer* neutralPFOContainer, xAOD::PFOContainer* neutralPFOContainer_nonModified) const;
/** Function to add cluster moments onto PFO */
- void addMoment(const xAOD::CaloCluster::MomentType& momentType, const xAOD::PFODetails::PFOAttributes& pfoAttribute, const xAOD::CaloCluster& theCluster, xAOD::PFO& thePFO);
+ void addMoment(const xAOD::CaloCluster::MomentType& momentType, const xAOD::PFODetails::PFOAttributes& pfoAttribute, const xAOD::CaloCluster& theCluster, xAOD::PFO& thePFO) const;
/** Toggle EOverP algorithm mode, whereby no charged shower subtraction is performed */
Gaudi::Property<bool> m_eOverPMode{this,"EOverPMode",false,"Toggle EOverP algorithm mode, whereby no charged shower subtraction is performed"};
diff --git a/Reconstruction/eflowRec/eflowRec/PFRecoverSplitShowersTool.h b/Reconstruction/eflowRec/eflowRec/PFRecoverSplitShowersTool.h
index 86fdf16746b1bea1fc9fe691bf4b5e741b7af62a..b7e6cbabb59fa81ab32fa9fff2f9f64faf798f34 100644
--- a/Reconstruction/eflowRec/eflowRec/PFRecoverSplitShowersTool.h
+++ b/Reconstruction/eflowRec/eflowRec/PFRecoverSplitShowersTool.h
@@ -6,6 +6,9 @@
#define PFRECOVERSPLITSHOWERSTOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
+
+#include <unordered_set>
+
#include "GaudiKernel/ToolHandle.h"
#include "xAODCaloEvent/CaloCluster.h"
#include "eflowRec/IPFSubtractionTool.h"
@@ -40,7 +43,7 @@ class PFRecoverSplitShowersTool : public extends<AthAlgTool, IPFSubtractionTool>
struct eflowData {
eflowCaloObjectContainer* caloObjects;
- std::vector<eflowRecCluster*> clustersToConsider;
+ std::unordered_set<eflowRecCluster*> clustersToConsider;
std::vector<eflowRecTrack*> tracksToRecover;
};
@@ -58,9 +61,6 @@ class PFRecoverSplitShowersTool : public extends<AthAlgTool, IPFSubtractionTool>
/* Tool for getting e/p values and hadronic shower cell ordering principle parameters */
ToolHandle<IEFlowCellEOverPTool> m_theEOverPTool{this,"eflowCellEOverPTool","eflowCellEOverPTool","Energy Flow E/P Values and Shower Parameters Tool"};
- /** Track-Cluster matching tool */
- ToolHandle<PFTrackClusterMatchingTool> m_matchingTool{this,"PFTrackClusterMatchingTool","PFTrackClusterMatchingTool/RcvrSpltMatchingTool","The track-cluster matching tool"};
-
std::unique_ptr<eflowEEtaBinnedParameters> m_binnedParameters;
/** Parameter that controls whether to use retain remaining calorimeter energy in track-cluster system, after charged shower subtraction */
diff --git a/Reconstruction/eflowRec/eflowRec/PFTrackClusterMatchingTool.h b/Reconstruction/eflowRec/eflowRec/PFTrackClusterMatchingTool.h
index ddf36db9d423ddf4ac9b19c4773758d4bb23e646..7867de6529b77f7641e2e3ae7df5819a16e71e06 100644
--- a/Reconstruction/eflowRec/eflowRec/PFTrackClusterMatchingTool.h
+++ b/Reconstruction/eflowRec/eflowRec/PFTrackClusterMatchingTool.h
@@ -14,6 +14,7 @@
#ifndef PFMATCHINGTOOL_H_
#define PFMATCHINGTOOL_H_
+#include <utility>
#include "eflowRec/PFMatcher.h"
class eflowRecCluster;
@@ -38,8 +39,8 @@ public:
StatusCode finalize();
/** Get n clusters that matches best to a given track */
- std::vector<eflowRecCluster*> doMatches(const eflowRecTrack* track, eflowRecClusterContainer* clusters, int n) const;
- std::vector<eflowRecCluster*> doMatches(const eflowRecTrack* track, const std::vector<eflowRecCluster*> clusters, int n) const;
+ std::vector<std::pair<eflowRecCluster*,float> > doMatches(const eflowRecTrack* track, eflowRecClusterContainer* clusters, int n) const;
+ std::vector<std::pair<eflowRecCluster*,float> > doMatches(const eflowRecTrack* track, const std::vector<eflowRecCluster*> clusters, int n) const;
private:
diff --git a/Reconstruction/eflowRec/python/PFHLTSequence.py b/Reconstruction/eflowRec/python/PFHLTSequence.py
index 146426e762fe4062e5d2f25262cd2eee250222fc..a0a999012a0203cc07e5cf19fbdc4d83d3ac36d2 100644
--- a/Reconstruction/eflowRec/python/PFHLTSequence.py
+++ b/Reconstruction/eflowRec/python/PFHLTSequence.py
@@ -9,7 +9,7 @@ log = logging.getLogger('PFHLTSequence')
# Use the appropriate containers based on what config is desired
trackvtxcontainers = {
"offline": ("InDetTrackParticles","PrimaryVertices"),
- "ftf": ("HLT_IDTrack_FS_FTF","HLT_EFHistoPrmVtx"),
+ "ftf": ("HLT_IDTrack_FS_FTF","HLT_IDVertex_FS"),
}
# PFTrackSelector
@@ -95,8 +95,7 @@ def getPFAlg(clustersin,tracktype):
# cluster is needed to recover the full track expected energy
# Reuse the default E/P subtraction tool
PFRecoverSplitShowersTool = eflowRecConf.PFRecoverSplitShowersTool("PFRecoverSplitShowersTool",
- eflowCellEOverPTool = CellEOverPTool,
- PFTrackClusterMatchingTool = getPFMatchingTool("MatchingTool_RecoverSS",0.2)
+ eflowCellEOverPTool = CellEOverPTool
)
# Configure moment calculation using topocluster moment calculator
diff --git a/Reconstruction/eflowRec/share/PFlowMTConfig.py b/Reconstruction/eflowRec/share/PFlowMTConfig.py
index 721308e53aa507009103a1db32347db5c997293c..8bf16d1e55e85a97d41f4679de681d6047a2d74e 100644
--- a/Reconstruction/eflowRec/share/PFlowMTConfig.py
+++ b/Reconstruction/eflowRec/share/PFlowMTConfig.py
@@ -98,13 +98,6 @@ if jobproperties.eflowRecFlags.recoverIsolatedTracks == True:
if jobproperties.eflowRecFlags.useUpdated2015ChargedShowerSubtraction == False:
PFRecoverSplitShowersTool.useUpdated2015ChargedShowerSubtraction = False
-MatchingTool_Recover = PFTrackClusterMatchingTool()
-MatchingTool_Recover.TrackPositionType = 'EM2EtaPhi' # str
-MatchingTool_Recover.ClusterPositionType = 'PlainEtaPhi' # str
-MatchingTool_Recover.DistanceType = 'EtaPhiSquareDistance' # str
-MatchingTool_Recover.MatchCut = 0.2*0.2 # float
-PFRecoverSplitShowersTool.PFTrackClusterMatchingTool = MatchingTool_Recover
-
if jobproperties.eflowRecFlags.eflowAlgType != "EOverP":
PFAlgorithm.SubtractionToolList += [PFRecoverSplitShowersTool]
diff --git a/Reconstruction/eflowRec/src/EtaPhiLUT.cxx b/Reconstruction/eflowRec/src/EtaPhiLUT.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..778fb86f788c8f44ea18e1c5fd99f5f7c9fa98b5
--- /dev/null
+++ b/Reconstruction/eflowRec/src/EtaPhiLUT.cxx
@@ -0,0 +1,85 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include <cmath>
+#include <algorithm>
+
+#include "eflowRec/EtaPhiLUT.h"
+
+namespace eflowRec {
+
+ /// define 2*Pi
+ static constexpr float TWOPI = 2*M_PI;
+
+ /// hepler function to ensure phi is within +-Pi
+ float phiInRange(float phi) {
+ while (phi >= M_PI) phi -= TWOPI;
+ while (phi < -M_PI) phi += TWOPI;
+ return phi;
+ }
+
+ /// calculate phi index for a given phi
+ unsigned int phiIndex(float phi, float binsize) { return (phi + M_PI)/binsize; }
+
+ EtaPhiLUT::EtaPhiLUT( unsigned int nbins ) :
+ m_nphiBins(nbins),
+ m_phiBinSize(TWOPI/m_nphiBins),
+ m_phiBinnedLookUpTable(m_nphiBins)
+ {}
+
+ void EtaPhiLUT::fill(eflowRecClusterContainer& clustersin)
+ {
+ for(eflowRecCluster* cluster : clustersin) {
+ int index = phiIndex(cluster->getCluster()->phi(), m_phiBinSize);
+ m_phiBinnedLookUpTable[index].push_back(cluster);
+ }
+
+ for( auto& vec : m_phiBinnedLookUpTable ) {
+ std::stable_sort(vec.begin(),vec.end(),[](const eflowRecCluster* c1, const eflowRecCluster* c2) { return c1->getCluster()->eta() < c2->getCluster()->eta(); });
+ }
+ }
+
+ std::vector<eflowRecCluster*> EtaPhiLUT::clustersInCone( float eta, float phi, float dr ) const {
+ std::vector<eflowRecCluster*> result;
+
+ // Indices corresponding to phi range
+ unsigned int iPhiMin = phiIndex( phiInRange(phi-dr), m_phiBinSize );
+ unsigned int iPhiMax = phiIndex( phiInRange(phi+dr), m_phiBinSize );
+
+ // Extract index ranges to iterate over
+ std::vector< std::pair<int,int> > iPhiRanges;
+ if( iPhiMin < iPhiMax ) {
+ iPhiRanges.push_back( std::make_pair(iPhiMin,iPhiMax) );
+ } else { // special treatment for phi-wrapping
+ iPhiRanges.push_back( std::make_pair(0,iPhiMax) );
+ iPhiRanges.push_back( std::make_pair(iPhiMin,m_nphiBins-1) );
+ }
+
+ float dr2Cut = dr*dr;
+
+ // loop over ranges
+ for( auto& range : iPhiRanges ){
+ unsigned int indexMin = range.first;
+ unsigned int indexMax = range.second;
+ for( ; indexMin <= indexMax; ++indexMin ){
+ const std::vector<eflowRecCluster*>& phiClusters = m_phiBinnedLookUpTable[indexMin];
+
+ // Get iterators for clusters in relevant eta range
+ auto it_min = std::lower_bound (phiClusters.begin(), phiClusters.end(), eta-dr, [] (const eflowRecCluster* cl, float etaval) {return cl->getCluster()->eta()<etaval;} );
+ auto it_max = std::upper_bound (it_min, phiClusters.end(), eta+dr, [] (float etaval, const eflowRecCluster* cl) {return etaval<cl->getCluster()->eta();} );
+
+ // Apply deltaR cut
+ for( ;it_min!=it_max;++it_min ){
+ const xAOD::CaloCluster& xcluster = *(*it_min)->getCluster();
+ float deta = eta - xcluster.eta();
+ float dphi = phiInRange(phi - xcluster.phi());
+ float dr2 = deta*deta + dphi*dphi;
+ if( dr2 < dr2Cut ) result.push_back(*it_min);
+ }
+ }
+ }
+ return result;
+ }
+
+} // namespace
diff --git a/Reconstruction/eflowRec/src/PFCellLevelSubtractionTool.cxx b/Reconstruction/eflowRec/src/PFCellLevelSubtractionTool.cxx
index 07a5fe815ecddd70c63a92279c51ddc656db6ecd..6461f12d191356abc2edb0bbcdc9ad74e464c396 100644
--- a/Reconstruction/eflowRec/src/PFCellLevelSubtractionTool.cxx
+++ b/Reconstruction/eflowRec/src/PFCellLevelSubtractionTool.cxx
@@ -44,7 +44,7 @@ using namespace eflowSubtract;
PFCellLevelSubtractionTool::PFCellLevelSubtractionTool(const std::string& type,const std::string& name,const IInterface* parent) :
base_class( type, name, parent),
m_binnedParameters(nullptr)
-{
+{
}
PFCellLevelSubtractionTool::~PFCellLevelSubtractionTool() {
@@ -57,10 +57,6 @@ StatusCode PFCellLevelSubtractionTool::initialize(){
msg(MSG::WARNING) << "Cannot find PFTrackClusterMatchingTool" << endmsg;
}
- if (m_matchingToolForPull_015.retrieve().isFailure()) {
- msg(MSG::WARNING) << "Cannot find PFTrackClusterMatchingTool_2" << endmsg;
- }
-
if (m_matchingToolForPull_02.retrieve().isFailure()) {
msg(MSG::WARNING) << "Cannot find PFTrackClusterMatchingTool_2" << endmsg;
}
@@ -76,6 +72,12 @@ StatusCode PFCellLevelSubtractionTool::initialize(){
return StatusCode::SUCCESS;
}
+ m_trkpos.reset( dynamic_cast<PFMatch::TrackEtaPhiInFixedLayersProvider*>(PFMatch::TrackPositionFactory::Get("EM2EtaPhi").release()) );
+ if(!m_trkpos.get()) {
+ ATH_MSG_ERROR("Failed to get TrackPositionProvider for cluster preselection!");
+ return StatusCode::FAILURE;
+ }
+
return StatusCode::SUCCESS;
}
@@ -88,6 +90,7 @@ void PFCellLevelSubtractionTool::execute(eflowCaloObjectContainer* theEflowCaloO
data.caloObjects = theEflowCaloObjectContainer;
data.tracks = recTrackContainer;
data.clusters = recClusterContainer;
+ data.clusterLUT.fill(*recClusterContainer);
/* Add each track to its best matching cluster's eflowCaloObject */
matchAndCreateEflowCaloObj(m_nMatchesInCellLevelSubtraction, data);
@@ -114,30 +117,39 @@ unsigned int PFCellLevelSubtractionTool::matchAndCreateEflowCaloObj(unsigned int
for (unsigned int iTrack=0; iTrack<nTrack; ++iTrack) {
eflowRecTrack *thisEfRecTrack = static_cast<eflowRecTrack*>(data.tracks->at(iTrack));
- /* Add cluster matches needed for pull calculation*/
- std::vector<eflowRecCluster*> bestClusters_015 = m_matchingToolForPull_015->doMatches(thisEfRecTrack, data.clusters, -1);
- std::vector<eflowRecCluster*> bestClusters_02 = m_matchingToolForPull_02->doMatches(thisEfRecTrack, data.clusters, -1);
+ // Preselect clusters in a local cone
+ eflowRecMatchTrack matchTrack(thisEfRecTrack);
+ PFMatch::EtaPhi etaphi = m_trkpos->getPosition(&matchTrack);
+ float tracketa = etaphi.getEta();
+ float trackphi = etaphi.getPhiD();
+ float dRpresel = 0.4; // Some safety margin, but still << full detector
+ std::vector<eflowRecCluster*> nearbyClusters = data.clusterLUT.clustersInCone(tracketa,trackphi,dRpresel);
- for (unsigned int imatch=0; imatch < bestClusters_015.size(); ++imatch) {
- eflowTrackClusterLink* trackClusterLink = eflowTrackClusterLink::getInstance(thisEfRecTrack, bestClusters_015.at(imatch));
- thisEfRecTrack->addAlternativeClusterMatch(trackClusterLink,"cone_015");
- }
-
- for (unsigned int imatch=0; imatch < bestClusters_02.size(); ++imatch) {
- eflowTrackClusterLink* trackClusterLink = eflowTrackClusterLink::getInstance(thisEfRecTrack, bestClusters_02.at(imatch));
+ /* Add cluster matches needed for pull calculation*/
+ std::vector<std::pair<eflowRecCluster*,float> > bestClusters_02 = m_matchingToolForPull_02->doMatches(thisEfRecTrack, data.clusters, -1);
+
+ for (auto& matchpair : bestClusters_02) {
+ eflowRecCluster* theCluster = matchpair.first;
+ float distancesq = matchpair.second;
+ eflowTrackClusterLink* trackClusterLink = eflowTrackClusterLink::getInstance(thisEfRecTrack, theCluster);
+ if(distancesq<0.15*0.15) {
+ // Narrower cone is a subset of the selected clusters
+ // Distance returned is deltaR^2
+ thisEfRecTrack->addAlternativeClusterMatch(trackClusterLink,"cone_015");
+ }
thisEfRecTrack->addAlternativeClusterMatch(trackClusterLink,"cone_02");
}
- std::vector<eflowRecCluster*> bestClusters = m_matchingTool->doMatches(thisEfRecTrack, data.clusters, n);
+ std::vector<std::pair<eflowRecCluster*,float> > bestClusters = m_matchingTool->doMatches(thisEfRecTrack, data.clusters, n);
if (bestClusters.empty()) { continue; }
/* Matched cluster: create TrackClusterLink and add it to both the track and the cluster (eflowCaloObject will be created later) */
nMatches++;
- for (unsigned int imatch=0; imatch < bestClusters.size(); ++imatch) {
- eflowTrackClusterLink* trackClusterLink = eflowTrackClusterLink::getInstance(thisEfRecTrack, bestClusters.at(imatch));
- thisEfRecTrack->addClusterMatch(trackClusterLink);
- bestClusters.at(imatch)->addTrackMatch(trackClusterLink);
-
+ for (auto& matchpair : bestClusters) {
+ eflowRecCluster* theCluster = matchpair.first;
+ eflowTrackClusterLink* trackClusterLink = eflowTrackClusterLink::getInstance(thisEfRecTrack, theCluster);
+ thisEfRecTrack->addClusterMatch(trackClusterLink);
+ theCluster->addTrackMatch(trackClusterLink);
}
}
diff --git a/Reconstruction/eflowRec/src/PFClusterCollectionTool.cxx b/Reconstruction/eflowRec/src/PFClusterCollectionTool.cxx
index 79f658a6c7fc7d3946c2f6880820bbfd7aea1896..6cf144b74eec1b478cf51a74f1fc8cd776bb8898 100644
--- a/Reconstruction/eflowRec/src/PFClusterCollectionTool.cxx
+++ b/Reconstruction/eflowRec/src/PFClusterCollectionTool.cxx
@@ -61,6 +61,7 @@ std::unique_ptr<xAOD::CaloClusterContainer> PFClusterCollectionTool::execute(con
ATH_MSG_DEBUG("Adding cluster with E, eta and phi to moments maker " << thisCluster->e() << ", " << thisCluster->eta() << " and " << thisCluster->phi());
}
}
+ std::sort(result->begin(), result->end(), [](xAOD::CaloCluster* c1, xAOD::CaloCluster* c2) {return c1->e()>c2->e();});
return result;
}
diff --git a/Reconstruction/eflowRec/src/PFOChargedCreatorAlgorithm.cxx b/Reconstruction/eflowRec/src/PFOChargedCreatorAlgorithm.cxx
index fce83ce909c57b149005008fc8398fc653809a82..a9611817b9ed690aa234ab52cacce6119cfc282b 100644
--- a/Reconstruction/eflowRec/src/PFOChargedCreatorAlgorithm.cxx
+++ b/Reconstruction/eflowRec/src/PFOChargedCreatorAlgorithm.cxx
@@ -1,9 +1,11 @@
/*
- 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 "eflowRec/PFOChargedCreatorAlgorithm.h"
+#include <algorithm>
+
#include "eflowRec/eflowRecCluster.h"
#include "eflowRec/eflowRecTrack.h"
#include "eflowRec/eflowTrackClusterLink.h"
@@ -11,7 +13,7 @@
#include "xAODPFlow/PFOAuxContainer.h"
PFOChargedCreatorAlgorithm::PFOChargedCreatorAlgorithm(const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name,pSvcLocator)
+ AthReentrantAlgorithm(name,pSvcLocator)
{
}
@@ -24,23 +26,25 @@ StatusCode PFOChargedCreatorAlgorithm::initialize(){
return StatusCode::SUCCESS;
}
-StatusCode PFOChargedCreatorAlgorithm::execute(){
+StatusCode PFOChargedCreatorAlgorithm::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("Processing eflowCaloObjectContainer");
- SG::WriteHandle<xAOD::PFOContainer> chargedPFOContainerWriteHandle(m_chargedPFOContainerWriteHandleKey);
+ SG::WriteHandle<xAOD::PFOContainer> chargedPFOContainerWriteHandle(m_chargedPFOContainerWriteHandleKey,ctx);
ATH_CHECK(chargedPFOContainerWriteHandle.record(std::make_unique<xAOD::PFOContainer>(),std::make_unique<xAOD::PFOAuxContainer>()));
/* Create Charged PFOs from all eflowCaloObjects */
- SG::ReadHandle<eflowCaloObjectContainer> eflowCaloObjectContainerReadHandle(m_eflowCaloObjectContainerReadHandleKey);
+ SG::ReadHandle<eflowCaloObjectContainer> eflowCaloObjectContainerReadHandle(m_eflowCaloObjectContainerReadHandleKey,ctx);
for (auto thisEflowCaloObject : *eflowCaloObjectContainerReadHandle) createChargedPFO(*thisEflowCaloObject,true,chargedPFOContainerWriteHandle);
+ std::sort(chargedPFOContainerWriteHandle->begin(), chargedPFOContainerWriteHandle->end(), [] (const xAOD::PFO* pfo1, const xAOD::PFO* pfo2) {return pfo1->pt()>pfo2->pt();});
+
return StatusCode::SUCCESS;
}
StatusCode PFOChargedCreatorAlgorithm::finalize(){ return StatusCode::SUCCESS; }
-void PFOChargedCreatorAlgorithm::createChargedPFO(const eflowCaloObject& energyFlowCaloObject, bool addClusters, SG::WriteHandle<xAOD::PFOContainer>& chargedPFOContainerWriteHandle){
+void PFOChargedCreatorAlgorithm::createChargedPFO(const eflowCaloObject& energyFlowCaloObject, bool addClusters, SG::WriteHandle<xAOD::PFOContainer>& chargedPFOContainerWriteHandle) const {
/* Loop over all tracks in the eflowCaloObject */
int nTracks = energyFlowCaloObject.nTracks();
diff --git a/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx b/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
index f42045c56da39bb1dc912580b550a9316298b149..00dd296913bb947fc4285cd56c7f52c63ee85313 100644
--- a/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
+++ b/Reconstruction/eflowRec/src/PFONeutralCreatorAlgorithm.cxx
@@ -1,9 +1,11 @@
/*
- 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 "eflowRec/PFONeutralCreatorAlgorithm.h"
+#include <algorithm>
+
#include "eflowRec/eflowCaloObject.h"
#include "eflowRec/eflowRecCluster.h"
#include "eflowRec/eflowTrackClusterLink.h"
@@ -11,7 +13,7 @@
#include "xAODPFlow/PFOAuxContainer.h"
PFONeutralCreatorAlgorithm::PFONeutralCreatorAlgorithm( const std::string& name, ISvcLocator* pSvcLocator) :
- AthAlgorithm(name, pSvcLocator)
+ AthReentrantAlgorithm(name, pSvcLocator)
{
}
@@ -26,29 +28,51 @@ StatusCode PFONeutralCreatorAlgorithm::initialize(){
}
-StatusCode PFONeutralCreatorAlgorithm::execute(){
+StatusCode PFONeutralCreatorAlgorithm::execute(const EventContext& ctx) const {
ATH_MSG_DEBUG("Executing");
- SG::WriteHandle<xAOD::PFOContainer> neutralPFOContainerWriteHandle(m_neutralPFOContainerWriteHandleKey);
- ATH_CHECK(neutralPFOContainerWriteHandle.record(std::make_unique<xAOD::PFOContainer>(),std::make_unique<xAOD::PFOAuxContainer>()));
- std::unique_ptr<SG::WriteHandle<xAOD::PFOContainer> > p_neutralPFOContainerWriteHandle_nonModified(nullptr);
- if (m_LCMode) {
- p_neutralPFOContainerWriteHandle_nonModified = std::make_unique<SG::WriteHandle<xAOD::PFOContainer> >(m_neutralPFOContainerWriteHandleKey_nonModified);
- ATH_CHECK(p_neutralPFOContainerWriteHandle_nonModified->record(std::make_unique<xAOD::PFOContainer>(),std::make_unique<xAOD::PFOAuxContainer>()));
- }
-
/* Create Neutral PFOs from all eflowCaloObjects */
- SG::ReadHandle<eflowCaloObjectContainer> eflowCaloObjectContainerReadHandle(m_eflowCaloObjectContainerReadHandleKey);
+ SG::ReadHandle<eflowCaloObjectContainer> eflowCaloObjectContainerReadHandle(m_eflowCaloObjectContainerReadHandleKey,ctx);
+
+ // Always create at least one PFO container & aux
+ auto neutralPFOContainer = std::make_unique<xAOD::PFOContainer>();
+ auto neutralPFOContainerAux = std::make_unique<xAOD::PFOAuxContainer>();
+ neutralPFOContainer->setStore(neutralPFOContainerAux.get());
+ // The non-modified container is only used for LC PFOs
+ std::unique_ptr<xAOD::PFOContainer> neutralPFOContainer_nonModified(nullptr);
+ std::unique_ptr<xAOD::PFOAuxContainer> neutralPFOContainerAux_nonModified(nullptr);
+ if(m_LCMode) {
+ neutralPFOContainer_nonModified = std::make_unique<xAOD::PFOContainer>();
+ neutralPFOContainerAux_nonModified = std::make_unique<xAOD::PFOAuxContainer>();
+ neutralPFOContainer->setStore(neutralPFOContainerAux_nonModified.get());
+ }
+
ATH_MSG_DEBUG("Looping over eflowCaloObjects");
- for (auto thisEflowCaloObject : *eflowCaloObjectContainerReadHandle) createNeutralPFO(*thisEflowCaloObject, neutralPFOContainerWriteHandle, p_neutralPFOContainerWriteHandle_nonModified.get());
+ // Create PFOs and fill the containers
+ for (auto thisEflowCaloObject : *eflowCaloObjectContainerReadHandle) {
+ if( createNeutralPFO(*thisEflowCaloObject, neutralPFOContainer.get(), neutralPFOContainer_nonModified.get()).isFailure() ) {
+ ATH_MSG_WARNING("Problem encountered while creating neutral PFOs");
+ return StatusCode::SUCCESS;
+ }
+ }
+
+ // Record the output containers
+ SG::WriteHandle<xAOD::PFOContainer> neutralPFOContainerWriteHandle(m_neutralPFOContainerWriteHandleKey,ctx);
+ std::sort(neutralPFOContainer->begin(), neutralPFOContainer->end(), [] (const xAOD::PFO* pfo1, const xAOD::PFO* pfo2) {return pfo1->pt()>pfo2->pt();});
+ ATH_CHECK( neutralPFOContainerWriteHandle.record(std::move(neutralPFOContainer),std::move(neutralPFOContainerAux)) );
+ if(m_LCMode) {
+ std::sort(neutralPFOContainer_nonModified->begin(), neutralPFOContainer_nonModified->end(), [] (const xAOD::PFO* pfo1, const xAOD::PFO* pfo2) {return pfo1->pt()>pfo2->pt();});
+ SG::WriteHandle<xAOD::PFOContainer> neutralPFOContainerWriteHandle_nonModified(m_neutralPFOContainerWriteHandleKey,ctx);
+ ATH_CHECK( neutralPFOContainerWriteHandle_nonModified.record(std::move(neutralPFOContainer_nonModified),std::move(neutralPFOContainerAux_nonModified)) );
+ }
return StatusCode::SUCCESS;
}
StatusCode PFONeutralCreatorAlgorithm::finalize(){ return StatusCode::SUCCESS; }
-void PFONeutralCreatorAlgorithm::createNeutralPFO(const eflowCaloObject& energyFlowCaloObject,SG::WriteHandle<xAOD::PFOContainer>& neutralPFOContainerWriteHandle, SG::WriteHandle<xAOD::PFOContainer>* neutralPFOContainerWriteHandle_nonModified){
+StatusCode PFONeutralCreatorAlgorithm::createNeutralPFO(const eflowCaloObject& energyFlowCaloObject, xAOD::PFOContainer* neutralPFOContainer, xAOD::PFOContainer* neutralPFOContainer_nonModified) const {
unsigned int nClusters = energyFlowCaloObject.nClusters();
@@ -72,12 +96,17 @@ void PFONeutralCreatorAlgorithm::createNeutralPFO(const eflowCaloObject& energyF
xAOD::PFO* thisPFO = new xAOD::PFO();
if (m_LCMode) {
if (thisEfRecCluster->isTouchable()) {
- neutralPFOContainerWriteHandle->push_back(thisPFO);
+ neutralPFOContainer->push_back(thisPFO);
} else {
- (*neutralPFOContainerWriteHandle_nonModified)->push_back(thisPFO);
+ if(neutralPFOContainer_nonModified) {
+ neutralPFOContainer_nonModified->push_back(thisPFO);
+ } else {
+ ATH_MSG_WARNING("Got a nullptr for non-modified nPFO container!");
+ return StatusCode::FAILURE;
+ }
}
} else {
- neutralPFOContainerWriteHandle->push_back(thisPFO);
+ neutralPFOContainer->push_back(thisPFO);
}
ATH_MSG_VERBOSE(" Get original cluster link");
@@ -278,9 +307,10 @@ void PFONeutralCreatorAlgorithm::createNeutralPFO(const eflowCaloObject& energyF
thisPFO->setAttribute(myAttribute_TIMING, clusterTiming);
}
}
+ return StatusCode::SUCCESS;
}
-void PFONeutralCreatorAlgorithm::addMoment(const xAOD::CaloCluster::MomentType& momentType, const xAOD::PFODetails::PFOAttributes& pfoAttribute, const xAOD::CaloCluster& theCluster, xAOD::PFO& thePFO){
+void PFONeutralCreatorAlgorithm::addMoment(const xAOD::CaloCluster::MomentType& momentType, const xAOD::PFODetails::PFOAttributes& pfoAttribute, const xAOD::CaloCluster& theCluster, xAOD::PFO& thePFO) const {
double moment = 0.0;
bool isRetrieved = theCluster.retrieveMoment(momentType, moment);
diff --git a/Reconstruction/eflowRec/src/PFRecoverSplitShowersTool.cxx b/Reconstruction/eflowRec/src/PFRecoverSplitShowersTool.cxx
index d0bb314287ac2b2986e7351762829cd7f249bcc8..06b16f46c9774355cd3a667d461bec66565034ec 100644
--- a/Reconstruction/eflowRec/src/PFRecoverSplitShowersTool.cxx
+++ b/Reconstruction/eflowRec/src/PFRecoverSplitShowersTool.cxx
@@ -36,11 +36,6 @@ PFRecoverSplitShowersTool::~PFRecoverSplitShowersTool() {}
StatusCode PFRecoverSplitShowersTool::initialize(){
- if (m_matchingTool.retrieve().isFailure()){
- ATH_MSG_WARNING("Couldn't retrieve PFTrackClusterMatchingTool");
- return StatusCode::SUCCESS;
- }
-
if (m_theEOverPTool.retrieve().isFailure()){
ATH_MSG_WARNING("Cannot find eflowEOverPTool");
return StatusCode::SUCCESS;
@@ -54,12 +49,14 @@ StatusCode PFRecoverSplitShowersTool::initialize(){
return StatusCode::SUCCESS;
}
-void PFRecoverSplitShowersTool::execute(eflowCaloObjectContainer* theEflowCaloObjectContainer, eflowRecTrackContainer*, eflowRecClusterContainer*) const {
+void PFRecoverSplitShowersTool::execute(eflowCaloObjectContainer* theEflowCaloObjectContainer, eflowRecTrackContainer* eflowRecTracks, eflowRecClusterContainer* eflowRecClusters) const {
ATH_MSG_DEBUG("Executing");
eflowData data;
data.caloObjects = theEflowCaloObjectContainer;
+ data.tracksToRecover.reserve(eflowRecTracks->size());
+ data.clustersToConsider.reserve(eflowRecClusters->size());
fillTracksToRecover(data);
fillClustersToConsider(data);
@@ -91,12 +88,10 @@ void PFRecoverSplitShowersTool::fillClustersToConsider(eflowData& data) const {
if (0 == (int)theCellLink->size()){ continue; }
thisEflowCaloObject->efRecCluster(i)->clearTrackMatches();
- data.clustersToConsider.push_back(thisEflowCaloObject->efRecCluster(i));
+ data.clustersToConsider.insert(thisEflowCaloObject->efRecCluster(i));
thisEflowCaloObject->clearClusters();
}
}
-
- std::sort(data.clustersToConsider.begin(),data.clustersToConsider.end(),eflowRecCluster::SortDescendingPt());
}
void PFRecoverSplitShowersTool::fillTracksToRecover(eflowData& data) const {
@@ -163,26 +158,35 @@ unsigned int PFRecoverSplitShowersTool::matchAndCreateEflowCaloObj(eflowData& da
const xAOD::TrackParticle* track = thisEfRecTrack->getTrack();
ATH_MSG_DEBUG("Recovering charged EFO with e,pt, eta and phi " << track->e() << ", " << track->pt() << ", " << track->eta() << " and " << track->phi());
}
- /* Get list of matched clusters */
- std::vector<eflowRecCluster*> matchedClusters = m_matchingTool->doMatches(thisEfRecTrack, data.clustersToConsider, -1);
+ // Get list of matched clusters in the dR<0.2 cone -- already identified
+ const std::vector<eflowTrackClusterLink*>* matchedClusters_02 = thisEfRecTrack->getAlternativeClusterMatches("cone_02");
+ if (!matchedClusters_02) { continue; }
if (msgLvl(MSG::DEBUG)){
- for (auto thisEFRecCluster : matchedClusters) ATH_MSG_DEBUG("Have matched cluster with e, pt, eta, phi of " << thisEFRecCluster->getCluster()->e() << ", " << thisEFRecCluster->getCluster()->eta() << ", " << thisEFRecCluster->getCluster()->eta() << " and " << thisEFRecCluster->getCluster()->phi());
+ for (auto trkClusLink : *matchedClusters_02) {
+ const eflowRecCluster* thisEFRecCluster = trkClusLink->getCluster();
+ ATH_MSG_DEBUG("Have matched cluster with e, pt, eta, phi of " << thisEFRecCluster->getCluster()->e() << ", " << thisEFRecCluster->getCluster()->eta() << ", " << thisEFRecCluster->getCluster()->eta() << " and " << thisEFRecCluster->getCluster()->phi());
+ }
}
- if (matchedClusters.empty()) { continue; }
+ if (matchedClusters_02->empty()) { continue; }
/* Matched cluster: create TrackClusterLink and add it to both the track and the cluster (eflowCaloObject will be created later) */
- for (auto efRecCluster : matchedClusters){
- eflowTrackClusterLink* trackClusterLink = eflowTrackClusterLink::getInstance(thisEfRecTrack,efRecCluster);
+ for (auto trkClusLink : *matchedClusters_02){
+ eflowRecCluster* thisEFRecCluster = trkClusLink->getCluster();
+ // Look up whether this cluster is intended for recovery
+ if( data.clustersToConsider.find(trkClusLink->getCluster()) == data.clustersToConsider.end() ) {continue;}
+ eflowTrackClusterLink* trackClusterLink = eflowTrackClusterLink::getInstance(thisEfRecTrack,thisEFRecCluster);
thisEfRecTrack->addClusterMatch(trackClusterLink);
- efRecCluster->addTrackMatch(trackClusterLink);
+ thisEFRecCluster->addTrackMatch(trackClusterLink);
}
}
/* Create all eflowCaloObjects that contain eflowRecCluster */
eflowCaloObjectMaker makeCaloObject;
- unsigned int nCaloObjects = makeCaloObject.makeTrkCluCaloObjects(data.tracksToRecover, data.clustersToConsider,
+ std::vector<eflowRecCluster*> v_clustersToConsider(data.clustersToConsider.begin(),data.clustersToConsider.end());
+ std::sort(v_clustersToConsider.begin(),v_clustersToConsider.end(),eflowRecCluster::SortDescendingPt());
+ unsigned int nCaloObjects = makeCaloObject.makeTrkCluCaloObjects(data.tracksToRecover, v_clustersToConsider,
data.caloObjects);
ATH_MSG_DEBUG("PFRecoverSplitShowersTool created " << nCaloObjects << " CaloObjects");
@@ -214,9 +218,10 @@ void PFRecoverSplitShowersTool::performSubtraction(eflowCaloObject* thisEflowCal
matchedClusters.clear();
std::vector<eflowTrackClusterLink*> links = thisEfRecTrack->getClusterMatches();
for ( auto thisEFlowTrackClusterLink : links) matchedClusters.push_back(thisEFlowTrackClusterLink->getCluster());
+ std::sort(matchedClusters.begin(),matchedClusters.end(),eflowRecCluster::SortDescendingPt());
if (msgLvl(MSG::DEBUG)){
- for (auto thisClus : matchedClusters) ATH_MSG_DEBUG("Cluster with e,pt, eta and phi of " << thisClus->getCluster()->e() << ", "<< thisClus->getCluster()->pt() << ", " << thisClus->getCluster()->eta() << " and " << thisClus->getCluster()->phi() << " will be subtracted");
+ for (auto thisClus : matchedClusters) ATH_MSG_DEBUG("Cluster " << thisClus->getCluster()->index() << " with e,pt, eta and phi of " << thisClus->getCluster()->e() << ", "<< thisClus->getCluster()->pt() << ", " << thisClus->getCluster()->eta() << " and " << thisClus->getCluster()->phi() << " will be subtracted");
}
/* Do subtraction */
std::vector<std::pair<xAOD::CaloCluster*, bool> > clusterSubtractionList;
@@ -255,7 +260,7 @@ void PFRecoverSplitShowersTool::performSubtraction(eflowCaloObject* thisEflowCal
else clusterSubtractedEnergyRatios.push_back(NAN);
}
- pfSubtractionStatusSetter.markSubtractionStatus(clusterSubtractionList, clusterSubtractedEnergyRatios, *thisEflowCaloObject);
+ pfSubtractionStatusSetter.markSubtractionStatus(clusterSubtractionList, clusterSubtractedEnergyRatios, *thisEflowCaloObject);
}
diff --git a/Reconstruction/eflowRec/src/PFTrackClusterMatchingTool.cxx b/Reconstruction/eflowRec/src/PFTrackClusterMatchingTool.cxx
index 04724057d4fbf1b9b1f7051305b086d525a28b24..e92a5e01c9250b8dd0b618458e659c5a23676d59 100644
--- a/Reconstruction/eflowRec/src/PFTrackClusterMatchingTool.cxx
+++ b/Reconstruction/eflowRec/src/PFTrackClusterMatchingTool.cxx
@@ -53,23 +53,17 @@ StatusCode PFTrackClusterMatchingTool::finalize() {
return StatusCode::SUCCESS;
}
-std::vector<eflowRecCluster*> PFTrackClusterMatchingTool::doMatches(const eflowRecTrack* track, eflowRecClusterContainer* clusters, int nMatches) const {
- std::vector<eflowRecCluster*> vec_clusters;
- for (unsigned int iCluster = 0; iCluster < clusters->size(); ++iCluster) {
- eflowRecCluster* thisEFRecCluster = clusters->at(iCluster);
- vec_clusters.push_back(thisEFRecCluster);
- }
- const std::vector<eflowRecCluster*> const_clusters = vec_clusters;
- return doMatches(track, const_clusters, nMatches);
+std::vector<std::pair<eflowRecCluster*,float> > PFTrackClusterMatchingTool::doMatches(const eflowRecTrack* track, eflowRecClusterContainer* clusters, int nMatches) const {
+ const std::vector<eflowRecCluster*> vec_clusters(clusters->begin(), clusters->end());
+ return doMatches(track, vec_clusters, nMatches);
}
-std::vector<eflowRecCluster*> PFTrackClusterMatchingTool::doMatches(const eflowRecTrack* track, const std::vector<eflowRecCluster*> clusters, int nMatches) const {
+std::vector<std::pair<eflowRecCluster*,float> > PFTrackClusterMatchingTool::doMatches(const eflowRecTrack* track, const std::vector<eflowRecCluster*> clusters, int nMatches) const {
/* Transform the vector of eflowRecCluster into a vector of eflowMatchClusters */
- unsigned int nClusters = clusters.size();
std::vector<const eflowMatchCluster*> matchClusters;
- for (unsigned int iCluster = 0; iCluster < nClusters; ++iCluster) {
- matchClusters.push_back(clusters.at(iCluster)->getMatchCluster());
+ for (auto& cluster : clusters) {
+ matchClusters.push_back(cluster->getMatchCluster());
}
/* Use the TrackClusterMatcher to retrieve the matches */
@@ -77,12 +71,12 @@ std::vector<eflowRecCluster*> PFTrackClusterMatchingTool::doMatches(const eflowR
std::vector<MatchDistance> allMatches = m_matcher->bestMatches(&matchTrack, matchClusters, nMatches, 0.1*track->getTrack()->e());
/* Transform the vector of MatchDistance objects into a vector of eflowRecClusters and return it */
- std::vector<eflowRecCluster*> results;
- for (unsigned int imatch = 0; imatch < allMatches.size(); ++imatch) {
+ std::vector<std::pair<eflowRecCluster*,float> > results;
+ for (MatchDistance& match : allMatches) {
// The matching cannot change the cluster type, this started as eflowMatchCluster
// and remains of that type -- no need to test cast from ICluster*
- const eflowMatchCluster* thisMatch = static_cast<const eflowMatchCluster*>(allMatches.at(imatch).first);
- results.push_back(thisMatch->getEfRecCluster());
+ const eflowMatchCluster* thisMatch = static_cast<const eflowMatchCluster*>(match.first);
+ results.push_back(std::make_pair(thisMatch->getEfRecCluster(),match.second));
}
return results;
}
diff --git a/Reconstruction/egamma/egammaAlgs/CMakeLists.txt b/Reconstruction/egamma/egammaAlgs/CMakeLists.txt
index 1121c7dd6b85bdaf309e03c9bbcaf31a2082d3ce..b71e28930fe9f2377d0c8a3f4a3fd7257e369f0a 100644
--- a/Reconstruction/egamma/egammaAlgs/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaAlgs/CMakeLists.txt
@@ -46,7 +46,7 @@ atlas_add_component( egammaAlgs
MCTruthClassifierLib CaloGeoHelpers CaloUtilsLib CaloDetDescrLib AthenaKernel StoreGateLib
xAODTracking InDetReadoutGeometry EgammaAnalysisInterfacesLib egammaRecEvent egammaUtils
TrkToolInterfaces InDetRecToolInterfaces FourMomUtils RecoToolInterfaces TrkTrack
- TrkPseudoMeasurementOnTrack InDetConversionFinderToolsLib TrkCaloExtension)
+ TrkPseudoMeasurementOnTrack InDetConversionFinderToolsLib TrkCaloExtension egammaInterfacesLib )
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref
index 06f9614cc8c51a77295ba271fb5caee30e4ac88c..a3fd1075558913a1f843d31e66a3bb37aac96a34 100644
--- a/Tools/PROCTools/data/master_q221_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref
@@ -1,26 +1,26 @@
run event nTopo nIdTracks nJets nMuons nElec nTrueElec nFakeElec nPhot nTruePhot nFakePhot
284500 87473001 118 128 4 1 9 2 7 7 4 3
- 284500 87473014 85 79 6 0 9 1 8 7 4 3
- 284500 87473022 38 30 4 0 5 1 4 2 1 1
+ 284500 87473014 85 80 6 0 9 1 8 7 4 3
+ 284500 87473022 38 29 4 0 5 1 4 4 3 1
284500 87473032 27 33 4 1 9 4 5 2 1 1
- 284500 87473037 60 42 7 0 10 2 8 6 4 2
- 284500 87473040 101 96 9 0 17 1 16 7 5 2
- 284500 87473051 142 114 12 1 14 2 12 22 16 6
+ 284500 87473037 60 42 7 0 11 2 9 5 3 2
+ 284500 87473040 101 95 9 0 17 1 16 7 5 2
+ 284500 87473051 142 111 12 1 13 1 12 23 16 7
284500 87473063 62 76 5 2 6 2 4 6 4 2
284500 87473068 26 35 1 1 0 0 0 0 0 0
- 284500 87473075 72 87 6 0 5 0 5 5 4 1
- 284500 87473084 83 86 7 3 15 1 14 9 4 5
+ 284500 87473075 72 84 6 0 5 0 5 5 4 1
+ 284500 87473084 83 86 7 2 14 1 13 10 5 5
284500 87473091 43 49 3 0 2 1 1 5 2 3
284500 87473096 72 75 3 2 2 0 2 3 2 1
- 284500 87473104 61 66 6 0 6 1 5 5 4 1
- 284500 87473114 93 83 7 2 13 1 12 8 5 3
- 284500 87473121 93 101 6 3 15 4 11 7 6 1
+ 284500 87473104 61 63 6 0 6 1 5 5 4 1
+ 284500 87473114 93 82 7 2 13 1 12 8 5 3
+ 284500 87473121 93 100 6 3 16 4 12 6 5 1
284500 87473132 81 59 9 1 10 0 10 5 5 0
284500 87473137 81 71 8 3 15 0 15 6 6 0
284500 87473144 83 70 7 1 6 0 6 8 5 3
- 284500 87473154 89 88 7 0 10 2 8 7 4 3
- 284500 87473162 52 52 3 0 8 1 7 3 2 1
+ 284500 87473154 89 89 7 0 9 1 8 8 4 4
+ 284500 87473162 52 52 3 0 7 0 7 3 2 1
284500 87473167 74 54 6 3 12 2 10 13 8 5
- 284500 87473171 82 71 8 3 4 2 2 5 3 2
- 284500 87473184 74 88 5 2 8 2 6 8 5 3
- 284500 87473192 54 53 4 1 7 4 3 5 4 1
+ 284500 87473171 82 70 8 3 4 2 2 5 3 2
+ 284500 87473184 74 87 5 2 7 1 6 9 5 4
+ 284500 87473192 54 52 4 1 7 4 3 5 4 1
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 8f5fbb3ab9e6074b7716c733dd172b1ae8cc814a..4973e847c86bd5c276bc38854eb4c37e7bad2843 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -1,26 +1,26 @@
run event nTopo nIdTracks nJets nMuons
330470 1183722158 1 0 0 0
- 330470 1183722342 394 428 20 0
- 330470 1183727953 532 594 13 4
- 330470 1183732647 467 483 12 1
- 330470 1183733040 381 293 6 1
- 330470 1183734651 361 375 14 3
- 330470 1183735332 406 396 9 1
- 330470 1183736475 741 723 15 2
+ 330470 1183722342 394 414 18 0
+ 330470 1183727953 532 571 13 4
+ 330470 1183732647 467 452 13 1
+ 330470 1183733040 381 285 6 1
+ 330470 1183734651 361 363 14 3
+ 330470 1183735332 406 370 9 1
+ 330470 1183736475 741 650 17 3
330470 1183738728 1 0 0 0
- 330470 1183738949 368 443 9 1
- 330470 1183742489 152 126 2 1
- 330470 1183743040 285 313 5 0
- 330470 1183746343 492 504 14 0
+ 330470 1183738949 368 418 9 1
+ 330470 1183742489 152 125 2 1
+ 330470 1183743040 285 305 5 0
+ 330470 1183746343 492 465 14 0
330470 1183746710 6 0 0 0
- 330470 1183751782 239 240 5 0
- 330470 1183752624 347 369 8 3
- 330470 1183753006 357 396 11 3
- 330470 1183754806 470 427 14 0
- 330470 1183769295 342 335 8 1
- 330470 1183769939 348 353 11 3
- 330470 1183773832 307 204 7 0
+ 330470 1183751782 239 235 5 0
+ 330470 1183752624 347 342 8 3
+ 330470 1183753006 357 377 11 3
+ 330470 1183754806 470 405 14 0
+ 330470 1183769295 342 317 8 1
+ 330470 1183769939 348 341 11 3
+ 330470 1183773832 307 197 7 0
330470 1183775209 57 0 0 0
- 330470 1183787124 431 381 11 2
- 330470 1183787946 321 325 5 1
- 330470 1183795329 458 345 19 0
+ 330470 1183787124 431 361 11 2
+ 330470 1183787946 321 310 5 1
+ 330470 1183795329 458 333 18 0
diff --git a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
index 2b3c42fdfc885b9acff7e18d5b9456354b3fa221..104596fc7ba29648c9e38e8d2fc4f59ca4079f98 100644
--- a/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
+++ b/Tracking/TrkTools/TrkMaterialProvider/src/TrkMaterialProviderTool.cxx
@@ -1135,7 +1135,7 @@ void Trk::TrkMaterialProviderTool::updateVector(DataVector<const Trk::TrackState
while(i<ntoupdate) {
it = inputTSOS->erase(it);
++i;
- firstMS--;
+ --firstMS;
}
inputTSOS->insert(firstMS, caloTSOS->begin(), caloTSOS->end());
}
@@ -1169,7 +1169,7 @@ void Trk::TrkMaterialProviderTool::updateVectorMS(DataVector<const Trk::TrackSta
// In the MuonSpectrometer the TSOS for the MaterialEffectsOnTrack do NOT have trackParameters
- for(;it!= inputTSOS->end();it++) {
+ for(;it!= inputTSOS->end();++it) {
msStates++;
if((*it)->materialEffectsOnTrack()) {
msMatStates++;
@@ -1220,7 +1220,7 @@ void Trk::TrkMaterialProviderTool::updateVectorMS(DataVector<const Trk::TrackSta
std::cout << " msStates " << msStates << " msMatStates " << msMatStates << " msMatParStates " << msMatParStates << std::endl;
// dump (new) energy loss
- for(it = firstMS;it!= inputTSOS->end();it++) {
+ for(it = firstMS;it!= inputTSOS->end();++it) {
if((*it)->materialEffectsOnTrack()) {
const Trk::MaterialEffectsOnTrack* meot = dynamic_cast<const Trk::MaterialEffectsOnTrack*>((*it)->materialEffectsOnTrack());
if(meot) {
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/CMakeLists.txt b/Tracking/TrkTools/TrkTrackSummaryTool/CMakeLists.txt
index 995a9caed8b938615f91dbc024303ec95d4e1263..2ab5a9a09228eb78449e2a15964ce953026179be 100644
--- a/Tracking/TrkTools/TrkTrackSummaryTool/CMakeLists.txt
+++ b/Tracking/TrkTools/TrkTrackSummaryTool/CMakeLists.txt
@@ -31,7 +31,8 @@ atlas_add_component( TrkTrackSummaryTool
src/*.cxx
src/components/*.cxx
LINK_LIBRARIES AthenaBaseComps AthContainers GaudiKernel TrkParameters TrkTrackSummary TrkToolInterfaces AtlasDetDescr
- Identifier TrkDetElementBase TrkGeometry TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMeasurementBase TrkRIO_OnTrack TrkTrack CxxUtils)
+ Identifier TrkDetElementBase TrkGeometry TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMeasurementBase TrkRIO_OnTrack TrkTrack CxxUtils
+ TRT_ElectronPidToolsLib )
# Install files from the package:
atlas_install_headers( TrkTrackSummaryTool )
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/TrkV0Fitter/TrkV0VertexFitter.h b/Tracking/TrkVertexFitter/TrkV0Fitter/TrkV0Fitter/TrkV0VertexFitter.h
index 27046f04a09cc2cd568eb3b15e5630f79ccb702d..d32fec23c6c955d72ce2dee61c07b9a8d242ff2a 100755
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/TrkV0Fitter/TrkV0VertexFitter.h
+++ b/Tracking/TrkVertexFitter/TrkV0Fitter/TrkV0Fitter/TrkV0VertexFitter.h
@@ -158,13 +158,13 @@ namespace Trk
*/
virtual xAOD::Vertex * fit(const std::vector<const xAOD::TrackParticle*> & vectorTrk,
- const std::vector<double> masses,
+ const std::vector<double>& masses,
const double& constraintMass,
const xAOD::Vertex* pointingVertex,
const Amg::Vector3D& startingPoint) const;
virtual xAOD::Vertex * fit(const std::vector<const Trk::TrackParameters*> & perigeeList,
- const std::vector<double> masses,
+ const std::vector<double>& masses,
const double& constraintMass,
const xAOD::Vertex* pointingVertex,
const Amg::Vector3D& startingPoint) const;
diff --git a/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx b/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
index ca1fdb73ee50881f0d1d069c7aeac85be0fa459d..0704ab2ffda553a83c24e62ead2bc0bdd0ba62f0 100755
--- a/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
+++ b/Tracking/TrkVertexFitter/TrkV0Fitter/src/TrkV0VertexFitter.cxx
@@ -116,7 +116,7 @@ namespace Trk
/** Interface for xAOD::TrackParticle with mass and pointing constraints */
xAOD::Vertex * TrkV0VertexFitter::fit(const std::vector<const xAOD::TrackParticle*> & vectorTrk,
- const std::vector<double> masses,
+ const std::vector<double>& masses,
const double& constraintMass,
const xAOD::Vertex* pointingVertex,
const Amg::Vector3D& firstStartingPoint) const
@@ -210,7 +210,7 @@ namespace Trk
/** Interface for Trk::TrackParameters with mass and pointing constraints */
xAOD::Vertex * TrkV0VertexFitter::fit(const std::vector<const Trk::TrackParameters*>& originalPerigees,
- const std::vector<double> masses,
+ const std::vector<double>& masses,
const double& constraintMass,
const xAOD::Vertex* pointingVertex,
const Amg::Vector3D& firstStartingPoint) const
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtParametersBase.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtParametersBase.cxx
index aa0b2adb53e4f02669eb14f83a519947b5e00452..609cd85e631bd1b19153eb0d59f855e28fdd10f6 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtParametersBase.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtParametersBase.cxx
@@ -31,7 +31,7 @@ namespace Trk {
//MsgStream log(msgSvc(), name());
std::vector<const TrackParameters*>::const_iterator i_pbase;
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
Amg::Vector3D perGlobalPos,perGlobalVrt;
const Trk::Perigee* mPer=nullptr;
double CovVertTrk[15]; std::fill(CovVertTrk,CovVertTrk+15,0.);
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrackParticle.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrackParticle.cxx
index c7798e81a89d1ba3aebed6342210d9c5a7534510..1f7363cc9f7bfef26eadad5418c57e4535860646 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrackParticle.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrackParticle.cxx
@@ -33,7 +33,7 @@ namespace Trk {
{
std::vector<const xAOD::TrackParticle*>::const_iterator i_ntrk;
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
const Trk::Perigee* mPer=nullptr;
double CovVertTrk[15]; std::fill(CovVertTrk,CovVertTrk+15,0.);
double tmp_refFrameX=0, tmp_refFrameY=0, tmp_refFrameZ=0;
@@ -139,7 +139,7 @@ namespace Trk {
State& state) const
{
std::vector<const xAOD::NeutralParticle*>::const_iterator i_ntrk;
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
const NeutralPerigee* mPer=nullptr;
double CovVertTrk[15]; std::fill(CovVertTrk,CovVertTrk+15,0.);
double tmp_refFrameX=0, tmp_refFrameY=0, tmp_refFrameZ=0;
@@ -247,7 +247,7 @@ namespace Trk {
{
std::vector<const TrackParticleBase*>::const_iterator i_ntrk;
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
const Trk::Perigee* mPer=nullptr;
double CovVertTrk[15]; std::fill(CovVertTrk,CovVertTrk+15,0.);
double tmp_refFrameX=0, tmp_refFrameY=0, tmp_refFrameZ=0;
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrkTrack.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrkTrack.cxx
index 6d78c797e17bbbc05697086da51777257c09a8a4..4a25f6b0b2987ca65b995e125fcfca11bb21fd16 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrkTrack.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/CvtTrkTrack.cxx
@@ -35,7 +35,7 @@ namespace Trk{
State& state) const
{
std::vector<const Track*>::const_iterator i_ntrk;
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0;
+ AmgVector(5) VectPerig; VectPerig.setZero();
const Perigee* mPer;
double CovVertTrk[15]; std::fill(CovVertTrk,CovVertTrk+15,0.);
double tmp_refFrameX=0, tmp_refFrameY=0, tmp_refFrameZ=0;
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalExtPropagator.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalExtPropagator.cxx
index 0c9961c64fbaa71163812183b4a9431785f9543c..a3f64a5c0a77922bd3716e09ef62ed29914d4c2f 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalExtPropagator.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalExtPropagator.cxx
@@ -131,7 +131,7 @@ namespace Trk {
}
const Perigee* mPer = dynamic_cast<const Perigee*>(endPer);
const AtaStraightLine* Line = dynamic_cast<const AtaStraightLine*>(endPer);
- AmgVector(5) VectPerig; VectPerig<<0.,0.,0.,0.,0.;
+ AmgVector(5) VectPerig; VectPerig.setZero();
const AmgSymMatrix(5) *CovMtx=nullptr;
if( mPer ){
VectPerig = mPer->parameters();
diff --git a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitFastSvc.cxx b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitFastSvc.cxx
index bcfc2784adf7f85d2e4e08d7df20ace59af8e154..98502edd8582931cbc6096f8fb4bdcd61fb54d38 100755
--- a/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitFastSvc.cxx
+++ b/Tracking/TrkVertexFitter/TrkVKalVrtFitter/src/VKalVrtFitFastSvc.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
*/
// Header include
@@ -73,15 +73,15 @@ namespace Trk{
std::vector<double>::iterator it1,it2;
it1=it2=xx.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[0]=0.5*( (*it1) + (*it2) );
it1=it2=yy.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[1]=0.5*( (*it1) + (*it2) );
it1=it2=zz.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[2]=0.5*( (*it1) + (*it2) );
}
@@ -138,15 +138,15 @@ namespace Trk{
std::vector<double>::iterator it1,it2;
it1=it2=xx.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[0]=0.5*( (*it1) + (*it2) );
it1=it2=yy.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[1]=0.5*( (*it1) + (*it2) );
it1=it2=zz.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[2]=0.5*( (*it1) + (*it2) );
}
@@ -203,15 +203,15 @@ namespace Trk{
std::vector<double>::iterator it1,it2;
it1=it2=xx.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[0]=0.5*( (*it1) + (*it2) );
it1=it2=yy.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[1]=0.5*( (*it1) + (*it2) );
it1=it2=zz.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[2]=0.5*( (*it1) + (*it2) );
}
@@ -268,15 +268,15 @@ namespace Trk{
std::vector<double>::iterator it1,it2;
it1=it2=xx.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[0]=0.5*( (*it1) + (*it2) );
it1=it2=yy.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[1]=0.5*( (*it1) + (*it2) );
it1=it2=zz.begin();
- for(i=0; i<((n+1)/2); i++,it1++){}; for(i=0; i<(n/2+1);i++,it2++){};
+ for(i=0; i<((n+1)/2); ++i,++it1){}; for(i=0; i<(n/2+1);++i,++it2){};
out[2]=0.5*( (*it1) + (*it2) );
}
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/doc/METMenuSequences.md b/Trigger/TrigAlgorithms/TrigEFMissingET/doc/METMenuSequences.md
index 8e4d09e5c775982801699ce7cc9c498e56a2504c..202fc01d938834c401f503feb786c7c1c8d59432 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/doc/METMenuSequences.md
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/doc/METMenuSequences.md
@@ -20,8 +20,9 @@ topSequence = AlgSequence()
from L1Decoder.L1DecoderConfig import mapThresholdToL1DecisionCollection
-from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
+from DecisionHandling.DecisionHandlingConf import InputMakerForRoI, ViewCreatorInitialROITool
InputMakerAlg = InputMakerForRoI("MetCellInputMaker", RoIsLink="initialRoI")
+InputMakerAlg.RoITool = ViewCreatorInitialROITool()
InputMakerAlg.RoIs='METCellRoI'
InputMakerAlg.InputMakerInputDecisions=[mapThresholdToL1DecisionCollection("XE")]
InputMakerAlg.InputMakerOutputDecisions="InputMaker_from_L1MET"
@@ -39,7 +40,7 @@ metHypoTool.metThreshold=50
metHypoAlg = MissingETHypoAlgMT("METHypoAlg")
metHypoAlg.HypoTools = [metHypoTool]
metHypoAlg.METContainerKey="HLT_MET"
-metHypoAlg.HypoInputDecisions = InputMakerAlg.InputMakerOutputDecisions[0]
+metHypoAlg.HypoInputDecisions = InputMakerAlg.InputMakerOutputDecisions
metHypoAlg.HypoOutputDecisions = "EFMETDecisions"
topSequence += metHypoAlg
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/PtBarrelLUTSvc.h b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/PtBarrelLUTSvc.h
index eb1c292dd2941c2e74f7c2173e2febd8a2ff9380..3ee66acc9dfd497c1d739dc2299b966bb365e666 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/src/PtBarrelLUTSvc.h
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/src/PtBarrelLUTSvc.h
@@ -27,7 +27,7 @@ namespace TrigL2MuonSA {
public:
PtBarrelLUTSvc(const std::string& name,ISvcLocator* sl);
- virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF);
+ virtual StatusCode queryInterface(const InterfaceID& riid,void** ppvIF) override;
virtual StatusCode initialize(void) override;
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
index b7354c7de4b14025813422b225fb290ae15b88bd..6b7231da24fe7f1f042f1ceac4864fe3aca8dd0f 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
@@ -119,6 +119,7 @@ def clusterFSInputMaker( ):
RoIs = 'FSJETRoI'
from AthenaConfiguration.ComponentFactory import CompFactory
InputMakerAlg = CompFactory.InputMakerForRoI("IMclusterFS", RoIsLink="initialRoI")
+ InputMakerAlg.RoITool = CompFactory.ViewCreatorInitialROITool()
InputMakerAlg.RoIs=RoIs
return InputMakerAlg
diff --git a/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
index c4c691f0611cbcb91d0596175c6e122a26d686d4..03bfa94ae99dcd291fffc95c338c08a47c03289b 100644
--- a/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
@@ -21,7 +21,7 @@ atlas_add_library ( TrigConfDataSA
TrigConfData/*.h src/*.cxx
PUBLIC_HEADERS TrigConfData
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} CxxUtils
+ LINK_LIBRARIES ${Boost_LIBRARIES}
DEFINITIONS -DTRIGCONF_STANDALONE
)
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/Logic.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/Logic.h
index 1fb2ed6b5427b56e41920973c51987928e46a646..1085fae1f6670fad3886e20de9c4aa4705acf4cb 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/Logic.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/Logic.h
@@ -5,8 +5,6 @@
#ifndef TRIGCONFDATA_LOGIC_H
#define TRIGCONFDATA_LOGIC_H
-#include "CxxUtils/checker_macros.h"
-
#include <string>
#include <vector>
#include <map>
diff --git a/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt b/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
index 10c01220bf6ae397ebdb3e6b7ea12e57980f9fcb..9ff61e1eeb169030a2dde3e8b018bb6ed51a3c06 100644
--- a/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigBSExtraction/CMakeLists.txt
@@ -1,64 +1,13 @@
-cmake_minimum_required( VERSION 3.2 )
-################################################################################
-# Package: TrigBSExtraction
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigBSExtraction )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/StoreGate
- Event/xAOD/xAODJetCnv
- Event/xAOD/xAODTrackingCnv
- Event/xAOD/xAODTrigBphysCnv
- Event/xAOD/xAODTrigCaloCnv
- Event/xAOD/xAODBTaggingCnv
- Event/xAOD/xAODTrigMinBiasCnv
- Event/xAOD/xAODTrigMissingETCnv
- Event/xAOD/xAODTrigMuonCnv
- Event/xAOD/xAODTauCnv
- Event/xAOD/xAODEgammaCnv
- Event/xAOD/xAODTriggerCnv
- Event/xAOD/xAODCaloEventCnv
- GaudiKernel
- Trigger/TrigDataAccess/TrigSerializeCnvSvc
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Event/xAOD/xAODJet
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigBphys
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigMinBias
- Event/xAOD/xAODTrigMissingET
- Event/xAOD/xAODTrigMuon
- Event/xAOD/xAODTau
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODBTagging
- Reconstruction/Jet/JetEvent
- Reconstruction/Particle
- Reconstruction/tauEvent
- Reconstruction/egamma/egammaEvent
- Tracking/TrkEvent/TrkTrack
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigMissingEtEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigParticle
- Trigger/TrigEvent/TrigStorageDefinitions )
-
# Component(s) in the package:
atlas_add_component( TrigBSExtraction
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel TrigSerializeCnvSvcLib TrigNavigationLib TrigSteeringEvent xAODJet xAODMuon xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTau xAODEgamma xAODCaloEvent xAODTrigger xAODBTagging JetEvent Particle tauEvent egammaEvent CaloEvent TrkTrack TrigCaloEvent TrigInDetEvent TrigMissingEtEvent TrigMuonEvent TrigParticle TrigStorageDefinitions xAODTauCnvLib xAODTrigMuonCnvLib xAODJetCnvLib xAODTrigCaloCnvLib xAODBTaggingCnvLib xAODTrigBphysCnvLib xAODTrigMissingETCnvLib xAODTrigMinBiasCnvLib xAODEgammaCnvLib xAODCaloEventCnvLib xAODTriggerCnvLib )
+ LINK_LIBRARIES AthenaBaseComps CaloEvent GaudiKernel JetEvent Particle StoreGateLib TrigCaloEvent TrigInDetEvent TrigMissingEtEvent TrigMuonEvent TrigNavigationLib TrigParticle TrigSerializeCnvSvcLib TrigSteeringEvent TrigStorageDefinitions TrkTrack egammaEvent tauEvent xAODBTagging xAODBTaggingCnvLib xAODCaloEvent xAODCaloEventCnvLib xAODEgamma xAODEgammaCnvLib xAODJet xAODJetCnvLib xAODMuon xAODTau xAODTauCnvLib xAODTracking xAODTrackingCnvLib xAODTrigBphys xAODTrigBphysCnvLib xAODTrigCalo xAODTrigCaloCnvLib xAODTrigMinBias xAODTrigMinBiasCnvLib xAODTrigMissingET xAODTrigMissingETCnvLib xAODTrigMuon xAODTrigMuonCnvLib xAODTrigger xAODTriggerCnvLib )
# Install files from the package:
-atlas_install_headers( TrigBSExtraction )
atlas_install_joboptions( share/*.py )
-
diff --git a/Trigger/TrigEvent/TrigDecisionEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigDecisionEvent/CMakeLists.txt
index 298134a1ca5cf75f1cba8818e74d481f82d5c405..e45de145910bc354d02f460622cf6bfc7147816f 100644
--- a/Trigger/TrigEvent/TrigDecisionEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigDecisionEvent/CMakeLists.txt
@@ -1,33 +1,17 @@
-################################################################################
-# Package: TrigDecisionEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigDecisionEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaKernel
- Control/AthLinks
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- AtlasTest/TestTools )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TrigDecisionEvent
src/*.cxx
PUBLIC_HEADERS TrigDecisionEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthLinks AthenaKernel TrigSteeringEvent
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TestTools )
+ LINK_LIBRARIES AthLinks AthenaKernel TrigSteeringEvent )
atlas_add_dictionary( TrigDecisionEventDict
TrigDecisionEvent/TrigDecisionEventDict.h
TrigDecisionEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthLinks AthenaKernel TrigSteeringEvent TestTools TrigDecisionEvent
+ LINK_LIBRARIES TrigDecisionEvent
DATA_LINKS HLT::HLTResult )
diff --git a/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
index 65a72e8e111aed23b1eff26cdf7eedf3b501aa51..0a9874d4f9f44ff6bfae057b1f1c90e8cce29c3c 100644
--- a/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigDecisionEventTPCnv/CMakeLists.txt
@@ -1,72 +1,46 @@
-################################################################################
-# Package: TrigDecisionEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigDecisionEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/DataModelAthenaPool
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Trigger/TrigEvent/TrigSteeringEventTPCnv
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- Control/SGTools
- GaudiKernel
- Trigger/TrigEvent/TrigDecisionEvent
- Trigger/TrigEvent/TrigSteeringEvent )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( TrigDecisionEventTPCnv
src/*.cxx
PUBLIC_HEADERS TrigDecisionEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent )
+ LINK_LIBRARIES AthenaPoolCnvSvcLib DataModelAthenaPoolLib TrigDecisionEvent TrigSteeringEventTPCnv
+ PRIVATE_LINK_LIBRARIES AthenaKernel )
atlas_add_dictionary( TrigDecisionEventTPCnvDict
TrigDecisionEventTPCnv/TrigDecisionEventTPCnvDict.h
TrigDecisionEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_dictionary( OLD_TrigDecisionEventTPCnvDict
TrigDecisionEventTPCnv/TrigDecisionEventTPCnvDict.h
TrigDecisionEventTPCnv/OLD_selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p1_test
SOURCES
test/TrigDecisionCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p2_test
SOURCES
test/TrigDecisionCnv_p2_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p3_test
SOURCES
test/TrigDecisionCnv_p3_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p4_test
SOURCES
test/TrigDecisionCnv_p4_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
atlas_add_test( TrigDecisionCnv_p5_test
SOURCES
test/TrigDecisionCnv_p5_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} DataModelAthenaPoolLib AthenaPoolCnvSvcLib TrigSteeringEventTPCnv TestTools AthenaKernel SGTools GaudiKernel TrigDecisionEvent TrigSteeringEvent TrigDecisionEventTPCnv )
-
+ LINK_LIBRARIES TrigDecisionEventTPCnv )
diff --git a/Trigger/TrigEvent/TrigNavStructure/CMakeLists.txt b/Trigger/TrigEvent/TrigNavStructure/CMakeLists.txt
index 2219f6bee9c37dd24d22f7218ba9f6d81439f897..3ae61fe8dd4bba0cf54a0ebb689a02ba388497aa 100644
--- a/Trigger/TrigEvent/TrigNavStructure/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigNavStructure/CMakeLists.txt
@@ -1,26 +1,23 @@
-################################################################################
-# Package: TrigNavStructure
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigNavStructure )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthContainers
- Control/AthToolSupport/AsgTools
- Control/CxxUtils )
-
# External dependencies:
find_package( Boost COMPONENTS regex )
+# Extra dependencies, based on the build environment:
+set( extra_libs )
+if( NOT XAOD_STANDALONE )
+ set( extra_libs StoreGateLib )
+endif()
+
# The library of the package:
atlas_add_library( TrigNavStructure
TrigNavStructure/*.h Root/*.cxx
PUBLIC_HEADERS TrigNavStructure
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthContainers AsgTools )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AsgTools AthContainers CxxUtils xAODCore ${extra_libs} )
# Test(s) in the package:
foreach( test_name ut_iterators_test ut_build_trignav_test ut_features_test
diff --git a/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt b/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
index bd2856ddb4c483a245915cad3d49b07f84d7362e..b5caeda5c6571d0f64c1d1c9a330358209462111 100644
--- a/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigNavTools/CMakeLists.txt
@@ -1,39 +1,18 @@
-################################################################################
-# Package: TrigNavTools
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigNavTools )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Control/AthenaKernel
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigEvent/TrigNavigation
- PRIVATE
- Control/StoreGate
- Event/xAOD/xAODTrigger
- GaudiKernel
- PhysicsAnalysis/DerivationFramework/DerivationFrameworkInterfaces
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigEvent/TrigSteeringEvent )
-
-# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
-
# Component(s) in the package:
atlas_add_library( TrigNavToolsLib
src/*.cxx
PUBLIC_HEADERS TrigNavTools
- PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigDecisionToolLib TrigNavigationLib StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} xAODTrigger GaudiKernel TrigConfHLTData TrigSteeringEvent DerivationFrameworkInterfaces )
+ PRIVATE_LINK_LIBRARIES AthenaBaseComps AthenaKernel TrigConfHLTData TrigSteeringEvent xAODTrigger
+ LINK_LIBRARIES GaudiKernel TrigDecisionToolLib TrigNavigationLib )
atlas_add_component( TrigNavTools
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps AthenaKernel TrigDecisionToolLib TrigNavigationLib StoreGateLib SGtests xAODTrigger GaudiKernel TrigConfHLTData TrigSteeringEvent TrigNavToolsLib DerivationFrameworkInterfaces )
+ LINK_LIBRARIES TrigNavToolsLib )
# Install files from the package:
atlas_install_python_modules( python/__init__.py python/TrigNavToolsConfig.py )
diff --git a/Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h b/Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h
deleted file mode 100644
index 037ffc7ab18810ee8b1b23eb1251476c68ad3144..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigNavTools/doc/packagedoc.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
-@page TrigNavTools_page TrigNavTools package
-
-@section TrigNavTools_TrigNavToolsIntro Introduction
-
-*/
diff --git a/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt b/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
index 92f7d6538e375a4f1ec703ae9c2182f55cf64a84..f5a1e179ffdbde7eb0f33817fd6cf96a6801aa4b 100644
--- a/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigNavigation/CMakeLists.txt
@@ -1,36 +1,8 @@
-# $Id: CMakeLists.txt 783840 2016-11-12 17:28:04Z ssnyder $
-################################################################################
-# Package: TrigNavigation
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigNavigation )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/CxxUtils
- Control/AthContainers
- Control/AthLinks
- Control/AthToolSupport/AsgTools
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/SGTools
- Control/StoreGate
- GaudiKernel
- Trigger/TrigEvent/TrigNavStructure
- Trigger/TrigEvent/TrigStorageDefinitions
- PRIVATE
- AtlasTest/TestTools
- Control/AthContainersInterfaces
- Control/AthContainersRoot
- Control/RootUtils
- Control/CxxUtils
- Event/xAOD/xAODCore
- Trigger/TrigConfiguration/TrigConfHLTData
- Trigger/TrigDataAccess/TrigSerializeCnvSvc
- Trigger/TrigDataAccess/TrigSerializeResult )
-
# External dependencies:
find_package( Boost COMPONENTS regex )
diff --git a/Trigger/TrigEvent/TrigRoiConversion/CMakeLists.txt b/Trigger/TrigEvent/TrigRoiConversion/CMakeLists.txt
index 651bc637e716b426604c8a1dd38324a46bb8511d..bad330263138a3c226120997c1a530ca4fb0e757 100644
--- a/Trigger/TrigEvent/TrigRoiConversion/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigRoiConversion/CMakeLists.txt
@@ -1,26 +1,8 @@
-# $Id: CMakeLists.txt 789262 2016-12-12 13:15:37Z krasznaa $
-################################################################################
-# Package: TrigRoiConversion
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigRoiConversion )
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-if( NOT XAOD_STANDALONE )
- set( extra_deps Control/AthenaBaseComps GaudiKernel )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Trigger/TrigEvent/TrigSteeringEvent
- PRIVATE
- Event/xAOD/xAODTrigger
- ${extra_deps} )
-
# Component(s) in the package:
atlas_add_library( TrigRoiConversionLib
TrigRoiConversion/*.h Root/*.cxx
@@ -31,6 +13,5 @@ atlas_add_library( TrigRoiConversionLib
if( NOT XAOD_STANDALONE )
atlas_add_component( TrigRoiConversion
src/*.h src/*.cxx src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel xAODTrigger
- TrigRoiConversionLib )
+ LINK_LIBRARIES AthenaBaseComps TrigRoiConversionLib xAODTrigger )
endif()
diff --git a/Trigger/TrigEvent/TrigStorageDefinitions/CMakeLists.txt b/Trigger/TrigEvent/TrigStorageDefinitions/CMakeLists.txt
index 2e711949857ca34142f6fc29caa3101cc2e54cac..80309d4e48dcd459a3ca92e4ea4cca8ea98774a2 100644
--- a/Trigger/TrigEvent/TrigStorageDefinitions/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigStorageDefinitions/CMakeLists.txt
@@ -1,65 +1,33 @@
-################################################################################
-# Package: TrigStorageDefinitions
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigStorageDefinitions )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthLinks
- Control/AthContainers
- Control/Navigation
- Event/xAOD/xAODBTagging
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODHIEvent
- Event/xAOD/xAODJet
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigBphys
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigEgamma
- Event/xAOD/xAODTrigL1Calo
- Event/xAOD/xAODTrigMinBias
- Event/xAOD/xAODTrigMissingET
- Event/xAOD/xAODTrigMuon
- Event/xAOD/xAODTrigRinger
- Event/xAOD/xAODTrigger
- PRIVATE
- AtlasTest/TestTools )
-
# External dependencies:
-find_package( Boost COMPONENTS filesystem thread system )
+find_package( Boost )
# Component(s) in the package:
atlas_add_library( TrigStorageDefinitions
PUBLIC_HEADERS TrigStorageDefinitions
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger )
+ LINK_LIBRARIES AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger )
atlas_add_test( TypeInformation_test
SOURCES
test/TypeInformation_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger TestTools TrigStorageDefinitions )
+ LINK_LIBRARIES TrigStorageDefinitions )
atlas_add_test( ListMap_test
SOURCES
test/ListMap_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger TestTools TrigStorageDefinitions )
+ LINK_LIBRARIES TrigStorageDefinitions )
atlas_add_test( NewEDMMap_test
SOURCES
test/NewEDMMap_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger TestTools TrigStorageDefinitions )
+ LINK_LIBRARIES TrigStorageDefinitions )
atlas_add_test( Basic_test
SOURCES
test/Basic_test.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthLinks AthContainers Navigation xAODBTagging xAODCaloEvent xAODEgamma xAODHIEvent xAODJet xAODMuon xAODTau xAODTracking xAODTrigBphys xAODTrigCalo xAODTrigEgamma xAODTrigL1Calo xAODTrigMinBias xAODTrigMissingET xAODTrigMuon xAODTrigRinger xAODTrigger TestTools TrigStorageDefinitions )
-
+ LINK_LIBRARIES TrigStorageDefinitions )
diff --git a/Trigger/TrigEvent/TrigTopoEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigTopoEvent/CMakeLists.txt
index 5070e5de010768fb5b24a6a3e94957de3d26f454..3bd770f85f9fdf3b3ea62e6994d0b215c1611693 100644
--- a/Trigger/TrigEvent/TrigTopoEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigTopoEvent/CMakeLists.txt
@@ -1,47 +1,22 @@
-################################################################################
-# Package: TrigTopoEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTopoEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Control/AthenaKernel
- GaudiKernel
- Reconstruction/egamma/egammaEvent
- Reconstruction/tauEvent
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigParticle
- PRIVATE
- Event/EventPrimitives
- Trigger/TrigDataAccess/TrigSerializeCnvSvc
- Trigger/TrigEvent/TrigNavigation )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_library( TrigTopoEvent
src/*.cxx
PUBLIC_HEADERS TrigTopoEvent
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthContainers AthenaKernel GaudiKernel egammaEvent tauEvent TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigParticle TrigSerializeCnvSvcLib TrigNavigationLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} EventPrimitives )
+ LINK_LIBRARIES AthContainers AthenaKernel GaudiKernel TrigMuonEvent TrigParticle egammaEvent tauEvent
+ PRIVATE_LINK_LIBRARIES CxxUtils EventPrimitives TrigNavigationLib )
atlas_add_sercnv_library( TrigTopoEventSerCnv
FILES TrigTopoEvent/ElectronMuonTopoInfo.h TrigTopoEvent/ElectronMuonTopoInfoContainer.h
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel GaudiKernel egammaEvent tauEvent TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigParticle EventPrimitives TrigSerializeCnvSvcLib TrigNavigationLib TrigTopoEvent )
+ LINK_LIBRARIES TrigTopoEvent )
atlas_add_dictionary( TrigTopoEventDict
TrigTopoEvent/TrigTopoEventDict.h
TrigTopoEvent/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthenaKernel GaudiKernel egammaEvent tauEvent TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigParticle EventPrimitives TrigSerializeCnvSvcLib TrigNavigationLib TrigTopoEvent
+ LINK_LIBRARIES TrigTopoEvent
DATA_LINKS ElectronMuonTopoInfo
ELEMENT_LINKS ElectronMuonTopoInfoContainer )
-
diff --git a/Trigger/TrigEvent/TrigTopoEventTPCnv/CMakeLists.txt b/Trigger/TrigEvent/TrigTopoEventTPCnv/CMakeLists.txt
index cee2945086cff936e38750e9d5b06647692b12cc..cd6b0fc948bf6d1d4e02fbd5c8f5d6f25beb4fcb 100644
--- a/Trigger/TrigEvent/TrigTopoEventTPCnv/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigTopoEventTPCnv/CMakeLists.txt
@@ -1,40 +1,21 @@
-################################################################################
-# Package: TrigTopoEventTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTopoEventTPCnv )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Trigger/TrigEvent/TrigTopoEvent
- PRIVATE
- AtlasTest/TestTools
- Control/AthenaKernel
- GaudiKernel )
-
-# External dependencies:
-find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
# Component(s) in the package:
atlas_add_tpcnv_library( TrigTopoEventTPCnv
src/*.cxx
PUBLIC_HEADERS TrigTopoEventTPCnv
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib TrigTopoEvent TestTools AthenaKernel GaudiKernel )
+ PRIVATE_LINK_LIBRARIES AthenaKernel
+ LINK_LIBRARIES AthenaPoolCnvSvcLib TrigTopoEvent )
atlas_add_dictionary( TrigTopoEventTPCnvDict
TrigTopoEventTPCnv/TrigTopoEventTPCnvDict.h
TrigTopoEventTPCnv/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib TrigTopoEvent TestTools AthenaKernel GaudiKernel TrigTopoEventTPCnv )
+ LINK_LIBRARIES TrigTopoEventTPCnv )
atlas_add_test( ElectronMuonTopoInfoCnv_p1_test
SOURCES
test/ElectronMuonTopoInfoCnv_p1_test.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaPoolCnvSvcLib TrigTopoEvent TestTools AthenaKernel GaudiKernel TrigTopoEventTPCnv )
-
+ LINK_LIBRARIES TrigTopoEventTPCnv )
diff --git a/Trigger/TrigEvent/TrigTopoEventTPCnv/test/ElectronMuonTopoInfoCnv_p1_test.cxx b/Trigger/TrigEvent/TrigTopoEventTPCnv/test/ElectronMuonTopoInfoCnv_p1_test.cxx
index a34d9790a3a489b51abb300a10c1f73aa7f74f38..feea234943253edb0f7372a234973474ae477ab5 100644
--- a/Trigger/TrigEvent/TrigTopoEventTPCnv/test/ElectronMuonTopoInfoCnv_p1_test.cxx
+++ b/Trigger/TrigEvent/TrigTopoEventTPCnv/test/ElectronMuonTopoInfoCnv_p1_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
@@ -15,7 +15,6 @@
#include "TrigTopoEventTPCnv/ElectronMuonTopoInfoCnv_p1.h"
#include "TestTools/leakcheck.h"
#include "GaudiKernel/MsgStream.h"
-#include "CLHEP/Vector/ThreeVector.h"
#include <cassert>
#include <iostream>
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/TrigBjetMonitoring/HLTBjetMonTool.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/TrigBjetMonitoring/HLTBjetMonTool.h
index 95e23681c80e5f5cc2b574ee325f60482ea4a6a2..323c2031ea7ab5e470a7019e762844180874b85c 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/TrigBjetMonitoring/HLTBjetMonTool.h
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/TrigBjetMonitoring/HLTBjetMonTool.h
@@ -70,7 +70,7 @@ class HLTBjetMonTool : public IHLTMonTool {
"The SG key of the online BJet container from the TriggerEDMRun3"};
SG::ReadHandleKey<xAOD::VertexContainer> m_offlineVertexContainerKey {this,"OfflineVertexContainerName","PrimaryVertices","Key of offline primary vertexes"};
- SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_EFHistoPrmVtx","Key of online bjet primary vertexes"};
+ SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_IDVertex_FS","Key of online bjet primary vertexes"};
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_onlineTrackContainerKey {this,"OnlineTrackContainerName","HLT_IDTrack_Bjet_IDTrig","Key of online tracks of bjets"};
ToolHandle<Trig::TrigDecisionTool> m_trigDec; //!
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
index 69349b9b66d6cf0efe8c7fcc94a8f50cec7b3f88..05c6df13cca7ad238032cb9fa73bcab8586899d9 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
@@ -1083,7 +1083,9 @@ StatusCode HLTBjetMonTool::book(){
if(HistJet) hist2("jetEtaPhi"+HistExt,"HLT/BjetMon/"+HistDir)->Fill(jet->eta(),jet->phi());
// zPV associated to the jets in the same event: they are the same for every jet in the same event so only the first zPV should be plotted
if (ijet == 0) {
- auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, "EFHistoPrmVtx"); // CV 200120
+ std::string vtxname = m_onlineVertexContainerKey.key();
+ if ( vtxname.find("HLT_")==0 ) vtxname.erase(0,4);
+ auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, vtxname ); // CV 200120
ATH_CHECK( vertexLinkInfo.isValid() ) ; // TM 200120
const xAOD::Vertex* vtx = *(vertexLinkInfo.link);
ATH_MSG_DEBUG(" PVz_jet from jet link info: " << vtx->z());
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
index df2cc7e08ed45b02f99e7e9aaa5f002b33a21095..503e71ac1b32747c319d37732f41e02aa974ae25 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.cxx
@@ -229,7 +229,7 @@ StatusCode TrigBjetMonitorAlgorithm::fillHistograms( const EventContext& ctx ) c
}// onlinebjets
}//bjetChain
-
+
//bjet or mujet chains
if (bjetChain || mujetChain) {
@@ -369,7 +369,11 @@ StatusCode TrigBjetMonitorAlgorithm::fillHistograms( const EventContext& ctx ) c
fill("TrigBjetMonitor",jetEta,jetPhi);
// zPV associated to the jets in the same event: they are the same for every jet in the same event so only the first zPV should be plotted
if (ijet == 0) {
- auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, "EFHistoPrmVtx"); // CV 200120
+
+ std::string vtxname = m_onlineVertexContainerKey.key();
+ if ( vtxname.find("HLT_")==0 ) vtxname.erase(0,4);
+
+ auto vertexLinkInfo = TrigCompositeUtils::findLink<xAOD::VertexContainer>(jetLinkInfo.source, vtxname ); // CV 200120
ATH_CHECK( vertexLinkInfo.isValid() ) ; // TM 200120
const xAOD::Vertex* vtx = *(vertexLinkInfo.link);
NameH = "PVz_jet_"+trigName;
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
index 07dfd01f729b88c38f5434c1c70defca9b867a49..565bae13e0d6fa10e7588a92948fe96754dbd669 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/TrigBjetMonitorAlgorithm.h
@@ -31,7 +31,7 @@ class TrigBjetMonitorAlgorithm : public AthMonitorAlgorithm {
std::vector<std::string> m_allChains;
SG::ReadHandleKey<xAOD::MuonContainer> m_muonContainerKey;
SG::ReadHandleKey<xAOD::VertexContainer> m_offlineVertexContainerKey {this,"OfflineVertexContainerName","PrimaryVertices","Key of offline primary vertexes"};
- SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_EFHistoPrmVtx","Key of online bjet primary vertexes"};
+ SG::ReadHandleKey<xAOD::VertexContainer> m_onlineVertexContainerKey {this,"OnlineVertexContainerName","HLT_IDVertex_FS","Key of online bjet primary vertexes"};
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_onlineTrackContainerKey {this,"OnlineTrackContainerName","HLT_IDTrack_Bjet_IDTrig","Key of online tracks of bjets"};
ToolHandle<Trig::TrigDecisionTool> m_trigDec; //!
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
index ea1b4c6ee177ceef484d19c55ce504155b9161c9..315c724b7874594dafba3ac5d792bcc4cf6963d9 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitCategory.py
@@ -29,8 +29,6 @@ monitoring_jet = [ 'j25',
'6j60',
'5j60',
'10j40_L14J20',
- 'j0_perf_ds1_L1J75',
- 'j0_perf_ds1_L1J100',
'ht850_L1J100',
'j60_TT',
'j85_cleanLLP',
@@ -93,8 +91,6 @@ primary_jet = ['j25',
'6j60',
'5j60',
'10j40_L14J20',
- 'j0_perf_ds1_L1J75',
- 'j0_perf_ds1_L1J100',
'ht850_L1J100',
'j60_TT',
'j85_cleanLLP',
@@ -157,8 +153,6 @@ monitoring_jet_pp = ['j25',
'6j60',
'5j60',
'10j40_L14J20',
- 'j0_perf_ds1_L1J75',
- 'j0_perf_ds1_L1J100',
'ht850_L1J100',
'j60_TT',
'j85_cleanLLP',
@@ -218,8 +212,6 @@ primary_jet_pp = ['j25',
'6j60',
'5j60',
'10j40_L14J20',
- 'j0_perf_ds1_L1J75',
- 'j0_perf_ds1_L1J100',
'ht850_L1J100',
'j60_TT',
'j85_cleanLLP',
@@ -281,8 +273,6 @@ monitoring_jet_validation = ['j25',
'6j60',
'5j60',
'10j40_L14J20',
- 'j0_perf_ds1_L1J75',
- 'j0_perf_ds1_L1J100',
'ht850_L1J100',
'j60_TT',
'j85_cleanLLP',
@@ -346,8 +336,6 @@ primary_jet_validation = ['j25',
'6j60',
'5j60',
'10j40_L14J20',
- 'j0_perf_ds1_L1J75',
- 'j0_perf_ds1_L1J100',
'ht850_L1J100',
'j60_TT',
'j85_cleanLLP',
@@ -427,8 +415,6 @@ monitoring_jet_hi = ['j25',
'4j45',
'6j60',
'5j60',
- 'j0_perf_ds1_L1J75',
- 'j0_perf_ds1_L1J100',
'ht850_L1J100',
'j30_ion_L1TE20', #start HI chains
'j30_L1TE20',
@@ -470,8 +456,6 @@ primary_jet_hi = ['j25',
'4j45',
'6j60',
'5j60',
- 'j0_perf_ds1_L1J75',
- 'j0_perf_ds1_L1J100',
'ht850_L1J100',
'j30_ion_L1TE20', #start HI chains
'j30_L1TE20',
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
index 975dac18c986297645b1b52cde144e33dcc8ceb0..8aac676048d4f6fa68eb28389a6a37f36aeb3cde 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
@@ -180,11 +180,7 @@ if (pp) or (mc):
# HLT items
hlt_hltEtThresholds = { 'j0_perf_L1RD0_FILLED': 0.,
- 'j0_perf_ftk_L1RD0_FILLED': 0.,
- 'j0_perf_ftkrefit_L1RD0_FILLED': 0.,
'j0_gsc0_boffperf_split_L1RD0_FILLED': 0.,
- 'j0_gsc0_boffperf_split_ftk_L1RD0_FILLED': 0.,
- 'j0_gsc0_boffperf_split_ftkrefit_L1RD0_FILLED': 0.,
'j35':20.,
'j35_jes':20.,
'j35_lcw':20.,
@@ -230,11 +226,7 @@ if (pp) or (mc):
hlt_hltEtaHighThresholds = { 'j0_perf_L1RD0_FILLED': 2.5,
- 'j0_perf_ftk_L1RD0_FILLED': 2.5,
- 'j0_perf_ftkrefit_L1RD0_FILLED': 2.5,
'j0_gsc0_boffperf_split_L1RD0_FILLED': 2.5,
- 'j0_gsc0_boffperf_split_ftk_L1RD0_FILLED': 2.5,
- 'j0_gsc0_boffperf_split_ftkrefit_L1RD0_FILLED': 2.5,
'j35':3.2,
'j35_jes':3.2,
'j35_lcw':3.2,
@@ -280,11 +272,7 @@ if (pp) or (mc):
hlt_hltEtaLowThresholds = { 'j0_perf_L1RD0_FILLED': 0.,
- 'j0_perf_ftk_L1RD0_FILLED': 0.,
- 'j0_perf_ftkrefit_L1RD0_FILLED': 0.,
'j0_gsc0_boffperf_split_L1RD0_FILLED': 0.,
- 'j0_gsc0_boffperf_split_ftk_L1RD0_FILLED': 0.,
- 'j0_gsc0_boffperf_split_ftkrefit_L1RD0_FILLED': 0.,
'j35':0.0,
'j35_jes':0.0,
'j35_lcw':0.0,
@@ -332,11 +320,7 @@ if (pp) or (mc):
hlt_hltJetn = { 'j0_perf_L1RD0_FILLED': 1,
- 'j0_perf_ftk_L1RD0_FILLED': 1,
- 'j0_perf_ftkrefit_L1RD0_FILLED': 1,
'j0_gsc0_boffperf_split_L1RD0_FILLED': 1,
- 'j0_gsc0_boffperf_split_ftk_L1RD0_FILLED': 1,
- 'j0_gsc0_boffperf_split_ftkrefit_L1RD0_FILLED': 1,
'j35':1,
'j35_jes':1,
'j35_lcw':1,
@@ -382,11 +366,7 @@ if (pp) or (mc):
hlt_hltContainers = { 'j0_perf_L1RD0_FILLED':'a4tcemsubjesISFS',
- 'j0_perf_ftk_L1RD0_FILLED':'a4tcemsubjesISFSftk',
- 'j0_perf_ftkrefit_L1RD0_FILLED':'a4tcemsubjesISFSftkrefit',
'j0_gsc0_boffperf_split_L1RD0_FILLED':'a4tcemsubjesISFS',
- 'j0_gsc0_boffperf_split_ftk_L1RD0_FILLED':'a4tcemsubjesISFSftk',
- 'j0_gsc0_boffperf_split_ftkrefit_L1RD0_FILLED':'a4tcemsubjesISFSftkrefit',
'j35':'a4tcemsubjesISFS',
'j35_sub':'a4tcemsubFS',
'j35_jes':'a4tcemjesFS',
@@ -435,11 +415,7 @@ if (pp) or (mc):
# Offline
hlt_offlineEtThresholds = { 'j0_perf_L1RD0_FILLED': 0.,
- 'j0_perf_ftk_L1RD0_FILLED': 0.,
- 'j0_perf_ftkrefit_L1RD0_FILLED': 0.,
'j0_gsc0_boffperf_split_L1RD0_FILLED': 0.,
- 'j0_gsc0_boffperf_split_ftk_L1RD0_FILLED': 0.,
- 'j0_gsc0_boffperf_split_ftkrefit_L1RD0_FILLED': 0.,
'L1_J15':0.,
'j35_jes':20.,
'j35_lcw':20.,
diff --git a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
index d746ccc55ce4bbbe92cc756065064fcae0c67904..f8965dddb8030200d62a8e397ff3972f5ef14040 100644
--- a/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
+++ b/Trigger/TrigSteer/DecisionHandling/CMakeLists.txt
@@ -4,7 +4,12 @@
atlas_subdir( DecisionHandling )
atlas_add_library( DecisionHandlingLib
- src/*.cxx
+ src/ComboHypo.cxx
+ src/ComboHypoToolBase.cxx
+ src/DumpDecisions.cxx
+ src/HLTIdentifier.cxx
+ src/HypoBase.cxx
+ src/InputMakerBase.cxx
PUBLIC_HEADERS DecisionHandling
LINK_LIBRARIES AthenaBaseComps AthenaMonitoringKernelLib GaudiKernel StoreGateLib TrigCompositeUtilsLib TrigCostMonitorMTLib TrigSteeringEvent TrigTimeAlgsLib
PRIVATE_LINK_LIBRARIES AthContainers AthViews xAODTrigger )
@@ -12,6 +17,11 @@ atlas_add_library( DecisionHandlingLib
# Component(s) in the package:
atlas_add_component( DecisionHandling
src/components/*.cxx
- LINK_LIBRARIES DecisionHandlingLib )
+ src/DeltaRRoIComboHypoTool.cxx
+ src/InputMakerForRoI.cxx
+ src/TriggerSummaryAlg.cxx
+ src/RoRSeqFilter.cxx
+ src/ViewCreator*.cxx
+ LINK_LIBRARIES DecisionHandlingLib xAODTrigCalo AthViews xAODTracking xAODJet )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigSteer/ViewAlgs/ViewAlgs/IViewCreatorROITool.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/ViewAlgs/IViewCreatorROITool.h
rename to Trigger/TrigSteer/DecisionHandling/DecisionHandling/IViewCreatorROITool.h
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
index 960c08b4ec4cb97018a5832156719bee9dbfa4e1..6974ee95c010ce9a3e814c6abde766eb81e9523b 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
@@ -82,6 +82,11 @@ StatusCode InputMakerBase::decisionInputToOutput(const EventContext& context, SG
} // end of: for ( auto inputKey: decisionInputs() )
+ // Print some debug messages summarising the content of the outputHandles.
+ if (msgLvl(MSG::DEBUG)) {
+ debugPrintOut(context, outputHandle);
+ }
+
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
index 340a2d6adc5fcd5393ded3140c6d2ca0d9da4748..35851da4d7762e1a97c8add88ed6d40ee08bbf49 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
@@ -10,10 +10,8 @@
using TrigCompositeUtils::DecisionContainer;
using TrigCompositeUtils::Decision;
-using TrigCompositeUtils::linkToPrevious;
-using TrigCompositeUtils::getLinkToPrevious;
-using TrigCompositeUtils::findLink;
using TrigCompositeUtils::createAndStore;
+using TrigCompositeUtils::roiString;
InputMakerForRoI:: InputMakerForRoI( const std::string& name,
ISvcLocator* pSvcLocator )
@@ -22,7 +20,8 @@ InputMakerForRoI:: InputMakerForRoI( const std::string& name,
StatusCode InputMakerForRoI::initialize() {
ATH_MSG_DEBUG("Will produce output RoI collections: " << m_RoIs);
- CHECK( m_RoIs.initialize( SG::AllowEmpty ) );
+ ATH_CHECK( m_RoIs.initialize( SG::AllowEmpty ) );
+ ATH_CHECK( m_roiTool.retrieve() );
return StatusCode::SUCCESS;
}
@@ -31,58 +30,69 @@ StatusCode InputMakerForRoI::execute( const EventContext& context ) const {
// create the output decisions from the input collections
SG::WriteHandle<DecisionContainer> outputHandle = createAndStore( decisionOutputs(), context );
- ATH_CHECK(decisionInputToOutput(context, outputHandle));
ATH_CHECK(outputHandle.isValid());
-
- // Prepare Outputs
- std::unique_ptr<TrigRoiDescriptorCollection> oneRoIColl = std::make_unique<TrigRoiDescriptorCollection>();
-
- // use also this: ElementLinkVector<xAOD::MuonRoIContainer> getMuonRoILinks = obj->objectCollectionLinks<xAOD::MuonRoIContainer>("ManyMuonRoIs");
- std::vector <ElementLink<TrigRoiDescriptorCollection> > RoIsFromDecision; // used to check for duplicate features linked to different inputHandles
+ ATH_CHECK(decisionInputToOutput(context, outputHandle));
+ ATH_MSG_DEBUG("Merging complete");
if( outputHandle->size() == 0) {
ATH_MSG_WARNING( "Have no decisions in output handle "<< outputHandle.key() << ". Handle is valid but container is empty. "
- << "Check why this EventViewCreatorAlgorithm was unlocked by a Filter, if the Filter then gave it no inputs.");
+ << "Check why this InputMakerForRoI was unlocked by a Filter, if the Filter then gave it no inputs.");
+ } else {
+ ATH_MSG_DEBUG( "Have output " << outputHandle.key() << " with " << outputHandle->size() << " elements" );
+ }
+
+ // Find and link to the output Decision objects the ROIs to run over
+ ATH_CHECK( m_roiTool->attachROILinks(*outputHandle, context) );
+
+ if (m_RoIs.empty()) {
+ ATH_MSG_DEBUG("No concrete output ROI collection required from this InputMaker.");
return StatusCode::SUCCESS;
}
- ATH_MSG_DEBUG( "Got output "<< outputHandle.key()<<" with " << outputHandle->size() << " elements" );
- // loop over output decisions in container of outputHandle, follow link to inputDecision
- for ( auto outputDecision : *outputHandle){
- ElementLinkVector<DecisionContainer> inputLinks = getLinkToPrevious(outputDecision);
- for (auto input: inputLinks){
- const Decision* inputDecision = *input;
- auto roiELInfo = findLink<TrigRoiDescriptorCollection>( inputDecision, m_roisLink.value() );
- auto roiEL = roiELInfo.link;
- ATH_CHECK( roiEL.isValid() );
-
- // avoid adding the same feature multiple times: check if not in container, if not add it
- if ( find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL) == RoIsFromDecision.end() ) {
- RoIsFromDecision.push_back(roiEL); // just to keep track of which we have used
- const TrigRoiDescriptor* roi = *roiEL;
- ATH_MSG_DEBUG("Found RoI:" <<*roi<<" FS="<<roi->isFullscan());
- //make a new one:
- TrigRoiDescriptor* newroi= new TrigRoiDescriptor(*roi); //use copy constructor
- oneRoIColl->push_back(newroi);
+ // Prepare Outputs
+ std::unique_ptr<TrigRoiDescriptorCollection> outputRoIColl = std::make_unique<TrigRoiDescriptorCollection>();
+
+ std::vector <ElementLink<TrigRoiDescriptorCollection> > RoIsFromDecision; // used to check for duplicate RoIs
+
+ if (m_mergeIntoSuperRoI) {
+ TrigRoiDescriptor* superRoI = new TrigRoiDescriptor();
+ superRoI->setComposite(true);
+ superRoI->manageConstituents(false);
+ outputRoIColl->push_back(superRoI);
+ }
+
+ // loop over output decisions in container of outputHandle, collect RoIs to process
+ for (const Decision* outputDecision : *outputHandle) {
+
+ if (!outputDecision->hasObjectLink(roiString(), ClassID_traits<TrigRoiDescriptorCollection>::ID())) {
+ ATH_MSG_ERROR("No '" << roiString() << "'link was attached by the ROITool. Decision object dump:" << *outputDecision);
+ return StatusCode::FAILURE;
+ }
+ const ElementLink<TrigRoiDescriptorCollection> roiEL = outputDecision->objectLink<TrigRoiDescriptorCollection>(roiString());
+ ATH_CHECK(roiEL.isValid());
+
+ // Avoid adding the same ROI multiple times: check if not in container, if not add it
+ if ( find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL) == RoIsFromDecision.end() ) {
+ RoIsFromDecision.push_back(roiEL); // just to keep track of which we have used
+ const TrigRoiDescriptor* roi = *roiEL;
+ ATH_MSG_DEBUG("Found RoI:" <<*roi<<" FS="<<roi->isFullscan());
+
+ if (m_mergeIntoSuperRoI) { // Append to the single superRoI
+ outputRoIColl->back()->push_back( roi );
+ } else { // Add individually
+ TrigRoiDescriptor* newroi = new TrigRoiDescriptor(*roi); //use copy constructor
+ outputRoIColl->push_back(newroi);
ATH_MSG_DEBUG("Added RoI:" <<*newroi<<" FS="<<newroi->isFullscan());
}
- } // loop over previous input links
+ }
+
} // loop over decisions
-
// Finally, record output
- if (m_RoIs.empty()) {
- ATH_MSG_DEBUG("No concrete output ROI collection required from this InputMaker.");
- } else {
- ATH_MSG_DEBUG("Produced "<<oneRoIColl->size() <<" output RoIs");
- auto roi_outputHandle = SG::makeHandle(m_RoIs, context);
- ATH_CHECK( roi_outputHandle.record(std::move(oneRoIColl)) );
- }
+ ATH_MSG_DEBUG("Produced "<<outputRoIColl->size() <<" output RoIs");
+ auto roi_outputHandle = SG::makeHandle(m_RoIs, context);
+ ATH_CHECK( roi_outputHandle.record(std::move(outputRoIColl)) );
- // call base class helper method to print some debug messages summarising the content of the outputHandles.
- if (msgLvl(MSG::DEBUG)) {
- debugPrintOut(context, outputHandle);
- }
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
index 9f5119fd46c7a6a628a24efa4bd3ea233c0fd1ae..aa615baf368f85459fa2649b5687ca5969fadb5d 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.h
@@ -1,8 +1,8 @@
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TRIGUPGRADETEST_INPUTMAKERFORROI_H
-#define TRIGUPGRADETEST_INPUTMAKERFORROI_H
+#ifndef DESICIONHANDLING_INPUTMAKERFORROI_H
+#define DESICIONHANDLING_INPUTMAKERFORROI_H
#include <string>
@@ -11,6 +11,8 @@
#include "AthContainers/ConstDataVector.h"
#include "StoreGate/ReadHandleKeyArray.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
+
/**
* @class InputMakerForRoI
@@ -26,10 +28,16 @@
virtual StatusCode execute(const EventContext&) const override;
private:
- SG::WriteHandleKey<TrigRoiDescriptorCollection> m_RoIs {this,"RoIs", "",
+ SG::WriteHandleKey<TrigRoiDescriptorCollection> m_RoIs {this, "RoIs", "",
"Name of the collection of ROI extrated from the input Decision Objects. Used as cocnrete starting handle for step's reconstruction."};
+ ToolHandle<IViewCreatorROITool> m_roiTool{this, "RoITool", "",
+ "Tool used to supply per-Decision Object the RoI which should be processed."};
+
+ Gaudi::Property<bool> m_mergeIntoSuperRoI{this, "MergeIntoSuperRoI", false,
+ "If true, the output RoIs collection will contain only one ROI, this will be a SuperRoI encompassing all individual ROIs - one from each of the input Decision Objects."};
+
};
-#endif //> !TRIGUPGRADETEST_INPUTMAKERFORROI_H
+#endif //> !DESICIONHANDLING_INPUTMAKERFORROI_H
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnClusterROITool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnClusterROITool.cxx
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnClusterROITool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnClusterROITool.cxx
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnClusterROITool.h b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnClusterROITool.h
similarity index 88%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnClusterROITool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnClusterROITool.h
index a80cb49c5c1a9e546f3d87f716bacf0a402fae7c..ff39dda85c5171cf09da47427744e489d7ae221b 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnClusterROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnClusterROITool.h
@@ -2,12 +2,12 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef VIEWALGS_VIEWCREATORCENTREDONCLUSTERROITOOL_H
-#define VIEWALGS_VIEWCREATORCENTREDONCLUSTERROITOOL_H
+#ifndef DESICIONHANDLING_VIEWCREATORCENTREDONCLUSTERROITOOL_H
+#define DESICIONHANDLING_VIEWCREATORCENTREDONCLUSTERROITOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
#include "StoreGate/WriteHandleKey.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "xAODTrigCalo/TrigEMClusterContainer.h"
@@ -49,4 +49,4 @@ public:
};
-#endif //> !VIEWALGS_VIEWCREATORCENTREDONCLUSTERROITOOL_H
+#endif //> !DESICIONHANDLING_VIEWCREATORCENTREDONCLUSTERROITOOL_H
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnIParticleROITool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnIParticleROITool.cxx
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnIParticleROITool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnIParticleROITool.cxx
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnIParticleROITool.h b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnIParticleROITool.h
similarity index 87%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnIParticleROITool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnIParticleROITool.h
index d766bb72d6db773b76bc6680064702d2111c5a73..62eddd373318587464eee926d95852e841aeb297 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnIParticleROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnIParticleROITool.h
@@ -2,12 +2,12 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef VIEWALGS_VIEWCREATORCENTREDONIPARTICLEROITOOL_H
-#define VIEWALGS_VIEWCREATORCENTREDONIPARTICLEROITOOL_H
+#ifndef DESICIONHANDLING_VIEWCREATORCENTREDONIPARTICLEROITOOL_H
+#define DESICIONHANDLING_VIEWCREATORCENTREDONIPARTICLEROITOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
#include "StoreGate/WriteHandleKey.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
/**
@@ -48,4 +48,4 @@ public:
};
-#endif //> !VIEWALGS_VIEWCREATORCENTREDONIPARTICLEROITOOL_H
+#endif //> !DESICIONHANDLING_VIEWCREATORCENTREDONIPARTICLEROITOOL_H
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnJetWithPVConstraintROITool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnJetWithPVConstraintROITool.cxx
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnJetWithPVConstraintROITool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnJetWithPVConstraintROITool.cxx
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnJetWithPVConstraintROITool.h b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnJetWithPVConstraintROITool.h
similarity index 88%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnJetWithPVConstraintROITool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnJetWithPVConstraintROITool.h
index cc65588dab5ae44b1c70f421fe6e77973338b700..da690591ae869a15eb5aaf05bd37a7a23983dfba 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorCentredOnJetWithPVConstraintROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorCentredOnJetWithPVConstraintROITool.h
@@ -2,12 +2,12 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef VIEWALGS_VIEWCREATORCENTREDONJETWITHPVCONSTRAINTROITOOL_H
-#define VIEWALGS_VIEWCREATORCENTREDONJETWITHPVCONSTRAINTROITOOL_H
+#ifndef DESICIONHANDLING_VIEWCREATORCENTREDONJETWITHPVCONSTRAINTROITOOL_H
+#define DESICIONHANDLING_VIEWCREATORCENTREDONJETWITHPVCONSTRAINTROITOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
#include "StoreGate/WriteHandleKey.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "xAODTracking/VertexContainer.h"
@@ -62,4 +62,4 @@ public:
};
-#endif //> !VIEWALGS_VIEWCREATORCENTREDONJETWITHPVCONSTRAINTROITOOL_H
+#endif //> !DESICIONHANDLING_VIEWCREATORCENTREDONJETWITHPVCONSTRAINTROITOOL_H
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFSROITool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFSROITool.cxx
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFSROITool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFSROITool.cxx
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFSROITool.h b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFSROITool.h
similarity index 85%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFSROITool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFSROITool.h
index c76fb89808468a0e1417c57ba869b7fd12023f8e..73396ecbd12e8daf27a9b4b74622c915ae09e6b0 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFSROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFSROITool.h
@@ -2,12 +2,12 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef VIEWALGS_VIEWCREATORFSROITOOL_H
-#define VIEWALGS_VIEWCREATORFSROITOOL_H
+#ifndef DESICIONHANDLING_VIEWCREATORFSROITOOL_H
+#define DESICIONHANDLING_VIEWCREATORFSROITOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
#include "StoreGate/WriteHandleKey.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
/**
@@ -39,4 +39,4 @@ public:
};
-#endif //> !VIEWALGS_VIEWCREATORFSROITOOL_H
+#endif //> !DESICIONHANDLING_VIEWCREATORFSROITOOL_H
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFetchFromViewROITool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFetchFromViewROITool.cxx
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFetchFromViewROITool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFetchFromViewROITool.cxx
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFetchFromViewROITool.h b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFetchFromViewROITool.h
similarity index 89%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFetchFromViewROITool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFetchFromViewROITool.h
index cf62f0d8aeca80ad5fdfa665a812c9755bb039e0..705a7a814a02384ac0cce34300a797c1664ce8a0 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorFetchFromViewROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorFetchFromViewROITool.h
@@ -2,12 +2,12 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef VIEWALGS_VIEWCREATORFETCHFROMVIEWROITOOL_H
-#define VIEWALGS_VIEWCREATORFETCHFROMVIEWROITOOL_H
+#ifndef DESICIONHANDLING_VIEWCREATORFETCHFROMVIEWROITOOL_H
+#define DESICIONHANDLING_VIEWCREATORFETCHFROMVIEWROITOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
#include "StoreGate/WriteHandleKey.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
/**
@@ -47,4 +47,4 @@ public:
};
-#endif //> !VIEWALGS_VIEWCREATORFETCHFROMVIEWROITOOL_H
+#endif //> !DESICIONHANDLING_VIEWCREATORFETCHFROMVIEWROITOOL_H
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorInitialROITool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorInitialROITool.cxx
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorInitialROITool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorInitialROITool.cxx
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorInitialROITool.h b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorInitialROITool.h
similarity index 83%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorInitialROITool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorInitialROITool.h
index bb297e595e36da44e491f726502b3db2a4845bdf..81f2e35843b09a25ddb3305d80d055286c7cb354 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorInitialROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorInitialROITool.h
@@ -2,11 +2,11 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef VIEWALGS_VIEWCREATORINITIALROITOOL_H
-#define VIEWALGS_VIEWCREATORINITIALROITOOL_H
+#ifndef DESICIONHANDLING_VIEWCREATORINITIALROITOOL_H
+#define DESICIONHANDLING_VIEWCREATORINITIALROITOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
/**
* @class ViewCreatorInitialROITool
@@ -32,4 +32,4 @@ public:
};
-#endif //> !VIEWALGS_VIEWCREATORINITIALROITOOL_H
+#endif //> !DESICIONHANDLING_VIEWCREATORINITIALROITOOL_H
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorNamedROITool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorNamedROITool.cxx
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorNamedROITool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorNamedROITool.cxx
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorNamedROITool.h b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorNamedROITool.h
similarity index 82%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorNamedROITool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorNamedROITool.h
index 34d9849cef1edb9145419887108de88408f59783..1bc3c37da151255f3da9cb3ba730fef5b5732ddf 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorNamedROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorNamedROITool.h
@@ -2,11 +2,11 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef VIEWALGS_VIEWCREATORNAMEDROITOOL_H
-#define VIEWALGS_VIEWCREATORNAMEDROITOOL_H
+#ifndef DESICIONHANDLING_VIEWCREATORNAMEDROITOOL_H
+#define DESICIONHANDLING_VIEWCREATORNAMEDROITOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
/**
* @class ViewCreatorNamedROITool
@@ -32,4 +32,4 @@ public:
};
-#endif //> !VIEWALGS_VIEWCREATORNAMEDROITOOL_H
+#endif //> !DESICIONHANDLING_VIEWCREATORNAMEDROITOOL_H
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorPreviousROITool.cxx b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorPreviousROITool.cxx
similarity index 100%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorPreviousROITool.cxx
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorPreviousROITool.cxx
diff --git a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorPreviousROITool.h b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorPreviousROITool.h
similarity index 95%
rename from Trigger/TrigSteer/ViewAlgs/src/ViewCreatorPreviousROITool.h
rename to Trigger/TrigSteer/DecisionHandling/src/ViewCreatorPreviousROITool.h
index 3f8d022df75db0ed2254eb408a9b61a4ac952563..95cdb00d6305d0f564ccfb1d8b51482877e4bcce 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/ViewCreatorPreviousROITool.h
+++ b/Trigger/TrigSteer/DecisionHandling/src/ViewCreatorPreviousROITool.h
@@ -6,7 +6,7 @@ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#define VIEWALGS_VIEWCREATORPREVIOUSROITOOL_H
#include "AthenaBaseComps/AthAlgTool.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
/**
* @class ViewCreatorPreviousROITool
diff --git a/Trigger/TrigSteer/DecisionHandling/src/components/DecisionHandling_entries.cxx b/Trigger/TrigSteer/DecisionHandling/src/components/DecisionHandling_entries.cxx
index e891afb5dad91b7a401bcb32542fd35d9eced1ec..7a1f0d36154b2180b9fdf99c6db8b3f1c610786f 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/components/DecisionHandling_entries.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/components/DecisionHandling_entries.cxx
@@ -6,6 +6,15 @@
#include "../DeltaRRoIComboHypoTool.h"
#include "DecisionHandling/ComboHypoToolBase.h"
+#include "../ViewCreatorInitialROITool.h"
+#include "../ViewCreatorPreviousROITool.h"
+#include "../ViewCreatorNamedROITool.h"
+#include "../ViewCreatorFSROITool.h"
+#include "../ViewCreatorFetchFromViewROITool.h"
+#include "../ViewCreatorCentredOnIParticleROITool.h"
+#include "../ViewCreatorCentredOnClusterROITool.h"
+#include "../ViewCreatorCentredOnJetWithPVConstraintROITool.h"
+
DECLARE_COMPONENT( DumpDecisions )
DECLARE_COMPONENT( RoRSeqFilter )
DECLARE_COMPONENT( TriggerSummaryAlg )
@@ -14,4 +23,14 @@ DECLARE_COMPONENT( InputMakerForRoI )
DECLARE_COMPONENT( ComboHypoToolBase )
DECLARE_COMPONENT( DeltaRRoIComboHypoTool )
+DECLARE_COMPONENT( ViewCreatorInitialROITool )
+DECLARE_COMPONENT( ViewCreatorPreviousROITool )
+DECLARE_COMPONENT( ViewCreatorNamedROITool )
+DECLARE_COMPONENT( ViewCreatorFSROITool )
+DECLARE_COMPONENT( ViewCreatorFetchFromViewROITool )
+DECLARE_COMPONENT( ViewCreatorCentredOnIParticleROITool )
+DECLARE_COMPONENT( ViewCreatorCentredOnClusterROITool )
+DECLARE_COMPONENT( ViewCreatorCentredOnJetWithPVConstraintROITool )
+
+
diff --git a/Trigger/TrigSteer/ViewAlgs/CMakeLists.txt b/Trigger/TrigSteer/ViewAlgs/CMakeLists.txt
index 811d9b89b0be46c42079ae5c078c6a06cace026c..e2c5914873f06c873857f4a19622594caad103ac 100644
--- a/Trigger/TrigSteer/ViewAlgs/CMakeLists.txt
+++ b/Trigger/TrigSteer/ViewAlgs/CMakeLists.txt
@@ -11,4 +11,4 @@ atlas_add_library( ViewAlgsLib
atlas_add_component( ViewAlgs
src/*.cxx src/components/*.cxx
- LINK_LIBRARIES AthViews AthenaBaseComps CxxUtils DecisionHandlingLib MuonCombinedEvent StoreGateLib TrigSteeringEvent ViewAlgsLib xAODJet xAODMuon xAODTracking xAODTrigCalo )
+ LINK_LIBRARIES AthViews AthenaBaseComps CxxUtils DecisionHandlingLib MuonCombinedEvent StoreGateLib TrigSteeringEvent ViewAlgsLib xAODJet xAODMuon )
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
index 84292ade21be048a66fba0de3995efae33a6f9d1..11c165c4d7f63b4e6f1e4351e0130838efeb5b65 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.cxx
@@ -55,11 +55,13 @@ StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) con
const DecisionContainer* cachedViews = nullptr;
if (!m_cachedViewsKey.empty()) {
SG::ReadHandle<DecisionContainer> cachedRH = SG::makeHandle(m_cachedViewsKey, context);
- ATH_CHECK(cachedRH.isValid());
- cachedViews = cachedRH.ptr();
+ // Even if the handle is configured, this precursor EventViewCreatorAlg may not have executed in a given event
+ if (cachedRH.isValid()) {
+ cachedViews = cachedRH.ptr();
+ }
}
- // Keep track of the ROIs we spwan a View for, do not spawn duplicates.
+ // Keep track of the ROIs we spawn a View for, do not spawn duplicates.
// For many cases, this will be covered by the Merging operation preceding this.
ElementLinkVector<TrigRoiDescriptorCollection> RoIsFromDecision;
@@ -83,7 +85,7 @@ StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) con
ATH_CHECK(roiEL.isValid());
// We do one of three things here, either...
- // a) We realise that an identically configured past EVCA has already run a View on an equivilant ROI. If so we can re-use this.
+ // a) We realise that an identically configured past EVCA has already run a View on an equivalent ROI. If so we can re-use this.
// b) We encounter a new ROI and hence need to spawn a new view.
// c) We encounter a ROI that we have already seen in looping over this outputHandle, we can re-use a view.
@@ -96,7 +98,7 @@ StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) con
if (useCached) {
- // Re-use an aready processed view from a previously executed EVCA instance
+ // Re-use an already processed view from a previously executed EVCA instance
const Decision* cached = cachedViews->at(cachedIndex);
ElementLink<ViewContainer> cachedViewEL = cached->objectLink<ViewContainer>(viewString());
ElementLink<TrigRoiDescriptorCollection> cachedROIEL = cached->objectLink<TrigRoiDescriptorCollection>(roiString());
@@ -159,9 +161,6 @@ StatusCode EventViewCreatorAlgorithm::execute( const EventContext& context ) con
getScheduler(), // Scheduler to launch with
m_reverseViews ) ); // Debug option
- if (msgLvl(MSG::DEBUG)) {
- debugPrintOut(context, outputHandle);
- }
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
index 4e54f68397460153c4cd021ce9ec814aa1517b27..b393b3b8efca212607cd4cfe35b9162fbc065843 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
@@ -21,7 +21,7 @@
#include "GaudiKernel/IScheduler.h"
#include "AthViews/View.h"
-#include "ViewAlgs/IViewCreatorROITool.h"
+#include "DecisionHandling/IViewCreatorROITool.h"
// Muon specifics
#include "xAODMuon/MuonContainer.h"
diff --git a/Trigger/TrigSteer/ViewAlgs/src/components/ViewAlgs_entries.cxx b/Trigger/TrigSteer/ViewAlgs/src/components/ViewAlgs_entries.cxx
index ba3ed577af455e179ff54d630f9b915e5805b74e..8f1bca845a4815e59632a074da250a3a4b5bbbc1 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/components/ViewAlgs_entries.cxx
+++ b/Trigger/TrigSteer/ViewAlgs/src/components/ViewAlgs_entries.cxx
@@ -2,23 +2,8 @@
#include "../EventViewCreatorAlgorithm.h"
#include "../MergeViews.h"
-#include "../ViewCreatorInitialROITool.h"
-#include "../ViewCreatorPreviousROITool.h"
-#include "../ViewCreatorNamedROITool.h"
-#include "../ViewCreatorFSROITool.h"
-#include "../ViewCreatorFetchFromViewROITool.h"
-#include "../ViewCreatorCentredOnIParticleROITool.h"
-#include "../ViewCreatorCentredOnClusterROITool.h"
-#include "../ViewCreatorCentredOnJetWithPVConstraintROITool.h"
+
DECLARE_COMPONENT( EventViewCreatorAlgorithm )
DECLARE_COMPONENT( MergeViews )
-DECLARE_COMPONENT( ViewCreatorInitialROITool )
-DECLARE_COMPONENT( ViewCreatorPreviousROITool )
-DECLARE_COMPONENT( ViewCreatorNamedROITool )
-DECLARE_COMPONENT( ViewCreatorFSROITool )
-DECLARE_COMPONENT( ViewCreatorFetchFromViewROITool )
-DECLARE_COMPONENT( ViewCreatorCentredOnIParticleROITool )
-DECLARE_COMPONENT( ViewCreatorCentredOnClusterROITool )
-DECLARE_COMPONENT( ViewCreatorCentredOnJetWithPVConstraintROITool )
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
index 2b2aa57502ebc24f5b6c33407c959855666b5766..85b8bec6df85deca48f5387b073d5bce3ea0430c 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetPriVtxConfig.py
@@ -1,143 +1,313 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+__author__ = "Mark Sutton"
+__doc__ = "vertexFinder_builder"
+__all__ = [ "vertexFinder_builder", "makeVertices" ]
+
+
+# These routines create the vertex finder for
+# use in the trigger
+#
+# This is done in the
+#
+# vertexFinder_builder()
#
-# Vertexing
+# function at the end - the rest are just helper
+# functions to create the relevant tools that are
+# needed along the way
-from AthenaCommon.Logging import logging
-log = logging.getLogger("InDetVtx")
+# linearised track factory, whatever that does, for the vertex finder
+def linearTrackFactory_builder( signature, extrapolator ) :
-def makeVertices( whichSignature, inputTrackCollection, outputVtxCollection ):
- from AthenaCommon.AppMgr import ToolSvc
- from TrigEDMConfig.TriggerEDMRun3 import recordable
- #vtxCollectionName = "HLT_xPrimVx"
+ from AthenaCommon.AppMgr import ToolSvc
- #If signature specified add suffix to the algorithms
- signature = "_" + whichSignature if whichSignature else ''
-
-
- from TrkExTools.TrkExToolsConf import Trk__Extrapolator
- InDetTrigExtrapolator = Trk__Extrapolator(name = 'InDetTrigExtrapolator' + signature,
- # Propagators = [ InDetPropagator ], # [ InDetPropagator, InDetStepPropagator ],
- # MaterialEffectsUpdators = [ InDetMaterialUpdator ],
- # Navigator = InDetNavigator,
- # SubPropagators = InDetSubPropagators,
- # SubMEUpdators = InDetSubUpdators)
- )
- ToolSvc += InDetTrigExtrapolator
-
- from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__FullLinearizedTrackFactory
- InDetTrigLinFactory = Trk__FullLinearizedTrackFactory(name = "InDetTrigFullLinearizedTrackFactory" + signature,
- Extrapolator = InDetTrigExtrapolator )
- ToolSvc += InDetTrigLinFactory
-
- from TrkVertexBilloirTools.TrkVertexBilloirToolsConf import Trk__FastVertexFitter
- InDetTrigVxFitterTool = Trk__FastVertexFitter(name = "InDetTrigFastVertexFitterTool" + signature,
- LinearizedTrackFactory = InDetTrigLinFactory,
- Extrapolator = InDetTrigExtrapolator) # commented out due to the InDetPriVxFinderToolNoBeamConstraint testing
- ToolSvc += InDetTrigVxFitterTool
-
-
- from InDetTrackSelectionTool.InDetTrackSelectionToolConf import InDet__InDetTrackSelectionTool
- InDetTrigTrackSelectorTool = InDet__InDetTrackSelectionTool(name = "InDetTrigDetailedTrackSelectionTool" + signature,
- # CutLevel = InDetPrimaryVertexingCuts.TrackCutLevel(),
- # minPt = InDetPrimaryVertexingCuts.minPT(),
- # maxD0 = InDetPrimaryVertexingCuts.IPd0Max(),
- # maxZ0 = InDetPrimaryVertexingCuts.z0Max(),
- # maxZ0SinTheta = InDetPrimaryVertexingCuts.IPz0Max(),
- # maxSigmaD0 = InDetPrimaryVertexingCuts.sigIPd0Max(),
- # maxSigmaZ0SinTheta = InDetPrimaryVertexingCuts.sigIPz0Max(),
- # maxChiSqperNdf = InDetPrimaryVertexingCuts.fitChi2OnNdfMax(), # Seems not to be implemented?
- # maxAbsEta = InDetPrimaryVertexingCuts.etaMax(),
- # minNInnermostLayerHits = InDetPrimaryVertexingCuts.nHitInnermostLayer(),
- # minNPixelHits = InDetPrimaryVertexingCuts.nHitPix(),
- # maxNPixelHoles = InDetPrimaryVertexingCuts.nHolesPix(),
- # minNSctHits = InDetPrimaryVertexingCuts.nHitSct(),
- # minNTrtHits = InDetPrimaryVertexingCuts.nHitTrt(),
- # minNSiHits = InDetPrimaryVertexingCuts.nHitSi(),
- # TrackSummaryTool = InDetTrackSummaryTool,
- Extrapolator = InDetTrigExtrapolator)
- ToolSvc += InDetTrigTrackSelectorTool
-
- from TrkVertexSeedFinderUtils.TrkVertexSeedFinderUtilsConf import Trk__GaussianTrackDensity
- TrigGaussDensityEstimator = Trk__GaussianTrackDensity( name = "TrigGaussianDensity" + signature )
-
- ToolSvc += TrigGaussDensityEstimator
-
- from TrkVertexSeedFinderTools.TrkVertexSeedFinderToolsConf import Trk__TrackDensitySeedFinder
- InDetTrigVtxSeedFinder = Trk__TrackDensitySeedFinder( name = "TrigGaussianDensitySeedFinder" + signature,
- DensityEstimator = TrigGaussDensityEstimator )
-
- ToolSvc += InDetTrigVtxSeedFinder
-
- from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__ImpactPoint3dEstimator
- InDetTrigImpactPoint3dEstimator = Trk__ImpactPoint3dEstimator(name = "InDetTrigImpactPoint3dEstimator" + signature,
- Extrapolator = InDetTrigExtrapolator)
-
- ToolSvc += InDetTrigImpactPoint3dEstimator
-
- from InDetPriVxFinderTool.InDetPriVxFinderToolConf import InDet__InDetIterativePriVxFinderTool
- InDetTrigPriVxFinderToolNoBeamConstraint = InDet__InDetIterativePriVxFinderTool(name = "InDetTrigPriVxFinderToolNoBeamConstraint" + signature,
- VertexFitterTool = InDetTrigVxFitterTool,
- TrackSelector = InDetTrigTrackSelectorTool,
- SeedFinder = InDetTrigVtxSeedFinder,
- ImpactPoint3dEstimator = InDetTrigImpactPoint3dEstimator,
- LinearizedTrackFactory = InDetTrigLinFactory,
- useBeamConstraint = False,
- significanceCutSeeding = 12,
- maximumChi2cutForSeeding = 49,
- maxVertices = 200,
- createSplitVertices = False,
- #doMaxTracksCut = InDetPrimaryVertexingCuts.doMaxTracksCut(),
- #MaxTracks = InDetPrimaryVertexingCuts.MaxTracks() )
- )
- ToolSvc += InDetTrigPriVxFinderToolNoBeamConstraint
-
- # if InDetFlags.primaryVertexSortingSetup() == 'SumPt2Sorting':
-
- from TrkVertexWeightCalculators.TrkVertexWeightCalculatorsConf import Trk__SumPtVertexWeightCalculator
- TrigVertexWeightCalculator = Trk__SumPtVertexWeightCalculator(name = "InDetSumPtVertexWeightCalculator" + signature,
- DoSumPt2Selection = True)
-
- # elif InDetFlags.primaryVertexSortingSetup() == 'VxProbSorting':
-
- # from TrkVertexWeightCalculators.TrkVertexWeightCalculatorsConf import Trk__VxProbVertexWeightCalculator
- # VertexWeightCalculator = Trk__VxProbVertexWeightCalculator(name = "InDetVxProbVertexWeightCalculator",
- # HistogramPath = "/VxProbHisto/h_sTrkPdfminBias")
-
- # elif InDetFlags.primaryVertexSortingSetup() == 'NNSorting':
-
- # from TrkVertexWeightCalculators.TrkVertexWeightCalculatorsConf import Trk__NNVertexWeightCalculator
- # VertexWeightCalculator = Trk__NNVertexWeightCalculator(name = "InDetNNVertexWeightCalculator",
- # HistoFilePath ="/NNHisto/")
-
- ToolSvc += TrigVertexWeightCalculator
+ from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__FullLinearizedTrackFactory
+
+ linearTrackFactory = Trk__FullLinearizedTrackFactory( name = "FullLinearizedTrackFactory" + signature,
+ Extrapolator = extrapolator )
+ ToolSvc += linearTrackFactory
+
+ return linearTrackFactory
+
+
+
+# vertex fitter for the vertex finder
+
+def vertexFitterTool_builder( signature, linearTrackFactory, extrapolator ) :
+
+ from AthenaCommon.AppMgr import ToolSvc
+
+ from TrkVertexBilloirTools.TrkVertexBilloirToolsConf import Trk__FastVertexFitter
+ vertexFitterTool = Trk__FastVertexFitter( name = "InDetTrigFastVertexFitterTool" + signature,
+ LinearizedTrackFactory = linearTrackFactory,
+ Extrapolator = extrapolator )
+ ToolSvc += vertexFitterTool
+
+ return vertexFitterTool
+
+
+
+
+# impact parameter estimator
+
+def impactEstimator_builder( signature, extrapolator ) :
+
+ from AthenaCommon.AppMgr import ToolSvc
+
+ from TrkVertexFitterUtils.TrkVertexFitterUtilsConf import Trk__ImpactPoint3dEstimator
+ impactPoint3dEstimator = Trk__ImpactPoint3dEstimator( name = "InDetTrigImpactPoint3dEstimator" + signature,
+ Extrapolator = extrapolator )
+ ToolSvc += impactPoint3dEstimator
+
+ return impactPoint3dEstimator
+
+
+
+
+
+def trackSelectorTool_builder( signature, trackSummaryTool, extrapolator ) :
+
+ from AthenaCommon.AppMgr import ToolSvc
+
+ # now create the track selection tool itself ...
+
+ from InDetTrackSelectionTool.InDetTrackSelectionToolConf import InDet__InDetTrackSelectionTool
- from TrkVertexTools.TrkVertexToolsConf import Trk__VertexCollectionSortingTool
- TrigVertexCollectionSortingTool = Trk__VertexCollectionSortingTool(name = "InDetVertexCollectionSortingTool" + signature,
- VertexWeightCalculator = TrigVertexWeightCalculator)
- ToolSvc += TrigVertexCollectionSortingTool
+ trackSelectorTool = InDet__InDetTrackSelectionTool( name = "InDetTrigDetailedTrackSelectionTool" + signature,
+ Extrapolator = extrapolator )
+
+# these changes need to go in next ...
+# TrackSummaryTool = trackSummaryTool,
+# CutLevel = configuredTrigVtxCuts.TrackCutLevel(),
+# # maybe have all these cuts passed in just by passing in the configuredVtsCuts object
+# minPt = configuredTrigVtxCuts.minPT(),
+# maxD0 = configuredTrigVtxCuts.IPd0Max(),
+# maxZ0 = configuredTrigVtxCuts.z0Max(),
+# maxZ0SinTheta = configuredTrigVtxCuts.IPz0Max(),
+# maxSigmaD0 = configuredTrigVtxCuts.sigIPd0Max(),
+# maxSigmaZ0SinTheta = configuredTrigVtxCuts.sigIPz0Max(),
+# maxChiSqperNdf = configuredTrigVtxCuts.fitChi2OnNdfMax(), # Seems not to be implemented?
+# maxAbsEta = configuredTrigVtxCuts.etaMax(),
+# minNInnermostLayerHits = configuredTrigVtxCuts.nHitInnermostLayer(),
+# minNPixelHits = configuredTrigVtxCuts.nHitPix(),
+# maxNPixelHoles = configuredTrigVtxCuts.nHolesPix(),
+# minNSctHits = configuredTrigVtxCuts.nHitSct(),
+# minNTrtHits = configuredTrigVtxCuts.nHitTrt(),
+# minNSiHits = configuredTrigVtxCuts.nHitSi() )
+
+ ToolSvc += trackSelectorTool
- from InDetPriVxFinder.InDetPriVxFinderMonitoring import InDetPriVxFinderMonitoringTool
+ return trackSelectorTool
+
+
+
+
+# the trackdensity seed finder builder ...
+
+def trackDensitySeedFinder_builder( signature ) :
+
+ from AthenaCommon.AppMgr import ToolSvc
+
+ # Gaussian Density finder needed by the seed finder ...
+
+ from TrkVertexSeedFinderUtils.TrkVertexSeedFinderUtilsConf import Trk__GaussianTrackDensity
+ gaussianTrackDensity = Trk__GaussianTrackDensity( name = "TrigGaussianDensity" + signature )
+ ToolSvc += gaussianTrackDensity
- from InDetPriVxFinder.InDetPriVxFinderConf import InDet__InDetPriVxFinder
- InDetTrigPriVxFinder = InDet__InDetPriVxFinder(name = "InDetTrigPriVxFinder" + signature,
- VertexFinderTool = InDetTrigPriVxFinderToolNoBeamConstraint,
- TracksName = recordable(inputTrackCollection), #recordable("HLT_IDTrack"), #InDetKeys.xAODTrackParticleContainer(),
- VxCandidatesOutputName = outputVtxCollection, #"HLT_xPrimVx", #InDetKeys.PrimaryVerticesWithoutBeamConstraint(),
- VertexCollectionSortingTool = TrigVertexCollectionSortingTool,
- doVertexSorting = True,
- #OutputLevel = 2,
- PriVxMonTool = InDetPriVxFinderMonitoringTool(),
- )
+ # TrackDensitySeed Finder for the iterative vtx finder tool ...
+
+ from TrkVertexSeedFinderTools.TrkVertexSeedFinderToolsConf import Trk__TrackDensitySeedFinder
+ trackDensitySeedFinder = Trk__TrackDensitySeedFinder( name = "TrigGaussianDensitySeedFinder" + signature,
+ DensityEstimator = gaussianTrackDensity )
- #Its not a tool but algorithm!
- #ToolSvc += InDetTrigPriVxFinder
- log.debug(InDetTrigPriVxFinder)
+ ToolSvc += trackDensitySeedFinder
+ return trackDensitySeedFinder
+
+
+
+
+# create the actual vertex finder tool ...
+
+def vertexFinderTool_builder( signature ) :
+
+ from AthenaCommon.AppMgr import ToolSvc
+
+ # use the getters from TrackingCommon ...
+ import InDetRecExample.TrackingCommon as TrackingCommon
- return [ InDetTrigPriVxFinder ]
+ # the track summary tool, and extrapolator will be needed by multiple
+ # tools so create them once and pass them into the builders ...
+
+ trackSummaryTool = TrackingCommon.getInDetTrackSummaryTool()
+ extrapolator = TrackingCommon.getInDetExtrapolator()
+
+ # NB: not yet ready to go in, but we have the code here in readiness ...
+ # get the selection cuts use to select the actual tracks in the tool ...
+ # from InDetTrigRecExample.TrigInDetConfiguredVtxCuts import ConfiguredTrigVertexingCuts
+ # configuredTrigVtxCuts = ConfiguredTrigVertexingCuts()
+ # configuredTrigVtxCuts.printInfo()
+
+
+
+ # now create the five sub tools needed ...
+
+ linearTrackFactory = linearTrackFactory_builder( signature, extrapolator )
+ vertexFitterTool = vertexFitterTool_builder( signature, linearTrackFactory, extrapolator )
+ impactEstimator = impactEstimator_builder( signature, extrapolator )
+ trackSelectorTool = trackSelectorTool_builder( signature, trackSummaryTool, extrapolator )
+ trackDensitySeedFinder = trackDensitySeedFinder_builder( signature )
+
+ # now create the actual vertex finder tool ...
+ # this is the main part of the actual working part of the code -
+ # the vertoces are found by this class, in this instance it includes
+ # a beam line constraint - it we want this to allow this constrain
+ # to be disabled we can add a flag and some additional logic
+
+ from InDetPriVxFinderTool.InDetPriVxFinderToolConf import InDet__InDetIterativePriVxFinderTool
+
+ vertexFinderTool = InDet__InDetIterativePriVxFinderTool( name = "InDetTrigPriVxFinderTool" + signature,
+ VertexFitterTool = vertexFitterTool,
+ TrackSelector = trackSelectorTool,
+ SeedFinder = trackDensitySeedFinder,
+ ImpactPoint3dEstimator = impactEstimator,
+ LinearizedTrackFactory = linearTrackFactory,
+ useBeamConstraint = False,
+ significanceCutSeeding = 12,
+ maximumChi2cutForSeeding = 49,
+ maxVertices = 200,
+ createSplitVertices = False )
+# these too should go in next ...
+# doMaxTracksCut = configuredTrigVtxCuts.doMaxTracksCut(),
+# MaxTracks = configuredTrigVtxCuts.MaxTracks() )
+
+
+ # InDetAdaptiveMultiPriVxFinderTool job options for later
+ # verxtexFinderTool = InDet__InDetAdaptiveMultiPriVxFinderTool( name = "InDetTrigPriVxFinderTool" + signature,
+ # VertexFitterTool = vertexFitterTool,
+ # ...
+
+ # VertexFitterTool = vertexFitterTool,
+ # TrackSelector = trackSelectorTool,
+ # SeedFinder = trackDensitySeedFinder,
+
+ # IPEstimator = Trk::ITrackToVertexIPEstimator : impactEstimator is different type than for IterativeFinder
+ # BeamSpotKey = InDet::BeamSpotData : what is this ??
+
+ # TracksMaxZinterval =
+ # maxVertexChi2 =
+ # finalCutMaxVertexChi2 =
+ # cutVertexDependence =
+ # MinWeight =
+ # realMultiVertex =
+ # useFastCompatibility =
+ # useBeamConstraint =
+ # addSingleTrackVertices =
+ # tracksMaxSignificance =
+ # m_useSeedConstraint =
+ # selectiontype =
+ # //==0 for sum p_t^2
+ # //==1 for NN
+ # //==2 for min bias compatibility estimation (in the future)
+ # maxIterations =
+ # do3dSplitting =
+ # zBfieldApprox =
+ # maximumVertexContamination =
+
+ ToolSvc += vertexFinderTool
+ return vertexFinderTool
+
+
+
+
+
+# create the vertex sorting tool - this is to sort the vertex candidates into
+# some order so clients can pick the best one off the front and so on ...
+
+def vertexSortingTool_builder( signature ) :
+
+ from AthenaCommon.AppMgr import ToolSvc
+
+ # create the vertex weight calculator, to be passed into the sorting tool ...
+
+ from TrkVertexWeightCalculators.TrkVertexWeightCalculatorsConf import Trk__SumPtVertexWeightCalculator
+ vertexWeightCalculator = Trk__SumPtVertexWeightCalculator( name = "InDetSumPtVertexWeightCalculator" + signature,
+ DoSumPt2Selection = True)
+ ToolSvc += vertexWeightCalculator
+
+ # and now create the sorting tool ...
+
+ from TrkVertexTools.TrkVertexToolsConf import Trk__VertexCollectionSortingTool
+ vertexSortingTool = Trk__VertexCollectionSortingTool( name = "InDetVertexCollectionSortingTool" + signature,
+ VertexWeightCalculator = vertexWeightCalculator)
+ ToolSvc += vertexSortingTool
+
+ return vertexSortingTool
+
+
+
+
+# create online vertex monitoring histograms
+
+def vertexMonitoringTool_builder( signature ) :
+ from InDetPriVxFinder.InDetPriVxFinderMonitoring import InDetPriVxFinderMonitoringTool
+ return InDetPriVxFinderMonitoringTool()
+
+
+
+
+
+# actual function to create the vertex finder instance
+# needs the tool to actually create the vertices, plus the
+# tool to sort them into the desired order, and some monitoring
+
+def vertexFinder_builder( signature, inputTracks, outputVertices ) :
+
+ from AthenaCommon.Logging import logging
+ log = logging.getLogger("InDetVtx")
+
+ from TrigEDMConfig.TriggerEDMRun3 import recordable
+
+ # create the three subtools for use by the vertexFinder itself ...
+
+ # the actual tool which finde the vertices ...
+ vertexFinderTool = vertexFinderTool_builder( signature )
+
+ # which are then sorted ...
+ vertexSortingTool = vertexSortingTool_builder( signature )
+
+ # and finally some monitoring ...
+ vertexMonitoringTool = vertexMonitoringTool_builder( signature )
+
+ # no create the vertex finder ...
+
+ from InDetPriVxFinder.InDetPriVxFinderConf import InDet__InDetPriVxFinder
+
+ vertexFinder = InDet__InDetPriVxFinder( name = "InDetTrigPriVxFinder" + signature,
+ VertexFinderTool = vertexFinderTool,
+ TracksName = recordable(inputTracks),
+ VxCandidatesOutputName = recordable(outputVertices),
+ VertexCollectionSortingTool = vertexSortingTool,
+ doVertexSorting = True,
+ PriVxMonTool = vertexMonitoringTool )
+
+ log.debug(vertexFinder)
+
+ return [ vertexFinder ]
+
+
+
+# old function for backwards compatability
+
+def makeVertices( whichSignature, inputTrackCollection, outputVtxCollection ) :
+ return vertexFinder_builder( signature = whichSignature,
+ inputTracks = inputTrackCollection,
+ outputVertices = outputVtxCollection )
+
+
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/Cosmic.py b/Trigger/TrigValidation/TrigUpgradeTest/share/Cosmic.py
index 73760490124c33aa72af7c8202a58a141ff3d1f0..c1a6d765a0236b9d79c32bb11f9a783be0109fa5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/Cosmic.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/Cosmic.py
@@ -23,7 +23,8 @@ from AthenaCommon.AlgSequence import AthSequencer
signatureName = 'Cosmic'
#TODO switch once done
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
from L1Decoder.L1DecoderConfig import mapThresholdToL1RoICollection, mapThresholdToL1DecisionCollection
inputMakerAlg = EventViewCreatorAlgorithm("IM_%s"%signatureName)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
index e6728c83928e1bef73133dd3a35f48750dd728e5..110add925c6c14f8216c5a8e33b8fa76df71eb2e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
@@ -18,8 +18,8 @@ trigL2CaloRingerFexMT = init_ringer()
from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq, findAlgorithm
from DecisionHandling.DecisionHandlingConf import RoRSeqFilter, DumpDecisions
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool
-
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
def createFastCaloSequence(rerun=False):
__prefix = "Rerurn_" if rerun else ""
diff --git a/Trigger/TrigValidation/TrigValTools/bin/trigvalsteering-unit-tester.py b/Trigger/TrigValidation/TrigValTools/bin/trigvalsteering-unit-tester.py
index e8efbfae724a3652f57659ea57fd089753756ba3..6e49a502e02594cdaa3799db56ce91a53c2c3a53 100755
--- a/Trigger/TrigValidation/TrigValTools/bin/trigvalsteering-unit-tester.py
+++ b/Trigger/TrigValidation/TrigValTools/bin/trigvalsteering-unit-tester.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
import sys
@@ -27,7 +27,7 @@ def grep_errors(filename):
lines = []
with open(filename) as f:
lines = re.findall(error_pattern, f.read(), re.MULTILINE)
- return filter(filter_fn, lines)
+ return list(filter(filter_fn, lines))
def main():
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index 3546d9799bff1ddf12d6dfd66cca08db31c7885f..ac18b4c3eae5066c8dca8445c8c334106dbd4a6c 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -300,10 +300,16 @@ TriggerHLTListRun3 = [
('xAOD::JetContainer#HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf', 'BS ESD AODFULL', 'Jet'),
('xAOD::JetAuxContainer#HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftfAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
+ # FS tracks
('xAOD::TrackParticleContainer#HLT_IDTrack_FS_FTF', 'BS ESD AODFULL', 'Jet'),
('xAOD::TrackParticleAuxContainer#HLT_IDTrack_FS_FTFAux.', 'BS ESD AODFULL', 'Jet'),
- # custom BeamSpot tracks - we don't want to write these out in general so this
+ # FS vertices
+ ('xAOD::VertexContainer#HLT_IDVertex_FS', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::VertexAuxContainer#HLT_IDVertex_FSAux.', 'BS ESD AODFULL', 'Jet'),
+
+
+ # custom BeamSpot tracks - we don't want to write these out in general so this
# is commented, if we want to write them out at some point, then these lines
# should be uncommented and they should get written out
# ('xAOD::TrackParticleContainer#HLT_IDTrack_BeamSpot_FTF', 'BS ESD AODFULL', 'ID', 'inViews:beamspotViewRoIs' ),
@@ -380,9 +386,6 @@ TriggerHLTListRun3 = [
('xAOD::JetContainer#HLT_bJets', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet', 'inViews:BTagViews'),
('xAOD::JetAuxContainer#HLT_bJetsAux.btaggingLink', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
- # vertex for b-jets
- ('xAOD::VertexContainer#HLT_EFHistoPrmVtx', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
- ('xAOD::VertexAuxContainer#HLT_EFHistoPrmVtxAux.', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet'),
# secvertex for b-jets
('xAOD::VertexContainer#HLT_BTagging_SecVtx', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Bjet', 'inViews:BTagViews'),
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index 75d886bf62c96925b3c623421204c3c0f5918220..25d772009bc674abd0af8937702d401601232e25 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -308,11 +308,11 @@ def triggerBSOutputCfg(flags, decObj, decObjHypoOut, summaryAlg, offline=False):
"""
Returns CA with algorithms and/or tools required to do the serialisation
- decObj - list of all naviagtaion objects
+ decObj - list of all navigation objects
decObjHypoOut - list of decisions produced by hypos
summaryAlg - the instance of algorithm producing final decision
- offline - if true CA contains algorithms that needs to be merged to output stream sequence,
- if false the CA contains a tool that needs to be added to HLT EventLoopMgr
+ offline - if true CA contains algorithms that need to be merged to output stream sequence,
+ if false the CA contains a tool that needs to be added to HltEventLoopMgr
"""
from TrigEDMConfig import DataScoutingInfo
from TrigEDMConfig.TriggerEDM import getRun3BSList
@@ -365,11 +365,8 @@ def triggerBSOutputCfg(flags, decObj, decObjHypoOut, summaryAlg, offline=False):
hltResultMakerAlg = HLTResultMTMakerAlg()
hltResultMakerAlg.ResultMaker = hltResultMakerTool
acc.addEventAlgo( hltResultMakerAlg )
- # TODO: Decide if stream tags are needed and, if yes, find a way to save updated ones in offline BS saving
# Transfer trigger bits to xTrigDecision which is read by offline BS writing ByteStreamCnvSvc
- #from TrigDecisionMaker.TrigDecisionMakerConfig import TrigDecisionMakerMT
- #decmaker = TrigDecisionMakerMT('TrigDecMakerMT')
decmaker = CompFactory.getComp( "TrigDec::TrigDecisionMakerMT" )("TrigDecMakerMT")
acc.addEventAlgo( decmaker )
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 4b5e1c5016ebd39d34703f455c24c7849f5f74e8..674a6adc083bf072962a84f9b688774a8f67bacf 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -627,7 +627,7 @@ if opt.reverseViews or opt.filterViews:
viewMakers = collectViewMakers( topSequence )
theFilter = []
if opt.filterViews:
- theFilter = [ "Cache", "EventInfo", "HLT_EFHistoPrmVtx" ]
+ theFilter = [ "Cache", "EventInfo", "HLT_IDVertex_FS" ]
for alg in viewMakers:
alg.ReverseViewsDebug = opt.reverseViews
alg.FallThroughFilter = theFilter
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index 1f48c44e876bc2d9e7d59c6bf539e4a1766b5074..9d34dd8a56ded7fe9547aec2b2d4a04a42c62719 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -25,11 +25,11 @@ def getBJetSequence():
# ====================================================================================================
def bJetStep2Sequence():
- prmVtxKey = "HLT_EFHistoPrmVtx"
+ prmVtxKey = "HLT_IDVertex_FS"
outputRoIName = "HLT_Roi_Bjet"
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
- from ViewAlgs.ViewAlgsConf import ViewCreatorCentredOnJetWithPVConstraintROITool
+ from DecisionHandling.DecisionHandlingConf import ViewCreatorCentredOnJetWithPVConstraintROITool
InputMakerAlg = EventViewCreatorAlgorithm( "IMBJet_step2" )
#
newRoITool = ViewCreatorCentredOnJetWithPVConstraintROITool()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
index 162ee73577d081640074bc40b3cef8f9958f19f4..416d23ad7d36d25f14ee9a3a8e482a22ec431a58 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/BeamspotChainConfiguration.py
@@ -9,8 +9,8 @@ from TrigStreamerHypo.TrigStreamerHypoConfigMT import StreamerHypoToolMTgenerato
from TrigStreamerHypo.TrigStreamerHypoConf import TrigStreamerHypoAlgMT
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
from AthenaCommon.CFElements import seqAND
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool
-
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
#----------------------------------------------------------------
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
index 615dd21fd63edd8cec8ca6c143ed1504342c23b4..1f183f1ad18c871c7f362b855c374b3a736ad5d7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/MonitorChainConfiguration.py
@@ -6,7 +6,7 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.MonitorChain
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, MenuSequence
-from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
+from DecisionHandling.DecisionHandlingConf import InputMakerForRoI, ViewCreatorInitialROITool
from AthenaCommon.CFElements import seqAND
from TrigGenericAlgs.TrigGenericAlgsConfig import TimeBurnerCfg, TimeBurnerHypoToolGen
from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
@@ -46,6 +46,7 @@ class MonitorChainConfiguration(ChainConfigurationBase):
def getTimeBurnerStep(self):
# Input maker - required by the framework, but inputs don't matter for TimeBurner
inputMaker = InputMakerForRoI("IM_TimeBurner")
+ inputMaker.RoITool = ViewCreatorInitialROITool()
inputMaker.RoIs="TimeBurnerInputRoIs"
inputMakerSeq = seqAND("TimeBurnerSequence", [inputMaker])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/StreamingChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/StreamingChainConfiguration.py
index c8ffd0373c1329e36461a4d4bd58a9f0832ee2a8..e7f587269dfdfb070a4c97223a704ec9434f2527 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/StreamingChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/StreamingChainConfiguration.py
@@ -8,7 +8,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigu
from TrigStreamerHypo.TrigStreamerHypoConfigMT import StreamerHypoToolMTgenerator
from TrigStreamerHypo.TrigStreamerHypoConf import TrigStreamerHypoAlgMT
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
-from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
+from DecisionHandling.DecisionHandlingConf import InputMakerForRoI, ViewCreatorInitialROITool
from AthenaCommon.CFElements import seqAND
@@ -23,6 +23,7 @@ def StreamingSequenceCfg( flags ):
def StreamingMenuSequence():
inputMakerAlg = InputMakerForRoI("IM_streamerInputMaker")
+ inputMakerAlg.RoITool = ViewCreatorInitialROITool()
inputMakerAlg.RoIs="streamerInputRoIs"
streamingSequence = seqAND("streamerSequence", [inputMakerAlg])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
index cf8f4b3dec84733af8425ad48ae12a921519c83b..153952c628ebb64b549531652e36e9437146abad 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CommonSequences/EventBuildingSequenceSetup.py
@@ -7,7 +7,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu import EventBuildingInfo
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, MenuSequence
from TrigPartialEventBuilding.TrigPartialEventBuildingConf import PEBInfoWriterAlg
from TrigPartialEventBuilding.TrigPartialEventBuildingConfig import StaticPEBInfoWriterToolCfg, RoIPEBInfoWriterToolCfg
-from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
+from DecisionHandling.DecisionHandlingConf import InputMakerForRoI, ViewCreatorInitialROITool
from libpyeformat_helper import SubDetector
from AthenaCommon.CFElements import seqAND, findAlgorithm
from AthenaCommon.Logging import logging
@@ -104,6 +104,7 @@ def pebInfoWriterTool(name, eventBuildType):
def pebInputMaker(eventBuildType):
maker = InputMakerForRoI("IMpeb_"+eventBuildType)
+ maker.RoITool = ViewCreatorInitialROITool()
maker.RoIs = "pebInputRoI_" + eventBuildType
return maker
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
index 2a673f5d85e01b9585c38c427009d6a8d368bf4d..be1401115c5aa6965b2165b8d87f3a1227f3abc3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronSequenceSetup.py
@@ -10,7 +10,8 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFr
# Until such time as FS and RoI collections do not interfere, a hacky fix
#from AthenaCommon.CFElements import parOR, seqAND
from AthenaCommon.CFElements import seqAND
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
from TrigEDMConfig.TriggerEDMRun3 import recordable
def fastElectronSequence(ConfigFlags):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
index 34c0e0c125b29205d769c794f8370fee6a704ebe..0f379090ce77e2b8320eae5f06dc4af0934a5cd1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonSequenceSetup.py
@@ -3,7 +3,8 @@
# menu components
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
from AthenaCommon.CFElements import parOR, seqAND
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
import AthenaCommon.CfgMgr as CfgMgr
from TrigEDMConfig.TriggerEDMRun3 import recordable
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloSequenceSetup.py
index 16ffb099d64c0fd051eb5baec9d06c64d0efd9a2..3b6617ed781b0b7ea26a758cc870b3d442d189e0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloSequenceSetup.py
@@ -5,7 +5,8 @@
# menu components
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
from AthenaCommon.CFElements import seqAND
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
from AthenaConfiguration.AllConfigFlags import ConfigFlags
from TrigEDMConfig.TriggerEDMRun3 import recordable
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionElectronSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionElectronSequenceSetup.py
index 466ce6ee4dd24a382ed6ba270025ae1a8b59438d..becfe6f5ac66a26ee1fcdb497fb23c3dc3952aaf 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionElectronSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionElectronSequenceSetup.py
@@ -7,7 +7,8 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
# menu components
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
from AthenaCommon.CFElements import parOR, seqAND
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
def precisionElectronSequence(ConfigFlags):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
index b0b6a72fe7b34571ea33426aef46b906f5a51068..b6e791509e2bb946216608219bb7ede9303ca980 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
@@ -144,7 +144,7 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
gscDepth = "EM3"
if "gsc" in jetRecoDict["jetCalib"]:
gscDepth = "trackWIDTH"
- pvname = "HLT_EFHistoPrmVtx"
+ pvname = "HLT_IDVertex_FS"
elif jetRecoDict["dataType"]=="pf":
gscDepth = "auto"
@@ -152,7 +152,7 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
calibSeq = "JetArea_Residual_EtaJES_GSC"
if jetRecoDict["jetCalib"].endswith("IS"):
calibSeq += "_Insitu"
- pvname = "HLT_EFHistoPrmVtx"
+ pvname = "HLT_IDVertex_FS"
calibSpec = ":".join( [calibContext, dataSource, calibSeq, rhoKey, pvname, gscDepth] )
from .TriggerJetMods import ConstitFourMom_copy
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
index 23a12bd0493f1d732f987b990acade362969a4e4..97789cf114ee819440148b76cdcfb02ce60e326c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetTrackingConfig.py
@@ -20,10 +20,10 @@ def JetTrackingSequence(dummyFlags,trkopt,RoIs):
viewAlgs = makeInDetAlgsNoView( "JetFS", "FS", rois=RoIs )
jetTrkSeq += viewAlgs
tracksname = recordable("HLT_IDTrack_FS_FTF")
- verticesname = recordable("HLT_EFHistoPrmVtx")
+ verticesname = recordable("HLT_IDVertex_FS")
from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
- vtxAlgs = makeVertices( "jet", "HLT_IDTrack_FS_FTF", verticesname )
+ vtxAlgs = makeVertices( "jet", tracksname, verticesname )
prmVtx = vtxAlgs[-1]
jetTrkSeq += prmVtx
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
index aed3c8e8234227faaf5c0f7900e4703730c47866..8b4318d8a45d55ebd10ef76b653a60188786ea45 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
@@ -121,7 +121,7 @@ class TrkMHTConfig(AlgConfig):
# These are the names set by the upstream algorithms. Unfortunately
# these aren't passed to us - we just have to 'know' them
tracks = "HLT_IDTrack_FS_FTF"
- vertices = "HLT_EFHistoPrmVtx"
+ vertices = "HLT_IDVertex_FS"
tva = "JetTrackVtxAssoc_{trkopt}".format(**jetRecoDict)
track_links = "GhostTrack_{trkopt}".format(**jetRecoDict)
@@ -164,7 +164,7 @@ class PFSumConfig(AlgConfig):
constit_mod_seq = getConstitModAlg(
constit, "HLT",
tvaKey="JetTrackVtxAssoc_{trkopt}".format(**jetRecoDict),
- vtxKey="HLT_EFHistoPrmVtx")
+ vtxKey="HLT_IDVertex_FS")
self.inputs = [tcSeq, pfseq, constit_mod_seq]
self.fexAlg = self._make_fex_alg(
HLT__MET__PFSumFex,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 74c80a054fb0e8b149158bb495c4df2d98338f10..6d322b94600acea926cedb7a39a3581040062f25 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -320,6 +320,7 @@ class EmptyMenuSequence(object):
def __init__(self, name):
self._name = name
Maker = CompFactory.InputMakerForRoI("IM"+name)
+ Maker.RoITool = CompFactory.ViewCreatorInitialROITool()
self._maker = InputMakerNode( Alg = Maker )
self._seed=''
self._sequence = Node( Alg = seqAND(name, [Maker]))
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
index 781d7bd6ab3aa7e8eb5e3d31771c1c9929968add..820eba59d6f2f570d3de3d0e645e3e521f286d6b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
@@ -12,7 +12,8 @@ from AthenaCommon.CFElements import seqAND
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep
from TrigInDetConfig.InDetSetup import makeInDetAlgs
from TrigEDMConfig.TriggerEDMRun3 import recordable
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool
from AthenaCommon.GlobalFlags import globalflags
#----------------------------------------------------------------
# fragments generating configuration will be functions in New JO,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
index ad6ac0b40093ee77f2a5bbdc2a4f80fb6acbb1fc..4709f37998da220d7e7bd081cf8b13e1b5a39583 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
@@ -24,8 +24,9 @@ muonCombinedRecFlags.doStatisticalCombination = False
muonCombinedRecFlags.doCombinedFit = True
muonRecFlags.enableErrorTuning = False
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, \
- ViewCreatorInitialROITool, ViewCreatorPreviousROITool, ViewCreatorNamedROITool, \
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool, \
+ ViewCreatorPreviousROITool, ViewCreatorNamedROITool, \
ViewCreatorFSROITool, ViewCreatorCentredOnIParticleROITool, ViewCreatorFetchFromViewROITool
#muon container names (for RoI based sequences)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
index d9a5aea24b5810f8eb1385151c769f17909fc7d2..1a02cec684050ae627b4481b636b8121f24bb470 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
@@ -4,7 +4,8 @@
from AthenaCommon.CFElements import parOR, seqAND
from AthenaCommon.GlobalFlags import globalflags
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm, ViewCreatorInitialROITool, ViewCreatorPreviousROITool
+from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+from DecisionHandling.DecisionHandlingConf import ViewCreatorInitialROITool, ViewCreatorPreviousROITool
from TrigT2CaloCommon.CaloDef import HLTLCTopoRecoSequence
from TrigEDMConfig.TriggerEDMRun3 import recordable
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool