diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
index 094791c29d0da9069c27920c98807248b4958008..460e237cc1d75a4f7544ab0dce1efd37ec56f7a8 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
@@ -86,13 +86,6 @@ function (athenapooltest_run_test testName jo pattern)
endfunction (athenapooltest_run_test)
-# Write with DoubleEventSelector
-athenapooltest_run_test( AthenaPoolTestWriteDoubleSelector AthenaPoolTestWriteDoubleSelector
- "'^..DoubleEvent|^..AthenaPoolTest'" )
-athenapooltest_run_test( AthenaPoolTestReadDoubleSelector AthenaPoolTestReadDoubleSelector
- "'^..DoubleEvent|^..AthenaPoolTest'"
- DEPENDS AthenaPoolTestWriteDoubleSelector )
-
# Write/read out some simple objects:
athenapooltest_run_test( AthenaPoolTestWrite AthenaPoolTestWrite
"^..AthenaPoolTestD" )
@@ -100,6 +93,14 @@ athenapooltest_run_test( AthenaPoolTestRead AthenaPoolTestRead
"AthenaPoolTestD"
DEPENDS AthenaPoolTestWrite )
+# Write with DoubleEventSelector
+athenapooltest_run_test( AthenaPoolTestWriteDoubleSelector AthenaPoolTestWriteDoubleSelector
+ "'^..DoubleEvent|^..AthenaPoolTest'"
+ DEPENDS AthenaPoolTestRead)
+athenapooltest_run_test( AthenaPoolTestReadDoubleSelector AthenaPoolTestReadDoubleSelector
+ "'^..DoubleEvent|^..AthenaPoolTest'"
+ DEPENDS AthenaPoolTestWriteDoubleSelector )
+
# Add on test of navigation still using simple objects:
# AthenaPoolTestWrite - Step2 - rewrite part in another file
# DoubleEventSelector
@@ -109,7 +110,7 @@ athenapooltest_run_test( AthenaPoolTestStep2WriteDoubleSelector AthenaPoolTestSt
# normal EventSelector
athenapooltest_run_test( AthenaPoolTestStep2Write AthenaPoolTestStep2Write
"^..AthenaPoolTestD"
- DEPENDS AthenaPoolTestRead )
+ DEPENDS AthenaPoolTestStep2WriteDoubleSelector )
# Copy the Step2 file
#athenapooltest_run_test( AthenaPoolTestCopy AthenaPoolTestCopy
@@ -135,14 +136,16 @@ athenapooltest_run_test( AthenaPoolTestStep2Write AthenaPoolTestStep2Write
# Test write/read of indet rdos:
athenapooltest_run_test( InDetRawDataWriter InDetRawDataWriter_jobOptions
- "InDetRawDataFak" )
+ "InDetRawDataFak"
+ DEPENDS AthenaPoolTestStep2Write )
athenapooltest_run_test( InDetRawDataRead InDetRawDataReader_jobOptions
"InDetRawDataFak"
DEPENDS InDetRawDataWriter )
# Test write/read of LAr cell
athenapooltest_run_test( LArCellContWriter LArCellContWriter_jobOptions
- "LArCellContFake" )
+ "LArCellContFake"
+ DEPENDS InDetRawDataRead )
athenapooltest_run_test( LArCellContRead LArCellContReader_jobOptions
"LArCellContFake"
DEPENDS LArCellContWriter )
@@ -157,7 +160,8 @@ athenapooltest_run_test( ReadCombinedRDO ReadCombinedRDO
# Test basic overlay algorithms with DoubleEventSelector
athenapooltest_run_test( DoubleEventSelectorOverlayTest DoubleEventSelectorOverlayTest
- "'^..DoubleEvent|^..AthenaPoolAddr|^..Stream1'" )
+ "'^..DoubleEvent|^..AthenaPoolAddr|^..Stream1'"
+ DEPENDS ReadCombinedRDO )
# AthenaMT test for DoubleEventSelector
atlas_add_test( DoubleEventSelectorOverlayTestMT
@@ -222,7 +226,7 @@ atlas_add_test( DoubleEventSelectorOverlayTestMT
# Check for adding DetDescr tags to event info object:
athenapooltest_run_test( EventInfoWrite EventInfoWrite
"'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
- DEPENDS LArCellContRead )
+ DEPENDS DoubleEventSelectorOverlayTest )
athenapooltest_run_test( EventInfoWriteStep2 EventInfoWriteStep2
"'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
DEPENDS EventInfoWrite )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py
index 5e29ee5fb6bae2c8f0e2df38fbfa2169fe7c7ec4..50cef3f3b7991f7f56b452fe82c5e26c9deff470 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2WriteDoubleSelector.py
@@ -88,6 +88,11 @@ Stream3.ItemList += ["AthenaPoolTestMatrix#*"]
print Stream3.ItemList
+# Change output file catalog to avoid collisions.
+PoolSvc = Service( 'PoolSvc' )
+PoolSvc.WriteCatalog = 'file:AthenaPoolTestStep2WriteDoubleSelector_catalog.xml'
+
+
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#--------------------------------------------------------------
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py
index cd8048ce610f03a644fc4993851e6536adf40a93..020754c8c61a33f489834858a60f8269dc3438ba 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/DoubleEventSelectorOverlayTest.py
@@ -46,8 +46,9 @@ DetDescrVersion = "ATLAS-R2-2016-01-00-01"
#--------------------------------------------------------------
# Input options
#--------------------------------------------------------------
-svcMgr.DoubleEventSelector.PrimaryInputCollections = [ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/PileupPremixing/22.0/RDO.merged-pileup-MT.unittest.pool.root" ]
-svcMgr.DoubleEventSelector.SecondaryaryInputCollections = [ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000765.pool.root.1" ]
+data_dir = os.environ.get ('ATLAS_REFERENCE_DATA', '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art')
+svcMgr.DoubleEventSelector.PrimaryInputCollections = [ data_dir + "/OverlayMonitoringRTT/PileupPremixing/22.0/RDO.merged-pileup-MT.unittest.pool.root" ]
+svcMgr.DoubleEventSelector.SecondaryaryInputCollections = [ data_dir + "/OverlayMonitoringRTT/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000765.pool.root.1" ]
svcMgr.DoubleEventSelector.OutputLevel = DEBUG
#--------------------------------------------------------------
diff --git a/AtlasTest/TestTools/share/post.sh b/AtlasTest/TestTools/share/post.sh
index 2135ef253662c75f483bfb38118dc3813ffce6b9..97b8a682caf06ed4e6d4d292d9fa219adc373a32 100755
--- a/AtlasTest/TestTools/share/post.sh
+++ b/AtlasTest/TestTools/share/post.sh
@@ -31,7 +31,7 @@ test=$1
# Concatenate them here so the same code works also from the command line.
pat="$2 $3"
if [[ "$pat" = "-s "* ]]; then
- selectpatterns=`echo "$pat" | sed 's/-s\s*//'`
+ selectpatterns=`echo "$pat" | sed 's/-s\s*//' | sed 's/ $//'`
else
extrapatterns="$2"
fi
diff --git a/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt b/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
index 673c89ff64225ca2a4d9800ac6223f4efcdeaee2..9998079e5a23adfe63f21c9e25c4bdf5a6f27c9e 100644
--- a/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloCondAthenaPool/CMakeLists.txt
@@ -11,7 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Calorimeter/CaloConditions
Calorimeter/CaloTriggerTool
- Control/SGTools
+ Control/AthenaKernel
Control/StoreGate
Database/AthenaPOOL/AthenaPoolCnvSvc )
@@ -20,7 +20,7 @@ atlas_add_poolcnv_library( CaloCondAthenaPoolPoolCnv
src/*.cxx
FILES CaloTriggerTool/LArTTCellMap.h CaloTriggerTool/CaloTTOnOffIdMap.h CaloTriggerTool/CaloTTOnAttrIdMap.h CaloTriggerTool/CaloTTPpmRxIdMap.h CaloConditions/ToolConstants.h CaloConditions/CaloCellFactor.h CaloConditions/CaloCellPositionShift.h CaloConditions/CaloHadWeight.h CaloConditions/CaloEMFrac.h CaloConditions/CaloHadDMCoeff.h CaloConditions/CaloHadDMCoeff2.h CaloConditions/CaloLocalHadCoeff.h
TYPES_WITH_NAMESPACE CaloRec::ToolConstants CaloRec::CaloCellFactor CaloRec::CaloCellPositionShift
- LINK_LIBRARIES AthenaPoolUtilities CaloConditions CaloTriggerToolLib SGTools StoreGateLib SGtests AthenaPoolCnvSvcLib )
+ LINK_LIBRARIES AthenaPoolUtilities CaloConditions CaloTriggerToolLib AthenaKernel StoreGateLib SGtests AthenaPoolCnvSvcLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTOnAttrIdMapCnv.cxx b/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTOnAttrIdMapCnv.cxx
index 0fae07d336471f609d2638f34faf037aa6b7d7c6..6737cbac3608e2073ae0f491fce367dff1da42ef 100755
--- a/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTOnAttrIdMapCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTOnAttrIdMapCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -16,7 +16,7 @@
// Athena
#include "StoreGate/StoreGateSvc.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
CaloTTOnAttrIdMapCnv::CaloTTOnAttrIdMapCnv(ISvcLocator* svcloc)
:
diff --git a/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTOnOffIdMapCnv.cxx b/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTOnOffIdMapCnv.cxx
index 955e21b8d33ce36ca6062d4597225fb1efac5500..7bef32188c64b759f6127b18b3d06f056fd60488 100755
--- a/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTOnOffIdMapCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTOnOffIdMapCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -16,7 +16,7 @@
// Athena
#include "StoreGate/StoreGateSvc.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
CaloTTOnOffIdMapCnv::CaloTTOnOffIdMapCnv(ISvcLocator* svcloc)
:
diff --git a/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTPpmRxIdMapCnv.cxx b/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTPpmRxIdMapCnv.cxx
index 290e91cf87de6c514fc62c1987e032091c0b6709..93c4c601811b5f18e976d63d423c507be1c4c3ed 100755
--- a/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTPpmRxIdMapCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloCondAthenaPool/src/CaloTTPpmRxIdMapCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -16,7 +16,7 @@
// Athena
#include "StoreGate/StoreGateSvc.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
CaloTTPpmRxIdMapCnv::CaloTTPpmRxIdMapCnv(ISvcLocator* svcloc)
:
diff --git a/Calorimeter/CaloCnv/CaloCondAthenaPool/src/LArTTCellMapCnv.cxx b/Calorimeter/CaloCnv/CaloCondAthenaPool/src/LArTTCellMapCnv.cxx
index 1ed7b4d4a5f1afbd3d14171647e09a9b7bd356c7..e77fb8709e5f6d299c28b0baaf0eb09cb368f49a 100755
--- a/Calorimeter/CaloCnv/CaloCondAthenaPool/src/LArTTCellMapCnv.cxx
+++ b/Calorimeter/CaloCnv/CaloCondAthenaPool/src/LArTTCellMapCnv.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "LArTTCellMapCnv.h"
@@ -11,7 +11,7 @@
// Athena
#include "StoreGate/StoreGateSvc.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
LArTTCellMapCnv::LArTTCellMapCnv(ISvcLocator* svcloc)
:
diff --git a/Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py b/Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py
index 42214ae81004a004bffa89f5f9c7f86a2f1dfb22..7c42355657287474ec3a61bc0d4c0f7ef27f606e 100644
--- a/Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py
+++ b/Calorimeter/CaloExample/CaloRecEx/share/CaloRecOutputItemList_jobOptions.py
@@ -80,28 +80,28 @@ if jobproperties.Beam.beamType() == 'cosmics' or jobproperties.Beam.beamType() =
#List of AOD moments: (copied from CaloClusterTopoGetter)
-AODMoments=["LATERAL"
- ,"LONGITUDINAL"
- ,"SECOND_R"
+AODMoments=[#"LATERAL"
+ #,"LONGITUDINAL"
+ "SECOND_R"
,"SECOND_LAMBDA"
,"CENTER_MAG"
,"CENTER_LAMBDA"
- ,"FIRST_ENG_DENS"
- ,"ENG_FRAC_MAX"
+ #,"FIRST_ENG_DENS"
+ #,"ENG_FRAC_MAX"
,"ISOLATION"
,"ENG_BAD_CELLS"
,"N_BAD_CELLS"
,"BADLARQ_FRAC"
- ,"ENG_BAD_HV_CELLS"
- ,"N_BAD_HV_CELLS"
+ #,"ENG_BAD_HV_CELLS"
+ #,"N_BAD_HV_CELLS"
,"ENG_POS"
- ,"SIGNIFICANCE"
- ,"CELL_SIGNIFICANCE"
- ,"CELL_SIG_SAMPLING"
+ #,"SIGNIFICANCE"
+ #,"CELL_SIGNIFICANCE"
+ #,"CELL_SIG_SAMPLING"
,"AVG_LAR_Q"
,"AVG_TILE_Q"
,"EM_PROBABILITY"
- ,"PTD"
+ #,"PTD"
,"BadChannelList"
,#"LATERAL"
]
diff --git a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgDefault.py b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgDefault.py
index 3f0b24063d3a50d53a20aae75d54a18095f1003a..6c57dde206432c5fdcea10b858a3efef4b33cb89 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgDefault.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgDefault.py
@@ -13,10 +13,8 @@ def CaloBCIDAvgAlgDefault():
from LArRecUtils.LArMCSymCondAlg import LArMCSymCondAlgDefault
LArMCSymCondAlgDefault()
if globalflags.DataSource()=='data':
- from LumiBlockComps.LuminosityToolDefault import LuminosityToolDefault
- theLumiTool = LuminosityToolDefault()
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += theLumiTool
+ from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgDefault
+ lumiAlg = LuminosityCondAlgDefault()
if athenaCommonFlags.isOnline:
conddb.addFolder("LAR_ONL","/LAR/LArPileup/LArPileupShape<key>LArShape32</key>",className="LArShape32MC")
conddb.addFolder("LAR_ONL","/LAR/LArPileup/LArPileupAverage",className="LArMinBiasAverageMC")
@@ -24,7 +22,9 @@ def CaloBCIDAvgAlgDefault():
conddb.addFolder("LAR_OFL","/LAR/ElecCalibOfl/LArPileupShape<key>LArShape32</key>",className="LArShape32MC")
conddb.addFolder("LAR_OFL","/LAR/ElecCalibOfl/LArPileupAverage",className="LArMinBiasAverageMC")
- topSequence+=CaloBCIDAvgAlg(isMC=False,LumiTool=theLumiTool,ShapeKey="LArShape32")
+ topSequence+=CaloBCIDAvgAlg(isMC=False,
+ LuminosityCondDataKey = lumiAlg.LuminosityOutputKey,
+ ShapeKey="LArShape32")
else: #MC case
from LArRecUtils.LArOFCCondAlgDefault import LArOFCCondAlgDefault
from LArRecUtils.LArAutoCorrTotalCondAlgDefault import LArAutoCorrTotalCondAlgDefault
@@ -36,6 +36,8 @@ def CaloBCIDAvgAlgDefault():
theBunchCrossingTool = BunchCrossingTool()
conddb.addFolder("LAR_OFL","/LAR/ElecCalibMC/Shape",className="LArShape32MC")
conddb.addFolder("LAR_OFL","/LAR/ElecCalibMC/LArPileupAverage",className="LArMinBiasAverageMC")
- topSequence+=CaloBCIDAvgAlg(isMC=True,BunchCrossingTool = theBunchCrossingTool,ShapeKey="LArShape")
+ topSequence+=CaloBCIDAvgAlg(isMC=True,
+ LuminosityCondDataKey = '',
+ BunchCrossingTool = theBunchCrossingTool,ShapeKey="LArShape")
return
diff --git a/Calorimeter/CaloRec/python/CaloCellGetter.py b/Calorimeter/CaloRec/python/CaloCellGetter.py
index 10c90949bd399aff9f520355180ebb8c233a3856..a3ef34ecc097027180b3b0de98b5d2fd4a097529 100644
--- a/Calorimeter/CaloRec/python/CaloCellGetter.py
+++ b/Calorimeter/CaloRec/python/CaloCellGetter.py
@@ -194,6 +194,10 @@ class CaloCellGetter (Configured) :
from TileRecUtils.TileRecFlags import jobproperties
theTileCellBuilder.TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
+ if (jobproperties.TileRecFlags.noiseFilter() == 1 and jobproperties.TileRecFlags.readDigits()
+ and globalflags.DataSource() == 'data' and not globalflags.isOverlay()):
+ theTileCellBuilder.TileDSPRawChannelContainer = 'TileRawChannelCntCorrected'
+
rawChannelContainer = ''
if globalflags.DataSource() == 'data' and globalflags.InputFormat() == 'bytestream':
if jobproperties.TileRecFlags.readDigits():
diff --git a/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py b/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
index da8d1da47ce23e065e3aa49285657b5ffd23401e..985fc21ff24fa014aa47a6e4f1cd2e705f7ac06b 100644
--- a/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
+++ b/Calorimeter/CaloRec/python/CaloClusterTopoGetter.py
@@ -239,6 +239,7 @@ class CaloClusterTopoGetter ( Configured ) :
,"AVG_TILE_Q"
,"PTD"
,"MASS"
+ ,"EM_PROBABILITY"
]
doDigiTruthFlag = False
diff --git a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
index eb23fe09a2cbfc55733b2fb9af804082b05b4735..b35aa6c749ed9dfa6b70a5daae58171ed1a5a4cc 100644
--- a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
+++ b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "CaloBCIDAvgAlg.h"
@@ -9,22 +9,18 @@
CaloBCIDAvgAlg::CaloBCIDAvgAlg(const std::string& name, ISvcLocator* pSvcLocator):
AthReentrantAlgorithm(name,pSvcLocator),
m_bunchCrossingTool("BunchCrossingTool") {
- declareProperty("LumiTool",m_lumiTool,"Tool handle for Luminosity");
declareProperty("BunchCrossingTool",m_bunchCrossingTool,"Tool handle for bunch crossing tool");
}
StatusCode CaloBCIDAvgAlg::initialize() {
ATH_MSG_INFO( " initialize " );
-// get LumiTool
+// get BunchCrossingTool
if (m_isMC) {
ATH_CHECK( m_bunchCrossingTool.retrieve() );
ATH_MSG_DEBUG(" -- bunch crossing Tool retrieved");
- m_lumiTool.disable();
} else {
- ATH_CHECK( m_lumiTool.retrieve() );
- ATH_MSG_DEBUG(" -- Lumi Tool retrieved");
m_bunchCrossingTool.disable();
}
@@ -35,6 +31,7 @@ StatusCode CaloBCIDAvgAlg::initialize() {
ATH_CHECK(m_minBiasAvgKey.initialize());
ATH_CHECK(m_cablingKey.initialize());
ATH_CHECK(m_mcSym.initialize());
+ ATH_CHECK(m_lumiDataKey.initialize(!m_isMC));
ATH_CHECK(detStore()->retrieve(m_lar_on_id,"LArOnlineID"));
return StatusCode::SUCCESS;
@@ -63,6 +60,12 @@ StatusCode CaloBCIDAvgAlg::execute(const EventContext& ctx) const {
SG::ReadCondHandle<LArMCSym> mcSymHdl(m_mcSym,ctx);
const LArMCSym* mcSym=*mcSymHdl;
+ std::vector<float> luminosityPerBCID;
+ if (!m_isMC) {
+ SG::ReadCondHandle<LuminosityCondData> lumiData(m_lumiDataKey,ctx);
+ luminosityPerBCID = lumiData->lbLuminosityPerBCIDVector();
+ }
+
std::unordered_map<unsigned,float> avgEshift;
const uint32_t bcid = ei->bcid();
@@ -72,7 +75,8 @@ StatusCode CaloBCIDAvgAlg::execute(const EventContext& ctx) const {
const float xlumiMC = m_isMC ? ei->averageInteractionsPerCrossing()*0.158478605 : 0.0;
// Calculate Luminosity values ONLY around the places Luminosity will be needed
- const std::vector<float> lumiVec=accumulateLumi(bcid,xlumiMC);
+ const std::vector<float> lumiVec=accumulateLumi(luminosityPerBCID,
+ bcid,xlumiMC);
//std::cout << " start loop over cells bcid= " << bcid << std::endl;
@@ -188,8 +192,11 @@ StatusCode CaloBCIDAvgAlg::execute(const EventContext& ctx) const {
return StatusCode::SUCCESS;
}
-std::vector<float> CaloBCIDAvgAlg::accumulateLumi(const unsigned int bcid, const float xlumiMC) const {
-
+std::vector<float>
+CaloBCIDAvgAlg::accumulateLumi(const std::vector<float>& luminosity,
+ const unsigned int bcid,
+ const float xlumiMC) const
+{
std::vector<float> lumiVec(m_bcidMax,0.0);
unsigned int keep_samples=32;
@@ -201,7 +208,7 @@ std::vector<float> CaloBCIDAvgAlg::accumulateLumi(const unsigned int bcid, const
for(unsigned int i=a;i<b;i++){
float lumi=0.0;
if (m_isMC) lumi= m_bunchCrossingTool->bcIntensity(i)*xlumiMC; // convert to luminosity per bunch in 10**30 units
- else lumi = m_lumiTool->lbLuminosityPerBCID(i); // luminosity in 10**30 units
+ else lumi = luminosity.at(i); // luminosity in 10**30 units
lumiVec[i]=(lumi);
}
}
@@ -213,21 +220,21 @@ std::vector<float> CaloBCIDAvgAlg::accumulateLumi(const unsigned int bcid, const
for(unsigned int i=(unsigned int)a;i<b;i++){
float lumi=0.0;
if (m_isMC) lumi= m_bunchCrossingTool->bcIntensity(i)*xlumiMC; // convert to luminosity per bunch in 10**30 units
- else lumi = m_lumiTool->lbLuminosityPerBCID(i); // luminosity in 10**30 units
+ else lumi = luminosity.at(i); // luminosity in 10**30 units
lumiVec[i]=(lumi);
}
for(unsigned int i=0;i<keep_ofcsamples+4;i++){
float lumi=0.0;
if (m_isMC) lumi= m_bunchCrossingTool->bcIntensity(i)*xlumiMC; // convert to luminosity per bunch in 10**30 units
- else lumi = m_lumiTool->lbLuminosityPerBCID(i); // luminosity in 10**30 units
+ else lumi = luminosity.at(i); // luminosity in 10**30 units
lumiVec[i]=(lumi);
}
for(unsigned int i=m_bcidMax-keep_samples-5;i<m_bcidMax;i++){
float lumi=0.0;
if (m_isMC) lumi= m_bunchCrossingTool->bcIntensity(i)*xlumiMC; // convert to luminosity per bunch in 10**30 units
- else lumi = m_lumiTool->lbLuminosityPerBCID(i); // luminosity in 10**30 units
+ else lumi = luminosity.at(i); // luminosity in 10**30 units
lumiVec[i]=(lumi);
}
diff --git a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
index 72f5c9879664d8cfd513a2589a2daa739b0c5baa..d2595ce3241c2035e92fb487905ca4cb72e57a7e 100644
--- a/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
+++ b/Calorimeter/CaloRec/src/CaloBCIDAvgAlg.h
@@ -1,6 +1,6 @@
//Dear emacs, this is -*-c++-*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CALOREC_CALOBCIDAVGALG_H
@@ -16,8 +16,7 @@
#include "LArElecCalib/ILArShape.h"
#include "LArElecCalib/ILArMinBiasAverage.h"
#include "LArCabling/LArOnOffIdMapping.h"
-
-#include "LumiBlockComps/ILuminosityTool.h"
+#include "LumiBlockData/LuminosityCondData.h"
#include "TrigAnalysisInterfaces/IBunchCrossingTool.h"
class CaloBCIDAvgAlg : public AthReentrantAlgorithm {
@@ -44,10 +43,10 @@ private:
SG::ReadCondHandleKey<ILArMinBiasAverage> m_minBiasAvgKey{this,"MinBiasAvgKey","LArPileupAverage","SGKey of LArMinBiasAverage object"};
SG::ReadCondHandleKey<LArOnOffIdMapping> m_cablingKey{this,"CablingKey","LArOnOffIdMap","SG Key of LArOnOffIdMapping object"};
SG::ReadCondHandleKey<LArMCSym> m_mcSym{this,"MCSym","LArMCSym","SG Key of LArMCSym object"};
+ SG::ReadCondHandleKey<LuminosityCondData> m_lumiDataKey{this,"LuminosityCondDataKey","LuminosityCondData","SG Key of LuminosityCondData object"};
//Tool Handles:
- ToolHandle<ILuminosityTool> m_lumiTool;
ToolHandle<Trig::IBunchCrossingTool> m_bunchCrossingTool;
//Other Properties
@@ -64,7 +63,9 @@ private:
const unsigned m_bcidMax=3564;
//private methods:
- std::vector<float> accumulateLumi(const unsigned int bcid, const float xlumiMC) const;
+ std::vector<float> accumulateLumi(const std::vector<float>& luminosity,
+ const unsigned int bcid,
+ const float xlumiMC) const;
};
diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
index 022a9bc0db7a2c0182fecc6a74ca8ea5b18eb291..0278524847d3d6cda2b48b79cff5880e50d13425 100755
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------
// File and Version Information:
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/AsgToolsAthena.h b/Control/AthToolSupport/AsgTools/AsgTools/AsgToolsAthena.h
index c3808c675d41f44cac20237d5f045c51db1a9adf..ece52e010bfbb738763c047e1fb9a7ec69e08a49 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/AsgToolsAthena.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/AsgToolsAthena.h
@@ -21,7 +21,7 @@
// Include headers from all the publicly used Athena packages:
#include "GaudiKernel/IAlgTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "IOVDbDataModel/IOVMetaDataContainer.h"
#endif // ASGTOOLS_ASGTOOLSATHENA_H
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h b/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h
index 9588e469dfde14f6f9e08759907ada26b3642f21..bf470cf51500388007c5f7d6f20a04fe5d909cf1 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h
@@ -26,7 +26,7 @@ int announce(const char* name, int clid) {
#endif
#ifdef ASGTOOL_ATHENA
- #include "SGTools/CLASS_DEF.h"
+ #include "AthenaKernel/CLASS_DEF.h"
#else
#ifdef CLASSDEF_SHOWDEFS
#define CLASS_DEF(NAME, CLID, VER) int clid_CLASS = announce(#NAME, CLID);
diff --git a/Control/AthToolSupport/AsgTools/CMakeLists.txt b/Control/AthToolSupport/AsgTools/CMakeLists.txt
index edfc2d367298cd3d873ac044e2499c963bbb7c0f..a172b4af5f19a1d4d90279d4199bde2f3ca017cc 100644
--- a/Control/AthToolSupport/AsgTools/CMakeLists.txt
+++ b/Control/AthToolSupport/AsgTools/CMakeLists.txt
@@ -12,9 +12,9 @@ if( XAOD_STANDALONE )
set( deps Control/xAODRootAccessInterfaces Control/xAODRootAccess )
set( libs xAODRootAccessInterfaces xAODRootAccess )
else()
- set( deps Control/xAODRootAccess Control/AthenaBaseComps Control/SGTools Database/IOVDbDataModel
+ set( deps Control/xAODRootAccess Control/AthenaBaseComps Control/AthenaKernel Database/IOVDbDataModel
GaudiKernel )
- set( libs AthenaBaseComps SGTools IOVDbDataModel GaudiKernel )
+ set( libs AthenaBaseComps AthenaKernel IOVDbDataModel GaudiKernel )
endif()
# Declare the package's dependencies:
diff --git a/Control/AthViews/AthViews/SimpleView.h b/Control/AthViews/AthViews/SimpleView.h
index 0a019b742e3de785fda76b50adc9c3c273878491..ad0b1bd938f5c25235c867498a9da11b3e6b9c5a 100644
--- a/Control/AthViews/AthViews/SimpleView.h
+++ b/Control/AthViews/AthViews/SimpleView.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHVIEWS_SIMPLEVIEW_H
@@ -12,8 +12,6 @@
#include "AthenaKernel/IProxyDict.h"
#include "StoreGate/StoreGateSvc.h"
-//#include "SGTools/CLASS_DEF.h"
-
#include <string>
#include <vector>
@@ -182,7 +180,7 @@ class SimpleView : public IProxyDict
};
-//#include "SGTools/CLASS_DEF.h"
+//#include "AthenaKernel/CLASS_DEF.h"
//CLASS_DEF( std::vector< SimpleView* >, 11111111110, 1 )
diff --git a/Control/AthViews/AthViews/View.h b/Control/AthViews/AthViews/View.h
index e49cfdf3b3faa7d199638793987fdba0f7117219..5ba06e9c0231d126447817924db46e009918f092 100644
--- a/Control/AthViews/AthViews/View.h
+++ b/Control/AthViews/AthViews/View.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHVIEWS_VIEW_H
@@ -118,7 +118,7 @@ private:
} // EOF SG namespace
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
// Do we need to do this?
class ViewContainer {
diff --git a/Control/AthViews/AthViews/ViewHelper.h b/Control/AthViews/AthViews/ViewHelper.h
index 53a6bbd7558bc4cd34201ef018669efbc7a0edc1..1c5df95fd3054de9a77f3e77fcddfa4dac06149e 100644
--- a/Control/AthViews/AthViews/ViewHelper.h
+++ b/Control/AthViews/AthViews/ViewHelper.h
@@ -1,11 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHVIEWS_VIEWHELPER_HH
#define ATHVIEWS_VIEWHELPER_HH
-#include "CxxUtils/make_unique.h"
#include "GaudiKernel/SmartIF.h"
#include "GaudiKernel/IService.h"
#include "GaudiKernel/IScheduler.h"
@@ -64,7 +63,7 @@ namespace ViewHelper
}
//Populate the view
- sc = populateHandle.record( CxxUtils::make_unique< T >( InputData[ viewIndex ] ) );
+ sc = populateHandle.record( std::make_unique< T >( InputData[ viewIndex ] ) );
if ( !sc.isSuccess() )
{
ViewVector->clear();
diff --git a/Control/AthViews/CMakeLists.txt b/Control/AthViews/CMakeLists.txt
index 163d89be976f7359de1403cb2cfeb59bc42ec6e6..7766358b5524f328b6560a123893c40c50173cd5 100644
--- a/Control/AthViews/CMakeLists.txt
+++ b/Control/AthViews/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthContainers
Control/AthenaBaseComps
Control/AthenaKernel
- Control/SGTools
Control/StoreGate
Trigger/TrigEvent/TrigSteeringEvent
Control/AthenaExamples/AthExHive
@@ -27,7 +26,7 @@ atlas_add_library( AthViews
src/*.cxx
PUBLIC_HEADERS AthViews
INCLUDE_DIRS ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${TBB_LIBRARIES} AthenaBaseComps AthenaKernel SGTools StoreGateLib GaudiKernel CxxUtils TrigSteeringEvent )
+ LINK_LIBRARIES ${TBB_LIBRARIES} AthenaBaseComps AthenaKernel StoreGateLib GaudiKernel CxxUtils TrigSteeringEvent )
atlas_add_component( AthViewsAlgs
src/*.cxx
diff --git a/Control/AthViews/src/RoiCollectionToViews.cxx b/Control/AthViews/src/RoiCollectionToViews.cxx
index 7950dbb7b5fdfc8f08fadb3adeb2e8483ca3dc11..0067e361d818f6a73b03614cfb58097bc14c76ab 100644
--- a/Control/AthViews/src/RoiCollectionToViews.cxx
+++ b/Control/AthViews/src/RoiCollectionToViews.cxx
@@ -9,7 +9,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "CxxUtils/make_unique.h"
#include "AthContainers/ConstDataVector.h"
namespace AthViews {
diff --git a/Control/AthViews/src_dflow/DFlowAlg1.cxx b/Control/AthViews/src_dflow/DFlowAlg1.cxx
index 9b99efe1db1ec2b2d23900d60b925ac33688615b..ac3ea191d33d160f51277672271f3082af25bb52 100644
--- a/Control/AthViews/src_dflow/DFlowAlg1.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg1.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// DFlowAlg1.cxx
@@ -19,7 +19,6 @@
#include "GaudiKernel/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
-#include "CxxUtils/make_unique.h"
namespace AthViews {
@@ -93,7 +92,7 @@ StatusCode DFlowAlg1::execute()
ATH_MSG_INFO("store [" << outputData.store() << "]");
ATH_MSG_INFO("clid: [" << outputData.clid() << "]");
- outputData.record( CxxUtils::make_unique< int >( seedData ) );
+ outputData.record( std::make_unique< int >( seedData ) );
//redundant check as op = would throw if outputData was not valid (e.g. because if clid/key combo was duplicated)
if ( outputData.isValid() )
diff --git a/Control/AthViews/src_dflow/DFlowAlg2.cxx b/Control/AthViews/src_dflow/DFlowAlg2.cxx
index f800c38282ef3229f478aba7d708c1344b14d4bd..ffd59dcafd659e4286d20f586e49e01158a69d7d 100644
--- a/Control/AthViews/src_dflow/DFlowAlg2.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg2.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// DFlowAlg2.cxx
@@ -16,7 +16,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "CxxUtils/make_unique.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
#include "StoreGate/UpdateHandle.h"
@@ -94,7 +93,7 @@ StatusCode DFlowAlg2::execute()
SG::WriteHandle< std::vector< int > > outputHandle( m_ints, ctx );
ATH_MSG_INFO("ints w-handle...");
- outputHandle.record( CxxUtils::make_unique< std::vector< int > >() );
+ outputHandle.record( std::make_unique< std::vector< int > >() );
outputHandle->push_back( 10 );
if ( inputHandle.isValid() )
diff --git a/Control/AthViews/src_dflow/DFlowAlg3.cxx b/Control/AthViews/src_dflow/DFlowAlg3.cxx
index a60ad5276598c38677357f3fc106afd961fe0841..f47f8aa4c703a234271e9746b52ad88754546afc 100644
--- a/Control/AthViews/src_dflow/DFlowAlg3.cxx
+++ b/Control/AthViews/src_dflow/DFlowAlg3.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// DFlowAlg3.cxx
@@ -16,7 +16,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
-#include "CxxUtils/make_unique.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
#include "AthenaKernel/ExtendedEventContext.h"
@@ -167,7 +166,7 @@ StatusCode DFlowAlg3::execute()
//Dummy object to fix the data flow
SG::WriteHandle< int > outputHandle( m_w_dflowDummy, ctx );
- outputHandle.record( CxxUtils::make_unique<int>(1) );
+ outputHandle.record( std::make_unique<int>(1) );
// Test update handles
SG::ReadHandle< HiveDataObj > testUpdate( m_testUpdate, ctx );
diff --git a/Control/AthViews/src_dflow/ViewMergeAlg.cxx b/Control/AthViews/src_dflow/ViewMergeAlg.cxx
index 9e0e32e949fc7e2e15b1f4af606ea31ee055ec01..34d19e18781a3b3c33409b0ddf41f9d1f79f4569 100644
--- a/Control/AthViews/src_dflow/ViewMergeAlg.cxx
+++ b/Control/AthViews/src_dflow/ViewMergeAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// AthExStoreGateExample includes
@@ -12,7 +12,6 @@
#include "GaudiKernel/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
-#include "CxxUtils/make_unique.h"
namespace AthViews {
@@ -71,7 +70,7 @@ StatusCode ViewMergeAlg::execute()
//Output the merged data
SG::WriteHandle< std::vector< int > > outputHandle( m_w_ints, ctx );
- outputHandle.record( CxxUtils::make_unique< std::vector< int > >( outputVector ) );
+ outputHandle.record( std::make_unique< std::vector< int > >( outputVector ) );
if ( !outputHandle.isValid() )
{
ATH_MSG_INFO( "Unable to load main event store for output" );
diff --git a/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx b/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
index 93f99d5baac097a17d36a0dcaeec053c8615c4cb..8290d3743b59c93017072390065a5a7224250741 100644
--- a/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
+++ b/Control/AthViews/src_dflow/ViewSubgraphAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "ViewSubgraphAlg.h"
@@ -10,7 +10,6 @@
// FrameWork includes
#include "GaudiKernel/Property.h"
#include "StoreGate/WriteHandle.h"
-#include "CxxUtils/make_unique.h"
namespace AthViews {
diff --git a/Control/AthViews/test/test_view_scheduling.sh b/Control/AthViews/test/test_view_scheduling.sh
index a3513bef3afb6f83cbcb7c0907962e44d7f9b68b..72a36bfe851167d2b7cdeb4bcfb8363a7f81076d 100755
--- a/Control/AthViews/test/test_view_scheduling.sh
+++ b/Control/AthViews/test/test_view_scheduling.sh
@@ -4,9 +4,6 @@
# art-ci: master
athena.py --threads=1 AthViews/ViewScheduling.py | tee ViewScheduling_ath.log
-if grep "INFO condTestAlg running with store view_1" ViewScheduling_ath.log; then
- exit 1
-fi
if ! grep "INFO condTestAlg running with store view_0" ViewScheduling_ath.log; then
exit 1
fi
diff --git a/Control/AthenaCommon/python/ChapPy.py b/Control/AthenaCommon/python/ChapPy.py
index fa1998309145cb0c81f87dc94425cd6fe140c2bc..f225cbac12f36b4cd7110954de65c7b8e65650dc 100755
--- a/Control/AthenaCommon/python/ChapPy.py
+++ b/Control/AthenaCommon/python/ChapPy.py
@@ -23,6 +23,7 @@ import os
import subprocess
import time
import types
+from past.builtins import basestring
def dump( buf, stdout = sys.stdout ):
"""
@@ -287,7 +288,7 @@ class AthenaApp(object):
def __lshift__(self, o):
if isinstance(o, str):
import textwrap
- self._jobo.write(textwrap.dedent(o))
+ self._jobo.write(textwrap.dedent(o).encode())
self._jobo.flush()
return
raise TypeError('unexpected type %s'%type(o))
diff --git a/Control/AthenaCommon/test/ConfigurableUnitTests.py b/Control/AthenaCommon/test/ConfigurableUnitTests.py
index 0144ab2dcfbd8081ded670b49ef586ab2da95bc8..04fe8564a8554f2d269605309161163844c97902 100755
--- a/Control/AthenaCommon/test/ConfigurableUnitTests.py
+++ b/Control/AthenaCommon/test/ConfigurableUnitTests.py
@@ -162,10 +162,10 @@ class ConfigurablePersistencyTestCase( unittest.TestCase ):
## which is why I've added the MacOSX-specific hack.
from sys import platform
if platform != 'darwin' :
- self.failUnless(os.path.exists(pickleName))
+ self.assertTrue(os.path.exists(pickleName))
else:
- self.failUnless(os.path.exists(pickleName+'.db'))
- self.failUnless(os.path.exists(asciiFileName+'.ref'))
+ self.assertTrue(os.path.exists(pickleName+'.db'))
+ self.assertTrue(os.path.exists(asciiFileName+'.ref'))
## load what we have stored...
from AthenaCommon.ConfigurationShelve import loadFromPickle
@@ -173,15 +173,15 @@ class ConfigurablePersistencyTestCase( unittest.TestCase ):
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
- self.failUnless(hasattr(topSequence, 'MyOutputStream'),
+ self.assertTrue(hasattr(topSequence, 'MyOutputStream'),
"topSequence is missing 'MyOutputStream' !")
- self.failUnless(hasattr(topSequence, 'MyConditionStream' ),
+ self.assertTrue(hasattr(topSequence, 'MyConditionStream' ),
"topSequence is missing 'MyConditionStream' !")
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- self.failUnless(hasattr(svcMgr, 'MyTHistSvc'),
+ self.assertTrue(hasattr(svcMgr, 'MyTHistSvc'),
"svcMgr is missing 'MyTHistSvc' !")
- self.failUnless(svcMgr.MyTHistSvc.Output == thistSvcOutput)
+ self.assertTrue(svcMgr.MyTHistSvc.Output == thistSvcOutput)
## create a job loading the pickle
job = """
@@ -222,7 +222,7 @@ class ConfigurablePersistencyTestCase( unittest.TestCase ):
del jobO
## check needed files have been produced
- self.failUnless(os.path.exists(asciiFileName))
+ self.assertTrue(os.path.exists(asciiFileName))
## test hysteresis...
cmd = 'diff -u %s.ref %s' % (asciiFileName, asciiFileName)
@@ -299,9 +299,9 @@ class ConfigurablePersistencyTestCase( unittest.TestCase ):
## which is why I've added the MacOSX-specific hack.
from sys import platform
if platform != 'darwin' :
- self.failUnless(os.path.exists(pickleName))
+ self.assertTrue(os.path.exists(pickleName))
else:
- self.failUnless(os.path.exists(pickleName+'.db'))
+ self.assertTrue(os.path.exists(pickleName+'.db'))
## create a job loading the pickle (smallCfg)
job = """
diff --git a/Control/AthenaCommon/test/JobOptionsUnitTests.py b/Control/AthenaCommon/test/JobOptionsUnitTests.py
index ac96fe01390bef62427f35f4c86121148b8efd0f..ccb7674bbf30422f5fc9256b76eb34cca73f30b9 100755
--- a/Control/AthenaCommon/test/JobOptionsUnitTests.py
+++ b/Control/AthenaCommon/test/JobOptionsUnitTests.py
@@ -92,7 +92,7 @@ class BasicConfigurableWorkingsTestCase( unittest.TestCase ):
exec ('del seq.%s' % name)
seq.setup()
- self.assert_( name not in JobOptionsSvc.getClients() )
+ self.assertTrue( name not in JobOptionsSvc.getClients() )
del HelloWorld
@@ -150,30 +150,30 @@ class BasicJobOptionsTestCase( JobOptionsTestBase ):
HelloWorld.setup()
self.assertEqual( HelloWorld.MyInt, 42 )
- self.assert_( JobOptionsSvc.verify( 'HelloWorld', 'MyInt', '42' ) )
+ self.assertTrue( JobOptionsSvc.verify( 'HelloWorld', 'MyInt', '42' ) )
self.assertEqual( HelloWorld.MyBool, True )
- self.assert_( JobOptionsSvc.verify( 'HelloWorld', 'MyBool', 'True' ) )
+ self.assertTrue( JobOptionsSvc.verify( 'HelloWorld', 'MyBool', 'True' ) )
self.assertEqual( round( HelloWorld.MyDouble - 3.14159, 8 ), 0. )
- self.assert_( JobOptionsSvc.verify( 'HelloWorld', 'MyDouble', '3.14159' ) )
+ self.assertTrue( JobOptionsSvc.verify( 'HelloWorld', 'MyDouble', '3.14159' ) )
# the following may be too sensitive to non-consequential changes in formatting
self.assertEqual( HelloWorld.MyStringVec,
[ "Welcome", "to", "Athena", "Framework", "Tutorial", "!" ] )
- self.assert_( JobOptionsSvc.verify( 'HelloWorld', 'MyStringVec',
+ self.assertTrue( JobOptionsSvc.verify( 'HelloWorld', 'MyStringVec',
"['Welcome', 'to', 'Athena', 'Framework', 'Tutorial', '!']" ) )
self.assertEqual( HelloWorld.MyDict,
{'Bonjour': 'Guten Tag', 'one': 'uno', 'Goeiedag': 'Ni Hao', 'Good Morning': 'Bonjour'} )
- self.assert_( JobOptionsSvc.verify( 'HelloWorld', 'MyDict',
+ self.assertTrue( JobOptionsSvc.verify( 'HelloWorld', 'MyDict',
{'Bonjour': 'Guten Tag', 'one': 'uno', 'Goeiedag': 'Ni Hao', 'Good Morning': 'Bonjour'} ) )
self.assertEqual( HelloWorld.MyTable, [(1, 1), (2, 4), (3, 9), (4, 16)] )
- self.assert_( JobOptionsSvc.verify( 'HelloWorld', 'MyTable',
+ self.assertTrue( JobOptionsSvc.verify( 'HelloWorld', 'MyTable',
"[(1, 1), (2, 4), (3, 9), (4, 16)]" ) )
self.assertEqual( HelloWorld.MyMatrix, [[1, 2, 3], [4, 5, 6], [7, 8, 9]] )
- self.assert_( JobOptionsSvc.verify( 'HelloWorld', 'MyMatrix',
+ self.assertTrue( JobOptionsSvc.verify( 'HelloWorld', 'MyMatrix',
"[[1, 2, 3], [4, 5, 6], [7, 8, 9]]" ) )
def test2SetToolProperties( self ):
@@ -202,10 +202,10 @@ class BasicJobOptionsTestCase( JobOptionsTestBase ):
self.assertEqual( HelloWorld.MyPrivateHelloTool.MyMessage, msg1 )
client = HelloWorld.getName() + '.' + HelloWorld.MyPrivateHelloTool.getName()
- self.assert_( JobOptionsSvc.verify( client, 'MyMessage', msg1 ) )
+ self.assertTrue( JobOptionsSvc.verify( client, 'MyMessage', msg1 ) )
self.assertEqual( ToolSvc.PublicHello.MyMessage, msg2 )
- self.assert_( JobOptionsSvc.verify( 'ToolSvc.PublicHello', 'MyMessage', msg2 ) )
+ self.assertTrue( JobOptionsSvc.verify( 'ToolSvc.PublicHello', 'MyMessage', msg2 ) )
def test3SetAuditorProperties( self ):
"""Test setting of Auditor properties"""
@@ -217,15 +217,15 @@ class BasicJobOptionsTestCase( JobOptionsTestBase ):
import AthenaCommon.AtlasUnixStandardJob
theAuditorSvc += NameAuditor()
- self.assert_( theAuditorSvc.NameAuditor.getFullName()\
+ self.assertTrue( theAuditorSvc.NameAuditor.getFullName()\
in ServiceMgr.AuditorSvc.Auditors )
theAuditorSvc.NameAuditor.OutputLevel = FATAL
theAuditorSvc.setup()
- self.assert_( JobOptionsSvc.verify( 'AuditorSvc', 'Auditors', str(theAuditorSvc.Auditors) ) )
- self.assert_( JobOptionsSvc.verify( 'NameAuditor', 'OutputLevel', str(FATAL) ) )
+ self.assertTrue( JobOptionsSvc.verify( 'AuditorSvc', 'Auditors', str(theAuditorSvc.Auditors) ) )
+ self.assertTrue( JobOptionsSvc.verify( 'NameAuditor', 'OutputLevel', str(FATAL) ) )
## actual test run
diff --git a/Control/AthenaCommon/test/KeyStoreUnitTests.py b/Control/AthenaCommon/test/KeyStoreUnitTests.py
index 87ef0921305eb49b67e0728b79436df8f500dbed..c4ffa3547bd250f6ebb3789738dffcc4cdcb0f4f 100755
--- a/Control/AthenaCommon/test/KeyStoreUnitTests.py
+++ b/Control/AthenaCommon/test/KeyStoreUnitTests.py
@@ -31,8 +31,8 @@ class BasicCfgItemListTestCase( unittest.TestCase ):
i1 = CfgItemList( "MyItems" )
i2 = CfgItemList( "MyItems" )
- self.failUnless( i1 == i2, "instances are not equal !" )
- self.failUnless( i1 is i2, "instances are not identical !" )
+ self.assertTrue( i1 == i2, "instances are not equal !" )
+ self.assertTrue( i1 is i2, "instances are not identical !" )
def test2KwConstructor( self ):
"""Test keyword constructor"""
@@ -40,25 +40,25 @@ class BasicCfgItemListTestCase( unittest.TestCase ):
items = [ 'Klass1#klass1',
'Klass2#klass2', ],
allowWildCard = False )
- self.failUnless( i.has_item( 'Klass1#klass1' ),
+ self.assertTrue( i.has_item( 'Klass1#klass1' ),
'Corrupted output item list !' )
- self.failUnless( i.has_item( 'Klass2#klass2' ),
+ self.assertTrue( i.has_item( 'Klass2#klass2' ),
'Corrupted output item list !' )
- self.failUnless( i.has_item( 'Klass1#*' ),
+ self.assertTrue( i.has_item( 'Klass1#*' ),
'Corrupted output item list !' )
- self.failUnless( i.has_item( 'Klass2#*' ),
+ self.assertTrue( i.has_item( 'Klass2#*' ),
'Corrupted output item list !' )
- self.failUnless( i.has_item( 'Klass1#klass*' ),
+ self.assertTrue( i.has_item( 'Klass1#klass*' ),
'Corrupted output item list !' )
- self.failUnless( i.has_item( 'Klass2#klass*' ),
+ self.assertTrue( i.has_item( 'Klass2#klass*' ),
'Corrupted output item list !' )
- self.failUnless( not i.has_item( 'Klass1#klass2' ),
+ self.assertTrue( not i.has_item( 'Klass1#klass2' ),
'Corrupted output item list !' )
- self.failUnless( not i.has_item( 'Klass2#klass1' ),
+ self.assertTrue( not i.has_item( 'Klass2#klass1' ),
'Corrupted output item list !' )
- self.failUnless( i._allowWildCard == False,
+ self.assertTrue( i._allowWildCard == False,
'Invalid "allowWildCard" state !' )
- self.failUnless( i() == [ 'Klass1#klass1', 'Klass2#klass2', ],
+ self.assertTrue( i() == [ 'Klass1#klass1', 'Klass2#klass2', ],
'Invalid output item list value !' )
del i
@@ -66,9 +66,9 @@ class BasicCfgItemListTestCase( unittest.TestCase ):
items = [ 'Klass3#klass3',
'Klass4#klass4', ],
allowWildCard = True )
- self.failUnless( i._allowWildCard == True,
+ self.assertTrue( i._allowWildCard == True,
'Invalid "allowWildCard" state !' )
- self.failUnless( i() == [ 'Klass3#klass3', 'Klass4#klass4', ],
+ self.assertTrue( i() == [ 'Klass3#klass3', 'Klass4#klass4', ],
'Invalid output item list value !' )
del i
@@ -76,16 +76,16 @@ class BasicCfgItemListTestCase( unittest.TestCase ):
i = CfgItemList( 'MyItems',
items = [ 'Klass3#*' ],
allowWildCard = False )
- self.failUnless( len(i()) == 0, "AllowWildCard does not work !" )
+ self.assertTrue( len(i()) == 0, "AllowWildCard does not work !" )
del i
i = CfgItemList( 'MyItems', items = [ 'Klass3#*' ] )
- self.failUnless( len(i()) == 0, "AllowWildCard does not work !" )
+ self.assertTrue( len(i()) == 0, "AllowWildCard does not work !" )
del i
i = CfgItemList( 'MyItems' )
i.add( 'Klass3#*' )
- self.failUnless( len(i()) == 0, "AllowWildCard does not work !" )
+ self.assertTrue( len(i()) == 0, "AllowWildCard does not work !" )
def test3Hierarchy( self ):
"""Test tree-like hierarchy structure of item lists"""
@@ -98,142 +98,142 @@ class BasicCfgItemListTestCase( unittest.TestCase ):
'Klass4#klass4',
'Klass5#klass5',
'Klass6#klass6' ] )
- self.failUnless( len(i()) == 2,
+ self.assertTrue( len(i()) == 2,
"Invalid output item list !!" )
- self.failUnless( len(ii()) == 4,
+ self.assertTrue( len(ii()) == 4,
"Invalid output item list !!" )
i += ii
- self.failUnless( len(i()) == 6,
+ self.assertTrue( len(i()) == 6,
"Invalid output item list !!" )
- self.failUnless( hasattr(i, ii.name()),
+ self.assertTrue( hasattr(i, ii.name()),
'Invalid hierarchy structure !!' )
oo = getattr(i, ii.name())
- self.failUnless( oo == ii,
+ self.assertTrue( oo == ii,
'Invalid hierarchy structure !!' )
- self.failUnless( oo is ii,
+ self.assertTrue( oo is ii,
'Invalid hierarchy structure !!' )
- self.failUnless( len(oo()) == 4,
+ self.assertTrue( len(oo()) == 4,
"Invalid output item list !!" )
del ii
ii = CfgItemList( 'MySubItems' )
- self.failUnless( len(ii()) == 4,
+ self.assertTrue( len(ii()) == 4,
"Invalid output item list !!" )
del i,ii
i = CfgItemList( 'MyItems' )
ii = CfgItemList( 'MySubItems' )
- self.failUnless( len( i()) == 0, "Invalid output item list !!" )
- self.failUnless( len(ii()) == 4, "Invalid output item list !!" )
+ self.assertTrue( len( i()) == 0, "Invalid output item list !!" )
+ self.assertTrue( len(ii()) == 4, "Invalid output item list !!" )
del oo,ii
ii = CfgItemList( 'MySubItems' )
- self.failUnless( len(ii()) == 0, "Invalid output item list !!" )
+ self.assertTrue( len(ii()) == 0, "Invalid output item list !!" )
def test4Methods( self ):
"""Test various methods of CfgItemList"""
i = CfgItemList( 'MyItems' )
- self.failUnless( i.name() == 'MyItems' )
+ self.assertTrue( i.name() == 'MyItems' )
i.add( { 'Klass' : ['key1', 'key2'] } )
- self.failUnless( i() == [ 'Klass#key1', 'Klass#key2' ] )
+ self.assertTrue( i() == [ 'Klass#key1', 'Klass#key2' ] )
i.add( { 'Klass' : ['key1', 'key3' ] } )
- self.failUnless( i() == [ 'Klass#key1', 'Klass#key2', 'Klass#key3' ] )
+ self.assertTrue( i() == [ 'Klass#key1', 'Klass#key2', 'Klass#key3' ] )
props = i.getProperties()
- self.failUnless( 'Klass' in props )
- self.failUnless( len(props['Klass']) == len(['key1','key2','key3']) )
- self.failUnless( 'key1' in props['Klass'] )
- self.failUnless( 'key2' in props['Klass'] )
- self.failUnless( 'key3' in props['Klass'] )
+ self.assertTrue( 'Klass' in props )
+ self.assertTrue( len(props['Klass']) == len(['key1','key2','key3']) )
+ self.assertTrue( 'key1' in props['Klass'] )
+ self.assertTrue( 'key2' in props['Klass'] )
+ self.assertTrue( 'key3' in props['Klass'] )
- self.failUnless( len(i.allChildren()) == 0 )
+ self.assertTrue( len(i.allChildren()) == 0 )
- self.failUnless( i.has_item( 'Klass#key1' ) )
- self.failUnless( i.has_item( 'Klass#key*' ) )
- self.failUnless( not i.has_item( 'Klass#Key1' ) )
- self.failUnless( not i.has_item( 'Klass#Key*' ) )
+ self.assertTrue( i.has_item( 'Klass#key1' ) )
+ self.assertTrue( i.has_item( 'Klass#key*' ) )
+ self.assertTrue( not i.has_item( 'Klass#Key1' ) )
+ self.assertTrue( not i.has_item( 'Klass#Key*' ) )
i.clear()
- self.failUnless( len(i()) == 0 )
+ self.assertTrue( len(i()) == 0 )
i.add( { 'Klass' : ['key1', 'key2'] } )
- self.failUnless( len(i()) == 2 )
+ self.assertTrue( len(i()) == 2 )
i.remove( 'Klass' )
- self.failUnless( len(i()) == 2 )
+ self.assertTrue( len(i()) == 2 )
i.remove( 'Klass#key1' )
- self.failUnless( len(i()) == 2 )
+ self.assertTrue( len(i()) == 2 )
i.removeAll()
- self.failUnless( len(i()) == 2 )
+ self.assertTrue( len(i()) == 2 )
i.removeItem( 'Klass' )
- self.failUnless( len(i()) == 2 )
+ self.assertTrue( len(i()) == 2 )
i.removeItem( 'Klass#key1' )
- self.failUnless( len(i()) == 1 )
+ self.assertTrue( len(i()) == 1 )
_keys = ['key1', 'key2', 'key3']
i.add( { 'Klass' : _keys } )
- self.failUnless( len(i()) == 3 )
+ self.assertTrue( len(i()) == 3 )
i.removeAllItems( 'Klass#key2' )
- self.failUnless( len(i()) == 2 )
+ self.assertTrue( len(i()) == 2 )
## test we don't modify input dict
d = { 'Klassy' : ['key1', 'key2', 'key3'] }
orig_d = d.copy()
i.add( d )
- self.failUnless( d == orig_d )
+ self.assertTrue( d == orig_d )
d = { 'Klassy' : 'key4' }
orig_d = d.copy()
i.add( d )
- self.failUnless( d == orig_d )
+ self.assertTrue( d == orig_d )
## test extraction of the item list of a given Container type
_keys = [ "Klassy#%s" % k for k in ('key1', 'key2', 'key3', 'key4') ]
- self.failUnless( i( "Klassy" ) == _keys )
- self.failUnless( i.list( "Klassy" ) == _keys )
- self.failUnless( i( key = "Klassy" ) == _keys )
- self.failUnless( i.list( key = "Klassy" ) == _keys )
+ self.assertTrue( i( "Klassy" ) == _keys )
+ self.assertTrue( i.list( "Klassy" ) == _keys )
+ self.assertTrue( i( key = "Klassy" ) == _keys )
+ self.assertTrue( i.list( key = "Klassy" ) == _keys )
## test dict()
_keys = [ 'key1', 'key2', 'key3', 'key4' ]
- self.failUnless( i.dict()['Klass' ] == ['key1', 'key3'] )
- self.failUnless( i.dict()['Klassy'] == _keys )
+ self.assertTrue( i.dict()['Klass' ] == ['key1', 'key3'] )
+ self.assertTrue( i.dict()['Klassy'] == _keys )
_dict = { 'Klass' : ['key1', 'key3'],
'Klassy': ['key1', 'key2', 'key3', 'key4']}
- self.failUnless( i.dict() == _dict )
+ self.assertTrue( i.dict() == _dict )
def test5WildCard( self ):
"""Test the wildcard capabilities of CfgItemList"""
i = CfgItemList( 'MyItems' )
- self.failUnless( i.name() == 'MyItems' )
+ self.assertTrue( i.name() == 'MyItems' )
## test wildcard
i.add( "Klass#Foo" )
- self.failUnless( i("Klass") == ["Klass#Foo"] )
+ self.assertTrue( i("Klass") == ["Klass#Foo"] )
# ignored as not allowing wildcarded items
i.add( "Klass#*" )
- self.failUnless( i("Klass") == ["Klass#Foo"] )
+ self.assertTrue( i("Klass") == ["Klass#Foo"] )
# allowed as special cases for trigger
i.clear()
i.add( "TrigKlass#HLTAutoKey*" )
- self.failUnless( i("TrigKlass") == ["TrigKlass#HLTAutoKey*"] )
+ self.assertTrue( i("TrigKlass") == ["TrigKlass#HLTAutoKey*"] )
i.clear()
i.add( "TrigKlass#HLTAutoKey_*" )
- self.failUnless( i("TrigKlass") == ["TrigKlass#HLTAutoKey_*"] )
+ self.assertTrue( i("TrigKlass") == ["TrigKlass#HLTAutoKey_*"] )
i.clear()
i.add( "TrigKlass#HLTAutoKey_foo_*" )
- self.failUnless( i("TrigKlass") == ["TrigKlass#HLTAutoKey_foo_*"] )
+ self.assertTrue( i("TrigKlass") == ["TrigKlass#HLTAutoKey_foo_*"] )
i.clear()
i.add( "TrigKlass#HLTAutoKey_foo_42_*" )
- self.failUnless( i("TrigKlass") == ["TrigKlass#HLTAutoKey_foo_42_*"] )
+ self.assertTrue( i("TrigKlass") == ["TrigKlass#HLTAutoKey_foo_42_*"] )
### basic behaviour of CfgKeyStore -------------------------------------------
class BasicCfgKeyStoreTestCase( unittest.TestCase ):
@@ -241,168 +241,168 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
def test1NamedSingleton( self ):
"""Test that instances w/ same name are the same"""
- self.failUnless( len(list(CfgKeyStore.instances.keys())) == 0 )
- self.failUnless( len(list(CfgItemList.instances.keys())) == 0 )
+ self.assertTrue( len(list(CfgKeyStore.instances.keys())) == 0 )
+ self.assertTrue( len(list(CfgItemList.instances.keys())) == 0 )
i1 = CfgKeyStore( "MyStore" )
i2 = CfgKeyStore( "MyStore" )
- self.failUnless( i1 == i2 )
- self.failUnless( i1 is i2 )
- self.failUnless( i1 != CfgKeyStore( "mystore" ) )
- self.failUnless( i1 is not CfgKeyStore( "mystore" ) )
+ self.assertTrue( i1 == i2 )
+ self.assertTrue( i1 is i2 )
+ self.assertTrue( i1 != CfgKeyStore( "mystore" ) )
+ self.assertTrue( i1 is not CfgKeyStore( "mystore" ) )
- self.failUnless( len(list(CfgKeyStore.instances.keys())) == 1 )
- self.failUnless( len(list(CfgItemList.instances.keys())) ==
+ self.assertTrue( len(list(CfgKeyStore.instances.keys())) == 1 )
+ self.assertTrue( len(list(CfgItemList.instances.keys())) ==
len(CfgKeyStore.__slots__['Labels'])+1 )
del i1
- self.failUnless( len(list(CfgKeyStore.instances.keys())) == 1 )
- self.failUnless( len(list(CfgItemList.instances.keys())) ==
+ self.assertTrue( len(list(CfgKeyStore.instances.keys())) == 1 )
+ self.assertTrue( len(list(CfgItemList.instances.keys())) ==
len(CfgKeyStore.__slots__['Labels'])+1 )
del i2
- self.failUnless( len(list(CfgKeyStore.instances.keys())) == 0 )
- self.failUnless( len(list(CfgItemList.instances.keys())) == 0 )
+ self.assertTrue( len(list(CfgKeyStore.instances.keys())) == 0 )
+ self.assertTrue( len(list(CfgItemList.instances.keys())) == 0 )
def test2Constructor( self ):
"""Test constructor"""
ks = CfgKeyStore( "MyStore" )
- self.failUnless( ks.name() == "MyStore" )
- self.failUnless( len(ks.keys()) == len(ks._items)+4 )
+ self.assertTrue( ks.name() == "MyStore" )
+ self.assertTrue( len(ks.keys()) == len(ks._items)+4 )
for label in ks.keys():
if label == 'transient': n = 4 # nbr of streamXyz
else : n = 0
- self.failUnless( len(ks[label]) == n )
- self.failUnless( len(ks[label].list()) == 0 )
- self.failUnless( hasattr(ks, label) )
+ self.assertTrue( len(ks[label]) == n )
+ self.assertTrue( len(ks[label].list()) == 0 )
+ self.assertTrue( hasattr(ks, label) )
ks.streamAOD.add( { 'Klass' : 'key1' } )
- self.failUnless( ks.streamAOD() == [ 'Klass#key1' ] )
+ self.assertTrue( ks.streamAOD() == [ 'Klass#key1' ] )
del ks
ks = CfgKeyStore( "MyStore" )
- self.failUnless( ks.streamAOD() == [] )
+ self.assertTrue( ks.streamAOD() == [] )
pass
def test3Methods( self ):
"""Test various methods of CfgKeyStore"""
ks = CfgKeyStore( "MyStore" )
- self.failUnless( ks.streamESD() == [] )
- self.failUnless( ks['streamESD']() == [] )
+ self.assertTrue( ks.streamESD() == [] )
+ self.assertTrue( ks['streamESD']() == [] )
ks.streamESD.add( {
'McEventCollection' : [ 'GEN_EVENT', 'GEN_AOD', 'TruthEvent' ],
} )
- self.failUnless( len(ks.streamESD()) == 3 )
- self.failUnless( len(ks.transient()) == 3 )
- self.failUnless(ks.streamESD.has_item('McEventCollection#TruthEvent'))
- self.failUnless(not ks.streamESD.has_item('McEventCollection#gen_aod'))
+ self.assertTrue( len(ks.streamESD()) == 3 )
+ self.assertTrue( len(ks.transient()) == 3 )
+ self.assertTrue(ks.streamESD.has_item('McEventCollection#TruthEvent'))
+ self.assertTrue(not ks.streamESD.has_item('McEventCollection#gen_aod'))
ks.streamAOD += CfgItemList( 'subAod',
items = [ 'Klass#key1', 'Klass#key2' ] )
- self.failUnless( len(ks.streamAOD()) == 2 )
- self.failUnless( len(ks.transient()) == 5 )
+ self.assertTrue( len(ks.streamAOD()) == 2 )
+ self.assertTrue( len(ks.transient()) == 5 )
ks.streamESD.add( {
'JetCollection' : [ 'Cone4Jets', 'Cone7Jets', 'KtJets',
'Cone4TruthJets' ],
} )
- self.failUnless( len(ks.streamESD()) == 3+4 )
- self.failUnless( len(ks.streamESD.dict().keys()) == 2 )
- self.failUnless( len(ks.transient.dict().keys()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 3+4 )
+ self.assertTrue( len(ks.streamESD.dict().keys()) == 2 )
+ self.assertTrue( len(ks.transient.dict().keys()) == 3 )
ks.streamESD.add( {
'JetCollection' : [ 'Cone4Jets', 'Cone7Jets', 'KtJets' ] } )
- self.failUnless( len(ks.streamESD()) == 3+4 )
- self.failUnless( len(ks.streamESD.dict().keys()) == 2 )
- self.failUnless( len(ks.transient.dict().keys()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 3+4 )
+ self.assertTrue( len(ks.streamESD.dict().keys()) == 2 )
+ self.assertTrue( len(ks.transient.dict().keys()) == 3 )
ks.streamAOD.add( 'ParticleJetContainer#ConeTowerParticleJets' )
- self.failUnless( len(ks.streamAOD()) == 3 )
- self.failUnless( len(ks.streamAOD.dict().keys()) == 2 )
- self.failUnless( len(ks.transient.dict().keys()) == 4 )
+ self.assertTrue( len(ks.streamAOD()) == 3 )
+ self.assertTrue( len(ks.streamAOD.dict().keys()) == 2 )
+ self.assertTrue( len(ks.transient.dict().keys()) == 4 )
ks.streamAOD.add( ['ParticleJetContainer#ConeTowerParticleJets'] )
- self.failUnless( len(ks.streamAOD()) == 3 )
- self.failUnless( len(ks.streamAOD.dict().keys()) == 2 )
- self.failUnless( len(ks.transient.dict().keys()) == 4 )
+ self.assertTrue( len(ks.streamAOD()) == 3 )
+ self.assertTrue( len(ks.streamAOD.dict().keys()) == 2 )
+ self.assertTrue( len(ks.transient.dict().keys()) == 4 )
ks.streamAOD.add( ['ParticleJetContainer#Cone4TowerParticleJets'] )
- self.failUnless( len(ks.streamAOD()) == 4 )
- self.failUnless( len(ks.streamAOD.dict().keys()) == 2 )
- self.failUnless( len(ks.transient.dict().keys()) == 4 )
+ self.assertTrue( len(ks.streamAOD()) == 4 )
+ self.assertTrue( len(ks.streamAOD.dict().keys()) == 2 )
+ self.assertTrue( len(ks.transient.dict().keys()) == 4 )
caught = False
try:
ks['unallowedKey'] = range(10)
except KeyError as err:
caught = True
- self.failUnless( caught )
+ self.assertTrue( caught )
caught = False
try: dummy = ks['unallowedKey']
except KeyError as err: caught = True
- self.failUnless( caught )
+ self.assertTrue( caught )
caught = False
try: dummy = ks['streamAOD']
except KeyError as err: caught = True
- self.failUnless( not caught )
+ self.assertTrue( not caught )
del dummy
## test reset...
ks.streamTAG.add( 'JetCollection#Tag_Cone4Jets' )
- self.failUnless( len(ks.streamTAG()) == 1 )
+ self.assertTrue( len(ks.streamTAG()) == 1 )
ks.streamTAG.clear()
- self.failUnless( len(ks.streamTAG()) == 0 )
+ self.assertTrue( len(ks.streamTAG()) == 0 )
- self.failUnless( len(ks.streamAOD.dict().keys()) == 2 )
- self.failUnless( len(ks.transient.dict().keys()) == 4 )
+ self.assertTrue( len(ks.streamAOD.dict().keys()) == 2 )
+ self.assertTrue( len(ks.transient.dict().keys()) == 4 )
ks.transient.clear()
- self.failUnless( len(ks.transient.dict().keys()) == 0 )
+ self.assertTrue( len(ks.transient.dict().keys()) == 0 )
## might be a bit confusing but 'clear' also removes children
caught = False
try: dummy = ks.streamAOD
except AttributeError as err: caught = True
- self.failUnless( caught )
+ self.assertTrue( caught )
- self.failUnless( len(list(CfgKeyStore.instances.keys())) == 1 )
+ self.assertTrue( len(list(CfgKeyStore.instances.keys())) == 1 )
del ks
## FIXME
## ARGH!!! Somebody is keeping a ref toward ks!
## OK with py3
if six.PY3:
- self.failUnless( len(list(CfgKeyStore.instances.keys())) == 0 )
+ self.assertTrue( len(list(CfgKeyStore.instances.keys())) == 0 )
## ks = CfgKeyStore( "MyStore" )
-## self.failUnless( ks.streamESD() == [] )
-## self.failUnless( ks['streamESD']() == [] )
+## self.assertTrue( ks.streamESD() == [] )
+## self.assertTrue( ks['streamESD']() == [] )
## ks.streamESD.add( {
## 'McEventCollection' : [ 'GEN_EVENT', 'GEN_AOD', 'TruthEvent' ],
## } )
-## self.failUnless( len(ks['streamESD']()) == 3 )
-## self.failUnless( len(ks.transient.dict().keys()) == 1 )
+## self.assertTrue( len(ks['streamESD']()) == 3 )
+## self.assertTrue( len(ks.transient.dict().keys()) == 1 )
## ks.transient.removeItem( 'McEventCollection#GEN_EVENT' )
-## self.failUnless( len(ks['streamESD']()) == 2 )
-## self.failUnless( len(ks.transient.dict().keys()) == 1 )
+## self.assertTrue( len(ks['streamESD']()) == 2 )
+## self.assertTrue( len(ks.transient.dict().keys()) == 1 )
def test4Persistency( self ):
"""Test persistency of CfgKeyStore"""
ks = CfgKeyStore( "MyStore" )
- self.failUnless( ks.streamESD() == [] )
- self.failUnless( ks.streamAOD() == [] )
- self.failUnless( ks.transient() == [] )
+ self.assertTrue( ks.streamESD() == [] )
+ self.assertTrue( ks.streamAOD() == [] )
+ self.assertTrue( ks.transient() == [] )
ks.streamESD.add( {
'McEventCollection' : [ 'GEN_EVENT', 'GEN_AOD', 'TruthEvent' ],
} )
- self.failUnless( len(ks.streamESD()) == 3 )
- self.failUnless( len(ks.streamAOD()) == 0 )
- self.failUnless( len(ks.transient()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 3 )
+ self.assertTrue( len(ks.streamAOD()) == 0 )
+ self.assertTrue( len(ks.transient()) == 3 )
import os
outFileName = 'esd_%s.py' % str(os.getpid())
@@ -410,48 +410,48 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
del ks
ks = CfgKeyStore( "MyStore" )
- self.failUnless( ks.streamESD() == [] )
- self.failUnless( ks.streamAOD() == [] )
- self.failUnless( ks.transient() == [] )
+ self.assertTrue( ks.streamESD() == [] )
+ self.assertTrue( ks.streamAOD() == [] )
+ self.assertTrue( ks.transient() == [] )
ks.read( outFileName, 'streamAOD' )
- self.failUnless( len(ks.streamESD()) == 0 )
- self.failUnless( len(ks.streamAOD()) == 3 )
- self.failUnless( len(ks.transient()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 0 )
+ self.assertTrue( len(ks.streamAOD()) == 3 )
+ self.assertTrue( len(ks.transient()) == 3 )
del ks
ks = CfgKeyStore( "MyStore" )
- self.failUnless( ks.streamESD() == [] )
- self.failUnless( ks.streamAOD() == [] )
- self.failUnless( ks.transient() == [] )
+ self.assertTrue( ks.streamESD() == [] )
+ self.assertTrue( ks.streamAOD() == [] )
+ self.assertTrue( ks.transient() == [] )
ks.read( outFileName, 'streamAOD' )
- self.failUnless( len(ks.streamESD()) == 0 )
- self.failUnless( len(ks.streamAOD()) == 3 )
- self.failUnless( len(ks.transient()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 0 )
+ self.assertTrue( len(ks.streamAOD()) == 3 )
+ self.assertTrue( len(ks.transient()) == 3 )
del ks
ks = CfgKeyStore( "MyStore" )
- self.failUnless( ks.streamESD() == [] )
- self.failUnless( ks.streamAOD() == [] )
- self.failUnless( ks.transient() == [] )
+ self.assertTrue( ks.streamESD() == [] )
+ self.assertTrue( ks.streamAOD() == [] )
+ self.assertTrue( ks.transient() == [] )
ks.read( outFileName, 'streamESD' )
- self.failUnless( len(ks.streamESD()) == 3 )
- self.failUnless( len(ks.streamAOD()) == 0 )
- self.failUnless( len(ks.transient()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 3 )
+ self.assertTrue( len(ks.streamAOD()) == 0 )
+ self.assertTrue( len(ks.transient()) == 3 )
del ks
ks = CfgKeyStore( "MyStore" )
- self.failUnless( ks.streamESD() == [] )
- self.failUnless( ks.streamAOD() == [] )
- self.failUnless( ks.transient() == [] )
+ self.assertTrue( ks.streamESD() == [] )
+ self.assertTrue( ks.streamAOD() == [] )
+ self.assertTrue( ks.transient() == [] )
ks.read( outFileName, 'streamESD' )
ks.read( outFileName, 'streamAOD' )
- self.failUnless( len(ks.streamESD()) == 3 )
- self.failUnless( len(ks.streamAOD()) == 3 )
- self.failUnless( len(ks.transient()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 3 )
+ self.assertTrue( len(ks.streamAOD()) == 3 )
+ self.assertTrue( len(ks.transient()) == 3 )
os.remove( outFileName )
try:
@@ -467,9 +467,9 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
ks.streamESD.add( {
'McEventCollection' : [ 'GEN_EVENT', 'GEN_AOD', 'TruthEvent' ],
} )
- self.failUnless( len(ks.streamESD()) == 3 )
- self.failUnless( len(ks.streamAOD()) == 0 )
- self.failUnless( len(ks.transient()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 3 )
+ self.assertTrue( len(ks.streamAOD()) == 0 )
+ self.assertTrue( len(ks.transient()) == 3 )
print ('outFileName:',outFileName)
db = shelve.open( outFileName, 'c' )
@@ -481,9 +481,9 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
ks = db['store']
db.close()
- self.failUnless( len(ks.streamESD()) == 3 )
- self.failUnless( len(ks.streamAOD()) == 0 )
- self.failUnless( len(ks.transient()) == 3 )
+ self.assertTrue( len(ks.streamESD()) == 3 )
+ self.assertTrue( len(ks.streamAOD()) == 0 )
+ self.assertTrue( len(ks.transient()) == 3 )
## MacOSX silently appends the .db suffix to shelve files. I haven't found a
## mechanism for determining the actual filename, which is why I've added the
## MacOSX-specific hack.
@@ -522,8 +522,8 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
'ParticleJetContainer#AtlfastParticleJetContainer',
'PhotonContainer#AtlfastPhotonCollection',
'TruthParticleContainer#SpclMC']
- self.failUnless(sorted(ks.inputFile()) == sorted(pool_file_content))
- self.failUnless(len(ks.inputFile.dict().keys()) == 11)
+ self.assertTrue(sorted(ks.inputFile()) == sorted(pool_file_content))
+ self.assertTrue(len(ks.inputFile.dict().keys()) == 11)
del ks
return
@@ -534,28 +534,28 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
# reference
ref = CfgKeyStore( "ref" )
- self.failUnless( ref.streamESD() == [] )
- self.failUnless( ref.streamAOD() == [] )
- self.failUnless( ref.transient() == [] )
+ self.assertTrue( ref.streamESD() == [] )
+ self.assertTrue( ref.streamAOD() == [] )
+ self.assertTrue( ref.transient() == [] )
ref.streamESD.add( {
'McEvent' : [ 'GEN_EVENT', 'GEN_AOD', 'TruthEvent' ],
'NoEvent' : [ 'GEN_EVENT', 'GEN_AOD', 'TruthEvent' ],
} )
- self.failUnless( len(ref.streamESD()) == 6 )
- self.failUnless( len(ref.streamAOD()) == 0 )
- self.failUnless( len(ref.transient()) == 6 )
+ self.assertTrue( len(ref.streamESD()) == 6 )
+ self.assertTrue( len(ref.streamAOD()) == 0 )
+ self.assertTrue( len(ref.transient()) == 6 )
# check
chk = CfgKeyStore( "chk" )
- self.failUnless( chk.streamESD() == [] )
- self.failUnless( chk.streamAOD() == [] )
- self.failUnless( chk.transient() == [] )
+ self.assertTrue( chk.streamESD() == [] )
+ self.assertTrue( chk.streamAOD() == [] )
+ self.assertTrue( chk.transient() == [] )
chk.streamESD.add( {
'NoEvent' : [ 'GEN_EVENT', 'TruthEvent' ],
} )
- self.failUnless( len(chk.streamESD()) == 2 )
- self.failUnless( len(chk.streamAOD()) == 0 )
- self.failUnless( len(chk.transient()) == 2 )
+ self.assertTrue( len(chk.streamESD()) == 2 )
+ self.assertTrue( len(chk.streamAOD()) == 0 )
+ self.assertTrue( len(chk.transient()) == 2 )
diff_ref = "".join ([
"- len(ref[streamESD]) == 6",
@@ -573,11 +573,11 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
otest1 = open (test1_fname, 'w')
atexit.register (os.unlink, test1_fname)
diff = keystore_diff (ref, chk, labels='streamESD', ofile=otest1)
- self.failUnless (diff==diff_ref)
- self.failUnless (os.path.exists (test1_fname))
+ self.assertTrue (diff==diff_ref)
+ self.assertTrue (os.path.exists (test1_fname))
diff = keystore_diff ("ref", "chk", labels='streamESD', ofile=otest1)
- self.failUnless (diff==diff_ref)
- self.failUnless (os.path.exists (test1_fname))
+ self.assertTrue (diff==diff_ref)
+ self.assertTrue (os.path.exists (test1_fname))
test2_fname = 'test2_%s.diff' % str(os.getpid())
@@ -599,20 +599,20 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
""
])
diff = keystore_diff (ref, chk, ofile=otest2)
- self.failUnless (diff==diff_ref)
- self.failUnless (os.path.exists (test2_fname))
+ self.assertTrue (diff==diff_ref)
+ self.assertTrue (os.path.exists (test2_fname))
diff = keystore_diff ("ref", "chk", ofile=otest2)
- self.failUnless (diff==diff_ref)
- self.failUnless (os.path.exists (test2_fname))
+ self.assertTrue (diff==diff_ref)
+ self.assertTrue (os.path.exists (test2_fname))
test3_fname = 'test3_%s.diff' % str(os.getpid())
otest3 = open (test3_fname, 'w')
atexit.register (os.unlink, test3_fname)
diff = keystore_diff (ref, ref, otest3)
- self.failUnless (diff=='')
- self.failUnless (os.path.exists (test3_fname))
+ self.assertTrue (diff=='')
+ self.assertTrue (os.path.exists (test3_fname))
diff = keystore_diff ("ref", "ref", otest3)
- self.failUnless (diff=='')
+ self.assertTrue (diff=='')
## valid arguments...
err_msg = None
@@ -624,7 +624,7 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
except ValueError as err:
err_msg = str(err)
ref_errmsg = "invalid `chk` argument (non existing instance name [typo-chk])"
- self.failUnless (err_msg == ref_errmsg)
+ self.assertTrue (err_msg == ref_errmsg)
#
err_msg = None
@@ -636,7 +636,7 @@ class BasicCfgKeyStoreTestCase( unittest.TestCase ):
except ValueError as err:
err_msg = str(err)
ref_errmsg = "invalid `ref` argument (non existing instance name [typo-ref])"
- self.failUnless (err_msg == ref_errmsg)
+ self.assertTrue (err_msg == ref_errmsg)
return # test6
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 0e83b025952e6d221ba91ff19848305b525a3d90..5bf80a583f74bf153dfddf58ed5781b8f57b6772 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -44,6 +44,7 @@ def _createCfgFlags():
acf.addFlag('Scheduler.ShowControlFlow', True)
acf.addFlag('Common.isOnline', False ) # Job runs in an online environment (access only to resources available at P1) # former global.isOnline
+ acf.addFlag('Common.doExpressProcessing', False)
def _checkProject():
import os
diff --git a/Control/AthenaConfiguration/python/ComponentAccumulator.py b/Control/AthenaConfiguration/python/ComponentAccumulator.py
index af8b4ac838bfb28c4910ff813ff8c7f79d282f65..43c3ff73a8a2f034e2af4c1e424000596febeaa2 100644
--- a/Control/AthenaConfiguration/python/ComponentAccumulator.py
+++ b/Control/AthenaConfiguration/python/ComponentAccumulator.py
@@ -24,7 +24,12 @@ class ConfigurationError(RuntimeError):
_servicesToCreate=frozenset(('GeoModelSvc','TileInfoLoader'))
def printProperties(msg, c, nestLevel = 0):
- for propname, propval in six.iteritems(c.getValuedProperties()):
+ # Iterate in sorted order.
+ props = c.getValuedProperties()
+ propnames = list(props.keys())
+ propnames.sort()
+ for propname in propnames:
+ propval = props[propname]
# Ignore empty lists
if propval==[]:
continue
diff --git a/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt b/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
index d9d59aef6e66ec6963a7c94891224e3811210eff..f6fc5eeae6aa4d214cbc8e48347f104c40107bb9 100644
--- a/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExHelloWorld/CMakeLists.txt
@@ -37,7 +37,7 @@ atlas_add_test( AthExHelloWorldMT_1
atlas_add_test( AthExHelloWorldMT_2
ENVIRONMENT THREADS=2
SCRIPT test/test_AthExHelloWorld.sh
- EXTRA_PATTERNS "AthenaHiveEventLoopMgr.* processing event|^HelloWorld .*(INFO|WARNING A WARNING|ERROR An ERROR|FATAL A FATAL|my message to the world" #processing order can change
+ EXTRA_PATTERNS "AthenaHiveEventLoopMgr.* processing event|^HelloWorld .*(INFO|WARNING A WARNING|ERROR An ERROR|FATAL A FATAL)|my message to the world" #processing order can change
)
atlas_add_test( AthExHelloWorld_CfgTest SCRIPT python -m AthExHelloWorld.HelloWorldConfig POST_EXEC_SCRIPT nopost.sh )
diff --git a/Control/AthenaExamples/AthExHive/AthExHive/CondDataObj.h b/Control/AthenaExamples/AthExHive/AthExHive/CondDataObj.h
index 5ed3f39ca96e8dc5988ebfc03f2f849a7c79aed0..99aa4bc6ab1637e25d325bef1f218e33eac73ddd 100644
--- a/Control/AthenaExamples/AthExHive/AthExHive/CondDataObj.h
+++ b/Control/AthenaExamples/AthExHive/AthExHive/CondDataObj.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CONDALGS_CONDDATAOBJ_H
@@ -30,7 +30,7 @@ inline std::ostream& operator<<(std::ostream& ost, const CondDataObj& rhs) {
//using the macros below we can assign an identifier (and a version)
//to the type CondDataObj
//This is required and checked at compile time when you try to record/retrieve
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF( CondDataObj , 232539028 , 1 )
CLASS_DEF( CondCont<CondDataObj> , 261788530 , 1 )
diff --git a/Control/AthenaExamples/AthExHive/AthExHive/CondDataObjY.h b/Control/AthenaExamples/AthExHive/AthExHive/CondDataObjY.h
index d6159036959c1111425582e770970e5b8ee4e9f6..1b85109b50f595278785768b35855f6e54d402e8 100644
--- a/Control/AthenaExamples/AthExHive/AthExHive/CondDataObjY.h
+++ b/Control/AthenaExamples/AthExHive/AthExHive/CondDataObjY.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef CONDALGS_CONDDATAOBJY_H
@@ -30,7 +30,7 @@ inline std::ostream& operator<<(std::ostream& ost, const CondDataObjY& rhs) {
//using the macros below we can assign an identifier (and a version)
//to the type CondDataObjY
//This is required and checked at compile time when you try to record/retrieve
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF( CondDataObjY , 6664392 , 1 )
CLASS_DEF( CondCont<CondDataObjY> , 207255848 , 1 )
diff --git a/Control/AthenaExamples/AthExHive/AthExHive/HiveDataObj.h b/Control/AthenaExamples/AthExHive/AthExHive/HiveDataObj.h
index c22a402d2add9b9d0a92f490a7b9ab85587d1d14..33617930aad9e0631336e6a0f204a2ca11632ffd 100644
--- a/Control/AthenaExamples/AthExHive/AthExHive/HiveDataObj.h
+++ b/Control/AthenaExamples/AthExHive/AthExHive/HiveDataObj.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHEXHIVE_HIVEDATAOBJ_H
@@ -38,7 +38,7 @@ private:
//using the macros below we can assign an identifier (and a version)
//to the type HiveDataObj
//This is required and checked at compile time when you try to record/retrieve
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF( HiveDataObj , 37539154 , 1 )
#endif
diff --git a/Control/AthenaExamples/AthExHive/CMakeLists.txt b/Control/AthenaExamples/AthExHive/CMakeLists.txt
index d17d613f9e81243907428208861f9d5b438f6e04..ca860e78f2b50176609403e27cf87b042c9ff3f5 100644
--- a/Control/AthenaExamples/AthExHive/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExHive/CMakeLists.txt
@@ -7,7 +7,7 @@ atlas_subdir( AthExHive )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/SGTools
+ Control/AthenaKernel
PRIVATE
Control/AthenaBaseComps
Control/CxxUtils
diff --git a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/LinkObj.h b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/LinkObj.h
index 41acaaa8edf32c702cdc0c614ec345ce4e3e9db9..1b9e4ac9d4de7a874d867dc3ebfb1d2692bb8b91 100755
--- a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/LinkObj.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/LinkObj.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ATHEXSTOREGATEEXAMPLE_LINKOBJ_H
@@ -62,7 +62,7 @@ namespace SGTutorial {
//using the macros below we can assign an identifier (and a version)
//to the type LinkObj
//This is required and checked at compile time when you try to record/retrieve
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(SGTutorial::LinkObj, 9909, 1)
//class version is not currently used
diff --git a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/MyDataObj.h b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/MyDataObj.h
index a848f8f7f021d8008a49651b854df4dd992844d4..bb3f052180d6b4da29db8bda1a34ce0b9f7ab12d 100755
--- a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/MyDataObj.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/MyDataObj.h
@@ -1,9 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef _MYDATAOBJ_
-#define _MYDATAOBJ_
+#ifndef ATHEXSTOREGATEEXAMPLE_TUTORIAL_MYDATAOBJ_H
+#define ATHEXSTOREGATEEXAMPLE_TUTORIAL_MYDATAOBJ_H
//sample data class for the Read/Write example
//it just wraps an int. Notice that is does not inherit from Gaudi DataObject
@@ -33,7 +33,7 @@ namespace SGTutorial {
//using the macros below we can assign an identifier (and a version)
//to the type MyDataObj
//This is required and checked at compile time when you try to record/retrieve
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(SGTutorial::MyDataObj, 9901, 1)
diff --git a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/Tutorial_ClassDEF.h b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/Tutorial_ClassDEF.h
index 7ac941faba8fa4f04e6a6f15a19088d33190516a..b99dcb99f5a8b45ca1ef5009a7ba6195ab5935af 100755
--- a/Control/AthenaExamples/AthExStoreGateExample/Tutorial/Tutorial_ClassDEF.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/Tutorial/Tutorial_ClassDEF.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TUTORIAL_CLASSDEF_H
@@ -9,7 +9,7 @@
#include <vector>
#include "MyElement.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(std::vector<SGTutorial::MyElement>, 9903, 1)
//the third field is the version which is currently ignored
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src/StoreGateExample_ClassDEF.h b/Control/AthenaExamples/AthExStoreGateExample/src/StoreGateExample_ClassDEF.h
index 9a440a6aba8253762e1e07f6ce838f2cea6da93b..f3ce9507eb33fe71ed558e8be64b01b0d03f307f 100755
--- a/Control/AthenaExamples/AthExStoreGateExample/src/StoreGateExample_ClassDEF.h
+++ b/Control/AthenaExamples/AthExStoreGateExample/src/StoreGateExample_ClassDEF.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef STOREGATEEXAMPLE_CLASSDEF_H
@@ -10,7 +10,7 @@
#include <list>
#include <vector>
#include "SGTools/StlVectorClids.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "AthContainers/DataVector.h"
#include "AthLinks/ElementLink.h"
#include "MyContObj.h"
diff --git a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
index 02ba59d9037caa4a244ae47067eeac3a123ad921..07843671a64e667071f1959045b2db2be5628672 100644
--- a/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
+++ b/Control/AthenaExamples/AthExStoreGateExample/src_dflow/DFlowAlg2.cxx
@@ -19,7 +19,6 @@
#include "GaudiKernel/Property.h"
#include "StoreGate/ReadHandle.h"
#include "StoreGate/WriteHandle.h"
-#include "CxxUtils/make_unique.h"
namespace AthEx {
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
index 498bd87c31678d6d7d5780908b438de307e7fd26..e4d8b0e5e6b0011ebe3f7035e4a344b22fa58dc8 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExDecay.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Decay.h
@@ -15,7 +15,7 @@
// HepMC / CLHEP includes
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
// DataModel includes
#include "AthLinks/ElementLink.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
index 2d48ae41b13d3685603d6aa4a655b16481b3194a..b5980d77385a4634e9dfa95f85056072c9159bc8 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExElephantino.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// Elephantino.h
@@ -19,7 +19,7 @@
// HepMC / CLHEP includes
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
// DataModel includes
#include "AthLinks/ElementLink.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExFatObject.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExFatObject.h
index d148ce08a1091a42c6c3d4e963017b5f65808e1a..79f8b910a2d937288e7028bbaa8860cfc02c2814 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExFatObject.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExFatObject.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// AthExFatObject.h
@@ -18,7 +18,7 @@
#include "AthExThinning/AthExParticles.h"
// datamodel
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
#include "AthLinks/ElementLink.h"
// Forward declaration
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExIParticles.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExIParticles.h
index ce581e0ad6f8106d0c94925355596aa46ae8d551..41acee11c1c09528b9991fcc0d480319a0783a21 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExIParticles.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExIParticles.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// AthExIParticles.h
@@ -16,7 +16,7 @@
// Gaudi includes
#include "AthContainers/DataVector.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
// AthExThinning includes
#include "AthExThinning/AthExIParticle.h"
diff --git a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
index ccfe90cd1b67b0eab39ab3ad343f952ed23d1416..96d771afbea47c623abbf4b8c9efc3286f277927 100644
--- a/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
+++ b/Control/AthenaExamples/AthExThinning/AthExThinning/AthExParticles.h
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// AthExParticles.h
@@ -18,7 +18,7 @@
// Gaudi includes
#include "AthContainers/DataVector.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
// AthExThinning includes
#include "AthExThinning/AthExParticle.h"
diff --git a/Control/AthenaExamples/AthExThinning/CMakeLists.txt b/Control/AthenaExamples/AthExThinning/CMakeLists.txt
index e06cbb3f8181d12eb236d50329b1b423b717b26f..eced45fddb29446d3a4da5f02b356942118e71e7 100644
--- a/Control/AthenaExamples/AthExThinning/CMakeLists.txt
+++ b/Control/AthenaExamples/AthExThinning/CMakeLists.txt
@@ -14,7 +14,6 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaPython
Control/AthenaServices
Control/DataModelAthenaPool
- Control/SGTools
Database/AthenaPOOL/AthenaPoolUtilities
GaudiKernel
PRIVATE
@@ -42,7 +41,7 @@ atlas_add_library( AthExThinningEvent
PUBLIC_HEADERS AthExThinning
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps AthenaKernel SGTools AthenaPoolUtilities GaudiKernel DataModelAthenaPoolLib StoreGateLib SGtests AthenaPoolCnvSvcLib
+ LINK_LIBRARIES AthContainers AthLinks AthenaBaseComps AthenaKernel AthenaPoolUtilities GaudiKernel DataModelAthenaPoolLib StoreGateLib SGtests AthenaPoolCnvSvcLib
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} )
atlas_add_component( AthExThinningAlgs
@@ -52,19 +51,19 @@ atlas_add_component( AthExThinningAlgs
src_lib/SlimmerAlg.cxx
src_lib/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib SGTools AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent )
atlas_add_poolcnv_library( AthExThinningPoolCnv
src/*.cxx
FILES AthExThinning/AthExParticles.h AthExThinning/AthExIParticles.h AthExThinning/AthExDecay.h AthExThinning/AthExElephantino.h AthExThinning/AthExFatObject.h
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib SGTools AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent )
atlas_add_dictionary( AthExThinningEventDict
AthExThinning/AthExThinningEventDict.h
AthExThinning/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib SGTools AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthContainers AthLinks AthenaBaseComps AthenaKernel DataModelAthenaPoolLib AthenaPoolUtilities GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthExThinningEvent
ELEMENT_LINKS AthExParticles AthExIParticles )
# Install files from the package:
@@ -82,8 +81,12 @@ atlas_add_test( test_pythinning
SCRIPT test/test_pythinning.sh
PROPERTIES TIMEOUT 900
EXTRA_PATTERNS ":::running" )
+set_tests_properties( AthExThinning_test_pythinning_ctest
+ PROPERTIES DEPENDS AthExThinning_test_thinning_ctest )
atlas_add_test( test_slimming
SCRIPT test/test_slimming.sh
PROPERTIES TIMEOUT 900
EXTRA_PATTERNS ":::running" )
+set_tests_properties( AthExThinning_test_slimming_ctest
+ PROPERTIES DEPENDS AthExThinning_test_pythinning_ctest )
diff --git a/Control/SGTools/src/StorableConversions.cxx b/Control/AthenaKernel/src/StorableConversions.cxx
similarity index 90%
rename from Control/SGTools/src/StorableConversions.cxx
rename to Control/AthenaKernel/src/StorableConversions.cxx
index 44eb010227012f94ae03f282cfc2f36b16a6af31..2a1fdf4c53f65d29140bba36f29731494e1d49b8 100755
--- a/Control/SGTools/src/StorableConversions.cxx
+++ b/Control/AthenaKernel/src/StorableConversions.cxx
@@ -1,14 +1,14 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-/** @file StorableConversions.cxx
+/** @file AthenaKernel/src/StorableConversions.cxx
* @brief convert to and from a SG storable
* $Id: StorableConversions.cxx,v 1.2 2008-04-08 16:05:32 ssnyder Exp $
* @author ATLAS Collaboration
**/
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
namespace SG {
diff --git a/Control/AthenaMonitoring/AthenaMonitoring/ITriggerTranslatorTool.h b/Control/AthenaMonitoring/AthenaMonitoring/ITriggerTranslatorTool.h
index e1dd3ef7b72ba3fc2aefc3e6f6773e70f8854f95..726f75f39eac15c6b960e0f3886d9691f20a1f8e 100755
--- a/Control/AthenaMonitoring/AthenaMonitoring/ITriggerTranslatorTool.h
+++ b/Control/AthenaMonitoring/AthenaMonitoring/ITriggerTranslatorTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ITRIGGERTRANSLATORTOOL_H
@@ -32,6 +32,6 @@ class ITriggerTranslatorTool : virtual public IAlgTool
virtual ~ITriggerTranslatorTool() {}
// book & fill (pure virtual)
- virtual const std::vector<std::string> translate(const std::string&) = 0;
+ virtual const std::vector<std::string> translate(const std::string&) const = 0;
};
#endif
diff --git a/Control/AthenaMonitoring/AthenaMonitoring/TriggerTranslatorSimple.h b/Control/AthenaMonitoring/AthenaMonitoring/TriggerTranslatorSimple.h
index 89b4aab10b4cb8991aefb2d38f045fe1ac3be506..3d1e04d84850734175d0baaf00226e358a05ba78 100755
--- a/Control/AthenaMonitoring/AthenaMonitoring/TriggerTranslatorSimple.h
+++ b/Control/AthenaMonitoring/AthenaMonitoring/TriggerTranslatorSimple.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TriggerTranslatorToolSimple_H
@@ -40,9 +40,9 @@ class TriggerTranslatorToolSimple : public AthAlgTool, virtual public ITriggerTr
virtual ~TriggerTranslatorToolSimple();
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
- virtual const std::vector<std::string> translate(const std::string&);
+ virtual const std::vector<std::string> translate(const std::string&) const override;
diff --git a/Control/AthenaMonitoring/CMakeLists.txt b/Control/AthenaMonitoring/CMakeLists.txt
index 416f80c1cd98dadaba38928523f4ebb17829e235..488a58be0600d5aed64102393f73afee2ae7254f 100644
--- a/Control/AthenaMonitoring/CMakeLists.txt
+++ b/Control/AthenaMonitoring/CMakeLists.txt
@@ -77,3 +77,8 @@ foreach ( test_file ${PYTHON_TEST_FILES} )
PROPERTIES WORKING_DIRECTORY ${rundir}
)
endforeach()
+
+# Code quality check
+atlas_add_test( flake8
+ SCRIPT flake8 --select=F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python/*.py
+ POST_EXEC_SCRIPT nopost.sh )
diff --git a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
index 97520d6a26f3e7602bad9d188ae0622bdd8d42a7..9e99d3d0a03bdd9a07a0e374d4b1d25bf3d8230a 100644
--- a/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
+++ b/Control/AthenaMonitoring/python/AthMonitorCfgHelper.py
@@ -214,14 +214,14 @@ def getTriggerTranslatorToolSimple(inputFlags):
tdt_local_hltconfig = HLTMonTriggerList()
tdt_mapping = {}
for tdt_menu, tdt_menu_item in tdt_local_hltconfig.__dict__.items():
- if not isinstance(tdt_menu_item, collections.Iterable): continue
+ if not isinstance(tdt_menu_item, collections.Iterable):
+ continue
# work around possibly buggy category items
if isinstance(tdt_menu_item, basestring):
tdt_local_logger.debug('String, not list: %s' % tdt_menu)
tdt_menu_item = [tdt_menu_item]
if len([_ for _ in tdt_menu_item if not (_.startswith('HLT_') or _.startswith('L1'))]) != 0:
tdt_local_logger.debug('Bad formatting: %s' % tdt_menu)
- patched_names = []
tdt_menu_item = [_ if (_.startswith('HLT_') or _.startswith('L1_')) else 'HLT_' + _
for _ in tdt_menu_item]
tdt_mapping[tdt_menu] = ','.join(tdt_menu_item)
diff --git a/Control/AthenaMonitoring/python/BadLBFilterTool.py b/Control/AthenaMonitoring/python/BadLBFilterTool.py
index 498a82f8ced9b0cd52482241f1e0de9bbd2eee26..4505b65fdd0368d5a312381a2a44045ffd59c425 100644
--- a/Control/AthenaMonitoring/python/BadLBFilterTool.py
+++ b/Control/AthenaMonitoring/python/BadLBFilterTool.py
@@ -18,8 +18,8 @@ def _InstanceFromProjectName():
from RecExConfig.RecFlags import rec
projectName=rec.projectName()
try:
- year=int(projectName[4:6]);
- except:
+ year=int(projectName[4:6])
+ except Exception:
log = logging.getLogger('BadLBFilterTool')
log.error("Failed to extract year from project tag "+ projectName+". Guessing run2")
return "CONDBR2"
@@ -41,8 +41,6 @@ def GetBadLBFilterAlg(name, defects, writekey, ignoreRecoverable=False, origDbTa
- ignoreRecoverable (optional; default=False): if True, the algorithm will ignore defects that are marked as recoverable
- origDbTag (optional): if set, will override automatic configuration of database tag (only for testing)
"""
- import operator
- from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon.Logging import logging
from AthenaCommon.AlgSequence import AthSequencer
@@ -94,7 +92,6 @@ def GetBadLBFilterTool(name, defects, alwaysReturnTrue=False, ignoreRecoverable=
- autoconfigure (optional; default=True): automatically handle certain cases, e.g. Monte Carlo, where we want to always return True
- origDbTag (optional): if set, will override automatic configuration of database tag (only for testing)
"""
- import operator
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaCommon.GlobalFlags import globalflags
from AthenaCommon.Logging import logging
@@ -133,9 +130,6 @@ def LArBadDefectList(origDbTag=None):
dbtag = _resolve_db_tag(origDbTag)
dbname = _InstanceFromProjectName()
ddb = DefectsDB('COOLOFL_GLOBAL/'+dbname, tag=dbtag)
- defects = ddb.defect_names
- defectliststr = []
- defectlist = []
lar_defects = reduce(operator.or_, [set(ddb.virtual_defect_logics[z].clauses) for z in \
('EMBA', 'EMBC', 'EMECA', 'EMECC',
'HECA', 'HECC', 'FCALA',
diff --git a/Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py b/Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py
index 702beffb33ef8a04d371fab5825b42a11575662e..aa1b7c1b1a3cd921e23517f96a85e4f5aecde1b4 100644
--- a/Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py
+++ b/Control/AthenaMonitoring/python/ExampleMonitorAlgorithm.py
@@ -13,10 +13,11 @@ def ExampleMonitoringConfig(inputFlags):
'''Function to configures some algorithms in the monitoring system.'''
### STEP 1 ###
- # Define one top-level monitoring algorithm. The new configuration
- # framework uses a component accumulator.
- from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
- result = ComponentAccumulator()
+ # If you need to set up special tools, etc., you will need your own ComponentAccumulator;
+ # uncomment the following 2 lines and use the last three lines of this function instead of the ones
+ # just before
+ # from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+ # result = ComponentAccumulator()
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
@@ -117,7 +118,7 @@ if __name__=='__main__':
# Setup logs
from AthenaCommon.Logging import log
- from AthenaCommon.Constants import DEBUG,INFO
+ from AthenaCommon.Constants import INFO
log.setLevel(INFO)
# Set the Athena configuration flags
diff --git a/Control/AthenaMonitoring/python/TriggerInterface.py b/Control/AthenaMonitoring/python/TriggerInterface.py
index c9e69d09dc97163991401a2743975c3991e4ebc5..ea0b0c6172520ba0844340fe4bc3774cb31c6b8b 100644
--- a/Control/AthenaMonitoring/python/TriggerInterface.py
+++ b/Control/AthenaMonitoring/python/TriggerInterface.py
@@ -8,7 +8,7 @@
@brief Simple new configuration framework functions for getting a TrigDecisionTool. Probably do not work except for reading ESD and AOD. Will be superseded by proper code from Trigger.
'''
-def getTrigConfigSvc(inputFlags):
+def getTrigConfigSvc(flags):
''' Setup a TrigConfigSvc with DS information. Works on AOD, not vetted for anything else! '''
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TrigConfigSvc.TrigConfigSvcConfig import DSConfigSvc, SetupTrigConfigSvc
@@ -16,13 +16,31 @@ def getTrigConfigSvc(inputFlags):
from EventInfoMgt.TagInfoMgrConfig import TagInfoMgrCfg
rv = ComponentAccumulator()
+ # is MC ? then set up XML reading and get out of here
+ if flags.Input.isMC:
+ from TrigConfigSvc.TrigConfigSvcConfig import (HLTConfigSvc, LVL1ConfigSvc, L1TopoConfigSvc,
+ findFileInXMLPATH, TrigConfigSvc)
+ hltcs = HLTConfigSvc("HLTConfigSvc")
+ hltcs.XMLMenuFile = findFileInXMLPATH(flags.Trigger.HLTConfigFile)
+ print 'hltcs', hltcs.XMLMenuFile
+ rv.addService(hltcs)
+ lvl1cs = LVL1ConfigSvc("LVL1ConfigSvc")
+ lvl1cs.XMLMenuFile = findFileInXMLPATH(flags.Trigger.LVL1ConfigFile)
+ rv.addService(lvl1cs)
+ l1topocs = L1TopoConfigSvc()
+ l1topocs.XMLMenuFile = findFileInXMLPATH(flags.Trigger.LVL1TopoConfigFile)
+ rv.addService(l1topocs)
+ ts = TrigConfigSvc("TrigConfigSvc")
+ ts.PriorityList = ['xml']
+ rv.addService(ts)
+ return rv
rv.addService(DSConfigSvc('DSConfigSvc'))
tcs = SetupTrigConfigSvc()
tcs.SetStates(["ds"])
tcssvc = tcs.GetConfigurable()
rv.addService(tcssvc)
- rv.merge(addFolders(inputFlags, ['/TRIGGER/HLT/Menu',
+ rv.merge(addFolders(flags, ['/TRIGGER/HLT/Menu',
'/TRIGGER/HLT/HltConfigKeys',
'/TRIGGER/LVL1/Lvl1ConfigKey',
'/TRIGGER/LVL1/Menu',
@@ -36,18 +54,18 @@ def getTrigConfigSvc(inputFlags):
'TRIGGER', tag='HEAD'))
# the following should probably be set up by IOVDbSvc configuration?
- rv.merge(TagInfoMgrCfg(inputFlags)[0])
+ rv.merge(TagInfoMgrCfg(flags)[0])
return rv
-def getTrigDecisionTool(inputFlags):
+def getTrigDecisionTool(flags):
''' Setup a TrigDecisionTool. Short-cuts deduplication with memoization.'''
if getTrigDecisionTool.rv:
- return rv
+ return getTrigDecisionTool.rv
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
rv = ComponentAccumulator()
- rv.merge(getTrigConfigSvc(inputFlags))
+ rv.merge(getTrigConfigSvc(flags))
tdt = Trig__TrigDecisionTool('TrigDecisionTool', TrigConfigSvc=rv.getService('TrigConfigSvc'))
from TrigEDMConfig.TriggerEDM import EDMLibraries
diff --git a/Control/AthenaMonitoring/python/__init__.py b/Control/AthenaMonitoring/python/__init__.py
index 70198ce84c5291c4970f12cf779605f0af874948..cbefc0a1a2aedf4f86e411814d76727e7bf420fe 100644
--- a/Control/AthenaMonitoring/python/__init__.py
+++ b/Control/AthenaMonitoring/python/__init__.py
@@ -2,5 +2,6 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
+__all__ = ['AthMonitorCfgHelper', 'AthMonitorCfgHelperOld', 'GetAtlasReadyFilterTool']
from AthenaMonitoring.AthMonitorCfgHelper import AthMonitorCfgHelper, AthMonitorCfgHelperOld
from AthenaMonitoring.AtlasReadyFilterTool import GetAtlasReadyFilterTool
diff --git a/Control/AthenaMonitoring/src/TriggerTranslatorSimple.cxx b/Control/AthenaMonitoring/src/TriggerTranslatorSimple.cxx
index 37a62e95dca3ee52f500e3f93220a8f5a883c58c..f666235f2bc118746556063e404dd8dfc24e6d29 100644
--- a/Control/AthenaMonitoring/src/TriggerTranslatorSimple.cxx
+++ b/Control/AthenaMonitoring/src/TriggerTranslatorSimple.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "AthenaMonitoring/TriggerTranslatorSimple.h"
@@ -30,6 +30,6 @@ StatusCode TriggerTranslatorToolSimple::initialize() {
}
-const std::vector<std::string> TriggerTranslatorToolSimple::translate(const std::string& key) {
+const std::vector<std::string> TriggerTranslatorToolSimple::translate(const std::string& key) const {
return m_trigmap.at(key);
}
diff --git a/Control/AthenaServices/python/Configurables.py b/Control/AthenaServices/python/Configurables.py
index 2d8a521615ae61549e8323fe4184154809d202ff..46e76cd4fcd5bd89d6291b393051719ee17038bb 100644
--- a/Control/AthenaServices/python/Configurables.py
+++ b/Control/AthenaServices/python/Configurables.py
@@ -37,7 +37,7 @@ class ThinningSvc( _ThinningSvc ):
if not isinstance(handle, ThinningSvc):
return
- from AthenaCommon.AlgSequence import AlgSequence
+ from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
## get a handle on the ToolSvc
from AthenaCommon.AppMgr import ToolSvc as toolSvc
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
@@ -142,6 +142,13 @@ class ThinningSvc( _ThinningSvc ):
_doScheduleTool(o, streams)):
outstreams.append (o)
pass
+ ## then loop over OutputStream sequence
+ for o in AthSequencer("AthOutSeq"):
+ if (isinstance(o, AthenaOutputStream) and
+ hasattr(o, 'HelperTools') and
+ _doScheduleTool(o, streams)):
+ outstreams.append (o)
+ pass
## then loop over OutStream sequence
if AlgSequence.configurables.has_key('Streams'):
for o in AlgSequence("Streams"):
diff --git a/Control/CLIDComps/python/clidGenerator.py b/Control/CLIDComps/python/clidGenerator.py
index ebb34f35ac639937b4ec8d74f8ed9a67c0e1105c..b3afdb3ddca381754d520e0c8381298e1579dae3 100644
--- a/Control/CLIDComps/python/clidGenerator.py
+++ b/Control/CLIDComps/python/clidGenerator.py
@@ -1,9 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
## @file clidGenerator.py
# @author CETull@lbl.gov
# @brief Athena CLID Generator Class
#
+from __future__ import print_function
import string, re, os, csv
## Athena CLID Generator Class
@@ -51,24 +52,24 @@ class clidGenerator (object):
self.__tidRep [tid_name] = clid
else:
- print "No CLID DataBase file <%s> " % cliddb
- except Exception, err:
- print "Error reading from CLID DataBase files <%s>:\n%s " % (
+ print ("No CLID DataBase file <%s> " % cliddb)
+ except Exception as err:
+ print ("Error reading from CLID DataBase files <%s>:\n%s " % (
self.__cliddbs,
- err)
+ err))
def setCLIDDB(self, db, debug):
"Initializes a CLID Generator object with a CLID Database"
if db:
self.__cliddbs = search_files(db, os.getenv('DATAPATH'))
- if debug: print "Using specified CLID DataBase files %s " % self.__cliddbs
+ if debug: print ("Using specified CLID DataBase files %s " % self.__cliddbs)
elif os.getenv('CLIDDB'):
# CLID DataBase (Default = clid.db)
self.__cliddbs.append(os.getenv('CLIDDB'))
- if debug: print "Using DataBase file from CLIDDB env variable %s " % self.__cliddbs
+ if debug: print ("Using DataBase file from CLIDDB env variable %s " % self.__cliddbs)
else:
self.__cliddbs = search_files('clid.db', os.getenv('DATAPATH'))
- if debug: print "Using DataBase file from DATAPATH %s " % self.__cliddbs
+ if debug: print ("Using DataBase file from DATAPATH %s " % self.__cliddbs)
def writedb(self,db):
"Read CLID DataBase file"
@@ -89,7 +90,7 @@ class clidGenerator (object):
c = self.genClidFromName(className+'_')
if self.isCollection(className):
c += 0x40000000
- if self.__clidRep.has_key(c):
+ if c in self.__clidRep:
if n != self.__clidRep[c]:
c = self.genClidFromName(className+'_')
else:
@@ -100,7 +101,7 @@ class clidGenerator (object):
return c
def getClidFromName(self,className):
"Get the CLID in the repository of class name <className>"
- if self.__nameRep.has_key(className):
+ if className in self.__nameRep:
return self.__nameRep[className]
else:
return None
@@ -112,7 +113,7 @@ class clidGenerator (object):
return None
def getNameFromClid(self,clid):
"Get the class name in the repository with CLID <clid>"
- if self.__clidRep.has_key(clid):
+ if clid in self.__clidRep:
return self.__clidRep[clid]
else:
return None
@@ -124,7 +125,7 @@ class clidGenerator (object):
return None
def getPackageFromClid(self,clid):
"Get the name of the package defining <clid>"
- if self.__clidPkg.has_key(clid):
+ if clid in self.__clidPkg:
return self.__clidPkg[clid]
else:
return None
@@ -161,7 +162,7 @@ def search_file(filename, search_path, pathsep=os.pathsep):
def search_files(filename, search_path, pathsep=os.pathsep):
"""Given a search path, find file with requested name """
clidFiles = []
- for path in string.split(search_path, pathsep):
+ for path in search_path.split(pathsep):
candidate = os.path.join(path, filename)
if os.path.exists(candidate): clidFiles.append(os.path.abspath(candidate))
return clidFiles
diff --git a/Control/CxxUtils/share/phihelper_test.ref b/Control/CxxUtils/share/phihelper_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..dc4d4e42e31c904fb8680d72c08910c22db16480
--- /dev/null
+++ b/Control/CxxUtils/share/phihelper_test.ref
@@ -0,0 +1,4 @@
+Running 12 test cases...
+
+[1;32;49m*** No errors detected
+[0;39;49m
\ No newline at end of file
diff --git a/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt
index e517f4b38125c3f3b421b5723228ef85c3542845..b9f58128b15d71c45f7959f46d19ce389099789b 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt
+++ b/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_depends_on_subdirs( PRIVATE
Control/AthContainers
Control/PerformanceMonitoring/PerfMonComps
Control/PerformanceMonitoring/PerfMonKernel
- Control/SGTools
Control/StoreGate
GaudiKernel
PhysicsAnalysis/TruthParticleID/McParticleTests
@@ -27,7 +26,7 @@ atlas_add_component( PerfMonTests
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthAllocators AthContainers PerfMonKernel SGTools StoreGateLib SGtests GaudiKernel )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel AthAllocators AthContainers PerfMonKernel StoreGateLib SGtests GaudiKernel )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
index 8357d5308649078e4779367957f7b2133c1b0966..d48f7e7f1ec4ff5f90e1fc62ead834fb5abcc623 100755
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestBasicAlg.cxx
@@ -1,7 +1,7 @@
///////////////////////// -*- C++ -*- /////////////////////////////
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// PerfMonTestBasicAlg.cxx
@@ -18,7 +18,7 @@
// StoreGate
#include "StoreGate/StoreGateSvc.h"
-#include "SGTools/CLASS_DEF.h"
+#include "AthenaKernel/CLASS_DEF.h"
// PerfMonTests includes
#include "PerfMonTestBasicAlg.h"
diff --git a/Control/SGTools/SGTools/DataProxy.icc b/Control/SGTools/SGTools/DataProxy.icc
index b414501196a1990e4f3b504466c310bd3068bb9c..d1fdf485fe4a127c32d80a227742c2b7212fd27d 100755
--- a/Control/SGTools/SGTools/DataProxy.icc
+++ b/Control/SGTools/SGTools/DataProxy.icc
@@ -13,7 +13,7 @@
// $Id: DataProxy.icc,v 1.6 2008-07-14 22:16:25 calaf Exp $
#include "AthenaKernel/DataBucketBase.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
#include "AthenaKernel/ClassID_traits.h"
#ifndef NDEBUG
# include "AthenaKernel/getMessageSvc.h"
diff --git a/Control/SGTools/SGTools/StorableConversions.h b/Control/SGTools/SGTools/StorableConversions.h
deleted file mode 100755
index cb35e2c405f6a499510f6908a8ba456606361d45..0000000000000000000000000000000000000000
--- a/Control/SGTools/SGTools/StorableConversions.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// This file's extension implies that it's C, but it's really -*- C++ -*-.
-
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef SGTOOLS_STORABLECONVERSIONS_H
-# define SGTOOLS_STORABLECONVERSIONS_H
-/** @file StorableConversions.h
- * @brief convert to and from a SG storable
- * $Id: StorableConversions.h,v 1.13 2008-05-22 22:54:12 calaf Exp $
- * @author ATLAS Collaboration
- **/
-
-
-#include "AthenaKernel/StorableConversions.h"
-
-
-#endif // SGTOOLS_STORABLECONVERSIONS_H
diff --git a/Control/SGTools/test/DataProxy_test.cxx b/Control/SGTools/test/DataProxy_test.cxx
index 561ec90754db36997a1c211b65975425ddd6aeaf..e2195590ad696465970c85af5054d6998fa52b3f 100644
--- a/Control/SGTools/test/DataProxy_test.cxx
+++ b/Control/SGTools/test/DataProxy_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
@@ -12,10 +12,10 @@
#undef NDEBUG
#include "SGTools/DataProxy.h"
-#include "SGTools/StorableConversions.h"
#include "SGTools/TestStore.h"
#include "SGTools/CurrentEventStore.h"
#include "SGTools/T2pMap.h"
+#include "AthenaKernel/StorableConversions.h"
#include "AthenaKernel/CLASS_DEF.h"
#include "AthenaKernel/IProxyDict.h"
#include "AthenaKernel/ILockable.h"
diff --git a/Database/IOVDbSvc/python/IOVDbSvcConfig.py b/Database/IOVDbSvc/python/IOVDbSvcConfig.py
index f673bc2a5269362351b218d6a84045a35fb71f53..85b7d037c4519bebebdda097b98574e79e70e2e0 100644
--- a/Database/IOVDbSvc/python/IOVDbSvcConfig.py
+++ b/Database/IOVDbSvc/python/IOVDbSvcConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator, ConfigurationError
from IOVSvc.IOVSvcConf import CondInputLoader
@@ -77,18 +77,19 @@ def IOVDbSvcCfg(configFlags):
#Convenience method to add folders:
def addFolders(configFlags,folderstrings,detDb=None,className=None,extensible=False,tag=None):
+ tagstr = ''
+ if tag is not None:
+ tagstr = '<tag>%s</tag>' % tag
+
#Convenience hack: Allow a single string as parameter:
if isinstance(folderstrings,str):
- return addFolderList(configFlags,((folderstrings,detDb,className),),extensible)
+ return addFolderList(configFlags,((folderstrings+tagstr,detDb,className),),extensible)
else: #Got a list of folders
folderdefs=[]
for fs in folderstrings:
- if tag is not None:
- fs+= '<tag>%s</tag>' % tag
-
- folderdefs.append((fs,detDb,className))
+ folderdefs.append((fs+tagstr,detDb,className))
return addFolderList(configFlags,folderdefs,extensible)
diff --git a/DetectorDescription/GeoModel/GeoSpecialShapes/CMakeLists.txt b/DetectorDescription/GeoModel/GeoSpecialShapes/CMakeLists.txt
index 1a4f540b25acda51cdae7ef3663680395c7af043..6c9c353806a67e80cf2d1265f2379b8bdde69d06 100644
--- a/DetectorDescription/GeoModel/GeoSpecialShapes/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoSpecialShapes/CMakeLists.txt
@@ -7,10 +7,9 @@ atlas_subdir( GeoSpecialShapes )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
- Control/SGTools
+ Control/AthenaKernel
Control/StoreGate
PRIVATE
- Control/AthenaKernel
Control/CxxUtils
Database/RDBAccessSvc
DetectorDescription/GeoModel/GeoModelInterfaces
@@ -37,20 +36,20 @@ atlas_add_library( GeoSpecialShapes
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} SGTools StoreGateLib SGtests
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} AthenaKernel StoreGateLib SGtests
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${GSL_LIBRARIES} AthenaKernel CxxUtils GeoModelUtilities GaudiKernel )
atlas_add_dictionary( LArGeoCheckerDict
GeoSpecialShapes/LArGeoCheckerDict.h
GeoSpecialShapes/selection.xml
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${GSL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} SGTools StoreGateLib SGtests AthenaKernel CxxUtils GeoModelUtilities GaudiKernel GeoSpecialShapes )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${GSL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} StoreGateLib SGtests AthenaKernel CxxUtils GeoModelUtilities GaudiKernel GeoSpecialShapes )
atlas_add_dictionary( LArWheelEnums
GeoSpecialShapes/LArWheelCalculatorEnums.h
GeoSpecialShapes/selectionEnums.xml
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${GSL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} SGTools StoreGateLib SGtests AthenaKernel CxxUtils GeoModelUtilities GaudiKernel GeoSpecialShapes )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${ROOT_LIBRARIES} ${GSL_LIBRARIES} ${CLHEP_LIBRARIES} ${GEOMODEL_LIBRARIES} StoreGateLib SGtests AthenaKernel CxxUtils GeoModelUtilities GaudiKernel GeoSpecialShapes )
endif()
if(BUILDVP1LIGHT)
diff --git a/DetectorDescription/GeoModel/GeoSpecialShapes/GeoSpecialShapes/LArWheelCalculator.h b/DetectorDescription/GeoModel/GeoSpecialShapes/GeoSpecialShapes/LArWheelCalculator.h
index a23e0653af96e90fe261eac814cb25aceafce459..4a803c1c8d0f13f46bc62c1b3ee8bcd2d0d7d664 100644
--- a/DetectorDescription/GeoModel/GeoSpecialShapes/GeoSpecialShapes/LArWheelCalculator.h
+++ b/DetectorDescription/GeoModel/GeoSpecialShapes/GeoSpecialShapes/LArWheelCalculator.h
@@ -9,7 +9,7 @@
#include "CLHEP/Vector/ThreeVector.h"
#ifndef XAOD_STANDALONE
- #include "SGTools/CLASS_DEF.h"
+ #include "AthenaKernel/CLASS_DEF.h"
#endif // XAOD_STANDALONE
#include "GeoSpecialShapes/LArWheelCalculatorEnums.h"
diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/ATLAS_CHECK_THREAD_SAFETY b/DetectorDescription/IRegionSelector/IRegionSelector/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..89af1c858bf66f682948012af2e9b3d3b3663dfe
--- /dev/null
+++ b/DetectorDescription/IRegionSelector/IRegionSelector/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+DetectorDescription/IRegionSelector
diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/IRegSelSvc.h b/DetectorDescription/IRegionSelector/IRegionSelector/IRegSelSvc.h
index d024c32f9f7a02d4dfe6ea78854565b3ae1cc922..741683d3ee05cd41e8395346638373ce75593827 100644
--- a/DetectorDescription/IRegionSelector/IRegionSelector/IRegSelSvc.h
+++ b/DetectorDescription/IRegionSelector/IRegionSelector/IRegSelSvc.h
@@ -1,6 +1,6 @@
// emacs: this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//
// IRegSelSvc.h
@@ -8,11 +8,9 @@
// Interface for the RegionSelector (RegSelSvc) service
//
//
-// $Id: IRegSelSvc.h,v 1.1.1.1 2008-11-19 15:33:35 sutt Exp $
-#ifndef IREGSELSVC_H
-#define IREGSELSVC_H
-#include "GaudiKernel/IInterface.h"
+#ifndef IREGIONSELECTOR_IREGSELSVC_H
+#define IREGIONSELECTOR_IREGSELSVC_H
#include "Identifier/IdentifierHash.h"
#include <vector>
#include <stdint.h>
@@ -20,19 +18,14 @@
#include "AthenaKernel/IOVSvcDefs.h"
#include "IRegionSelector/IRoiDescriptor.h"
-//static const InterfaceID IID_IRegSelSvc("IRegSelSvc", 1 , 0);
-
class IRegSelSvc: virtual public IInterface {
public:
+ /// InterfaceID
+ DeclareInterfaceID( IRegSelSvc, 1 , 0 );
+
/// Destructor
virtual ~IRegSelSvc(){}
- /// Retrieve interface ID
- static const InterfaceID& interfaceID() {
- static const InterfaceID IID("IRegSelSvc", 1 , 0);
- return IID;
- }
- //static const InterfaceID& interfaceID() { return IID_IRegSelSvc; }
-
+
/// IdentifierHash methods
diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/IRoiDescriptor.h b/DetectorDescription/IRegionSelector/IRegionSelector/IRoiDescriptor.h
index 20e8d083676fd253cc3d74f08f64545bff1e7f05..298d15aa70a1b4d08dd78a213ccb467b6a64a860 100644
--- a/DetectorDescription/IRegionSelector/IRegionSelector/IRoiDescriptor.h
+++ b/DetectorDescription/IRegionSelector/IRegionSelector/IRoiDescriptor.h
@@ -1,6 +1,6 @@
// emacs: this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//
// @file IRoiDescriptor.h
@@ -9,7 +9,6 @@
//
// @author sutt@cern.ch
//
-// $Id: IRoiDescriptor.h, v0.0 Fri 14 Jun 2013 00:52:09 CEST sutt $
#ifndef IREGIONSELECTOR_IROIDESCRIPTOR_H
#define IREGIONSELECTOR_IROIDESCRIPTOR_H
@@ -17,9 +16,6 @@
#include <vector>
#include <iostream>
-/// hmmm - is this actually ever needed ??
-// #include "CLIDSvc/CLASS_DEF.h"
-
/**
** @brief Describes the API of the Region of Ineterest geometry
**/
@@ -133,9 +129,6 @@ std::ostream& operator<<( std::ostream& s, const IRoiDescriptor& d ) {
}
-/// is this really needed ??
-// CLASS_DEF(IRoiDescriptor,12665988,1)
-
#endif // IREGIONSELECTOR_INEWROIDESCRIPTOR_H
diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/RegSelEnums.h b/DetectorDescription/IRegionSelector/IRegionSelector/RegSelEnums.h
index 6760b837c8f394465fb7ba102d131581bb2abc61..c29b50fbd56915f2dc104483ab818dbf8ecef03c 100644
--- a/DetectorDescription/IRegionSelector/IRegionSelector/RegSelEnums.h
+++ b/DetectorDescription/IRegionSelector/IRegionSelector/RegSelEnums.h
@@ -1,9 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef REGSELENUMS_H
-#define REGSELENUMS_H
+#ifndef IREGIONSELECTOR_REGSELENUMS_H
+#define IREGIONSELECTOR_REGSELENUMS_H
//! An enum to define Muon chambers names.
enum TYPEID{
diff --git a/DetectorDescription/IRegionSelector/IRegionSelector/RoiUtil.h b/DetectorDescription/IRegionSelector/IRegionSelector/RoiUtil.h
index fa3d0f02bbd6175d1135b82e8505cc8ff3b1ff3c..f5cb51664904c3b70cbab7e364150ce9e3470384 100644
--- a/DetectorDescription/IRegionSelector/IRegionSelector/RoiUtil.h
+++ b/DetectorDescription/IRegionSelector/IRegionSelector/RoiUtil.h
@@ -1,6 +1,6 @@
// emacs: this is -*- c++ -*-
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//
// @file RoiUtil.h
@@ -10,13 +10,10 @@
//
//
//
-// $Id: RoiUtil.h, v0.0 Sat 31 Oct 2015 09:55:29 CET sutt $
-#ifndef ROIUTIL_H
-#define ROIUTIL_H
-
-// #include "IRegionSelector/IRoiDescriptor.h"
+#ifndef IREGIONSELECTOR_ROIUTIL_H
+#define IREGIONSELECTOR_ROIUTIL_H
class IRoiDescriptor;
@@ -52,14 +49,4 @@ bool operator!=( const IRoiDescriptor& roi0, const IRoiDescriptor& roi1 );
-#endif // ROIUTIL_H
-
-
-
-
-
-
-
-
-
-
+#endif // IREGIONSELECTOR_ROIUTIL_H
diff --git a/DetectorDescription/RegSelSvcTest/CMakeLists.txt b/DetectorDescription/RegSelSvcTest/CMakeLists.txt
index 8928aa2dea0b440aaa55f621a63db1cb5f1d7c7a..46e1ca87091d04f12b5661cfae3f3834925dea67 100644
--- a/DetectorDescription/RegSelSvcTest/CMakeLists.txt
+++ b/DetectorDescription/RegSelSvcTest/CMakeLists.txt
@@ -6,38 +6,25 @@
atlas_subdir( RegSelSvcTest )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/IRegionSelector
- DetectorDescription/Identifier
+atlas_depends_on_subdirs( PRIVATE
GaudiKernel
- PRIVATE
+ DetectorDescription/IRegionSelector
Control/AthenaBaseComps
- Control/StoreGate
- Database/AthenaPOOL/AthenaPoolUtilities
- DetectorDescription/GeoModel/GeoModelInterfaces
- DetectorDescription/RegSelLUT
- InnerDetector/InDetConditions/InDetConditionsSummaryService
- Tools/PathResolver
Trigger/TrigEvent/TrigSteeringEvent
AtlasTest/TestTools )
# Component(s) in the package:
-atlas_add_library( RegSelSvcTestLib
- NO_PUBLIC_HEADERS
- src/*.cxx
- PRIVATE_LINK_LIBRARIES IRegionSelector Identifier GaudiKernel StoreGateLib SGtests AthenaBaseComps AthenaPoolUtilities RegSelLUT PathResolver TrigSteeringEvent )
-
atlas_add_component( RegSelSvcTest
- src/components/*.cxx
- LINK_LIBRARIES IRegionSelector Identifier GaudiKernel AthenaBaseComps StoreGateLib SGtests AthenaPoolUtilities RegSelLUT PathResolver TrigSteeringEvent RegionSelectorLib RegSelSvcTestLib )
+ src/*.cxx src/components/*.cxx
+ LINK_LIBRARIES GaudiKernel IRegionSelector AthenaBaseComps TrigSteeringEvent TestTools )
-atlas_add_test( RegSel_dump SCRIPT test/test_RegSel_dump.sh
- PROPERTIES TIMEOUT 1200
- )
+atlas_add_test( RegSel_dump
+ SCRIPT test/test_RegSel_dump.sh
+ PROPERTIES TIMEOUT 1200 )
-atlas_add_test( RegSel_mt SCRIPT test/test_RegSel_mt.sh
- PROPERTIES TIMEOUT 1200
- )
+atlas_add_test( RegSel_mt
+ SCRIPT test/test_RegSel_mt.sh
+ PROPERTIES TIMEOUT 1200 )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/DetectorDescription/RegSelSvcTest/share/testRegSelSvc.py b/DetectorDescription/RegSelSvcTest/share/testRegSelSvc.py
index 8a2451aa163c5337b952be6a9a1294cf9dea4942..be1b9917bde07736cc3bd338c7381b86f92445c9 100644
--- a/DetectorDescription/RegSelSvcTest/share/testRegSelSvc.py
+++ b/DetectorDescription/RegSelSvcTest/share/testRegSelSvc.py
@@ -8,27 +8,11 @@ DetFlags.pixel_setOn()
DetFlags.SCT_setOn()
DetFlags.Calo_setOn()
DetFlags.Muon_setOn()
-#DetFlags._setOn()
-#DetFlags._setOn()
-#DetFlags._setOn()
-#DetFlags._setOn()
include("TrigUpgradeTest/testHLT_MT.py")
-# from RegionSelector.RegSelSvcDefault import RegSelSvcDefault
-# from AthenaCommon.AppMgr import ServiceMgr
-
-# theRegSelSvc = RegSelSvcDefault("RegSelSvcDefault")
-# ServiceMgr += theRegSelSvc
-
-
-
-theApp.EvtMax = 1
-
-
-
-
from RegSelSvcTest.RegSelSvcTestConf import RegSelTestAlg
+from AthenaCommon.AppMgr import athAlgSeq
athAlgSeq += RegSelTestAlg()
athAlgSeq.RegSelTestAlg.OutputLevel=DEBUG
if "TestType" not in dir():
@@ -38,12 +22,3 @@ if TestType == "dump":
if TestType == "mt":
athAlgSeq.RegSelTestAlg.Mt=True
-
-
-
-
-
-
-
-
-
diff --git a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
index c483744ceddba0dc00f690bbac7ec0346650e4e2..402982fc97cbef33edc84cb69fb0b0fad9672b17 100644
--- a/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
+++ b/DetectorDescription/RegSelSvcTest/src/RegSelTestAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/Property.h"
@@ -12,8 +12,6 @@
RegSelTestAlg::RegSelTestAlg( const std::string& name,
ISvcLocator* pSvcLocator ) :
::AthReentrantAlgorithm( name, pSvcLocator ) {
- //declareProperty( "Property", m_nProperty );
-
}
RegSelTestAlg::~RegSelTestAlg()
diff --git a/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.cxx b/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.cxx
index d2e96bc3219084e89d502a8b7688ede00ffcb570..81a17bda06898bf8df3ddc8b78ad3a3dead40c50 100644
--- a/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.cxx
+++ b/Event/xAOD/xAODEventFormatCnv/src/EventFormatMetaDataTool.cxx
@@ -23,6 +23,8 @@ namespace xAODMaker {
const IInterface* parent )
: GenericMetadataToolNoAux <xAOD::EventFormat>(type,name,parent)
{
+ m_inputCollName="EventFormat";
+ m_outputCollName="EventFormat";
}
StatusCode EventFormatMetaDataTool::initialize() {
diff --git a/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx b/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx
index b9c293d6a2cfeb8a51ebbfd648ca4cf2b7b2291f..3d916bee953856ab315ffaf8a2ed195525ac06d1 100644
--- a/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx
+++ b/Event/xAOD/xAODTrigger/Root/TrigComposite_v1.cxx
@@ -199,8 +199,8 @@ namespace xAOD {
bool TrigComposite_v1::hasObjectLinkExact(const std::string& name, const uint32_t key, const uint16_t index, const uint32_t clid) const {
for (size_t i = 0; i < this->linkColNames().size(); ++i) {
if (this->linkColNames().at(i) != name) continue;
- if (this->linkColKeys().at(i) != key) continue;
- if (this->linkColIndices().at(i) != index) continue;
+ if (this->linkColKeysNoRemap().at(i) != key) continue;
+ if (this->linkColIndicesNoRemap().at(i) != index) continue;
if (this->linkColClids().at(i) != clid) continue;
return true;
}
@@ -214,13 +214,39 @@ namespace xAOD {
AUXSTORE_OBJECT_GETTER( TrigComposite_v1, std::vector< std::string >,
linkColNames )
- AUXSTORE_OBJECT_GETTER( TrigComposite_v1, std::vector< uint32_t >,
- linkColKeys )
- AUXSTORE_OBJECT_GETTER( TrigComposite_v1, std::vector< uint16_t >,
- linkColIndices )
AUXSTORE_OBJECT_GETTER( TrigComposite_v1, std::vector< uint32_t >,
linkColClids )
+ const std::vector< uint32_t >& TrigComposite_v1::linkColKeys() const {
+ if (isRemapped()) {
+ static const Accessor< std::vector< uint32_t > > acc_remap( "remap_linkColKeys" );
+ return acc_remap( *this );
+ }
+ static const Accessor< std::vector< uint32_t > > acc_builtin( "linkColKeys" );
+ return acc_builtin( *this );
+ }
+
+ const std::vector< uint16_t >& TrigComposite_v1::linkColIndices() const {
+ if (isRemapped()) {
+ static const Accessor< std::vector< uint16_t > > acc_remap( "remap_linkColIndices" );
+ return acc_remap( *this );
+ }
+ static const Accessor< std::vector< uint16_t > > acc_builtin( "linkColIndices" );
+ return acc_builtin( *this );
+ }
+
+ const std::vector< uint32_t >& TrigComposite_v1::linkColKeysNoRemap() const {
+ static const Accessor< std::vector< uint32_t > > acc( "linkColKeys" );
+ return acc( *this );
+ }
+
+ const std::vector< uint16_t >& TrigComposite_v1::linkColIndicesNoRemap() const {
+ static const Accessor< std::vector< uint16_t > > acc( "linkColIndices" );
+ return acc( *this );
+ }
+
+ ////////
+
std::vector< std::string >& TrigComposite_v1::linkColNamesNC() {
static const Accessor< std::vector< std::string > > acc( "linkColNames" );
@@ -314,18 +340,35 @@ namespace xAOD {
}
}
+ bool TrigComposite_v1::isRemapped() const {
+ static const Accessor< std::vector< uint32_t > > key_remap( "remap_linkColKeys" );
+ static const Accessor< std::vector< uint16_t > > index_remap( "remap_linkColIndices" );
+ size_t nDecorations = 0;
+ if (key_remap.isAvailable( *this )) ++nDecorations;
+ if (index_remap.isAvailable( *this )) ++nDecorations;
+ if (nDecorations == 1) {
+ throw std::runtime_error("TrigComposite_v1::isRemapped Only one of the 'remap_linkColKeys' and 'remap_linkColIndices' "
+ "decorations were found on this object. This should never happen, a remapped element link must have both of these collections.");
+ }
+ return static_cast<bool>(nDecorations); //0=Fasle, 2=True
+ }
+
+
//
/////////////////////////////////////////////////////////////////////////////
std::ostream& operator<<(std::ostream& os, const xAOD::TrigComposite_v1& tc) {
os << "TrigComposite_v1 name:'" << tc.name() << "'" << std::endl;
- os << " N Lnks:" << tc.linkColNames().size();
+ const bool isRemapped = tc.isRemapped();
+ os << " N Links:" << tc.linkColNames().size() << ", isRemapped:" << (isRemapped ? "YES" : "NO");
for (size_t i=0; i<tc.linkColNames().size(); ++i){
if (!i) os << std::endl;
os << " Link Name:" << tc.linkColNames()[i];
os << ", Key:" << tc.linkColKeys()[i];
+ if (isRemapped) os << ", OldKey:" << tc.linkColKeysNoRemap()[i];
os << ", Index:" << tc.linkColIndices()[i];
+ if (isRemapped) os << ", OldIndex:" << tc.linkColIndicesNoRemap()[i];
os << ", CLID:" << tc.linkColClids()[i];
if (i != tc.linkColNames().size() - 1) os << std::endl;
}
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h
index 54420895b95664410a65a3bd6d1467a063052713..434ec8485befeb1818bfa321b228765e412de1ca 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h
@@ -166,13 +166,22 @@ namespace xAOD {
/// Raw access to the persistent link names
const std::vector< std::string >& linkColNames() const;
- /// Raw access to the persistent link labels
+ /// Raw access to the persistent link labels. Will use remapped data, if available.
const std::vector< uint32_t >& linkColKeys() const;
- /// Raw access to the persistent link indices
+ /// Raw access to the persistent link indices. Will use remapped data, if available.
const std::vector< uint16_t >& linkColIndices() const;
/// Raw access to the persistent link CLIDs
const std::vector< uint32_t >& linkColClids() const;
+ /// Information on if linkColKeys() and linkColIndices() are able to access remapped link data
+ /// Remapping happens at the end of HLT execution when EDM objects are copied out of their per-EventView
+ /// containers and into the global Trigger EDM containers.
+ bool isRemapped() const;
+
+ /// Raw access to the persistent link labels. Will not attempt to access remapped link data.
+ const std::vector< uint32_t >& linkColKeysNoRemap() const;
+ /// Raw access to the persistent link indices. Will not attempt to access remapped link data.
+ const std::vector< uint16_t >& linkColIndicesNoRemap() const;
/// @}
diff --git a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc
index 3af13d04d63d733e37aa2339404b2a4af3c724ff..6c3bf8b4c6de0712f02818843b4768e7e4c4d1b0 100644
--- a/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc
+++ b/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.icc
@@ -119,9 +119,16 @@ namespace xAOD {
for( size_t i = 0; i < names.size(); ++i ) {
if( names[ i ] != name ) continue;
checkTypes< CONTAINER >(linkColClids()[ i ], name);
- // Construct the link:
- return ElementLink< CONTAINER >( linkColKeys()[ i ],
- linkColIndices()[ i ] );
+ // Construct the link. Try to remap, if remap collections are available:
+ ElementLink< CONTAINER > linkTryRemap( linkColKeys()[ i ],
+ linkColIndices()[ i ] );
+ if (linkTryRemap.isValid()) {
+ return linkTryRemap;
+ }
+
+ // Try again, without remapping
+ return ElementLink< CONTAINER >( linkColKeysNoRemap()[ i ],
+ linkColIndicesNoRemap()[ i ] );
}
// We didn't find the link. :-(
@@ -145,13 +152,19 @@ namespace xAOD {
// Check that it is of the right type:
checkTypes< DataVector< OBJECT > >(linkColClids()[ i ], name);
// Create a temporary ElementLink:
- ElementLink< DataVector< OBJECT > > link( linkColKeys()[ i ],
- linkColIndices()[ i ] );
- if( ! link.isValid() ) {
- return 0;
+ ElementLink< DataVector< OBJECT > > linkTryRemap( linkColKeys()[ i ],
+ linkColIndices()[ i ] );
+ if( linkTryRemap.isValid() ) {
+ return *linkTryRemap;
+ }
+
+ // This time forbid remapping
+ ElementLink< DataVector< OBJECT > > link( linkColKeysNoRemap()[ i ],
+ linkColIndicesNoRemap()[ i ] );
+
+ if( link.isValid() ) {
+ return *link;
}
- // Get the pointer:
- return *link;
}
// There was an internal error. :-(
diff --git a/HLT/Event/ByteStreamEmonSvc/ATLAS_CHECK_THREAD_SAFETY b/HLT/Event/ByteStreamEmonSvc/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..8cd37da83a1331d2fe7220bdd78450a4ffe2d556
--- /dev/null
+++ b/HLT/Event/ByteStreamEmonSvc/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+HLT/Event/ByteStreamEmonSvc
diff --git a/HLT/Event/ByteStreamEmonSvc/ByteStreamEmonSvc/ByteStreamEmonInputSvc.h b/HLT/Event/ByteStreamEmonSvc/ByteStreamEmonSvc/ByteStreamEmonInputSvc.h
deleted file mode 100644
index f3446fee8ae3e5dbe1b0143cfc901bff48b4da15..0000000000000000000000000000000000000000
--- a/HLT/Event/ByteStreamEmonSvc/ByteStreamEmonSvc/ByteStreamEmonInputSvc.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// this is -*- C++ -*-
-
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef BYTESTREAMCNVSVC_BYTESTREAMEVENTSTORAGEINPUTSVC_H
-#define BYTESTREAMCNVSVC_BYTESTREAMEVENTSTORAGEINPUTSVC_H
-
-/**
- @class ByteStreamEmonInputSvc
- @brief implements the interface ByteStreamInputSvc for reading events
- from emon.
-
-*/
-
-// Include files.
-#include "ByteStreamCnvSvc/ByteStreamInputSvc.h"
-#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
-#include "ByteStreamData/RawEvent.h"
-#include "GaudiKernel/IIncidentListener.h"
-#include "GaudiKernel/ServiceHandle.h"
-
-// To avoid compiler warning
-#undef PACKAGE_VERSION
-#include "emon/EventIterator.h"
-
-#include <vector>
-#include <stdint.h>
-#include <memory>
-
-#include <boost/regex.hpp>
-
-class ITHistSvc;
-class OHRootProvider;
-class StoreGateSvc;
-
-class ByteStreamEmonInputSvc: public ByteStreamInputSvc, public virtual IIncidentListener {
-public:
-
- /// Constructors:
- ByteStreamEmonInputSvc(const std::string& name, ISvcLocator* svcloc);
-
- /// Destructor.
- virtual ~ByteStreamEmonInputSvc();
-
- virtual StatusCode initialize();
- virtual StatusCode finalize();
-
- /// Implementation of the ByteStreamInputSvc interface methods.
- virtual const RawEvent* previousEvent();
- virtual const RawEvent* nextEvent();
-
- /// Implementation of the ByteStreamInputSvc interface methods.
- virtual const RawEvent* currentEvent() const;
-
-public: // IIncidentListener
- virtual void handle(const Incident&);
-
-private:
-
- bool getIterator();
- void check_publish();
- void get_runparams();
-
- void updateHandler(Property& p);
-
- int m_totalEventCounter; //!< event Counter
-
- RawEvent* m_re; //!< current event
-
- // Properties
- std::string m_partition; //!< Partition name
- std::string m_key; //!< Emon key, e.g. "SFI"
- std::vector<std::string> m_value; //!< Emon values, e.g. "SFI-1", if empty, all SFIs
- unsigned int m_key_count; //!< Emon key count, e.g. 5 to get five random SFIs
- std::string m_publish; //!< Name to publish histograms under
- bool m_exit; //!< Exit if partition shuts down (default: false)
- std::string m_is_server; //!< Name of IS server to publish to
- std::string m_include; //!< Regexpression of histograms to publish
- std::string m_exclude; //!< Regexpression of histograms not to publish
- int m_frequency; //!< After how many events to publish
- int m_updatePeriod; //!< After how many seconds to publish
- float m_updatePeriodRange; //!< Percentage of update window where allowed to publish.
- bool m_clearHistograms; //!< Clear histograms for each new run (default: true)
- std::vector<std::string> m_l1names; //!< Level 1 names
- std::vector<unsigned int> m_l1items; //!< Level 1 items, as a numerical list
- std::string m_l1logic; //!< One of: 'Or', 'And', 'Ignore' (default: Ignore)
- std::string m_l1origin; //!< One of: 'TBP', 'TAP', 'TAV'
- std::string m_stream_type; //!< HLT stream type (physics or calibration)
- std::vector<std::string> m_stream_names; //!< HLT stream names
- std::string m_stream_logic; //!< One of 'Or', 'And', 'Ignore' (default: Ignore)
-
- unsigned int m_trigger_type; //!< LVL1 8 bit trigger type
- std::string m_groupName; //!< GroupName
- unsigned int m_buffer_size; //!< Number of events buffered internally.
- bool m_readDetectorMask; //!< Read detector mask and run params from IS
- int m_timeout; //!< Timeout in seconds, -1 == infinite
- bool m_corrupted_events; //!< process corrupted events ?
- std::string m_state;
-
- // internal
- bool m_connect;
- std::auto_ptr<emon::EventIterator> m_eventIt; //!< Event iterator
-
- ITHistSvc *m_histSvc;
- OHRootProvider *m_provider;
-
- boost::regex m_include_rex;
- boost::regex m_exclude_rex;
-
- int m_frequency_counter;
-
- int m_publish_target;
-
- /// Reference to StoreGateSvc;
- ServiceHandle<StoreGateSvc> m_inputMetaDataStore;
- ServiceHandle<StoreGateSvc> m_sgSvc;
- ServiceHandle<IROBDataProviderSvc> m_robProvider;
-
-};
-
-#endif
diff --git a/HLT/Event/ByteStreamEmonSvc/CMakeLists.txt b/HLT/Event/ByteStreamEmonSvc/CMakeLists.txt
index 47b3ff72b4e546404ec7e64513aa69edbb377cf5..c4b52c06a6d9dd477349167011123b3f5f04388d 100644
--- a/HLT/Event/ByteStreamEmonSvc/CMakeLists.txt
+++ b/HLT/Event/ByteStreamEmonSvc/CMakeLists.txt
@@ -6,33 +6,26 @@
atlas_subdir( ByteStreamEmonSvc )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
+atlas_depends_on_subdirs( PRIVATE
+ GaudiKernel
+ Event/ByteStreamCnvSvcBase
Event/ByteStreamCnvSvc
Event/ByteStreamData
- GaudiKernel
- PRIVATE
+ Event/EventInfo
+ Control/CxxUtils
Control/StoreGate
- Database/PersistentDataModel
- Event/ByteStreamCnvSvcBase
- Event/EventInfo )
+ Database/PersistentDataModel )
+
# External dependencies:
find_package( Boost COMPONENTS filesystem thread system )
find_package( tdaq COMPONENTS emon ohroot owl is omniORB4 omnithread oh )
# Component(s) in the package:
-atlas_add_library( ByteStreamEmonSvcLib
- src/ByteStreamEmonInputSvc.cxx
- PUBLIC_HEADERS ByteStreamEmonSvc
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${TDAQ_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${TDAQ_LIBRARIES} ByteStreamData GaudiKernel ByteStreamCnvSvcLib ByteStreamData_test StoreGateLib SGtests ByteStreamCnvSvcBaseLib
- PRIVATE_LINK_LIBRARIES PersistentDataModel EventInfo )
-
atlas_add_component( ByteStreamEmonSvc
- src/components/*.cxx
+ src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS} ${TDAQ_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${TDAQ_LIBRARIES} ByteStreamCnvSvcLib ByteStreamData ByteStreamData_test GaudiKernel StoreGateLib SGtests PersistentDataModel ByteStreamCnvSvcBaseLib EventInfo ByteStreamEmonSvcLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} ${TDAQ_LIBRARIES} ByteStreamCnvSvcLib ByteStreamData GaudiKernel StoreGateLib PersistentDataModel ByteStreamCnvSvcBaseLib EventInfo )
# Install files from the package:
atlas_install_joboptions( share/*.py )
-
diff --git a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
index 5f240375d95c1a76140cd65ed8e3ecc0c842ba3b..8c74554ddaf893243569d17f35bbdd8e3d8e3f52 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
+++ b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//===================================================================
@@ -7,15 +7,12 @@
//===================================================================
// Include files.
-#include "ByteStreamEmonSvc/ByteStreamEmonInputSvc.h"
+#include "ByteStreamEmonInputSvc.h"
-#include "GaudiKernel/MsgStream.h"
#include "eformat/Version.h"
#include "eformat/HeaderMarker.h"
#include "eformat/DetectorMask.h"
-#include "GaudiKernel/IIncidentSvc.h"
-
#include "GaudiKernel/ITHistSvc.h"
#include "oh/OHRootProvider.h"
@@ -24,7 +21,8 @@
#include "StoreGate/StoreGateSvc.h"
#include "EventInfo/EventInfo.h"
#include "ByteStreamData/ByteStreamMetadata.h"
-#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
+#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
+#include "CxxUtils/checker_macros.h"
#include "PersistentDataModel/DataHeader.h"
#include "rc/RunParamsNamed.h"
@@ -37,15 +35,14 @@
namespace {
-
// pure madness...
#define PARSE_ITEM(z, n, unused) \
{ \
- vector<string> result; \
- split(result, l1info.Item##n, algorithm::is_space()); \
+ std::vector<std::string> result; \
+ split(result, l1info.Item##n, boost::algorithm::is_space()); \
if(!result.empty()) { \
- trim_if(result[0], algorithm::is_any_of("'")); \
+ boost::trim_if(result[0], boost::algorithm::is_any_of("'")); \
l1map[result[0]] = n; \
} \
}
@@ -53,10 +50,7 @@ namespace {
std::map<std::string,int>
convert_names_bits(const ByteStreamEmon::TrigConfL1ItemsNamed& l1info)
{
- using namespace std;
- using namespace boost;
-
- map<string,int> l1map;
+ std::map<std::string,int> l1map;
BOOST_PP_REPEAT(256, PARSE_ITEM, ~)
return l1map;
}
@@ -66,7 +60,7 @@ namespace {
namespace {
- void handle_terminate(int)
+ void handle_terminate ATLAS_NOT_THREAD_SAFE (int)
{
// online wants
::exit(0);
@@ -74,85 +68,20 @@ namespace {
}
// Constructor.
-ByteStreamEmonInputSvc::ByteStreamEmonInputSvc(const std::string& name, ISvcLocator* svcloc)
- :
- ByteStreamInputSvc(name,svcloc),
- m_totalEventCounter(0),
- m_re(0),
- m_key_count(0),
- m_publish("Athena"),
- m_exit(false),
- m_frequency(60),
- m_updatePeriod(0),
- m_updatePeriodRange(0.2),
- m_clearHistograms(true),
- m_l1logic("Ignore"),
- m_l1origin("TAV"),
- m_stream_type("physics"),
- m_stream_logic("Ignore"),
- m_trigger_type(256),
- m_buffer_size(2),
- m_readDetectorMask(true),
- m_timeout(3600000),
- m_corrupted_events(false),
- m_state("None"),
- m_connect(false),
- m_histSvc(0),
- m_provider(0),
- m_frequency_counter(60),
- m_publish_target(0),
+ByteStreamEmonInputSvc::ByteStreamEmonInputSvc(const std::string& name, ISvcLocator* svcloc) :
+ ByteStreamInputSvc(name,svcloc),
m_inputMetaDataStore("StoreGateSvc/InputMetaDataStore", name ),
m_sgSvc("StoreGateSvc", name),
m_robProvider("ROBDataProviderSvc", name)
{
-
- declareProperty("Partition", m_partition, "Partitin name, default taken from $TDAQ_PARTITION if not set")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("Key", m_key , "EMON Selection key, e.g. SFI")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("KeyValue", m_value, "EMON key values, e.g. [SFI-1, SFI-2]; if empty all SFIs")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("KeyCount", m_key_count, "EMON key count, e.g. 5 to get five random SFIs")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("ExitOnPartitionShutdown", m_exit, "If true, exit if partition shuts down")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("ISServer", m_is_server ,"IS Server to publish histograms to")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("PublishName", m_publish, "Name under which to publish histograms")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("Include", m_include, "Regular expression to select histograms to publish")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("Exclude", m_exclude, "Regular expression to select histograms not to publish")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("Frequency", m_frequency, "Frequency (in number of events) of publishing histograms")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("UpdatePeriod", m_updatePeriod, "Frequency (in secods) of publishing histograms")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("UpdatePeriodRange", m_updatePeriodRange, "A percentage number to determine how close we have to be to the next update time to publish now");
- declareProperty("ClearHistograms", m_clearHistograms, "If true, clear histograms when new run starts (default: True)")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("LVL1Names", m_l1names, "A list of L1 bit names")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("LVL1Items", m_l1items, "A list of L1 bit numbers")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("LVL1Logic", m_l1logic, "'And', 'Or' or 'Ignore' (default: Ignore)")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("LVL1Origin", m_l1origin, "TBP, TAP, TAV (default: TAV")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("StreamType", m_stream_type, "HLT stream type (e.g. physics or calibration)")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("StreamNames", m_stream_names, "List of HLT stream names")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("StreamLogic", m_stream_logic, "'And', 'Or' or 'Ignore' (default: Ignore)")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
-
- declareProperty("TriggerType", m_trigger_type, "LVL1 8 bit trigger type")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
-
- declareProperty("GroupName", m_groupName, "Name of the monitoring group")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("BufferSize", m_buffer_size, "Number of buffers");
- declareProperty("ReadDetectorMaskFromIS", m_readDetectorMask, "Read detector mask from IS");
- declareProperty("Timeout", m_timeout, "Timeout in seconds, -1 == infinity")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("ProcessCorruptedEvents", m_corrupted_events, "Process corrupted events not passing check_tree()")->declareUpdateHandler(&ByteStreamEmonInputSvc::updateHandler, this);
- declareProperty("State",m_state,"Read-only property showing the state");
-}
-
-// Destructor.
-ByteStreamEmonInputSvc::~ByteStreamEmonInputSvc()
-{
- delete m_re;
}
// Open the first input file and read the first event.
StatusCode ByteStreamEmonInputSvc::initialize()
{
-
setProperty("State", "Init");
- StatusCode sc = ByteStreamInputSvc::initialize();
- if(!sc.isSuccess()) return sc;
-
- MsgStream log(msgSvc(), name() );
+ ATH_CHECK( ByteStreamInputSvc::initialize() );
// check properties
if(m_partition.empty() && getenv("TDAQ_PARTITION") != 0) {
@@ -160,23 +89,23 @@ StatusCode ByteStreamEmonInputSvc::initialize()
}
if(m_partition.empty()){
- log << MSG::ERROR << " initialize: No partition name specified" << endmsg;
+ ATH_MSG_ERROR("initialize: No partition name specified");
return StatusCode::FAILURE;
}
if(m_key.empty()) {
- log << MSG::ERROR << " initialize: No emon key " <<endmsg;
+ ATH_MSG_ERROR("initialize: No emon key ");
return StatusCode::FAILURE;
}
m_connect = true;
if (service("THistSvc", m_histSvc, true).isFailure()) {
- log << MSG::ERROR << "Unable to locate THistSvc" << endmsg;
+ ATH_MSG_ERROR("Unable to locate THistSvc");
m_is_server.clear();
} else {
- if(!m_include.empty()) m_include_rex = m_include;
- if(!m_exclude.empty()) m_exclude_rex = m_exclude;
+ if(!m_include.empty()) m_include_rex = m_include.value();
+ if(!m_exclude.empty()) m_exclude_rex = m_exclude.value();
if(m_frequency < 0) m_frequency = 100000;
m_frequency_counter = m_frequency;
@@ -189,67 +118,41 @@ StatusCode ByteStreamEmonInputSvc::initialize()
}
}
- {
- // register incident handler for begin run
- IIncidentSvc* incsvc;
-
- if (StatusCode::SUCCESS!=service("IncidentSvc",incsvc)) {
- log << MSG::FATAL << "Incident service not found" << endmsg;
- return StatusCode::FAILURE;
- }
-
- long int prio = 100;
- incsvc->addListener(this,"BeginRun", prio);
- }
-
//-------------------------------------------------------------------------
// Setup the InputMetaDataStore
//-------------------------------------------------------------------------
- sc = m_inputMetaDataStore.retrieve();
- if( !sc.isSuccess() ) {
- log << MSG::FATAL << "Error retrieving InputMetaDataStore"+m_inputMetaDataStore << endmsg;
- return sc;
- }
-
- if(!m_robProvider.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Cannot get rob data provider");
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( m_inputMetaDataStore.retrieve() );
+ ATH_CHECK( m_robProvider.retrieve() );
signal(SIGTERM, handle_terminate);
- log << MSG::INFO << " initialized for: " << m_partition << " " << m_key << "/" << m_value << endmsg;
+ ATH_MSG_INFO("initialized for: " << m_partition << " " << m_key << "/" << m_value);
return StatusCode::SUCCESS;
}
bool ByteStreamEmonInputSvc::getIterator()
{
- using namespace std;
-
- MsgStream log(msgSvc(), name() );
setProperty("State", "Init");
- // log << MSG::INFO << "getIterator(): " << m_partition << endmsg;
-
if(!IPCCore::isInitialised()) {
- static char *argv[2] = { 0 };
- int argc = 0;
- IPCCore::init(argc, argv);
+ char* argv[2] = { 0 };
+ int argc = 0;
+ IPCCore::init(argc, argv);
}
IPCPartition partition(m_partition);
while(!partition.isValid()) {
- if(m_exit) {
- log << MSG::ERROR << "No such partition: " << m_partition << endmsg;
- return false;
- }
- log << MSG::INFO << "No such partition (yet?): " << m_partition << endmsg;
+ if(m_exit) {
+ ATH_MSG_ERROR("No such partition: " << m_partition);
+ return false;
+ }
+ ATH_MSG_INFO("No such partition (yet?): " << m_partition);
sleep(20);
}
delete m_provider;
- m_provider = 0;
+ m_provider = nullptr;
std::auto_ptr<emon::SamplingAddress> address;
@@ -278,7 +181,7 @@ bool ByteStreamEmonInputSvc::getIterator()
} else if(m_l1origin == "TAV") {
l1_origin = emon::origin::AFTER_VETO;
} else {
- log << MSG::FATAL << "Invalid L1 origin" << endmsg;
+ ATH_MSG_FATAL("Invalid L1 origin");
}
if(m_stream_logic == "Or") {
@@ -292,7 +195,7 @@ bool ByteStreamEmonInputSvc::getIterator()
// now put together the bit mask from all
// three sources: l1 bit mask, l1 names, l1 items
- vector<unsigned short> l1bits(m_l1items.begin(), m_l1items.end());
+ std::vector<unsigned short> l1bits(m_l1items.begin(), m_l1items.end());
// if names are given, try to read information from IS.
if(m_l1names.size() > 0) {
@@ -305,22 +208,20 @@ bool ByteStreamEmonInputSvc::getIterator()
retry = false;
} catch(...) {
// might not exist yet...
- log << MSG::INFO << "No L1CT information, waiting 5 sec" << endmsg;
+ ATH_MSG_INFO("No L1CT information, waiting 5 sec");
sleep(5);
}
}
// Now translate names into bits.
- map<string,int> l1mapping = convert_names_bits(l1info);
+ std::map<std::string,int> l1mapping = convert_names_bits(l1info);
- for(vector<string>::const_iterator it = m_l1names.begin();
- it != m_l1names.end();
- ++it) {
- if(l1mapping.find(*it) == l1mapping.end()) {
- log << MSG::ERROR << "Invalid L1 name in trigger mask: " << *it << endmsg;
+ for(const std::string& l1name : m_l1names) {
+ if(l1mapping.find(l1name) == l1mapping.end()) {
+ ATH_MSG_ERROR("Invalid L1 name in trigger mask: " << l1name);
continue;
}
- int bit = l1mapping[*it];
+ int bit = l1mapping[l1name];
l1bits.push_back(bit);
}
}
@@ -340,21 +241,21 @@ bool ByteStreamEmonInputSvc::getIterator()
while (true) {
if (partition.name() != m_partition) {
- log << MSG::INFO << "Partition name changed - reconnecting to " << m_partition << endmsg;
+ ATH_MSG_INFO("Partition name changed - reconnecting to " << m_partition);
return getIterator();
}
try {
m_eventIt.reset(0);
- m_eventIt.reset(new emon::EventIterator(partition, *address, criteria, m_buffer_size, m_groupName));
+ m_eventIt.reset(new emon::EventIterator(partition, *address, criteria, m_buffer_size, m_groupName));
if(m_readDetectorMask) {
get_runparams();
}
setProperty("State", "Connected");
return true;
} catch(ers::Issue& ex) {
- log << MSG::INFO << "Cannot connect to sampler (will wait 20s): " << m_key << "/" << m_value
- << " Reason: " << ex.what() << endmsg;
+ ATH_MSG_INFO("Cannot connect to sampler (will wait 20s): " << m_key << "/" << m_value
+ << " Reason: " << ex.what());
sleep(20);
}
}
@@ -363,43 +264,36 @@ bool ByteStreamEmonInputSvc::getIterator()
// Read previous event should not be called for this version of input svc
const RawEvent* ByteStreamEmonInputSvc::previousEvent()
{
- MsgStream log(msgSvc(), name() );
- log << MSG::WARNING << "previousEvent not implemented for ByteStreamEmonInputSvc" << endmsg;
+ ATH_MSG_WARNING("previousEvent not implemented for ByteStreamEmonInputSvc");
- return 0;
+ return nullptr;
}
// Read the next event.
const RawEvent* ByteStreamEmonInputSvc::nextEvent()
{
- MsgStream log(msgSvc(), name() );
-
if (m_re) {
- OFFLINE_FRAGMENTS_NAMESPACE::PointerType st = 0;
+ OFFLINE_FRAGMENTS_NAMESPACE::PointerType st = nullptr;
m_re->start(st);
if (st) delete [] st;
- delete m_re;
- m_re = 0 ;
+ m_re.reset();
}
- // log << MSG::INFO << " nextEvent()" << endmsg;
-
- while(m_re == 0) {
+ while(m_re == nullptr) {
if(m_connect) {
if(!getIterator()) {
- // log << MSG::WARNING << "No iterator..." << endmsg;
- return 0;
+ return nullptr;
} else {
- log << MSG::INFO << "Got sampler..." << endmsg;
+ ATH_MSG_INFO("Got sampler...");
m_connect = false;
}
}
emon::Event event;
try {
- unsigned int timeout = m_timeout;
+ int timeout = m_timeout;
if(m_updatePeriod) {
// try to hit lower end of update period
timeout = (m_publish_target - time(0) - int(m_updatePeriodRange * m_updatePeriod)) * 1000;
@@ -408,7 +302,7 @@ const RawEvent* ByteStreamEmonInputSvc::nextEvent()
event = m_eventIt->nextEvent(timeout);
} catch(emon::NoMoreEvents& ex) {
if(m_exit) {
- return 0;
+ return nullptr;
}
check_publish();
continue;
@@ -425,30 +319,29 @@ const RawEvent* ByteStreamEmonInputSvc::nextEvent()
if (buf[0] == eformat::FULL_EVENT) {
- // We got a full levent
- m_re = new RawEvent(buf);
+ // We got a full event
+ m_re = std::make_unique<RawEvent>(buf);
try {
m_re->check_tree();
- log << MSG::INFO << "nextEvent: Got valid fragment of size:" << event.size() << endmsg;
- m_robProvider->setNextEvent(m_re);
+ ATH_MSG_INFO("nextEvent: Got valid fragment of size:" << event.size());
+ m_robProvider->setNextEvent(m_re.get());
m_robProvider->setEventStatus(0);
} catch (ers::Issue& ex) {
// log in any case
- log << MSG::ERROR << "nextEvent: Invalid event fragment" << endmsg;
+ ATH_MSG_ERROR("nextEvent: Invalid event fragment");
if(!m_corrupted_events) {
delete [] buf;
- delete m_re;
- m_re = 0;
+ m_re.reset();
continue;
} // else fall through
}
} else {
// We got something we didn't expect.
- log << MSG::ERROR << "nextEvent: Got invalid fragment of unknown type: 0x"
- << std::hex << buf[0] << std::dec << endmsg;
+ ATH_MSG_ERROR("nextEvent: Got invalid fragment of unknown type: 0x"
+ << std::hex << buf[0] << std::dec);
delete [] buf;
continue;
}
@@ -482,20 +375,18 @@ const RawEvent* ByteStreamEmonInputSvc::nextEvent()
// we got an event, check if we have to publish
check_publish();
- return m_re;
+ return m_re.get();
}
// Get a pointer to the current event.
const RawEvent* ByteStreamEmonInputSvc::currentEvent() const
{
- return m_re;
+ return m_re.get();
}
void ByteStreamEmonInputSvc::check_publish()
{
- using namespace std;
-
// is a server specified ?
if(m_is_server.empty()) return;
@@ -517,8 +408,7 @@ void ByteStreamEmonInputSvc::check_publish()
}
// do NOT publish, but print a warning
- MsgStream log(msgSvc(), name() );
- log << MSG::WARNING << " check_publish: missed " << missed_publications << " publications to OH" << endmsg;
+ ATH_MSG_WARNING(" check_publish: missed " << missed_publications << " publications to OH");
return;
}
@@ -531,35 +421,31 @@ void ByteStreamEmonInputSvc::check_publish()
try {
- if(m_provider == 0) {
- IPCPartition part(m_partition);
- if(!part.isValid()) return;
- // might throw...
- m_provider = new OHRootProvider(part, m_is_server, m_publish);
- }
+ if(m_provider == nullptr) {
+ IPCPartition part(m_partition);
+ if(!part.isValid()) return;
+ // might throw...
+ m_provider = new OHRootProvider(part, m_is_server, m_publish);
+ }
- vector<string> histnames = m_histSvc->getHists();
- for(vector<string>::iterator it = histnames.begin();
- it != histnames.end();
- ++it) {
+ for(const std::string name : m_histSvc->getHists()) {
- if(!m_include.empty() && !regex_match(*it, m_include_rex)) {
- continue;
- }
+ if(!m_include.empty() && !regex_match(name, m_include_rex)) {
+ continue;
+ }
- if(!m_exclude.empty() && regex_match(*it, m_exclude_rex)) {
- continue;
- }
+ if(!m_exclude.empty() && regex_match(name, m_exclude_rex)) {
+ continue;
+ }
- TH1 *h = 0;
- if(m_histSvc->getHist(*it, h)) {
- // might throw...
- m_provider->publish(*h, *it);
- };
- }
+ TH1 *h = nullptr;
+ if(m_histSvc->getHist(name, h)) {
+ // might throw...
+ m_provider->publish(*h, name);
+ };
+ }
} catch (daq::oh::Exception& ex) {
- MsgStream log(msgSvc(), name() );
- log << MSG::ERROR << ex.what() << endmsg;
+ ATH_MSG_ERROR(ex.what());
}
m_publish_target += m_updatePeriod;
@@ -567,18 +453,13 @@ void ByteStreamEmonInputSvc::check_publish()
void ByteStreamEmonInputSvc::get_runparams()
{
- using namespace std;
-
- MsgStream log(msgSvc(), name() );
-
IPCPartition p(m_partition);
RunParamsNamed runParams(p, "RunParams.RunParams");
try {
runParams.checkout();
-
- eformat::helper::DetectorMask mask(runParams.det_mask);
+ eformat::helper::DetectorMask mask(runParams.det_mask);
ByteStreamMetadata* metadata = new ByteStreamMetadata( runParams.run_number,
0,
@@ -588,53 +469,42 @@ void ByteStreamEmonInputSvc::get_runparams()
mask.serialize().second,
runParams.beam_type,
runParams.beam_energy,
- std::string(),
- std::string(""),
- runParams.T0_project_tag,
- 0,
- std::vector<std::string>() );
+ {},
+ {},
+ runParams.T0_project_tag,
+ 0,
+ {} );
m_inputMetaDataStore->clearStore().ignore();
-
-
if (m_inputMetaDataStore->record(metadata,"ByteStreamMetadata").isFailure()) {
delete metadata;
- metadata = 0;
- log << MSG::WARNING << " Unable to record MetaData in InputMetaDataStore." << endmsg;
+ metadata = nullptr;
+ ATH_MSG_WARNING(" Unable to record MetaData in InputMetaDataStore.");
} else {
- log << MSG::INFO << " Recorded MetaData in InputMetaDataStore." << endmsg;
+ ATH_MSG_INFO(" Recorded MetaData in InputMetaDataStore.");
}
} catch(ers::Issue& ex) {
- log << MSG::ERROR << "Cannot get run parameters:" << ex.what() << endmsg;
+ ATH_MSG_ERROR("Cannot get run parameters:" << ex.what());
}
}
-//
-// BeginRun incident handler
-//
-void ByteStreamEmonInputSvc::handle(const Incident& /* incident */)
+// start of run
+StatusCode ByteStreamEmonInputSvc::start()
{
- using namespace std;
-
- MsgStream log(msgSvc(), name() );
-
if(m_readDetectorMask) {
get_runparams();
}
if(m_clearHistograms) {
- log << MSG::INFO << "Resetting histograms at BeginRun incidient" << endmsg;
- vector<string> histnames = m_histSvc->getHists();
- for(vector<string>::iterator it = histnames.begin();
- it != histnames.end();
- ++it) {
-
- TH1 *h = 0;
- if(m_histSvc->getHist(*it, h)) {
+ ATH_MSG_INFO("Resetting histograms...");
+ for(const std::string& name : m_histSvc->getHists()) {
+ TH1 *h = nullptr;
+ if(m_histSvc->getHist(name, h)) {
h->Reset();
};
- }
+ }
}
+ return StatusCode::SUCCESS;
}
void ByteStreamEmonInputSvc::updateHandler(Property& /* p */)
diff --git a/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h
new file mode 100644
index 0000000000000000000000000000000000000000..74d49d7931c025d025e760ddca90acc39eaf11ed
--- /dev/null
+++ b/HLT/Event/ByteStreamEmonSvc/src/ByteStreamEmonInputSvc.h
@@ -0,0 +1,112 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef BYTESTREAMCNVSVC_BYTESTREAMEVENTSTORAGEINPUTSVC_H
+#define BYTESTREAMCNVSVC_BYTESTREAMEVENTSTORAGEINPUTSVC_H
+
+/**
+ @class ByteStreamEmonInputSvc
+ @brief implements the interface ByteStreamInputSvc for reading events
+ from emon.
+
+*/
+
+// Include files.
+#include "ByteStreamCnvSvc/ByteStreamInputSvc.h"
+#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
+#include "ByteStreamData/RawEvent.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "GaudiKernel/ITHistSvc.h"
+
+// To avoid compiler warning
+#include "emon/EventIterator.h"
+
+#include <vector>
+#include <stdint.h>
+#include <memory>
+
+#include <boost/regex.hpp>
+
+class OHRootProvider;
+class StoreGateSvc;
+
+class ByteStreamEmonInputSvc: public ByteStreamInputSvc {
+public:
+
+ /// Constructors:
+ ByteStreamEmonInputSvc(const std::string& name, ISvcLocator* svcloc);
+
+ virtual StatusCode initialize() override;
+ virtual StatusCode start() override;
+ virtual StatusCode finalize() override;
+
+ /// Implementation of the ByteStreamInputSvc interface methods.
+ virtual const RawEvent* previousEvent() override;
+ virtual const RawEvent* nextEvent() override;
+
+ /// Implementation of the ByteStreamInputSvc interface methods.
+ virtual const RawEvent* currentEvent() const override;
+
+private:
+
+ bool getIterator();
+ void check_publish();
+ void get_runparams();
+
+ void updateHandler(Property& p);
+
+ int m_totalEventCounter{0}; //!< event Counter
+
+ std::unique_ptr<RawEvent> m_re{nullptr}; //!< current event
+
+ // Properties
+ Gaudi::Property<std::string> m_partition{this, "Partition", {}, "Partition name, default taken from $TDAQ_PARTITION if not set"};
+ Gaudi::Property<std::string> m_key{this, "Key", {}, &ByteStreamEmonInputSvc::updateHandler, "EMON Selection key, e.g. SFI"};
+ Gaudi::Property<std::vector<std::string>> m_value{this, "KeyValue", {}, &ByteStreamEmonInputSvc::updateHandler, "EMON key values, e.g. [SFI-1, SFI-2]; if empty all SFIs"};
+ Gaudi::Property<unsigned int> m_key_count{this, "KeyCount", 0, &ByteStreamEmonInputSvc::updateHandler, "EMON key count, e.g. 5 to get five random SFIs"};
+ Gaudi::Property<std::string> m_publish{this, "PublishName", "Athena", &ByteStreamEmonInputSvc::updateHandler, "Name under which to publish histograms"};
+ Gaudi::Property<bool> m_exit {this, "ExitOnPartitionShutdown", false, &ByteStreamEmonInputSvc::updateHandler, "If true, exit if partition shuts down"};
+ Gaudi::Property<std::string> m_is_server{this, "ISServer", "", &ByteStreamEmonInputSvc::updateHandler, "IS Server to publish histograms to"};
+ Gaudi::Property<std::string> m_include{this, "Include", {}, &ByteStreamEmonInputSvc::updateHandler, "Regular expression to select histograms to publish"};
+ Gaudi::Property<std::string> m_exclude{this, "Exclude", {}, &ByteStreamEmonInputSvc::updateHandler, "Regular expression to select histograms not to publish"};
+ Gaudi::Property<int> m_frequency{this, "Frequency", 60, &ByteStreamEmonInputSvc::updateHandler, "Frequency (in number of events) of publishing histograms"};
+ Gaudi::Property<int> m_updatePeriod{this, "UpdatePeriod", 0, &ByteStreamEmonInputSvc::updateHandler, "Frequency (in seconds) of publishing histograms"};
+ Gaudi::Property<float> m_updatePeriodRange{this, "UpdatePeriodRange", 0.2, "A percentage number to determine how close we have to be to the next update time to publish now"};
+ Gaudi::Property<bool> m_clearHistograms{this, "ClearHistograms", true, &ByteStreamEmonInputSvc::updateHandler, "If true, clear histograms when new run starts (default: True)"};
+ Gaudi::Property<std::vector<std::string>> m_l1names{this, "LVL1Names", {}, &ByteStreamEmonInputSvc::updateHandler, "A list of L1 bit names"};
+ Gaudi::Property<std::vector<unsigned int>> m_l1items{this, "LVL1Items", {}, &ByteStreamEmonInputSvc::updateHandler, "A list of L1 bit numbers"};
+ Gaudi::Property<std::string> m_l1logic{this, "LVL1Logic", "Ignore", &ByteStreamEmonInputSvc::updateHandler, "'And', 'Or' or 'Ignore' (default: Ignore)"};
+ Gaudi::Property<std::string> m_l1origin{this, "LVL1Origin", "TAV", &ByteStreamEmonInputSvc::updateHandler, "TBP, TAP, TAV (default: TAV"};
+ Gaudi::Property<std::string> m_stream_type{this, "StreamType", "physics", &ByteStreamEmonInputSvc::updateHandler, "HLT stream type (e.g. physics or calibration)"};
+ Gaudi::Property<std::vector<std::string>> m_stream_names{this, "StreamNames", {}, &ByteStreamEmonInputSvc::updateHandler, "List of HLT stream names"};
+ Gaudi::Property<std::string> m_stream_logic{this, "StreamLogic", "Ignore", &ByteStreamEmonInputSvc::updateHandler, "'And', 'Or' or 'Ignore' (default: Ignore)"};
+
+ Gaudi::Property<unsigned int> m_trigger_type{this, "TriggerType", 256, &ByteStreamEmonInputSvc::updateHandler, "LVL1 8 bit trigger type"};
+ Gaudi::Property<std::string> m_groupName{this, "GroupName", {}, &ByteStreamEmonInputSvc::updateHandler, "Name of the monitoring group"};
+ Gaudi::Property<unsigned int> m_buffer_size{this, "BufferSize", 2, "Number of buffers"};
+ Gaudi::Property<bool> m_readDetectorMask{this, "ReadDetectorMaskFromIS", true, "Read detector mask from IS"};
+ Gaudi::Property<int> m_timeout{this, "Timeout", 3600000, &ByteStreamEmonInputSvc::updateHandler, "Timeout in seconds, -1 == infinity"};
+ Gaudi::Property<bool> m_corrupted_events{this, "ProcessCorruptedEvents", false, &ByteStreamEmonInputSvc::updateHandler, "Process corrupted events not passing check_tree()"};
+ Gaudi::Property<std::string> m_state{this, "State", "None", "Read-only property showing the state"};
+
+ // internal
+ bool m_connect{false};
+ std::auto_ptr<emon::EventIterator> m_eventIt; //!< Event iterator
+
+ ITHistSvc* m_histSvc{nullptr};
+ OHRootProvider* m_provider{nullptr};
+
+ boost::regex m_include_rex;
+ boost::regex m_exclude_rex;
+
+ int m_frequency_counter{60};
+ int m_publish_target{0};
+
+ ServiceHandle<StoreGateSvc> m_inputMetaDataStore;
+ ServiceHandle<StoreGateSvc> m_sgSvc;
+ ServiceHandle<IROBDataProviderSvc> m_robProvider;
+
+};
+
+#endif
diff --git a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
index cb4b40c24f5984ae9c14d75f84c2f4a6f8062217..f2796d36b92712834a6f6af2e5ffa1d361f26c9c 100644
--- a/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
+++ b/HLT/Event/ByteStreamEmonSvc/src/components/ByteStreamEmonSvc_entries.cxx
@@ -1,4 +1,4 @@
-#include "ByteStreamEmonSvc/ByteStreamEmonInputSvc.h"
+#include "../ByteStreamEmonInputSvc.h"
DECLARE_COMPONENT( ByteStreamEmonInputSvc )
diff --git a/HLT/Trigger/TrigControl/TrigServices/ATLAS_CHECK_THREAD_SAFETY b/HLT/Trigger/TrigControl/TrigServices/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..4919d0b200a10e74b442ce0268133294d2cb414e
--- /dev/null
+++ b/HLT/Trigger/TrigControl/TrigServices/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+HLT/Trigger/TrigControl/TrigServices
diff --git a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
index dbc97d83ec1c01f9eb34d166fbd23ca6d0636466..34c4aebd13c2ae5f051c09ab9d7c180029e821b9 100644
--- a/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
+++ b/HLT/Trigger/TrigControl/TrigServices/CMakeLists.txt
@@ -49,3 +49,4 @@ atlas_add_component( TrigServices
# Install files from the package:
atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
diff --git a/HLT/Trigger/TrigControl/TrigServices/share/test_hlt_coolupdates.py b/HLT/Trigger/TrigControl/TrigServices/share/test_hlt_coolupdates.py
new file mode 100644
index 0000000000000000000000000000000000000000..b925e6eaa14a942e22bbfad2096d3434b3075ca5
--- /dev/null
+++ b/HLT/Trigger/TrigControl/TrigServices/share/test_hlt_coolupdates.py
@@ -0,0 +1,17 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+# Job options to test/configure TrigCOOLUpdateHelper
+#
+
+# Set minimal flags for online/data running
+from AthenaCommon.GlobalFlags import globalflags
+globalflags.ConditionsTag = 'CONDBR2-HLTP-2018-01'
+globalflags.DatabaseInstance='CONDBR2'
+globalflags.DataSource = 'data'
+
+from IOVDbSvc.CondDB import conddb
+conddb.setGlobalTag(globalflags.ConditionsTag())
+
+# Enable COOL updates
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+svcMgr.HltEventLoopMgr.CoolUpdateTool.enable()
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
index 9db5388955eabee5d39fea329a53210d9923f715..78545cd5dba7ae3e92c996d4ae7301b40c9ca925 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx
@@ -389,7 +389,7 @@ StatusCode HltEventLoopMgr::prepareForRun(const ptree& pt)
ATH_CHECK(ita->sysBeginRun()); // TEMPORARY: beginRun is deprecated
}
// Initialize COOL helper (needs to be done after IOVDbSvc has loaded all folders)
- m_coolHelper->readFolderInfo();
+ ATH_CHECK(m_coolHelper->readFolderInfo());
// close any open files (e.g. THistSvc)
ATH_CHECK(m_ioCompMgr->io_finalize());
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
index e3553adc11adb4d7afa46823d86485fcbc0418b8..a5c0a0b7386b01bfdccdaa210658c713af21a181 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.h
@@ -15,6 +15,7 @@
#include "AthenaBaseComps/AthService.h"
#include "AthenaKernel/EventContextClid.h"
#include "AthenaKernel/Timeout.h"
+#include "CxxUtils/checker_macros.h"
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h" // number_type
#include "StoreGate/ReadHandleKey.h"
@@ -83,7 +84,7 @@ public:
/// @name State transitions of ITrigEventLoopMgr interface
///@{
- virtual StatusCode prepareForRun(const boost::property_tree::ptree& pt);
+ virtual StatusCode prepareForRun ATLAS_NOT_THREAD_SAFE (const boost::property_tree::ptree& pt);
virtual StatusCode hltUpdateAfterFork(const boost::property_tree::ptree& pt);
///@}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx
index 5a82176af15cb3db70167df50f2b06a27b41d279..60f483a1280619bb980371782ec5e7b4fe8d0ead 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.cxx
@@ -17,6 +17,7 @@
#include "AthenaKernel/IOVRange.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "CoralBase/AttributeListException.h"
+#include "StoreGate/DataHandle.h"
// TDAQ includes
#include "CTPfragment/CTPfragment.h"
@@ -33,8 +34,6 @@ TrigCOOLUpdateHelper::TrigCOOLUpdateHelper(const std::string &type,
m_robDataProviderSvc("ROBDataProviderSvc", name)
{}
-TrigCOOLUpdateHelper::~TrigCOOLUpdateHelper()
-{}
StatusCode TrigCOOLUpdateHelper::initialize()
{
@@ -42,11 +41,6 @@ StatusCode TrigCOOLUpdateHelper::initialize()
service("IOVSvc", m_iovSvc, /*createIf=*/false).ignore();
service("IOVDbSvc", m_iovDbSvc, /*createIf=*/false).ignore();
- // Register DataHandle with COOLUPDATE folder
- if (!m_coolFolderName.empty()) {
- ATH_CHECK( detStore()->regHandle(m_folderMapHandle, m_coolFolderName) );
- }
-
if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
return StatusCode::SUCCESS;
@@ -77,9 +71,9 @@ StatusCode TrigCOOLUpdateHelper::stop()
// Read COOL folder info
// Loop over all registered keys and get folder name and CLID
//=========================================================================
-void TrigCOOLUpdateHelper::readFolderInfo()
+StatusCode TrigCOOLUpdateHelper::readFolderInfo()
{
- if (m_iovDbSvc==0) return;
+ if (m_iovDbSvc==nullptr) return StatusCode::SUCCESS;
m_folderInfo.clear();
// Loop over all keys registered with IOVDbSvc
@@ -99,18 +93,23 @@ void TrigCOOLUpdateHelper::readFolderInfo()
CLID clid = detStore()->clid(key);
if (clid!=CLID_NULL)
- m_folderInfo.insert(FolderInfoMap::value_type(foldername,FolderInfo(clid, key)));
+ m_folderInfo.insert({foldername, FolderInfo(clid, key)});
else
ATH_MSG_ERROR("Cannot find CLID for " << key);
}
if (!m_coolFolderName.empty()) {
+ // Read COOL folder map
+ const DataHandle<CondAttrListCollection> folderMapHandle;
+ ATH_CHECK( detStore()->regHandle(folderMapHandle, m_coolFolderName) );
+
ATH_MSG_INFO("COOL folder map in " << m_coolFolderName << ":");
- for (CondAttrListCollection::const_iterator c = m_folderMapHandle->begin();
- c != m_folderMapHandle->end(); ++c) {
- ATH_MSG_INFO(" (" << c->first << ") " << c->second["FolderName"].data<std::string>());
+ for (auto const& [idx, attr] : *folderMapHandle) {
+ m_folderNames[idx] = attr["FolderName"].data<std::string>();
+ ATH_MSG_INFO(" (" << idx << ") " << m_folderNames[idx]);
}
}
+ return StatusCode::SUCCESS;
}
StatusCode TrigCOOLUpdateHelper::resetFolders(const std::vector<std::string>& folders,
@@ -134,13 +133,13 @@ StatusCode TrigCOOLUpdateHelper::resetFolder(const std::string& folder,
{
// Force a reset of folders by setting an IOVRange in the past
- if (m_iovSvc==0 || m_iovDbSvc==0) return StatusCode::SUCCESS;
+ if (m_iovSvc==nullptr || m_iovDbSvc==nullptr) return StatusCode::SUCCESS;
// Set IOV in the past to trigger reload in IOVSvc
IOVRange iov_range(IOVTime(currentRun-2, 0),
IOVTime(currentRun-1, 0));
- FolderInfoMap::const_iterator f = m_folderInfo.find(folder);
+ const auto& f = m_folderInfo.find(folder);
if ( f==m_folderInfo.end() ) {
ATH_MSG_DEBUG("Folder " << folder << " not registered with IOVDbSvc");
return StatusCode::SUCCESS;
@@ -216,7 +215,7 @@ StatusCode TrigCOOLUpdateHelper::hltCoolUpdate(const EventContext& ctx)
StatusCode TrigCOOLUpdateHelper::hltCoolUpdate(const std::string& folderName, const EventContext& ctx)
{
- if ( m_iovSvc==0 || m_coolFolderName.empty() ) {
+ if ( m_iovSvc==nullptr || m_coolFolderName.empty() ) {
ATH_MSG_DEBUG("Passive mode. Not updating COOL folders");
return StatusCode::SUCCESS;
}
@@ -232,23 +231,21 @@ StatusCode TrigCOOLUpdateHelper::hltCoolUpdate(const std::string& folderName, co
return StatusCode::SUCCESS;
}
-StatusCode TrigCOOLUpdateHelper::getFolderName(CTPfragment::FolderIndex idx, std::string& folderName)
+StatusCode TrigCOOLUpdateHelper::getFolderName(CTPfragment::FolderIndex idx, std::string& folderName) const
{
if (m_coolFolderName.empty()) return StatusCode::SUCCESS;
-
- if (!m_folderMapHandle.isInitialized()) {
- ATH_MSG_ERROR("DataHandle for '" << m_coolFolderName << "' not initialized.");
- return StatusCode::FAILURE;
- }
- try {
- folderName = m_folderMapHandle->attributeList(idx)["FolderName"].data<std::string>();
- }
- catch (coral::AttributeListException &) {
+
+ const auto& itr = m_folderNames.find(idx);
+ if (itr==m_folderNames.end()) {
ATH_MSG_ERROR(m_coolFolderName << " does not contain a folder for index/channel " << idx
<< ". Existing folders are:");
- m_folderMapHandle->dump();
+ for (auto const& [idx, name] : m_folderNames) {
+ ATH_MSG_INFO(" (" << idx << ") " << name);
+ }
return StatusCode::FAILURE;
}
+
+ folderName = itr->second;
return StatusCode::SUCCESS;
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h
index 08b9280b29dbc76d8f150ea6c71202da1530c4a4..3cb066e27e8b315aaf2ff00e4479c67e9bfae959 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigCOOLUpdateHelper.h
@@ -21,17 +21,15 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "AthenaMonitoring/Monitored.h"
+#include "CxxUtils/checker_macros.h"
#include "EventInfo/EventID.h"
-#include "StoreGate/DataHandle.h"
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
// TDAQ includes
#include "CTPfragment/CTPExtraWordsFormat.h"
-class TH1F;
class IIOVSvc;
class IIOVDbSvc;
-class CondAttrListCollection;
/**
* Struct to hold CLID <-> folder name mapping
@@ -64,7 +62,6 @@ struct FolderUpdate {
class TrigCOOLUpdateHelper : public AthAlgTool {
public:
TrigCOOLUpdateHelper(const std::string& type, const std::string& name, const IInterface* parent);
- virtual ~TrigCOOLUpdateHelper();
virtual StatusCode initialize() override;
virtual StatusCode start() override;
@@ -88,7 +85,7 @@ public:
* @param idx Folder index
* @param folderName Returns folder name
*/
- StatusCode getFolderName(CTPfragment::FolderIndex idx, std::string& folderName);
+ StatusCode getFolderName(CTPfragment::FolderIndex idx, std::string& folderName) const;
/**
* @brief Schedule COOL folder updates according to extra payload in CTP fragment
@@ -98,7 +95,7 @@ public:
/**
* @brief Read information about existing COOL folders
*/
- void readFolderInfo();
+ StatusCode readFolderInfo ATLAS_NOT_THREAD_SAFE ();
private:
/**
@@ -119,15 +116,18 @@ private:
StatusCode resetFolders(const std::vector<std::string>& folders, EventID::number_type currentRun,
bool dropObject = false);
- typedef std::map<std::string, FolderInfo> FolderInfoMap;
- FolderInfoMap m_folderInfo; //!< COOL folder info
+ /// CLID/name mapping of COOL folders
+ std::map<std::string, FolderInfo> m_folderInfo;
- const DataHandle<CondAttrListCollection> m_folderMapHandle;
+ /// Map to store scheduled/done COOL folder updates
std::map<CTPfragment::FolderIndex, FolderUpdate> m_folderUpdates;
+ /// Map to store the folder update index -> name mapping
+ std::map<CTPfragment::FolderIndex, std::string> m_folderNames;
+
// Services and Tools
- IIOVSvc* m_iovSvc{0};
- IIOVDbSvc* m_iovDbSvc{0};
+ IIOVSvc* m_iovSvc{nullptr};
+ IIOVDbSvc* m_iovDbSvc{nullptr};
ServiceHandle<IROBDataProviderSvc> m_robDataProviderSvc;
// Properties
diff --git a/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignSiModule.h b/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignSiModule.h
index 8e0312ae732e30358f092c4cc35646ce4595b4a4..bbcd98462b2ac60031ca75976e53162020108c8f 100755
--- a/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignSiModule.h
+++ b/InnerDetector/InDetAlignEvent/InDetAlignTrkInfo/InDetAlignTrkInfo/AlignSiModule.h
@@ -8,6 +8,8 @@
// ntuple
// Richard Hawkings, started 13/4/04
+#include <atomic>
+
class AlignSiModule {
public:
@@ -66,7 +68,7 @@ public:
float m_pitch;
float m_length;
float m_width[3];
- mutable int m_nhits;
+ mutable std::atomic_int m_nhits;
bool m_dead;
bool m_stereo;
};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
index 04924e98d2e44f98778547ddb3927242195172e9..e3af12df42522f28cfc4c6db9312a40e1e3ec110 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
@@ -24,13 +24,13 @@ StatusCode SCT_AlignCondAlg::initialize()
ATH_CHECK(m_condSvc.retrieve());
// Read Handles
- if (not m_useDynamicAlignFolders.value()) { // Static
- ATH_CHECK(m_readKeyStatic.initialize());
- } else { // Dynamic
- ATH_CHECK(m_readKeyDynamicL1.initialize());
- ATH_CHECK(m_readKeyDynamicL2.initialize());
- ATH_CHECK(m_readKeyDynamicL3.initialize());
- }
+ // Static
+ ATH_CHECK(m_readKeyStatic.initialize(!m_useDynamicAlignFolders.value()));
+ // Dynamic
+ ATH_CHECK(m_readKeyDynamicL1.initialize(m_useDynamicAlignFolders.value()));
+ ATH_CHECK(m_readKeyDynamicL2.initialize(m_useDynamicAlignFolders.value()));
+ ATH_CHECK(m_readKeyDynamicL3.initialize(m_useDynamicAlignFolders.value()));
+
// Write Handles
ATH_CHECK(m_writeKey.initialize());
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
index 0233819a4c31450f5a3ab6c98147cddeef2228a6..ea9f4031742b9f33296f50e79417f2e33d133f38 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
@@ -28,8 +28,6 @@ SCT_ByteStreamErrorsTool::initialize() {
std::lock_guard<std::recursive_mutex> lock{m_mutex};
StatusCode sc{StatusCode::SUCCESS};
- m_bsErrors.clear();
-
sc = detStore()->retrieve(m_sct_id, "SCT_ID") ;
if (sc.isFailure()) {
ATH_MSG_FATAL("Cannot retrieve SCT ID helper!");
@@ -267,8 +265,9 @@ SCT_ByteStreamErrorsTool::getChip(const Identifier& stripId, const EventContext&
void
SCT_ByteStreamErrorsTool::resetSets(const EventContext& ctx) const {
std::lock_guard<std::recursive_mutex> lock{m_mutex};
+ CacheEntry* ent{m_cache.get(ctx)};
for (int errType{0}; errType<SCT_ByteStreamErrors::NUM_ERROR_TYPES; errType++) {
- m_bsErrors[ctx.slot()][errType].clear();
+ ent->m_bsErrors[errType].clear();
}
return;
}
@@ -283,12 +282,13 @@ SCT_ByteStreamErrorsTool::resetSets(const EventContext& ctx) const {
const std::set<IdentifierHash>*
SCT_ByteStreamErrorsTool::getErrorSet(int errorType, const EventContext& ctx) const {
std::lock_guard<std::recursive_mutex> lock{m_mutex};
+ CacheEntry* ent{m_cache.get(ctx)};
if (errorType>=0 and errorType<SCT_ByteStreamErrors::NUM_ERROR_TYPES) {
StatusCode sc{fillData(ctx)};
if (sc.isFailure()) {
ATH_MSG_ERROR("fillData in getErrorSet fails");
}
- return &m_bsErrors[ctx.slot()][errorType];
+ return &(ent->m_bsErrors[errorType]);
}
return nullptr;
}
@@ -312,7 +312,8 @@ SCT_ByteStreamErrorsTool::getErrorSets(const EventContext& ctx) const {
ATH_MSG_ERROR("fillData in getErrorSet fails");
return nullptr;
}
- return &m_bsErrors[ctx.slot()];
+ CacheEntry* ent{m_cache.get(ctx)};
+ return &(ent->m_bsErrors);
}
const std::array<std::set<IdentifierHash>, SCT_ByteStreamErrors::NUM_ERROR_TYPES>*
@@ -331,24 +332,15 @@ SCT_ByteStreamErrorsTool::getErrorSets() const {
StatusCode
SCT_ByteStreamErrorsTool::fillData(const EventContext& ctx) const {
std::lock_guard<std::recursive_mutex> lock{m_mutex};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
-
- if (slot<m_cache.size() and m_cache[slot]==evt) {
+ CacheEntry* ent{m_cache.get(ctx)};
+ if (ent->m_evt == ctx.evt()) {
// Cache is valid
return StatusCode::SUCCESS;
}
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- if (slot>=m_cache.size()) {
- m_cache.resize(slot+1, invalidValue);
- m_bsErrors.resize(slot+1);
- m_tempMaskedChips.resize(slot+1);
- m_abcdErrorChips.resize(slot+1);
- }
resetSets(ctx);
- m_tempMaskedChips[slot].clear();
- m_abcdErrorChips[slot].clear();
+ ent->m_tempMaskedChips.clear();
+ ent->m_abcdErrorChips.clear();
SG::ReadHandle<InDetBSErrContainer> errCont (m_bsErrContainerName, ctx);
@@ -379,9 +371,9 @@ SCT_ByteStreamErrorsTool::fillData(const EventContext& ctx) const {
Identifier module_id{m_sct_id->module_id(wafer_id)};
int side{m_sct_id->side(m_sct_id->wafer_id(elt->first))};
if ((elt->second>=SCT_ByteStreamErrors::ABCDError_Chip0 and elt->second<=SCT_ByteStreamErrors::ABCDError_Chip5)) {
- m_abcdErrorChips[slot][module_id] |= (1 << (elt->second-SCT_ByteStreamErrors::ABCDError_Chip0 + side*6));
+ ent->m_abcdErrorChips[module_id] |= (1 << (elt->second-SCT_ByteStreamErrors::ABCDError_Chip0 + side*6));
} else if (elt->second>=SCT_ByteStreamErrors::TempMaskedChip0 and elt->second<=SCT_ByteStreamErrors::TempMaskedChip5) {
- m_tempMaskedChips[slot][module_id] |= (1 << (elt->second-SCT_ByteStreamErrors::TempMaskedChip0 + side*6));
+ ent->m_tempMaskedChips[module_id] |= (1 << (elt->second-SCT_ByteStreamErrors::TempMaskedChip0 + side*6));
} else {
std::pair<bool, bool> badLinks{m_config->badLinks(elt->first, ctx)};
bool result{(side==0 ? badLinks.first : badLinks.second) and (badLinks.first xor badLinks.second)};
@@ -401,7 +393,7 @@ SCT_ByteStreamErrorsTool::fillData(const EventContext& ctx) const {
}
}
- m_cache[slot] = evt;
+ ent->m_evt = ctx.evt();
return StatusCode::SUCCESS;
}
@@ -415,8 +407,9 @@ SCT_ByteStreamErrorsTool::fillData(const EventContext& ctx) const {
void
SCT_ByteStreamErrorsTool::addError(const IdentifierHash& id, int errorType, const EventContext& ctx) const {
std::lock_guard<std::recursive_mutex> lock{m_mutex};
+ CacheEntry* ent{m_cache.get(ctx)};
if (errorType>=0 and errorType<SCT_ByteStreamErrors::NUM_ERROR_TYPES) {
- m_bsErrors[ctx.slot()][errorType].insert(id);
+ ent->m_bsErrors[errorType].insert(id);
}
}
@@ -500,7 +493,8 @@ const std::map<Identifier, unsigned int>& SCT_ByteStreamErrorsTool::getTempMaske
if (sc.isFailure()) {
ATH_MSG_ERROR("fillData in getTempMaskedChips fails");
}
- return m_tempMaskedChips[ctx.slot()];
+ CacheEntry* ent{m_cache.get(ctx)};
+ return ent->m_tempMaskedChips;
}
const std::map<Identifier, unsigned int>& SCT_ByteStreamErrorsTool::getAbcdErrorChips(const EventContext& ctx) const {
@@ -509,5 +503,6 @@ const std::map<Identifier, unsigned int>& SCT_ByteStreamErrorsTool::getAbcdError
if (sc.isFailure()) {
ATH_MSG_ERROR("fillData in getAbcdErrorChips fails");
}
- return m_abcdErrorChips[ctx.slot()];
+ CacheEntry* ent{m_cache.get(ctx)};
+ return ent->m_abcdErrorChips;
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
index a45fe36ed26e14ea2c67383eee179fad2d86fb78..c6215b3c473cf1c2839a17ada84b97a5735951a2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.h
@@ -17,6 +17,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "SCT_ConditionsTools/ISCT_ByteStreamErrorsTool.h"
+#include "AthenaKernel/SlotSpecificObj.h"
#include "Identifier/IdContext.h"
#include "Identifier/Identifier.h"
#include "Identifier/IdentifierHash.h"
@@ -98,15 +99,15 @@ private:
BooleanProperty m_checkRODSimulatedData{this, "CheckRODSimulatedData", true, "Flag to check RODSimulatedData flag."};
- mutable std::vector<std::array<std::set<IdentifierHash>, SCT_ByteStreamErrors::NUM_ERROR_TYPES>> m_bsErrors ATLAS_THREAD_SAFE; // Used by getErrorSet, addError, resetSets
-
- mutable std::vector<std::map<Identifier, unsigned int>> m_tempMaskedChips ATLAS_THREAD_SAFE {};
- mutable std::vector<std::map<Identifier, unsigned int>> m_abcdErrorChips ATLAS_THREAD_SAFE {};
-
// Mutex to protect the contents.
mutable std::recursive_mutex m_mutex{};
- // Cache to store events for slots
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE {};
+ struct CacheEntry {
+ EventContext::ContextEvt_t m_evt{EventContext::INVALID_CONTEXT_EVT};
+ std::array<std::set<IdentifierHash>, SCT_ByteStreamErrors::NUM_ERROR_TYPES> m_bsErrors; // Used by getErrorSet, addError, resetSets
+ std::map<Identifier, unsigned int> m_tempMaskedChips;
+ std::map<Identifier, unsigned int> m_abcdErrorChips;
+ };
+ mutable SG::SlotSpecificObj<CacheEntry> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
mutable std::atomic_uint m_nRetrievalFailure{0};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
index 6dec258b85592bd48a29d041d62be6b28bf768df..88c8ba1880bcd77675aec3db2ab5214d9d74de7d 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
@@ -61,11 +61,11 @@ SCT_ModuleVetoTool::initialize() {
ATH_MSG_FATAL("Failed to fill data");
return StatusCode::FAILURE;
}
- } else {
- // Read Cond Handle
- CHECK(m_condKey.initialize());
}
+ // Read Cond Handle
+ CHECK(m_condKey.initialize(m_useDatabase));
+
const std::string databaseUseString{m_useDatabase ? "" : "not "};
ATH_MSG_INFO("Initialized veto service with data, "
<< (m_badElements.value().size() - static_cast<long unsigned int>(m_useDatabase))
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
index 8c4c6016b578de6a6677c0f1affe0d13b24f8794..84c3f07a4a8372ae818ff7359aae58987e5a7d03 100644
--- a/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/CMakeLists.txt
@@ -28,10 +28,6 @@ atlas_add_component( BCM_Digitization
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} GaudiKernel AthenaBaseComps AthenaKernel PileUpToolsLib xAODEventInfo GeneratorObjects InDetBCM_RawData InDetSimData InDetSimEvent )
-atlas_add_test( BCM_DigitizationConfigNew_test
- SCRIPT test/BCM_DigitizationConfigNew_test.py
- PROPERTIES TIMEOUT 300 )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py test/*.py )
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py b/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py
index 65503e3ac15b21be5eaf907d4b7cdb6ef31f24ee..fdd8a20a009fb2fc53673feac8b7b8217bad874d 100755
--- a/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/python/BCM_DigitizationConfigNew.py
@@ -60,15 +60,14 @@ def BCM_DigitizationToolCfg(flags, name="BCM_DigitizationTool", **kwargs):
acc.setPrivateTools(BCM_DigitizationTool(name, **kwargs))
return acc
-def BCM_DigitizationCfg(flags, name="BCM_OverlayDigitization", **kwargs):
+def BCM_DigitizationCfg(flags, name="BCM_Digitization", **kwargs):
"""Return a ComponentAccumulator with configured BCM_Digitization algorithm"""
acc = PixelGeometryCfg(flags)
if "DigitizationTool" not in kwargs:
tool = acc.popToolsAndMerge(BCM_DigitizationToolCfg(flags, **kwargs))
kwargs["DigitizationTool"] = tool
acc.addEventAlgo(BCM_Digitization(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", BCM_ItemList()))
+ acc.merge(OutputStreamCfg(flags, "RDO", BCM_ItemList()))
return acc
def BCM_OverlayDigitizationToolCfg(flags, name="BCM_OverlayDigitizationTool", **kwargs):
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
index efc5c66009bcf37bf2dd4968aa5c51949e7f4f40..144705dfd91a03da196197a6aae44f84438ebd2a 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/PixelDigitization/CMakeLists.txt
@@ -44,10 +44,6 @@ atlas_add_component( PixelDigitization
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps GaudiKernel CommissionEvent AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier xAODEventInfo GeneratorObjects PixelConditionsData SiPropertiesToolLib InDetIdentifier InDetReadoutGeometry SiDigitization InDetRawData InDetSimData InDetSimEvent HitManagement PathResolver )
-atlas_add_test( PixelDigitizationConfigNew_test
- SCRIPT test/PixelDigitizationConfigNew_test.py
- PROPERTIES TIMEOUT 300 )
-
# Install files from the package:
atlas_install_headers( PixelDigitization )
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
index 934e1c82c4fd024903ec93a021666acfc81e39f6..f3b4b6eea5d4a980e9914554bf4a4add48bafd4f 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/python/PixelDigitizationConfigNew.py
@@ -104,7 +104,7 @@ def EndcapFEI3SimToolCfg(flags, name="EndcapFEI3SimTool", **kwargs):
kwargs.setdefault("BarrelEC", 2)
return FEI3SimTool(name, **kwargs)
-def PixelDigitizationBasicToolCfg(flags, name="PixelDigitizationTool", **kwargs):
+def PixelDigitizationBasicToolCfg(flags, name="PixelDigitizationBasicTool", **kwargs):
"""Return a ComponentAccumulator with configured PixelDigitizationTool"""
acc = PixelGeometryCfg(flags)
acc.popToolsAndMerge(PixelConditionsSummaryCfg(flags))
@@ -184,15 +184,19 @@ def PixelRangeCfg(flags, name="PixelRange", **kwargs):
kwargs.setdefault("ItemList", ["SiHitCollection#PixelHits"])
return PileUpXingFolder(name, **kwargs)
-def PixelDigitizationCfg(toolCfg, flags, name="PixelDigitization", **kwargs):
- """Return a ComponentAccumulator with toolCfg type Pixel digitization"""
+def PixelDigitizationBasicCfg(toolCfg, flags, name="PixelDigitizationBasic", **kwargs):
+ """Return a ComponentAccumulator with basic toolCfg type Pixel digitization"""
acc = ComponentAccumulator()
if "DigitizationTool" not in kwargs:
tool = acc.popToolsAndMerge(toolCfg(flags))
kwargs["DigitizationTool"] = tool
acc.addEventAlgo(PixelDigitization(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", PixelItemList()))
+ return acc
+
+def PixelDigitizationCfg(toolCfg, flags, name="PixelDigitization", **kwargs):
+ """Return a ComponentAccumulator with toolCfg type Pixel digitization and Output"""
+ acc = PixelDigitizationBasicCfg(toolCfg, flags, name, **kwargs)
+ acc.merge(OutputStreamCfg(flags, "RDO", PixelItemList()))
return acc
def PixelDigitizationHSCfg(flags, name="PixelDigitizationHS", **kwargs):
@@ -205,5 +209,5 @@ def PixelDigitizationPUCfg(flags, name="PixelDigitizationPU", **kwargs):
def PixelDigitizationOverlayCfg(flags, name="PixelDigitizationOverlay", **kwargs):
"""Return a ComponentAccumulator with Hard Scatter Pixel Digitization"""
- return PixelDigitizationCfg(PixelDigitizationOverlayToolCfg, flags, name, **kwargs)
+ return PixelDigitizationBasicCfg(PixelDigitizationOverlayToolCfg, flags, name, **kwargs)
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h
index b34b48e4cfd19ac97fdb8e751c45ff4e0d66e18d..8f9d7388d249751d8523607cf0f0e9b02d5b0b24 100644
--- a/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/PixelDigitization/src/PixelDigitizationTool.h
@@ -66,7 +66,6 @@ class PixelDigitizationTool : public PileUpToolBase {
Gaudi::Property<int> m_HardScatterSplittingMode{this, "HardScatterSplittingMode", 0, "Control pileup & signal splitting"};
bool m_HardScatterSplittingSkipper{false};
Gaudi::Property<bool> m_onlyHitElements{this, "OnlyHitElements", false, "Process only elements with hits"};
- IntegerProperty m_vetoThisBarcode{this, "ParticleBarcodeVeto", crazyParticleBarcode, "Barcode of particle to ignore"};
const PixelID *m_detID{};
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/PixelRadDamDigitization/CMakeLists.txt
index 90d2b8df0fbdcd1386d8e4df0ad5a62c4f9a5c28..4ab96b9158f72564be0cdcefc55674d5cfd99bc1 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/CMakeLists.txt
@@ -35,7 +35,7 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
find_package( HepMC )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread Matrix TreePlayer )
# Component(s) in the package:
atlas_add_component( PixelRadDamDigitization
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/EfieldInterpolator.cxx b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/EfieldInterpolator.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..095c5adbd5ac3b5cfe43f5097c57d633a1857d3a
--- /dev/null
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/EfieldInterpolator.cxx
@@ -0,0 +1,827 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// PixelDigitization includes
+#include "EfieldInterpolator.h"
+
+#include "TROOT.h"
+#include "TH1.h"
+#include "TF1.h"
+#include "TVectorD.h"
+#include <TFile.h>
+#include "TTreeReader.h"
+#include "TTreeReaderValue.h"
+#include "TTreeReaderArray.h"
+#include <TMath.h>
+#include <TGraph.h>
+#include <TPRegexp.h>
+#include <TSystemDirectory.h>
+#include <TSystemFile.h>
+#include <TGraph2D.h>
+#include <algorithm>
+
+using namespace RadDam;
+
+static const InterfaceID IID_IEfieldInterpolator("EfieldInterpolator", 1, 0);
+const InterfaceID& EfieldInterpolator::interfaceID( ){ return IID_IEfieldInterpolator; }
+
+// Constructor with parameters:
+EfieldInterpolator::EfieldInterpolator(const std::string& type, const std::string& name,const IInterface* parent):
+ AthAlgTool(type,name,parent),
+ m_initialized (false ),
+ m_saveDocu (true ),
+ m_useSpline (true ),
+ m_sensorDepth (200 ), //um - default is IBL layer
+ m_efieldOrigin(interspline)
+{
+ declareInterface< EfieldInterpolator >( this );
+ declareProperty( "initialized", m_initialized, "Flag whether already initalized" );
+ declareProperty( "saveDocu", m_saveDocu, "Flag whether to save individual Histograms for documentation" );
+ declareProperty( "useSpline", m_useSpline, "Flag whether to use cubic splines for interpolation" );
+ declareProperty( "sensorDepth", m_sensorDepth, "Depth of E fields in sensors in um" );
+}
+
+EfieldInterpolator::~EfieldInterpolator()
+{
+}
+
+StatusCode EfieldInterpolator::initialize() {
+ ATH_MSG_DEBUG("Initializing " << name() << "...");
+ return StatusCode::SUCCESS;
+}
+
+
+StatusCode EfieldInterpolator::finalize() {
+ ATH_MSG_DEBUG ("Finalizing " << name() << "...");
+ return StatusCode::SUCCESS;
+}
+
+TVectorD CastStdVec(const std::vector<double> vin ){
+ TVectorD tmp(vin.size());
+ //for(uint i = 0; i<vin.size(); i++ ){
+ uint index = 0;
+ for(auto i : vin){
+ tmp[index] = i;
+ index++;
+ }
+ return tmp;
+}
+
+//Returns index at of std::vectorv where val is contained
+int isContainedAt(std::vector<double> v, double val){
+ for(uint i=0; i<v.size(); i++){
+ //Equality for decimals
+ if( v.at(i)-0.00001 < val && val < v.at(i)+0.00001 ) return i;
+ }
+ return -1;
+}
+
+// Initialize indicating layer due to different geometry
+// One instance interpolates only for fixed geometry (=pixel depth)
+void EfieldInterpolator::setLayer(int layer)
+{
+ ATH_MSG_INFO("Create interpolator for layer "<< layer);
+ if(layer > 0){
+ //it's b layer
+ m_sensorDepth = 250;
+ }else{
+ //IBL
+ m_sensorDepth = 200;
+ }
+ ATH_MSG_INFO("EfieldInterpolator: Default ctor");
+}
+
+StatusCode EfieldInterpolator::loadTCADlist(std::string TCADfileListToLoad )
+{
+ m_efieldOrigin = interspline;
+ ATH_MSG_INFO("Load from list " << TCADfileListToLoad);
+ if(!initializeFromFile(TCADfileListToLoad) ){
+ ATH_MSG_WARNING("ERROR: Initialize failed looking for file " << TCADfileListToLoad );
+ //Check if given path links to directory:
+ if(!initializeFromDirectory(TCADfileListToLoad)){;
+ return StatusCode::FAILURE;
+ }
+ }
+ ATH_MSG_INFO("Finished loading TCAD list");
+ return StatusCode::SUCCESS;
+}
+
+bool EfieldInterpolator::initializeFromDirectory(const std::string fpath){
+ //similar to function loadTCADfiles()
+ //instead of reading file list, list files from directory fpath and create file listing information
+
+ //retrieve fluence and bias voltage from file name (including path, directory names fluence value)
+ //skip files which do not dollow naming declaration
+
+ //Create textfile for tmp storage
+ std::ofstream efieldscalib;
+ efieldscalib.open("listOfEfields.txt");
+ TPRegexp rvo("\\b-[0-9](\\w+)V\\b");
+ TPRegexp rfl("\\bfl([\\w.]+)e[0-9]{1,2}");
+ TString ext = ".dat";
+ TString sflu, svol, fullpath;
+ TSystemDirectory dir( (TString) fpath, (TString) fpath);
+ TList *files = dir.GetListOfFiles();
+ if (files) {
+ TSystemFile *file;
+ TString fname;
+ TIter next(files);
+ while ((file=(TSystemFile*)next())) {
+ fname = file->GetName();
+ if(fname.BeginsWith("fl") && file->IsDirectory() ){
+ TString deeppath = fpath;
+ deeppath += fname;
+ deeppath += "/reference/";
+ TSystemDirectory deepdir(deeppath, deeppath);
+ TList *deepfiles = deepdir.GetListOfFiles();
+ if (deepfiles) {
+ TSystemFile *deepfile;
+ TString deepfname;
+ TIter deepnext(deepfiles);
+ while ((deepfile=(TSystemFile*)deepnext())) {
+ deepfname = deepfile->GetName();
+ if (!deepfile->IsDirectory() && deepfname.EndsWith(ext)) {
+ svol = deepfname(rvo);
+ svol.ReplaceAll("-","");
+ svol.ReplaceAll("V","");
+ sflu = deeppath(rfl);
+ sflu.ReplaceAll("fl","");
+ fullpath = deeppath;
+ fullpath += deepfname;
+ if(!deepfname.Contains("pruned")){
+ if(!sflu.IsFloat()){
+ ATH_MSG_INFO("EfieldInterpolator load from directory - could not resolve fluence from " << fullpath);
+ continue;
+ }
+ if(!svol.IsFloat()){
+ ATH_MSG_INFO("EfieldInterpolator load from directory - could not resolve voltage from " << fullpath);
+ continue;
+ }
+ }else{
+ ATH_MSG_INFO("Skip pruned files: " << fullpath);
+ continue;
+ }
+ efieldscalib << fullpath << " " << sflu << " " << svol << std::endl;
+ }
+ }
+ }
+ }
+ }
+ }
+ efieldscalib.close();
+ bool success = initializeFromFile("listOfEfields.txt");
+ if(success) ATH_MSG_INFO("Initialized from directory");
+ return success;
+}
+// Load maps into TTree for faster processing
+bool EfieldInterpolator::initializeFromFile(std::string finpath){
+ TString fpath = finpath ;
+ m_initialized = false;
+ TString fTCAD = "";
+ if(fpath.EndsWith(".txt")){
+ //File list path, fluence and bias voltage of TCAD simulation as plain text
+ fTCAD = loadTCADfiles(fpath.Data());
+ ATH_MSG_INFO("Loaded file " << fpath << " - all maps accumulated in " << fTCAD);
+ m_fInter = createInterpolationFromTCADtree(fTCAD.Data());
+ ATH_MSG_INFO("created interpolation tree ");
+ m_initialized = true;
+ ATH_MSG_INFO("Loaded from .txt file");
+ }else{
+ if(fpath.EndsWith("toTTree.root") ){
+ //File list TCAD efield maps as leaves
+ m_fInter = createInterpolationFromTCADtree(fpath.Data());
+ m_initialized = true;
+ }else{
+ if(fpath.EndsWith(".root")){
+ //File list is already transformed to tree
+ m_fInter = fpath;
+ m_initialized = true;
+ }
+ }
+ }
+ ATH_MSG_INFO("Interpolation has been initialized from file "<< m_fInter <<" - successful "<< m_initialized);
+ return m_initialized;
+}
+
+// Check if requested values out of range of given TCAD samples
+void EfieldInterpolator::reliabilityCheck(double aimFluence, std::vector<double> fluences, double aimVoltage, std::vector<double> voltages){
+ bool tooLowVolt = true;
+ bool tooHighVolt = true;
+ for(const auto iv : voltages){
+ if( aimVoltage < iv ) tooHighVolt= false;
+ if( aimVoltage > iv ) tooLowVolt= false;
+ }
+ bool tooLowFlu = true;
+ bool tooHighFlu = true;
+ for(uint iv = 0; iv< fluences.size(); iv++){
+ if( aimFluence < fluences.at(iv) ) tooHighFlu = false;
+ if( aimFluence > fluences.at(iv) ) tooLowFlu = false;
+ }
+ if(tooLowFlu ) ATH_MSG_WARNING("WARNING: The fluence value you specified (" << aimFluence <<") is too low to be reliably interpolated!" );
+ if(tooLowVolt ) ATH_MSG_WARNING("WARNING: The voltage value you specified (" << aimVoltage <<") is too low to be reliably interpolated!" );
+ if(tooHighFlu ) ATH_MSG_WARNING("WARNING: The fluence value you specified (" << aimFluence <<") is too high to be reliably interpolated!" );
+ if(tooHighVolt ) ATH_MSG_WARNING("WARNING: The voltage value you specified (" << aimVoltage <<") is too high to be reliably interpolated!" );
+
+ // Results from Closure Test
+ // TCAD files save 20 for 20e14 neq/cm2
+ if( 12.2 < aimFluence || aimFluence < 1. ) ATH_MSG_WARNING(" WARNING: The fluence value you specified ("<< aimFluence <<") is outside the range within it could be reliably interpolated!" ); //Based on closure test June 2018 - max fluences available: ... 10 12 15 20
+ if( 1010. < aimVoltage || aimVoltage < 79. ) ATH_MSG_WARNING(" WARNING: The voltage value you specified ("<< aimVoltage <<") is outside the range within it could be reliably interpolated!" ); //Based on closure test June 2018 - max volatges available: ... 600 800 1000V
+ return;
+}
+
+void EfieldInterpolator::scaleIntegralTo(TH1* hin, double aimInt, int first , int last){
+ hin->Scale(aimInt/(float) hin->Integral(first,last) );
+}
+
+double EfieldInterpolator::relativeDistance(double x1, double x2)
+{
+ if( x1 == 0. ) return 0.;
+ return( (x1-x2)/x1 );
+}
+
+//Use as definition for distance in Fluence/Voltage space
+double EfieldInterpolator::relativeDistance(double x1, double y1, double x2, double y2)
+{
+ return( std::sqrt( relativeDistance(x1,x2)*relativeDistance(x1,x2) + relativeDistance(y1,y2)*relativeDistance(y1,y2))) ;
+}
+
+double EfieldInterpolator::extrapolateLinear(double x1, double y1, double x2, double y2, double xaim){
+ // follow linear extrapolation: y=mx+b
+ double delx = x2-x1;
+ if(delx == 0) return 0.; // slope not defined
+ double dely = y2-y1;
+ double b = y1 - (dely/delx)*x1;
+ return (xaim*(dely/delx)+b) ;
+}
+
+
+// Return E field which is directly read from TCAD simulation
+// and fill edges values
+TH1D* EfieldInterpolator::loadEfieldFromDat(std::string fname, bool fillEdges ){
+ TH1D* hefieldz = new TH1D( "hefieldz", "hefieldz",m_sensorDepth +1,-0.5, m_sensorDepth + 0.5);
+ std::ifstream in;
+ in.open(fname);
+ TString z,e;
+ int nlines =0;
+ ATH_MSG_INFO("Load E field from " << fname);
+ while (1) {
+ in >> z >> e;
+ if (!in.good()) break;
+ if (nlines < 3) printf("e=%s=%f, z=%s=%f \n",e.Data(), e.Atof(),z.Data(), z.Atof() );
+ nlines++;
+ hefieldz->Fill(z.Atof(), e.Atof());
+ }
+ in.close();
+ if(fillEdges) EfieldInterpolator::fillEdgeValues(hefieldz);
+ return hefieldz;
+}
+
+// original TCAD simulations given as txt (.dat) files (zVal efieldVal)
+std::string EfieldInterpolator::loadTCADfiles(std::string targetList)
+{
+ bool isIBL = true;
+ TString tl = targetList;
+ TString fName = targetList;
+ fName.ReplaceAll(".txt", "_toTTree.root");
+ fName =fName.Remove(0,fName.Last('/')+1); //Remove prepending path and store in run directory
+ TFile* bufferTCADtree = new TFile(fName.Data() ,"RECREATE");
+
+ if(tl.Length() < 1 ){
+ tl = "list_TCAD_efield_maps.txt";
+ ATH_MSG_WARNING("No List to load! Set default: " << tl.Data());
+ }
+ std::ifstream in;
+ TTree *tcadtree = new TTree("tcad","All TCAD E field simulations stored as individual events in tree");
+ double voltage = -1.;
+ double fluence = -1.;
+ std::vector<double> efield;
+ std::vector<Int_t> pixeldepth;
+ tcadtree->Branch("voltage" ,&voltage, "voltage/D" );
+ tcadtree->Branch("fluence" ,&fluence,"fluence/D");
+ tcadtree->Branch("efield" ,&efield );
+ tcadtree->Branch("pixeldepth" ,&pixeldepth);
+ //Get vetcor of {filename, fluence, bias voltage}
+ std::vector<std::vector<TString>> infile = list_files(tl);
+ TString z,e;
+ TString tmp = "";
+ for(uint ifile = 0; ifile<infile.size(); ifile++){
+ tmp = infile.at(ifile).at(0);
+ in.open(infile.at(ifile).at(0));
+ // Number format eg 10e14 also 1.2e13
+ //fluence = (infile.at(ifile).at(1).ReplaceAll("e14","")).Atof();
+ fluence = (infile.at(ifile).at(1)).Atof();
+ fluence = fluence * 1e-14; //choose fluence e14 as default unit
+ voltage = infile.at(ifile).at(2).Atof();
+ Int_t nlines = 0;
+ efield.clear();
+ pixeldepth.clear();
+ while (1) {
+ in >> z >> e;
+ if (!in.good()){
+ ATH_MSG_DEBUG("Break for file No. " << ifile << ": "<< infile.at(ifile).at(0) <<" . After " << nlines << " steps");
+ break;
+ }
+ ATH_MSG_DEBUG("Reading input line: fluence=" << (infile.at(ifile).at(1)).Data() << fluence << " voltage=" << voltage << " e="<< e.Atof() <<"="<< e.Data() << ", z="<< (int) z.Atof() <<"="<< z.Data() <<" in file = "<< ifile );
+ nlines++;
+ efield.push_back(e.Atof());
+ pixeldepth.push_back((int) z.Atof());
+ if(z.Atof() > 200 ) isIBL = false; // Pixel depth to huge to be IBL
+ }
+ bufferTCADtree->cd();
+ tcadtree->Fill();
+ in.close();
+ }
+ if(!isIBL){
+ ATH_MSG_INFO("Pixel depth read from file too big for IBL. Set to B layer, depth = 250um\n");
+ m_sensorDepth = 250;
+ }
+ bufferTCADtree->cd();
+ tcadtree->Write();
+ bufferTCADtree->Close();
+ return fName.Data();
+}
+
+std::vector<std::vector<TString>> EfieldInterpolator::list_files(TString fileList_TCADsamples)
+{
+ std::vector<std::vector<TString>> filelist;
+ TString tmpname = "";
+ TString tmpfluence = "";
+ TString tmpvolt = "";
+ std::vector<TString> vstr;
+ std::ifstream in;
+ ATH_MSG_DEBUG("Try to open: " << fileList_TCADsamples.Data());
+ in.open(fileList_TCADsamples);
+ int nlines = 0;
+ while (1) {
+ in >> tmpname >> tmpfluence >> tmpvolt ;
+ nlines++;
+ if (!in.good()) break;
+ if (tmpname.BeginsWith('#')) continue;
+ if (tmpname.EndsWith(".dat")){
+ vstr.push_back(tmpname);
+ vstr.push_back(tmpfluence);
+ vstr.push_back(tmpvolt);
+ filelist.push_back(vstr);
+ ATH_MSG_DEBUG("Found and load:"<< tmpfluence.Atof() <<" neq/cm2 " << tmpvolt.Atof() << "V - " << tmpname.Data());
+ vstr.clear();
+ }else{
+ ATH_MSG_WARNING("Wrong extension: "<< tmpname.Data() <<" -- check input " );
+ }
+ }
+ in.close();
+ return filelist;
+}
+
+// Return path to file containing tree
+// Final tree is restructured providing e field value as function of fluence, voltage and pixeldepth
+std::string EfieldInterpolator::createInterpolationFromTCADtree(std::string fTCAD){
+ TString tmpfinter = fTCAD;
+ tmpfinter.ReplaceAll("toTTree","toInterpolationTTree");
+ TFile* faim = new TFile(tmpfinter, "Recreate");
+ TFile* ftreeTCAD = new TFile(fTCAD.c_str());
+ TTreeReader myReader("tcad", ftreeTCAD);
+ TTreeReaderValue<double> involtage(myReader , "voltage" );
+ TTreeReaderValue<double> influence(myReader , "fluence" );
+ TTreeReaderValue<std::vector<double>> inefield(myReader , "efield" );
+ TTreeReaderValue<std::vector<int>> inpixeldepth(myReader , "pixeldepth");
+ // Get Data from TCAD tree
+ // Loop tree once to initialize values
+ // Finding which values for fluence and bias voltage exist
+ // do not hardcode values to maintain compatibility with new simulations available
+ std::vector<double> allFluences; // serves as x-axis
+ std::vector<double> allVoltages; // serves as y-axis
+ std::vector<double> allEfield;
+ int ne = 0;
+ double tmpflu, tmpvol;
+ while(myReader.Next()){
+ tmpflu = *influence;
+ tmpvol = *involtage;
+ //Check if (double) value of fluence and bias voltage is already saved: if not save
+ if( std::find_if(allFluences.begin(), allFluences.end(), [&tmpflu](const double &b) { return (std::abs( tmpflu - b) < 1E-6); } ) == allFluences.end()) allFluences.push_back(tmpflu);
+ if( std::find_if(allVoltages.begin(), allVoltages.end(), [&tmpvol](const double &b) { return (std::abs( tmpvol - b) < 1E-6); } ) == allVoltages.end()) allVoltages.push_back(tmpvol);
+ ne++;
+ }
+ //put into ascending order
+ std::sort(allFluences.begin(), allFluences.end());
+ std::sort(allVoltages.begin(), allVoltages.end());
+ for(uint i=0; i<allFluences.size();i++ ) ATH_MSG_DEBUG("fluences recorded: "<< allFluences.at(i));
+ for(uint i=0; i<allVoltages.size();i++ ) ATH_MSG_DEBUG("voltages recorded: "<< allVoltages.at(i));
+ std::vector<double> tmpef;
+ myReader.Restart(); //available from ROOT 6.10.
+ //Exclude TCAD efield values close to sensor edge
+ int leftEdge = 3; //unify maps - different startting points from z=1 to z=2 and z=3. Simulation not reliable at edges, skip first and last
+ int rightEdge= m_sensorDepth-2;
+ std::vector<int> tmpz;
+ int nz = rightEdge - leftEdge;
+ // Temporary saving to avoid nesting tree loops
+ // ie read all z values at once -> add to each branch-param dimension for z
+ std::vector<double> zpixeldepth(nz, -1);
+ std::vector<std::vector<double>> zfluence(nz,std::vector<double>( ne, -1));
+ std::vector<std::vector<double>> zvoltage(nz,std::vector<double>( ne, -1));
+ std::vector<std::vector<double>> zefield(nz, std::vector<double>( ne, -1));
+ std::vector<std::vector<std::vector<double>>> zefieldmap(nz,std::vector<std::vector<double>>(allFluences.size(), std::vector<double>(allVoltages.size(), -1) ));
+ int iev = 0;
+ ATH_MSG_INFO("Access TTreeReader second time\n");
+
+ while(myReader.Next()){
+
+ tmpz = *inpixeldepth; //Pixeldepth of current TCAD map
+ ATH_MSG_DEBUG("Number of available z values = " << tmpz.size());
+ if(tmpz.at(0) > leftEdge ) ATH_MSG_WARNING("Map starting from high pixeldepth = " << tmpz.at(0) << ". Might trouble readout.");
+ for(int iz = leftEdge; iz < rightEdge; iz++){
+ int index = 0;
+ //Safety check:
+ //files starting from z=1, z=2 or z=3
+ //determine correct index to match sensor depth
+ ATH_MSG_DEBUG("Access tmpz \n");
+ ATH_MSG_DEBUG("Adapt index shift \n");
+ while( (tmpz.at(index) != iz) && (index < nz) ){
+ ATH_MSG_DEBUG("Adapt possible index shift for missing edge values: pixeldepth tree = " << nz << " current index = " << index);
+ index++;
+ }
+ if(iz%2 ==0) ATH_MSG_DEBUG("Index "<< index <<" - iev "<< iev <<" - iz " << iz );
+ tmpflu = *influence;
+ tmpvol = *involtage;
+ tmpef = *inefield;
+ zfluence.at(iz-leftEdge).at(iev) = tmpflu; // assign value to certain pixeldepth(z)
+ zvoltage.at(iz-leftEdge).at(iev) = tmpvol;
+ zefield .at(iz-leftEdge).at(iev) = tmpef.at(index) ;
+ ((zefieldmap.at(iz-leftEdge)).at(isContainedAt(allFluences, tmpflu))).at(isContainedAt(allVoltages,tmpvol)) = tmpef.at(index);
+ ATH_MSG_DEBUG ("Event #" << iev << "-z="<< iz << ": fluence ="<< tmpflu <<" voltage=" << tmpvol <<", E="<< tmpef.at(index));
+ }
+ iev++;
+ }
+ ATH_MSG_DEBUG("# Start filling interpolation tree \n");
+ //Filling the interpolation tree
+ faim->cd();
+ TTree *tz_tmp = new TTree("tz","All TCAD E field simulations stored splitted by pixel depth");
+ double pixeldepth = -1.;
+ std::vector<double> fluence;
+ std::vector<double> voltage;
+ std::vector<double> xfluence;
+ std::vector<double> yvoltage;
+ std::vector<double> efield;
+ std::vector<std::vector<double>> efieldfluvol;
+
+ tz_tmp->Branch("pixeldepth" ,&pixeldepth);
+ tz_tmp->Branch("voltage" ,&voltage);
+ tz_tmp->Branch("fluence" ,&fluence);
+ tz_tmp->Branch("yvoltage" ,&yvoltage);
+ tz_tmp->Branch("xfluence" ,&xfluence);
+ tz_tmp->Branch("efield" ,&efield );
+ tz_tmp->Branch("efieldfluvol" ,&efieldfluvol);
+ for(int iz = leftEdge; iz < rightEdge; iz++ ){
+ pixeldepth = iz;
+ fluence = zfluence.at(iz-leftEdge);
+ voltage = zvoltage.at(iz-leftEdge);
+ efield = zefield .at(iz-leftEdge);
+ efieldfluvol = zefieldmap.at(iz-leftEdge);
+ xfluence = allFluences;
+ yvoltage = allVoltages;
+ ATH_MSG_DEBUG("Fill tree for z ="<< iz <<" pd=" << pixeldepth);
+ faim->cd();
+ tz_tmp->Fill();
+ }
+
+ //Save new Interpolation tree
+ faim->cd();
+ tz_tmp->Write();
+ faim->Close();
+ m_fInter = tmpfinter.Data();
+ return m_fInter;
+}
+
+// Retrieve fluence values corresponding to a fixed voltage or viceversa if regular order == false
+int EfieldInterpolator::fillXYvectors(std::vector<double> vLoop,int ifix, std::vector<std::vector<double>> v2vsv1, std::vector<double> &xx, std::vector<double> &yy, bool regularOrder ){
+ yy.clear();
+ xx.clear();
+ int nfills = 0;
+ if(regularOrder){
+ for(uint ie = 0; ie < v2vsv1.size(); ie++ ){
+ double ef = v2vsv1.at(ie).at(ifix); // different fluences for volatge ifix
+ if(ef > 0){
+ yy.push_back(ef);
+ xx.push_back(vLoop.at(ie));
+ nfills++;
+ }else{
+ ATH_MSG_DEBUG("E field value not available for Phi=" << vLoop.at(ie) <<" index Vol= " << ifix);
+ //Values not ordered in a regular fluence-bias voltage grid
+ }
+ }
+ }else{
+ for(uint ie = 0; ie < v2vsv1.at(0).size(); ie++ ){
+ double ef = v2vsv1.at(ifix).at(ie);
+ if(ef > 0){
+ yy.push_back(ef);
+ xx.push_back(vLoop.at(ie));
+ nfills++;
+ }else{
+ ATH_MSG_DEBUG("E field value not available for Phi="<< vLoop.at(ifix) << " U="<< vLoop.at(ie));
+ //Values not ordered in a regular fluence-bias voltage grid
+ }
+ }
+ }
+
+ return nfills;
+}
+
+//Final computation of efield according to method specified
+double EfieldInterpolator::estimateEfieldLinear(double aimVoltage){
+ return aimVoltage/(float) m_efieldProfile->GetNbinsX() * 10000; //10^4 for unit conversion
+}
+
+//Interpolate following inverse distance weighted Interpolation
+double EfieldInterpolator::estimateEfieldInvDistance(std::vector<double> vvol, std::vector<double> vflu, std::vector<std::vector<double>> vfluvvol, double aimFlu, double aimVol, double measure)
+{
+ ATH_MSG_WARNING("Use interpolation method _Inverse distance weighted_ - guarantees positive E field but no reliable interpolation");
+ double weight = 0.;
+ double meanEf = 0.;
+ double distance = 1.;
+ double efEntry = 0.;
+ //Loop available efield values for fluence/voltage - take weighted mean
+ for(uint ivol = 0; ivol < vvol.size(); ivol++ ){
+ for(uint iflu = 0; iflu < vflu.size(); iflu++ ){
+ efEntry = vfluvvol.at(iflu).at(ivol);
+ if(efEntry > 0. ){ //Otherwise (-1), TCAD not available
+ distance = relativeDistance(aimVol, aimFlu, vvol.at(ivol), vflu.at(iflu) );
+ if( distance < 0.00001 ) return efEntry; //fluence and voltage almost correpsond to available TCAD simulation
+ meanEf += efEntry * TMath::Power( (1./distance), measure);
+ weight += TMath::Power( (1./distance),measure);
+ }
+ }
+ }
+ return (meanEf/weight);
+}
+
+// Interpolate using cubic splines
+// E efield values given as function of fluence and bias voltage (vvol, vflu)
+// interpolate to value for aimFluence and aimVoltage
+double EfieldInterpolator::estimateEfield(std::vector<double> vvol, std::vector<double> vflu, std::vector<std::vector<double>> vfluvvol, double aimFlu, double aimVol, std::string prepend, bool debug){
+ ATH_MSG_DEBUG("Estimating efield");
+ std::vector<double> evol; // e field values for fixed voltages inter- or extrapolated to fluence of interest
+ std::vector<double> vvolWoEp; // fixed voltages values for which no extrapolation is used to obatin E field in between fluences
+ std::vector<double> evolWoEp;
+ //Loop the voltages
+ for(uint ifix = 0; ifix < vvol.size(); ifix++ ){
+ std::vector<double> vx;// = new std::vector<double> ;
+ std::vector<double> vy;// = new std::vector<double>;
+ double efflu = -1.;
+ int availableTCADpoints = fillXYvectors(vflu, ifix, vfluvvol, vx, vy);
+ ATH_MSG_DEBUG("Number of available TCAD points for voltage " << vvol.at(ifix) << ": " << availableTCADpoints );
+ TString name = "FluenceEfield_";
+ name += ifix;
+ name += "FixVol";
+ name += TString::Format("%.0f",vvol.at(ifix));
+ name += "-aimFlu";
+ name += TString::Format("%.1f",aimFlu);
+ name += "-aimVol";
+ name += TString::Format("%.0f",aimVol);
+
+ TGraph* tmpgr = new TGraph(CastStdVec(vx),CastStdVec(vy));
+ tmpgr->SetTitle(name.Data());
+ if(isInterpolation(vx, aimFlu)){
+ name+="_ip";
+ }else{
+ name+="_ep";
+ }
+ if(m_useSpline ){
+ efflu = tmpgr->Eval(aimFlu,0,"S");
+ }else{
+ efflu = tmpgr->Eval(aimFlu); //linear extrapolation
+ }
+ if(debug){
+ TString aimFile = m_fInter;
+ aimFile.ReplaceAll(".root", "_debug.root");
+ aimFile.ReplaceAll(".root", prepend );
+ aimFile+= name;
+ aimFile+=".root";
+ tmpgr->SaveAs(aimFile);
+ }
+ if(isInterpolation(vx, aimFlu)){
+ // try without extrapolation: skip extrapolated values
+ vvolWoEp.push_back(vvol.at(ifix));
+ evolWoEp.push_back(efflu);
+ }
+
+ delete tmpgr;
+ evol.push_back(efflu); //includes extrapolated values
+ }//end loop voltages
+
+ //Check for debugging distribution of available E field values in fluence and
+ if(debug){
+ saveTGraph(vvol, vflu, vfluvvol, aimFlu, aimVol, prepend);
+ }
+ // if possible to reach voltage of interest without any extrapolation in previous step, prefer this
+ if(isInterpolation(vvolWoEp, aimVol) && vvolWoEp.size() > 1 ){
+ vvol = vvolWoEp;
+ evol = evolWoEp;
+ }else{
+ ATH_MSG_WARNING("E field created on extrapolation. Please check if reasonable!");
+ }
+
+ TString name = "VoltageEfield";
+ name += "-aimFlu";
+ name += TString::Format("%.1f",aimFlu);
+ name += "-aimVol";
+ name += TString::Format("%.0f",aimVol);
+ double aimEf = -1;
+ TGraph* tmpgr = new TGraph(CastStdVec(vvol),CastStdVec(evol) );
+ tmpgr->SetTitle(name.Data());
+ if(isInterpolation(vvol, aimVol)){
+ name+="_ip";
+ }else{
+ name+="_ep";
+ }
+ if(m_useSpline){
+ aimEf = tmpgr->Eval(aimVol,0,"S");
+ }else{
+ aimEf = tmpgr->Eval(aimVol); //linear extrapolation
+ }
+ if(debug){
+ TString aimFile = m_fInter;
+ aimFile.ReplaceAll(".root", "_debug.root");
+ aimFile.ReplaceAll(".root", prepend );
+ aimFile+= name;
+ aimFile+=".root";
+ tmpgr->SaveAs(aimFile);
+ }
+ delete tmpgr;
+ return aimEf;
+}
+
+//Save all E field values as function of fluence and bias voltage for debugging
+void EfieldInterpolator::saveTGraph(std::vector<double> vvol, std::vector<double> vflu, std::vector<std::vector<double>> vfluvvol, double aimFlu, double aimVol, std::string prepend, bool skipNegative){
+ TString name = "VoltageEfield";
+ name += "-aimFlu";
+ name += TString::Format("%.1f",aimFlu);
+ name += "-aimVol";
+ name += TString::Format("%.0f",aimVol);
+ TGraph2D* tmpgr = new TGraph2D();
+ tmpgr->GetYaxis()->SetTitle("voltage");
+ tmpgr->GetXaxis()->SetTitle("fluence");
+ tmpgr->SetTitle(name.Data());
+ ATH_MSG_DEBUG("E field values: "<< vfluvvol.size() << " x " << vfluvvol.at(0).size() << ", flu(x)"<< vflu.size()<< ", vol(y)" << vvol.size() );
+ int npoint = 0;
+ for(uint ix = 0; ix < vfluvvol.size(); ix++){
+ for(uint iy=0; iy < vfluvvol.at(ix).size(); iy++){
+ printf("Set point %i, %f,%f,%f\n",npoint, vflu.at(ix), vvol.at(iy), vfluvvol.at(ix).at(iy) );
+ if(vfluvvol.at(ix).at(iy) < 0){
+ if(!skipNegative) tmpgr->SetPoint(npoint, vflu.at(ix), vvol.at(iy), -1);
+ }else{
+ tmpgr->SetPoint(npoint, vflu.at(ix), vvol.at(iy), vfluvvol.at(ix).at(iy) );
+ }
+ npoint++;
+ }
+ }
+ TString aimFile = m_fInter;
+ aimFile.ReplaceAll(".root", "_debugAvailableEfieldVals.root");
+ aimFile.ReplaceAll(".root", prepend );
+ aimFile+= name;
+ aimFile+=".root";
+ tmpgr->SaveAs(aimFile);
+}
+
+TH1D* EfieldInterpolator::createEfieldProfile(double aimFluence, double aimVoltage){
+ if(!m_initialized){
+ ATH_MSG_WARNING("ERROR: EfieldInterpolator not properly intialized from " << m_fInter);
+ return NULL;
+ }
+ if(aimFluence > 1e12) aimFluence = aimFluence/1e14; //adapt units - TCAD files save 20 for 20e14 neq/cm2
+ TString title = "hefieldz";
+ TString info = "#Phi=";
+ info += TString::Format("%.2f",aimFluence);
+ info += "-U=";
+ info += TString::Format("%.0f",aimVoltage);
+ info += ";Pixeldepth z [#mum]";
+ info += ";E [V/cm]";
+ m_efieldProfile = new TH1D(title, info, m_sensorDepth,-0.5,m_sensorDepth + 0.5);
+ double pixeldepth;
+ std::vector<double> xfluence;
+ std::vector<double> yvoltage;
+ std::vector<std::vector<double>> efieldfluvol;
+ TFile* ftreeInterpolation = TFile::Open(m_fInter.c_str());
+ TTreeReader myReader("tz", ftreeInterpolation);
+ TTreeReaderValue<std::vector<double>> involtage(myReader , "yvoltage" );
+ TTreeReaderValue<std::vector<double>> influence(myReader , "xfluence" );
+ TTreeReaderValue<std::vector<std::vector<double>>> inefield(myReader , "efieldfluvol" );
+ TTreeReaderValue<double> inpixeldepth(myReader , "pixeldepth" );
+ int ientry = 0;
+ while(myReader.Next()){
+ ATH_MSG_DEBUG("TTree entry: " << ientry);
+ pixeldepth = *inpixeldepth;
+ xfluence = *influence;
+ yvoltage = *involtage;
+ efieldfluvol = *inefield;
+ // Check if interpolation is reliable based on given TCAD samples
+ if(ientry < 2){
+ reliabilityCheck(aimFluence, xfluence, aimVoltage, yvoltage);
+ }
+ double aimEf =0.;
+ switch(m_efieldOrigin)
+ {
+ case interspline : aimEf = estimateEfield(yvoltage, xfluence, efieldfluvol,aimFluence, aimVoltage ) ; break;
+ case interinvdist : aimEf = estimateEfieldInvDistance(yvoltage, xfluence, efieldfluvol,aimFluence, aimVoltage) ; break;
+ case linearField : m_useSpline = false;
+ aimEf = estimateEfield(yvoltage, xfluence, efieldfluvol,aimFluence, aimVoltage ) ; break;
+ case TCAD : aimEf = estimateEfieldLinear(aimVoltage) ;
+ if(aimEf < 0.) ATH_MSG_ERROR("TCAD E field negative at" << pixeldepth <<" !") ; break;
+ }
+
+ if(aimEf < 0.){
+ if(m_useSpline){
+ TString debugName = "negativeSplineZ";
+ debugName+= TString::Format("%.0f",pixeldepth);
+ aimEf = estimateEfield(yvoltage, xfluence, efieldfluvol,aimFluence, aimVoltage,debugName.Data(), true );
+ ATH_MSG_INFO("InterpolatorMessage: linearly interpolated e=" << aimEf << ", z=" << pixeldepth <<" Phi=,"<< aimFluence <<" U=" << aimVoltage);
+ m_useSpline = false;
+ m_efieldOrigin = linearField; // not as good as interpolation
+ }else{
+ TString debugName = "negativeLinearZ";
+ debugName+= TString::Format("%.0f",pixeldepth);
+ aimEf = estimateEfield(yvoltage, xfluence, efieldfluvol,aimFluence, aimVoltage,debugName.Data(), true );
+ ATH_MSG_ERROR("InterpolatorMessage: spline and linear interpolation failed => InvDistWeighhted e=" << aimEf << ", z=" << pixeldepth <<" Phi=,"<< aimFluence <<" U=" << aimVoltage);
+ m_efieldOrigin = interinvdist; // not as good as interpolation (linear or spline) but guaranteed to be positive
+ }
+
+ myReader.Restart();
+ }
+ m_efieldProfile->SetBinContent(m_efieldProfile->FindBin(pixeldepth), aimEf );
+ ientry++;
+ }
+ ftreeInterpolation->Close();
+ //Check edge values
+ ATH_MSG_DEBUG("Fill edges");
+ fillEdgeValues(m_efieldProfile);
+ scaleIntegralTo(m_efieldProfile,aimVoltage*10000, 2,m_sensorDepth ); //exclude first and last bin
+ TString newtitle = m_efieldProfile->GetTitle();
+ switch(m_efieldOrigin)
+ {
+ case interspline :newtitle +=" spline" ; break;
+ case interinvdist :newtitle +=" inverse distance" ; break;
+ case linearField :newtitle +=" linear" ; break;
+ case TCAD :newtitle +=" TCAD" ; break;
+ }
+
+ m_efieldProfile->SetTitle(newtitle.Data());
+ ATH_MSG_DEBUG("Created Efield");
+ m_efieldProfile->SetLineWidth(3) ;
+ m_efieldProfile->SetLineStyle(2) ;
+ m_efieldProfile->SetLineColor(4) ;
+ m_efieldProfile->SetStats(0) ;
+ return m_efieldProfile;
+}
+
+//First few and last few bins of TCAD maps not filled due to edge effect - fill with extrapolation
+void EfieldInterpolator::fillEdgeValues(TH1D* hin){
+ int nBins = hin->GetNbinsX();
+ //Check first and last bins if filled
+ // if not extrapolate linearly from two neighbouring values
+ // empty (or zero) e field values cause unphysical behaviour in ATHENA/Allpix
+ for(int i = 5; i > 0; i--){
+ //first bins
+ float curval = hin->GetBinContent(i);
+ float binii = hin->GetBinContent(i+1);
+ float biniii = hin->GetBinContent(i+2);
+ float bini = hin->GetBinContent(i);
+ if( (bini <0.01 && binii > 0.01 && biniii > 0.01) || ( (biniii-binii)/(float) binii *(binii-bini)/(float) binii <-0.2) ) {//either neighbour filled and bin negative, or edge detected, i.e. slope changes sign and relatively larger than middle entry
+ bini = extrapolateLinear(i+1, binii , i+2, biniii, i);
+ if (bini > 0 ){
+ hin->SetBinContent(i,bini );
+ }else{
+ ATH_MSG_WARNING("Could not correct bin "<< i <<" for zero or edge " );
+ if(curval <= 0.) hin->SetBinContent(i, 1.); //avoid negative Efield
+ }
+ }else{
+ ATH_MSG_INFO("No need to fill edge bin: " << i);
+ }
+ //Last bins = right hand edge
+ curval = hin->GetBinContent(nBins+1-i);
+ binii = hin->GetBinContent(nBins+1-i-1);
+ biniii = hin->GetBinContent(nBins+1-i-2);
+ bini = hin->GetBinContent(nBins+1-i);
+ if( (bini <0.01 && binii > 0.01 && biniii > 0.01) ||( (biniii-binii)/(float) binii *(binii-bini)/(float) binii < -0.2) ) {//left neighbour filled and bin below negative or slope changes sign and magnitude
+ bini = extrapolateLinear(nBins+1-i-2, hin->GetBinContent(nBins+1-i-2) , nBins+1-i-1, hin->GetBinContent(nBins+1-i-1), nBins+1-i);
+ if (bini > 0.){
+ hin->SetBinContent(nBins+1-i, bini);
+ }else{
+ ATH_MSG_WARNING("Could not correct bin"<< nBins+1-i << " for zero or edge " );
+ if(curval <= 0.) hin->SetBinContent(nBins+1-i, 1.); //avoid negative Efield
+ }
+ }else{
+ ATH_MSG_INFO("No need to fill edge bin: " << (nBins-i) );
+ }
+ }
+}
+
+// Main function to be called to create E field of interest
+
+TH1D* EfieldInterpolator::getEfield(double aimFluence, double aimVoltage){
+ if(m_initialized){
+ m_efieldProfile = createEfieldProfile( aimFluence, aimVoltage);
+ }else{
+ ATH_MSG_WARNING("EfieldInterpolator not initialized! Not able to produce E field.");
+ }
+ return m_efieldProfile;
+}
+
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/EfieldInterpolator.h b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/EfieldInterpolator.h
new file mode 100644
index 0000000000000000000000000000000000000000..ecd4ce941d7bf54f25559eacaa18f5fb3f590557
--- /dev/null
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/EfieldInterpolator.h
@@ -0,0 +1,85 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * Author Lennart Adam <lennart.adam@cern.ch> July 2018
+ *
+ * Instances of this class create a map (TH1D) describing the electric field profile along the pixeldepth.
+ * E field maps based on TCAD simulations available only for limited number of values of fluence and bias voltage.
+ * Interpolate inbetween these simulations to save computing time.
+ *
+ * The TCAD simulations are performed for the FEI4 pixel sensor with a pixeldepth of 200um (IBL) or 250um (B layers)
+ */
+
+#ifndef PIXELDIGITIZATION_EFIELDINTERPOLATOR_H
+#define PIXELDIGITIZATION_EFIELDINTERPOLATOR_H
+
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "TH1.h"
+
+namespace RadDam{
+
+// Different options to retrieve E field
+// default: interspline
+enum interpolationMethod{
+ TCAD, //use Precomputed TCAD map
+ interspline, //use interpolation based on cubic splines
+ interinvdist, //use inverse distance weighted estimate
+ linearField //linear field according to bias voltage
+};
+
+class EfieldInterpolator: public AthAlgTool {
+public:
+
+ EfieldInterpolator( const std::string& type, const std::string& name,const IInterface* parent);
+ virtual ~EfieldInterpolator();
+ void setLayer(int layer);
+ //Recommended constructor
+ StatusCode loadTCADlist(std::string TCADfileListToLoad );
+ //defFct
+
+ virtual StatusCode initialize();
+ virtual StatusCode finalize();
+
+ static const InterfaceID& interfaceID() ;
+
+ // Member Functions
+ std::string loadTCADfiles(std::string targetList = "");
+ std::string createInterpolationFromTCADtree(std::string fTCAD);//TTree* tTCAD);
+ bool initializeFromFile(std::string finpath);
+ bool initializeFromDirectory(const std::string fpath);
+ double estimateEfield(std::vector<double> vvol, std::vector<double> vflu, std::vector<std::vector<double>> vfluvvol, double aimFlu, double aimVol, std::string prepend="", bool debug =false);
+ double estimateEfieldInvDistance(std::vector<double> vvol, std::vector<double> vflu, std::vector<std::vector<double>> vfluvvol, double aimFlu, double aimVol, double measure = 1.);
+
+ TH1D* createEfieldProfile(double aimFluence, double aimVoltage);
+ TH1D* getEfield(double aimFluence, double aimVoltage);
+ TH1D* loadEfieldFromDat(std::string fname, bool fillEdges = true);
+ void scaleIntegralTo(TH1* hin, double aimInt, int first = 1, int last = -1);
+ void reliabilityCheck(double aimFluence, std::vector<double> fluences, double aimVoltage, std::vector<double> voltages);
+
+private:
+ // Member variables
+ bool m_initialized;
+ bool m_saveDocu ;
+ bool m_useSpline ;
+ int m_sensorDepth ; //um - default is IBL layer
+ interpolationMethod m_efieldOrigin;
+ TH1D* m_efieldProfile; //Final efield profile
+ std::string m_fInter; //path to .root file for saving interpolation TTree, i.e. ordered by pixeldepth z
+ std::vector<std::vector<TString>> list_files(TString fileList_TCADsamples);
+ double extrapolateLinear(double x1, double y1, double x2, double y2, double xaim );
+ int fillXYvectors(std::vector<double> vLoop,int ifix, std::vector<std::vector<double>> v2vsv1, std::vector<double> &xx, std::vector<double> &yy, bool regularOrder = true);
+ void fillEdgeValues(TH1D* hin);
+ bool isInterpolation(const std::vector<double> &vval, double aimval)
+ { return ( vval.front() <= aimval && aimval <= vval.back() ); };
+ bool isInterpolation(std::vector<double>* vval, double aimval)
+ {return ( vval->front() <= aimval && aimval <= vval->back() );};
+ double relativeDistance(double x1, double x2); //difference between x1 x2 scaled to x1
+ double relativeDistance(double x1, double y1, double x2, double y2);
+ double estimateEfieldLinear(double aimVoltage);
+ void saveTGraph(std::vector<double> vvol, std::vector<double> vflu, std::vector<std::vector<double>> vfluvvol, double aimFlu, double aimVol, std::string prepend, bool skipNegative = true);
+};
+
+}
+#endif //> !PIXELDIGITIZATION_EFIELDINTERPOLATOR_H
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RadDamageUtil.cxx b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RadDamageUtil.cxx
index 87bae22ae5c57cf411939d2f347a736831ee30f7..cb4ce086c8e5223469d3b8bcd7c1a85f771353ed 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RadDamageUtil.cxx
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RadDamageUtil.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -37,21 +37,26 @@
#include "TLorentzVector.h"
#include "CLHEP/Units/PhysicalConstants.h"
+#include "EfieldInterpolator.h"
+
using namespace std;
// Constructor with parameters:
RadDam::RadDamageUtil::RadDamageUtil(const std::string& type, const std::string& name,const IInterface* parent):
AthAlgTool(type,name,parent),
- betaElectrons(4.5e-16),
- betaHoles(6.0e-16),
m_defaultRamo( 1 ),
m_defaultEField( 1 ),
+ m_EfieldInterpolator(""),
+ m_betaElectrons(4.5e-16),
+ m_betaHoles(6.0e-16),
+ m_saveDebugMaps(false),
m_rndmSvc("AtDSFMTGenSvc",name),
m_rndmEngineName("PixelDigitization"),
- m_rndmEngine(0)
+ m_rndmEngine(nullptr)
{
declareProperty("RndmSvc", m_rndmSvc, "Random Number Service used in RadDamageUtil");
declareProperty("RndmEngine", m_rndmEngineName, "Random engine name");
+ declareProperty("EfieldInterpolator", m_EfieldInterpolator, "Create an Efield for fluence and bias volatge of interest based on TCAD samples");
}
// Destructor:
@@ -63,6 +68,7 @@ RadDam::RadDamageUtil::~RadDamageUtil(){}
StatusCode RadDam::RadDamageUtil::initialize() {
CHECK(AthAlgTool::initialize());
+ CHECK(m_EfieldInterpolator.retrieve());
CHECK(m_rndmSvc.retrieve());
ATH_MSG_INFO("You are using RadDamageUtil for solid-state silicon detectors.");
@@ -233,16 +239,27 @@ double RadDam::RadDamageUtil::weighting2D(double x, double z, double Lx, double
//=========================================
// G E N E R A T E E - F I E L D M A P
//=========================================
-const StatusCode RadDam::RadDamageUtil::generateEfieldMap( TH1F* eFieldMap, InDetDD::PixelModuleDesign* module ){
+const StatusCode RadDam::RadDamageUtil::generateEfieldMap( TH1F*& eFieldMap, InDetDD::PixelModuleDesign* module ){
//TODO: from DB
- double biasVoltage = 600.;
- double depletionVoltage = 80.;
- double depletionLength = 0.2;
- double sensorThickness = module->thickness(); //default should be 0.2?
-
+ double biasVoltage = 600.;
+ double sensorThickness = module->thickness(); //default should be 0.2?
+ double fluence = 8.;//*e14 neq/cm^2
eFieldMap = new TH1F("hefieldz","hefieldz",200,0,sensorThickness*1e3);
+ std::string TCAD_list = PathResolver::find_file("ibl_TCAD_EfieldProfiles.txt", "DATAPATH"); //IBL layer
+ if(sensorThickness > 0.2){
+ //is blayer
+ TCAD_list = PathResolver::find_file("blayer_TCAD_EfieldProfiles.txt", "DATAPATH"); //B layer
+ if(sensorThickness > 0.25){
+ ATH_MSG_WARNING("Sensor thickness ("<< sensorThickness << "mm) does not match geometry provided in samples");
+ return StatusCode::FAILURE;
+ }
+ }
+
+ m_EfieldInterpolator->loadTCADlist(TCAD_list);
+ eFieldMap = (TH1F*) m_EfieldInterpolator->getEfield(fluence , biasVoltage);
+ /*
//Set depletion width
double electricField=0; //V/mm
double depletionWidth = sensorThickness; //in mm
@@ -268,9 +285,47 @@ const StatusCode RadDam::RadDamageUtil::generateEfieldMap( TH1F* eFieldMap, InDe
if (m_defaultEField==0)
eFieldMap->SetBinContent(i,10*biasVoltage/(sensorThickness)); //in V/cm
}
+ */
return StatusCode::SUCCESS;
}
+StatusCode RadDam::RadDamageUtil::generateEfieldMap( TH1F* &eFieldMap, InDetDD::PixelModuleDesign* /*module*/, double fluence, double biasVoltage, int layer, std::string TCAD_list, bool interpolate ){
+
+ TString id;
+ //TODO adapt saving location for documentation of E field interpolation
+ TString predirname ="";
+ if(interpolate){
+ id = "Interpolation";
+ }else{
+ id = "TCAD";
+ }
+ if(interpolate){
+ CHECK( m_EfieldInterpolator->loadTCADlist(TCAD_list) );
+ eFieldMap = (TH1F*) m_EfieldInterpolator->getEfield(fluence , biasVoltage);
+ }else{
+ //retrieve E field directly from file (needs to be .dat file with table)
+ CHECK( m_EfieldInterpolator->loadTCADlist(TCAD_list) );
+ ATH_MSG_INFO("Load Efield map from " << TCAD_list );
+ }
+ if(!eFieldMap){
+ ATH_MSG_ERROR("E field has not been created!");
+ return StatusCode::FAILURE;
+ }
+ //For debugging save map
+ //TCAD_list.ReplaceAll(".txt","_map.root");
+ TString dirname = "layer";
+ dirname+=layer;
+ dirname+="_fl";
+ dirname+=TString::Format("%.1f",fluence/(float)(1e14));
+ dirname+="e14_U";
+ dirname+=TString::Format("%.0f",biasVoltage);
+ dirname+=id;
+ dirname.ReplaceAll(".","-");
+ dirname = predirname + dirname;
+ dirname+=(".root");
+ eFieldMap->SaveAs(dirname.Data());
+ return StatusCode::SUCCESS;
+}
//==================================================
// G E N E R A T E DISTANCE / TIME / LORENTZ MAP
@@ -279,23 +334,34 @@ const StatusCode RadDam::RadDamageUtil::generateEfieldMap( TH1F* eFieldMap, InDe
//It IS possible to split them up but riht now that means lots of repeated code.
//Might be worth coming back in the future if it needs to be optimised or
//if
-const StatusCode RadDam::RadDamageUtil::generateDistanceTimeMap( TH2F* distanceMap_e, TH2F* distanceMap_h, TH1F* timeMap_e, TH1F* timeMap_h, TH2F* lorentzMap_e, TH2F* lorentzMap_h, TH1F* eFieldMap, InDetDD::PixelModuleDesign* module ){
-
+const StatusCode RadDam::RadDamageUtil::generateDistanceTimeMap( TH2F* &distanceMap_e, TH2F* &distanceMap_h, TH1F* &timeMap_e, TH1F* &timeMap_h, TH2F* &lorentzMap_e, TH2F* &lorentzMap_h, TH1F* &eFieldMap, InDetDD::PixelModuleDesign* module ){
+ // Implementation for precomputed maps
+ //https://gitlab.cern.ch/radiationDamageDigitization/radDamage_athena_rel22/blob/rel22_radDamageDev_master/scripts/SaveMapsForAthena.C
//TODO: From DB call each time
double temperature = 300;
double bField = 2;//Tesla
//From PixelModuleDesign: TODO
- double sensorThickness = module->thickness() * 1000.0;//default is 200;
-
+ //FIXME workaround, if PixelModuleDesign not available: retrieve sensor thickness from E field
+ //double sensorThickness = module->thickness() * 1000.0;//default is 200;
+ double sensorThickness = 0.2; //mm
+ //Check if x axis (sensor depth) of E field larger than IBL sensors
+ if(eFieldMap->GetXaxis()->GetXmax() > 210 ){ //Efield in um
+ sensorThickness = 0.250;
+ }
+ if(module){
+ sensorThickness = module->thickness() * 1000.0;//default is 200;
+ }
+
//Y-axis is time charge carrier travelled for,
//X-axis is initial position of charge carrier,
//Z-axis is final position of charge carrier
- distanceMap_e = new TH2F("edistance","Electron Distance Map",100,0,sensorThickness,20,0,10); //mm by ns
- distanceMap_h = new TH2F("hdistance","Holes Distance Map",100,0,sensorThickness,20,0,10);
-
+ distanceMap_e = new TH2F("edistance","Electron Distance Map",100,0,sensorThickness,1000,0,1000); //mm by ns
+ distanceMap_h = new TH2F("hdistance","Holes Distance Map",100,0,sensorThickness,1000,0,1000);
+ //Initalize distance maps
for (int i=1; i<= distanceMap_e->GetNbinsX(); i++){
for (int j=1; j<= distanceMap_e->GetNbinsY(); j++){
distanceMap_h->SetBinContent(i,j,sensorThickness); //if you travel long enough, you will reach the electrode.
+ distanceMap_e->SetBinContent(i,j,0.); //if you travel long enough, you will reach the electrode.
}
}
@@ -311,7 +377,6 @@ const StatusCode RadDam::RadDamageUtil::generateDistanceTimeMap( TH2F* distanceM
ATH_MSG_DEBUG ("Did not find time and/or distance maps. Will compute them from the E-field map..");
for (int i=1; i<= distanceMap_e->GetNbinsX(); i++){ //Loop over initial position of charge carrier (in z)
- double z_i = distanceMap_e->GetXaxis()->GetBinCenter(i);
double time_e = 0.; //ns
double time_h = 0.; //ns
double distanceTravelled_e=0; //mm
@@ -320,37 +385,54 @@ const StatusCode RadDam::RadDamageUtil::generateDistanceTimeMap( TH2F* distanceM
double drift_h = 0.; //mm
for (int j=i; j >= 1; j--){ //Lower triangle
+ double dz = distanceMap_e->GetXaxis()->GetBinWidth(j); //mm
+ double z_j = distanceMap_e->GetXaxis()->GetBinCenter(j); //mm
+ //printf("\n \n distance map bin center i/j: %f/%f width %f (mm) \n sensor thickness: %f \n E field value: %f in bin %f \n ", z_i, z_j, dz, sensorThickness, Ez, z_i*1000);
+ //
+ double Ez = eFieldMap->GetBinContent(eFieldMap->GetXaxis()->FindBin(z_j*1000))/1e7; // in MV/mm;
+ std::pair<double, double> mu = getMobility(Ez, temperature); //mm^2/MV*ns
+ if (Ez > 0){
+
+ //Electrons
+ //double tanLorentzAngle = mu.first*bField*(1.0E-3); //rad, unit conversion; pixelPitch_eta-Field is in T = V*s/m^2
+ double tanLorentzAngle = getTanLorentzAngle(Ez, temperature, bField, false);
+ time_e += dz/(mu.first*Ez); //mm * 1/(mm/ns) = ns
+
+ //Fill: time charge carrier travelled for, given staring position (i) and final position (z_j)
+ distanceMap_e->SetBinContent(i,distanceMap_e->GetYaxis()->FindBin(time_e),z_j);
+
+ drift_e += dz*tanLorentzAngle; //Increment the total drift parallel to plane of sensor
+ distanceTravelled_e += dz; //mm (travelled in z)
+ lorentzMap_e->SetBinContent(i,j,drift_e/distanceTravelled_e);
- double dz = distanceMap_e->GetXaxis()->GetBinWidth(j); //mm
- double Ez = eFieldMap->GetBinContent(eFieldMap->GetXaxis()->FindBin(z_i*1000))/1e7; // in MV/mm;
- double z_j = distanceMap_e->GetXaxis()->GetBinCenter(j); //mm
-
- if (Ez > 0){
-
- //Electrons
- std::pair<double, double> mu = getMobility(Ez, temperature); //mm^2/MV*ns
- double tanLorentzAngle = mu.first*bField*(1.0E-3); //rad, unit conversion; pixelPitch_eta-Field is in T = V*s/m^2
- time_e += dz/(mu.first*Ez); //mm * 1/(mm/ns) = ns
-
- //Fill: time charge carrier travelled for, given staring position (i) and final position (z_j)
- distanceMap_e->SetBinContent(i,distanceMap_e->GetYaxis()->FindBin(time_e),z_j);
-
- drift_e += dz*tanLorentzAngle; //Increment the total drift parallel to plane of sensor
- distanceTravelled_e += dz; //mm (travelled in z)
- lorentzMap_e->SetBinContent(i,j,drift_e/distanceTravelled_e);
-
- //Holes
- tanLorentzAngle = mu.second*bField*(1.0E-3); //rad
- time_h+=dz/(mu.second*Ez); //mm * 1/(mm/ns) = ns
- distanceMap_h->SetBinContent(i,distanceMap_h->GetYaxis()->FindBin(time_h),z_j);
-
- drift_h+=dz*tanLorentzAngle;
- distanceTravelled_h += dz; //mm
lorentzMap_h->SetBinContent(i,j,drift_h/distanceTravelled_h);
}
}
- timeMap_e->SetBinContent(i,time_e);
- timeMap_h->SetBinContent(i,time_h);
+ //Mainly copied from l416 ff changed naming k=>j
+ //https://gitlab.cern.ch/radiationDamageDigitization/radDamage_athena_rel22/blob/rel22_radDamageDev_master/scripts/SaveMapsForAthena.C
+ for (int j=i; j <= distanceMap_e->GetNbinsX(); j++){ //holes go the opposite direction as electrons.
+
+ double dz = distanceMap_e->GetXaxis()->GetBinWidth(j); //similar to _h
+ //double Ez = eFieldMap->GetBinContent(eFieldMap->GetXaxis()->FindBin(z_i*1000))/1e7; // in MV/mm;
+ double z_j= distanceMap_e->GetXaxis()->GetBinCenter(j); //mm //similar to _h
+ double Ez = eFieldMap->GetBinContent(eFieldMap->GetXaxis()->FindBin(z_j*1000))/1e7; // in MV/mm;
+ std::pair<double, double> mu = getMobility(Ez, temperature); //mm^2/MV*ns
+ if (Ez > 0){
+ //Holes
+ //std::pair<double, double> mu = getMobility(Ez, temperature); //mm^2/MV*ns
+ //double tanLorentzAngle = mu.second*bField*(1.0E-3); //rad
+ double tanLorentzAngle = getTanLorentzAngle(Ez, temperature,bField, true);
+ time_h+=dz/(mu.second*Ez); //mm * 1/(mm/ns) = ns
+ distanceMap_h->SetBinContent(i,distanceMap_h->GetYaxis()->FindBin(time_h),z_j);
+
+ drift_h+=dz*tanLorentzAngle;
+ distanceTravelled_h += dz; //mm
+ lorentzMap_h->SetBinContent(i,j,drift_h/distanceTravelled_h);
+ }
+ timeMap_h->SetBinContent(i,time_h);
+ }
+
+
}
return StatusCode::SUCCESS;
@@ -387,6 +469,21 @@ const std::pair<double,double> RadDam::RadDamageUtil::getMobility(double electri
return std::make_pair( mobility_e, mobility_h );
}
+//=======================================
+// G E T L O R E N T Z A N G L E
+//=======================================
+//Taken from https://gitlab.cern.ch/radiationDamageDigitization/radDamage_athena_rel22/blob/rel22_radDamageDev_master/scripts/SaveMapsForAthena.C
+double RadDam::RadDamageUtil::getTanLorentzAngle(double electricField, double temperature, double bField, bool isHole){
+ double hallEffect = 1.;//already in mobility//= 1.13 + 0.0008*(temperature - 273.0); //Hall Scattering Factor - taken from https://cds.cern.ch/record/684187/files/indet-2001-004.pdf
+ if (isHole) hallEffect = 0.72 - 0.0005*(temperature - 273.0);
+ std::pair<double,double> mobility = getMobility(electricField, temperature);
+ double mobility_object = mobility.first;
+ if(isHole) mobility_object = mobility.second;
+ double tanLorentz = hallEffect*mobility_object*bField*(1.0E-3); //unit conversion
+ return tanLorentz;
+}
+
+
//=======================================
// G E T T R A P P I N G T I M E
//=======================================
@@ -395,8 +492,8 @@ const std::pair<double,double> RadDam::RadDamageUtil::getTrappingTimes( double f
double trappingTimeElectrons(0.), trappingTimeHoles(0.);
if(fluence!=0.0){
- trappingTimeElectrons = 1.0/(betaElectrons*fluence); //Make memberVar
- trappingTimeHoles = 1.0/(betaHoles*fluence); //ns
+ trappingTimeElectrons = 1.0/(m_betaElectrons*fluence); //Make memberVar
+ trappingTimeHoles = 1.0/(m_betaHoles*fluence); //ns
}
else{//fluence = 0 so do not trap!
trappingTimeElectrons = 1000; //~infinity
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RadDamageUtil.h b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RadDamageUtil.h
index ef8804c1322d4fcef471f994f29400d10b7e61dd..b4bac6410ecec4a40a364e08e9c7d345b48785cd 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RadDamageUtil.h
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/RadDamageUtil.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -31,6 +31,8 @@
#include "TH2.h"
#include "TH1.h"
+#include "EfieldInterpolator.h"
+
namespace RadDam{
//====================
@@ -49,24 +51,32 @@ public:
virtual ~RadDamageUtil();
StatusCode initTools();
const StatusCode generateRamoMap(TH3F* ramPotentialMap, InDetDD::PixelModuleDesign* module);
- const StatusCode generateEfieldMap(TH1F* eFieldMap, InDetDD::PixelModuleDesign* module);
- const StatusCode generateDistanceTimeMap( TH2F* distanceMap_e, TH2F* distanceMap_h, TH1F* timeMap_e, TH1F* timeMap_h, TH2F* lorentzMap_e, TH2F* lorentzMap_h, TH1F* eFieldMap, InDetDD::PixelModuleDesign* module);
+ const StatusCode generateEfieldMap(TH1F*& eFieldMap, InDetDD::PixelModuleDesign* module);
+ StatusCode generateEfieldMap(TH1F* &eFieldMap, InDetDD::PixelModuleDesign* module, double fluence, double biasVoltage, int layer, std::string TCAD_list, bool interpolate);
+ const StatusCode generateDistanceTimeMap( TH2F* &distanceMap_e, TH2F* &distanceMap_h, TH1F* &timeMap_e, TH1F* &timeMap_h, TH2F* &lorentzMap_e, TH2F* &lorentzMap_h, TH1F* &eFieldMap, InDetDD::PixelModuleDesign* module);
const std::pair<double,double> getTrappingTimes( double fluence ) const;
const std::pair<double,double> getMobility( double electricField, double temperature) const;
+ double getTanLorentzAngle(double electricField, double temperature, double bField, bool isHole);
- double betaElectrons; //TODO: should be replaced my DB version
- double betaHoles; //TODO: should be replaced my DB version
int m_defaultRamo; //TODO: need to decide what we want to do with this.
int m_defaultEField; //TODO: need to decide what we want to do with this.
+
+ ToolHandle<EfieldInterpolator> m_EfieldInterpolator;
private:
RadDamageUtil();
+ double m_betaElectrons; //TODO: should be replaced my DB version
+ double m_betaHoles; //TODO: should be replaced my DB version
+
double alpha(int n, int Nrep, double a); //Poisson solution factor
double weighting3D(double x, double y, double z, int n, int m, int Nrep, double a, double b);
double weighting2D(double x, double z, double Lx, double sensorThickness);
+public:
+ bool m_saveDebugMaps;
+
protected:
ServiceHandle<IAtRndmGenSvc> m_rndmSvc;
std::string m_rndmEngineName;
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSim3DTool.cxx b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSim3DTool.cxx
index c5db4b438db082b15d520acdaad6702c0b20bc5e..e2b7e34fd0db390ee6d04ea58ceb91dd92a86c40 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSim3DTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSim3DTool.cxx
@@ -96,49 +96,49 @@
} else if (m_fluence == 1) {
- mapsPath_list.push_back(PathResolverFindCalibFile("/afs/cern.ch/user/v/vewallan/public/TCADmaps/outputfiles/phi_0_20V.root"));
+ mapsPath_list.push_back(PathResolverFindCalibFile("PixelDigitization/TCAD_IBL_3Dsensors_efields/phi_0_20V.root"));
m_fluence_layers.push_back(1e-10);
} else if (m_fluence == 2) {
- mapsPath_list.push_back(PathResolverFindCalibFile("/afs/cern.ch/user/v/vewallan/public/TCADmaps/outputfiles/phi_1e14_20V.root"));
+ mapsPath_list.push_back(PathResolverFindCalibFile("PixelDigitization/TCAD_IBL_3Dsensors_efields/phi_1e14_20V.root"));
m_fluence_layers.push_back(1e14);
} else if (m_fluence == 3) {
- mapsPath_list.push_back(PathResolverFindCalibFile("/afs/cern.ch/user/v/vewallan/public/TCADmaps/outputfiles/phi_2e14_30V.root"));
+ mapsPath_list.push_back(PathResolverFindCalibFile("PixelDigitization/TCAD_IBL_3Dsensors_efields/phi_2e14_30V.root"));
m_fluence_layers.push_back(2e14);
} else if (m_fluence == 4) {
- mapsPath_list.push_back(PathResolverFindCalibFile("/afs/cern.ch/user/v/vewallan/public/TCADmaps/outputfiles/phi_5e14_40V.root"));
+ mapsPath_list.push_back(PathResolverFindCalibFile("PixelDigitization/TCAD_IBL_3Dsensors_efields/phi_5e14_40V.root"));
m_fluence_layers.push_back(5e14);
} else if (m_fluence == 5) {
- mapsPath_list.push_back(PathResolverFindCalibFile("/afs/cern.ch/user/v/vewallan/public/TCADmaps/outputfiles/phi_1e15_50V.root"));
+ mapsPath_list.push_back(PathResolverFindCalibFile("PixelDigitization/TCAD_IBL_3Dsensors_efields/phi_1e15_50V.root"));
m_fluence_layers.push_back(1e15);
} else if (m_fluence == 6) {
- mapsPath_list.push_back(PathResolverFindCalibFile("/afs/cern.ch/user/v/vewallan/public/TCADmaps/outputfiles/phi_5e15_160V.root"));
+ mapsPath_list.push_back(PathResolverFindCalibFile("PixelDigitization/TCAD_IBL_3Dsensors_efields/phi_5e15_160V.root"));
m_fluence_layers.push_back(5e15);
} else if (m_fluence == 7) {
- mapsPath_list.push_back(PathResolverFindCalibFile("/afs/cern.ch/user/v/vewallan/public/TCADmaps/outputfiles/phi_6e15_190V_new.root"));
+ mapsPath_list.push_back(PathResolverFindCalibFile("PixelDigitization/TCAD_IBL_3Dsensors_efields/phi_6e15_190V_new.root"));
m_fluence_layers.push_back(6e15);
} else if (m_fluence == 8) {
- mapsPath_list.push_back(PathResolverFindCalibFile("/afs/cern.ch/user/v/vewallan/public/TCADmaps/outputfiles/phi_1e16_260V_new.root"));
+ mapsPath_list.push_back(PathResolverFindCalibFile("PixelDigitization/TCAD_IBL_3Dsensors_efields/phi_1e16_260V_new.root"));
m_fluence_layers.push_back(1e16);
}
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.cxx b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.cxx
index a7152bd2750f46da60c2143fac5775fa3f887dff..4460dc91b36d6a71313a5f2ac6094a00ad97e0d9 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.cxx
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -51,18 +51,32 @@ SensorSimPlanarTool::SensorSimPlanarTool(const std::string& type, const std::str
m_numberOfCharges(10),
m_diffusionConstant(.0),
m_doRadDamage(true),
- m_fluence(5),
m_trappingTimeElectrons(0.),
- m_trappingTimeHoles(0.)
+ m_trappingTimeHoles(0.),
+ m_fluence(5),
+ m_fluenceB(-1), //e14 neq/cm^2 //if negative do not use interpolation maps
+ m_fluence1(-1), //if negative do not use interpolation maps but maps precomputed for benchmark indicated in fluence
+ m_fluence2(-1),
+ m_voltage (-1), //Volt
+ m_voltageB(-1),
+ m_voltage1(-1),
+ m_voltage2(-1)
{
- declareProperty("RadDamageUtil", m_radDamageUtil, "Rad Damage utility");
- declareProperty("numberOfSteps",m_numberOfSteps,"Geant4:number of steps for PixelPlanar");
- declareProperty("numberOfCharges",m_numberOfCharges,"Geant4:number of charges for PixelPlanar");
- declareProperty("diffusionConstant",m_diffusionConstant,"Geant4:Diffusion Constant for PixelPlanar");
- declareProperty("doRadDamage", m_doRadDamage, "doRadDmaage bool: should be flag");
- declareProperty("fluence", m_fluence, "this is the fluence benchmark, 0-6. 0 is unirradiated, 1 is start of Run 2, 5 is end of 2018 and 6 is projected end of 2018");
+ declareProperty("RadDamageUtil", m_radDamageUtil, "Rad Damage utility");
+ declareProperty("numberOfSteps", m_numberOfSteps,"Geant4:number of steps for PixelPlanar");
+ declareProperty("numberOfCharges", m_numberOfCharges,"Geant4:number of charges for PixelPlanar");
+ declareProperty("diffusionConstant", m_diffusionConstant,"Geant4:Diffusion Constant for PixelPlanar");
+ declareProperty("doRadDamage", m_doRadDamage, "doRadDmaage bool: should be flag");
declareProperty("trappingTimeElectrons", m_trappingTimeElectrons, "Characteristic time till electron is trapped [ns]");
- declareProperty("trappingTimeHoles", m_trappingTimeHoles, "Characteristic time till hole is trapped [ns]");
+ declareProperty("trappingTimeHoles", m_trappingTimeHoles, "Characteristic time till hole is trapped [ns]");
+ declareProperty("fluence", m_fluence, "this is the fluence benchmark, 0-6. 0 is unirradiated, 1 is start of Run 2, 5 is end of 2018 and 6 is projected end of 2018");
+ declareProperty("fluenceB", m_fluenceB, "fluence detector has recieved in neqcm2 at the B layer.");
+ declareProperty("fluence1", m_fluence1, "fluence detector has recieved in neqcm2 at the layer 1.");
+ declareProperty("fluence2", m_fluence2, "fluence detector has recieved in neqcm2 at the layer 2.");
+ declareProperty("voltage", m_voltage, "this is the bias voltage applied to the IBL - if not set use values from applied at benchmark points according to fluence");
+ declareProperty("voltageB", m_voltageB, "bias voltage applied to the B layer.");
+ declareProperty("voltage1", m_voltage1, "bias voltage applied to the layer 1.");
+ declareProperty("voltage2", m_voltage2, "bias voltage applied to the layer 2.");
}
class DetCondCFloat;
@@ -88,14 +102,29 @@ StatusCode SensorSimPlanarTool::initialize() {
m_trappingTimeElectrons = trappingTimes.first;
m_trappingTimeHoles = trappingTimes.second;
}
-
- std::vector<std::string> mapsPath_list;
-
+ //If any fluence or voltage initialized negative use benchmark maps and not interpolation
+ bool doInterpolateEfield = (m_fluence > 0. && m_fluenceB > 0. && m_fluence1 > 0. && m_fluence2 > 0. && m_voltage > 0. && m_voltageB > 0. && m_voltage1 > 0. && m_voltage2 > 0.);
+ std::vector<std::string> mapsPath_list;
+ std::vector<std::string> TCADpath_list;
+
+ // Use all TCAD E field files in this directory for creating E field via interpolation (pruned filed excluded)
+ std::string iblFiles = PathResolverFindCalibDirectory("PixelDigitization/TCAD_IBL_efields/fei4-200um/");
+ std::string sensorFiles = PathResolverFindCalibDirectory("PixelDigitization/TCAD_Blayer_efields/fei4-250um/");
+
+ // For each layer one configuration
+ TCADpath_list = {iblFiles, sensorFiles, sensorFiles, sensorFiles}; //IBL - 200um sensor depth, B layer - 20um, layer 1, layer 2
+// Replpicate the sesensorFiles files to afs/GroupData https://twiki.cern.ch/twiki/bin/view/AtlasComputing/PathResolver
+// If you want only certain TCAD E field files to be used to create an interpolated E field, hand over a list like these instead of the directory
+// TCADpath_list.push_back(PathResolverFindCalibFile("PixelDigitization/ibl_TCAD_EfieldProfiles.txt" );
+// TCADpath_list.push_back(PathResolverFindCalibFile("PixelDigitization/blayer_TCAD_EfieldProfiles.txt");
+// TCADpath_list.push_back(PathResolverFindCalibFile("PixelDigitization/blayer_TCAD_EfieldProfiles.txt");
+// TCADpath_list.push_back(PathResolverFindCalibFile("PixelDigitization/blayer_TCAD_EfieldProfiles.txt");
+
if(m_fluence==0){
}
else if(m_fluence==1){
-
+ ATH_MSG_INFO("Use benchmark point 1!");
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_IBL_PL_80V_fl0em10.root") ); //IBL PL - Barrel
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_150V_fl7e13.root") ); //B-Layer - Barrel
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_150V_fl3e13.root") ); //Layer-1 - Barrel
@@ -106,8 +135,13 @@ StatusCode SensorSimPlanarTool::initialize() {
m_fluence_layers.push_back(3e13);
m_fluence_layers.push_back(2e13);
+ m_voltage_layers.push_back(80);
+ m_voltage_layers.push_back(150);
+ m_voltage_layers.push_back(150);
+ m_voltage_layers.push_back(150);
}
else if(m_fluence==2){
+ ATH_MSG_INFO("Use benchmark point 2!");
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_IBL_PL_80V_fl1e14.root") );
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_150V_fl1.2e14.root") );
@@ -119,8 +153,12 @@ StatusCode SensorSimPlanarTool::initialize() {
m_fluence_layers.push_back(5e13);
m_fluence_layers.push_back(3e13);
+ m_voltage_layers.push_back(80);
+ m_voltage_layers.push_back(150);
+ m_voltage_layers.push_back(150);
+ m_voltage_layers.push_back(150);
}else if(m_fluence==3){
-
+ ATH_MSG_INFO("Use benchmark point 3!");
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_IBL_PL_80V_fl2e14.root") );
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_150V_fl1.7e14.root") );
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_150V_fl7e13.root") );
@@ -131,7 +169,12 @@ StatusCode SensorSimPlanarTool::initialize() {
m_fluence_layers.push_back(7e13);
m_fluence_layers.push_back(4e13);
+ m_voltage_layers.push_back(80);
+ m_voltage_layers.push_back(150);
+ m_voltage_layers.push_back(150);
+ m_voltage_layers.push_back(150);
}else if(m_fluence==4){
+ ATH_MSG_INFO("Use benchmark point 4!");
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_IBL_PL_150V_fl2e14.root") );
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_350V_fl1.7e14.root") );
@@ -143,7 +186,12 @@ StatusCode SensorSimPlanarTool::initialize() {
m_fluence_layers.push_back(7e13);
m_fluence_layers.push_back(4e13);
+ m_voltage_layers.push_back(150);
+ m_voltage_layers.push_back(350);
+ m_voltage_layers.push_back(250);
+ m_voltage_layers.push_back(150);
}else if(m_fluence==5){
+ ATH_MSG_INFO("Use benchmark point 5!");
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_IBL_PL_350V_fl5e14.root") );
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_350V_fl3.1e14.root") );
@@ -155,7 +203,12 @@ StatusCode SensorSimPlanarTool::initialize() {
m_fluence_layers.push_back(1.3e14);
m_fluence_layers.push_back(8e13);
+ m_voltage_layers.push_back(350);
+ m_voltage_layers.push_back(350);
+ m_voltage_layers.push_back(250);
+ m_voltage_layers.push_back(150);
}else if(m_fluence==6){
+ ATH_MSG_INFO("Use benchmark point 6!");
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_IBL_400V_fl8_7e14.root") );
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_400V_fl4_6e14.root") );
@@ -168,7 +221,12 @@ StatusCode SensorSimPlanarTool::initialize() {
m_fluence_layers.push_back(2.1e14);
m_fluence_layers.push_back(1.3e14);
+ m_voltage_layers.push_back(400);
+ m_voltage_layers.push_back(400);
+ m_voltage_layers.push_back(250);
+ m_voltage_layers.push_back(150);
}else if(m_fluence==7){
+ ATH_MSG_INFO("Use benchmark point 7!");
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_IBL_endLHC.root") );
mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_blayer_endLHC.root") );
@@ -181,22 +239,65 @@ StatusCode SensorSimPlanarTool::initialize() {
m_fluence_layers.push_back(2*2.1e14);
m_fluence_layers.push_back(2*1.3e14);
+ m_voltage_layers.push_back(350);
+ m_voltage_layers.push_back(350);
+ m_voltage_layers.push_back(250);
+ m_voltage_layers.push_back(150);
}
-
+
+ if(mapsPath_list.size()==0 ){
+ if(doInterpolateEfield){
+ ATH_MSG_INFO("No benchmark value set for fluence. Use interpolation.");
+ mapsPath_list.clear();
+ m_fluence_layers.clear();
+ m_voltage_layers.clear();
+ //Set up default maps for ramoMap,
+ //but retrieve Efield from interpolation as well as Lorentz, time and distance map from E field
+ mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_IBL_PL_80V_fl0em10.root") ); //IBL PL - Barrel
+ mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_150V_fl7e13.root") ); //B-Layer - Barrel
+ mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_150V_fl3e13.root") ); //Layer-1 - Barrel
+ mapsPath_list.push_back( PathResolverFindCalibFile("PixelDigitization/maps_PIX_150V_fl2e13.root") ); //Layer-2 - Barrel
+ m_fluence_layers.push_back(m_fluence*1e14);
+ m_fluence_layers.push_back(m_fluenceB*1e14);
+ m_fluence_layers.push_back(m_fluence1*1e14);
+ m_fluence_layers.push_back(m_fluence2*1e14);
+
+ m_voltage_layers.push_back(m_voltage);
+ m_voltage_layers.push_back(m_voltageB);
+ m_voltage_layers.push_back(m_voltage1);
+ m_voltage_layers.push_back(m_voltage2);
+ }else{
+ ATH_MSG_WARNING("m_fluence could not match becnhmark value but interpolation not indicated.");
+ return StatusCode::FAILURE;
+ }
+ }else{
+ if(!doInterpolateEfield){
+ ATH_MSG_INFO("m_fluence set to becnhmark value. Use becnhmark values for all layers.");
+ }else{
+ ATH_MSG_WARNING("m_fluence set to benchmark value. Fluence and bias voltage for all layers overwritten accordingly.");
+ }
+ }
+
+ ATH_MSG_INFO("ibl : Phi=" << m_fluence_layers.at(0) << "e14neq/cm2 U="<< m_voltage_layers.at(0) << "V");
+ ATH_MSG_INFO("B layer : Phi=" << m_fluence_layers.at(1) << "e14neq/cm2 U="<< m_voltage_layers.at(1) << "V");
+ ATH_MSG_INFO("layer 1 : Phi=" << m_fluence_layers.at(2) << "e14neq/cm2 U="<< m_voltage_layers.at(2) << "V");
+ ATH_MSG_INFO("layer 2 : Phi=" << m_fluence_layers.at(3) << "e14neq/cm2 U="<< m_voltage_layers.at(3) << "V");
+
// *****************************
// *** Setup Maps ****
// *****************************
//TODO This is only temporary until remotely stored maps and locally generated maps can be implemented
-
+ //E field already implemented: needs fluence and bias voltage given as Property m_fluence, m_fluenceB, ..., m_fluence1, ...
for(unsigned int i=0; i<mapsPath_list.size(); i++){
- ATH_MSG_INFO("Using maps located in: "<<mapsPath_list.at(i));
+ ATH_MSG_INFO("Using maps located in: "<<mapsPath_list.at(i) << " for layer No." << i);
+ if(doInterpolateEfield)ATH_MSG_INFO("Create E field via interpolation based on files from: " << TCADpath_list.at(i));
//std::unique_ptr<TFile> mapsFile=std::make_unique<TFile>( (mapsPath_list.at(i)).c_str() ); //this is the ramo potential.
TFile* mapsFile=new TFile( (mapsPath_list.at(i)).c_str() ); //this is the ramo potential.
std::pair<int, int> Layer; // index for layer/end cap position
- Layer.first=0; //Barrel (0) or End Cap (1) - Now only for Barrel. If we want to add End Caps, put them at Layer.first=1
- Layer.second=i; //Layer: 0 = IBL Planar, 1=B-Layer, 2=Layer-1, 3=Layer-2
+ Layer.first=0; //Barrel (0) or End Cap (1) - Now only for Barrel. If we want to add End Caps, put them at Layer.first=1
+ Layer.second=i; //Layer: 0 = IBL Planar, 1=B-Layer, 2=Layer-1, 3=Layer-2
//IBL Barrel doesn't exist. So the possible idexes should be: 0-0, 0-1, 0-2, 0-3, 1-1, 1-2, 1-3
//Setup ramo weighting field map
@@ -205,53 +306,73 @@ StatusCode SensorSimPlanarTool::initialize() {
ramoPotentialMap_hold=(TH3F*)mapsFile->Get("hramomap1");
if (ramoPotentialMap_hold==0) ramoPotentialMap_hold=(TH3F*)mapsFile->Get("ramo3d");
if (ramoPotentialMap_hold==0){
- ATH_MSG_INFO("Did not find a Ramo potential map. Will use an approximate form.");
- return StatusCode::FAILURE; //Obviously, remove this when gen. code is set up
- //TODO
- // CHECK(m_radDamageUtil->generateRamoMap( ramoPotentialMap, p_design_dummy ));
+ ATH_MSG_INFO("Did not find a Ramo potential map. Will use an approximate form.");
+ ATH_MSG_WARNING("Not implemented yet - exit");
+ return StatusCode::FAILURE; //Obviously, remove this when gen. code is set up
+ //TODO -- is actually implemented?!
+ // CHECK(m_radDamageUtil->generateRamoMap( ramoPotentialMap, p_design_dummy ));
}
- //ramoPotentialMap.push_back(ramoPotentialMap_hold);
ramoPotentialMap[Layer]=ramoPotentialMap_hold;
m_fluence_layersMaps[Layer]=m_fluence_layers.at(i);
//Now setup the E-field.
TH1F* eFieldMap_hold;
- eFieldMap_hold=0;
- eFieldMap_hold=(TH1F*)mapsFile->Get("hEfield1D");
- if (eFieldMap_hold == 0){
- ATH_MSG_INFO("Unable to load sensor e-field map, so generating one using approximations.");
- return StatusCode::FAILURE;//Obviously, remove this when gen. code is set up
- //TODO
- // CHECK(m_radDamageUtil->generateEfieldMap( eFieldMap, p_design_dummy ));
+ eFieldMap_hold= new TH1F() ;
+ if(doInterpolateEfield){
+ //ATH_MSG_INFO("Generating E field maps using interpolation.");
+ CHECK(m_radDamageUtil->generateEfieldMap( eFieldMap_hold, NULL, m_fluence_layers.at(i), m_voltage_layers.at(i), i, TCADpath_list.at(i), true));
+ }else{
+ //precomputed map
+ eFieldMap_hold=(TH1F*)mapsFile->Get("hEfield1D");
}
+
+ if (eFieldMap_hold == 0){
+ ATH_MSG_INFO("Unable to load sensor e-field map.");
+ return StatusCode::FAILURE;
+ }
//eFieldMap.push_back(eFieldMap_hold);
eFieldMap[Layer]=eFieldMap_hold;
- TH2F* lorentzMap_e_hold;
- TH2F* lorentzMap_h_hold;
- TH2F* distanceMap_h_hold;
- TH2F* distanceMap_e_hold;
- TH1F* timeMap_e_hold;
- TH1F* timeMap_h_hold;
-
- lorentzMap_e_hold=0;
- lorentzMap_h_hold=0;
- distanceMap_e_hold=0;
- distanceMap_h_hold=0;
- timeMap_e_hold=0;
- timeMap_h_hold=0;
- lorentzMap_e_hold=(TH2F*)mapsFile->Get("lorentz_map_e");
- lorentzMap_h_hold=(TH2F*)mapsFile->Get("lorentz_map_h");
- distanceMap_h_hold=(TH2F*)mapsFile->Get("hdistance");
- distanceMap_e_hold=(TH2F*)mapsFile->Get("edistance");
- timeMap_e_hold=(TH1F*)mapsFile->Get("etimes");
- timeMap_h_hold=(TH1F*)mapsFile->Get("htimes");
- //Now, determine the time to reach the electrode and the trapping position.
- if (distanceMap_e_hold == 0 || distanceMap_h_hold == 0 || timeMap_e_hold == 0 || timeMap_h_hold == 0 || lorentzMap_e_hold == 0 || lorentzMap_h_hold == 0){
+ TH2F* lorentzMap_e_hold =new TH2F() ;
+ TH2F* lorentzMap_h_hold =new TH2F() ;
+ TH2F* distanceMap_h_hold =new TH2F() ;
+ TH2F* distanceMap_e_hold =new TH2F() ;
+ TH1F* timeMap_e_hold =new TH1F() ;
+ TH1F* timeMap_h_hold =new TH1F() ;
+
+
- ATH_MSG_INFO("Unable to load at least one of teh distance/time/Lorentz angle maps, so generating all using approximations.");
- return StatusCode::FAILURE;//Obviously, remove this when gen. code is set up
- //TODO
- //CHECK(m_radDamageUtil->generateDistanceTimeMap( distanceMap_e, distanceMap_h, timeMap_e, timeMap_h, lorentzMap_e, lorentzMap_h, eFieldMap, p_design_dummy ));
+ if(doInterpolateEfield){
+ CHECK(m_radDamageUtil->generateDistanceTimeMap( distanceMap_e_hold, distanceMap_h_hold, timeMap_e_hold, timeMap_h_hold, lorentzMap_e_hold, lorentzMap_h_hold, eFieldMap_hold, NULL ));
+ // For debugging and documentation: uncomment to save different maps which are based on the interpolated E field
+ if(m_radDamageUtil->m_saveDebugMaps){
+ TString prename = "map_layer_";
+ prename += i;
+ prename += "distance_e.root";
+ distanceMap_e_hold->SaveAs(prename);
+ prename.ReplaceAll("_e", "_h");
+ distanceMap_h_hold->SaveAs(prename);
+ prename.ReplaceAll("distance","time");
+ timeMap_h_hold->SaveAs(prename);
+ prename.ReplaceAll( "_h","_e");
+ timeMap_e_hold->SaveAs(prename);
+ prename.ReplaceAll("time", "lorentz");
+ lorentzMap_e_hold->SaveAs(prename);
+ prename.ReplaceAll( "_e","_h");
+ lorentzMap_h_hold->SaveAs(prename);
+ }
+ }else{
+ //retrieve precomputed maps
+ lorentzMap_e_hold=(TH2F*)mapsFile->Get("lorentz_map_e");
+ lorentzMap_h_hold=(TH2F*)mapsFile->Get("lorentz_map_h");
+ distanceMap_h_hold=(TH2F*)mapsFile->Get("hdistance");
+ distanceMap_e_hold=(TH2F*)mapsFile->Get("edistance");
+ timeMap_e_hold=(TH1F*)mapsFile->Get("etimes");
+ timeMap_h_hold=(TH1F*)mapsFile->Get("htimes");
+ }
+ //Safetycheck
+ if (distanceMap_e_hold == 0 || distanceMap_h_hold == 0 || timeMap_e_hold == 0 || timeMap_h_hold == 0 || lorentzMap_e_hold == 0 || lorentzMap_h_hold == 0){
+ ATH_MSG_INFO("Unable to load at least one of the distance/time/Lorentz angle maps.");
+ return StatusCode::FAILURE;//Obviously, remove this when gen. code is set up
}
lorentzMap_e[Layer]=lorentzMap_e_hold;
lorentzMap_h[Layer]=lorentzMap_h_hold;
@@ -259,7 +380,6 @@ StatusCode SensorSimPlanarTool::initialize() {
distanceMap_h[Layer]=distanceMap_h_hold;
timeMap_e[Layer]=timeMap_e_hold;
timeMap_h[Layer]=timeMap_h_hold;
-
}
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.h b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.h
index 7c6a964566ee407ac0e75cf5b9eac19eacf20104..5b0224286465d64746da81ab38269188c65a8cb9 100644
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.h
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/SensorSimPlanarTool.h
@@ -61,12 +61,16 @@ class SensorSimPlanarTool : public SensorSimTool {
double m_diffusionConstant;
bool m_doRadDamage;
+ double m_trappingTimeElectrons;
+ double m_trappingTimeHoles;
double m_fluence; //eventually, this should be pulled from the conditions.
+ double m_fluenceB, m_fluence1, m_fluence2;
+ double m_voltage; //eventually, this should be pulled from the conditions.
+ double m_voltageB, m_voltage1, m_voltage2;
+ std::string fTCADibl, fTCADblayer;
- std::vector<double> m_fluence_layers;
+ std::vector<double> m_fluence_layers,m_voltage_layers; //merging information from m_fluence* and m_voltage*
std::map<std::pair<int, int>, double> m_fluence_layersMaps;
- double m_trappingTimeElectrons;
- double m_trappingTimeHoles;
ToolHandle<ISiLorentzAngleTool> m_lorentzAngleTool{this, "LorentzAngleTool", "SiLorentzAngleTool/PixelLorentzAngleTool", "Tool to retreive Lorentz angle"};
};
diff --git a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/components/PixelRadDamDigitization_entries.cxx b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/components/PixelRadDamDigitization_entries.cxx
index a9254cb96f5788c49ea8cf53db4d81021f955d44..ca7ba071ceaa5d85b2e32ef940576e50c39757ea 100755
--- a/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/components/PixelRadDamDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/PixelRadDamDigitization/src/components/PixelRadDamDigitization_entries.cxx
@@ -9,6 +9,7 @@
#include "src/ChargeCollProbSvc.h"
#include "src/EnergyDepositionTool.h"
#include "src/RadDamageUtil.h"
+#include "src/EfieldInterpolator.h"
#include "src/RD53SimTool.h"
#include "src/FEI4SimTool.h"
#include "src/FEI3SimTool.h"
@@ -17,6 +18,7 @@ using namespace RadDam;
DECLARE_COMPONENT(PixelDigitization)
DECLARE_COMPONENT(EnergyDepositionTool)
DECLARE_COMPONENT(RadDamageUtil)
+DECLARE_COMPONENT(EfieldInterpolator)
DECLARE_COMPONENT(PixelDigitizationTool)
DECLARE_COMPONENT(PixelNoisyCellGenerator)
DECLARE_COMPONENT(PixelChargeSmearer)
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
index 5cd9907cbbc06651014bfdf60d8008358ddd1822..4b88111403f926ef830d19b56b96dd8ec40a6fc7 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/CMakeLists.txt
@@ -42,9 +42,6 @@ atlas_add_component( SCT_Digitization
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} CommissionEvent AthenaBaseComps AthenaKernel PileUpToolsLib Identifier xAODEventInfo GaudiKernel SiDigitization InDetRawData InDetSimEvent HitManagement GeneratorObjects SiPropertiesToolLib InDetIdentifier InDetReadoutGeometry InDetSimData )
-atlas_add_test( SCT_DigitizationConfigNew_test
- SCRIPT test/SCT_DigitizationConfigNew_test.py
- PROPERTIES TIMEOUT 300 )
atlas_add_test( SCT_DigitizationMT_test
SCRIPT Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/HITS.04919495._001041.pool.root.1 --conditionsTag default:OFLCOND-RUN12-SDR-25 --digiSeedOffset1 170 --digiSeedOffset2 170 --geometryVersion ATLAS-R2-2015-03-01-00 --DataRunNumber 222525 --outputRDOFile mc15_2015_ttbar.RDO.pool.root --preInclude HITtoRDO:SimulationJobOptions/preInclude.SCTOnlyConfig.py,Digitization/ForceUseOfAlgorithms.py --postInclude Digitization/FixDataDependenciesForMT.py --skipEvents 0 --maxEvents 100 --athenaopts '--threads 10'
PROPERTIES TIMEOUT 1200
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py b/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py
index c637e06d86748f7699483ae7587d322c41268c4f..8e1f938ef6bd3229fd202d9e77dc9af15de0be73 100644
--- a/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/python/SCT_DigitizationConfigNew.py
@@ -227,16 +227,19 @@ def SCT_RangeCfg(flags, name="SiliconRange", **kwargs):
kwargs.setdefault("ItemList", ["SiHitCollection#SCT_Hits"] )
return PileUpXingFolder(name, **kwargs)
-def SCT_DigitizationCfg(toolCfg, flags, name="SCT_Digitization", **kwargs):
- """Return a ComponentAccumulator with toolCfg type SCT digitization"""
+def SCT_DigitizationBasicCfg(toolCfg, flags, name="SCT_DigitizationBasic", **kwargs):
+ """Return a ComponentAccumulator with BasictoolCfg type SCT digitization"""
acc = ComponentAccumulator()
if "DigitizationTool" not in kwargs:
tool = acc.popToolsAndMerge(toolCfg(flags))
kwargs["DigitizationTool"] = tool
- alg = SCT_Digitization(name, **kwargs)
- acc.addEventAlgo(alg)
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", SCT_ItemList()))
+ acc.addEventAlgo(SCT_Digitization(name, **kwargs))
+ return acc
+
+def SCT_DigitizationCfg(toolCfg, flags, name="SCT_Digitization", **kwargs):
+ """Return a ComponentAccumulator with toolCfg type SCT digitization and Output"""
+ acc = SCT_DigitizationBasicCfg(toolCfg, flags, name, **kwargs)
+ acc.merge(OutputStreamCfg(flags, "RDO", SCT_ItemList()))
return acc
def SCT_DigitizationHSCfg(flags, name="SCT_DigitizationHS", **kwargs):
@@ -249,5 +252,5 @@ def SCT_DigitizationPUCfg(flags, name="SCT_DigitizationPU", **kwargs):
def SCT_DigitizationOverlayCfg(flags, name="SCT_OverlayDigitization", **kwargs):
"""Return a ComponentAccumulator with Overlay SCT digitization"""
- return SCT_DigitizationCfg(SCT_DigitizationToolOverlayCfg, flags, name, **kwargs)
+ return SCT_DigitizationBasicCfg(SCT_DigitizationToolOverlayCfg, flags, name, **kwargs)
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
index 6a5acdc543465f44e8b28fe0dc3998cbf34f0c14..b90c97ac7e839d4bec5c3691045452eb43a1a1d4 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/CMakeLists.txt
@@ -44,10 +44,6 @@ atlas_add_component( TRT_Digitization
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 PileUpToolsLib AthenaPoolUtilities GeoModelUtilities GeoPrimitives Identifier EventInfo GeneratorObjects TRT_ConditionsData TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry InDetRawData InDetSimData InDetSimEvent MagFieldInterfaces HitManagement )
-atlas_add_test( TRT_DigitizationConfigNew_test
- SCRIPT test/TRT_DigitizationConfigNew_test.py
- PROPERTIES TIMEOUT 600 )
-
# Install files from the package:
atlas_install_headers( TRT_Digitization )
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py
index 4064f61c2509ff7ce6c5e9823b15a876d54b5eb6..726a41d86783a0d480e7d49f37762425f0f6c6c6 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/python/TRT_DigitizationConfigNew.py
@@ -119,17 +119,19 @@ def TRT_DigitizationOverlayToolCfg(flags, name="TRT_OverlayDigitizationTool", **
acc.setPrivateTools(tool)
return acc
-def TRT_DigitizationCfg(toolCfg, flags, name="TRT_Digitization", **kwargs):
- """Return a ComponentAccumulator with toolCfg type TRT digitization"""
+def TRT_DigitizationBasicCfg(toolCfg, flags, name="TRT_DigitizationBasic", **kwargs):
+ """Return a ComponentAccumulator with basic toolCfg type TRT digitization"""
acc = ComponentAccumulator()
if "DigitizationTool" not in kwargs:
tool = acc.popToolsAndMerge(toolCfg(flags))
kwargs["DigitizationTool"] = tool
- print("#"*200)
- print(tool)
acc.addEventAlgo(TRTDigitization(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", TRT_ItemList()))
+ return acc
+
+def TRT_DigitizationCfg(toolCfg, flags, name="TRT_Digitization", **kwargs):
+ """Return a ComponentAccumulator with toolCfg type TRT digitization and Output"""
+ acc = TRT_DigitizationBasicCfg(toolCfg, flags, name, **kwargs)
+ acc.merge(OutputStreamCfg(flags, "RDO", TRT_ItemList()))
return acc
def TRT_DigitizationHSCfg(flags, name="TRT_DigitizationHS", **kwargs):
@@ -142,5 +144,5 @@ def TRT_DigitizationPUCfg(flags, name="TRT_DigitizationPU", **kwargs):
def TRT_DigitizationOverlayCfg(flags, name="TRT_OverlayDigitization", **kwargs):
"""Return a ComponentAccumulator configured for Overlay TRT digitization"""
- return TRT_DigitizationCfg(TRT_DigitizationOverlayToolCfg, flags, name, **kwargs)
+ return TRT_DigitizationBasicCfg(TRT_DigitizationOverlayToolCfg, flags, name, **kwargs)
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.h b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.h
index e51e9086867cdf10027cd7335484c15399afdd34..fd83f43bd210faa67a6e000212ad4660aee815c7 100644
--- a/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.h
@@ -141,7 +141,6 @@ private:
Gaudi::Property<std::string> m_dataObjectName{this, "DataObjectName", "TRTUncompressedHits", "Data Object Name"};
Gaudi::Property<int> m_HardScatterSplittingMode{this, "HardScatterSplittingMode", 0, ""};
Gaudi::Property<int> m_UseGasMix{this, "UseGasMix", 0, ""};
- IntegerProperty m_vetoThisBarcode{this, "ParticleBarcodeVeto", crazyParticleBarcode, "Barcode of particle to ignore"};
TRTDigSettings* m_settings{};
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt
index 8d41a87a08f699ac0218e48059055d8e19f7f1b8..ea89a1ad30ed773f5f3dcb7ff92bee58a60e8ab4 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt
@@ -14,6 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetConditions/InDetByteStreamErrors
PRIVATE
Control/AthenaBaseComps
+ Control/AthenaKernel
Control/StoreGate
DetectorDescription/Identifier
Event/xAOD/xAODEventInfo
@@ -32,13 +33,13 @@ atlas_add_component( SCT_RawDataByteStreamCnv
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel InDetRawData InDetByteStreamErrors AthenaBaseComps StoreGateLib SGtests Identifier xAODEventInfo InDetIdentifier InDetReadoutGeometry SCT_CablingLib TrigSteeringEvent)
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamCnvSvcBaseLib ByteStreamData ByteStreamData_test GaudiKernel InDetRawData InDetByteStreamErrors AthenaBaseComps AthenaKernel StoreGateLib SGtests Identifier xAODEventInfo InDetIdentifier InDetReadoutGeometry SCT_CablingLib TrigSteeringEvent)
# Run tests:
atlas_add_test( TestSCTDecode
- SCRIPT athena.py --threads=3 SCT_RawDataByteStreamCnv/testSCTDecode.py
+ SCRIPT athena.py --threads=5 SCT_RawDataByteStreamCnv/testSCTDecode.py
PROPERTIES TIMEOUT 600
- ENVIRONMENT THREADS=3 )
+ ENVIRONMENT THREADS=5 )
atlas_add_test( TestSCTEncodeSerial
SCRIPT athena.py SCT_RawDataByteStreamCnv/testSCTEncode.py
PROPERTIES TIMEOUT 300 )
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h
index 8bb1f460072f012944623bcf236ef1fb05a74f4b..3e2966c0e0cea7d1f5add717c7748a5551c46478 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h
@@ -1,5 +1,7 @@
+// -*- C++ -*-
+
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -35,14 +37,16 @@ class ISCTRawDataProviderTool : virtual public IAlgTool
/** Destructor */
virtual ~ISCTRawDataProviderTool() = default;
- /** Main decoding method */
+ /** Main decoding methods */
virtual StatusCode convert(std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>&,
ISCT_RDO_Container&,
InDetBSErrContainer* errs,
SCT_ByteStreamFractionContainer* bsFracCont) const = 0;
-
- /** Reset list of know ROB IDs */
- virtual void beginNewEvent() const = 0;
+ virtual StatusCode convert(std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>&,
+ ISCT_RDO_Container&,
+ InDetBSErrContainer* errs,
+ SCT_ByteStreamFractionContainer* bsFracCont,
+ const EventContext& ctx) const = 0;
};
#endif // SCT_RAWDATABYTESTREAMCNV_ISCTRAWDATAPROVIDERTOOL_H
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
index 8f033c9eb7335f3c63fa6ac555db78c66ad543dc..0050dbc58133e2b6b1860e042dfb4948d1d500a5 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
@@ -5,6 +5,7 @@
#==============================================================
doPrint = False
+doDump = False
#--------------------------------------------------------------
# Standard includes
@@ -119,10 +120,15 @@ InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
from SCT_ConditionsTools.SCT_ConfigurationConditionsToolSetup import SCT_ConfigurationConditionsToolSetup
sct_ConfigurationConditionsToolSetup = SCT_ConfigurationConditionsToolSetup()
sct_ConfigurationConditionsToolSetup.setup()
+from SCT_ConditionsTools.SCT_ByteStreamErrorsToolSetup import SCT_ByteStreamErrorsToolSetup
+sct_ByteStreamErrorsToolSetup = SCT_ByteStreamErrorsToolSetup()
+sct_ByteStreamErrorsToolSetup.setConfigTool(sct_ConfigurationConditionsToolSetup.getTool())
+sct_ByteStreamErrorsToolSetup.setup()
from SCT_ConditionsTools.SCT_ConditionsSummaryToolSetup import SCT_ConditionsSummaryToolSetup
sct_ConditionsSummaryToolSetupWithoutFlagged = SCT_ConditionsSummaryToolSetup("InDetSCT_ConditionsSummaryToolWithoutFlagged")
sct_ConditionsSummaryToolSetupWithoutFlagged.setup()
-sct_ConditionsSummaryToolSetupWithoutFlagged.ConditionsTools=[sct_ConfigurationConditionsToolSetup.getTool().getFullName()]
+sct_ConditionsSummaryToolSetupWithoutFlagged.ConditionsTools=[sct_ByteStreamErrorsToolSetup.getTool().getFullName(),
+ sct_ConfigurationConditionsToolSetup.getTool().getFullName()]
from SiClusterizationTool.SiClusterizationToolConf import InDet__SCT_ClusteringTool
InDetSCT_ClusteringTool = InDet__SCT_ClusteringTool(name = "InDetSCT_ClusteringTool",
@@ -165,7 +171,8 @@ sct_FlaggedConditionToolSetup.setup()
sct_ConditionsSummaryToolSetup = SCT_ConditionsSummaryToolSetup()
sct_ConditionsSummaryToolSetup.setup()
SCT_ConditionsSummaryTool = sct_ConditionsSummaryToolSetup.getTool()
-SCT_ConditionsSummaryTool.ConditionsTools=[sct_ConfigurationConditionsToolSetup.getTool().getFullName(),
+SCT_ConditionsSummaryTool.ConditionsTools=[sct_ByteStreamErrorsToolSetup.getTool().getFullName(),
+ sct_ConfigurationConditionsToolSetup.getTool().getFullName(),
sct_FlaggedConditionToolSetup.getTool().getFullName()]
from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_ConditionsSummaryTestAlg
topSequence += SCT_ConditionsSummaryTestAlg(SCT_ConditionsSummaryTool=SCT_ConditionsSummaryTool)
@@ -201,7 +208,20 @@ if doPrint:
print topSequence
# Set the number of events to be processed
-theApp.EvtMax = 6
+theApp.EvtMax = 10
+
+# Output file
+if doDump:
+ from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
+ outStream = AthenaPoolOutputStream("OutStream", "testSCTDecode.pool.root")
+ outStream.ItemList = ["xAOD::EventInfo#EventInfo", "xAOD::EventAuxInfo#EventInfoAux."]
+ outStream.ItemList += ["SCT_RDO_Container#SCT_RDOs"]
+ outStream.ItemList += ["InDetBSErrContainer#SCT_ByteStreamErrs"]
+ outStream.ItemList += ["InDet::SCT_ClusterContainer#SCT_Clusters"]
+ outStream.ItemList += ["SCT_FlaggedCondData#SCT_FlaggedCondData"]
+ # outStream.ItemList += ["SpacePointContainer#SCT_SpacePoints"]
+ outStream.ItemList += ["xAOD::SCTRawHitValidationContainer#*", "xAOD::SCTRawHitValidationAuxContainer#*"]
+ outStream.ItemList += ["xAOD::TrackMeasurementValidationContainer#*", "xAOD::TrackMeasurementValidationAuxContainer#*"]
#--------------------------------------------------------------
# Set output lvl (VERBOSE, DEBUG, INFO, WARNING, ERROR, FATAL)
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
index d538342fe2bb0769ddfab874231ef103c6de7472..b76b2a6d500977eb598d760bd391956cb87ca2ea 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
@@ -61,8 +61,6 @@ typedef EventContainers::IdentifiableContTemp<InDetRawDataCollection<SCT_RDORawD
StatusCode SCTRawDataProvider::execute(const EventContext& ctx) const
{
- m_rawDataTool->beginNewEvent();
-
SG::WriteHandle<SCT_RDO_Container> rdoContainer(m_rdoContainerKey, ctx);
bool externalCacheRDO = !m_rdoContainerCacheKey.key().empty();
if (not externalCacheRDO) {
@@ -145,7 +143,8 @@ StatusCode SCTRawDataProvider::execute(const EventContext& ctx) const
if (m_rawDataTool->convert(vecROBFrags,
*rdoInterface,
bsErrContainer.ptr(),
- bsFracContainer.ptr()).isFailure()) {
+ bsFracContainer.ptr(),
+ ctx).isFailure()) {
ATH_MSG_WARNING("BS conversion into RDOs failed");
}
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
index 9db3d9bc1985f9eb1817b9c5d0cd72aaf2e21efa..1b7ef9febcf8dd7170b0f86f9380738e24ed7a41 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "SCTRawDataProviderTool.h"
@@ -10,7 +10,6 @@
using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
// Constructor
-
SCTRawDataProviderTool::SCTRawDataProviderTool(const std::string& type, const std::string& name,
const IInterface* parent) :
base_class(type, name, parent)
@@ -18,7 +17,6 @@ SCTRawDataProviderTool::SCTRawDataProviderTool(const std::string& type, const st
}
// Initialize
-
StatusCode SCTRawDataProviderTool::initialize()
{
ATH_CHECK(m_decoder.retrieve());
@@ -27,29 +25,42 @@ StatusCode SCTRawDataProviderTool::initialize()
}
// Convert method
-
StatusCode SCTRawDataProviderTool::convert(std::vector<const ROBFragment*>& vecROBFrags,
ISCT_RDO_Container& rdoIDCont,
InDetBSErrContainer* errs,
SCT_ByteStreamFractionContainer* bsFracCont) const
+{
+ const EventContext& ctx{Gaudi::Hive::currentContext()};
+ return convert(vecROBFrags, rdoIDCont, errs, bsFracCont, ctx);
+}
+
+// Convert method
+StatusCode SCTRawDataProviderTool::convert(std::vector<const ROBFragment*>& vecROBFrags,
+ ISCT_RDO_Container& rdoIDCont,
+ InDetBSErrContainer* errs,
+ SCT_ByteStreamFractionContainer* bsFracCont,
+ const EventContext& ctx) const
{
if (vecROBFrags.empty()) return StatusCode::SUCCESS;
ATH_MSG_DEBUG("SCTRawDataProviderTool::convert()");
- StatusCode sc{StatusCode::SUCCESS};
-
- std::lock_guard<std::mutex> lock(m_mutex);
+ // Retrieve or prepare the already decoded ROBIDs in this thread.
+ std::lock_guard<std::mutex> lock{m_mutex};
+ CacheEntry* ent{m_cache.get(ctx)};
+ if (ent->m_evt != ctx.evt()) {
+ ent->m_evt = ctx.evt();
+ ent->m_robIDSet.clear();
+ }
// loop over the ROB fragments
-
- std::set<uint32_t> tmpROBIDSet;
-
+ StatusCode sc{StatusCode::SUCCESS};
+ std::unordered_set<uint32_t> tmpROBIDSet;
for (const ROBFragment* robFrag : vecROBFrags) {
// get the ID of this ROB/ROD
uint32_t robid{(robFrag)->rod_source_id()};
// check if this ROBFragment was already decoded (EF case in ROIs)
- if (m_robIDSet.count(robid) or tmpROBIDSet.count(robid)) {
- ATH_MSG_DEBUG(" ROB Fragment with ID "
+ if (ent->m_robIDSet.count(robid) or tmpROBIDSet.count(robid)) {
+ ATH_MSG_DEBUG(" ROB Fragment with ID "
<< std::hex<<robid << std::dec
<< " already decoded, skip");
continue;
@@ -72,7 +83,8 @@ StatusCode SCTRawDataProviderTool::convert(std::vector<const ROBFragment*>& vecR
}
}
- m_robIDSet.insert(tmpROBIDSet.begin(), tmpROBIDSet.end());
+ // Insert the ROBIDs decoded in this process to the already decoded ROBIDs.
+ ent->m_robIDSet.insert(tmpROBIDSet.begin(), tmpROBIDSet.end());
if (sc == StatusCode::FAILURE) {
ATH_MSG_ERROR("There was a problem with SCT ByteStream conversion");
@@ -81,12 +93,3 @@ StatusCode SCTRawDataProviderTool::convert(std::vector<const ROBFragment*>& vecR
return sc;
}
-
-// beginNewEvent method
-
-void SCTRawDataProviderTool::beginNewEvent() const
-{
- // reset list of known robIDs
- std::lock_guard<std::mutex> lock(m_mutex);
- m_robIDSet.clear();
-}
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.h
index 59e07e18ac70364b27c14c28666a3879c7aa0f02..224ef2c9e0e293cbe51d7b190acc7b6eac9396c3 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProviderTool.h
@@ -10,6 +10,7 @@
#include "SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
+#include "AthenaKernel/SlotSpecificObj.h"
#include "InDetRawData/SCT_RDO_Container.h"
#include "ByteStreamData/RawEvent.h"
@@ -17,11 +18,11 @@
#include <atomic>
#include <mutex>
-#include <set>
+#include <unordered_set>
class ISCT_RodDecoder;
-/**
+/**
* @class SCTRawDataProviderTool
*
* @brief Athena Algorithm Tool to fill Collections of SCT RDO Containers.
@@ -43,7 +44,21 @@ class SCTRawDataProviderTool : public extends<AthAlgTool, ISCTRawDataProviderToo
/** Initialize */
virtual StatusCode initialize() override;
- /**
+ /**
+ * @brief Old-style decoding method.
+ *
+ * Retrieve EventContext and call the convert method with EventContext
+ *
+ * @param vecROBFrags Vector containing ROB framgents.
+ * @param rdoIDCont RDO ID Container to be filled.
+ * @param errs Byte stream error container.
+ * @param bsFracCont Byte stream fraction container.
+ * */
+ virtual StatusCode convert(std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecROBFrags,
+ ISCT_RDO_Container& rdoIDCont,
+ InDetBSErrContainer* errs,
+ SCT_ByteStreamFractionContainer* bsFracCont) const override;
+ /**
* @brief Main decoding method.
*
* Loops over ROB fragments, get ROB/ROD ID, then decode if not allready decoded.
@@ -52,14 +67,13 @@ class SCTRawDataProviderTool : public extends<AthAlgTool, ISCTRawDataProviderToo
* @param rdoIDCont RDO ID Container to be filled.
* @param errs Byte stream error container.
* @param bsFracCont Byte stream fraction container.
+ * @param ctx EventContext of the event
* */
virtual StatusCode convert(std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecROBFrags,
ISCT_RDO_Container& rdoIDCont,
InDetBSErrContainer* errs,
- SCT_ByteStreamFractionContainer* bsFracCont) const override;
-
- /** Reset list of known ROB IDs */
- virtual void beginNewEvent() const override;
+ SCT_ByteStreamFractionContainer* bsFracCont,
+ const EventContext& ctx) const override;
private:
@@ -67,7 +81,11 @@ class SCTRawDataProviderTool : public extends<AthAlgTool, ISCTRawDataProviderToo
ToolHandle<ISCT_RodDecoder> m_decoder{this, "Decoder", "SCT_RodDecoder", "Decoder"};
/** For bookkeeping of decoded ROBs */
- mutable std::set<uint32_t> m_robIDSet ATLAS_THREAD_SAFE {};
+ struct CacheEntry {
+ EventContext::ContextEvt_t m_evt{EventContext::INVALID_CONTEXT_EVT};
+ std::unordered_set<uint32_t> m_robIDSet;
+ };
+ mutable SG::SlotSpecificObj<CacheEntry> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
/** Number of decode errors encountered in decoding.
Turning off error message after 100 errors are counted */
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCaloSeededROISelection.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCaloSeededROISelection.py
index dab9d4f4d4111ee396eeddecc9a5331330c0098e..3892d7c5fc2eb0558c51ca9770b66df2c239cc99 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCaloSeededROISelection.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecCaloSeededROISelection.py
@@ -14,9 +14,9 @@ from egammaCaloTools import egammaCaloToolsConf
egammaCaloClusterROISelector = ToolFactory( egammaCaloToolsConf.egammaCaloClusterSelector,
name = 'caloClusterROISelector',
egammaCheckEnergyDepositTool = egammaCheckEnergyDepositTool,
- EMEtRanges = [1500.,2500.],
- EMFCuts = [0.85,0.8],
- RetaCut = [0.7,0.65]
+ EMEtRanges = [1500.,2500.,3500.],
+ EMFCuts = [0.9,0.85,0.8],
+ RetaCut = [0.7,0.65,0.65]
)
#
# --- get the builder tool
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/CMakeLists.txt b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/CMakeLists.txt
index 6a354f207ed5ab2b785f9d93bef2f74a34a613d9..cc231b32da7caf1d009af4483dcbc43997e1b17a 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/CMakeLists.txt
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/CMakeLists.txt
@@ -20,6 +20,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/CxxUtils
Event/xAOD/xAODEventInfo
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
Tracking/TrkEvent/TrkPatternParameters
Tracking/TrkEvent/TrkRIO_OnTrack )
@@ -27,7 +28,18 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( SiSPSeededTrackFinder
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel InDetRecToolInterfaces TrkGeometry TrkSurfaces TrkSpacePoint TrkTrack TrkExInterfaces CxxUtils xAODEventInfo TrkPatternParameters TrkRIO_OnTrack )
+ LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests GaudiKernel InDetRecToolInterfaces TrkGeometry TrkSurfaces TrkSpacePoint TrkTrack TrkExInterfaces CxxUtils xAODEventInfo SiSPSeededTrackFinderData TrkPatternParameters TrkRIO_OnTrack )
+
+# Run tests:
+atlas_add_test( SiSPSeededTracksStandalone
+ SCRIPT athena.py --threads=5 SiSPSeededTrackFinder/SiSPSeededTracksStandalone.py
+ PROPERTIES TIMEOUT 600
+ ENVIRONMENT THREADS=5 )
+
+atlas_add_test( SiSPSeededTracksStandaloneFromESD
+ SCRIPT athena.py --threads=1 SiSPSeededTrackFinder/SiSPSeededTracksStandaloneFromESD.py
+ PROPERTIES TIMEOUT 600
+ ENVIRONMENT THREADS=5 )
# Install files from the package:
atlas_install_headers( SiSPSeededTrackFinder )
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededSCTTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededSCTTracksStandalone.py
deleted file mode 100644
index 524e6a0b0f9431a72c3bbab2f28cd9a6d9abafb4..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededSCTTracksStandalone.py
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-###############################################################
-#
-# Standalone job options file to create SiSPSeededSCTTracks
-#
-#==============================================================
-
-doPrint = False
-
-#--------------------------------------------------------------
-# Standard includes
-#--------------------------------------------------------------
-import AthenaCommon.AtlasUnixStandardJob
-
-#--------------------------------------------------------------
-# Thread-specific setup
-#--------------------------------------------------------------
-from AthenaCommon.ConcurrencyFlags import jobproperties
-numThreads = jobproperties.ConcurrencyFlags.NumThreads()
-if numThreads > 0:
- from AthenaCommon.AlgScheduler import AlgScheduler
- AlgScheduler.CheckDependencies( True )
- AlgScheduler.ShowControlFlow( True )
- AlgScheduler.ShowDataDependencies( True )
-
-#--------------------------------------------------------------
-# use auditors
-#--------------------------------------------------------------
-from AthenaCommon.AppMgr import ServiceMgr
-from GaudiSvc.GaudiSvcConf import AuditorSvc
-ServiceMgr += AuditorSvc()
-theAuditorSvc = ServiceMgr.AuditorSvc
-theAuditorSvc.Auditors += [ "ChronoAuditor"]
-theAuditorSvc.Auditors += [ "MemStatAuditor" ]
-theApp.AuditAlgorithms=True
-
-#--------------------------------------------------------------
-# Load Geometry
-#--------------------------------------------------------------
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetDescrVersion="ATLAS-R2-2016-01-00-01"
-globalflags.DetGeo="atlas"
-globalflags.InputFormat="bytestream"
-globalflags.DataSource="data"
-if doPrint:
- print globalflags
-
-#--------------------------------------------------------------
-# Set Detector setup
-#--------------------------------------------------------------
-# --- switch on InnerDetector
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.SCT_setOn()
-DetFlags.ID_setOff()
-DetFlags.Calo_setOff()
-DetFlags.Muon_setOff()
-DetFlags.Truth_setOff()
-DetFlags.LVL1_setOff()
-DetFlags.SCT_setOn()
-
-# ---- switch parts of ID off/on as follows
-#switch off tasks
-DetFlags.pileup.all_setOff()
-DetFlags.simulate.all_setOff()
-DetFlags.makeRIO.all_setOff()
-DetFlags.makeRIO.SCT_setOn()
-DetFlags.writeBS.all_setOff()
-DetFlags.readRDOBS.all_setOff()
-DetFlags.readRDOBS.SCT_setOn()
-DetFlags.readRIOBS.all_setOff()
-DetFlags.readRIOPool.all_setOff()
-DetFlags.writeRIOPool.all_setOff()
-
-if doPrint:
- DetFlags.Print()
-
-import AtlasGeoModel.SetGeometryVersion
-import AtlasGeoModel.GeoModelInit
-import MagFieldServices.SetupField
-
-#--------------------------------------------------------------
-# Load IOVDbSvc
-#--------------------------------------------------------------
-IOVDbSvc = Service("IOVDbSvc")
-from IOVDbSvc.CondDB import conddb
-conddb.dbdata="CONDBR2"
-IOVDbSvc.GlobalTag="CONDBR2-BLKPA-2018-03"
-IOVDbSvc.OutputLevel = WARNING
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# EventInfo setup
-if not hasattr(topSequence, "xAODMaker::EventInfoCnvAlg"):
- from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
- topSequence +=xAODMaker__EventInfoCnvAlg()
-
-# Set input byte stream file (from q431 test)
-inputBSFiles = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data17_13TeV.00330470.physics_Main.daq.RAW._lb0310._SFO-1._0001.data"]
-include("ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py")
-ServiceMgr.ByteStreamInputSvc.FullFileName = inputBSFiles
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.FilesInput = inputBSFiles
-
-# Set up byte stream converters (SCTRawDataProvider, SCTRawDataProviderTool, SCT_RodDecoder, SCTEventFlagWriter)
-include("InDetRecExample/InDetReadBS_jobOptions.py")
-topSequence.InDetSCTRawDataProvider.OutputLevel = INFO
-topSequence.InDetSCTRawDataProvider.ProviderTool.Decoder.OutputLevel = INFO
-topSequence.InDetSCTEventFlagWriter.OutputLevel = INFO
-if numThreads >= 2:
- topSequence.InDetSCTRawDataProvider.Cardinality = numThreads
- topSequence.InDetSCTEventFlagWriter.Cardinality = numThreads
-
-# Set up SCT clsutering
-from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
-sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
-from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
-InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
- PixelCablingSvc = None,
- PixelModuleData = "",
- PixelChargeCalibCondData = "",
- PixelLorentzAngleTool = None,
- SCTLorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool)
-
-# SCT conditions setups
-from SCT_ConditionsTools.SCT_ConfigurationConditionsToolSetup import SCT_ConfigurationConditionsToolSetup
-sct_ConfigurationConditionsToolSetup = SCT_ConfigurationConditionsToolSetup()
-sct_ConfigurationConditionsToolSetup.setup()
-
-from SCT_ConditionsTools.SCT_ByteStreamErrorsToolSetup import SCT_ByteStreamErrorsToolSetup
-sct_ByteStreamErrorsToolSetup = SCT_ByteStreamErrorsToolSetup()
-sct_ByteStreamErrorsToolSetup.setConfigTool(sct_ConfigurationConditionsToolSetup.getTool())
-sct_ByteStreamErrorsToolSetup.setup()
-
-from SCT_ConditionsTools.SCT_ReadCalibDataToolSetup import SCT_ReadCalibDataToolSetup
-sct_ReadCalibDataToolSetup = SCT_ReadCalibDataToolSetup()
-sct_ReadCalibDataToolSetup.setup()
-
-from SCT_ConditionsTools.SCT_TdaqEnabledToolSetup import SCT_TdaqEnabledToolSetup
-sct_TdaqEnabledToolSetup = SCT_TdaqEnabledToolSetup()
-sct_TdaqEnabledToolSetup.setFolder('/TDAQ/Resources/ATLAS/SCT/Robins')
-sct_TdaqEnabledToolSetup.setup()
-
-from SCT_ConditionsTools.SCT_DCSConditionsToolSetup import SCT_DCSConditionsToolSetup
-sct_DCSConditionsToolSetup = SCT_DCSConditionsToolSetup()
-sct_DCSConditionsToolSetup.setup()
-
-from SCT_ConditionsTools.SCT_ConditionsSummaryToolSetup import SCT_ConditionsSummaryToolSetup
-sct_ConditionsSummaryToolSetupWithoutFlagged = SCT_ConditionsSummaryToolSetup("InDetSCT_ConditionsSummaryToolWithoutFlagged")
-sct_ConditionsSummaryToolSetupWithoutFlagged.setup()
-sct_ConditionsSummaryToolSetupWithoutFlagged.ConditionsTools=[sct_ConfigurationConditionsToolSetup.getTool().getFullName(),
- sct_ByteStreamErrorsToolSetup.getTool().getFullName(),
- sct_ReadCalibDataToolSetup.getTool().getFullName(),
- sct_TdaqEnabledToolSetup.getTool().getFullName(),
- sct_DCSConditionsToolSetup.getTool().getFullName()]
-
-from SiClusterizationTool.SiClusterizationToolConf import InDet__SCT_ClusteringTool
-InDetSCT_ClusteringTool = InDet__SCT_ClusteringTool(name = "InDetSCT_ClusteringTool",
- OutputLevel = INFO,
- globalPosAlg = InDetClusterMakerTool,
- timeBins = "01X",
- conditionsTool = sct_ConditionsSummaryToolSetupWithoutFlagged.getTool())
-from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__SCT_Clusterization
-InDetSCT_Clusterization = InDet__SCT_Clusterization(name = "InDetSCT_Clusterization",
- OutputLevel = INFO,
- clusteringTool = InDetSCT_ClusteringTool,
- conditionsTool = sct_ConditionsSummaryToolSetupWithoutFlagged.getTool(),
- DataObjectName = "SCT_RDOs",
- ClustersName = "SCT_Clusters",
- maxFiredStrips = 384)
-if numThreads >= 2:
- InDetSCT_Clusterization.Cardinality = numThreads
-
-topSequence += InDetSCT_Clusterization
-
-# Set up SCT_ConditionsSummaryTestAlg with SCT_FlaggedConditionTool
-from SCT_ConditionsTools.SCT_FlaggedConditionToolSetup import SCT_FlaggedConditionToolSetup
-sct_FlaggedConditionToolSetup = SCT_FlaggedConditionToolSetup()
-sct_FlaggedConditionToolSetup.setup()
-sct_ConditionsSummaryToolSetup = SCT_ConditionsSummaryToolSetup()
-sct_ConditionsSummaryToolSetup.setup()
-SCT_ConditionsSummaryTool = sct_ConditionsSummaryToolSetup.getTool()
-SCT_ConditionsSummaryTool.ConditionsTools=[sct_ConfigurationConditionsToolSetup.getTool().getFullName(),
- sct_FlaggedConditionToolSetup.getTool().getFullName(),
- sct_ByteStreamErrorsToolSetup.getTool().getFullName(),
- sct_ReadCalibDataToolSetup.getTool().getFullName(),
- sct_TdaqEnabledToolSetup.getTool().getFullName(),
- sct_DCSConditionsToolSetup.getTool().getFullName()]
-
-# Set up space point formation
-from AthenaCommon.AlgSequence import AthSequencer
-condSeq = AthSequencer("AthCondSeq")
-if not hasattr(condSeq, "InDetSiElementPropertiesTableCondAlg"):
- from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiElementPropertiesTableCondAlg
- condSeq += InDet__SiElementPropertiesTableCondAlg(name = "InDetSiElementPropertiesTableCondAlg")
-from SiSpacePointTool.SiSpacePointToolConf import InDet__SiSpacePointMakerTool
-InDetSiSpacePointMakerTool = InDet__SiSpacePointMakerTool(name = "InDetSiSpacePointMakerTool")
-from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiTrackerSpacePointFinder
-InDetSiTrackerSpacePointFinder = InDet__SiTrackerSpacePointFinder(name = "InDetSiTrackerSpacePointFinder",
- SiSpacePointMakerTool = InDetSiSpacePointMakerTool,
- PixelsClustersName = "",
- SCT_ClustersName = "SCT_Clusters",
- SpacePointsPixelName = "",
- SpacePointsSCTName = "SCT_SpacePoints",
- SpacePointsOverlapName = "OverlapSpacePoints",
- ProcessPixels = False,
- ProcessSCTs = True,
- ProcessOverlaps = False,
- OverrideBeamSpot = True)
-if numThreads >= 2:
- InDetSiTrackerSpacePointFinder.Cardinality = numThreads
-topSequence += InDetSiTrackerSpacePointFinder
-
-# Setup SiSPSeededTrackFinder
-if not hasattr(condSeq, "InDetSiDetElementBoundaryLinksCondAlg"):
- from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiDetElementBoundaryLinksCondAlg_xk
- condSeq += InDet__SiDetElementBoundaryLinksCondAlg_xk(name = "InDetSiDetElementBoundaryLinksCondAlg")
-
-from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts
-NewTrackingCuts = ConfiguredNewTrackingCuts("SCT")
-
-from SiSpacePointsSeedTool_xk.SiSpacePointsSeedTool_xkConf import InDet__SiSpacePointsSeedMaker_ATLxk as SiSpacePointsSeedMaker
-InDetSiSpacePointsSeedMaker = SiSpacePointsSeedMaker(name = "InDetSpSeedsMaker"+NewTrackingCuts.extension(),
- pTmin = NewTrackingCuts.minPT(),
- maxdImpact = NewTrackingCuts.maxPrimaryImpact(),
- maxZ = NewTrackingCuts.maxZImpact(),
- minZ = -NewTrackingCuts.maxZImpact(),
- usePixel = False,
- SpacePointsPixelName = "",
- useSCT = (NewTrackingCuts.useSCT() and NewTrackingCuts.useSCTSeeding()),
- SpacePointsSCTName = "SCT_SpacePoints",
- useOverlapSpCollection = True,
- SpacePointsOverlapName = "OverlapSpacePoints",
- radMax = NewTrackingCuts.radMax(),
- RapidityCut = NewTrackingCuts.maxEta(),
- UseAssociationTool = False,
- AssociationTool = None,
- BeamSpotKey = "")
-
-from SiZvertexTool_xk.SiZvertexTool_xkConf import InDet__SiZvertexMaker_xk
-InDetZvertexMaker = InDet__SiZvertexMaker_xk(name = 'InDetZvertexMaker'+NewTrackingCuts.extension(),
- Zmax = NewTrackingCuts.maxZImpact(),
- Zmin = -NewTrackingCuts.maxZImpact(),
- minRatio = 0.17,
- SeedMakerTool = InDetSiSpacePointsSeedMaker)
-
-from TrkExRungeKuttaPropagator.TrkExRungeKuttaPropagatorConf import Trk__RungeKuttaPropagator as Propagator
-InDetPatternPropagator = Propagator(name = 'InDetPatternPropagator')
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += InDetPatternPropagator
-
-if not hasattr(condSeq, "InDet__SiDetElementsRoadCondAlg_xk"):
- from SiDetElementsRoadTool_xk.SiDetElementsRoadTool_xkConf import InDet__SiDetElementsRoadCondAlg_xk
- useDynamicAlignFolders = False
- condSeq += InDet__SiDetElementsRoadCondAlg_xk(name = "InDet__SiDetElementsRoadCondAlg_xk",
- UseDynamicAlignFolders = useDynamicAlignFolders,
- usePixel = False)
-
-from SiDetElementsRoadTool_xk.SiDetElementsRoadTool_xkConf import InDet__SiDetElementsRoadMaker_xk
-InDetSiDetElementsRoadMaker = InDet__SiDetElementsRoadMaker_xk(name = 'InDetSiRoadMaker'+NewTrackingCuts.extension(),
- PropagatorTool = InDetPatternPropagator,
- usePixel = False,
- useSCT = NewTrackingCuts.useSCT(),
- SCTManagerLocation = "SCT",
- RoadWidth = NewTrackingCuts.RoadWidth())
-
-from TrkMeasurementUpdator_xk.TrkMeasurementUpdator_xkConf import Trk__KalmanUpdator_xk
-InDetPatternUpdator = Trk__KalmanUpdator_xk(name = 'InDetPatternUpdator')
-ToolSvc += InDetPatternUpdator
-
-from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__SCT_ClusterOnTrackTool
-SCT_ClusterOnTrackTool = InDet__SCT_ClusterOnTrackTool("InDetSCT_ClusterOnTrackTool",
- CorrectionStrategy = 0, # do correct position bias
- ErrorStrategy = 2, # do use phi dependent errors
- LorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool)
-from TrkRIO_OnTrackCreator.TrkRIO_OnTrackCreatorConf import Trk__RIO_OnTrackCreator
-InDetRotCreator = Trk__RIO_OnTrackCreator(name = 'InDetRotCreator',
- ToolPixelCluster = None,
- ToolSCT_Cluster = SCT_ClusterOnTrackTool,
- ToolTRT_DriftCircle = None,
- Mode = 'indet')
-ToolSvc += InDetRotCreator
-
-from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiCombinatorialTrackFinder_xk
-InDetSiComTrackFinder = InDet__SiCombinatorialTrackFinder_xk(name = 'InDetSiComTrackFinder',
- PropagatorTool = InDetPatternPropagator,
- UpdatorTool = InDetPatternUpdator,
- RIOonTrackTool = InDetRotCreator,
- SctSummaryTool = SCT_ConditionsSummaryTool,
- AssosiationTool = None,
- usePixel = False,
- PixelClusterContainer = "",
- useSCT = True,
- SCTManagerLocation = "SCT",
- SCT_ClusterContainer = "SCT_Clusters")
-ToolSvc += InDetSiComTrackFinder
-
-from SiTrackMakerTool_xk.SiTrackMakerTool_xkConf import InDet__SiTrackMaker_xk as SiTrackMaker
-InDetSiTrackMaker = SiTrackMaker(name = 'InDetSiTrackMaker'+NewTrackingCuts.extension(),
- useSCT = NewTrackingCuts.useSCT(),
- usePixel = False,
- RoadTool = InDetSiDetElementsRoadMaker,
- CombinatorialTrackFinder = InDetSiComTrackFinder,
- pTmin = NewTrackingCuts.minPT(),
- pTminBrem = NewTrackingCuts.minPTBrem(),
- pTminSSS = -1.,
- nClustersMin = NewTrackingCuts.minClusters(),
- nHolesMax = NewTrackingCuts.nHolesMax(),
- nHolesGapMax = NewTrackingCuts.nHolesGapMax(),
- SeedsFilterLevel = NewTrackingCuts.seedFilterLevel(),
- Xi2max = NewTrackingCuts.Xi2max(),
- Xi2maxNoAdd = NewTrackingCuts.Xi2maxNoAdd(),
- nWeightedClustersMin = NewTrackingCuts.nWeightedClustersMin(),
- CosmicTrack = InDetFlags.doCosmics(),
- Xi2maxMultiTracks = NewTrackingCuts.Xi2max(), # was 3.
- useSSSseedsFilter = True,
- doMultiTracksProd = True,
- useBremModel = False,
- doCaloSeededBrem = False,
- doHadCaloSeedSSS = False,
- phiWidth = NewTrackingCuts.phiWidthBrem(),
- etaWidth = NewTrackingCuts.etaWidthBrem(),
- InputClusterContainerName = "",
- InputHadClusterContainerName = "",
- UseAssociationTool = False,
- TrackPatternRecoInfo = "SiSPSeededFinder",
- BeamSpotKey = "")
-
-from SiSPSeededTrackFinder.SiSPSeededTrackFinderConf import InDet__SiSPSeededTrackFinder
-InDetSiSPSeededTrackFinder = InDet__SiSPSeededTrackFinder(name = 'InDetSiSpTrackFinder'+NewTrackingCuts.extension(),
- TrackTool = InDetSiTrackMaker,
- TracksLocation = "SiSPSeededSCTTracks",
- SeedsTool = InDetSiSpacePointsSeedMaker,
- SpacePointsPixelName = "",
- useZvertexTool = True,
- ZvertexTool = InDetZvertexMaker,
- useNewStrategy = False,
- useMBTSTimeDiff = False,
- useZBoundFinding = NewTrackingCuts.doZBoundary(),
- BeamSpotKey = "")
-if doPrint:
- print InDetSiSPSeededTrackFinder
-if numThreads >= 2:
- InDetSiSPSeededTrackFinder.Cardinality = numThreads
-topSequence += InDetSiSPSeededTrackFinder
-
-# Print algorithms
-if doPrint:
- print topSequence
-
-# Set the number of events to be processed
-theApp.EvtMax = -1
-
-#--------------------------------------------------------------
-# Set output lvl (VERBOSE, DEBUG, INFO, WARNING, ERROR, FATAL)
-#--------------------------------------------------------------
-ServiceMgr.MessageSvc.OutputLevel = INFO
-# Gaudi/GaudiKernel/GaudiKernel/Message.h
-ServiceMgr.MessageSvc.Format = "% F%50W%S% F%3W%s%7W%R%T %0W%M"
-
-if numThreads >= 2:
- from SCT_ConditionsAlgorithms.SCTCondAlgCardinality import sctCondAlgCardinality
- sctCondAlgCardinality.set(numThreads)
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
index 420c9aeabcbda1893708319176e12a08dc7dd0a6..13738448180285c8c21a043b97e05a38ce0eadba 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandalone.py
@@ -7,7 +7,7 @@
#==============================================================
# Configuration flags
-doPixel = True
+doPixel = False
doSCT = True
doBeamSpot = True
doPrint = True
@@ -15,6 +15,7 @@ doPrint = True
# doPixel = True, doSCT = True, doBeamSpot = True, doPrint = True
# doPixel = True, doSCT = False, doBeamSpot = False, doPrint = True
# doPixel = False, doSCT = True, doBeamSpot = False, doPrint = True
+# doPixel = False, doSCT = True, doBeamSpot = True, doPrint = True
# were tested.
# Output track location
@@ -588,7 +589,7 @@ if doPrint:
print topSequence
# Set the number of events to be processed
-theApp.EvtMax = 10
+theApp.EvtMax = 25
#--------------------------------------------------------------
# Set output lvl (VERBOSE, DEBUG, INFO, WARNING, ERROR, FATAL)
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
new file mode 100644
index 0000000000000000000000000000000000000000..6b381cd0423852735bce5b0bd985092b22c8dcc5
--- /dev/null
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/share/SiSPSeededTracksStandaloneFromESD.py
@@ -0,0 +1,493 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+###############################################################
+#
+# Standalone job options file to create SiSPSeededTracks
+#
+#==============================================================
+
+# Configuration flags
+doPixel = True
+doSCT = True
+doBeamSpot = True
+doPrint = True
+
+# Output track location
+TracksLocation = "SiSPSeededTracks"
+if doPixel and not doSCT:
+ TracksLocation = "SiSPSeededPixelTracks"
+if not doPixel and doSCT:
+ TracksLocation = "SiSPSeededSCTTracks"
+
+#--------------------------------------------------------------
+# Standard includes
+#--------------------------------------------------------------
+import AthenaCommon.AtlasUnixStandardJob
+
+# Common fragments
+import sys
+from AthenaCommon.AppMgr import ToolSvc
+from AthenaCommon.AppMgr import ServiceMgr
+from InDetRecExample.InDetJobProperties import InDetFlags
+from InDetRecExample.InDetKeys import InDetKeys
+
+if not doBeamSpot:
+ InDetFlags.useBeamConstraint.set_Value_and_Lock(False)
+if not doPixel:
+ InDetKeys.PixelClusters.set_Value_and_Lock("")
+ InDetKeys.PixelSpacePoints.set_Value_and_Lock("")
+ # InDetKeys.OverlapSpacePoints.set_Value_and_Lock("")
+if not doSCT:
+ InDetKeys.SCT_Clusters.set_Value_and_Lock("")
+ InDetKeys.SCT_SpacePoints.set_Value_and_Lock("")
+ # InDetKeys.OverlapSpacePoints.set_Value_and_Lock("")
+
+#--------------------------------------------------------------
+# Thread-specific setup
+#--------------------------------------------------------------
+from AthenaCommon.ConcurrencyFlags import jobproperties
+numThreads = jobproperties.ConcurrencyFlags.NumThreads()
+if numThreads > 0:
+ from AthenaCommon.AlgScheduler import AlgScheduler
+ AlgScheduler.CheckDependencies( True )
+ AlgScheduler.ShowControlFlow( True )
+ AlgScheduler.ShowDataDependencies( True )
+
+#--------------------------------------------------------------
+# use auditors
+#--------------------------------------------------------------
+from GaudiSvc.GaudiSvcConf import AuditorSvc
+ServiceMgr += AuditorSvc()
+theAuditorSvc = ServiceMgr.AuditorSvc
+theAuditorSvc.Auditors += [ "ChronoAuditor"]
+theAuditorSvc.Auditors += [ "MemStatAuditor" ]
+theApp.AuditAlgorithms=True
+
+#--------------------------------------------------------------
+# Load Geometry
+#--------------------------------------------------------------
+from AthenaCommon.GlobalFlags import globalflags
+globalflags.DetDescrVersion="ATLAS-R2-2016-01-00-01"
+globalflags.DetGeo="atlas"
+globalflags.InputFormat="pool"
+globalflags.DataSource="geant4"
+if doPrint:
+ print globalflags
+
+#--------------------------------------------------------------
+# Set Detector setup
+#--------------------------------------------------------------
+# --- switch on BField, bpipe, pixel and SCT
+from AthenaCommon.DetFlags import DetFlags
+DetFlags.ID_setOff()
+if doBeamSpot:
+ DetFlags.bpipe_setOn()
+if doPixel:
+ DetFlags.pixel_setOn()
+if doSCT:
+ DetFlags.SCT_setOn()
+DetFlags.Calo_setOff()
+DetFlags.Muon_setOff()
+DetFlags.Truth_setOff()
+DetFlags.LVL1_setOff()
+DetFlags.BField_setOn()
+
+# ---- switch parts of ID off/on as follows
+DetFlags.digitize.all_setOff()
+DetFlags.geometry.all_setOff()
+DetFlags.overlay.all_setOff()
+DetFlags.pileup.all_setOff()
+DetFlags.readRIOBS.all_setOff()
+DetFlags.readRIOPool.all_setOff()
+DetFlags.simulate.all_setOff()
+DetFlags.simulateLVL1.all_setOff()
+DetFlags.writeBS.all_setOff()
+DetFlags.writeRIOPool.all_setOff()
+
+import AtlasGeoModel.SetGeometryVersion
+import AtlasGeoModel.GeoModelInit
+import MagFieldServices.SetupField
+
+if doPrint:
+ DetFlags.Print()
+
+#--------------------------------------------------------------
+# Load IOVDbSvc
+#--------------------------------------------------------------
+IOVDbSvc = Service("IOVDbSvc")
+from IOVDbSvc.CondDB import conddb
+IOVDbSvc.GlobalTag="OFLCOND-MC16-SDR-20"
+IOVDbSvc.OutputLevel = WARNING
+
+# Set input ESD file
+inputESDFiles = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"]
+
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+athenaCommonFlags.FilesInput = inputESDFiles
+
+import AthenaPoolCnvSvc.ReadAthenaPool
+from PoolSvc.PoolSvcConf import PoolSvc
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+svcMgr += PoolSvc()
+PoolSvc = svcMgr.PoolSvc
+EventSelector = svcMgr.EventSelector
+EventSelector.InputCollections = inputESDFiles
+
+# Set up topSequence and condSeq
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
+from AthenaCommon.AlgSequence import AthSequencer
+condSeq = AthSequencer("AthCondSeq")
+
+# Set up EventInfo
+if not hasattr(topSequence, "xAODMaker::EventInfoCnvAlg") and not hasattr(condSeq, "xAODMaker::EventInfoCnvAlg"):
+ from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
+ topSequence += xAODMaker__EventInfoCnvAlg()
+
+# Set up BeamSpot
+if doBeamSpot:
+ if not hasattr(condSeq, "BeamSpotCondAlg"):
+ conddb.addFolderSplitOnline("INDET", "/Indet/Onl/Beampos", "/Indet/Beampos", className="AthenaAttributeList")
+ from BeamSpotConditions.BeamSpotConditionsConf import BeamSpotCondAlg
+ condSeq += BeamSpotCondAlg("BeamSpotCondAlg")
+
+from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
+do_runI = geoFlags.Run() not in ["RUN2", "RUN3"]
+if do_runI:
+ sys.exit("RUN1 is not supported. Bye.")
+
+# Set up cabling
+include("InDetRecExample/InDetRecCabling.py")
+
+# Set up Pixel conditions
+if doPixel:
+ # Taken from InDetRecExample/share/InDetRecConditionsAccess.py
+ if not hasattr(condSeq, "PixelConfigCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelConfigCondAlg
+ condSeq += PixelConfigCondAlg(name="PixelConfigCondAlg")
+ if not (conddb.folderRequested("/PIXEL/PixMapOverlay") or conddb.folderRequested("/PIXEL/Onl/PixMapOverlay")):
+ conddb.addFolderSplitOnline("PIXEL","/PIXEL/Onl/PixMapOverlay", "/PIXEL/PixMapOverlay", className="CondAttrListCollection")
+ if not hasattr(condSeq, "PixelChargeCalibCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg
+ condSeq += PixelChargeCalibCondAlg(name="PixelChargeCalibCondAlg", ReadKey="/PIXEL/PixCalib")
+ if not conddb.folderRequested("/PIXEL/PixCalib"):
+ conddb.addFolderSplitOnline("PIXEL", "/PIXEL/Onl/PixCalib", "/PIXEL/PixCalib", className="CondAttrListCollection")
+ if not hasattr(condSeq, "PixelOfflineCalibCondAlg"):
+ from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelOfflineCalibCondAlg
+ condSeq += PixelOfflineCalibCondAlg(name="PixelOfflineCalibCondAlg", ReadKey="/PIXEL/PixReco",
+ InputSource = 2)
+ if not conddb.folderRequested("/PIXEL/PixReco"):
+ conddb.addFolder("PIXEL_OFL", "/PIXEL/PixReco", className="DetCondCFloat")
+ if not hasattr(ToolSvc, "PixelLorentzAngleTool"):
+ from SiLorentzAngleTool.PixelLorentzAngleToolSetup import PixelLorentzAngleToolSetup
+ pixelLorentzAngleToolSetup = PixelLorentzAngleToolSetup()
+ # Takne from InDetRecExample/share/InDetRecLoadTools.py
+ from InDetRecExample.TrackingCommon import createAndAddCondAlg,getPixelClusterNnCondAlg,getPixelClusterNnWithTrackCondAlg
+ createAndAddCondAlg( getPixelClusterNnCondAlg, "PixelNnClusterNnCondAlg", GetInputsInfo = do_runI)
+ createAndAddCondAlg( getPixelClusterNnWithTrackCondAlg,"PixelNnClusterNnWithTrackCondAlg", GetInputsInfo = do_runI)
+
+# Set up SCT conditions
+SCT_ConditionsSummaryTool = None
+if doSCT:
+ # Taken from InDetRecExample/share/InDetRecConditionsAccess.py
+ from SCT_ConditionsTools.SCT_ConfigurationConditionsToolSetup import SCT_ConfigurationConditionsToolSetup
+ sct_ConfigurationConditionsToolSetup = SCT_ConfigurationConditionsToolSetup()
+ sct_ConfigurationConditionsToolSetup.setup()
+ from SCT_ConditionsTools.SCT_ReadCalibDataToolSetup import SCT_ReadCalibDataToolSetup
+ sct_ReadCalibDataToolSetup = SCT_ReadCalibDataToolSetup()
+ sct_ReadCalibDataToolSetup.setup()
+ from SCT_ConditionsTools.SCT_DCSConditionsToolSetup import SCT_DCSConditionsToolSetup
+ sct_DCSConditionsToolSetup = SCT_DCSConditionsToolSetup()
+ sct_DCSConditionsToolSetup.setup()
+ from SCT_ConditionsTools.SCT_ConditionsSummaryToolSetup import SCT_ConditionsSummaryToolSetup
+ from SCT_ConditionsTools.SCT_FlaggedConditionToolSetup import SCT_FlaggedConditionToolSetup
+ sct_FlaggedConditionToolSetup = SCT_FlaggedConditionToolSetup()
+ sct_FlaggedConditionToolSetup.setup()
+ sct_ConditionsSummaryToolSetup = SCT_ConditionsSummaryToolSetup()
+ sct_ConditionsSummaryToolSetup.setup()
+ SCT_ConditionsSummaryTool = sct_ConditionsSummaryToolSetup.getTool()
+ SCT_ConditionsSummaryTool.ConditionsTools=[sct_ConfigurationConditionsToolSetup.getTool().getFullName(),
+ sct_FlaggedConditionToolSetup.getTool().getFullName(),
+ sct_ReadCalibDataToolSetup.getTool().getFullName(),
+ sct_DCSConditionsToolSetup.getTool().getFullName()]
+ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
+ sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
+ # Taken from InDetRecExample/share/InDetRecPreProcessingSilicon.py
+ if not hasattr(condSeq, "InDetSiElementPropertiesTableCondAlg"):
+ from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiElementPropertiesTableCondAlg
+ condSeq += InDet__SiElementPropertiesTableCondAlg(name = "InDetSiElementPropertiesTableCondAlg")
+ # Taken from InDetRecExample/share/InDetRecLoadTools.py
+ if not hasattr(condSeq, "InDetSiDetElementBoundaryLinksCondAlg"):
+ from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiDetElementBoundaryLinksCondAlg_xk
+ condSeq += InDet__SiDetElementBoundaryLinksCondAlg_xk(name = "InDetSiDetElementBoundaryLinksCondAlg")
+
+if doPixel or doSCT:
+ # This is for both Pixel and SCT.
+ # Takne from InDetRecExample/share/InDetRecLoadTools.py
+ from InDetRecExample.TrackingCommon import createAndAddCondAlg, getRIO_OnTrackErrorScalingCondAlg
+ createAndAddCondAlg(getRIO_OnTrackErrorScalingCondAlg,"RIO_OnTrackErrorScalingCondAlg")
+
+# Set up Pixel neutral network tools
+clusterSplitProbTool = None
+clusterSplitterTool = None
+if doPixel:
+ # Taken from InDetRecExample/share/InDetRecLoadTools.py
+ from TrkNeuralNetworkUtils.TrkNeuralNetworkUtilsConf import Trk__NeuralNetworkToHistoTool
+ NeuralNetworkToHistoTool=Trk__NeuralNetworkToHistoTool(name = "NeuralNetworkToHistoTool")
+ ToolSvc += NeuralNetworkToHistoTool
+ from SiClusterizationTool.SiClusterizationToolConf import InDet__NnClusterizationFactory
+ NnClusterizationFactory = InDet__NnClusterizationFactory(name = "NnClusterizationFactory",
+ PixelLorentzAngleTool = ToolSvc.PixelLorentzAngleTool,
+ useToT = InDetFlags.doNNToTCalibration(),
+ NnCollectionReadKey = "PixelClusterNN",
+ NnCollectionWithTrackReadKey = "PixelClusterNNWithTrack")
+ ToolSvc += NnClusterizationFactory
+
+# Set up InDet__SiTrackerSpacePointFinder (alg)
+# Taken from InDetRecExample/share/InDetRecPreProcessingSilicon.py
+from SiSpacePointTool.SiSpacePointToolConf import InDet__SiSpacePointMakerTool
+InDetSiSpacePointMakerTool = InDet__SiSpacePointMakerTool(name = "InDetSiSpacePointMakerTool")
+from SiSpacePointFormation.SiSpacePointFormationConf import InDet__SiTrackerSpacePointFinder
+InDetSiTrackerSpacePointFinder = InDet__SiTrackerSpacePointFinder(name = "InDetSiTrackerSpacePointFinder",
+ SiSpacePointMakerTool = InDetSiSpacePointMakerTool,
+ PixelsClustersName = InDetKeys.PixelClusters(),
+ SCT_ClustersName = InDetKeys.SCT_Clusters(),
+ SpacePointsPixelName = InDetKeys.PixelSpacePoints(),
+ SpacePointsSCTName = InDetKeys.SCT_SpacePoints(),
+ SpacePointsOverlapName = InDetKeys.OverlapSpacePoints(),
+ ProcessPixels = DetFlags.haveRIO.pixel_on(),
+ ProcessSCTs = DetFlags.haveRIO.SCT_on(),
+ ProcessOverlaps = DetFlags.haveRIO.pixel_on() and DetFlags.haveRIO.SCT_on(),
+ OverrideBeamSpot = not doBeamSpot)
+if numThreads >= 2:
+ InDetSiTrackerSpacePointFinder.Cardinality = numThreads
+topSequence += InDetSiTrackerSpacePointFinder
+
+# Set up ConfiguredNewTrackingCuts
+# Taken from InDetRecExample/share/InDetRec_jobOptions.py
+from InDetRecExample.ConfiguredNewTrackingCuts import ConfiguredNewTrackingCuts
+NewTrackingCuts = None
+if doPixel and doSCT:
+ NewTrackingCuts = ConfiguredNewTrackingCuts("Offline")
+elif doPixel:
+ NewTrackingCuts = ConfiguredNewTrackingCuts("Pixel")
+elif doSCT:
+ NewTrackingCuts = ConfiguredNewTrackingCuts("SCT")
+
+# Set up InDet__InDetPRD_AssociationToolGangedPixels (public)
+if (NewTrackingCuts.mode() == "LowPt" or
+ NewTrackingCuts.mode() == "VeryLowPt" or
+ NewTrackingCuts.mode() == "LargeD0" or
+ NewTrackingCuts.mode() == "LowPtLargeD0" or
+ NewTrackingCuts.mode() == "BeamGas" or
+ NewTrackingCuts.mode() == "ForwardTracks" or
+ NewTrackingCuts.mode() == "ForwardSLHCTracks" or
+ NewTrackingCuts.mode() == "PixelPrdAssociation" or
+ NewTrackingCuts.mode() == "VeryForwardSLHCTracks" or
+ NewTrackingCuts.mode() == "SLHCConversionFinding"):
+ usePrdAssociationTool = True
+else:
+ usePrdAssociationTool = False
+InDetPrdAssociationTool = None
+if usePrdAssociationTool:
+ # Taken from InDetRecExample/share/InDetRecLoadTools.py
+ from InDetAssociationTools.InDetAssociationToolsConf import InDet__InDetPRD_AssociationToolGangedPixels
+ InDetPrdAssociationTool = InDet__InDetPRD_AssociationToolGangedPixels(name = "InDetPrdAssociationTool",
+ PixelClusterAmbiguitiesMapName = InDetKeys.GangedPixelMap(),
+ addTRToutliers = False) ###
+ ToolSvc += InDetPrdAssociationTool
+
+# Set up InDet__SiSpacePointsSeedMaker_ATLxk (private)
+# Taken from InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+from SiSpacePointsSeedTool_xk.SiSpacePointsSeedTool_xkConf import InDet__SiSpacePointsSeedMaker_ATLxk as SiSpacePointsSeedMaker
+InDetSiSpacePointsSeedMaker = SiSpacePointsSeedMaker(name = "InDetSpSeedsMaker"+NewTrackingCuts.extension(),
+ pTmin = NewTrackingCuts.minPT(),
+ maxdImpact = NewTrackingCuts.maxPrimaryImpact(),
+ maxZ = NewTrackingCuts.maxZImpact(),
+ minZ = -NewTrackingCuts.maxZImpact(),
+ usePixel = NewTrackingCuts.usePixel(),
+ SpacePointsPixelName = InDetKeys.PixelSpacePoints(),
+ useSCT = (NewTrackingCuts.useSCT() and NewTrackingCuts.useSCTSeeding()),
+ SpacePointsSCTName = InDetKeys.SCT_SpacePoints(),
+ useOverlapSpCollection = NewTrackingCuts.usePixel() and (NewTrackingCuts.useSCT() and NewTrackingCuts.useSCTSeeding()), ###
+ SpacePointsOverlapName = InDetKeys.OverlapSpacePoints(),
+ radMax = NewTrackingCuts.radMax(),
+ RapidityCut = NewTrackingCuts.maxEta(),
+ UseAssociationTool = usePrdAssociationTool,
+ AssociationTool = InDetPrdAssociationTool,
+ maxdImpactPPS = NewTrackingCuts.maxdImpactPPSSeeds(),
+ maxdImpactSSS = NewTrackingCuts.maxdImpactSSSSeeds())
+if not doBeamSpot:
+ InDetSiSpacePointsSeedMaker.BeamSpotKey = ""
+
+# Set up InDet__SiZvertexMaker_xk (private)
+# Taken from ConfiguredNewTrackingSiPattern.py
+from SiZvertexTool_xk.SiZvertexTool_xkConf import InDet__SiZvertexMaker_xk
+InDetZvertexMaker = InDet__SiZvertexMaker_xk(name = "InDetZvertexMaker"+NewTrackingCuts.extension(),
+ Zmax = NewTrackingCuts.maxZImpact(),
+ Zmin = -NewTrackingCuts.maxZImpact(),
+ minRatio = 0.17,
+ SeedMakerTool = InDetSiSpacePointsSeedMaker)
+
+# Set up Trk__RungeKuttaPropagator (public)
+# Taken from InDetRecExample/share/InDetRecLoadTools.py
+from TrkExRungeKuttaPropagator.TrkExRungeKuttaPropagatorConf import Trk__RungeKuttaPropagator as Propagator
+InDetPatternPropagator = Propagator(name = "InDetPatternPropagator")
+ToolSvc += InDetPatternPropagator
+
+# Set up InDet__SiDetElementsRoadMaker_xk (private)
+# Taken from InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+if not hasattr(condSeq, "InDet__SiDetElementsRoadCondAlg_xk"):
+ from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
+ from SiDetElementsRoadTool_xk.SiDetElementsRoadTool_xkConf import InDet__SiDetElementsRoadCondAlg_xk
+ condSeq += InDet__SiDetElementsRoadCondAlg_xk(name = "InDet__SiDetElementsRoadCondAlg_xk",
+ UseDynamicAlignFolders = InDetGeometryFlags.useDynamicAlignFolders(),
+ usePixel = doPixel,
+ useSCT = doSCT)
+from SiDetElementsRoadTool_xk.SiDetElementsRoadTool_xkConf import InDet__SiDetElementsRoadMaker_xk
+InDetSiDetElementsRoadMaker = InDet__SiDetElementsRoadMaker_xk(name = "InDetSiRoadMaker"+NewTrackingCuts.extension(),
+ PropagatorTool = InDetPatternPropagator,
+ usePixel = NewTrackingCuts.usePixel(),
+ PixManagerLocation = InDetKeys.PixelManager(),
+ useSCT = NewTrackingCuts.useSCT(),
+ RoadWidth = NewTrackingCuts.RoadWidth())
+
+# Set up InDetPatternUpdator (public)
+# Taken from InDetRecExample/share/InDetRecLoadTools.py
+from TrkMeasurementUpdator_xk.TrkMeasurementUpdator_xkConf import Trk__KalmanUpdator_xk
+InDetPatternUpdator = Trk__KalmanUpdator_xk(name = "InDetPatternUpdator")
+ToolSvc += InDetPatternUpdator
+
+# Set up InDet__PixelClusterOnTrackTool (public)
+PixelClusterOnTrackTool = None
+if doPixel:
+ # Taken from InDetRecExample/share/InDetRecLoadTools.py
+ from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__PixelClusterOnTrackTool
+ PixelClusterOnTrackTool = InDet__PixelClusterOnTrackTool("InDetPixelClusterOnTrackTool",
+ LorentzAngleTool = ToolSvc.PixelLorentzAngleTool,
+ DisableDistortions = (InDetFlags.doFatras() or InDetFlags.doDBMstandalone()),
+ applyNNcorrection = ( InDetFlags.doPixelClusterSplitting() and
+ InDetFlags.pixelClusterSplittingType() == "NeuralNet" and not InDetFlags.doSLHC()),
+ NNIBLcorrection = ( InDetFlags.doPixelClusterSplitting() and
+ InDetFlags.pixelClusterSplittingType() == "NeuralNet" and not InDetFlags.doSLHC()),
+ SplitClusterAmbiguityMap = InDetKeys.SplitClusterAmbiguityMap(),
+ RunningTIDE_Ambi = InDetFlags.doTIDE_Ambi())
+ PixelClusterOnTrackTool.NnClusterizationFactory = NnClusterizationFactory
+ ToolSvc += PixelClusterOnTrackTool
+
+# Set up InDet__SCT_ClusterOnTrackTool (private)
+SCT_ClusterOnTrackTool = None
+if doSCT:
+ # Taken from InDetRecExample/share/InDetRecLoadTools.py
+ from SiClusterOnTrackTool.SiClusterOnTrackToolConf import InDet__SCT_ClusterOnTrackTool
+ SCT_ClusterOnTrackTool = InDet__SCT_ClusterOnTrackTool("InDetSCT_ClusterOnTrackTool",
+ CorrectionStrategy = 0, # do correct position bias
+ ErrorStrategy = 2, # do use phi dependent errors
+ LorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool)
+
+# Set up InDetRotCreator (public)
+# Taken from InDetRecExample/share/InDetRecLoadTools.py
+from TrkRIO_OnTrackCreator.TrkRIO_OnTrackCreatorConf import Trk__RIO_OnTrackCreator
+InDetRotCreator = Trk__RIO_OnTrackCreator(name = "InDetRotCreator",
+ ToolPixelCluster = PixelClusterOnTrackTool,
+ ToolSCT_Cluster = SCT_ClusterOnTrackTool,
+ ToolTRT_DriftCircle = None,
+ Mode = "indet")
+ToolSvc += InDetRotCreator
+
+# Set up SiCombinatorialTrackFinder_xk (private)
+# Taken from InDetRecExample/share/InDetRecLoadTools.py
+from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiCombinatorialTrackFinder_xk
+InDetSiComTrackFinder = InDet__SiCombinatorialTrackFinder_xk(name = "InDetSiComTrackFinder",
+ PropagatorTool = InDetPatternPropagator,
+ UpdatorTool = InDetPatternUpdator,
+ RIOonTrackTool = InDetRotCreator,
+ SctSummaryTool = SCT_ConditionsSummaryTool,
+ AssosiationTool = InDetPrdAssociationTool,
+ usePixel = DetFlags.haveRIO.pixel_on(),
+ useSCT = DetFlags.haveRIO.SCT_on(),
+ PixManagerLocation = InDetKeys.PixelManager(),
+ PixelClusterContainer = InDetKeys.PixelClusters(),
+ SCT_ClusterContainer = InDetKeys.SCT_Clusters())
+
+# Set up SiTrackMaker_xk (private)
+# Taken from InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+# useBremMode = NewTrackingCuts.mode() == "Offline" or NewTrackingCuts.mode() == "SLHC"
+useBremMode = False ###
+InDetFlags.doCaloSeededBrem.set_Value_and_Lock(False) ###
+InDetFlags.doHadCaloSeededSSS.set_Value_and_Lock(False) ###
+InDetKeys.CaloClusterROIContainer.set_Value_and_Lock("") ###
+InDetKeys.HadCaloClusterROIContainer.set_Value_and_Lock("") ###
+from SiTrackMakerTool_xk.SiTrackMakerTool_xkConf import InDet__SiTrackMaker_xk as SiTrackMaker
+InDetSiTrackMaker = SiTrackMaker(name = "InDetSiTrackMaker"+NewTrackingCuts.extension(),
+ useSCT = NewTrackingCuts.useSCT(),
+ usePixel = NewTrackingCuts.usePixel(),
+ RoadTool = InDetSiDetElementsRoadMaker,
+ CombinatorialTrackFinder = InDetSiComTrackFinder,
+ pTmin = NewTrackingCuts.minPT(),
+ pTminBrem = NewTrackingCuts.minPTBrem(),
+ pTminSSS = InDetFlags.pT_SSScut(),
+ nClustersMin = NewTrackingCuts.minClusters(),
+ nHolesMax = NewTrackingCuts.nHolesMax(),
+ nHolesGapMax = NewTrackingCuts.nHolesGapMax(),
+ SeedsFilterLevel = NewTrackingCuts.seedFilterLevel(),
+ Xi2max = NewTrackingCuts.Xi2max(),
+ Xi2maxNoAdd = NewTrackingCuts.Xi2maxNoAdd(),
+ nWeightedClustersMin = NewTrackingCuts.nWeightedClustersMin(),
+ CosmicTrack = InDetFlags.doCosmics(),
+ Xi2maxMultiTracks = NewTrackingCuts.Xi2max(), # was 3.
+ useSSSseedsFilter = InDetFlags.doSSSfilter(),
+ doMultiTracksProd = True,
+ useBremModel = InDetFlags.doBremRecovery() and useBremMode, # only for NewTracking the brem is debugged !!!
+ doCaloSeededBrem = InDetFlags.doCaloSeededBrem(),
+ doHadCaloSeedSSS = InDetFlags.doHadCaloSeededSSS(),
+ phiWidth = NewTrackingCuts.phiWidthBrem(),
+ etaWidth = NewTrackingCuts.etaWidthBrem(),
+ InputClusterContainerName = InDetKeys.CaloClusterROIContainer(), # "InDetCaloClusterROIs"
+ InputHadClusterContainerName = InDetKeys.HadCaloClusterROIContainer(), # "InDetCaloClusterROIs"
+ UseAssociationTool = usePrdAssociationTool)
+InDetSiTrackMaker.TrackPatternRecoInfo = "SiSPSeededFinder"
+if not doBeamSpot:
+ InDetSiTrackMaker.BeamSpotKey = ""
+
+# Set up SiSPSeededTrackFinder (alg)
+# InDetRecExample/share/ConfiguredNewTrackingSiPattern.py
+from SiSPSeededTrackFinder.SiSPSeededTrackFinderConf import InDet__SiSPSeededTrackFinder
+InDetSiSPSeededTrackFinder = InDet__SiSPSeededTrackFinder(name = "InDetSiSpTrackFinder"+NewTrackingCuts.extension(),
+ TrackTool = InDetSiTrackMaker,
+ TracksLocation = TracksLocation,
+ SeedsTool = InDetSiSpacePointsSeedMaker,
+ useZvertexTool = InDetFlags.useZvertexTool() and NewTrackingCuts.mode() != "DBM",
+ ZvertexTool = InDetZvertexMaker,
+ useNewStrategy = InDetFlags.useNewSiSPSeededTF() and NewTrackingCuts.mode() != "DBM",
+ useMBTSTimeDiff = InDetFlags.useMBTSTimeDiff(),
+ useZBoundFinding = NewTrackingCuts.doZBoundary() and NewTrackingCuts.mode() != "DBM")
+if not doBeamSpot:
+ InDetSiSPSeededTrackFinder.BeamSpotKey = ""
+if not doPixel:
+ InDetSiSPSeededTrackFinder.SpacePointsPixelName = ""
+if not doSCT:
+ InDetSiSPSeededTrackFinder.SpacePointsSCTName = ""
+
+if doPrint:
+ print InDetSiSPSeededTrackFinder
+if numThreads >= 2:
+ InDetSiSPSeededTrackFinder.Cardinality = numThreads
+topSequence += InDetSiSPSeededTrackFinder
+
+# Print algorithms
+if doPrint:
+ print topSequence
+
+# Set the number of events to be processed
+theApp.EvtMax = 25
+
+#--------------------------------------------------------------
+# Set output lvl (VERBOSE, DEBUG, INFO, WARNING, ERROR, FATAL)
+#--------------------------------------------------------------
+ServiceMgr.MessageSvc.OutputLevel = INFO
+ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M"
+
+if numThreads >= 2:
+ from SCT_ConditionsAlgorithms.SCTCondAlgCardinality import sctCondAlgCardinality
+ sctCondAlgCardinality.set(numThreads)
diff --git a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/SiSPSeededTrackFinder.cxx b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/SiSPSeededTrackFinder.cxx
index cbf6b9acc979d50108d6f973e13151b8805ebe7c..da1dca1435389af4b1f1a7660673dffea1748205 100644
--- a/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/SiSPSeededTrackFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/SiSPSeededTrackFinder/src/SiSPSeededTrackFinder.cxx
@@ -4,6 +4,8 @@
#include "SiSPSeededTrackFinder/SiSPSeededTrackFinder.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
+#include "SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h"
#include "TrkPatternParameters/PatternTrackParameters.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
@@ -110,20 +112,22 @@ StatusCode InDet::SiSPSeededTrackFinder::oldStrategy(const EventContext& ctx) co
return StatusCode::SUCCESS;
}
+ SiSpacePointsSeedMakerEventData seedEventData;
bool ZVE = false;
if (m_useZvertexTool) {
- std::list<Trk::Vertex> vertices = m_zvertexmaker->newEvent();
+ std::list<Trk::Vertex> vertices = m_zvertexmaker->newEvent(seedEventData);
if (not vertices.empty()) ZVE = true;
- m_seedsmaker->find3Sp(vertices);
+ m_seedsmaker->find3Sp(seedEventData, vertices);
} else {
- m_seedsmaker->newEvent(-1);
+ m_seedsmaker->newEvent(seedEventData, -1);
std::list<Trk::Vertex> VZ;
- m_seedsmaker->find3Sp(VZ);
+ m_seedsmaker->find3Sp(seedEventData, VZ);
}
const bool PIX = true;
const bool SCT = true;
- m_trackmaker->newEvent(PIX, SCT);
+ InDet::SiTrackMakerEventData_xk trackEventData;
+ m_trackmaker->newEvent(trackEventData, PIX, SCT);
bool ERR = false;
Counter_t counter{};
@@ -131,9 +135,9 @@ StatusCode InDet::SiSPSeededTrackFinder::oldStrategy(const EventContext& ctx) co
std::multimap<double, Trk::Track*> qualityTrack;
// Loop through all seed and reconsrtucted tracks collection preparation
//
- while ((seed = m_seedsmaker->next())) {
+ while ((seed = m_seedsmaker->next(seedEventData))) {
++counter[kNSeeds];
- std::list<Trk::Track*> trackList = std::move(m_trackmaker->getTracks(seed->spacePoints()));
+ std::list<Trk::Track*> trackList = m_trackmaker->getTracks(trackEventData, seed->spacePoints());
for (Trk::Track* t: trackList) {
qualityTrack.insert(std::make_pair(-trackQuality(t), t));
}
@@ -143,7 +147,7 @@ StatusCode InDet::SiSPSeededTrackFinder::oldStrategy(const EventContext& ctx) co
break;
}
}
- m_trackmaker->endEvent();
+ m_trackmaker->endEvent(trackEventData);
// Remove shared tracks with worse quality
//
@@ -194,14 +198,17 @@ StatusCode InDet::SiSPSeededTrackFinder::newStrategy(const EventContext& ctx) co
//
SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle{m_beamSpotKey, ctx};
Trk::PerigeeSurface per(beamSpotHandle->beamPos());
+
+ SiSpacePointsSeedMakerEventData seedEventData;
- m_seedsmaker->newEvent(0);
+ m_seedsmaker->newEvent(seedEventData, 0);
std::list<Trk::Vertex> VZ;
- m_seedsmaker->find3Sp(VZ);
+ m_seedsmaker->find3Sp(seedEventData, VZ);
const bool PIX = true ;
const bool SCT = true ;
- m_trackmaker->newEvent(PIX, SCT);
+ InDet::SiTrackMakerEventData_xk trackEventData;
+ m_trackmaker->newEvent(trackEventData, PIX, SCT);
std::vector<int> nhistogram(m_histsize, 0);
std::vector<double> zhistogram(m_histsize, 0.);
@@ -213,10 +220,10 @@ StatusCode InDet::SiSPSeededTrackFinder::newStrategy(const EventContext& ctx) co
std::multimap<double, Trk::Track*> qualityTrack;
// Loop through all seed and reconsrtucted tracks collection preparation
//
- while ((seed = m_seedsmaker->next())) {
+ while ((seed = m_seedsmaker->next(seedEventData))) {
++counter[kNSeeds];
bool firstTrack{true};
- std::list<Trk::Track*> trackList = std::move(m_trackmaker->getTracks(seed->spacePoints()));
+ std::list<Trk::Track*> trackList = m_trackmaker->getTracks(trackEventData, seed->spacePoints());
for (Trk::Track* t: trackList) {
qualityTrack.insert(std::make_pair(-trackQuality(t), t));
@@ -232,21 +239,21 @@ StatusCode InDet::SiSPSeededTrackFinder::newStrategy(const EventContext& ctx) co
}
}
- m_seedsmaker->newEvent(1);
+ m_seedsmaker->newEvent(seedEventData, 1);
double ZB[2];
if (not m_ITKGeometry) {
findZvertex(VZ, ZB, nhistogram, zhistogram, phistogram);
- m_seedsmaker->find3Sp(VZ, ZB);
+ m_seedsmaker->find3Sp(seedEventData, VZ, ZB);
} else {
- m_seedsmaker->find3Sp(VZ);
+ m_seedsmaker->find3Sp(seedEventData, VZ);
}
// Loop through all seed and reconsrtucted tracks collection preparation
//
- while ((seed = m_seedsmaker->next())) {
+ while ((seed = m_seedsmaker->next(seedEventData))) {
++counter[kNSeeds];
- for (Trk::Track* t: m_trackmaker->getTracks(seed->spacePoints())) {
+ for (Trk::Track* t: m_trackmaker->getTracks(trackEventData, seed->spacePoints())) {
qualityTrack.insert(std::make_pair(-trackQuality(t), t));
}
if (counter[kNSeeds] >= m_maxNumberSeeds) {
@@ -255,7 +262,7 @@ StatusCode InDet::SiSPSeededTrackFinder::newStrategy(const EventContext& ctx) co
break;
}
}
- m_trackmaker->endEvent();
+ m_trackmaker->endEvent(trackEventData);
// Remove shared tracks with worse quality
//
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/CMakeLists.txt b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/CMakeLists.txt
index 59e9895cbc2d335b0305d06f9b4cb6b7ceb86af3..3cc304a222e475659a6108266673c136d00e0656 100644
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/CMakeLists.txt
+++ b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/CMakeLists.txt
@@ -18,6 +18,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Control/CxxUtils
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkPseudoMeasurementOnTrack )
@@ -25,7 +26,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( TRT_SeededTrackFinder
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkSegment TrkTrack TrkExInterfaces TrkFitterInterfaces CxxUtils InDetRIO_OnTrack TrkEventPrimitives TrkPseudoMeasurementOnTrack )
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkSegment TrkTrack TrkExInterfaces TrkFitterInterfaces CxxUtils InDetRIO_OnTrack SiSPSeededTrackFinderData TrkEventPrimitives TrkPseudoMeasurementOnTrack )
# Install files from the package:
atlas_install_headers( TRT_SeededTrackFinder )
diff --git a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx
index 3137f7924d832529266d902fbb90b288304fc72b..89ab49dc9cf374706ce9e82345c9a205f5286953 100755
--- a/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_SeededTrackFinder/src/TRT_SeededTrackFinder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -20,6 +20,8 @@
///Needed for my scoring
#include "InDetRIO_OnTrack/SiClusterOnTrack.h"
+#include "SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h"
+
#include "TrkEventPrimitives/FitQualityOnSurface.h"
#include "TrkEventPrimitives/FitQuality.h"
#include "CxxUtils/make_unique.h"
@@ -173,8 +175,11 @@ StatusCode InDet::TRT_SeededTrackFinder::execute()
ATH_MSG_DEBUG ("TRT track container size huge; will process event partially if number of max segments reached !!!");
}
+ // Event dependent data of SiCombinatorialTrackFinder_xk
+ InDet::SiCombinatorialTrackFinderData_xk combinatorialData;
+
// Initialize the TRT seeded track tool's new event
- m_trackmaker ->newEvent();
+ m_trackmaker ->newEvent(combinatorialData);
m_trtExtension->newEvent();
// TrackCollection* outTracks = new TrackCollection; //Tracks to be finally output
@@ -222,7 +227,7 @@ StatusCode InDet::TRT_SeededTrackFinder::execute()
m_nTrtSegGood++;
// ok, call track maker and get list of possible track candidates
- std::list<Trk::Track*> trackSi = m_trackmaker->getTrack(*trackTRT); //Get the possible Si extensions
+ std::list<Trk::Track*> trackSi = m_trackmaker->getTrack(combinatorialData, *trackTRT); //Get the possible Si extensions
if (trackSi.size()==0) {
ATH_MSG_DEBUG ("No Si track candidates associated to the TRT track ");
@@ -474,7 +479,7 @@ StatusCode InDet::TRT_SeededTrackFinder::execute()
for (auto p : tempTracks){
delete p;
}
- m_trackmaker->endEvent();
+ m_trackmaker->endEvent(combinatorialData);
//Print common event information
if(msgLvl(MSG::DEBUG)){
diff --git a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/TRT_TrackSegmentsFinder.cxx b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/TRT_TrackSegmentsFinder.cxx
index be596ca5fd2fa1efe105f41f1f452f984ac0a6cb..3abf93c8e82327cfba58758465d8f4e80c569a0b 100755
--- a/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/TRT_TrackSegmentsFinder.cxx
+++ b/InnerDetector/InDetRecAlgs/TRT_TrackSegmentsFinder/src/TRT_TrackSegmentsFinder.cxx
@@ -32,7 +32,7 @@ InDet::TRT_TrackSegmentsFinder::TRT_TrackSegmentsFinder
m_nsegmentsTotal = 0 ;
m_useCaloSeeds = false ;
m_minNumberDCs = 9 ;
- m_ClusterEt = 2500.0 ;
+ m_ClusterEt = 2750.0 ;
declareProperty("SegmentsMakerTool",m_segmentsMakerTool);
declareProperty("SegmentsLocation" ,m_foundSegments );
declareProperty("useCaloSeeds" ,m_useCaloSeeds );
diff --git a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h
index 23a148021599efe77f560aec708229928c99665a..5a0b37ccc2fa3680ffca56e12792bffb4a2a0ad2 100755
--- a/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h
+++ b/InnerDetector/InDetRecEvent/InDetRIO_OnTrack/InDetRIO_OnTrack/TRT_DriftCircleOnTrack.h
@@ -168,9 +168,6 @@ namespace InDet{
/**local position along wire to be written out*/
mutable std::atomic<float> m_positionAlongWire;
- /** the contained RIO (PRD, PrepRawData) - TRT_DriftCircle in this case */
-// mutable const InDet::TRT_DriftCircle* m_rio;
-
ElementLinkToIDCTRT_DriftCircleContainer m_rio;
/** the IdentifierHash - probably not used*/
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/CMakeLists.txt b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..00d1e15cde1b4bb2d3385f97e45f848dc00b92a1
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/CMakeLists.txt
@@ -0,0 +1,36 @@
+################################################################################
+# Package: SiSPSeededTrackFinderData
+################################################################################
+
+# Declare the package name:
+atlas_subdir( SiSPSeededTrackFinderData )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ InnerDetector/InDetRecEvent/InDetPrepRawData
+ InnerDetector/InDetDetDescr/InDetReadoutGeometry
+ InnerDetector/InDetConditions/InDetConditionsSummaryService
+ MagneticField/MagFieldInterfaces
+ Tracking/TrkEvent/TrkEventPrimitives
+ Tracking/TrkExtrapolation/TrkExInterfaces
+ Tracking/TrkDetDescr/TrkGeometry
+ Tracking/TrkEvent/TrkPatternParameters
+ Tracking/TrkEvent/TrkTrack
+ Tracking/TrkTools/TrkToolInterfaces
+ PRIVATE
+ GaudiKernel
+ InnerDetector/InDetRecEvent/InDetRIO_OnTrack
+ InnerDetector/InDetRecEvent/SiSpacePointsSeed
+ Tracking/TrkDetDescr/TrkSurfaces
+ Tracking/TrkEvent/TrkMaterialOnTrack
+ Tracking/TrkEvent/TrkPrepRawData
+ Tracking/TrkEvent/TrkRIO_OnTrack
+ Tracking/TrkEvent/TrkSpacePoint )
+
+# Component(s) in the package:
+atlas_add_library( SiSPSeededTrackFinderData
+ src/*.cxx
+ PUBLIC_HEADERS SiSPSeededTrackFinderData
+ LINK_LIBRARIES InDetPrepRawData InDetReadoutGeometry MagFieldInterfaces TrkEventPrimitives TrkExInterfaces TrkGeometry TrkPatternParameters TrkTrack TrkToolInterfaces
+ PRIVATE_LINK_LIBRARIES GaudiKernel InDetRIO_OnTrack SiSpacePointsSeed TrkSurfaces TrkMaterialOnTrack TrkPrepRawData TrkRIO_OnTrack TrkSpacePoint )
+
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/ATLAS_CHECK_THREAD_SAFETY b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..2eb038d2929c21853d30f28d71f0d6c6d089d488
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SeedToTrackConversionData.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SeedToTrackConversionData.h
new file mode 100644
index 0000000000000000000000000000000000000000..30992e88ace2db074c2543ffc8091b4424879da9
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SeedToTrackConversionData.h
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef INDETSEEDTOTRACKCONVERSIONDATA_H
+#define INDETSEEDTOTRACKCONVERSIONDATA_H
+
+#include "TrkTrack/TrackInfo.h"
+#include "TrkTrack/TrackCollection.h"
+
+#include <memory>
+#include <string>
+
+namespace InDet
+{
+
+ /** @class SeedToTrackConversionData
+
+ InDet::SeedToTrackConversionData holds event dependent data used in
+ InDet::SeedToTrackConversionTool.
+
+ @author Susumu Oda <Susumu.Oda@cern.ch>
+ */
+
+ class SeedToTrackConversionData
+ {
+ public:
+ SeedToTrackConversionData();
+ ~SeedToTrackConversionData() = default;
+
+ std::unique_ptr<TrackCollection>& seedSegmentsCollection();
+ Trk::TrackInfo& trackInfo();
+ std::string& patternName();
+
+ private:
+ std::unique_ptr<TrackCollection> m_seedSegmentsCollection; //!< output collection for seed
+ Trk::TrackInfo m_trackInfo; //!< TrackInfo for seeds
+ std::string m_patternName; //!< Name of the pattern recognition
+ };
+} // end of namespace
+
+#endif // INDETSEEDTOTRACKCONVERSIONDATA_H
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiClusterLink_xk.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiClusterLink_xk.h
similarity index 98%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiClusterLink_xk.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiClusterLink_xk.h
index 175495e0944620cb84b856225b8b5808bceea8ef..31f3e2282f0f5310a09fbcfd1b5902551d037bf4 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiClusterLink_xk.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiClusterLink_xk.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -17,7 +17,6 @@
#include "InDetPrepRawData/SiCluster.h"
-
namespace InDet{
class SiClusterLink_xk
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h
new file mode 100644
index 0000000000000000000000000000000000000000..8ecedb4d09e3432708545d980a7228fc71e464f9
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h
@@ -0,0 +1,109 @@
+// -*- C++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////////////////////////
+// Header file for class SiCombinatorialTrackFinderData_xk
+/////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SiCombinatorialTrackFinderData_xk_H
+#define SiCombinatorialTrackFinderData_xk_H
+
+#include "SiSPSeededTrackFinderData/SiTrajectory_xk.h"
+#include "SiSPSeededTrackFinderData/SiTools_xk.h"
+#include "TrkTrack/TrackInfo.h"
+
+#include <list>
+
+namespace Trk {
+ class Track;
+}
+
+namespace InDet {
+
+ /**
+ @class SiCombinatorialTrackFinderData_xk
+
+ InDet::SiCombinatorialTrackFinderData_xk holds event dependent data
+ used by SiCombinatorialTrackFinder_xk.
+ @author Susumu.Oda@cern.ch
+ */
+
+ class SiCombinatorialTrackFinderData_xk {
+
+ ///////////////////////////////////////////////////////////////////
+ // Public methods:
+ ///////////////////////////////////////////////////////////////////
+
+ public:
+ SiCombinatorialTrackFinderData_xk();
+ ~SiCombinatorialTrackFinderData_xk() = default;
+
+ void setTools(const Trk::IPatternParametersPropagator* propTool,
+ const Trk::IPatternParametersUpdator* updatorTool,
+ const Trk::IRIO_OnTrackCreator* rioTool,
+ const Trk::IPRD_AssociationTool* assoTool,
+ MagField::IMagFieldSvc* fieldService,
+ const IInDetConditionsTool* pixCondTool,
+ const IInDetConditionsTool* sctCondTool,
+ const Trk::MagneticFieldProperties* fieldProp);
+ bool isInitialized() const;
+
+ SiTrajectory_xk& trajectory();
+ Trk::TrackInfo& trackinfo();
+ InDet::SiTools_xk& tools();
+ std::list<Trk::Track*>& tracks();
+ int& nprint();
+ int& inputseeds();
+ int& goodseeds();
+ int& findtracks();
+ int& inittracks();
+ int& roadbug();
+ bool& heavyIon();
+ int& cosmicTrack();
+ int& nclusmin();
+ int& nclusminb();
+ int& nwclusmin();
+ int& nholesmax();
+ int& dholesmax();
+ bool& simpleTrack();
+ double& pTmin();
+ double& pTminBrem();
+ double& xi2max();
+ double& xi2maxNoAdd();
+ double& xi2maxlink();
+
+ private:
+
+ bool m_initialized{false};
+ SiTrajectory_xk m_trajectory; // Track trajectory
+ Trk::TrackInfo m_trackinfo;
+ InDet::SiTools_xk m_tools;
+ std::list<Trk::Track*> m_tracks; // List found tracks
+ int m_nprint{0}; // Kind output information
+ int m_inputseeds{0}; // Number input seeds
+ int m_goodseeds{0}; // Number accepted seeds
+ int m_findtracks{0}; // Number found tracks
+ int m_inittracks{0}; // Number initial tracks
+ int m_roadbug{0}; // Number wrong DE roads
+ bool m_heavyIon{false};
+ int m_cosmicTrack{0}; // Is it cosmic track (0 or 1)
+ int m_nclusmin{0}; // Min number clusters
+ int m_nclusminb{0}; // Min number clusters
+ int m_nwclusmin{0}; // Min number weighted clusters
+ int m_nholesmax{0}; // Max number holes
+ int m_dholesmax{0}; // Max holes gap
+ bool m_simpleTrack{false};
+ double m_pTmin{0.}; // min pT
+ double m_pTminBrem{0.}; // min pT for brem noise model
+ double m_xi2max{0.}; // max Xi2 for updators
+ double m_xi2maxNoAdd{0.}; // max Xi2 for clusters
+ double m_xi2maxlink{0.}; // max Xi2 for clusters
+
+ };
+
+} // end of name space
+
+#endif // SiCombinatorialTrackFinderData_xk_H
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h
similarity index 97%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h
index 9b5c9fe5d3219ec6a331fb21d4bcef16064927fb..f7870b7c2c486766756f8e96696de9ea0564d1cb 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLinks_xk.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiDetElementBoundaryLinks_xk.h
similarity index 90%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLinks_xk.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiDetElementBoundaryLinks_xk.h
index 61b2683ae9af61512e687c5852975619247a8bf1..7bc53f5611d7e3758e83ee3a1c43587e7de01c4a 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLinks_xk.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiDetElementBoundaryLinks_xk.h
@@ -9,7 +9,7 @@
#ifndef SiDetElementBoundaryLinks_xk_H
#define SiDetElementBoundaryLinks_xk_H
-#include "SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h"
+#include "SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h"
#include <vector>
namespace InDet {
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeed.h
similarity index 100%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeed.h
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h
similarity index 100%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsProSeed.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsProSeed.h
similarity index 100%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsProSeed.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsProSeed.h
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsProSeedITK.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsProSeedITK.h
similarity index 100%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsProSeedITK.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsProSeedITK.h
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h
new file mode 100644
index 0000000000000000000000000000000000000000..4ac52d0de07a7563cb354528a375edce44272093
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h
@@ -0,0 +1,271 @@
+// -*- C++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////////////////////////
+// Header file for struct SiSpacePointsSeedMakerEventData
+/////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SiSpacePointsSeedMakerEventData_h
+#define SiSpacePointsSeedMakerEventData_h
+
+#include "SiSpacePointsSeed/SiSpacePointsSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsProSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsProSeedITK.h"
+
+#include <list>
+#include <map>
+#include <vector>
+
+namespace InDet {
+
+ struct SiSpacePointsSeedMakerEventData {
+ enum ToolType {
+ ATLxk,
+ BeamGas,
+ Cosmic,
+ HeavyIon,
+ ITK,
+ LowMomentum,
+ Trigger
+ };
+
+ bool initialized{false};
+ bool trigger{false};
+ bool izvertex{false};
+ bool endlist{true};
+ bool isvertex{false};
+ bool checketa{false};
+
+ int iteration{0};
+ int iteration0{0};
+ int r_first{0};
+ int ns{0};
+ int nsaz{0};
+ int nsazv{0};
+ int nr{0};
+ int nrf{0};
+ int nrfz{0};
+ int nrfzv{0};
+ int state{0};
+ int nspoint{2};
+ int mode{0};
+ int nlist{0};
+ int fNmin{0};
+ int fvNmin{0};
+ int zMin{0};
+ int nOneSeeds{0};
+ int fillOneSeeds{0};
+ int nprint{0};
+ int nseeds{0};
+
+ float K{0.};
+ float dzdrmin{0.};
+ float dzdrmax{0.};
+ float ipt2C{0.};
+ float ipt2K{0.};
+ float COFK{0.};
+ float zminU{0.};
+ float zmaxU{0.};
+ float zminB{0.};
+ float zmaxB{0.};
+ float ftrig{0.};
+ float ftrigW{0.};
+ float umax{0.};
+
+ ///////////////////////////////////////////////////////////////////
+ // Beam geometry
+ // Updated only in buildBeamFrameWork,
+ // which is called by newEvent and newRegion
+ ///////////////////////////////////////////////////////////////////
+ float xbeam[4]{0., 1., 0., 0.}; // x,ax,ay,az - center and x-axis direction
+ float ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
+ float zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
+
+ std::vector<int> r_index;
+ std::vector<int> r_map;
+ std::vector<int> rf_index;
+ std::vector<int> rf_map;
+ std::vector<int> rfz_index;
+ std::vector<int> rfz_map;
+ std::vector<int> rfzv_index;
+ std::vector<int> rfzv_map;
+
+ std::set<float> l_vertex;
+
+ ///////////////////////////////////////////////////////////////////
+ // Tables for 3 space points seeds search
+ // Updated in many mthods
+ ///////////////////////////////////////////////////////////////////
+ std::vector<InDet::SiSpacePointForSeed*> SP;
+ std::vector<InDet::SiSpacePointForSeedITK*> SP_ITK;
+ std::vector<float> Zo;
+ std::vector<float> Tz;
+ std::vector<float> R;
+ std::vector<float> U;
+ std::vector<float> V;
+ std::vector<float> X;
+ std::vector<float> Y;
+ std::vector<float> Er;
+
+ InDet::SiSpacePointsSeed seedOutput;
+
+ std::vector<InDet::SiSpacePointsSeed> OneSeeds;
+ std::vector<InDet::SiSpacePointsProSeed> OneSeeds_Pro;
+ std::vector<InDet::SiSpacePointsProSeedITK> OneSeeds_ITK;
+
+ std::vector<std::pair<float,InDet::SiSpacePointForSeed*>> CmSp;
+ std::vector<std::pair<float,InDet::SiSpacePointForSeedITK*>> CmSp_ITK;
+
+ std::vector<std::list<InDet::SiSpacePointForSeed*>> r_Sorted;
+ std::vector<std::list<InDet::SiSpacePointForSeed*>> rf_Sorted;
+ std::vector<std::list<InDet::SiSpacePointForSeed*>> rfz_Sorted;
+ std::vector<std::list<InDet::SiSpacePointForSeed*>> rfzv_Sorted;
+ std::vector<std::list<InDet::SiSpacePointForSeedITK*>> r_Sorted_ITK;
+ std::vector<std::list<InDet::SiSpacePointForSeedITK*>> rfz_Sorted_ITK;
+ std::vector<std::list<InDet::SiSpacePointForSeedITK*>> rfzv_Sorted_ITK;
+
+ std::vector<InDet::SiSpacePointsSeed> seeds;
+
+ std::list<InDet::SiSpacePointForSeed> l_spforseed;
+ std::list<InDet::SiSpacePointForSeed>::iterator i_spforseed;
+ std::list<InDet::SiSpacePointForSeedITK> l_spforseed_ITK;
+ std::list<InDet::SiSpacePointForSeedITK>::iterator i_spforseed_ITK;
+
+ std::list<InDet::SiSpacePointsSeed> l_seeds;
+ std::list<InDet::SiSpacePointsSeed>::iterator i_seed;
+ std::list<InDet::SiSpacePointsSeed>::iterator i_seede;
+ std::list<InDet::SiSpacePointsProSeed> l_seeds_Pro;
+ std::list<InDet::SiSpacePointsProSeed>::iterator i_seed_Pro;
+ std::list<InDet::SiSpacePointsProSeed>::iterator i_seede_Pro;
+ std::list<InDet::SiSpacePointsProSeedITK> l_seeds_ITK;
+ std::list<InDet::SiSpacePointsProSeedITK>::iterator i_seed_ITK;
+ std::list<InDet::SiSpacePointsProSeedITK>::iterator i_seede_ITK;
+
+ std::list<InDet::SiSpacePointForSeed*>::iterator rMin;
+ std::list<InDet::SiSpacePointForSeedITK*>::iterator rMin_ITK;
+
+ std::multimap<float,InDet::SiSpacePointsSeed*> mapOneSeeds;
+ std::multimap<float,InDet::SiSpacePointsSeed*> mapSeeds;
+ std::multimap<float,InDet::SiSpacePointsSeed*> l_seeds_map;
+ std::multimap<float,InDet::SiSpacePointsSeed*>::iterator seed;
+ std::multimap<float,InDet::SiSpacePointsSeed*>::iterator seede;
+ std::multimap<float,InDet::SiSpacePointsSeed*>::iterator i_seed_map;
+ std::multimap<float,InDet::SiSpacePointsSeed*>::iterator i_seede_map;
+ std::multimap<float,InDet::SiSpacePointsProSeed*> mapOneSeeds_Pro;
+ std::multimap<float,InDet::SiSpacePointsProSeed*> seeds_Pro;
+ std::multimap<float,InDet::SiSpacePointsProSeed*>::iterator seed_Pro;
+ std::multimap<float,InDet::SiSpacePointsProSeedITK*> mapOneSeeds_ITK;
+ std::multimap<float,InDet::SiSpacePointsProSeedITK*> seeds_ITK;
+ std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator seed_ITK;
+
+ void initialize(ToolType type,
+ int maxsizeSP,
+ int maxOneSize,
+ int maxsize,
+ int sizeR,
+ int sizeRF,
+ int sizeRFZ,
+ int sizeRFZV,
+ bool checkEta) {
+ if (type==ATLxk) {
+ CmSp.reserve(500);
+ } else if (type==ITK) {
+ CmSp_ITK.reserve(500);
+ }
+
+ if (type==ITK) {
+ SP_ITK.resize(maxsizeSP, nullptr);
+ X.resize(maxsizeSP, 0.);
+ Y.resize(maxsizeSP, 0.);
+ } else {
+ SP.resize(maxsizeSP, nullptr);
+ }
+ R.resize(maxsizeSP, 0.);
+ Tz.resize(maxsizeSP, 0.);
+ Er.resize(maxsizeSP, 0.);
+ U.resize(maxsizeSP, 0.);
+ V.resize(maxsizeSP, 0.);
+ if (type!=Cosmic) {
+ Zo.resize(maxsizeSP, 0.);
+ }
+
+ if (type==ATLxk) {
+ OneSeeds_Pro.resize(maxOneSize);
+ } else if (type==BeamGas or type==HeavyIon or type==LowMomentum or type==Trigger) {
+ OneSeeds.resize(maxOneSize);
+ } else if (type==ITK) {
+ OneSeeds_ITK.resize(maxOneSize);
+ }
+
+ // Build radius sorted containers
+ r_index.resize(sizeR, 0);
+ r_map.resize(sizeR, 0);
+ if (type==ITK) {
+ r_Sorted_ITK.resize(sizeR);
+ } else {
+ r_Sorted.resize(sizeR);
+ }
+
+ if (type==BeamGas or type==Cosmic) {
+ // Build radius-azimuthal sorted containers
+ rf_index.resize(sizeRF, 0);
+ rf_map.resize(sizeRF, 0);
+ rf_Sorted.resize(sizeRF, {});
+ }
+
+ // Build radius-azimuthal-Z sorted containers
+ rfz_index.resize(sizeRFZ, 0);
+ rfz_map.resize(sizeRFZ, 0);
+ if (type==ITK) {
+ rfz_Sorted_ITK.resize(sizeRFZ, {});
+ } else {
+ rfz_Sorted.resize(sizeRFZ, {});
+ }
+
+ if (type==ATLxk or type==HeavyIon or type==ITK or type==Trigger) {
+ // Build radius-azimuthal-Z sorted containers for Z-vertices
+ rfzv_index.resize(sizeRFZV, 0);
+ rfzv_map.resize(sizeRFZV, 0);
+ if (type==ITK) {
+ rfzv_Sorted_ITK.resize(sizeRFZV, {});
+ } else {
+ rfzv_Sorted.resize(sizeRFZV, {});
+ }
+ }
+
+ if (type==Cosmic) {
+ seeds.resize(maxsize+5);
+ }
+
+ if (type==ATLxk) {
+ i_seed_Pro = l_seeds_Pro.begin();
+ i_seede_Pro = l_seeds_Pro.end();
+ } else if (type==BeamGas or type==HeavyIon or type==LowMomentum or type==Trigger) {
+ i_seed = l_seeds.begin();
+ i_seede = l_seeds.end();
+ } else if (type==ITK) {
+ i_seed_ITK = l_seeds_ITK.begin();
+ i_seede_ITK = l_seeds_ITK.end();
+ }
+
+ if (type==Trigger) {
+ seed = mapSeeds.begin();
+ seede = mapSeeds.end();
+ }
+
+ if (type==ATLxk or type==ITK) {
+ checketa = checkEta;
+ }
+
+ initialized = true;
+ }
+ };
+
+} // end of name space
+
+#endif // SiSpacePointsSeedMakerEventData_h
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTools_xk.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTools_xk.h
similarity index 99%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTools_xk.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTools_xk.h
index de1b8aec9b6120765c849125b1c4ef820f32de53..c1c216b78d1ff15ba65256808a7996d670c9d79a 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTools_xk.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTools_xk.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -15,13 +15,13 @@
#ifndef SiTools_xk_H
#define SiTools_xk_H
-#include "TrkGeometry/MagneticFieldProperties.h"
+#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "TrkToolInterfaces/IPatternParametersUpdator.h"
#include "TrkExInterfaces/IPatternParametersPropagator.h"
-#include "TrkToolInterfaces/IRIO_OnTrackCreator.h"
+#include "TrkGeometry/MagneticFieldProperties.h"
+#include "TrkToolInterfaces/IPatternParametersUpdator.h"
#include "TrkToolInterfaces/IPRD_AssociationTool.h"
-#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
+#include "TrkToolInterfaces/IRIO_OnTrackCreator.h"
namespace InDet{
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h
new file mode 100644
index 0000000000000000000000000000000000000000..733e165637db11f6fb8083419d85dc4d5535f4ad
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h
@@ -0,0 +1,92 @@
+// -*- C++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////////////////////////
+// Header file for class SiTrackMakerEventData_xk
+/////////////////////////////////////////////////////////////////////////////////
+// Class for event dependent data used in SiTrackMaker_xk
+/////////////////////////////////////////////////////////////////////////////////
+
+#ifndef SiTrackMakerEventData_xk_H
+#define SiTrackMakerEventData_xk_H
+
+#include "SiSPSeededTrackFinderData/SeedToTrackConversionData.h"
+#include "SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h"
+
+#include <array>
+#include <list>
+#include <map>
+
+namespace Trk {
+ class PrepRawData;
+ class Track;
+}
+
+namespace InDet {
+
+ class SiTrackMakerEventData_xk {
+ public:
+ SiTrackMakerEventData_xk();
+ ~SiTrackMakerEventData_xk() = default;
+
+ int& inputseeds();
+ int& goodseeds();
+ int& findtracks();
+ int& nprint();
+ std::multimap<const Trk::PrepRawData*, const Trk::Track*>& clusterTrack();
+ std::array<double, 9>& par();
+ bool& pix();
+ bool& sct();
+ bool& dbm();
+ std::list<double>& caloF();
+ std::list<double>& caloR();
+ std::list<double>& caloZ();
+ std::list<double>& hadF();
+ std::list<double>& hadR();
+ std::list<double>& hadZ();
+ std::array<double, 2>& xybeam();
+ SeedToTrackConversionData& conversionData();
+ SiCombinatorialTrackFinderData_xk& combinatorialData();
+
+ private:
+ // Counters
+ int m_inputseeds{0}; // Number input seeds
+ int m_goodseeds{0}; // Number good seeds
+ int m_findtracks{0}; // Numbe found tracks
+
+ // Flag for dump method
+ int m_nprint{0}; // Kind output information
+
+ // Updated by many methods
+ std::multimap<const Trk::PrepRawData*, const Trk::Track*> m_clusterTrack;
+ std::array<double, 9> m_par;
+
+ // Updated only by newEvent and newTrigEvent methods
+ bool m_pix{false};
+ bool m_sct{false};
+
+ // Updated only by getTracks
+ bool m_dbm{false};
+
+ // Updated only by newEvent method
+ std::list<double> m_caloF;
+ std::list<double> m_caloR;
+ std::list<double> m_caloZ;
+ std::list<double> m_hadF;
+ std::list<double> m_hadR;
+ std::list<double> m_hadZ;
+ std::array<double, 2> m_xybeam{0., 0.};
+
+ // SeedToTrackConversionData to hold the event dependent data of SeedToTrackConversionTool.
+ SeedToTrackConversionData m_conversionData;
+
+ // SiCombinatorialTrackFinderData_xk to hold the event dependent data of SiCombinatorialTrackFinder_xk.
+ SiCombinatorialTrackFinderData_xk m_combinatorialData;
+ };
+
+} // end of name space
+
+#endif // SiTrackMakerEventData_xk_H
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTrajectoryElement_xk.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrajectoryElement_xk.h
similarity index 99%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTrajectoryElement_xk.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrajectoryElement_xk.h
index 19040a785e695e0f31e14cec023f2d8511d92180..b050cc993b7be7ddf3ad89114a0d34673900d3c5 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTrajectoryElement_xk.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrajectoryElement_xk.h
@@ -16,13 +16,11 @@
#define SiTrajectoryElement_xk_H
#include "InDetPrepRawData/SiClusterCollection.h"
+#include "SiSPSeededTrackFinderData/SiClusterLink_xk.h"
+#include "SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h"
+#include "SiSPSeededTrackFinderData/SiTools_xk.h"
#include "TrkPatternParameters/PatternTrackParameters.h"
#include "TrkPatternParameters/NoiseOnSurface.h"
-
-#include "SiCombinatorialTrackFinderTool_xk/SiTools_xk.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiClusterLink_xk.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h"
-
#include "TrkTrack/TrackStateOnSurface.h"
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTrajectory_xk.h b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrajectory_xk.h
similarity index 97%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTrajectory_xk.h
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrajectory_xk.h
index b1d7da692d5178b6e6a502af7782a79d658d91e1..7fd0dcc29cc4edab7e412644e45bafb780e72254 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiTrajectory_xk.h
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/SiSPSeededTrackFinderData/SiTrajectory_xk.h
@@ -15,14 +15,14 @@
#ifndef SiTrajector_xk_H
#define SiTrajector_xk_H
-#include <map>
-
#include "InDetPrepRawData/SiClusterContainer.h"
#include "TrkTrack/Track.h"
#include "TrkEventPrimitives/FitQuality.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiTools_xk.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiTrajectoryElement_xk.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h"
+#include "SiSPSeededTrackFinderData/SiTools_xk.h"
+#include "SiSPSeededTrackFinderData/SiTrajectoryElement_xk.h"
+#include "SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h"
+
+#include <map>
namespace InDet{
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SeedToTrackConversionData.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SeedToTrackConversionData.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..749596dd575974f0b1e422b6e2be0f2d08ec0b40
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SeedToTrackConversionData.cxx
@@ -0,0 +1,34 @@
+// -*- C++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////////////////////////
+// Source file for class SeedToTrackConversionData
+/////////////////////////////////////////////////////////////////////////////////
+// Class for event dependent data used in SeedToTrackConversionTool
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "SiSPSeededTrackFinderData/SeedToTrackConversionData.h"
+
+namespace InDet {
+
+ // Constructor
+ SeedToTrackConversionData::SeedToTrackConversionData() {
+ }
+
+ // Get methods
+ std::unique_ptr<TrackCollection>& SeedToTrackConversionData::seedSegmentsCollection() {
+ return m_seedSegmentsCollection;
+ }
+
+ Trk::TrackInfo& SeedToTrackConversionData::trackInfo() {
+ return m_trackInfo;
+ }
+
+ std::string& SeedToTrackConversionData::patternName() {
+ return m_patternName;
+ }
+
+} // end of name space
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiCombinatorialTrackFinderData_xk.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiCombinatorialTrackFinderData_xk.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..ee1a371ae84815139df74c890b5de99b51d62dd2
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiCombinatorialTrackFinderData_xk.cxx
@@ -0,0 +1,139 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////////////////////////
+// Source file for class SiCombinatorialTrackFinderData_xk
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h"
+
+namespace InDet {
+
+ SiCombinatorialTrackFinderData_xk::SiCombinatorialTrackFinderData_xk() {
+ }
+
+ void SiCombinatorialTrackFinderData_xk::setTools(const Trk::IPatternParametersPropagator* propTool,
+ const Trk::IPatternParametersUpdator* updatorTool,
+ const Trk::IRIO_OnTrackCreator* rioTool,
+ const Trk::IPRD_AssociationTool* assoTool,
+ MagField::IMagFieldSvc* fieldService,
+ const IInDetConditionsTool* pixCondTool,
+ const IInDetConditionsTool* sctCondTool,
+ const Trk::MagneticFieldProperties* fieldProp)
+ {
+ // Set SiTools and conditions
+ //
+ m_tools.setTools(propTool,
+ updatorTool,
+ rioTool,
+ assoTool,
+ fieldService);
+ m_tools.setTools(pixCondTool,
+ sctCondTool);
+ m_tools.setTools(fieldProp);
+
+ // Set tool to trajectory
+ //
+ m_trajectory.setTools(&m_tools);
+
+ m_initialized = true;
+ }
+
+ bool SiCombinatorialTrackFinderData_xk::isInitialized() const {
+ return m_initialized;
+ }
+
+ SiTrajectory_xk& SiCombinatorialTrackFinderData_xk::trajectory() {
+ return m_trajectory;
+ }
+
+ Trk::TrackInfo& SiCombinatorialTrackFinderData_xk::trackinfo() {
+ return m_trackinfo;
+ }
+
+ InDet::SiTools_xk& SiCombinatorialTrackFinderData_xk::tools() {
+ return m_tools;
+ }
+
+ std::list<Trk::Track*>& SiCombinatorialTrackFinderData_xk::tracks() {
+ return m_tracks;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::nprint() {
+ return m_nprint;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::inputseeds() {
+ return m_inputseeds;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::goodseeds() {
+ return m_goodseeds;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::findtracks() {
+ return m_findtracks;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::inittracks() {
+ return m_inittracks;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::roadbug() {
+ return m_roadbug;
+ }
+
+ bool& SiCombinatorialTrackFinderData_xk::heavyIon() {
+ return m_heavyIon;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::cosmicTrack() {
+ return m_cosmicTrack;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::nclusmin() {
+ return m_nclusmin;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::nclusminb() {
+ return m_nclusminb;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::nwclusmin() {
+ return m_nwclusmin;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::nholesmax() {
+ return m_nholesmax;
+ }
+
+ int& SiCombinatorialTrackFinderData_xk::dholesmax() {
+ return m_dholesmax;
+ }
+
+ bool& SiCombinatorialTrackFinderData_xk::simpleTrack() {
+ return m_simpleTrack;
+ }
+
+ double& SiCombinatorialTrackFinderData_xk::pTmin() {
+ return m_pTmin;
+ }
+
+ double& SiCombinatorialTrackFinderData_xk::pTminBrem() {
+ return m_pTminBrem;
+ }
+
+ double& SiCombinatorialTrackFinderData_xk::xi2max() {
+ return m_xi2max;
+ }
+
+ double& SiCombinatorialTrackFinderData_xk::xi2maxNoAdd() {
+ return m_xi2maxNoAdd;
+ }
+
+ double& SiCombinatorialTrackFinderData_xk::xi2maxlink() {
+ return m_xi2maxlink;
+ }
+
+} // end of name space
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLink_xk.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiDetElementBoundaryLink_xk.cxx
similarity index 96%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLink_xk.cxx
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiDetElementBoundaryLink_xk.cxx
index b75ce416c21d70422f7d88feee242a010df56d05..2ae37245097b1ca5d35aa828a0e34d3aa23ecbf9 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLink_xk.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiDetElementBoundaryLink_xk.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -11,10 +11,11 @@
// Version 1.0 21/04/2004 I.Gavrilenko
///////////////////////////////////////////////////////////////////
-#include "TrkSurfaces/PlaneSurface.h"
+#include "SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h"
+
#include "InDetReadoutGeometry/SiDetectorElement.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h"
#include "TrkSurfaces/AnnulusBounds.h"
+#include "TrkSurfaces/PlaneSurface.h"
///////////////////////////////////////////////////////////////////
// Constructor
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointForSeed.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeed.cxx
similarity index 98%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointForSeed.cxx
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeed.cxx
index 4317758532ec72975c1f5aac1f1a47503e3be730..b1716d8257d77e80418786459789834791f71b79 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointForSeed.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeed.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
#include "InDetPrepRawData/SiCluster.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointForSeedITK.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeedITK.cxx
similarity index 99%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointForSeedITK.cxx
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeedITK.cxx
index f27f5874f64f5f6394d0f24bd6725a1f09e42474..c8b82a66aaa007a25fd76c18ea234dda52934d39 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointForSeedITK.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointForSeedITK.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h"
#include "InDetPrepRawData/SiCluster.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsProSeed.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeed.cxx
similarity index 96%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsProSeed.cxx
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeed.cxx
index cb616f3a55c343e7d8becc332f6131cb668699e6..4abe8730ade8aa0a20832578aea99e16e1ed27b4 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsProSeed.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeed.cxx
@@ -2,10 +2,10 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "SiSpacePointsSeedTool_xk/SiSpacePointsProSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsProSeed.h"
#include "SiSpacePointsSeed/SiSpacePointsSeed.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
namespace InDet {
SiSpacePointsProSeed::SiSpacePointsProSeed ()
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsProSeedITK.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeedITK.cxx
similarity index 96%
rename from InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsProSeedITK.cxx
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeedITK.cxx
index 99167a6f177307c4621f19c3c52d776942500701..3defdfb0601c210a323b087c1b3a253acb4e8b92 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsProSeedITK.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiSpacePointsProSeedITK.cxx
@@ -2,10 +2,10 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "SiSpacePointsSeedTool_xk/SiSpacePointsProSeedITK.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsProSeedITK.h"
#include "SiSpacePointsSeed/SiSpacePointsSeed.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h"
namespace InDet {
SiSpacePointsProSeedITK::SiSpacePointsProSeedITK ()
diff --git a/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrackMakerEventData_xk.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrackMakerEventData_xk.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..cf815c8c3aaa8c423b83736df5878520f3d6f6f8
--- /dev/null
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrackMakerEventData_xk.cxx
@@ -0,0 +1,97 @@
+// -*- C++ -*-
+
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////////////////////////
+// Source file for class SiTrackMakerEventData_xk
+/////////////////////////////////////////////////////////////////////////////////
+// Class for event dependent data used in SiTrackMaker_xk
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h"
+
+#include "TrkPrepRawData/PrepRawData.h"
+#include "TrkTrack/Track.h"
+
+namespace InDet {
+
+ // Constructor
+ SiTrackMakerEventData_xk::SiTrackMakerEventData_xk() {
+ }
+
+ // Get methods
+ int& SiTrackMakerEventData_xk::inputseeds() {
+ return m_inputseeds;
+ }
+
+ int& SiTrackMakerEventData_xk::goodseeds() {
+ return m_goodseeds;
+ }
+
+ int& SiTrackMakerEventData_xk::findtracks() {
+ return m_findtracks;
+ }
+
+ int& SiTrackMakerEventData_xk::nprint() {
+ return m_nprint;
+ }
+
+ std::multimap<const Trk::PrepRawData*, const Trk::Track*>& SiTrackMakerEventData_xk::clusterTrack() {
+ return m_clusterTrack;
+ }
+
+ std::array<double, 9>& SiTrackMakerEventData_xk::par() {
+ return m_par;
+ }
+
+ bool& SiTrackMakerEventData_xk::pix() {
+ return m_pix;
+ }
+
+ bool& SiTrackMakerEventData_xk::sct() {
+ return m_sct;
+ }
+
+ bool& SiTrackMakerEventData_xk::dbm() {
+ return m_dbm;
+ }
+
+ std::list<double>& SiTrackMakerEventData_xk::caloF() {
+ return m_caloF;
+ }
+
+ std::list<double>& SiTrackMakerEventData_xk::caloR() {
+ return m_caloR;
+ }
+
+ std::list<double>& SiTrackMakerEventData_xk::caloZ() {
+ return m_caloZ;
+ }
+
+ std::list<double>& SiTrackMakerEventData_xk::hadF() {
+ return m_hadF;
+ }
+
+ std::list<double>& SiTrackMakerEventData_xk::hadR() {
+ return m_hadR;
+ }
+
+ std::list<double>& SiTrackMakerEventData_xk::hadZ() {
+ return m_hadZ;
+ }
+
+ std::array<double, 2>& SiTrackMakerEventData_xk::xybeam() {
+ return m_xybeam;
+ }
+
+ SeedToTrackConversionData& SiTrackMakerEventData_xk::conversionData() {
+ return m_conversionData;
+ }
+
+ SiCombinatorialTrackFinderData_xk& SiTrackMakerEventData_xk::combinatorialData() {
+ return m_combinatorialData;
+ }
+
+} // end of name space
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrajectoryElement_xk.cxx
similarity index 99%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrajectoryElement_xk.cxx
index d8448325701f6659a94ef11a9febccadc2fd0bfa..03621309e645af7cad49e0baa384dcce03050def 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectoryElement_xk.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrajectoryElement_xk.cxx
@@ -1,7 +1,8 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
+#include "SiSPSeededTrackFinderData/SiTrajectoryElement_xk.h"
#include "TrkSurfaces/PerigeeSurface.h"
#include "TrkSurfaces/AnnulusBounds.h"
@@ -9,10 +10,10 @@
#include "TrkMaterialOnTrack/MaterialEffectsOnTrack.h"
#include "TrkEventPrimitives/FitQualityOnSurface.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiTrajectoryElement_xk.h"
#include "InDetRIO_OnTrack/PixelClusterOnTrack.h"
#include "InDetRIO_OnTrack/SCT_ClusterOnTrack.h"
+
#include <stdexcept>
#include <math.h>//for sincos function
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectory_xk.cxx b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrajectory_xk.cxx
similarity index 99%
rename from InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectory_xk.cxx
rename to InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrajectory_xk.cxx
index 2fa4c8592e21abb711b67cd8ef041194a7d815d6..6884c5028452f3e5b648cd9b1dbbd072a4eef67a 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiTrajectory_xk.cxx
+++ b/InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData/src/SiTrajectory_xk.cxx
@@ -1,14 +1,15 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
+#include "SiSPSeededTrackFinderData/SiTrajectory_xk.h"
+
+#include "TrkSurfaces/PlaneSurface.h"
+
#include <iostream>
#include <iomanip>
#include <boost/io/ios_state.hpp>
-#include "TrkSurfaces/PlaneSurface.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiTrajectory_xk.h"
-
///////////////////////////////////////////////////////////////////
// Set work information to trajectory
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISeedToTrackConversionTool.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISeedToTrackConversionTool.h
index 953f84bb9749267baa84c59f97940009a2ba227c..77ee7c30e320ceceafe61d54bd24d9e74f1a8d74 100644
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISeedToTrackConversionTool.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISeedToTrackConversionTool.h
@@ -19,40 +19,22 @@ class MsgStream;
namespace InDet
{
+ class SeedToTrackConversionData;
+
class ISeedToTrackConversionTool : virtual public IAlgTool {
public:
DeclareInterfaceID(ISeedToTrackConversionTool, 1, 0);
- virtual void executeSiSPSeedSegments(const Trk::TrackParameters*,const int&, const std::list<const Trk::SpacePoint*>&) const =0;
- virtual void newEvent(const Trk::TrackInfo&, const std::string&) const =0;
- virtual void endEvent() const =0;
+ virtual void executeSiSPSeedSegments(SeedToTrackConversionData& data, const Trk::TrackParameters*,const int&, const std::list<const Trk::SpacePoint*>&) const =0;
+ virtual void newEvent(SeedToTrackConversionData& data, const Trk::TrackInfo&, const std::string&) const =0;
+ virtual void endEvent(SeedToTrackConversionData& data) const =0;
//////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream& out) const=0;
- virtual std::ostream& dump(std::ostream& out) const=0;
- // enter declaration of your interface-defining member functions here
+ virtual MsgStream& dump(SeedToTrackConversionData& data, MsgStream& out) const=0;
};
-
- // Overload of << operator for MsgStream and std::ostream
- MsgStream& operator << (MsgStream& ,const ISeedToTrackConversionTool&);
- std::ostream& operator << (std::ostream&,const ISeedToTrackConversionTool&);
-
- // Overload of << operator MsgStream
- inline MsgStream& operator <<
- (MsgStream& sl,const ISeedToTrackConversionTool& se)
- {
- return se.dump(sl);
- }
-
- // Overload of << operator std::ostream
- inline std::ostream& operator <<
- (std::ostream& sl,const ISeedToTrackConversionTool& se)
- {
- return se.dump(sl);
- }
} // end of namespace
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
index b71106326d9c9121c6cbbcfd1238878970e0667c..db455c0c1649a23b2e3d509edf661f1851603585 100644
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiCombinatorialTrackFinder.h
@@ -33,6 +33,7 @@ namespace InDetDD {
namespace InDet {
+ class SiCombinatorialTrackFinderData_xk;
class TrackQualityCuts;
class ISiCombinatorialTrackFinder : virtual public IAlgTool
@@ -52,72 +53,44 @@ namespace InDet {
virtual const std::list<Trk::Track*>& getTracks
- (const Trk::TrackParameters&,
+ (SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters&,
const std::list<const Trk::SpacePoint*>&,
const std::list<Amg::Vector3D>&,
std::list<const InDetDD::SiDetectorElement*>&,
const TrackQualityCuts&) const =0;
virtual const std::list<Trk::Track*>& getTracks
- (const Trk::TrackParameters&,
+ (SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters&,
const std::list<const Trk::SpacePoint*>&,
const std::list<Amg::Vector3D>&,
std::list<const InDetDD::SiDetectorElement*>&,
std::multimap<const Trk::PrepRawData*, const Trk::Track*>&) const =0;
virtual const std::list<Trk::Track*>& getTracksWithBrem
- (const Trk::TrackParameters&,
+ (SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters&,
const std::list<const Trk::SpacePoint*>&,
const std::list<Amg::Vector3D>&,
std::list<const InDetDD::SiDetectorElement*>&,
std::multimap<const Trk::PrepRawData*, const Trk::Track*>&,
bool) const =0;
- virtual void newEvent() const =0;
- virtual void newEvent(Trk::TrackInfo, const TrackQualityCuts&) const =0;
+ virtual void newEvent(SiCombinatorialTrackFinderData_xk& data) const =0;
+ virtual void newEvent(SiCombinatorialTrackFinderData_xk& data,
+ Trk::TrackInfo, const TrackQualityCuts&) const =0;
- virtual void endEvent() const =0;
+ virtual void endEvent(SiCombinatorialTrackFinderData_xk& data) const =0;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream& out) const=0;
- virtual std::ostream& dump(std::ostream& out) const=0;
+ virtual MsgStream& dump(SiCombinatorialTrackFinderData_xk& data, MsgStream& out) const=0;
};
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator for MsgStream and std::ostream
- ///////////////////////////////////////////////////////////////////
-
- MsgStream& operator << (MsgStream& ,const ISiCombinatorialTrackFinder&);
- std::ostream& operator << (std::ostream&,const ISiCombinatorialTrackFinder&);
-
- ///////////////////////////////////////////////////////////////////
- // Inline methods
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator MsgStream
- ///////////////////////////////////////////////////////////////////
-
- inline MsgStream& operator <<
- (MsgStream& sl,const ISiCombinatorialTrackFinder& se)
- {
- return se.dump(sl);
- }
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator std::ostream
- ///////////////////////////////////////////////////////////////////
-
- inline std::ostream& operator <<
- (std::ostream& sl,const ISiCombinatorialTrackFinder& se)
- {
- return se.dump(sl);
- }
-
-
/////////////////////////////////////////////////////////////////////////////////
// Header file for class TrackQualityCuts
/////////////////////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h
index 045949706d8172b446c7c66bc644d2ef5efa6473..a5b983b9243141ec89c281065d3bb9f8bfffcb68 100644
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiSpacePointsSeedMaker.h
@@ -51,6 +51,7 @@ class MsgStream;
namespace InDet {
class SiSpacePointsSeed;
+ class SiSpacePointsSeedMakerEventData;
class ISiSpacePointsSeedMaker : virtual public IAlgTool
{
@@ -67,26 +68,28 @@ namespace InDet {
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- void newEvent() const;
- virtual void newEvent(int iteration) const =0;
- virtual void newRegion
- (const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const =0;
- virtual void newRegion
- (const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& iRD) const =0;
+ virtual void newEvent(SiSpacePointsSeedMakerEventData& data, int iteration=-1) const =0;
+ virtual void newRegion(SiSpacePointsSeedMakerEventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const =0;
+ virtual void newRegion(SiSpacePointsSeedMakerEventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& iRD) const =0;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find2Sp(const std::list<Trk::Vertex>& lv) const =0;
+ virtual void find2Sp(SiSpacePointsSeedMakerEventData& data,
+ const std::list<Trk::Vertex>& lv) const =0;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv) const =0;
+ virtual void find3Sp(SiSpacePointsSeedMakerEventData& data,
+ const std::list<Trk::Vertex>& lv) const =0;
//////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -94,7 +97,8 @@ namespace InDet {
// with information about min and max Z of the vertex
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv, const double* zVertex) const =0;
+ virtual void find3Sp(SiSpacePointsSeedMakerEventData& data,
+ const std::list<Trk::Vertex>& lv, const double* zVertex) const =0;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -102,60 +106,25 @@ namespace InDet {
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
- virtual void findVSp (const std::list<Trk::Vertex>& lv) const =0;
+ virtual void findVSp(SiSpacePointsSeedMakerEventData& data,
+ const std::list<Trk::Vertex>& lv) const =0;
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
- virtual const SiSpacePointsSeed* next() const =0;
+ virtual const SiSpacePointsSeed* next(SiSpacePointsSeedMakerEventData& data) const =0;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream& out) const=0;
- virtual std::ostream& dump(std::ostream& out) const=0;
+ virtual MsgStream& dump(SiSpacePointsSeedMakerEventData& data, MsgStream& out) const=0;
};
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator for MsgStream and std::ostream
- ///////////////////////////////////////////////////////////////////
-
- MsgStream& operator << (MsgStream& ,const ISiSpacePointsSeedMaker&);
- std::ostream& operator << (std::ostream&,const ISiSpacePointsSeedMaker&);
-
- ///////////////////////////////////////////////////////////////////
- // Inline methods
- ///////////////////////////////////////////////////////////////////
-
- inline void ISiSpacePointsSeedMaker::newEvent() const
- {
- return newEvent(-1);
- }
-
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator MsgStream
- ///////////////////////////////////////////////////////////////////
-
- inline MsgStream& operator <<
- (MsgStream& sl,const ISiSpacePointsSeedMaker& se)
- {
- return se.dump(sl);
- }
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator std::ostream
- ///////////////////////////////////////////////////////////////////
-
- inline std::ostream& operator <<
- (std::ostream& sl,const ISiSpacePointsSeedMaker& se)
- {
- return se.dump(sl);
- }
} // end of name space
#endif // ISiSpacePointsSeedMaker_H
-
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiTrackMaker.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiTrackMaker.h
index 6fdd69de257c656160160bb87c12b7b94d46cffe..8ce17cfd1fd2618291a43bc2e6fd42db7fdfff86 100644
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiTrackMaker.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiTrackMaker.h
@@ -33,6 +33,8 @@ namespace InDetDD {
namespace InDet {
+ class SiTrackMakerEventData_xk;
+
static const InterfaceID IID_ISiTrackMaker
("InDet::ISiTrackMaker",1,0);
@@ -52,54 +54,23 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
virtual std::list<Trk::Track*>
- getTracks(const std::list<const Trk::SpacePoint*>&) const =0;
+ getTracks(SiTrackMakerEventData_xk& data, const std::list<const Trk::SpacePoint*>&) const =0;
virtual std::list<Trk::Track*>
- getTracks(const Trk::TrackParameters&, const std::list<Amg::Vector3D>&) const =0;
+ getTracks(SiTrackMakerEventData_xk& data, const Trk::TrackParameters&, const std::list<Amg::Vector3D>&) const =0;
- virtual void newEvent(bool, bool) const =0;
- virtual void newTrigEvent(bool, bool) const =0;
+ virtual void newEvent(SiTrackMakerEventData_xk& data, bool, bool) const =0;
+ virtual void newTrigEvent(SiTrackMakerEventData_xk& data, bool, bool) const =0;
- virtual void endEvent() const =0;
+ virtual void endEvent(SiTrackMakerEventData_xk& data) const =0;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream& out) const=0;
- virtual std::ostream& dump(std::ostream& out) const=0;
+ virtual MsgStream& dump(SiTrackMakerEventData_xk& data, MsgStream& out) const=0;
};
-
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator for MsgStream and std::ostream
- ///////////////////////////////////////////////////////////////////
-
- MsgStream& operator << (MsgStream& ,const ISiTrackMaker&);
- std::ostream& operator << (std::ostream&,const ISiTrackMaker&);
-
- ///////////////////////////////////////////////////////////////////
- // Inline methods
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator MsgStream
- ///////////////////////////////////////////////////////////////////
-
- inline MsgStream& operator <<
- (MsgStream& sl,const ISiTrackMaker& se)
- {
- return se.dump(sl);
- }
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator std::ostream
- ///////////////////////////////////////////////////////////////////
-
- inline std::ostream& operator <<
- (std::ostream& sl,const ISiTrackMaker& se)
- {
- return se.dump(sl);
- }
} // end of name space
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiZvertexMaker.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiZvertexMaker.h
index 8e9f14962ecf9f7be6cdc33344e34b9563b1dd32..c8636fd36096a2d1ebba31b35fcd3534d0c0e79f 100644
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiZvertexMaker.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiZvertexMaker.h
@@ -35,6 +35,8 @@ class MsgStream;
namespace InDet{
+ class SiSpacePointsSeedMakerEventData;
+
class ISiZvertexMaker : virtual public IAlgTool
{
///////////////////////////////////////////////////////////////////
@@ -50,51 +52,22 @@ namespace InDet{
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual std::list<Trk::Vertex> newEvent() const =0;
+ virtual std::list<Trk::Vertex> newEvent(SiSpacePointsSeedMakerEventData& data) const =0;
virtual std::list<Trk::Vertex> newRegion
- (const std::vector<IdentifierHash>&,const std::vector<IdentifierHash>&) const =0;
+ (SiSpacePointsSeedMakerEventData& data,
+ const std::vector<IdentifierHash>&,const std::vector<IdentifierHash>&) const =0;
virtual std::list<Trk::Vertex> newRegion
- (const std::vector<IdentifierHash>&,const std::vector<IdentifierHash>&,const IRoiDescriptor&) const =0;
+ (SiSpacePointsSeedMakerEventData& data,
+ const std::vector<IdentifierHash>&,const std::vector<IdentifierHash>&,
+ const IRoiDescriptor&) const =0;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream& out) const=0;
- virtual std::ostream& dump(std::ostream& out) const=0;
-
+ virtual MsgStream& dump(MsgStream& out) const=0;
};
-
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator for MsgStream and std::ostream
- ///////////////////////////////////////////////////////////////////
-
- MsgStream& operator << (MsgStream& ,const ISiZvertexMaker&);
- std::ostream& operator << (std::ostream&,const ISiZvertexMaker&);
-
- ///////////////////////////////////////////////////////////////////
- // Inline methods
- ///////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator MsgStream
- ///////////////////////////////////////////////////////////////////
-
- inline MsgStream& operator <<
- (MsgStream& sl,const ISiZvertexMaker& se)
- {
- return se.dump(sl);
- }
- ///////////////////////////////////////////////////////////////////
- // Overload of << operator std::ostream
- ///////////////////////////////////////////////////////////////////
-
- inline std::ostream& operator <<
- (std::ostream& sl,const ISiZvertexMaker& se)
- {
- return se.dump(sl);
- }
-
+
} // end of name space
#endif // ISiZvertexMaker_H
diff --git a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ITRT_SeededTrackFinder.h b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ITRT_SeededTrackFinder.h
index df32180db6034102a966478033c72aeee65f1d88..623755664ef504db38c2b7cb3ff65cd1ae13834c 100755
--- a/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ITRT_SeededTrackFinder.h
+++ b/InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ITRT_SeededTrackFinder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/////////////////////////////////////////////////////////////////////////////////
@@ -24,6 +24,7 @@ class MsgStream;
namespace InDet {
+ class SiCombinatorialTrackFinderData_xk;
static const InterfaceID IID_ITRT_SeededTrackFinder
("InDet::ITRT_SeededTrackFinder",1,0);
@@ -49,10 +50,12 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
virtual std::list<Trk::Track*> getTrack
- (const Trk::TrackSegment&) = 0;
- virtual void newEvent()=0;
- virtual void newRegion(const std::vector<IdentifierHash>&,const std::vector<IdentifierHash>&)=0;
- virtual void endEvent()=0;
+ (SiCombinatorialTrackFinderData_xk& combinatorialData,
+ const Trk::TrackSegment&) = 0;
+ virtual void newEvent(SiCombinatorialTrackFinderData_xk& combinatorialData)=0;
+ virtual void newRegion(SiCombinatorialTrackFinderData_xk& combinatorialData,
+ const std::vector<IdentifierHash>&,const std::vector<IdentifierHash>&)=0;
+ virtual void endEvent(SiCombinatorialTrackFinderData_xk& combinatorialData)=0;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/InDetTrackSelectionTool/InDetTrackSelectionTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/InDetTrackSelectionTool/InDetTrackSelectionTool.h
index 94c7327f0558eeda7d161740b59f7336b6e1716e..b80fa3a69acb59e7195ed0d1614cdc182f8fe685 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/InDetTrackSelectionTool/InDetTrackSelectionTool.h
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/InDetTrackSelectionTool/InDetTrackSelectionTool.h
@@ -1,7 +1,7 @@
// -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef INDETTRACKSELECTIONTOOL_INDETTRACKSELECTIONTOOL_H
@@ -18,8 +18,10 @@
#include "TrkExInterfaces/IExtrapolator.h"
#endif
-#include <map>
+#include <atomic>
#include <limits>
+#include <map>
+#include <unordered_map>
namespace InDet {
@@ -88,7 +90,7 @@ namespace InDet {
private:
bool m_isInitialized = false; // flag whether or not the tool has been initialized, to check erroneous use cases.
- mutable bool m_warnInit = false; // flag to keep track of whether we have warned about a lack of initialization
+ mutable std::atomic_bool m_warnInit = false; // flag to keep track of whether we have warned about a lack of initialization
// this is the setCutLevel function that actually does the work, so that it doesn't warn if called in athena.
void setCutLevelPrivate( InDet::CutLevel level, Bool_t overwrite = true );
@@ -98,8 +100,8 @@ namespace InDet {
// first element is cut family, second is the set of cuts
std::map< std::string, std::vector< std::unique_ptr<TrackCut> > > m_trackCuts; //!< First element is the name of the cut family, second element is the set of cuts
- mutable ULong64_t m_numTracksProcessed = 0; //!< a counter of the number of tracks proccessed
- mutable ULong64_t m_numTracksPassed = 0; //!< a counter of the number of tracks that passed all cuts
+ mutable std::atomic<ULong64_t> m_numTracksProcessed = 0; //!< a counter of the number of tracks proccessed
+ mutable std::atomic<ULong64_t> m_numTracksPassed = 0; //!< a counter of the number of tracks that passed all cuts
mutable std::vector<ULong64_t> m_numTracksPassedCuts; //!< tracks the number of tracks that passed each cut family
constexpr static Double_t LOCAL_MAX_DOUBLE = 1.0e16;
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackCut.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackCut.cxx
index 036836e54642a9eb810d92f5e0cfea9e82219722..29ff058ce26fb6c07438e601b5603b364717ce4f 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackCut.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackCut.cxx
@@ -881,7 +881,7 @@ bool InDet::EtaDependentSiliconHitsCut::result() const
return false;
}
// ATH_MSG_INFO("in eta dependent hit cut");
- static int cutVecSize = m_etaCutoffs.size();
+ const int cutVecSize = m_etaCutoffs.size();
// ATH_MSG_INFO("cut vec size "<<cutVecSize);
float trketa = std::fabs(m_etaAccessor->getValue());
@@ -959,7 +959,7 @@ bool InDet::EtaDependentPtCut::result() const
}
float trkpt = std::fabs(m_ptAccessor->getValue());
float trketa = std::fabs(m_etaAccessor->getValue());
- static int cutVecSize = m_etaCutoffs.size();
+ const int cutVecSize = m_etaCutoffs.size();
for (int i_etabin = cutVecSize-1; i_etabin >= 0; --i_etabin) {
@@ -1036,7 +1036,7 @@ bool InDet::PtDependentSctHitsCut::result() const
ATH_MSG_WARNING( "pt accessor not valid. Track will not pass." );
return false;
}
- static int cutVecSize = m_ptCutoffs.size();
+ const int cutVecSize = m_ptCutoffs.size();
for (int i_ptbin = cutVecSize-1; i_ptbin >= 0; --i_ptbin) {
if (m_ptAccessor->getValue() >= m_ptCutoffs.at(i_ptbin)
&& (m_sctAccessor->getValue() + m_sctDeadAccessor->getValue()
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
index 492427c66125a7e37d770c8548465fa0b2529723..060d1fa9ef5a9f8724cbb375eb931bef986a3b58 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
@@ -841,13 +841,12 @@ InDet::InDetTrackSelectionTool::accept( const Trk::Track& track,
}
const Trk::TrackSummary* summary = track.trackSummary();
+ Trk::Track tmpTrack;
if (summary == nullptr && m_trackSumToolAvailable) {
- // unfortunately the const must be cast away because the tool needs
- // to update the track to make a summary (it is a friend of the track)
- Trk::Track& nonConstTrack = const_cast<Trk::Track&>(track);
- m_trackSumTool->updateTrack(nonConstTrack);
- // now get the summary from the track (the track has ownership)
- summary = nonConstTrack.trackSummary();
+ tmpTrack = Trk::Track(track);
+ m_trackSumTool->updateTrack(tmpTrack);
+ // now get the summary from the tmpTrack (the tmpTrack has ownership)
+ summary = tmpTrack.trackSummary();
}
if (summary == nullptr) {
ATH_MSG_INFO( "Track preselection: cannot get a track summary. This track will not pass any cuts." );
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/CMakeLists.txt b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/CMakeLists.txt
index 6e9ed09a6625c207731277ae1cff1967056b1080..b7e72b85727d07250e97a43f40957baa3d73e767 100644
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/CMakeLists.txt
@@ -15,6 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Database/AthenaPOOL/AthenaPoolUtilities
InnerDetector/InDetRecEvent/InDetPrepRawData
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
Tracking/TrkEvent/TrkRIO_OnTrack )
# External dependencies:
find_package( CLHEP )
@@ -24,6 +25,6 @@ atlas_add_component( SeedToTrackConversionTool
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkTrack TrkExInterfaces TrkToolInterfaces AthenaPoolUtilities InDetPrepRawData TrkRIO_OnTrack )
+ LINK_LIBRARIES ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetRecToolInterfaces TrkTrack TrkExInterfaces TrkToolInterfaces AthenaPoolUtilities InDetPrepRawData SiSPSeededTrackFinderData TrkRIO_OnTrack )
# Install files from the package:
atlas_install_headers( SeedToTrackConversionTool )
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/SeedToTrackConversionTool/SeedToTrackConversionTool.h b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/SeedToTrackConversionTool/SeedToTrackConversionTool.h
index ba641ae033ed7a151a30a06cfb051b470373111f..bd8b0b0d35d38bc1d6c5daedd78b1c9595b3d88f 100644
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/SeedToTrackConversionTool/SeedToTrackConversionTool.h
+++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/SeedToTrackConversionTool/SeedToTrackConversionTool.h
@@ -24,7 +24,6 @@
#include <atomic>
#include <list>
-#include <mutex>
class MsgStream;
@@ -48,23 +47,21 @@ namespace InDet
virtual ~SeedToTrackConversionTool() = default;
/** standard Athena-Algorithm method */
- virtual StatusCode initialize();
+ virtual StatusCode initialize() override;
/** standard Athena-Algorithm method */
- virtual StatusCode finalize();
+ virtual StatusCode finalize() override;
// Main methods for seeds conversion
- virtual void executeSiSPSeedSegments(const Trk::TrackParameters*, const int&, const std::list<const Trk::SpacePoint*>&) const;
+ virtual void executeSiSPSeedSegments(SeedToTrackConversionData& data, const Trk::TrackParameters*, const int&, const std::list<const Trk::SpacePoint*>&) const override;
//!<seed trackparameters, number of tracks found:m_track.size(), list of spacepoints
- virtual void newEvent(const Trk::TrackInfo&, const std::string&) const;
- virtual void endEvent() const;
+ virtual void newEvent(SeedToTrackConversionData& data, const Trk::TrackInfo&, const std::string&) const override;
+ virtual void endEvent(SeedToTrackConversionData& data) const override;
//////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream& out) const;
- virtual std::ostream& dump(std::ostream& out) const;
- // enter declaration of your interface-defining member functions here
+ virtual MsgStream& dump(SeedToTrackConversionData& data, MsgStream& out) const override;
private:
PublicToolHandle<Trk::IExtrapolator> m_extrapolator
@@ -77,23 +74,10 @@ namespace InDet
mutable std::atomic_int m_totseed{0}; //!< number of total seeds in the pass
mutable std::atomic_int m_survived{0}; //!< number of survived seeds
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- std::unique_ptr<TrackCollection> m_seedSegmentsCollection; //!< output collection for seed
- Trk::TrackInfo m_trackInfo; //!< TrackInfo for seeds
- std::string m_patternName; //!< Name of the pattern recognition
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
- EventData& getEventData() const;
-
- MsgStream& dumpconditions(MsgStream& out) const;
- MsgStream& dumpevent (MsgStream& out) const;
+ MsgStream& dumpconditions(SeedToTrackConversionData& data, MsgStream& out) const;
+ MsgStream& dumpevent (SeedToTrackConversionData& data, MsgStream& out) const;
};
- MsgStream& operator << (MsgStream& , const SeedToTrackConversionTool&);
- std::ostream& operator << (std::ostream&, const SeedToTrackConversionTool&);
} // end of namespace
#endif
diff --git a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx
index 47b3078da61f49c00783776b69b60956667c0523..ca3501d429b39db4256baa513b51f18a6bc9add6 100644
--- a/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx
+++ b/InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx
@@ -10,6 +10,7 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "InDetPrepRawData/SiClusterContainer.h"
+#include "SiSPSeededTrackFinderData/SeedToTrackConversionData.h"
#include "StoreGate/WriteHandle.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
@@ -62,42 +63,41 @@ StatusCode InDet::SeedToTrackConversionTool::finalize()
return AlgTool::finalize();
}
-void InDet::SeedToTrackConversionTool::newEvent(const Trk::TrackInfo& info, const std::string& patternName) const
+void InDet::SeedToTrackConversionTool::newEvent(SeedToTrackConversionData& data, const Trk::TrackInfo& info, const std::string& patternName) const
{
- EventData& data{getEventData()};
- data.m_seedSegmentsCollection = std::make_unique<TrackCollection>();
+ data.seedSegmentsCollection() = std::make_unique<TrackCollection>();
m_totseed = 0;
m_survived = 0;
- data.m_trackInfo = info;
- data.m_patternName = patternName;
- if (static_cast<int>(data.m_patternName.find("Forward"))>-1) {
- data.m_trackInfo.setPatternRecognitionInfo(Trk::TrackInfo::SiSpacePointsSeedMaker_ForwardTracks);
+ data.trackInfo() = info;
+ data.patternName() = patternName;
+ if (static_cast<int>(data.patternName().find("Forward"))>-1) {
+ data.trackInfo().setPatternRecognitionInfo(Trk::TrackInfo::SiSpacePointsSeedMaker_ForwardTracks);
}
}
-void InDet::SeedToTrackConversionTool::endEvent() const
+void InDet::SeedToTrackConversionTool::endEvent(SeedToTrackConversionData& data) const
{
- EventData& data{getEventData()};
-
// Print event information
//
if (msgLevel()<=0) {
m_nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
- ATH_MSG_INFO(" Check SiSPSeedSegments Collection " << data.m_seedSegmentsCollection->size() << " trackinfo: "
- << data.m_trackInfo);
+ ATH_MSG_INFO(" Check SiSPSeedSegments Collection " << data.seedSegmentsCollection()->size() << " trackinfo: "
+ << data.trackInfo());
SG::WriteHandle<TrackCollection> seedsegmentsOutput{m_seedsegmentsOutput};
- if (seedsegmentsOutput.record(std::move(data.m_seedSegmentsCollection)).isFailure()) {
+ if (seedsegmentsOutput.record(std::move(data.seedSegmentsCollection())).isFailure()) {
ATH_MSG_ERROR("Could not save converted SiSPSeedSegments tracks");
}
}
-void InDet::SeedToTrackConversionTool::executeSiSPSeedSegments(const Trk::TrackParameters* Tp, const int& mtrk, const std::list<const Trk::SpacePoint*>& Sp) const
+void InDet::SeedToTrackConversionTool::executeSiSPSeedSegments(SeedToTrackConversionData& data,
+ const Trk::TrackParameters* Tp,
+ const int& mtrk,
+ const std::list<const Trk::SpacePoint*>& Sp) const
{
- EventData& data{getEventData()};
++m_totseed; // accumulate all seeds
if (mtrk>0) ++m_survived; // survided seeds
std::vector<const Trk::PrepRawData*> prdsInSp;
@@ -133,10 +133,10 @@ void InDet::SeedToTrackConversionTool::executeSiSPSeedSegments(const Trk::Track
}
}
if (mtrk>0) { // survived seeds set as
- data.m_trackInfo.setTrackFitter(Trk::TrackInfo::xKalman); // xk seedfinder
+ data.trackInfo().setTrackFitter(Trk::TrackInfo::xKalman); // xk seedfinder
}
- Trk::Track* t = new Trk::Track(data.m_trackInfo, traj, 0);
- if (t) data.m_seedSegmentsCollection->push_back(t);
+ Trk::Track* t = new Trk::Track(data.trackInfo(), traj, 0);
+ if (t) data.seedSegmentsCollection()->push_back(t);
}
}
@@ -144,45 +144,23 @@ void InDet::SeedToTrackConversionTool::executeSiSPSeedSegments(const Trk::Track
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SeedToTrackConversionTool::dump(MsgStream& out) const
+MsgStream& InDet::SeedToTrackConversionTool::dump(SeedToTrackConversionData& data, MsgStream& out) const
{
out << std::endl;
- if (m_nprint) dumpevent(out);
- return dumpconditions(out);
-}
-
-InDet::SeedToTrackConversionTool::EventData& InDet::SeedToTrackConversionTool::getEventData() const
-{
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- delete m_eventData[slot].m_seedSegmentsCollection.release();
- m_eventData[slot].m_trackInfo = Trk::TrackInfo();
- m_eventData[slot].m_patternName = "";
- }
- return m_eventData[slot];
+ if (m_nprint) dumpevent(data, out);
+ return dumpconditions(data, out);
}
///////////////////////////////////////////////////////////////////
// Dumps conditions information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SeedToTrackConversionTool::dumpconditions(MsgStream& out) const
+MsgStream& InDet::SeedToTrackConversionTool::dumpconditions(SeedToTrackConversionData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
out << "|----------------------------------------------------------------------"
<< "-------------------|"
<< std::endl;
out << "| Output Collection Name | " << m_seedsegmentsOutput << std::endl;
- out << "} Name of pattern recognition | " << data.m_patternName << std::endl;
+ out << "} Name of pattern recognition | " << data.patternName() << std::endl;
out << "|----------------------------------------------------------------------"
<< "-------------------|"
<< std::endl;
@@ -192,12 +170,11 @@ MsgStream& InDet::SeedToTrackConversionTool::dumpconditions(MsgStream& out) cons
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SeedToTrackConversionTool::dumpevent(MsgStream& out) const
+MsgStream& InDet::SeedToTrackConversionTool::dumpevent(SeedToTrackConversionData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
out << "|---------------------------------------------------------------------|"
<< std::endl;
- out << "| Name of SeedFinder | " << data.m_patternName
+ out << "| Name of SeedFinder | " << data.patternName()
<< " | " << std::endl;
out << "| Number of All seeds | " << std::setw(12) << m_totseed
<< " | " << std::endl;
@@ -208,33 +185,4 @@ MsgStream& InDet::SeedToTrackConversionTool::dumpevent(MsgStream& out) const
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SeedToTrackConversionTool::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl, const InDet::SeedToTrackConversionTool& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl, const InDet::SeedToTrackConversionTool& se)
-{
- return se.dump(sl);
-}
-
//============================================================================================
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/CMakeLists.txt
index 03242e108150abbfe1f655a5d59f891a6c134ba4..a31731a749fb17450c483691d13c13931a008dc0 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/CMakeLists.txt
@@ -12,6 +12,7 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetConditions/InDetConditionsSummaryService
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecEvent/InDetPrepRawData
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
InnerDetector/InDetRecTools/InDetRecToolInterfaces
MagneticField/MagFieldInterfaces
Tracking/TrkDetDescr/TrkGeometry
@@ -36,7 +37,7 @@ atlas_add_component( SiCombinatorialTrackFinderTool_xk
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps GaudiKernel InDetReadoutGeometry InDetPrepRawData InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkEventPrimitives TrkPatternParameters TrkTrack TrkExInterfaces TrkToolInterfaces EventInfo InDetRIO_OnTrack TrkSurfaces TrkMaterialOnTrack TrkMeasurementBase TrkRIO_OnTrack )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthenaBaseComps GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSPSeededTrackFinderData InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkEventPrimitives TrkPatternParameters TrkTrack TrkExInterfaces TrkToolInterfaces EventInfo InDetRIO_OnTrack TrkSurfaces TrkMaterialOnTrack TrkMeasurementBase TrkRIO_OnTrack )
# Install files from the package:
atlas_install_headers( SiCombinatorialTrackFinderTool_xk )
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
index ebb9250da0df637f176df81f6f05a1354d9a4db8..749ec04c5d7bfd53806b85ed82a9103203b864b1 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinderTool_xk/SiCombinatorialTrackFinder_xk.h
@@ -22,10 +22,10 @@
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiTrajectory_xk.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiTools_xk.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLinks_xk.h"
+#include "SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h"
+#include "SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h"
+#include "SiSPSeededTrackFinderData/SiDetElementBoundaryLinks_xk.h"
+#include "SiSPSeededTrackFinderData/SiTrajectory_xk.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/ReadHandleKey.h"
@@ -34,7 +34,6 @@
#include <list>
#include <map>
-#include <mutex>
#include <vector>
class MsgStream;
@@ -70,49 +69,51 @@ namespace InDet {
SiCombinatorialTrackFinder_xk
(const std::string&,const std::string&,const IInterface*);
virtual ~SiCombinatorialTrackFinder_xk() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize ();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize () override;
///////////////////////////////////////////////////////////////////
// Main methods for local track finding
///////////////////////////////////////////////////////////////////
virtual const std::list<Trk::Track*>& getTracks
- (const Trk::TrackParameters&,
+ (SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters&,
const std::list<const Trk::SpacePoint*>&,
const std::list<Amg::Vector3D>&,
std::list<const InDetDD::SiDetectorElement*>&,
- const TrackQualityCuts&) const;
+ const TrackQualityCuts&) const override;
virtual const std::list<Trk::Track*>& getTracks
- (const Trk::TrackParameters&,
+ (SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters&,
const std::list<const Trk::SpacePoint*>&,
const std::list<Amg::Vector3D>&,
std::list<const InDetDD::SiDetectorElement*>&,
- std::multimap<const Trk::PrepRawData*, const Trk::Track*>&) const;
+ std::multimap<const Trk::PrepRawData*, const Trk::Track*>&) const override;
virtual const std::list<Trk::Track*>& getTracksWithBrem
- (const Trk::TrackParameters&,
+ (SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters&,
const std::list<const Trk::SpacePoint*>&,
const std::list<Amg::Vector3D>&,
std::list<const InDetDD::SiDetectorElement*>&,
std::multimap<const Trk::PrepRawData*, const Trk::Track*>&,
- bool) const;
+ bool) const override;
- virtual void newEvent() const;
- virtual void newEvent(Trk::TrackInfo, const TrackQualityCuts&) const;
+ virtual void newEvent(SiCombinatorialTrackFinderData_xk& data) const override;
+ virtual void newEvent(SiCombinatorialTrackFinderData_xk& data,
+ Trk::TrackInfo, const TrackQualityCuts&) const override;
- virtual void endEvent() const;
-
+ virtual void endEvent(SiCombinatorialTrackFinderData_xk& data) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- MsgStream& dump(MsgStream& out) const;
- std::ostream& dump(std::ostream& out) const;
+ MsgStream& dump(SiCombinatorialTrackFinderData_xk& data, MsgStream& out) const override;
- protected:
+ private:
///////////////////////////////////////////////////////////////////
// Protected Data
@@ -158,51 +159,22 @@ namespace InDet {
// Updated in only mapDetectorElementsProduction
InDet::SiDetElementBoundaryLinks_xk m_boundaryPIX;
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData {
- SiTrajectory_xk trajectory; // Track trajectory
- Trk::TrackInfo trackinfo;
- InDet::SiTools_xk tools;
- std::list<Trk::Track*> tracks; // List found tracks
- int nprint{0}; // Kind output information
- int inputseeds{0}; // Number input seeds
- int goodseeds{0}; // Number accepted seeds
- int findtracks{0}; // Number found tracks
- int inittracks{0}; // Number initial tracks
- int roadbug{0}; // Number wrong DE roads
- bool heavyIon{false};
- int cosmicTrack{0}; // Is it cosmic track (0 or 1)
- int nclusmin{0}; // Min number clusters
- int nclusminb{0}; // Min number clusters
- int nwclusmin{0}; // Min number weighted clusters
- int nholesmax{0}; // Max number holes
- int dholesmax{0}; // Max holes gap
- bool simpleTrack{false};
- double pTmin{0.}; // min pT
- double pTminBrem{0.}; // min pT for brem noise model
- double xi2max{0.}; // max Xi2 for updators
- double xi2maxNoAdd{0.}; // max Xi2 for clusters
- double xi2maxlink{0.}; // max Xi2 for clusters
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Methods
///////////////////////////////////////////////////////////////////
bool findTrack
- (EventData& data,
+ (SiCombinatorialTrackFinderData_xk& data,
const Trk::TrackParameters&,
const std::list<const Trk::SpacePoint*>&,
const std::list<Amg::Vector3D>&,
std::list<const InDetDD::SiDetectorElement*>&,
std::multimap<const Trk::PrepRawData*, const Trk::Track*>&) const;
- void getTrackQualityCuts(EventData& data, const TrackQualityCuts&) const;
+ void getTrackQualityCuts(SiCombinatorialTrackFinderData_xk& data, const TrackQualityCuts&) const;
- Trk::Track* convertToTrack(EventData& data) const;
- Trk::Track* convertToNextTrack(EventData& data) const;
+ Trk::Track* convertToTrack(SiCombinatorialTrackFinderData_xk& data) const;
+ Trk::Track* convertToNextTrack(SiCombinatorialTrackFinderData_xk& data) const;
void magneticFieldInit();
@@ -216,17 +188,12 @@ namespace InDet {
(std::list<const InDetDD::SiDetectorElement*> &,
std::list<const InDet::SiDetElementBoundaryLink_xk*>&) const;
- void newEvent(EventData& data) const;
-
- EventData& getEventData() const;
-
MsgStream& dumpconditions(MsgStream& out) const;
- MsgStream& dumpevent(EventData& data, MsgStream& out) const;
+ MsgStream& dumpevent(SiCombinatorialTrackFinderData_xk& data, MsgStream& out) const;
- };
+ void initializeCombinatorialData(SiCombinatorialTrackFinderData_xk& data) const;
- MsgStream& operator << (MsgStream& ,const SiCombinatorialTrackFinder_xk&);
- std::ostream& operator << (std::ostream&,const SiCombinatorialTrackFinder_xk&);
+ };
} // end of name space
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
index 0958f967de99a27d7470e36ff9d98b71f15c2752..a7dea16d98b252e8f82320956ab189fd4853b1e5 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiCombinatorialTrackFinder_xk.cxx
@@ -173,12 +173,12 @@ StatusCode InDet::SiCombinatorialTrackFinder_xk::finalize()
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiCombinatorialTrackFinder_xk::dump(MsgStream& out) const
+MsgStream& InDet::SiCombinatorialTrackFinder_xk::dump(SiCombinatorialTrackFinderData_xk& data, MsgStream& out) const
{
- EventData& data{getEventData()};
+ if (not data.isInitialized()) initializeCombinatorialData(data);
out<<std::endl;
- if (data.nprint) return dumpevent(data, out);
+ if (data.nprint()) return dumpevent(data, out);
return dumpconditions(out);
}
@@ -258,83 +258,65 @@ MsgStream& InDet::SiCombinatorialTrackFinder_xk::dumpconditions(MsgStream& out)
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiCombinatorialTrackFinder_xk::dumpevent(EventData& data, MsgStream& out) const
+MsgStream& InDet::SiCombinatorialTrackFinder_xk::dumpevent(SiCombinatorialTrackFinderData_xk& data, MsgStream& out) const
{
out<<"|---------------------------------------------------------------------|"
<<std::endl;
- out<<"| Min pT of track (MeV) | "<<std::setw(12)<<std::setprecision(5)<<data.pTmin
+ out<<"| Min pT of track (MeV) | "<<std::setw(12)<<std::setprecision(5)<<data.pTmin()
<<" |"<<std::endl;
- out<<"| Max Xi2 for cluster | "<<std::setw(12)<<std::setprecision(5)<<data.xi2max
+ out<<"| Max Xi2 for cluster | "<<std::setw(12)<<std::setprecision(5)<<data.xi2max()
<<" |"<<std::endl;
- out<<"| Max Xi2 for outlayer | "<<std::setw(12)<<std::setprecision(5)<<data.xi2maxNoAdd
+ out<<"| Max Xi2 for outlayer | "<<std::setw(12)<<std::setprecision(5)<<data.xi2maxNoAdd()
<<" |"<<std::endl;
- out<<"| Max Xi2 for link | "<<std::setw(12)<<std::setprecision(5)<<data.xi2maxlink
+ out<<"| Max Xi2 for link | "<<std::setw(12)<<std::setprecision(5)<<data.xi2maxlink()
<<" |"<<std::endl;
- out<<"| Min number of clusters | "<<std::setw(12)<<data.nclusmin
+ out<<"| Min number of clusters | "<<std::setw(12)<<data.nclusmin()
<<" |"<<std::endl;
- out<<"| Min number of wclusters | "<<std::setw(12)<<data.nwclusmin
+ out<<"| Min number of wclusters | "<<std::setw(12)<<data.nwclusmin()
<<" |"<<std::endl;
- out<<"| Max number holes | "<<std::setw(12)<<data.nholesmax
+ out<<"| Max number holes | "<<std::setw(12)<<data.nholesmax()
<<" |"<<std::endl;
- out<<"| Max holes gap | "<<std::setw(12)<<data.dholesmax
+ out<<"| Max holes gap | "<<std::setw(12)<<data.dholesmax()
<<" |"<<std::endl;
- out<<"| Use association tool ? | "<<std::setw(12)<<data.tools.useassoTool()
+ out<<"| Use association tool ? | "<<std::setw(12)<<data.tools().useassoTool()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
- out<<"| Number input seeds | "<<std::setw(12)<<data.inputseeds
+ out<<"| Number input seeds | "<<std::setw(12)<<data.inputseeds()
<<" |"<<std::endl;
- out<<"| Number accepted seeds | "<<std::setw(12)<<data.goodseeds
+ out<<"| Number accepted seeds | "<<std::setw(12)<<data.goodseeds()
<<" |"<<std::endl;
- out<<"| Number initial tracks | "<<std::setw(12)<<data.inittracks
+ out<<"| Number initial tracks | "<<std::setw(12)<<data.inittracks()
<<" |"<<std::endl;
- out<<"| Number wrong DE roads | "<<std::setw(12)<<data.roadbug
+ out<<"| Number wrong DE roads | "<<std::setw(12)<<data.roadbug()
<<" |"<<std::endl;
- out<<"| Number output tracks | "<<std::setw(12)<<data.findtracks
+ out<<"| Number output tracks | "<<std::setw(12)<<data.findtracks()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiCombinatorialTrackFinder_xk::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl,const InDet::SiCombinatorialTrackFinder_xk& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl,const InDet::SiCombinatorialTrackFinder_xk& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Initiate track finding tool
///////////////////////////////////////////////////////////////////
-void InDet::SiCombinatorialTrackFinder_xk::newEvent() const
+void InDet::SiCombinatorialTrackFinder_xk::newEvent(SiCombinatorialTrackFinderData_xk& data) const
{
- EventData& data{getEventData()};
+ if (not data.isInitialized()) initializeCombinatorialData(data);
- newEvent(data);
+ // Erase statistic information
+ //
+ data.inputseeds() = 0;
+ data.goodseeds() = 0;
+ data.inittracks() = 0;
+ data.findtracks() = 0;
+ data.roadbug() = 0;
+
+ // Set track info
+ //
+ data.trackinfo().setPatternRecognitionInfo(Trk::TrackInfo::SiSPSeededFinder);
+ data.cosmicTrack() = 0;
}
///////////////////////////////////////////////////////////////////
@@ -342,55 +324,41 @@ void InDet::SiCombinatorialTrackFinder_xk::newEvent() const
///////////////////////////////////////////////////////////////////
void InDet::SiCombinatorialTrackFinder_xk::newEvent
-(Trk::TrackInfo info, const TrackQualityCuts& Cuts) const
+(SiCombinatorialTrackFinderData_xk& data, Trk::TrackInfo info, const TrackQualityCuts& Cuts) const
{
- EventData& data{getEventData()};
+ if (not data.isInitialized()) initializeCombinatorialData(data);
newEvent(data);
- data.trackinfo = info;
+ data.trackinfo() = info;
// Get track qulaity cuts information
//
getTrackQualityCuts(data, Cuts);
- data.heavyIon = false;
- data.cosmicTrack = 0;
+ data.heavyIon() = false;
+ data.cosmicTrack() = 0;
if (info.patternRecoInfo(Trk::TrackInfo::SiSpacePointsSeedMaker_Cosmic)) {
- data.cosmicTrack = 1;
+ data.cosmicTrack() = 1;
} else if (info.patternRecoInfo(Trk::TrackInfo::SiSpacePointsSeedMaker_HeavyIon)) {
- data.heavyIon = true;
+ data.heavyIon() = true;
}
- data.tools.setHeavyIon(data.heavyIon);
-}
-
-void InDet::SiCombinatorialTrackFinder_xk::newEvent(EventData& data) const {
- // Erase statistic information
- //
- data.inputseeds = 0;
- data.goodseeds = 0;
- data.inittracks = 0;
- data.findtracks = 0;
- data.roadbug = 0;
-
- // Set track info
- //
- data.trackinfo.setPatternRecognitionInfo(Trk::TrackInfo::SiSPSeededFinder);
- data.cosmicTrack = 0;
+ data.tools().setHeavyIon(data.heavyIon());
}
///////////////////////////////////////////////////////////////////
// Finalize track finding tool for given event
///////////////////////////////////////////////////////////////////
-void InDet::SiCombinatorialTrackFinder_xk::endEvent() const
+void InDet::SiCombinatorialTrackFinder_xk::endEvent(SiCombinatorialTrackFinderData_xk& data) const
{
+ if (not data.isInitialized()) initializeCombinatorialData(data);
+
// Print event information
//
if (m_outputlevel<=0) {
- EventData& data{getEventData()};
- data.nprint = 1;
- ATH_MSG_DEBUG(*this);
+ data.nprint() = 1;
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -399,43 +367,44 @@ void InDet::SiCombinatorialTrackFinder_xk::endEvent() const
///////////////////////////////////////////////////////////////////
const std::list<Trk::Track*>& InDet::SiCombinatorialTrackFinder_xk::getTracks
-(const Trk::TrackParameters& Tp,
+(SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters& Tp,
const std::list<const Trk::SpacePoint*>& Sp,
const std::list<Amg::Vector3D>& Gp,
std::list<const InDetDD::SiDetectorElement*>& DE,
const TrackQualityCuts& Cuts) const
{
- EventData& data{getEventData()};
+ if (not data.isInitialized()) initializeCombinatorialData(data);
- data.tools.setBremNoise(false,false);
- data.tracks.erase(data.tracks.begin(), data.tracks.end());
+ data.tools().setBremNoise(false, false);
+ data.tracks().erase(data.tracks().begin(), data.tracks().end());
- ++data.inputseeds;
+ ++data.inputseeds();
if (!m_usePIX && !m_useSCT) {
- return data.tracks;
+ return data.tracks();
}
// Get track qulaity cuts information
//
getTrackQualityCuts(data, Cuts);
std::multimap<const Trk::PrepRawData*, const Trk::Track*> PT;
- if (!findTrack(data, Tp, Sp, Gp, DE, PT)) return data.tracks;
+ if (!findTrack(data, Tp, Sp, Gp, DE, PT)) return data.tracks();
- data.trajectory.sortStep();
+ data.trajectory().sortStep();
// Trk::Track production
//
Trk::Track* t = convertToTrack(data);
- ++data.findtracks;
- data.tracks.push_back(t);
+ ++data.findtracks();
+ data.tracks().push_back(t);
- if (!data.tools.multiTrack() || data.simpleTrack || Sp.size()<=2 || data.cosmicTrack || data.trajectory.pTfirst() < data.tools.pTmin()) return data.tracks;
+ if (!data.tools().multiTrack() || data.simpleTrack() || Sp.size()<=2 || data.cosmicTrack() || data.trajectory().pTfirst() < data.tools().pTmin()) return data.tracks();
while ((t=convertToNextTrack(data))) {
- ++data.findtracks;
- data.tracks.push_back(t);
+ ++data.findtracks();
+ data.tracks().push_back(t);
}
- return data.tracks;
+ return data.tracks();
}
///////////////////////////////////////////////////////////////////
@@ -443,42 +412,43 @@ const std::list<Trk::Track*>& InDet::SiCombinatorialTrackFinder_xk::getTracks
///////////////////////////////////////////////////////////////////
const std::list<Trk::Track*>& InDet::SiCombinatorialTrackFinder_xk::getTracks
-(const Trk::TrackParameters& Tp,
+(SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters& Tp,
const std::list<const Trk::SpacePoint*>& Sp,
const std::list<Amg::Vector3D>& Gp,
std::list<const InDetDD::SiDetectorElement*>& DE,
std::multimap<const Trk::PrepRawData*, const Trk::Track*>& PT) const
{
- EventData& data{getEventData()};
+ if (not data.isInitialized()) initializeCombinatorialData(data);
- data.tools.setBremNoise(false, false);
- data.tracks.erase(data.tracks.begin(), data.tracks.end());
+ data.tools().setBremNoise(false, false);
+ data.tracks().erase(data.tracks().begin(), data.tracks().end());
- ++data.inputseeds;
+ ++data.inputseeds();
if (!m_usePIX && !m_useSCT) {
- return data.tracks;
+ return data.tracks();
}
- if (!findTrack(data, Tp, Sp, Gp, DE, PT)) return data.tracks;
- if (!data.trajectory.isNewTrack(PT)) return data.tracks;
+ if (!findTrack(data, Tp, Sp, Gp, DE, PT)) return data.tracks();
+ if (!data.trajectory().isNewTrack(PT)) return data.tracks();
- data.trajectory.sortStep();
+ data.trajectory().sortStep();
// Trk::Track production
//
Trk::Track* t = convertToTrack(data);
- if (t==nullptr) return data.tracks;
+ if (t==nullptr) return data.tracks();
- ++data.findtracks;
- data.tracks.push_back(t);
+ ++data.findtracks();
+ data.tracks().push_back(t);
- if (!data.tools.multiTrack() || data.simpleTrack || Sp.size()<=2 || data.cosmicTrack || data.trajectory.pTfirst() < data.tools.pTmin()) return data.tracks;
+ if (!data.tools().multiTrack() || data.simpleTrack() || Sp.size()<=2 || data.cosmicTrack() || data.trajectory().pTfirst() < data.tools().pTmin()) return data.tracks();
while ((t=convertToNextTrack(data))) {
- ++data.findtracks;
- data.tracks.push_back(t);
+ ++data.findtracks();
+ data.tracks().push_back(t);
}
- return data.tracks;
+ return data.tracks();
}
///////////////////////////////////////////////////////////////////
@@ -487,83 +457,84 @@ const std::list<Trk::Track*>& InDet::SiCombinatorialTrackFinder_xk::getTracks
///////////////////////////////////////////////////////////////////
const std::list<Trk::Track*>& InDet::SiCombinatorialTrackFinder_xk::getTracksWithBrem
-(const Trk::TrackParameters& Tp,
+(SiCombinatorialTrackFinderData_xk& data,
+ const Trk::TrackParameters& Tp,
const std::list<const Trk::SpacePoint*>& Sp,
const std::list<Amg::Vector3D>& Gp,
std::list<const InDetDD::SiDetectorElement*>& DE,
std::multimap<const Trk::PrepRawData*, const Trk::Track*>& PT,
bool isCaloCompatible) const
{
- EventData& data{getEventData()};
+ if (not data.isInitialized()) initializeCombinatorialData(data);
// Old information
//
int mult = 0;
- if (data.tools.multiTrack()) mult = 1;
- double Xi2m = data.tools.xi2multi();
+ if (data.tools().multiTrack()) mult = 1;
+ double Xi2m = data.tools().xi2multi();
- data.tools.setBremNoise(false, true);
- data.tracks.erase(data.tracks.begin(), data.tracks.end());
+ data.tools().setBremNoise(false, true);
+ data.tracks().erase(data.tracks().begin(), data.tracks().end());
- ++data.inputseeds;
+ ++data.inputseeds();
if (!m_usePIX && !m_useSCT) {
- return data.tracks;
+ return data.tracks();
}
bool Q = findTrack(data, Tp, Sp, Gp, DE, PT);
- if (Q) Q = data.trajectory.isNewTrack(PT);
+ if (Q) Q = data.trajectory().isNewTrack(PT);
int na = 0;
if (Q) {
- data.trajectory.sortStep();
+ data.trajectory().sortStep();
// Trk::Track production
//
- Trk::TrackInfo oldinfo = data.trackinfo;
- if (isCaloCompatible) data.trackinfo.setPatternRecognitionInfo(Trk::TrackInfo::TrackInCaloROI);
+ Trk::TrackInfo oldinfo = data.trackinfo();
+ if (isCaloCompatible) data.trackinfo().setPatternRecognitionInfo(Trk::TrackInfo::TrackInCaloROI);
- data.tools.setMultiTracks(0, Xi2m);
+ data.tools().setMultiTracks(0, Xi2m);
Trk::Track* t = convertToTrack(data);
- data.trackinfo = oldinfo;
- data.tools.setMultiTracks(mult,Xi2m);
-
- if (!t) return data.tracks;
- ++data.findtracks;
- data.tracks.push_back(t);
- na = data.trajectory.nclusters();
- if (na >=12 && !data.trajectory.nclustersNoAdd()) return data.tracks;
+ data.trackinfo() = oldinfo;
+ data.tools().setMultiTracks(mult,Xi2m);
+
+ if (!t) return data.tracks();
+ ++data.findtracks();
+ data.tracks().push_back(t);
+ na = data.trajectory().nclusters();
+ if (na >=12 && !data.trajectory().nclustersNoAdd()) return data.tracks();
- if (data.trajectory.pTfirst() < data.pTminBrem) return data.tracks;
+ if (data.trajectory().pTfirst() < data.pTminBrem()) return data.tracks();
}
- if ((*Sp.begin())->clusterList().second) return data.tracks;
+ if ((*Sp.begin())->clusterList().second) return data.tracks();
// Repeat track finding using electron noise model
//
- data.tools.setBremNoise(true,true);
- if (!findTrack(data, Tp, Sp, Gp, DE, PT)) return data.tracks;
- if (!data.trajectory.isNewTrack(PT)) return data.tracks;
+ data.tools().setBremNoise(true,true);
+ if (!findTrack(data, Tp, Sp, Gp, DE, PT)) return data.tracks();
+ if (!data.trajectory().isNewTrack(PT)) return data.tracks();
- int nb = data.trajectory.nclusters();
- if (nb <= na ) return data.tracks;
+ int nb = data.trajectory().nclusters();
+ if (nb <= na) return data.tracks();
- data.trajectory.sortStep();
+ data.trajectory().sortStep();
// Trk::Track production
//
- Trk::TrackInfo oldinfo = data.trackinfo;
- data.trackinfo.setTrackProperties(Trk::TrackInfo::BremFit );
- data.trackinfo.setTrackProperties(Trk::TrackInfo::BremFitSuccessful);
- if (isCaloCompatible) data.trackinfo.setPatternRecognitionInfo(Trk::TrackInfo::TrackInCaloROI);
+ Trk::TrackInfo oldinfo = data.trackinfo();
+ data.trackinfo().setTrackProperties(Trk::TrackInfo::BremFit );
+ data.trackinfo().setTrackProperties(Trk::TrackInfo::BremFitSuccessful);
+ if (isCaloCompatible) data.trackinfo().setPatternRecognitionInfo(Trk::TrackInfo::TrackInCaloROI);
- data.tools.setMultiTracks(0, Xi2m);
+ data.tools().setMultiTracks(0, Xi2m);
Trk::Track* t = convertToTrack(data);
- data.trackinfo = oldinfo;
- data.tools.setMultiTracks(mult, Xi2m);
+ data.trackinfo() = oldinfo;
+ data.tools().setMultiTracks(mult, Xi2m);
- if (t==nullptr) return data.tracks;
+ if (t==nullptr) return data.tracks();
- ++data.findtracks;
- data.tracks.push_back(t);
- return data.tracks;
+ ++data.findtracks();
+ data.tracks().push_back(t);
+ return data.tracks();
}
///////////////////////////////////////////////////////////////////
@@ -571,12 +542,14 @@ const std::list<Trk::Track*>& InDet::SiCombinatorialTrackFinder_xk::getTracksWi
///////////////////////////////////////////////////////////////////
bool InDet::SiCombinatorialTrackFinder_xk::findTrack
-(EventData& data,
+(SiCombinatorialTrackFinderData_xk& data,
const Trk::TrackParameters& Tp,
const std::list<const Trk::SpacePoint*>& Sp,const std::list<Amg::Vector3D>& Gp,
std::list<const InDetDD::SiDetectorElement*>& DE,
std::multimap<const Trk::PrepRawData*,const Trk::Track*>& PT) const
{
+ if (not data.isInitialized()) initializeCombinatorialData(data);
+
// List detector element links preparation
//
std::list<const InDet::SiDetElementBoundaryLink_xk*> DEL;
@@ -604,67 +577,67 @@ bool InDet::SiCombinatorialTrackFinder_xk::findTrack
}
if (Sp.size()<=2) TWO = true;
} else if (Gp.size() > 2) {
- if (!data.trajectory.globalPositionsToClusters(p_pixcontainer, p_sctcontainer, Gp, DEL, PT, Cl)) return false;
+ if (!data.trajectory().globalPositionsToClusters(p_pixcontainer, p_sctcontainer, Gp, DEL, PT, Cl)) return false;
} else {
- if (!data.trajectory.trackParametersToClusters(p_pixcontainer, p_sctcontainer, Tp, DEL, PT, Cl)) return false;
+ if (!data.trajectory().trackParametersToClusters(p_pixcontainer, p_sctcontainer, Tp, DEL, PT, Cl)) return false;
}
- ++data.goodseeds;
+ ++data.goodseeds();
// Build initial trajectory
//
bool Qr;
- bool Q = data.trajectory.initialize(m_usePIX, m_useSCT, p_pixcontainer, p_sctcontainer, Tp, Cl, DEL, Qr);
+ bool Q = data.trajectory().initialize(m_usePIX, m_useSCT, p_pixcontainer, p_sctcontainer, Tp, Cl, DEL, Qr);
if (!Q && Sp.size() < 2 && Gp.size() > 3) {
Cl.clear();
- if (!data.trajectory.trackParametersToClusters(p_pixcontainer, p_sctcontainer, Tp, DEL, PT, Cl)) return false;
- if (!data.trajectory.initialize(m_usePIX, m_useSCT, p_pixcontainer, p_sctcontainer, Tp, Cl, DEL, Qr)) return false;
+ if (!data.trajectory().trackParametersToClusters(p_pixcontainer, p_sctcontainer, Tp, DEL, PT, Cl)) return false;
+ if (!data.trajectory().initialize(m_usePIX, m_useSCT, p_pixcontainer, p_sctcontainer, Tp, Cl, DEL, Qr)) return false;
Q = Qr = true;
}
- if (!Qr) ++data.roadbug;
+ if (!Qr) ++data.roadbug();
if (!Q) return false;
- ++data.inittracks;
- bool pixseed = data.trajectory.isLastPixel();
+ ++data.inittracks();
+ bool pixseed = data.trajectory().isLastPixel();
int itmax = 30;
- if (data.simpleTrack) itmax = 10;
- if (data.heavyIon) itmax = 50;
+ if (data.simpleTrack()) itmax = 10;
+ if (data.heavyIon()) itmax = 50;
// Track finding
//
if (pixseed) { // Strategy for pixel seeds
- if (!data.trajectory.forwardExtension (false,itmax)) return false;
- if (!data.trajectory.backwardSmoother (false) ) return false;
- if (!data.trajectory.backwardExtension(itmax) ) return false;
+ if (!data.trajectory().forwardExtension (false,itmax)) return false;
+ if (!data.trajectory().backwardSmoother (false) ) return false;
+ if (!data.trajectory().backwardExtension(itmax) ) return false;
- if (data.trajectory.difference() > 0) {
- if (!data.trajectory.forwardFilter() ) return false;
- if (!data.trajectory.backwardSmoother (false) ) return false;
+ if (data.trajectory().difference() > 0) {
+ if (!data.trajectory().forwardFilter() ) return false;
+ if (!data.trajectory().backwardSmoother (false) ) return false;
}
- int na = data.trajectory.nclustersNoAdd();
- if (data.trajectory.nclusters()+na < data.nclusmin || data.trajectory.ndf() < data.nwclusmin) return false;
+ int na = data.trajectory().nclustersNoAdd();
+ if (data.trajectory().nclusters()+na < data.nclusmin() || data.trajectory().ndf() < data.nwclusmin()) return false;
} else { // Strategy for mixed seeds
- if (!data.trajectory.backwardSmoother(TWO) ) return false;
- if (!data.trajectory.backwardExtension(itmax) ) return false;
- if (!data.trajectory.forwardExtension(true,itmax)) return false;
+ if (!data.trajectory().backwardSmoother(TWO) ) return false;
+ if (!data.trajectory().backwardExtension(itmax) ) return false;
+ if (!data.trajectory().forwardExtension(true,itmax)) return false;
- int na = data.trajectory.nclustersNoAdd();
- if (data.trajectory.nclusters()+na < data.nclusmin || data.trajectory.ndf() < data.nwclusmin) return false;
- if (!data.trajectory.backwardSmoother(false) ) return false;
+ int na = data.trajectory().nclustersNoAdd();
+ if (data.trajectory().nclusters()+na < data.nclusmin() || data.trajectory().ndf() < data.nwclusmin()) return false;
+ if (!data.trajectory().backwardSmoother(false) ) return false;
- na = data.trajectory.nclustersNoAdd();
- if (data.trajectory.nclusters()+na < data.nclusmin || data.trajectory.ndf() < data.nwclusmin) return false;
+ na = data.trajectory().nclustersNoAdd();
+ if (data.trajectory().nclusters()+na < data.nclusmin() || data.trajectory().ndf() < data.nwclusmin()) return false;
- if (data.trajectory.difference() > 0) {
- if (!data.trajectory.forwardFilter() ) return false;
- if (!data.trajectory.backwardSmoother (false)) return false;
+ if (data.trajectory().difference() > 0) {
+ if (!data.trajectory().forwardFilter() ) return false;
+ if (!data.trajectory().backwardSmoother (false)) return false;
}
}
- if (data.trajectory.qualityOptimization() < (m_qualityCut*data.nclusmin) ) return false;
- if (data.trajectory.pTfirst () < data.pTmin && data.trajectory.nclusters() < data.nclusmin ) return false;
- if (data.trajectory.nclusters() < data.nclusminb || data.trajectory.ndf () < data.nwclusmin) return false;
+ if (data.trajectory().qualityOptimization() < (m_qualityCut*data.nclusmin()) ) return false;
+ if (data.trajectory().pTfirst () < data.pTmin() && data.trajectory().nclusters() < data.nclusmin() ) return false;
+ if (data.trajectory().nclusters() < data.nclusminb() || data.trajectory().ndf () < data.nwclusmin()) return false;
return true;
}
@@ -673,32 +646,32 @@ bool InDet::SiCombinatorialTrackFinder_xk::findTrack
// Trk::Track production
///////////////////////////////////////////////////////////////////
-Trk::Track* InDet::SiCombinatorialTrackFinder_xk::convertToTrack(EventData& data) const
+Trk::Track* InDet::SiCombinatorialTrackFinder_xk::convertToTrack(SiCombinatorialTrackFinderData_xk& data) const
{
- if (!data.simpleTrack) {
- return new Trk::Track(data.trackinfo,
- data.trajectory.convertToTrackStateOnSurface(data.cosmicTrack),
- data.trajectory.convertToFitQuality());
+ if (!data.simpleTrack()) {
+ return new Trk::Track(data.trackinfo(),
+ data.trajectory().convertToTrackStateOnSurface(data.cosmicTrack()),
+ data.trajectory().convertToFitQuality());
}
- Trk::TrackInfo info = data.trackinfo;
+ Trk::TrackInfo info = data.trackinfo();
info.setPatternRecognitionInfo(Trk::TrackInfo::SiSPSeededFinderSimple);
return new Trk::Track(info,
- data.trajectory.convertToSimpleTrackStateOnSurface(data.cosmicTrack),
- data.trajectory.convertToFitQuality());
+ data.trajectory().convertToSimpleTrackStateOnSurface(data.cosmicTrack()),
+ data.trajectory().convertToFitQuality());
}
///////////////////////////////////////////////////////////////////
// Next Trk::Track production
///////////////////////////////////////////////////////////////////
-Trk::Track* InDet::SiCombinatorialTrackFinder_xk::convertToNextTrack(EventData& data) const
+Trk::Track* InDet::SiCombinatorialTrackFinder_xk::convertToNextTrack(SiCombinatorialTrackFinderData_xk& data) const
{
- DataVector<const Trk::TrackStateOnSurface>* tsos{data.trajectory.convertToNextTrackStateOnSurface()};
+ DataVector<const Trk::TrackStateOnSurface>* tsos{data.trajectory().convertToNextTrackStateOnSurface()};
if (tsos==nullptr) return nullptr;
- return new Trk::Track(data.trackinfo,
+ return new Trk::Track(data.trackinfo(),
tsos,
- data.trajectory.convertToFitQuality());
+ data.trajectory().convertToFitQuality());
}
///////////////////////////////////////////////////////////////////
@@ -851,90 +824,70 @@ void InDet::SiCombinatorialTrackFinder_xk::detectorElementLinks
///////////////////////////////////////////////////////////////////
void InDet::SiCombinatorialTrackFinder_xk::getTrackQualityCuts
-(EventData& data, const TrackQualityCuts& Cuts) const
+(SiCombinatorialTrackFinderData_xk& data, const TrackQualityCuts& Cuts) const
{
// Integer cuts
//
- if (!Cuts.getIntCut ("CosmicTrack" ,data.cosmicTrack)) data.cosmicTrack = 0;
+ if (!Cuts.getIntCut ("CosmicTrack" ,data.cosmicTrack())) data.cosmicTrack() = 0;
- if (!Cuts.getIntCut ("MinNumberOfClusters" ,data.nclusmin )) data.nclusmin = 7;
- data.nclusminb = data.nclusmin-1;
- if (data.nclusminb < 3) data.nclusminb = 3;
+ if (!Cuts.getIntCut ("MinNumberOfClusters" ,data.nclusmin() )) data.nclusmin() = 7;
+ data.nclusminb() = data.nclusmin()-1;
+ if (data.nclusminb() < 3) data.nclusminb() = 3;
- if (!Cuts.getIntCut ("MinNumberOfWClusters",data.nwclusmin )) data.nwclusmin = 7;
+ if (!Cuts.getIntCut ("MinNumberOfWClusters",data.nwclusmin() )) data.nwclusmin() = 7;
- if (!Cuts.getIntCut ("MaxNumberOfHoles" ,data.nholesmax )) data.nholesmax = 2;
- if (!Cuts.getIntCut ("MaxHolesGae" ,data.dholesmax )) data.dholesmax = 2;
- if (!data.cosmicTrack) {
- if (data.nholesmax > 2) data.nholesmax = 2;
- if (data.dholesmax > 2) data.dholesmax = 2;
+ if (!Cuts.getIntCut ("MaxNumberOfHoles" ,data.nholesmax() )) data.nholesmax() = 2;
+ if (!Cuts.getIntCut ("MaxHolesGae" ,data.dholesmax() )) data.dholesmax() = 2;
+ if (!data.cosmicTrack()) {
+ if (data.nholesmax() > 2) data.nholesmax() = 2;
+ if (data.dholesmax() > 2) data.dholesmax() = 2;
}
- if (data.dholesmax > data.nholesmax) data.dholesmax = data.nholesmax;
+ if (data.dholesmax() > data.nholesmax()) data.dholesmax() = data.nholesmax();
int useasso;
if (!Cuts.getIntCut ("UseAssociationTool" ,useasso )) useasso = 0;
int simpletrack;
if (!Cuts.getIntCut ("SimpleTrack" ,simpletrack )) simpletrack = 0;
- simpletrack ? data.simpleTrack = true : data.simpleTrack = false;
+ simpletrack ? data.simpleTrack() = true : data.simpleTrack() = false;
int multitrack;
if (!Cuts.getIntCut ("doMultiTracksProd" ,multitrack )) multitrack = 0;
// Double cuts
//
- if (!Cuts.getDoubleCut("pTmin" ,data.pTmin )) data.pTmin = 500.;
- if (!Cuts.getDoubleCut("pTminBrem" ,data.pTminBrem )) data.pTminBrem =1000.;
+ if (!Cuts.getDoubleCut("pTmin" ,data.pTmin() )) data.pTmin() = 500.;
+ if (!Cuts.getDoubleCut("pTminBrem" ,data.pTminBrem() )) data.pTminBrem() =1000.;
- if (!Cuts.getDoubleCut("MaxXi2forCluster" ,data.xi2max )) data.xi2max = 9.;
- if (!Cuts.getDoubleCut("MaxXi2forOutlier" ,data.xi2maxNoAdd)) data.xi2maxNoAdd = 25.;
- if (!data.cosmicTrack) {
- if (data.xi2maxNoAdd > 25.) data.xi2maxNoAdd = 25.;
+ if (!Cuts.getDoubleCut("MaxXi2forCluster" ,data.xi2max() )) data.xi2max() = 9.;
+ if (!Cuts.getDoubleCut("MaxXi2forOutlier" ,data.xi2maxNoAdd())) data.xi2maxNoAdd() = 25.;
+ if (!data.cosmicTrack()) {
+ if (data.xi2maxNoAdd() > 25.) data.xi2maxNoAdd() = 25.;
}
- if (data.xi2maxNoAdd <= data.xi2max) data.xi2maxNoAdd = data.xi2max+5.;
+ if (data.xi2maxNoAdd() <= data.xi2max()) data.xi2maxNoAdd() = data.xi2max()+5.;
- if (!Cuts.getDoubleCut("MaxXi2forSearch" ,data.xi2maxlink )) data.xi2maxlink = 100.;
+ if (!Cuts.getDoubleCut("MaxXi2forSearch" ,data.xi2maxlink() )) data.xi2maxlink() = 100.;
double xi2m;
if (!Cuts.getDoubleCut("MaxXi2MultiTracks" ,xi2m )) xi2m = 7.;
- if (!data.cosmicTrack) {
+ if (!data.cosmicTrack()) {
if (xi2m > 7.) xi2m = 7.;
}
- data.tools.setXi2pTmin(data.xi2max, data.xi2maxNoAdd, data.xi2maxlink, data.pTmin);
- data.tools.setHolesClusters(data.nholesmax, data.dholesmax, data.nclusmin);
- data.tools.setAssociation(useasso);
- data.tools.setMultiTracks(multitrack, xi2m);
- data.trajectory.setParameters();
+ data.tools().setXi2pTmin(data.xi2max(), data.xi2maxNoAdd(), data.xi2maxlink(), data.pTmin());
+ data.tools().setHolesClusters(data.nholesmax(), data.dholesmax(), data.nclusmin());
+ data.tools().setAssociation(useasso);
+ data.tools().setMultiTracks(multitrack, xi2m);
+ data.trajectory().setParameters();
}
-InDet::SiCombinatorialTrackFinder_xk::EventData& InDet::SiCombinatorialTrackFinder_xk::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot] = EventData{};
-
- // Set SiTools and conditions
- //
- m_eventData[slot].tools.setTools(&*m_proptool, &*m_updatortool, &*m_riocreator,
- ((not m_assoTool.empty()) ? &*m_assoTool : nullptr),
- &*m_fieldServiceHandle);
- m_eventData[slot].tools.setTools(m_usePIX ? &*m_pixelCondSummaryTool : nullptr,
- m_useSCT ? &*m_sctCondSummaryTool : nullptr);
- m_eventData[slot].tools.setTools(&m_fieldprop);
-
- // Set tool to trajectory
- //
- m_eventData[slot].trajectory.setTools(&m_eventData[slot].tools);
- }
- return m_eventData[slot];
+void InDet::SiCombinatorialTrackFinder_xk::initializeCombinatorialData(SiCombinatorialTrackFinderData_xk& data) const {
+ data.setTools(&*m_proptool,
+ &*m_updatortool,
+ &*m_riocreator,
+ ((not m_assoTool.empty()) ? &*m_assoTool : nullptr),
+ &*m_fieldServiceHandle,
+ (m_usePIX ? &*m_pixelCondSummaryTool : nullptr),
+ (m_useSCT ? &*m_sctCondSummaryTool : nullptr),
+ &m_fieldprop);
}
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.cxx b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.cxx
index 1ff3884ce65ce5827fcfe3eed4c317a937c3ea67..9831f0d1300e0796a97561415b9d88f98e962cec 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.cxx
@@ -5,7 +5,7 @@
#include "SiDetElementBoundaryLinksCondAlg_xk.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLink_xk.h"
+#include "SiSPSeededTrackFinderData/SiDetElementBoundaryLink_xk.h"
#include "StoreGate/ReadCondHandle.h"
#include "StoreGate/WriteCondHandle.h"
diff --git a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.h b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.h
index 7e0a090f6ecb28a713516b32d7d089b497a448ab..797c1baee0fb6954f64e4fb3af8dcd4ec3fe68b3 100644
--- a/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.h
+++ b/InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk/src/SiDetElementBoundaryLinksCondAlg_xk.h
@@ -8,7 +8,7 @@
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
-#include "SiCombinatorialTrackFinderTool_xk/SiDetElementBoundaryLinks_xk.h"
+#include "SiSPSeededTrackFinderData/SiDetElementBoundaryLinks_xk.h"
#include "StoreGate/ReadCondHandleKey.h"
#include "StoreGate/WriteCondHandleKey.h"
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
index 30ff03daee5778395888ed3ced9bc90afd385b80..89609dd5a8ce9870550ad85a209aa5df58a744e7 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/CMakeLists.txt
@@ -8,6 +8,7 @@ atlas_subdir( SiDetElementsRoadTool_xk )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
+ Control/AthenaKernel
GaudiKernel
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecTools/InDetRecToolInterfaces
@@ -24,7 +25,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( SiDetElementsRoadTool_xk
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkSurfaces AthenaPoolUtilities EventInfo TrkPrepRawData TrkExInterfaces )
+ LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel InDetReadoutGeometry InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkSurfaces AthenaPoolUtilities EventInfo TrkPrepRawData TrkExInterfaces )
# Install files from the package:
atlas_install_headers( SiDetElementsRoadTool_xk )
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h
index a4e6eba5cb56e5ec9bf1f5dc9f7e28c34d05b7ff..a56a938bca3ebe3165a46e90c08fc0e1d8649ef8 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -20,6 +22,7 @@
#include "InDetRecToolInterfaces/ISiDetElementsRoadMaker.h"
#include "AthenaBaseComps/AthAlgTool.h"
+#include "AthenaKernel/SlotSpecificObj.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
#include "SiDetElementsRoadTool_xk/SiDetElementsLayer_xk.h"
#include "SiDetElementsRoadTool_xk/SiDetElementsLayerVectors_xk.h"
@@ -66,8 +69,8 @@ namespace InDet{
SiDetElementsRoadMaker_xk
(const std::string&, const std::string&, const IInterface*);
virtual ~SiDetElementsRoadMaker_xk() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize ();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Main methods for road builder
@@ -75,25 +78,25 @@ namespace InDet{
virtual void detElementsRoad
(const std::list<const Trk::SpacePoint*>&,
- std::list<const InDetDD::SiDetectorElement*>&) const;
+ std::list<const InDetDD::SiDetectorElement*>&) const override;
virtual void detElementsRoad
(std::list<Amg::Vector3D>&,
- std::list<const InDetDD::SiDetectorElement*>&) const;
+ std::list<const InDetDD::SiDetectorElement*>&) const override;
virtual void detElementsRoad
(const Trk::TrackParameters&,
Trk::PropDirection,
- std::list<const InDetDD::SiDetectorElement*>&) const;
+ std::list<const InDetDD::SiDetectorElement*>&) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- MsgStream& dump(MsgStream & out) const;
- std::ostream& dump(std::ostream& out) const;
+ MsgStream& dump(MsgStream & out) const override;
+ std::ostream& dump(std::ostream& out) const override;
- protected:
+ private:
///////////////////////////////////////////////////////////////////
// Protected Data
@@ -120,16 +123,19 @@ namespace InDet{
Trk::MagneticFieldMode m_fieldModeEnum{Trk::FullField};
int m_outputlevel{};
- // This is not set by third detElementsRoad method but used by first detElementsRoad method.
+ // This is not set by third detElementsRoad method but used by first detElementsRoad method.
// This is not multithread safe.
mutable std::atomic_bool m_test{};
// Mutex to protect the contents
mutable std::mutex m_mutex;
- // Cache to store events for slots
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- // std::vector<SiDetElementsLayer_xk> for each event. This is not const.
- mutable SiDetElementsLayerVectors_xk m_layerVectors[3] ATLAS_THREAD_SAFE; // Guarded by m_mutex
+ // Cache
+ struct CacheEntry {
+ EventContext::ContextEvt_t m_evt{EventContext::INVALID_CONTEXT_EVT};
+ SiDetElementsLayerVectors_xk m_layerVectors{SiDetElementsLayerVectors_xk(3)};
+ // std::vector<SiDetElementsLayer_xk> for each layer. This is not const.
+ };
+ mutable SG::SlotSpecificObj<CacheEntry> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
///////////////////////////////////////////////////////////////////
// Methods
diff --git a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
index b4105a5c3f2256e181b0f205277a2dad171c9136..f53c2a632b2d4e2bfcc6722d4b179b6239712535 100644
--- a/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx
@@ -130,6 +130,7 @@ MsgStream& InDet::SiDetElementsRoadMaker_xk::dumpConditions(MsgStream& out) cons
s6.append("|");
std::vector<SiDetElementsLayer_xk>* layer[3];
+ std::lock_guard<std::mutex> lock{m_mutex};
getLayers(layer);
int maps = 0;
@@ -312,6 +313,7 @@ void InDet::SiDetElementsRoadMaker_xk::detElementsRoad
if (!m_usePIX && !m_useSCT) return;
std::vector<SiDetElementsLayer_xk>* layer[3];
+ std::lock_guard<std::mutex> lock{m_mutex};
getLayers(layer);
@@ -747,30 +749,21 @@ Trk::CylinderBounds InDet::SiDetElementsRoadMaker_xk::getBound
void InDet::SiDetElementsRoadMaker_xk::getLayers(std::vector<SiDetElementsLayer_xk>* (&layer)[3]) const {
const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- std::lock_guard<std::mutex> lock{m_mutex};
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- if (slot>=m_cache.size()) {
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement.
- m_layerVectors[0].resize(slot+1);
- m_layerVectors[1].resize(slot+1);
- m_layerVectors[2].resize(slot+1);
- }
- if (m_cache[slot]!=evt) {
+ CacheEntry* ent{m_cache.get(ctx)};
+ if (ent->m_evt!=ctx.evt()) {
SG::ReadCondHandle<SiDetElementsLayerVectors_xk> layerVec{m_layerVecKey, ctx};
if (not layerVec.isValid()) {
ATH_MSG_ERROR("Failed to get " << m_layerVecKey.key());
}
- m_cache[slot] = evt;
+ ent->m_evt = ctx.evt();
// Condition objects are copied for each event
// so that we can set used state in shared detector elements.
// Index 0: Endcap C, 1: Barrel, 2: Endcap A
- m_layerVectors[0][slot] = (*layerVec)->at(0);
- m_layerVectors[1][slot] = (*layerVec)->at(1);
- m_layerVectors[2][slot] = (*layerVec)->at(2);
+ ent->m_layerVectors[0] = (*layerVec)->at(0);
+ ent->m_layerVectors[1] = (*layerVec)->at(1);
+ ent->m_layerVectors[2] = (*layerVec)->at(2);
}
- layer[0] = &(m_layerVectors[0][slot]);
- layer[1] = &(m_layerVectors[1][slot]);
- layer[2] = &(m_layerVectors[2][slot]);
+ layer[0] = &(ent->m_layerVectors[0]);
+ layer[1] = &(ent->m_layerVectors[1]);
+ layer[2] = &(ent->m_layerVectors[2]);
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
index 2dc0408e48ccd49002827c902dc6e4097e58b643..8b9cce7b072535b9a6c09ca728adf0b0a70cabfd 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/CMakeLists.txt
@@ -13,6 +13,7 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecEvent/InDetPrepRawData
InnerDetector/InDetRecEvent/SiSpacePointsSeed
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
InnerDetector/InDetRecTools/InDetRecToolInterfaces
MagneticField/MagFieldInterfaces
Tracking/TrkDetDescr/TrkSurfaces
@@ -24,7 +25,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( SiSpacePointsSeedTool_xk
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSpacePointsSeed InDetRecToolInterfaces MagFieldInterfaces TrkSurfaces TrkSpacePoint TrkToolInterfaces )
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetReadoutGeometry InDetPrepRawData SiSpacePointsSeed SiSPSeededTrackFinderData InDetRecToolInterfaces MagFieldInterfaces TrkSurfaces TrkSpacePoint TrkToolInterfaces )
# Install files from the package:
atlas_install_headers( SiSpacePointsSeedTool_xk )
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
index 71400b792ea3b9a3ed1209f19c717378ef29cf94..b153516ea6905bc64a133149dbdad2d5c5b86220 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ATLxk.h
@@ -23,8 +23,8 @@
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointsProSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
#include "TrkToolInterfaces/IPRD_AssociationTool.h"
@@ -34,15 +34,14 @@
#include <iosfwd>
#include <list>
-#include <map>
-#include <mutex>
-#include <set>
#include <vector>
class MsgStream;
namespace InDet {
+ using EventData = SiSpacePointsSeedMakerEventData;
+
class SiSpacePointsSeedMaker_ATLxk :
public extends<AthAlgTool, ISiSpacePointsSeedMaker>
{
@@ -58,31 +57,34 @@ namespace InDet {
SiSpacePointsSeedMaker_ATLxk(const std::string&, const std::string&, const IInterface*);
virtual ~SiSpacePointsSeedMaker_ATLxk() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual void newEvent(int iteration) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& iRD) const;
+ virtual void newEvent(EventData& data, int iteration) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& iRD) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find2Sp(const std::list<Trk::Vertex>& lv) const;
+ virtual void find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv) const;
- virtual void find3Sp(const std::list<Trk::Vertex>& lv, const double* zVertex) const;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* zVertex) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -90,21 +92,20 @@ namespace InDet {
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
- virtual void findVSp(const std::list<Trk::Vertex>& lv) const;
+ virtual void findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
- virtual const SiSpacePointsSeed* next() const;
+ virtual const SiSpacePointsSeed* next(EventData& data) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream & out) const;
- virtual std::ostream& dump(std::ostream& out) const;
+ virtual MsgStream& dump(EventData& data, MsgStream& out) const override;
private:
enum Size {SizeRF=53,
@@ -201,93 +202,6 @@ namespace InDet {
float m_sF{0};
float m_sFv{0};
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- // Updated only in newEvent and newRegion
- bool trigger{false};
- int iteration{0};
- int r_first{0};
- int ns{0};
- int nr{0};
- int nsaz{0};
- int nsazv{0};
- int nrfz{0};
- int nrfzv{0};
- float K{0.};
- float dzdrmin{0.}; // Always equals to m_dzdrmin0
- float dzdrmax{0.}; // Always equals to m_dzdrmax0
- float ipt2C{0.}; // Always equals to m_ipt2*m_COF
- float ipt2K{0.};
- float COFK{0.};
- std::vector<int> r_index;
- std::vector<int> r_map;
- std::vector<std::list<InDet::SiSpacePointForSeed*>> r_Sorted;
-
- ///////////////////////////////////////////////////////////////////
- // Beam geometry
- // Updated only in buildBeamFrameWork,
- // which is called by newEvent and newRegion
- ///////////////////////////////////////////////////////////////////
- float xbeam[4]{0., 1., 0., 0.}; // x,ax,ay,az - center and x-axis direction
- float ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
- float zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
-
- ///////////////////////////////////////////////////////////////////
- // Tables for 3 space points seeds search
- // Updated in many mthods
- ///////////////////////////////////////////////////////////////////
- std::vector<InDet::SiSpacePointForSeed*> SP;
- std::vector<float> Zo;
- std::vector<float> Tz;
- std::vector<float> R;
- std::vector<float> U;
- std::vector<float> V;
- std::vector<float> Er;
-
- // Updated in many methods
- InDet::SiSpacePointsSeed seedOutput;
- std::vector<InDet::SiSpacePointsProSeed> OneSeeds;
- std::list<InDet::SiSpacePointForSeed> l_spforseed;
- std::vector<std::pair<float,InDet::SiSpacePointForSeed*>> CmSp;
- bool endlist{true};
- bool isvertex{false};
- bool checketa{false};
- int state{0};
- int nspoint{2};
- int mode{0};
- int nlist{0};
- int fNmin{0};
- int fvNmin{0};
- int zMin{0};
- int nOneSeeds{0};
- int fillOneSeeds{};
- int nprint{0};
- float zminU{0.};
- float zmaxU{0.};
- float zminB{0.};
- float zmaxB{0.};
- float ftrig{0.};
- float ftrigW{0.};
- float umax{0.};
- int rfz_index[SizeRFZ];
- int rfz_map[SizeRFZ];
- int rfzv_index[SizeRFZV];
- int rfzv_map[SizeRFZV];
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted[SizeRFZ];
- std::list<InDet::SiSpacePointForSeed*> rfzv_Sorted[SizeRFZV];
- std::list<InDet::SiSpacePointForSeed>::iterator i_spforseed;
- std::list<InDet::SiSpacePointForSeed*>::iterator rMin;
- std::multimap<float,InDet::SiSpacePointsProSeed*> seeds;
- std::multimap<float,InDet::SiSpacePointsProSeed*>::iterator seed;
- std::multimap<float,InDet::SiSpacePointsProSeed*> mapOneSeeds;
- std::set<float> l_vertex;
- std::list<InDet::SiSpacePointsProSeed> l_seeds;
- std::list<InDet::SiSpacePointsProSeed>::iterator i_seed;
- std::list<InDet::SiSpacePointsProSeed>::iterator i_seede;
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////
@@ -299,8 +213,6 @@ namespace InDet {
SiSpacePointsSeedMaker_ATLxk &operator=(const SiSpacePointsSeedMaker_ATLxk&) = delete;
//@}
- EventData& getEventData() const;
-
MsgStream& dumpConditions(EventData& data, MsgStream& out) const;
MsgStream& dumpEvent (EventData& data, MsgStream& out) const;
@@ -342,10 +254,9 @@ namespace InDet {
bool isZCompatible(EventData& data, float& Zv, float& R, float& T) const;
void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const& sp, float* r) const;
bool isUsed(const Trk::SpacePoint* sp) const;
- };
- MsgStream& operator << (MsgStream& sl, const SiSpacePointsSeedMaker_ATLxk& se);
- std::ostream& operator << (std::ostream& sl, const SiSpacePointsSeedMaker_ATLxk& se);
+ void initializeEventData(EventData& data) const;
+ };
} // end of name space
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
index 8239a884cf14460350239aec24723a11ab02fdd9..a5a1c115d07ec4384a3a174be63c558307099231 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_BeamGas.h
@@ -23,7 +23,8 @@
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
@@ -32,8 +33,6 @@
#include <iosfwd>
#include <list>
-#include <map>
-#include <mutex>
#include <vector>
class MsgStream;
@@ -44,6 +43,8 @@ namespace Trk {
namespace InDet {
+ using EventData = SiSpacePointsSeedMakerEventData;
+
class SiSpacePointsSeedMaker_BeamGas :
public extends<AthAlgTool,ISiSpacePointsSeedMaker>
{
@@ -60,31 +61,34 @@ namespace InDet {
SiSpacePointsSeedMaker_BeamGas
(const std::string&, const std::string&, const IInterface*);
virtual ~SiSpacePointsSeedMaker_BeamGas() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual void newEvent(int iteration) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& iRD) const;
+ virtual void newEvent(EventData& data, int iteration) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& iRD) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find2Sp(const std::list<Trk::Vertex>& lv) const;
+ virtual void find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv) const;
- virtual void find3Sp(const std::list<Trk::Vertex>& lv, const double* zVertex) const;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* zVertex) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -92,21 +96,20 @@ namespace InDet {
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
- virtual void findVSp(const std::list<Trk::Vertex>& lv) const;
+ virtual void findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
- virtual const SiSpacePointsSeed* next() const;
-
+ virtual const SiSpacePointsSeed* next(EventData& data) const override;
+
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream & out) const;
- virtual std::ostream& dump(std::ostream& out) const;
+ virtual MsgStream& dump(EventData& data, MsgStream& out) const override;
private:
enum Size {SizeRF=53,
@@ -177,63 +180,6 @@ namespace InDet {
float m_ipt2{0.};
float m_sF{0.};
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- bool endlist{true};
- int state{0};
- int nspoint{2};
- int nlist{0};
- int mode{0};
- int fNmin{0};
- int zMin{0};
- int nprint{0};
- int ns{0};
- int nsaz{0};
- int nr{0};
- int nrf{0};
- int nrfz{0};
- int nOneSeeds{0};
- int rf_index[SizeRF];
- int rf_map[SizeRF];
- int rfz_index[SizeRFZ];
- int rfz_map[SizeRFZ];
- float K{0.};
-
- ///////////////////////////////////////////////////////////////////
- // Beam geometry
- ///////////////////////////////////////////////////////////////////
- float xbeam[4]{0., 1., 0., 0.}; // x,ax,ay,az - center and x-axis direction
- float ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
- float zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
-
- std::vector<int> r_index;
- std::vector<int> r_map;
- std::vector<std::list<InDet::SiSpacePointForSeed*>> r_Sorted;
- std::vector<InDet::SiSpacePointsSeed> OneSeeds;
- std::multimap<float, InDet::SiSpacePointsSeed*> mapOneSeeds;
- std::list<InDet::SiSpacePointForSeed*> rf_Sorted[SizeRF];
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted[SizeRFZ];
- std::list<InDet::SiSpacePointForSeed> l_spforseed;
- std::list<InDet::SiSpacePointForSeed>::iterator i_spforseed;
- std::list<InDet::SiSpacePointForSeed*>::iterator rMin;
- std::list<InDet::SiSpacePointsSeed> l_seeds;
- std::list<InDet::SiSpacePointsSeed>::iterator i_seed;
- std::list<InDet::SiSpacePointsSeed>::iterator i_seede;
-
- ///////////////////////////////////////////////////////////////////
- // Tables for 3 space points seeds search
- ///////////////////////////////////////////////////////////////////
- std::vector<InDet::SiSpacePointForSeed*> SP;
- std::vector<float> R;
- std::vector<float> Tz;
- std::vector<float> Er;
- std::vector<float> U;
- std::vector<float> V;
- std::vector<float> Zo;
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////
@@ -285,12 +231,9 @@ namespace InDet {
void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const& sp, float* r) const;
bool isUsed(const Trk::SpacePoint*) const;
- EventData& getEventData() const;
+ void initializeEventData(EventData& data) const;
};
- MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_BeamGas&);
- std::ostream& operator << (std::ostream&,const SiSpacePointsSeedMaker_BeamGas&);
-
} // end of name space
#endif // SiSpacePointsSeedMaker_BeamGas_H
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
index 426f6b1f8cd994103f0100227f15f5a09ca21815..6133aa7f16868e682b4353c66824b005967573d9 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Cosmic.h
@@ -22,7 +22,8 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
@@ -31,8 +32,6 @@
#include <iosfwd>
#include <list>
-#include <map>
-#include <mutex>
#include <vector>
class MsgStream;
@@ -43,6 +42,8 @@ namespace Trk {
namespace InDet {
+ using EventData = SiSpacePointsSeedMakerEventData;
+
class SiSpacePointsSeedMaker_Cosmic :
public extends<AthAlgTool, ISiSpacePointsSeedMaker>
{
@@ -59,30 +60,33 @@ namespace InDet {
SiSpacePointsSeedMaker_Cosmic
(const std::string&, const std::string&, const IInterface*);
virtual ~SiSpacePointsSeedMaker_Cosmic() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual void newEvent(int iteration) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& iRD) const;
+ virtual void newEvent(EventData& data, int iteration) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& iRD) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find2Sp(const std::list<Trk::Vertex>& lv) const;
+ virtual void find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv) const;
- virtual void find3Sp(const std::list<Trk::Vertex>& lv, const double* zVertex) const;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* zVertex) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -90,21 +94,20 @@ namespace InDet {
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
- virtual void findVSp(const std::list<Trk::Vertex>& lv) const;
-
+ virtual void findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
+
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
- virtual const SiSpacePointsSeed* next() const;
+ virtual const SiSpacePointsSeed* next(EventData& data) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream & out) const;
- virtual std::ostream& dump(std::ostream& out) const;
+ virtual MsgStream& dump(EventData& data, MsgStream& out) const override;
private:
enum Size {SizeRF=53,
@@ -165,52 +168,6 @@ namespace InDet {
float m_dzdrmax{};
float m_sF{};
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- bool endlist{true};
- int state{0};
- int nprint{0};
- int nspoint{2};
- int mode{0};
- int nlist{0};
- int nseeds{0};
- int ns{0};
- int nsaz{0};
- int nr{0};
- int nrf{0};
- int nrfz{0};
- int fNmin{0};
- int zMin{0};
- int rf_index[SizeRF];
- int rf_map[SizeRF];
- int rfz_index[SizeRFZ];
- int rfz_map[SizeRFZ];
- std::vector<std::list<InDet::SiSpacePointForSeed*>> r_Sorted;
- std::vector<int> r_index;
- std::vector<int> r_map;
- std::vector<InDet::SiSpacePointsSeed> seeds;
- std::multimap<float,InDet::SiSpacePointsSeed*> l_seeds;
- std::multimap<float,InDet::SiSpacePointsSeed*>::iterator i_seed;
- std::multimap<float,InDet::SiSpacePointsSeed*>::iterator i_seede;
- std::list<InDet::SiSpacePointForSeed*> rf_Sorted[SizeRF];
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted[SizeRFZ];
- std::list<InDet::SiSpacePointForSeed> l_spforseed;
- std::list<InDet::SiSpacePointForSeed>::iterator i_spforseed;
- std::list<InDet::SiSpacePointForSeed*>::iterator rMin;
- ///////////////////////////////////////////////////////////////////
- // Tables for 3 space points seeds search
- ///////////////////////////////////////////////////////////////////
- std::vector<InDet::SiSpacePointForSeed*> SP;
- std::vector<float> R;
- std::vector<float> Tz;
- std::vector<float> Er;
- std::vector<float> U;
- std::vector<float> V;
- std::vector<float> Zo;
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////
@@ -261,12 +218,9 @@ namespace InDet {
bool isUsed(const Trk::SpacePoint*) const;
- EventData& getEventData() const;
+ void initializeEventData(EventData& data) const;
};
- MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_Cosmic&);
- std::ostream& operator << (std::ostream&,const SiSpacePointsSeedMaker_Cosmic&);
-
} // end of name space
#endif // SiSpacePointsSeedMaker_Cosmic_H
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
index beae30b868c730fc92b67ce555bd563d8344b8ee..6dd0e420deecc817e5dfcf98e4d0ee5d63832c01 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_HeavyIon.h
@@ -23,7 +23,8 @@
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
@@ -32,14 +33,14 @@
#include <iosfwd>
#include <list>
-#include <map>
-#include <mutex>
#include <vector>
class MsgStream;
namespace InDet {
+ using EventData = SiSpacePointsSeedMakerEventData;
+
class SiSpacePointsSeedMaker_HeavyIon :
public extends<AthAlgTool, ISiSpacePointsSeedMaker>
{
@@ -56,31 +57,34 @@ namespace InDet {
SiSpacePointsSeedMaker_HeavyIon
(const std::string&,const std::string&,const IInterface*);
virtual ~SiSpacePointsSeedMaker_HeavyIon() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual void newEvent(int iteration) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>&vSCT) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>&vSCT, const IRoiDescriptor& iRD) const;
+ virtual void newEvent(EventData& data, int iteration) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>&vSCT) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>&vSCT,
+ const IRoiDescriptor& iRD) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find2Sp(const std::list<Trk::Vertex>& lv) const;
+ virtual void find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv) const;
- virtual void find3Sp(const std::list<Trk::Vertex>& lv, const double* zVertex) const;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* zVertex) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -88,21 +92,20 @@ namespace InDet {
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
- virtual void findVSp(const std::list<Trk::Vertex>& lv) const;
+ virtual void findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
- virtual const SiSpacePointsSeed* next() const;
+ virtual const SiSpacePointsSeed* next(EventData& data) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream & out) const;
- virtual std::ostream& dump(std::ostream& out) const;
+ virtual MsgStream& dump(EventData& data, MsgStream& out) const override;
private:
enum Size {SizeRF=53,
@@ -192,65 +195,6 @@ namespace InDet {
float m_sF{0.};
float m_sFv{0.};
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- bool endlist{true};
- bool trigger{false};
- bool izvertex{false};
- int nprint{0};
- int state{0};
- int nspoint{2};
- int mode{0};
- int nlist{0};
- int ns{0};
- int nsaz{0};
- int nsazv{0};
- int fNmin{0};
- int fvNmin{0};
- int zMin{0};
- int nr{0};
- int nrfz{0};
- int nrfzv{0};
- int nOneSeeds{0};
- int rfz_index[SizeRFZ];
- int rfz_map[SizeRFZ];
- int rfzv_index[SizeRFZV];
- int rfzv_map[SizeRFZV];
- float K{0.};
- std::vector<std::list<InDet::SiSpacePointForSeed*>> r_Sorted;
- std::vector<int> r_index;
- std::vector<int> r_map;
- std::vector<InDet::SiSpacePointsSeed> OneSeeds;
- std::multimap<float,InDet::SiSpacePointsSeed*> mapOneSeeds;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted[SizeRFZ];
- std::list<InDet::SiSpacePointForSeed*> rfzv_Sorted[SizeRFZV];
- std::list<InDet::SiSpacePointForSeed> l_spforseed;
- std::list<InDet::SiSpacePointForSeed>::iterator i_spforseed;
- std::list<InDet::SiSpacePointForSeed*>::iterator rMin;
- std::list<InDet::SiSpacePointsSeed> l_seeds;
- std::list<InDet::SiSpacePointsSeed>::iterator i_seed;
- std::list<InDet::SiSpacePointsSeed>::iterator i_seede;
- std::list<float> l_vertex;
- ///////////////////////////////////////////////////////////////////
- // Tables for 3 space points seeds search
- ///////////////////////////////////////////////////////////////////
- std::vector<InDet::SiSpacePointForSeed*> SP;
- std::vector<float> R;
- std::vector<float> Tz;
- std::vector<float> Er;
- std::vector<float> U;
- std::vector<float> V;
- std::vector<float> Zo;
- ///////////////////////////////////////////////////////////////////
- // Beam geometry
- ///////////////////////////////////////////////////////////////////
- float xbeam[4]{0., 1., 0., 0.}; // x,ax,ay,az - center and x-axis direction
- float ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
- float zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////
@@ -316,12 +260,9 @@ namespace InDet {
float dZVertexMin(EventData& data, float&) const;
void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) const;
- EventData& getEventData() const;
+ void initializeEventData(EventData& data) const;
};
- MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_HeavyIon&);
- std::ostream& operator << (std::ostream&,const SiSpacePointsSeedMaker_HeavyIon&);
-
} // end of name space
#endif // SiSpacePointsSeedMaker_HeavyIon_H
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
index 1132be3111ef22c0ad0b97fd133e0a8d2afa1b7b..14337db37c5a7cd7a911da20d1477e9996896f20 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_ITK.h
@@ -23,8 +23,8 @@
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeedITK.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointsProSeedITK.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeedITK.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
@@ -33,9 +33,6 @@
#include <iosfwd>
#include <list>
-#include <map>
-#include <mutex>
-#include <set>
#include <vector>
class MsgStream;
@@ -46,6 +43,8 @@ namespace Trk {
namespace InDet {
+ using EventData = SiSpacePointsSeedMakerEventData;
+
class SiSpacePointsSeedMaker_ITK :
public extends<AthAlgTool, ISiSpacePointsSeedMaker>
{
@@ -62,31 +61,34 @@ namespace InDet {
SiSpacePointsSeedMaker_ITK
(const std::string&,const std::string&,const IInterface*);
virtual ~SiSpacePointsSeedMaker_ITK() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual void newEvent(int iteration) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& iRD) const;
+ virtual void newEvent(EventData& data, int iteration) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& iRD) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find2Sp(const std::list<Trk::Vertex>& lv) const;
+ virtual void find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv) const;
- virtual void find3Sp(const std::list<Trk::Vertex>& lv, const double* zVertex) const;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* zVertex) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -94,21 +96,20 @@ namespace InDet {
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
- virtual void findVSp(const std::list<Trk::Vertex>& lv) const;
+ virtual void findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
- virtual const SiSpacePointsSeed* next() const;
+ virtual const SiSpacePointsSeed* next(EventData& data) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream & out) const;
- virtual std::ostream& dump(std::ostream& out) const;
+ virtual MsgStream& dump(EventData& data, MsgStream& out) const override;
private:
enum Size {SizeRF=53,
@@ -205,87 +206,6 @@ namespace InDet {
float m_sF{0.};
float m_sFv{0.};
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- bool checketa{false};
- bool endlist{true};
- bool trigger{false};
- bool isvertex{false};
- int nprint{0};
- int state{0};
- int nspoint{2};
- int mode{0};
- int nlist{0};
- int iteration{0};
- int iteration0{0};
- int r_first{0};
- int ns{0};
- int nsaz{0};
- int nsazv{0};
- int zMin{0};
- int nr{0};
- int nrfz{0};
- int nrfzv{0};
- int fNmin{0};
- int fvNmin{0};
- int nOneSeeds{0};
- int fillOneSeeds{0};
- int rfz_index[SizeRFZ];
- int rfz_map[SizeRFZ];
- int rfzv_index[SizeRFZV];
- int rfzv_map[SizeRFZV];
- float dzdrmin{0.};
- float dzdrmax{0.};
- float zminU{0.};
- float zmaxU{0.};
- float zminB{0.};
- float zmaxB{0.};
- float ftrig{0.};
- float ftrigW{0.};
- float K{0.};
- float ipt2K{0.};
- float ipt2C{0.};
- float COFK{0.};
- InDet::SiSpacePointsSeed seedOutput;
- std::vector<std::list<InDet::SiSpacePointForSeedITK*>> r_Sorted;
- std::vector<int> r_index;
- std::vector<int> r_map;
- std::vector<InDet::SiSpacePointsProSeedITK> OneSeeds;
- std::vector<std::pair<float,InDet::SiSpacePointForSeedITK*>> CmSp;
- std::multimap<float,InDet::SiSpacePointsProSeedITK*> seeds;
- std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator seed;
- std::multimap<float,InDet::SiSpacePointsProSeedITK*> mapOneSeeds;
- std::list<InDet::SiSpacePointForSeedITK*> rfz_Sorted[SizeRFZ];
- std::list<InDet::SiSpacePointForSeedITK*> rfzv_Sorted[SizeRFZV];
- std::list<InDet::SiSpacePointForSeedITK> l_spforseed;
- std::list<InDet::SiSpacePointForSeedITK>::iterator i_spforseed;
- std::list<InDet::SiSpacePointForSeedITK*>::iterator rMin;
- std::list<InDet::SiSpacePointsProSeedITK> l_seeds;
- std::list<InDet::SiSpacePointsProSeedITK>::iterator i_seed;
- std::list<InDet::SiSpacePointsProSeedITK>::iterator i_seede;
- std::set<float> l_vertex;
- ///////////////////////////////////////////////////////////////////
- // Tables for 3 space points seeds search
- ///////////////////////////////////////////////////////////////////
- std::vector<InDet::SiSpacePointForSeedITK*> SP;
- std::vector<float> R;
- std::vector<float> Tz;
- std::vector<float> Er;
- std::vector<float> U;
- std::vector<float> V;
- std::vector<float> X;
- std::vector<float> Y;
- std::vector<float> Zo;
- ///////////////////////////////////////////////////////////////////
- // Beam geometry
- ///////////////////////////////////////////////////////////////////
- float xbeam[4]{0., 1., 0., 0,}; // x,ax,ay,az - center and x-axis direction
- float ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
- float zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////
@@ -350,12 +270,9 @@ namespace InDet {
void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) const;
bool isUsed(const Trk::SpacePoint*) const;
- EventData& getEventData() const;
+ void initializeEventData(EventData& data) const;
};
- MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_ITK&);
- std::ostream& operator << (std::ostream&,const SiSpacePointsSeedMaker_ITK&);
-
} // end of name space
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
index ae39132c03d4a2c4dfda228ac284ced08dc28ffe..3479a659f31450abc4d1f0fc8513e69e8ac2cd41 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_LowMomentum.h
@@ -23,7 +23,8 @@
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
@@ -31,8 +32,6 @@
#include "GaudiKernel/ToolHandle.h"
#include <list>
-#include <map>
-#include <mutex>
#include <vector>
class MsgStream;
@@ -43,6 +42,8 @@ namespace Trk {
namespace InDet {
+ using EventData = SiSpacePointsSeedMakerEventData;
+
class SiSpacePointsSeedMaker_LowMomentum :
public extends<AthAlgTool, ISiSpacePointsSeedMaker>
{
@@ -59,31 +60,34 @@ namespace InDet {
SiSpacePointsSeedMaker_LowMomentum
(const std::string&,const std::string&,const IInterface*);
virtual ~SiSpacePointsSeedMaker_LowMomentum() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual void newEvent(int iteration) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& iRD) const;
+ virtual void newEvent(EventData& data, int iteration) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& iRD) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find2Sp(const std::list<Trk::Vertex>& lv) const;
+ virtual void find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv) const;
- virtual void find3Sp(const std::list<Trk::Vertex>& lv, const double* zVertex) const;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* zVertex) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -91,21 +95,20 @@ namespace InDet {
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
- virtual void findVSp(const std::list<Trk::Vertex>& lv) const;
+ virtual void findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
- virtual const SiSpacePointsSeed* next() const;
-
+ virtual const SiSpacePointsSeed* next(EventData& data) const override;
+
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream & out) const;
- virtual std::ostream& dump(std::ostream& out) const;
+ virtual MsgStream& dump(EventData& data, MsgStream& out) const override;
private:
enum Size {SizeRF=20,
@@ -176,57 +179,6 @@ namespace InDet {
float m_iptmax{1./400.};
float m_sF{0.};
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- bool endlist{true};
- bool trigger{false};
- int nprint{0};
- int state{0};
- int nspoint{2};
- int mode{0};
- int nlist{0};
- int ns{0};
- int nsaz{0};
- int fNmin{0};
- int zMin{0};
- int nr{0};
- int nrfz{0};
- int nOneSeeds{0};
- int rfz_index[SizeRFZ];
- int rfz_map[SizeRFZ];
- std::vector<int> r_index;
- std::vector<int> r_map;
- std::vector<std::list<InDet::SiSpacePointForSeed*>> r_Sorted;
- std::vector<InDet::SiSpacePointsSeed> OneSeeds;
- std::multimap<float,InDet::SiSpacePointsSeed*> mapOneSeeds;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted[SizeRFZ];
- std::list<InDet::SiSpacePointForSeed> l_spforseed;
- std::list<InDet::SiSpacePointForSeed>::iterator i_spforseed;
- std::list<InDet::SiSpacePointForSeed*>::iterator rMin;
- std::list<InDet::SiSpacePointsSeed> l_seeds;
- std::list<InDet::SiSpacePointsSeed>::iterator i_seed;
- std::list<InDet::SiSpacePointsSeed>::iterator i_seede;
- std::list<float> l_vertex;
- ///////////////////////////////////////////////////////////////////
- // Tables for 3 space points seeds search
- ///////////////////////////////////////////////////////////////////
- std::vector<InDet::SiSpacePointForSeed*> SP;
- std::vector<float> R;
- std::vector<float> Tz;
- std::vector<float> Er;
- std::vector<float> U;
- std::vector<float> V;
- std::vector<float> Zo;
- ///////////////////////////////////////////////////////////////////
- // Beam geometry
- ///////////////////////////////////////////////////////////////////
- float xbeam[4]{0., 1., 0., 0.}; // x,ax,ay,az - center and x-axis direction
- float ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
- float zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////
@@ -278,12 +230,9 @@ namespace InDet {
void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&,float*) const;
bool isUsed(const Trk::SpacePoint*) const;
- EventData& getEventData() const;
+ void initializeEventData(EventData& data) const;
};
- MsgStream& operator << (MsgStream& ,const SiSpacePointsSeedMaker_LowMomentum&);
- std::ostream& operator << (std::ostream&,const SiSpacePointsSeedMaker_LowMomentum&);
-
} // end of name space
#endif // SiSpacePointsSeedMaker_LowMomentum_H
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
index e046688f102c5d451adb6fe0729b0a0c46e9343e..3e8453fb9d4bea8d2b994e7c7f16cd68f8ed8152 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/SiSpacePointsSeedTool_xk/SiSpacePointsSeedMaker_Trigger.h
@@ -23,7 +23,8 @@
#include "BeamSpotConditionsData/BeamSpotData.h"
#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "SiSpacePointsSeedTool_xk/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointForSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
#include "TrkSpacePoint/SpacePointContainer.h"
#include "TrkSpacePoint/SpacePointOverlapCollection.h"
@@ -31,14 +32,14 @@
#include "GaudiKernel/ToolHandle.h"
#include <list>
-#include <map>
-#include <mutex>
#include <vector>
class MsgStream;
namespace InDet {
+ using EventData = SiSpacePointsSeedMakerEventData;
+
class SiSpacePointsSeedMaker_Trigger :
public extends<AthAlgTool, ISiSpacePointsSeedMaker>
{
@@ -54,31 +55,34 @@ namespace InDet {
SiSpacePointsSeedMaker_Trigger(const std::string&, const std::string&, const IInterface*);
virtual ~SiSpacePointsSeedMaker_Trigger() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual void newEvent(int iteration) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const;
- virtual void newRegion(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& iRD) const;
+ virtual void newEvent(EventData& data, int iteration) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const override;
+ virtual void newRegion(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& iRD) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find2Sp(const std::list<Trk::Vertex>& lv) const;
+ virtual void find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
- virtual void find3Sp(const std::list<Trk::Vertex>& lv) const;
- virtual void find3Sp(const std::list<Trk::Vertex>& lv, const double* zVertex) const;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
+ virtual void find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* zVertex) const override;
///////////////////////////////////////////////////////////////////
// Methods to initilize different strategies of seeds production
@@ -86,21 +90,20 @@ namespace InDet {
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
- virtual void findVSp(const std::list<Trk::Vertex>& lv) const;
+ virtual void findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const override;
///////////////////////////////////////////////////////////////////
// Iterator through seeds pseudo collection produced accordingly
// methods find
///////////////////////////////////////////////////////////////////
- virtual const SiSpacePointsSeed* next() const;
+ virtual const SiSpacePointsSeed* next(EventData& data) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- virtual MsgStream& dump(MsgStream & out) const;
- virtual std::ostream& dump(std::ostream& out) const;
+ virtual MsgStream& dump(EventData& data, MsgStream& out) const override;
private:
enum Size {SizeRF=53,
@@ -184,74 +187,6 @@ namespace InDet {
float m_sF{0.};
float m_sFv{0.};
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- bool endlist{true};
- bool trigger{false};
- int nprint{0};
- int state{0};
- int nspoint{2};
- int mode{0};
- int nlist{0};
- int ns{0};
- int nsaz{0};
- int nsazv{0};
- int fNmin{0};
- int fvNmin{0};
- int zMin{0};
- int nr{0};
- int nrfz{0};
- int nrfzv{0};
- int nOneSeeds{0};
- int rfz_index[SizeRFZ];
- int rfz_map[SizeRFZ];
- int rfzv_index[SizeRFZV];
- int rfzv_map[SizeRFZV];
- float zminU{0.};
- float zmaxU{0.};
- float zminB{0.};
- float zmaxB{0.};
- float ftrig{0.};
- float ftrigW{0.};
- float K{0.};
-
- std::vector<int> r_index;
- std::vector<int> r_map;
- std::vector<std::list<InDet::SiSpacePointForSeed*>> r_Sorted;
- std::vector<InDet::SiSpacePointsSeed> OneSeeds;
- std::multimap<float,InDet::SiSpacePointsSeed*> mapOneSeeds;
- std::multimap<float,InDet::SiSpacePointsSeed*> mapSeeds;
- std::multimap<float,InDet::SiSpacePointsSeed*>::iterator seed;
- std::multimap<float,InDet::SiSpacePointsSeed*>::iterator seede;
- std::list<InDet::SiSpacePointForSeed*> rfz_Sorted[SizeRFZ];
- std::list<InDet::SiSpacePointForSeed*> rfzv_Sorted[SizeRFZV];
- std::list<InDet::SiSpacePointForSeed> l_spforseed;
- std::list<InDet::SiSpacePointForSeed>::iterator i_spforseed;
- std::list<InDet::SiSpacePointForSeed*>::iterator rMin;
- std::list<InDet::SiSpacePointsSeed> l_seeds;
- std::list<InDet::SiSpacePointsSeed>::iterator i_seed;
- std::list<InDet::SiSpacePointsSeed>::iterator i_seede;
- std::list<float> l_vertex;
- ///////////////////////////////////////////////////////////////////
- // Tables for 3 space points seeds search
- ///////////////////////////////////////////////////////////////////
- std::vector<InDet::SiSpacePointForSeed*> SP;
- std::vector<float> R;
- std::vector<float> Tz;
- std::vector<float> Er;
- std::vector<float> U;
- std::vector<float> V;
- std::vector<float> Zo;
- ///////////////////////////////////////////////////////////////////
- // Beam geometry
- ///////////////////////////////////////////////////////////////////
- float xbeam[4]{0., 1., 0., 0.}; // x,ax,ay,az - center and x-axis direction
- float ybeam[4]{0., 0., 1., 0.}; // y,ax,ay,az - center and y-axis direction
- float zbeam[4]{0., 0., 0., 1.}; // z,ax,ay,az - center and z-axis direction
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Private methods
///////////////////////////////////////////////////////////////////
@@ -306,12 +241,9 @@ namespace InDet {
void convertToBeamFrameWork(EventData& data, const Trk::SpacePoint*const&, float*) const;
float dZVertexMin(EventData& data, float&) const;
- EventData& getEventData() const;
+ void initializeEventData(EventData& data) const;
};
- MsgStream& operator << (MsgStream&, const SiSpacePointsSeedMaker_Trigger&);
- std::ostream& operator << (std::ostream&, const SiSpacePointsSeedMaker_Trigger&);
-
} // end of name space
#endif // SiSpacePointsSeedMaker_Trigger_H
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
index 921cc2c1cbc02c5ad66e9a597162dfd2e0f58869..ed7ad069a7085cb4cff5463a94ac5d502ca13c6a 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ATLxk.cxx
@@ -78,9 +78,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_ATLxk::initialize()
//
m_outputlevel = msg().level()-MSG::DEBUG;
if (m_outputlevel<=0) {
- EventData& data{getEventData()};
+ EventData data;
+ initializeEventData(data);
data.nprint=0;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
m_initialized = true;
@@ -101,9 +102,9 @@ StatusCode InDet::SiSpacePointsSeedMaker_ATLxk::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(int iteration) const
+void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(EventData& data, int iteration) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.trigger = false;
if (!m_pixel && !m_sct) return;
@@ -274,9 +275,10 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newEvent(int iteration) const
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ATLxk::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.iteration = 0;
data.trigger = false;
@@ -382,13 +384,15 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newRegion
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ATLxk::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& IRD) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& IRD) const
{
constexpr float pi2 = 2.*M_PI;
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
- newRegion(vPixel,vSCT);
+ newRegion(data, vPixel, vSCT);
data.trigger = true;
double dzdrmin = 1./tan(2.*atan(exp(-IRD.etaMinus())));
@@ -410,9 +414,9 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newRegion
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ATLxk::find2Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ATLxk::find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.zminU = m_zmin;
data.zmaxU = m_zmax;
@@ -422,7 +426,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find2Sp(const std::list<Trk::Vertex>&
bool newv = newVertices(data, lv);
if (newv || !data.state || data.nspoint!=2 || data.mode!=mode || data.nlist) {
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_Pro = data.l_seeds_Pro.begin();
data.state = 1;
data.nspoint = 2;
data.nlist = 0;
@@ -433,11 +437,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find2Sp(const std::list<Trk::Vertex>&
data.zMin = 0;
production2Sp(data);
}
- data.i_seed = data.l_seeds.begin();
+ data.i_seed_Pro = data.l_seeds_Pro.begin();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -446,9 +450,9 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find2Sp(const std::list<Trk::Vertex>&
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.zminU = m_zmin;
data.zmaxU = m_zmax;
@@ -458,7 +462,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
bool newv = newVertices(data, lv);
if (newv || !data.state || data.nspoint!=3 || data.mode!=mode || data.nlist) {
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_Pro = data.l_seeds_Pro.begin();
data.state = 1;
data.nspoint = 3;
data.nlist = 0;
@@ -469,12 +473,12 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
data.zMin = 0;
production3Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.seed = data.seeds.begin();
+ data.i_seed_Pro = data.l_seeds_Pro.begin();
+ data.seed_Pro = data.seeds_Pro.begin();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -483,9 +487,9 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>& lv, const double* ZVertex) const
+void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* ZVertex) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.zminU = ZVertex[0];
if (data.zminU < m_zmin) data.zminU = m_zmin;
@@ -497,7 +501,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
bool newv = newVertices(data, lv);
if (newv || !data.state || data.nspoint!=3 || data.mode!=mode || data.nlist) {
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_Pro = data.l_seeds_Pro.begin();
data.state = 1;
data.nspoint = 3;
data.nlist = 0;
@@ -508,12 +512,12 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
data.zMin = 0;
production3Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.seed = data.seeds.begin();
+ data.i_seed_Pro = data.l_seeds_Pro.begin();
+ data.seed_Pro = data.seeds_Pro.begin();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -523,9 +527,9 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::find3Sp(const std::list<Trk::Vertex>&
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.zminU = m_zmin;
data.zmaxU = m_zmax;
@@ -535,7 +539,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp(const std::list<Trk::Vertex>&
bool newv = newVertices(data, lv);
if (newv || !data.state || data.nspoint!=4 || data.mode!=mode || data.nlist) {
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_Pro = data.l_seeds_Pro.begin();
data.state = 1;
data.nspoint = 4;
data.nlist = 0;
@@ -546,12 +550,12 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp(const std::list<Trk::Vertex>&
data.zMin = 0;
production3Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.seed = data.seeds.begin();
+ data.i_seed_Pro = data.l_seeds_Pro.begin();
+ data.seed_Pro = data.seeds_Pro.begin();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -559,9 +563,9 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findVSp(const std::list<Trk::Vertex>&
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dump(MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dump(EventData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.nprint) return dumpEvent(data, out);
return dumpConditions(data, out);
@@ -730,42 +734,13 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ATLxk::dumpEvent(EventData& data, MsgSt
<<std::setw(12)<<data.nsazv
<<" |"<<endmsg;
out<<"| seeds | "
- <<std::setw(12)<<data.l_seeds.size()
+ <<std::setw(12)<<data.l_seeds_Pro.size()
<<" |"<<endmsg;
out<<"|---------------------------------------------------------------------|"
<<endmsg;
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiSpacePointsSeedMaker_ATLxk::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl, const InDet::SiSpacePointsSeedMaker_ATLxk& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl, const InDet::SiSpacePointsSeedMaker_ATLxk& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Find next set space points
///////////////////////////////////////////////////////////////////
@@ -774,14 +749,14 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::findNext(EventData& data) const
{
if (data.endlist) return;
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_Pro = data.l_seeds_Pro.begin();
if (data.mode==0 or data.mode==1) production2Sp(data);
else if (data.mode==2 or data.mode==3) production3Sp(data);
else if (data.mode==5 or data.mode==6) production3Sp(data);
- data.i_seed = data.l_seeds.begin();
- data.seed = data.seeds.begin();
+ data.i_seed_Pro = data.l_seeds_Pro.begin();
+ data.seed_Pro = data.seeds_Pro.begin();
++data.nlist;
}
@@ -1265,7 +1240,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production2Sp(EventData& data) const
void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp(EventData& data) const
{
if (data.nsaz<3) return;
- data.seeds.clear();
+ data.seeds_Pro.clear();
const int ZI[SizeZ]= {5,6,7,8,9,10,4,3,2,1,0};
std::list<InDet::SiSpacePointForSeed*>::iterator rt[9],rte[9],rb[9],rbe[9];
@@ -1343,7 +1318,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3Sp
for (; r0!=rbe[0]; ++r0) {
data.nOneSeeds = 0;
- data.mapOneSeeds.clear();
+ data.mapOneSeeds_Pro.clear();
float R = (*r0)->radius();
@@ -1538,7 +1513,7 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::production3SpTrigger
for (; r0!=rbe[0]; ++r0) {
data.nOneSeeds = 0;
- data.mapOneSeeds.clear();
+ data.mapOneSeeds_Pro.clear();
float R = (*r0)->radius();
@@ -1709,12 +1684,12 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newOneSeed
{
if (data.nOneSeeds < m_maxOneSize) {
- data.OneSeeds[data.nOneSeeds].set(p1,p2,p3,z);
- data.mapOneSeeds.insert(std::make_pair(q, &data.OneSeeds[data.nOneSeeds]));
+ data.OneSeeds_Pro[data.nOneSeeds].set(p1,p2,p3,z);
+ data.mapOneSeeds_Pro.insert(std::make_pair(q, &data.OneSeeds_Pro[data.nOneSeeds]));
++data.nOneSeeds;
} else {
std::multimap<float,InDet::SiSpacePointsProSeed*>::reverse_iterator
- l = data.mapOneSeeds.rbegin();
+ l = data.mapOneSeeds_Pro.rbegin();
if ((*l).first <= q) return;
@@ -1722,11 +1697,11 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newOneSeed
s->set(p1,p2,p3,z);
std::multimap<float,InDet::SiSpacePointsProSeed*>::iterator
- i = data.mapOneSeeds.insert(std::make_pair(q,s));
+ i = data.mapOneSeeds_Pro.insert(std::make_pair(q,s));
- for (++i; i!=data.mapOneSeeds.end(); ++i) {
+ for (++i; i!=data.mapOneSeeds_Pro.end(); ++i) {
if ((*i).second==s) {
- data.mapOneSeeds.erase(i);
+ data.mapOneSeeds_Pro.erase(i);
return;
}
}
@@ -1813,9 +1788,9 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillSeeds(EventData& data) const
data.fillOneSeeds = 0;
std::multimap<float,InDet::SiSpacePointsProSeed*>::iterator
- lf = data.mapOneSeeds.begin(),
- l = data.mapOneSeeds.begin(),
- le = data.mapOneSeeds.end();
+ lf = data.mapOneSeeds_Pro.begin(),
+ l = data.mapOneSeeds_Pro.begin(),
+ le = data.mapOneSeeds_Pro.end();
if (l==le) return;
@@ -1828,43 +1803,43 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::fillSeeds(EventData& data) const
if (l!=lf && s->spacepoint0()->radius() < 43. && w > -200.) continue;
if (!s->setQuality(w)) continue;
- if (data.i_seede!=data.l_seeds.end()) {
- s = &(*data.i_seede++);
+ if (data.i_seede_Pro!=data.l_seeds_Pro.end()) {
+ s = &(*data.i_seede_Pro++);
*s = *(*l).second;
} else {
- data.l_seeds.emplace_back(SiSpacePointsProSeed(*(*l).second));
- s = &(data.l_seeds.back());
- data.i_seede = data.l_seeds.end();
+ data.l_seeds_Pro.emplace_back(SiSpacePointsProSeed(*(*l).second));
+ s = &(data.l_seeds_Pro.back());
+ data.i_seede_Pro = data.l_seeds_Pro.end();
}
if (s->spacepoint0()->spacepoint->clusterList().second) w-=3000.;
else if (s->spacepoint1()->spacepoint->clusterList().second) w-=2000.;
else if (s->spacepoint2()->spacepoint->clusterList().second) w-=1000.;
- data.seeds.insert(std::make_pair(w, s));
+ data.seeds_Pro.insert(std::make_pair(w, s));
++data.fillOneSeeds;
}
}
-const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_ATLxk::next() const
+const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_ATLxk::next(EventData& data) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.nspoint==3) {
do {
- if (data.i_seed==data.i_seede) {
+ if (data.i_seed_Pro==data.i_seede_Pro) {
findNext(data);
- if (data.i_seed==data.i_seede) return nullptr;
+ if (data.i_seed_Pro==data.i_seede_Pro) return nullptr;
}
- ++data.i_seed;
- } while (!(*data.seed++).second->set3(data.seedOutput));
+ ++data.i_seed_Pro;
+ } while (!(*data.seed_Pro++).second->set3(data.seedOutput));
return &data.seedOutput;
} else {
- if (data.i_seed==data.i_seede) {
+ if (data.i_seed_Pro==data.i_seede_Pro) {
findNext(data);
- if (data.i_seed==data.i_seede) return nullptr;
+ if (data.i_seed_Pro==data.i_seede_Pro) return nullptr;
}
- (*data.i_seed++).set2(data.seedOutput);
+ (*data.i_seed_Pro++).set2(data.seedOutput);
return &data.seedOutput;
}
return nullptr;
@@ -1925,57 +1900,23 @@ void InDet::SiSpacePointsSeedMaker_ATLxk::newSeed
{
InDet::SiSpacePointForSeed* p3 = nullptr;
- if (data.i_seede!=data.l_seeds.end()) {
- SiSpacePointsProSeed* s = &(*data.i_seede++);
+ if (data.i_seede_Pro!=data.l_seeds_Pro.end()) {
+ SiSpacePointsProSeed* s = &(*data.i_seede_Pro++);
s->set(p1, p2, p3, z);
} else {
- data.l_seeds.emplace_back(SiSpacePointsProSeed(p1, p2, p3, z));
- data.i_seede = data.l_seeds.end();
+ data.l_seeds_Pro.emplace_back(SiSpacePointsProSeed(p1, p2, p3, z));
+ data.i_seede_Pro = data.l_seeds_Pro.end();
}
}
-InDet::SiSpacePointsSeedMaker_ATLxk::EventData&
-InDet::SiSpacePointsSeedMaker_ATLxk::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- if (not m_initialized) slot = 0;
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot] = EventData{}; // This will be improved later.
-
- m_eventData[slot].CmSp.reserve(500);
- m_eventData[slot].SP.resize(m_maxsizeSP, nullptr);
- m_eventData[slot].R.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Tz.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Er.resize(m_maxsizeSP, 0.);
- m_eventData[slot].U.resize(m_maxsizeSP, 0.);
- m_eventData[slot].V.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Zo.resize(m_maxsizeSP, 0.);
- m_eventData[slot].OneSeeds.resize(m_maxOneSize);
- m_eventData[slot].r_Sorted.resize(m_r_size);
- m_eventData[slot].r_index.resize(m_r_size, 0);
- m_eventData[slot].r_map.resize(m_r_size, 0);
- // Build radius-azimuthal-Z sorted containers
- //
- for (int i=0; i<SizeRFZ; ++i) {
- m_eventData[slot].rfz_index[i]=0;
- m_eventData[slot].rfz_map[i]=0;
- }
- for (int i=0; i<SizeRFZV; ++i) {
- m_eventData[slot].rfzv_index[i]=0;
- m_eventData[slot].rfzv_map[i]=0;
- }
- m_eventData[slot].i_seed = m_eventData[slot].l_seeds.begin();
- m_eventData[slot].i_seede = m_eventData[slot].l_seeds.end();
- m_eventData[slot].checketa = m_checketa;
- }
- return m_eventData[slot];
+void InDet::SiSpacePointsSeedMaker_ATLxk::initializeEventData(EventData& data) const {
+ data.initialize(EventData::ATLxk,
+ m_maxsizeSP,
+ m_maxOneSize,
+ 0, // maxsize not used
+ m_r_size,
+ 0, // sizeRF not used
+ SizeRFZ,
+ SizeRFZV,
+ m_checketa);
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
index c81fa7addfb35664cab8d0bcced3bb82bb03ece2..6e52a78e5ece6a80852faec6efbabcea554dc4a0 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_BeamGas.cxx
@@ -74,9 +74,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_BeamGas::initialize()
//
m_outputlevel = msg().level()-MSG::DEBUG;
if (m_outputlevel<=0) {
- EventData& data{getEventData()};
+ EventData data;
+ initializeEventData(data);
data.nprint=0;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
m_initialized = true;
@@ -97,11 +98,12 @@ StatusCode InDet::SiSpacePointsSeedMaker_BeamGas::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent(int) const
+void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent(EventData& data, int) const
{
- EventData& data{getEventData()};
-
if (!m_pixel && !m_sct) return;
+
+ if (not data.initialized) initializeEventData(data);
+
erase(data);
buildBeamFrameWork(data);
@@ -196,11 +198,13 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newEvent(int) const
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
{
- EventData& data{getEventData()};
-
if (!m_pixel && !m_sct) return;
+
+ if (not data.initialized) initializeEventData(data);
+
erase(data);
buildBeamFrameWork(data);
@@ -281,9 +285,10 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor&) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor&) const
{
- newRegion(vPixel,vSCT);
+ newRegion(data, vPixel, vSCT);
}
///////////////////////////////////////////////////////////////////
@@ -291,9 +296,9 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newRegion
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_BeamGas::find2Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_BeamGas::find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 0;
if (lv.begin()!=lv.end()) mode = 1;
@@ -313,7 +318,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find2Sp(const std::list<Trk::Vertex>
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -322,9 +327,9 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find2Sp(const std::list<Trk::Vertex>
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 2;
if (lv.begin()!=lv.end()) mode = 3;
@@ -344,12 +349,12 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(const std::list<Trk::Vertex>
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
-void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(const std::list<Trk::Vertex>& lv, const double*) const
+void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double*) const
{
- find3Sp(lv);
+ find3Sp(data, lv);
}
///////////////////////////////////////////////////////////////////
@@ -358,11 +363,11 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::find3Sp(const std::list<Trk::Vertex>
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
- int mode = 5;
+ int mode = 5;
if (lv.begin()!=lv.end()) mode = 6;
if (!data.state || data.nspoint!=4 || data.mode!=mode || data.nlist) {
@@ -380,7 +385,7 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp(const std::list<Trk::Vertex>
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -388,9 +393,9 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::findVSp(const std::list<Trk::Vertex>
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dump( MsgStream& out ) const
+MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dump(EventData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.nprint) return dumpEvent(data, out);
return dumpConditions(data, out);
@@ -541,35 +546,6 @@ MsgStream& InDet::SiSpacePointsSeedMaker_BeamGas::dumpEvent(EventData& data, Msg
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiSpacePointsSeedMaker_BeamGas::dump( std::ostream& out ) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl,const InDet::SiSpacePointsSeedMaker_BeamGas& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl,const InDet::SiSpacePointsSeedMaker_BeamGas& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Find next set space points
///////////////////////////////////////////////////////////////////
@@ -1112,9 +1088,9 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::newOneSeed
}
}
-const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_BeamGas::next() const
+const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_BeamGas::next(EventData& data) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.i_seed==data.i_seede) {
findNext(data);
@@ -1216,50 +1192,14 @@ void InDet::SiSpacePointsSeedMaker_BeamGas::fillSeeds(EventData& data) const
}
}
-InDet::SiSpacePointsSeedMaker_BeamGas::EventData&
-InDet::SiSpacePointsSeedMaker_BeamGas::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- if (not m_initialized) slot = 0;
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot] = EventData{}; // This will be improved later.
-
- m_eventData[slot].r_Sorted.resize(m_r_size);
- m_eventData[slot].r_index.resize(m_r_size, 0);
- m_eventData[slot].r_map.resize(m_r_size, 0);
-
- m_eventData[slot].SP.resize(m_maxsizeSP, nullptr);
- m_eventData[slot].R.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Tz.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Er.resize(m_maxsizeSP, 0.);
- m_eventData[slot].U.resize(m_maxsizeSP, 0.);
- m_eventData[slot].V.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Zo.resize(m_maxsizeSP, 0.);
-
- m_eventData[slot].OneSeeds.resize(m_maxOneSize);
-
- for (int i=0; i<SizeRF; ++i) {
- m_eventData[slot].rf_index[i] = 0;
- m_eventData[slot].rf_map[i] = 0;
- }
- // Build radius-azimuthal-Z sorted containers
- for (int i=0; i<SizeRFZ; ++i) {
- m_eventData[slot].rfz_index[i] = 0;
- m_eventData[slot].rfz_map[i] = 0;
- }
-
- m_eventData[slot].i_seed = m_eventData[slot].l_seeds.begin();
- m_eventData[slot].i_seede = m_eventData[slot].l_seeds.end();
- }
-
- return m_eventData[slot];
+void InDet::SiSpacePointsSeedMaker_BeamGas::initializeEventData(EventData& data) const {
+ data.initialize(EventData::BeamGas,
+ m_maxsizeSP,
+ m_maxOneSize,
+ 0, // maxsize not used
+ m_r_size,
+ SizeRF,
+ SizeRFZ,
+ 0, // sizeRFZV not used
+ false); // checkEta not used
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
index 2b25f44475a77a353f41c10311a7494ca0509081..2ff372cccbc64989a62941bbf010839d56546345 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Cosmic.cxx
@@ -71,9 +71,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_Cosmic::initialize()
//
m_outputlevel = msg().level()-MSG::DEBUG;
if (m_outputlevel<=0) {
- EventData& data{getEventData()};
+ EventData data;
+ initializeEventData(data);
data.nprint=0;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
m_initialized = true;
@@ -94,11 +95,12 @@ StatusCode InDet::SiSpacePointsSeedMaker_Cosmic::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Cosmic::newEvent(int) const
+void InDet::SiSpacePointsSeedMaker_Cosmic::newEvent(EventData& data, int) const
{
- EventData& data{getEventData()};
-
if (!m_pixel && !m_sct) return;
+
+ if (not data.initialized) initializeEventData(data);
+
erase(data);
data.i_spforseed = data.l_spforseed.begin();
@@ -185,9 +187,10 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newEvent(int) const
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_Cosmic::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (!m_pixel && !m_sct) return;
erase(data);
@@ -261,9 +264,10 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newRegion
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_Cosmic::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor&) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor&) const
{
- newRegion(vPixel, vSCT);
+ newRegion(data, vPixel, vSCT);
}
///////////////////////////////////////////////////////////////////
@@ -271,15 +275,15 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newRegion
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Cosmic::find2Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_Cosmic::find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 0;
if (lv.begin()!=lv.end()) mode = 1;
data.nseeds = 0;
- data.l_seeds.erase(data.l_seeds.begin(),data.l_seeds.end());
+ data.l_seeds_map.erase(data.l_seeds_map.begin(),data.l_seeds_map.end());
if ( !data.state || data.nspoint!=2 || data.mode!=mode || data.nlist) {
@@ -293,12 +297,12 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find2Sp(const std::list<Trk::Vertex>&
production2Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.i_seede = data.l_seeds.end ();
+ data.i_seed_map = data.l_seeds_map.begin();
+ data.i_seede_map = data.l_seeds_map.end ();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -307,15 +311,15 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find2Sp(const std::list<Trk::Vertex>&
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 2;
- if (lv.begin()!=lv.end())mode = 3;
+ if (lv.begin()!=lv.end()) mode = 3;
data.nseeds = 0;
- data.l_seeds.erase(data.l_seeds.begin(),data.l_seeds.end());
+ data.l_seeds_map.erase(data.l_seeds_map.begin(),data.l_seeds_map.end());
if (!data.state || data.nspoint!=3 || data.mode!=mode || data.nlist) {
@@ -329,18 +333,18 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(const std::list<Trk::Vertex>&
production3Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.i_seede = data.l_seeds.end ();
+ data.i_seed_map = data.l_seeds_map.begin();
+ data.i_seede_map = data.l_seeds_map.end ();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
-void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(const std::list<Trk::Vertex>& lv, const double*) const
+void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double*) const
{
- find3Sp(lv);
+ find3Sp(data, lv);
}
///////////////////////////////////////////////////////////////////
@@ -349,9 +353,9 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::find3Sp(const std::list<Trk::Vertex>&
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Cosmic::findVSp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_Cosmic::findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 5;
if (lv.begin()!=lv.end()) mode = 6;
@@ -368,12 +372,12 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::findVSp(const std::list<Trk::Vertex>&
production3Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.i_seede = data.l_seeds.end ();
+ data.i_seed_map = data.l_seeds_map.begin();
+ data.i_seede_map = data.l_seeds_map.end ();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -381,9 +385,10 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::findVSp(const std::list<Trk::Vertex>&
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dump( MsgStream& out ) const
+MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dump(EventData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
+
if (data.nprint) return dumpEvent(data, out);
return dumpConditions(out);
}
@@ -469,42 +474,13 @@ MsgStream& InDet::SiSpacePointsSeedMaker_Cosmic::dumpEvent(EventData& data, MsgS
<<std::setw(12)<<data.nsaz
<<" |"<<endmsg;
out<<"| seeds | "
- <<std::setw(12)<<data.l_seeds.size()
+ <<std::setw(12)<<data.l_seeds_map.size()
<<" |"<<endmsg;
out<<"|---------------------------------------------------------------------|"
<<endmsg;
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiSpacePointsSeedMaker_Cosmic::dump( std::ostream& out ) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl,const InDet::SiSpacePointsSeedMaker_Cosmic& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl,const InDet::SiSpacePointsSeedMaker_Cosmic& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Initiate frame work for seed generator
///////////////////////////////////////////////////////////////////
@@ -1053,14 +1029,14 @@ bool InDet::SiSpacePointsSeedMaker_Cosmic::isUsed(const Trk::SpacePoint* sp) con
return false;
}
-const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_Cosmic::next() const
+const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_Cosmic::next(EventData& data) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
- if (data.i_seed==data.i_seede) return nullptr;
- InDet::SiSpacePointsSeed* sp = (*data.i_seed).second;
- ++data.i_seed;
- return(sp);
+ if (data.i_seed_map==data.i_seede_map) return nullptr;
+ InDet::SiSpacePointsSeed* sp = (*data.i_seed_map).second;
+ ++data.i_seed_map;
+ return sp;
}
///////////////////////////////////////////////////////////////////
@@ -1128,19 +1104,19 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newSeed
data.seeds[data.nseeds].add (p1);
data.seeds[data.nseeds].add (p2);
data.seeds[data.nseeds].setZVertex(0.);
- data.l_seeds.insert(std::make_pair(z, &(data.seeds[data.nseeds])));
+ data.l_seeds_map.insert(std::make_pair(z, &(data.seeds[data.nseeds])));
++data.nseeds;
} else {
- std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator l = data.l_seeds.rbegin();
+ std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator l = data.l_seeds_map.rbegin();
if ((*l).first <= z) return;
InDet::SiSpacePointsSeed* s = (*l).second;
- data.l_seeds.erase((*l).first);
+ data.l_seeds_map.erase((*l).first);
s->erase ( );
s->add (p1);
s->add (p2);
s->setZVertex(0.);
- data.l_seeds.insert(std::make_pair(z,s));
+ data.l_seeds_map.insert(std::make_pair(z,s));
}
}
@@ -1159,64 +1135,31 @@ void InDet::SiSpacePointsSeedMaker_Cosmic::newSeed
data.seeds[data.nseeds].add (p2);
data.seeds[data.nseeds].add (p3);
data.seeds[data.nseeds].setZVertex(0.);
- data.l_seeds.insert(std::make_pair(z, &(data.seeds[data.nseeds])));
+ data.l_seeds_map.insert(std::make_pair(z, &(data.seeds[data.nseeds])));
++data.nseeds;
} else {
- std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator l = data.l_seeds.rbegin();
+ std::multimap<float,InDet::SiSpacePointsSeed*>::reverse_iterator l = data.l_seeds_map.rbegin();
if ((*l).first <= z) return;
InDet::SiSpacePointsSeed* s = (*l).second;
- data.l_seeds.erase((*l).first);
+ data.l_seeds_map.erase((*l).first);
s->erase ( );
s->add (p1);
s->add (p2);
s->add (p3);
s->setZVertex(0.);
- data.l_seeds.insert(std::make_pair(z,s));
+ data.l_seeds_map.insert(std::make_pair(z,s));
}
}
-InDet::SiSpacePointsSeedMaker_Cosmic::EventData&
-InDet::SiSpacePointsSeedMaker_Cosmic::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- if (not m_initialized) slot = 0;
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot] = EventData{}; // This will be improved later.
-
- // Build radius sorted containers
- m_eventData[slot].r_Sorted.resize(m_r_size);
- m_eventData[slot].r_index.resize(m_r_size, 0);
- m_eventData[slot].r_map.resize(m_r_size, 0);
- // Build radius-azimuthal sorted containers
- for (int i=0; i<SizeRF; ++i) {
- m_eventData[slot].rf_index[i]=0;
- m_eventData[slot].rf_map[i]=0;
- }
- // Build radius-azimuthal-Z sorted containers
- for (int i=0; i<SizeRFZ; ++i) {
- m_eventData[slot].rfz_index[i]=0;
- m_eventData[slot].rfz_map[i]=0;
- }
-
- m_eventData[slot].SP.resize(m_maxsizeSP, nullptr);
- m_eventData[slot].R.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Tz.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Er.resize(m_maxsizeSP, 0.);
- m_eventData[slot].U.resize(m_maxsizeSP, 0.);
- m_eventData[slot].V.resize(m_maxsizeSP, 0.);
-
- m_eventData[slot].seeds.resize(m_maxsize+5);
- }
-
- return m_eventData[slot];
+void InDet::SiSpacePointsSeedMaker_Cosmic::initializeEventData(EventData& data) const {
+ data.initialize(EventData::Cosmic,
+ m_maxsizeSP,
+ 0, // maxOneSize not used
+ m_maxsize,
+ m_r_size,
+ SizeRF,
+ SizeRFZ,
+ 0, // sizeRFZV not used
+ false); // checkEta not used
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
index 7df5a884aecefe48412e6559209cc5f4cd4704b6..34756f340bc284a8166bfba3f638ab691aecaa97 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_HeavyIon.cxx
@@ -59,9 +59,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_HeavyIon::initialize()
//
m_outputlevel = msg().level()-MSG::DEBUG;
if (m_outputlevel<=0) {
- EventData& data{getEventData()};
+ EventData data;
+ initializeEventData(data);
data.nprint=0;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
m_initialized = true;
@@ -82,9 +83,9 @@ StatusCode InDet::SiSpacePointsSeedMaker_HeavyIon::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent(int) const
+void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent(EventData& data, int) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.trigger = false;
if (!m_pixel && !m_sct) return;
@@ -158,9 +159,10 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newEvent(int) const
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.trigger = false;
if (!m_pixel && !m_sct) return;
@@ -245,9 +247,11 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor&) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor&) const
{
- newRegion(vPixel, vSCT);
+ newRegion(data, vPixel, vSCT);
}
///////////////////////////////////////////////////////////////////
@@ -255,9 +259,9 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newRegion
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.izvertex = not lv.empty();
@@ -282,7 +286,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(const std::list<Trk::Vertex
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -291,9 +295,9 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find2Sp(const std::list<Trk::Vertex
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.izvertex = not lv.empty();
@@ -318,13 +322,13 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
-void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex>& lv, const double*) const
+void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double*) const
{
- find3Sp(lv);
+ find3Sp(data, lv);
}
///////////////////////////////////////////////////////////////////
@@ -333,9 +337,9 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::find3Sp(const std::list<Trk::Vertex
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 5;
if (lv.begin()!=lv.end()) mode = 6;
@@ -357,7 +361,7 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp(const std::list<Trk::Vertex
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -365,9 +369,9 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::findVSp(const std::list<Trk::Vertex
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dump(MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dump(EventData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.nprint) return dumpEvent(data, out);
return dumpConditions(data, out);
@@ -536,35 +540,6 @@ MsgStream& InDet::SiSpacePointsSeedMaker_HeavyIon::dumpEvent(EventData& data, Ms
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiSpacePointsSeedMaker_HeavyIon::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl,const InDet::SiSpacePointsSeedMaker_HeavyIon& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl,const InDet::SiSpacePointsSeedMaker_HeavyIon& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Find next set space points
///////////////////////////////////////////////////////////////////
@@ -593,10 +568,10 @@ bool InDet::SiSpacePointsSeedMaker_HeavyIon::newVertices(EventData& data, const
if (s1==0 && s2==0) return false;
- data.l_vertex.erase(data.l_vertex.begin(), data.l_vertex.end());
+ data.l_vertex.clear();
for (const Trk::Vertex& v: lV) {
- data.l_vertex.push_back(static_cast<float>(v.position().z()));
+ data.l_vertex.insert(static_cast<float>(v.position().z()));
if (data.l_vertex.size() >= m_maxNumberVertices) break;
}
return false;
@@ -1619,9 +1594,9 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::newOneSeed
}
}
-const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_HeavyIon::next() const
+const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_HeavyIon::next(EventData& data) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.i_seed==data.i_seede) {
findNext(data);
@@ -1637,7 +1612,7 @@ bool InDet::SiSpacePointsSeedMaker_HeavyIon::isZCompatible
if (!data.izvertex) return true;
float dZmin = std::numeric_limits<float>::max();
- for (float& v: data.l_vertex) {
+ for (const float& v: data.l_vertex) {
float dZ = fabs(v-Zv);
if (dZ<dZmin) dZmin=dZ;
}
@@ -1647,7 +1622,7 @@ bool InDet::SiSpacePointsSeedMaker_HeavyIon::isZCompatible
float InDet::SiSpacePointsSeedMaker_HeavyIon::dZVertexMin(EventData& data, float& Z) const
{
float dZm = std::numeric_limits<float>::max();
- for (float& v: data.l_vertex) {
+ for (const float& v: data.l_vertex) {
float dZ = fabs(v-Z);
if (dZ<dZm) dZm = dZ;
}
@@ -1741,52 +1716,14 @@ void InDet::SiSpacePointsSeedMaker_HeavyIon::fillSeeds(EventData& data) const
}
}
-InDet::SiSpacePointsSeedMaker_HeavyIon::EventData&
-InDet::SiSpacePointsSeedMaker_HeavyIon::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- if (not m_initialized) slot = 0;
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot] = EventData{}; // This will be improved later.
-
- m_eventData[slot].r_Sorted.resize(m_r_size);
- m_eventData[slot].r_index.resize(m_r_size, 0);
- m_eventData[slot].r_map.resize(m_r_size, 0);
-
- m_eventData[slot].SP.resize(m_maxsizeSP, nullptr);
- m_eventData[slot].R.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Tz.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Er.resize(m_maxsizeSP, 0.);
- m_eventData[slot].U.resize(m_maxsizeSP, 0.);
- m_eventData[slot].V.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Zo.resize(m_maxsizeSP, 0.);
-
- m_eventData[slot].OneSeeds.resize(m_maxOneSize);
-
- // Build radius-azimuthal-Z sorted containers
- for (int i=0; i<SizeRFZ; ++i) {
- m_eventData[slot].rfz_index[i] = 0;
- m_eventData[slot].rfz_map[i] = 0;
- }
-
- // Build radius-azimuthal-Z sorted containers for Z-vertices
- for (int i=0; i<SizeRFZV; ++i) {
- m_eventData[slot].rfzv_index[i] = 0;
- m_eventData[slot].rfzv_map[i] = 0;
- }
-
- m_eventData[slot].i_seed = m_eventData[slot].l_seeds.begin();
- m_eventData[slot].i_seede = m_eventData[slot].l_seeds.end();
- }
-
- return m_eventData[slot];
+void InDet::SiSpacePointsSeedMaker_HeavyIon::initializeEventData(EventData& data) const {
+ data.initialize(EventData::HeavyIon,
+ m_maxsizeSP,
+ m_maxOneSize,
+ 0, // maxsize not used
+ m_r_size,
+ 0, // sizeRF not used
+ SizeRFZ,
+ SizeRFZV,
+ false); // checkEta not used
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
index 5fe3fa3566aecc2f31183d868dbce2ea11723614..65f7ba35e0367a2af17303ddd2e5a30a7473cf64 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_ITK.cxx
@@ -77,9 +77,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_ITK::initialize()
//
m_outputlevel = msg().level()-MSG::DEBUG;
if (m_outputlevel<=0) {
- EventData& data{getEventData()};
+ EventData data;
+ initializeEventData(data);
data.nprint=0;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
m_umax = 100.-fabs(m_umax)*300.;
@@ -101,9 +102,9 @@ StatusCode InDet::SiSpacePointsSeedMaker_ITK::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration) const
+void InDet::SiSpacePointsSeedMaker_ITK::newEvent(EventData& data, int iteration) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.iteration0 = iteration;
data.trigger = false;
@@ -128,7 +129,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration) const
data.ipt2K = m_ipt2/(data.K*data.K);
data.ipt2C = m_ipt2*m_COF;
data.COFK = m_COF*(data.K*data.K);
- data.i_spforseed = data.l_spforseed.begin();
+ data.i_spforseed_ITK = data.l_spforseed_ITK.begin();
} else {
data.r_first = 0;
fillLists(data);
@@ -142,7 +143,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration) const
for (int i=0; i<data.nr; ++i) {
int n = data.r_index[i];
data.r_map[n] = 0;
- data.r_Sorted[n].clear();
+ data.r_Sorted_ITK[n].clear();
}
data.ns = data.nr = 0;
@@ -164,7 +165,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration) const
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- data.r_Sorted[ir].push_back(sps);
+ data.r_Sorted_ITK[ir].push_back(sps);
++data.r_map[ir];
if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
if (ir > data.r_first) data.r_first = ir;
@@ -192,7 +193,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration) const
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- data.r_Sorted[ir].push_back(sps);
+ data.r_Sorted_ITK[ir].push_back(sps);
++data.r_map[ir];
if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
++data.ns;
@@ -216,7 +217,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration) const
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- data.r_Sorted[ir].push_back(sps);
+ data.r_Sorted_ITK[ir].push_back(sps);
++data.r_map[ir];
if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
++data.ns;
@@ -234,9 +235,10 @@ void InDet::SiSpacePointsSeedMaker_ITK::newEvent(int iteration) const
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ITK::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.iteration = 0;
data.trigger = false;
@@ -261,7 +263,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
data.ipt2C = m_ipt2*m_COF;
data.COFK = m_COF*(data.K*data.K);
- data.i_spforseed = data.l_spforseed.begin();
+ data.i_spforseed_ITK = data.l_spforseed_ITK.begin();
float irstep = 1./m_r_rstep;
int irmax = m_r_size-1;
@@ -272,7 +274,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
for (int i=0; i<data.nr; ++i) {
int n = data.r_index[i];
data.r_map[n] = 0;
- data.r_Sorted[n].clear();
+ data.r_Sorted_ITK[n].clear();
}
data.ns = data.nr = 0;
@@ -295,7 +297,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
InDet::SiSpacePointForSeedITK* sps = newSpacePoint(data, sp);
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- data.r_Sorted[ir].push_back(sps);
+ data.r_Sorted_ITK[ir].push_back(sps);
++data.r_map[ir];
if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
++data.ns;
@@ -323,7 +325,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
InDet::SiSpacePointForSeedITK* sps = newSpacePoint(data, sp);
int ir = static_cast<int>(sps->radius()*irstep);
if (ir>irmax) ir = irmax;
- data.r_Sorted[ir].push_back(sps);
+ data.r_Sorted_ITK[ir].push_back(sps);
++data.r_map[ir];
if (data.r_map[ir]==1) data.r_index[data.nr++] = ir;
++data.ns;
@@ -339,11 +341,12 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_ITK::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& IRD) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& IRD) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
- newRegion(vPixel, vSCT);
+ newRegion(data, vPixel, vSCT);
data.trigger = true;
double dzdrmin = 1./tan(2.*atan(exp(-IRD.etaMinus())));
@@ -365,9 +368,9 @@ void InDet::SiSpacePointsSeedMaker_ITK::newRegion
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.zminU = m_zmin;
data.zmaxU = m_zmax;
@@ -378,7 +381,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(const std::list<Trk::Vertex>& lv
if (newv || !data.state || data.nspoint!=2 || data.mode!=mode || data.nlist) {
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_ITK = data.l_seeds_ITK.begin();
data.state = 1;
data.nspoint = 2;
data.nlist = 0;
@@ -389,11 +392,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(const std::list<Trk::Vertex>& lv
data.zMin = 0;
production2Sp(data);
}
- data.i_seed = data.l_seeds.begin();
+ data.i_seed_ITK = data.l_seeds_ITK.begin();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -402,9 +405,9 @@ void InDet::SiSpacePointsSeedMaker_ITK::find2Sp(const std::list<Trk::Vertex>& lv
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.zminU = m_zmin;
data.zmaxU = m_zmax;
@@ -414,7 +417,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
bool newv = newVertices(data, lv);
if (newv || !data.state || data.nspoint!=3 || data.mode!=mode || data.nlist) {
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_ITK = data.l_seeds_ITK.begin();
data.state = 1;
data.nspoint = 3;
data.nlist = 0;
@@ -425,12 +428,12 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
data.zMin = 0;
production3Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.seed = data.seeds.begin();
+ data.i_seed_ITK = data.l_seeds_ITK.begin();
+ data.seed_ITK = data.seeds_ITK.begin();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -439,9 +442,9 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv, const double* ZVertex) const
+void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double* ZVertex) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.zminU = ZVertex[0];
if (data.zminU < m_zmin) data.zminU = m_zmin;
@@ -453,7 +456,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
bool newv = newVertices(data, lv);
if (newv || !data.state || data.nspoint!=3 || data.mode!=mode || data.nlist) {
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_ITK = data.l_seeds_ITK.begin();
data.state = 1;
data.nspoint = 3;
data.nlist = 0;
@@ -464,12 +467,12 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
data.zMin = 0;
production3Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.seed = data.seeds.begin();
+ data.i_seed_ITK = data.l_seeds_ITK.begin();
+ data.seed_ITK = data.seeds_ITK.begin();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -479,9 +482,9 @@ void InDet::SiSpacePointsSeedMaker_ITK::find3Sp(const std::list<Trk::Vertex>& lv
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_ITK::findVSp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_ITK::findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.zminU = m_zmin;
data.zmaxU = m_zmax;
@@ -492,7 +495,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp(const std::list<Trk::Vertex>& lv
if (newv || !data.state || data.nspoint!=4 || data.mode!=mode || data.nlist) {
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_ITK = data.l_seeds_ITK.begin();
data.state = 1;
data.nspoint = 4;
data.nlist = 0;
@@ -503,12 +506,12 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp(const std::list<Trk::Vertex>& lv
data.zMin = 0;
production3Sp(data);
}
- data.i_seed = data.l_seeds.begin();
- data.seed = data.seeds.begin();
+ data.i_seed_ITK = data.l_seeds_ITK.begin();
+ data.seed_ITK = data.seeds_ITK.begin();
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -516,9 +519,9 @@ void InDet::SiSpacePointsSeedMaker_ITK::findVSp(const std::list<Trk::Vertex>& lv
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dump(MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dump(EventData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.nprint) return dumpEvent(data, out);
return dumpConditions(data, out);
@@ -683,42 +686,13 @@ MsgStream& InDet::SiSpacePointsSeedMaker_ITK::dumpEvent(EventData& data, MsgStre
<<std::setw(12)<<data.nsazv
<<" |"<<endmsg;
out<<"| seeds | "
- <<std::setw(12)<<data.l_seeds.size()
+ <<std::setw(12)<<data.l_seeds_ITK.size()
<<" |"<<endmsg;
out<<"|---------------------------------------------------------------------|"
<<endmsg;
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiSpacePointsSeedMaker_ITK::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl, const InDet::SiSpacePointsSeedMaker_ITK& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl, const InDet::SiSpacePointsSeedMaker_ITK& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Find next set space points
///////////////////////////////////////////////////////////////////
@@ -727,14 +701,14 @@ void InDet::SiSpacePointsSeedMaker_ITK::findNext(EventData& data) const
{
if (data.endlist) return;
- data.i_seede = data.l_seeds.begin();
+ data.i_seede_ITK = data.l_seeds_ITK.begin();
if (data.mode==0 || data.mode==1) production2Sp(data);
else if (data.mode==2 || data.mode==3) production3Sp(data);
else if (data.mode==5 || data.mode==6) production3Sp(data);
- data.i_seed = data.l_seeds.begin();
- data.seed = data.seeds.begin();
+ data.i_seed_ITK = data.l_seeds_ITK.begin();
+ data.seed_ITK = data.seeds_ITK.begin();
++data.nlist;
}
@@ -1021,8 +995,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists(EventData& data) const
for (int i=data.r_first; i!=m_r_size; ++i) {
if (!data.r_map[i]) continue;
- r = data.r_Sorted[i].begin();
- re = data.r_Sorted[i].end();
+ r = data.r_Sorted_ITK[i].begin();
+ re = data.r_Sorted_ITK[i].end();
if (!ir0) ir0 = i;
if (data.iteration && (*r)->spacepoint->clusterList().second) break;
@@ -1051,7 +1025,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists(EventData& data) const
int n = f*SizeZ+z;
++data.nsaz;
- data.rfz_Sorted[n].push_back(*r);
+ data.rfz_Sorted_ITK[n].push_back(*r);
if (!data.rfz_map[n]++) data.rfz_index[data.nrfz++] = n;
if (!data.iteration && (*r)->spacepoint->clusterList().second == 0 && z>=3 && z<=7) {
@@ -1065,7 +1039,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillLists(EventData& data) const
n = f*3+z;
++data.nsazv;
- data.rfzv_Sorted[n].push_back(*r);
+ data.rfzv_Sorted_ITK[n].push_back(*r);
if (!data.rfzv_map[n]++) data.rfzv_index[data.nrfzv++] = n;
}
}
@@ -1082,13 +1056,13 @@ void InDet::SiSpacePointsSeedMaker_ITK::erase(EventData& data) const
for (int i=0; i<data.nrfz; ++i) {
int n = data.rfz_index[i];
data.rfz_map[n] = 0;
- data.rfz_Sorted[n].clear();
+ data.rfz_Sorted_ITK[n].clear();
}
for (int i=0; i<data.nrfzv; ++i) {
int n = data.rfzv_index[i];
data.rfzv_map[n] = 0;
- data.rfzv_Sorted[n].clear();
+ data.rfzv_Sorted_ITK[n].clear();
}
data.state = 0;
data.nsaz = 0;
@@ -1135,11 +1109,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp(EventData& data) const
int a = f*SizeZV+z;
if (!data.rfzv_map[a]) continue;
- r0 = data.rfzv_Sorted[a].begin();
- r0e = data.rfzv_Sorted[a].end ();
+ r0 = data.rfzv_Sorted_ITK[a].begin();
+ r0e = data.rfzv_Sorted_ITK[a].end ();
if (!data.endlist) {
- r0 = data.rMin;
+ r0 = data.rMin_ITK;
data.endlist = true;
}
@@ -1162,8 +1136,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp(EventData& data) const
int an = m_rfzv_i[a][i];
if (!data.rfzv_map[an]) continue;
- r = data.rfzv_Sorted[an].begin();
- re = data.rfzv_Sorted[an].end ();
+ r = data.rfzv_Sorted_ITK[an].begin();
+ re = data.rfzv_Sorted_ITK[an].end ();
for (; r!=re; ++r) {
float Rb =(*r)->radius();
@@ -1201,7 +1175,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp(EventData& data) const
}
if (nseed < m_maxsize) continue;
data.endlist=false;
- data.rMin = (++r0);
+ data.rMin_ITK = (++r0);
data.fvNmin=f;
data.zMin=z;
return;
@@ -1218,7 +1192,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production2Sp(EventData& data) const
void InDet::SiSpacePointsSeedMaker_ITK::production3Sp(EventData& data) const
{
if (data.nsaz<3) return;
- data.seeds.clear();
+ data.seeds_ITK.clear();
const int ZI[SizeZ]= {5,6,7,8,9,10,4,3,2,1,0};
std::list<InDet::SiSpacePointForSeedITK*>::iterator rt[9],rte[9],rb[9],rbe[9];
@@ -1241,14 +1215,14 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3Sp(EventData& data) const
for (int i=0; i<m_rfz_b[a]; ++i) {
int an = m_rfz_ib[a][i];
if (!data.rfz_map[an]) continue;
- rb [NB] = data.rfz_Sorted[an].begin();
- rbe[NB++] = data.rfz_Sorted[an].end();
+ rb [NB] = data.rfz_Sorted_ITK[an].begin();
+ rbe[NB++] = data.rfz_Sorted_ITK[an].end();
}
for (int i=0; i<m_rfz_t[a]; ++i) {
int an = m_rfz_it[a][i];
if (!data.rfz_map[an]) continue;
- rt [NT] = data.rfz_Sorted[an].begin();
- rte[NT++] = data.rfz_Sorted[an].end();
+ rt [NT] = data.rfz_Sorted_ITK[an].begin();
+ rte[NT++] = data.rfz_Sorted_ITK[an].end();
}
if (data.iteration == 0 && data.iteration0 ==0) production3SpSSS(data, rb, rbe, rt, rte, NB, NT, nseed);
@@ -1278,7 +1252,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
{
std::list<InDet::SiSpacePointForSeedITK*>::iterator r0=rb[0], r;
if (!data.endlist) {
- r0 = data.rMin;
+ r0 = data.rMin_ITK;
data.endlist = true;
}
@@ -1288,14 +1262,14 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
float imaxp = m_diver;
float imaxs = m_divermax;
- data.CmSp.clear();
+ data.CmSp_ITK.clear();
// Loop through all trigger space points
//
for (; r0!=rbe[0]; ++r0) {
data.nOneSeeds = 0;
- data.mapOneSeeds.clear();
+ data.mapOneSeeds_ITK.clear();
float R = (*r0)->radius();
@@ -1328,7 +1302,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
//
float Zo = Z-R*Tz;
if (!isZCompatible(data, Zo, Rb, Tz)) continue;
- data.SP[Nb] = (*r);
+ data.SP_ITK[Nb] = (*r);
if (++Nb==m_maxsizeSP) goto breakb;
}
}
@@ -1359,7 +1333,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
//
float Zo = Z-R*Tz;
if (!isZCompatible(data, Zo, R, Tz)) continue;
- data.SP[Nt] = (*r);
+ data.SP_ITK[Nt] = (*r);
if (++Nt==m_maxsizeSP) goto breakt;
}
}
@@ -1372,7 +1346,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
float ay = Y/R;
for (int i=0; i<Nt; ++i) {
- InDet::SiSpacePointForSeedITK* sp = data.SP[i];
+ InDet::SiSpacePointForSeedITK* sp = data.SP_ITK[i];
float dx = sp->x()-X;
float dy = sp->y()-Y;
@@ -1409,7 +1383,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
float CSA = Tzb2*COFK;
float ICSA = Tzb2*ipt2C;
float imax = imaxp;
- if (data.SP[b]->spacepoint->clusterList().second) imax = imaxs;
+ if (data.SP_ITK[b]->spacepoint->clusterList().second) imax = imaxs;
for (int t=Nb; t<Nt; ++t) {
float dT = ((Tzb-data.Tz[t])*(Tzb-data.Tz[t])-data.R[t]*Rb2z-(Erb+data.Er[t]))-(data.R[t]*Rb2r)*((Tzb+data.Tz[t])*(Tzb+data.Tz[t]));
@@ -1429,12 +1403,12 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
float dr = data.R[b];
if (data.R[t] < data.R[b]) dr = data.R[t];
Im+=fabs((Tzb-data.Tz[t])/(dr*sTzb2));
- data.CmSp.emplace_back(std::make_pair(B/sqrt(S2), data.SP[t]));
- data.SP[t]->setParam(Im);
+ data.CmSp_ITK.emplace_back(std::make_pair(B/sqrt(S2), data.SP_ITK[t]));
+ data.SP_ITK[t]->setParam(Im);
}
}
- if (!data.CmSp.empty()) {
- newOneSeedWithCurvaturesComparison(data, data.SP[b], (*r0), Zob);
+ if (!data.CmSp_ITK.empty()) {
+ newOneSeedWithCurvaturesComparison(data, data.SP_ITK[b], (*r0), Zob);
}
}
fillSeeds(data);
@@ -1442,7 +1416,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpPPP
if (nseed>=m_maxsize) {
data.endlist=false;
++r0;
- data.rMin = r0;
+ data.rMin_ITK = r0;
return;
}
}
@@ -1462,7 +1436,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
{
std::list<InDet::SiSpacePointForSeedITK*>::iterator r0=rb[0], r;
if (!data.endlist) {
- r0 = data.rMin;
+ r0 = data.rMin_ITK;
data.endlist = true;
}
@@ -1471,13 +1445,13 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
float COFK = data.COFK;
float imaxs = m_divermax;
- data.CmSp.clear();
+ data.CmSp_ITK.clear();
// Loop through all trigger space points
//
for (; r0!=rbe[0]; ++r0) {
data.nOneSeeds = 0;
- data.mapOneSeeds.clear();
+ data.mapOneSeeds_ITK.clear();
float R = (*r0)->radius();
@@ -1508,7 +1482,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
//
float Zo = Z-R*Tz;
if (!isZCompatible(data, Zo, Rb, Tz)) continue;
- data.SP[Nb] = (*r);
+ data.SP_ITK[Nb] = (*r);
if (++Nb==m_maxsizeSP) goto breakb;
}
}
@@ -1538,7 +1512,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
//
float Zo = Z-R*Tz;
if (!isZCompatible(data, Zo, R, Tz)) continue;
- data.SP[Nt] = (*r);
+ data.SP_ITK[Nt] = (*r);
if (++Nt==m_maxsizeSP) goto breakt;
}
}
@@ -1551,7 +1525,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
float ay = Y/R;
for (int i=0; i<Nt; ++i) {
- InDet::SiSpacePointForSeedITK* sp = data.SP[i];
+ InDet::SiSpacePointForSeedITK* sp = data.SP_ITK[i];
float dx = sp->x()-X;
float dy = sp->y()-Y;
@@ -1615,7 +1589,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
float Sb = (A0+B0*data.X[b])*C0;
float db[3] = {Sx*Cb-Sy*Sb,Sx*Sb+Sy*Cb,Ce};
float rbDup[3]; //a new and different rb
- if (!data.SP[b]->coordinates(db,rbDup)) continue;
+ if (!data.SP_ITK[b]->coordinates(db,rbDup)) continue;
// Top point
//
@@ -1623,7 +1597,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
float St = (A0+B0*data.X[t])*C0;
float dt[3] = {Sx*Ct-Sy*St,Sx*St+Sy*Ct,Ce};
float rtDup[3]; //doesnt hide previous declaration of rt
- if (!data.SP[t]->coordinates(dt,rtDup)) continue;
+ if (!data.SP_ITK[t]->coordinates(dt,rtDup)) continue;
float xb = rbDup[0]-rn[0];
float yb = rbDup[1]-rn[1];
@@ -1662,13 +1636,13 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
float dr;
data.R[t] < data.R[b] ? dr = data.R[t] : dr = data.R[b];
Im+=fabs((Tzb-data.Tz[t])/(dr*sTzb2));
- data.CmSp.emplace_back(std::make_pair(B/sqrt(S2), data.SP[t]));
- data.SP[t]->setParam(Im);
+ data.CmSp_ITK.emplace_back(std::make_pair(B/sqrt(S2), data.SP_ITK[t]));
+ data.SP_ITK[t]->setParam(Im);
}
}
- if (!data.CmSp.empty()) {
- newOneSeedWithCurvaturesComparison(data, data.SP[b], (*r0), Zob);
+ if (!data.CmSp_ITK.empty()) {
+ newOneSeedWithCurvaturesComparison(data, data.SP_ITK[b], (*r0), Zob);
}
}
fillSeeds(data);
@@ -1676,7 +1650,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpSSS
if (nseed>=m_maxsize) {
data.endlist=false;
++r0;
- data.rMin = r0;
+ data.rMin_ITK = r0;
return;
}
}
@@ -1697,7 +1671,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
{
std::list<InDet::SiSpacePointForSeedITK*>::iterator r0=rb[0], r;
if (!data.endlist) {
- r0 = data.rMin;
+ r0 = data.rMin_ITK;
data.endlist = true;
}
@@ -1709,13 +1683,13 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
float imaxp = m_diver;
float imaxs = m_diversss;
- data.CmSp.clear();
+ data.CmSp_ITK.clear();
// Loop through all trigger space points
//
for (; r0!=rbe[0]; ++r0) {
data.nOneSeeds = 0;
- data.mapOneSeeds.clear();
+ data.mapOneSeeds_ITK.clear();
float R = (*r0)->radius();
@@ -1742,7 +1716,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
if (Zo < data.zminB || Zo > data.zmaxB) continue;
float Zu = Z+(550.-R)*Tz;
if (Zu < data.zminU || Zu > data.zmaxU) continue;
- data.SP[Nb] = (*r);
+ data.SP_ITK[Nb] = (*r);
if (++Nb==m_maxsizeSP) goto breakb;
}
}
@@ -1772,7 +1746,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
if (Zo < data.zminB || Zo > data.zmaxB) continue;
float Zu = Z+(550.-R)*Tz;
if (Zu < data.zminU || Zu > data.zmaxU) continue;
- data.SP[Nt] = (*r);
+ data.SP_ITK[Nt] = (*r);
if (++Nt==m_maxsizeSP) goto breakt;
}
}
@@ -1786,7 +1760,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
float ay = Y/R;
for (int i=0; i<Nt; ++i) {
- InDet::SiSpacePointForSeedITK* sp = data.SP[i];
+ InDet::SiSpacePointForSeedITK* sp = data.SP_ITK[i];
float dx = sp->x()-X;
float dy = sp->y()-Y;
@@ -1824,7 +1798,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
float CSA = Tzb2*COFK;
float ICSA = Tzb2*ipt2C;
float imax = imaxp;
- if (data.SP[b]->spacepoint->clusterList().second) imax = imaxs;
+ if (data.SP_ITK[b]->spacepoint->clusterList().second) imax = imaxs;
for (int t=Nb; t!=Nt; ++t) {
float dT = ((Tzb-data.Tz[t])*(Tzb-data.Tz[t])-data.R[t]*Rb2z-(Erb+data.Er[t]))-(data.R[t]*Rb2r)*((Tzb+data.Tz[t])*(Tzb+data.Tz[t]));
@@ -1847,11 +1821,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
float df = fabs(atan2(ay*y-ax*x,ax*y+ay*x)-data.ftrig);
if (df > M_PI) df=pi2-df;
if (df > data.ftrigW) continue;
- data.CmSp.emplace_back(std::make_pair(B/sqrt(S2), data.SP[t]));
- data.SP[t]->setParam(Im);
+ data.CmSp_ITK.emplace_back(std::make_pair(B/sqrt(S2), data.SP_ITK[t]));
+ data.SP_ITK[t]->setParam(Im);
}
- if (!data.CmSp.empty()) {
- newOneSeedWithCurvaturesComparison(data, data.SP[b], (*r0), Zob);
+ if (!data.CmSp_ITK.empty()) {
+ newOneSeedWithCurvaturesComparison(data, data.SP_ITK[b], (*r0), Zob);
}
}
fillSeeds(data);
@@ -1859,7 +1833,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::production3SpTrigger
if (nseed>=m_maxsize) {
data.endlist=false;
++r0;
- data.rMin = r0;
+ data.rMin_ITK = r0;
return;
}
}
@@ -1875,12 +1849,12 @@ void InDet::SiSpacePointsSeedMaker_ITK::newOneSeed
InDet::SiSpacePointForSeedITK*& p3, float z, float q) const
{
if (data.nOneSeeds < m_maxOneSize) {
- data.OneSeeds[data.nOneSeeds].set(p1,p2,p3,z);
- data.mapOneSeeds.insert(std::make_pair(q, &(data.OneSeeds[data.nOneSeeds])));
+ data.OneSeeds_ITK[data.nOneSeeds].set(p1,p2,p3,z);
+ data.mapOneSeeds_ITK.insert(std::make_pair(q, &(data.OneSeeds_ITK[data.nOneSeeds])));
++data.nOneSeeds;
} else {
std::multimap<float,InDet::SiSpacePointsProSeedITK*>::reverse_iterator
- l = data.mapOneSeeds.rbegin();
+ l = data.mapOneSeeds_ITK.rbegin();
if ((*l).first <= q) return;
@@ -1888,11 +1862,11 @@ void InDet::SiSpacePointsSeedMaker_ITK::newOneSeed
s->set(p1,p2,p3,z);
std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator
- i = data.mapOneSeeds.insert(std::make_pair(q,s));
+ i = data.mapOneSeeds_ITK.insert(std::make_pair(q,s));
- for (++i; i!=data.mapOneSeeds.end(); ++i) {
+ for (++i; i!=data.mapOneSeeds_ITK.end(); ++i) {
if ((*i).second==s) {
- data.mapOneSeeds.erase(i);
+ data.mapOneSeeds_ITK.erase(i);
return;
}
}
@@ -1910,8 +1884,8 @@ void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparison
bool pixb = !SPb->spacepoint->clusterList().second;
- std::sort(data.CmSp.begin(), data.CmSp.end(), comCurvatureITK());
- std::vector<std::pair<float,InDet::SiSpacePointForSeedITK*>>::iterator j,jn,i = data.CmSp.begin(),ie = data.CmSp.end();
+ std::sort(data.CmSp_ITK.begin(), data.CmSp_ITK.end(), comCurvatureITK());
+ std::vector<std::pair<float,InDet::SiSpacePointForSeedITK*>>::iterator j,jn,i = data.CmSp_ITK.begin(),ie = data.CmSp_ITK.end();
jn=i;
for (; i!=ie; ++i) {
@@ -1957,7 +1931,7 @@ void InDet::SiSpacePointsSeedMaker_ITK::newOneSeedWithCurvaturesComparison
newOneSeed(data, SPb, SP0, (*i).second, Zob, u);
}
- data.CmSp.clear();
+ data.CmSp_ITK.clear();
}
///////////////////////////////////////////////////////////////////
@@ -1969,9 +1943,9 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillSeeds(EventData& data) const
data.fillOneSeeds = 0;
std::multimap<float,InDet::SiSpacePointsProSeedITK*>::iterator
- lf = data.mapOneSeeds.begin(),
- l = data.mapOneSeeds.begin(),
- le = data.mapOneSeeds.end ();
+ lf = data.mapOneSeeds_ITK.begin(),
+ l = data.mapOneSeeds_ITK.begin(),
+ le = data.mapOneSeeds_ITK.end ();
if (l==le) return;
@@ -1983,43 +1957,43 @@ void InDet::SiSpacePointsSeedMaker_ITK::fillSeeds(EventData& data) const
if (l!=lf && s->spacepoint0()->radius() < 43. && w > -200.) continue;
if (!s->setQuality(w)) continue;
- if (data.i_seede!=data.l_seeds.end()) {
- s = &(*data.i_seede++);
+ if (data.i_seede_ITK!=data.l_seeds_ITK.end()) {
+ s = &(*data.i_seede_ITK++);
*s = *(*l).second;
} else {
- data.l_seeds.emplace_back(SiSpacePointsProSeedITK(*(*l).second));
- s = &(data.l_seeds.back());
- data.i_seede = data.l_seeds.end();
+ data.l_seeds_ITK.emplace_back(SiSpacePointsProSeedITK(*(*l).second));
+ s = &(data.l_seeds_ITK.back());
+ data.i_seede_ITK = data.l_seeds_ITK.end();
}
if (s->spacepoint0()->spacepoint->clusterList().second) w-=3000.;
else if (s->spacepoint1()->spacepoint->clusterList().second) w-=2000.;
else if (s->spacepoint2()->spacepoint->clusterList().second) w-=1000.;
- data.seeds.insert(std::make_pair(w,s));
+ data.seeds_ITK.insert(std::make_pair(w,s));
++data.fillOneSeeds;
}
}
-const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_ITK::next() const
+const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_ITK::next(EventData& data) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.nspoint==3) {
do {
- if (data.i_seed==data.i_seede) {
+ if (data.i_seed_ITK==data.i_seede_ITK) {
findNext(data);
- if (data.i_seed==data.i_seede) return nullptr;
+ if (data.i_seed_ITK==data.i_seede_ITK) return nullptr;
}
- ++data.i_seed;
- } while (!(*data.seed++).second->set3(data.seedOutput));
+ ++data.i_seed_ITK;
+ } while (!(*data.seed_ITK++).second->set3(data.seedOutput));
return &data.seedOutput;
} else {
- if (data.i_seed==data.i_seede) {
+ if (data.i_seed_ITK==data.i_seede_ITK) {
findNext(data);
- if (data.i_seed==data.i_seede) return nullptr;
+ if (data.i_seed_ITK==data.i_seede_ITK) return nullptr;
}
- (*data.i_seed++).set2(data.seedOutput);
+ (*data.i_seed_ITK++).set2(data.seedOutput);
return &data.seedOutput;
}
return nullptr;
@@ -2060,13 +2034,13 @@ InDet::SiSpacePointForSeedITK* InDet::SiSpacePointsSeedMaker_ITK::newSpacePoint
if ((z*z )<(x*x+y*y)) return sps;
}
- if (data.i_spforseed!=data.l_spforseed.end()) {
- sps = &(*data.i_spforseed++);
+ if (data.i_spforseed_ITK!=data.l_spforseed_ITK.end()) {
+ sps = &(*data.i_spforseed_ITK++);
sps->set(sp, r);
} else {
- data.l_spforseed.emplace_back(InDet::SiSpacePointForSeedITK(sp, r));
- sps = &(data.l_spforseed.back());
- data.i_spforseed = data.l_spforseed.end();
+ data.l_spforseed_ITK.emplace_back(InDet::SiSpacePointForSeedITK(sp, r));
+ sps = &(data.l_spforseed_ITK.back());
+ data.i_spforseed_ITK = data.l_spforseed_ITK.end();
}
return sps;
@@ -2082,67 +2056,23 @@ void InDet::SiSpacePointsSeedMaker_ITK::newSeed
{
InDet::SiSpacePointForSeedITK* p3 = nullptr;
- if (data.i_seede!=data.l_seeds.end()) {
- InDet::SiSpacePointsProSeedITK* s = &(*data.i_seede++);
+ if (data.i_seede_ITK!=data.l_seeds_ITK.end()) {
+ InDet::SiSpacePointsProSeedITK* s = &(*data.i_seede_ITK++);
s->set(p1, p2, p3, z);
} else {
- data.l_seeds.emplace_back(InDet::SiSpacePointsProSeedITK(p1, p2, p3, z));
- data.i_seede = data.l_seeds.end();
+ data.l_seeds_ITK.emplace_back(InDet::SiSpacePointsProSeedITK(p1, p2, p3, z));
+ data.i_seede_ITK = data.l_seeds_ITK.end();
}
}
-InDet::SiSpacePointsSeedMaker_ITK::EventData&
-InDet::SiSpacePointsSeedMaker_ITK::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- if (not m_initialized) slot = 0;
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot] = EventData{}; // This will be improved later.
-
- m_eventData[slot].checketa = m_checketa;
-
- // Build radius sorted containers
- m_eventData[slot].r_Sorted.resize(m_r_size);
- m_eventData[slot].r_index.resize(m_r_size, 0);
- m_eventData[slot].r_map.resize(m_r_size, 0);
-
- // Build radius-azimuthal-Z sorted containers
- for (int i=0; i<SizeRFZ; ++i) {
- m_eventData[slot].rfz_index [i]=0;
- m_eventData[slot].rfz_map [i]=0;
- }
- // Build radius-azimuthal-Z sorted containers for Z-vertices
- for (int i=0; i<SizeRFZV; ++i) {
- m_eventData[slot].rfzv_index[i]=0;
- m_eventData[slot].rfzv_map[i]=0;
- }
-
- m_eventData[slot].SP.resize(m_maxsizeSP, nullptr);
- m_eventData[slot].R.resize(m_maxsizeSP, 0.);
- m_eventData[slot].X.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Y.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Tz.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Er.resize(m_maxsizeSP, 0.);
- m_eventData[slot].U.resize(m_maxsizeSP, 0.);
- m_eventData[slot].V.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Zo.resize(m_maxsizeSP, 0.);
-
- m_eventData[slot].OneSeeds.resize(m_maxOneSize);
-
- m_eventData[slot].CmSp.reserve(500);
-
- m_eventData[slot].i_seed = m_eventData[slot].l_seeds.begin();
- m_eventData[slot].i_seede = m_eventData[slot].l_seeds.end ();
- }
-
- return m_eventData[slot];
+void InDet::SiSpacePointsSeedMaker_ITK::initializeEventData(EventData& data) const {
+ data.initialize(EventData::ITK,
+ m_maxsizeSP,
+ m_maxOneSize,
+ 0, // maxsize not used
+ m_r_size,
+ 0, // sizeRF not used
+ SizeRFZ,
+ SizeRFZV,
+ m_checketa);
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
index cfcf8ad83831135d4c206d72865ed1e430368d1f..6c8dd01682dd82842a1c10c33938dbeb46eab9da 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_LowMomentum.cxx
@@ -17,6 +17,7 @@
#include "TrkToolInterfaces/IPRD_AssociationTool.h"
#include <iomanip>
+#include <limits>
#include <ostream>
///////////////////////////////////////////////////////////////////
@@ -74,9 +75,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_LowMomentum::initialize()
//
m_outputlevel = msg().level()-MSG::DEBUG;
if (m_outputlevel<=0) {
- EventData& data{getEventData()};
+ EventData data;
+ initializeEventData(data);
data.nprint=0;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
m_initialized = true;
@@ -97,9 +99,9 @@ StatusCode InDet::SiSpacePointsSeedMaker_LowMomentum::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_LowMomentum::newEvent(int) const
+void InDet::SiSpacePointsSeedMaker_LowMomentum::newEvent(EventData& data, int) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.trigger = false;
if (!m_pixel && !m_sct) return;
@@ -171,9 +173,9 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newEvent(int) const
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_LowMomentum::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
-{
- EventData& data{getEventData()};
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const{
+ if (not data.initialized) initializeEventData(data);
data.trigger = false;
if (!m_pixel && !m_sct) return;
@@ -252,9 +254,11 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newRegion
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_LowMomentum::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor&) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor&) const
{
- newRegion(vPixel, vSCT);
+ newRegion(data, vPixel, vSCT);
}
///////////////////////////////////////////////////////////////////
@@ -262,9 +266,9 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newRegion
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_LowMomentum::find2Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_LowMomentum::find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 0;
if (lv.begin()!=lv.end()) mode = 1;
@@ -285,7 +289,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find2Sp(const std::list<Trk::Ver
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -294,9 +298,9 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find2Sp(const std::list<Trk::Ver
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 2;
if (lv.begin()!=lv.end()) mode = 3;
@@ -317,13 +321,13 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(const std::list<Trk::Ver
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
-void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(const std::list<Trk::Vertex>& lv, const double*) const
+void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double*) const
{
- find3Sp(lv);
+ find3Sp(data, lv);
}
///////////////////////////////////////////////////////////////////
@@ -332,9 +336,9 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::find3Sp(const std::list<Trk::Ver
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 5;
if (lv.begin()!=lv.end()) mode = 6;
@@ -355,7 +359,7 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp(const std::list<Trk::Ver
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -363,9 +367,10 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::findVSp(const std::list<Trk::Ver
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dump(MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dump(EventData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
+
if (data.nprint) return dumpEvent(data, out);
return dumpConditions(data, out);
}
@@ -520,35 +525,6 @@ MsgStream& InDet::SiSpacePointsSeedMaker_LowMomentum::dumpEvent(EventData& data,
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiSpacePointsSeedMaker_LowMomentum::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl, const InDet::SiSpacePointsSeedMaker_LowMomentum& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl, const InDet::SiSpacePointsSeedMaker_LowMomentum& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Find next set space points
///////////////////////////////////////////////////////////////////
@@ -581,11 +557,10 @@ bool InDet::SiSpacePointsSeedMaker_LowMomentum::newVertices(EventData& data, con
if (s1==0 && s2==0) return false;
- std::list<Trk::Vertex>::const_iterator v;
- data.l_vertex.erase(data.l_vertex.begin(),data.l_vertex.end());
+ data.l_vertex.clear();
- for (v=lV.begin(); v!=lV.end(); ++v) {
- data.l_vertex.push_back(static_cast<float>((*v).position().z()));
+ for (const Trk::Vertex& v : lV) {
+ data.l_vertex.insert(static_cast<float>(v.position().z()));
}
return false;
}
@@ -1092,9 +1067,10 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::newOneSeed
}
}
-const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_LowMomentum::next() const
+const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_LowMomentum::next(EventData& data) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
+
if (data.i_seed==data.i_seede) {
findNext(data);
if (data.i_seed==data.i_seede) return nullptr;
@@ -1107,14 +1083,11 @@ bool InDet::SiSpacePointsSeedMaker_LowMomentum::isZCompatible
{
if (Zv < m_zmin || Zv > m_zmax) return false;
- std::list<float>::iterator v=data.l_vertex.begin(),ve=data.l_vertex.end();
- if (v==ve) return true;
-
- float dZmin = fabs((*v)-Zv);
- ++v;
+ if (data.l_vertex.size()==0) return true;
- for (; v!=ve; ++v) {
- float dZ = fabs((*v)-Zv);
+ float dZmin = std::numeric_limits<float>::max();
+ for (const float& v : data.l_vertex) {
+ float dZ = fabs(v-Zv);
if (dZ<dZmin) dZmin=dZ;
}
return dZmin < (m_dzver+m_dzdrver*R)*sqrt(1.+T*T);
@@ -1208,46 +1181,14 @@ void InDet::SiSpacePointsSeedMaker_LowMomentum::fillSeeds(EventData& data) const
}
}
-InDet::SiSpacePointsSeedMaker_LowMomentum::EventData&
-InDet::SiSpacePointsSeedMaker_LowMomentum::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- if (not m_initialized) slot = 0;
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot] = EventData{}; // This will be improved later.
-
- // Build radius sorted containers
- m_eventData[slot].r_Sorted.resize(m_r_size);
- m_eventData[slot].r_index.resize(m_r_size, 0);
- m_eventData[slot].r_map.resize(m_r_size, 0);
- // Build radius-azimuthal-Z sorted containers
- for (int i=0; i<SizeRFZ; ++i) {
- m_eventData[slot].rfz_index[i]=0;
- m_eventData[slot].rfz_map[i]=0;
- }
-
- m_eventData[slot].SP.resize(m_maxsizeSP, nullptr);
- m_eventData[slot].R.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Tz.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Er.resize(m_maxsizeSP, 0.);
- m_eventData[slot].U.resize(m_maxsizeSP, 0.);
- m_eventData[slot].V.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Zo.resize(m_maxsizeSP, 0.);
-
- m_eventData[slot].OneSeeds.resize(m_maxOneSize);
-
- m_eventData[slot].i_seed = m_eventData[slot].l_seeds.begin();
- m_eventData[slot].i_seede = m_eventData[slot].l_seeds.end ();
- }
-
- return m_eventData[slot];
+void InDet::SiSpacePointsSeedMaker_LowMomentum::initializeEventData(EventData& data) const {
+ data.initialize(EventData::LowMomentum,
+ m_maxsizeSP,
+ m_maxOneSize,
+ 0, // maxsize not used
+ m_r_size,
+ 0, // sizeRF not used
+ SizeRFZ,
+ 0, // sizeRFZV not used
+ false); // checkEta not used
}
diff --git a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
index a6138574523e0ecdcf041ac0adc4585b32f913dd..fe10f6cfde2fa3334c8486342cab41363354ff96 100644
--- a/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
+++ b/InnerDetector/InDetRecTools/SiSpacePointsSeedTool_xk/src/SiSpacePointsSeedMaker_Trigger.cxx
@@ -59,9 +59,10 @@ StatusCode InDet::SiSpacePointsSeedMaker_Trigger::initialize()
//
m_outputlevel = msg().level()-MSG::DEBUG;
if (m_outputlevel<=0) {
- EventData& data{getEventData()};
+ EventData data;
+ initializeEventData(data);
data.nprint=0;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
m_initialized = true;
@@ -82,9 +83,9 @@ StatusCode InDet::SiSpacePointsSeedMaker_Trigger::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Trigger::newEvent(int) const
+void InDet::SiSpacePointsSeedMaker_Trigger::newEvent(EventData& data, int) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.trigger = false;
if (!m_pixel && !m_sct) return;
@@ -188,9 +189,9 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newEvent(int) const
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
+(EventData& data, const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
data.trigger = false;
if (!m_pixel && !m_sct) return;
@@ -274,11 +275,13 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
///////////////////////////////////////////////////////////////////
void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT, const IRoiDescriptor& IRD) const
+(EventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& IRD) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
- newRegion(vPixel, vSCT);
+ newRegion(data, vPixel, vSCT);
data.trigger = true;
@@ -301,9 +304,9 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newRegion
// with two space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Trigger::find2Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_Trigger::find2Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 0;
if (lv.begin()!=lv.end()) mode = 1;
@@ -326,7 +329,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find2Sp(const std::list<Trk::Vertex>
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -335,9 +338,9 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find2Sp(const std::list<Trk::Vertex>
// with three space points with or without vertex constraint
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 2;
if (lv.begin()!=lv.end()) mode = 3;
@@ -362,13 +365,13 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(const std::list<Trk::Vertex>
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
-void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(const std::list<Trk::Vertex>& lv, const double*) const
+void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(EventData& data, const std::list<Trk::Vertex>& lv, const double*) const
{
- find3Sp(lv);
+ find3Sp(data, lv);
}
///////////////////////////////////////////////////////////////////
@@ -377,9 +380,9 @@ void InDet::SiSpacePointsSeedMaker_Trigger::find3Sp(const std::list<Trk::Vertex>
// Variable means (2,3,4,....) any number space points
///////////////////////////////////////////////////////////////////
-void InDet::SiSpacePointsSeedMaker_Trigger::findVSp(const std::list<Trk::Vertex>& lv) const
+void InDet::SiSpacePointsSeedMaker_Trigger::findVSp(EventData& data, const std::list<Trk::Vertex>& lv) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
int mode = 5;
if (lv.begin()!=lv.end()) mode = 6;
@@ -404,7 +407,7 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findVSp(const std::list<Trk::Vertex>
if (m_outputlevel<=0) {
data.nprint=1;
- ATH_MSG_DEBUG(*this);
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -412,9 +415,9 @@ void InDet::SiSpacePointsSeedMaker_Trigger::findVSp(const std::list<Trk::Vertex>
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dump(MsgStream& out) const
+MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dump(EventData& data, MsgStream& out) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
if (data.nprint) return dumpEvent(data, out);
return dumpConditions(data, out);
@@ -583,35 +586,6 @@ MsgStream& InDet::SiSpacePointsSeedMaker_Trigger::dumpEvent(EventData& data, Msg
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiSpacePointsSeedMaker_Trigger::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl,const InDet::SiSpacePointsSeedMaker_Trigger& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl,const InDet::SiSpacePointsSeedMaker_Trigger& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Find next set space points
///////////////////////////////////////////////////////////////////
@@ -643,11 +617,10 @@ bool InDet::SiSpacePointsSeedMaker_Trigger::newVertices(EventData& data, const s
if (s1==0 && s2==0) return false;
- std::list<Trk::Vertex>::const_iterator v;
- data.l_vertex.erase(data.l_vertex.begin(),data.l_vertex.end());
+ data.l_vertex.clear();
- for (v=lV.begin(); v!=lV.end(); ++v) {
- data.l_vertex.push_back(static_cast<float>((*v).position().z()));
+ for (const Trk::Vertex& v : lV) {
+ data.l_vertex.insert(static_cast<float>(v.position().z()));
if (data.l_vertex.size() >= m_maxNumberVertices) break;
}
return false;
@@ -1547,9 +1520,10 @@ void InDet::SiSpacePointsSeedMaker_Trigger::newOneSeed
}
}
-const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_Trigger::next() const
+const InDet::SiSpacePointsSeed* InDet::SiSpacePointsSeedMaker_Trigger::next(EventData& data) const
{
- EventData& data{getEventData()};
+ if (not data.initialized) initializeEventData(data);
+
if (data.i_seed==data.i_seede) {
findNext(data);
if (data.i_seed==data.i_seede) return nullptr;
@@ -1564,13 +1538,11 @@ bool InDet::SiSpacePointsSeedMaker_Trigger::isZCompatible
{
if (Zv < m_zmin || Zv > m_zmax) return false;
- std::list<float>::iterator v=data.l_vertex.begin(),ve=data.l_vertex.end();
- if (v==ve) return true;
+ if (data.l_vertex.size()==0) return true;
- float dZmin = fabs((*v)-Zv);
- ++v;
- for (; v!=ve; ++v) {
- float dZ = fabs((*v)-Zv);
+ float dZmin = std::numeric_limits<float>::max();
+ for (const float& v : data.l_vertex) {
+ float dZ = fabs(v-Zv);
if (dZ<dZmin) dZmin=dZ;
}
return dZmin < (m_dzver+m_dzdrver*R)*sqrt(1.+T*T);
@@ -1578,15 +1550,14 @@ bool InDet::SiSpacePointsSeedMaker_Trigger::isZCompatible
float InDet::SiSpacePointsSeedMaker_Trigger::dZVertexMin(EventData& data, float& Z) const
{
- std::list<float>::iterator v=data.l_vertex.begin(),ve=data.l_vertex.end();
- if (v==ve) return 0.;
+ if (data.l_vertex.size()==0) return 0.;
- float dZm = 1.E10;
- for (; v!=ve; ++v) {
- float dZ = fabs((*v)-Z);
- if (dZ<dZm) dZm = dZ;
+ float dZmin = std::numeric_limits<float>::max();
+ for (const float& v : data.l_vertex) {
+ float dZ = fabs(v-Z);
+ if (dZ<dZmin) dZmin = dZ;
}
- return dZm;
+ return dZmin;
}
///////////////////////////////////////////////////////////////////
@@ -1665,54 +1636,14 @@ void InDet::SiSpacePointsSeedMaker_Trigger::fillSeeds(EventData& data) const
}
}
-InDet::SiSpacePointsSeedMaker_Trigger::EventData&
-InDet::SiSpacePointsSeedMaker_Trigger::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- if (not m_initialized) slot = 0;
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot] = EventData{}; // This will be improved later.
-
- // Build radius sorted containers
- m_eventData[slot].r_Sorted.resize(m_r_size);
- m_eventData[slot].r_index.resize(m_r_size, 0);
- m_eventData[slot].r_map.resize(m_r_size, 0);
-
- // Build radius-azimuthal-Z sorted containers
- for (int i=0; i<SizeRFZ; ++i) {
- m_eventData[slot].rfz_index[i] = 0;
- m_eventData[slot].rfz_map[i] = 0;
- }
-
- // Build radius-azimuthal-Z sorted containers for Z-vertices
- for (int i=0; i<SizeRFZV; ++i) {
- m_eventData[slot].rfzv_index[i] = 0;
- m_eventData[slot].rfzv_map[i] = 0;
- }
-
- m_eventData[slot].SP.resize(m_maxsizeSP, nullptr);
- m_eventData[slot].R.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Tz.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Er.resize(m_maxsizeSP, 0.);
- m_eventData[slot].U.resize(m_maxsizeSP, 0.);
- m_eventData[slot].V.resize(m_maxsizeSP, 0.);
- m_eventData[slot].Zo.resize(m_maxsizeSP, 0.);
- m_eventData[slot].OneSeeds.resize(m_maxOneSize);
-
- m_eventData[slot].i_seed = m_eventData[slot].l_seeds.begin();
- m_eventData[slot].i_seede = m_eventData[slot].l_seeds.end ();
- m_eventData[slot].seed = m_eventData[slot].mapSeeds.begin();
- m_eventData[slot].seede = m_eventData[slot].mapSeeds.end ();
- }
-
- return m_eventData[slot];
+void InDet::SiSpacePointsSeedMaker_Trigger::initializeEventData(EventData& data) const {
+ data.initialize(EventData::Trigger,
+ m_maxsizeSP,
+ m_maxOneSize,
+ 0, // maxsize not used
+ m_r_size,
+ 0, // sizeRF not used
+ SizeRFZ,
+ SizeRFZV,
+ false); // checkEta not used
}
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/CMakeLists.txt
index 8ae2bd4893699fc9ed15d384847a0dc1f1225919..076b88b50fdc63a93496a5fa579b278d2c0ca57e 100644
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/CMakeLists.txt
@@ -17,13 +17,14 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
Database/AthenaPOOL/AthenaPoolUtilities
InnerDetector/InDetRecEvent/InDetPrepRawData
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
Tracking/TrkEvent/TrkRIO_OnTrack )
# Component(s) in the package:
atlas_add_component( SiTrackMakerTool_xk
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkCaloClusterROI AthenaPoolUtilities InDetPrepRawData TrkRIO_OnTrack )
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkCaloClusterROI AthenaPoolUtilities InDetPrepRawData SiSPSeededTrackFinderData TrkRIO_OnTrack )
# Install files from the package:
atlas_install_headers( SiTrackMakerTool_xk )
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h
index c2586fb87cf453dc8d855c8e46ce3fe9c62a5fce..9b1d577df81334eb5c9ee09263bd4362ef61c82e 100644
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/SiTrackMakerTool_xk/SiTrackMaker_xk.h
@@ -40,6 +40,8 @@ class MsgStream;
namespace InDet{
+ class SiTrackMakerEventData_xk;
+
/**
@class SiTrackMaker_xk
@@ -66,32 +68,31 @@ namespace InDet{
SiTrackMaker_xk
(const std::string&,const std::string&,const IInterface*);
virtual ~SiTrackMaker_xk() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Main methods for local track finding
///////////////////////////////////////////////////////////////////
virtual std::list<Trk::Track*>
- getTracks(const std::list<const Trk::SpacePoint*>& Sp) const;
+ getTracks(SiTrackMakerEventData_xk& data, const std::list<const Trk::SpacePoint*>& Sp) const override;
virtual std::list<Trk::Track*>
- getTracks(const Trk::TrackParameters& Tp, const std::list<Amg::Vector3D>& Gp) const;
+ getTracks(SiTrackMakerEventData_xk& data, const Trk::TrackParameters& Tp, const std::list<Amg::Vector3D>& Gp) const override;
- virtual void newEvent(bool PIX, bool SCT) const;
- virtual void newTrigEvent(bool PIX, bool SCT) const;
+ virtual void newEvent(SiTrackMakerEventData_xk& data, bool PIX, bool SCT) const override;
+ virtual void newTrigEvent(SiTrackMakerEventData_xk& data, bool PIX, bool SCT) const override;
- virtual void endEvent() const;
+ virtual void endEvent(SiTrackMakerEventData_xk& data) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- MsgStream& dump(MsgStream& out) const;
- std::ostream& dump(std::ostream& out) const;
+ MsgStream& dump(SiTrackMakerEventData_xk& data, MsgStream& out) const override;
- protected:
+ private:
SiTrackMaker_xk() = delete;
SiTrackMaker_xk(const SiTrackMaker_xk&) =delete;
@@ -145,47 +146,14 @@ namespace InDet{
bool m_heavyion{false}; // Is it heavy ion events
Trk::MagneticFieldMode m_fieldModeEnum{Trk::FullField};
- mutable std::mutex m_mutex;
- mutable std::vector<EventContext::ContextEvt_t> m_cache ATLAS_THREAD_SAFE; // Guarded by m_mutex
- struct EventData { // To hold event dependent data
- // Counters
- int inputseeds{0}; // Number input seeds
- int goodseeds{0}; // Number good seeds
- int findtracks{0}; // Numbe found tracks
-
- // Flag for dump method
- int nprint{0}; // Kind output information
-
- // Updated by many methods
- std::multimap<const Trk::PrepRawData*, const Trk::Track*> clusterTrack;
- std::array<double, 9> par;
-
- // Updated only by newEvent and newTrigEvent methods
- bool pix{false};
- bool sct{false};
-
- // Updated only by getTracks
- bool dbm{false};
-
- // Updated only by newEvent method
- std::list<double> caloF;
- std::list<double> caloR;
- std::list<double> caloZ;
- std::list<double> hadF;
- std::list<double> hadR;
- std::list<double> hadZ;
- double xybeam[2]{0., 0.};
- };
- mutable std::vector<EventData> m_eventData ATLAS_THREAD_SAFE; // Guarded by m_mutex
-
///////////////////////////////////////////////////////////////////
// Methods
///////////////////////////////////////////////////////////////////
- const Trk::TrackParameters* getAtaPlane(EventData& data,
+ const Trk::TrackParameters* getAtaPlane(SiTrackMakerEventData_xk& data,
bool sss,
const std::list<const Trk::SpacePoint*>& SP) const;
- const Trk::TrackParameters* getAtaPlaneDBM(EventData& data,
+ const Trk::TrackParameters* getAtaPlaneDBM(SiTrackMakerEventData_xk& data,
const std::list<const Trk::SpacePoint*>& SP) const;
bool globalPositions(const Trk::SpacePoint* s0,
@@ -197,24 +165,19 @@ namespace InDet{
bool globalPosition(const Trk::SpacePoint* sp, double* dir, double* p) const;
void globalDirections(double* p0, double* p1, double* p2, double* d0, double* d1, double* d2) const;
InDet::TrackQualityCuts setTrackQualityCuts(bool simpleTrack) const;
- void detectorElementsSelection(EventData& data,
+ void detectorElementsSelection(SiTrackMakerEventData_xk& data,
std::list<const InDetDD::SiDetectorElement*>& DE) const;
- bool newSeed(EventData& data, const std::list<const Trk::SpacePoint*>& Sp) const;
- bool isNewTrack(EventData& data, Trk::Track* Tr) const;
- bool isCaloCompatible(EventData& data) const;
- bool isHadCaloCompatible(EventData& data) const;
+ bool newSeed(SiTrackMakerEventData_xk& data, const std::list<const Trk::SpacePoint*>& Sp) const;
+ bool isNewTrack(SiTrackMakerEventData_xk& data, Trk::Track* Tr) const;
+ bool isCaloCompatible(SiTrackMakerEventData_xk& data) const;
+ bool isHadCaloCompatible(SiTrackMakerEventData_xk& data) const;
bool isDBMSeeds(const Trk::SpacePoint* s) const;
- void clusterTrackMap(EventData& data, Trk::Track* Tr) const;
-
- EventData& getEventData() const;
+ void clusterTrackMap(SiTrackMakerEventData_xk& data, Trk::Track* Tr) const;
MsgStream& dumpconditions(MsgStream& out) const;
- MsgStream& dumpevent(EventData& data, MsgStream& out) const;
+ MsgStream& dumpevent(SiTrackMakerEventData_xk& data, MsgStream& out) const;
};
- MsgStream& operator << (MsgStream& sl, const SiTrackMaker_xk& se);
- std::ostream& operator << (std::ostream& sl, const SiTrackMaker_xk& se);
-
} // end of name space
#endif // SiTrackMaker_xk_H
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
index f43ca12c371e93f9e7052f875070ca204af0f738..5756c4bd49c1db4af41a5391811e9cf022755484 100644
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
@@ -14,6 +14,7 @@
#include "SiTrackMakerTool_xk/SiTrackMaker_xk.h"
#include "InDetPrepRawData/SiClusterContainer.h"
+#include "SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h"
#include "TrkCaloClusterROI/CaloClusterROI.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
@@ -133,11 +134,10 @@ StatusCode InDet::SiTrackMaker_xk::finalize()
// Dumps relevant information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiTrackMaker_xk::dump(MsgStream& out) const
+MsgStream& InDet::SiTrackMaker_xk::dump(SiTrackMakerEventData_xk& data, MsgStream& out) const
{
- EventData& data{getEventData()};
out<<std::endl;
- if (data.nprint) return dumpevent(data, out);
+ if (data.nprint()) return dumpevent(data, out);
return dumpconditions(out);
}
@@ -207,178 +207,144 @@ MsgStream& InDet::SiTrackMaker_xk::dumpconditions(MsgStream& out) const
// Dumps event information into the MsgStream
///////////////////////////////////////////////////////////////////
-MsgStream& InDet::SiTrackMaker_xk::dumpevent(EventData& data, MsgStream& out) const
+MsgStream& InDet::SiTrackMaker_xk::dumpevent(SiTrackMakerEventData_xk& data, MsgStream& out) const
{
out<<"|---------------------------------------------------------------------|"
<<std::endl;
- out<<"| Number input seeds | "<<std::setw(12)<<data.inputseeds
+ out<<"| Number input seeds | "<<std::setw(12)<<data.inputseeds()
<<" |"<<std::endl;
- out<<"| Number good seeds | "<<std::setw(12)<<data.goodseeds
+ out<<"| Number good seeds | "<<std::setw(12)<<data.goodseeds()
<<" |"<<std::endl;
- out<<"| Number output tracks | "<<std::setw(12)<<data.findtracks
+ out<<"| Number output tracks | "<<std::setw(12)<<data.findtracks()
<<" |"<<std::endl;
out<<"|---------------------------------------------------------------------|"
<<std::endl;
return out;
}
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiTrackMaker_xk::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl, const InDet::SiTrackMaker_xk& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl, const InDet::SiTrackMaker_xk& se)
-{
- return se.dump(sl);
-}
-
///////////////////////////////////////////////////////////////////
// Initiate track finding tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiTrackMaker_xk::newEvent(bool PIX, bool SCT) const
+void InDet::SiTrackMaker_xk::newEvent(SiTrackMakerEventData_xk& data, bool PIX, bool SCT) const
{
- EventData& data{getEventData()};
-
- data.xybeam[0] = 0.;
- data.xybeam[1] = 0.;
+ data.xybeam()[0] = 0.;
+ data.xybeam()[1] = 0.;
if (not m_beamSpotKey.empty()) {
SG::ReadCondHandle<InDet::BeamSpotData> beamSpotHandle { m_beamSpotKey };
if (beamSpotHandle.isValid()) {
- data.xybeam[0] = beamSpotHandle->beamPos()[0];
- data.xybeam[1] = beamSpotHandle->beamPos()[1];
+ data.xybeam()[0] = beamSpotHandle->beamPos()[0];
+ data.xybeam()[1] = beamSpotHandle->beamPos()[1];
}
}
- data.pix = PIX and m_usePix;
- data.sct = SCT and m_useSct;
+ data.pix() = PIX and m_usePix;
+ data.sct() = SCT and m_useSct;
bool simpleTrack = false;
InDet::TrackQualityCuts trackquality = setTrackQualityCuts(simpleTrack);
// New event for track finder tool
//
- m_tracksfinder->newEvent(m_trackinfo, trackquality);
+ m_tracksfinder->newEvent(data.combinatorialData(), m_trackinfo, trackquality);
// Erase cluster to track association
//
- if (m_seedsfilter) data.clusterTrack.clear();
+ if (m_seedsfilter) data.clusterTrack().clear();
// Erase statistic information
//
- data.inputseeds = 0;
- data.goodseeds = 0;
- data.findtracks = 0;
+ data.inputseeds() = 0;
+ data.goodseeds() = 0;
+ data.findtracks() = 0;
// Retrieve
//
if (m_useBremModel && m_useCaloSeeds) {
- data.caloF.clear();
- data.caloR.clear();
- data.caloZ.clear();
+ data.caloF().clear();
+ data.caloR().clear();
+ data.caloZ().clear();
if (!m_caloCluster.key().empty()) {
SG::ReadHandle<CaloClusterROI_Collection> calo_cluster(m_caloCluster);
if (calo_cluster.isValid()) {
for (const Trk::CaloClusterROI *c : * calo_cluster) {
- data.caloF.push_back( c->globalPosition().phi ());
- data.caloR.push_back( c->globalPosition().perp());
- data.caloZ.push_back( c->globalPosition().z ());
+ data.caloF().push_back( c->globalPosition().phi ());
+ data.caloR().push_back( c->globalPosition().perp());
+ data.caloZ().push_back( c->globalPosition().z ());
}
}
}
}
if (!m_useSSSfilter && m_useHClusSeed) {
-
- data.hadF.clear();
- data.hadR.clear();
- data.hadZ.clear();
+ data.hadF().clear();
+ data.hadR().clear();
+ data.hadZ().clear();
if (!m_caloHad.key().empty()) {
SG::ReadHandle<CaloClusterROI_Collection> calo_had(m_caloHad);
if (calo_had.isValid()) {
for (const Trk::CaloClusterROI *c : * calo_had) {
- data.hadF.push_back( c->globalPosition().phi ());
- data.hadR.push_back( c->globalPosition().perp());
- data.hadZ.push_back( c->globalPosition().z ());
+ data.hadF().push_back( c->globalPosition().phi ());
+ data.hadR().push_back( c->globalPosition().perp());
+ data.hadZ().push_back( c->globalPosition().z ());
}
}
}
}
- if (m_seedsegmentsWrite) m_seedtrack->newEvent(m_trackinfo, m_patternName);
+ if (m_seedsegmentsWrite) m_seedtrack->newEvent(data.conversionData(), m_trackinfo, m_patternName);
}
///////////////////////////////////////////////////////////////////
// Initiate track finding tool for new event
///////////////////////////////////////////////////////////////////
-void InDet::SiTrackMaker_xk::newTrigEvent(bool PIX, bool SCT) const
+void InDet::SiTrackMaker_xk::newTrigEvent(SiTrackMakerEventData_xk& data, bool PIX, bool SCT) const
{
- EventData& data{getEventData()};
- data.pix = PIX && m_usePix;
- data.sct = SCT && m_useSct;
+ data.pix() = PIX && m_usePix;
+ data.sct() = SCT && m_useSct;
bool simpleTrack = true;
InDet::TrackQualityCuts trackquality = setTrackQualityCuts(simpleTrack);
// New event for track finder tool
//
- m_tracksfinder->newEvent(m_trackinfo, trackquality);
+ m_tracksfinder->newEvent(data.combinatorialData(), m_trackinfo, trackquality);
// Erase cluster to track association
//
- if (m_seedsfilter) data.clusterTrack.clear();
+ if (m_seedsfilter) data.clusterTrack().clear();
// Erase statistic information
//
- data.inputseeds = 0;
- data.goodseeds = 0;
- data.findtracks = 0;
+ data.inputseeds() = 0;
+ data.goodseeds() = 0;
+ data.findtracks() = 0;
}
///////////////////////////////////////////////////////////////////
// Finalize track finding tool for given event
///////////////////////////////////////////////////////////////////
-void InDet::SiTrackMaker_xk::endEvent() const
+void InDet::SiTrackMaker_xk::endEvent(SiTrackMakerEventData_xk& data) const
{
- EventData& data{getEventData()};
// End event for track finder tool
//
- m_tracksfinder->endEvent();
+ m_tracksfinder->endEvent(data.combinatorialData());
//correction to exclude memory fragmentation
- data.clusterTrack.clear();
+ data.clusterTrack().clear();
// end event for seed to track tool
- if (m_seedsegmentsWrite) m_seedtrack->endEvent();
+ if (m_seedsegmentsWrite) m_seedtrack->endEvent(data.conversionData());
// Print event information
//
if (msgLevel()<=0) {
- data.nprint = 1;
- ATH_MSG_DEBUG(*this);
+ data.nprint() = 1;
+ dump(data, msg(MSG::DEBUG));
}
}
@@ -387,28 +353,27 @@ void InDet::SiTrackMaker_xk::endEvent() const
///////////////////////////////////////////////////////////////////
std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
-(const std::list<const Trk::SpacePoint*>& Sp) const
+(SiTrackMakerEventData_xk& data, const std::list<const Trk::SpacePoint*>& Sp) const
{
- EventData& data{getEventData()};
- ++data.inputseeds;
+ ++data.inputseeds();
std::list<Trk::Track*> tracks;
- if (!data.pix && !data.sct) return tracks;
+ if (!data.pix() && !data.sct()) return tracks;
bool good;
!m_seedsfilter ? good=true : good=newSeed(data, Sp);
if (!good) return tracks;
- data.dbm = isDBMSeeds(*Sp.begin());
+ data.dbm() = isDBMSeeds(*Sp.begin());
// Get initial parameters estimation
//
bool sss = false;
const Trk::TrackParameters* Tp = nullptr;
- if (data.dbm) Tp = getAtaPlaneDBM(data, Sp);
+ if (data.dbm()) Tp = getAtaPlaneDBM(data, Sp);
else Tp = getAtaPlane(data, sss && m_useHClusSeed, Sp);
if (!Tp) return tracks;
- ++data.goodseeds;
+ ++data.goodseeds();
// Get detector elements road
//
@@ -416,7 +381,7 @@ std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
if (!m_cosmicTrack) m_roadmaker->detElementsRoad(*Tp,Trk::alongMomentum, DE);
else m_roadmaker->detElementsRoad(*Tp,Trk::oppositeMomentum,DE);
- if (!data.pix || !data.sct || data.dbm) detectorElementsSelection(data, DE);
+ if (!data.pix() || !data.sct() || data.dbm()) detectorElementsSelection(data, DE);
if ( static_cast<int>(DE.size()) < m_nclusmin) {
delete Tp;
@@ -428,13 +393,13 @@ std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
// Find possible list of tracks using space points space points information
//
if (!m_useBremModel) {
- tracks = m_tracksfinder->getTracks (*Tp,Sp,Gp,DE,data.clusterTrack);
+ tracks = m_tracksfinder->getTracks (data.combinatorialData(), *Tp, Sp, Gp, DE, data.clusterTrack());
} else if (!m_useCaloSeeds) {
- tracks = m_tracksfinder->getTracksWithBrem(*Tp,Sp,Gp,DE,data.clusterTrack,false);
+ tracks = m_tracksfinder->getTracksWithBrem(data.combinatorialData(), *Tp, Sp, Gp, DE, data.clusterTrack(), false);
} else if (isCaloCompatible(data)) {
- tracks = m_tracksfinder->getTracksWithBrem(*Tp,Sp,Gp,DE,data.clusterTrack,true);
+ tracks = m_tracksfinder->getTracksWithBrem(data.combinatorialData(), *Tp, Sp, Gp, DE, data.clusterTrack(), true);
} else {
- tracks = m_tracksfinder->getTracks (*Tp,Sp,Gp,DE,data.clusterTrack);
+ tracks = m_tracksfinder->getTracks (data.combinatorialData(), *Tp, Sp, Gp, DE, data.clusterTrack());
}
if (m_seedsfilter) {
@@ -448,11 +413,11 @@ std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
}
}
}
- data.findtracks+=tracks.size();
+ data.findtracks() += tracks.size();
// Call seed to track execution
//
- if (m_seedsegmentsWrite) m_seedtrack->executeSiSPSeedSegments(Tp,tracks.size(),Sp);
+ if (m_seedsegmentsWrite) m_seedtrack->executeSiSPSeedSegments(data.conversionData(), Tp, tracks.size(), Sp);
delete Tp;
return tracks;
@@ -463,14 +428,13 @@ std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
///////////////////////////////////////////////////////////////////
std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
-(const Trk::TrackParameters& Tp, const std::list<Amg::Vector3D>& Gp) const
+(SiTrackMakerEventData_xk& data, const Trk::TrackParameters& Tp, const std::list<Amg::Vector3D>& Gp) const
{
- EventData& data{getEventData()};
- ++data.inputseeds;
+ ++data.inputseeds();
std::list<Trk::Track*> tracks;
- if (!data.pix && !data.sct) return tracks;
+ if (!data.pix() && !data.sct()) return tracks;
- ++data.goodseeds;
+ ++data.goodseeds();
// Get detector elements road
//
@@ -478,7 +442,7 @@ std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
if (!m_cosmicTrack) m_roadmaker->detElementsRoad(Tp,Trk::alongMomentum, DE);
else m_roadmaker->detElementsRoad(Tp,Trk::oppositeMomentum,DE);
- if (!data.pix || !data.sct) detectorElementsSelection(data, DE);
+ if (!data.pix() || !data.sct()) detectorElementsSelection(data, DE);
if (static_cast<int>(DE.size()) < m_nclusmin) return tracks;
@@ -487,13 +451,13 @@ std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
std::list<const Trk::SpacePoint*> Sp;
if (!m_useBremModel) {
- tracks = m_tracksfinder->getTracks (Tp,Sp,Gp,DE,data.clusterTrack);
+ tracks = m_tracksfinder->getTracks (data.combinatorialData(), Tp, Sp, Gp, DE, data.clusterTrack());
} else if (!m_useCaloSeeds) {
- tracks = m_tracksfinder->getTracksWithBrem(Tp,Sp,Gp,DE,data.clusterTrack,false);
+ tracks = m_tracksfinder->getTracksWithBrem(data.combinatorialData(), Tp, Sp, Gp, DE, data.clusterTrack(), false);
} else if (isCaloCompatible(data)) {
- tracks = m_tracksfinder->getTracksWithBrem(Tp,Sp,Gp,DE,data.clusterTrack,true);
+ tracks = m_tracksfinder->getTracksWithBrem(data.combinatorialData(), Tp, Sp, Gp, DE, data.clusterTrack(), true);
} else {
- tracks = m_tracksfinder->getTracks (Tp,Sp,Gp,DE,data.clusterTrack);
+ tracks = m_tracksfinder->getTracks (data.combinatorialData(), Tp, Sp, Gp, DE, data.clusterTrack());
}
if (m_seedsfilter) {
@@ -507,7 +471,7 @@ std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
}
}
}
- data.findtracks += tracks.size();
+ data.findtracks() += tracks.size();
return tracks;
}
@@ -516,7 +480,7 @@ std::list<Trk::Track*> InDet::SiTrackMaker_xk::getTracks
///////////////////////////////////////////////////////////////////
const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlane
-(EventData& data, bool sss, const std::list<const Trk::SpacePoint*>& SP) const
+(SiTrackMakerEventData_xk& data, bool sss, const std::list<const Trk::SpacePoint*>& SP) const
{
std::list<const Trk::SpacePoint*>::const_iterator is=SP.begin(),ise=SP.end(),is0,is1,is2;
if (is==ise) return nullptr;
@@ -564,8 +528,8 @@ const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlane
double d[3] = {x0-D[0],y0-D[1],z0-D[2]};
- data.par[0] = d[0]*Ax[0]+d[1]*Ax[1]+d[2]*Ax[2];
- data.par[1] = d[0]*Ay[0]+d[1]*Ay[1]+d[2]*Ay[2];
+ data.par()[0] = d[0]*Ax[0]+d[1]*Ax[1]+d[2]*Ax[2];
+ data.par()[1] = d[0]*Ay[0]+d[1]*Ay[1]+d[2]*Ay[2];
Trk::MagneticFieldMode fieldModeEnum(m_fieldModeEnum);
if (!m_fieldServiceHandle->solenoidOn()) fieldModeEnum = Trk::NoField;
@@ -575,31 +539,31 @@ const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlane
double H[3],gP[3] ={x0,y0,z0}; m_fieldServiceHandle->getFieldZR(gP,H);
if (fabs(H[2])>.0001) {
- data.par[2] = atan2(b+a*A,a-b*A);
- data.par[3] = atan2(1.,T) ;
- data.par[5] = -C/(300.*H[2]) ;
+ data.par()[2] = atan2(b+a*A,a-b*A);
+ data.par()[3] = atan2(1.,T) ;
+ data.par()[5] = -C/(300.*H[2]) ;
} else {
T = z2*sqrt(r2) ;
- data.par[2] = atan2(y2,x2);
- data.par[3] = atan2(1.,T) ;
- data.par[5] = 1./m_pTmin ;
+ data.par()[2] = atan2(y2,x2);
+ data.par()[3] = atan2(1.,T) ;
+ data.par()[5] = 1./m_pTmin ;
}
} else {
T = z2*sqrt(r2) ;
- data.par[2] = atan2(y2,x2);
- data.par[3] = atan2(1.,T) ;
- data.par[5] = 1./m_pTmin ;
+ data.par()[2] = atan2(y2,x2);
+ data.par()[3] = atan2(1.,T) ;
+ data.par()[5] = 1./m_pTmin ;
}
- if (fabs(data.par[5])*m_pTmin > 1.1) return nullptr;
- data.par[4] = data.par[5]/sqrt(1.+T*T);
- data.par[6] = x0 ;
- data.par[7] = y0 ;
- data.par[8] = z0 ;
+ if (fabs(data.par()[5])*m_pTmin > 1.1) return nullptr;
+ data.par()[4] = data.par()[5]/sqrt(1.+T*T);
+ data.par()[6] = x0 ;
+ data.par()[7] = y0 ;
+ data.par()[8] = z0 ;
if (sss && !isHadCaloCompatible(data)) return nullptr;
- return pla->createTrackParameters(data.par[0],data.par[1],data.par[2],data.par[3],data.par[4],0);
+ return pla->createTrackParameters(data.par()[0],data.par()[1],data.par()[2],data.par()[3],data.par()[4],0);
}
///////////////////////////////////////////////////////////////////
@@ -607,7 +571,7 @@ const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlane
///////////////////////////////////////////////////////////////////
const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlaneDBM
-(EventData& data, const std::list<const Trk::SpacePoint*>& SP) const
+(SiTrackMakerEventData_xk& data, const std::list<const Trk::SpacePoint*>& SP) const
{
std::list<const Trk::SpacePoint*>::const_iterator is=SP.begin(),ise=SP.end(),is0,is1,is2;
if (is==ise) return nullptr;
@@ -626,8 +590,8 @@ const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlaneDBM
double p0[3],p1[3],p2[3];
if (!globalPositions((*is0),(*is1),(*is2),p0,p1,p2)) return nullptr;
- double x0 = data.xybeam[0]-p0[0];
- double y0 = data.xybeam[1]-p0[1];
+ double x0 = data.xybeam()[0]-p0[0];
+ double y0 = data.xybeam()[1]-p0[1];
double x2 = p2[0] -p0[0];
double y2 = p2[1] -p0[1];
double z2 = p2[2] -p0[2];
@@ -652,8 +616,8 @@ const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlaneDBM
double d[3] = {p0[0]-D[0],p0[1]-D[1],p0[2]-D[2]};
- data.par[0] = d[0]*Ax[0]+d[1]*Ax[1]+d[2]*Ax[2];
- data.par[1] = d[0]*Ay[0]+d[1]*Ay[1]+d[2]*Ay[2];
+ data.par()[0] = d[0]*Ax[0]+d[1]*Ax[1]+d[2]*Ax[2];
+ data.par()[1] = d[0]*Ay[0]+d[1]*Ay[1]+d[2]*Ay[2];
Trk::MagneticFieldMode fieldModeEnum(m_fieldModeEnum);
if (!m_fieldServiceHandle->solenoidOn()) fieldModeEnum = Trk::NoField;
@@ -663,28 +627,28 @@ const Trk::TrackParameters* InDet::SiTrackMaker_xk::getAtaPlaneDBM
m_fieldServiceHandle->getFieldZR(gP,H);
if (fabs(H[2])>.0001) {
- data.par[2] = atan2(b+a*A,a-b*A);
- data.par[3] = atan2(1.,T) ;
- data.par[5] = -C/(300.*H[2]) ;
+ data.par()[2] = atan2(b+a*A,a-b*A);
+ data.par()[3] = atan2(1.,T) ;
+ data.par()[5] = -C/(300.*H[2]) ;
} else {
T = z2*sqrt(r2) ;
- data.par[2] = atan2(y2,x2);
- data.par[3] = atan2(1.,T) ;
- data.par[5] = 1./1000. ;
+ data.par()[2] = atan2(y2,x2);
+ data.par()[3] = atan2(1.,T) ;
+ data.par()[5] = 1./1000. ;
}
} else {
T = z2*sqrt(r2) ;
- data.par[2] = atan2(y2,x2);
- data.par[3] = atan2(1.,T) ;
- data.par[5] = 1./1000 ;
+ data.par()[2] = atan2(y2,x2);
+ data.par()[3] = atan2(1.,T) ;
+ data.par()[5] = 1./1000 ;
}
- if (fabs(data.par[5])*20. > 1.1) return nullptr;
- data.par[4] = data.par[5]/sqrt(1.+T*T);
- data.par[6] = p0[0] ;
- data.par[7] = p0[1] ;
- data.par[8] = p0[2] ;
- return pla->createTrackParameters(data.par[0],data.par[1],data.par[2],data.par[3],data.par[4],0);
+ if (fabs(data.par()[5])*20. > 1.1) return nullptr;
+ data.par()[4] = data.par()[5]/sqrt(1.+T*T);
+ data.par()[6] = p0[0] ;
+ data.par()[7] = p0[1] ;
+ data.par()[8] = p0[2] ;
+ return pla->createTrackParameters(data.par()[0],data.par()[1],data.par()[2],data.par()[3],data.par()[4],0);
}
///////////////////////////////////////////////////////////////////
@@ -726,18 +690,18 @@ InDet::TrackQualityCuts InDet::SiTrackMaker_xk::setTrackQualityCuts(bool simpleT
// Detector elements selection
///////////////////////////////////////////////////////////////////
-void InDet::SiTrackMaker_xk::detectorElementsSelection(EventData& data,
+void InDet::SiTrackMaker_xk::detectorElementsSelection(SiTrackMakerEventData_xk& data,
std::list<const InDetDD::SiDetectorElement*>& DE) const
{
std::list<const InDetDD::SiDetectorElement*>::iterator d = DE.begin();
- if (!data.dbm) {
+ if (!data.dbm()) {
while (d!=DE.end()) {
if ((*d)->isPixel()) {
- if (!data.pix) {
+ if (!data.pix()) {
d = DE.erase(d);
continue;
}
- } else if (!data.sct) {
+ } else if (!data.sct()) {
d = DE.erase(d);
continue;
}
@@ -765,10 +729,10 @@ void InDet::SiTrackMaker_xk::detectorElementsSelection(EventData& data,
// New clusters comparison with clusters associated with track
///////////////////////////////////////////////////////////////////
-bool InDet::SiTrackMaker_xk::newSeed(EventData& data, const std::list<const Trk::SpacePoint*>& Sp) const
+bool InDet::SiTrackMaker_xk::newSeed(SiTrackMakerEventData_xk& data, const std::list<const Trk::SpacePoint*>& Sp) const
{
std::multiset<const Trk::Track*> trackseed;
- std::multimap<const Trk::PrepRawData*,const Trk::Track*>::const_iterator pt,pte = data.clusterTrack.end();
+ std::multimap<const Trk::PrepRawData*,const Trk::Track*>::const_iterator pt,pte = data.clusterTrack().end();
std::list<const Trk::SpacePoint*>::const_iterator s=Sp.begin(),se=Sp.end();
int n = 0;
@@ -776,7 +740,7 @@ bool InDet::SiTrackMaker_xk::newSeed(EventData& data, const std::list<const Trk:
const Trk::PrepRawData* p = (*s)->clusterList().first;
- for (pt = data.clusterTrack.find(p); pt!=pte; ++pt) {
+ for (pt = data.clusterTrack().find(p); pt!=pte; ++pt) {
if ((*pt).first!=p) break;
trackseed.insert((*pt).second);
}
@@ -785,7 +749,7 @@ bool InDet::SiTrackMaker_xk::newSeed(EventData& data, const std::list<const Trk:
p = (*s)->clusterList().second;
if (!p) continue;
- for (pt = data.clusterTrack.find(p); pt!=pte; ++pt) {
+ for (pt = data.clusterTrack().find(p); pt!=pte; ++pt) {
if ((*pt).first!=p) break;
trackseed.insert((*pt).second);
}
@@ -831,7 +795,7 @@ bool InDet::SiTrackMaker_xk::newSeed(EventData& data, const std::list<const Trk:
if ( (m_ITKGeomtry && t3 > 0) || nsm3 > 13 || t3 > 2) return false;
- if ( !m_cosmicTrack && n==3 && data.sct && (*Sp.begin())->r() > 43. ) return true;
+ if ( !m_cosmicTrack && n==3 && data.sct() && (*Sp.begin())->r() > 43. ) return true;
if (t3 > 0) return false;
return true;
}
@@ -840,7 +804,7 @@ bool InDet::SiTrackMaker_xk::newSeed(EventData& data, const std::list<const Trk:
// Clusters-track multimap production
///////////////////////////////////////////////////////////////////
-void InDet::SiTrackMaker_xk::clusterTrackMap(EventData& data, Trk::Track* Tr) const
+void InDet::SiTrackMaker_xk::clusterTrackMap(SiTrackMakerEventData_xk& data, Trk::Track* Tr) const
{
DataVector<const Trk::MeasurementBase>::const_iterator
m = Tr->measurementsOnTrack()->begin(),
@@ -848,7 +812,7 @@ void InDet::SiTrackMaker_xk::clusterTrackMap(EventData& data, Trk::Track* Tr) c
for (; m!=me; ++m) {
const Trk::PrepRawData* prd = static_cast<const Trk::RIO_OnTrack*>(*m)->prepRawData();
- if (prd) data.clusterTrack.insert(std::make_pair(prd, Tr));
+ if (prd) data.clusterTrack().insert(std::make_pair(prd, Tr));
}
}
@@ -856,11 +820,11 @@ void InDet::SiTrackMaker_xk::clusterTrackMap(EventData& data, Trk::Track* Tr) c
// Test is it new track
///////////////////////////////////////////////////////////////////
-bool InDet::SiTrackMaker_xk::isNewTrack(EventData& data, Trk::Track* Tr) const
+bool InDet::SiTrackMaker_xk::isNewTrack(SiTrackMakerEventData_xk& data, Trk::Track* Tr) const
{
const Trk::PrepRawData* prd [100];
std::multimap<const Trk::PrepRawData*,const Trk::Track*>::const_iterator
- ti,t[100],te = data.clusterTrack.end();
+ ti,t[100],te = data.clusterTrack().end();
int n = 0;
@@ -873,7 +837,7 @@ bool InDet::SiTrackMaker_xk::isNewTrack(EventData& data, Trk::Track* Tr) const
const Trk::PrepRawData* pr = static_cast<const Trk::RIO_OnTrack*>(*m)->prepRawData();
if (pr) {
prd[n] =pr;
- t [n] = data.clusterTrack.find(prd[n]);
+ t [n] = data.clusterTrack().find(prd[n]);
if (t[n]==te) return true;
++n;
}
@@ -981,20 +945,20 @@ bool InDet::SiTrackMaker_xk::globalPosition
// Test is it track with calo seed compatible
///////////////////////////////////////////////////////////////////
-bool InDet::SiTrackMaker_xk::isCaloCompatible(EventData& data) const
+bool InDet::SiTrackMaker_xk::isCaloCompatible(SiTrackMakerEventData_xk& data) const
{
const double pi = M_PI, pi2 = 2.*M_PI;
- if (data.caloF.empty()) return false;
+ if (data.caloF().empty()) return false;
- std::list<double>::const_iterator f = data.caloF.begin(), fe = data.caloF.end();
- std::list<double>::const_iterator r = data.caloR.begin();
- std::list<double>::const_iterator z = data.caloZ.begin();
+ std::list<double>::const_iterator f = data.caloF().begin(), fe = data.caloF().end();
+ std::list<double>::const_iterator r = data.caloR().begin();
+ std::list<double>::const_iterator z = data.caloZ().begin();
- double F = data.par[2] ;
- double E = -log(tan(.5*data.par[3])) ;
- double R = sqrt(data.par[6]*data.par[6]+data.par[7]*data.par[7]);
- double Z = data.par[8] ;
+ double F = data.par()[2] ;
+ double E = -log(tan(.5*data.par()[3])) ;
+ double R = sqrt(data.par()[6]*data.par()[6]+data.par()[7]*data.par()[7]);
+ double Z = data.par()[8] ;
for (; f!=fe; ++f) {
double df = fabs(F-(*f));
@@ -1013,20 +977,20 @@ bool InDet::SiTrackMaker_xk::isCaloCompatible(EventData& data) const
// Test track is compatible withi had calo seed
///////////////////////////////////////////////////////////////////
-bool InDet::SiTrackMaker_xk::isHadCaloCompatible(EventData& data) const
+bool InDet::SiTrackMaker_xk::isHadCaloCompatible(SiTrackMakerEventData_xk& data) const
{
const double pi = M_PI, pi2 = 2.*M_PI;
- if (data.hadF.empty() || fabs(data.par[5])*m_pTminSSS > 1.) return false;
+ if (data.hadF().empty() || fabs(data.par()[5])*m_pTminSSS > 1.) return false;
- std::list<double>::const_iterator f = data.hadF.begin(), fe = data.hadF.end();
- std::list<double>::const_iterator r = data.hadR.begin();
- std::list<double>::const_iterator z = data.hadZ.begin();
+ std::list<double>::const_iterator f = data.hadF().begin(), fe = data.hadF().end();
+ std::list<double>::const_iterator r = data.hadR().begin();
+ std::list<double>::const_iterator z = data.hadZ().begin();
- double F = data.par[2] ;
- double E = -log(tan(.5*data.par[3])) ;
- double R = sqrt(data.par[6]*data.par[6]+data.par[7]*data.par[7]);
- double Z = data.par[8] ;
+ double F = data.par()[2] ;
+ double E = -log(tan(.5*data.par()[3])) ;
+ double R = sqrt(data.par()[6]*data.par()[6]+data.par()[7]*data.par()[7]);
+ double Z = data.par()[8] ;
for (; f!=fe; ++f) {
double df = fabs(F-(*f));
@@ -1093,37 +1057,3 @@ void InDet::SiTrackMaker_xk::globalDirections
d1[0] = Sa +Sb*A0; d1[1]= Sb -Sa*A0; d1[2]=Ce;
d2[0] = Sa*C2-Sb*S2; d2[1]= Sa*S2+Sb*C2; d2[2]=Ce;
}
-
-InDet::SiTrackMaker_xk::EventData& InDet::SiTrackMaker_xk::getEventData() const {
- const EventContext& ctx{Gaudi::Hive::currentContext()};
- EventContext::ContextID_t slot{ctx.slot()};
- EventContext::ContextEvt_t evt{ctx.evt()};
- std::lock_guard<std::mutex> lock{m_mutex};
- if (slot>=m_cache.size()) { // Need to extend vectors
- static const EventContext::ContextEvt_t invalidValue{EventContext::INVALID_CONTEXT_EVT};
- m_cache.resize(slot+1, invalidValue); // Store invalid values in order to go to the next IF statement
- m_eventData.resize(slot+1);
- }
- if (m_cache[slot]!=evt) { // New event
- m_cache[slot] = evt;
- // Initialization
- m_eventData[slot].inputseeds = 0;
- m_eventData[slot].goodseeds = 0;
- m_eventData[slot].findtracks = 0;
- m_eventData[slot].nprint = 0;
- m_eventData[slot].clusterTrack.clear();
- m_eventData[slot].par = {0., 0., 0., 0., 0., 0., 0., 0., 0.};
- m_eventData[slot].pix = false;
- m_eventData[slot].sct = false;
- m_eventData[slot].dbm = false;
- m_eventData[slot].caloF.clear();
- m_eventData[slot].caloR.clear();
- m_eventData[slot].caloZ.clear();
- m_eventData[slot].hadF.clear();
- m_eventData[slot].hadR.clear();
- m_eventData[slot].hadZ.clear();
- m_eventData[slot].xybeam[0] = 0.;
- m_eventData[slot].xybeam[1] = 0.;
- }
- return m_eventData[slot];
-}
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/CMakeLists.txt b/InnerDetector/InDetRecTools/SiZvertexTool_xk/CMakeLists.txt
index 384b18a7eec12e032eea29ea3d310b7f426ae9bf..021b579e802d5bbd125412fffdd646d4827f9081 100644
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/CMakeLists.txt
@@ -11,13 +11,14 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
InnerDetector/InDetRecTools/InDetRecToolInterfaces
PRIVATE
- InnerDetector/InDetRecEvent/SiSpacePointsSeed )
+ InnerDetector/InDetRecEvent/SiSpacePointsSeed
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData )
# Component(s) in the package:
atlas_add_component( SiZvertexTool_xk
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces SiSpacePointsSeed )
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRecToolInterfaces SiSpacePointsSeed SiSPSeededTrackFinderData )
# Install files from the package:
atlas_install_headers( SiZvertexTool_xk )
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/SiZvertexTool_xk/SiZvertexMaker_xk.h b/InnerDetector/InDetRecTools/SiZvertexTool_xk/SiZvertexTool_xk/SiZvertexMaker_xk.h
index 22f40fdd24ec2aa03e654b1b49251c5535659031..d3143f5e48dd52864716cb3895c1bb0bde752c29 100644
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/SiZvertexTool_xk/SiZvertexMaker_xk.h
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/SiZvertexTool_xk/SiZvertexMaker_xk.h
@@ -38,6 +38,8 @@ class MsgStream;
namespace InDet {
+ class SiSpacePointsSeedMakerEventData;
+
class SiZvertexMaker_xk : public extends<AthAlgTool, ISiZvertexMaker>
{
///////////////////////////////////////////////////////////////////
@@ -54,26 +56,27 @@ namespace InDet {
const std::string&,
const IInterface*);
virtual ~SiZvertexMaker_xk() = default;
- virtual StatusCode initialize();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
///////////////////////////////////////////////////////////////////
// Methods to initialize tool for new event or region
///////////////////////////////////////////////////////////////////
- virtual std::list<Trk::Vertex> newEvent() const;
- virtual std::list<Trk::Vertex> newRegion(const std::vector<IdentifierHash>&,
- const std::vector<IdentifierHash>&) const;
- virtual std::list<Trk::Vertex> newRegion(const std::vector<IdentifierHash>&,
+ virtual std::list<Trk::Vertex> newEvent(SiSpacePointsSeedMakerEventData& data) const override;
+ virtual std::list<Trk::Vertex> newRegion(SiSpacePointsSeedMakerEventData& data,
+ const std::vector<IdentifierHash>&,
+ const std::vector<IdentifierHash>&) const override;
+ virtual std::list<Trk::Vertex> newRegion(SiSpacePointsSeedMakerEventData& data,
+ const std::vector<IdentifierHash>&,
const std::vector<IdentifierHash>&,
- const IRoiDescriptor&) const;
+ const IRoiDescriptor&) const override;
///////////////////////////////////////////////////////////////////
// Print internal tool parameters and status
///////////////////////////////////////////////////////////////////
- MsgStream& dump(MsgStream& out) const;
- std::ostream& dump(std::ostream& out) const;
+ virtual MsgStream& dump(MsgStream& out) const override;
protected:
@@ -95,11 +98,9 @@ namespace InDet {
// Protected methods
///////////////////////////////////////////////////////////////////
- std::list<Trk::Vertex> production() const;
+ std::list<Trk::Vertex> production(SiSpacePointsSeedMakerEventData& data) const;
MsgStream& dumpConditions(MsgStream& out) const;
};
- MsgStream& operator << (MsgStream& , const SiZvertexMaker_xk&);
- std::ostream& operator << (std::ostream&, const SiZvertexMaker_xk&);
}
#endif // SiZvertexMaker_xk_H
diff --git a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/SiZvertexMaker_xk.cxx b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/SiZvertexMaker_xk.cxx
index 8799db2a94f50fd4e50db294f2a28c85c81981bf..26c3ba490166f2748fa1d048d9a50ba101f1bcd3 100644
--- a/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/SiZvertexMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiZvertexTool_xk/src/SiZvertexMaker_xk.cxx
@@ -13,6 +13,7 @@
#include "SiZvertexTool_xk/SiZvertexMaker_xk.h"
#include "SiSpacePointsSeed/SiSpacePointsSeed.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
#include "VxVertex/Vertex.h"
#include <iomanip>
@@ -39,7 +40,7 @@ StatusCode InDet::SiZvertexMaker_xk::initialize()
//
ATH_CHECK(m_seedsgenerator.retrieve());
- ATH_MSG_DEBUG(*this);
+ dump(msg(MSG::DEBUG));
return StatusCode::SUCCESS;
}
@@ -57,10 +58,10 @@ StatusCode InDet::SiZvertexMaker_xk::finalize()
// Initialize tool for new event
///////////////////////////////////////////////////////////////////
-std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::newEvent() const
+std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::newEvent(SiSpacePointsSeedMakerEventData& data) const
{
- m_seedsgenerator->newEvent();
- return production();
+ m_seedsgenerator->newEvent(data);
+ return production(data);
}
///////////////////////////////////////////////////////////////////
@@ -68,10 +69,11 @@ std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::newEvent() const
///////////////////////////////////////////////////////////////////
std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
+(SiSpacePointsSeedMakerEventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT) const
{
- m_seedsgenerator->newRegion(vPixel, vSCT);
- return production();
+ m_seedsgenerator->newRegion(data, vPixel, vSCT);
+ return production(data);
}
///////////////////////////////////////////////////////////////////
@@ -79,17 +81,19 @@ std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::newRegion
///////////////////////////////////////////////////////////////////
std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::newRegion
-(const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,const IRoiDescriptor& PhEt) const
+(SiSpacePointsSeedMakerEventData& data,
+ const std::vector<IdentifierHash>& vPixel, const std::vector<IdentifierHash>& vSCT,
+ const IRoiDescriptor& PhEt) const
{
- m_seedsgenerator->newRegion(vPixel, vSCT, PhEt);
- return production();
+ m_seedsgenerator->newRegion(data, vPixel, vSCT, PhEt);
+ return production(data);
}
///////////////////////////////////////////////////////////////////
// Get list vertices Z-coordinates
///////////////////////////////////////////////////////////////////
-std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::production() const
+std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::production(SiSpacePointsSeedMakerEventData& data) const
{
std::list<Trk::Vertex> vertices;
@@ -104,9 +108,9 @@ std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::production() const
std::list<Trk::Vertex> lv;
- if (m_nspoint==2) m_seedsgenerator->find2Sp(lv);
- else if (m_nspoint==3) m_seedsgenerator->find3Sp(lv);
- else m_seedsgenerator->findVSp(lv);
+ if (m_nspoint==2) m_seedsgenerator->find2Sp(data, lv);
+ else if (m_nspoint==3) m_seedsgenerator->find3Sp(data, lv);
+ else m_seedsgenerator->findVSp(data, lv);
const InDet::SiSpacePointsSeed* seed = nullptr;
std::multimap<int,double> ver;
@@ -115,7 +119,7 @@ std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::production() const
int Hmax = 0 ;
double zmax = 0.;
- while ((seed = m_seedsgenerator->next())) {
+ while ((seed = m_seedsgenerator->next(data))) {
std::list<const Trk::SpacePoint*>::const_iterator
s = seed->spacePoints().begin();
@@ -202,7 +206,7 @@ std::list<Trk::Vertex> InDet::SiZvertexMaker_xk::production() const
}
}
- ATH_MSG_DEBUG(*this);
+ dump(msg(MSG::DEBUG));
return vertices;
}
@@ -258,32 +262,3 @@ MsgStream& InDet::SiZvertexMaker_xk::dumpConditions(MsgStream& out) const
return out;
}
-
-///////////////////////////////////////////////////////////////////
-// Dumps relevant information into the ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::SiZvertexMaker_xk::dump(std::ostream& out) const
-{
- return out;
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator MsgStream
-///////////////////////////////////////////////////////////////////
-
-MsgStream& InDet::operator <<
-(MsgStream& sl, const InDet::SiZvertexMaker_xk& se)
-{
- return se.dump(sl);
-}
-
-///////////////////////////////////////////////////////////////////
-// Overload of << operator std::ostream
-///////////////////////////////////////////////////////////////////
-
-std::ostream& InDet::operator <<
-(std::ostream& sl,const InDet::SiZvertexMaker_xk& se)
-{
- return se.dump(sl);
-}
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/CMakeLists.txt
index 30934f5aee3ddb2de94395a30aa0751fad9542b4..cfba6b6b7b9d6b695af2f717045a1c3dca7b7ea2 100644
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/CMakeLists.txt
@@ -19,6 +19,7 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetRecEvent/InDetPrepRawData
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
Tracking/TrkEvent/TrkCaloClusterROI
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
@@ -34,7 +35,7 @@ atlas_add_component( TRT_SeededTrackFinderTool
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkSurfaces TrkParameters StoreGateLib SGtests InDetIdentifier InDetPrepRawData InDetRIO_OnTrack TrkCaloClusterROI TrkEventPrimitives TrkPseudoMeasurementOnTrack TrkTrack TrkExInterfaces TrkToolInterfaces )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetRecToolInterfaces MagFieldInterfaces TrkGeometry TrkSurfaces TrkParameters StoreGateLib SGtests InDetIdentifier InDetPrepRawData InDetRIO_OnTrack SiSPSeededTrackFinderData TrkCaloClusterROI TrkEventPrimitives TrkPseudoMeasurementOnTrack TrkTrack TrkExInterfaces TrkToolInterfaces )
# Install files from the package:
atlas_install_headers( TRT_SeededTrackFinderTool )
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/TRT_SeededTrackFinderTool/TRT_SeededTrackFinder_ATL.h b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/TRT_SeededTrackFinderTool/TRT_SeededTrackFinder_ATL.h
index eb7d133c0594abe31364783d52ac1fc633cb3b6f..b3ad5c67fa521dad85419b39031f6abe8df85033 100755
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/TRT_SeededTrackFinderTool/TRT_SeededTrackFinder_ATL.h
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/TRT_SeededTrackFinderTool/TRT_SeededTrackFinder_ATL.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**********************************************************************************
@@ -63,6 +63,7 @@ namespace Trk{
namespace InDet{
class ISiDetElementsRoadMaker;
class ITRT_SeededSpacePointFinder;
+ class SiCombinatorialTrackFinderData_xk;
/**
@class TRT_SeededTrackFinder_ATL
@@ -89,29 +90,31 @@ namespace InDet{
TRT_SeededTrackFinder_ATL
(const std::string&,const std::string&,const IInterface*);
virtual ~TRT_SeededTrackFinder_ATL();
- virtual StatusCode initialize();
- virtual StatusCode finalize ();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize () override;
///////////////////////////////////////////////////////////////////
/** Main methods for local track finding */
///////////////////////////////////////////////////////////////////
/** Main method. Calls private methods and returns a list of Si tracks */
- virtual std::list<Trk::Track*> getTrack (const Trk::TrackSegment&);
+ virtual std::list<Trk::Track*> getTrack (SiCombinatorialTrackFinderData_xk& combinatorialData,
+ const Trk::TrackSegment&) override;
/** New event initialization */
- virtual void newEvent();
+ virtual void newEvent(SiCombinatorialTrackFinderData_xk& combinatorialData) override;
/** New region intialization */
void newRegion
- (const std::vector<IdentifierHash>&,const std::vector<IdentifierHash>&);
+ (SiCombinatorialTrackFinderData_xk& combinatorialData,
+ const std::vector<IdentifierHash>&,const std::vector<IdentifierHash>&) override;
/** End of event tasks */
- virtual void endEvent();
+ virtual void endEvent(SiCombinatorialTrackFinderData_xk& combinatorialData) override;
///////////////////////////////////////////////////////////////////
/** Print internal tool parameters and status */
///////////////////////////////////////////////////////////////////
- MsgStream& dump(MsgStream& out) const;
- std::ostream& dump(std::ostream& out) const;
+ MsgStream& dump(MsgStream& out) const override;
+ std::ostream& dump(std::ostream& out) const override;
protected:
@@ -172,7 +175,8 @@ namespace InDet{
const Trk::TrackParameters* getTP(const Trk::SpacePoint*, const Trk::TrackParameters*,bool&);
/** Find the corresponding list of Si tracks */
- std::list<Trk::Track*> findTrack(const Trk::TrackParameters*,const Trk::TrackSegment&);
+ std::list<Trk::Track*> findTrack(SiCombinatorialTrackFinderData_xk& combinatorialData,
+ const Trk::TrackParameters*,const Trk::TrackSegment&);
/** Add material effects */
const Trk::TrackParameters* addNoise(double,double,double,double,const Trk::TrackParameters*,int);
diff --git a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx
index addd000195d22ccb73eb87c2b536b864f628a624..ec7306424064982f5226da6cfd1e308f919e2dc4 100755
--- a/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx
+++ b/InnerDetector/InDetRecTools/TRT_SeededTrackFinderTool/src/TRT_SeededTrackFinder_ATL.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -42,6 +42,9 @@
//Propagator tool
#include "TrkExInterfaces/IPropagator.h"
+// For SiCombinatorialTrackFinder_xk
+#include "SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h"
+
//Tool for getting the SiDetElements from geometry
#include "InDetRecToolInterfaces/ISiDetElementsRoadMaker.h"
@@ -363,7 +366,7 @@ std::ostream& InDet::operator <<
// Initiate track finding tool
///////////////////////////////////////////////////////////////////
-void InDet::TRT_SeededTrackFinder_ATL::newEvent()
+void InDet::TRT_SeededTrackFinder_ATL::newEvent(SiCombinatorialTrackFinderData_xk& combinatorialData)
{
///Get the seeds
@@ -371,7 +374,7 @@ void InDet::TRT_SeededTrackFinder_ATL::newEvent()
// New event for track finder tool
//
- m_tracksfinder->newEvent();
+ m_tracksfinder->newEvent(combinatorialData);
// Erase cluster to track association
//
@@ -408,8 +411,9 @@ void InDet::TRT_SeededTrackFinder_ATL::newEvent()
}
///////////////////////////////////////////////////////////////////////
-void InDet::TRT_SeededTrackFinder_ATL::newRegion(const std::vector<IdentifierHash>& listOfPixIds,
-const std::vector<IdentifierHash>& listOfSCTIds)
+void InDet::TRT_SeededTrackFinder_ATL::newRegion(SiCombinatorialTrackFinderData_xk& combinatorialData,
+ const std::vector<IdentifierHash>& listOfPixIds,
+ const std::vector<IdentifierHash>& listOfSCTIds)
{
///Get the seeds
@@ -417,7 +421,7 @@ const std::vector<IdentifierHash>& listOfSCTIds)
// New event for track finder tool
//
- m_tracksfinder->newEvent();
+ m_tracksfinder->newEvent(combinatorialData);
// Erase cluster to track association
//
@@ -435,12 +439,12 @@ const std::vector<IdentifierHash>& listOfSCTIds)
// Finalize track finding tool for given event
///////////////////////////////////////////////////////////////////
-void InDet::TRT_SeededTrackFinder_ATL::endEvent()
+void InDet::TRT_SeededTrackFinder_ATL::endEvent(SiCombinatorialTrackFinderData_xk& combinatorialData)
{
// End event for track finder tool
//
- m_tracksfinder->endEvent();
+ m_tracksfinder->endEvent(combinatorialData);
m_clusterTrack.clear();
}
@@ -450,7 +454,8 @@ void InDet::TRT_SeededTrackFinder_ATL::endEvent()
// starting from an intial track segment
///////////////////////////////////////////////////////////////////
-std::list<Trk::Track*> InDet::TRT_SeededTrackFinder_ATL::getTrack(const Trk::TrackSegment& tS)
+std::list<Trk::Track*> InDet::TRT_SeededTrackFinder_ATL::getTrack(SiCombinatorialTrackFinderData_xk& combinatorialData,
+ const Trk::TrackSegment& tS)
{
// return list, will be copied by value (fix!)
std::list<Trk::Track*> aSiTrack;
@@ -498,7 +503,7 @@ std::list<Trk::Track*> InDet::TRT_SeededTrackFinder_ATL::getTrack(const Trk::Tra
}
- aSiTrack = findTrack(newPerPar.get(),tS);
+ aSiTrack = findTrack(combinatorialData, newPerPar.get(), tS);
if((aSiTrack.size()==0)&&(m_bremCorrect)){
if(msgLvl(MSG::DEBUG)) {
msg(MSG::DEBUG) << "==============================================================" << endmsg;
@@ -509,7 +514,7 @@ std::list<Trk::Track*> InDet::TRT_SeededTrackFinder_ATL::getTrack(const Trk::Tra
msg(MSG::VERBOSE) << "Modified TRT Track Parameters for brem. " << endmsg;
msg(MSG::VERBOSE) << (*modTP) << endmsg;
}
- aSiTrack = findTrack(modTP,tS);
+ aSiTrack = findTrack(combinatorialData, modTP, tS);
delete modTP;
if(aSiTrack.size()==0){
if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"Could not create track states on surface for this track after all!"<<endmsg;
@@ -528,7 +533,8 @@ std::list<Trk::Track*> InDet::TRT_SeededTrackFinder_ATL::getTrack(const Trk::Tra
///////////////////////////////////////////////////////////////////
std::list<Trk::Track*> InDet::TRT_SeededTrackFinder_ATL::findTrack
- (const Trk::TrackParameters* initTP,const Trk::TrackSegment& tS)
+(SiCombinatorialTrackFinderData_xk& combinatorialData,
+ const Trk::TrackParameters* initTP,const Trk::TrackSegment& tS)
{
//Return list copied by value (fix!!)
std::list<Trk::Track*> associatedSiTrack; // List of found tracks per TRT segment
@@ -758,7 +764,7 @@ std::list<Trk::Track*> InDet::TRT_SeededTrackFinder_ATL::findTrack
// --------------- Get the Si extensions using the combinatorial track finding tool
//
std::list<Amg::Vector3D> Gp;
- aTracks = m_tracksfinder->getTracks(*mesTP,SpList,Gp,DE,m_trackquality);
+ aTracks = m_tracksfinder->getTracks(combinatorialData, *mesTP, SpList, Gp, DE, m_trackquality);
if(int(aTracks.size())==0) {
if(msgLvl(MSG::DEBUG)) msg(MSG::DEBUG)<<"No tracks found by the combinatorial track finder!"<<endmsg;
}
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
index b25a0abdea6366ee4155ff223c49e81e13114755..f9319d19a67678754caf553bfd33cf81f31ee0c6 100644
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "InDetTrigRawDataProvider/TrigSCTRawDataProvider.h"
@@ -124,7 +124,6 @@ namespace InDet {
void TrigSCTRawDataProvider::handle(const Incident& inc) {
if (inc.type() == "BeginEvent") {
m_container->cleanup();
- m_rawDataTool->beginNewEvent();
}
}
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/CMakeLists.txt
index cdd41587c6c078ccae22ecec63609904074310fb..31f397f8d1ab76c5fa0d6eab34b979342f614f3d 100644
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/CMakeLists.txt
@@ -14,6 +14,7 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoPrimitives
DetectorDescription/IRegionSelector
Event/EventPrimitives
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
InnerDetector/InDetRecTools/InDetRecToolInterfaces
Tracking/TrkEvent/TrkMeasurementBase
Tracking/TrkEvent/TrkParameters
@@ -32,7 +33,7 @@ atlas_add_component( SiTrigSPSeededTrackFinder
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GaudiKernel TrigInterfacesLib AthenaKernel GeoPrimitives IRegionSelector EventPrimitives InDetRecToolInterfaces TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkTrack TrigInDetEvent TrigParticle TrigSteeringEvent TrigTimeAlgsLib )
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} GaudiKernel TrigInterfacesLib AthenaKernel GeoPrimitives IRegionSelector EventPrimitives SiSPSeededTrackFinderData InDetRecToolInterfaces TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkTrack TrigInDetEvent TrigParticle TrigSteeringEvent TrigTimeAlgsLib )
# Install files from the package:
atlas_install_headers( SiTrigSPSeededTrackFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
index 6234bc5e61ffe44938f17ed3a204cb9812ecd60d..546b71bb6635154e04c8fe2de0e4ed722fa8da48 100755
--- a/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/SiTrigSPSeededTrackFinder/src/SiTrigSPSeededTrackFinder.cxx
@@ -25,6 +25,9 @@
#include "InDetRecToolInterfaces/ISiZvertexMaker.h"
#include "InDetRecToolInterfaces/ISiTrackMaker.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
+#include "SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h"
+
//
#include "TrigInDetEvent/TrigInDetTrackCollection.h"
#include "TrkParameters/TrackParameters.h"
@@ -250,6 +253,8 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
bool PIX = true;
bool SCT = true;
+ SiSpacePointsSeedMakerEventData seedEventData;
+
if (m_useSeedMaker){
if( m_useZvertexTool ) {
@@ -259,21 +264,21 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
if(!m_doFullScan){
if (m_fastTracking){
- vertices = m_zvertexmaker->newRegion(listOfPixIds,listOfSCTIds,*roi);
+ vertices = m_zvertexmaker->newRegion(seedEventData, listOfPixIds, listOfSCTIds, *roi);
}
else {
- vertices = m_zvertexmaker->newRegion(listOfPixIds,listOfSCTIds);
+ vertices = m_zvertexmaker->newRegion(seedEventData, listOfPixIds, listOfSCTIds);
}
}
else{
- vertices = m_zvertexmaker->newEvent();
+ vertices = m_zvertexmaker->newEvent(seedEventData);
}
if(doTiming()) m_timerZVertexTool->stop();
if(doTiming()) m_timerSeedsMaker->start();
- m_seedsmaker->find3Sp(vertices);
+ m_seedsmaker->find3Sp(seedEventData, vertices);
if(doTiming()) m_timerSeedsMaker->stop();
@@ -286,17 +291,18 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
if(doTiming()) m_timerSeedsMaker->start();
if(!m_doFullScan){
if (m_fastTracking){
- m_seedsmaker ->newRegion(listOfPixIds,listOfSCTIds,*roi);
+ m_seedsmaker->newRegion(seedEventData, listOfPixIds, listOfSCTIds, *roi);
} else {
- m_seedsmaker ->newRegion(listOfPixIds,listOfSCTIds);
+ m_seedsmaker->newRegion(seedEventData, listOfPixIds, listOfSCTIds);
}
}
else{
- m_seedsmaker ->newEvent();
+ m_seedsmaker->newEvent(seedEventData);
}
- std::list<Trk::Vertex> VZ; m_seedsmaker->find3Sp(VZ);
+ std::list<Trk::Vertex> VZ;
+ m_seedsmaker->find3Sp(seedEventData, VZ);
if(doTiming()) m_timerSeedsMaker->stop();
}
}
@@ -305,12 +311,13 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
//?
}
+ InDet::SiTrackMakerEventData_xk trackEventData;
if(doTiming()) m_timerTrackMaker->start();
if (m_fastTracking){
- m_trackmaker->newTrigEvent(PIX,SCT);
- //m_trackmaker->newEvent(PIX,SCT);
+ m_trackmaker->newTrigEvent(trackEventData, PIX, SCT);
+ //m_trackmaker->newEvent(trackEventData, PIX, SCT);
} else {
- m_trackmaker->newEvent(PIX,SCT);
+ m_trackmaker->newEvent(trackEventData, PIX, SCT);
}
// Loop through all seeds and reconsrtucted tracks collection preparation
@@ -341,7 +348,7 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
int nseedwithtrack(0);
///////////////////////////////////////
- while((seed = m_seedsmaker->next())) {
+ while((seed = m_seedsmaker->next(seedEventData))) {
if (m_doTimeOutChecks && Athena::Timeout::instance().reached() ) {
ATH_MSG_WARNING( "Timeout reached. Aborting sequence." );
delete foundTracks;
@@ -349,7 +356,7 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
}
if(doTiming()) m_timerSeedProcessing->start();
++m_nseeds;
- std::list<Trk::Track*> T = std::move(m_trackmaker->getTracks(seed->spacePoints()));
+ std::list<Trk::Track*> T = m_trackmaker->getTracks(trackEventData, seed->spacePoints());
if (m_fastTracking){
for(std::list<Trk::Track*>::const_iterator t=T.begin(); t!=T.end(); ++t) {
@@ -537,7 +544,7 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
}
- std::list<Trk::Track*> T = std::move(m_trackmaker->getTracks(*perig, gpList));//dummyp); //
+ std::list<Trk::Track*> T = m_trackmaker->getTracks(trackEventData, *perig, gpList);//dummyp); //
if(doTiming()){
@@ -623,7 +630,7 @@ HLT::ErrorCode InDet::SiTrigSPSeededTrackFinder::hltExecute(const HLT::TriggerEl
- m_trackmaker->endEvent();
+ m_trackmaker->endEvent(trackEventData);
if (m_fastTracking){
// Remove shared tracks with worse quality
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/CMakeLists.txt b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/CMakeLists.txt
index 125b9c759ee14e556dcc75fd6a2c3fa3397ca1d0..7181f06824ee6dc75e8b8f32ac6c9490e880e090 100644
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/CMakeLists.txt
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/CMakeLists.txt
@@ -16,6 +16,7 @@ atlas_depends_on_subdirs( PUBLIC
PRIVATE
DetectorDescription/IRegionSelector
Event/EventPrimitives
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
@@ -27,7 +28,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( TRT_TrigSeededTrackFinder
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES GaudiKernel InDetRecToolInterfaces TrkSegment TrkFitterInterfaces TrigInterfacesLib TrigTimeAlgsLib IRegionSelector EventPrimitives TrkEventPrimitives TrkParameters TrkPseudoMeasurementOnTrack TrkTrack TrigParticle TrigSteeringEvent )
+ LINK_LIBRARIES GaudiKernel InDetRecToolInterfaces TrkSegment TrkFitterInterfaces TrigInterfacesLib TrigTimeAlgsLib IRegionSelector EventPrimitives SiSPSeededTrackFinderData TrkEventPrimitives TrkParameters TrkPseudoMeasurementOnTrack TrkTrack TrigParticle TrigSteeringEvent )
# Install files from the package:
atlas_install_headers( TRT_TrigSeededTrackFinder )
diff --git a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
index b03a71859f46130bada5c04e67f5efcfa248c685..662275a6608de2184008da54fa4d77fe6128c866 100755
--- a/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/TRT_TrigSeededTrackFinder/src/TRT_TrigSeededTrackFinder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -24,6 +24,8 @@
#include "EventPrimitives/EventPrimitives.h"
+#include "SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h"
+
using namespace std;
///////////////////////////////////////////////////////////////////
@@ -204,12 +206,15 @@ HLT::ErrorCode InDet::TRT_TrigSeededTrackFinder::hltExecute(const HLT::TriggerEl
if(doTiming()) m_timerRegSel->stop();
}
+ // Event dependent data of SiCombinatorialTrackFinder_xk
+ InDet::SiCombinatorialTrackFinderData_xk combinatorialData;
+
///Initialize the TRT seeded track tool's new event
if(!m_doFullScan){
- m_trackmaker->newRegion(listOfPixIds,listOfSCTIds); //RoI-based reconstruction
+ m_trackmaker->newRegion(combinatorialData, listOfPixIds, listOfSCTIds); //RoI-based reconstruction
}
else{
- m_trackmaker->newEvent(); // FullScan mode
+ m_trackmaker->newEvent(combinatorialData); // FullScan mode
}
if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << "Begin looping over all TRT segments in the event" << endmsg;
@@ -233,7 +238,7 @@ HLT::ErrorCode InDet::TRT_TrigSeededTrackFinder::hltExecute(const HLT::TriggerEl
if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << "Number Of ROTs " << (trackTRT->numberOfMeasurementBases()) << endmsg;
if(trackTRT->numberOfMeasurementBases()>9){ //Ask for at least 10 TRT hits in order to process
m_nTrtSegGood++;
- std::list<Trk::Track*> trackSi = m_trackmaker->getTrack(*trackTRT); //Get the possible Si extensions
+ std::list<Trk::Track*> trackSi = m_trackmaker->getTrack(combinatorialData, *trackTRT); //Get the possible Si extensions
if(trackSi.size()==0){
if(outputLevel <= MSG::DEBUG) msg() << MSG::DEBUG << "No Si track candidates associated to the TRT track " << endmsg;
diff --git a/LArCalorimeter/LArCabling/python/LArCablingConfig.py b/LArCalorimeter/LArCabling/python/LArCablingConfig.py
index c6773ed3de6b6feaf7bab36d34aa3b9ea7675d3d..a470f8b0462517fb3a015316f9392d6d979cda06 100644
--- a/LArCalorimeter/LArCabling/python/LArCablingConfig.py
+++ b/LArCalorimeter/LArCabling/python/LArCablingConfig.py
@@ -1,5 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+from __future__ import print_function
+
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from IOVDbSvc.IOVDbSvcConfig import IOVDbSvcCfg,addFolders
from LArRecUtils.LArRecUtilsConf import LArOnOffMappingAlg, LArFebRodMappingAlg, LArCalibLineMappingAlg
@@ -27,7 +29,7 @@ def _larCablingCfg(configFlags,algo,folder):
result.addCondAlgo(algo(ReadKey=folder),primary=True)
result.merge(addFolders(configFlags,folderwithtag,className="AthenaAttributeList",detDb=db))
- #print result
+ #print (result)
return result
@@ -66,4 +68,4 @@ if __name__ == "__main__":
acc.merge(LArFebRodMappingCfg(ConfigFlags))
acc.merge(LArCalibIdMappingCfg(ConfigFlags))
acc.store( file( "test.pkl", "w" ) )
- print "All OK"
+ print ("All OK")
diff --git a/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py b/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py
index 99ef6334f38a6e168a1f049c5043333f1dce8382..44a2844c33fa83385a4a235affc29d942d7bb6dc 100644
--- a/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py
+++ b/LArCalorimeter/LArConfiguration/python/LArConfigFlags.py
@@ -34,12 +34,23 @@ def createLArConfigFlags():
lcf.addFlag("LAr.ForceIOVRunNumber", "")
# Include Shape folder
lcf.addFlag("LAr.UseShape", True)
- # Number of samples in LAr digitization + ROD emulation
- lcf.addFlag("LAr.RODnSamples", 5)
- # Index of first sample in LAr digitization + ROD emulation
- lcf.addFlag("LAr.RODFirstSample", 0)
# DataBase server string
lcf.addFlag("LAr.DBConnection", "")
+
+ # Number of samples in LAr digitization + ROD emulation
+ lcf.addFlag("LAr.ROD.nSamples", 5)
+ # Index of first sample in LAr digitization + ROD emulation
+ lcf.addFlag("LAr.ROD.FirstSample", 0)
+ # Force using the highest gain autocorrelation function
+ # when doing OFC optimization
+ lcf.addFlag("LAr.ROD.UseHighestGainAutoCorr", False)
+ # Flag not to use pileup noise neither average constrain in EMB and EMEC-OW,
+ # and both pileup noise and average constrain everywhere else
+ lcf.addFlag("LAr.ROD.DoOFCMixedOptimization", False)
+ ### option to use average constraint in OFC computation
+ ### 0 = not use Delta, 1 = only EMECIW/HEC/FCAL, 2 = all , 3 = only EMECIW
+ lcf.addFlag("LAr.ROD.UseDelta", 0)
+
return lcf
diff --git a/LArCalorimeter/LArDigitization/python/LArDigitizationConfigNew.py b/LArCalorimeter/LArDigitization/python/LArDigitizationConfigNew.py
index e6433da765eca4f6d47a97cac98fa746337582e1..f9519090b127ee194d57fac846f8cc27084117b9 100644
--- a/LArCalorimeter/LArDigitization/python/LArDigitizationConfigNew.py
+++ b/LArCalorimeter/LArDigitization/python/LArDigitizationConfigNew.py
@@ -13,6 +13,7 @@ from LArRawConditions.LArRawConditionsConfig import LArRawConditionsMCCfg
from LArDigitization.LArDigitizationConf import LArPileUpTool, LArDigitMaker
from CommissionUtils.CommissionUtilsConf import CosmicTriggerTimeTool
from SGComps.SGCompsConf import AddressRemappingSvc, ProxyProviderSvc
+from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
def useLArFloat(flags):
"""Return bool for simplified transient LArHit with float E,time"""
@@ -105,8 +106,8 @@ def LArPileUpToolCfg(flags, name="LArPileUpTool", **kwargs):
# if doing MC+MC overlay
if flags.Input.isMC and flags.Detector.OverlayLAr:
kwargs.setdefault("isMcOverlay", True)
- kwargs.setdefault("Nsamples", flags.LAr.RODnSamples)
- kwargs.setdefault("firstSample", flags.LAr.RODFirstSample)
+ kwargs.setdefault("Nsamples", flags.LAr.ROD.nSamples)
+ kwargs.setdefault("firstSample", flags.LAr.ROD.FirstSample)
if flags.Detector.OverlayLAr:
kwargs.setdefault("RandomDigitContainer", "LArDigitContainer_MC")
# cosmics digitization
@@ -137,7 +138,6 @@ def LArDigitMakerCfg(flags, name="LArDigitMaker", **kwargs):
tool = acc.popToolsAndMerge(LArPileUpToolCfg(flags))
kwargs["LArPileUpTool"] = tool
acc.addEventAlgo(LArDigitMaker(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", LArItemList()))
+ acc.merge(OutputStreamCfg(flags, "RDO", LArItemList()))
return acc
diff --git a/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py b/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
index 2fc85d314a7dc660f3ef73f3dbf9fa2a69598a2f..f4355193b9b422263fad37e6359bcc507c93c6cf 100644
--- a/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
@@ -40,7 +40,7 @@ def LArAutoCorrNoiseCondAlgCfg(flags, name="LArAutoCorrNoiseCondAlg", **kwargs):
"""Return ComponentAccumulator with configured LArAutoCorrNoiseCondAlg"""
acc = LArOnOffIdMappingCfg(flags)
acc.merge(LArMCSymCondAlgCfg(flags))
- kwargs.setdefault("nSampl", flags.LAr.RODnSamples)
+ kwargs.setdefault("nSampl", flags.LAr.ROD.nSamples)
acc.addCondAlgo(LArAutoCorrNoiseCondAlg(name, **kwargs))
return acc
diff --git a/LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx b/LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx
index 8220bea7ac0bab5b709863c00d237cd5d56ea070..c258af47c81cda2e27853e51d30bd874424cc764 100644
--- a/LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArFlatConditionSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "LArFlatConditionSvc.h"
@@ -7,7 +7,7 @@
#include "AthenaKernel/IOVRange.h"
#include "AthenaPoolUtilities/CondAttrListCollection.h"
-#include "SGTools/StorableConversions.h"
+#include "AthenaKernel/StorableConversions.h"
#include "SGTools/DataProxy.h"
#include "AthenaKernel/errorcheck.h"
diff --git a/LumiBlock/LumiBlockComps/CMakeLists.txt b/LumiBlock/LumiBlockComps/CMakeLists.txt
index 9397b7a6d7e373c6ea939e0019e6bb5f6b65f197..3abc461ccbbcae91766cd09a8568aab396acfcda 100644
--- a/LumiBlock/LumiBlockComps/CMakeLists.txt
+++ b/LumiBlock/LumiBlockComps/CMakeLists.txt
@@ -33,6 +33,7 @@ else()
GaudiKernel
LumiBlock/LumiCalc
PRIVATE
+ Control/CxxUtils
DataQuality/GoodRunsLists
Database/AthenaPOOL/AthenaPoolUtilities
Database/AthenaPOOL/DBDataModel
@@ -81,3 +82,13 @@ atlas_add_executable( getLumi
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/*.txt )
+
+atlas_add_test( LBDurationCondAlg_test
+ SOURCES test/LBDurationCondAlg_test.cxx
+ LINK_LIBRARIES GaudiKernel LumiBlockCompsLib )
+
+atlas_add_test( LuminosityCondAlg_test
+ SOURCES test/LuminosityCondAlg_test.cxx
+ LINK_LIBRARIES GaudiKernel LumiBlockCompsLib )
+
diff --git a/LumiBlock/LumiBlockComps/python/LBDurationCondAlgDefault.py b/LumiBlock/LumiBlockComps/python/LBDurationCondAlgDefault.py
new file mode 100644
index 0000000000000000000000000000000000000000..f4536327bea2cc33d2f70a6981cdea48a671edf7
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/python/LBDurationCondAlgDefault.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+# File: LumiBlockComps/python/LBDurationCondAlgDefault.py
+# Created: May 2019, sss
+# Purpose: Configure LBDurationCondAlg.
+#
+
+from AthenaCommon.AlgSequence import AthSequencer
+
+def LBDurationCondAlgDefault():
+ name = 'LBDurationCondAlg'
+ condSeq = AthSequencer ('AthCondSeq')
+
+ if hasattr (condSeq, name):
+ return getattr (condSeq, name)
+
+ from IOVDbSvc.CondDB import conddb
+ folder = "/TRIGGER/LUMI/LBLB"
+ if not conddb.folderRequested( folder ):
+ conddb.addFolder ('TRIGGER', folder,
+ className = 'AthenaAttributeList')
+
+ from LumiBlockComps.LumiBlockCompsConf import LBDurationCondAlg
+ alg = LBDurationCondAlg (name,
+ LBLBFolderInputKey = folder,
+ LBDurationOutputKey = 'LBDurationCondData')
+ condSeq += alg
+
+ return alg
diff --git a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py
new file mode 100644
index 0000000000000000000000000000000000000000..835b4794fcbf4cc8269b120369b15516e064d5ca
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgDefault.py
@@ -0,0 +1,189 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+# File: LumiBlockComps/python/LuminosityCondAlgDefault.py
+# Created: May 2019, sss, from existing LuminosityToolDefault.
+# Purpose: Configure LuminosityCondAlg.
+#
+
+# xxx lumicondalg to handle no-input case.
+
+from AthenaCommon.Logging import logging
+from AthenaCommon.AlgSequence import AthSequencer
+
+
+def configureLuminosityCondAlgMC (name):
+ return { 'LuminosityFolderInputKey' : '',
+ 'OnlineLumiCalibrationInputKey' : '',
+ 'BunchLumisInputKey' : '',
+ 'BunchGroupInputKey' : '',
+ 'FillParamsInputKey' : '' }
+
+
+
+# Configuration for offline default tool used in Run2
+def configureLuminosityCondAlgRun2 (name):
+ mlog = logging.getLogger(name)
+
+ kwargs = {}
+
+ # Set up DB configuration
+ from IOVDbSvc.CondDB import conddb
+ from RecExConfig.RecFlags import rec
+
+ # Check if this is express stream or bulk
+ if rec.doExpressProcessing():
+ lumiFolder = "/TRIGGER/LUMI/OnlPrefLumi"
+ if not conddb.folderRequested( lumiFolder ):
+ conddb.addFolder('TRIGGER_ONL', lumiFolder,
+ className = 'CondAttrListCollection')
+
+ else:
+ lumiFolder = "/TRIGGER/OFLLUMI/OflPrefLumi"
+ if not conddb.folderRequested( lumiFolder ):
+ conddb.addFolder('TRIGGER_OFL', lumiFolder,
+ className = 'CondAttrListCollection')
+
+ mlog.info("configureLuminosityCondAlgRun2 requested %s", lumiFolder)
+ kwargs['LuminosityFolderInputKey'] = lumiFolder
+
+ mlog.info("Created Run2 %s using folder %s" % (name, lumiFolder))
+
+ # Need the calibration tool just to get the proper MuToLumi value
+ from CoolLumiUtilities.OnlineLumiCalibrationCondAlgDefault \
+ import OnlineLumiCalibrationCondAlgDefault
+ calibAlg = OnlineLumiCalibrationCondAlgDefault()
+ kwargs['OnlineLumiCalibrationInputKey'] = calibAlg.LumiCalibOutputKey
+
+ # Other folder names should be blank.
+ kwargs['BunchLumisInputKey'] = ''
+ kwargs['BunchGroupInputKey'] = ''
+ kwargs['FillParamsInputKey'] = ''
+
+ return kwargs
+
+
+# Configuration for offline default tool used in Run1
+def configureLuminosityCondAlgRun1 (name):
+ mlog = logging.getLogger(name)
+
+ kwargs = {}
+
+ # Now configure DB based on the environment
+ from IOVDbSvc.CondDB import conddb
+ from RecExConfig.RecFlags import rec
+
+ # Check if this is express stream or bulk
+ if rec.doExpressProcessing():
+ lumiFolder = "/TRIGGER/LUMI/LBLESTONL"
+ if not conddb.folderRequested( lumiFolder ):
+ conddb.addFolder('TRIGGER_ONL', lumiFolder,
+ className = 'CondAttrListCollection')
+ mlog.info("configureLuminosityCondAlgRun1 requested %s", lumiFolder)
+
+ else:
+ lumiFolder = "/TRIGGER/OFLLUMI/LBLESTOFL"
+ if not conddb.folderRequested( lumiFolder ):
+ conddb.addFolder('TRIGGER_OFL', lumiFolder,
+ className = 'CondAttrListCollection')
+ mlog.info("configureLuminosityCondAlgRun1 requested %s", lumiFolder)
+
+ kwargs['LuminosityFolderInputKey'] = lumiFolder
+
+ # Configure input conditions data.
+ from CoolLumiUtilities.FillParamsCondAlgDefault \
+ import FillParamsCondAlgDefault
+ fillParamsAlg = FillParamsCondAlgDefault()
+ kwargs['FillParamsInputKey'] = fillParamsAlg.FillParamsOutputKey
+
+ from CoolLumiUtilities.BunchLumisCondAlgDefault \
+ import BunchLumisCondAlgDefault
+ bunchLumisAlg = BunchLumisCondAlgDefault()
+ kwargs['BunchLumisInputKey'] = bunchLumisAlg.BunchLumisOutputKey
+
+ from CoolLumiUtilities.BunchGroupCondAlgDefault \
+ import BunchGroupCondAlgDefault
+ bunchGroupAlg = BunchGroupCondAlgDefault()
+ kwargs['BunchGroupInputKey'] = bunchGroupAlg.BunchGroupOutputKey
+
+ from CoolLumiUtilities.OnlineLumiCalibrationCondAlgDefault \
+ import OnlineLumiCalibrationCondAlgDefault
+ calibAlg = OnlineLumiCalibrationCondAlgDefault()
+ kwargs['OnlineLumiCalibrationInputKey'] = calibAlg.LumiCalibOutputKey
+
+ return kwargs
+
+
+def LuminosityCondAlgDefault (name = 'LuminosityCondAlg', kwargs = None):
+ mlog = logging.getLogger(name)
+ condSeq = AthSequencer ('AthCondSeq')
+
+ if hasattr (condSeq, name):
+ return getattr (condSeq, name)
+
+ from IOVDbSvc.CondDB import conddb
+ if kwargs != None:
+ pass
+
+ elif conddb.isMC:
+ mlog.info("LuminosityCondAlgDefault called for MC!")
+ kwargs = configureLuminosityCondAlgMC (name)
+
+ elif conddb.dbdata == "COMP200":
+ kwargs = configureLuminosityCondAlgRun1 (name)
+
+ elif conddb.dbdata == "CONDBR2":
+ kwargs = configureLuminosityCondAlgRun2 (name)
+
+ else:
+ mlog.warning("LuminosityToolDefault can't resolve conddb.dbdata = %s, assume Run2!" % conddb.dbdata)
+ kwargs = configureLuminosityCondAlgRun2 (name)
+
+ from LumiBlockComps.LumiBlockCompsConf import \
+ LuminosityCondAlg
+
+ alg = LuminosityCondAlg (name,
+ LuminosityOutputKey = 'LuminosityCondData',
+ **kwargs)
+ condSeq += alg
+
+ return alg
+
+
+def LuminosityCondAlgOnline (name = 'LuminosityCondAlg'):
+ mlog = logging.getLogger(name)
+
+ kwargs = {}
+
+ # Keep values for invalid data
+ kwargs['SkipInvalid'] = False
+
+ from IOVDbSvc.CondDB import conddb
+ if conddb.dbdata == "COMP200": # Run1
+ folder = "/TRIGGER/LUMI/LBLESTONL"
+ conddb.addFolder('TRIGGER_ONL', folder,
+ className = 'CondAttrListCollection')
+
+ else: # Run 2
+ if conddb.dbdata != "CONDBR2":
+ mlog.warning("LuminosityToolOnline can't resolve conddb.dbdata = %s, assume Run2!" % conddb.dbdata)
+ mlog.info("Using Run 2 configuration")
+
+ folder = "/TRIGGER/LUMI/HLTPrefLumi"
+ conddb.addFolder('TRIGGER_ONL', folder,
+ className = 'CondAttrListCollection')
+
+ kwargs['LuminosityFolderInputKey'] = folder
+ mlog.info("Created online %s using folder %s" % (name, folder))
+
+ # Need the calibration tool just to get the proper MuToLumi value
+ from CoolLumiUtilities.OnlineLumiCalibrationCondAlgDefault \
+ import OnlineLumiCalibrationCondAlgDefault
+ calibAlg = OnlineLumiCalibrationCondAlgDefault()
+ kwargs['OnlineLumiCalibrationInputKey'] = calibAlg.LumiCalibOutputKey
+
+ # Other folder names should be blank.
+ kwargs['BunchLumisInputKey'] = ''
+ kwargs['BunchGroupInputKey'] = ''
+ kwargs['FillParamsInputKey'] = ''
+
+ return kwargs
diff --git a/LumiBlock/LumiBlockComps/share/LBDurationCondAlg_test.ref b/LumiBlock/LumiBlockComps/share/LBDurationCondAlg_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..d5a7fe27dee28d73c397ec3267e073983ccaa32e
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/share/LBDurationCondAlg_test.ref
@@ -0,0 +1,23 @@
+LumiBlockComps/LBDurationCondAlg_test
+
+
+Initializing Gaudi ApplicationMgr using job opts ../share/LBDurationCondAlg_test.txt
+JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/LBDurationCondAlg_test.txt
+JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["StoreGateSvc/ConditionStore"]
+JobOptionsSvc INFO # (2,1): LBDurationCondAlg.LBLBFolderInputKey = "testLBLB"
+JobOptionsSvc INFO # (3,1): LBDurationCondAlg.LBDurationOutputKey = "LBDurationCondData"
+JobOptionsSvc INFO Job options successfully read in from ../share/LBDurationCondAlg_test.txt
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Mon May 20 10:52:18 2019
+====================================================================================================================================
+ApplicationMgr INFO Application Manager Configured successfully
+ClassIDSvc INFO getRegistryEntries: read 2861 CLIDRegistry entries for module ALL
+EventLoopMgr WARNING Unable to locate service "EventSelector"
+EventLoopMgr WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
+ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
diff --git a/LumiBlock/LumiBlockComps/share/LBDurationCondAlg_test.txt b/LumiBlock/LumiBlockComps/share/LBDurationCondAlg_test.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e122052652364a671e38b23ed75e70cc760e6693
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/share/LBDurationCondAlg_test.txt
@@ -0,0 +1,3 @@
+ApplicationMgr.ExtSvc = {"StoreGateSvc/ConditionStore"};
+LBDurationCondAlg.LBLBFolderInputKey = "testLBLB";
+LBDurationCondAlg.LBDurationOutputKey = "LBDurationCondData";
diff --git a/LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.ref b/LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.ref
new file mode 100644
index 0000000000000000000000000000000000000000..7508f297f3fbb0407431dd3fe670103d80bc58f5
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.ref
@@ -0,0 +1,36 @@
+LumiBlockComps/LuminosityCondAlg_test
+
+
+Initializing Gaudi ApplicationMgr using job opts ../share/LuminosityCondAlg_test.txt
+JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build/../tests/../share/LuminosityCondAlg_test.txt
+JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["StoreGateSvc/ConditionStore"]
+JobOptionsSvc INFO # (3,1): LuminosityCondAlg.LuminosityFolderInputKey = "testLumi"
+JobOptionsSvc INFO # (4,1): LuminosityCondAlg.OnlineLumiCalibrationInputKey = "testCalib"
+JobOptionsSvc INFO # (5,1): LuminosityCondAlg.LuminosityOutputKey = "LuminosityCondData"
+JobOptionsSvc INFO # (7,1): LuminosityCondAlgRun1.LuminosityFolderInputKey = "testLumiRun1"
+JobOptionsSvc INFO # (8,1): LuminosityCondAlgRun1.OnlineLumiCalibrationInputKey = "testCalibRun1"
+JobOptionsSvc INFO # (9,1): LuminosityCondAlgRun1.BunchLumisInputKey = "testBunchLumisRun1"
+JobOptionsSvc INFO # (10,1): LuminosityCondAlgRun1.BunchGroupInputKey = "testBunchGroupRun1"
+JobOptionsSvc INFO # (11,1): LuminosityCondAlgRun1.FillParamsInputKey = "testFillParamsRun1"
+JobOptionsSvc INFO # (12,1): LuminosityCondAlgRun1.LuminosityOutputKey = "LuminosityCondDataRun1"
+JobOptionsSvc INFO # (14,1): LuminosityCondAlgMC.LuminosityFolderInputKey = ""
+JobOptionsSvc INFO # (15,1): LuminosityCondAlgMC.OnlineLumiCalibrationInputKey = ""
+JobOptionsSvc INFO # (16,1): LuminosityCondAlgMC.LuminosityOutputKey = "LuminosityCondDataMC"
+JobOptionsSvc INFO Job options successfully read in from ../share/LuminosityCondAlg_test.txt
+ApplicationMgr SUCCESS
+====================================================================================================================================
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Wed May 22 16:49:43 2019
+====================================================================================================================================
+ApplicationMgr INFO Application Manager Configured successfully
+ClassIDSvc INFO getRegistryEntries: read 2871 CLIDRegistry entries for module ALL
+EventLoopMgr WARNING Unable to locate service "EventSelector"
+EventLoopMgr WARNING No events will be processed from external input.
+HistogramPersis...WARNING Histograms saving not required.
+ApplicationMgr INFO Application Manager Initialized successfully
+ApplicationMgr Ready
+test1
+ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
+test2
+ClassIDSvc INFO getRegistryEntries: read 1932 CLIDRegistry entries for module ALL
+test3
diff --git a/LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.txt b/LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fc33742ab8ec148e5375f9a53b68e5e8de0f2a95
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/share/LuminosityCondAlg_test.txt
@@ -0,0 +1,16 @@
+ApplicationMgr.ExtSvc = {"StoreGateSvc/ConditionStore"};
+
+LuminosityCondAlg.LuminosityFolderInputKey = "testLumi";
+LuminosityCondAlg.OnlineLumiCalibrationInputKey = "testCalib";
+LuminosityCondAlg.LuminosityOutputKey = "LuminosityCondData";
+
+LuminosityCondAlgRun1.LuminosityFolderInputKey = "testLumiRun1";
+LuminosityCondAlgRun1.OnlineLumiCalibrationInputKey = "testCalibRun1";
+LuminosityCondAlgRun1.BunchLumisInputKey = "testBunchLumisRun1";
+LuminosityCondAlgRun1.BunchGroupInputKey = "testBunchGroupRun1";
+LuminosityCondAlgRun1.FillParamsInputKey = "testFillParamsRun1";
+LuminosityCondAlgRun1.LuminosityOutputKey = "LuminosityCondDataRun1";
+
+LuminosityCondAlgMC.LuminosityFolderInputKey = "";
+LuminosityCondAlgMC.OnlineLumiCalibrationInputKey = "";
+LuminosityCondAlgMC.LuminosityOutputKey = "LuminosityCondDataMC";
diff --git a/LumiBlock/LumiBlockComps/src/LBDurationCondAlg.cxx b/LumiBlock/LumiBlockComps/src/LBDurationCondAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..567b1c116a279813eb1a128e51cab3aa991874ce
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/src/LBDurationCondAlg.cxx
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file LumiBlockComps/src/LBDurationCondAlg.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date May, 2019
+ * @brief Produce LBDurationCondData from /TRIGGER/LUMI/LBLB.
+ */
+
+
+#include "LBDurationCondAlg.h"
+#include "CoolKernel/IObject.h"
+#include "GaudiKernel/SystemOfUnits.h"
+
+
+using Gaudi::Units::second;
+using Gaudi::Units::nanosecond;
+
+
+/**
+ * @brief Gaudi initialize method.
+ */
+StatusCode
+LBDurationCondAlg::initialize()
+{
+ ATH_CHECK( m_lblbFolderInputKey.initialize() );
+ ATH_CHECK( m_lbDurationOutputKey.initialize() );
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Algorithm execute method.
+ * @param ctx Event Context.
+ */
+StatusCode
+LBDurationCondAlg::execute (const EventContext& ctx) const
+{
+ SG::ReadCondHandle<AthenaAttributeList> lblbFolder
+ (m_lblbFolderInputKey, ctx);
+ EventIDRange range;
+ ATH_CHECK( lblbFolder.range (range) );
+
+ if ((**lblbFolder)["StartTime"].isNull()) {
+ ATH_MSG_ERROR( "StartTime is NULL in " << m_lblbFolderInputKey.key() << "!" );
+ return StatusCode::FAILURE;
+ }
+
+ if ((**lblbFolder)["EndTime"].isNull()) {
+ ATH_MSG_ERROR( "EndTime is NULL in " << m_lblbFolderInputKey.key() << "!" );
+ return StatusCode::FAILURE;
+ }
+
+ // Times in nanoseconds.
+ cool::UInt63 startTime = (**lblbFolder)["StartTime"].data<cool::UInt63>();
+ cool::UInt63 endTime = (**lblbFolder)["EndTime"].data<cool::UInt63>();
+
+ // Convert to seconds.
+ double duration = (endTime-startTime) * (nanosecond / second);
+
+ auto lbdur = std::make_unique<LBDurationCondData> (duration);
+
+ SG::WriteCondHandle<LBDurationCondData> lbDurationCondData
+ (m_lbDurationOutputKey, ctx);
+ ATH_CHECK( lbDurationCondData.record (range, std::move (lbdur)) );
+ return StatusCode::SUCCESS;
+}
+
+
diff --git a/LumiBlock/LumiBlockComps/src/LBDurationCondAlg.h b/LumiBlock/LumiBlockComps/src/LBDurationCondAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..aafceb640c6c17d4c38e07f285a47811aabda9a4
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/src/LBDurationCondAlg.h
@@ -0,0 +1,55 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file LumiBlockComps/src/LBDurationCondAlg.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date May, 2019
+ * @brief Produce LBDurationCondData from /TRIGGER/LUMI/LBLB.
+ */
+
+
+#ifndef LUMIBLOCKCOMPS_LBDURATIONCONDALG_H
+#define LUMIBLOCKCOMPS_LBDURATIONCONDALG_H
+
+
+#include "LumiBlockData/LBDurationCondData.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "PersistentDataModel/AthenaAttributeList.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "StoreGate/WriteCondHandleKey.h"
+
+
+/**
+ * @brief Produce LBDurationCondData from /TRIGGER/LUMI/LBLB.
+ */
+class LBDurationCondAlg
+ : public AthReentrantAlgorithm
+{
+public:
+ /// Forward base class ctor.
+ using AthReentrantAlgorithm::AthReentrantAlgorithm;
+
+
+ /// Gaudi initialize method.
+ virtual StatusCode initialize() override;
+
+
+ /// Algorithm execute method.
+ virtual StatusCode execute (const EventContext& ctx) const override;
+
+
+private:
+ /// Input COOL folder.
+ SG::ReadCondHandleKey<AthenaAttributeList> m_lblbFolderInputKey
+ { this, "LBLBFolderInputKey", "/TRIGGER/LUMI/LBLB", "" };
+
+
+ /// Output conditions object.
+ SG::WriteCondHandleKey<LBDurationCondData> m_lbDurationOutputKey
+ {this, "LBDurationOutputKey", "LBDurationCondData", "" };
+};
+
+
+#endif // not LUMIBLOCKCOMPS_LBDURATIONCONDALG_H
diff --git a/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx b/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..7a1868e648126fabc288f7a050d94b9d2071cdb1
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.cxx
@@ -0,0 +1,526 @@
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file LumiBlockComps/src/LuminosityCondAlg.cxx
+ * @author scott snyder <snyder@bnl.gov>, from existing LuminosityTool.
+ * @date May, 2019
+ * @brief Conditions algorithm for luminosity data.
+ */
+
+
+#include "LuminosityCondAlg.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "CoolKernel/IObject.h"
+#include "CxxUtils/get_unaligned.h"
+#include <sstream>
+
+
+/**
+ * @brief Gaudi initialize method.
+ */
+StatusCode
+LuminosityCondAlg::initialize()
+{
+ ATH_CHECK( m_luminosityOutputKey.initialize() );
+
+ // May be empty if configured for MC.
+ ATH_CHECK( m_luminosityFolderInputKey.initialize(SG::AllowEmpty) );
+ ATH_CHECK( m_onlineLumiCalibrationInputKey.initialize(SG::AllowEmpty) );
+
+ // Only used for run1.
+ ATH_CHECK( m_bunchLumisInputKey.initialize(SG::AllowEmpty) );
+ ATH_CHECK( m_bunchGroupInputKey.initialize(SG::AllowEmpty) );
+ ATH_CHECK( m_fillParamsInputKey.initialize(SG::AllowEmpty) );
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Algorithm execute method.
+ * @param ctx Event Context.
+ */
+StatusCode
+LuminosityCondAlg::execute (const EventContext& ctx) const
+{
+ auto lumi = std::make_unique<LuminosityCondData>();
+ EventIDRange range;
+
+ if (m_luminosityFolderInputKey.empty()) {
+ // MC case.
+ const EventIDBase::number_type UNDEFNUM = EventIDBase::UNDEFNUM;
+ const EventIDBase::event_number_t UNDEFEVT = EventIDBase::UNDEFEVT;
+ EventIDRange fullrange (EventIDBase (0, UNDEFEVT, UNDEFNUM, 0, 0),
+ EventIDBase (UNDEFNUM-1, UNDEFEVT, UNDEFNUM, 0, 0));
+ range = fullrange;
+ }
+ else {
+ SG::ReadCondHandle<CondAttrListCollection> luminosityFolder
+ (m_luminosityFolderInputKey, ctx);
+ ATH_CHECK( luminosityFolder.range (range) );
+
+ unsigned int preferredChannel;
+ unsigned int calibChannel;
+ const coral::Blob* bunchInstLumiBlob = nullptr;
+ ATH_CHECK( updateAvgLumi (**luminosityFolder,
+ *lumi,
+ preferredChannel,
+ calibChannel,
+ bunchInstLumiBlob) );
+
+ ATH_CHECK( updatePerBunchLumi (ctx,
+ bunchInstLumiBlob,
+ preferredChannel,
+ calibChannel,
+ range,
+ *lumi) );
+ }
+
+ SG::WriteCondHandle<LuminosityCondData> luminosityCondData
+ (m_luminosityOutputKey, ctx);
+ ATH_CHECK( luminosityCondData.record (range, std::move (lumi)) );
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Unpack luminosity data from the attribute list.
+ * @param lumiData Input luminosity data.
+ * @param lumi Output luminosity data being filled.
+ * @param preferredChannel[out] Preferred luminosity channel to use.
+ * @param calibChannel[out] Calibration luminosity channel to use.
+ * @param bunchInstLumiBlob[out] Packed per-bunch luminosity data.
+ * Set to null for Run 1.
+ *
+ * Unpacks luminosity data from the attribute list.
+ * Fills in the average luminosity fields in @c lumi,
+ * and determines the luminosity channels to use.
+ * For Run 2 and later, returns the packed luminosity data.
+ */
+StatusCode
+LuminosityCondAlg::updateAvgLumi (const CondAttrListCollection& lumiData,
+ LuminosityCondData& lumi,
+ unsigned int& preferredChannel,
+ unsigned int& calibChannel,
+ const coral::Blob*& bunchInstLumiBlob) const
+
+{
+ preferredChannel = 0;
+ calibChannel = 0;
+ bunchInstLumiBlob = nullptr;
+
+ const coral::AttributeList& attrList = lumiData.attributeList (m_lumiChannel);
+ if (attrList["Valid"].isNull()) {
+ ATH_MSG_ERROR ("Can't find luminosity information for channel " << m_lumiChannel);
+ return StatusCode::FAILURE;
+ }
+
+ if (msgLvl (MSG::DEBUG)) {
+ std::ostringstream attrStr1;
+ attrList.toOutputStream( attrStr1 );
+ ATH_MSG_DEBUG( "ChanNum " << m_lumiChannel << " Attribute list "
+ << attrStr1.str() );
+ }
+
+ // Check data availability
+ if (attrList["LBAvInstLumi"].isNull() || attrList["LBAvEvtsPerBX"].isNull()) {
+ ATH_MSG_ERROR( " NULL Luminosity information in database " );
+ return StatusCode::FAILURE;
+ }
+
+ // Check validity (don't bother continuing if invalid)
+ uint32_t valid = attrList["Valid"].data<cool::UInt32>();
+ lumi.setLbAverageValid (valid);
+ if (valid & 0x01) {
+ if (m_skipInvalid) {
+ ATH_MSG_WARNING( " Invalid LB Average luminosity ... set lumi to 0" );
+ return StatusCode::SUCCESS;
+ } else {
+ ATH_MSG_WARNING( " Invalid LB Average luminosity ... continuing because skipInvalid == FALSE" );
+ }
+ }
+
+ // Get preferred channel (needed for per-BCID calculation)
+ if (m_lumiChannel == 0u) {
+
+ // Check if we have a payload for this (Run2 only)
+ bool hasAlgorithmID = false;
+ for (coral::AttributeList::const_iterator attr = attrList.begin();
+ attr != attrList.end(); ++attr) {
+ if (attr->specification().name() == "AlgorithmID") {
+ hasAlgorithmID = true;
+ break;
+ }
+ }
+
+ if (hasAlgorithmID) {
+ // In Run2, channel 0 should be good. Leave as is
+ preferredChannel = m_lumiChannel;
+ calibChannel = attrList["AlgorithmID"].data<cool::UInt32>();
+
+ } else {
+ // In Run1, we need to recalculate from the actual channel number
+ preferredChannel = (valid >> 22);
+ calibChannel = preferredChannel;
+ }
+
+ } else {
+ preferredChannel = m_lumiChannel;
+ calibChannel = m_lumiChannel;
+ }
+
+ float LBAvInstLumi = attrList["LBAvInstLumi"].data<cool::Float>(); // Lumi
+ float LBAvEvtsPerBX = attrList["LBAvEvtsPerBX"].data<cool::Float>(); // Mu
+
+ // Check (and protect for NaN
+ if ( std::isnan (LBAvInstLumi) ) {
+ ATH_MSG_WARNING( " Luminosity is not a number.. " << LBAvInstLumi << " ... set it to 0 " );
+ LBAvInstLumi=0.;
+ }
+
+ if ( std::isnan (LBAvEvtsPerBX) ) {
+ ATH_MSG_WARNING( " Luminosity is not a number.. " << LBAvEvtsPerBX << " ... set it to 0 " );
+ LBAvEvtsPerBX=0.;
+ }
+
+ lumi.setLbAverageLuminosity (LBAvInstLumi);
+ lumi.setLbAverageInteractionsPerCrossing (LBAvEvtsPerBX);
+
+ // Check validity of per-BCID luminosity (will issue warning in recalcPerBCIDLumi
+ int perBcidValid = (valid/10) % 10;
+ if ((perBcidValid > 0) && m_skipInvalid) {
+ return StatusCode::SUCCESS;
+ }
+
+ // Also save per-BCID blob if it exists
+ for (coral::AttributeList::const_iterator attr = attrList.begin();
+ attr != attrList.end(); ++attr)
+ {
+ if (attr->specification().name() == "BunchInstLumi") {
+ if (!attrList["BunchInstLumi"].isNull())
+ bunchInstLumiBlob = &attrList["BunchInstLumi"].data<coral::Blob>();
+ break;
+ }
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Fill in per-bunch luminosity data.
+ * @param ctx Event context.
+ * @param bunchInstLumiBlob Packed per-bunch luminosity data.
+ * Null for Run 1.
+ * @param preferredChannel Preferred luminosity channel to use.
+ * @param calibChannel Calibration luminosity channel to use.
+ * @param range Validity range of the conditions data being filled.
+ * Updated if needed.
+ * @param lumi Output luminosity data being filled.
+ */
+StatusCode
+LuminosityCondAlg::updatePerBunchLumi (const EventContext& ctx,
+ const coral::Blob* bunchInstLumiBlob,
+ unsigned int preferredChannel,
+ unsigned int calibChannel,
+ EventIDRange& range,
+ LuminosityCondData& lumi) const
+{
+ if (lumi.lbAverageLuminosity() <= 0.) {
+ ATH_MSG_WARNING( "LBAvInstLumi is zero or negative in recalculatePerBCIDLumi():"
+ << lumi.lbAverageLuminosity());
+ return StatusCode::SUCCESS;
+ }
+
+ ATH_CHECK( updateMuToLumi (ctx, calibChannel, range, lumi) );
+
+ // Check here if we want to do this the Run1 way (hard) or the Run2 way (easy)
+
+ if (bunchInstLumiBlob != nullptr) { // Run2 way, easy
+ ATH_CHECK( updatePerBunchLumiRun2 (*bunchInstLumiBlob,
+ preferredChannel,
+ lumi) );
+ }
+ else { // Run1 way, hard!
+ ATH_CHECK( updatePerBunchLumiRun1 (ctx,
+ preferredChannel,
+ range,
+ lumi) );
+ }
+
+ ATH_MSG_DEBUG( "finished recalculatePerBCIDLumi() for alg: "
+ << preferredChannel );
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Fill in mu-to-lumi calibration.
+ * @param ctx Event context.
+ * @param calibChannel Calibration luminosity channel to use.
+ * @param range Validity range of the conditions data being filled.
+ * Updated if needed.
+ * @param lumi Output luminosity data being filled.
+ */
+StatusCode
+LuminosityCondAlg::updateMuToLumi (const EventContext& ctx,
+ unsigned int calibChannel,
+ EventIDRange& range,
+ LuminosityCondData& lumi) const
+{
+ SG::ReadCondHandle<OnlineLumiCalibrationCondData> onlineLumiCalibration
+ ( m_onlineLumiCalibrationInputKey, ctx );
+ EventIDRange range2;
+ ATH_CHECK( onlineLumiCalibration.range (range2) );
+ range = EventIDRange::intersect (range, range2);
+
+ // This is the only correct way to do this!
+ // The division below gives average mu (over all bunches) to total lumi
+ float muToLumi = onlineLumiCalibration->getMuToLumi (calibChannel);
+
+ // Check if this is reasonable
+ if (muToLumi < 0.) {
+ ATH_MSG_WARNING(" Found muToLumi = " << muToLumi << " for channel " << calibChannel << ". Try backup channel..." );
+ muToLumi = onlineLumiCalibration->getMuToLumi(m_calibBackupChannel);
+ ATH_MSG_WARNING(" Found muToLumi = " << muToLumi << " for backup channel " << m_calibBackupChannel);
+ }
+
+ // Check validity
+ bool isValid = true;
+ int perBcidValid = (lumi.lbAverageValid()/10) % 10;
+ if ((lumi.lbAverageValid() & 0x03) || (perBcidValid > 0)) { // Skip if either per-BCID or LBAv is invalid
+ isValid = false;
+ if (m_skipInvalid) {
+ ATH_MSG_WARNING( " Invalid per-BCID luminosity found: "
+ << lumi.lbAverageValid() << "!" );
+ return StatusCode::SUCCESS;
+ } else {
+ ATH_MSG_WARNING( " Invalid per-BCID luminosity found: "
+ << lumi.lbAverageValid()
+ << " continuing because skipInvalid == FALSE" );
+ }
+ }
+
+ // Now check muToLumi and report depending upon whether lumi is valid or not
+ if (muToLumi < 0.) {
+ if (isValid) {
+ ATH_MSG_ERROR(" Found invalid muToLumi = " << muToLumi << " for backup channel " << m_calibBackupChannel << "!");
+ } else {
+ ATH_MSG_WARNING(" Found invalid muToLumi = " << muToLumi << " for backup channel " << m_calibBackupChannel << "!");
+ }
+
+ // Don't keep negative values
+ muToLumi = 0.;
+ }
+
+ ATH_MSG_DEBUG(" Found muToLumi = " << muToLumi << " for channel "
+ << calibChannel );
+
+ lumi.setMuToLumi (muToLumi);
+
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Fill in per-bunch luminosity data, run 2 and later.
+ * @param bunchInstLumiBlob Packed per-bunch luminosity data.
+ * @param preferredChannel Preferred luminosity channel to use.
+ * @param lumi Output luminosity data being filled.
+ */
+StatusCode
+LuminosityCondAlg::updatePerBunchLumiRun2 (const coral::Blob& bunchInstLumiBlob,
+ unsigned int preferredChannel,
+ LuminosityCondData& lumi) const
+{
+ ATH_MSG_DEBUG( "starting Run2 recalculatePerBCIDLumi() for alg: " << preferredChannel );
+
+ // Check that the length isn't zero
+ if (bunchInstLumiBlob.size() == 0) {
+ ATH_MSG_ERROR("BunchInstLumi blob found with zero length!");
+ return StatusCode::FAILURE;
+ }
+
+ // Hardcode the Run2 BLOB decoding (should use CoolLumiUtilities...)
+ const uint8_t* ATH_RESTRICT pchar =
+ static_cast<const uint8_t*>(bunchInstLumiBlob.startingAddress()); // First byte holds storage size and mode
+ unsigned int bss = ((*pchar) % 100) / 10; // Byte storage size
+ unsigned int smod = ((*pchar) % 10); // Storage mode
+ ++pchar; // Points to next char after header
+
+ ATH_MSG_DEBUG( "BunchInstLumi blob found with storage mode " << smod
+ << " and byte storage size " << bss );
+
+ // Make sure we have what we think we have
+ if (bss != 4 || smod != 1) {
+ ATH_MSG_ERROR( "BunchInstLumi blob found with storage mode " << smod << " and byte storage size " << bss << " - Unknown!");
+ return StatusCode::FAILURE;
+ }
+
+ unsigned int nbcids = LuminosityCondData::TOTAL_LHC_BCIDS;
+ unsigned int bloblength = bss * nbcids + 1;
+
+ if (static_cast<cool::UInt32>(bunchInstLumiBlob.size()) != bloblength) {
+ ATH_MSG_ERROR( "BunchRawInstLumi blob found with length"
+ << bunchInstLumiBlob.size() << "in storage mode" << smod
+ << ", expecting " << bloblength << "!" );
+ return StatusCode::FAILURE;
+ }
+
+ // Length is correct, read raw data according to packing scheme
+ // This is absolute luminosity, so just unpack values into our array
+
+ ATH_MSG_DEBUG( "Unpacking lumi value from blob");
+ std::vector<float> instLumi (nbcids);
+ for (unsigned int i=0; i<nbcids; i++) {
+ // Can't use assignment directly because source may be misaligned.
+ instLumi[i] = CxxUtils::get_unaligned_float (pchar);
+ }
+
+ if (msgLvl (MSG::DEBUG)) {
+ for (unsigned int i=0; i<nbcids; i++) {
+ ATH_MSG_DEBUG( "Bcid: " << i << " Lumi: " << instLumi[i] );
+ }
+ }
+
+ lumi.setLbLuminosityPerBCIDVector (std::move (instLumi));
+
+ return StatusCode::SUCCESS;
+}
+
+
+/**
+ * @brief Fill in per-bunch luminosity data, run 1.
+ * @param preferredChannel Preferred luminosity channel to use.
+ * @param range Validity range of the conditions data being filled.
+ * Updated if needed.
+ * @param lumi Output luminosity data being filled.
+ */
+StatusCode
+LuminosityCondAlg::updatePerBunchLumiRun1 (const EventContext& ctx,
+ unsigned int preferredChannel,
+ EventIDRange& range,
+ LuminosityCondData& lumi) const
+{
+ ATH_MSG_DEBUG( "starting Run1 recalculatePerBCIDLumi() for alg: " << preferredChannel );
+
+ if (preferredChannel == 0) {
+ return StatusCode::SUCCESS;
+ }
+
+ // Nothing to do if we don't have the ingredients
+ if (m_onlineLumiCalibrationInputKey.empty()) {
+ ATH_MSG_ERROR( "OnlineLumiCalibrationInputKey.empty() is TRUE, skipping..." );
+ return StatusCode::FAILURE;
+ }
+ if (m_bunchLumisInputKey.empty()) {
+ ATH_MSG_DEBUG( "BunchLumisInputKey.empty() is TRUE, skipping..." );
+ return StatusCode::FAILURE;
+ }
+ if (m_bunchGroupInputKey.empty()) {
+ ATH_MSG_DEBUG( "BunchGroupTool.empty() is TRUE, skipping..." );
+ return StatusCode::FAILURE;
+ }
+ if (m_fillParamsInputKey.empty()) {
+ ATH_MSG_ERROR( "FillParamsInputKey.empty() is TRUE, skipping..." );
+ return StatusCode::FAILURE;
+ }
+
+ SG::ReadCondHandle<OnlineLumiCalibrationCondData> onlineLumiCalibration
+ (m_onlineLumiCalibrationInputKey, ctx);
+ SG::ReadCondHandle<BunchLumisCondData> bunchLumis (m_bunchLumisInputKey, ctx);
+ SG::ReadCondHandle<BunchGroupCondData> bunchGroup (m_bunchGroupInputKey, ctx);
+ SG::ReadCondHandle<FillParamsCondData> fillParams (m_fillParamsInputKey, ctx);
+
+ EventIDRange range2;
+ ATH_CHECK( onlineLumiCalibration.range (range2) );
+ range = EventIDRange::intersect (range, range2);
+ ATH_CHECK( bunchLumis.range (range2) );
+ range = EventIDRange::intersect (range, range2);
+ ATH_CHECK( bunchGroup.range (range2) );
+ range = EventIDRange::intersect (range, range2);
+ ATH_CHECK( fillParams.range (range2) );
+ range = EventIDRange::intersect (range, range2);
+
+ const std::vector<unsigned int>& luminousBunches = fillParams->luminousBunches();
+ ATH_MSG_DEBUG( "N LuminousBunches:" << luminousBunches.size() );
+
+ // Get the raw data for the preferred channel
+ const std::vector<float>& rawLumiVec = bunchLumis->rawLuminosity(preferredChannel);
+
+ //
+ // Calibration step
+ //
+
+ // Here we want to go through and calibrate raw values in the luminous bunches only.
+ // This is what the OL adds up, and since these are online calibrations, we want to rescale the total
+ // to agree to whatever offline tag we are using.
+ std::vector<float> calLumiVec (LuminosityCondData::TOTAL_LHC_BCIDS, 0.);
+
+ // Update muToLumi while we are at it (also check that calibration exists)
+ float muToLumi = onlineLumiCalibration->getMuToLumi (preferredChannel);
+ if (muToLumi <= 0.) {
+ ATH_MSG_ERROR( " dont have calibration information for preferred channel "
+ << preferredChannel << "!" );
+ return StatusCode::FAILURE;
+ }
+ lumi.setMuToLumi (muToLumi);
+
+ double lumiSum = 0.;
+ for (unsigned int bcid : luminousBunches) {
+ // Don't waste time on zero lumi
+ if (rawLumiVec[bcid] <= 0.) {
+ ATH_MSG_DEBUG( "Calibrate BCID " << bcid << " with raw "
+ << rawLumiVec[bcid] << " -> skipping" );
+ continue;
+ }
+
+ // Calibrate
+ if (!onlineLumiCalibration->calibrateLumi(preferredChannel,
+ rawLumiVec[bcid],
+ calLumiVec[bcid]))
+ {
+ ATH_MSG_DEBUG( "Calibrate BCID " << bcid << " with raw " << rawLumiVec[bcid] << " -> calibration failed!" );
+ ATH_MSG_WARNING( "Per-BCID calibration failed for bcid " << bcid << " with raw lumi = " << rawLumiVec[bcid] );
+ continue;
+ }
+
+ lumiSum += calLumiVec[bcid];
+
+ ATH_MSG_DEBUG( "Calibrate BCID " << bcid << " with raw " << rawLumiVec[bcid] << " -> " << calLumiVec[bcid] );
+ }
+
+ // Work out scale factor between offline and online estimate
+ float offlineOnlineRatio = 1.;
+ if (lumiSum > 0.) offlineOnlineRatio = lumi.lbAverageLuminosity() / lumiSum;
+
+ ATH_MSG_DEBUG( " Offline/Online scale factor: " << lumi.lbAverageLuminosity()
+ << " / " << lumiSum << " = " << offlineOnlineRatio );
+
+ // Make sure we have values for all BCIDs in the physics bunch group
+ for (unsigned int bcid : bunchGroup->bunchGroup (1)) {
+ // Don't repeat if value already exists
+ if (calLumiVec[bcid] > 0.) continue;
+ if (rawLumiVec[bcid] <= 0.) continue;
+
+ // Calibrate
+ if (!onlineLumiCalibration->calibrateLumi(preferredChannel,
+ rawLumiVec[bcid],
+ calLumiVec[bcid]))
+ {
+ ATH_MSG_DEBUG( " -> Calibration failed!" );
+ ATH_MSG_WARNING( "Per-BCID calibration failed for bcid " << bcid
+ << " with raw lumi = " << rawLumiVec[bcid] );
+ continue;
+ }
+ }
+
+ // Almost done, now we apply the scale factor to all BCIDs
+ for (float& lumi : calLumiVec) {
+ lumi *= offlineOnlineRatio;
+ }
+
+ lumi.setLbLuminosityPerBCIDVector (std::move (calLumiVec));
+
+ return StatusCode::SUCCESS;
+}
diff --git a/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.h b/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..b7c1b5fd7cfc765518f14dde3169062411ed44f3
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/src/LuminosityCondAlg.h
@@ -0,0 +1,168 @@
+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file LumiBlockComps/src/LuminosityCondAlg.h
+ * @author scott snyder <snyder@bnl.gov>, from existing LuminosityTool.
+ * @date May, 2019
+ * @brief Conditions algorithm for luminosity data.
+ */
+
+
+#ifndef LUMIBLOCKCOMPS_LUMINOSITYCONDALG_H
+#define LUMIBLOCKCOMPS_LUMINOSITYCONDALG_H
+
+
+#include "LumiBlockData/LuminosityCondData.h"
+#include "CoolLumiUtilities/OnlineLumiCalibrationCondData.h"
+#include "CoolLumiUtilities/FillParamsCondData.h"
+#include "CoolLumiUtilities/BunchLumisCondData.h"
+#include "CoolLumiUtilities/BunchGroupCondData.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "AthenaPoolUtilities/CondAttrListCollection.h"
+#include "StoreGate/ReadCondHandleKey.h"
+#include "StoreGate/WriteCondHandleKey.h"
+#include "CoralBase/Blob.h"
+
+
+/**
+ * @brief Conditions algorithm for luminosity data.
+ */
+class LuminosityCondAlg
+ : public AthReentrantAlgorithm
+{
+public:
+ /// Forward base class ctor.
+ using AthReentrantAlgorithm::AthReentrantAlgorithm;
+
+
+ /// Gaudi initialize method.
+ virtual StatusCode initialize() override;
+
+
+ /// Algorithm execute method.
+ virtual StatusCode execute (const EventContext& ctx) const override;
+
+
+private:
+ /**
+ * @brief Unpack luminosity data from the attribute list.
+ * @param lumiData Input luminosity data.
+ * @param lumi Output luminosity data being filled.
+ * @param preferredChannel[out] Preferred luminosity channel to use.
+ * @param calibChannel[out] Calibration luminosity channel to use.
+ * @param bunchInstLumiBlob[out] Packed per-bunch luminosity data.
+ * Set to null for Run 1.
+ *
+ * Unpacks luminosity data from the attribute list.
+ * Fills in the average luminosity fields in @c lumi,
+ * and determines the luminosity channels to use.
+ * For Run 2 and later, returns the packed luminosity data.
+ */
+ StatusCode
+ updateAvgLumi (const CondAttrListCollection& lumiData,
+ LuminosityCondData& lumi,
+ unsigned int& preferredChannel,
+ unsigned int& calibChannel,
+ const coral::Blob*& bunchInstLumiBlob) const;
+
+
+ /**
+ * @brief Fill in per-bunch luminosity data.
+ * @param ctx Event context.
+ * @param bunchInstLumiBlob Packed per-bunch luminosity data.
+ * Null for Run 1.
+ * @param preferredChannel Preferred luminosity channel to use.
+ * @param calibChannel Calibration luminosity channel to use.
+ * @param range Validity range of the conditions data being filled.
+ * Updated if needed.
+ * @param lumi Output luminosity data being filled.
+ */
+ StatusCode
+ updatePerBunchLumi (const EventContext& ctx,
+ const coral::Blob* bunchInstLumiBlob,
+ unsigned int preferredChannel,
+ unsigned int calibChannel,
+ EventIDRange& range,
+ LuminosityCondData& lumi) const;
+
+
+ /**
+ * @brief Fill in mu-to-lumi calibration.
+ * @param ctx Event context.
+ * @param calibChannel Calibration luminosity channel to use.
+ * @param range Validity range of the conditions data being filled.
+ * Updated if needed.
+ * @param lumi Output luminosity data being filled.
+ */
+ StatusCode
+ updateMuToLumi (const EventContext& ctx,
+ unsigned int calibChannel,
+ EventIDRange& range,
+ LuminosityCondData& lumi) const;
+
+
+ /**
+ * @brief Fill in per-bunch luminosity data, run 2 and later.
+ * @param bunchInstLumiBlob Packed per-bunch luminosity data.
+ * @param preferredChannel Preferred luminosity channel to use.
+ * @param lumi Output luminosity data being filled.
+ */
+ StatusCode
+ updatePerBunchLumiRun2 (const coral::Blob& bunchInstLumiBlob,
+ unsigned int preferredChannel,
+ LuminosityCondData& lumi) const;
+
+
+ /**
+ * @brief Fill in per-bunch luminosity data, run 1.
+ * @param preferredChannel Preferred luminosity channel to use.
+ * @param range Validity range of the conditions data being filled.
+ * Updated if needed.
+ * @param lumi Output luminosity data being filled.
+ */
+ StatusCode
+ updatePerBunchLumiRun1 (const EventContext& ctx,
+ unsigned int preferredChannel,
+ EventIDRange& range,
+ LuminosityCondData& lumi) const;
+
+
+ Gaudi::Property<unsigned long> m_lumiChannel
+ { this, "LumiChannelNumber", 0, "Luminosity channel to read. 0 means to determine from the data." };
+
+ Gaudi::Property<unsigned long> m_calibBackupChannel
+ { this, "CalibBackupChannel", 112, "Backup channel in case calibChannel doesn't exist in online calibration folder" };
+
+ Gaudi::Property<bool> m_skipInvalid
+ { this, "SkipInvalid", true, "Flag to control whether invalid data is skipped: True (default), returning a zero luminosity; false, retruning available luminosity values anyway" };
+
+ SG::ReadCondHandleKey<CondAttrListCollection> m_luminosityFolderInputKey
+ { this, "LuminosityFolderInputKey", "/TRIGGER/OFLLUMI/LBLESTOFL",
+ "Input luminosityCOOL folder." };
+
+ SG::ReadCondHandleKey<OnlineLumiCalibrationCondData> m_onlineLumiCalibrationInputKey
+ { this, "OnlineLumiCalibrationInputKey", "OnlineLumiCalibrationCondData",
+ "Input luminosity calibration." };
+
+ SG::ReadCondHandleKey<BunchLumisCondData> m_bunchLumisInputKey
+ { this, "BunchLumisInputKey", "",
+ "Input raw luminosities. Only used for Run 1." };
+
+ SG::ReadCondHandleKey<BunchGroupCondData> m_bunchGroupInputKey
+ { this, "BunchGroupInputKey", "",
+ "Input filled bunch data. Only used for Run 1." };
+
+ SG::ReadCondHandleKey<FillParamsCondData> m_fillParamsInputKey
+ { this, "FillParamsInputKey", "",
+ "Input luminous bunch data. Only used for Run 1." };
+
+ /// Output conditions object.
+ SG::WriteCondHandleKey<LuminosityCondData> m_luminosityOutputKey
+ { this, "LuminosityOutputKey", "LuminosityCondData",
+ "Output luminosity data." };
+};
+
+
+#endif // not LUMIBLOCKCOMPS_LUMINOSITYCONDALG_H
diff --git a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
index 780dd362d12a5697d932c2c91e1f2467312a467c..11cbdee34df1ab2af2b9842fa2304d73b3582924 100644
--- a/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
+++ b/LumiBlock/LumiBlockComps/src/components/LumiBlockComps_entries.cxx
@@ -9,6 +9,8 @@
#include "LumiBlockComps/TrigLivefractionTool.h"
#include "LumiBlockComps/LumiCalcSvc.h"
#include "LumiBlockComps/LumiBlockTester.h"
+#include "../LBDurationCondAlg.h"
+#include "../LuminosityCondAlg.h"
#endif
DECLARE_COMPONENT( CreateLumiBlockCollectionFromFile )
@@ -19,6 +21,8 @@ DECLARE_COMPONENT( LumiBlockMuTool )
DECLARE_COMPONENT( LuminosityTool )
DECLARE_COMPONENT( TrigLivefractionTool )
DECLARE_COMPONENT( LumiCalcSvc )
+DECLARE_COMPONENT( LBDurationCondAlg )
+DECLARE_COMPONENT( LuminosityCondAlg )
#endif
DECLARE_COMPONENT( LumiBlockMetaDataTool )
diff --git a/LumiBlock/LumiBlockComps/test/LBDurationCondAlg_test.cxx b/LumiBlock/LumiBlockComps/test/LBDurationCondAlg_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..aee2c0920929b1b264bb4938c513169134f46d65
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/test/LBDurationCondAlg_test.cxx
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file LumiBlockComps/test/LBDurationCondAlg_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date May, 2019
+ * @brief Unit test for LBDurationCondAlg.
+ */
+
+
+#undef NDEBUG
+#include "../src/LBDurationCondAlg.h"
+#include "LumiBlockData/LBDurationCondData.h"
+#include "AthenaKernel/ExtendedEventContext.h"
+#include "PersistentDataModel/AthenaAttributeList.h"
+#include "TestTools/initGaudi.h"
+#include "CoolKernel/IObject.h"
+#include <iostream>
+#include <cassert>
+
+
+class TestRCUSvc
+ : public Athena::IRCUSvc
+{
+public:
+ virtual StatusCode remove (Athena::IRCUObject* /*obj*/) override
+ {
+ return StatusCode::SUCCESS;
+ }
+ virtual size_t getNumSlots() const override { return 1; }
+ virtual void add (Athena::IRCUObject* /*obj*/) override
+ { }
+
+ virtual unsigned long addRef() override { std::abort(); }
+ virtual unsigned long release() override { std::abort(); }
+ virtual StatusCode queryInterface(const InterfaceID &/*ti*/, void** /*pp*/) override { std::abort(); }
+};
+
+
+EventIDBase timestamp (int t)
+{
+ return EventIDBase (EventIDBase::UNDEFNUM, // run
+ EventIDBase::UNDEFEVT, // event
+ t);
+}
+
+
+void test1 (ISvcLocator* svcloc)
+{
+ std::cout << "test1\n";
+
+ EventContext ctx;
+ ctx.setExtension (Atlas::ExtendedEventContext());
+ EventIDBase eid (0, 0, 0, 0);
+ ctx.setEventID (eid);
+
+ LBDurationCondAlg alg ("LBDurationCondAlg", svcloc);
+ alg.addRef();
+ assert( alg.sysInitialize().isSuccess() );
+
+ TestRCUSvc rcu;
+ DataObjID id1 ("testLBLB");
+ auto cc1 = std::make_unique<CondCont<AthenaAttributeList> > (rcu, id1);
+ DataObjID id2 ("LBDurationCondData");
+
+ auto attrs = std::make_unique<AthenaAttributeList>();
+ attrs->extend ("StartTime", "unsigned long long");
+ attrs->extend ("EndTime", "unsigned long long");
+ (*attrs)["StartTime"].setValue (static_cast<cool::UInt63> (123*1e9));
+ (*attrs)["EndTime"].setValue (static_cast<cool::UInt63> (125.5*1e9));
+
+ const EventIDRange range (timestamp (0), timestamp (100));
+ assert( cc1->insert (range, std::move(attrs), ctx).isSuccess() );
+
+ ServiceHandle<StoreGateSvc> conditionStore ("ConditionStore", "test");
+ assert( conditionStore->record (std::move (cc1), "testLBLB") );
+
+ assert( alg.execute (ctx).isSuccess() );
+
+ CondCont<LBDurationCondData>* cc2 = nullptr;
+ assert( conditionStore->retrieve (cc2, "LBDurationCondData").isSuccess() );
+ const LBDurationCondData* data = 0;
+ const EventIDRange* range2p = nullptr;
+ assert (cc2->find (eid, data, &range2p));
+ assert (range2p->start().time_stamp() == timestamp(0).time_stamp());
+ assert (range2p->stop().time_stamp() == timestamp(100).time_stamp());
+
+ assert (data->lbDuration() == 2.5);
+}
+
+
+int main()
+{
+ std::cout << "LumiBlockComps/LBDurationCondAlg_test\n";
+
+ ISvcLocator* svcloc = nullptr;
+ if (!Athena_test::initGaudi("LumiBlockComps/LBDurationCondAlg_test.txt", svcloc)) {
+ return 1;
+ }
+
+
+ test1 (svcloc);
+ return 0;
+}
diff --git a/LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx b/LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..aaf9579c7d268b4ec3207982178078c00ca40ac2
--- /dev/null
+++ b/LumiBlock/LumiBlockComps/test/LuminosityCondAlg_test.cxx
@@ -0,0 +1,417 @@
+/*
+ * Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file LumiBlockComps/test/LuminosityAlg_test.cxx
+ * @author scott snyder <snyder@bnl.gov>
+ * @date May, 2019
+ * @brief Unit test for LuminosityCondAlg.
+ */
+
+
+#undef NDEBUG
+#include "../src/LuminosityCondAlg.h"
+#include "LumiBlockData/LuminosityCondData.h"
+#include "CoolLumiUtilities/BunchLumisCondData.h"
+#include "CoolLumiUtilities/BunchGroupCondData.h"
+#include "CoolLumiUtilities/FillParamsCondData.h"
+#include "CoolLumiUtilities/OnlineLumiCalibrationCondData.h"
+#include "AthenaKernel/ExtendedEventContext.h"
+#include "PersistentDataModel/AthenaAttributeList.h"
+#include "TestTools/initGaudi.h"
+#include "TestTools/FLOATassert.h"
+#include "CoolKernel/IObject.h"
+#include <iostream>
+#include <cassert>
+
+
+const unsigned int TOTAL_LHC_BCIDS = 3564;
+
+// BCID, lumi pairs
+const std::pair<unsigned int, float> lumiData[] =
+ {
+ { 10, 10.5 },
+ { 20, 20.5 },
+ { 30, 12.5 },
+ { 40, 13.5 },
+ { 55, 15.5 },
+};
+
+
+// Run1 results
+const std::pair<unsigned int, float> lumiCalibData[] =
+ {
+ { 10, 0.171479 },
+ { 20, 0.622183 },
+ { 30, 0.239085 },
+ { 40, 0.277113 },
+ { 55, 0.361620 },
+};
+
+
+class TestRCUSvc
+ : public Athena::IRCUSvc
+{
+public:
+ virtual StatusCode remove (Athena::IRCUObject* /*obj*/) override
+ {
+ return StatusCode::SUCCESS;
+ }
+ virtual size_t getNumSlots() const override { return 1; }
+ virtual void add (Athena::IRCUObject* /*obj*/) override
+ { }
+
+ virtual unsigned long addRef() override { std::abort(); }
+ virtual unsigned long release() override { std::abort(); }
+ virtual StatusCode queryInterface(const InterfaceID &/*ti*/, void** /*pp*/) override { std::abort(); }
+};
+
+
+EventIDBase timestamp (int t)
+{
+ return EventIDBase (EventIDBase::UNDEFNUM, // run
+ EventIDBase::UNDEFEVT, // event
+ t);
+}
+
+
+void push_float (float x, std::vector<uint8_t>& data)
+{
+ union {
+ float f;
+ uint32_t i;
+ } cnv;
+ cnv.f = x;
+ data.push_back (cnv.i & 0xff);
+ data.push_back ((cnv.i>>8) & 0xff);
+ data.push_back ((cnv.i>>16) & 0xff);
+ data.push_back ((cnv.i>>24) & 0xff);
+}
+
+
+coral::Blob makeBlob (float offs)
+{
+ unsigned int bss = 4;
+ unsigned int smod = 1;
+
+ std::vector<uint8_t> data;
+ data.push_back (bss*10 + smod);
+
+ unsigned int nbcid = std::end(lumiData) - std::begin(lumiData);
+
+ unsigned int ilumi = 0;
+ for (unsigned int bcid = 0; bcid < TOTAL_LHC_BCIDS; bcid++) {
+ float lumi = 0;
+ if (ilumi < nbcid && lumiData[ilumi].first == bcid) {
+ lumi = lumiData[ilumi].second+offs;
+ ++ilumi;
+ }
+ push_float (lumi, data);
+ }
+
+ coral::Blob blob (data.size());
+ memcpy (blob.startingAddress(), data.data(), data.size());
+ return blob;
+}
+
+
+std::unique_ptr<CondAttrListCollection> make_run2_attrlist()
+{
+ auto attrs = std::make_unique<CondAttrListCollection> (false);
+ coral::AttributeList al;
+
+ al.extend ("LBAvInstLumi", "float");
+ al.extend ("LBAvEvtsPerBX", "float");
+ al.extend ("Valid", "unsigned int");
+ al.extend ("AlgorithmID", "unsigned int");
+ al.extend ("BunchInstLumi", "blob");
+ al["LBAvInstLumi"].setValue (1.5f);
+ al["LBAvEvtsPerBX"].setValue (10.5f);
+ al["Valid"].setValue (0u);
+ al["AlgorithmID"].setValue (42u);
+ al["BunchInstLumi"].setValue (makeBlob (0));
+ attrs->add (0, al);
+ return attrs;
+}
+
+
+std::unique_ptr<CondAttrListCollection> make_run1_attrlist()
+{
+ auto attrs = std::make_unique<CondAttrListCollection> (false);
+ coral::AttributeList al;
+
+ al.extend ("LBAvInstLumi", "float");
+ al.extend ("LBAvEvtsPerBX", "float");
+ al.extend ("Valid", "unsigned int");
+ al["LBAvInstLumi"].setValue (1.5f);
+ al["LBAvEvtsPerBX"].setValue (10.5f);
+ unsigned int valid = (42) << 22;
+ // Round up to next 100.
+ valid = ((valid+99)/100) * 100;
+ al["Valid"].setValue (valid);
+ attrs->add (0, al);
+ return attrs;
+}
+
+
+std::unique_ptr<OnlineLumiCalibrationCondData> make_onlineLumiCalib()
+{
+ auto calib = std::make_unique<OnlineLumiCalibrationCondData>();
+
+ float muToLumi = 2.5;
+ float p0 = 1;
+ float p1 = 1;
+ float p2 = 1;
+
+ coral::AttributeList attr;
+ attr.extend ("NumOfParameters", "unsigned int");
+ attr.extend ("Function", "string");
+ attr.extend ("MuToLumi", "float");
+ attr.extend ("Parameters", "blob");
+
+ attr["MuToLumi"].setValue (muToLumi);
+ attr["Function"].setValue (std::string ("Polynomial"));
+
+ coral::Blob blob (9 * sizeof(float));
+ float* p = static_cast<float*> (blob.startingAddress());
+ p[0] = 1;
+ p[1] = 0;
+ p[2] = 100;
+ p[3] = p0;
+ p[4] = p1;
+ p[5] = p2;
+ p[6] = 0;
+ p[7] = 0;
+ p[8] = 0;
+ attr["Parameters"].setValue (blob);
+ attr["NumOfParameters"].setValue (9u);
+
+ OnlineLumiCalibrator lc;
+ assert (lc.setCalibration (attr));
+ calib->set (42, std::move (lc));
+
+ return calib;
+}
+
+
+std::unique_ptr<BunchLumisCondData> make_bunchLumis()
+{
+ auto bl = std::make_unique<BunchLumisCondData>();
+ std::vector<float> rawLumi (LuminosityCondData::TOTAL_LHC_BCIDS);
+ for (const auto& p : lumiData) {
+ rawLumi[p.first] = p.second;
+ }
+ bl->addChannel (42, std::move (rawLumi));
+ return bl;
+}
+
+
+std::unique_ptr<BunchGroupCondData> make_bunchGroup()
+{
+ auto bg = std::make_unique<BunchGroupCondData>();
+ for (const auto& p : lumiData) {
+ bg->addBCID (p.first, 2);
+ }
+ return bg;
+}
+
+
+std::unique_ptr<FillParamsCondData> make_fillParams()
+{
+ auto params = std::make_unique<FillParamsCondData>();
+ std::vector<uint16_t> bunches;
+ for (const auto& p : lumiData) {
+ if (p.first == 10) continue;
+ bunches.push_back (p.first);
+ }
+ params->setLuminousBunches (bunches.data(), bunches.data()+bunches.size());
+ return params;
+}
+
+
+// run2
+void test1 (ISvcLocator* svcloc)
+{
+ std::cout << "test1\n";
+
+ EventContext ctx;
+ ctx.setExtension (Atlas::ExtendedEventContext());
+ EventIDBase eid (0, 0, 0, 0);
+ ctx.setEventID (eid);
+
+ LuminosityCondAlg alg ("LuminosityCondAlg", svcloc);
+ alg.addRef();
+ assert( alg.sysInitialize().isSuccess() );
+
+ TestRCUSvc rcu;
+
+ DataObjID id1 ("testLumi");
+ auto cc1 = std::make_unique<CondCont<CondAttrListCollection> > (rcu, id1);
+ const EventIDRange range1 (timestamp (0), timestamp (100));
+ assert( cc1->insert (range1, make_run2_attrlist(), ctx).isSuccess() );
+
+ DataObjID id2 ("testCalib");
+ auto cc2 = std::make_unique<CondCont<OnlineLumiCalibrationCondData> > (rcu, id2);
+ const EventIDRange range2 (timestamp (0), timestamp (90));
+ assert( cc2->insert (range2, make_onlineLumiCalib(), ctx).isSuccess() );
+
+ ServiceHandle<StoreGateSvc> conditionStore ("ConditionStore", "test");
+ assert( conditionStore->record (std::move (cc1), "testLumi") );
+ assert( conditionStore->record (std::move (cc2), "testCalib") );
+
+ assert( alg.execute (ctx).isSuccess() );
+
+ CondCont<LuminosityCondData>* ccout = nullptr;
+ assert( conditionStore->retrieve (ccout, "LuminosityCondData").isSuccess() );
+ const LuminosityCondData* data = 0;
+ const EventIDRange* rangeout = nullptr;
+ assert (ccout->find (eid, data, &rangeout));
+ assert (rangeout->start().time_stamp() == timestamp(0).time_stamp());
+ assert (rangeout->stop().time_stamp() == timestamp(90).time_stamp());
+
+ assert( data->lbAverageLuminosity() == 1.5 );
+ assert( data->lbAverageInteractionsPerCrossing() == 10.5 );
+ assert( data->lbAverageValid() == 0 );
+ assert( data->muToLumi() == 2.5 );
+
+ std::vector<float> vec = data->lbLuminosityPerBCIDVector();
+ assert (vec.size() == LuminosityCondData::TOTAL_LHC_BCIDS);
+ for (const auto& p : lumiData) {
+ assert (vec[p.first] == p.second);
+ vec[p.first] = 0;
+ }
+
+ for (float f : vec) {
+ assert (f == 0);
+ }
+}
+
+
+// run1
+void test2 (ISvcLocator* svcloc)
+{
+ std::cout << "test2\n";
+
+ EventContext ctx;
+ ctx.setExtension (Atlas::ExtendedEventContext());
+ EventIDBase eid (0, 0, 0, 0);
+ ctx.setEventID (eid);
+
+ LuminosityCondAlg alg ("LuminosityCondAlgRun1", svcloc);
+ alg.addRef();
+ assert( alg.sysInitialize().isSuccess() );
+
+ TestRCUSvc rcu;
+
+ DataObjID id1 ("testLumiRun1");
+ auto cc1 = std::make_unique<CondCont<CondAttrListCollection> > (rcu, id1);
+ const EventIDRange range1 (timestamp (0), timestamp (100));
+ assert( cc1->insert (range1, make_run1_attrlist(), ctx).isSuccess() );
+
+ DataObjID id2 ("testCalibRun1");
+ auto cc2 = std::make_unique<CondCont<OnlineLumiCalibrationCondData> > (rcu, id2);
+ const EventIDRange range2 (timestamp (0), timestamp (90));
+ assert( cc2->insert (range2, make_onlineLumiCalib(), ctx).isSuccess() );
+
+ DataObjID id3 ("testBunchLumisRun1");
+ auto cc3 = std::make_unique<CondCont<BunchLumisCondData> > (rcu, id3);
+ const EventIDRange range3 (timestamp (0), timestamp (85));
+ assert( cc3->insert (range3, make_bunchLumis(), ctx).isSuccess() );
+
+ DataObjID id4 ("testBunchGroupRun1");
+ auto cc4 = std::make_unique<CondCont<BunchGroupCondData> > (rcu, id4);
+ const EventIDRange range4 (timestamp (0), timestamp (95));
+ assert( cc4->insert (range4, make_bunchGroup(), ctx).isSuccess() );
+
+ DataObjID id5 ("testFillParamsRun1");
+ auto cc5 = std::make_unique<CondCont<FillParamsCondData> > (rcu, id5);
+ const EventIDRange range5 (timestamp (0), timestamp (80));
+ assert( cc5->insert (range5, make_fillParams(), ctx).isSuccess() );
+
+ ServiceHandle<StoreGateSvc> conditionStore ("ConditionStore", "test");
+ assert( conditionStore->record (std::move (cc1), "testLumiRun1") );
+ assert( conditionStore->record (std::move (cc2), "testCalibRun1") );
+ assert( conditionStore->record (std::move (cc3), "testBunchLumisRun1") );
+ assert( conditionStore->record (std::move (cc4), "testBunchGroupRun1") );
+ assert( conditionStore->record (std::move (cc5), "testFillParamsRun1") );
+
+ assert( alg.execute (ctx).isSuccess() );
+
+ CondCont<LuminosityCondData>* ccout = nullptr;
+ assert( conditionStore->retrieve (ccout, "LuminosityCondDataRun1").isSuccess() );
+ const LuminosityCondData* data = 0;
+ const EventIDRange* rangeout = nullptr;
+ assert (ccout->find (eid, data, &rangeout));
+ assert (rangeout->start().time_stamp() == timestamp(0).time_stamp());
+ assert (rangeout->stop().time_stamp() == timestamp(80).time_stamp());
+
+ assert( data->lbAverageLuminosity() == 1.5 );
+ assert( data->lbAverageInteractionsPerCrossing() == 10.5 );
+ assert( (data->lbAverageValid() >> 22) == 42 );
+ assert( (data->lbAverageValid() % 100) == 0 );
+ assert( data->muToLumi() == 2.5 );
+
+ std::vector<float> vec = data->lbLuminosityPerBCIDVector();
+ assert (vec.size() == LuminosityCondData::TOTAL_LHC_BCIDS);
+ for (const auto& p : lumiCalibData) {
+ assert( Athena_test::isEqual (vec[p.first], p.second, 1e-5) );
+ vec[p.first] = 0;
+ }
+
+ for (float f : vec) {
+ assert (f == 0);
+ }
+}
+
+
+// MC
+void test3 (ISvcLocator* svcloc)
+{
+ std::cout << "test3\n";
+
+ EventContext ctx;
+ ctx.setExtension (Atlas::ExtendedEventContext());
+ EventIDBase eid (0, 0, 0, 0, 0, 0);
+ ctx.setEventID (eid);
+
+ LuminosityCondAlg alg ("LuminosityCondAlgMC", svcloc);
+ alg.addRef();
+ assert( alg.sysInitialize().isSuccess() );
+
+ assert( alg.execute (ctx).isSuccess() );
+
+ ServiceHandle<StoreGateSvc> conditionStore ("ConditionStore", "test");
+ CondCont<LuminosityCondData>* ccout = nullptr;
+ assert( conditionStore->retrieve (ccout, "LuminosityCondDataMC").isSuccess() );
+ const LuminosityCondData* data = 0;
+ const EventIDRange* rangeout = nullptr;
+ assert (ccout->find (eid, data, &rangeout));
+ assert (rangeout->start().time_stamp() == timestamp(0).time_stamp());
+
+ assert( data->lbAverageLuminosity() == 0 );
+ assert( data->lbAverageInteractionsPerCrossing() == 0 );
+ assert( data->lbAverageValid() == 0xffffffff );
+ assert( data->muToLumi() == 0 );
+
+ std::vector<float> vec = data->lbLuminosityPerBCIDVector();
+ assert (vec.size() == LuminosityCondData::TOTAL_LHC_BCIDS);
+ for (float f : vec) {
+ assert (f == 0);
+ }
+}
+
+
+int main()
+{
+ std::cout << "LumiBlockComps/LuminosityCondAlg_test\n";
+
+ ISvcLocator* svcloc = nullptr;
+ if (!Athena_test::initGaudi("LumiBlockComps/LuminosityCondAlg_test.txt", svcloc)) {
+ return 1;
+ }
+
+ test1 (svcloc);
+ test2 (svcloc);
+ test3 (svcloc);
+ return 0;
+}
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
index 26192b9385093172b2ad5abc7f1d339d07308217..74b338bb3d5dc898ae6f5ad8579b2f2e60278380 100755
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/CMakeLists.txt
@@ -33,10 +33,6 @@ atlas_add_component( CSC_Digitization
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib GaudiKernel MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonSimData MuonSimEvent HitManagement StoreGateLib SGtests GeneratorObjects )
-atlas_add_test( CSC_DigitizationConfigNew_test
- SCRIPT test/CSC_DigitizationConfigNew_test.py
- PROPERTIES TIMEOUT 300 )
-
# Install files from the package:
atlas_install_headers( CSC_Digitization )
atlas_install_python_modules( python/*.py )
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigNew.py b/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigNew.py
index 4f45185c364d83f99d2a1f997c7f60f266726ce6..32745f4c57a0e89419bfae6637651b9a317ce89e 100644
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigNew.py
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/python/CSC_DigitizationConfigNew.py
@@ -62,8 +62,7 @@ def CSC_DigitBuilderCfg(flags, name="CSC_DigitBuilder", **kwargs):
tool = acc.popToolsAndMerge(CSC_DigitizationToolCfg(flags))
kwargs.setdefault("DigitizationTool", tool)
acc.addEventAlgo(CscDigitBuilder(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", CSC_ItemList()))
+ acc.merge(OutputStreamCfg(flags, "RDO", CSC_ItemList()))
return acc
def CSC_OverlayDigitizationToolCfg(flags, name="CSC_OverlayDigitizationTool",**kwargs):
@@ -84,7 +83,5 @@ def CSC_OverlayDigitBuilderCfg(flags, name="CSC_OverlayDigitBuilder", **kwargs):
tool = acc.popToolsAndMerge(CSC_OverlayDigitizationToolCfg(flags))
kwargs.setdefault("DigitizationTool", tool)
acc.addEventAlgo(CscDigitBuilder(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", CSC_ItemList()))
return acc
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/MDT_Digitization/CMakeLists.txt
index 8eeb3e2e1cc166492570a569e245991e5883a23d..19caffe8179550a43c51504e79fbe404147e69d1 100755
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/CMakeLists.txt
@@ -41,10 +41,6 @@ atlas_add_component( MDT_Digitization
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier xAODEventInfo GaudiKernel GeneratorObjects MdtCalibData MdtCalibSvcLib MuonCondInterface MuonReadoutGeometry MuonDigitContainer MDT_Response MuonIdHelpersLib MuonSimData MuonSimEvent HitManagement PathResolver TrkDetDescrUtils EventPrimitives )
-atlas_add_test( MDT_DigitizationConfigNew_test
- SCRIPT test/MDT_DigitizationConfigNew_test.py
- PROPERTIES TIMEOUT 600 )
-
# Install files from the package:
atlas_install_headers( MDT_Digitization )
atlas_install_python_modules( python/*.py )
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MDT_DigitizationConfigNew.py b/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MDT_DigitizationConfigNew.py
index 377f6ba2137763ccd2f3d89055b1c4ebb095511c..f14b738859ba2db6338490a3c2d2c6d2e73b33c1 100644
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MDT_DigitizationConfigNew.py
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/python/MDT_DigitizationConfigNew.py
@@ -70,8 +70,7 @@ def MDT_DigitizerCfg(flags, name="MDT_Digitizer", **kwargs):
tool = acc.popToolsAndMerge(MDT_DigitizationToolCfg(flags))
kwargs.setdefault("DigitizationTool", tool)
acc.addEventAlgo(MDT_Digitizer(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", MDT_ItemList()))
+ acc.merge(OutputStreamCfg(flags, "RDO", MDT_ItemList()))
return acc
def MDT_OverlayDigitizationToolCfg(flags, name="MDT_OverlayDigitizationTool",**kwargs):
@@ -82,7 +81,6 @@ def MDT_OverlayDigitizationToolCfg(flags, name="MDT_OverlayDigitizationTool",**k
kwargs.setdefault("GetT0FromBD", flags.Detector.Overlay)
if not flags.Detector.Overlay:
kwargs.setdefault("OutputSDOName", flags.Overlay.Legacy.EventStore + "+MDT_SDO")
- acc.setPrivateTools(MdtDigitizationTool(name, **kwargs))
return acc
def MDT_OverlayDigitizerCfg(flags, name="MDT_OverlayDigitizer", **kwargs):
@@ -91,7 +89,5 @@ def MDT_OverlayDigitizerCfg(flags, name="MDT_OverlayDigitizer", **kwargs):
tool = acc.popToolsAndMerge(MDT_OverlayDigitizationToolCfg(flags))
kwargs.setdefault("DigitizationTool", tool)
acc.addEventAlgo(MDT_Digitizer(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", MDT_ItemList()))
return acc
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
index c3343b16251e6692713aab7adc906c4c673a16f5..d9262d24237bd809d9bb7d124b17eb5f21fd52bb 100755
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/CMakeLists.txt
@@ -42,10 +42,6 @@ atlas_add_component( RPC_Digitization
INCLUDE_DIRS ${AIDA_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${HEPMC_LIBRARIES} AthenaBaseComps PileUpToolsLib xAODEventInfo GaudiKernel MuonSimData MuonSimEvent HitManagement AthenaKernel EventInfo GeneratorObjects MuonCondInterface MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib PathResolver )
-atlas_add_test( RPC_DigitizationConfigNew_test
- SCRIPT test/RPC_DigitizationConfigNew_test.py
- PROPERTIES TIMEOUT 300 )
-
# Install files from the package:
atlas_install_headers( RPC_Digitization )
atlas_install_python_modules( python/*.py )
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigNew.py b/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigNew.py
index c8cbb8b5c876189f39b9ca84654173a1c6aedf9f..f6b1bf93259eb183c58299280d999c45f895a2cc 100644
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigNew.py
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/python/RPC_DigitizationConfigNew.py
@@ -85,8 +85,7 @@ def RPC_DigitizerCfg(flags, name="RPC_Digitizer", **kwargs):
tool = acc.popToolsAndMerge(RPC_DigitizationToolCfg(flags))
kwargs.setdefault("DigitizationTool", tool)
acc.addEventAlgo(RPC_Digitizer(name,**kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", RPC_ItemList()))
+ acc.merge(OutputStreamCfg(flags, "RDO", RPC_ItemList()))
return acc
def RPC_OverlayDigitizationToolCfg(flags, name="RPC_DigitizationTool", **kwargs):
@@ -106,7 +105,5 @@ def RPC_OverlayDigitizerCfg(flags, name="RPC_OverlayDigitizer", **kwargs):
tool = acc.popToolsAndMerge(RPC_OverlayDigitizationToolCfg(flags))
kwargs.setdefault("DigitizationTool", tool)
acc.addEventAlgo(RPC_Digitizer(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", RPC_ItemList()))
return acc
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt b/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
index bc06a2f4af36cc4760c038b7347f0b3f3f3da70c..2e3b90e3c30db1c55b36016f977366d4fe9245f7 100755
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/CMakeLists.txt
@@ -39,10 +39,6 @@ atlas_add_component( TGC_Digitization
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib GeoPrimitives Identifier GaudiKernel MuonSimEvent HitManagement xAODEventInfo GeneratorObjects MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonSimData PathResolver )
-atlas_add_test( TGC_DigitizationConfigNew_test
- SCRIPT test/TGC_DigitizationConfigNew_test.py
- PROPERTIES TIMEOUT 300 )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigNew.py b/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigNew.py
index 5a4227425a830ec5030c60bf07a20ec3ab4b66e1..712d0dcdbdf969be23bd3d3afd262d419a4caa0b 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigNew.py
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/python/TGC_DigitizationConfigNew.py
@@ -49,8 +49,7 @@ def TGC_DigitizerCfg(flags, name="TGC_Digitizer", **kwargs):
tool = acc.popToolsAndMerge(TGC_DigitizationToolCfg(flags))
kwargs.setdefault("DigitizationTool", tool)
acc.addEventAlgo(TGCDigitizer(name,**kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", TGC_ItemList()))
+ acc.merge(OutputStreamCfg(flags, "RDO", TGC_ItemList()))
return acc
def TGC_OverlayDigitizationToolCfg(flags, name="TGC_OverlayDigitizationTool", **kwargs):
@@ -70,7 +69,5 @@ def TGC_OverlayDigitizerCfg(flags, name="TGC_OverlayDigitizer", **kwargs):
tool = acc.popToolsAndMerge(TGC_OverlayDigitizationToolCfg(flags))
kwargs.setdefault("DigitizationTool", tool)
acc.addEventAlgo(TGCDigitizer(name, **kwargs))
- # FIXME once OutputStreamCfg merges correctly
- #acc.merge(OutputStreamCfg(flags, "RDO", TGC_ItemList()))
return acc
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MMPrepData.h b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MMPrepData.h
index 7c9465d759a37478cadcb87b84c20fefce38b637..a3fa107956d4ee9f8caf7f44bdb91dc10ef5bf49 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MMPrepData.h
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecEvent/MuonPrepRawData/MuonPrepRawData/MMPrepData.h
@@ -81,7 +81,7 @@ namespace Muon
int time() const;
/** @brief Returns the ADC counts */
- int charge() const;
+ double charge() const;
/** @brief Returns the microTPC angle */
double angle() const;
@@ -130,7 +130,7 @@ namespace Muon
return m_time;
}
- inline int MMPrepData::charge() const
+ inline double MMPrepData::charge() const
{
return m_charge;
}
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.cxx
index 19da31e17672aa2e075fca8a4e0fb5ec637bde55..cee1f14959aca6b6457b38b7a8c8c4da25407e7b 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "MMPRDVariables.h"
@@ -8,9 +8,14 @@
#include "MuonPrepRawData/MMPrepDataContainer.h"
#include "MuonPrepRawData/MMPrepData.h"
-#include "MuonReadoutGeometry/MMReadoutElement.h"
+#include "MuonRDO/MM_RawDataContainer.h"
#include "MuonSimData/MuonSimDataCollection.h"
+
+#include "MMRDOVariables.h"
+
+#include "MuonReadoutGeometry/MMReadoutElement.h"
+
#include "TTree.h"
@@ -24,9 +29,20 @@ StatusCode MMPRDVariables::fillVariables()
CHECK( m_evtStore->retrieve(nsw_MMPrepDataContainer, m_ContainerName.c_str()) );
if(nsw_MMPrepDataContainer->size()==0) ATH_MSG_WARNING(" MM PRD Container empty ");
+
+ const Muon::MM_RawDataContainer* rdo_container = nullptr;
+ CHECK( m_evtStore->retrieve(rdo_container, "MMRDO") ); // retrieve RDOs to get information per strip since PRDs only contain ids of strips
+
+ if(rdo_container->size()==0) ATH_MSG_WARNING(" RDO Container empty ");
for(const Muon::MMPrepDataCollection* coll : *nsw_MMPrepDataContainer) {
-
+
+ const Muon::MM_RawDataCollection* rdo_coll = *rdo_container->indexFind(coll->identifyHash());
+ if(rdo_coll==0){
+ ATH_MSG_ERROR("Did not find rdo collection " << coll->identifyHash());
+ return StatusCode::FAILURE;
+ }
+ ATH_MSG_DEBUG("Found rdo_coll at "<<rdo_coll);
for (unsigned int item=0; item<coll->size(); item++) {
const Muon::MMPrepData* prd = coll->at(item);
Identifier Id = prd->identify();
@@ -74,6 +90,31 @@ StatusCode MMPRDVariables::fillVariables()
m_NSWMM_prd_localPosY->push_back(loc_pos[1]);
m_NSWMM_prd_covMatrix_1_1->push_back(cov(0,0));
+ m_NSWMM_prd_rdos_charge->push_back(std::vector<int>());
+ m_NSWMM_prd_rdos_time->push_back(std::vector<int>());
+ m_NSWMM_prd_rdos_channel->push_back(std::vector<int>());
+ m_NSWMM_prd_nRdos->push_back((prd->rdoList()).size());
+
+ for(const Identifier &id_rdo:prd->rdoList()){
+ const Muon::MM_RawData* rdo=nullptr;
+ for(auto it :*rdo_coll){if(it->identify() == id_rdo) rdo=it;}
+ if(rdo==0){
+ ATH_MSG_ERROR("Did not find rdo for identifier in rdo list");
+ return StatusCode::FAILURE;
+ }
+ m_NSWMM_prd_rdos_charge->back().push_back(rdo->charge());
+ m_NSWMM_prd_rdos_time->back().push_back(rdo->time());
+ m_NSWMM_prd_rdos_channel->back().push_back(m_MmIdHelper->channel(id_rdo));
+
+ }
+
+ m_NSWMM_prd_uTPCAngle->push_back(prd->angle());
+ m_nsw_prd_uTPCChiSqProb->push_back(prd->chisqProb());
+
+
+
+
+
m_NSWMM_nPRDs++;
}
}
@@ -84,6 +125,7 @@ StatusCode MMPRDVariables::fillVariables()
void MMPRDVariables::deleteVariables()
{
+ ATH_MSG_DEBUG("begin of deleteVariables()");
delete m_NSWMM_prd_stationName;
delete m_NSWMM_prd_stationEta;
delete m_NSWMM_prd_stationPhi;
@@ -100,8 +142,18 @@ void MMPRDVariables::deleteVariables()
delete m_NSWMM_prd_localPosY;
delete m_NSWMM_prd_covMatrix_1_1;
+ delete m_NSWMM_prd_rdos_charge;
+ delete m_NSWMM_prd_rdos_time;
+ delete m_NSWMM_prd_rdos_channel;
+ delete m_NSWMM_prd_nRdos;
+
+ delete m_NSWMM_prd_uTPCAngle;
+ delete m_nsw_prd_uTPCChiSqProb;
+
+
m_NSWMM_nPRDs = 0;
+
m_NSWMM_prd_stationName= nullptr;
m_NSWMM_prd_stationEta = nullptr;
m_NSWMM_prd_stationPhi = nullptr;
@@ -118,12 +170,23 @@ void MMPRDVariables::deleteVariables()
m_NSWMM_prd_localPosY = nullptr;
m_NSWMM_prd_covMatrix_1_1 = nullptr;
+ m_NSWMM_prd_rdos_charge=nullptr;
+ m_NSWMM_prd_rdos_time=nullptr;
+ m_NSWMM_prd_rdos_channel=nullptr;
+ m_NSWMM_prd_nRdos=nullptr;
+
+ m_NSWMM_prd_uTPCAngle=nullptr;
+ m_nsw_prd_uTPCChiSqProb=nullptr;
+
+ ATH_MSG_DEBUG("end of deleteVariables()");
+
return;
}
StatusCode MMPRDVariables::clearVariables()
{
+ ATH_MSG_DEBUG("beginninng of clearVariables()");
m_NSWMM_nPRDs = 0;
m_NSWMM_prd_stationName->clear();
m_NSWMM_prd_stationEta->clear();
@@ -141,12 +204,23 @@ StatusCode MMPRDVariables::clearVariables()
m_NSWMM_prd_localPosY->clear();
m_NSWMM_prd_covMatrix_1_1->clear();
+ m_NSWMM_prd_rdos_charge->clear();
+ m_NSWMM_prd_rdos_time->clear();
+ m_NSWMM_prd_rdos_channel->clear();
+ m_NSWMM_prd_nRdos->clear();
+ m_NSWMM_prd_uTPCAngle->clear();
+ m_nsw_prd_uTPCChiSqProb->clear();
+
+
+ ATH_MSG_DEBUG("end of clearVariables()");
+
return StatusCode::SUCCESS;
}
StatusCode MMPRDVariables::initializeVariables()
{
+ ATH_MSG_DEBUG("begin initializeVariables()");
m_NSWMM_nPRDs = 0;
m_NSWMM_prd_stationName = new std::vector<std::string>();
m_NSWMM_prd_stationEta = new std::vector<int>();
@@ -164,6 +238,17 @@ StatusCode MMPRDVariables::initializeVariables()
m_NSWMM_prd_localPosY = new std::vector<double>();
m_NSWMM_prd_covMatrix_1_1 = new std::vector<double>();
+ m_NSWMM_prd_rdos_charge = new std::vector<std::vector<int>>();
+ m_NSWMM_prd_rdos_time = new std::vector<std::vector<int>>();
+ m_NSWMM_prd_rdos_channel = new std::vector<std::vector<int>>();
+ m_NSWMM_prd_nRdos = new std::vector<int>();
+
+ m_NSWMM_prd_uTPCAngle = new std::vector<double>();
+ m_nsw_prd_uTPCChiSqProb = new std::vector<double>();
+
+
+ ATH_MSG_DEBUG("did init of vars initializeVariables()");
+
if(m_tree) {
m_tree->Branch("PRD_MM", &m_NSWMM_nPRDs, "PRDs_MM_n/i");
m_tree->Branch("PRD_MM_stationName", &m_NSWMM_prd_stationName);
@@ -182,8 +267,22 @@ StatusCode MMPRDVariables::initializeVariables()
m_tree->Branch("PRD_MM_localPosY", &m_NSWMM_prd_localPosY);
m_tree->Branch("PRD_MM_covMatrix_1_1", &m_NSWMM_prd_covMatrix_1_1);
+
+ m_tree->Branch("PRD_MM_rdos_charge", &m_NSWMM_prd_rdos_charge);
+ m_tree->Branch("PRD_MM_rdos_time", &m_NSWMM_prd_rdos_time);
+ m_tree->Branch("PRD_MM_rdos_channel", &m_NSWMM_prd_rdos_channel);
+ m_tree->Branch("PRD_MM_nRdos", &m_NSWMM_prd_nRdos);
+
+ m_tree->Branch("PRD_MM_uTPCAngle",&m_NSWMM_prd_uTPCAngle);
+ m_tree->Branch("PRD_MM_uTPCChiSqProb",&m_nsw_prd_uTPCChiSqProb);
+
+
+ ATH_MSG_DEBUG("did init of tree initializeVariables()");
+
}
+ ATH_MSG_DEBUG("after init of tree initializeVariables()");
+
return StatusCode::SUCCESS;
}
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h
index 1472f692bebd026acc08f80d54ed6b884b5194f8..f981631464c229e3d28c47ee16f58b3345e71dd1 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMPRDVariables.h
@@ -34,7 +34,13 @@ class MMPRDVariables : public ValAlgVariables
m_NSWMM_prd_globalPosZ(0),
m_NSWMM_prd_localPosX(0),
m_NSWMM_prd_localPosY(0),
- m_NSWMM_prd_covMatrix_1_1(0)
+ m_NSWMM_prd_covMatrix_1_1(0),
+ m_NSWMM_prd_rdos_charge(0),
+ m_NSWMM_prd_rdos_time(0),
+ m_NSWMM_prd_rdos_channel(0),
+ m_NSWMM_prd_nRdos(0),
+ m_NSWMM_prd_uTPCAngle(0),
+ m_nsw_prd_uTPCChiSqProb(0)
{
setHelper(idhelper);
}
@@ -79,6 +85,16 @@ class MMPRDVariables : public ValAlgVariables
std::vector<double> *m_NSWMM_prd_localPosY;
std::vector<double> *m_NSWMM_prd_covMatrix_1_1;
+ std::vector<std::vector<int>> *m_NSWMM_prd_rdos_charge;
+ std::vector<std::vector<int>> *m_NSWMM_prd_rdos_time;
+ std::vector<std::vector<int>> *m_NSWMM_prd_rdos_channel;
+ std::vector<int> *m_NSWMM_prd_nRdos;
+
+ std::vector<double>* m_NSWMM_prd_uTPCAngle;
+ std::vector<double>* m_nsw_prd_uTPCChiSqProb;
+
+
+
};
#endif // MMPRDVARIABLE_H
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.cxx
index d6180277b17e2fabaa3021ac202864d7fafa4fe9..c90e0d1443f0105170668b67926e986fe4cdc9d5 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.cxx
@@ -1,11 +1,11 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "MMSimHitVariables.h"
#include "AthenaKernel/errorcheck.h"
-#include "MuonSimEvent/GenericMuonSimHitCollection.h"
+#include "MuonSimEvent/MMSimHitCollection.h"
#include "MuonSimEvent/MM_SimIdToOfflineId.h"
#include "MuonReadoutGeometry/MMReadoutElement.h"
@@ -22,16 +22,16 @@ StatusCode MMSimHitVariables::fillVariables()
CHECK( this->clearVariables() );
- const GenericMuonSimHitCollection *nswContainer = nullptr;
+ const MMSimHitCollection *nswContainer = nullptr;
CHECK( m_evtStore->retrieve(nswContainer, m_ContainerName.c_str()) );
// Get the MicroMegas Id hit helper
MicromegasHitIdHelper* hitHelper = MicromegasHitIdHelper::GetHelper();
MM_SimIdToOfflineId simToOffline(*m_MmIdHelper);
- if(nswContainer->size()==0) ATH_MSG_WARNING(" GenericMuonSimHit empty ");
+ if(nswContainer->size()==0) ATH_MSG_WARNING(" MMSimHit empty ");
for( auto it : *nswContainer ) {
- const GenericMuonSimHit hit = it;
+ const MMSimHit hit = it;
if(hit.depositEnergy()==0.) continue; // SimHits without energy loss are not recorded.
@@ -52,19 +52,13 @@ StatusCode MMSimHitVariables::fillVariables()
m_NSWMM_hitGlobalDirectionY->push_back(globalDirection.y());
m_NSWMM_hitGlobalDirectionZ->push_back(globalDirection.z());
- const Amg::Vector3D localPosition = hit.localPosition();
- m_NSWMM_hitLocalPositionX->push_back(localPosition.x());
- m_NSWMM_hitLocalPositionY->push_back(localPosition.y());
- m_NSWMM_hitLocalPositionZ->push_back(localPosition.z());
-
m_NSWMM_particleEncoding->push_back(hit.particleEncoding());
m_NSWMM_kineticEnergy->push_back(hit.kineticEnergy());
m_NSWMM_depositEnergy->push_back(hit.depositEnergy());
- m_NSWMM_StepLength->push_back(hit.StepLength());
// Read the information about the Micro Megas hit
- int simId = hit.GenericId();
+ int simId = hit.MMId();
std::string sim_stationName = hitHelper->GetStationName(simId);
int sim_stationEta = hitHelper->GetZSector(simId);
int sim_stationPhi = hitHelper->GetPhiSector(simId);
@@ -94,7 +88,7 @@ StatusCode MMSimHitVariables::fillVariables()
// convert simHit id to offline id; make sanity checks; retrieve the associated detector element.
- Identifier offId = simToOffline.convert(hit.GenericId());
+ Identifier offId = simToOffline.convert(hit.MMId());
// sanity checks
if( !m_MmIdHelper->is_mm(offId) ){
@@ -204,8 +198,7 @@ StatusCode MMSimHitVariables::fillVariables()
ATH_MSG_DEBUG("Global hit : r " << hit.globalPosition().perp() << ", phi " << hit.globalPosition().phi() << ", z " << hit.globalPosition().z()
<< "; detEl: r " << detpos.perp() << ", phi " << detpos.phi() << ", z " << detpos.z()
<< "; surf z " << surf.center().z() << ", ml " << sim_multilayer << ", l " << sim_layer );
- ATH_MSG_DEBUG("Local hit : x " << hit.localPosition().x() << " y " << hit.localPosition().y() << " z " << hit.localPosition().z()
- << " detEl: x " << dSurface_pos.x() << " y " << dSurface_pos.y() << " z " << dSurface_pos.z());
+ ATH_MSG_DEBUG(" detEl: x " << dSurface_pos.x() << " y " << dSurface_pos.y() << " z " << dSurface_pos.z());
ATH_MSG_DEBUG("MM Fast digit: x " << fastDigitPos.x() << " y " << fastDigitPos.y()
<< ", gToL: x " << rSurface_pos.x() << " y " << rSurface_pos.y() << " z " << rSurface_pos.z() );
@@ -265,10 +258,6 @@ StatusCode MMSimHitVariables::clearVariables()
m_NSWMM_hitGlobalDirectionY->clear();
m_NSWMM_hitGlobalDirectionZ->clear();
- m_NSWMM_hitLocalPositionX->clear();
- m_NSWMM_hitLocalPositionY->clear();
- m_NSWMM_hitLocalPositionZ->clear();
-
m_NSWMM_detector_globalPositionX->clear();
m_NSWMM_detector_globalPositionY->clear();
m_NSWMM_detector_globalPositionZ->clear();
@@ -289,7 +278,6 @@ StatusCode MMSimHitVariables::clearVariables()
m_NSWMM_particleEncoding->clear();
m_NSWMM_kineticEnergy->clear();
m_NSWMM_depositEnergy->clear();
- m_NSWMM_StepLength->clear();
m_NSWMM_sim_stationName->clear();
m_NSWMM_sim_stationEta->clear();
@@ -322,10 +310,6 @@ void MMSimHitVariables::deleteVariables()
delete m_NSWMM_hitGlobalDirectionY;
delete m_NSWMM_hitGlobalDirectionZ;
- delete m_NSWMM_hitLocalPositionX;
- delete m_NSWMM_hitLocalPositionY;
- delete m_NSWMM_hitLocalPositionZ;
-
delete m_NSWMM_detector_globalPositionX;
delete m_NSWMM_detector_globalPositionY;
delete m_NSWMM_detector_globalPositionZ;
@@ -347,7 +331,6 @@ void MMSimHitVariables::deleteVariables()
delete m_NSWMM_particleEncoding;
delete m_NSWMM_kineticEnergy;
delete m_NSWMM_depositEnergy;
- delete m_NSWMM_StepLength;
delete m_NSWMM_sim_stationName;
delete m_NSWMM_sim_stationEta;
@@ -377,10 +360,6 @@ void MMSimHitVariables::deleteVariables()
m_NSWMM_hitGlobalDirectionY = nullptr;
m_NSWMM_hitGlobalDirectionZ = nullptr;
- m_NSWMM_hitLocalPositionX = nullptr;
- m_NSWMM_hitLocalPositionY = nullptr;
- m_NSWMM_hitLocalPositionZ = nullptr;
-
m_NSWMM_detector_globalPositionX = nullptr;
m_NSWMM_detector_globalPositionY = nullptr;
m_NSWMM_detector_globalPositionZ = nullptr;
@@ -401,7 +380,6 @@ void MMSimHitVariables::deleteVariables()
m_NSWMM_particleEncoding = nullptr;
m_NSWMM_kineticEnergy = nullptr;
m_NSWMM_depositEnergy = nullptr;
- m_NSWMM_StepLength = nullptr;
m_NSWMM_sim_stationName = nullptr;
m_NSWMM_sim_stationEta = nullptr;
@@ -434,10 +412,6 @@ StatusCode MMSimHitVariables::initializeVariables()
m_NSWMM_hitGlobalDirectionY = new std::vector<double>;
m_NSWMM_hitGlobalDirectionZ = new std::vector<double>;
- m_NSWMM_hitLocalPositionX = new std::vector<double>;
- m_NSWMM_hitLocalPositionY = new std::vector<double>;
- m_NSWMM_hitLocalPositionZ = new std::vector<double>;
-
m_NSWMM_detector_globalPositionX = new std::vector<double>;
m_NSWMM_detector_globalPositionY = new std::vector<double>;
m_NSWMM_detector_globalPositionZ = new std::vector<double>;
@@ -459,7 +433,6 @@ StatusCode MMSimHitVariables::initializeVariables()
m_NSWMM_particleEncoding = new std::vector<int>;
m_NSWMM_kineticEnergy = new std::vector<double>;
m_NSWMM_depositEnergy = new std::vector<double>;
- m_NSWMM_StepLength = new std::vector<double>;
m_NSWMM_sim_stationName = new std::vector<std::string>;
@@ -489,10 +462,6 @@ StatusCode MMSimHitVariables::initializeVariables()
m_tree->Branch("Hits_MM_hitGlobalDirectionY", &m_NSWMM_hitGlobalDirectionY);
m_tree->Branch("Hits_MM_hitGlobalDirectionZ", &m_NSWMM_hitGlobalDirectionZ);
- m_tree->Branch("Hits_MM_hitLocalPositionX", &m_NSWMM_hitLocalPositionX);
- m_tree->Branch("Hits_MM_hitLocalPositionY", &m_NSWMM_hitLocalPositionY);
- m_tree->Branch("Hits_MM_hitLocalPositionZ", &m_NSWMM_hitLocalPositionZ);
-
m_tree->Branch("Hits_MM_detector_globalPositionX", &m_NSWMM_detector_globalPositionX);
m_tree->Branch("Hits_MM_detector_globalPositionY", &m_NSWMM_detector_globalPositionY);
m_tree->Branch("Hits_MM_detector_globalPositionZ", &m_NSWMM_detector_globalPositionZ);
@@ -514,7 +483,6 @@ StatusCode MMSimHitVariables::initializeVariables()
m_tree->Branch("Hits_MM_particleEncoding", &m_NSWMM_particleEncoding);
m_tree->Branch("Hits_MM_kineticEnergy", &m_NSWMM_kineticEnergy);
m_tree->Branch("Hits_MM_depositEnergy", &m_NSWMM_depositEnergy);
- m_tree->Branch("Hits_MM_StepLength", &m_NSWMM_StepLength);
m_tree->Branch("Hits_MM_sim_stationName", &m_NSWMM_sim_stationName);
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
index fe084fd265f78a84090bafa4142389d1b904231d..c06b26b27ebfd52521ca929beacd1e2ab5fd0d5d 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MMSIMHITVARIABLES_H
@@ -32,9 +32,6 @@ class MMSimHitVariables : public ValAlgVariables
m_NSWMM_hitGlobalDirectionX(0),
m_NSWMM_hitGlobalDirectionY(0),
m_NSWMM_hitGlobalDirectionZ(0),
- m_NSWMM_hitLocalPositionX(0),
- m_NSWMM_hitLocalPositionY(0),
- m_NSWMM_hitLocalPositionZ(0),
m_NSWMM_detector_globalPositionX(0),
m_NSWMM_detector_globalPositionY(0),
m_NSWMM_detector_globalPositionZ(0),
@@ -51,7 +48,6 @@ class MMSimHitVariables : public ValAlgVariables
m_NSWMM_particleEncoding(0),
m_NSWMM_kineticEnergy(0),
m_NSWMM_depositEnergy(0),
- m_NSWMM_StepLength(0),
m_NSWMM_sim_stationName(0),
m_NSWMM_sim_stationEta(0),
m_NSWMM_sim_stationPhi(0),
@@ -103,10 +99,6 @@ class MMSimHitVariables : public ValAlgVariables
std::vector<double> *m_NSWMM_hitGlobalDirectionY;
std::vector<double> *m_NSWMM_hitGlobalDirectionZ;
- std::vector<double> *m_NSWMM_hitLocalPositionX;
- std::vector<double> *m_NSWMM_hitLocalPositionY;
- std::vector<double> *m_NSWMM_hitLocalPositionZ;
-
std::vector<double> *m_NSWMM_detector_globalPositionX;
std::vector<double> *m_NSWMM_detector_globalPositionY;
std::vector<double> *m_NSWMM_detector_globalPositionZ;
@@ -127,7 +119,6 @@ class MMSimHitVariables : public ValAlgVariables
std::vector<int> *m_NSWMM_particleEncoding;
std::vector<double> *m_NSWMM_kineticEnergy;
std::vector<double> *m_NSWMM_depositEnergy;
- std::vector<double> *m_NSWMM_StepLength;
std::vector<std::string> *m_NSWMM_sim_stationName;
std::vector<int> *m_NSWMM_sim_stationEta;
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
index aa116a01a9f33ec5406c3fac9f05ce3bde1dbf62..deb8b2185c01d21b68bcee19f3f2539f329cdc5d 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/NSWPRDValAlg.cxx
@@ -37,6 +37,9 @@
// Misc includes
#include "GaudiKernel/ITHistSvc.h"
+#include "EventInfo/EventInfo.h"
+#include "EventInfo/EventID.h"
+
NSWPRDValAlg::NSWPRDValAlg(const std::string& name, ISvcLocator* pSvcLocator)
: AthAlgorithm(name, pSvcLocator),
@@ -249,9 +252,16 @@ StatusCode NSWPRDValAlg::execute()
ATH_MSG_DEBUG("execute()");
// Event information
- const EventContext& context = getContext();
- m_runNumber = context.eventID().run_number();
- m_eventNumber = context.eventID().event_number();
+ const EventInfo* pevt(0);
+ if( evtStore()->retrieve(pevt).isSuccess() ) {
+ m_runNumber = pevt->event_ID()->run_number();
+ m_eventNumber = pevt->event_ID()->event_number();
+ ATH_MSG_DEBUG("Now processing event number:" << m_eventNumber << ", run number:" << m_runNumber);
+ } else {
+ ATH_MSG_WARNING("Could not retrieve event info!");
+ m_runNumber = -1;
+ m_eventNumber = -1;
+ }
if (m_doTruth) ATH_CHECK( m_TruthVar->fillVariables() );
@@ -475,7 +485,7 @@ StatusCode NSWPRDValAlg::setDataAdress (EDM_object &oData, TString branch_name)
if (branch_name.EndsWith("stationPhi")) { m_tree->SetBranchAddress(branch_name, &oData.m_stationPhi); setBranch = true; }
if (branch_name.EndsWith("multiplet")) { m_tree->SetBranchAddress(branch_name, &oData.m_multiplet); setBranch = true; }
if (branch_name.EndsWith("gas_gap")) { m_tree->SetBranchAddress(branch_name, &oData.m_gas_gap); setBranch = true; }
- if (branch_name.EndsWith("channel")) { m_tree->SetBranchAddress(branch_name, &oData.m_channel); setBranch = true; }
+ if (branch_name.EndsWith("channel") && !branch_name.Contains("rdos")) { m_tree->SetBranchAddress(branch_name, &oData.m_channel); setBranch = true; }
if (branch_name.EndsWith("channel_type")) { m_tree->SetBranchAddress(branch_name, &oData.m_channel_type); setBranch = true; }
if (setBranch) { ATH_MSG_DEBUG("Set data adress of branch " << branch_name); }
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.cxx b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.cxx
index 8d41d96e1fa0a3ab2c21cc77d4418e570ea1c3aa..c9b5e4aaf0e5d002601079877f366a55a39aea05 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.cxx
@@ -1,11 +1,11 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "sTGCSimHitVariables.h"
#include "AthenaKernel/errorcheck.h"
-#include "MuonSimEvent/GenericMuonSimHitCollection.h"
+#include "MuonSimEvent/sTGCSimHitCollection.h"
#include "MuonSimEvent/sTgcSimIdToOfflineId.h"
#include "MuonReadoutGeometry/sTgcReadoutElement.h"
@@ -18,7 +18,7 @@ StatusCode sTGCSimHitVariables::fillVariables()
CHECK( this->clearVariables() );
- const GenericMuonSimHitCollection *nswContainer = nullptr;
+ const sTGCSimHitCollection *nswContainer = nullptr;
CHECK( m_evtStore->retrieve(nswContainer, m_ContainerName.c_str()) );
ATH_MSG_DEBUG("ReadMuonSimHits: Retrieved " << nswContainer->size() << " sTGC hits!" );
@@ -27,9 +27,9 @@ StatusCode sTGCSimHitVariables::fillVariables()
sTgcHitIdHelper* hitHelper = sTgcHitIdHelper::GetHelper();
sTgcSimIdToOfflineId simToOffline (*m_sTgcIdHelper);
- if(nswContainer->size()==0) ATH_MSG_WARNING(" GenericMuonSimHit empty ");
+ if(nswContainer->size()==0) ATH_MSG_WARNING(" sTGCSimHit empty ");
for(auto it : *nswContainer) {
- const GenericMuonSimHit hit = it;
+ const sTGCSimHit hit = it;
if(hit.depositEnergy()==0.) continue; // SimHits without energy loss are not recorded.
// SimHits do not have channel type (1 is assigned as dummy value).
@@ -37,7 +37,7 @@ StatusCode sTGCSimHitVariables::fillVariables()
for( int type=0;type<=2;++type ){
// Read information about the sTGC hits; make sanity checks and printout
- int simId = hit.GenericId();
+ int simId = hit.sTGCId();
std::string sim_stationName = hitHelper->GetStationName(simId);
int sim_stationEta = hitHelper->GetZSector(simId);
int sim_stationPhi = hitHelper->GetPhiSector(simId);
@@ -69,7 +69,7 @@ StatusCode sTGCSimHitVariables::fillVariables()
// convert simHit id to offline id; make sanity checks; retrieve the associated detector element.
- Identifier offId = simToOffline.convert(hit.GenericId());
+ Identifier offId = simToOffline.convert(hit.sTGCId());
std::string stName = m_sTgcIdHelper->stationNameString(m_sTgcIdHelper->stationName(offId));
int off_stationEta = m_sTgcIdHelper->stationEta(offId);
@@ -121,15 +121,8 @@ StatusCode sTGCSimHitVariables::fillVariables()
m_NSWsTGC_hitGlobalDirectionY->push_back(globalDirection.y());
m_NSWsTGC_hitGlobalDirectionZ->push_back(globalDirection.z());
- const Amg::Vector3D localPosition = hit.localPosition();
- m_NSWsTGC_hitLocalPositionX->push_back(localPosition.x());
- m_NSWsTGC_hitLocalPositionY->push_back(localPosition.y());
- m_NSWsTGC_hitLocalPositionZ->push_back(localPosition.z());
-
m_NSWsTGC_particleEncoding->push_back(hit.particleEncoding());
- m_NSWsTGC_kineticEnergy->push_back(hit.kineticEnergy());
m_NSWsTGC_depositEnergy->push_back(hit.depositEnergy());
- m_NSWsTGC_StepLength->push_back(hit.StepLength());
// Fill Ntuple with SimId data
@@ -198,8 +191,7 @@ StatusCode sTGCSimHitVariables::fillVariables()
<< "; detEl: r " << detpos.perp() << ", phi " << detpos.phi() << ", z " << detpos.z()
<< "; surf z " << surf.center().z() << ", ml " << sim_multilayer << ", l " << sim_layer );
- ATH_MSG_DEBUG("sTGC Local hit : x " << hit.localPosition().x() << " y " << hit.localPosition().y() << " z " << hit.localPosition().z()
- << " detEl: x " << dSurface_pos.x() << " y " << dSurface_pos.y() << " z " << dSurface_pos.z());
+ ATH_MSG_DEBUG(" detEl: x " << dSurface_pos.x() << " y " << dSurface_pos.y() << " z " << dSurface_pos.z());
ATH_MSG_DEBUG("sTGC Fast digit: x " << fastDigitPos.x() << " y " << fastDigitPos.y()
<< ", gToL: x " << rSurface_pos.x() << " y " << rSurface_pos.y() << " z " << rSurface_pos.z() );
@@ -247,11 +239,7 @@ StatusCode sTGCSimHitVariables::fillVariables()
<< ", Global X sTGC = " << globalPosition.x()
<< ", Global Y sTGC = " << globalPosition.y()
<< ", Global Z sTGC = " << globalPosition.z()
- << ", Local X sTGC = " << localPosition.x()
- << ", Local Y sTGC = " << localPosition.y()
- << ", Local Z sTGC = " << localPosition.z()
<< ", time = " << hit.globalTime()
- << ", step length = " << hit.StepLength() );
*/
m_NSWsTGC_nSimHits++;
}
@@ -277,10 +265,6 @@ StatusCode sTGCSimHitVariables::clearVariables()
m_NSWsTGC_hitGlobalDirectionY->clear();
m_NSWsTGC_hitGlobalDirectionZ->clear();
- m_NSWsTGC_hitLocalPositionX->clear();
- m_NSWsTGC_hitLocalPositionY->clear();
- m_NSWsTGC_hitLocalPositionZ->clear();
-
m_NSWsTGC_detector_globalPositionX->clear();
m_NSWsTGC_detector_globalPositionY->clear();
m_NSWsTGC_detector_globalPositionZ->clear();
@@ -300,9 +284,7 @@ StatusCode sTGCSimHitVariables::clearVariables()
m_NSWsTGC_particleEncoding->clear();
- m_NSWsTGC_kineticEnergy->clear();
m_NSWsTGC_depositEnergy->clear();
- m_NSWsTGC_StepLength->clear();
m_NSWsTGC_sim_stationName->clear();
@@ -341,10 +323,6 @@ void sTGCSimHitVariables::deleteVariables()
delete m_NSWsTGC_hitGlobalDirectionY;
delete m_NSWsTGC_hitGlobalDirectionZ;
- delete m_NSWsTGC_hitLocalPositionX;
- delete m_NSWsTGC_hitLocalPositionY;
- delete m_NSWsTGC_hitLocalPositionZ;
-
delete m_NSWsTGC_detector_globalPositionX;
delete m_NSWsTGC_detector_globalPositionY;
delete m_NSWsTGC_detector_globalPositionZ;
@@ -363,9 +341,7 @@ void sTGCSimHitVariables::deleteVariables()
delete m_NSWsTGC_FastDigitRsurfacePositionY;
delete m_NSWsTGC_particleEncoding;
- delete m_NSWsTGC_kineticEnergy;
delete m_NSWsTGC_depositEnergy;
- delete m_NSWsTGC_StepLength;
delete m_NSWsTGC_sim_stationName;
delete m_NSWsTGC_sim_stationEta;
@@ -402,10 +378,6 @@ void sTGCSimHitVariables::deleteVariables()
m_NSWsTGC_hitGlobalDirectionY = nullptr;
m_NSWsTGC_hitGlobalDirectionZ = nullptr;
- m_NSWsTGC_hitLocalPositionX = nullptr;
- m_NSWsTGC_hitLocalPositionY = nullptr;
- m_NSWsTGC_hitLocalPositionZ = nullptr;
-
m_NSWsTGC_detector_globalPositionX = nullptr;
m_NSWsTGC_detector_globalPositionY = nullptr;
m_NSWsTGC_detector_globalPositionZ = nullptr;
@@ -424,9 +396,7 @@ void sTGCSimHitVariables::deleteVariables()
m_NSWsTGC_FastDigitRsurfacePositionY = nullptr;
m_NSWsTGC_particleEncoding = nullptr;
- m_NSWsTGC_kineticEnergy = nullptr;
m_NSWsTGC_depositEnergy = nullptr;
- m_NSWsTGC_StepLength = nullptr;
m_NSWsTGC_sim_stationName =nullptr;
m_NSWsTGC_sim_stationEta=nullptr;
@@ -466,10 +436,6 @@ StatusCode sTGCSimHitVariables::initializeVariables()
m_NSWsTGC_hitGlobalDirectionY = new std::vector<double>;
m_NSWsTGC_hitGlobalDirectionZ = new std::vector<double>;
- m_NSWsTGC_hitLocalPositionX = new std::vector<double>;
- m_NSWsTGC_hitLocalPositionY = new std::vector<double>;
- m_NSWsTGC_hitLocalPositionZ = new std::vector<double>;
-
m_NSWsTGC_detector_globalPositionX = new std::vector<double>;
m_NSWsTGC_detector_globalPositionY = new std::vector<double>;
m_NSWsTGC_detector_globalPositionZ = new std::vector<double>;
@@ -489,9 +455,7 @@ StatusCode sTGCSimHitVariables::initializeVariables()
m_NSWsTGC_particleEncoding = new std::vector<int>;
- m_NSWsTGC_kineticEnergy = new std::vector<double>;
m_NSWsTGC_depositEnergy = new std::vector<double>;
- m_NSWsTGC_StepLength = new std::vector<double>;
m_NSWsTGC_sim_stationName = new std::vector<std::string>;
m_NSWsTGC_wedgeId = new std::vector<int>;
@@ -527,10 +491,6 @@ StatusCode sTGCSimHitVariables::initializeVariables()
m_tree->Branch("Hits_sTGC_hitGlobalDirectionY", &m_NSWsTGC_hitGlobalDirectionY);
m_tree->Branch("Hits_sTGC_hitGlobalDirectionZ", &m_NSWsTGC_hitGlobalDirectionZ);
- m_tree->Branch("Hits_sTGC_hitLocalPositionX", &m_NSWsTGC_hitLocalPositionX);
- m_tree->Branch("Hits_sTGC_hitLocalPositionY", &m_NSWsTGC_hitLocalPositionY);
- m_tree->Branch("Hits_sTGC_hitLocalPositionZ", &m_NSWsTGC_hitLocalPositionZ);
-
m_tree->Branch("Hits_sTGC_detector_globalPositionX", &m_NSWsTGC_detector_globalPositionX);
m_tree->Branch("Hits_sTGC_detector_globalPositionY", &m_NSWsTGC_detector_globalPositionY);
m_tree->Branch("Hits_sTGC_detector_globalPositionZ", &m_NSWsTGC_detector_globalPositionZ);
@@ -550,9 +510,7 @@ StatusCode sTGCSimHitVariables::initializeVariables()
m_tree->Branch("Hits_sTGC_particleEncoding", &m_NSWsTGC_particleEncoding);
- m_tree->Branch("Hits_sTGC_kineticEnergy", &m_NSWsTGC_kineticEnergy);
m_tree->Branch("Hits_sTGC_depositEnergy", &m_NSWsTGC_depositEnergy);
- m_tree->Branch("Hits_sTGC_StepLength", &m_NSWsTGC_StepLength);
m_tree->Branch("Hits_sTGC_sim_stationName", &m_NSWsTGC_sim_stationName);
m_tree->Branch("Hits_sTGC_wedgeId", &m_NSWsTGC_wedgeId);
diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
index 2e36014ef047720d4bf7743bafb574b05cd9769f..e0d771a061000523359b5e0fce3a370618f34871 100644
--- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
+++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef STGCSIMHITVARIABLES_H
@@ -32,9 +32,6 @@ class sTGCSimHitVariables : public ValAlgVariables
m_NSWsTGC_hitGlobalDirectionX(0),
m_NSWsTGC_hitGlobalDirectionY(0),
m_NSWsTGC_hitGlobalDirectionZ(0),
- m_NSWsTGC_hitLocalPositionX(0),
- m_NSWsTGC_hitLocalPositionY(0),
- m_NSWsTGC_hitLocalPositionZ(0),
m_NSWsTGC_detector_globalPositionX(0),
m_NSWsTGC_detector_globalPositionY(0),
m_NSWsTGC_detector_globalPositionZ(0),
@@ -49,9 +46,7 @@ class sTGCSimHitVariables : public ValAlgVariables
m_NSWsTGC_FastDigitRsurfacePositionX(0),
m_NSWsTGC_FastDigitRsurfacePositionY(0),
m_NSWsTGC_particleEncoding(0),
- m_NSWsTGC_kineticEnergy(0),
m_NSWsTGC_depositEnergy(0),
- m_NSWsTGC_StepLength(0),
m_NSWsTGC_sim_stationName(0),
m_NSWsTGC_wedgeId(0),
m_NSWsTGC_wedgeType(0),
@@ -111,10 +106,6 @@ class sTGCSimHitVariables : public ValAlgVariables
std::vector<double> *m_NSWsTGC_hitGlobalDirectionY;
std::vector<double> *m_NSWsTGC_hitGlobalDirectionZ;
- std::vector<double> *m_NSWsTGC_hitLocalPositionX;
- std::vector<double> *m_NSWsTGC_hitLocalPositionY;
- std::vector<double> *m_NSWsTGC_hitLocalPositionZ;
-
std::vector<double> *m_NSWsTGC_detector_globalPositionX;
std::vector<double> *m_NSWsTGC_detector_globalPositionY;
std::vector<double> *m_NSWsTGC_detector_globalPositionZ;
@@ -133,9 +124,7 @@ class sTGCSimHitVariables : public ValAlgVariables
std::vector<double> *m_NSWsTGC_FastDigitRsurfacePositionY;
std::vector<int> *m_NSWsTGC_particleEncoding;
- std::vector<double> *m_NSWsTGC_kineticEnergy;
std::vector<double> *m_NSWsTGC_depositEnergy;
- std::vector<double> *m_NSWsTGC_StepLength;
std::vector<std::string> *m_NSWsTGC_sim_stationName;
std::vector<int> *m_NSWsTGC_wedgeId; // large=0, small=1
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py b/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py
index 6a85f284dc2be85606b2f4cc46de1ded32d54a04..299a1d82a0bc6786276d2484f1276d35a832e852 100755
--- a/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py
@@ -86,7 +86,15 @@ class ThinNegativeEnergyNeutralPFOs(JobProperty):
statusOn=True
allowedTypes=['bool']
StoredValue=True
-
+
+class ThinInDetForwardTrackParticles(JobProperty):
+ """ If True, add ThinInDetForwardTrackParticles
+ """
+ statusOn=True
+ allowedTypes=['bool']
+ StoredValue=False
+
+
class Muon(JobProperty):
""" If True, add Muon
"""
@@ -302,6 +310,7 @@ _list_AOD=[ \
ThinGeantTruth, \
ThinNegativeEnergyCaloClusters, \
ThinNegativeEnergyNeutralPFOs, \
+ ThinInDetForwardTrackParticles, \
Muon,MuonTrackSlimmer, \
Tau,TauTrackSlimmer, \
TrackParticleSlimmer, TrackParticleLastHitAndPerigeeSlimmer, \
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinInDetForwardTrackParticles.py b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinInDetForwardTrackParticles.py
new file mode 100644
index 0000000000000000000000000000000000000000..41822818a31b0e9f5f89c80af63f22fcbf61c868
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinInDetForwardTrackParticles.py
@@ -0,0 +1,26 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from RecExConfig.Configured import Configured
+from AthenaCommon.Logging import logging
+
+class ThinInDetForwardTrackParticles(Configured):
+
+ def configure(self):
+ mlog = logging.getLogger ('ThinInDetForwardTrackParticles.py::configure:')
+ mlog.info('entering')
+ try:
+ from ThinningUtils.ThinningUtilsConf import ThinInDetForwardTrackParticlesAlg
+ theInDetFwdThinner = ThinInDetForwardTrackParticlesAlg(
+ "ThinInDetForwardTrackParticlesAlg",
+ ThinInDetForwardTrackParticles = True
+ )
+ print theInDetFwdThinner
+ except Exception:
+ mlog.error("could not get handle to ThinInDetForwardTrackParticlesAlg")
+ print traceback.format_exc()
+ return False
+ mlog.info("now adding to topSequence")
+ from AthenaCommon.AlgSequence import AlgSequence
+ topSequence = AlgSequence()
+ topSequence += theInDetFwdThinner
+ return True
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..3b44c0cc53030304ca7baca632e4dfaec1a3caa4
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.cxx
@@ -0,0 +1,166 @@
+///////////////////////// -*- C++ -*- /////////////////////////////
+
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+// ThinInDetForwardTrackParticlesAlg.cxx
+// Author: James Catmore <James.Catmore@cern.ch>
+// Uses thinning service to remove unwanted all InDetForwardTrackParticles
+// that are not associated with Muons.
+// Unlike some other algs in this package, no tool is used to select the
+// objects for thinning - everything is done in this one class.
+// Expression evaluation is also not used.
+///////////////////////////////////////////////////////////////////
+
+// EventUtils includes
+#include "ThinInDetForwardTrackParticlesAlg.h"
+#include "xAODTracking/TrackParticleContainer.h"
+#include "xAODMuon/MuonContainer.h"
+
+// STL includes
+#include <algorithm>
+
+// FrameWork includes
+#include "GaudiKernel/Property.h"
+#include "GaudiKernel/IJobOptionsSvc.h"
+
+///////////////////////////////////////////////////////////////////
+// Public methods:
+///////////////////////////////////////////////////////////////////
+
+// Constructors
+////////////////
+ThinInDetForwardTrackParticlesAlg::ThinInDetForwardTrackParticlesAlg( const std::string& name,
+ ISvcLocator* pSvcLocator ) :
+::AthAlgorithm( name, pSvcLocator ),
+m_thinningSvc( "ThinningSvc/ThinningSvc", name ),
+m_doThinning(true),
+m_nEventsProcessed(0),
+m_nTracksProcessed(0),
+m_nTracksThinned(0)
+{
+
+ declareProperty("ThinningSvc", m_thinningSvc,
+ "The ThinningSvc instance for a particular output stream" );
+
+ declareProperty("ThinInDetForwardTrackParticles", m_doThinning,
+ "Should the InDetForwardTrackParticles thinning be run?");
+
+}
+
+// Destructor
+///////////////
+ThinInDetForwardTrackParticlesAlg::~ThinInDetForwardTrackParticlesAlg()
+{}
+
+// Athena Algorithm's Hooks
+////////////////////////////
+StatusCode ThinInDetForwardTrackParticlesAlg::initialize()
+{
+ ATH_MSG_DEBUG ("Initializing " << name() << "...");
+
+ // Print out the used configuration
+ ATH_MSG_DEBUG ( " using = " << m_thinningSvc );
+
+ // Is truth thinning required?
+ if (!m_doThinning) {
+ ATH_MSG_INFO("InDetForwardTrackParticles thinning not required");
+ } else {
+ ATH_MSG_INFO("InDetForwardTrackParticles will be thinned");
+ }
+
+ // Initialize the counters to zero
+ m_nEventsProcessed = 0;
+ m_nMuons = 0;
+ m_nSiFwdMuons = 0;
+ m_nSiFwdAssoc = 0;
+ m_nTracksProcessed = 0;
+ m_nTracksThinned = 0;
+
+ ATH_MSG_DEBUG ( "==> done with initialize " << name() << "..." );
+
+ return StatusCode::SUCCESS;
+}
+
+
+
+StatusCode ThinInDetForwardTrackParticlesAlg::finalize()
+{
+ ATH_MSG_DEBUG ("Finalizing " << name() << "...");
+ ATH_MSG_INFO("Processed " << m_nEventsProcessed << " events containing: ");
+ ATH_MSG_INFO(" " << m_nTracksProcessed << " InDetForwardTrackParticles");
+ ATH_MSG_INFO(" " << m_nMuons << " muons of which " << m_nSiFwdMuons << " were SiliconAssociatedForward muons");
+ ATH_MSG_INFO(" " << m_nSiFwdAssoc << " of the SiliconAssociatedForward muons were associated with InDetForwardTrackParticles");
+ ATH_MSG_INFO("Removed " << m_nTracksThinned << " InDetForwardTrackParticles");
+ return StatusCode::SUCCESS;
+}
+
+
+
+StatusCode ThinInDetForwardTrackParticlesAlg::execute()
+{
+ // Increase the event counter
+ ++m_nEventsProcessed;
+
+ // Is truth thinning required?
+ if (!m_doThinning) {
+ return StatusCode::SUCCESS;
+ }
+
+ // Retrieve InDetForwardTrackParticles and Muons containers
+ const xAOD::TrackParticleContainer* tracks(0);
+ const xAOD::MuonContainer* muons(0);
+ if (evtStore()->contains<xAOD::TrackParticleContainer>("InDetForwardTrackParticles")) {
+ CHECK( evtStore()->retrieve( tracks , "InDetForwardTrackParticles" ) );
+ } else {
+ ATH_MSG_FATAL("No InDetForwardTrackParticles found.");
+ return StatusCode::FAILURE;
+ }
+ if (evtStore()->contains<xAOD::MuonContainer>("Muons")) {
+ CHECK( evtStore()->retrieve( muons , "Muons" ) );
+ } else {
+ ATH_MSG_FATAL("No Muons found");
+ return StatusCode::FAILURE;
+ }
+
+ // Set up mask and set the main counters
+ std::vector<bool> trackMask;
+ unsigned int nTracks = tracks->size();
+ m_nTracksProcessed += nTracks;
+ trackMask.assign(nTracks,false);
+ m_nMuons += muons->size();
+
+ // Loop over the muons. Identify which are SiliconAssociatedForwardMuon.
+ // Get their associated inner detector track. Find that track in the InDetForwardTrackParticles.
+ // Set the mask element.
+ if (muons!=nullptr) {
+ for (auto muon : *muons) {
+ if (muon->muonType()==xAOD::Muon::SiliconAssociatedForwardMuon) {
+ ++m_nSiFwdMuons;
+ const xAOD::TrackParticle* muTrk(nullptr);
+ if (muon->inDetTrackParticleLink().isValid()) muTrk = *(muon->inDetTrackParticleLink());
+ if (muTrk!=nullptr) {
+ auto search = std::find(tracks->begin(), tracks->end(), muTrk);
+ if (search != tracks->end()) {++m_nSiFwdAssoc; trackMask[(*search)->index()] = true;}
+ }
+ }
+ }
+ }
+
+ // Increment counters
+ for (unsigned int i=0; i<nTracks; ++i) {
+ if (trackMask[i]==false) ++m_nTracksThinned;
+ }
+
+ // Apply masks to thinning service
+ if (m_thinningSvc->filter(*tracks, trackMask, IThinningSvc::Operator::Or).isFailure()) {
+ ATH_MSG_ERROR("Application of thinning service failed for InDetForwardTrackParticles! ");
+ return StatusCode::FAILURE;
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+
+
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.h b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..4e86efaf9221d88842fb3ab143b47ac9fbcdd87a
--- /dev/null
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/ThinInDetForwardTrackParticlesAlg.h
@@ -0,0 +1,63 @@
+///////////////////////// -*- C++ -*- /////////////////////////////
+
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+
+#ifndef THINNINGUTILS_ThinInDetForwardTrackParticlesAlg_H
+#define THINNINGUTILS_ThinInDetForwardTrackParticlesAlg_H 1
+
+/**
+ @class ThinInDetForwardTrackParticlesAlg
+*/
+
+
+// STL includes
+#include <string>
+
+// FrameWork includes
+#include "GaudiKernel/ToolHandle.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaKernel/IThinningSvc.h"
+
+class ThinInDetForwardTrackParticlesAlg
+: public ::AthAlgorithm
+{
+public:
+
+ /// Constructor with parameters:
+ ThinInDetForwardTrackParticlesAlg( const std::string& name, ISvcLocator* pSvcLocator );
+
+ /// Destructor:
+ virtual ~ThinInDetForwardTrackParticlesAlg();
+
+ /// Athena algorithm's initalize hook
+ virtual StatusCode initialize();
+
+ /// Athena algorithm's execute hook
+ virtual StatusCode execute();
+
+ /// Athena algorithm's finalize hook
+ virtual StatusCode finalize();
+
+private:
+
+ /// Pointer to IThinningSvc
+ ServiceHandle<IThinningSvc> m_thinningSvc;
+
+ /// Should the thinning run?
+ bool m_doThinning;
+
+ /// Counters
+ unsigned long m_nEventsProcessed;
+ unsigned long m_nTracksProcessed;
+ unsigned long m_nTracksThinned;
+ unsigned long m_nMuons;
+ unsigned long m_nSiFwdMuons;
+ unsigned long m_nSiFwdAssoc;
+};
+
+
+#endif //> !THINNINGUTILS_ThinInDetForwardTrackParticlesAlg_H
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
index 5c7362fd1530d5fabf20a5d519f8f4a04b3046d7..5b81a018a0250d48b4a549888cc657fb9f59c7dd 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/src/components/ThinningUtils_entries.cxx
@@ -5,6 +5,7 @@
#include "../ThinGeantTruthAlg.h"
#include "../ThinNegativeEnergyCaloClustersAlg.h"
#include "../ThinNegativeEnergyNeutralPFOsAlg.h"
+#include "../ThinInDetForwardTrackParticlesAlg.h"
// AthAnalysisBase doesn't know about calo cells (geometry would be needed)
#ifndef XAOD_ANALYSIS
#include "../ThinCaloCellsTool.h"
@@ -15,6 +16,7 @@
#include "../ThinTrackParticlesAlg.h"
#include "../ThinTrackParticlesTool.h"
+DECLARE_COMPONENT( ThinInDetForwardTrackParticlesAlg )
DECLARE_COMPONENT( ThinGeantTruthAlg )
DECLARE_COMPONENT( ThinNegativeEnergyCaloClustersAlg )
DECLARE_COMPONENT( ThinNegativeEnergyNeutralPFOsAlg )
@@ -31,4 +33,3 @@ DECLARE_COMPONENT( ThinCaloClustersAlg )
DECLARE_COMPONENT( ThinCaloClustersTool )
DECLARE_COMPONENT( ThinTrackParticlesAlg )
DECLARE_COMPONENT( ThinTrackParticlesTool )
-
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgElectronIsEMSelectorsConfig.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgElectronIsEMSelectorsConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..0263ac6a9edbe79115a7dc8b548539ce664dfbe9
--- /dev/null
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgElectronIsEMSelectorsConfig.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+__doc__ = "Configure the AsgElectronIsEMSelector with the quality cuts and allow for (re-)setting of all provided cuts."
+
+import logging
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+# Import the needed stuff specific to the ElectronPhotonSelectorTools
+from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgElectronIsEMSelector
+from ElectronPhotonSelectorTools.ElectronIsEMSelectorMapping import ElectronIsEMMap, electronPIDmenu
+
+
+def AsgElectronIsEMSelectorsCfg(flags, name, quality, menu=electronPIDmenu.menuDC14):
+
+ acc = ComponentAccumulator()
+
+ mlog = logging.getLogger('AsgElectronIsEMSelectorsCfg')
+
+ try:
+ ntuple = ElectronIsEMMap(quality, menu)
+ mlog.debug('ntuple: %s', ntuple)
+ except KeyError:
+ mlog.error('Electron quality not found. Please use an egammaIDQuality (ElectronPhotonSelectorTools/egammaPIDdefs.h).This function only supports standard electron IDs, and not photon or forward IDs')
+ raise
+
+ # Create and instance of the tool
+ tool = AsgElectronIsEMSelector(name)
+
+ # Call the function and configure it with the standard configuration
+ ntuple[1](tool)
+ tool.isEMMask = ntuple[0]
+
+ mlog.debug('isEMMask: %x', tool.isEMMask)
+
+ acc.setPrivateTools(tool)
+ return acc
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgElectronLikelihoodToolsConfig.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgElectronLikelihoodToolsConfig.py
new file mode 100755
index 0000000000000000000000000000000000000000..2c6e71f375bdeb68200b4478bdb19c5351081c68
--- /dev/null
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgElectronLikelihoodToolsConfig.py
@@ -0,0 +1,33 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+__doc__ = " Configure the AsgElectronLikelihoodTool with the quality cuts and allow for (re-)setting of all provided cuts."
+
+import logging
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+# Import the needed stuff specific to the ElectronPhotonSelectorTools
+from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgElectronLikelihoodTool
+from ElectronPhotonSelectorTools.ElectronLikelihoodToolMapping import ElectronLikelihoodMap, electronLHmenu
+
+
+def AsgElectronLikelihoodToolCfg(flag, name, quality, menu=electronLHmenu.offlineMC16):
+
+ acc = ComponentAccumulator()
+
+ mlog = logging.getLogger('AsgElectronLikelihoodToolCfg')
+
+ try:
+ ntuple = ElectronLikelihoodMap(quality, menu)
+ mlog.debug('ntuple: %s', ntuple)
+ except KeyError:
+ mlog.error("ElectronLH quality not found. Please use an egammaIDQuality (ElectronPhotonSelectorTools/egammaPIDdefs.h). This function only supports standard electronLH IDs, and not standard electron IDs or photon or forward IDs")
+ raise
+
+ # Create an instance of the tool
+ tool = AsgElectronLikelihoodTool(name)
+
+ # Call the function and configure it with the standard configuration
+ ntuple[1](tool)
+
+ acc.setPrivateTools(tool)
+ return acc
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgForwardElectronIsEMSelectorsConfig.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgForwardElectronIsEMSelectorsConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..b1e6c456769806f88068f48358294ba0c9dd7cc0
--- /dev/null
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgForwardElectronIsEMSelectorsConfig.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+__doc__ = "Configure the AsgForwardElectronIsEMSelector with the quality cuts and allow for (re-)setting of all provided cuts."
+
+import logging
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+# Import the needed stuff specific to the ElectronPhotonSelectorTools
+from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgForwardElectronIsEMSelector
+from ElectronPhotonSelectorTools.ForwardElectronIsEMSelectorMapping import ForwardElectronIsEMMap, forwardelectronPIDmenu
+
+
+def AsgForwardElectronIsEMSelectorCfg(flags, name, quality, menu=forwardelectronPIDmenu.menuMC15):
+
+ acc = ComponentAccumulator()
+
+ mlog = logging.getLogger('AsgForwardElectronIsEMSelectorCfg')
+
+ try:
+ ntuple = ForwardElectronIsEMMap(quality, menu)
+ mlog.debug('ntuple: %s', ntuple)
+ except KeyError:
+ mlog.error("Fwd Electron quality not found. Please use an egammaIDQuality (ElectronPhotonSelectorTools/egammaPIDdefs.h). This function only supports forward IDs, and not photon or standard electron IDs")
+ raise
+
+ # Create and instance of the tool
+ tool = AsgForwardElectronIsEMSelector(name)
+
+ # Call the function and configure it with the standard configuration
+ ntuple[1](tool)
+ tool.isEMMask = ntuple[0]
+
+ mlog.debug('isEMMask: %x', tool.isEMMask)
+
+ acc.setPrivateTools(tool)
+ return acc
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgPhotonIsEMSelectorsConfig.py b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgPhotonIsEMSelectorsConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..1a9b3a234fc9bd2ff80704ce3e5cf4c471c4b11c
--- /dev/null
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/python/AsgPhotonIsEMSelectorsConfig.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+__doc__ = "Configure the AsgPhotonIsEMSelector with the quality cuts and allow for (re-)setting of all provided cuts."
+
+import logging
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+
+# Import the needed stuff specific to the PhotonPhotonSelectorTools
+from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgPhotonIsEMSelector
+from ElectronPhotonSelectorTools.PhotonIsEMSelectorMapping import PhotonIsEMMap, photonPIDmenu
+
+
+def AsgPhotonIsEMSelectorCfg(flags, name, quality, menu=photonPIDmenu.menuDC14):
+
+ acc = ComponentAccumulator()
+
+ mlog = logging.getLogger('AsgPhotonIsEMSelectorCfg')
+
+ try:
+ ntuple = PhotonIsEMMap(quality, menu)
+ mlog.debug('ntuple: %s', ntuple)
+ except KeyError:
+ mlog.error("Photon quality not found. Please use an egammaIDQuality (ElectronPhotonSelectorTools/egammaPIDdefs.h). This function only supports standard photon IDs, and not electron IDs or forward IDs")
+ raise
+
+ # Create and instance of the tool
+ tool = AsgPhotonIsEMSelector(name)
+
+ # # Call the function and configure it with the standard configuration
+ ntuple[1](tool)
+ tool.isEMMask = ntuple[0]
+
+ mlog.debug('isEMMask: %x', tool.isEMMask)
+
+ acc.setPrivateTools(tool)
+ return acc
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/CMakeLists.txt b/PhysicsAnalysis/PrimaryDPDMaker/CMakeLists.txt
index 94a85c4f67d3a7f11a9e3873807f275f17b2c2c7..103934131262b7c2634838dea1d4b23d8524f424 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/PrimaryDPDMaker/CMakeLists.txt
@@ -35,6 +35,7 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
LArCalorimeter/LArRecEvent
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
+ PhysicsAnalysis/MuonID/MuonSelectorTools
Reconstruction/Jet/JetEvent
Reconstruction/MuonIdentification/muonEvent
Reconstruction/egamma/egammaEvent
@@ -60,18 +61,18 @@ atlas_add_library( PrimaryDPDMakerLib
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloEvent AthenaBaseComps AthenaKernel AthLinks AthContainers IRegionSelector Identifier EventKernel GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkTrack TrkToolInterfaces StoreGateLib SGtests
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} RoiDescriptor FourMom FourMomUtils NavFourMom xAODEventInfo xAODMuon xAODTracking InDetRIO_OnTrack LArRecEvent AnalysisTriggerEvent JetEvent muonEvent egammaEvent tauEvent TileEvent TileIdentifier TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack TrkTrackSummary VxVertex )
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} RoiDescriptor FourMom FourMomUtils NavFourMom xAODEventInfo xAODMuon xAODTracking InDetRIO_OnTrack LArRecEvent AnalysisTriggerEvent MuonSelectorToolsLib JetEvent muonEvent egammaEvent tauEvent TileEvent TileIdentifier TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack TrkTrackSummary VxVertex )
atlas_add_component( PrimaryDPDMaker
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaBaseComps AthenaKernel AthLinks AthContainers StoreGateLib SGtests IRegionSelector Identifier EventKernel GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkTrack TrkToolInterfaces RoiDescriptor FourMom FourMomUtils NavFourMom xAODEventInfo xAODMuon xAODTracking InDetRIO_OnTrack LArRecEvent AnalysisTriggerEvent JetEvent muonEvent egammaEvent tauEvent TileEvent TileIdentifier TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack TrkTrackSummary VxVertex PrimaryDPDMakerLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaBaseComps AthenaKernel AthLinks AthContainers StoreGateLib SGtests IRegionSelector Identifier EventKernel GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkTrack TrkToolInterfaces RoiDescriptor FourMom FourMomUtils NavFourMom xAODEventInfo xAODMuon xAODTracking InDetRIO_OnTrack LArRecEvent AnalysisTriggerEvent MuonSelectorToolsLib JetEvent muonEvent egammaEvent tauEvent TileEvent TileIdentifier TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack TrkTrackSummary VxVertex PrimaryDPDMakerLib )
atlas_add_dictionary( PrimaryDPDMakerDict
PrimaryDPDMaker/PrimaryDPDMakerDict.h
PrimaryDPDMaker/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaBaseComps AthenaKernel AthLinks AthContainers StoreGateLib SGtests IRegionSelector Identifier EventKernel GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkTrack TrkToolInterfaces RoiDescriptor FourMom FourMomUtils NavFourMom xAODEventInfo xAODMuon xAODTracking InDetRIO_OnTrack LArRecEvent AnalysisTriggerEvent JetEvent muonEvent egammaEvent tauEvent TileEvent TileIdentifier TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack TrkTrackSummary VxVertex PrimaryDPDMakerLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloEvent AthenaBaseComps AthenaKernel AthLinks AthContainers StoreGateLib SGtests IRegionSelector Identifier EventKernel GaudiKernel InDetIdentifier InDetReadoutGeometry InDetPrepRawData Particle TrkTrack TrkToolInterfaces RoiDescriptor FourMom FourMomUtils NavFourMom xAODEventInfo xAODMuon xAODTracking InDetRIO_OnTrack LArRecEvent AnalysisTriggerEvent MuonSelectorToolsLib JetEvent muonEvent egammaEvent tauEvent TileEvent TileIdentifier TrkParameters TrkParticleBase TrkPseudoMeasurementOnTrack TrkTrackSummary VxVertex PrimaryDPDMakerLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/PrimaryDPDMaker/DRAW_ZMUMUSkimmingTool.h b/PhysicsAnalysis/PrimaryDPDMaker/PrimaryDPDMaker/DRAW_ZMUMUSkimmingTool.h
new file mode 100644
index 0000000000000000000000000000000000000000..9092750caa730b84cfef4dff0d064178791ca742
--- /dev/null
+++ b/PhysicsAnalysis/PrimaryDPDMaker/PrimaryDPDMaker/DRAW_ZMUMUSkimmingTool.h
@@ -0,0 +1,62 @@
+/*
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+*/
+
+///////////////////////////////////////////////////////////////////
+// DRAW_ZMUMUSkimmingTool.h, (c) ATLAS Detector software
+///////////////////////////////////////////////////////////////////
+
+#ifndef DERIVATIONFRAMEWORK_SKIMMINGTOOLEXAMPLE_H
+#define DERIVATIONFRAMEWORK_SKIMMINGTOOLEXAMPLE_H 1
+
+#include<string>
+
+// Gaudi & Athena basics
+#include "AthenaBaseComps/AthAlgTool.h"
+
+// DerivationFramework includes
+#include "DerivationFrameworkInterfaces/ISkimmingTool.h"
+
+namespace CP {
+ class IMuonSelectionTool;
+}
+
+namespace DerivationFramework {
+
+ /** @class DRAW_ZMUMUSkimmingTool
+
+ the code used in this implementation is kindly stolen from:
+ atlasoff:: ISF/ISF_Core/ISF_Tools
+
+ @author James Catmore -at- cern.ch
+ */
+ class DRAW_ZMUMUSkimmingTool : public AthAlgTool, public ISkimmingTool {
+
+ public:
+ /** Constructor with parameters */
+ DRAW_ZMUMUSkimmingTool( const std::string& t, const std::string& n, const IInterface* p );
+
+ /** Destructor */
+ ~DRAW_ZMUMUSkimmingTool();
+
+ // Athena algtool's Hooks
+ StatusCode initialize();
+ StatusCode finalize();
+
+ /** Check that the current event passes this filter */
+ virtual bool eventPassesFilter() const;
+
+ private:
+ mutable unsigned int m_ntot;
+ mutable unsigned int m_npass;
+ std::string m_muonSGKey;
+ ToolHandle<CP::IMuonSelectionTool> m_muonSelectionTool;
+ unsigned int m_nMuons;
+ double m_muonPtCut;
+
+ };
+
+}
+
+
+#endif
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_ZMUMU.py b/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_ZMUMU.py
index 89c79087f83dc7f03e9d52e601187db056edc161..e51d461b707c48f18ec1d2942bb2ab53d4be65dc 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_ZMUMU.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/share/DRAW_ZMUMU.py
@@ -35,11 +35,21 @@ dimuonMassSkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "DRA
expression = dimuonMassString)
ToolSvc += dimuonMassSkimmingTool
-# Tightening by requiring at least one good (i.e. preselected) muon and either a single-muon or dimuon trigger to have passed
-from DerivationFrameworkMuons.MuonsCommon import *
-goodMuonString = 'count((Muons.DFCommonGoodMuon) && (Muons.pt > 20*GeV)) >= 1'
-goodMuonSkimmingTool = DerivationFramework__xAODStringSkimmingTool(name = "DRAW_ZMUMU_GoodMuon_SkimmingTool",
- expression = goodMuonString)
+# Muon selector tool
+from MuonSelectorTools.MuonSelectorToolsConf import CP__MuonSelectionTool
+goodMuonTool = CP__MuonSelectionTool(name = "DRAW_ZMUMU_MuonsSelector")
+goodMuonTool.MaxEta = 3.
+goodMuonTool.MuQuality = 3
+# turn of the momentum correction which is not needed for IDHits cut and Preselection
+goodMuonTool.TurnOffMomCorr = True
+ToolSvc += goodMuonTool
+print goodMuonTool
+from PrimaryDPDMaker.PrimaryDPDMakerConf import DerivationFramework__DRAW_ZMUMUSkimmingTool
+goodMuonSkimmingTool = DerivationFramework__DRAW_ZMUMUSkimmingTool(name = "DRAW_ZMUMU_GoodMuon_SkimmingTool",
+ MuonContainerKey = "Muons",
+ MuonSelectorTool = goodMuonTool,
+ MinimumNumberOfMuons = 1,
+ MuonPtCut = 20.0)
ToolSvc += goodMuonSkimmingTool
periods = TriggerPeriod.future | TriggerPeriod.y2015 | TriggerPeriod.y2016 | TriggerPeriod.y2017
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/DRAW_ZMUMU_SkimmingTool.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/DRAW_ZMUMU_SkimmingTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..df51466fd310d216e72e6166c808ec04a80671ac
--- /dev/null
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/DRAW_ZMUMU_SkimmingTool.cxx
@@ -0,0 +1,82 @@
+/*
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+/////////////////////////////////////////////////////////////////
+// DRAW_ZMUMUSkimmingTool.cxx
+///////////////////////////////////////////////////////////////////
+// Author: James Catmore (James.Catmore@cern.ch)
+// This tool implements the "good muon" event selection required
+// by the DRAW_ZMUMU format, avoiding the use of decorators on the
+// muons. Inherits from derivation framework components.
+
+#include "PrimaryDPDMaker/DRAW_ZMUMUSkimmingTool.h"
+#include "xAODMuon/MuonContainer.h"
+#include "MuonSelectorTools/IMuonSelectionTool.h"
+#include <vector>
+#include <string>
+
+// Constructor
+DerivationFramework::DRAW_ZMUMUSkimmingTool::DRAW_ZMUMUSkimmingTool( const std::string& t,
+ const std::string& n,
+ const IInterface* p ) :
+ AthAlgTool(t,n,p),
+ m_ntot(0),
+ m_npass(0),
+ m_muonSGKey("Muons"),
+ m_muonSelectionTool("CP::MuonSelectionTool/MuonSelectionTool"),
+ m_nMuons(1),
+ m_muonPtCut(20.0)
+ {
+ declareInterface<DerivationFramework::ISkimmingTool>(this);
+ declareProperty("MuonContainerKey", m_muonSGKey);
+ declareProperty("MuonSelectorTool", m_muonSelectionTool);
+ declareProperty("MinimumNumberOfMuons", m_nMuons);
+ declareProperty("MuonPtCut", m_muonPtCut);
+ }
+
+// Destructor
+DerivationFramework::DRAW_ZMUMUSkimmingTool::~DRAW_ZMUMUSkimmingTool() {
+}
+
+// Athena initialize and finalize
+StatusCode DerivationFramework::DRAW_ZMUMUSkimmingTool::initialize()
+{
+ ATH_MSG_VERBOSE("initialize() ...");
+ return StatusCode::SUCCESS;
+}
+StatusCode DerivationFramework::DRAW_ZMUMUSkimmingTool::finalize()
+{
+ ATH_MSG_VERBOSE("finalize() ...");
+ ATH_MSG_INFO("Processed "<< m_ntot <<" events, "<< m_npass<<" events passed filter ");
+ return StatusCode::SUCCESS;
+}
+
+// The filter itself
+bool DerivationFramework::DRAW_ZMUMUSkimmingTool::eventPassesFilter() const
+{
+ ++m_ntot;
+
+ // Retrieve muon container
+ const xAOD::MuonContainer* muons(0);
+ StatusCode sc = evtStore()->retrieve(muons,m_muonSGKey);
+ if (sc.isFailure()) {
+ ATH_MSG_ERROR("No muon collection with name " << m_muonSGKey << " found in StoreGate!");
+ return(false);
+ }
+
+ // Loop over muons, count up and set decision
+ xAOD::MuonContainer::const_iterator muItr;
+ unsigned int nGoodMu(0);
+ for (muItr=muons->begin(); muItr!=muons->end(); ++muItr) {
+ if ( m_muonSelectionTool->accept(**muItr) && (*muItr)->pt() > m_muonPtCut ) ++nGoodMu;
+ }
+ bool acceptEvent(false);
+ if (nGoodMu >= m_nMuons) {
+ acceptEvent = true;
+ ++m_npass;
+ }
+ return acceptEvent;
+
+}
+
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
index d95193c1b7ba9df3ec77fa7ebe1a885a80ddfdae..dfc908783ea40da93dc7378376f83022de74d8fc 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/components/PrimaryDPDMaker_entries.cxx
@@ -6,6 +6,7 @@
#include "PrimaryDPDMaker/CollisionFilterAlg.h"
#include "PrimaryDPDMaker/muonTrkTrackThinTool.h"
#include "PrimaryDPDMaker/CaloCellThinningTool.h"
+#include "PrimaryDPDMaker/DRAW_ZMUMUSkimmingTool.h"
using namespace DerivationFramework;
@@ -17,4 +18,4 @@ DECLARE_COMPONENT( MBTSTimeFilterTool )
DECLARE_COMPONENT( CaloTimeFilterTool )
DECLARE_COMPONENT( BCIDFilterTool )
DECLARE_COMPONENT( CaloCellThinningTool )
-
+DECLARE_COMPONENT( DRAW_ZMUMUSkimmingTool )
diff --git a/Projects/AnalysisBase/externals.txt b/Projects/AnalysisBase/externals.txt
index 8f8aa0218f965c8f050e6917204907293a04e6e4..1c9e07805ec7590349a6640c7c68e06fdcea249e 100644
--- a/Projects/AnalysisBase/externals.txt
+++ b/Projects/AnalysisBase/externals.txt
@@ -6,4 +6,4 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AnalysisBaseExternalsVersion = 2.0.28
+AnalysisBaseExternalsVersion = 2.0.29
diff --git a/Projects/AnalysisTop/externals.txt b/Projects/AnalysisTop/externals.txt
index 25a315ed3f3fb1d3eb84ec6e28f857160f9e83d9..ba052e034ad03a4649c650a55586aa69142e38b7 100644
--- a/Projects/AnalysisTop/externals.txt
+++ b/Projects/AnalysisTop/externals.txt
@@ -1,4 +1,4 @@
# Versions of the various externals to build before starting the build of
# this project, when doing a full stack nightly build.
-AnalysisBaseExternalsVersion = 2.0.28
+AnalysisBaseExternalsVersion = 2.0.29
diff --git a/Projects/AthDataQuality/externals.txt b/Projects/AthDataQuality/externals.txt
index 213291871d90621535f007c08aac0210d507f5cd..52c57407abade2338592ff8a1062879d25e14cad 100644
--- a/Projects/AthDataQuality/externals.txt
+++ b/Projects/AthDataQuality/externals.txt
@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly
# forbidden.
-AtlasExternalsVersion = 2.0.28
+AtlasExternalsVersion = 2.0.29
diff --git a/Projects/AthSimulation/externals.txt b/Projects/AthSimulation/externals.txt
index 06f1ef0591cd8e34d0f27a5a1a9850b57e780062..5793156229b3f0881b1d07e8e2b80e0cfd1341c7 100644
--- a/Projects/AthSimulation/externals.txt
+++ b/Projects/AthSimulation/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthSimulationExternalsVersion = 2.0.28
+AthSimulationExternalsVersion = 2.0.29
# The version of atlas/Gaudi to use:
GaudiVersion = v31r0.004
diff --git a/Projects/Athena/externals.txt b/Projects/Athena/externals.txt
index 426abe2585bb23014e3ee9e3be0abeb1f8080c99..5006007520a8f86e81a4336bff9a12847cad07e6 100644
--- a/Projects/Athena/externals.txt
+++ b/Projects/Athena/externals.txt
@@ -6,7 +6,7 @@
# forbidden.
# The version of atlas/atlasexternals to use:
-AthenaExternalsVersion = 2.0.28
+AthenaExternalsVersion = 2.0.29
# The version of atlas/Gaudi to use:
GaudiVersion = v31r0.004
diff --git a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
index 57e9d3bde7ab5fbd59f9523b370e24e4ed1b2bf8..6e8660d39bd6a4fde19517f7d70cbd8fb1c7aa37 100644
--- a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
+++ b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
@@ -31,8 +31,7 @@ topocontexts = {
"T0":("JES_MC15cRecommendation_May2016_rel21.config","00-04-77","JetArea_Residual_EtaJES"),
# Omit smearing, to avoid any efficiency loss
"AnalysisLatest":("JES_data2017_2016_2015_Consolidated_EMTopo_2018_Rel21.config","00-04-82","JetArea_Residual_EtaJES_GSC_Insitu"),
- "TrigSubJES":("JES_MC15cRecommendation_May2016_Trigger.config","00-04-77","JetArea_EtaJES"),
- "TrigSubJESIS":("JES_MC15cRecommendation_May2016_Trigger.config","00-04-77","JetArea_EtaJES_GSC_Insitu"),
+ "TrigRun2":("JES_MC15cRecommendation_May2016_Trigger.config","00-04-77","JetArea_EtaJES_GSC_Insitu"),
}
rscanlc2 = {
@@ -44,10 +43,10 @@ rscanlc6 = {
}
fatjetcontexts = {
- "CombinedMass": ("JES_MC16recommendation_FatJet_JMS_comb_19Jan2018.config","00-04-81","EtaJES_JMS"),
- "CaloMass": ("JES_MC16recommendation_FatJet_JMS_calo_29Nov2017.config","00-04-81","EtaJES_JMS"),
- "TAMass": ("JES_MC16recommendation_FatJet_JMS_TA_29Nov2017.config","00-04-81","EtaJES_JMS"),
- "TrigSubJES": ("JES_Full2012dataset_Rscan_June2014.config","00-04-77","JetArea_EtaJES"),
+ "CombinedMass": ("JES_MC16recommendation_FatJet_JMS_comb_19Jan2018.config","00-04-81","EtaJES_JMS"),
+ "CaloMass": ("JES_MC16recommendation_FatJet_JMS_calo_29Nov2017.config","00-04-81","EtaJES_JMS"),
+ "TAMass": ("JES_MC16recommendation_FatJet_JMS_TA_29Nov2017.config","00-04-81","EtaJES_JMS"),
+ "TrigUngroomed": ("JES_Full2012dataset_Rscan_June2014.config","00-04-77","JetArea_EtaJES"),
}
# List AFII config files separately, to avoid needing to specify a different context
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
index 7e9832da72a59adc0360c12d378adfabd570b522..769ccca1c49cb1d781a4f3ce8457044386e7b46c 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py
@@ -204,6 +204,25 @@ def expandPrereqs(reqtype,prereqs):
return reqdefs
+########################################################################
+# Function producing an EventShapeAlg to calculate
+# medaian energy density for pileup correction
+#
+def getEventShapeAlg( constit, constitpjkey, nameprefix="" ):
+
+ rhokey = "Kt4"+constit.label+"EventShape"
+ rhotoolname = "EventDensity_Kt4"+constit.label
+
+ from EventShapeTools import EventShapeToolsConf
+ rhotool = EventShapeToolsConf.EventDensityTool(rhotoolname)
+ rhotool.InputContainer = constitpjkey
+ rhotool.OutputContainer = rhokey
+
+ eventshapealg = EventShapeToolsConf.EventDensityAthAlg("{0}{1}Alg".format(nameprefix,rhotoolname))
+ eventshapealg.EventDensityTool = rhotool
+
+ return eventshapealg
+
########################################################################
# Function for setting up inputs to jet finding
#
@@ -302,17 +321,7 @@ def JetInputCfg(inputdeps, configFlags, sequenceName):
if rhokey in filecontents:
jetlog.debug("Event density {0} for label {1} already in input file.".format(rhokey, constit.label))
else:
- rhotoolname = "EventDensity_Kt4"+constit.label
-
- jetlog.debug("Setting up event density calculation Kt4{0}".format(constit.label))
- from EventShapeTools import EventShapeToolsConf
- rhotool = EventShapeToolsConf.EventDensityTool(rhotoolname)
- rhotool.InputContainer = constitpjkey
- rhotool.OutputContainer = rhokey
-
- eventshapealg = EventShapeToolsConf.EventDensityAthAlg("{0}Alg".format(rhotoolname))
- eventshapealg.EventDensityTool = rhotool
- components.addEventAlgo(eventshapealg)
+ components.addEventAlgo( getEventShapeAlg(constit,constitpjkey) )
return components
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
index 3ce00b8a6b79e3128789b0a9d15bf05a2e84b1d3..3714c04ab2ea61305e8bbaf0dea5a1e1e71e9ebc 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombined_OutputItemsAOD.py
@@ -22,10 +22,11 @@ if DetFlags.detdescr.Muon_on():
MuonCombinedAODList+=[ "xAOD::TrackParticleContainer#"+MuonCbKeys.SpectrometerParticles() ]
MuonCombinedAODList+=[ "xAOD::TrackParticleAuxContainer#"+MuonCbKeys.SpectrometerParticles()+"Aux." + excludedAuxData ]
MuonCombinedAODList+=[ "xAOD::MuonContainer#Muons" ]
- MuonCombinedAODList+=[ "xAOD::MuonAuxContainer#MuonsAux." ]
+ MuonCombinedAODList+=[ "xAOD::MuonAuxContainer#MuonsAux.-DFCommonMuonsTight.-DFCommonGoodMuon.-DFCommonMuonsMedium.-DFCommonMuonsLoose" ] # See note
MuonCombinedAODList+=["MuonCaloEnergyContainer#MuonCaloEnergyCollection"]
MuonCombinedAODList+=["xAOD::MuonSegmentContainer#"+MuonCbKeys.MuGirlxAODSegments()]
MuonCombinedAODList+=["xAOD::MuonSegmentAuxContainer#"+MuonCbKeys.MuGirlxAODSegments()+"Aux."]
+ # Note: hack to remove derivation framework variables that are added by DRAW building and are supposed to be transient
### stau
MuonCombinedAODList+=[ "xAOD::TrackParticleContainer#CombinedStauTrackParticles"]
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index e6a6414826b3e8af708cb83c33cd2f234597f193..99de4d14d1dbb1b7c9feab1715dbda5c540f13d7 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -688,17 +688,18 @@ AODFix_postCombinedRec()
#
# Heavy ion reconstruction special configuration
#
+pdr.flag_domain('HI')
if rec.doHeavyIon():
protectedInclude ("HIRecExample/HIRec_jobOptions.py")
if rec.doHIP ():
protectedInclude ("HIRecExample/HIPRec_jobOptions.py")
-
if rec.doWriteBS() and not recAlgs.doTrigger():
include( "ByteStreamCnvSvc/RDP_ByteStream_jobOptions.py" )
pass
+pdr.flag_domain('tagraw')
## add in RawInfoSummaryForTagWriter
if rec.doESD() and not rec.readESD() and rec.doTagRawSummary():
try:
@@ -731,6 +732,7 @@ if recAlgs.doMonteCarloReact():
# Monitoring Algorithms and Tools
# ----------------------------------------------------------------------------
+pdr.flag_domain('monitoring')
if rec.doMonitoring():
protectedInclude ("AthenaMonitoring/DataQualitySteering_jobOptions.py")
@@ -1398,6 +1400,9 @@ if rec.doWriteAOD():
if AODFlags.ThinNegativeEnergyNeutralPFOs:
from ThinningUtils.ThinNegativeEnergyNeutralPFOs import ThinNegativeEnergyNeutralPFOs
ThinNegativeEnergyNeutralPFOs()
+ if AODFlags.ThinInDetForwardTrackParticles():
+ from ThinningUtils.ThinInDetForwardTrackParticles import ThinInDetForwardTrackParticles
+ ThinInDetForwardTrackParticles()
#Thin Trk::Tracks for Electons and Muons (GSF/Combined)
if (AODFlags.AddEgammaMuonTracksInAOD and not rec.doTruth()) or (AODFlags.AddEgammaTracksInMCAOD and rec.doTruth()):
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3977664243614878e9c5e7284aa58e9bfe9d0326
--- /dev/null
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# art-description: Athena runs btagging from an ESD file
+# art-type: grid
+# art-include: master/Athena
+
+athena BTagging/RecExRecoTest_ART_btagging_fromESD.py | tee temp.log
+echo "art-result: ${PIPESTATUS[0]}"
+
+test_postProcessing_Errors.sh temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_MT_oneThread.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_MT_oneThread.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b23b173f1451893eff5fae0a80c9527a9b2922f4
--- /dev/null
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_MT_oneThread.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# art-description: Athena runs btagging from an ESD file
+# art-type: grid
+# art-include: master/Athena
+
+art.py createpoolfile
+
+athena --threads=1 BTagging/RecExRecoTest_ART_btagging_fromESD.py | tee temp.log
+echo "art-result: ${PIPESTATUS[0]}"
+
+test_postProcessing_Errors.sh temp.log
+
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_MT_twoThreads.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_MT_twoThreads.sh
new file mode 100755
index 0000000000000000000000000000000000000000..cf26e6899797a396adf7a56ea8166d3cd6e7044a
--- /dev/null
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_btagging_fromesd_MT_twoThreads.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# art-description: Athena runs btagging from an ESD file
+# art-type: grid
+# art-include: master/Athena
+
+art.py createpoolfile
+
+athena --threads=2 BTagging/RecExRecoTest_ART_btagging_fromESD.py | tee temp.log
+echo "art-result: ${PIPESTATUS[0]}"
+
+test_postProcessing_Errors.sh temp.log
+
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events.sh
index 13705702e498e95c04d534ee6b46fd16874896ca..0557e83a0c6b6b958310039b5d00725792c62af0 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events.sh
@@ -8,7 +8,7 @@
# art-include: 21.3/Athena
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_comm.00265545.physics_MinBias.merge.RAW._lb0048._SFO-ALL._0001.1 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-2015-04" --geometryVersion="ATLAS-R2-2015-03-01-00" --outputESDFile myESD.pool.root --outputNTUP_MUONCALIBFile muonCalib.root --outputHISTFile myMergedMonitoring.root --outputTAGFile myTAG.pool.root --maxEvents 300 --preExec 'rec.doTrigger=False;'
+export TRF_ECHO=True; Reco_tf.py --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_comm.00265545.physics_MinBias.merge.RAW._lb0048._SFO-ALL._0001.1 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-2015-04" --geometryVersion="ATLAS-R2-2015-03-01-00" --outputESDFile myESD.pool.root --outputHISTFile myMergedMonitoring.root --outputTAGFile myTAG.pool.root --maxEvents 300 --preExec 'rec.doTrigger=False;'
echo "art-result: $? Reco"
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.MergePool_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.MergePool_tf.py
index a389ed15e298455a69b322ab3bf4743498e06009..5ae81287e25c666e062e9e5eb9d6f1a19b2ba4f3 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.MergePool_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.MergePool_tf.py
@@ -94,7 +94,8 @@ if hasattr(runArgs,"fastPoolMerge") and runArgs.fastPoolMerge == True:
stream.HelperTools = []
streamInfoToolKey = stream.name()
streamInfoTool = CopyEventStreamInfo( streamInfoToolKey+"_CopyEventStreamInfo" )
- streamInfoTool.Key = streamInfoToolKey
+ streamInfoTool.InputCollName = streamInfoToolKey
+ streamInfoTool.OutputCollName = streamInfoToolKey
ToolSvc += streamInfoTool
ServiceMgr.MetaDataSvc.MetaDataTools += [ streamInfoTool ]
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtrigger.py b/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtrigger.py
index 155a9ece10e34712984b39ff3f2a4c5f87ff6f23..2f82d47117c23776b302fe05efa4fb073c24a010 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtrigger.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.RDOtoRDOtrigger.py
@@ -15,7 +15,6 @@ rec.doJetMissingETTag.set_Value_and_Lock(False)
rec.doEgamma.set_Value_and_Lock(False)
rec.doMuonCombined.set_Value_and_Lock(False)
rec.doTau.set_Value_and_Lock(False)
-
rec.doTrigger.set_Value_and_Lock(True)
rec.doRDOTrigger.set_Value_and_Lock(True)
recAlgs.doTrigger.set_Value_and_Lock(True)
@@ -62,9 +61,22 @@ if hasattr(runArgs,"preInclude"):
for fragment in runArgs.preInclude:
include(fragment)
-if TriggerFlags.doMTHLT():
- log.info("configuring MT Trigger, actually nothing happens for now")
-
+# Setup the algorithm and output sequences
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
+from AthenaCommon.AlgSequence import AthSequencer
+outSequence = AthSequencer("AthOutSeq")
+
+if TriggerFlags.doMT():
+ log.info("configuring MT Trigger")
+ from AthenaCommon.AlgScheduler import AlgScheduler
+ AlgScheduler.CheckDependencies( True )
+ AlgScheduler.ShowControlFlow( True )
+ AlgScheduler.ShowDataDependencies( True )
+ AlgScheduler.EnableVerboseViews( True )
+ from TriggerJobOpts.Lvl1SimulationConfig import Lvl1SimulationSequence
+ topSequence += Lvl1SimulationSequence(None)
+
else:
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
@@ -82,6 +94,10 @@ def preplist(input):
triglist.append(k + "#" + j)
return triglist
+
+if TriggerFlags.doMT():
+ TriggerFlags.doHLT.set_Value_and_Lock(False)
+
#========================================================
# Central topOptions (this is one is a string not a list)
@@ -95,11 +111,6 @@ if rec.doFileMetaData():
"xAOD::TriggerMenuAuxContainer#TriggerMenuAux." ]
objKeyStore.addManyTypesMetaData( metadataItems )
-# Setup the algorithm and output sequences
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-from AthenaCommon.AlgSequence import AthSequencer
-outSequence = AthSequencer("AthOutSeq")
from AnalysisTriggerAlgs.AnalysisTriggerAlgsConfig import \
RoIBResultToAOD
@@ -112,7 +123,7 @@ for i in topSequence.getAllChildren():
topSequence.insert(idx, RoIBResultToAOD("RoIBResultToxAOD"))
for i in outSequence.getAllChildren():
- if "StreamRDO" in i.getName() and ( not TriggerFlags.doMTHLT() ):
+ if "StreamRDO" in i.getName() and ( not TriggerFlags.doMT() ):
from TrigDecisionMaker.TrigDecisionMakerConfig import TrigDecisionMaker,WritexAODTrigDecision
topSequence.insert(idx, TrigDecisionMaker('TrigDecMaker'))
from AthenaCommon.Logging import logging
@@ -143,7 +154,7 @@ for i in outSequence.getAllChildren():
StreamRDO.ItemList += preplist(getLvl1AODList())
StreamRDO.MetadataItemList += [ "xAOD::TriggerMenuContainer#*", "xAOD::TriggerMenuAuxContainer#*" ]
- if "StreamRDO" in i.getName() and TriggerFlags.doMTHLT():
+ if "StreamRDO" in i.getName() and TriggerFlags.doMT():
from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTList
from TrigEDMConfig.TriggerEDM import getLvl1ESDList
StreamRDO.ItemList += preplist(getLvl1ESDList())
@@ -160,7 +171,7 @@ if hasattr(ToolSvc, 'TrigDecisionTool'):
ToolSvc.TrigDecisionTool.TrigDecisionKey = "TrigDecision"
ToolSvc.TrigDecisionTool.UseAODDecision = True
-if TriggerFlags.doMTHLT():
+if TriggerFlags.doMT():
pass
else:
# inform TD maker that some parts may be missing
@@ -202,3 +213,8 @@ if hasattr(runArgs,"postExec"):
for cmd in runArgs.postExec:
recoLog.info(cmd)
exec(cmd)
+
+
+# topSequence.McAodBuilder.OutputLevel=DEBUG
+
+# del topSequence.McAodBuilder
diff --git a/Reconstruction/RecoFix/python/RecoFix_r210.py b/Reconstruction/RecoFix/python/RecoFix_r210.py
index a24ddea798fbba41849e64fe2ead498a31e6a6ca..a6b13dc3a5ec7ed5758e78d88b31ad1ad339af51 100644
--- a/Reconstruction/RecoFix/python/RecoFix_r210.py
+++ b/Reconstruction/RecoFix/python/RecoFix_r210.py
@@ -14,5 +14,5 @@ class RecoFix_r210(RecoFix_base):
@staticmethod
def latestAODFixVersion():
"""The latest version of the AODFix. Use same sort order as in AODFix"""
- return ["IDTide", "egammaStrips", "trklinks"]
+ return ["IDTide", "egammaStrips", "removeMuonDecor", "trklinks"]
diff --git a/Reconstruction/RecoTools/TrackToCalo/CMakeLists.txt b/Reconstruction/RecoTools/TrackToCalo/CMakeLists.txt
index 9f69ff39c852bf5c655c5386785717292680b4e6..9f0bc904d12bcee52ab5d7293ce86507243e1883 100644
--- a/Reconstruction/RecoTools/TrackToCalo/CMakeLists.txt
+++ b/Reconstruction/RecoTools/TrackToCalo/CMakeLists.txt
@@ -36,7 +36,8 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkTrack
Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkTools/TrkToolInterfaces )
+ Tracking/TrkTools/TrkToolInterfaces
+ Control/CxxUtils )
# External dependencies:
find_package( Eigen )
@@ -49,11 +50,11 @@ atlas_add_library( TrackToCaloLib
LINK_LIBRARIES ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers GeoPrimitives xAODCaloEvent GaudiKernel ParticleCaloExtension RecoToolInterfaces
TrackCaloClusterRecTools TrkCaloExtension TrkParametersIdentificationHelpers CaloDetDescrLib CaloUtilsLib
PRIVATE_LINK_LIBRARIES CaloIdentifier AthenaBaseComps AtlasDetDescr FourMomUtils xAODTracking xAODMuon xAODEgamma xAODTruth TrkSurfaces
- TrkEventPrimitives TrkParameters TrkTrack TrkExInterfaces TrkToolInterfaces )
+ TrkEventPrimitives TrkParameters TrkTrack TrkExInterfaces TrkToolInterfaces CxxUtils)
atlas_add_component( TrackToCalo
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} CaloEvent CaloGeoHelpers GeoPrimitives xAODCaloEvent GaudiKernel ParticleCaloExtension RecoToolInterfaces TrackCaloClusterRecTools TrkCaloExtension TrkParametersIdentificationHelpers CaloDetDescrLib CaloIdentifier CaloUtilsLib AthenaBaseComps AtlasDetDescr FourMomUtils xAODMuon xAODTracking xAODTruth TrkSurfaces TrkEventPrimitives TrkParameters TrkTrack TrkExInterfaces TrkToolInterfaces TrackToCaloLib )
+ LINK_LIBRARIES GaudiKernel TrackToCaloLib )
atlas_install_python_modules( python/*.py )
diff --git a/Reconstruction/RecoTools/TrackToCalo/TrackToCalo/ATLAS_CHECK_THREAD_SAFETY b/Reconstruction/RecoTools/TrackToCalo/TrackToCalo/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..8f21f6c6200bc9e4bfee247a3994835d69e53e91
--- /dev/null
+++ b/Reconstruction/RecoTools/TrackToCalo/TrackToCalo/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Reconstruction/RecoTools/TrackToCalo
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/MuonCaloEnergyTool.h b/Reconstruction/RecoTools/TrackToCalo/src/MuonCaloEnergyTool.h
index b8068c1ec5c6d0ce2e15598cbf0c85888e83e1b3..7c0c5721564a83ba8c704c11f5f20a315efcbb7a 100644
--- a/Reconstruction/RecoTools/TrackToCalo/src/MuonCaloEnergyTool.h
+++ b/Reconstruction/RecoTools/TrackToCalo/src/MuonCaloEnergyTool.h
@@ -66,7 +66,6 @@ namespace Rec {
ToolHandle <Rec::IParticleCaloCellAssociationTool> m_caloCellAssociationTool; //!< Tool to make the step-wise extrapolation
ToolHandle< Trk::ITrackParticleCreatorTool > m_particleCreator; /**< The CB Particle Creator Tool */
- // FIXME: mutable
SG::ReadCondHandleKey<CaloNoise> m_caloNoiseCDOKey{this,"CaloNoiseKey","totalNoise","SG Key of CaloNoise data object"};
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloClusterAssociationTool.h b/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloClusterAssociationTool.h
index 8ee935259f4124d63f5a5dc151464d602d1a7385..6c0afda2355607f11b715a00c5d012688e501931 100644
--- a/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloClusterAssociationTool.h
+++ b/Reconstruction/RecoTools/TrackToCalo/src/ParticleCaloClusterAssociationTool.h
@@ -19,7 +19,7 @@ authors : Niels van Eldik (CERN PH-ATC)
#include "RecoToolInterfaces/IParticleCaloExtensionTool.h"
#include "TrackVertexAssociationTool/ITrackVertexAssociationTool.h"
-
+#include "CxxUtils/checker_macros.h"
namespace Trk {
class CaloExtension;
}
@@ -28,7 +28,12 @@ namespace xAOD {
}
namespace Rec {
- class ParticleCaloClusterAssociationTool : virtual public IParticleCaloClusterAssociationTool, public AthAlgTool {
+ /* Mark as not ATLAS_NOT_THREAD_SAFE
+ * as it still uses the old style caching
+ * to be updated if needed
+ */
+ class ATLAS_NOT_THREAD_SAFE ParticleCaloClusterAssociationTool :
+ virtual public IParticleCaloClusterAssociationTool, public AthAlgTool {
public:
ParticleCaloClusterAssociationTool(const std::string&,const std::string&,const IInterface*);
diff --git a/Reconstruction/RecoTools/TrackToCalo/src/PathLengthUtils.h b/Reconstruction/RecoTools/TrackToCalo/src/PathLengthUtils.h
index d7d6c63997356c0555cb4a59ceb2cb2680514647..2ab26881e90c55baed3038f1a511f26c78af72d9 100755
--- a/Reconstruction/RecoTools/TrackToCalo/src/PathLengthUtils.h
+++ b/Reconstruction/RecoTools/TrackToCalo/src/PathLengthUtils.h
@@ -51,10 +51,6 @@
double getPathLengthInZ(double zMin, double zMax, double z_entrance, double z_exit) const;
double getPathLengthInZ(const CaloCell& cell, double z_entrance, double z_exit) const;
bool crossingMatrix(Amg::MatrixX Matrix ,Amg::Vector3D entry, Amg::Vector3D& path) const;
- //static double CellZB[9];
- //static double CellDZB[9];
- //static double CellZC[9];
- //static double CellDZC[9];
};
inline double PathLengthUtils::phiMean(double a, double b) const { return 0.5*(a+b) + (a*b < 0)*M_PI; }
diff --git a/Reconstruction/eflowRec/python/PFHLTSequence.py b/Reconstruction/eflowRec/python/PFHLTSequence.py
new file mode 100644
index 0000000000000000000000000000000000000000..6306f77441fb6c32684a576a64b5220a45e58d4b
--- /dev/null
+++ b/Reconstruction/eflowRec/python/PFHLTSequence.py
@@ -0,0 +1,138 @@
+from eflowRec import eflowRecConf
+from InDetTrackSelectionTool import InDetTrackSelectionToolConf
+# PFTrackSelector
+# This handles the track selection (including lepton veto)
+# and extrapolation into the calorimeter.
+# Parameters: track & vertex container names (offline, HLT, FTK)
+def getPFTrackSel(tracksin, verticesin):
+
+ # Configure the extrapolator
+ def getExtrapolator():
+ # Set up with trigger extrapolator instance
+ # FIXME: reconfigure for lower tolerance to speed up
+ # from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
+ from TrackToCalo.TrackToCaloConf import Trk__ParticleCaloExtensionTool
+ from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigExtrapolator
+ return Trk__ParticleCaloExtensionTool(Extrapolator = InDetTrigExtrapolator)
+
+ TrackCaloExtensionTool = eflowRecConf.eflowTrackCaloExtensionTool(TrackCaloExtensionTool=getExtrapolator())
+
+ # Configure the track selector
+ PFTrackSelector = eflowRecConf.PFTrackSelector("PFTrackSelector")
+ PFTrackSelector.trackExtrapolatorTool = TrackCaloExtensionTool
+
+ TrackSelectionTool = InDetTrackSelectionToolConf.InDet__InDetTrackSelectionTool(
+ CutLevel = "TightPrimary",
+ minPt = 500.0)
+ PFTrackSelector.trackSelectionTool = TrackSelectionTool
+
+ # Disable lepton veto as not reconstructed for hadronic triggers
+ PFTrackSelector.electronsName = ""
+ PFTrackSelector.muonsName = ""
+ # Specify input track and vertex containers
+ PFTrackSelector.tracksName = tracksin
+ PFTrackSelector.VertexContainer = verticesin
+
+ return PFTrackSelector
+
+# PFAlgorithm
+# This runs the cell-level subtraction:
+# 1. Match clusters to tracks
+# 2. Iteratively remove expected calo energy
+# 3. Calculate cluster moments and apply LC calibration
+# For HLT purposes, no LC calibration is applied and only
+# one essential moment (CENTER_MAG) is computed. This is
+# needed for origin corrections.
+def getPFAlg(clustersin):
+
+ # The tool to handle cell-level subtraction, default parameters
+ CellEOverPTool = eflowRecConf.eflowCellEOverPTool_mc12_JetETMiss()
+
+ # Need a few instances of PFTrackClusterMatchingTool with different distance cuts
+ def getPFMatchingTool(name,matchcut):
+ matchingtool = eflowRecConf.PFTrackClusterMatchingTool(name)
+ matchingtool.TrackPositionType = 'EM2EtaPhi' # str
+ matchingtool.ClusterPositionType = 'PlainEtaPhi' # str
+ matchingtool.DistanceType = 'EtaPhiSquareDistance' # str
+ matchingtool.MatchCut = matchcut*matchcut
+
+ # Default energy subtraction where a single cluster satisfies the expected
+ # track calo energy
+ PFCellLevelSubtractionTool = eflowRecConf.PFCellLevelSubtractionTool("PFCellLevelSubtractionTool",
+ eflowCellEOverPTool = CellEOverPTool,
+ # Uses a deltaR' cut (deltaR corrected for cluster width in eta/phi) to
+ # match clusters to tracks
+ PFTrackClusterMatchingTool = eflowRecConf.PFTrackClusterMatchingTool("CalObjBldMatchingTool"),
+ # Additional matching tools used to determine cluster weights
+ # These deal with dense environments in which subtraction is difficult.
+ PFTrackClusterMatchingTool_015 = getPFMatchingTool(name="MatchingTool_Pull_015",matchcut=0.15),
+ PFTrackClusterMatchingTool_02 = getPFMatchingTool(name="MatchingTool_Pull_02", matchcut=0.2)
+ )
+
+ # A second cell-level subtraction tool that handles cases where more than one
+ # 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)
+ )
+
+ # Configure moment calculation using topocluster moment calculator
+ PFMomentCalculatorTool = eflowRecConf.PFMomentCalculatorTool("PFMomentCalculatorTool")
+ # Only need CENTER_MAG (depth in calo) for origin corrections
+ from CaloRec import CaloRecConf
+ PFMomentCalculatorTool.CaloClusterMomentsMaker = CaloRecConf.CaloClusterMomentsMaker("PFClusterMomentsMaker",
+ # Originally from CaloTopoClusterFlags
+ TwoGaussianNoise = True,
+ # Needed for origin correction
+ MomentsNames = ["CENTER_MAG"]
+ )
+ # Makes a temporary cluster collection for moment calculation
+ PFMomentCalculatorTool.PFClusterCollectionTool = eflowRecConf.PFClusterCollectionTool()
+
+ pfClusterSel = eflowRecConf.PFClusterSelectorTool("PFClusterSelectorTool",
+ clustersName=clustersin,
+ calClustersName="")
+ PFAlgorithm = eflowRecConf.PFAlgorithm("PFAlgorithm",
+ PFClusterSelectorTool = pfClusterSel,
+ SubtractionToolList = [PFCellLevelSubtractionTool,PFRecoverSplitShowersTool],
+ BaseToolList = [PFMomentCalculatorTool]
+ )
+
+ return PFAlgorithm
+
+# Convert internal eflowRec track/cluster objects into xAOD neutral/charged
+# particle flow objects
+def getPFOCreators():
+ PFOChargedCreatorAlgorithm = eflowRecConf.PFOChargedCreatorAlgorithm("PFOChargedCreatorAlgorithm",
+ PFOOutputName="HLTChargedParticleFlowObjects"
+ )
+
+ PFONeutralCreatorAlgorithm = eflowRecConf.PFONeutralCreatorAlgorithm("PFONeutralCreatorAlgorithm",
+ PFOOutputName="HLTNeutralParticleFlowObjects",
+ DoClusterMoments=False # Only CENTER_MAG
+ )
+ return PFOChargedCreatorAlgorithm, PFONeutralCreatorAlgorithm
+
+# Generate the full PF reco sequence, assuming tracks, vertices, clusters
+# will be created upstream
+def PFHLTSequence(clustersin,tracktype="Offline"):
+ trackvtxcontainers = {
+ "Offline": ("InDetTrackParticles","PrimaryVertices"),
+ "HLT": ("",""), # Not set up -- ask MET?
+ "FTK": ("FTK_TrackParticleContainer","FTK_VertexContainer"),
+ "FTKRefit": ("FTK_TrackParticleContainer_Refit","FTK_VertexContainer_Refit")
+ }
+
+ tracksin,verticesin = trackvtxcontainers[tracktype]
+
+ PFTrkSel = getPFTrackSel(tracksin, verticesin)
+ PFAlg = getPFAlg(clustersin)
+ PFNCreator, PFCCreator = getPFOCreators()
+
+ # Create HLT "parallel OR" sequence holding the PF algs
+ # Can be inserted into the jet building sequence
+ from AthenaCommon.CFElements import parOR
+ pfSequence = parOR("PFSeq_"+tracktype, [PFTrkSel,PFAlg,PFCCreator,PFNCreator])
+
+ return pfSequence
diff --git a/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.cxx b/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.cxx
index 948e5e5effbcb8be13319c63e7c2078eedb84bf7..8248d5a1eadd1b6d7969b338dc99dbab671c7d15 100644
--- a/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.cxx
+++ b/Reconstruction/egamma/egammaAlgs/src/EMGSFCaloExtensionBuilder.cxx
@@ -10,6 +10,7 @@ AUTHORS: Anastopoulos
PURPOSE: Performs Calo Extension for all GSF tracks
**********************************************************************/
#include "EMGSFCaloExtensionBuilder.h"
+#include "xAODEgamma/EgammaxAODHelpers.h"
//
#include "xAODTracking/TrackParticleContainer.h"
#include "xAODTracking/TrackParticleAuxContainer.h"
@@ -67,6 +68,12 @@ StatusCode EMGSFCaloExtensionBuilder::execute()
CaloExtensionCollection* ptrPerigee=perigeeCache.ptr();
CaloExtensionCollection* ptrLast=lastCache.ptr();
std::vector<bool> mask (ptrTracks->size(),true);
+ for (auto trkIt : *ptrTracks) {
+ //If we have TRT-SA tracks we don't extrapolate
+ if (xAOD::EgammaHelpers::numberOfSiHits(trkIt) < 4) {
+ mask[trkIt->index()] = false;
+ }
+ }
ATH_CHECK(m_perigeeParticleCaloExtensionTool->caloExtensionCollection(*ptrTracks,mask,*ptrPerigee));
ATH_CHECK(m_lastParticleCaloExtensionTool->caloExtensionCollection(*ptrTracks,mask,*ptrLast));
diff --git a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
index 105114f834b2c7187cbccfc4a9ddc7e8b8cb75e5..e90a69ed1954a8f2338f799638d72f2c1df1513c 100644
--- a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
+++ b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.cxx
@@ -114,7 +114,8 @@ StatusCode EMTrackMatchBuilder::executeRec(const EventContext& ctx, egammaRec* e
}
// ===============================================================
-StatusCode EMTrackMatchBuilder::trackExecute(const EventContext& ctx, egammaRec* eg, const xAOD::TrackParticleContainer* trackPC) const
+StatusCode EMTrackMatchBuilder::trackExecute(const EventContext& ctx, egammaRec* eg,
+ const xAOD::TrackParticleContainer* trackPC) const
{
if (!eg || !trackPC)
{
@@ -139,12 +140,21 @@ StatusCode EMTrackMatchBuilder::trackExecute(const EventContext& ctx, egammaRec*
{
bool isTRT = (xAOD::EgammaHelpers::numberOfSiHits(*trkIt) < 4);
- if (!(isCandidateMatch(cluster, isTRT, (*trkIt), false ) &&
- inBroadWindow(ctx, trkMatches, cluster, trackNumber, isTRT, (*trkIt), Trk::alongMomentum)) && m_isCosmics)
- {
- // Second chance for cosmics, flip eta and phi
+ if(isTRT){
+ continue;
+ }
+
+ if(!m_isCosmics){
+ if (isCandidateMatch(cluster, isTRT, (*trkIt), false)){
+ inBroadWindow(ctx, trkMatches, *cluster, trackNumber,
+ isTRT, (**trkIt), Trk::alongMomentum);
+ }
+ }
+ else{
+ // For cosmics, flip eta and phi
if (isCandidateMatch(cluster, isTRT, (*trkIt), true))
- inBroadWindow(ctx, trkMatches, cluster, trackNumber, isTRT, (*trkIt), Trk::oppositeMomentum);
+ inBroadWindow(ctx, trkMatches, *cluster, trackNumber,
+ isTRT, (**trkIt), Trk::oppositeMomentum);
}
}
@@ -153,7 +163,6 @@ StatusCode EMTrackMatchBuilder::trackExecute(const EventContext& ctx, egammaRec*
//sort the track matches
std::sort(trkMatches.begin(), trkMatches.end(), TrackMatchSorter);
-
//set the matching values
TrackMatch bestTrkMatch=trkMatches.at(0);
for(int i=0; i<4 ;++i){
@@ -188,21 +197,23 @@ StatusCode EMTrackMatchBuilder::trackExecute(const EventContext& ctx, egammaRec*
return StatusCode::SUCCESS;
}
-// =================================================================
bool
EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
std::vector<TrackMatch>& trackMatches,
- const xAOD::CaloCluster* cluster,
- int trackNumber,
- bool trkTRT,
- const xAOD::TrackParticle* trkPB,
+ const xAOD::CaloCluster& cluster,
+ int trackNumber,
+ bool trkTRT,
+ const xAOD::TrackParticle& trkPB,
const Trk::PropDirection dir) const
{
- // make position match between cluster and TrackParameters at LAr calorimeter
- //
-
- // protection against bad pointers
- if (cluster==0 || trkPB==0) return false;
+ /*
+ * If it is TRT do nothing.
+ * If it is silicon we always do both Rescale
+ * and Standard and then we decide
+ */
+ if(trkTRT){
+ return false;
+ }
IEMExtrapolationTools::TrkExtrapDef extrapFrom;
if (m_useLastMeasurement) {
@@ -229,90 +240,75 @@ EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
std::vector<double> deltaEtaRes(4, -999.0);
std::vector<double> deltaPhiRes(4, -999.0);
ATH_MSG_DEBUG("### Matching #### ");
-
- /*
- * If it is TRT we can determine immediately if it failed
- * or not (we use matches at calo)
- * If it is silicon we always do both Rescale
- * and Standard and then we decide
- */
- if(trkTRT){//TRTSA
- if(!m_extrapolationTool->matchesAtCalo (ctx,
- cluster,
- trkPB,
- trkTRT,
- dir,
- eta,
- phi,
- deltaEta,
- deltaPhi,
- extrapFrom)) {
- ATH_MSG_DEBUG("Normal matched Failed deltaPhi/deltaEta " << deltaPhi[2] <<" / "<< deltaEta[2]<<", No Rescale attempted, isTRTSA = " <<trkTRT);
- return false;
- }
- } //end if is TRTSA
- else{//Silicon tracks
- if (m_extrapolationTool->getMatchAtCalo (ctx,
- cluster,
- trkPB,
- trkTRT,
- dir,
- eta,
- phi,
- deltaEta,
- deltaPhi,
- extrapFrom).isFailure())
- {
- if (m_useLastMeasurement) ATH_MSG_DEBUG("Extrapolation from last measurement failed");
- else ATH_MSG_DEBUG("Extrapolation from perigee failed");
- return false;
- }
- //=======================================================================================///
- //Calculate both always std and rescale
- IEMExtrapolationTools::TrkExtrapDef extrapFrom1 = IEMExtrapolationTools::fromPerigeeRescaled;
- std::vector<double> eta1(4, -999.0);
- std::vector<double> phi1(4, -999.0);
- if (m_extrapolationTool->getMatchAtCalo (ctx,
- cluster,
- trkPB,
- trkTRT,
- dir,
- eta1,
- phi1,
- deltaEtaRes,
- deltaPhiRes,
- extrapFrom1).isFailure())
- {
- ATH_MSG_DEBUG("Extrapolation from rescaled perigee failed");
- return false;
- }
- ATH_MSG_DEBUG("Done with extrapolations");
- deltaPhiRescale = deltaPhiRes[2];
- //Try to match : First std , then rescale, else failure
- if(fabs(deltaEta[2]) < m_narrowDeltaEta &&deltaPhi[2] < m_narrowDeltaPhi && deltaPhi[2] > -m_narrowDeltaPhiBrem){
- ATH_MSG_DEBUG("Matched with Perigee") ;
- }
- else if(m_SecondPassRescale && fabs(deltaEtaRes[2]) < m_narrowDeltaEta &&deltaPhiRes[2] < m_narrowDeltaPhiRescale && deltaPhiRes[2] > -m_narrowDeltaPhiRescaleBrem){
- ATH_MSG_DEBUG("Not Perigee but matched with Rescale") ;
- }
- else{
- ATH_MSG_DEBUG("Normal matched Failed deltaPhi/deltaEta " << deltaPhi[2] <<" / "<< deltaEta[2]<<", No Rescale attempted, isTRTSA = " <<trkTRT);
- ATH_MSG_DEBUG("Rescaled matched Failed deltaPhi/deltaEta " << deltaPhiRes[2] <<" / "<< deltaEtaRes[2] );
- return false;
- }
- if(fabs(deltaPhiRes[2]) > m_MaxDeltaPhiRescale)
- {
- ATH_MSG_DEBUG("DeltaPhiRescaled above maximum: " << deltaPhiRes[2] <<
- " (max: " << m_MaxDeltaPhiRescale << ")" );
- return false;
- }
- } //end if is silicon
+ /*
+ * Try both extrapFrom and extrapFrom1
+ * Typically this is once from perigee
+ * and once from perigee Rescale
+ * */
+ if (m_extrapolationTool->getMatchAtCalo (ctx,
+ &cluster,
+ &trkPB,
+ trkTRT,
+ dir,
+ eta,
+ phi,
+ deltaEta,
+ deltaPhi,
+ extrapFrom).isFailure())
+ {
+ return false;
+ }
+ IEMExtrapolationTools::TrkExtrapDef extrapFrom1 = IEMExtrapolationTools::fromPerigeeRescaled;
+ std::vector<double> eta1(4, -999.0);
+ std::vector<double> phi1(4, -999.0);
+ if (m_extrapolationTool->getMatchAtCalo (ctx,
+ &cluster,
+ &trkPB,
+ trkTRT,
+ dir,
+ eta1,
+ phi1,
+ deltaEtaRes,
+ deltaPhiRes,
+ extrapFrom1).isFailure())
+ {
+ return false;
+ }
+
+ deltaPhiRescale = deltaPhiRes[2];
+ /*
+ * Sanity check for very far away matches
+ */
+ if(fabs(deltaPhiRes[2]) > m_MaxDeltaPhiRescale){
+ ATH_MSG_DEBUG("DeltaPhiRescaled above maximum: " << deltaPhiRes[2] <<
+ " (max: " << m_MaxDeltaPhiRescale << ")" );
+ return false;
+ }
+ /*
+ * Try to match : First std , then rescale, else failure
+ */
+ if(fabs(deltaEta[2]) < m_narrowDeltaEta &&
+ deltaPhi[2] < m_narrowDeltaPhi &&
+ deltaPhi[2] > -m_narrowDeltaPhiBrem){
+ ATH_MSG_DEBUG("Matched with Perigee") ;
+ }
+ else if(m_SecondPassRescale &&
+ fabs(deltaEtaRes[2]) < m_narrowDeltaEta &&
+ deltaPhiRes[2] < m_narrowDeltaPhiRescale
+ && deltaPhiRes[2] > -m_narrowDeltaPhiRescaleBrem){
+ ATH_MSG_DEBUG("Not Perigee but matched with Rescale") ;
+ }
+ else{
+ ATH_MSG_DEBUG("Normal matched Failed deltaPhi/deltaEta " << deltaPhi[2] <<" / "<< deltaEta[2]<<", No Rescale attempted, isTRTSA = " <<trkTRT);
+ ATH_MSG_DEBUG("Rescaled matched Failed deltaPhi/deltaEta " << deltaPhiRes[2] <<" / "<< deltaEtaRes[2] );
+ return false;
+ }
- /*In case of extrapolation from
+ /* In case of extrapolation from
* perigee keep the dPhi from the last measurement
- * This means for success we do another extrapolation
+ * This means we do another extrapolation
* from last
*/
if (!m_useLastMeasurement ) {
@@ -322,8 +318,8 @@ EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
std::vector<double> deltaEta1(4, -999.0);
std::vector<double> deltaPhi1(4, -999.0);
if (m_extrapolationTool->getMatchAtCalo (ctx,
- cluster,
- trkPB,
+ &cluster,
+ &trkPB,
trkTRT,
dir,
eta1,
@@ -335,7 +331,6 @@ EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
ATH_MSG_DEBUG("Extrapolation from last measurement failed");
return false;
}
-
//Always the deltaPhiLast will be from the last measurement
deltaPhiLast = deltaPhi1[2];
}
@@ -344,11 +339,12 @@ EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
deltaPhiLast = deltaPhi[2];
}
ATH_MSG_DEBUG("Rescale dPhi " << deltaPhiRescale);
- ATH_MSG_DEBUG("dPhi Last measurement " << deltaPhiLast);
-
- //Create Track Match struct here
+ ATH_MSG_DEBUG("dPhi Last measurement " << deltaPhiLast);
+ /*
+ * Done with extrapolation
+ * Lets do the matching logic
+ */
TrackMatch trkmatch;
-
//Add the matching variable to the TrackMAtch
for(int i=0; i<4 ;++i){
trkmatch.deltaEta[i]=deltaEta.at(i);
@@ -357,7 +353,7 @@ EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
}
trkmatch.deltaPhiLast=deltaPhiLast;
- //Variables used for the sorting. Note both dPhi will be used.
+ //Variables used for the sorting. Note both dPhi's will be used.
trkmatch.isTRT=trkTRT;
trkmatch.trackNumber=trackNumber;
if (!trkTRT) {
@@ -376,73 +372,64 @@ EMTrackMatchBuilder::inBroadWindow(const EventContext& ctx,
trkmatch.seconddR = -999;
ATH_MSG_DEBUG("TRTSA = " << trkTRT << " DPhi " << trkmatch.dR <<" deltaPhi " << deltaPhi[2]);
}
-
- //Primary Score. The first thing to check in finding the best track match
+ /*
+ * Primary Score.
+ * The first thing to check in
+ * finding the best track match
+ * Prefer pixel over SCT only
+ */
trkmatch.score=0;
- /*Seconday score based on hits to be used for track that are very close
- to each other at the calo, pick the innermost possible one*/
+ int nPixel=0;
+ uint8_t uint8_value=0;
+ //Check number of pixel hits
+ if (trkPB.summaryValue(uint8_value, xAOD::numberOfPixelDeadSensors)){
+ nPixel+=uint8_value;
+ }
+ if (trkPB.summaryValue(uint8_value, xAOD::numberOfPixelHits)){
+ nPixel+=uint8_value;
+ }
+ if (nPixel > 0) {
+ trkmatch.score+=1;
+ }
+ /*
+ * Seconday score based on hits to be used
+ * for track that are very close
+ * to each other at the calo,
+ * pick the longest possible one
+ */
trkmatch.hitsScore=0;
+ if(m_useScoring){
+ //Check the 2 innermost layers
+ int nInnerMost =0;
+ if (trkPB.summaryValue(uint8_value, xAOD::numberOfInnermostPixelLayerHits)){
+ nInnerMost+=uint8_value;
+ }
+ int expectInnermostPixelLayerHit = 0;
+ if (trkPB.summaryValue(uint8_value, xAOD::expectInnermostPixelLayerHit)){
+ expectInnermostPixelLayerHit+=uint8_value;
+ }
+ int nNextToInnerMost =0;
+ if (trkPB.summaryValue(uint8_value, xAOD::numberOfNextToInnermostPixelLayerHits)){
+ nNextToInnerMost+=uint8_value;
+ }
+ int expectNextToInnermostPixelLayerHit = 0;
+ if (trkPB.summaryValue(uint8_value, xAOD::expectNextToInnermostPixelLayerHit)){
+ expectNextToInnermostPixelLayerHit+=uint8_value;
+ }
- if(!trkTRT){ //10 primary points if it is not TRT ==> TRT-only are the weakest candidates ==> score =0
-
- trkmatch.score+=10 ;
- if(m_useScoring){
-
- int nPixel=0;
- uint8_t uint8_value=0;
-
- //Check number of pixel hits
- if (trkPB->summaryValue(uint8_value, xAOD::numberOfPixelDeadSensors)){
- nPixel+=uint8_value;
- }
- if (trkPB->summaryValue(uint8_value, xAOD::numberOfPixelHits)){
- nPixel+=uint8_value;
- }
-
- //20 primary score points if it also have pixel hits
- if (nPixel > 0) {
- trkmatch.score+=20;
- }
-
- //Check the 2 innermost layers
- int nInnerMost =0;
- if (trkPB->summaryValue(uint8_value, xAOD::numberOfInnermostPixelLayerHits)){
- nInnerMost+=uint8_value;
- }
- int expectInnermostPixelLayerHit = 0;
- if (trkPB->summaryValue(uint8_value, xAOD::expectInnermostPixelLayerHit)){
- expectInnermostPixelLayerHit+=uint8_value;
- }
- int nNextToInnerMost =0;
- if (trkPB->summaryValue(uint8_value, xAOD::numberOfNextToInnermostPixelLayerHits)){
- nNextToInnerMost+=uint8_value;
- }
- int expectNextToInnermostPixelLayerHit = 0;
- if (trkPB->summaryValue(uint8_value, xAOD::expectNextToInnermostPixelLayerHit)){
- expectNextToInnermostPixelLayerHit+=uint8_value;
- }
-
- //Secondary score , find the longest track possible,
- //i.e the one with the most inner hists in the pixel
- //npixel*5
- trkmatch.hitsScore+=(nPixel*5);
- //Extra points for NextToInnermost
- if(!expectNextToInnermostPixelLayerHit || nNextToInnerMost>0){
- trkmatch.hitsScore+=5;
- }
- //Extra points for Innermost
- if(!expectInnermostPixelLayerHit || nInnerMost>0){
- trkmatch.hitsScore+=10;
- }
-
- ATH_MSG_DEBUG("Pixel hits : " <<nPixel
- <<" InnerMost : " << nInnerMost
- <<" Expected InnerMost : " << expectInnermostPixelLayerHit
- <<" NextToInnerMost : " << nNextToInnerMost
- <<" Expected NextToInnerMost : " << expectNextToInnermostPixelLayerHit);
-
- }
- }
+ //Secondary score , find the longest track possible,
+ //i.e the one with the most inner hists in the pixel
+ //npixel*5
+ trkmatch.hitsScore+=(nPixel*5);
+ //Extra points for NextToInnermost
+ if(!expectNextToInnermostPixelLayerHit || nNextToInnerMost>0){
+ trkmatch.hitsScore+=5;
+ }
+ //Extra points for Innermost
+ if(!expectInnermostPixelLayerHit || nInnerMost>0){
+ trkmatch.hitsScore+=10;
+ }
+ }
ATH_MSG_DEBUG("Score : " <<trkmatch.score <<" hitsScore : " <<trkmatch.hitsScore);
trackMatches.push_back(trkmatch);
@@ -475,24 +462,29 @@ EMTrackMatchBuilder::isCandidateMatch(const xAOD::CaloCluster* cluster,
if(trkTRT){
Et = cluster->et();
}
- //===========================================================//
+
double etaclus_corrected = CandidateMatchHelpers::CorrectedEta(clusterEta,z_first,isEndCap);
double phiRot = CandidateMatchHelpers::PhiROT(Et,trkEta, track->charge(),r_first ,isEndCap) ;
double phiRotTrack = CandidateMatchHelpers::PhiROT(track->pt(),trkEta, track->charge(),r_first ,isEndCap) ;
- //===========================================================//
+
double deltaPhiStd = P4Helpers::deltaPhi(cluster->phiBE(2), trkPhi);
double trkPhiCorr = P4Helpers::deltaPhi(trkPhi, phiRot);
double deltaPhi2 = P4Helpers::deltaPhi(cluster->phiBE(2), trkPhiCorr);
double trkPhiCorrTrack = P4Helpers::deltaPhi(trkPhi, phiRotTrack);
double deltaPhi2Track = P4Helpers::deltaPhi(cluster->phiBE(2), trkPhiCorrTrack);
- //===========================================================//
+
//check eta match . Both metrics need to fail in order to disgard the track
- if ( (!trkTRT) && (fabs(cluster->etaBE(2) - trkEta) > 2.*m_broadDeltaEta) && (fabs( etaclus_corrected- trkEta) > 2.*m_broadDeltaEta)){
- ATH_MSG_DEBUG(" Fails broad window eta match (track eta, cluster eta, cluster eta corrected): ( " << trkEta << ", " << cluster->etaBE(2) <<", "<<etaclus_corrected<<")" );
+ if ( (!trkTRT) &&
+ (fabs(cluster->etaBE(2) - trkEta) > 2.*m_broadDeltaEta) &&
+ (fabs( etaclus_corrected- trkEta) > 2.*m_broadDeltaEta)){
+ ATH_MSG_DEBUG(" Fails broad window eta match (track eta, cluster eta, cluster eta corrected): ( "
+ << trkEta << ", " << cluster->etaBE(2) <<", "<<etaclus_corrected<<")" );
return false;
}
//It has to fail all metrics in order to be disgarded
- else if ( (fabs(deltaPhi2) > 2.*m_broadDeltaPhi) && (fabs(deltaPhi2Track) > 2.*m_broadDeltaPhi) && (fabs(deltaPhiStd) > 2.*m_broadDeltaPhi) ){
+ else if ( (fabs(deltaPhi2) > 2.*m_broadDeltaPhi) &&
+ (fabs(deltaPhi2Track) > 2.*m_broadDeltaPhi) &&
+ (fabs(deltaPhiStd) > 2.*m_broadDeltaPhi) ){
ATH_MSG_DEBUG(" Fails broad window eta match (track eta, cluster eta, cluster eta corrected): ( " << trkEta << ", " << cluster->etaBE(2) <<", "<<etaclus_corrected<<")" );
return false;
}
@@ -503,9 +495,8 @@ EMTrackMatchBuilder::isCandidateMatch(const xAOD::CaloCluster* cluster,
}
bool EMTrackMatchBuilder::TrackMatchSorter(const EMTrackMatchBuilder::TrackMatch& match1,
- const EMTrackMatchBuilder::TrackMatch& match2)
+ const EMTrackMatchBuilder::TrackMatch& match2)
{
-
if(match1.score!= match2.score) {//Higher score
return match1.score>match2.score;
}
@@ -515,13 +506,10 @@ bool EMTrackMatchBuilder::TrackMatchSorter(const EMTrackMatchBuilder::TrackMatch
if(fabs(match1.seconddR-match2.seconddR)>1e-02 ){ //Can the second distance separate them?
return match1.seconddR < match2.seconddR ;
}
-
if((match1.hitsScore!= match2.hitsScore)){ //use the one with more pixel
return match1.hitsScore>match2.hitsScore;
}
-
}
-
//closest DR
return match1.dR < match2.dR ;
}
diff --git a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.h b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.h
index aeddafe3bcfd7f2e918d54c525f993c4293c2ed3..6eb2a7c5c6930fcb44fe9d3f4520f61679196ac0 100644
--- a/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.h
+++ b/Reconstruction/egamma/egammaTools/src/EMTrackMatchBuilder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef EGAMMATOOLS_EMTRACKMATCHBUILDER_H
@@ -7,13 +7,13 @@
/**
@class EMTrackMatchBuilder
- EMTrackMatch data object builder.
+ EMTrackMatch data object builder.
@author H. Ma
@author RD schaffer
@author Thomas Koffas
@author Christos Anastopoulos
-The matching of a track to a cluster is driven by the EMTrackMatchBuilder tool located in the Reconstruction/egamma/egammaTools package.
-*/
+ The matching of a track to a cluster is driven by the EMTrackMatchBuilder tool located in the Reconstruction/egamma/egammaTools package.
+ */
// INCLUDE HEADER FILES:
#include "AthenaBaseComps/AthAlgTool.h"
@@ -34,7 +34,7 @@ namespace Reco { class ITrackToVertex; }
class EMTrackMatchBuilder : public AthAlgTool, virtual public IEMTrackMatchBuilder
{
- public:
+public:
/** @brief Default constructor*/
EMTrackMatchBuilder(const std::string& type,
@@ -43,13 +43,14 @@ class EMTrackMatchBuilder : public AthAlgTool, virtual public IEMTrackMatchBuild
/** @brief Destructor*/
~EMTrackMatchBuilder();
-
+
/** @brief Gaudi algorithm hooks*/
StatusCode initialize() override;
/** @brief execute method*/
virtual StatusCode executeRec(const EventContext& ctx, egammaRec* eg) const override final;
/** @brief execute method*/
- virtual StatusCode trackExecute(const EventContext& ctx, egammaRec* eg, const xAOD::TrackParticleContainer * trackPC) const override final;
+ virtual StatusCode trackExecute(const EventContext& ctx, egammaRec* eg,
+ const xAOD::TrackParticleContainer * trackPC) const override final;
private:
@@ -73,105 +74,101 @@ private:
static bool TrackMatchSorter(const TrackMatch& match1, const TrackMatch& match2);
/** @brief Compute for tracks passing the loose matching
- the distance between track extrapolated to 2nd sampling and cluster */
+ the distance between track extrapolated to 2nd sampling and cluster */
bool inBroadWindow(const EventContext& ctx,
std::vector<TrackMatch>& trackMatches,
- const xAOD::CaloCluster* cluster,
+ const xAOD::CaloCluster& cluster,
int trackNumber,
bool isTRT,
- const xAOD::TrackParticle* trkPB,
+ const xAOD::TrackParticle& trkPB,
const Trk::PropDirection dir) const;
/** @brief Loose track-cluster matching */
-// bool isCandidateMatch(const CaloCluster& cluster,
-// bool isTRT,
-// const Trk::Perigee* candidatePerigee,
-// bool flip) const;
bool isCandidateMatch(const xAOD::CaloCluster* cluster,
bool isTRT,
const xAOD::TrackParticle* track,
bool flip) const;
-
-
+
+
// configuration:
/** @brief name of TrackParticle container in TDS*/
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_TrackParticlesKey { this,
- "TrackParticlesName", "",
- "Name of the input track particle container"};
-
+ "TrackParticlesName", "",
+ "Name of the input track particle container"};
+
/** @brief broad cut on deltaEta*/
Gaudi::Property<double> m_broadDeltaEta {this,
- "broadDeltaEta", 0.1, "Value of broad cut for delta eta"};
+ "broadDeltaEta", 0.1, "Value of broad cut for delta eta"};
/** @brief broad cut on deltaPhi*/
Gaudi::Property<double> m_broadDeltaPhi {this,
- "broadDeltaPhi", 0.1, "Value of broad cut for delta phi"};
+ "broadDeltaPhi", 0.1, "Value of broad cut for delta phi"};
/** @brief narrow cut on deltaEta*/
Gaudi::Property<double> m_narrowDeltaEta {this,
- "narrowDeltaEta", 0.05,
- "Value of narrow cut for delta eta"};
+ "narrowDeltaEta", 0.05,
+ "Value of narrow cut for delta eta"};
/** @brief narrow cut on deltaPhiRescale*/
Gaudi::Property<double> m_narrowDeltaPhi {this,
- "narrowDeltaPhi", 0.05,
- "Value of the narrowd cut for delta phi"};
+ "narrowDeltaPhi", 0.05,
+ "Value of the narrowd cut for delta phi"};
/** @brief narrow cut on deltaPhi for electrons*/
Gaudi::Property<double> m_narrowDeltaPhiBrem {this,
- "narrowDeltaPhiBrem", 0.1,
- "Value of the narrow cut for delta phi Brem"};
+ "narrowDeltaPhiBrem", 0.1,
+ "Value of the narrow cut for delta phi Brem"};
/** @brief narrow cut on deltaPhiRescale*/
Gaudi::Property<double> m_narrowDeltaPhiRescale {this,
- "narrowDeltaPhiRescale", 0.05,
- "Value of the narrow cut for delta phi Rescale"};
+ "narrowDeltaPhiRescale", 0.05,
+ "Value of the narrow cut for delta phi Rescale"};
/** @brief narrow cut on deltaPhiRescale for electrons*/
Gaudi::Property<double> m_narrowDeltaPhiRescaleBrem {this,
- "narrowDeltaPhiRescaleBrem", 0.1,
- "Value of the narrow cut for delta phi Rescale Brem"};
+ "narrowDeltaPhiRescaleBrem", 0.1,
+ "Value of the narrow cut for delta phi Rescale Brem"};
/** @Maximum deltaPhi (Res) allowed for a match */
Gaudi::Property<double> m_MaxDeltaPhiRescale {this,
- "MaxDeltaPhiRescale", 0.25,
- "Maximum Value of the deltaPhi rescale"};
+ "MaxDeltaPhiRescale", 0.25,
+ "Maximum Value of the deltaPhi rescale"};
/** @brief flag to turn on/off use of isCandidateMatch*/
Gaudi::Property<bool> m_useCandidateMatch {this,
- "useCandidateMatch", true,
- "Boolean to use candidate matching"};
+ "useCandidateMatch", true,
+ "Boolean to use candidate matching"};
/** @brief flag to either use last measurement hit or perigee */
Gaudi::Property<bool> m_useLastMeasurement {this,
- "useLastMeasurement", false,
- "Boolean to use last measurement for extrapolation, otherwise use perigee"};
+ "useLastMeasurement", false,
+ "Boolean to use last measurement for extrapolation, otherwise use perigee"};
/** @brief Boolean to favor tracks with Pixel hits*/
Gaudi::Property<bool> m_useScoring {this,
- "useScoring", true,
- "Boolean to favor tracks with Pixel hits"};
+ "useScoring", true,
+ "Boolean to favor tracks with Pixel hits"};
/** @brief Boolean to use Rescale in the metric*/
Gaudi::Property<bool> m_UseRescaleMetric {this,
- "UseRescaleMetric", true, "Use Rescale Metric"};
+ "UseRescaleMetric", true, "Use Rescale Metric"};
/** @brief Boolean to do second pass with Rescale*/
Gaudi::Property<bool> m_SecondPassRescale {this,
- "SecondPassRescale", true, "Do second pass with rescale"};
+ "SecondPassRescale", true, "Do second pass with rescale"};
/** @brief TrackToCalo extrapolation tool. Handles Trk::ParametersBase as input.
- Extrapolation starts from the last measurement of the track. The
- InDetExtrapolator is used, with all proper material effects inside the
- part of the ID that is traversed. Both charged and neutral particles
- are handled. */
+ Extrapolation starts from the last measurement of the track. The
+ InDetExtrapolator is used, with all proper material effects inside the
+ part of the ID that is traversed. Both charged and neutral particles
+ are handled. */
ToolHandle<IEMExtrapolationTools> m_extrapolationTool {this,
- "ExtrapolationTool", "EMExtrapolationTools",
- "Name of the extrapolation tool"};
+ "ExtrapolationTool", "EMExtrapolationTools",
+ "Name of the extrapolation tool"};
/** @brief */
Gaudi::Property<bool> m_isCosmics {this,
- "isCosmics", false, "Boolean for use of cosmics"};
+ "isCosmics", false, "Boolean for use of cosmics"};
};
#endif
diff --git a/Simulation/Digitization/test/DigitizationConfigNew_test.py b/Simulation/Digitization/test/DigitizationConfigNew_test.py
index 90dab2c92657657473bdeeff0db051705f256f3c..b79ec896a6a60df94bb32f9f7d77f28cc896e27d 100755
--- a/Simulation/Digitization/test/DigitizationConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationConfigNew_test.py
@@ -46,20 +46,6 @@ acc.merge(TGC_DigitizerCfg(ConfigFlags))
acc.merge(RPC_DigitizerCfg(ConfigFlags))
acc.merge(CSC_DigitBuilderCfg(ConfigFlags))
acc.merge(LArDigitMakerCfg(ConfigFlags))
-# FIXME once OutputStreamCfg merges correctly
-from BCM_Digitization.BCM_DigitizationConfigNew import BCM_ItemList
-from SCT_Digitization.SCT_DigitizationConfigNew import SCT_ItemList
-from TRT_Digitization.TRT_DigitizationConfigNew import TRT_ItemList
-from PixelDigitization.PixelDigitizationConfigNew import PixelItemList
-from MDT_Digitization.MDT_DigitizationConfigNew import MDT_ItemList
-from TGC_Digitization.TGC_DigitizationConfigNew import TGC_ItemList
-from RPC_Digitization.RPC_DigitizationConfigNew import RPC_ItemList
-from CSC_Digitization.CSC_DigitizationConfigNew import CSC_ItemList
-from LArDigitization.LArDigitizationConfigNew import LArItemList
-from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-ItemList = BCM_ItemList() + SCT_ItemList() + TRT_ItemList() + PixelItemList() + MDT_ItemList() + TGC_ItemList() + RPC_ItemList() + CSC_ItemList() + LArItemList()
-ItemList = list(set(ItemList)) # remove duplicates
-acc.merge(OutputStreamCfg(ConfigFlags, "RDO", ItemList))
# Dump config
acc.getService("StoreGateSvc").Dump = True
acc.getService("ConditionStore").Dump = True
diff --git a/Simulation/FastShower/FastCaloSim/FastCaloSim/BasicCellBuilderTool.h b/Simulation/FastShower/FastCaloSim/FastCaloSim/BasicCellBuilderTool.h
index 711b45a6bdbc8dd8f1272ef1c61251f18352ff2e..0e9dbbb74e99a375c8f094cb2b5055708fc0fbc6 100755
--- a/Simulation/FastShower/FastCaloSim/FastCaloSim/BasicCellBuilderTool.h
+++ b/Simulation/FastShower/FastCaloSim/FastCaloSim/BasicCellBuilderTool.h
@@ -165,13 +165,14 @@ public:
const EventContext& ctx) const override;
protected:
- void init_all_maps();
+ void init_all_maps(const CaloDetDescrManager* caloDDM);
void init_cell(cellinfo_map& map,const CaloDetDescrElement* theDDE);
void init_volume(cellinfo_map& map);
- void find_phi0();
+ void find_phi0(const CaloDetDescrManager* caloDDM);
// void init_map(cellinfo_map& map, int layer); //layer 1=EM 3=HAD
- void findCells(cellinfo_vec & cell_vec, double eta_min, double eta_max, double phi_min, double phi_max, int layer);
+ void findCells(const CaloDetDescrManager* caloDDM,
+ cellinfo_vec & cell_vec, double eta_min, double eta_max, double phi_min, double phi_max, int layer);
void addCell(CaloCellContainer * theCellContainer, int etabin, int phibin, double energy, cellinfo_map& map );
@@ -203,9 +204,7 @@ protected:
double zmid(CaloCell_ID_FCS::CaloSample sample,double eta) const;
double zent(CaloCell_ID_FCS::CaloSample sample,double eta) const;
- const CaloDetDescrManager* m_caloDDM;
const CaloCell_ID* m_caloCID;
- const AtlasDetectorID* m_atlas_id ;
bool m_isCaloBarrel[CaloCell_ID_FCS::MaxSample];
bool isCaloBarrel(CaloCell_ID_FCS::CaloSample sample) const {return m_isCaloBarrel[sample];};
diff --git a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
index 96dc4db01acbbeac3e6e6ed1a1193acbea9038bd..ed89a21ac7d43d221055ebcd0f967ba47c5f8efe 100755
--- a/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
+++ b/Simulation/FastShower/FastCaloSim/FastCaloSim/FastShowerCellBuilderTool.h
@@ -113,6 +113,7 @@ public:
const EventContext& ctx) const;
StatusCode callBack( IOVSVC_CALLBACK_ARGS );
+ StatusCode caloAligned( IOVSVC_CALLBACK_ARGS );
typedef std::map<int,int> MCdo_simul_state;
typedef std::vector<const HepMC::GenParticle*> MCparticleCollection ;
diff --git a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.py b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.py
index a0dec9d9902fe3dfe4451f03a9b7abdc268d4b6d..64ca4f5cdb1ac8d0ed9dc9bec739371dbfb5f90b 100644
--- a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.py
+++ b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.py
@@ -72,42 +72,46 @@ exp_cells = {
(0, 2, 1, 1, 1, 25) : 572.2,
(0, 2, 1, 1, 2, 25) : 12659.3,
(0, 2, 2, 1, 1, 101) : 581.2,
- (0, 2, 2, 1, 2, 100) : 1557.3,
+ (0, 2, 2, 1, 2, 100) : 1557.8,
(0, 2, 2, 1, 2, 101) : 9685.9,
- (0, 2, 2, 1, 2, 102) : 1053.7,
+ (0, 2, 2, 1, 2, 102) : 1053.3,
(0, 2, 2, 1, 3, 101) : 716.1,
(0, 2, 2, 1, 29, 149) : 1217.4,
(0, 2, 2, 1, 29, 150) : 2093.2,
(0, 2, 2, 1, 29, 151) : 461.8,
- (0, 2, 2, 1, 30, 148) : 492.0,
- (0, 2, 2, 1, 30, 149) : 6877.1,
+ (0, 2, 2, 1, 30, 148) : 492.1,
+ (0, 2, 2, 1, 30, 149) : 6877.4,
(0, 2, 2, 1, 30, 150) : 12497.6,
- (0, 2, 2, 1, 30, 151) : 1600.2,
+ (0, 2, 2, 1, 30, 151) : 1599.9,
(0, 2, 2, 1, 31, 148) : 378.3,
(0, 2, 2, 1, 31, 149) : 1359.0,
(0, 2, 2, 1, 31, 150) : 2037.2,
(0, 2, 2, 1, 31, 151) : 651.7,
(0, 2, 2, 1, 32, 150) : 294.3,
- (0, 2, 3, 0, 13, 148) : 859.8,
- (0, 2, 3, 0, 13, 149) : 6645.7,
- (0, 2, 3, 0, 13, 150) : 13592.1,
- (0, 2, 3, 0, 13, 151) : 2535.4,
- (0, 2, 3, 0, 14, 148) : 561.8,
- (0, 2, 3, 0, 14, 149) : 2037.4,
- (0, 2, 3, 0, 14, 150) : 3168.5,
- (0, 2, 3, 0, 14, 151) : 982.9,
- (1, 2, 0, 0, 6, 36) : 1028.7,
- (1, 2, 0, 0, 6, 37) : 10040.6,
- (1, 2, 0, 0, 6, 38) : 1319.7,
- (1, 2, 0, 0, 7, 36) : 1187.8,
- (1, 2, 0, 0, 7, 37) : 5799.3,
- (1, 2, 0, 0, 8, 37) : 1021.9,
- (1, 2, 1, 0, 6, 36) : 288.7,
- (1, 2, 1, 0, 6, 37) : 1598.3,
- (1, 2, 1, 0, 6, 38) : 94.8,
- (1, 2, 1, 0, 7, 36) : 330.9,
- (1, 2, 1, 0, 7, 37) : 887.8,
- (1, 2, 1, 0, 7, 38) : 525.4,
+ (0, 2, 3, 0, 13, 148) : 615.8,
+ (0, 2, 3, 0, 13, 149) : 6715.2,
+ (0, 2, 3, 0, 13, 150) : 13650.3,
+ (0, 2, 3, 0, 13, 151) : 2502.6,
+ (0, 2, 3, 0, 14, 148) : 487.0,
+ (0, 2, 3, 0, 14, 149) : 1922.1,
+ (0, 2, 3, 0, 14, 150) : 3057.3,
+ (0, 2, 3, 0, 14, 151) : 1206.9,
+ (1, 2, 0, 0, 5, 36) : 615.1,
+ (1, 2, 0, 0, 5, 37) : 294.7,
+ (1, 2, 0, 0, 6, 36) : 844.9,
+ (1, 2, 0, 0, 6, 37) : 12346.6,
+ (1, 2, 0, 0, 6, 38) : 513.5,
+ (1, 2, 0, 0, 7, 36) : 760.9,
+ (1, 2, 0, 0, 7, 37) : 3984.5,
+ (1, 2, 0, 0, 7, 38) : 1196.1,
+ (1, 2, 0, 0, 8, 37) : 482.5,
+ (1, 2, 0, 0, 8, 38) : 369.4,
+ (1, 2, 1, 0, 6, 36) : 66.3,
+ (1, 2, 1, 0, 6, 37) : 1233.5,
+ (1, 2, 1, 0, 6, 38) : 595.2,
+ (1, 2, 1, 0, 7, 36) : 109.5,
+ (1, 2, 1, 0, 7, 37) : 1353.6,
+ (1, 2, 1, 0, 7, 38) : 178.6,
(3, 3, -1, 28, 15, 3) : 4606.0,
(3, 3, -1, 29, 15, 3) : 623.9,
(3, 3, 1, 24, 15, 3) : 1149.3,
diff --git a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
index 3ea5800e6bc04eea8dda3256f677b5a95eda4627..10f1163e596a0b1747e9284a5f25695ff9458d2e 100644
--- a/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
+++ b/Simulation/FastShower/FastCaloSim/share/FastShowerCellBuilderTool_test.ref
@@ -1,14 +1,14 @@
-Wed May 15 01:12:12 CEST 2019
+Fri May 31 05:35:29 CEST 2019
Preloading tcmalloc_minimal.so
Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.2] [x86_64-centos7-gcc8-opt] [master-LArHV-DCS-reco/813f5e3736] -- built on [2019-05-15T0033]
+Py:Athena INFO using release [WorkDir-22.0.2] [x86_64-centos7-gcc8-opt] [atlas-work3/e40ca7281d0] -- built on [2019-05-30T1755]
Py:Athena INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
Py:Athena INFO executing ROOT6Setup
Py:Athena INFO including file "AthenaCommon/Execution.py"
Py:Athena INFO including file "FastCaloSim/FastShowerCellBuilderTool_test.py"
SetGeometryVersion.py obtained major release version 22
Py:Athena INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb INFO Read module info for 5467 configurables from 18 genConfDb files
+Py:ConfigurableDb INFO Read module info for 5480 configurables from 34 genConfDb files
Py:ConfigurableDb INFO No duplicates have been found: that's good !
EventInfoMgtInit: Got release version Athena-22.0.2
Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
@@ -23,7 +23,7 @@ Py:TileInfoConf. INFO Changing default TileCondToolNoiseSample configuration
Py:TileInfoConf. INFO Changing default TileCondToolTiming configuration to COOL source
Py:TileConditions_jobOptions.py INFO Adjusting TileInfo to return cell noise for Opt.Filter without iterations
Py:Athena INFO Importing MagFieldServices.SetupField
-Py:ConfiguredFactory INFO imported 135 confDb modules in 0.24 seconds
+Py:ConfiguredFactory INFO imported 134 confDb modules in 1.79 seconds
Py:Athena INFO Importing MagFieldServices.MagFieldServicesConfig
Py:FastCaloSimFactory::configure: INFO now configure the non-interacting propagator...
Py:FastCaloSimFactory::configure: INFO configure nono-interacting propagator finished
@@ -84,14 +84,14 @@ ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to leve
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v31r0)
- running on aibuild028.cern.ch on Wed May 15 01:12:25 2019
+ running on lxplus737.cern.ch on Fri May 31 05:35:50 2019
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
StatusCodeSvc INFO initialize
AthDictLoaderSvc INFO in initialize...
AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 7003 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 7068 CLIDRegistry entries for module ALL
CoreDumpSvc INFO install f-a-t-a-l handler... (flag = -1)
CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
@@ -100,8 +100,8 @@ PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.x
PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
PoolSvc INFO Frontier compression level set to 5
DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://lcgft-atlas.gridpp.rl.ac.uk:3128/frontierATLAS)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy-wigner.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host aibuild028.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
+DBReplicaSvc INFO Total of 10 servers found for host lxplus737.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
PoolSvc INFO Successfully setup replica sorting algorithm
PoolSvc INFO Setting up APR FileCatalog and Streams
PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
@@ -254,7 +254,7 @@ TileDddbManager INFO n_tilb = 21
TileDddbManager INFO n_tileSwitches = 1
CaloIDHelper_ID... INFO in createObj: creating a TileID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/TileNeighbour_reduced.txt
TileHWIDDetDesc... INFO in createObj: creating a TileHWID helper object in the detector store
TileHWID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
@@ -266,47 +266,23 @@ CaloIDHelper_ID... INFO in createObj: creating a LArHEC_ID helper object in th
AtlasDetectorID INFO initialize_from_dictionary - OK
CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCal2DNeighbors-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsNext-April2011.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCal3DNeighborsPrev-April2011.txt
CaloIDHelper_ID... INFO in createObj: creating a LArMiniFCAL_ID helper object in the detector store
AtlasDetectorID INFO initialize_from_dictionary - OK
LArMiniFCAL_ID INFO initialize_from_dict - LArCalorimeter dictionary does NOT contain miniFCAL description. Unable to initialize LArMiniFCAL_ID.
AtlasDetectorID INFO initialize_from_dictionary - OK
TileDetDescrMan... INFO Entering create_elements()
ClassIDSvc INFO getRegistryEntries: read 66 CLIDRegistry entries for module ALL
-TileInfoLoader INFO Initializing....TileInfoLoader
-TileInfoLoader INFO New ATLAS geometry detected: ATLAS-R2-2016-01-00-01 (010001) version 10001
TileInfoLoader INFO Changing TTL1 calib from 4.1 to 6.9
TileInfoLoader INFO Changing TTL1 noise sigma from 2.5 to 2.8
-TileInfoLoader INFO ATLAS IBL geometry - special sampling fractions for gap/crack scin are allowed
-TileInfoLoader INFO Special C10 in EB module 39
-TileInfoLoader INFO Special C10 in EB module 40
-TileInfoLoader INFO Special C10 in EB module 41
-TileInfoLoader INFO Special C10 in EB module 42
-TileInfoLoader INFO Special C10 in EB module 55
-TileInfoLoader INFO Special C10 in EB module 56
-TileInfoLoader INFO Special C10 in EB module 57
-TileInfoLoader INFO Special C10 in EB module 58
-TileInfoLoader INFO Sampling fraction for normal cells 1/34
-TileInfoLoader INFO Sampling fraction for special C10 cells 1/45
-TileInfoLoader INFO Sampling fraction for E1 cells 1/125
-TileInfoLoader INFO Sampling fraction for E2 cells 1/107
-TileInfoLoader INFO Sampling fraction for E3 cells 1/97
-TileInfoLoader INFO Sampling fraction for E4 cells 1/75
-TileInfoLoader INFO Sampling fraction for E4' cells 1/75
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/pulsehi_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/pulselo_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/pulse_adder_tower_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/pulse_adder_muonRcv_physics.dat
-TileInfoLoader INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/pulse_adder_muon_physics.dat
CaloIDHelper_ID... INFO in createObj: creating a CaloLVL1_ID helper object in the detector store
CaloLVL1_ID INFO initialize_from_dictionary
AtlasDetectorID INFO initialize_from_dictionary - OK
TileCablingSvc INFO RUN2 ATLAS geometry flag detected for geometry: ATLAS-R2-2016-01-00-01
TileCablingSvc INFO Cabling for RUN2 (2014-2017) ATLAS geometry is set via jobOptions
TileCablingSvc INFO Setting Cabling type to 4
-TileInfoLoader INFO Placed TileInfo object in the detector store.
AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
ClassIDSvc INFO getRegistryEntries: read 265 CLIDRegistry entries for module ALL
CondInputLoader INFO Initializing CondInputLoader...
@@ -358,31 +334,6 @@ PyComponentMgr INFO Initializing PyComponentMgr...
testalg1 INFO Initializing testalg1...
ClassIDSvc INFO getRegistryEntries: read 2005 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO Initialisating started
-CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
-CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
-ClassIDSvc INFO getRegistryEntries: read 161 CLIDRegistry entries for module ALL
-CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
-CaloDM_ID INFO initialize_from_dictionary
-AtlasDetectorID INFO initialize_from_dictionary - OK
-CaloIDHelper_ID... INFO in createObj: creating a TTOnlineID helper object in the detector store
-TTOnlineID INFO initialize_from_dictionary
-AtlasDetectorID INFO initialize_from_dictionary - OK
-CaloIDHelper_ID... INFO in createObj: creating a CaloCell_SuperCell_ID helper object in the detector store
-CaloIDHelper_ID... INFO in createObj: creating a LArEM_SuperCell_ID helper object in the detector store
-AtlasDetectorID INFO initialize_from_dictionary - OK
-CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper object in the detector store
-AtlasDetectorID INFO initialize_from_dictionary - OK
-CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
-AtlasDetectorID INFO initialize_from_dictionary - OK
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
-LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
-CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
-AtlasDetectorID INFO initialize_from_dictionary - OK
-TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-13T2132/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
-AtlasDetectorID INFO initialize_from_dictionary - OK
-CaloIdMgrDetDes... INFO Finished
-CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
PartPropSvc INFO No table format type specified for "PDGTABLE.MeV". Assuming PDG
--------------- HepPDT Version 2.06.01 ---------------
found 298 particles
@@ -405,14 +356,6 @@ ToolSvc.AtlasEn... INFO initialize()
ToolSvc.AtlasMu... INFO initialize() successful
ToolSvc.TimedEx... INFO initialize() successful
ToolSvc.tool1 INFO retrieved TBCaloCoordinate
-ToolSvc.tool1 INFO ========================= Init EM map =============================
-ToolSvc.tool1 INFO ========================= Init EM fine map ========================
-ToolSvc.tool1 INFO ========================= Init HAD map ============================
-ToolSvc.tool1 INFO ========================= Init EM celllist map =============================
-ToolSvc.tool1 INFO ========================= Init celllist maps sample 0 ... 23
-ToolSvc.tool1 INFO Building all maps
-ToolSvc.tool1 INFO Building all maps finished : n(total)=187652 n(volume>0)=179842 n(used)=177540
-ToolSvc.tool1 INFO ========================= Init volume all maps =========================
ToolSvc.tool1 INFO McCollection=TruthEvent
ToolSvc.tool1 INFO ==== LoadParametrizations from file : /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/atlas/offline/ReleaseData/v20/FastCaloSim/v1/ParticleEnergyParametrization.root ====
ToolSvc.tool1 INFO LoadParametrizations : EnergyResults
@@ -513,6 +456,10 @@ ToolSvc.CaloTra... INFO Retrieved tool TrackingVolumeCreator = PublicToolHandl
ToolSvc.LArVolu... INFO Retrieved tool TrackingVolumeHelper = PublicToolHandle('Trk::TrackingVolumeHelper/TrackingVolumeHelper')
ToolSvc.Trackin... INFO initialize() successful
ToolSvc.LArVolu... INFO Retrieved tool TrackingVolumeCreator = PublicToolHandle('Trk::CylinderVolumeCreator/TrackingVolumeCreator')
+ClassIDSvc INFO getRegistryEntries: read 750 CLIDRegistry entries for module ALL
+CaloIDHelper_ID... INFO in createObj: creating a CaloDM_ID helper object in the detector store
+CaloDM_ID INFO initialize_from_dictionary
+AtlasDetectorID INFO initialize_from_dictionary - OK
ToolSvc.LArReco... INFO Entering method ScanTree()
ToolSvc.LArReco... INFO LArRecoMaterialTool successfully initialized
ToolSvc.LArReco... INFO DecodeVersionKey found : ATLAS-R2-2016-01-00-01 ATLAS-R2-2016-01-00-01
@@ -520,6 +467,28 @@ ToolSvc.LArReco... INFO LAr simplified geometry will use : ATLAS-R2-2016-01-00
ToolSvc.LArReco... INFO did access RDBAccessSvc
ToolSvc.LArReco... INFO LArRecoSimpleGeomTool successfully initialized
ToolSvc.CaloDep... INFO CaloDepthTool ToolSvc.CaloDepthTool successfully initialised, will provide entrance (default)
+CaloMgrDetDescrCnv INFO in createObj: creating a Calo Detector Manager object in the detector store
+CaloIdMgrDetDes... INFO in createObj: creating a CaloDescrManager object in the detector store
+ClassIDSvc INFO getRegistryEntries: read 161 CLIDRegistry entries for module ALL
+CaloIDHelper_ID... INFO in createObj: creating a TTOnlineID helper object in the detector store
+TTOnlineID INFO initialize_from_dictionary
+AtlasDetectorID INFO initialize_from_dictionary - OK
+CaloIDHelper_ID... INFO in createObj: creating a CaloCell_SuperCell_ID helper object in the detector store
+CaloIDHelper_ID... INFO in createObj: creating a LArEM_SuperCell_ID helper object in the detector store
+AtlasDetectorID INFO initialize_from_dictionary - OK
+CaloIDHelper_ID... INFO in createObj: creating a LArHEC_SuperCell_ID helper object in the detector store
+AtlasDetectorID INFO initialize_from_dictionary - OK
+CaloIDHelper_ID... INFO in createObj: creating a LArFCAL_SuperCell_ID helper object in the detector store
+AtlasDetectorID INFO initialize_from_dictionary - OK
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells2DNeighborsNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsNextNew-April2014.txt
+LArFCAL_Base_ID INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/FCalSuperCells3DNeighborsPrevNew-April2014.txt
+CaloIDHelper_ID... INFO in createObj: creating a Tile_SuperCell_ID helper object in the detector store
+AtlasDetectorID INFO initialize_from_dictionary - OK
+TileNeighbour INFO Reading file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2019-05-29T2127/Athena/22.0.2/InstallArea/x86_64-centos7-gcc8-opt/share/TileSuperCellNeighbour.txt
+AtlasDetectorID INFO initialize_from_dictionary - OK
+CaloIdMgrDetDes... INFO Finished
+CaloIdMgrDetDes... INFO Initializing CaloIdMgr from values in CaloIdMgrDetDescrCnv
ToolSvc.LArVolu... INFO Retrieved tool CaloSurfaceBuilder = PublicToolHandle('CaloSurfaceBuilder')
ToolSvc.LArVolu... INFO ToolSvc.LArVolumeBuilder initialize() successful
ToolSvc.CaloTra... INFO Retrieved tool LArVolumeBuilder = PublicToolHandle('LAr::LArVolumeBuilder/LArVolumeBuilder')
@@ -540,6 +509,55 @@ RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond09/cond
Domain[ROOT_All] INFO -> Access DbDatabase READ [ROOT_All] 8667C6F2-1559-DE11-A611-000423D9A21A
Domain[ROOT_All] INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root
RootDatabase.open INFO /cvmfs/atlas-condb.cern.ch/repo/conditions/cond08/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
+ToolSvc.tool1 INFO ========================= Init EM map =============================
+ToolSvc.tool1 INFO ========================= Init EM fine map ========================
+ToolSvc.tool1 INFO ========================= Init HAD map ============================
+ToolSvc.tool1 INFO ========================= Init EM celllist map =============================
+ToolSvc.tool1 INFO ========================= Init celllist maps sample 0 ... 23
+ToolSvc.tool1 INFO Building all maps
+ToolSvc.tool1 INFO Building all maps finished : n(total)=187652 n(volume>0)=179842 n(used)=177540
+ToolSvc.tool1 INFO ========================= Init volume all maps =========================
+ToolSvc.tool1 WARNING empty map cell EM: eta=-4.85 phi=-2.21405
+ToolSvc.tool1 WARNING empty map cell EM: eta=-4.85 phi=-1.82135
+ToolSvc.tool1 WARNING empty map cell EM: eta=-4.85 phi=-1.33048
+ToolSvc.tool1 WARNING empty map cell EM: eta=4.85 phi=-2.21405
+ToolSvc.tool1 WARNING empty map cell EM: eta=4.85 phi=-1.82135
+ToolSvc.tool1 WARNING empty map cell EM: eta=4.85 phi=-1.33048
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-3.13444
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-3.03627
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.93809
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.83992
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.74174
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.64357
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.54539
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.44722
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.34904
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.25087
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=-2.15269
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=2.65787
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=2.75605
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=2.85422
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=2.95239
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.7125 phi=3.05057
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-3.13444
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-3.03627
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-2.93809
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-2.83992
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-2.74174
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-2.64357
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-2.54539
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-2.44722
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-2.34904
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=-2.25087
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=2.65787
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=2.75605
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=2.85422
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=2.95239
+ToolSvc.tool1 WARNING empty map cell EM fine: eta=-2.6125 phi=3.05057
+ToolSvc.tool1 WARNING empty map cell HAD: eta=-4.85 phi=-1.81623
+ToolSvc.tool1 WARNING empty map cell HAD: eta=-4.85 phi=-1.32536
+ToolSvc.tool1 WARNING empty map cell HAD: eta=4.85 phi=-1.81623
+ToolSvc.tool1 WARNING empty map cell HAD: eta=4.85 phi=-1.32536
AthenaEventLoopMgr INFO ===>>> start processing event #1, run #1 0 events processed so far <<<===
IOVDbSvc INFO Opening COOL connection for COOLOFL_TILE/OFLP200
IOVDbFolder INFO HVS tag OFLCOND-RUN12-SDR-35 resolved to TileOfl02CalibCes-SIM-06 for folder /TILE/OFL02/CALIB/CES
@@ -564,15 +582,13 @@ TileBadChannels... INFO TileBchStatus::isNoGainL1() is defined by: ADC dead; N
TileBadChannels... INFO TileBchStatus::isBadTiming() is defined by: Bad timing; Online bad timing;
TileBadChannels... INFO TileBchStatus::isWrongBCID() is defined by: Wrong BCID; Online wrong BCID;
TileBadChannels... INFO No drawer trips probabilities found in DB
-ClassIDSvc INFO getRegistryEntries: read 1749 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 999 CLIDRegistry entries for module ALL
ToolSvc.tool1 INFO CaloEntrance not found
ToolSvc.tool1 INFO CaloEntrance not found
ToolSvc.tool1 INFO CaloEntrance not found
ToolSvc.tool1 INFO CaloEntrance not found
ToolSvc.tool1 INFO CaloEntrance not found
AthenaEventLoopMgr INFO ===>>> done processing event #1, run #1 1 events processed so far <<<===
-TileInfoLoader INFO Handling EndRun incident
-TileInfoLoader INFO Removed TileInfo object from detector store.
/cvmfs/atlas-co... INFO Database being retired...
Domain[ROOT_All] INFO -> Deaccess DbDatabase READ [ROOT_All] 2B8BB54A-2F81-7B49-8484-60F83666998E
/cvmfs/atlas-co... INFO Database being retired...
@@ -589,29 +605,28 @@ AtlasTrackingGe... INFO finalize() successful.
AtlasFieldSvc INFO finalize() successful
PyComponentMgr INFO Finalizing PyComponentMgr...
IdDictDetDescrCnv INFO in finalize
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/20 (( 0.20 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 0.14 ))s
-IOVDbFolder INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/1 objs/chan/bytes 1/1/231 (( 0.03 ))s
-IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.28 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.24 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.06 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.06 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.06 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.06 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 5.08 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.05 ))s
-IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.01 ))s
-IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.19 ))s
-IOVDbSvc INFO bytes in (( 6.60 ))s
+IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/2 objs/chan/bytes 4/4/20 (( 0.19 ))s
+IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 0.19 ))s
+IOVDbFolder INFO Folder /GLOBAL/TrackingGeo/LayerMaterialV2 (PoolRef) db-read 1/1 objs/chan/bytes 1/1/231 (( 0.02 ))s
+IOVDbFolder INFO Folder /LAR/Align (PoolRef) db-read 1/1 objs/chan/bytes 1/1/170 (( 0.33 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CES (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/103344 (( 0.21 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/CIS/FIT/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/80 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/EMS (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/92 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/FIBER (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/940 (( 0.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/LIN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/72 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/CALIB/LAS/NLN (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/NOISE/SAMPLE (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/641476 (( 0.13 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/97884 (( 1.04 ))s
+IOVDbFolder INFO Folder /TILE/OFL02/TIME/CHANNELOFFSET/PHY (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/96 (( 0.90 ))s
+IOVDbFolder INFO Folder /TILE/ONL01/STATUS/ADC (AttrListColl) db-read 1/1 objs/chan/bytes 277/277/76 (( 0.03 ))s
+IOVDbFolder INFO Folder /LAR/LArCellPositionShift (PoolRef) db-read 1/1 objs/chan/bytes 1/1/195 (( 0.05 ))s
+IOVDbSvc INFO bytes in (( 3.29 ))s
IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=OFLP200 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.47 ))s
-IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 5.77 ))s
-IOVDbSvc INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.16 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.20 ))s
-TileInfoLoader INFO TileInfoLoader::finalize()
+IOVDbSvc INFO Connection COOLOFL_LAR/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.37 ))s
+IOVDbSvc INFO Connection COOLOFL_TILE/OFLP200 : nConnect: 2 nFolders: 11 ReadTime: (( 2.52 ))s
+IOVDbSvc INFO Connection COOLOFL_GLOBAL/OFLP200 : nConnect: 2 nFolders: 2 ReadTime: (( 0.21 ))s
+IOVDbSvc INFO Connection COOLOFL_DCS/OFLP200 : nConnect: 2 nFolders: 1 ReadTime: (( 0.19 ))s
AthDictLoaderSvc INFO in finalize...
ToolSvc INFO Removing all tools created by ToolSvc
ToolSvc.TileVol... INFO finalize() successful
@@ -631,9 +646,9 @@ ToolSvc.Trackin... INFO finalize() successful
*****Chrono***** INFO ****************************************************************************************************
*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
*****Chrono***** INFO ****************************************************************************************************
-cObjR_ALL INFO Time User : Tot= 1.24 [s] Ave/Min/Max=0.413(+-0.549)/ 0.01/ 1.19 [s] #= 3
-cObj_ALL INFO Time User : Tot= 1.31 [s] Ave/Min/Max=0.0771(+-0.284)/ 0/ 1.21 [s] #= 17
-ChronoStatSvc INFO Time User : Tot= 53.4 [s] #= 1
+cObjR_ALL INFO Time User : Tot= 1.31 [s] Ave/Min/Max=0.437(+-0.596)/ 0/ 1.28 [s] #= 3
+cObj_ALL INFO Time User : Tot= 1.37 [s] Ave/Min/Max=0.0806(+-0.305)/ 0/ 1.3 [s] #= 17
+ChronoStatSvc INFO Time User : Tot= 48 [s] #= 1
*****Chrono***** INFO ****************************************************************************************************
ChronoStatSvc.f... INFO Service finalized successfully
ApplicationMgr INFO Application Manager Finalized successfully
diff --git a/Simulation/FastShower/FastCaloSim/src/BasicCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/BasicCellBuilderTool.cxx
index 30551e72666ef9ca52e2d4e65cbf1e4d36a922b3..f95a76d817c30ede45640c543cec3bfb507f5519 100755
--- a/Simulation/FastShower/FastCaloSim/src/BasicCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/BasicCellBuilderTool.cxx
@@ -20,9 +20,7 @@ BasicCellBuilderTool::BasicCellBuilderTool(
const std::string& name,
const IInterface* parent)
:base_class(type, name, parent),
- m_caloDDM(0),
- m_caloCID(0),
- m_atlas_id(0)
+ m_caloCID(0)
{
declareProperty("phi0_em",m_phi0_em);
declareProperty("phi0_had",m_phi0_had);
@@ -43,14 +41,14 @@ BasicCellBuilderTool::~BasicCellBuilderTool()
ATH_MSG_DEBUG("in destructor ");
}
-void BasicCellBuilderTool::find_phi0()
+void BasicCellBuilderTool::find_phi0(const CaloDetDescrManager* caloDDM)
{
if(m_phi0_em==-1000) {
ATH_MSG_DEBUG("Trying to find best phi0 of EM calo :");
m_phi0_em=0;
cellinfo_vec test_vec;
const double dphi=2*M_PI/64;
- findCells(test_vec,0.1,0.2,-dphi,dphi,1);
+ findCells(caloDDM,test_vec,0.1,0.2,-dphi,dphi,1);
double bestphi0=10000;
for(unsigned int i=0;i<test_vec.size();++i) {
@@ -73,7 +71,7 @@ void BasicCellBuilderTool::find_phi0()
m_phi0_had=0;
cellinfo_vec test_vec;
const double dphi=2*M_PI/64;
- findCells(test_vec,0.1,0.2,-dphi,dphi,3);
+ findCells(caloDDM,test_vec,0.1,0.2,-dphi,dphi,3);
double bestphi0=10000;
for(unsigned int i=0;i<test_vec.size();++i) {
@@ -95,15 +93,7 @@ void BasicCellBuilderTool::find_phi0()
StatusCode BasicCellBuilderTool::initialize()
{
- ATH_MSG_DEBUG("Accesssing CaloDetDescrManager");
- m_caloDDM = CaloDetDescrManager::instance() ;
-
- ATH_MSG_DEBUG("Accesssing CaloCellID");
- m_caloCID = m_caloDDM->getCaloCell_ID();
-
- // pointer to detector manager:
- m_atlas_id = (m_caloDDM->getCalo_Mgr())->getEM_ID();
-
+ ATH_CHECK( detStore()->retrieve (m_caloCID, "CaloCell_ID") );
return StatusCode::SUCCESS;
}
@@ -207,23 +197,23 @@ double BasicCellBuilderTool::rzent(CaloCell_ID_FCS::CaloSample sample,double eta
}
-void BasicCellBuilderTool::init_all_maps()
+void BasicCellBuilderTool::init_all_maps(const CaloDetDescrManager* caloDDM)
{
ATH_MSG_INFO("Building all maps");
cellinfo_map* curmap;
cellinfo_map* curmap2;
- ATH_MSG_DEBUG("size all cells : " <<m_caloDDM->element_end()-m_caloDDM->element_begin()
- << "; LAREM=" <<m_caloDDM->element_end(CaloCell_ID::LAREM)-m_caloDDM->element_begin(CaloCell_ID::LAREM)
- << "; TILE=" <<m_caloDDM->element_end(CaloCell_ID::TILE)-m_caloDDM->element_begin(CaloCell_ID::TILE)
- << "; LARHEC=" <<m_caloDDM->element_end(CaloCell_ID::LARHEC)-m_caloDDM->element_begin(CaloCell_ID::LARHEC)
- << "; LARFCAL=" <<m_caloDDM->element_end(CaloCell_ID::LARFCAL)-m_caloDDM->element_begin(CaloCell_ID::LARFCAL) );
+ ATH_MSG_DEBUG("size all cells : " <<caloDDM->element_end()-caloDDM->element_begin()
+ << "; LAREM=" <<caloDDM->element_end(CaloCell_ID::LAREM)-caloDDM->element_begin(CaloCell_ID::LAREM)
+ << "; TILE=" <<caloDDM->element_end(CaloCell_ID::TILE)-caloDDM->element_begin(CaloCell_ID::TILE)
+ << "; LARHEC=" <<caloDDM->element_end(CaloCell_ID::LARHEC)-caloDDM->element_begin(CaloCell_ID::LARHEC)
+ << "; LARFCAL=" <<caloDDM->element_end(CaloCell_ID::LARFCAL)-caloDDM->element_begin(CaloCell_ID::LARFCAL) );
/*
int nokfcal=0;
log << MSG::INFO << "Loop only fcal" << endmsg ;
- for(CaloDetDescrManager::calo_element_const_iterator calo_iter=m_caloDDM->element_begin(CaloCell_ID::LARFCAL);calo_iter<m_caloDDM->element_end(CaloCell_ID::LARFCAL);++calo_iter) {
+ for(CaloDetDescrManager::calo_element_const_iterator calo_iter=caloDDM->element_begin(CaloCell_ID::LARFCAL);calo_iter<caloDDM->element_end(CaloCell_ID::LARFCAL);++calo_iter) {
const CaloDetDescrElement* theDDE=*calo_iter;
if(theDDE) {
++nokfcal;
@@ -256,7 +246,7 @@ void BasicCellBuilderTool::init_all_maps()
}
- for(CaloDetDescrManager::calo_element_const_iterator calo_iter=m_caloDDM->element_begin();calo_iter<m_caloDDM->element_end();++calo_iter) {
+ for(CaloDetDescrManager::calo_element_const_iterator calo_iter=caloDDM->element_begin();calo_iter<caloDDM->element_end();++calo_iter) {
const CaloDetDescrElement* theDDE=*calo_iter;
if(theDDE) {
++nok;
@@ -662,7 +652,8 @@ void BasicCellBuilderTool::init_cell(cellinfo_map& map,const CaloDetDescrElement
-void BasicCellBuilderTool::findCells(cellinfo_vec & cell_vec, double eta_min, double eta_max, double phi_min, double phi_max, int layer)
+void BasicCellBuilderTool::findCells(const CaloDetDescrManager* caloDDM,
+ cellinfo_vec & cell_vec, double eta_min, double eta_max, double phi_min, double phi_max, int layer)
{
ATH_MSG_VERBOSE("REGION : eta_min=" <<eta_min<<" eta_max=" <<eta_max << " phi_min=" <<phi_min<<" phi_max=" <<phi_max);
@@ -696,7 +687,7 @@ void BasicCellBuilderTool::findCells(cellinfo_vec & cell_vec, double eta_min, do
const CaloDetDescrElement* theDDE;
for(unsigned int sc=0;sc<subcalos.size();++sc) {
- m_caloDDM->cellsInZone(eta_min,eta_max,phi_min,phi_max,subcalos[sc],idhash_list);
+ caloDDM->cellsInZone(eta_min,eta_max,phi_min,phi_max,subcalos[sc],idhash_list);
ATH_MSG_VERBOSE("sc="<<sc<<" : idhash_list.size()=" <<idhash_list.size());
caloDDE_list.reserve(caloDDE_list.size()+idhash_list.size());
vol_list.reserve(vol_list.size()+idhash_list.size());
@@ -708,7 +699,7 @@ void BasicCellBuilderTool::findCells(cellinfo_vec & cell_vec, double eta_min, do
std::vector<IdentifierHash>::iterator idhash_list_end(idhash_list.end());
for(std::vector<IdentifierHash>::iterator it_idhash=idhash_list.begin();it_idhash<idhash_list_end;++it_idhash) {
- theDDE=m_caloDDM->get_element(*it_idhash);
+ theDDE=caloDDM->get_element(*it_idhash);
if(theDDE) if(theDDE->volume()>0) {
//dont' fill PreSampler and TileGap
diff --git a/Simulation/FastShower/FastCaloSim/src/EmptyCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/EmptyCellBuilderTool.cxx
index 095d86fcb9f80d77c23c2a53b620418b4a30830b..298ba4457833b4d498d89aee606f04569c644ce1 100755
--- a/Simulation/FastShower/FastCaloSim/src/EmptyCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/EmptyCellBuilderTool.cxx
@@ -55,6 +55,11 @@ void EmptyCellBuilderTool::create_empty_calo(const EventContext& ctx,
{
MsgStream log( msgSvc(), name() );
+ const CaloDetDescrManager* caloDDM = nullptr;
+ if (detStore()->retrieve (caloDDM, "CaloMgr").isFailure() ) {
+ std::abort();
+ }
+
ATH_MSG_DEBUG("Executing start calo size=" <<theCellContainer->size()<<" Event="<<ctx.evt());
bool check_exist=false;
if(theCellContainer->size()>0) {
@@ -75,7 +80,7 @@ void EmptyCellBuilderTool::create_empty_calo(const EventContext& ctx,
log << MSG::DEBUG << "before: CellsPCalo.capacity()="<<CellsPCalo.capacity()<<" CellsPCalo.allocated()="<<CellsPCalo.allocated()<<endmsg;
#endif
- for(CaloDetDescrManager::calo_element_const_iterator calo_iter=m_caloDDM->element_begin();calo_iter<m_caloDDM->element_end();++calo_iter) {
+ for(CaloDetDescrManager::calo_element_const_iterator calo_iter=caloDDM->element_begin();calo_iter<caloDDM->element_end();++calo_iter) {
const CaloDetDescrElement* theDDE=*calo_iter;
if(theDDE) {
// if(n%10000==0) {
@@ -123,7 +128,7 @@ void EmptyCellBuilderTool::create_empty_calo(const EventContext& ctx,
log << MSG::DEBUG << ncreate<<" cells created, "<<nfound<<" cells already found: size="<<theCellContainer->size()<<" e="<<E_tot<<" ; et="<<Et_tot<<". Now initialize and order calo..." << endmsg;
// check whether has max hash id size
- const CaloCell_ID * theCaloCCIDM = m_caloDDM->getCaloCell_ID() ;
+ const CaloCell_ID * theCaloCCIDM = caloDDM->getCaloCell_ID() ;
unsigned int hashMax=theCaloCCIDM->calo_cell_hash_max();
if (theCellContainer->size()<hashMax) {
ATH_MSG_DEBUG("CaloCellContainer size " << theCellContainer->size() << " smaller than hashMax: " << hashMax);
diff --git a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
index 96a7b67f1b4fbd79397925a3ed548ccc53984d4c..1ed0c558dc0fa322c2763941a82bb12b65be3041 100755
--- a/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
+++ b/Simulation/FastShower/FastCaloSim/src/FastShowerCellBuilderTool.cxx
@@ -61,6 +61,9 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "DetDescrCondTools/ICoolHistSvc.h"
+#include "GeoModelInterfaces/IGeoModelTool.h"
+#include "GeoModelInterfaces/IGeoModelSvc.h"
+
#include "TROOT.h"
#include "TClass.h"
#include <TSystem.h>
@@ -369,6 +372,30 @@ StatusCode FastShowerCellBuilderTool::initialize()
ATH_CHECK(m_partPropSvc.retrieve());
+ // If alignments are enabled, then arrange for caloAligned() to be called
+ // after they are applied, to build our tables. If alignments are not
+ // enabled, then do this immediately.
+ ServiceHandle<IGeoModelSvc> geoModelSvc ("GeoModelSvc", name());
+ ATH_CHECK( geoModelSvc.retrieve() );
+ bool registeredCB = false;
+ if (IProperty* geoModelProp = dynamic_cast<IProperty*> (geoModelSvc.get())) {
+ if (geoModelProp->getProperty ("AlignCallbacks").toString() == "True") {
+ const IGeoModelTool* larDetectorTool =
+ geoModelSvc->getTool("LArDetectorToolNV");
+ ATH_CHECK( detStore()->regFcn (&IGeoModelTool::align,
+ dynamic_cast<const IGeoModelTool*>(larDetectorTool),
+ &FastShowerCellBuilderTool::caloAligned,
+ this) );
+ registeredCB = true;
+ }
+ }
+ if (!registeredCB) {
+ // No alignments, make the call now.
+ int dumi = 0;
+ std::list<std::string> duml;
+ ATH_CHECK( caloAligned (dumi, duml) );
+ }
+
m_particleDataTable = (HepPDT::ParticleDataTable*) m_partPropSvc->PDT();
if(!m_particleDataTable) {
ATH_MSG_ERROR("PDG table not found");
@@ -405,38 +432,6 @@ StatusCode FastShowerCellBuilderTool::initialize()
//m_calosurf_entrance->setCaloDepth(m_calodepthEntrance);
//#endif
- find_phi0();
-
- ATH_MSG_INFO("========================= Init EM map =============================");
- m_em_map.init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64);
- m_em_map.setname("EM");
-
- ATH_MSG_INFO("========================= Init EM fine map ========================");
- m_em_fine_map.init(-2.8,+2.8,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,224,256);
- m_em_fine_map.setname("EM fine");
-
- ATH_MSG_INFO("========================= Init HAD map ============================");
- m_had_map.init(-5,+5,-M_PI+m_phi0_had,+M_PI+m_phi0_had,100,64);
- m_had_map.setname("HAD");
-
- ATH_MSG_INFO("========================= Init EM celllist map =============================");
- m_em_celllist_map.init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64,2,2);
- m_em_celllist_map.setname("EMlist");
-
- ATH_MSG_INFO("========================= Init celllist maps sample 0 ... "<< CaloCell_ID_FCS::LastSample);
- for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample) {
- //log << MSG::INFO << "========================= Init celllist map sample "<<sample<<" =============================" <<endmsg;
- m_celllist_maps[sample].init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64,3,3);
- m_celllist_maps[sample].setname("samplecelllist");
- // m_celllist_maps[sample];
- }
-
- init_all_maps();
- ATH_MSG_INFO("========================= Init volume all maps =========================");
- init_volume(m_em_map);
- init_volume(m_em_fine_map);
- init_volume(m_had_map);
-
/*
if(m_mcLocation=="") {
log << MSG::INFO << "========================= Atlfast::GlobalEventData::Instance() =========================" <<endmsg;
@@ -685,6 +680,47 @@ StatusCode FastShowerCellBuilderTool::callBack( IOVSVC_CALLBACK_ARGS_P( I, keys)
return StatusCode::SUCCESS;
}
+StatusCode FastShowerCellBuilderTool::caloAligned( IOVSVC_CALLBACK_ARGS)
+{
+ const CaloDetDescrManager* caloDDM = nullptr;
+ ATH_CHECK( detStore()->retrieve (caloDDM, "CaloMgr") );
+
+ find_phi0(caloDDM);
+
+ ATH_MSG_INFO("========================= Init EM map =============================");
+ m_em_map.init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64);
+ m_em_map.setname("EM");
+
+ ATH_MSG_INFO("========================= Init EM fine map ========================");
+ m_em_fine_map.init(-2.8,+2.8,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,224,256);
+ m_em_fine_map.setname("EM fine");
+
+ ATH_MSG_INFO("========================= Init HAD map ============================");
+ m_had_map.init(-5,+5,-M_PI+m_phi0_had,+M_PI+m_phi0_had,100,64);
+ m_had_map.setname("HAD");
+
+ ATH_MSG_INFO("========================= Init EM celllist map =============================");
+ m_em_celllist_map.init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64,2,2);
+ m_em_celllist_map.setname("EMlist");
+
+ ATH_MSG_INFO("========================= Init celllist maps sample 0 ... "<< CaloCell_ID_FCS::LastSample);
+ for(int sample=CaloCell_ID_FCS::FirstSample;sample<CaloCell_ID_FCS::MaxSample;++sample) {
+ //log << MSG::INFO << "========================= Init celllist map sample "<<sample<<" =============================" <<endmsg;
+ m_celllist_maps[sample].init(-5,+5,-M_PI+m_phi0_em ,+M_PI+m_phi0_em ,100,64,3,3);
+ m_celllist_maps[sample].setname("samplecelllist");
+ // m_celllist_maps[sample];
+ }
+
+ init_all_maps(caloDDM);
+ ATH_MSG_INFO("========================= Init volume all maps =========================");
+ init_volume(m_em_map);
+ init_volume(m_em_fine_map);
+ init_volume(m_had_map);
+
+ return StatusCode::SUCCESS;
+}
+
+
ParticleEnergyParametrization* FastShowerCellBuilderTool::findElower(int id,double E,double eta) const
{
t_map_PEP_ID::const_iterator iter_id=m_map_ParticleEnergyParametrizationMap.find(id);
diff --git a/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt b/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
index 676c0f2646acf6478f91cafe6efdf8d8e73defeb..1640af820915c5fc91c52922062bf5964d06070e 100644
--- a/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
+++ b/Simulation/G4Atlas/G4AtlasTools/CMakeLists.txt
@@ -54,7 +54,6 @@ atlas_add_test( G4PhysicsRegionConfig_test
SCRIPT test/G4PhysicsRegionConfig_test.py
PROPERTIES TIMEOUT 300 )
-
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/Simulation/G4Atlas/G4AtlasTools/test/G4PhysicsRegionConfig_test.py b/Simulation/G4Atlas/G4AtlasTools/test/G4PhysicsRegionConfig_test.py
index 405233f59b2613747f1012d03326ca0481a5f1e8..03ca12bc5318c7ce305fe9742013ba2b85028a2c 100755
--- a/Simulation/G4Atlas/G4AtlasTools/test/G4PhysicsRegionConfig_test.py
+++ b/Simulation/G4Atlas/G4AtlasTools/test/G4PhysicsRegionConfig_test.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
-"""Run tests on G4Geometry Tool configuration
+
+"""Run tests on G4PhysicsRegionConfig configuration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
"""
diff --git a/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.cxx b/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.cxx
index 796ebf49b9d8ca46da1ac4da32cf3d9edf0ea9e8..724428a9c654fd0cbc910235cb46c41e2cf3c952 100644
--- a/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.cxx
+++ b/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.cxx
@@ -35,6 +35,12 @@
//
// =======================================================================
+// Modified: 19 May 2019, M. Bandieramonte: introduced MT mode. The class
+// was a Singleton and it was not thread-safe.
+// Added the #ifdef G4MULTITHREADED directive to handle
+// the multithreaded case. One instance of the class will be created
+// per each thread and stored in a tbb::concurrent_unordered_map that
+// is hashed with the threadID number.
// Modified: 28 August 2013, W. Taylor: adapted for ATLAS
// Created: 23 May 2013, J. Apostolakis
// Adapted from G4MonopoleFieldSetup by B. Bozsogi
@@ -62,7 +68,11 @@
// AtlasRK4, NystromRK4 - these have the equation of motion embedded inside
#include "G4SystemOfUnits.hh"
-G4mplEquationSetup* G4mplEquationSetup::fG4mplEquationSetup=0;
+#ifdef G4MULTITHREADED
+G4mplEquationSetup::ESThreadMap_t G4mplEquationSetup::m_ESThreadMap;
+#endif
+
+
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -84,13 +94,17 @@ G4mplEquationSetup::G4mplEquationSetup():
G4mplEquationSetup* G4mplEquationSetup::GetInstance()
{
- if ( fG4mplEquationSetup == 0 )
- {
- static G4mplEquationSetup theInstance;
- fG4mplEquationSetup = &theInstance;
- }
+#ifdef G4MULTITHREADED
+ auto es = getES();
+ if (!es) //nullpointer if it is not found
+ return setES();
+ else return es;
+#else
+ //Standard implementation of a Singleton Pattern
+ static G4mplEquationSetup instance;
+ return &instance;
+#endif
- return fG4mplEquationSetup;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -109,6 +123,30 @@ G4mplEquationSetup::~G4mplEquationSetup()
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+#ifdef G4MULTITHREADED
+ G4mplEquationSetup* G4mplEquationSetup::getES()
+ {
+ // Get current thread-ID
+ const auto tid = std::this_thread::get_id();
+ auto esPair = m_ESThreadMap.find(tid);
+ if(esPair == m_ESThreadMap.end())
+ return nullptr; //if not found return null pointer
+ else return esPair->second;
+ }
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+ G4mplEquationSetup* G4mplEquationSetup::setES()
+ {
+ G4mplEquationSetup* instance = new G4mplEquationSetup;
+ const auto tid = std::this_thread::get_id();
+ auto inserted = m_ESThreadMap.insert( std::make_pair(tid, instance)).first;
+ return (G4mplEquationSetup*) inserted->second;
+ }
+#endif
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
void
G4mplEquationSetup::InitialiseForField(G4FieldManager* fieldManager )
{
diff --git a/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.hh b/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.hh
index 87961cbd7afbbc1f6002b196683c553516348427..fca58626b2b3febeaf0df8fe4bc905b42ce36349 100644
--- a/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.hh
+++ b/Simulation/G4Extensions/Monopole/src/G4mplEquationSetup.hh
@@ -30,6 +30,13 @@
// particles.
//
// =======================================================================
+// Modified: 19 May 2019, M. Bandieramonte: introduced MT mode. The class
+// was a Singleton and it was not thread-safe.
+// Added the #ifdef G4MULTITHREADED directive to handle
+// the multithreaded case. One instance of the class will be created
+// per each thread and stored in a tbb::concurrent_unordered_map that
+// is hashed with the threadID number.
+//
// Modified: 28 August 2013, W. Taylor: adapted for ATLAS
// Created: 23 May 2013, J. Apostolakis
// Adapted from G4MonopoleFieldSetup by B. Bozsogi
@@ -38,6 +45,11 @@
#ifndef MONOPOLE_G4mplEquationSetup_H
#define MONOPOLE_G4mplEquationSetup_H
+#include <thread>
+#ifdef G4MULTITHREADED
+# include "tbb/concurrent_unordered_map.h"
+#endif
+
// Geant4 headers
#include "G4MagneticField.hh"
@@ -63,7 +75,21 @@ public:
~G4mplEquationSetup() ;
-private:
+private:
+
+#ifdef G4MULTITHREADED
+ // Thread-to-EquationSetup concurrent map type
+ using ESThreadMap_t = tbb::concurrent_unordered_map< std::thread::id, G4mplEquationSetup*, std::hash<std::thread::id> >;
+ // Concurrent map of EquationsSetup, one for each thread
+ static ESThreadMap_t m_ESThreadMap;
+ //@brief Search inside m_ESThreadMap the element with the current threadID
+ // and return it or return a null pointer if the element is not found
+ static G4mplEquationSetup* getES();
+ // @brief Insert the current ES in m_ESThreadMap and
+ // associate it with the current threadID
+ static G4mplEquationSetup* setES();
+ #endif
+ //
G4mplEquationSetup();
@@ -83,8 +109,6 @@ private:
G4MagIntegratorStepper* fStepper ;
G4bool fCreatedOrdinaryStepper; // If set, created stepper.
- // For Singleton
- static G4mplEquationSetup* fG4mplEquationSetup;
G4bool fVerbose;
//
// State - changed during tracking
diff --git a/Simulation/G4Extensions/RHadrons/python/RHadronMasses.py b/Simulation/G4Extensions/RHadrons/python/RHadronMasses.py
index add95cfd479a122eaaba861c9bcf6da4f052d78d..36c783743ac3001323269caf360ad271028f76c1 100644
--- a/Simulation/G4Extensions/RHadrons/python/RHadronMasses.py
+++ b/Simulation/G4Extensions/RHadrons/python/RHadronMasses.py
@@ -156,12 +156,18 @@ def get_quarks( y ):
def is_baryon( x ):
- if '009' in str(x): return 0 # gluino meson
- elif '09' in str(x): return 1 # gluino baryon
- elif '006' in str(x): return 1 # stop baryon
- elif '005' in str(x): return 1 # sbottom baryon
- # Otherwise it's a meson
- return 0
+ # 1000993, gluinoball, is also not a baryon
+ b_n = 0
+ if '009' in str(x): b_n=0 # gluino meson
+ elif '09' in str(x): b_n=1 # gluino baryon
+ elif '0006' in str(x): b_n=0 # stop meson
+ elif '0005' in str(x): b_n=0 # sbottom meson
+ elif '006' in str(x): b_n=1 # stop baryon
+ elif '005' in str(x): b_n=1 # sbottom baryon
+ else: # Otherwise, what on earth was this??
+ raise RuntimeError('is_baryon ERROR Unknown PDG ID: '+str(x))
+ if int(x)<0: return -b_n
+ return b_n
def anti_name( x ):
@@ -390,26 +396,34 @@ def get_interaction_list(input_file, interaction_file='ProcessList.txt', mass_sp
if '3' in my_q or '4' in my_q or '5' in my_q:
if len(my_q)>2:
# Gluino R-baryons
- s_number = -(my_q.count('3')+my_q.count('4')+my_q.count('5')) if pid>0 else my_q.count('3')+my_q.count('4')+my_q.count('5')
- elif len(my_q)>1:
- # Squark R-baryons or Gluino R-mesons
- if my_q.count('3') + my_q.count('4') + my_q.count('5')>1: s_number=0
+ s_number = -(my_q.count('3')-my_q.count('4')+my_q.count('5')) if pid>0 else my_q.count('3')-my_q.count('4')+my_q.count('5')
+ elif len(my_q)>1 and '9' in str(pid):
+ # Gluino R-mesons
+ if my_q in ['33','44','55','35']: s_number=0 # 33, 44, 55, 35 - one is anti-quark, so they cancel
+ # By convention both 43 and 53 have charge +1, which means c-sbar or c-bbar
+ elif my_q in ['43','53']: s_number = 2 if pid>0 else -2
+ # Only one of bottom / charm / strange. Deal with neutral convention first
elif offset_options[abs(pid)][3]==0 and ('3' in my_q or '5' in my_q): s_number=1 if pid>0 else -1
elif offset_options[abs(pid)][3]==0 and '4' in my_q: s_number=1 if pid<0 else -1
+ # Now charged convention
elif '3' in my_q or '5' in my_q: s_number=offset_options[abs(pid)][3]
elif '4' in my_q: s_number=-offset_options[abs(pid)][3]
+ elif len(my_q)>1:
+ # Squark R-baryons
+ s_number = -(my_q.count('3')-my_q.count('4')+my_q.count('5')) if pid>0 else my_q.count('3')-my_q.count('4')+my_q.count('5')
else:
# Squark R-mesons
- s_number = my_q.count('3') + my_q.count('4') + my_q.count('5')
+ s_number = my_q.count('3') - my_q.count('4') + my_q.count('5')
s_number = s_number if pid>0 else -s_number
else: s_number=0
# Build the dictionary
pid_name = offset_options[pid][2].strip() if pid>0 else anti_name(offset_options[abs(pid)][2]).strip()
- incoming_rhadrons[pid_name] = [ offset_options[abs(pid)][3] , is_baryon(pid) , s_number ]
+ charge = offset_options[abs(pid)][3] if pid>0 else -offset_options[abs(pid)][3]
+ incoming_rhadrons[pid_name] = [ charge , is_baryon(pid) , s_number ]
# Smaller list of outgoing rhadrons.
# No charm or bottom
if '4' in my_q or '5' in my_q: continue
- outgoing_rhadrons[pid_name] = [ offset_options[abs(pid)][3] , is_baryon(pid) , s_number ]
+ outgoing_rhadrons[pid_name] = [ charge , is_baryon(pid) , s_number ]
# Add all our R-hadrons to the table
for proj in incoming_rhadrons:
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationBase.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationBase.h
index 0ee503bffd36648a59a25ca1636bc27353cffc1e..9ac1b7cf1761ef1f4bca8f1b1401d2169f7dd8d5 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationBase.h
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSParametrizationBase.h
@@ -141,12 +141,12 @@ public:
static void DoCleanup();
protected:
- const double init_Ekin_nominal=0;
- const double init_Ekin_min=0;
- const double init_Ekin_max=14000000;
- const double init_eta_nominal=0;
- const double init_eta_min=-100;
- const double init_eta_max=100;
+ static constexpr double init_Ekin_nominal=0;//! Do not persistify!
+ static constexpr double init_Ekin_min=0;//! Do not persistify!
+ static constexpr double init_Ekin_max=14000000;//! Do not persistify!
+ static constexpr double init_eta_nominal=0;//! Do not persistify!
+ static constexpr double init_eta_min=-100;//! Do not persistify!
+ static constexpr double init_eta_max=100;//! Do not persistify!
static std::vector< TFCSParametrizationBase* > s_cleanup_list;
@@ -196,7 +196,7 @@ private:
private:
static std::set< int > s_no_pdgid;
- ClassDef(TFCSParametrizationBase,1) //TFCSParametrizationBase
+ ClassDef(TFCSParametrizationBase,2) //TFCSParametrizationBase
};
#if defined(__ROOTCLING__) && defined(__FastCaloSimStandAlone__)
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
index 7e758c316017cde356e0b9397c88a10dd2993110..e1637a61715ddf18b32d1a5be49f13f6c7277edb 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
@@ -16,6 +16,7 @@
#include "TrkTrack/Track.h"
#include "TrkExInterfaces/ITimedExtrapolator.h"
// MuonSpectrometer includes
+#include "MuonReadoutGeometry/MuonStation.h"
#include "MuonReadoutGeometry/MdtReadoutElement.h"
#include "MuonReadoutGeometry/RpcReadoutElement.h"
#include "MuonReadoutGeometry/TgcReadoutElement.h"
@@ -29,6 +30,7 @@
#include "MuonSimEvent/CscHitIdHelper.h"
#include "MuonSimEvent/TgcHitIdHelper.h"
#include "MuonSimEvent/sTgcHitIdHelper.h"
+#include "MuonIdHelpers/MdtIdHelper.h"
#include "MuonSimEvent/MicromegasHitIdHelper.h"
#include "MuonSimEvent/MM_SimIdToOfflineId.h"
#include "MuonSimEvent/sTgcSimIdToOfflineId.h"
@@ -66,11 +68,13 @@ iFatras::SimHitCreatorMS::SimHitCreatorMS(const std::string& t,
m_rpcHitIdHelper(nullptr),
m_cscHitIdHelper(nullptr),
m_tgcHitIdHelper(nullptr),
+ m_mdtIdHelper(nullptr),
m_mmOffToSimId(nullptr),
m_stgcOffToSimId(nullptr),
m_idHelperTool("Muon::MuonIdHelperTool/MuonIdHelperTool"),
m_muonMgr(nullptr),
m_mdtSigmaDriftRadius(0.08),
+ m_BMGid(-1),
m_createAllMdtHits(true)
{
// template for property decalration
@@ -119,6 +123,13 @@ StatusCode iFatras::SimHitCreatorMS::initialize()
// m_sTgcHitIdHelper = sTgcHitIdHelper::GetHelper();
// m_mmHitIdHelper = MicromegasHitIdHelper::GetHelper();
+ if (detStore()->retrieve(m_mdtIdHelper,"MDTIDHELPER").isFailure()) {
+ ATH_MSG_FATAL("Cannot get MdtIdHelper" );
+ return StatusCode::FAILURE;
+ }
+ else {
+ ATH_MSG_DEBUG(" Found the MdtIdHelper. " );
+ }
if (detStore()->retrieve(m_muonMgr).isFailure()) {
ATH_MSG_FATAL( "[ --- ] Cannot retrieve MuonDetectorManager..." );
@@ -158,6 +169,26 @@ StatusCode iFatras::SimHitCreatorMS::initialize()
m_incidentSvc->addListener( this, IncidentType::BeginEvent);
ATH_MSG_INFO( "[ mutrack ] initialize() successful." );
+
+ m_BMGpresent = m_mdtIdHelper->stationNameIndex("BMG") != -1;
+ if(m_BMGpresent){
+ ATH_MSG_INFO("Processing configuration for layouts with BMG chambers.");
+ m_BMGid = m_mdtIdHelper->stationNameIndex("BMG");
+ for(int phi=6; phi<8; phi++) { // phi sectors
+ for(int eta=1; eta<4; eta++) { // eta sectors
+ for(int side=-1; side<2; side+=2) { // side
+ if( !m_muonMgr->getMuonStation("BMG", side*eta, phi) ) continue;
+ for(int roe=1; roe<= ((m_muonMgr->getMuonStation("BMG", side*eta, phi) )->nMuonReadoutElements()); roe++) { // iterate on readout elemets
+ const MuonGM::MdtReadoutElement* mdtRE =
+ dynamic_cast<const MuonGM::MdtReadoutElement*> ( ( m_muonMgr->getMuonStation("BMG", side*eta, phi) )->getMuonReadoutElement(roe) ); // has to be an MDT
+ if(mdtRE) initDeadChannels(mdtRE);
+ }
+ }
+ }
+ }
+ }
+
+
return StatusCode::SUCCESS;
}
@@ -346,7 +377,6 @@ void iFatras::SimHitCreatorMS::createHits(const ISF::ISFParticle& isp,
if (m_idHelperTool->mdtIdHelper().valid(hid)) {
// create first hit
bool hitCreated = createHit(isp, currLay,parm,hid,timeInfo,pitch, true);
-
if (m_createAllMdtHits) {
// nearby hits - check range
const MuonGM::MdtReadoutElement* mdtROE = m_muonMgr->getMdtReadoutElement(hid);
@@ -402,7 +432,6 @@ void iFatras::SimHitCreatorMS::createHits(const ISF::ISFParticle& isp,
bool iFatras::SimHitCreatorMS::createHit(const ISF::ISFParticle& isp,
const Trk::Layer* lay,const Trk::TrackParameters* parm, Identifier id, double globalTimeEstimate, double /* pitch */, bool /* smear */) const
{
-
// MDT SECTION
if (m_idHelperTool->mdtIdHelper().is_mdt(id)) {
@@ -412,13 +441,21 @@ bool iFatras::SimHitCreatorMS::createHit(const ISF::ISFParticle& isp,
m_idHelperTool->mdtIdHelper().tube(id));
ATH_MSG_VERBOSE( "[ muhit ] Creating MDTSimHit with identifier " << simId );
-
+ // local position from the mdt's i
+ const MuonGM::MdtReadoutElement* MdtRoEl = m_muonMgr->getMdtReadoutElement(id);
+ if(m_BMGpresent && m_mdtIdHelper->stationName(id) == m_BMGid ) {
+ auto myIt = m_DeadChannels.find(MdtRoEl->identify());
+ if( myIt != m_DeadChannels.end() ){
+ if( std::find( (myIt->second).begin(), (myIt->second).end(), id) != (myIt->second).end() ) {
+ ATH_MSG_DEBUG("Skipping tube with identifier " << m_mdtIdHelper->show_to_string(id) );
+ return false;
+ }
+ }
+ }
// local position from the mdt's
const Amg::Vector3D localPos = m_muonMgr->getMdtReadoutElement(id)->globalToLocalCoords(parm->position(),id);
-
// drift radius
double residual = m_measTool->residual(lay,parm,id);
-
if (fabs(residual)<15.075) {
double dlh = sqrt(15.075*15.075-residual*residual);
@@ -560,4 +597,42 @@ int iFatras::SimHitCreatorMS::offIdToSimId(Identifier id) const{
return 0;
}
+void iFatras::SimHitCreatorMS::initDeadChannels(const MuonGM::MdtReadoutElement* mydetEl) {
+ PVConstLink cv = mydetEl->getMaterialGeom(); // it is "Multilayer"
+ int nGrandchildren = cv->getNChildVols();
+ if(nGrandchildren <= 0) return;
+
+ Identifier detElId = mydetEl->identify();
+
+ int name = m_mdtIdHelper->stationName(detElId);
+ int eta = m_mdtIdHelper->stationEta(detElId);
+ int phi = m_mdtIdHelper->stationPhi(detElId);
+ int ml = m_mdtIdHelper->multilayer(detElId);
+ std::vector<Identifier> deadTubes;
+
+ for(int layer = 1; layer <= mydetEl->getNLayers(); layer++){
+ for(int tube = 1; tube <= mydetEl->getNtubesperlayer(); tube++){
+ bool tubefound = false;
+ for(unsigned int kk=0; kk < cv->getNChildVols(); kk++) {
+ int tubegeo = cv->getIdOfChildVol(kk) % 100;
+ int layergeo = ( cv->getIdOfChildVol(kk) - tubegeo ) / 100;
+ if( tubegeo == tube && layergeo == layer ) {
+ tubefound=true;
+ break;
+ }
+ if( layergeo > layer ) break; // don't loop any longer if you cannot find tube anyway anymore
+ }
+ if(!tubefound) {
+ Identifier deadTubeId = m_mdtIdHelper->channelID( name, eta, phi, ml, layer, tube );
+ deadTubes.push_back( deadTubeId );
+ ATH_MSG_VERBOSE("adding dead tube (" << tube << "), layer(" << layer
+ << "), phi(" << phi << "), eta(" << eta << "), name(" << name
+ << "), multilayerId(" << ml << ") and identifier " << deadTubeId <<" .");
+ }
+ }
+ }
+ std::sort(deadTubes.begin(), deadTubes.end());
+ m_DeadChannels[detElId] = deadTubes;
+ return;
+}
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.h
index 416dd1c31ad4e01a89ec88eb831e1b98ad78cc8f..29d7be4f5c5890decd184d2a030a62e0a2820851 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.h
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.h
@@ -26,6 +26,8 @@
#include "MuonSimEvent/CSCSimHitCollection.h"
#include "MuonSimEvent/MMSimHitCollection.h"
#include "MuonSimEvent/sTGCSimHitCollection.h"
+//Muon ReadoutGeometry includes
+#include "MuonReadoutGeometry/MdtReadoutElement.h"
// Identifier
#include "Identifier/Identifier.h"
@@ -34,6 +36,7 @@ class MdtHitIdHelper;
class RpcHitIdHelper;
class CscHitIdHelper;
class TgcHitIdHelper;
+class MdtIdHelper;
namespace MuonGM {
class MuonDetectorManager;
@@ -87,6 +90,8 @@ namespace iFatras
void createHits(const ISF::ISFParticle& isp,
const std::vector<Trk::HitInfo>& hits) const;
+ void initDeadChannels(const MuonGM::MdtReadoutElement* mydetEl);
+
private:
/** Private HitCreate method - returns bool for a successful hit creation */
@@ -125,6 +130,7 @@ namespace iFatras
RpcHitIdHelper* m_rpcHitIdHelper;
CscHitIdHelper* m_cscHitIdHelper;
TgcHitIdHelper* m_tgcHitIdHelper;
+ const MdtIdHelper* m_mdtIdHelper; //added to protect against dead sensors
MM_SimIdToOfflineId* m_mmOffToSimId;
sTgcSimIdToOfflineId* m_stgcOffToSimId;
@@ -136,7 +142,10 @@ namespace iFatras
mutable std::string m_stationName;
+ int m_BMGid; //added to protect against dead sensors
bool m_createAllMdtHits;
+ bool m_BMGpresent;//added to protect against dead sensors
+ std::map<Identifier, std::vector<Identifier> > m_DeadChannels;
};
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
index a5af2dfa0a5fc2853479b9ba1d63018db9126e43..dcef0ad5fece64a1f7b6f3cb5c81e30b726afc3a 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
@@ -78,6 +78,6 @@ HITSMerge_tf.py --inputHitsFile 'hitsFull.ttbar.pool.root' --outputHitsFile 'hit
echo "art-result: $? dummy-merge"
# Compare the merged outputs
-acmd.py diff-root hitsFullMerged.ttbar.pool.root hitsMerged.ttbar.pool.root --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings
+acmd.py diff-root hitsFullMerged.ttbar.pool.root hitsMerged.ttbar.pool.root --ignore-leaves RecoTimingObj_p1_EVNTtoHITS_timings index_ref
echo "art-result: $? comparison"
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_heavy_ion.sh b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_heavy_ion.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f5a27bc056ce6234891550fc987cc7cb6c1e3ece
--- /dev/null
+++ b/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_heavy_ion.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# art-description: Run digitization combining a heavy ion sample produced with MC15 using 2015 geometry and conditions with Zmumu events
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.9/Athena
+# art-include: master/Athena
+# art-type: grid
+# art-output: mc15_2015_heavyIon.RDO.pool.root
+
+DigiOutFileName="mc15_2015_heavyIon.RDO.pool.root"
+ZmumuHITSFileName="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/mc15_pPb8TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.simul.HITS.e5367_s3164.HITS.11308894._000005.pool.root.1"
+HeavyIonHITSFileName="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DigitizationTests/mc15_pPb8TeV.420112.Hijing_MinBiasDiff_pPb_8TeV.merge.HITS.e5328_s3148_s3153.HITS.11232927._000249.pool.root.1"
+
+Digi_tf.py \
+--inputHITSFile ${ZmumuHITSFileName} \
+--inputCavernHitsFile ${HeavyIonHITSFileName} \
+--outputRDOFile ${DigiOutFileName} \
+--maxEvents 10 \
+--skipEvents 0 \
+--numberOfCavernBkg 1 \
+--preExec 'all:rec.doHIP.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(0.0);jobproperties.Beam.bunchSpacing.set_Value_and_Lock(25);from LArROD.LArRODFlags import larRODFlags;larRODFlags.nSamples.set_Value_and_Lock(4);from LArDigitization.LArDigitizationFlags import jobproperties;jobproperties.LArDigitizationFlags.useFcalHighGain.set_Value_and_Lock(True)' 'HITtoRDO:from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=["PhysicsList"]' \
+--preInclude 'HITtoRDO:Digitization/ForceUseOfPileUpTools.py' \
+--postExec 'all:CfgMgr.MessageSvc().setError+=["HepMcParticleLink"]' 'HITtoRDO:from AthenaCommon import CfgGetter;mergeMcEventCollTool=CfgGetter.getPublicTool("MergeMcEventCollTool").DoSlimming=False' \
+--postInclude 'all:PyJobTransforms/UseFrontier.py,SimulationJobOptions/postInclude.HijingPars.py' \
+--geometryVersion ATLAS-R2-2015-03-01-00 \
+--conditionsTag all:OFLCOND-MC15c-SDR-15 \
+--DataRunNumber 295000 \
+--pileupInitialBunch 0 \
+--pileupFinalBunch 0 \
+--bunchSpacing 100 \
+--imf False
+
+echo "art-result: $? Digi_tf.py"
diff --git a/Simulation/Tests/DigitizationTestsMT/CMakeLists.txt b/Simulation/Tests/DigitizationTestsMT/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2a1f4cd87ff61c7567d0690ab01a79ea973ceba2
--- /dev/null
+++ b/Simulation/Tests/DigitizationTestsMT/CMakeLists.txt
@@ -0,0 +1,13 @@
+################################################################################
+# Package: DigitizationTestsMT
+################################################################################
+
+# Declare the package name:
+atlas_subdir( DigitizationTestsMT )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+ TestPolicy )
+
+atlas_install_scripts( test/*.sh )
+
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT.sh
similarity index 100%
rename from Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT.sh
rename to Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT.sh
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT_1thread.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT_1thread.sh
similarity index 100%
rename from Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT_1thread.sh
rename to Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_MT_1thread.sh
diff --git a/Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_no_ID_MT.sh b/Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_no_ID_MT.sh
similarity index 100%
rename from Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_no_ID_MT.sh
rename to Simulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc15_2015_ttbar_no_pileup_no_ID_MT.sh
diff --git a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
index a1396d52effa3d046ddad95b422dfbf964248ef7..82409c2da2a150b812f88b05e7bcf4221202a488 100755
--- a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
@@ -6,6 +6,7 @@
# art-include: 21.9/Athena
# art-include: master/Athena
# art-type: grid
+# art-output: test.HITS.pool.root
athena G4AtlasApps/jobOptions.G4Cosmic.py
diff --git a/Simulation/Tests/SimCoreTestsMT/CMakeLists.txt b/Simulation/Tests/SimCoreTestsMT/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..00eb0b20ffe98c1c43ec6baf6ffb16fcca81cd2e
--- /dev/null
+++ b/Simulation/Tests/SimCoreTestsMT/CMakeLists.txt
@@ -0,0 +1,13 @@
+################################################################################
+# Package: SimCoreTestsMT
+################################################################################
+
+# Declare the package name:
+atlas_subdir( SimCoreTestsMT )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+ TestPolicy )
+
+# Install files from the package:
+atlas_install_scripts( test/*.sh )
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim_MT.sh b/Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh
similarity index 100%
rename from Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim_MT.sh
rename to Simulation/Tests/SimCoreTestsMT/test/test_AtlasG4_TTbarSim_MT.sh
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
index 8839bbeb98b403f823552ced7a8e4ad06295d781..4fde1dd51b7309d014067d28430cbffd3228ea1a 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelGetter.py
@@ -62,11 +62,11 @@ class TileRawChannelGetter ( Configured) :
# true for real data, false for MC - GlobalFlags.DataSource.is_data()
# true for nominal ATLAS configuration - GlobalFlags.DetGeo.is_atlas()
from AthenaCommon.GlobalFlags import globalflags
- if globalflags.DataSource() == 'data' and not globalflags.isOverlay():
+ if globalflags.DataSource() == 'data' and jobproperties.TileRecFlags.noiseFilter() < 0:
# apply noise filter for real data (if this option was not set before)
- if jobproperties.TileRecFlags.noiseFilter() < 0:
- jobproperties.TileRecFlags.noiseFilter=1
+ jobproperties.TileRecFlags.noiseFilter = 1
+ if globalflags.DataSource() == 'data' and not globalflags.isOverlay():
if jobproperties.TileRecFlags.TileRunType() == 1 :
tileBeamElemContainer="";
else:
@@ -108,6 +108,9 @@ class TileRawChannelGetter ( Configured) :
# run optimal filter only if readDigits is set
if jobproperties.TileRecFlags.readDigits():
+ from AthenaCommon.AlgSequence import AlgSequence
+ topSequence = AlgSequence()
+
TilePulseTypes = {0 : 'PHY', 1 : 'PHY', 2 : 'LAS', 4 : 'PHY', 8 : 'CIS'}
TilePulse = TilePulseTypes[jobproperties.TileRecFlags.TileRunType()]
@@ -116,6 +119,7 @@ class TileRawChannelGetter ( Configured) :
toolOfcCoolOF1 = None
NoiseFilterTools = []
+ TileRawChannelContainerDSP = ''
if jobproperties.TileRecFlags.noiseFilter() == 1:
if globalflags.DataSource() == 'data':
@@ -146,10 +150,17 @@ class TileRawChannelGetter ( Configured) :
NoiseFilterTools += [theTileRawChannelOF1Corrector]
+
from TileRecUtils.TileRecUtilsConf import TileRawChannelNoiseFilter
theTileRawChannelNoiseFilter = TileRawChannelNoiseFilter()
NoiseFilterTools += [theTileRawChannelNoiseFilter]
+ if globalflags.DataSource() == 'data' and not globalflags.isOverlay():
+ from TileRecUtils.TileRecUtilsConf import TileRawChannelCorrectionAlg
+ theTileRawChannelCorrectionAlg = TileRawChannelCorrectionAlg()
+ theTileRawChannelCorrectionAlg.NoiseFilterTools= NoiseFilterTools
+ TileRawChannelContainerDSP = 'TileRawChannelCntCorrected'
+ topSequence += theTileRawChannelCorrectionAlg
if (jobproperties.TileRecFlags.doTileMF()
or (not jobproperties.TileRecFlags.OfcFromCOOL()
@@ -195,7 +206,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderQIEFilter.correctTime = jobproperties.TileRecFlags.correctTime()
theTileRawChannelBuilderQIEFilter.NoiseFilterTools= NoiseFilterTools
theTileRawChannelBuilderQIEFilter.PedestalMode = 1
- theTileRawChannelBuilderQIEFilter.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderQIEFilter.DSPContainer = TileRawChannelContainerDSP
mlog.info(" adding now TileRawChannelBuilderQIEFilter to the algorithm: %s" % theTileRawChannelMaker.name())
@@ -219,7 +230,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderManyAmps.calibrateEnergy = jobproperties.TileRecFlags.calibrateEnergy()
theTileRawChannelBuilderManyAmps.correctTime = jobproperties.TileRecFlags.correctTime()
theTileRawChannelBuilderManyAmps.NoiseFilterTools= NoiseFilterTools
- theTileRawChannelBuilderManyAmps.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderManyAmps.DSPContainer = TileRawChannelContainerDSP
mlog.info(" adding now TileRawChannelBuilderManyAmps to the algorithm: %s" % theTileRawChannelMaker.name())
@@ -245,7 +256,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderFlatFilter.NoiseFilterTools= NoiseFilterTools
theTileRawChannelBuilderFlatFilter.FrameLength = TileFrameLength
theTileRawChannelBuilderFlatFilter.SignalLength = TileFrameLength - 1
- theTileRawChannelBuilderFlatFilter.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderFlatFilter.DSPContainer = TileRawChannelContainerDSP
mlog.info(" adding now TileRawChannelBuilderFlatFilter to the algorithm: %s" % theTileRawChannelMaker.name())
@@ -269,7 +280,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderFitFilter.correctTime = jobproperties.TileRecFlags.correctTime()
theTileRawChannelBuilderFitFilter.NoiseFilterTools= NoiseFilterTools
theTileRawChannelBuilderFitFilter.FrameLength = TileFrameLength
- theTileRawChannelBuilderFitFilter.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderFitFilter.DSPContainer = TileRawChannelContainerDSP
# add the tool to list of tool ( should use ToolHandle eventually)
mlog.info(" adding now TileRawChannelBuilderFitFilter to the algorithm: %s" % theTileRawChannelMaker.name())
@@ -305,7 +316,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderFitFilterCool.correctTime = jobproperties.TileRecFlags.correctTime()
theTileRawChannelBuilderFitFilterCool.NoiseFilterTools= NoiseFilterTools
theTileRawChannelBuilderFitFilterCool.FrameLength = TileFrameLength
- theTileRawChannelBuilderFitFilterCool.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderFitFilterCool.DSPContainer = TileRawChannelContainerDSP
# add the tool to list of tool ( should use ToolHandle eventually)
mlog.info(" adding now TileRawChannelBuilderFitFilterCool to the algorithm: %s" % theTileRawChannelMaker.name())
@@ -346,7 +357,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderMF.TimeMinForAmpCorrection = jobproperties.TileRecFlags.TimeMinForAmpCorrection()
theTileRawChannelBuilderMF.TimeMaxForAmpCorrection = jobproperties.TileRecFlags.TimeMaxForAmpCorrection()
- theTileRawChannelBuilderMF.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderMF.DSPContainer = TileRawChannelContainerDSP
mlog.info(" adding now TileRawChannelBuilderMF to the algorithm: %s" % theTileRawChannelMaker.name())
theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderMF]
@@ -372,7 +383,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderOptFilter.Minus1Iteration = True
theTileRawChannelBuilderOptFilter.AmplitudeCorrection = False; # don't need correction after iterations
theTileRawChannelBuilderOptFilter.TimeCorrection = False # don't need correction after iterations
- theTileRawChannelBuilderOptFilter.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderOptFilter.DSPContainer = TileRawChannelContainerDSP
ServiceMgr.TileInfoLoader.LoadOptFilterWeights=True
@@ -421,7 +432,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderOF1.TimeMinForAmpCorrection = jobproperties.TileRecFlags.TimeMinForAmpCorrection()
theTileRawChannelBuilderOF1.TimeMaxForAmpCorrection = jobproperties.TileRecFlags.TimeMaxForAmpCorrection()
- theTileRawChannelBuilderOF1 = dq.TileRawChannelContainer
+ theTileRawChannelBuilderOF1 = TileRawChannelContainerDSP
mlog.info(" adding now TileRawChannelBuilderOF1 to the algorithm: %s" % theTileRawChannelMaker.name())
theTileRawChannelMaker.TileRawChannelBuilder += [theTileRawChannelBuilderOF1]
@@ -453,7 +464,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderOpt2Filter.Minus1Iteration = True
theTileRawChannelBuilderOpt2Filter.AmplitudeCorrection = False; # don't need correction after iterations
theTileRawChannelBuilderOpt2Filter.TimeCorrection = False; # don't need correction after iterations
- theTileRawChannelBuilderOpt2Filter.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderOpt2Filter.DSPContainer = TileRawChannelContainerDSP
mlog.info(" adding now TileRawChannelBuilderOpt2Filter to the algorithm: %s" % theTileRawChannelMaker.name())
@@ -501,7 +512,7 @@ class TileRawChannelGetter ( Configured) :
theTileRawChannelBuilderOptATLAS.TimeMinForAmpCorrection = jobproperties.TileRecFlags.TimeMinForAmpCorrection()
theTileRawChannelBuilderOptATLAS.TimeMaxForAmpCorrection = jobproperties.TileRecFlags.TimeMaxForAmpCorrection()
- theTileRawChannelBuilderOptATLAS.DSPContainer = dq.TileRawChannelContainer
+ theTileRawChannelBuilderOptATLAS.DSPContainer = TileRawChannelContainerDSP
mlog.info(" adding now TileRawChannelBuilderOpt2Filter with name TileRawChannelBuilderOptATLAS to the algorithm: %s"
% theTileRawChannelMaker.name())
@@ -514,8 +525,6 @@ class TileRawChannelGetter ( Configured) :
# this should always come at the end
mlog.info(" now adding to topSequence")
- from AthenaCommon.AlgSequence import AlgSequence
- topSequence = AlgSequence()
if jobproperties.TileRecFlags.noiseFilter() == 2:
# Instantiation of the C++ algorithm
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
index ed64393ac8e2a96369752830f29bca78dff57915..cf236cf9cd2673a7daeeb99c405eb8f6dbb224ed 100644
--- a/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelBuilder.cxx
@@ -525,30 +525,18 @@ StatusCode TileRawChannelBuilder::commitContainer()
if ( m_useDSP && !m_DSPContainerKey.key().empty() &&
(DQstatus->incompleteDigits() || m_chCounter<12288) && itrTool!=endTool )
{
- const TileRawChannelContainer * dspCnt =
- SG::makeHandle (m_DSPContainerKey, ctx).get();
+ const TileRawChannelContainer * dspCnt = SG::makeHandle (m_DSPContainerKey, ctx).get();
ATH_MSG_DEBUG( "Incomplete container - use noise filter corrections from DSP container" );
- auto copiedDspCnt = std::make_unique<TileMutableRawChannelContainer> (*dspCnt);
- ATH_CHECK( copiedDspCnt->status() );
- dspCnt = copiedDspCnt.get();
- for (;itrTool!=endTool;++itrTool){
- if ((*itrTool)->process(*copiedDspCnt).isFailure()) {
- ATH_MSG_ERROR( " Error status returned from noise filter " );
- } else {
- ATH_MSG_DEBUG( "Noise filter applied to DSP container" );
- }
- }
std::vector<IdentifierHash> hashes = m_rawChannelCnt->GetAllCurrentHashes();
std::vector<IdentifierHash> dspHashes = dspCnt->GetAllCurrentHashes();
if (hashes != dspHashes) {
ATH_MSG_ERROR( " Error in applying noise corrections; "
"hash vectors do not match.");
- }
- else {
+ } else {
// Go through all TileRawChannelCollections
for (IdentifierHash hash : hashes) {
- TileRawChannelCollection* coll = m_rawChannelCnt->indexFindPtr (hash);
+ TileRawChannelCollection* coll = m_rawChannelCnt->indexFindPtr (hash);
const TileRawChannelCollection* dcoll = dspCnt->indexFindPtr (hash);
if (coll->identify() != dcoll->identify()) {
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelCorrectionAlg.cxx b/TileCalorimeter/TileRecUtils/src/TileRawChannelCorrectionAlg.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..1b4fe7453b17c71195d6656596a9b385a6e81d72
--- /dev/null
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelCorrectionAlg.cxx
@@ -0,0 +1,55 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+// Tile includes
+#include "TileRawChannelCorrectionAlg.h"
+#include "TileEvent/TileMutableRawChannelContainer.h"
+
+// Athena includes
+#include "StoreGate/ReadHandle.h"
+#include "StoreGate/WriteHandle.h"
+#include "AthenaKernel/errorcheck.h"
+
+#include <memory>
+
+StatusCode TileRawChannelCorrectionAlg::initialize() {
+
+ ATH_MSG_DEBUG( "Input raw channel container: '" << m_inputRawChannelContainerKey.key()
+ << "' output container: '" << m_outputRawChannelContainerKey.key() << "'" );
+
+ ATH_CHECK( m_inputRawChannelContainerKey.initialize() );
+ ATH_CHECK( m_outputRawChannelContainerKey.initialize() );
+
+ ATH_CHECK( m_noiseFilterTools.retrieve() );
+ ATH_MSG_DEBUG( "Successfully retrieve NoiseFilterTools: " << m_noiseFilterTools );
+
+ ATH_MSG_DEBUG( "initialization completed" );
+
+ return StatusCode::SUCCESS;
+}
+
+
+StatusCode TileRawChannelCorrectionAlg::execute(const EventContext& ctx) const {
+
+
+ const TileRawChannelContainer* inputRawChannels = SG::makeHandle(m_inputRawChannelContainerKey, ctx).get();
+ auto outputRawChannels = std::make_unique<TileMutableRawChannelContainer>(*inputRawChannels);
+ ATH_CHECK( outputRawChannels->status() );
+
+ for (const ToolHandle<ITileRawChannelTool>& noiseFilterTool : m_noiseFilterTools) {
+ if (noiseFilterTool->process(*outputRawChannels.get()).isFailure()) {
+ ATH_MSG_ERROR( " Error status returned from noise filter " );
+ } else {
+ ATH_MSG_DEBUG( "Noise filter applied to the container" );
+ }
+ }
+
+ SG::WriteHandle<TileRawChannelContainer> outputRawChannelContainer(m_outputRawChannelContainerKey, ctx);
+ ATH_CHECK( outputRawChannelContainer.record(std::move(outputRawChannels)) );
+
+ ATH_MSG_DEBUG( "TileRawChannelContainer registered successfully ("
+ << m_outputRawChannelContainerKey.key() << ")");
+
+ return StatusCode::SUCCESS;
+}
diff --git a/TileCalorimeter/TileRecUtils/src/TileRawChannelCorrectionAlg.h b/TileCalorimeter/TileRecUtils/src/TileRawChannelCorrectionAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..af2121b83e437ff053cf9249768b73fca155909e
--- /dev/null
+++ b/TileCalorimeter/TileRecUtils/src/TileRawChannelCorrectionAlg.h
@@ -0,0 +1,46 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TILERECUTILS_TILERAWCHANNELCORRECTIONALG_H
+#define TILERECUTILS_TILERAWCHANNELCORRECTIONALG_H
+
+// Tile includes
+#include "TileEvent/TileRawChannelContainer.h"
+#include "TileRecUtils/ITileRawChannelTool.h"
+
+// Athena includes
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
+#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/WriteHandleKey.h"
+
+// Gaudi includes
+#include "GaudiKernel/ToolHandle.h"
+
+/**
+ * @class TileRawChannelCorrectionAlg
+ * @brief This algorithm applies noise filter tools to input Tile raw channel container
+ */
+class TileRawChannelCorrectionAlg: public AthReentrantAlgorithm {
+ public:
+
+ using AthReentrantAlgorithm::AthReentrantAlgorithm;
+
+ virtual ~TileRawChannelCorrectionAlg() override = default;
+
+ virtual StatusCode initialize() override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
+
+ private:
+
+ SG::ReadHandleKey<TileRawChannelContainer> m_inputRawChannelContainerKey{this,
+ "InputRawChannelContainer", "TileRawChannelCnt", "Input Tile raw channels container key"};
+
+ SG::WriteHandleKey<TileRawChannelContainer> m_outputRawChannelContainerKey{this,
+ "OutputRawChannelContainer", "TileRawChannelCntCorrected", "Output Tile digits container key"};
+
+ ToolHandleArray<ITileRawChannelTool> m_noiseFilterTools{this,
+ "NoiseFilterTools", {}, "Tile noise filter tools"};
+};
+
+#endif // TILERECUTILS_TILERAWCHANNELCORRECTIONALG_H
diff --git a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
index ff4a67c367a5e7a528dbfcf077959f508b6964b1..fa0c5cccd0f6c29f1fb2a216af9ff32446b53a7c 100644
--- a/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
+++ b/TileCalorimeter/TileRecUtils/src/components/TileRecUtils_entries.cxx
@@ -26,6 +26,7 @@
#include "../TileRawChannelBuilderTest.h"
#include "../TileDQstatusTool.h"
#include "../TileDQstatusAlg.h"
+#include "../TileRawChannelCorrectionAlg.h"
DECLARE_COMPONENT( TileRawChannelBuilderFlatFilter )
DECLARE_COMPONENT( TileRawChannelBuilderFitFilter )
@@ -55,3 +56,4 @@ DECLARE_COMPONENT( TileMuonReceiverDumper )
DECLARE_COMPONENT( TileRawChannelBuilderTest )
DECLARE_COMPONENT( TileDQstatusTool )
DECLARE_COMPONENT( TileDQstatusAlg )
+DECLARE_COMPONENT( TileRawChannelCorrectionAlg )
diff --git a/Tools/PROCTools/python/RunTier0TestsTools.py b/Tools/PROCTools/python/RunTier0TestsTools.py
index 6f56267f71106d5637fb470732c3160ebb3acc0c..c28dc9c1d48281ad91adcf8b9a2bdfcc68994d20 100644
--- a/Tools/PROCTools/python/RunTier0TestsTools.py
+++ b/Tools/PROCTools/python/RunTier0TestsTools.py
@@ -21,7 +21,7 @@ ciRefFileMap = {
's3126-21.0' : 'v1',
's3126-21.3' : 'v1',
's3126-21.9' : 'v1',
- 's3126-22.0' : 'v5',
+ 's3126-22.0' : 'v6',
# OverlayTier0Test_required-test
'overlay-d1498-21.0' : 'v2',
'overlay-d1498-22.0' : 'v16',
diff --git a/Tools/PyJobTransforms/python/trfArgClasses.py b/Tools/PyJobTransforms/python/trfArgClasses.py
index bf3ecf545d2bb77649b75b3ecd3b09613002f762..570c6879950045c72e952ad0a3d55c66a3004e92 100644
--- a/Tools/PyJobTransforms/python/trfArgClasses.py
+++ b/Tools/PyJobTransforms/python/trfArgClasses.py
@@ -695,6 +695,9 @@ class argFile(argList):
msg.debug('Found root filesystem input - activating globbing')
newValue = []
for filename in self._value:
+ if str(filename).startswith("root"):
+ msg.debug('Found input file name starting with "root," setting XRD_RUNFORKHANDLER=1, which enables fork handlers for xrootd in direct I/O')
+ os.environ["XRD_RUNFORKHANDLER"] = "1"
if str(filename).startswith("https") or str(filename).startswith("davs") or not(str(filename).endswith('/')) and '*' not in filename and '?' not in filename:
msg.debug('Seems that only one file was given: {0}'.format(filename))
newValue.extend(([filename]))
diff --git a/Tools/PyUtils/python/AthFile/__init__.py b/Tools/PyUtils/python/AthFile/__init__.py
index 2cea4ece006872bc7c6859514107243d6cde5a41..ffef68271ac01d367432b05e919d77af5f3654da 100644
--- a/Tools/PyUtils/python/AthFile/__init__.py
+++ b/Tools/PyUtils/python/AthFile/__init__.py
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# @file PyUtils/python/AthFile/__init__.py
# @purpose a simple abstraction of a file to retrieve informations out of it
# @author Sebastien Binet <binet@cern.ch>
# @date October 2008
-from __future__ import with_statement
+from __future__ import with_statement, print_function
__doc__ = "a simple abstraction of a file to retrieve informations out of it"
__version__ = "$Revision$"
@@ -25,8 +25,8 @@ __pseudo_all__ = [
]
import PyUtils.Decorators as _decos
-import impl as _impl
-import tests as _tests
+from . import impl as _impl
+from . import tests as _tests
AthFile = _impl.AthFile
from decorator import decorator as _dec
diff --git a/Tools/PyUtils/python/AthFile/impl.py b/Tools/PyUtils/python/AthFile/impl.py
index 7ddb535b1cc4c5a169275307909a087aca02efb7..6528f518dad1d1f2890c0b87591a7929fc0fd87b 100644
--- a/Tools/PyUtils/python/AthFile/impl.py
+++ b/Tools/PyUtils/python/AthFile/impl.py
@@ -1,11 +1,11 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# @file PyUtils/python/AthFile/impl.py
# @purpose a simple abstraction of a file to retrieve informations out of it
# @author Sebastien Binet <binet@cern.ch>
# @date November 2009
-from __future__ import with_statement
+from __future__ import with_statement, print_function
__version__ = "$Revision: 723532 $"
__author__ = "Sebastien Binet"
@@ -15,6 +15,8 @@ import errno
import os
import subprocess
import sys
+import six
+from past.builtins import basestring
import PyUtils.Helpers as H
from PyUtils.Helpers import ShutUp
@@ -40,6 +42,28 @@ DEFAULT_AF_TIMEOUT = 20
### utils ----------------------------------------------------------------------
+# Try to convert long->int in output when we're running with python2,
+# to prevent interoperability problems if we then read with python3.
+def _clean_dict (d):
+ for k, v in d.items():
+ if type(v) == type({}):
+ _clean_dict(v)
+ elif type(v) == type([]):
+ _clean_list(v)
+ elif type(v) in six.integer_types:
+ d[k] = int(v)
+ return
+def _clean_list (l):
+ for i in range(len(l)):
+ v = l[i]
+ if type(v) == type({}):
+ _clean_dict(v)
+ elif type(v) == type([]):
+ _clean_list(v)
+ elif type(v) in six.integer_types:
+ l[i] = int(v)
+ return
+
def _get_real_ext(fname):
"""little helper to get the 'real' extension of a filename, handling 'fake' extensions (e.g. foo.ascii.gz -> .ascii)"""
se = os.path.splitext
@@ -61,7 +85,7 @@ def _my_open(name, mode='r', bufsiz=-1):
return self
gzip.GzipFile.__exit__ = gzip_exit
gzip.GzipFile.__enter__= gzip_enter
- return gzip.open(name, mode)
+ return gzip.open(name, mode + 't')
else:
return open(name, mode, bufsiz)
@@ -324,7 +348,7 @@ class AthFileServer(object):
self.pyroot = ru.import_root()
try:
ru._pythonize_tfile()
- except Exception, err:
+ except Exception as err:
self.msg().warning('problem during TFile pythonization:\n%s', err)
self.msg().debug('importing ROOT... [done]')
@@ -349,7 +373,7 @@ class AthFileServer(object):
if f:
f.Close()
del f
- except Exception,err:
+ except Exception as err:
self._msg.info('could not close a TFile:\n%s', err)
pass
tfiles[:] = []
@@ -454,7 +478,7 @@ class AthFileServer(object):
# synchronize once
try:
self._sync_pers_cache()
- except Exception, err:
+ except Exception as err:
self.msg().info('could not synchronize the persistent cache:\n%s', err)
pass
@@ -474,7 +498,7 @@ class AthFileServer(object):
msg = self.msg()
cache = dict(self._cache)
fids = []
- for k,v in cache.iteritems():
+ for k,v in six.iteritems (cache):
v = v.infos
fid = v.get('file_md5sum', v['file_guid'])
if fid:
@@ -552,7 +576,7 @@ class AthFileServer(object):
try:
self._cache = cache
self._sync_pers_cache()
- except Exception,err:
+ except Exception as err:
msg.info('could not synchronize the persistent cache:\n%s', err)
pass
return self._cache[fname]
@@ -580,7 +604,7 @@ class AthFileServer(object):
return 'file:'+uri
return uri
- from urlparse import urlsplit
+ from six.moves.urllib.parse import urlsplit
url = urlsplit(_normalize_uri(fname))
protocol = url.scheme
def _normalize(fname):
@@ -692,7 +716,7 @@ class AthFileServer(object):
else:
msg.warning("could not save to [%s]", pid_fname)
msg.debug('synch-ing cache to [%s]... [done]', fname)
- except Exception,err:
+ except Exception as err:
msg.debug('synch-ing cache to [%s]... [failed]', fname)
msg.debug('reason:\n%s', err)
pass
@@ -742,7 +766,7 @@ class AthFileServer(object):
cache = {}
try:
cache = loader(fname)
- except Exception, err:
+ except Exception as err:
msg.info("problem loading cache from [%s]!", fname)
msg.info(repr(err))
pass
@@ -770,13 +794,13 @@ class AthFileServer(object):
saver = self._save_ascii_cache
try:
saver(fname)
- except IOError,err:
+ except IOError as err:
import errno
if err.errno != errno.EACCES:
raise
else:
msg.info('could not save cache in [%s]', fname)
- except Exception,err:
+ except Exception as err:
msg.warning('could not save cache into [%s]:\n%s', fname, err)
return
@@ -820,11 +844,11 @@ class AthFileServer(object):
"""load file informations from a pretty-printed python code"""
dct = {}
ast = compile(_my_open(fname).read(), fname, 'exec')
- exec ast in dct,dct
+ exec (ast, dct,dct)
del ast
try:
cache = dct['fileinfos']
- except Exception, err:
+ except Exception as err:
raise
finally:
del dct
@@ -835,19 +859,21 @@ class AthFileServer(object):
from pprint import pprint
cache = self._cache
with _my_open(fname, 'w') as fd:
- print >> fd, "# this is -*- python -*-"
- print >> fd, "# this file has been automatically generated."
- print >> fd, "fileinfos = ["
+ print ("# this is -*- python -*-", file=fd)
+ print ("# this file has been automatically generated.", file=fd)
+ print ("fileinfos = [", file=fd)
fd.flush()
for k in cache:
- print >> fd, "\n## new-entry"
+ print ("\n## new-entry", file=fd)
+ if six.PY2:
+ _clean_dict (cache[k].fileinfos)
pprint((k, cache[k].fileinfos),
stream=fd,
width=120)
fd.flush()
- print >> fd, ", "
- print >> fd, "]"
- print >> fd, "### EOF ###"
+ print (", ", file=fd)
+ print ("]", file=fd)
+ print ("### EOF ###", file=fd)
fd.flush()
return
@@ -856,7 +882,7 @@ class AthFileServer(object):
import PyUtils.dbsqlite as dbsqlite
cache = dbsqlite.open(fname)
d = {}
- for k,v in cache.iteritems():
+ for k,v in six.iteritems (cache):
d[k] = AthFile.from_infos(v)
return d
@@ -920,7 +946,7 @@ class AthFileServer(object):
do_close = False
f = fname
- _is_root_file= bool(f and f.IsOpen() and 'root' in f.read(10))
+ _is_root_file= bool(f and f.IsOpen() and b'root' in f.read(10))
if f and do_close:
f.Close()
del f
@@ -1062,7 +1088,7 @@ class FilePeeker(object):
if evtmax in (-1, None):
evtmax = nentries
evtmax = int(evtmax)
- for row in xrange(evtmax):
+ for row in range(evtmax):
if coll_tree.GetEntry(row) < 0:
break
# With root 5.34.22, trying to access leaves of a
@@ -1150,8 +1176,8 @@ class FilePeeker(object):
os.close(fd_pkl)
if os.path.exists(out_pkl_fname):
os.remove(out_pkl_fname)
- print "\n --------- running Athena peeker"
- print os.environ.get('CMTPATH','')
+ print ("\n --------- running Athena peeker")
+ print (os.environ.get('CMTPATH',''))
import AthenaCommon.ChapPy as api
app = api.AthenaApp(cmdlineargs=["--nprocs=0"])
@@ -1192,9 +1218,9 @@ class FilePeeker(object):
(os.getpid(), uuid.uuid4())
)
stdout = open(stdout_fname, "w")
- print >> stdout,"="*80
- print >> stdout,self._sub_env
- print >> stdout,"="*80
+ print ("="*80, file=stdout)
+ print (self._sub_env, file=stdout)
+ print ("="*80, file=stdout)
stdout.flush()
if DEFAULT_AF_RUN:
sc = app.run(stdout=stdout, env=self._sub_env)
@@ -1263,7 +1289,7 @@ class FilePeeker(object):
f_root.Close()
del f_raw
del f_root
- except Exception,err:
+ except Exception as err:
msg.warning(
'problem while closing raw and root file handles:\n%s',
err
@@ -1274,11 +1300,7 @@ class FilePeeker(object):
import re
import PyUtils.Helpers as H
with H.ShutUp(filters=[re.compile('.*')]):
- try:
- f = self._process_call(fname, evtmax, projects)
- except Exception,err:
- # give it another chance but with the full environment
- f = self._process_call(fname, evtmax, projects=None)
+ f = self._process_call(fname, evtmax, projects=None)
return f
@@ -1293,14 +1315,14 @@ class FilePeeker(object):
beam_type = '<beam-type N/A>'
try:
beam_type = data_reader.beamType()
- except Exception,err:
+ except Exception as err:
msg.warning ("problem while extracting beam-type information")
pass
beam_energy = '<beam-energy N/A>'
try:
beam_energy = data_reader.beamEnergy()
- except Exception,err:
+ except Exception as err:
msg.warning ("problem while extracting beam-type information")
pass
@@ -1384,7 +1406,7 @@ class FilePeeker(object):
evtmax = nentries
ievt = iter(bs)
- for i in xrange(evtmax):
+ for i in range(evtmax):
try:
evt = ievt.next()
evt.check() # may raise a RuntimeError
@@ -1400,8 +1422,8 @@ class FilePeeker(object):
file_infos['beam_energy'].append(beam_energy)
file_infos['stream_tags'].extend(stream_tags)
- except RuntimeError, err:
- print "** WARNING ** detected a corrupted bs-file:\n",err
+ except RuntimeError as err:
+ print ("** WARNING ** detected a corrupted bs-file:\n",err)
"""
detailed dump how-to:
---------------------
diff --git a/Tools/PyUtils/python/AthFile/tests.py b/Tools/PyUtils/python/AthFile/tests.py
index 71329b4821ac3f5d0fc54fbc354c824737cc1ec1..08aef7a1d6d02a2474822879f0d3746912075df2 100644
--- a/Tools/PyUtils/python/AthFile/tests.py
+++ b/Tools/PyUtils/python/AthFile/tests.py
@@ -4,7 +4,7 @@
# @purpose a simple abstraction of a file to retrieve informations out of it
# @author Sebastien Binet <binet@cern.ch>
# @date October 2008
-from __future__ import with_statement
+from __future__ import with_statement, print_function
import unittest, sys
@@ -69,9 +69,9 @@ class AthFileTest(unittest.TestCase):
f1 = af.fopen(fname)
if verbose:
- print "::: f1.fileinfos:"
- print f1.fileinfos
- f1_ref = {'file_md5sum':'36ff1ef242bd3240227016e71e241a89', 'metadata_items': [('EventStreamInfo', 'StreamESD'), ('LumiBlockCollection', 'LumiBlocks'), ('DataHeader', ';00;MetaDataSvc'), ('IOVMetaDataContainer', '/GLOBAL/DETSTATUS/LBSUMM')], 'stream_names': ['StreamESD'], 'run_type': ['N/A'], 'stream_tags': [{'obeys_lbk': True, 'stream_type': 'physics', 'stream_name': 'IDCosmic'}], 'tag_info': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', 'GeoAtlas': 'ATLAS-GEO-02-01-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections.topophioff-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections.topogap-v1', 'AtlasRelease': 'AtlasTier0-15.0.0.4', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-00', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/SCT/DAQ/Calibration/NoiseOccupancyDefects': 'HEAD', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections.etaoff-v4_1', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections.trcorr-v5', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections.topolw-v1', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/SCT/DAQ/Calibration/NPtGainDefects': 'HEAD', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections.etamod-v4', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections.phimod-v4', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections.rfac-v4', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections.calhits-v5', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections.phioff-v4', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections.topoetaoff-v1', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections.gap-v4', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections.topophimod-v1'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/esd.gcc34.15.1.x.pool.root', 'file_guid': '5A6CD469-D01D-DE11-82E4-000423D67746', 'beam_type': ['N/A'], 'lumi_block': [1L], 'conditions_tag': 'COMCOND-ES1C-001-00', 'det_descr_tags': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', 'GeoAtlas': 'ATLAS-GEO-02-01-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections.topophioff-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections.topogap-v1', 'AtlasRelease': 'AtlasTier0-15.0.0.4', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-00', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/SCT/DAQ/Calibration/NoiseOccupancyDefects': 'HEAD', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections.etaoff-v4_1', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections.trcorr-v5', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections.topolw-v1', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/SCT/DAQ/Calibration/NPtGainDefects': 'HEAD', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections.etamod-v4', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections.phimod-v4', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections.rfac-v4', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections.calhits-v5', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections.phioff-v4', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections.topoetaoff-v1', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections.gap-v4', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections.topophimod-v1'}, 'nentries': 10L, 'eventdata_items': [('EventInfo', 'ByteStreamEventInfo'), ('PixelRDO_Container', 'PixelRDOs'), ('SCT_RDO_Container', 'SCT_RDOs'), ('TRT_RDO_Container', 'TRT_RDOs'), ('InDet::PixelClusterContainer', 'PixelClusters'), ('InDet::SCT_ClusterContainer', 'SCT_Clusters'), ('BCM_RDO_Container', 'BCM_RDOs'), ('LArDigitContainer', 'LArDigitContainer_IIC'), ('LArDigitContainer', 'LArDigitContainer_Thinned'), ('CaloCellContainer', 'AllCalo'), ('CaloTowerContainer', 'CombinedTower'), ('CaloClusterContainer', 'CaloCalTopoCluster'), ('CaloClusterContainer', 'CaloTopoCluster'), ('CaloClusterContainer', 'EMTopoCluster430'), ('CaloClusterContainer', 'LArClusterEM'), ('CaloClusterContainer', 'LArClusterEM7_11Nocorr'), ('CaloClusterContainer', 'LArClusterEMFrwd'), ('CaloClusterContainer', 'LArClusterEMSofte'), ('CaloClusterContainer', 'LArMuClusterCandidates'), ('CaloClusterContainer', 'MuonClusterCollection'), ('CaloClusterContainer', 'Tau1P3PCellCluster'), ('CaloClusterContainer', 'Tau1P3PCellEM012ClusterContainer'), ('CaloClusterContainer', 'Tau1P3PPi0ClusterContainer'), ('CaloClusterContainer', 'egClusterCollection'), ('TileDigitsContainer', 'TileDigitsFlt'), ('TileCellContainer', 'MBTSContainer'), ('TileL2Container', 'TileL2Cnt'), ('TileMuContainer', 'TileMuObj'), ('TileCosmicMuonContainer', 'TileCosmicMuonHT'), ('ElectronContainer', 'ElectronAODCollection'), ('ElectronContainer', 'ElectronCollection'), ('PhotonContainer', 'PhotonAODCollection'), ('PhotonContainer', 'PhotonCollection'), ('ElectronContainer', 'egammaForwardCollection'), ('ElectronContainer', 'softeCollection'), ('Analysis::TauJetContainer', 'TauRecContainer'), ('JetKeyDescriptor', 'JetKeyMap'), ('MissingETSig', 'METSig'), ('MissingEtCalo', 'MET_Base'), ('MissingEtCalo', 'MET_Base0'), ('MissingEtCalo', 'MET_Calib'), ('MissingET', 'MET_CellOut'), ('MissingET', 'MET_CellOut_MiniJet'), ('MissingEtCalo', 'MET_CorrTopo'), ('MissingET', 'MET_Cryo'), ('MissingET', 'MET_CryoCone'), ('MissingET', 'MET_Final'), ('MissingEtCalo', 'MET_LocHadTopo'), ('MissingET', 'MET_LocHadTopoObj'), ('MissingET', 'MET_Muon'), ('MissingET', 'MET_MuonBoy'), ('MissingET', 'MET_MuonBoy_Spectro'), ('MissingET', 'MET_MuonBoy_Track'), ('MissingET', 'MET_RefEle'), ('MissingET', 'MET_RefFinal'), ('MissingET', 'MET_RefGamma'), ('MissingET', 'MET_RefJet'), ('MissingET', 'MET_RefMuon'), ('MissingET', 'MET_RefMuon_Track'), ('MissingET', 'MET_RefTau'), ('MissingEtCalo', 'MET_Topo'), ('MissingET', 'MET_TopoObj'), ('MissingET', 'ObjMET_Elec'), ('MissingET', 'ObjMET_Final'), ('MissingET', 'ObjMET_IdTrk'), ('MissingET', 'ObjMET_Jet'), ('MissingET', 'ObjMET_MiniJet'), ('MissingET', 'ObjMET_Muon'), ('MissingET', 'ObjMET_Rest'), ('MissingET', 'ObjMET_TauJet'), ('Trk::SegmentCollection', 'ConvertedMBoySegments'), ('Trk::SegmentCollection', 'MooreSegments'), ('Trk::SegmentCollection', 'MuGirlSegments'), ('TrackCollection', 'CombinedInDetTracks'), ('TrackCollection', 'CombinedInDetTracks_CTB'), ('TrackCollection', 'Combined_Tracks'), ('TrackCollection', 'ConvertedMBoyMuonSpectroOnlyTracks'), ('TrackCollection', 'ConvertedMBoyTracks'), ('TrackCollection', 'ConvertedMuIdCBTracks'), ('TrackCollection', 'ConvertedMuTagTracks'), ('TrackCollection', 'ConvertedStacoTracks'), ('TrackCollection', 'MooreExtrapolatedTracks'), ('TrackCollection', 'MooreTracks'), ('TrackCollection', 'MuGirlRefittedTracks'), ('TrackCollection', 'MuTagIMOTracks'), ('TrackCollection', 'MuidExtrapolatedTracks'), ('TrackCollection', 'ResolvedPixelTracks_CTB'), ('TrackCollection', 'ResolvedSCTTracks_CTB'), ('TrackCollection', 'TRTStandaloneTRTTracks_CTB'), ('InDet::PixelGangedClusterAmbiguities', 'PixelClusterAmbiguitiesMap'), ('LArFebErrorSummary', 'LArFebErrorSummary'), ('ComTime', 'TRT_Phase'), ('Analysis::TauDetailsContainer', 'TauRecDetailsContainer'), ('Analysis::TauDetailsContainer', 'TauRecExtraDetailsContainer'), ('Analysis::MuonContainer', 'CaloESDMuonCollection'), ('Analysis::MuonContainer', 'CaloESDMuonCollection2'), ('Analysis::MuonContainer', 'CaloMuonCollection'), ('Analysis::MuonContainer', 'MuGirlLowBetaCollection'), ('Analysis::MuonContainer', 'MuidESDMuonCollection'), ('Analysis::MuonContainer', 'MuidMuonCollection'), ('Analysis::MuonContainer', 'StacoESDMuonCollection'), ('Analysis::MuonContainer', 'StacoMuonCollection'), ('MissingETSigHypoContainer', 'EtMissHypoCollection'), ('TRT_BSIdErrContainer', 'TRT_ByteStreamIdErrs'), ('InDet::TRT_DriftCircleContainer', 'TRT_DriftCircles'), ('MissingETSigObjContainer', 'EtMissObjCollection'), ('Muon::MdtPrepDataContainer', 'MDT_DriftCircles'), ('JetCollection', 'Cone4H1TopoJets'), ('JetCollection', 'Cone4H1TowerJets'), ('JetCollection', 'Cone7H1TowerJets'), ('egDetailContainer', 'SofteDetailContainer'), ('egDetailContainer', 'egDetailAOD'), ('egDetailContainer', 'egDetailContainer'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollection'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollectionNextBC'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollectionPriorBC'), ('Muon::RpcPrepDataContainer', 'RPC_Measurements'), ('CaloShowerContainer', 'CaloCalTopoCluster_Data'), ('CaloShowerContainer', 'CaloTopoCluster_Data'), ('CaloShowerContainer', 'EMTopoCluster430_Data'), ('CaloShowerContainer', 'LArClusterEM7_11Nocorr_Data'), ('CaloShowerContainer', 'LArClusterEMSofte_Data'), ('CaloShowerContainer', 'LArClusterEM_Data'), ('CaloShowerContainer', 'LArMuClusterCandidates_Data'), ('CaloShowerContainer', 'MuonClusterCollection_Data'), ('CaloShowerContainer', 'Tau1P3PCellCluster_Data'), ('CaloShowerContainer', 'Tau1P3PCellEM012ClusterContainer_Data'), ('CaloShowerContainer', 'Tau1P3PPi0ClusterContainer_Data'), ('CaloShowerContainer', 'egClusterCollection_Data'), ('InDetBSErrContainer', 'PixelByteStreamErrs'), ('InDetBSErrContainer', 'SCT_ByteStreamErrs'), ('TRT_BSErrContainer', 'TRT_ByteStreamErrs'), ('CaloCellLinkContainer', 'CaloCalTopoCluster_Link'), ('CaloCellLinkContainer', 'CaloTopoCluster_Link'), ('CaloCellLinkContainer', 'EMTopoCluster430_Link'), ('CaloCellLinkContainer', 'LArClusterEM7_11Nocorr_Link'), ('CaloCellLinkContainer', 'LArClusterEMSofte_Link'), ('CaloCellLinkContainer', 'LArClusterEM_Link'), ('CaloCellLinkContainer', 'LArMuClusterCandidates_Link'), ('CaloCellLinkContainer', 'MuonClusterCollection_Link'), ('CaloCellLinkContainer', 'Tau1P3PCellCluster_Link'), ('CaloCellLinkContainer', 'Tau1P3PCellEM012ClusterContainer_Link'), ('CaloCellLinkContainer', 'Tau1P3PPi0ClusterContainer_Link'), ('CaloCellLinkContainer', 'egClusterCollection_Link'), ('Rec::MuonSpShowerContainer', 'MuonSpShowers'), ('Rec::TrackParticleContainer', 'Combined_TrackParticles'), ('Rec::TrackParticleContainer', 'MooreTrackParticles'), ('Rec::TrackParticleContainer', 'MuGirlRefittedTrackParticles'), ('Rec::TrackParticleContainer', 'MuTagIMOTrackParticles'), ('Rec::TrackParticleContainer', 'MuTagTrackParticles'), ('Rec::TrackParticleContainer', 'MuidExtrTrackParticles'), ('Rec::TrackParticleContainer', 'MuonboyMuonSpectroOnlyTrackParticles'), ('Rec::TrackParticleContainer', 'MuonboyTrackParticles'), ('Rec::TrackParticleContainer', 'StacoTrackParticles'), ('Rec::TrackParticleContainer', 'TrackParticleCandidate'), ('Muon::TgcPrepDataContainer', 'TGC_Measurements'), ('Muon::TgcPrepDataContainer', 'TGC_MeasurementsNextBC'), ('Muon::TgcPrepDataContainer', 'TGC_MeasurementsPriorBC'), ('MuonCaloEnergyContainer', 'MuonCaloEnergyCollection'), ('DataHeader', 'StreamESD')], 'run_number': [91900L], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-02-01-00', 'evt_number': [2244L], 'evt_type': ('IS_DATA', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {'/GLOBAL/DETSTATUS/LBSUMM': []}}
+ print ("::: f1.fileinfos:")
+ print (f1.fileinfos)
+ f1_ref = {'file_md5sum':'36ff1ef242bd3240227016e71e241a89', 'metadata_items': [('EventStreamInfo', 'StreamESD'), ('LumiBlockCollection', 'LumiBlocks'), ('DataHeader', ';00;MetaDataSvc'), ('IOVMetaDataContainer', '/GLOBAL/DETSTATUS/LBSUMM')], 'stream_names': ['StreamESD'], 'run_type': ['N/A'], 'stream_tags': [{'obeys_lbk': True, 'stream_type': 'physics', 'stream_name': 'IDCosmic'}], 'tag_info': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', 'GeoAtlas': 'ATLAS-GEO-02-01-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections.topophioff-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections.topogap-v1', 'AtlasRelease': 'AtlasTier0-15.0.0.4', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-00', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/SCT/DAQ/Calibration/NoiseOccupancyDefects': 'HEAD', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections.etaoff-v4_1', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections.trcorr-v5', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections.topolw-v1', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/SCT/DAQ/Calibration/NPtGainDefects': 'HEAD', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections.etamod-v4', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections.phimod-v4', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections.rfac-v4', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections.calhits-v5', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections.phioff-v4', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections.topoetaoff-v1', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections.gap-v4', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections.topophimod-v1'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/esd.gcc34.15.1.x.pool.root', 'file_guid': '5A6CD469-D01D-DE11-82E4-000423D67746', 'beam_type': ['N/A'], 'lumi_block': [1], 'conditions_tag': 'COMCOND-ES1C-001-00', 'det_descr_tags': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', 'GeoAtlas': 'ATLAS-GEO-02-01-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections.topophioff-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections.topogap-v1', 'AtlasRelease': 'AtlasTier0-15.0.0.4', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-00', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/SCT/DAQ/Calibration/NoiseOccupancyDefects': 'HEAD', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections.etaoff-v4_1', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections.trcorr-v5', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections.topolw-v1', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/SCT/DAQ/Calibration/NPtGainDefects': 'HEAD', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections.etamod-v4', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections.phimod-v4', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections.rfac-v4', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections.calhits-v5', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections.phioff-v4', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections.topoetaoff-v1', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections.gap-v4', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections.topophimod-v1'}, 'nentries': 10, 'eventdata_items': [('EventInfo', 'ByteStreamEventInfo'), ('PixelRDO_Container', 'PixelRDOs'), ('SCT_RDO_Container', 'SCT_RDOs'), ('TRT_RDO_Container', 'TRT_RDOs'), ('InDet::PixelClusterContainer', 'PixelClusters'), ('InDet::SCT_ClusterContainer', 'SCT_Clusters'), ('BCM_RDO_Container', 'BCM_RDOs'), ('LArDigitContainer', 'LArDigitContainer_IIC'), ('LArDigitContainer', 'LArDigitContainer_Thinned'), ('CaloCellContainer', 'AllCalo'), ('CaloTowerContainer', 'CombinedTower'), ('CaloClusterContainer', 'CaloCalTopoCluster'), ('CaloClusterContainer', 'CaloTopoCluster'), ('CaloClusterContainer', 'EMTopoCluster430'), ('CaloClusterContainer', 'LArClusterEM'), ('CaloClusterContainer', 'LArClusterEM7_11Nocorr'), ('CaloClusterContainer', 'LArClusterEMFrwd'), ('CaloClusterContainer', 'LArClusterEMSofte'), ('CaloClusterContainer', 'LArMuClusterCandidates'), ('CaloClusterContainer', 'MuonClusterCollection'), ('CaloClusterContainer', 'Tau1P3PCellCluster'), ('CaloClusterContainer', 'Tau1P3PCellEM012ClusterContainer'), ('CaloClusterContainer', 'Tau1P3PPi0ClusterContainer'), ('CaloClusterContainer', 'egClusterCollection'), ('TileDigitsContainer', 'TileDigitsFlt'), ('TileCellContainer', 'MBTSContainer'), ('TileL2Container', 'TileL2Cnt'), ('TileMuContainer', 'TileMuObj'), ('TileCosmicMuonContainer', 'TileCosmicMuonHT'), ('ElectronContainer', 'ElectronAODCollection'), ('ElectronContainer', 'ElectronCollection'), ('PhotonContainer', 'PhotonAODCollection'), ('PhotonContainer', 'PhotonCollection'), ('ElectronContainer', 'egammaForwardCollection'), ('ElectronContainer', 'softeCollection'), ('Analysis::TauJetContainer', 'TauRecContainer'), ('JetKeyDescriptor', 'JetKeyMap'), ('MissingETSig', 'METSig'), ('MissingEtCalo', 'MET_Base'), ('MissingEtCalo', 'MET_Base0'), ('MissingEtCalo', 'MET_Calib'), ('MissingET', 'MET_CellOut'), ('MissingET', 'MET_CellOut_MiniJet'), ('MissingEtCalo', 'MET_CorrTopo'), ('MissingET', 'MET_Cryo'), ('MissingET', 'MET_CryoCone'), ('MissingET', 'MET_Final'), ('MissingEtCalo', 'MET_LocHadTopo'), ('MissingET', 'MET_LocHadTopoObj'), ('MissingET', 'MET_Muon'), ('MissingET', 'MET_MuonBoy'), ('MissingET', 'MET_MuonBoy_Spectro'), ('MissingET', 'MET_MuonBoy_Track'), ('MissingET', 'MET_RefEle'), ('MissingET', 'MET_RefFinal'), ('MissingET', 'MET_RefGamma'), ('MissingET', 'MET_RefJet'), ('MissingET', 'MET_RefMuon'), ('MissingET', 'MET_RefMuon_Track'), ('MissingET', 'MET_RefTau'), ('MissingEtCalo', 'MET_Topo'), ('MissingET', 'MET_TopoObj'), ('MissingET', 'ObjMET_Elec'), ('MissingET', 'ObjMET_Final'), ('MissingET', 'ObjMET_IdTrk'), ('MissingET', 'ObjMET_Jet'), ('MissingET', 'ObjMET_MiniJet'), ('MissingET', 'ObjMET_Muon'), ('MissingET', 'ObjMET_Rest'), ('MissingET', 'ObjMET_TauJet'), ('Trk::SegmentCollection', 'ConvertedMBoySegments'), ('Trk::SegmentCollection', 'MooreSegments'), ('Trk::SegmentCollection', 'MuGirlSegments'), ('TrackCollection', 'CombinedInDetTracks'), ('TrackCollection', 'CombinedInDetTracks_CTB'), ('TrackCollection', 'Combined_Tracks'), ('TrackCollection', 'ConvertedMBoyMuonSpectroOnlyTracks'), ('TrackCollection', 'ConvertedMBoyTracks'), ('TrackCollection', 'ConvertedMuIdCBTracks'), ('TrackCollection', 'ConvertedMuTagTracks'), ('TrackCollection', 'ConvertedStacoTracks'), ('TrackCollection', 'MooreExtrapolatedTracks'), ('TrackCollection', 'MooreTracks'), ('TrackCollection', 'MuGirlRefittedTracks'), ('TrackCollection', 'MuTagIMOTracks'), ('TrackCollection', 'MuidExtrapolatedTracks'), ('TrackCollection', 'ResolvedPixelTracks_CTB'), ('TrackCollection', 'ResolvedSCTTracks_CTB'), ('TrackCollection', 'TRTStandaloneTRTTracks_CTB'), ('InDet::PixelGangedClusterAmbiguities', 'PixelClusterAmbiguitiesMap'), ('LArFebErrorSummary', 'LArFebErrorSummary'), ('ComTime', 'TRT_Phase'), ('Analysis::TauDetailsContainer', 'TauRecDetailsContainer'), ('Analysis::TauDetailsContainer', 'TauRecExtraDetailsContainer'), ('Analysis::MuonContainer', 'CaloESDMuonCollection'), ('Analysis::MuonContainer', 'CaloESDMuonCollection2'), ('Analysis::MuonContainer', 'CaloMuonCollection'), ('Analysis::MuonContainer', 'MuGirlLowBetaCollection'), ('Analysis::MuonContainer', 'MuidESDMuonCollection'), ('Analysis::MuonContainer', 'MuidMuonCollection'), ('Analysis::MuonContainer', 'StacoESDMuonCollection'), ('Analysis::MuonContainer', 'StacoMuonCollection'), ('MissingETSigHypoContainer', 'EtMissHypoCollection'), ('TRT_BSIdErrContainer', 'TRT_ByteStreamIdErrs'), ('InDet::TRT_DriftCircleContainer', 'TRT_DriftCircles'), ('MissingETSigObjContainer', 'EtMissObjCollection'), ('Muon::MdtPrepDataContainer', 'MDT_DriftCircles'), ('JetCollection', 'Cone4H1TopoJets'), ('JetCollection', 'Cone4H1TowerJets'), ('JetCollection', 'Cone7H1TowerJets'), ('egDetailContainer', 'SofteDetailContainer'), ('egDetailContainer', 'egDetailAOD'), ('egDetailContainer', 'egDetailContainer'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollection'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollectionNextBC'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollectionPriorBC'), ('Muon::RpcPrepDataContainer', 'RPC_Measurements'), ('CaloShowerContainer', 'CaloCalTopoCluster_Data'), ('CaloShowerContainer', 'CaloTopoCluster_Data'), ('CaloShowerContainer', 'EMTopoCluster430_Data'), ('CaloShowerContainer', 'LArClusterEM7_11Nocorr_Data'), ('CaloShowerContainer', 'LArClusterEMSofte_Data'), ('CaloShowerContainer', 'LArClusterEM_Data'), ('CaloShowerContainer', 'LArMuClusterCandidates_Data'), ('CaloShowerContainer', 'MuonClusterCollection_Data'), ('CaloShowerContainer', 'Tau1P3PCellCluster_Data'), ('CaloShowerContainer', 'Tau1P3PCellEM012ClusterContainer_Data'), ('CaloShowerContainer', 'Tau1P3PPi0ClusterContainer_Data'), ('CaloShowerContainer', 'egClusterCollection_Data'), ('InDetBSErrContainer', 'PixelByteStreamErrs'), ('InDetBSErrContainer', 'SCT_ByteStreamErrs'), ('TRT_BSErrContainer', 'TRT_ByteStreamErrs'), ('CaloCellLinkContainer', 'CaloCalTopoCluster_Link'), ('CaloCellLinkContainer', 'CaloTopoCluster_Link'), ('CaloCellLinkContainer', 'EMTopoCluster430_Link'), ('CaloCellLinkContainer', 'LArClusterEM7_11Nocorr_Link'), ('CaloCellLinkContainer', 'LArClusterEMSofte_Link'), ('CaloCellLinkContainer', 'LArClusterEM_Link'), ('CaloCellLinkContainer', 'LArMuClusterCandidates_Link'), ('CaloCellLinkContainer', 'MuonClusterCollection_Link'), ('CaloCellLinkContainer', 'Tau1P3PCellCluster_Link'), ('CaloCellLinkContainer', 'Tau1P3PCellEM012ClusterContainer_Link'), ('CaloCellLinkContainer', 'Tau1P3PPi0ClusterContainer_Link'), ('CaloCellLinkContainer', 'egClusterCollection_Link'), ('Rec::MuonSpShowerContainer', 'MuonSpShowers'), ('Rec::TrackParticleContainer', 'Combined_TrackParticles'), ('Rec::TrackParticleContainer', 'MooreTrackParticles'), ('Rec::TrackParticleContainer', 'MuGirlRefittedTrackParticles'), ('Rec::TrackParticleContainer', 'MuTagIMOTrackParticles'), ('Rec::TrackParticleContainer', 'MuTagTrackParticles'), ('Rec::TrackParticleContainer', 'MuidExtrTrackParticles'), ('Rec::TrackParticleContainer', 'MuonboyMuonSpectroOnlyTrackParticles'), ('Rec::TrackParticleContainer', 'MuonboyTrackParticles'), ('Rec::TrackParticleContainer', 'StacoTrackParticles'), ('Rec::TrackParticleContainer', 'TrackParticleCandidate'), ('Muon::TgcPrepDataContainer', 'TGC_Measurements'), ('Muon::TgcPrepDataContainer', 'TGC_MeasurementsNextBC'), ('Muon::TgcPrepDataContainer', 'TGC_MeasurementsPriorBC'), ('MuonCaloEnergyContainer', 'MuonCaloEnergyCollection'), ('DataHeader', 'StreamESD')], 'run_number': [91900], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-02-01-00', 'evt_number': [2244], 'evt_type': ('IS_DATA', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {'/GLOBAL/DETSTATUS/LBSUMM': []}}
_compare_fileinfos(f1,f1_ref)
assert f1.run_number==f1_ref['run_number']
assert f1.evt_number==f1_ref['evt_number']
@@ -93,8 +93,8 @@ class AthFileTest(unittest.TestCase):
f2 = af.fopen(fname)
if verbose:
- print "::: f2.fileinfos:"
- print f2.fileinfos
+ print ("::: f2.fileinfos:")
+ print (f2.fileinfos)
f2_ref = {'file_md5sum':'e3e301bca63e4b5acb3b3cba43127ff9', 'metadata_items': None, 'stream_names': None, 'run_type': ['TEST'], 'stream_tags': [{'obeys_lbk': True, 'stream_type': 'physics', 'stream_name': 'IDCosmic'}, {'obeys_lbk': False, 'stream_type': 'calibration', 'stream_name': 'IDTracks'}], 'tag_info': None, 'file_type': 'bs', 'file_name': 'rfio:/castor/cern.ch/user/b/binet/regr-tests/athfile/daq.ATLAS.0092226.physics.IDCosmic.LB0054.SFO-1._0001.data', 'file_guid': '7B1EABBD-12E0-4184-ABF0-84EB677D92E7', 'beam_type': [0], 'lumi_block': [54], 'conditions_tag': None, 'det_descr_tags': None, 'nentries': 417, 'eventdata_items': None, 'run_number': [92226], 'beam_energy': [0], 'geometry': None, 'evt_number': [8349492], 'evt_type': [], 'metadata': None}
_compare_fileinfos(f2,f2_ref)
assert f2.run_number==f2_ref['run_number']
@@ -113,9 +113,9 @@ class AthFileTest(unittest.TestCase):
f3 = af.fopen(fname)
if verbose:
- print "::: f3.fileinfos:"
- print f3.fileinfos
- f3_ref = {'file_md5sum':'85f7b3d2da72cb387a8345091c2e00ca','metadata_items': [('EventStreamInfo', 'Stream1'), ('DataHeader', ';00;MetaDataSvc'), ('IOVMetaDataContainer', '/Digitization/Parameters'), ('IOVMetaDataContainer', '/Simulation/Parameters')], 'stream_names': ['Stream1'], 'run_type': ['N/A'], 'stream_tags': [], 'tag_info': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPerm-02_test', '/TRT/Cond/Status': 'TrtStrawStatus-02', '/LAR/Identifier/FebRodAtlas': 'FebRodAtlas-005', '/LAR/ElecCalibMC': 'LARElecCalibMC-CSC02-J-QGSP_BERT', 'GeoAtlas': 'ATLAS-GEO-02-01-00', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', 'AtlasRelease': 'AtlasProduction-14.2.25.3', 'TGC_support': 'TGC Big Wheel', '/GLOBAL/BField/Map': 'BFieldMap-000', 'IOVDbGlobalTag': 'OFLCOND-SIM-00-00-00', 'MDT_support': 'MDT Big Wheel', '/LAR/Identifier/OnOffIdAtlas': 'OnOffIdAtlas-012'}, 'file_type': 'pool', 'file_name': '/afs/cern.ch/atlas/offline/ReleaseData/v3/testfile/valid1.005200.T1_McAtNlo_Jimmy.digit.RDO.e322_s488_d151_tid039414_RDO.039414._00001_extract_10evt.pool.root', 'file_guid': 'E29E4282-D8ED-DD11-8435-000423D59D52', 'beam_type': ['N/A'], 'lumi_block': [0L], 'conditions_tag': 'OFLCOND-SIM-00-00-00', 'det_descr_tags': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPerm-02_test', '/TRT/Cond/Status': 'TrtStrawStatus-02', '/LAR/Identifier/FebRodAtlas': 'FebRodAtlas-005', '/LAR/ElecCalibMC': 'LARElecCalibMC-CSC02-J-QGSP_BERT', 'GeoAtlas': 'ATLAS-GEO-02-01-00', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', 'AtlasRelease': 'AtlasProduction-14.2.25.3', 'TGC_support': 'TGC Big Wheel', '/GLOBAL/BField/Map': 'BFieldMap-000', 'IOVDbGlobalTag': 'OFLCOND-SIM-00-00-00', 'MDT_support': 'MDT Big Wheel', '/LAR/Identifier/OnOffIdAtlas': 'OnOffIdAtlas-012'}, 'nentries': 10L, 'eventdata_items': [('EventInfo', 'McEventInfo'), ('PixelRDO_Container', 'PixelRDOs'), ('SCT_RDO_Container', 'SCT_RDOs'), ('TRT_RDO_Container', 'TRT_RDOs'), ('InDetSimDataCollection', 'BCM_SDO_Map'), ('InDetSimDataCollection', 'PixelSDO_Map'), ('InDetSimDataCollection', 'SCT_SDO_Map'), ('InDetSimDataCollection', 'TRT_SDO_Map'), ('BCM_RDO_Container', 'BCM_RDOs'), ('LArDigitContainer', 'LArDigitContainer_MC_Thinned'), ('LArRawChannelContainer', 'LArRawChannels'), ('LArTTL1Container', 'LArTTL1EM'), ('LArTTL1Container', 'LArTTL1HAD'), ('TileRawChannelContainer', 'TileRawChannelCnt'), ('TileTTL1Container', 'TileTTL1Cnt'), ('TileTTL1Container', 'TileTTL1MBTS'), ('TileHitVector', 'MBTSHits'), ('CscRawDataContainer', 'CSCRDO'), ('TgcRdoContainer', 'TGCRDO'), ('MdtCsmContainer', 'MDTCSM'), ('RpcPadContainer', 'RPCPAD'), ('ROIB::RoIBResult', 'RoIBResult'), ('CTP_RDO', 'CTP_RDO'), ('DataVector<LVL1::JetElement>', 'JetElements'), ('DataVector<LVL1::TriggerTower>', 'TriggerTowers'), ('MuCTPI_RDO', 'MUCTPI_RDO'), ('McEventCollection', 'TruthEvent'), ('DataVector<LVL1::JEMEtSums>', 'JEMEtSums'), ('MuonSimDataCollection', 'MDT_SDO'), ('MuonSimDataCollection', 'RPC_SDO'), ('MuonSimDataCollection', 'TGC_SDO'), ('DataVector<LVL1::CPMTower>', 'CPMTowers'), ('DataVector<LVL1::CPMHits>', 'CPMHits'), ('DataVector<LVL1::CMMEtSums>', 'CMMEtSums'), ('DataVector<LVL1::JEMRoI>', 'JEMRoIs'), ('LVL1::CMMRoI', 'CMMRoIs'), ('DataVector<LVL1::JEMHits>', 'JEMHits'), ('DataVector<LVL1::CPMRoI>', 'CPMRoIs'), ('DataVector<LVL1::CMMJetHits>', 'CMMJetHits'), ('DataVector<LVL1::CMMCPHits>', 'CMMCPHits'), ('CscSimDataCollection', 'CSC_SDO'), ('TrackRecordCollection', 'CaloEntryLayer'), ('TrackRecordCollection', 'MuonEntryLayer'), ('TrackRecordCollection', 'MuonExitLayer'), ('CaloCalibrationHitContainer', 'LArCalibrationHitActive'), ('CaloCalibrationHitContainer', 'LArCalibrationHitDeadMaterial'), ('CaloCalibrationHitContainer', 'LArCalibrationHitInactive'), ('DataHeader', 'Stream1')], 'run_number': [5200L], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-02-01-00', 'evt_number': [30002L], 'evt_type': ('IS_SIMULATION', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {'/Digitization/Parameters': {'physicsList': 'QGSP_BERT', 'N_beamGasInputFiles': 0, 'doBeamHalo': False, 'N_cavernInputFiles': 0, 'overrideMetadata': False, 'numberOfBeamHalo': 1.0, 'doCavern': False, 'IOVDbGlobalTag': 'default', 'N_beamHaloInputFiles': 0, 'initialBunchCrossing': -36, 'doCaloNoise': True, 'N_minBiasInputFiles': 0, 'numberOfCollisions': 0.0, 'rndmSvc': 'AtRanluxGenSvc', 'rndmSeedList': ['BCM_Digitization 49261511 105132395', 'PixelDigitization 10513240 492615105', 'SCT_Digitization 49261511 105132395', 'TRT_ElectronicsNoise 124 346', 'TRT_Noise 1235 3457', 'TRT_ThresholdFluctuations 12346 34568', 'TRT_ProcessStraw 123457 345679', 'TRT_SimDriftTime 1234568 3456790', 'TRT_PAI 12345679 34567891', 'TRT_FakeConditions 123456790 345678902', 'LArDigitization 1235 5679', 'Tile_HitVecToCnt 4789900 989240513', 'Tile_DigitsMaker 4789900 989240513', 'CSC_Digitization 49261511 105132395', 'MDTResponse 49261511 105132395', 'MDT_Digitization 49261511 105132395', 'MDT_DigitizationTwin 393242562 857132382', 'TGC_Digitization 49261511 105132395', 'RPC_Digitization 49261511 105132395', 'CscDigitToCscRDOTool 49261511 105132395', 'Tile_HitToTTL1 4789900 989240513', 'CTPSimulation 1979283044 1924452190'], 'numberOfCavern': 2, 'doMuonNoise': True, 'doInDetNoise': True,'numberOfBeamGas': 1.0, 'finalBunchCrossing': 32, 'doBeamGas': False, 'doMinimumBias': False, 'bunchSpacing': 25, 'DetDescrVersion': 'ATLAS-GEO-02-01-00', 'lvl1TriggerMenu': 'lumi1E31_no_Bphysics_no_prescale', 'rndmSeedOffset2': 1, 'rndmSeedOffset1': 1}, '/Simulation/Parameters': {'EtaPhiStatus': True, 'PhysicsList': 'QGSP_BERT', 'CalibrationRun': 'DeadLAr', 'SimLayout': 'ATLAS-GEO-02-01-00', 'DoLArBirk': False, 'LArParameterization': 0, 'MagneticField': 'OracleDB', 'WorldRRange': 'default', 'SeedsG4': 'default', 'NeutronTimeCut': 150.0, 'WorldZRange': 'default', 'Seeds': 'default', 'G4Version': 'geant4.9.1.patch03.atlas01', 'RunType': 'atlas', 'VertexStatus': True, 'IOVDbGlobalTag': 'default', 'VRangeStatus': True}}}
+ print ("::: f3.fileinfos:")
+ print (f3.fileinfos)
+ f3_ref = {'file_md5sum':'85f7b3d2da72cb387a8345091c2e00ca','metadata_items': [('EventStreamInfo', 'Stream1'), ('DataHeader', ';00;MetaDataSvc'), ('IOVMetaDataContainer', '/Digitization/Parameters'), ('IOVMetaDataContainer', '/Simulation/Parameters')], 'stream_names': ['Stream1'], 'run_type': ['N/A'], 'stream_tags': [], 'tag_info': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPerm-02_test', '/TRT/Cond/Status': 'TrtStrawStatus-02', '/LAR/Identifier/FebRodAtlas': 'FebRodAtlas-005', '/LAR/ElecCalibMC': 'LARElecCalibMC-CSC02-J-QGSP_BERT', 'GeoAtlas': 'ATLAS-GEO-02-01-00', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', 'AtlasRelease': 'AtlasProduction-14.2.25.3', 'TGC_support': 'TGC Big Wheel', '/GLOBAL/BField/Map': 'BFieldMap-000', 'IOVDbGlobalTag': 'OFLCOND-SIM-00-00-00', 'MDT_support': 'MDT Big Wheel', '/LAR/Identifier/OnOffIdAtlas': 'OnOffIdAtlas-012'}, 'file_type': 'pool', 'file_name': '/afs/cern.ch/atlas/offline/ReleaseData/v3/testfile/valid1.005200.T1_McAtNlo_Jimmy.digit.RDO.e322_s488_d151_tid039414_RDO.039414._00001_extract_10evt.pool.root', 'file_guid': 'E29E4282-D8ED-DD11-8435-000423D59D52', 'beam_type': ['N/A'], 'lumi_block': [0], 'conditions_tag': 'OFLCOND-SIM-00-00-00', 'det_descr_tags': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPerm-02_test', '/TRT/Cond/Status': 'TrtStrawStatus-02', '/LAR/Identifier/FebRodAtlas': 'FebRodAtlas-005', '/LAR/ElecCalibMC': 'LARElecCalibMC-CSC02-J-QGSP_BERT', 'GeoAtlas': 'ATLAS-GEO-02-01-00', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', 'AtlasRelease': 'AtlasProduction-14.2.25.3', 'TGC_support': 'TGC Big Wheel', '/GLOBAL/BField/Map': 'BFieldMap-000', 'IOVDbGlobalTag': 'OFLCOND-SIM-00-00-00', 'MDT_support': 'MDT Big Wheel', '/LAR/Identifier/OnOffIdAtlas': 'OnOffIdAtlas-012'}, 'nentries': 10, 'eventdata_items': [('EventInfo', 'McEventInfo'), ('PixelRDO_Container', 'PixelRDOs'), ('SCT_RDO_Container', 'SCT_RDOs'), ('TRT_RDO_Container', 'TRT_RDOs'), ('InDetSimDataCollection', 'BCM_SDO_Map'), ('InDetSimDataCollection', 'PixelSDO_Map'), ('InDetSimDataCollection', 'SCT_SDO_Map'), ('InDetSimDataCollection', 'TRT_SDO_Map'), ('BCM_RDO_Container', 'BCM_RDOs'), ('LArDigitContainer', 'LArDigitContainer_MC_Thinned'), ('LArRawChannelContainer', 'LArRawChannels'), ('LArTTL1Container', 'LArTTL1EM'), ('LArTTL1Container', 'LArTTL1HAD'), ('TileRawChannelContainer', 'TileRawChannelCnt'), ('TileTTL1Container', 'TileTTL1Cnt'), ('TileTTL1Container', 'TileTTL1MBTS'), ('TileHitVector', 'MBTSHits'), ('CscRawDataContainer', 'CSCRDO'), ('TgcRdoContainer', 'TGCRDO'), ('MdtCsmContainer', 'MDTCSM'), ('RpcPadContainer', 'RPCPAD'), ('ROIB::RoIBResult', 'RoIBResult'), ('CTP_RDO', 'CTP_RDO'), ('DataVector<LVL1::JetElement>', 'JetElements'), ('DataVector<LVL1::TriggerTower>', 'TriggerTowers'), ('MuCTPI_RDO', 'MUCTPI_RDO'), ('McEventCollection', 'TruthEvent'), ('DataVector<LVL1::JEMEtSums>', 'JEMEtSums'), ('MuonSimDataCollection', 'MDT_SDO'), ('MuonSimDataCollection', 'RPC_SDO'), ('MuonSimDataCollection', 'TGC_SDO'), ('DataVector<LVL1::CPMTower>', 'CPMTowers'), ('DataVector<LVL1::CPMHits>', 'CPMHits'), ('DataVector<LVL1::CMMEtSums>', 'CMMEtSums'), ('DataVector<LVL1::JEMRoI>', 'JEMRoIs'), ('LVL1::CMMRoI', 'CMMRoIs'), ('DataVector<LVL1::JEMHits>', 'JEMHits'), ('DataVector<LVL1::CPMRoI>', 'CPMRoIs'), ('DataVector<LVL1::CMMJetHits>', 'CMMJetHits'), ('DataVector<LVL1::CMMCPHits>', 'CMMCPHits'), ('CscSimDataCollection', 'CSC_SDO'), ('TrackRecordCollection', 'CaloEntryLayer'), ('TrackRecordCollection', 'MuonEntryLayer'), ('TrackRecordCollection', 'MuonExitLayer'), ('CaloCalibrationHitContainer', 'LArCalibrationHitActive'), ('CaloCalibrationHitContainer', 'LArCalibrationHitDeadMaterial'), ('CaloCalibrationHitContainer', 'LArCalibrationHitInactive'), ('DataHeader', 'Stream1')], 'run_number': [5200], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-02-01-00', 'evt_number': [30002], 'evt_type': ('IS_SIMULATION', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {'/Digitization/Parameters': {'physicsList': 'QGSP_BERT', 'N_beamGasInputFiles': 0, 'doBeamHalo': False, 'N_cavernInputFiles': 0, 'overrideMetadata': False, 'numberOfBeamHalo': 1.0, 'doCavern': False, 'IOVDbGlobalTag': 'default', 'N_beamHaloInputFiles': 0, 'initialBunchCrossing': -36, 'doCaloNoise': True, 'N_minBiasInputFiles': 0, 'numberOfCollisions': 0.0, 'rndmSvc': 'AtRanluxGenSvc', 'rndmSeedList': ['BCM_Digitization 49261511 105132395', 'PixelDigitization 10513240 492615105', 'SCT_Digitization 49261511 105132395', 'TRT_ElectronicsNoise 124 346', 'TRT_Noise 1235 3457', 'TRT_ThresholdFluctuations 12346 34568', 'TRT_ProcessStraw 123457 345679', 'TRT_SimDriftTime 1234568 3456790', 'TRT_PAI 12345679 34567891', 'TRT_FakeConditions 123456790 345678902', 'LArDigitization 1235 5679', 'Tile_HitVecToCnt 4789900 989240513', 'Tile_DigitsMaker 4789900 989240513', 'CSC_Digitization 49261511 105132395', 'MDTResponse 49261511 105132395', 'MDT_Digitization 49261511 105132395', 'MDT_DigitizationTwin 393242562 857132382', 'TGC_Digitization 49261511 105132395', 'RPC_Digitization 49261511 105132395', 'CscDigitToCscRDOTool 49261511 105132395', 'Tile_HitToTTL1 4789900 989240513', 'CTPSimulation 1979283044 1924452190'], 'numberOfCavern': 2, 'doMuonNoise': True, 'doInDetNoise': True,'numberOfBeamGas': 1.0, 'finalBunchCrossing': 32, 'doBeamGas': False, 'doMinimumBias': False, 'bunchSpacing': 25, 'DetDescrVersion': 'ATLAS-GEO-02-01-00', 'lvl1TriggerMenu': 'lumi1E31_no_Bphysics_no_prescale', 'rndmSeedOffset2': 1, 'rndmSeedOffset1': 1}, '/Simulation/Parameters': {'EtaPhiStatus': True, 'PhysicsList': 'QGSP_BERT', 'CalibrationRun': 'DeadLAr', 'SimLayout': 'ATLAS-GEO-02-01-00', 'DoLArBirk': False, 'LArParameterization': 0, 'MagneticField': 'OracleDB', 'WorldRRange': 'default', 'SeedsG4': 'default', 'NeutronTimeCut': 150.0, 'WorldZRange': 'default', 'Seeds': 'default', 'G4Version': 'geant4.9.1.patch03.atlas01', 'RunType': 'atlas', 'VertexStatus': True, 'IOVDbGlobalTag': 'default', 'VRangeStatus': True}}}
_compare_fileinfos(f3,f3_ref)
assert f3.run_number==f3_ref['run_number']
assert f3.evt_number==f3_ref['evt_number']
@@ -133,8 +133,8 @@ class AthFileTest(unittest.TestCase):
f4 = af.fopen(fname)
if verbose:
- print "::: f4.fileinfos:"
- print f4.fileinfos
+ print ("::: f4.fileinfos:")
+ print (f4.fileinfos)
f4_ref = {'file_md5sum':'519643438bf3a0e7a1e637463d73d9e9','metadata_items': [('DataHeader', ';00;MetaDataSvc'), ('EventBookkeeperCollection', 'EventBookkeepers'), ('EventBookkeeperCollection', 'EventSelector.Counter'), ('EventStreamInfo', 'DPD_EGAMTAUCOMM'), ('IOVMetaDataContainer', '/GLOBAL/DETSTATUS/LBSUMM'), ('IOVMetaDataContainer', '/TRIGGER/HLT/HltConfigKeys'), ('IOVMetaDataContainer', '/TRIGGER/HLT/Menu'), ('IOVMetaDataContainer', '/TRIGGER/LVL1/Lvl1ConfigKey'), ('IOVMetaDataContainer', '/TRIGGER/LVL1/Menu'), ('IOVMetaDataContainer', '/TRIGGER/LVL1/Prescales'), ('IOVMetaDataContainer', '/TagInfo'), ('LumiBlockCollection', 'IncompleteLumiBlocks')], 'stream_names': ['DPD_EGAMTAUCOMM'], 'run_type': ['N/A'], 'stream_tags': [], 'tag_info': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPerm-02_test', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', 'GeoAtlas': 'ATLAS-GEO-03-00-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections.topophioff-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections.topogap-v1', 'AtlasRelease': 'any', 'IOVDbGlobalTag': 'COMCOND-ES1C-000-00', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections.etaoff-v4_1', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections.phioff-v4', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-003-01', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections.topolw-v1', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-003-01', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFRac-003-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-003-01', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections.phimod-v4', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections.etamod-v4', 'AMITag': 'f57', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections.rfac-v4', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections.calhits-v5', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections.trcorr-v5', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections.topoetaoff-v1', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections.gap-v4', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections.topophimod-v1'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/empty-file.pool', 'file_guid': 'CC6B79F4-043E-DE11-BD81-000423D67862', 'conditions_tag': 'COMCOND-ES1C-000-00', 'beam_type': ['N/A'], 'lumi_block': [], 'det_descr_tags': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPerm-02_test', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', 'GeoAtlas': 'ATLAS-GEO-03-00-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections.topophioff-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections.topogap-v1', 'AtlasRelease': 'any', 'IOVDbGlobalTag': 'COMCOND-ES1C-000-00', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections.etaoff-v4_1', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections.phioff-v4', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-003-01', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections.topolw-v1', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-003-01', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFRac-003-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-003-01', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections.phimod-v4', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections.etamod-v4', 'AMITag': 'f57', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections.rfac-v4', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections.calhits-v5', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections.trcorr-v5', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections.topoetaoff-v1', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections.gap-v4', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections.topophimod-v1'}, 'nentries': 0, 'eventdata_items': [], 'run_number': [], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-03-00-00', 'evt_number': [], 'evt_type': [], 'metadata': None}
f4.fileinfos['tag_info']['AtlasRelease'] = 'any'
@@ -159,9 +159,9 @@ class AthFileTest(unittest.TestCase):
f5 = af.fopen(fname)
if verbose:
- print "::: f5.fileinfos:"
- print f5.fileinfos
- f5_ref = {'file_md5sum':'b109aa2689abeb8aa282605c29087d64', 'metadata_items': [], 'stream_names': ['Stream1'], 'run_type': ['N/A'], 'stream_tags': [], 'tag_info': {'AtlasRelease': 'AtlasOffline-12.0.31', 'GeoAtlas': 'ATLAS-CSC-01-02-00', 'IOVDbGlobalTag': 'OFLCOND-CSC-00-01-00'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/calib1_csc11.005200.T1_McAtNlo_Jimmy.simul.HITS.v12003104_tid004131._00069.pool.root.10', 'file_guid': '00C5C040-EB75-DB11-9308-00E0812B9987', 'beam_type': ['N/A'], 'lumi_block': [0L], 'conditions_tag': 'OFLCOND-CSC-00-01-00', 'det_descr_tags': {'AtlasRelease': 'AtlasOffline-12.0.31', 'GeoAtlas': 'ATLAS-CSC-01-02-00', 'IOVDbGlobalTag': 'OFLCOND-CSC-00-01-00'}, 'nentries': 50L, 'eventdata_items': [('EventInfo', 'McEventInfo'), ('SiHitCollection', 'PixelHits'), ('SiHitCollection', 'SCT_Hits'), ('LArHitContainer', 'LArHitEMB'), ('LArHitContainer', 'LArHitEMEC'), ('LArHitContainer', 'LArHitFCAL'), ('LArHitContainer', 'LArHitHEC'), ('TileHitVector', 'MBTSHits'), ('TileHitVector', 'TileHitVec'), ('RPCSimHitCollection', 'RPC_Hits'), ('TGCSimHitCollection', 'TGC_Hits'), ('CSCSimHitCollection', 'CSC_Hits'), ('MDTSimHitCollection', 'MDT_Hits'), ('McEventCollection', 'TruthEvent'), ('TRTUncompressedHitCollection', 'TRTUncompressedHits'), ('TrackRecordCollection', 'CaloEntryLayer'), ('TrackRecordCollection', 'MuonEntryLayer'), ('TrackRecordCollection', 'MuonExitLayer'), ('CaloCalibrationHitContainer', 'LArCalibrationHitActive'), ('CaloCalibrationHitContainer', 'LArCalibrationHitDeadMaterial'), ('CaloCalibrationHitContainer', 'LArCalibrationHitInactive'), ('CaloCalibrationHitContainer', 'TileCalibrationCellHitCnt'), ('CaloCalibrationHitContainer', 'TileCalibrationDMHitCnt'), ('DataHeader', 'Stream1')], 'run_number': [5200L], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-CSC-01-02-00', 'evt_number': [6136L], 'evt_type': ('IS_SIMULATION', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {}}
+ print ("::: f5.fileinfos:")
+ print (f5.fileinfos)
+ f5_ref = {'file_md5sum':'b109aa2689abeb8aa282605c29087d64', 'metadata_items': [], 'stream_names': ['Stream1'], 'run_type': ['N/A'], 'stream_tags': [], 'tag_info': {'AtlasRelease': 'AtlasOffline-12.0.31', 'GeoAtlas': 'ATLAS-CSC-01-02-00', 'IOVDbGlobalTag': 'OFLCOND-CSC-00-01-00'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/calib1_csc11.005200.T1_McAtNlo_Jimmy.simul.HITS.v12003104_tid004131._00069.pool.root.10', 'file_guid': '00C5C040-EB75-DB11-9308-00E0812B9987', 'beam_type': ['N/A'], 'lumi_block': [0], 'conditions_tag': 'OFLCOND-CSC-00-01-00', 'det_descr_tags': {'AtlasRelease': 'AtlasOffline-12.0.31', 'GeoAtlas': 'ATLAS-CSC-01-02-00', 'IOVDbGlobalTag': 'OFLCOND-CSC-00-01-00'}, 'nentries': 50, 'eventdata_items': [('EventInfo', 'McEventInfo'), ('SiHitCollection', 'PixelHits'), ('SiHitCollection', 'SCT_Hits'), ('LArHitContainer', 'LArHitEMB'), ('LArHitContainer', 'LArHitEMEC'), ('LArHitContainer', 'LArHitFCAL'), ('LArHitContainer', 'LArHitHEC'), ('TileHitVector', 'MBTSHits'), ('TileHitVector', 'TileHitVec'), ('RPCSimHitCollection', 'RPC_Hits'), ('TGCSimHitCollection', 'TGC_Hits'), ('CSCSimHitCollection', 'CSC_Hits'), ('MDTSimHitCollection', 'MDT_Hits'), ('McEventCollection', 'TruthEvent'), ('TRTUncompressedHitCollection', 'TRTUncompressedHits'), ('TrackRecordCollection', 'CaloEntryLayer'), ('TrackRecordCollection', 'MuonEntryLayer'), ('TrackRecordCollection', 'MuonExitLayer'), ('CaloCalibrationHitContainer', 'LArCalibrationHitActive'), ('CaloCalibrationHitContainer', 'LArCalibrationHitDeadMaterial'), ('CaloCalibrationHitContainer', 'LArCalibrationHitInactive'), ('CaloCalibrationHitContainer', 'TileCalibrationCellHitCnt'), ('CaloCalibrationHitContainer', 'TileCalibrationDMHitCnt'), ('DataHeader', 'Stream1')], 'run_number': [5200], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-CSC-01-02-00', 'evt_number': [6136], 'evt_type': ('IS_SIMULATION', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {}}
_compare_fileinfos(f5,f5_ref)
assert f5.run_number==f5_ref['run_number']
assert f5.evt_number==f5_ref['evt_number']
@@ -180,9 +180,9 @@ class AthFileTest(unittest.TestCase):
assert af.ftype(fname) == ('pool', 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/testSim.0011.mu_pt5_eta60.EVGEN.pool.root')
f6 = af.fopen(fname)
if verbose:
- print "::: f6.fileinfos:"
- print f6.fileinfos
- f6_ref = {'file_md5sum':'b6b58e325235b4fbbf0aebd5e028ab08', 'metadata_items': [], 'stream_names': ['Stream1'], 'run_type': ['N/A'], 'stream_tags': [], 'tag_info': {'AtlasRelease': 'any'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/testSim.0011.mu_pt5_eta60.EVGEN.pool.root', 'file_guid': 'ACC40752-51BB-DB11-8437-000423D65662', 'beam_type': ['N/A'], 'lumi_block': [0L], 'conditions_tag': None, 'det_descr_tags': {'AtlasRelease': 'any'}, 'nentries': 1053L, 'eventdata_items': [('EventInfo', 'McEventInfo'), ('McEventCollection', 'GEN_EVENT'), ('DataHeader', 'Stream1')], 'run_number': [11L], 'beam_energy': ['N/A'], 'geometry': None, 'evt_number': [1L], 'evt_type': ('IS_SIMULATION', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {}}
+ print ("::: f6.fileinfos:")
+ print (f6.fileinfos)
+ f6_ref = {'file_md5sum':'b6b58e325235b4fbbf0aebd5e028ab08', 'metadata_items': [], 'stream_names': ['Stream1'], 'run_type': ['N/A'], 'stream_tags': [], 'tag_info': {'AtlasRelease': 'any'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/testSim.0011.mu_pt5_eta60.EVGEN.pool.root', 'file_guid': 'ACC40752-51BB-DB11-8437-000423D65662', 'beam_type': ['N/A'], 'lumi_block': [0], 'conditions_tag': None, 'det_descr_tags': {'AtlasRelease': 'any'}, 'nentries': 1053, 'eventdata_items': [('EventInfo', 'McEventInfo'), ('McEventCollection', 'GEN_EVENT'), ('DataHeader', 'Stream1')], 'run_number': [11], 'beam_energy': ['N/A'], 'geometry': None, 'evt_number': [1], 'evt_type': ('IS_SIMULATION', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {}}
f6.fileinfos['tag_info']['AtlasRelease'] = 'any'
f6.fileinfos['det_descr_tags']['AtlasRelease'] = 'any'
_compare_fileinfos(f6,f6_ref)
@@ -204,9 +204,9 @@ class AthFileTest(unittest.TestCase):
f7 = af.fopen(fname)
if verbose:
- print "::: f7.fileinfos:"
- print f7.fileinfos
- f7_ref = {'file_md5sum':'c52c2056f049094abe559af10216937c', 'metadata_items': [('EventStreamInfo', 'StreamESD'), ('LumiBlockCollection', 'LumiBlocks'), ('DataHeader', ';00;MetaDataSvc'), ('IOVMetaDataContainer', '/GLOBAL/DETSTATUS/LBSUMM'), ('IOVMetaDataContainer', '/TagInfo')], 'stream_names': ['StreamESD'], 'run_type': ['N/A'], 'stream_tags': [{'obeys_lbk': True, 'stream_type': 'physics', 'stream_name': 'IDCosmic'}], 'tag_info': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/GLOBAL/BTagCalib/IP3D': 'BTagCalib-03-00', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', '/CALO/H1Weights/H1WeightsCone4Topo': 'CaloH1WeightsCone4Topo-02-000', '/TILE/OFL01/CALIB/LAS/LIN': 'TileOfl01CalibLasLin-HLT-UPD1-00', 'GeoAtlas': 'ATLAS-GEO-03-00-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections-00-02-00-DC3-v2', 'AtlasRelease': 'any', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-01', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/CaloSwClusterCorrections/larupdate': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/clcon': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/CES': 'TileOfl01CalibCes-HLT-UPD1-01', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SV1': 'BTagCalib-03-00', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/GLOBAL/BTagCalib/JetProb': 'BTagCalib-03-00', '/CALO/EMTopoClusterCorrections/larupdate': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/GLOBAL/BTagCalib/SoftEl': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/lwc': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/EMS': 'TileOfl01CalibEms-HLT-UPD1-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/TILE/OFL01/CALIB/CIS/FIT/LIN': 'TileOfl01CalibCisFitLin-HLT-UPD1-00', '/GLOBAL/BTagCalib/IP2D': 'BTagCalib-03-00', '/GLOBAL/BTagCalib/JetFitter': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SoftMu': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/EMTopoClusterCorrections/topoetaoffsw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections-00-02-00-DC3-v2'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/esd.commissionning.15.2.0.pool', 'file_guid': '487184A1-9343-DE11-AACC-001E4F3E5C1F', 'beam_type': ['N/A'], 'lumi_block': [1L], 'conditions_tag': 'COMCOND-ES1C-001-01', 'det_descr_tags': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/GLOBAL/BTagCalib/IP3D': 'BTagCalib-03-00', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', '/CALO/H1Weights/H1WeightsCone4Topo': 'CaloH1WeightsCone4Topo-02-000', '/TILE/OFL01/CALIB/LAS/LIN': 'TileOfl01CalibLasLin-HLT-UPD1-00', 'GeoAtlas': 'ATLAS-GEO-03-00-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections-00-02-00-DC3-v2', 'AtlasRelease': 'any', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-01', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/CaloSwClusterCorrections/larupdate': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/clcon': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/CES': 'TileOfl01CalibCes-HLT-UPD1-01', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SV1': 'BTagCalib-03-00', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/GLOBAL/BTagCalib/JetProb': 'BTagCalib-03-00', '/CALO/EMTopoClusterCorrections/larupdate': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/GLOBAL/BTagCalib/SoftEl': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/lwc': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/EMS': 'TileOfl01CalibEms-HLT-UPD1-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/TILE/OFL01/CALIB/CIS/FIT/LIN': 'TileOfl01CalibCisFitLin-HLT-UPD1-00', '/GLOBAL/BTagCalib/IP2D': 'BTagCalib-03-00', '/GLOBAL/BTagCalib/JetFitter': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SoftMu': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/EMTopoClusterCorrections/topoetaoffsw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections-00-02-00-DC3-v2'}, 'nentries': 10L, 'eventdata_items': [('EventInfo', 'ByteStreamEventInfo'), ('PixelRDO_Container', 'PixelRDOs'), ('SCT_RDO_Container', 'SCT_RDOs'), ('TRT_RDO_Container', 'TRT_RDOs'), ('InDet::PixelClusterContainer', 'PixelClusters'), ('InDet::SCT_ClusterContainer', 'SCT_Clusters'), ('BCM_RDO_Container', 'BCM_RDOs'), ('LArDigitContainer', 'LArDigitContainer_IIC'), ('LArDigitContainer', 'LArDigitContainer_Thinned'), ('CaloCellContainer', 'AllCalo'), ('CaloTowerContainer', 'CombinedTower'), ('CaloClusterContainer', 'CaloCalTopoCluster'), ('CaloClusterContainer', 'CaloTopoCluster'), ('CaloClusterContainer', 'EMTopoCluster430'), ('CaloClusterContainer', 'LArClusterEM'), ('CaloClusterContainer', 'LArClusterEM7_11Nocorr'), ('CaloClusterContainer', 'LArClusterEMFrwd'), ('CaloClusterContainer', 'LArClusterEMSofte'), ('CaloClusterContainer', 'LArMuClusterCandidates'), ('CaloClusterContainer', 'MuonClusterCollection'), ('CaloClusterContainer', 'Tau1P3PCellCluster'), ('CaloClusterContainer', 'Tau1P3PCellEM012ClusterContainer'), ('CaloClusterContainer', 'Tau1P3PPi0ClusterContainer'), ('CaloClusterContainer', 'egClusterCollection'), ('TileDigitsContainer', 'TileDigitsFlt'), ('TileCellContainer', 'MBTSContainer'), ('TileL2Container', 'TileL2Cnt'), ('TileMuContainer', 'TileMuObj'), ('TileCosmicMuonContainer', 'TileCosmicMuonHT'), ('ElectronContainer', 'ElectronAODCollection'), ('ElectronContainer', 'ElectronCollection'), ('PhotonContainer', 'PhotonAODCollection'), ('PhotonContainer', 'PhotonCollection'), ('ElectronContainer', 'egammaForwardCollection'), ('ElectronContainer', 'softeCollection'), ('Analysis::TauJetContainer', 'TauRecContainer'), ('JetKeyDescriptor', 'JetKeyMap'), ('MissingEtCalo', 'MET_Base'), ('MissingEtCalo', 'MET_Base0'), ('MissingEtCalo', 'MET_Calib'), ('MissingET', 'MET_CellOut'), ('MissingEtCalo', 'MET_CorrTopo'), ('MissingET', 'MET_Cryo'), ('MissingET', 'MET_CryoCone'), ('MissingET', 'MET_Final'), ('MissingEtCalo', 'MET_LocHadTopo'), ('MissingET', 'MET_LocHadTopoObj'), ('MissingET', 'MET_Muon'), ('MissingET', 'MET_MuonBoy'), ('MissingET', 'MET_MuonBoy_Spectro'), ('MissingET', 'MET_MuonBoy_Track'), ('MissingET', 'MET_RefEle'), ('MissingET', 'MET_RefFinal'), ('MissingET', 'MET_RefGamma'), ('MissingET', 'MET_RefJet'), ('MissingET', 'MET_RefTau'), ('MissingEtCalo', 'MET_Topo'), ('MissingET', 'MET_TopoObj'), ('Trk::SegmentCollection', 'ConvertedMBoySegments'), ('Trk::SegmentCollection', 'MooreSegments'), ('Trk::SegmentCollection', 'MuGirlSegments'), ('TrackCollection', 'CombinedInDetTracks'), ('TrackCollection', 'CombinedInDetTracks_CTB'), ('TrackCollection', 'Combined_Tracks'), ('TrackCollection', 'ConvertedMBoyMuonSpectroOnlyTracks'), ('TrackCollection', 'ConvertedMBoyTracks'), ('TrackCollection', 'ConvertedMuIdCBTracks'), ('TrackCollection', 'ConvertedMuTagTracks'), ('TrackCollection', 'ConvertedStacoTracks'), ('TrackCollection', 'MooreExtrapolatedTracks'), ('TrackCollection', 'MooreTracks'), ('TrackCollection', 'MuGirlRefittedTracks'), ('TrackCollection', 'MuTagIMOTracks'), ('TrackCollection', 'MuidExtrapolatedTracks'), ('TrackCollection', 'ResolvedPixelTracks_CTB'), ('TrackCollection', 'ResolvedSCTTracks_CTB'), ('TrackCollection', 'TRTStandaloneTRTTracks_CTB'), ('InDet::PixelGangedClusterAmbiguities', 'PixelClusterAmbiguitiesMap'), ('LArFebErrorSummary', 'LArFebErrorSummary'), ('ComTime', 'TRT_Phase'), ('Analysis::TauDetailsContainer', 'TauRecDetailsContainer'), ('Analysis::TauDetailsContainer', 'TauRecExtraDetailsContainer'), ('Muon::CscPrepDataContainer', 'CSC_Clusters'), ('Analysis::MuonContainer', 'CaloESDMuonCollection'), ('Analysis::MuonContainer', 'CaloMuonCollection'), ('Analysis::MuonContainer', 'MuGirlLowBetaCollection'), ('Analysis::MuonContainer', 'MuidESDMuonCollection'), ('Analysis::MuonContainer', 'MuidMuonCollection'), ('Analysis::MuonContainer', 'StacoESDMuonCollection'), ('Analysis::MuonContainer', 'StacoMuonCollection'), ('TRT_BSIdErrContainer', 'TRT_ByteStreamIdErrs'), ('InDet::TRT_DriftCircleContainer', 'TRT_DriftCircles'), ('Muon::MdtPrepDataContainer', 'MDT_DriftCircles'), ('JetCollection', 'Cone4H1TopoJets'), ('JetCollection', 'Cone4H1TowerJets'), ('JetCollection', 'Cone7H1TowerJets'), ('egDetailContainer', 'SofteDetailContainer'), ('egDetailContainer', 'egDetailAOD'), ('egDetailContainer', 'egDetailContainer'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollection'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollectionNextBC'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollectionPriorBC'), ('Muon::RpcCoinDataContainer', 'RPC_triggerHits'), ('Muon::CscStripPrepDataContainer', 'CSC_Measurements'), ('Muon::RpcPrepDataContainer', 'RPC_Measurements'), ('CaloShowerContainer', 'CaloCalTopoCluster_Data'), ('CaloShowerContainer', 'CaloTopoCluster_Data'), ('CaloShowerContainer', 'EMTopoCluster430_Data'), ('CaloShowerContainer', 'LArClusterEM7_11Nocorr_Data'), ('CaloShowerContainer', 'LArClusterEMSofte_Data'), ('CaloShowerContainer', 'LArClusterEM_Data'), ('CaloShowerContainer', 'LArMuClusterCandidates_Data'), ('CaloShowerContainer', 'MuonClusterCollection_Data'), ('CaloShowerContainer', 'Tau1P3PCellCluster_Data'), ('CaloShowerContainer', 'Tau1P3PCellEM012ClusterContainer_Data'), ('CaloShowerContainer', 'Tau1P3PPi0ClusterContainer_Data'), ('CaloShowerContainer', 'egClusterCollection_Data'), ('InDetBSErrContainer', 'PixelByteStreamErrs'), ('InDetBSErrContainer', 'SCT_ByteStreamErrs'), ('TRT_BSErrContainer', 'TRT_ByteStreamErrs'), ('CaloCellLinkContainer', 'CaloCalTopoCluster_Link'), ('CaloCellLinkContainer', 'CaloTopoCluster_Link'), ('CaloCellLinkContainer', 'EMTopoCluster430_Link'), ('CaloCellLinkContainer', 'LArClusterEM7_11Nocorr_Link'), ('CaloCellLinkContainer', 'LArClusterEMSofte_Link'), ('CaloCellLinkContainer', 'LArClusterEM_Link'), ('CaloCellLinkContainer', 'LArMuClusterCandidates_Link'), ('CaloCellLinkContainer', 'MuonClusterCollection_Link'), ('CaloCellLinkContainer', 'Tau1P3PCellCluster_Link'), ('CaloCellLinkContainer', 'Tau1P3PCellEM012ClusterContainer_Link'), ('CaloCellLinkContainer', 'Tau1P3PPi0ClusterContainer_Link'), ('CaloCellLinkContainer', 'egClusterCollection_Link'), ('Rec::MuonSpShowerContainer', 'MuonSpShowers'), ('Rec::TrackParticleContainer', 'Combined_TrackParticles'), ('Rec::TrackParticleContainer', 'MooreTrackParticles'), ('Rec::TrackParticleContainer', 'MuGirlRefittedTrackParticles'), ('Rec::TrackParticleContainer', 'MuTagIMOTrackParticles'), ('Rec::TrackParticleContainer', 'MuTagTrackParticles'), ('Rec::TrackParticleContainer', 'MuidExtrTrackParticles'), ('Rec::TrackParticleContainer', 'MuonboyMuonSpectroOnlyTrackParticles'), ('Rec::TrackParticleContainer', 'MuonboyTrackParticles'), ('Rec::TrackParticleContainer', 'StacoTrackParticles'), ('Rec::TrackParticleContainer', 'TrackParticleCandidate'), ('Muon::TgcPrepDataContainer', 'TGC_Measurements'), ('Muon::TgcPrepDataContainer', 'TGC_MeasurementsNextBC'), ('Muon::TgcPrepDataContainer', 'TGC_MeasurementsPriorBC'), ('MuonCaloEnergyContainer', 'MuonCaloEnergyCollection'), ('DataHeader', 'StreamESD')], 'run_number': [91900L], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-03-00-00', 'evt_number': [2244L], 'evt_type': ('IS_DATA', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {'/GLOBAL/DETSTATUS/LBSUMM': [], '/TagInfo': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/GLOBAL/BTagCalib/IP3D': 'BTagCalib-03-00', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', '/CALO/H1Weights/H1WeightsCone4Topo': 'CaloH1WeightsCone4Topo-02-000', '/TILE/OFL01/CALIB/LAS/LIN': 'TileOfl01CalibLasLin-HLT-UPD1-00', 'GeoAtlas': 'ATLAS-GEO-03-00-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections-00-02-00-DC3-v2', 'AtlasRelease': 'AtlasOffline-rel_1', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-01', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/CaloSwClusterCorrections/larupdate': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/clcon': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/CES': 'TileOfl01CalibCes-HLT-UPD1-01', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SV1': 'BTagCalib-03-00', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/GLOBAL/BTagCalib/JetProb': 'BTagCalib-03-00', '/CALO/EMTopoClusterCorrections/larupdate': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/GLOBAL/BTagCalib/SoftEl': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/lwc': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/EMS': 'TileOfl01CalibEms-HLT-UPD1-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/TILE/OFL01/CALIB/CIS/FIT/LIN': 'TileOfl01CalibCisFitLin-HLT-UPD1-00', '/GLOBAL/BTagCalib/IP2D': 'BTagCalib-03-00', '/GLOBAL/BTagCalib/JetFitter': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SoftMu': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/EMTopoClusterCorrections/topoetaoffsw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections-00-02-00-DC3-v2'}}}
+ print ("::: f7.fileinfos:")
+ print (f7.fileinfos)
+ f7_ref = {'file_md5sum':'c52c2056f049094abe559af10216937c', 'metadata_items': [('EventStreamInfo', 'StreamESD'), ('LumiBlockCollection', 'LumiBlocks'), ('DataHeader', ';00;MetaDataSvc'), ('IOVMetaDataContainer', '/GLOBAL/DETSTATUS/LBSUMM'), ('IOVMetaDataContainer', '/TagInfo')], 'stream_names': ['StreamESD'], 'run_type': ['N/A'], 'stream_tags': [{'obeys_lbk': True, 'stream_type': 'physics', 'stream_name': 'IDCosmic'}], 'tag_info': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/GLOBAL/BTagCalib/IP3D': 'BTagCalib-03-00', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', '/CALO/H1Weights/H1WeightsCone4Topo': 'CaloH1WeightsCone4Topo-02-000', '/TILE/OFL01/CALIB/LAS/LIN': 'TileOfl01CalibLasLin-HLT-UPD1-00', 'GeoAtlas': 'ATLAS-GEO-03-00-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections-00-02-00-DC3-v2', 'AtlasRelease': 'any', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-01', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/CaloSwClusterCorrections/larupdate': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/clcon': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/CES': 'TileOfl01CalibCes-HLT-UPD1-01', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SV1': 'BTagCalib-03-00', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/GLOBAL/BTagCalib/JetProb': 'BTagCalib-03-00', '/CALO/EMTopoClusterCorrections/larupdate': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/GLOBAL/BTagCalib/SoftEl': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/lwc': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/EMS': 'TileOfl01CalibEms-HLT-UPD1-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/TILE/OFL01/CALIB/CIS/FIT/LIN': 'TileOfl01CalibCisFitLin-HLT-UPD1-00', '/GLOBAL/BTagCalib/IP2D': 'BTagCalib-03-00', '/GLOBAL/BTagCalib/JetFitter': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SoftMu': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/EMTopoClusterCorrections/topoetaoffsw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections-00-02-00-DC3-v2'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/esd.commissionning.15.2.0.pool', 'file_guid': '487184A1-9343-DE11-AACC-001E4F3E5C1F', 'beam_type': ['N/A'], 'lumi_block': [1], 'conditions_tag': 'COMCOND-ES1C-001-01', 'det_descr_tags': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/GLOBAL/BTagCalib/IP3D': 'BTagCalib-03-00', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', '/CALO/H1Weights/H1WeightsCone4Topo': 'CaloH1WeightsCone4Topo-02-000', '/TILE/OFL01/CALIB/LAS/LIN': 'TileOfl01CalibLasLin-HLT-UPD1-00', 'GeoAtlas': 'ATLAS-GEO-03-00-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections-00-02-00-DC3-v2', 'AtlasRelease': 'any', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-01', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/CaloSwClusterCorrections/larupdate': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/clcon': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/CES': 'TileOfl01CalibCes-HLT-UPD1-01', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SV1': 'BTagCalib-03-00', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/GLOBAL/BTagCalib/JetProb': 'BTagCalib-03-00', '/CALO/EMTopoClusterCorrections/larupdate': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/GLOBAL/BTagCalib/SoftEl': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/lwc': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/EMS': 'TileOfl01CalibEms-HLT-UPD1-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/TILE/OFL01/CALIB/CIS/FIT/LIN': 'TileOfl01CalibCisFitLin-HLT-UPD1-00', '/GLOBAL/BTagCalib/IP2D': 'BTagCalib-03-00', '/GLOBAL/BTagCalib/JetFitter': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SoftMu': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/EMTopoClusterCorrections/topoetaoffsw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections-00-02-00-DC3-v2'}, 'nentries': 10, 'eventdata_items': [('EventInfo', 'ByteStreamEventInfo'), ('PixelRDO_Container', 'PixelRDOs'), ('SCT_RDO_Container', 'SCT_RDOs'), ('TRT_RDO_Container', 'TRT_RDOs'), ('InDet::PixelClusterContainer', 'PixelClusters'), ('InDet::SCT_ClusterContainer', 'SCT_Clusters'), ('BCM_RDO_Container', 'BCM_RDOs'), ('LArDigitContainer', 'LArDigitContainer_IIC'), ('LArDigitContainer', 'LArDigitContainer_Thinned'), ('CaloCellContainer', 'AllCalo'), ('CaloTowerContainer', 'CombinedTower'), ('CaloClusterContainer', 'CaloCalTopoCluster'), ('CaloClusterContainer', 'CaloTopoCluster'), ('CaloClusterContainer', 'EMTopoCluster430'), ('CaloClusterContainer', 'LArClusterEM'), ('CaloClusterContainer', 'LArClusterEM7_11Nocorr'), ('CaloClusterContainer', 'LArClusterEMFrwd'), ('CaloClusterContainer', 'LArClusterEMSofte'), ('CaloClusterContainer', 'LArMuClusterCandidates'), ('CaloClusterContainer', 'MuonClusterCollection'), ('CaloClusterContainer', 'Tau1P3PCellCluster'), ('CaloClusterContainer', 'Tau1P3PCellEM012ClusterContainer'), ('CaloClusterContainer', 'Tau1P3PPi0ClusterContainer'), ('CaloClusterContainer', 'egClusterCollection'), ('TileDigitsContainer', 'TileDigitsFlt'), ('TileCellContainer', 'MBTSContainer'), ('TileL2Container', 'TileL2Cnt'), ('TileMuContainer', 'TileMuObj'), ('TileCosmicMuonContainer', 'TileCosmicMuonHT'), ('ElectronContainer', 'ElectronAODCollection'), ('ElectronContainer', 'ElectronCollection'), ('PhotonContainer', 'PhotonAODCollection'), ('PhotonContainer', 'PhotonCollection'), ('ElectronContainer', 'egammaForwardCollection'), ('ElectronContainer', 'softeCollection'), ('Analysis::TauJetContainer', 'TauRecContainer'), ('JetKeyDescriptor', 'JetKeyMap'), ('MissingEtCalo', 'MET_Base'), ('MissingEtCalo', 'MET_Base0'), ('MissingEtCalo', 'MET_Calib'), ('MissingET', 'MET_CellOut'), ('MissingEtCalo', 'MET_CorrTopo'), ('MissingET', 'MET_Cryo'), ('MissingET', 'MET_CryoCone'), ('MissingET', 'MET_Final'), ('MissingEtCalo', 'MET_LocHadTopo'), ('MissingET', 'MET_LocHadTopoObj'), ('MissingET', 'MET_Muon'), ('MissingET', 'MET_MuonBoy'), ('MissingET', 'MET_MuonBoy_Spectro'), ('MissingET', 'MET_MuonBoy_Track'), ('MissingET', 'MET_RefEle'), ('MissingET', 'MET_RefFinal'), ('MissingET', 'MET_RefGamma'), ('MissingET', 'MET_RefJet'), ('MissingET', 'MET_RefTau'), ('MissingEtCalo', 'MET_Topo'), ('MissingET', 'MET_TopoObj'), ('Trk::SegmentCollection', 'ConvertedMBoySegments'), ('Trk::SegmentCollection', 'MooreSegments'), ('Trk::SegmentCollection', 'MuGirlSegments'), ('TrackCollection', 'CombinedInDetTracks'), ('TrackCollection', 'CombinedInDetTracks_CTB'), ('TrackCollection', 'Combined_Tracks'), ('TrackCollection', 'ConvertedMBoyMuonSpectroOnlyTracks'), ('TrackCollection', 'ConvertedMBoyTracks'), ('TrackCollection', 'ConvertedMuIdCBTracks'), ('TrackCollection', 'ConvertedMuTagTracks'), ('TrackCollection', 'ConvertedStacoTracks'), ('TrackCollection', 'MooreExtrapolatedTracks'), ('TrackCollection', 'MooreTracks'), ('TrackCollection', 'MuGirlRefittedTracks'), ('TrackCollection', 'MuTagIMOTracks'), ('TrackCollection', 'MuidExtrapolatedTracks'), ('TrackCollection', 'ResolvedPixelTracks_CTB'), ('TrackCollection', 'ResolvedSCTTracks_CTB'), ('TrackCollection', 'TRTStandaloneTRTTracks_CTB'), ('InDet::PixelGangedClusterAmbiguities', 'PixelClusterAmbiguitiesMap'), ('LArFebErrorSummary', 'LArFebErrorSummary'), ('ComTime', 'TRT_Phase'), ('Analysis::TauDetailsContainer', 'TauRecDetailsContainer'), ('Analysis::TauDetailsContainer', 'TauRecExtraDetailsContainer'), ('Muon::CscPrepDataContainer', 'CSC_Clusters'), ('Analysis::MuonContainer', 'CaloESDMuonCollection'), ('Analysis::MuonContainer', 'CaloMuonCollection'), ('Analysis::MuonContainer', 'MuGirlLowBetaCollection'), ('Analysis::MuonContainer', 'MuidESDMuonCollection'), ('Analysis::MuonContainer', 'MuidMuonCollection'), ('Analysis::MuonContainer', 'StacoESDMuonCollection'), ('Analysis::MuonContainer', 'StacoMuonCollection'), ('TRT_BSIdErrContainer', 'TRT_ByteStreamIdErrs'), ('InDet::TRT_DriftCircleContainer', 'TRT_DriftCircles'), ('Muon::MdtPrepDataContainer', 'MDT_DriftCircles'), ('JetCollection', 'Cone4H1TopoJets'), ('JetCollection', 'Cone4H1TowerJets'), ('JetCollection', 'Cone7H1TowerJets'), ('egDetailContainer', 'SofteDetailContainer'), ('egDetailContainer', 'egDetailAOD'), ('egDetailContainer', 'egDetailContainer'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollection'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollectionNextBC'), ('Muon::TgcCoinDataContainer', 'TrigT1CoinDataCollectionPriorBC'), ('Muon::RpcCoinDataContainer', 'RPC_triggerHits'), ('Muon::CscStripPrepDataContainer', 'CSC_Measurements'), ('Muon::RpcPrepDataContainer', 'RPC_Measurements'), ('CaloShowerContainer', 'CaloCalTopoCluster_Data'), ('CaloShowerContainer', 'CaloTopoCluster_Data'), ('CaloShowerContainer', 'EMTopoCluster430_Data'), ('CaloShowerContainer', 'LArClusterEM7_11Nocorr_Data'), ('CaloShowerContainer', 'LArClusterEMSofte_Data'), ('CaloShowerContainer', 'LArClusterEM_Data'), ('CaloShowerContainer', 'LArMuClusterCandidates_Data'), ('CaloShowerContainer', 'MuonClusterCollection_Data'), ('CaloShowerContainer', 'Tau1P3PCellCluster_Data'), ('CaloShowerContainer', 'Tau1P3PCellEM012ClusterContainer_Data'), ('CaloShowerContainer', 'Tau1P3PPi0ClusterContainer_Data'), ('CaloShowerContainer', 'egClusterCollection_Data'), ('InDetBSErrContainer', 'PixelByteStreamErrs'), ('InDetBSErrContainer', 'SCT_ByteStreamErrs'), ('TRT_BSErrContainer', 'TRT_ByteStreamErrs'), ('CaloCellLinkContainer', 'CaloCalTopoCluster_Link'), ('CaloCellLinkContainer', 'CaloTopoCluster_Link'), ('CaloCellLinkContainer', 'EMTopoCluster430_Link'), ('CaloCellLinkContainer', 'LArClusterEM7_11Nocorr_Link'), ('CaloCellLinkContainer', 'LArClusterEMSofte_Link'), ('CaloCellLinkContainer', 'LArClusterEM_Link'), ('CaloCellLinkContainer', 'LArMuClusterCandidates_Link'), ('CaloCellLinkContainer', 'MuonClusterCollection_Link'), ('CaloCellLinkContainer', 'Tau1P3PCellCluster_Link'), ('CaloCellLinkContainer', 'Tau1P3PCellEM012ClusterContainer_Link'), ('CaloCellLinkContainer', 'Tau1P3PPi0ClusterContainer_Link'), ('CaloCellLinkContainer', 'egClusterCollection_Link'), ('Rec::MuonSpShowerContainer', 'MuonSpShowers'), ('Rec::TrackParticleContainer', 'Combined_TrackParticles'), ('Rec::TrackParticleContainer', 'MooreTrackParticles'), ('Rec::TrackParticleContainer', 'MuGirlRefittedTrackParticles'), ('Rec::TrackParticleContainer', 'MuTagIMOTrackParticles'), ('Rec::TrackParticleContainer', 'MuTagTrackParticles'), ('Rec::TrackParticleContainer', 'MuidExtrTrackParticles'), ('Rec::TrackParticleContainer', 'MuonboyMuonSpectroOnlyTrackParticles'), ('Rec::TrackParticleContainer', 'MuonboyTrackParticles'), ('Rec::TrackParticleContainer', 'StacoTrackParticles'), ('Rec::TrackParticleContainer', 'TrackParticleCandidate'), ('Muon::TgcPrepDataContainer', 'TGC_Measurements'), ('Muon::TgcPrepDataContainer', 'TGC_MeasurementsNextBC'), ('Muon::TgcPrepDataContainer', 'TGC_MeasurementsPriorBC'), ('MuonCaloEnergyContainer', 'MuonCaloEnergyCollection'), ('DataHeader', 'StreamESD')], 'run_number': [91900], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-03-00-00', 'evt_number': [2244], 'evt_type': ('IS_DATA', 'IS_ATLAS', 'IS_PHYSICS'), 'metadata': {'/GLOBAL/DETSTATUS/LBSUMM': [], '/TagInfo': {'/TRT/Cond/StatusPermanent': 'TrtStrawStatusPermanent-01', '/GLOBAL/BTagCalib/IP3D': 'BTagCalib-03-00', '/CALO/HadCalibration/CaloDMCorr2': 'CaloHadDMCorr-002-00', '/MUONALIGN/MDT/ENDCAP/SIDEC': 'MuonAlignMDTEndCapCAlign-REPRO-08', '/MUONALIGN/MDT/BARREL': 'MuonAlignMDTBarrelAlign-0100-SEC0109', '/CALO/H1Weights/H1WeightsCone4Topo': 'CaloH1WeightsCone4Topo-02-000', '/TILE/OFL01/CALIB/LAS/LIN': 'TileOfl01CalibLasLin-HLT-UPD1-00', 'GeoAtlas': 'ATLAS-GEO-03-00-00', '/CALO/EMTopoClusterCorrections/topophioff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topogap': 'EMTopoClusterCorrections-00-02-00-DC3-v2', 'AtlasRelease': 'AtlasOffline-rel_1', 'IOVDbGlobalTag': 'COMCOND-ES1C-001-01', '/MUONALIGN/TGC/SIDEA': 'MuonAlignTGCEndCapAAlign-REPRO-01', '/MUONALIGN/TGC/SIDEC': 'MuonAlignTGCEndCapCAlign-REPRO-01', '/CALO/CaloSwClusterCorrections/larupdate': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/clcon': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/etaoff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phimod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/CES': 'TileOfl01CalibCes-HLT-UPD1-01', '/CALO/CaloSwClusterCorrections/trcorr': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SV1': 'BTagCalib-03-00', '/MUONALIGN/MDT/ENDCAP/SIDEA': 'MuonAlignMDTEndCapAAlign-REPRO-08', '/CALO/HadCalibration/CaloOutOfClusterPi0': 'CaloHadOOCCorrPi0-CSC05-BERT', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/CALO/EMTopoClusterCorrections/topolw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/HadCalibration/H1ClusterCellWeights': 'CaloH1CellWeights-CSC05-BERT', '/CALO/HadCalibration/CaloEMFrac': 'CaloEMFrac-CSC05-BERT', '/GLOBAL/BTagCalib/JetProb': 'BTagCalib-03-00', '/CALO/EMTopoClusterCorrections/larupdate': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/GLOBAL/BTagCalib/SoftEl': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/lwc': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/TILE/OFL01/CALIB/EMS': 'TileOfl01CalibEms-HLT-UPD1-01', '/CALO/HadCalibration/CaloOutOfCluster': 'CaloHadOOCCorr-CSC05-BERT', '/TILE/OFL01/CALIB/CIS/FIT/LIN': 'TileOfl01CalibCisFitLin-HLT-UPD1-00', '/GLOBAL/BTagCalib/IP2D': 'BTagCalib-03-00', '/GLOBAL/BTagCalib/JetFitter': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/etamod': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/GLOBAL/BTagCalib/SoftMu': 'BTagCalib-03-00', '/CALO/CaloSwClusterCorrections/rfac': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/calhits': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/CaloSwClusterCorrections/phioff': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/H1Weights/H1WeightsConeTopo': 'CaloH1WeightsConeTopo-00-000', '/GLOBAL/TrackingGeo/LayerMaterial': 'TagInfo/AtlasLayerMat_v11_/GeoAtlas', '/CALO/EMTopoClusterCorrections/topoetaoffsw': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/EMTopoClusterCorrections/topoetaoff': 'EMTopoClusterCorrections-00-02-00-DC3-v2', '/CALO/CaloSwClusterCorrections/gap': 'CaloSwClusterCorrections-00-02-00-v6_calh', '/CALO/EMTopoClusterCorrections/topophimod': 'EMTopoClusterCorrections-00-02-00-DC3-v2'}}}
f7.fileinfos['tag_info']['AtlasRelease'] = 'any'
f7.fileinfos['det_descr_tags']['AtlasRelease'] = 'any'
@@ -230,10 +230,10 @@ class AthFileTest(unittest.TestCase):
f8 = af.fopen(fname)
if verbose:
- print "::: f8.fileinfos:"
- print f8.fileinfos
+ print ("::: f8.fileinfos:")
+ print (f8.fileinfos)
- f8_ref = {'file_md5sum': '7f6798d2115b5c1cdad02eb98dec5d68', 'stream_tags': [], 'tag_info': {'IOVDbGlobalTag': 'OFLCOND-SIM-00-00-00','/TRT/Cond/Status': 'TrtStrawStatus-02', '/LAR/Identifier/FebRodAtlas': 'FebRodAtlas-005', '/LAR/ElecCalibMC': 'LARElecCalibMC-CSC02-J-QGSP_BERT', 'GeoAtlas': 'ATLAS-GEO-02-01-00', 'TGC_support': 'TGC Big Wheel', 'AtlasRelease': 'any', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/GLOBAL/BField/Map': 'BFieldMap-000', 'MDT_support': 'MDT Big Wheel', '/LAR/Identifier/OnOffIdAtlas': 'OnOffIdAtlas-012'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.005640.CharybdisJimmy.digit.RDO.e322_s483/RDO.027377._00069.pool.root.3', 'beam_type': ['N/A'], 'det_descr_tags': {'IOVDbGlobalTag': 'OFLCOND-SIM-00-00-00','/TRT/Cond/Status': 'TrtStrawStatus-02', '/LAR/Identifier/FebRodAtlas': 'FebRodAtlas-005', '/LAR/ElecCalibMC': 'LARElecCalibMC-CSC02-J-QGSP_BERT', 'GeoAtlas': 'ATLAS-GEO-02-01-00', 'TGC_support': 'TGC Big Wheel', 'AtlasRelease': 'any', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/GLOBAL/BField/Map': 'BFieldMap-000', 'MDT_support': 'MDT Big Wheel', '/LAR/Identifier/OnOffIdAtlas': 'OnOffIdAtlas-012'}, 'nentries': 25L, 'evt_number': [1814L], 'file_guid': '4E971C9E-A9A4-DD11-8A9A-00145E6D4F72', 'metadata': {'/Digitization/Parameters': {'physicsList': 'QGSP_BERT', 'N_beamGasInputFiles': 0, 'doBeamHalo': False, 'N_cavernInputFiles': 0, 'overrideMetadata': False, 'numberOfBeamHalo': 1.0, 'doCavern': False, 'IOVDbGlobalTag': 'default', 'N_beamHaloInputFiles': 0, 'initialBunchCrossing': -36, 'doCaloNoise': True, 'N_minBiasInputFiles': 0, 'numberOfCollisions': 2.2999999999999998, 'rndmSvc': 'AtRanluxGenSvc', 'rndmSeedList': ['PixelDigitization 10513308 492615173', 'SCT_Digitization 49261579 105132463', 'TRT_ElectronicsNoise 192 414', 'TRT_Noise 1303 3525', 'TRT_ThresholdFluctuations 12414 34636', 'TRT_ProcessStraw 123525 345747', 'TRT_SimDriftTime 1234636 3456858', 'TRT_PAI 12345747 34567959', 'TRT_FakeConditions 123456858 345678970', 'BCM_Digitization 49261579 105132463', 'LArDigitization 1303 5747', 'Tile_HitVecToCnt 4789968 989240581', 'Tile_DigitsMaker 4789968 989240581', 'CSC_Digitization 49261579 105132463', 'MDTResponse 49261579 105132463', 'MDT_Digitization 49261579 105132463', 'MDT_DigitizationTwin 393242630 857132450', 'TGC_Digitization 49261579 105132463', 'RPC_Digitization 49261579 105132463', 'CscDigitToCscRDOTool 49261579 105132463', 'Tile_HitToTTL1 4789968 989240581', 'CTPSimulation 1979283112 1924452258'], 'numberOfCavern': 2, 'doMuonNoise': True, 'doInDetNoise': True, 'numberOfBeamGas': 1.0, 'finalBunchCrossing': 32, 'doBeamGas': False, 'doMinimumBias': False, 'bunchSpacing': 25, 'DetDescrVersion': 'ATLAS-GEO-02-01-00', 'lvl1TriggerMenu': 'lumi1E31_no_Bphysics_no_prescale', 'rndmSeedOffset2': 69, 'rndmSeedOffset1': 69}, '/Simulation/Parameters': {'MagneticField': 'OracleDB', 'PhysicsList': 'QGSP_BERT', 'CalibrationRun': 'DeadLAr', 'SimLayout': 'ATLAS-GEO-02-01-00', 'DoLArBirk': False, 'LArParameterization': 0, 'VertexStatus': True, 'EtaPhiStatus': True, 'WorldRRange': 'default', 'RunType': 'atlas', 'WorldZRange': 'default', 'Seeds': 'default', 'G4Version': 'geant4.8.3.patch02.atlas04', 'NeutronTimeCut': 150.0, 'SeedsG4': 'default', 'IOVDbGlobalTag': 'default', 'VRangeStatus': True}}, 'metadata_items': [('DataHeader', ';00;MetaDataSvc'), ('IOVMetaDataContainer', '/Digitization/Parameters'), ('IOVMetaDataContainer', '/Simulation/Parameters')], 'stream_names': ['Stream1'], 'run_type': ['N/A'], 'conditions_tag': 'OFLCOND-SIM-00-00-00', 'lumi_block': [1L], 'eventdata_items': [('EventInfo', 'McEventInfo'), ('PixelRDO_Container', 'PixelRDOs'), ('SCT_RDO_Container', 'SCT_RDOs'), ('TRT_RDO_Container', 'TRT_RDOs'), ('InDetSimDataCollection', 'BCM_SDO_Map'), ('InDetSimDataCollection', 'PixelSDO_Map'), ('InDetSimDataCollection', 'SCT_SDO_Map'), ('InDetSimDataCollection', 'TRT_SDO_Map'), ('BCM_RDO_Container', 'BCM_RDOs'), ('LArDigitContainer', 'LArDigitContainer_MC_Thinned'), ('LArRawChannelContainer', 'LArRawChannels'), ('LArTTL1Container', 'LArTTL1EM'), ('LArTTL1Container', 'LArTTL1HAD'), ('TileRawChannelContainer', 'TileRawChannelCnt'), ('TileTTL1Container', 'TileTTL1Cnt'), ('TileTTL1Container', 'TileTTL1MBTS'), ('TileHitVector', 'MBTSHits'), ('CscRawDataContainer', 'CSCRDO'), ('TgcRdoContainer', 'TGCRDO'), ('MdtCsmContainer', 'MDTCSM'), ('RpcPadContainer', 'RPCPAD'), ('ROIB::RoIBResult', 'RoIBResult'), ('CTP_RDO', 'CTP_RDO'), ('DataVector<LVL1::JetElement>', 'JetElements'), ('DataVector<LVL1::TriggerTower>', 'TriggerTowers'), ('MuCTPI_RDO', 'MUCTPI_RDO'), ('McEventCollection', 'TruthEvent'), ('DataVector<LVL1::JEMEtSums>', 'JEMEtSums'), ('MuonSimDataCollection', 'MDT_SDO'), ('MuonSimDataCollection', 'RPC_SDO'), ('MuonSimDataCollection', 'TGC_SDO'), ('DataVector<LVL1::CPMTower>', 'CPMTowers'), ('DataVector<LVL1::CPMHits>', 'CPMHits'), ('DataVector<LVL1::CMMEtSums>', 'CMMEtSums'), ('DataVector<LVL1::JEMRoI>', 'JEMRoIs'), ('LVL1::CMMRoI', 'CMMRoIs'), ('DataVector<LVL1::JEMHits>', 'JEMHits'), ('DataVector<LVL1::CPMRoI>', 'CPMRoIs'), ('DataVector<LVL1::CMMJetHits>', 'CMMJetHits'), ('DataVector<LVL1::CMMCPHits>', 'CMMCPHits'), ('CscSimDataCollection', 'CSC_SDO'), ('TrackRecordCollection', 'CaloEntryLayer'), ('TrackRecordCollection', 'MuonEntryLayer'), ('TrackRecordCollection', 'MuonExitLayer'), ('CaloCalibrationHitContainer', 'LArCalibrationHitActive'), ('CaloCalibrationHitContainer', 'LArCalibrationHitDeadMaterial'), ('CaloCalibrationHitContainer', 'LArCalibrationHitInactive'), ('DataHeader', 'Stream1')], 'run_number': [5640L], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-02-01-00', 'evt_type': ('IS_SIMULATION', 'IS_ATLAS', 'IS_PHYSICS')}
+ f8_ref = {'file_md5sum': '7f6798d2115b5c1cdad02eb98dec5d68', 'stream_tags': [], 'tag_info': {'IOVDbGlobalTag': 'OFLCOND-SIM-00-00-00','/TRT/Cond/Status': 'TrtStrawStatus-02', '/LAR/Identifier/FebRodAtlas': 'FebRodAtlas-005', '/LAR/ElecCalibMC': 'LARElecCalibMC-CSC02-J-QGSP_BERT', 'GeoAtlas': 'ATLAS-GEO-02-01-00', 'TGC_support': 'TGC Big Wheel', 'AtlasRelease': 'any', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/GLOBAL/BField/Map': 'BFieldMap-000', 'MDT_support': 'MDT Big Wheel', '/LAR/Identifier/OnOffIdAtlas': 'OnOffIdAtlas-012'}, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.005640.CharybdisJimmy.digit.RDO.e322_s483/RDO.027377._00069.pool.root.3', 'beam_type': ['N/A'], 'det_descr_tags': {'IOVDbGlobalTag': 'OFLCOND-SIM-00-00-00','/TRT/Cond/Status': 'TrtStrawStatus-02', '/LAR/Identifier/FebRodAtlas': 'FebRodAtlas-005', '/LAR/ElecCalibMC': 'LARElecCalibMC-CSC02-J-QGSP_BERT', 'GeoAtlas': 'ATLAS-GEO-02-01-00', 'TGC_support': 'TGC Big Wheel', 'AtlasRelease': 'any', '/LAR/Identifier/LArTTCellMapAtlas': 'LARIdentifierLArTTCellMapAtlas-DC3-05', '/GLOBAL/BField/Map': 'BFieldMap-000', 'MDT_support': 'MDT Big Wheel', '/LAR/Identifier/OnOffIdAtlas': 'OnOffIdAtlas-012'}, 'nentries': 25, 'evt_number': [1814], 'file_guid': '4E971C9E-A9A4-DD11-8A9A-00145E6D4F72', 'metadata': {'/Digitization/Parameters': {'physicsList': 'QGSP_BERT', 'N_beamGasInputFiles': 0, 'doBeamHalo': False, 'N_cavernInputFiles': 0, 'overrideMetadata': False, 'numberOfBeamHalo': 1.0, 'doCavern': False, 'IOVDbGlobalTag': 'default', 'N_beamHaloInputFiles': 0, 'initialBunchCrossing': -36, 'doCaloNoise': True, 'N_minBiasInputFiles': 0, 'numberOfCollisions': 2.2999999999999998, 'rndmSvc': 'AtRanluxGenSvc', 'rndmSeedList': ['PixelDigitization 10513308 492615173', 'SCT_Digitization 49261579 105132463', 'TRT_ElectronicsNoise 192 414', 'TRT_Noise 1303 3525', 'TRT_ThresholdFluctuations 12414 34636', 'TRT_ProcessStraw 123525 345747', 'TRT_SimDriftTime 1234636 3456858', 'TRT_PAI 12345747 34567959', 'TRT_FakeConditions 123456858 345678970', 'BCM_Digitization 49261579 105132463', 'LArDigitization 1303 5747', 'Tile_HitVecToCnt 4789968 989240581', 'Tile_DigitsMaker 4789968 989240581', 'CSC_Digitization 49261579 105132463', 'MDTResponse 49261579 105132463', 'MDT_Digitization 49261579 105132463', 'MDT_DigitizationTwin 393242630 857132450', 'TGC_Digitization 49261579 105132463', 'RPC_Digitization 49261579 105132463', 'CscDigitToCscRDOTool 49261579 105132463', 'Tile_HitToTTL1 4789968 989240581', 'CTPSimulation 1979283112 1924452258'], 'numberOfCavern': 2, 'doMuonNoise': True, 'doInDetNoise': True, 'numberOfBeamGas': 1.0, 'finalBunchCrossing': 32, 'doBeamGas': False, 'doMinimumBias': False, 'bunchSpacing': 25, 'DetDescrVersion': 'ATLAS-GEO-02-01-00', 'lvl1TriggerMenu': 'lumi1E31_no_Bphysics_no_prescale', 'rndmSeedOffset2': 69, 'rndmSeedOffset1': 69}, '/Simulation/Parameters': {'MagneticField': 'OracleDB', 'PhysicsList': 'QGSP_BERT', 'CalibrationRun': 'DeadLAr', 'SimLayout': 'ATLAS-GEO-02-01-00', 'DoLArBirk': False, 'LArParameterization': 0, 'VertexStatus': True, 'EtaPhiStatus': True, 'WorldRRange': 'default', 'RunType': 'atlas', 'WorldZRange': 'default', 'Seeds': 'default', 'G4Version': 'geant4.8.3.patch02.atlas04', 'NeutronTimeCut': 150.0, 'SeedsG4': 'default', 'IOVDbGlobalTag': 'default', 'VRangeStatus': True}}, 'metadata_items': [('DataHeader', ';00;MetaDataSvc'), ('IOVMetaDataContainer', '/Digitization/Parameters'), ('IOVMetaDataContainer', '/Simulation/Parameters')], 'stream_names': ['Stream1'], 'run_type': ['N/A'], 'conditions_tag': 'OFLCOND-SIM-00-00-00', 'lumi_block': [1], 'eventdata_items': [('EventInfo', 'McEventInfo'), ('PixelRDO_Container', 'PixelRDOs'), ('SCT_RDO_Container', 'SCT_RDOs'), ('TRT_RDO_Container', 'TRT_RDOs'), ('InDetSimDataCollection', 'BCM_SDO_Map'), ('InDetSimDataCollection', 'PixelSDO_Map'), ('InDetSimDataCollection', 'SCT_SDO_Map'), ('InDetSimDataCollection', 'TRT_SDO_Map'), ('BCM_RDO_Container', 'BCM_RDOs'), ('LArDigitContainer', 'LArDigitContainer_MC_Thinned'), ('LArRawChannelContainer', 'LArRawChannels'), ('LArTTL1Container', 'LArTTL1EM'), ('LArTTL1Container', 'LArTTL1HAD'), ('TileRawChannelContainer', 'TileRawChannelCnt'), ('TileTTL1Container', 'TileTTL1Cnt'), ('TileTTL1Container', 'TileTTL1MBTS'), ('TileHitVector', 'MBTSHits'), ('CscRawDataContainer', 'CSCRDO'), ('TgcRdoContainer', 'TGCRDO'), ('MdtCsmContainer', 'MDTCSM'), ('RpcPadContainer', 'RPCPAD'), ('ROIB::RoIBResult', 'RoIBResult'), ('CTP_RDO', 'CTP_RDO'), ('DataVector<LVL1::JetElement>', 'JetElements'), ('DataVector<LVL1::TriggerTower>', 'TriggerTowers'), ('MuCTPI_RDO', 'MUCTPI_RDO'), ('McEventCollection', 'TruthEvent'), ('DataVector<LVL1::JEMEtSums>', 'JEMEtSums'), ('MuonSimDataCollection', 'MDT_SDO'), ('MuonSimDataCollection', 'RPC_SDO'), ('MuonSimDataCollection', 'TGC_SDO'), ('DataVector<LVL1::CPMTower>', 'CPMTowers'), ('DataVector<LVL1::CPMHits>', 'CPMHits'), ('DataVector<LVL1::CMMEtSums>', 'CMMEtSums'), ('DataVector<LVL1::JEMRoI>', 'JEMRoIs'), ('LVL1::CMMRoI', 'CMMRoIs'), ('DataVector<LVL1::JEMHits>', 'JEMHits'), ('DataVector<LVL1::CPMRoI>', 'CPMRoIs'), ('DataVector<LVL1::CMMJetHits>', 'CMMJetHits'), ('DataVector<LVL1::CMMCPHits>', 'CMMCPHits'), ('CscSimDataCollection', 'CSC_SDO'), ('TrackRecordCollection', 'CaloEntryLayer'), ('TrackRecordCollection', 'MuonEntryLayer'), ('TrackRecordCollection', 'MuonExitLayer'), ('CaloCalibrationHitContainer', 'LArCalibrationHitActive'), ('CaloCalibrationHitContainer', 'LArCalibrationHitDeadMaterial'), ('CaloCalibrationHitContainer', 'LArCalibrationHitInactive'), ('DataHeader', 'Stream1')], 'run_number': [5640], 'beam_energy': ['N/A'], 'geometry': 'ATLAS-GEO-02-01-00', 'evt_type': ('IS_SIMULATION', 'IS_ATLAS', 'IS_PHYSICS')}
f8.fileinfos['tag_info']['AtlasRelease'] = 'any'
f8.fileinfos['det_descr_tags']['AtlasRelease'] = 'any'
@@ -307,10 +307,10 @@ class AthFileTest(unittest.TestCase):
f10 = af.fopen(fname)
if verbose:
- print "::: f10.fileinfos:"
- print f10.fileinfos
+ print ("::: f10.fileinfos:")
+ print (f10.fileinfos)
- f10_ref = {'metadata_items': None, 'stream_names': ['TAG'], 'run_type': [], 'stream_tags': [], 'evt_type': [], 'tag_info': None, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/utests/athfile/TAG.102229._000001.pool.root.1', 'evt_number': [25], 'beam_energy': [], 'eventdata_items': None, 'run_number': [142391], 'geometry': None, 'beam_type': [], 'file_guid': '10A1A6D0-98EF-DE11-8D70-003048C6617E', 'file_md5sum': 'bce350a81aa253cc7eb8385a62775938', 'lumi_block': [], 'conditions_tag': None, 'det_descr_tags': None, 'nentries': 71L, 'metadata': None}
+ f10_ref = {'metadata_items': None, 'stream_names': ['TAG'], 'run_type': [], 'stream_tags': [], 'evt_type': [], 'tag_info': None, 'file_type': 'pool', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/utests/athfile/TAG.102229._000001.pool.root.1', 'evt_number': [25], 'beam_energy': [], 'eventdata_items': None, 'run_number': [142391], 'geometry': None, 'beam_type': [], 'file_guid': '10A1A6D0-98EF-DE11-8D70-003048C6617E', 'file_md5sum': 'bce350a81aa253cc7eb8385a62775938', 'lumi_block': [], 'conditions_tag': None, 'det_descr_tags': None, 'nentries': 71, 'metadata': None}
_compare_fileinfos(f10,f10_ref)
assert f10.run_number==f10_ref['run_number']
@@ -335,8 +335,8 @@ class AthFileTest(unittest.TestCase):
f11 = af.fopen(fname)
if verbose:
- print "::: f11.fileinfos:"
- print f11.fileinfos
+ print ("::: f11.fileinfos:")
+ print (f11.fileinfos)
f11_ref = {'metadata_items': None, 'stream_names': ['StreamRAW'], 'run_type': [], 'stream_tags': [{'obeys_lbk': None, 'stream_type': 'calibration', 'stream_name': 'LArElec-Delay-32s-High-Em'}], 'evt_type': [], 'tag_info': None, 'file_type': 'bs', 'file_name': 'ami://data10_calib.00150430.calibration_LArElec-Delay-32s-High-Em.daq.RAW', 'evt_number': [], 'beam_energy': [], 'eventdata_items': None, 'run_number': [150430], 'geometry': None, 'beam_type': [], 'file_guid': 'ami://data10_calib.00150430.calibration_LArElec-Delay-32s-High-Em.daq.RAW', 'file_md5sum': None, 'lumi_block': [], 'conditions_tag': None, 'det_descr_tags': None, 'nentries': 3072, 'metadata': None}
@@ -364,8 +364,8 @@ class AthFileTest(unittest.TestCase):
f12 = af.fopen(fname)
if verbose:
- print "::: f12.fileinfos:"
- print f12.fileinfos
+ print ("::: f12.fileinfos:")
+ print (f12.fileinfos)
f12_ref = {'metadata_items': None, 'stream_names': ['StreamESD'], 'run_type': [], 'stream_tags': [{'obeys_lbk': None, 'stream_type': 'physics', 'stream_name': 'BPTX'}], 'evt_type': [], 'tag_info': None, 'file_type': 'pool', 'file_name': 'ami://data09_900GeV.00142191.physics_BPTX.merge.ESD.r1093_p101', 'evt_number': [], 'beam_energy': [], 'eventdata_items': None, 'run_number': [142191], 'geometry': None, 'beam_type': ['collisions'], 'file_guid': 'ami://data09_900GeV.00142191.physics_BPTX.merge.ESD.r1093_p101', 'file_md5sum': None, 'lumi_block': [], 'conditions_tag': 'COMCOND-REPPST-004-00', 'det_descr_tags': None, 'nentries': 1256124, 'metadata': None}
@@ -393,8 +393,8 @@ class AthFileTest(unittest.TestCase):
f13 = af.fopen(fname)
if verbose:
- print "::: f13.fileinfos:"
- print f13.fileinfos
+ print ("::: f13.fileinfos:")
+ print (f13.fileinfos)
f13_ref = {'metadata_items': None, 'stream_names': ['StreamAOD'], 'run_type': [], 'stream_tags': [{'obeys_lbk': None, 'stream_type': 'physics', 'stream_name': 'L1TT-b6'}], 'evt_type': [], 'tag_info': None, 'file_type': 'pool', 'file_name': 'ami://data09_idcomm.00111427.physics_L1TT-b6.merge.AOD.f97_m48', 'evt_number': [], 'beam_energy': [], 'eventdata_items': None, 'run_number': [111427], 'geometry': None, 'beam_type': [], 'file_guid': 'ami://data09_idcomm.00111427.physics_L1TT-b6.merge.AOD.f97_m48', 'file_md5sum': None, 'lumi_block': [], 'conditions_tag': None, 'det_descr_tags': None, 'nentries': 27, 'metadata': None}
@@ -422,8 +422,8 @@ class AthFileTest(unittest.TestCase):
f14 = af.fopen(fname)
if verbose:
- print "::: f14.fileinfos:"
- print f14.fileinfos
+ print ("::: f14.fileinfos:")
+ print (f14.fileinfos)
f14_ref = {'metadata_items': None, 'stream_names': ['StreamTAG_COMM'], 'run_type': [], 'stream_tags': [{'obeys_lbk': None, 'stream_type': 'express', 'stream_name': 'express'}], 'evt_type': [], 'tag_info': None, 'file_type': 'pool', 'file_name': 'ami://data10_1beam.00150419.express_express.merge.TAG_COMM.x2_m396', 'evt_number': [], 'beam_energy': [], 'eventdata_items': None, 'run_number': [150419], 'geometry': None, 'beam_type': [], 'file_guid': 'ami://data10_1beam.00150419.express_express.merge.TAG_COMM.x2_m396', 'file_md5sum': None, 'lumi_block': [], 'conditions_tag': None, 'det_descr_tags': None, 'nentries': 407, 'metadata': None}
@@ -447,8 +447,8 @@ class AthFileTest(unittest.TestCase):
f15 = af.fopen(fname)
if verbose:
- print "::: f15.fileinfos:"
- print f15.fileinfos
+ print ("::: f15.fileinfos:")
+ print (f15.fileinfos)
f15_ref = {'file_md5sum':'e3e301bca63e4b5acb3b3cba43127ff9', 'metadata_items': None, 'stream_names': None, 'run_type': ['TEST'], 'stream_tags': [{'obeys_lbk': True, 'stream_type': 'physics', 'stream_name': 'IDCosmic'}, {'obeys_lbk': False, 'stream_type': 'calibration', 'stream_name': 'IDTracks'}], 'tag_info': None, 'file_type': 'bs', 'file_name': 'root://eosatlas.cern.ch//eos/atlas/user/b/binet/regr-tests/athfile/daq.ATLAS.0092226.physics.IDCosmic.LB0054.SFO-1._0001.data', 'file_guid': '72013664-ECA3-DD11-A90E-0015171A45AC', 'beam_type': [0], 'lumi_block': [54], 'conditions_tag': None, 'det_descr_tags': None, 'nentries': 417, 'eventdata_items': None, 'run_number': [92226], 'beam_energy': [0], 'geometry': None, 'evt_number': [8349492], 'evt_type': [], 'metadata': None}
_compare_fileinfos(f15,f15_ref)
assert f15.run_number==f15_ref['run_number']
@@ -474,6 +474,6 @@ def main(verbose=False):
if __name__ == "__main__":
import sys
- print __file__
+ print (__file__)
sys.exit(main())
diff --git a/Tools/PyUtils/python/AthFile/timerdecorator.py b/Tools/PyUtils/python/AthFile/timerdecorator.py
index 0ec2e9dd28f2dfcac6ca34ad23b2e3699e6acc44..1c7e00a3720e9a3e8dac7f537230ffbdb8d19e0a 100644
--- a/Tools/PyUtils/python/AthFile/timerdecorator.py
+++ b/Tools/PyUtils/python/AthFile/timerdecorator.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# @file timerdecorator.py
# @purpose decorate functions which will have a limited alloted time to finish execution
diff --git a/Tools/PyUtils/python/FilePeekerTool.py b/Tools/PyUtils/python/FilePeekerTool.py
index e95782d23a7621db64cd345c324c8ad6baf38963..b92e41d4bec2347c0cb122aa7bc9abc52ae1e947 100644
--- a/Tools/PyUtils/python/FilePeekerTool.py
+++ b/Tools/PyUtils/python/FilePeekerTool.py
@@ -1,10 +1,12 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# @file PyUtils.FilePeekerTool
# @purpose peek into APR files to read in-file metadata without Athena (based on PyAthena.FilePeekerLib code by Sebastian Binet)
# @author Alexandre Vaniachine <vaniachine@anl.gov>
# @date May 2015
+from __future__ import print_function
+
__version__= "$Revision: 734431 $"
__author__ = "Alexandre Vaniachine <vaniachine@anl.gov>"
__doc__ = "peek into APR files to read in-file metadata"
@@ -37,15 +39,15 @@ class FilePeekerTool():
(os.getpid(), uuid.uuid4())
)
stdout = open(stdout_fname, "w")
- print >> stdout,"Extracting in-file metadata without athena sub-process from file", self.f.GetName()
- print >> stdout,"="*80
+ print ("Extracting in-file metadata without athena sub-process from file", self.f.GetName(), file=stdout)
+ print ("="*80, file=stdout)
stdout.flush()
pool = self.f.Get("##Params")
import re
- pool_token = re.compile(r'[[]NAME=(?P<name>.*?)[]]' r'[[]VALUE=(?P<value>.*?)[]]').match
+ pool_token = re.compile(r'[\[]NAME=(?P<name>.*?)[]]' r'[\[]VALUE=(?P<value>.*?)[]]').match
params = []
- for i in xrange(pool.GetEntries()):
+ for i in range(pool.GetEntries()):
if pool.GetEntry(i)>0:
match = pool_token(pool.FindLeaf("db_string").GetValueString())
if not match:
@@ -86,7 +88,7 @@ class FilePeekerTool():
break
if esiTypeName != 'EventStreamInfo_p3':
- print >> stdout, "old schema is not supported:", esiTypeName
+ print ("old schema is not supported:", esiTypeName, file=stdout)
return {}
import cppyy
@@ -103,7 +105,7 @@ class FilePeekerTool():
peeked_data['run_type'] = ['N/A']
- print >> stdout, peeked_data
+ print (peeked_data, file=stdout)
peeked_data['nentries'] = esic.getNumberOfEvents(esi)
peeked_data['lumi_block'] = list(esic.lumiBlockNumbers(esi))
@@ -128,7 +130,7 @@ class FilePeekerTool():
isa_idx = raw_bit_mask[idx]
return bit_mask_typecodes[idx][isa_idx]
bm = map(decode_bitmask,
- xrange(len(bit_mask_typecodes)))
+ range(len(bit_mask_typecodes)))
return tuple(bm)
def _get_detdescr_tags(evt_type):
@@ -150,10 +152,10 @@ class FilePeekerTool():
peeked_data['mc_channel_number'] = [et.m_mc_channel_number]
peeked_data['evt_number'] = [et.m_mc_event_number]
- #print >> stdout, 'mc_event_number', et.m_mc_event_number
- print >> stdout, 'mc_event_weights.size:', et.m_mc_event_weights.size()
- print >> stdout, 'mc_event_weights value', et.m_mc_event_weights[0]
- print >> stdout, 'user_type', et.m_user_type
+ #printf ('mc_event_number', et.m_mc_event_number, file=stdout)
+ print ('mc_event_weights.size:', et.m_mc_event_weights.size(), file=stdout)
+ print ('mc_event_weights value', et.m_mc_event_weights[0], file=stdout)
+ print ('user_type', et.m_user_type, file=stdout)
# handle event-less files
if peeked_data['nentries'] == 0:
@@ -220,7 +222,7 @@ class FilePeekerTool():
obj = cppyy.gbl.IOVMetaDataContainer()
def process_metadata(obj, metadata_name):
- print >> stdout, 'processing container [%s]' % obj.folderName()
+ print ('processing container [%s]' % obj.folderName(), file=stdout)
data = []
payloads = obj.payloadContainer()
payloads_sz = payloads.size()
@@ -232,43 +234,44 @@ class FilePeekerTool():
payloads.append(_tmp.at(ii))
pass
for ii,payload in zip(range(payloads_sz), payloads):
- #print >> stdout, "-->",ii,payload,type(payload),'\n'
+ #print ("-->",ii,payload,type(payload),'\n', file=stdout)
if not payload:
- print >> stdout, "**error** null-pointer ?"
+ print ("**error** null-pointer ?", file=stdout)
continue
# names
chan_names = []
sz = payload.name_size()
- print >> stdout, '==names== (sz: %s)' % sz
- for idx in xrange(sz):
+ print ('==names== (sz: %s)' % sz, file=stdout)
+ for idx in range(sz):
chan = payload.chanNum(idx)
chan_name = payload.chanName(chan)
- #print >> stdout, '--> (%s, %s)' % (idx, chan_name)
+ #print ('--> (%s, %s)' % (idx, chan_name), file=stdout)
chan_names.append(chan_name)
if 1: # we don't really care about those...
# iovs
sz = payload.iov_size()
- print >> stdout, '==iovs== (sz: %s)' % sz
- for idx in xrange(sz):
+ print ('==iovs== (sz: %s)' % sz, file=stdout)
+ for idx in range(sz):
chan = payload.chanNum(idx)
iov_range = payload.iovRange(chan)
iov_start = iov_range.start()
iov_stop = iov_range.stop()
if 0:
- print >> stdout, '(%s, %s) => (%s, %s) valid=%s runEvt=%s' % (
+ print ('(%s, %s) => (%s, %s) valid=%s runEvt=%s' % (
iov_start.run(),
iov_start.event(),
iov_stop.run(),
iov_stop.event(),
iov_start.isValid(),
- iov_start.isRunEvent())
+ iov_start.isRunEvent()),
+ file=stdout)
# attrs
attrs = [] # can't use a dict as spec.name() isn't unique
sz = payload.size()
- print >> stdout, '==attrs== (sz: %s)' % sz
- for idx in xrange(sz):
+ print ('==attrs== (sz: %s)' % sz, file=stdout)
+ for idx in range(sz):
chan = payload.chanNum(idx)
attr_list = payload.attributeList(chan)
attr_data = []
@@ -283,13 +286,13 @@ class FilePeekerTool():
except Exception:
# swallow and keep as a string
pass
-# print >> stdout, spec.name(),a_data
+# print (spec.name(),a_data, file=stdout)
else:
a_data = getattr(a,'data<%s>'%a_type)()
- #print >> stdout, "%s: %s %s" (spec.name(), a_data, type(a_data) )
+ #print ("%s: %s %s" (spec.name(), a_data, type(a_data) ), file=stdout)
attr_data.append( (spec.name(), a_data) )
attrs.append(dict(attr_data))
- #print >> stdout, attrs[-1]
+ #print (attrs[-1], file=stdout)
if len(attrs) == len(chan_names):
data.append(dict(zip(chan_names,attrs)))
else:
@@ -329,10 +332,10 @@ class FilePeekerTool():
try:
obj.payloadContainer().at(0).dump()
except Exception:
- print >> stdout, l.GetName()
+ print (l.GetName(), file=stdout)
pass
v = process_metadata(obj, k)
- #print >> stdout, obj.folderName(),v
+ #print (obj.folderName(),v, file=stdout)
flName = obj.folderName()
metadata[obj.folderName()] = maybe_get(v, -1)
# if flName[:15] == 'TriggerMenuAux.' and clName[:6] == 'vector': continue
@@ -397,21 +400,21 @@ class FilePeekerTool():
peeked_data['det_descr_tags'] = {}
## -- summary
- print >> stdout, ':::::: summary ::::::'
- print >> stdout, ' - nbr events: %s' % peeked_data['nentries']
- print >> stdout, ' - run numbers: %s' % peeked_data['run_number']
- #print >> stdout, ' - evt numbers: %s' % peeked_data['evt_number']
- print >> stdout, ' - lumiblocks: %s' % peeked_data['lumi_block']
- print >> stdout, ' - evt types: ', peeked_data['evt_type']
- print >> stdout, ' - item list: %s' % len(peeked_data['eventdata_items'])
- #print >> stdout, ' - item list: ', peeked_data['eventdata_items']
- print >> stdout, ' - processing tags: %s' % peeked_data['stream_names']
- #print >> stdout, ' - stream tags: %s' % peeked_data['stream_tags']
- print >> stdout, ' - geometry: %s' % peeked_data['geometry']
- print >> stdout, ' - conditions tag: %s' % peeked_data['conditions_tag']
- #print >> stdout, ' - metadata items: %s' % len(peeked_data['metadata_items'])
- print >> stdout, ' - tag-info: %s' % peeked_data['tag_info'].keys()
- #print >> stdout, ' - item list: ' % peeked_data['eventdata_items']
+ print (':::::: summary ::::::', file=stdout)
+ print (' - nbr events: %s' % peeked_data['nentries'], file=stdout)
+ print (' - run numbers: %s' % peeked_data['run_number'], file=stdout)
+ #print (' - evt numbers: %s' % peeked_data['evt_number'], file=stdout)
+ print (' - lumiblocks: %s' % peeked_data['lumi_block'], file=stdout)
+ print (' - evt types: ', peeked_data['evt_type'], file=stdout)
+ print (' - item list: %s' % len(peeked_data['eventdata_items']), file=stdout)
+ #print (' - item list: ', peeked_data['eventdata_items'], file=stdout)
+ print (' - processing tags: %s' % peeked_data['stream_names'], file=stdout)
+ #print (' - stream tags: %s' % peeked_data['stream_tags'], file=stdout)
+ print (' - geometry: %s' % peeked_data['geometry'], file=stdout)
+ print (' - conditions tag: %s' % peeked_data['conditions_tag'], file=stdout)
+ #print (' - metadata items: %s' % len(peeked_data['metadata_items']), file=stdout)
+ print (' - tag-info: %s' % peeked_data['tag_info'].keys(), file=stdout)
+ #print (' - item list: ' % peeked_data['eventdata_items'], file=stdout)
stdout.flush()
stdout.close()
#os.remove(stdout.name)
diff --git a/Tools/PyUtils/python/RootUtils.py b/Tools/PyUtils/python/RootUtils.py
index 7151fef588e01447d373355664c055212feada4d..45e4b9b88035fdca5f07adf5a94a52fc81123d8e 100644
--- a/Tools/PyUtils/python/RootUtils.py
+++ b/Tools/PyUtils/python/RootUtils.py
@@ -20,6 +20,7 @@ __all__ = [
import os
import sys
import re
+import six
from pprint import pprint
from array import array
@@ -30,7 +31,7 @@ from .Decorators import memoize
# The argument to SetSize is in elements, not bytes.
def _set_byte_size (buf, sz):
eltsz = array(buf.typecode).itemsize
- buf.SetSize (sz / eltsz)
+ buf.SetSize (sz // eltsz)
return
def import_root(batch=True):
@@ -157,6 +158,8 @@ def _pythonize_tfile():
#print ("-->2",self.tell())
buf = c_buf.buffer()
_set_byte_size (buf, c_buf.sz)
+ if six.PY3:
+ return buf.tobytes()
return str(buf[:])
return ''
else:
diff --git a/Tools/PyUtils/python/dbsqlite.py b/Tools/PyUtils/python/dbsqlite.py
index 932eceeadf32ba59fc232d37fc2956211bab9d53..cf6b82d67f7282be6f7dd959f43ad22ad14e0b17 100644
--- a/Tools/PyUtils/python/dbsqlite.py
+++ b/Tools/PyUtils/python/dbsqlite.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# @file PyUtils/python/dbsqlite.py
# reaped off: http://svn.python.org/view/sandbox/trunk/dbm_sqlite
@@ -17,15 +17,15 @@ __version__ = "$Revision: 225332 $"
__all__ = ['error', 'open']
import sqlite3
-import cPickle as pickle
-from UserDict import DictMixin
+import pickle
+from collections import MutableMapping
import collections
from operator import itemgetter
import shelve
error = sqlite3.DatabaseError
-class SQLhash(object, DictMixin):
+class SQLhash(MutableMapping):
def __init__(self, filename=':memory:', flags='r', mode=None):
# XXX add flag/mode handling
# c -- create if it doesn't exist
@@ -67,15 +67,15 @@ class SQLhash(object, DictMixin):
def iterkeys(self):
GET_KEYS = 'SELECT key FROM shelf ORDER BY ROWID'
- return iter(SQLHashKeyIterator(self.conn, GET_KEYS, (0,)))
+ return SQLHashKeyIterator(self.conn, GET_KEYS, (0,))
def itervalues(self):
GET_VALUES = 'SELECT value FROM shelf ORDER BY ROWID'
- return iter(SQLHashValueIterator(self.conn, GET_VALUES, (0,)))
+ return SQLHashValueIterator(self.conn, GET_VALUES, (0,))
def iteritems(self):
GET_ITEMS = 'SELECT key, value FROM shelf ORDER BY ROWID'
- return iter(SQLHashItemIterator(self.conn, GET_ITEMS, (0, 1)))
+ return SQLHashItemIterator(self.conn, GET_ITEMS, (0, 1))
def __contains__(self, key):
HAS_ITEM = 'SELECT 1 FROM shelf WHERE key = ?'
@@ -153,8 +153,10 @@ class SQLHashKeyIterator(object):
def __iter__(self):
return self
- def next(self):
+ def next(self): #py2
return self.getter(self.iter.next())
+ def __next__(self): #py3
+ return self.getter(self.iter.__next__())
class SQLHashValueIterator(object):
def __init__(self, conn, stmt, indices):
@@ -167,9 +169,12 @@ class SQLHashValueIterator(object):
def __iter__(self):
return self
- def next(self):
+ def next(self): #py2
o = self.getter(self.iter.next())
return pickle.loads(o)
+ def __next__(self): #py3
+ o = self.getter(self.iter.__next__())
+ return pickle.loads(o)
class SQLHashItemIterator(object):
def __init__(self, conn, stmt, indices):
@@ -182,11 +187,16 @@ class SQLHashItemIterator(object):
def __iter__(self):
return self
- def next(self):
+ def next(self): #py2
o = self.getter(self.iter.next())
k = o[0]
v = pickle.loads(o[1])
return (k,v)
+ def __next__(self): #py3
+ o = self.getter(self.iter.__next__())
+ k = o[0]
+ v = pickle.loads(o[1])
+ return (k,v)
if __name__ in '__main___':
for d in SQLhash(flags='n'), SQLhash('example',flags='n'):
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ATLASMagneticFieldWrapper.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ATLASMagneticFieldWrapper.h
index 1725a3b8508c8d4cfbcda1136b3660ac683d953c..559fb8779682d189ce0ec2c26b2e1df3953c404b 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ATLASMagneticFieldWrapper.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ATLASMagneticFieldWrapper.h
@@ -7,7 +7,7 @@
#include "MagFieldInterfaces/IMagFieldSvc.h"
#include "Acts/Utilities/Definitions.hpp"
-#include "Acts/MagneticField/concept/AnyFieldLookup.hpp"
+#include "Acts/Utilities/MagneticFieldContext.hpp"
class ATLASMagneticFieldWrapper
{
@@ -17,6 +17,10 @@ public:
struct Cache {
// empty, no cache for now
+
+ Cache(std::reference_wrapper<const Acts::MagneticFieldContext> /*mctx*/) {
+ // does nothing, but is required
+ }
};
// FieldCell is not needed anymore, keep it for backwards compatibility right now.
@@ -32,7 +36,7 @@ public:
{
Acts::Vector3D bfield;
m_fieldService->getField(&pos, &bfield);
-
+
bfield *= m_bFieldUnit; // kT -> T;
return bfield;
@@ -76,7 +80,7 @@ public:
return bfield;
}
-
+
Acts::Vector3D
getField(const Acts::Vector3D& pos, Cache& /*cache*/) const
{
@@ -94,7 +98,7 @@ public:
return bfield;
}
-
+
Acts::Vector3D
getFieldGradient(const Acts::Vector3D& position,
Acts::ActsMatrixD<3, 3>& gradient,
@@ -104,16 +108,16 @@ public:
}
// only kept for backwards compatibility
- Acts::concept::AnyFieldCell<>
+ FieldCell
getFieldCell(const Acts::Vector3D& /*position*/) const
{
return m_fieldCell;
}
-
+
private:
// only kept for backwards compatibility
FieldCell m_fieldCell;
-
+
MagField::IMagFieldSvc *m_fieldService;
const double m_bFieldUnit = 1000.*Acts::units::_T;
};
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsDetectorElement.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsDetectorElement.h
index bc40d819be36a2fadf1e7110c3890a3b07f4ee99..2fcf30d7562faf09561962270f9875e98a02ccec 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsDetectorElement.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsDetectorElement.h
@@ -13,7 +13,7 @@
// ACTS
#include "Acts/Detector/DetectorElementBase.hpp"
-
+#include "Acts/Utilities/GeometryContext.hpp"
// STL
#include <mutex>
@@ -57,11 +57,11 @@ public:
identify() const;
/// Return local to global transform associated with this identifier
- virtual const Acts::Transform3D&
- transform() const final override;
void
storeTransform(ActsAlignmentStore* gas) const;
+ virtual const Acts::Transform3D &
+ transform(const Acts::GeometryContext &gctx) const final override;
/// Return surface associated with this identifier, which should come from the
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
index 5b94ae591fc16ceb6d924be7ad12299c17041ba1..4062cf9dfad38b0627b2f834448c6d73d3c6f232 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsExtrapolationTool.h
@@ -10,9 +10,11 @@
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/Property.h"
+#include "GaudiKernel/EventContext.h"
// PACKAGE
#include "ActsGeometry/ActsTrackingGeometryTool.h"
+#include "ActsGeometry/ActsGeometryContext.h"
// ACTS
#include "Acts/Propagator/EigenStepper.hpp"
@@ -25,6 +27,8 @@
#include "Acts/Propagator/detail/StandardAborters.hpp"
#include "ActsGeometry/ATLASMagneticFieldWrapper.h"
#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Utilities/MagneticFieldContext.hpp"
+#include "Acts/Utilities/Result.hpp"
// BOOST
#include <boost/variant/variant.hpp>
@@ -53,12 +57,19 @@ public:
template <typename parameters_t>
std::vector<Acts::detail::Step>
- propagate(const parameters_t& startParameters,
+ propagate(const EventContext& ctx,
+ const parameters_t& startParameters,
double pathLimit = std::numeric_limits<double>::max()) const
{
ATH_MSG_VERBOSE(name() << "::" << __FUNCTION__ << " begin");
- Options options;
+ Acts::MagneticFieldContext mctx;
+ const ActsGeometryContext& gctx
+ = m_trackingGeometryTool->getGeometryContext(ctx);
+
+ auto anygctx = gctx.any();
+
+ Options options(anygctx, mctx);
options.pathLimit = pathLimit;
bool debug = msg().level() == MSG::VERBOSE;
options.debug = debug;
@@ -73,7 +84,13 @@ public:
std::vector<Acts::detail::Step> steps;
DebugOutput::result_type debugOutput;
- std::tie(steps, debugOutput) = boost::apply_visitor(visitor, *m_varProp);
+ auto res = boost::apply_visitor(visitor, *m_varProp);
+ if (!res.ok()) {
+ ATH_MSG_ERROR("Got error during propagation:" << res.error()
+ << ". Returning empty step vector.");
+ return {};
+ }
+ std::tie(steps, debugOutput) = std::move(*res);
if(debug) {
ATH_MSG_VERBOSE(debugOutput.debugString);
@@ -85,8 +102,11 @@ public:
return steps;
}
- void
- prepareAlignment() const;
+ const ActsTrackingGeometryTool*
+ trackingGeometryTool() const
+ {
+ return m_trackingGeometryTool.get();
+ }
private:
// set up options for propagation
@@ -107,37 +127,41 @@ private:
std::unique_ptr<VariantPropagator> m_varProp;
+ using ResultType = Acts::Result<std::pair<std::vector<Acts::detail::Step>,
+ DebugOutput::result_type>>;
template <typename parameters_t, typename options_t>
- struct PropagatorVisitor
- : boost::static_visitor<std::pair<std::vector<Acts::detail::Step>,
- DebugOutput::result_type>> {
+ struct PropagatorVisitor
+ : boost::static_visitor<ResultType> {
PropagatorVisitor(const parameters_t& parameters, options_t options)
: m_parameters(parameters), m_options(std::move(options))
{}
template <typename propagator_t>
- std::pair<std::vector<Acts::detail::Step>, DebugOutput::result_type>
+ ResultType
operator()(const propagator_t& propagator) const
{
- const auto& result = propagator.propagate(m_parameters, m_options);
- auto steppingResults = result.template get<SteppingLogger::result_type>();
- auto debugOutput = result.template get<DebugOutput::result_type>();
+ auto result = propagator.propagate(m_parameters, m_options);
+ if (!result.ok()) {
+ return result.error();
+ }
+ auto& propRes = *result;
+
+ auto steppingResults = propRes.template get<SteppingLogger::result_type>();
+ auto debugOutput = propRes.template get<DebugOutput::result_type>();
// try to force return value optimization, not sure this is necessary
- return {std::move(steppingResults.steps), std::move(debugOutput)};
+ return std::make_pair(std::move(steppingResults.steps), std::move(debugOutput));
}
const parameters_t& m_parameters;
options_t m_options;
};
-
+
ServiceHandle<MagField::IMagFieldSvc> m_fieldServiceHandle;
ToolHandle<ActsTrackingGeometryTool> m_trackingGeometryTool{this, "TrackingGeometryTool", "ActsTrackingGeometryTool"};
- Options m_propagationOptions;
-
Gaudi::Property<std::string> m_fieldMode{this, "FieldMode", "ATLAS"};
Gaudi::Property<std::vector<double>> m_constantFieldVector{this, "ConstantFieldVector", {0, 0, 0}};
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsGeometryContext.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsGeometryContext.h
new file mode 100644
index 0000000000000000000000000000000000000000..27c32c3ba14f8dfaf745313da45db0128d33768e
--- /dev/null
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsGeometryContext.h
@@ -0,0 +1,35 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef ACTSGEOMETRY_ACTSGEOMETRYCONTEXT_H
+#define ACTSGEOMETRY_ACTSGEOMETRYCONTEXT_H
+
+#include "ActsGeometry/ActsAlignmentStore.h"
+
+#include "AthenaKernel/CLASS_DEF.h"
+#include "AthenaKernel/CondCont.h"
+
+#include "Acts/Utilities/GeometryContext.hpp"
+
+#include <memory>
+
+struct ActsGeometryContext {
+
+ bool construction{false};
+
+ std::unique_ptr<const ActsAlignmentStore> ownedAlignmentStore{nullptr};
+
+ const ActsAlignmentStore* alignmentStore{nullptr};
+
+ Acts::GeometryContext
+ any() const
+ {
+ return {this};
+ }
+};
+
+CLASS_DEF(ActsGeometryContext, 51464195, 1)
+CONDCONT_DEF( ActsGeometryContext , 11228079 );
+
+#endif
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsLayerBuilder.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsLayerBuilder.h
index 696ecfc2cac0b77784a6f1a1a6bff6b2fb3109c2..7ca4fdc2398498e9cd238bbb2324cbe2ac920893 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsLayerBuilder.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsLayerBuilder.h
@@ -14,6 +14,7 @@
#include "Acts/Tools/ILayerBuilder.hpp"
#include "Acts/Utilities/Logger.hpp"
#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/GeometryContext.hpp"
class ActsTrackingGeomtrySvc;
@@ -77,13 +78,13 @@ public:
~ActsLayerBuilder() {}
const Acts::LayerVector
- negativeLayers() const override;
+ negativeLayers(const Acts::GeometryContext& gctx) const override;
const Acts::LayerVector
- centralLayers() const override;
+ centralLayers(const Acts::GeometryContext& gctx) const override;
const Acts::LayerVector
- positiveLayers() const override;
+ positiveLayers(const Acts::GeometryContext& gctx) const override;
/// Name identification
// const std::string&
@@ -139,7 +140,7 @@ private:
// @param layers is goint to be filled
// @param type is the indication which ones to build -1 | 0 | 1
void
- buildLayers(Acts::LayerVector& layersOutput, int type = 0);
+ buildLayers(const Acts::GeometryContext& gctx, Acts::LayerVector& layersOutput, int type = 0);
};
#endif
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
index 615a04f6aaf1f9a0ef2afa97c8f45736ea5c02b2..945de291de1b0fe559cf9d984b0425df2a06a0d9 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsObjWriterTool.h
@@ -10,6 +10,7 @@
#include "GaudiKernel/IAlgTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/IInterface.h"
+#include "ActsGeometry/ActsGeometryContext.h"
#include "GaudiKernel/Property.h" /*no forward decl: typedef*/
@@ -33,12 +34,12 @@ public:
ActsObjWriterTool(const std::string& type, const std::string& name,
const IInterface* parent);
-
+
void
- write(const Acts::TrackingGeometry&);
+ write(const ActsGeometryContext& gctx, const Acts::TrackingGeometry&);
private:
-
+
Gaudi::Property<std::string> m_outputDirectory{this, "OutputDirectory", ".", ""};
Gaudi::Property<std::vector<std::string>> m_subDetectors{this, "SubDetectors", {}, ""};
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsStrawLayerBuilder.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsStrawLayerBuilder.h
index 5391de6bbd5580d9252d8fbcc72ddec3424fc01b..2a9f3ae9feb1e0393f35912cdc3dbcbb23e248a7 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsStrawLayerBuilder.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsStrawLayerBuilder.h
@@ -13,6 +13,7 @@
// ACTS
#include "Acts/Tools/ILayerBuilder.hpp"
#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/GeometryContext.hpp"
class TRT_ID;
class ActsTrackingGeometrySvc;
@@ -30,7 +31,7 @@ class ActsStrawLayerBuilder : public Acts::ILayerBuilder
public:
using ElementVector
= std::vector<std::shared_ptr<const ActsDetectorElement>>;
-
+
struct Config
{
/// string based identification
@@ -41,7 +42,7 @@ public:
const ActsTrackingGeometrySvc* trackingGeometrySvc = nullptr;
const TRT_ID* idHelper = nullptr;
};
-
+
/// Constructor
/// @param cfg is the configuration struct
/// @param logger the local logging instance
@@ -52,21 +53,21 @@ public:
{
m_cfg = cfg;
}
-
+
~ActsStrawLayerBuilder() {}
const Acts::LayerVector
- negativeLayers() const override;
+ negativeLayers(const Acts::GeometryContext& gctx) const override;
const Acts::LayerVector
- centralLayers() const override;
+ centralLayers(const Acts::GeometryContext& gctx) const override;
const Acts::LayerVector
- centralLayers();
+ centralLayers(const Acts::GeometryContext& gctx);
const Acts::LayerVector
- positiveLayers() const override;
-
+ positiveLayers(const Acts::GeometryContext& gctx) const override;
+
const std::string&
identification() const override
{
@@ -74,7 +75,7 @@ public:
}
const Acts::LayerVector
- endcapLayers(int side);
+ endcapLayers(const Acts::GeometryContext& gctx, int side);
private:
/// configruation object
@@ -86,7 +87,7 @@ private:
{
return *m_logger;
}
-
+
/// logging instance
std::unique_ptr<const Acts::Logger> m_logger;
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
index 1acae91e6e584858e967db2fc964a4d0eb5b7ef3..bb40f58ca77ecd806b882ae03228ebd72df7161e 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometrySvc.h
@@ -44,44 +44,41 @@ public:
StatusCode initialize() override;
//virtual StatusCode finalize() override;
-
+
ActsTrackingGeometrySvc( const std::string& name, ISvcLocator* pSvcLocator );
std::shared_ptr<const Acts::TrackingGeometry>
trackingGeometry() override;
-
- void
- setAlignmentStore(const ActsAlignmentStore* gas, const EventContext& ctx) override;
-
- const ActsAlignmentStore*
- getAlignmentStore(const EventContext& ctx) const override;
+ void
+ populateAlignmentStore(ActsAlignmentStore *store) const override;
+
+ const ActsAlignmentStore*
+ getNominalAlignmentStore() const override;
private:
- std::shared_ptr<const Acts::ITrackingVolumeBuilder>
+ std::shared_ptr<const Acts::ITrackingVolumeBuilder>
makeVolumeBuilder(const InDetDD::InDetDetectorManager* manager, std::shared_ptr<const Acts::CylinderVolumeHelper> cvh, bool toBeamline = false);
ServiceHandle<StoreGateSvc> m_detStore;
const InDetDD::SiDetectorManager* p_pixelManager;
const InDetDD::SiDetectorManager* p_SCTManager;
const InDetDD::TRT_DetectorManager* p_TRTManager;
-
+
std::shared_ptr<std::vector<std::shared_ptr<const ActsDetectorElement>>> m_elementStore;
std::shared_ptr<const Acts::TrackingGeometry> m_trackingGeometry;
-
+
const TRT_ID *m_TRT_idHelper;
-
+
+ std::unique_ptr<const ActsAlignmentStore> m_nominalAlignmentStore{nullptr};
+
Gaudi::Property<bool> m_useMaterialMap{this, "UseMaterialMap", false, ""};
Gaudi::Property<std::string> m_materialMapInputFile{this, "MaterialMapInputFile", "", ""};
Gaudi::Property<std::vector<size_t>> m_barrelMaterialBins{this, "BarrelMaterialBins", {10, 10}};
Gaudi::Property<std::vector<size_t>> m_endcapMaterialBins{this, "EndcapMaterialBins", {5, 20}};
-
- mutable std::unordered_map<EventContext::ContextID_t, const ActsAlignmentStore*> m_gasMap;
- mutable std::mutex m_gasMapMutex;
-
};
-#endif
+#endif
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometryTool.h b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometryTool.h
index 56efe7caaf938fd6f23a7fd08541947b3298f158..d9a9ee1a96f451c98362ea061ddf2afc8ac528e5 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometryTool.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/ActsTrackingGeometryTool.h
@@ -10,9 +10,11 @@
#include "GaudiKernel/IInterface.h"
#include "GaudiKernel/ServiceHandle.h"
#include "StoreGate/ReadCondHandleKey.h"
+#include "GaudiKernel/EventContext.h"
// PACKAGE
#include "ActsGeometry/ActsAlignmentStore.h" // ReadCondHandleKey wants complete type
+#include "ActsGeometry/ActsGeometryContext.h"
// ACTS
@@ -20,6 +22,7 @@ namespace Acts {
class TrackingGeometry;
}
+class ActsGeometryContext;
class IActsTrackingGeometrySvc;
static const InterfaceID IID_ActsTrackingGeometryTool("ActsTrackingGeometryTool", 1, 0);
@@ -36,13 +39,18 @@ public:
std::shared_ptr<const Acts::TrackingGeometry>
trackingGeometry() const;
- StatusCode prepareAlignment() const;
+ const ActsGeometryContext&
+ getGeometryContext(const EventContext& ctx = Gaudi::Hive::currentContext()) const;
+
+ ActsGeometryContext
+ getNominalGeometryContext() const;
+
private:
ServiceHandle<IActsTrackingGeometrySvc> m_trackingGeometrySvc;
- SG::ReadCondHandleKey<ActsAlignmentStore> m_rchk {this, "PixelAlignmentKey", "PixelAlignment", "cond read key"};
+ SG::ReadCondHandleKey<ActsGeometryContext> m_rchk {this, "PixelAlignmentKey", "PixelAlignment", "cond read key"};
};
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
index 7370fcaabe911758d5795d5a5e2e21b8c0b4ea1e..d5f71fd1d1c9d3593513373f3ba0488f7cec1870 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/GeomShiftCondAlg.h
@@ -28,15 +28,16 @@ class StoreGateSvc;
class IActsTrackingGeometrySvc;
class ActsAlignmentStore;
class GeoAlignableTransform;
+class ActsGeometryContext;
class GeomShiftCondAlg : public AthAlgorithm {
-
+
public:
-
+
GeomShiftCondAlg (const std::string& name, ISvcLocator* pSvcLocator);
virtual ~GeomShiftCondAlg();
-
+
virtual bool isClonable() const override { return true; }
virtual StatusCode initialize() override;
@@ -44,10 +45,10 @@ public:
virtual StatusCode finalize() override;
private:
-
+
SG::ReadHandleKey<EventInfo> m_evt {this,"EvtInfo", "McEventInfo", "EventInfo name"};
- SG::WriteCondHandleKey<ActsAlignmentStore> m_wchk {this, "PixelAlignmentKey", "PixelAlignment", "cond handle key"};
+ SG::WriteCondHandleKey<ActsGeometryContext> m_wchk {this, "PixelAlignmentKey", "PixelAlignment", "cond handle key"};
Gaudi::Property<double> m_zShiftPerLB {this, "ZShiftPerLB", 10.5, ""};
@@ -62,4 +63,3 @@ private:
std::vector<const GeoAlignableTransform*> m_topAligns;
};
-
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/IActsTrackingGeometrySvc.h b/Tracking/Acts/ActsGeometry/ActsGeometry/IActsTrackingGeometrySvc.h
index a175dfccf5c9ad71b8a1b49cd6be8c90e6740b7d..082c0f21bc6322b0964c9e6d3fb089f76a56750d 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/IActsTrackingGeometrySvc.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/IActsTrackingGeometrySvc.h
@@ -27,12 +27,12 @@ class IActsTrackingGeometrySvc : virtual public IInterface {
trackingGeometry() = 0;
virtual
- void
- setAlignmentStore(const ActsAlignmentStore* gas, const EventContext& ctx) = 0;
-
+ void
+ populateAlignmentStore(ActsAlignmentStore *store) const = 0;
+
virtual
const ActsAlignmentStore*
- getAlignmentStore(const EventContext& ctx) const = 0;
+ getNominalAlignmentStore() const = 0;
};
diff --git a/Tracking/Acts/ActsGeometry/ActsGeometry/NominalAlignmentCondAlg.h b/Tracking/Acts/ActsGeometry/ActsGeometry/NominalAlignmentCondAlg.h
index 539ea274621b99de89245af03c0cf4176096e396..7b1539a57baa793ab71bdbdb6e8e00c2307c331c 100644
--- a/Tracking/Acts/ActsGeometry/ActsGeometry/NominalAlignmentCondAlg.h
+++ b/Tracking/Acts/ActsGeometry/ActsGeometry/NominalAlignmentCondAlg.h
@@ -18,6 +18,8 @@
class IActsTrackingGeometrySvc;
class ActsAlignmentStore;
+class ActsGeometryContext;
+
/// @class NominalAlignmentCondAlg
/// Conditions algorithm which produces an (effectively)
@@ -25,12 +27,12 @@ class ActsAlignmentStore;
/// nominal alignments (= identity deltas)
///
class NominalAlignmentCondAlg : public AthAlgorithm {
-
+
public:
-
+
NominalAlignmentCondAlg (const std::string& name, ISvcLocator* pSvcLocator);
virtual ~NominalAlignmentCondAlg();
-
+
virtual bool isClonable() const override { return true; }
virtual StatusCode initialize() override;
@@ -38,11 +40,10 @@ public:
virtual StatusCode finalize() override;
private:
-
- SG::WriteCondHandleKey<ActsAlignmentStore> m_wchk {this, "PixelAlignmentKey", "PixelAlignment", "cond handle key"};
+
+ SG::WriteCondHandleKey<ActsGeometryContext> m_wchk {this, "PixelAlignmentKey", "PixelAlignment", "cond handle key"};
ServiceHandle<ICondSvc> m_cs;
ServiceHandle<IActsTrackingGeometrySvc> m_trackingGeometrySvc;
};
-
diff --git a/Tracking/Acts/ActsGeometry/src/ActsDetectorElement.cxx b/Tracking/Acts/ActsGeometry/src/ActsDetectorElement.cxx
index 534854401ae1ca55d96db84ec018c4b4c95e2e8a..40d18ca9b725bf37973c3dbd44f2165ba573639d 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsDetectorElement.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsDetectorElement.cxx
@@ -16,6 +16,7 @@
// PACKAGE
#include "ActsGeometry/ActsTrackingGeometrySvc.h"
#include "ActsGeometry/ActsAlignmentStore.h"
+#include "ActsGeometry/ActsGeometryContext.h"
// ACTS
#include "Acts/Surfaces/StrawSurface.hpp"
@@ -23,6 +24,7 @@
#include "Acts/Surfaces/PlaneSurface.hpp"
#include "Acts/Surfaces/RectangleBounds.hpp"
#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/GeometryContext.hpp"
// STL
#include <mutex>
@@ -94,7 +96,7 @@ ActsDetectorElement::ActsDetectorElement(
m_detElement = detElem;
m_defTransform = trf;
m_explicitIdentifier = id;
-
+
// we know this is a straw
double length = detElem->strawLength()*0.5;
@@ -112,15 +114,15 @@ ActsDetectorElement::ActsDetectorElement(
throw std::runtime_error("Cannot get tube radius for element in ActsDetectorElement c'tor");
}
}
-
+
auto lineBounds = std::make_shared<const Acts::LineBounds>(innerTubeRadius, length);
m_bounds = lineBounds;
m_surface = Acts::Surface::makeShared<Acts::StrawSurface>(lineBounds, *this);
}
-IdentityHelper
-ActsDetectorElement::identityHelper() const
+IdentityHelper
+ActsDetectorElement::identityHelper() const
{
size_t which = m_detElement.which();
if (which == 0) {
@@ -129,32 +131,31 @@ ActsDetectorElement::identityHelper() const
throw std::domain_error("Cannot get IdentityHelper for TRT element");
}
}
-
+
const Acts::Transform3D&
-ActsDetectorElement::transform() const
+ActsDetectorElement::transform(const Acts::GeometryContext& anygctx) const
{
-
-
- auto ctx = Gaudi::Hive::currentContext();
-
- if (!ctx.valid()) {
- // this is really only the case single threaded, but let's be safe and lock it down
- // also, we're not super afraid about performance here
+ // any cast to known context type
+ const ActsGeometryContext* gctx = std::any_cast<const ActsGeometryContext*>(anygctx);
+
+ // This is needed for initial geometry construction. At that point, we don't have a
+ // consistent view of the geometry yet, and thus we can't populate an alignment store
+ // at that time.
+ if (gctx->construction) {
+ // this should only happen at initialize (1 thread, but mutex anyway)
return getDefaultTransformMutexed();
}
- // retrieve GAS from tracking geometry svc
- const ActsAlignmentStore* alignmentStore = m_trackingGeometrySvc->getAlignmentStore(ctx);
+ // unpack the alignment store from the context
+ const ActsAlignmentStore* alignmentStore = gctx->alignmentStore;
// no GAS, is this initialization?
- if (alignmentStore == nullptr) {
- throw std::runtime_error("ActsAlignmentStore could not be found for valid context.");
- }
+ assert(alignmentStore != nullptr);
+ // get the correct cached transform
const Transform3D* cachedTrf = alignmentStore->getTransform(this);
- if (cachedTrf == nullptr) {
- throw std::runtime_error("Detector transform not found in ActsAlignmentStore.");
- }
+
+ assert(cachedTrf != nullptr);
return *cachedTrf;
}
@@ -169,12 +170,12 @@ ActsDetectorElement::storeTransform(ActsAlignmentStore* gas) const
Transform3D operator()(const InDetDD::SiDetectorElement* detElem) const
{
- Amg::Transform3D g2l
+ Amg::Transform3D g2l
= detElem->getMaterialGeom()->getAbsoluteTransform(m_store);
return g2l * Amg::CLHEPTransformToEigen(detElem->recoToHitTransform());
}
-
+
Transform3D operator()(const InDetDD::TRT_BaseElement*) const
{
return *m_trtTrf;
@@ -184,7 +185,7 @@ ActsDetectorElement::storeTransform(ActsAlignmentStore* gas) const
const Transform3D* m_trtTrf;
};
- Transform3D trf
+ Transform3D trf
= boost::apply_visitor(get_transform(gas, m_defTransform.get()), m_detElement);
gas->setTransform(this, trf);
@@ -203,12 +204,12 @@ ActsDetectorElement::getDefaultTransformMutexed() const
Transform3D operator()(const InDetDD::SiDetectorElement* detElem) const
{
- Amg::Transform3D g2l
+ Amg::Transform3D g2l
= detElem->getMaterialGeom()->getDefAbsoluteTransform();
return g2l * Amg::CLHEPTransformToEigen(detElem->recoToHitTransform());
}
-
+
Transform3D operator()(const InDetDD::TRT_BaseElement*) const
{
return *m_trtTrf;
@@ -216,13 +217,13 @@ ActsDetectorElement::getDefaultTransformMutexed() const
const Transform3D* m_trtTrf;
};
-
+
std::lock_guard<std::mutex> guard(m_cacheMutex);
if (m_defTransform) {
return *m_defTransform;
}
// transform not yet set
- m_defTransform
+ m_defTransform
= std::make_shared<const Transform3D>(
boost::apply_visitor(get_default_transform(m_defTransform.get()), m_detElement));
diff --git a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
index d72ae620323b1e45d327d57edd72d86a2d9b88b3..bfd4e55bb033b653dcd42873846ba27e1ac8068e 100755
--- a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationAlg.cxx
@@ -21,6 +21,7 @@
// PACKAGE
#include "ActsGeometry/ActsExtrapolationTool.h"
#include "ActsInterop/Logger.h"
+#include "ActsGeometry/ActsGeometryContext.h"
//#include "ActsGeometry/IActsMaterialTrackWriterSvc.h"
// OTHER
@@ -57,12 +58,11 @@ StatusCode ActsExtrapolationAlg::initialize() {
return StatusCode::SUCCESS;
}
-StatusCode ActsExtrapolationAlg::execute(const EventContext& ctx) const
+StatusCode ActsExtrapolationAlg::execute(const EventContext& ctx) const
{
ATH_MSG_VERBOSE(name() << "::" << __FUNCTION__);
- m_extrapolationTool->prepareAlignment();
ATHRNG::RNGWrapper* rngWrapper = m_rndmGenSvc->getEngine(this);
rngWrapper->setSeed( name(), ctx );
CLHEP::HepRandomEngine* rngEngine = rngWrapper->getEngine(ctx);
@@ -92,29 +92,29 @@ StatusCode ActsExtrapolationAlg::execute(const EventContext& ctx) const
double charge = rngEngine->flat() > 0.5 ? -1 : 1;
double qop = charge / momentum.norm();
-
- std::shared_ptr<Acts::PerigeeSurface> surface
+
+ std::shared_ptr<Acts::PerigeeSurface> surface
= Acts::Surface::makeShared<Acts::PerigeeSurface>(Acts::Vector3D(0, 0, 0));
Acts::ActsVectorD<5> pars;
pars << d0, z0, phi, theta, qop;
std::unique_ptr<Acts::ActsSymMatrixD<5>> cov = nullptr;
-
+
std::vector<Acts::detail::Step> steps;
if(charge != 0.) {
- // charged extrapolation - with hit recording
- Acts::BoundParameters startParameters(
+ // Perigee, no alignment -> default geo context
+ ActsGeometryContext gctx
+ = m_extrapolationTool->trackingGeometryTool()->getNominalGeometryContext();
+ auto anygctx = gctx.any();
+ Acts::BoundParameters startParameters(anygctx,
std::move(cov), std::move(pars), std::move(surface));
- steps = m_extrapolationTool->propagate(startParameters);
+ steps = m_extrapolationTool->propagate(ctx, startParameters);
m_propStepWriterSvc->write(steps);
}
-
-
-
ATH_MSG_VERBOSE(name() << " execute done");
return StatusCode::SUCCESS;
@@ -142,4 +142,3 @@ void ActsExtrapolationAlg::writeStepsObj(std::vector<Acts::detail::Step> steps)
out << lstr.str() << std::endl;
}
-
diff --git a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
index 2a2fd77ac63886ac99b1822c09d3d577d0388023..f790e00b3eed1c2ade4712d3aeda5d5d80ba3630 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
@@ -26,14 +26,14 @@
#include <memory>
ActsExtrapolationTool::ActsExtrapolationTool(const std::string& type, const std::string& name,
- const IInterface* parent)
+ const IInterface* parent)
: AthAlgTool(type, name, parent),
m_fieldServiceHandle("AtlasFieldSvc", name)
{
}
-
-StatusCode
+
+StatusCode
ActsExtrapolationTool::initialize()
{
using namespace std::literals::string_literals;
@@ -42,7 +42,7 @@ ActsExtrapolationTool::initialize()
ATH_MSG_INFO("Initializing ACTS extrapolation");
ATH_CHECK( m_trackingGeometryTool.retrieve() );
- std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry
+ std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry
= m_trackingGeometryTool->trackingGeometry();
Acts::Navigator navigator(trackingGeometry);
@@ -54,7 +54,7 @@ ActsExtrapolationTool::initialize()
using BField_t = ATLASMagneticFieldWrapper;
BField_t bField(m_fieldServiceHandle.get());
auto stepper = Acts::EigenStepper<BField_t>(std::move(bField));
- auto propagator = Acts::Propagator<decltype(stepper), Acts::Navigator>(std::move(stepper),
+ auto propagator = Acts::Propagator<decltype(stepper), Acts::Navigator>(std::move(stepper),
std::move(navigator));
m_varProp = std::make_unique<VariantPropagator>(propagator);
}
@@ -67,7 +67,7 @@ ActsExtrapolationTool::initialize()
using BField_t = Acts::ConstantBField;
BField_t bField(Bx, By, Bz);
auto stepper = Acts::EigenStepper<BField_t>(std::move(bField));
- auto propagator = Acts::Propagator<decltype(stepper), Acts::Navigator>(std::move(stepper),
+ auto propagator = Acts::Propagator<decltype(stepper), Acts::Navigator>(std::move(stepper),
std::move(navigator));
m_varProp = std::make_unique<VariantPropagator>(propagator);
}
@@ -75,10 +75,3 @@ ActsExtrapolationTool::initialize()
ATH_MSG_INFO("ACTS extrapolation successfully initialized");
return StatusCode::SUCCESS;
}
-
-
-void
-ActsExtrapolationTool::prepareAlignment() const
-{
- m_trackingGeometryTool->prepareAlignment();
-}
diff --git a/Tracking/Acts/ActsGeometry/src/ActsLayerBuilder.cxx b/Tracking/Acts/ActsGeometry/src/ActsLayerBuilder.cxx
index 3743ddeeb6aa7df272d405f5d14e6ae156bc085c..4d0aef027181caec9ae8a40616e55f89772889ab 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsLayerBuilder.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsLayerBuilder.cxx
@@ -11,49 +11,50 @@
#include "ActsInterop/IdentityHelper.h"
// ACTS
-#include "Acts/Material/SurfaceMaterialProxy.hpp"
+#include "Acts/Material/ProtoSurfaceMaterial.hpp"
#include "Acts/Surfaces/CylinderSurface.hpp"
#include "Acts/Surfaces/DiscSurface.hpp"
#include "Acts/Layers/GenericApproachDescriptor.hpp"
-#include "Acts/Utilities/ApproachDescriptor.hpp"
+#include "Acts/Layers/ApproachDescriptor.hpp"
#include "Acts/Layers/ProtoLayer.hpp"
#include "Acts/Tools/LayerCreator.hpp"
#include "Acts/Utilities/Definitions.hpp"
+#include "Acts/Utilities/GeometryContext.hpp"
using Acts::Surface;
using Acts::Transform3D;
using Acts::Translation3D;
const Acts::LayerVector
-ActsLayerBuilder::negativeLayers() const
+ActsLayerBuilder::negativeLayers(const Acts::GeometryContext& gctx) const
{
ACTS_VERBOSE("Building negative layers");
// @todo Remove this hack once the m_elementStore mess is sorted out
auto mutableThis = const_cast<ActsLayerBuilder*>(this);
Acts::LayerVector nVector;
- mutableThis->buildLayers(nVector, -1);
+ mutableThis->buildLayers(gctx, nVector, -1);
return nVector;
}
const Acts::LayerVector
-ActsLayerBuilder::centralLayers() const
+ActsLayerBuilder::centralLayers(const Acts::GeometryContext& gctx) const
{
ACTS_VERBOSE("Building central layers");
// @todo Remove this hack once the m_elementStore mess is sorted out
auto mutableThis = const_cast<ActsLayerBuilder*>(this);
Acts::LayerVector cVector;
- mutableThis->buildLayers(cVector, 0);
+ mutableThis->buildLayers(gctx, cVector, 0);
return cVector;
}
const Acts::LayerVector
-ActsLayerBuilder::positiveLayers() const
+ActsLayerBuilder::positiveLayers(const Acts::GeometryContext& gctx) const
{
ACTS_VERBOSE("Building positive layers");
// @todo Remove this hack once the m_elementStore mess is sorted out
auto mutableThis = const_cast<ActsLayerBuilder*>(this);
Acts::LayerVector pVector;
- mutableThis->buildLayers(pVector, 1);
+ mutableThis->buildLayers(gctx, pVector, 1);
return pVector;
}
@@ -80,7 +81,8 @@ ActsLayerBuilder::getDetectorElements() const
}
void
-ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
+ActsLayerBuilder::buildLayers(const Acts::GeometryContext& gctx,
+ Acts::LayerVector& layersOutput, int type)
{
std::vector<std::shared_ptr<const ActsDetectorElement>> elements = getDetectorElements();
@@ -138,7 +140,7 @@ ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
for (const auto& layerPair : layers) {
const std::vector<std::shared_ptr<const Surface>>& layerSurfaces = layerPair.second;
auto key = layerPair.first;
- Acts::ProtoLayer pl(layerSurfaces);
+ Acts::ProtoLayer pl(gctx, layerSurfaces);
ACTS_VERBOSE("Layer #" << n << " with layerKey: ("
<< key.first << ", " << key.second << ")");
if (type == 0) { // BARREL
@@ -155,14 +157,14 @@ ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
for (const auto& layerPair : layers) {
std::unique_ptr<Acts::ApproachDescriptor> approachDescriptor = nullptr;
- std::shared_ptr<const Acts::SurfaceMaterialProxy> materialProxy = nullptr;
+ std::shared_ptr<const Acts::ProtoSurfaceMaterial> materialProxy = nullptr;
// use ref here, copy later
const std::vector<std::shared_ptr<const Surface>>& layerSurfaces = layerPair.second;
if (type == 0) { // BARREL
// layers and extent are determined, build actual layer
- Acts::ProtoLayer pl(layerSurfaces);
+ Acts::ProtoLayer pl(gctx, layerSurfaces);
pl.envR = {0, 0};
pl.envZ = {20, 20};
@@ -194,7 +196,7 @@ ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
binsZ, -layerHalfZ, layerHalfZ, Acts::open, Acts::binZ, transform);
materialProxy
- = std::make_shared<const Acts::SurfaceMaterialProxy>(materialBinUtil);
+ = std::make_shared<const Acts::ProtoSurfaceMaterial>(materialBinUtil);
ACTS_VERBOSE("[L] Layer is marked to carry support material on Surface ( "
"inner=0 / center=1 / outer=2 ) : " << "inner");
@@ -207,7 +209,7 @@ ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
// set material on inner
// @TODO: make this configurable somehow
- innerBoundary->setAssociatedMaterial(materialProxy);
+ innerBoundary->assignSurfaceMaterial(materialProxy);
std::vector<std::shared_ptr<const Acts::Surface>> aSurfaces;
aSurfaces.push_back(std::move(innerBoundary));
@@ -217,16 +219,17 @@ ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
approachDescriptor
= std::make_unique<Acts::GenericApproachDescriptor>(std::move(aSurfaces));
- auto layer = m_cfg.layerCreator->cylinderLayer(layerSurfaces,
- Acts::equidistant,
- Acts::equidistant,
- pl,
+ auto layer = m_cfg.layerCreator->cylinderLayer(gctx,
+ layerSurfaces,
+ Acts::equidistant,
+ Acts::equidistant,
+ pl,
transform,
std::move(approachDescriptor));
layersOutput.push_back(layer);
} else { // ENDCAP
- Acts::ProtoLayer pl(layerSurfaces);
+ Acts::ProtoLayer pl(gctx, layerSurfaces);
pl.envR = {0, 0};
pl.envZ = {10, 10};
@@ -269,7 +272,7 @@ ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
matBinsR, pl.minR, pl.maxR, Acts::open, Acts::binR, transformNominal);
materialProxy
- = std::make_shared<const Acts::SurfaceMaterialProxy>(materialBinUtil);
+ = std::make_shared<const Acts::ProtoSurfaceMaterial>(materialBinUtil);
ACTS_VERBOSE("[L] Layer is marked to carry support material on Surface ( "
"inner=0 / center=1 / outer=2 ) : " << "inner");
@@ -283,7 +286,7 @@ ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
// set material on inner
// @TODO: make this configurable somehow
- innerBoundary->setAssociatedMaterial(materialProxy);
+ innerBoundary->assignSurfaceMaterial(materialProxy);
int nModPhi = std::numeric_limits<int>::max();
int nModR = 0;
@@ -319,9 +322,10 @@ ActsLayerBuilder::buildLayers(Acts::LayerVector& layersOutput, int type)
approachDescriptor
= std::make_unique<Acts::GenericApproachDescriptor>(aSurfaces);
- auto layer = m_cfg.layerCreator->discLayer(layerSurfaces,
- nBinsR,
- nBinsPhi,
+ auto layer = m_cfg.layerCreator->discLayer(gctx,
+ layerSurfaces,
+ nBinsR,
+ nBinsPhi,
pl,
transformNominal,
std::move(approachDescriptor));
diff --git a/Tracking/Acts/ActsGeometry/src/ActsObjWriterTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsObjWriterTool.cxx
index bc4c6eff8c6e4123c166b116a24ca7d0bb049a30..3a3f832d842ef553591a7a537f240a1346e0077b 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsObjWriterTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsObjWriterTool.cxx
@@ -11,6 +11,7 @@
// Gaudi / Athena
#include "GaudiKernel/IInterface.h"
+#include "ActsGeometry/ActsGeometryContext.h"
// ACTS
#include "Acts/Detector/TrackingGeometry.hpp"
@@ -20,14 +21,14 @@
ActsObjWriterTool::ActsObjWriterTool(const std::string& type, const std::string& name,
- const IInterface* parent)
+ const IInterface* parent)
: AthAlgTool(type, name, parent)
{
//declareProperty("OutputDirectory", m_outputDirectory = "");
//declareProperty("SubDetectors", m_subDetectors = {});
}
-
-StatusCode
+
+StatusCode
ActsObjWriterTool::initialize()
{
@@ -69,13 +70,11 @@ ActsObjWriterTool::initialize()
m_tgObjWriter
= std::make_shared<Acts::ObjTrackingGeometryWriter>(tgObjWriterConfig);
-
return StatusCode::SUCCESS;
}
void
-ActsObjWriterTool::write(const Acts::TrackingGeometry& tg)
+ActsObjWriterTool::write(const ActsGeometryContext& gctx, const Acts::TrackingGeometry& tg)
{
- m_tgObjWriter->write(tg);
+ m_tgObjWriter->write(gctx.any(), tg);
}
-
diff --git a/Tracking/Acts/ActsGeometry/src/ActsStrawLayerBuilder.cxx b/Tracking/Acts/ActsGeometry/src/ActsStrawLayerBuilder.cxx
index e488c87ac0e3a11b3e1089d58a8746cb2f181580..dc9700cf12f0747e56c855f687488c7d80272778 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsStrawLayerBuilder.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsStrawLayerBuilder.cxx
@@ -20,6 +20,7 @@
#include "Acts/Tools/LayerCreator.hpp"
#include "Acts/Utilities/Definitions.hpp"
#include "Acts/Layers/ProtoLayer.hpp"
+#include "Acts/Utilities/GeometryContext.hpp"
// STL
#include <iostream>
@@ -29,33 +30,33 @@ using Acts::Transform3D;
using Acts::Vector3D;
const Acts::LayerVector
-ActsStrawLayerBuilder::negativeLayers() const
+ActsStrawLayerBuilder::negativeLayers(const Acts::GeometryContext& gctx) const
{
// @todo Remove this hack once the m_elementStore mess is sorted out
auto mutableThis = const_cast<ActsStrawLayerBuilder*>(this);
- return mutableThis->endcapLayers(-1);
+ return mutableThis->endcapLayers(gctx, -1);
}
const Acts::LayerVector
-ActsStrawLayerBuilder::centralLayers() const
+ActsStrawLayerBuilder::centralLayers(const Acts::GeometryContext& gctx) const
{
// @todo Remove this hack once the m_elementStore mess is sorted out
auto mutableThis = const_cast<ActsStrawLayerBuilder*>(this);
- return mutableThis->centralLayers();
+ return mutableThis->centralLayers(gctx);
}
const Acts::LayerVector
-ActsStrawLayerBuilder::positiveLayers() const
+ActsStrawLayerBuilder::positiveLayers(const Acts::GeometryContext& gctx) const
{
// @todo Remove this hack once the m_elementStore mess is sorted out
auto mutableThis = const_cast<ActsStrawLayerBuilder*>(this);
- return mutableThis->endcapLayers(1);
+ return mutableThis->endcapLayers(gctx, 1);
}
const Acts::LayerVector
-ActsStrawLayerBuilder::centralLayers()
+ActsStrawLayerBuilder::centralLayers(const Acts::GeometryContext& gctx)
{
ACTS_VERBOSE("Building central Straw layers")
@@ -126,7 +127,7 @@ ActsStrawLayerBuilder::centralLayers()
fudge = radius / 4.;
// calculate min/max R and Z
- Vector3D ctr = straw->center();
+ Vector3D ctr = straw->center(gctx);
pl.maxR = std::max(pl.maxR, ctr.perp() + radius);
pl.minR = std::min(pl.minR, ctr.perp() - radius);
pl.maxZ = std::max(pl.maxZ, ctr.z() + length);
@@ -146,8 +147,8 @@ ActsStrawLayerBuilder::centralLayers()
pl.minR = prev.maxR + prev.envR.second + pl.envR.first + fudge;
}
- std::shared_ptr<Acts::Layer> layer
- = m_cfg.layerCreator->cylinderLayer(std::move(layerSurfaces), 100, 1, pl);
+ std::shared_ptr<Acts::Layer> layer
+ = m_cfg.layerCreator->cylinderLayer(gctx, std::move(layerSurfaces), 100, 1, pl);
layers.push_back(layer);
protoLayers.push_back(pl);
@@ -158,7 +159,7 @@ ActsStrawLayerBuilder::centralLayers()
}
const Acts::LayerVector
-ActsStrawLayerBuilder::endcapLayers(int side)
+ActsStrawLayerBuilder::endcapLayers(const Acts::GeometryContext& gctx, int side)
{
ACTS_VERBOSE("Building endcap Straw layers")
@@ -220,7 +221,7 @@ ActsStrawLayerBuilder::endcapLayers(int side)
double radius = strawBounds->r();
double length = strawBounds->halflengthZ();
- Vector3D ctr = straw->center();
+ Vector3D ctr = straw->center(gctx);
pl.maxZ = std::max(pl.maxZ, ctr.z() + radius);
pl.minZ = std::min(pl.minZ, ctr.z() - radius);
pl.maxR = std::max(pl.maxR, ctr.perp() + length);
@@ -233,8 +234,8 @@ ActsStrawLayerBuilder::endcapLayers(int side)
}
}
- std::shared_ptr<Acts::Layer> layer
- = m_cfg.layerCreator->discLayer(std::move(wheelSurfaces), 1, 100, pl);
+ std::shared_ptr<Acts::Layer> layer
+ = m_cfg.layerCreator->discLayer(gctx, std::move(wheelSurfaces), 1, 100, pl);
layers.push_back(layer);
ACTS_VERBOSE(" - Collected " << wheelSurfaces.size() << " straws");
}
diff --git a/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometrySvc.cxx b/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometrySvc.cxx
index 6429115a50878f2d87bbe13b06e31f4cfe61ae37..2402d6bdd624c0008b8b1e8df6b43eec937ffc08 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometrySvc.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometrySvc.cxx
@@ -21,6 +21,7 @@
#include "Acts/Tools/CylinderVolumeHelper.hpp"
#include "Acts/Tools/TrackingGeometryBuilder.hpp"
#include "Acts/Tools/CylinderVolumeBuilder.hpp"
+#include "Acts/ActsVersion.hpp"
// PACKAGE
#include "ActsGeometry/ActsLayerBuilder.h"
@@ -29,6 +30,7 @@
#include "ActsInterop/IdentityHelper.h"
#include "ActsInterop/Logger.h"
#include "ActsGeometry/ActsAlignmentStore.h"
+#include "ActsGeometry/ActsGeometryContext.h"
ActsTrackingGeometrySvc::ActsTrackingGeometrySvc(const std::string& name, ISvcLocator* svc)
@@ -42,7 +44,11 @@ StatusCode
ActsTrackingGeometrySvc::initialize()
{
ATH_MSG_INFO(name() << " is initializing");
-
+ ATH_MSG_INFO("Acts version is: v" << Acts::VersionMajor << "."
+ << Acts::VersionMinor << "."
+ << Acts::VersionPatch
+ << " [" << Acts::CommitHash << "]");
+
ATH_CHECK ( m_detStore->retrieve(p_pixelManager, "Pixel") );
ATH_CHECK ( m_detStore->retrieve(p_SCTManager, "SCT") );
ATH_CHECK ( m_detStore->retrieve(p_TRTManager, "TRT") );
@@ -50,14 +56,17 @@ ActsTrackingGeometrySvc::initialize()
if (m_detStore->retrieve(m_TRT_idHelper, "TRT_ID").isFailure()) {
msg(MSG::ERROR) << "Could not retrieve TRT ID Helper" << endmsg;
}
-
+
+
+ Acts::LayerArrayCreator::Config lacCfg;
auto layerArrayCreator = std::make_shared<const Acts::LayerArrayCreator>(
- makeActsAthenaLogger(this, "LayArrCrtr", "ActsTGSvc"));
+ lacCfg, makeActsAthenaLogger(this, "LayArrCrtr", "ActsTGSvc"));
+ Acts::TrackingVolumeArrayCreator::Config tvcCfg;
auto trackingVolumeArrayCreator
= std::make_shared<const Acts::TrackingVolumeArrayCreator>(
- makeActsAthenaLogger(this, "TrkVolArrCrtr", "ActsTGSvc"));
+ tvcCfg, makeActsAthenaLogger(this, "TrkVolArrCrtr", "ActsTGSvc"));
Acts::CylinderVolumeHelper::Config cvhConfig;
cvhConfig.layerArrayCreator = layerArrayCreator;
@@ -72,23 +81,23 @@ ActsTrackingGeometrySvc::initialize()
try {
// PIXEL
tgbConfig.trackingVolumeBuilders.push_back([this, cylinderVolumeHelper](
- const auto& inner, const auto&) {
+ const auto& gctx, const auto& inner, const auto&) {
auto tv = makeVolumeBuilder(p_pixelManager, cylinderVolumeHelper, true);
- return tv->trackingVolume(inner);
+ return tv->trackingVolume(gctx, inner);
});
-
+
// SCT
tgbConfig.trackingVolumeBuilders.push_back([this, cylinderVolumeHelper](
- const auto& inner, const auto&) {
+ const auto& gctx, const auto& inner, const auto&) {
auto tv = makeVolumeBuilder(p_SCTManager, cylinderVolumeHelper);
- return tv->trackingVolume(inner);
+ return tv->trackingVolume(gctx, inner);
});
// TRT
tgbConfig.trackingVolumeBuilders.push_back([this, cylinderVolumeHelper](
- const auto& inner, const auto&) {
+ const auto& gctx, const auto& inner, const auto&) {
auto tv = makeVolumeBuilder(p_TRTManager, cylinderVolumeHelper);
- return tv->trackingVolume(inner);
+ return tv->trackingVolume(gctx, inner);
});
}
catch (const std::invalid_argument& e) {
@@ -100,14 +109,25 @@ ActsTrackingGeometrySvc::initialize()
auto trackingGeometryBuilder
= std::make_shared<const Acts::TrackingGeometryBuilder>(tgbConfig,
makeActsAthenaLogger(this, "TrkGeomBldr", "ActsTGSvc"));
-
- m_trackingGeometry = trackingGeometryBuilder->trackingGeometry();
-
- //const Acts::TrackingVolume* = m_trackingGeometry->highestTrackingVolume();
+ // default geometry context, this is nominal
+ ActsGeometryContext constructionContext;
+ constructionContext.construction = true;
+
+ m_trackingGeometry = trackingGeometryBuilder
+ ->trackingGeometry(constructionContext.any());
+
+ ATH_MSG_VERBOSE("Building nominal alignment store");
+ ActsAlignmentStore* nominalAlignmentStore = new ActsAlignmentStore();
+
+ populateAlignmentStore(nominalAlignmentStore);
+
+ // manage ownership
+ m_nominalAlignmentStore = std::unique_ptr<const ActsAlignmentStore>(nominalAlignmentStore);
+
ATH_MSG_INFO("Acts TrackingGeometry construction completed");
-
+
return StatusCode::SUCCESS;
}
@@ -118,7 +138,7 @@ ActsTrackingGeometrySvc::trackingGeometry() {
return m_trackingGeometry;
}
-std::shared_ptr<const Acts::ITrackingVolumeBuilder>
+std::shared_ptr<const Acts::ITrackingVolumeBuilder>
ActsTrackingGeometrySvc::makeVolumeBuilder(const InDetDD::InDetDetectorManager* manager, std::shared_ptr<const Acts::CylinderVolumeHelper> cvh, bool toBeamline)
{
std::string managerName = manager->getName();
@@ -127,7 +147,7 @@ ActsTrackingGeometrySvc::makeVolumeBuilder(const InDetDD::InDetDetectorManager*
std::shared_ptr<const Acts::ILayerBuilder> gmLayerBuilder;
if (manager->getName() == "TRT") {
- auto matcher = [](Acts::BinningValue /*bValue*/, const Acts::Surface* /*aS*/,
+ auto matcher = [](const Acts::GeometryContext& /*gctx*/, Acts::BinningValue /*bValue*/, const Acts::Surface* /*aS*/,
const Acts::Surface* /*bS*/) -> bool {
return false;
};
@@ -158,15 +178,15 @@ ActsTrackingGeometrySvc::makeVolumeBuilder(const InDetDD::InDetDetectorManager*
//gmLayerBuilder->positiveLayers();
}
else {
- auto matcher = [](Acts::BinningValue bValue, const Acts::Surface* aS,
- const Acts::Surface* bS) -> bool {
+ auto matcher = [](const Acts::GeometryContext& /*gctx*/, Acts::BinningValue bValue,
+ const Acts::Surface* aS, const Acts::Surface* bS) -> bool {
auto a = dynamic_cast<const ActsDetectorElement*>(aS->associatedDetectorElement());
auto b = dynamic_cast<const ActsDetectorElement*>(bS->associatedDetectorElement());
if ((not a) or (not b)){
throw std::runtime_error("Cast of surface associated element to ActsDetectorElement failed in ActsTrackingGeometrySvc::makeVolumeBuilder");
}
-
+
IdentityHelper idA = a->identityHelper();
IdentityHelper idB = b->identityHelper();
@@ -186,7 +206,7 @@ ActsTrackingGeometrySvc::makeVolumeBuilder(const InDetDD::InDetDetectorManager*
}
if (bValue == Acts::binR) {
- return (idA.eta_module() == idB.eta_module())
+ return (idA.eta_module() == idB.eta_module())
&& (idA.layer_disk() == idB.layer_disk())
&& (idB.bec() == idA.bec());
}
@@ -208,7 +228,7 @@ ActsTrackingGeometrySvc::makeVolumeBuilder(const InDetDD::InDetDetectorManager*
ActsLayerBuilder::Config cfg;
-
+
if(managerName == "Pixel") {
cfg.subdetector = ActsDetectorElement::Subdetector::Pixel;
}
@@ -221,14 +241,14 @@ ActsTrackingGeometrySvc::makeVolumeBuilder(const InDetDD::InDetDetectorManager*
throw std::invalid_argument("Number of barrel material bin counts != 2");
}
std::vector<size_t> brlBins(m_barrelMaterialBins);
- cfg.barrelMaterialBins = {brlBins.at(0),
+ cfg.barrelMaterialBins = {brlBins.at(0),
brlBins.at(1)};
if (m_endcapMaterialBins.size() != 2) {
throw std::invalid_argument("Number of endcap material bin counts != 2");
}
std::vector<size_t> ecBins(m_endcapMaterialBins);
- cfg.endcapMaterialBins = {ecBins.at(0),
+ cfg.endcapMaterialBins = {ecBins.at(0),
ecBins.at(1)};
cfg.mng = static_cast<const InDetDD::SiDetectorManager*>(manager);
@@ -261,16 +281,19 @@ ActsTrackingGeometrySvc::makeVolumeBuilder(const InDetDD::InDetDetectorManager*
}
void
-ActsTrackingGeometrySvc::setAlignmentStore(const ActsAlignmentStore* gas, const EventContext& ctx)
+ActsTrackingGeometrySvc::populateAlignmentStore(ActsAlignmentStore *store) const
{
- std::lock_guard<std::mutex> lock(m_gasMapMutex);
- m_gasMap[ctx.slot()] = gas;
+ // populate the alignment store with all detector elements
+ m_trackingGeometry->visitSurfaces(
+ [store](const Acts::Surface* srf) {
+ const Acts::DetectorElementBase* detElem = srf->associatedDetectorElement();
+ const auto* gmde = dynamic_cast<const ActsDetectorElement*>(detElem);
+ gmde->storeTransform(store);
+ });
}
const ActsAlignmentStore*
-ActsTrackingGeometrySvc::getAlignmentStore(const EventContext& ctx) const
+ActsTrackingGeometrySvc::getNominalAlignmentStore() const
{
- std::lock_guard<std::mutex> lock(m_gasMapMutex);
- if (m_gasMap.find(ctx.slot()) == m_gasMap.end()) return nullptr;
- return m_gasMap[ctx.slot()];
+ return m_nominalAlignmentStore.get();
}
diff --git a/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometryTool.cxx b/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometryTool.cxx
index 2ca8c6261cdeb2fc75087a7f876c0e80e3c4e35b..563aeb090ac45b3de2fbc6b0e901e562d093062d 100644
--- a/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometryTool.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsTrackingGeometryTool.cxx
@@ -5,6 +5,7 @@
#include "ActsGeometry/ActsTrackingGeometryTool.h"
// ATHENA
+#include "GaudiKernel/EventContext.h"
// PACKAGE
#include "ActsGeometry/ActsAlignmentStore.h"
@@ -15,13 +16,13 @@
#include <memory>
ActsTrackingGeometryTool::ActsTrackingGeometryTool(const std::string& type, const std::string& name,
- const IInterface* parent)
+ const IInterface* parent)
: AthAlgTool(type, name, parent),
m_trackingGeometrySvc("ActsTrackingGeometrySvc", name)
{
}
-
-StatusCode
+
+StatusCode
ActsTrackingGeometryTool::initialize()
{
ATH_MSG_INFO(name() << " initializing");
@@ -39,21 +40,25 @@ ActsTrackingGeometryTool::trackingGeometry() const
return m_trackingGeometrySvc->trackingGeometry();
}
-StatusCode
-ActsTrackingGeometryTool::prepareAlignment() const
+const ActsGeometryContext&
+ActsTrackingGeometryTool::getGeometryContext(const EventContext& ctx) const
{
- ATH_MSG_DEBUG("Setting up alignment for this event");
- SG::ReadCondHandle<ActsAlignmentStore> rch(m_rchk);
+ ATH_MSG_DEBUG("Creating alignment context for event");
+ SG::ReadCondHandle<ActsGeometryContext> rch(m_rchk, ctx);
- if (!rch.isValid()) {
- ATH_MSG_ERROR("Preparing alignment not possible, ReadCondHandle invalid");
- return StatusCode::FAILURE;
+ if(!rch.isValid()) {
+ ATH_MSG_ERROR("Creating alignment context failed: read cond handle invalid!");
}
-
- const ActsAlignmentStore* gas = *rch;
- m_trackingGeometrySvc->setAlignmentStore(gas, Gaudi::Hive::currentContext());
- ATH_MSG_DEBUG("ActsAlignmentStore registered successfully");
+ return **rch;
+}
+
+ActsGeometryContext
+ActsTrackingGeometryTool::getNominalGeometryContext() const
+{
+
+ ActsGeometryContext gctx;
+ gctx.alignmentStore = m_trackingGeometrySvc->getNominalAlignmentStore();
- return StatusCode::SUCCESS;
+ return gctx;
}
diff --git a/Tracking/Acts/ActsGeometry/src/ActsWriteTrackingGeometry.cxx b/Tracking/Acts/ActsGeometry/src/ActsWriteTrackingGeometry.cxx
index e97a4e057b4786a770ff123ee2e5347d8a02dcc1..6fc7a6d5b74920670f060a79d928361886530680 100755
--- a/Tracking/Acts/ActsGeometry/src/ActsWriteTrackingGeometry.cxx
+++ b/Tracking/Acts/ActsGeometry/src/ActsWriteTrackingGeometry.cxx
@@ -12,6 +12,7 @@
// PACKAGE
#include "ActsGeometry/IActsTrackingGeometrySvc.h"
+#include "ActsGeometry/ActsGeometryContext.h"
// STL
#include <string>
@@ -34,13 +35,15 @@ StatusCode ActsWriteTrackingGeometry::initialize() {
}
StatusCode ActsWriteTrackingGeometry::execute() {
- ATH_CHECK( m_trackingGeometryTool->prepareAlignment() );
auto trackingGeometry = m_trackingGeometryTool->trackingGeometry();
- m_objWriterTool->write(*trackingGeometry);
+
+ // Use nominal context
+ ActsGeometryContext defGctx;
+
+ m_objWriterTool->write(defGctx, *trackingGeometry);
return StatusCode::SUCCESS;
}
StatusCode ActsWriteTrackingGeometry::finalize() {
return StatusCode::SUCCESS;
}
-
diff --git a/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx b/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
index db58edd284671ab7f0a6e66df659bd05518fb259..fdf3769c3bcd5c699b1f51cf2c6ffe0277680b6b 100644
--- a/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
+++ b/Tracking/Acts/ActsGeometry/src/NominalAlignmentCondAlg.cxx
@@ -16,6 +16,7 @@
#include "ActsGeometry/IActsTrackingGeometrySvc.h"
#include "ActsGeometry/ActsDetectorElement.h"
#include "ActsGeometry/ActsAlignmentStore.h"
+#include "ActsGeometry/ActsGeometryContext.h"
// ACTS
#include "Acts/Utilities/Definitions.hpp"
@@ -23,8 +24,8 @@
#include "Acts/Surfaces/Surface.hpp"
-NominalAlignmentCondAlg::NominalAlignmentCondAlg( const std::string& name,
- ISvcLocator* pSvcLocator ) :
+NominalAlignmentCondAlg::NominalAlignmentCondAlg( const std::string& name,
+ ISvcLocator* pSvcLocator ) :
::AthAlgorithm( name, pSvcLocator ),
m_cs("CondSvc",name),
m_trackingGeometrySvc("ActsTrackingGeometrySvc", name)
@@ -46,7 +47,7 @@ StatusCode NominalAlignmentCondAlg::initialize() {
}
if (m_cs->regHandle(this, m_wchk).isFailure()) {
- ATH_MSG_ERROR("unable to register WriteCondHandle " << m_wchk.fullKey()
+ ATH_MSG_ERROR("unable to register WriteCondHandle " << m_wchk.fullKey()
<< " with CondSvc");
return StatusCode::FAILURE;
}
@@ -62,7 +63,7 @@ StatusCode NominalAlignmentCondAlg::finalize() {
StatusCode NominalAlignmentCondAlg::execute() {
ATH_MSG_DEBUG(name() << "::" << __FUNCTION__);
- SG::WriteCondHandle<ActsAlignmentStore> wch(m_wchk);
+ SG::WriteCondHandle<ActsGeometryContext> wch(m_wchk);
EventIDBase now(getContext().eventID());
@@ -74,7 +75,7 @@ StatusCode NominalAlignmentCondAlg::execute() {
} else {
- ATH_MSG_DEBUG(" CondHandle " << wch.key()
+ ATH_MSG_DEBUG(" CondHandle " << wch.key()
<< " not valid now (" << now << "). Setting nominal alignment cond");
@@ -87,30 +88,14 @@ StatusCode NominalAlignmentCondAlg::execute() {
ATH_MSG_DEBUG("Will register nominal alignment for range: " << r);
- // create empty alignment store, no deltas
- ActsAlignmentStore* alignmentStore = new ActsAlignmentStore();
-
- // populate the alignment store with all detector elements
- auto trkGeom = m_trackingGeometrySvc->trackingGeometry();
-
-
- ATH_MSG_DEBUG("Populating ActsAlignmentStore for IOV");
- size_t nElems = 0;
- trkGeom->visitSurfaces(
- [alignmentStore, &nElems](const Acts::Surface* srf) {
- const Acts::DetectorElementBase* detElem = srf->associatedDetectorElement();
- const auto* gmde = dynamic_cast<const ActsDetectorElement*>(detElem);
- if (gmde){
- gmde->storeTransform(alignmentStore);
- nElems++;
- }
- });
- ATH_MSG_DEBUG("ActsAlignmentStore populated for " << nElems << " detector elements");
-
-
- if (wch.record(r, alignmentStore).isFailure()) {
- ATH_MSG_ERROR("could not record nominal ActsAlignmentStore " << wch.key()
- << " = " << alignmentStore
+ // get a nominal alignment store from the tracking geometry service
+ // and plug it into a geometry context
+ auto gctx = std::make_unique<ActsGeometryContext>();
+ gctx->alignmentStore = m_trackingGeometrySvc->getNominalAlignmentStore();
+
+ // and write it to the conditions store
+ if (wch.record(r, gctx.release()).isFailure()) {
+ ATH_MSG_ERROR("could not record nominal ActsGeometryContext " << wch.key()
<< " with EventRange " << r);
return StatusCode::FAILURE;
}
diff --git a/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.cxx b/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.cxx
index ce21ef70cd74569d9fb8a75f2d73311bff974935..59a4c0b17f58161849e0b5557bf7fbbd85b5a916 100644
--- a/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.cxx
+++ b/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.cxx
@@ -52,7 +52,8 @@ Acts::ObjSurfaceWriter::write(const std::string& sinfo)
}
void
-Acts::ObjSurfaceWriter::write(const Acts::Surface& surface)
+Acts::ObjSurfaceWriter::write(const Acts::GeometryContext &gctx,
+ const Acts::Surface &surface)
{
std::lock_guard<std::mutex> lock(m_write_mutex);
@@ -62,7 +63,7 @@ Acts::ObjSurfaceWriter::write(const Acts::Surface& surface)
auto scalor = m_cfg.outputScalor;
// let's get the bounds & the transform
const Acts::SurfaceBounds& surfaceBounds = surface.bounds();
- auto sTransform = surface.transform();
+ auto sTransform = surface.transform(gctx);
// dynamic_cast to PlanarBounds
const Acts::PlanarBounds* planarBounds
@@ -112,14 +113,16 @@ Acts::ObjSurfaceWriter::write(const Acts::Surface& surface)
auto cylinderSurface = dynamic_cast<const Acts::CylinderSurface*>(&surface);
- Acts::PolyhedronRepresentation ph = cylinderSurface->polyhedronRepresentation();
+ Acts::PolyhedronRepresentation ph =
+ cylinderSurface->polyhedronRepresentation(gctx);
(*(m_cfg.outputStream)) << ph.objString(m_vtnCounter.vcounter);
m_vtnCounter.vcounter += ph.vertices.size();
}
else if(strawSurface) {
- Acts::PolyhedronRepresentation ph = strawSurface->polyhedronRepresentation();
+ Acts::PolyhedronRepresentation ph =
+ strawSurface->polyhedronRepresentation(gctx);
(*(m_cfg.outputStream)) << ph.objString(m_vtnCounter.vcounter);
m_vtnCounter.vcounter += ph.vertices.size();
diff --git a/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.h b/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.h
index e734f1ffe883396efb9072df1ac9a3dee459d394..2f207a659242c67102fea2227d5f9a9d415ada1d 100644
--- a/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.h
+++ b/Tracking/Acts/ActsGeometry/src/util/ObjSurfaceWriter.h
@@ -6,6 +6,7 @@
#pragma once
+#include "Acts/Utilities/GeometryContext.hpp"
#include <fstream>
#include <iostream>
#include <mutex>
@@ -73,7 +74,7 @@ public:
/// The write interface
/// @param surface to be written out
void
- write(const Acts::Surface& surface);
+ write(const Acts::GeometryContext &gctx, const Acts::Surface &surface);
/// write a bit of string
/// @param is the string to be written
diff --git a/Tracking/Acts/ActsGeometry/src/util/ObjTrackingGeometryWriter.cxx b/Tracking/Acts/ActsGeometry/src/util/ObjTrackingGeometryWriter.cxx
index 1eae3bedb271de7d236d822583b569c03b93af0c..4fc1e7c45ce582c5987ad24fe2a80d29394fa99a 100644
--- a/Tracking/Acts/ActsGeometry/src/util/ObjTrackingGeometryWriter.cxx
+++ b/Tracking/Acts/ActsGeometry/src/util/ObjTrackingGeometryWriter.cxx
@@ -9,6 +9,7 @@
#include <iostream>
#include "Acts/Detector/TrackingVolume.hpp"
#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/GeometryContext.hpp"
Acts::ObjTrackingGeometryWriter::ObjTrackingGeometryWriter(
const ObjTrackingGeometryWriter::Config& cfg)
@@ -23,18 +24,18 @@ Acts::ObjTrackingGeometryWriter::name() const
}
void
-Acts::ObjTrackingGeometryWriter::write(const Acts::TrackingGeometry& tGeometry)
+Acts::ObjTrackingGeometryWriter::write(const Acts::GeometryContext& gctx, const Acts::TrackingGeometry& tGeometry)
{
ACTS_DEBUG(">>Obj: Writer for TrackingGeometry object called.");
// get the world volume
auto world = tGeometry.highestTrackingVolume();
- if (world) write(*world);
+ if (world) write(gctx, *world);
// return the success code
}
/// process this volume
void
-Acts::ObjTrackingGeometryWriter::write(const Acts::TrackingVolume& tVolume)
+Acts::ObjTrackingGeometryWriter::write(const Acts::GeometryContext& gctx, const Acts::TrackingVolume& tVolume)
{
ACTS_DEBUG(">>Obj: Writer for TrackingVolume object called.");
// get the confined layers and process them
@@ -68,7 +69,7 @@ Acts::ObjTrackingGeometryWriter::write(const Acts::TrackingVolume& tVolume)
surfaceWriter->write(m_cfg.sensitiveGroupPrefix);
// loop over the surface
for (auto surface : layer->surfaceArray()->surfaces()) {
- if (surface) surfaceWriter->write(*surface);
+ if (surface) surfaceWriter->write(gctx, *surface);
}
}
}
@@ -77,7 +78,7 @@ Acts::ObjTrackingGeometryWriter::write(const Acts::TrackingVolume& tVolume)
if (tVolume.confinedVolumes()) {
// loop over the volumes and write what they have
for (auto volume : tVolume.confinedVolumes()->arrayObjects()) {
- write(*volume.get());
+ write(gctx, *volume.get());
}
}
}
diff --git a/Tracking/Acts/ActsGeometry/src/util/ObjTrackingGeometryWriter.h b/Tracking/Acts/ActsGeometry/src/util/ObjTrackingGeometryWriter.h
index e83d338d0c2128fffc546fc68f6b12e413450b85..d3e7b5a39fc198ca825898e0f3db0b2b74b3f0c8 100644
--- a/Tracking/Acts/ActsGeometry/src/util/ObjTrackingGeometryWriter.h
+++ b/Tracking/Acts/ActsGeometry/src/util/ObjTrackingGeometryWriter.h
@@ -14,6 +14,7 @@
#include "Acts/Detector/TrackingGeometry.hpp"
#include "Acts/Surfaces/Surface.hpp"
#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/GeometryContext.hpp"
namespace Acts {
class TrackingVolume;
@@ -62,7 +63,7 @@ public:
/// @param tGeometry is the geometry to be written out
/// @return ProcessCode to indicate success/failure
void
- write(const Acts::TrackingGeometry& tGeometry);
+ write(const Acts::GeometryContext& gctx, const Acts::TrackingGeometry& tGeometry);
private:
Config m_cfg; ///< the config class
@@ -70,7 +71,7 @@ private:
/// process this volume
/// @param tVolume the volume to be processed
void
- write(const Acts::TrackingVolume& tVolume);
+ write(const Acts::GeometryContext& gctx, const Acts::TrackingVolume& tVolume);
/// Private access to the logging instance
const Acts::Logger&
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
index fc5c226eb101b73c2dd21c6332ec694aa1aad1c2..12922cb4152338f6f0f936aa18c52067f2c51058 100755
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/* *******************************************************************************
@@ -50,10 +50,10 @@ class GaussianSumFitter : virtual public ITrackFitter, public AthAlgTool {
virtual ~GaussianSumFitter() {};
/** AlgTool initialise method */
- StatusCode initialize();
+ virtual StatusCode initialize() override final;
/** AlgTool finalise method */
- StatusCode finalize();
+ virtual StatusCode finalize() override final;
using ITrackFitter::fit;
@@ -61,27 +61,27 @@ class GaussianSumFitter : virtual public ITrackFitter, public AthAlgTool {
virtual Track* fit ( const Track&,
const RunOutlierRemoval outlierRemoval = false,
- const ParticleHypothesis particleHypothesis = nonInteracting ) const;
+ const ParticleHypothesis particleHypothesis = nonInteracting ) const override final;
/** Fit a collection of 'PrepRawData' objects using the Gaussian Sum Filter
- This requires that an trackParameters object be supplied also as an initial guess */
virtual Track* fit ( const PrepRawDataSet&,
const TrackParameters&,
const RunOutlierRemoval outlierRemoval = false,
- const ParticleHypothesis particleHypothesis = nonInteracting ) const;
+ const ParticleHypothesis particleHypothesis = nonInteracting ) const override final;
/** Fit a collection of 'RIO_OnTrack' objects using the Gaussian Sum Filter
- This requires that an trackParameters object be supplied also as an initial guess */
virtual Track* fit ( const MeasurementSet&,
const TrackParameters&,
const RunOutlierRemoval outlierRemoval = false,
- const ParticleHypothesis particleHypothesis = nonInteracting ) const;
+ const ParticleHypothesis particleHypothesis = nonInteracting ) const override final;
/** Refit a track adding a PrepRawDataSet - Not done! */
virtual Track* fit ( const Track&,
const PrepRawDataSet&,
const RunOutlierRemoval runOutlier = false,
- const ParticleHypothesis matEffects = nonInteracting) const;
+ const ParticleHypothesis matEffects = nonInteracting) const override final;
/** Refit a track adding a RIO_OnTrack set
- This has no form of outlier rejection and will use all hits on orginal track...
@@ -89,16 +89,13 @@ class GaussianSumFitter : virtual public ITrackFitter, public AthAlgTool {
virtual Track* fit ( const Track&,
const MeasurementSet&,
const RunOutlierRemoval runOutlier = false,
- const ParticleHypothesis matEffects = nonInteracting) const;
+ const ParticleHypothesis matEffects = nonInteracting) const override final;
/** Combine two tracks by refitting - Not done! */
virtual Track* fit ( const Track&,
const Track&,
const RunOutlierRemoval runOutlier = false,
- const ParticleHypothesis matEffects = nonInteracting ) const;
-
- /** Save GSF Validation ntuple */
- void validationAction() const;
+ const ParticleHypothesis matEffects = nonInteracting ) const override final;
private:
@@ -110,35 +107,34 @@ class GaussianSumFitter : virtual public ITrackFitter, public AthAlgTool {
const Trk::FitQuality* buildFitQuality(const Trk::SmoothedTrajectory& ) const;
private:
- ToolHandle<IMultiStateExtrapolator> m_extrapolator;
-
- ToolHandle<IMultiStateMeasurementUpdator> m_updator;
-
- ToolHandle<IRIO_OnTrackCreator> m_rioOnTrackCreator;
-
- ToolHandle<IForwardGsfFitter> m_forwardGsfFitter;
- ToolHandle<IGsfSmoother> m_gsfSmoother;
-
+ ToolHandle<IMultiStateExtrapolator> m_extrapolator
+ {this,"ToolForExtrapolation","Trk::GsfExtrapolator/GsfExtrapolator",""};
+ ToolHandle<IMultiStateMeasurementUpdator> m_updator
+ {this,"MeasurementUpdatorType","Trk::GsfMeasurementUpdator/GsfMeasurementUpdator",""};
+ ToolHandle<IRIO_OnTrackCreator> m_rioOnTrackCreator
+ {this,"ToolForROTCreation","Trk::RioOnTrackCreator/RIO_OnTrackCreator",""};
+ ToolHandle<IForwardGsfFitter> m_forwardGsfFitter
+ {this,"ForwardGsfFitter","Trk::ForwardGsfFitter/ForwardGsfFitter",""};
+ ToolHandle<IGsfSmoother> m_gsfSmoother
+ {this,"GsfSmoother","Trk::GsfSmoother/GsfSmoother",""};
+ ToolHandle<IMultiComponentStateCombiner> m_stateCombiner
+ {this,"StateCombiner","Trk::MultiComponentStateCombiner/GSFMultiComponentStateCombiner",""};
+
bool m_reintegrateOutliers;
-
bool m_makePerigee;
- PropDirection m_directionToPerigee;
bool m_refitOnMeasurementBase;
bool m_doHitSorting;
+ PropDirection m_directionToPerigee;
TrkParametersComparisonFunction* m_trkParametersComparisonFunction;
std::vector<double> m_sortingReferencePoint;
-
- ToolHandle<IMultiComponentStateCombiner> m_stateCombiner;
ServiceHandle<IChronoStatSvc> m_chronoSvc;
-
TrackFitInputPreparator* m_inputPreparator;
-
// GSF Fit Statistics
mutable std::atomic<int> m_FitPRD; // Number of Fit PrepRawData Calls
- mutable std::atomic<int> m_FitMeasuremnetBase; // Number of Fit MeasurementBase Calls
- mutable std::atomic<int> m_FowardFailure; // Number of Foward Fit Failures
+ mutable std::atomic<int> m_FitMeasurementBase; // Number of Fit MeasurementBase Calls
+ mutable std::atomic<int> m_ForwardFailure; // Number of Foward Fit Failures
mutable std::atomic<int> m_SmootherFailure; // Number of Smoother Failures
mutable std::atomic<int> m_PerigeeFailure; // Number of MakePerigee Failures
mutable std::atomic<int> m_fitQualityFailure; // Number of Tracks that fail fit Quailty test
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
index a5e25ac7099a03cbfc61961513444e13da7c0839..be46c1ca002b8fd53cfc4f30c57c843ef55b039e 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*********************************************************************************
@@ -48,81 +48,33 @@ namespace Trk{
virtual ~QuickCloseComponentsMultiStateMerger();
/** AlgTool initialise method */
- StatusCode initialize();
+ StatusCode initialize() override final;
/** AlgTool finalise method */
- StatusCode finalize();
+ StatusCode finalize() override final;
- virtual const MultiComponentState* merge(const MultiComponentState&) const;
+ virtual const MultiComponentState* merge(const MultiComponentState&) const override final;
private:
-
- typedef std::multimap<double, ComponentParameters, SortBySmallerWeight> MultiComponentStateMap;
-
- double calculateDistance(const ComponentParameters , const ComponentParameters) const;
-
-
- unsigned int m_maximumNumberOfComponents;
-
- ToolHandle<IComponentSeparationDistance> m_distance;
-
- ToolHandle<Trk::IMultiComponentStateCombiner> m_stateCombiner;
- ToolHandle<Trk::IMultiComponentStateAssembler> m_stateAssembler
- {this,"MultiComponentStateAssembler","Trk::MultiComponentStateAssembler/CloseComponentsStateAssembler",""};
-
- ServiceHandle<IChronoStatSvc> m_chronoSvc; //!< Timing: The Gaudi time auditing service
-
- //////////////////////////////////////////////////////////////////////////////////////
- // New merging functions.
-
- bool m_useFullDistanceCalcArray;
- bool m_useFullDistanceCalcVector;
-
-
-
- const MultiComponentState* mergeFullDistVector(IMultiComponentStateAssembler::Cache& cache,
- const MultiComponentState&) const;
+ Gaudi::Property <unsigned int> m_maximumNumberOfComponents {this,
+ "MaximumNumberOfComponents", 12 , "Maximum number of components"};
+
+ ToolHandle<IComponentSeparationDistance> m_distance {this,
+ "DistanceType","Trk::KullbackLeiblerComponentDistance/KullbackLeiblerComponentDistance","Distance calculator"};
+
+ ToolHandle<Trk::IMultiComponentStateCombiner> m_stateCombiner {this,
+ "CombinerTool","Trk::MultiComponentStateCombiner/CloseComponentsCombiner"," Combonent combiner"};
+
+ ToolHandle<Trk::IMultiComponentStateAssembler> m_stateAssembler {this,
+ "MultiComponentStateAssembler","Trk::MultiComponentStateAssembler/CloseComponentsStateAssembler"," "};
+
+ ServiceHandle<IChronoStatSvc> m_chronoSvc; //!< Timing: The Gaudi time auditing service
+
+
+
const MultiComponentState* mergeFullDistArray(IMultiComponentStateAssembler::Cache& cache,
const MultiComponentState&) const;
-
- typedef std::vector<std::vector<float> > IndexDistanceMap;
-
- //Routine to add a new component to the map & calculate distances.
- //NOTE: New components will always come at the end of the vector,
- //which should simplify routine.
- void buildMap(IndexDistanceMap&, std::vector<const ComponentParameters*>&) const;
-
-
- // Merge components and delete them from map while adding the new one
- void mergeStateComponents (IndexDistanceMap&, std::vector<const ComponentParameters*>&) const;
-
- void deleteStateComponents(int ind1, int ind2, std::vector<const ComponentParameters*>&) const;
-
- //Routine to get rid of all the distance calculations made with
- //merged components.
- void deleteStoredDistances(IndexDistanceMap&, int i1, int i2) const;
-
- //Routine to add a new component to the map & calculate distances.
- //NOTE: New components will always come at the end of the vector,
- //which should simplify routine.
- void addComponentDistances(IndexDistanceMap&, std::vector<const ComponentParameters*>&) const;
- std::pair<int,int> getMinDistanceIndicesFromMap(IndexDistanceMap&) const;
-
- //New function to define a reference component, and calculate
- //KL distances with respect to it.
- float getMinimumKLDistanceComponent(
- IndexDistanceMap&,
- const ComponentParameters* &ref,
- std::vector<const ComponentParameters*>&,
- int& minIndex) const;
-
- void fillKLDistance(
- IndexDistanceMap&,
- const ComponentParameters* &ref,
- std::vector<const ComponentParameters*>&
- ) const;
-
//Recalculate the distances for a row of pairs and return the index of the minimum pair
int recalculateDistances( floatPtrRestrict qonpIn,
floatPtrRestrict qonpCovIn,
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
index 10ef7ce92cc784066338f2cadd4bfb12d9eb5393..f32b7e72d86f096f438090bb4aab4fd45867b558 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/* *******************************************************************************
@@ -42,26 +42,22 @@ decription : Implementation code for Gaussian Sum Fitter class
-Trk::GaussianSumFitter::GaussianSumFitter(const std::string& type, const std::string& name, const IInterface* parent)
+Trk::GaussianSumFitter::GaussianSumFitter(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
:
AthAlgTool(type, name, parent),
- m_extrapolator("Trk::GsfExtrapolator/GsfExtrapolator"),
- m_updator("Trk::GsfMeasurementUpdator/GsfMeasurementUpdator"),
- m_rioOnTrackCreator("Trk::RioOnTrackCreator/RIO_OnTrackCreator"),
- m_forwardGsfFitter("Trk::ForwardGsfFitter/ForwardGsfFitter"),
- m_gsfSmoother("Trk::GsfSmoother/GsfSmoother"),
m_reintegrateOutliers(false),
m_makePerigee(true),
- m_directionToPerigee(Trk::oppositeMomentum),
m_refitOnMeasurementBase(true),
m_doHitSorting(true),
+ m_directionToPerigee(Trk::oppositeMomentum),
m_trkParametersComparisonFunction(0),
- m_stateCombiner("Trk::MultiComponentStateCombiner"),
m_chronoSvc("ChronoStatSvc", name),
m_inputPreparator(nullptr),
m_FitPRD{0},
- m_FitMeasuremnetBase{0},
- m_FowardFailure{0},
+ m_FitMeasurementBase{0},
+ m_ForwardFailure{0},
m_SmootherFailure{0},
m_PerigeeFailure{0},
m_fitQualityFailure{0}
@@ -69,18 +65,11 @@ Trk::GaussianSumFitter::GaussianSumFitter(const std::string& type, const std::st
declareInterface<ITrackFitter>(this);
- declareProperty("ToolForExtrapolation", m_extrapolator );
- declareProperty("MeasurementUpdatorType", m_updator );
- declareProperty("ToolForROTCreation", m_rioOnTrackCreator );
declareProperty("ReintegrateOutliers", m_reintegrateOutliers );
declareProperty("MakePerigee", m_makePerigee );
declareProperty("RefitOnMeasurementBase", m_refitOnMeasurementBase );
declareProperty("DoHitSorting", m_doHitSorting );
declareProperty("SortingReferencePoint", m_sortingReferencePoint );
- declareProperty("StateCombiner", m_stateCombiner );
- declareProperty("GsfSmoother",m_gsfSmoother);
- declareProperty("ForwardGsfFitter",m_forwardGsfFitter);
-
// Estrablish reference point as origin
m_sortingReferencePoint.push_back(0.);
m_sortingReferencePoint.push_back(0.);
@@ -115,13 +104,13 @@ StatusCode Trk::GaussianSumFitter::initialize()
if( m_rioOnTrackCreator.retrieve().isFailure() ){
if (!m_refitOnMeasurementBase){
- msg(MSG::FATAL) << "Attempting to use PrepRawData with no RIO_OnTrack creator tool provided... Exiting!" << endmsg;
+ ATH_MSG_FATAL( "Attempting to use PrepRawData with no RIO_OnTrack creator tool provided... Exiting!");
return StatusCode::FAILURE;
}
-
- else
- ATH_MSG_INFO( "Request to retrieve the RIO_OnTrack Creator failed but track is fit at the MeasurementBase level... Continuing!");
-
+ else{
+ ATH_MSG_INFO( "Request to retrieve the RIO_OnTrack Creator"<<
+ "failed but track is fit at the MeasurementBase level... Continuing!");
+ }
}
// Initialise the closest track parameters search algorithm
@@ -132,7 +121,7 @@ StatusCode Trk::GaussianSumFitter::initialize()
m_trkParametersComparisonFunction = new Trk::TrkParametersComparisonFunction( referencePosition );
if (!m_trkParametersComparisonFunction) {
- msg(MSG::FATAL) << "Request to instansiate the ClosestTrackParametersFinder object failed... Exiting!" << endmsg;
+ ATH_MSG_FATAL("Request to instansiate the ClosestTrackParametersFinder object failed... Exiting!");
return StatusCode::FAILURE;
}
@@ -140,7 +129,7 @@ StatusCode Trk::GaussianSumFitter::initialize()
sc = m_forwardGsfFitter->configureTools(m_extrapolator, m_updator, m_rioOnTrackCreator );
if ( sc.isFailure() ) {
- msg(MSG::FATAL) << "Could not configure the forwards GSF fitter... Exiting!" << endmsg;
+ ATH_MSG_FATAL("Could not configure the forwards GSF fitter... Exiting!");
return StatusCode::FAILURE;
}
@@ -148,21 +137,21 @@ StatusCode Trk::GaussianSumFitter::initialize()
sc = m_gsfSmoother->configureTools(m_extrapolator, m_updator);
if ( sc.isFailure() ) {
- msg(MSG::FATAL) << "Could not configure the GSF smoother... Exiting!" << endmsg;
+ ATH_MSG_FATAL("Could not configure the GSF smoother... Exiting!");
return StatusCode::FAILURE;
}
//GSF Statistics Setup;
m_FitPRD = 0; // Number of Fit PrepRawData Calls
- m_FitMeasuremnetBase = 0; // Number of Fit MeasurementBase Calls
- m_FowardFailure = 0; // Number of Foward Fit Failures:
+ m_FitMeasurementBase = 0; // Number of Fit MeasurementBase Calls
+ m_ForwardFailure = 0; // Number of Foward Fit Failures:
m_SmootherFailure = 0; // Number of Smoother Failures:
m_PerigeeFailure = 0; // Number of MakePerigee Failures:
m_fitQualityFailure = 0;
m_inputPreparator = new TrackFitInputPreparator();
- msg(MSG::INFO) << "Initialisation of " << name() << " was successful" << endmsg;
+ ATH_MSG_INFO("Initialisation of " << name() << " was successful");
return StatusCode::SUCCESS;
@@ -181,8 +170,8 @@ StatusCode Trk::GaussianSumFitter::finalize()
msg(MSG::INFO) << "-----------------------------------------------" << endmsg;
msg(MSG::INFO) << "Number of Fit PrepRawData Calls: "<< m_FitPRD << endmsg;
- msg(MSG::INFO) << "Number of Fit MeasurementBase Calls: "<< m_FitMeasuremnetBase << endmsg;
- msg(MSG::INFO) << "Number of Forward Fit Failures: "<< m_FowardFailure << endmsg;
+ msg(MSG::INFO) << "Number of Fit MeasurementBase Calls: "<< m_FitMeasurementBase << endmsg;
+ msg(MSG::INFO) << "Number of Forward Fit Failures: "<< m_ForwardFailure << endmsg;
msg(MSG::INFO) << "Number of Smoother Failures: "<< m_SmootherFailure << endmsg;
msg(MSG::INFO) << "Number of MakePerigee Failures: "<< m_PerigeeFailure << endmsg;
msg(MSG::INFO) << "Number of Trks that fail fitquality test: "<< m_fitQualityFailure << endmsg;
@@ -194,47 +183,9 @@ StatusCode Trk::GaussianSumFitter::finalize()
}
-#if 0
-StatusCode Trk::GaussianSumFitter::configureTools(const IMultiStateMeasurementUpdator* measurementUpdator, const IRIO_OnTrackCreator* rioOnTrackCreator)
-{
-
- msg(MSG::INFO) << "Configuring the GaussianSumFilter!" << endmsg;
-
- StatusCode sc;
-
- m_updator = measurementUpdator;
- m_rioOnTrackCreator = rioOnTrackCreator;
-
- // Configure forward fitter
- sc = m_forwardGsfFitter->configureTools(m_extrapolator, m_updator, m_rioOnTrackCreator );
-
- if ( sc.isFailure() ) {
- msg(MSG::FATAL) << "Could not configure the forwards GSF fitter... Exiting!" << endmsg;
- return StatusCode::FAILURE;
- }
-
- // Configure smoother
- sc = m_gsfSmoother->configureTools(m_extrapolator, m_updator);
-
- if ( sc.isFailure() ) {
- msg(MSG::FATAL) << "Could not configure the GSF smoother... Exiting!" << endmsg;
- return StatusCode::FAILURE;
- }
-
- msg(MSG::INFO) << "Configuration of Gaussian Sum Fitter successful" << endmsg;
-
- return StatusCode::SUCCESS;
-
-}
-#endif
-
-/* =========================================================================================================================================
- =========================================================================================================================================
-
+/* ======================================================================================================
Refitting of a track
-
- =========================================================================================================================================
- ========================================================================================================================================= */
+========================================================================================================= */
Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::Track& inputTrack,
const Trk::RunOutlierRemoval outlierRemoval,
@@ -267,16 +218,18 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::Track& inputTra
if (msgLvl(MSG::VERBOSE))
msg() << "Estimation parameters near reference point: " << *parametersNearestReference << endmsg;
- // If refitting of track is at the MeasurementBase level extract the MeasurementBase from the input track and create a new vector
+ // If refitting of track is at the MeasurementBase level
+ // extract the MeasurementBase from the input track and create a new vector
if (m_refitOnMeasurementBase) {
MeasurementSet measurementSet;
- DataVector<const Trk::TrackStateOnSurface>::const_iterator trackStateOnSurface = inputTrack.trackStateOnSurfaces()->begin();
+ DataVector<const Trk::TrackStateOnSurface>::const_iterator trackStateOnSurface =
+ inputTrack.trackStateOnSurfaces()->begin();
for ( ; trackStateOnSurface != inputTrack.trackStateOnSurfaces()->end(); ++trackStateOnSurface ) {
if ( !(*trackStateOnSurface) ){
- msg(MSG::WARNING) << "This track contains an empty MeasurementBase object that won't be included in the fit" << endmsg;
+ ATH_MSG_WARNING("This track contains an empty MeasurementBase object that won't be included in the fit");
continue;
}
@@ -300,12 +253,13 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::Track& inputTra
PrepRawDataSet prepRawDataSet;
- DataVector<const Trk::MeasurementBase>::const_iterator measurementOnTrack = inputTrack.measurementsOnTrack()->begin();
+ DataVector<const Trk::MeasurementBase>::const_iterator measurementOnTrack =
+ inputTrack.measurementsOnTrack()->begin();
for ( ; measurementOnTrack != inputTrack.measurementsOnTrack()->end(); ++ measurementOnTrack ) {
if ( !(*measurementOnTrack) ){
- msg(MSG::DEBUG) << "This track contains an empty MeasurementBase object... Ignoring object" << endmsg;
+ ATH_MSG_DEBUG("This track contains an empty MeasurementBase object... Ignoring object");
continue;
}
@@ -316,14 +270,15 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::Track& inputTra
}
if ( !rioOnTrack){
- msg(MSG::DEBUG) << "Measurement could not be cast as a RIO_OnTrack object... continuing" << endmsg;
+ ATH_MSG_DEBUG("Measurement could not be cast as a RIO_OnTrack object... continuing");
continue;
}
const PrepRawData* prepRawData = rioOnTrack->prepRawData();
if ( !prepRawData ){
- msg(MSG::DEBUG) << "Defined RIO_OnTrack object has no associated PrepRawData object... this object will be ignored in fit" << endmsg;
+ ATH_MSG_DEBUG("Defined RIO_OnTrack object has no associated PrepRawData object..."<<
+ "this object will be ignored in fit");
continue;
}
@@ -338,13 +293,9 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::Track& inputTra
}
-/* =========================================================================================================================================
- =========================================================================================================================================
-
+/* ==================================================================================================================
Fitting of a set of PrepRawData objects
-
- =========================================================================================================================================
- ========================================================================================================================================= */
+===================================================================================================================== */
Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::PrepRawDataSet& prepRawDataSet,
const Trk::TrackParameters& estimatedParametersNearOrigin,
@@ -352,20 +303,18 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::PrepRawDataSet& prepRawD
const Trk::ParticleHypothesis particleHypothesis ) const
{
- if (msgLvl(MSG::VERBOSE)){
- msg() << "Trk::GaussianSumFilter::fit() - Fitting a set of PrepRawData objects" << endmsg;
- msg() << "Material effects switch: " << particleHypothesis << endmsg;
- msg() << "Outlier removal switch: " << outlierRemoval << endmsg;
- }
+ ATH_MSG_VERBOSE("Trk::GaussianSumFilter::fit() - Fitting a set of PrepRawData objects"<<'\n'
+ << "Material effects switch: " << particleHypothesis << '\n'
+ << "Outlier removal switch: " << outlierRemoval );
+
++m_FitPRD;
// Start the timer
Chrono chrono( &(*m_chronoSvc), name() );
-
// Protect against empty PrepRawDataSet object
if ( prepRawDataSet.empty() ) {
- msg(MSG::FATAL) << "PrepRawData set for fit is empty... Exiting!" << endmsg;
+ ATH_MSG_FATAL("PrepRawData set for fit is empty... Exiting!");
return 0;
}
@@ -373,45 +322,46 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::PrepRawDataSet& prepRawD
Trk::PrepRawDataSet sortedPrepRawDataSet = PrepRawDataSet( prepRawDataSet );
if ( m_doHitSorting ){
-
- Trk::PrepRawDataComparisonFunction* prdComparisonFunction = new Trk::PrepRawDataComparisonFunction( estimatedParametersNearOrigin.position(),
- estimatedParametersNearOrigin.momentum() );
+ Trk::PrepRawDataComparisonFunction* prdComparisonFunction =
+ new Trk::PrepRawDataComparisonFunction( estimatedParametersNearOrigin.position(),
+ estimatedParametersNearOrigin.momentum() );
sort ( sortedPrepRawDataSet.begin(), sortedPrepRawDataSet.end(), *prdComparisonFunction );
delete prdComparisonFunction;
-
}
// Perform GSF forwards fit
- const ForwardTrajectory* forwardTrajectory = m_forwardGsfFitter->fitPRD( sortedPrepRawDataSet, estimatedParametersNearOrigin, particleHypothesis );
+ const ForwardTrajectory* forwardTrajectory = m_forwardGsfFitter->fitPRD( sortedPrepRawDataSet,
+ estimatedParametersNearOrigin,
+ particleHypothesis );
if ( !forwardTrajectory ) {
- if (msgLvl(MSG::DEBUG)) msg() << "Forward GSF fit failed... Exiting!" << endmsg;
- ++m_FowardFailure;
+ ATH_MSG_DEBUG("Forward GSF fit failed... Exiting!");
+ ++m_ForwardFailure;
return 0;
}
if ( forwardTrajectory->empty() ){
- if (msgLvl(MSG::DEBUG)) msg() << "No states in forward trajectory... Exiting!" << endmsg;
- ++m_FowardFailure;
+ ATH_MSG_DEBUG("No states in forward trajectory... Exiting!");
+ ++m_ForwardFailure;
delete forwardTrajectory;
return 0;
}
- if (msgLvl(MSG::VERBOSE)) msg() << "*** Forward GSF fit passed! ***" << endmsg;
+ ATH_MSG_VERBOSE("*** Forward GSF fit passed! ***");
// Perform GSF smoother operation
SmoothedTrajectory* smoothedTrajectory = m_gsfSmoother->fit( *forwardTrajectory, particleHypothesis );
// Protect against failed smoother fit
if ( !smoothedTrajectory ) {
- if (msgLvl(MSG::DEBUG)) msg() << "Smoother GSF fit failed... Exiting!" << endmsg;
+ ATH_MSG_DEBUG("Smoother GSF fit failed... Exiting!");
++m_SmootherFailure;
delete forwardTrajectory;
return 0;
}
- if (msgLvl(MSG::VERBOSE)) msg() << "*** GSF smoother fit passed! ***" << endmsg;
+ ATH_MSG_VERBOSE("*** GSF smoother fit passed! ***");
// Outlier m_logic and track finalisation
const FitQuality* fitQuality = buildFitQuality( *smoothedTrajectory );
@@ -426,12 +376,14 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::PrepRawDataSet& prepRawD
Track* fittedTrack = 0;
- if (outlierRemoval)
+ if (outlierRemoval){
ATH_MSG_DEBUG( "Outlier removal not yet implemented for the Gaussian Sum Filter" );
-
+ }
if ( m_makePerigee ){
- const Trk::MultiComponentStateOnSurface* perigeeMultiStateOnSurface = this->makePerigee( smoothedTrajectory, particleHypothesis );
+ const Trk::MultiComponentStateOnSurface* perigeeMultiStateOnSurface =
+ this->makePerigee( smoothedTrajectory,
+ particleHypothesis );
ATH_MSG_DEBUG( "perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface );
if ( perigeeMultiStateOnSurface ) smoothedTrajectory->push_back( perigeeMultiStateOnSurface );
else {
@@ -444,39 +396,31 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::PrepRawDataSet& prepRawD
}
}
-
// Delete forward trajectory. New memory was assigned in ForwardGsfFitter.
delete forwardTrajectory;
-
//Reverse the order of the TSOS's to make be order flow from inside to out
std::reverse(smoothedTrajectory->begin(), smoothedTrajectory->end());
-
// Create new track
Trk::TrackInfo info(Trk::TrackInfo::GaussianSumFilter, particleHypothesis);
info.setTrackProperties(TrackInfo::BremFit);
info.setTrackProperties(TrackInfo::BremFitSuccessful);
fittedTrack = new Track(info, smoothedTrajectory, fitQuality );
- if ( fittedTrack && msgLvl(MSG::VERBOSE)) {
- msg() << "Fitting of a set of PrepRawData objects is successful" << endmsg;
- msg() << "Track fit chi squared... " << fitQuality->chiSquared() << endmsg;
- msg() << "Track fit number of degrees of freedom... " << fitQuality->numberDoF() << endmsg;
+ if ( fittedTrack) {
+ ATH_MSG_VERBOSE("Fitting of a set of PrepRawData objects is successful" << '\n'
+ <<"Track fit chi squared... " << fitQuality->chiSquared() << '\n'
+ << "Track fit number of degrees of freedom... " << fitQuality->numberDoF());
+ }
+ else{
+ ATH_MSG_DEBUG("Trk::GaussianSumFilter::fit() failed!");
}
- else
- if (msgLvl(MSG::DEBUG)) msg() << "Trk::GaussianSumFilter::fit() failed!" << endmsg;
-
return fittedTrack;
-
}
-/* =========================================================================================================================================
- =========================================================================================================================================
-
+/* ================================================================================================
Fitting of a set of MeasurementBase objects
-
- =========================================================================================================================================
- ========================================================================================================================================= */
+============== ==================================================================================== */
Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::MeasurementSet& measurementSet,
const Trk::TrackParameters& estimatedParametersNearOrigin,
@@ -487,17 +431,14 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::MeasurementSet& measurem
// Start the timer
Chrono chrono( &(*m_chronoSvc), name() );
- if (msgLvl(MSG::VERBOSE)){
- msg() << "Trk::GaussianSumFilter::fit() - Fitting a set of MeasurementBase objects" << endmsg;
- msg() << "Material effects switch: " << particleHypothesis << endmsg;
- msg() << "Outlier removal switch: " << outlierRemoval << endmsg;
- }
-
- ++m_FitMeasuremnetBase;
+ ATH_MSG_VERBOSE("Trk::GaussianSumFilter::fit() - Fitting a set of MeasurementBase objects" <<'\n'
+ << "Material effects switch: " << particleHypothesis << '\n'
+ << "Outlier removal switch: " << outlierRemoval);
+ ++m_FitMeasurementBase;
// Protect against empty PrepRawDataSet object
if ( measurementSet.empty() ) {
- msg(MSG::FATAL) << "MeasurementSet for fit is empty... Exiting!" << endmsg;
+ ATH_MSG_FATAL("MeasurementSet for fit is empty... Exiting!");
return 0;
}
@@ -509,7 +450,7 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::MeasurementSet& measurem
MeasurementSet::const_iterator itSetEnd = measurementSet.end();
for ( ; itSet!=itSetEnd; ++itSet) {
if (!(*itSet)) {
- msg(MSG::WARNING) << "There is an empty MeasurementBase object in the track! Skip this object.." << endmsg;
+ ATH_MSG_WARNING("There is an empty MeasurementBase object in the track! Skip this object..");
}
else {
ccot = nullptr;
@@ -529,8 +470,9 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::MeasurementSet& measurem
if ( m_doHitSorting ){
- Trk::MeasurementBaseComparisonFunction* measurementBaseComparisonFunction = new Trk::MeasurementBaseComparisonFunction( estimatedParametersNearOrigin.position(),
- estimatedParametersNearOrigin.momentum() );
+ Trk::MeasurementBaseComparisonFunction* measurementBaseComparisonFunction =
+ new Trk::MeasurementBaseComparisonFunction( estimatedParametersNearOrigin.position(),
+ estimatedParametersNearOrigin.momentum() );
sort ( sortedMeasurementSet.begin(), sortedMeasurementSet.end(), *measurementBaseComparisonFunction );
@@ -538,23 +480,25 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::MeasurementSet& measurem
}
// Perform GSF forwards fit - new memory allocated in forwards fitter
- const ForwardTrajectory* forwardTrajectory = m_forwardGsfFitter->fitMeasurements( sortedMeasurementSet, estimatedParametersNearOrigin, particleHypothesis );
+ const ForwardTrajectory* forwardTrajectory = m_forwardGsfFitter->fitMeasurements( sortedMeasurementSet,
+ estimatedParametersNearOrigin,
+ particleHypothesis );
if ( !forwardTrajectory ) {
- if (msgLvl(MSG::DEBUG)) msg() << "Forward GSF fit failed... Exiting!" << endmsg;
- ++m_FowardFailure;
+ ATH_MSG_DEBUG("Forward GSF fit failed... Exiting!");
+ ++m_ForwardFailure;
return 0;
}
if ( forwardTrajectory->empty() ){
- if (msgLvl(MSG::DEBUG)) msg() << "No states in forward trajectory... Exiting!" << endmsg;
+ ATH_MSG_DEBUG("No states in forward trajectory... Exiting!");
delete forwardTrajectory;
- ++m_FowardFailure;
+ ++m_ForwardFailure;
return 0;
}
- if (msgLvl(MSG::VERBOSE))
- msg() << "*** Forward GSF fit passed! ***" << endmsg;
+
+ ATH_MSG_VERBOSE("*** Forward GSF fit passed! ***");
// Perform GSF smoother operation
@@ -562,39 +506,36 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::MeasurementSet& measurem
// Protect against failed smoother fit
if ( !smoothedTrajectory ) {
- msg(MSG::DEBUG) << "Smoother GSF fit failed... Exiting!" << endmsg;
+ ATH_MSG_DEBUG("Smoother GSF fit failed... Exiting!");
++m_SmootherFailure;
delete forwardTrajectory;
return 0;
}
-
-
- if (msgLvl(MSG::VERBOSE))
- msg() << "*** GSF smoother fit passed! ***" << endmsg;
+ ATH_MSG_VERBOSE("*** GSF smoother fit passed! ***");
// Outlier m_logic and track finalisation
const FitQuality* fitQuality = buildFitQuality( *smoothedTrajectory );
if ( !fitQuality ){
- if (msgLvl(MSG::DEBUG))
- msg() << "Chi squared could not be calculated... Bailing" << endmsg;
+ ATH_MSG_DEBUG("Chi squared could not be calculated... Bailing");
++m_fitQualityFailure;
delete forwardTrajectory;
delete smoothedTrajectory;
return 0;
}
- if (outlierRemoval && msgLvl(MSG::DEBUG))
- msg() << "Outlier removal not yet implemented for the Gaussian Sum Filter" << endmsg;
-
+ if (outlierRemoval){
+ ATH_MSG_DEBUG("Outlier removal not yet implemented for the Gaussian Sum Filter");
+ }
if ( m_makePerigee ){
- const Trk::MultiComponentStateOnSurface* perigeeMultiStateOnSurface = this->makePerigee( smoothedTrajectory, particleHypothesis );
- if (msgLvl(MSG::DEBUG)) msg() << "perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface << endmsg;
+ const Trk::MultiComponentStateOnSurface* perigeeMultiStateOnSurface = this->makePerigee( smoothedTrajectory,
+ particleHypothesis );
+ ATH_MSG_DEBUG("perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface);
if ( perigeeMultiStateOnSurface ) smoothedTrajectory->push_back( perigeeMultiStateOnSurface );
else {
- if (msgLvl(MSG::DEBUG)) msg() << "Perigee asked to be created but failed.....Exiting" << endmsg;
+ ATH_MSG_DEBUG("Perigee asked to be created but failed.....Exiting");
++m_PerigeeFailure;
delete fitQuality;
delete forwardTrajectory;
@@ -618,15 +559,13 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Trk::MeasurementSet& measurem
Track* fittedTrack = new Track(info, smoothedTrajectory, fitQuality );
if ( fittedTrack ) {
- msg(MSG::DEBUG) << "Fitting of a set of MeasurementBase objects is successful" << endmsg;
- msg(MSG::DEBUG) << "Track fit chi squared... " << fitQuality->chiSquared() << endmsg;
- msg(MSG::DEBUG) << "Track fit number of degrees of freedom... " << fitQuality->numberDoF() << endmsg;
+ ATH_MSG_DEBUG("Fitting of a set of MeasurementBase objects is successful" <<'\n'
+ << "Track fit chi squared... " << fitQuality->chiSquared() <<'\n'
+ << "Track fit number of degrees of freedom... " << fitQuality->numberDoF());
} else {
- msg(MSG::DEBUG) << "Trk::GaussianSumFilter::fit() failed!" << endmsg;
+ ATH_MSG_DEBUG("Trk::GaussianSumFilter::fit() failed!");
}
-
return fittedTrack;
-
}
Trk::Track* Trk::GaussianSumFitter::fit ( const Track& intrk,
@@ -635,22 +574,19 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Track& intrk,
const ParticleHypothesis matEffects) const
{
- if (msgLvl(MSG::VERBOSE)) {
- msg() << "--> enter GaussianSumFitter::fit(Track,PrdSet,,)" << endmsg;
- msg() << " with Track from author = " << intrk.info().dumpInfo() << endmsg;
- }
+ ATH_MSG_VERBOSE("--> enter GaussianSumFitter::fit(Track,PrdSet,,)" << '\n'
+ <<" with Track from author = " << intrk.info().dumpInfo());
// protection, if empty PrepRawDataSet
if (addPrdColl.empty()) {
- msg(MSG::WARNING) << "client tries to add an empty PrepRawDataSet to the track fit." << endmsg;
+ ATH_MSG_WARNING("client tries to add an empty PrepRawDataSet to the track fit.");
return fit(intrk, runOutlier, matEffects);
}
/* determine the Track Parameter which is the start of the trajectory,
i.e. closest to the reference point */
- if (msgLvl(MSG::VERBOSE)) msg()<< "get track parameters near origin "
- << (m_doHitSorting? "via STL sort" : "from 1st state")
- << endmsg;
+ ATH_MSG_DEBUG("get track parameters near origin "
+ << (m_doHitSorting? "via STL sort" : "from 1st state"));
const TrackParameters* estimatedStartParameters = m_doHitSorting
? *(std::min_element(intrk.trackParameters()->begin(),
@@ -668,8 +604,10 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Track& intrk,
TrackFitInputPreparator* inputPreparator = new TrackFitInputPreparator(referencePosition);
PrepRawDataSet orderedPRDColl =
- inputPreparator->stripPrepRawData(intrk,addPrdColl,m_doHitSorting,
- true /* do not lose outliers! */);
+ inputPreparator->stripPrepRawData(intrk,
+ addPrdColl,
+ m_doHitSorting,
+ true /* do not lose outliers! */);
delete inputPreparator;
@@ -683,36 +621,37 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Track& inputTrack,
const ParticleHypothesis matEffects) const
{
- if (msgLvl(MSG::VERBOSE))
- msg() << "Trk::GaussianSumFilter::fit() - Refitting a track with a additional information " << endmsg;
+ ATH_MSG_VERBOSE("Trk::GaussianSumFilter::fit() - Refitting a track with a additional information ");
// protection, if empty MeasurementSet
if (measurementSet.empty()) {
- msg(MSG::WARNING) << "Client tries to add an empty MeasurementSet to the track fit." << endmsg;
+ ATH_MSG_WARNING("Client tries to add an empty MeasurementSet to the track fit.");
return fit(inputTrack, runOutlier, matEffects);
}
// Check that the input track has well defined parameters
if ( inputTrack.trackParameters()->empty() ) {
- msg(MSG::FATAL) << "No estimation of track parameters near origin... Exiting!" << endmsg;
+ ATH_MSG_FATAL("No estimation of track parameters near origin... Exiting!");
return 0;
}
// Check that the input track has associated MeasurementBase objects
if ( inputTrack.trackStateOnSurfaces()->empty() ) {
- msg(MSG::FATAL) << "Attempting to fit track to empty MeasurementBase collection... Exiting!" << endmsg;
+ ATH_MSG_FATAL("Attempting to fit track to empty MeasurementBase collection... Exiting!");
return 0;
}
// Retrieve the set of track parameters closest to the reference point
const Trk::TrackParameters* parametersNearestReference = *( std::min_element( inputTrack.trackParameters()->begin(),
- inputTrack.trackParameters()->end(),
- *m_trkParametersComparisonFunction ) );
+ inputTrack.trackParameters()->end(),
+ *m_trkParametersComparisonFunction ) );
- MeasurementSet combinedMS = m_inputPreparator->stripMeasurements (inputTrack, measurementSet,
- true, false);
+ MeasurementSet combinedMS = m_inputPreparator->stripMeasurements (inputTrack,
+ measurementSet,
+ true,
+ false);
// Apply GSF fit to MeasurementBase objects
return fit( combinedMS, *parametersNearestReference, runOutlier, matEffects );
@@ -767,63 +706,57 @@ Trk::Track* Trk::GaussianSumFitter::fit ( const Track& intrk1,
}
-const Trk::MultiComponentStateOnSurface* Trk::GaussianSumFitter::makePerigee (
- const Trk::SmoothedTrajectory* smoothedTrajectory,
- const Trk::ParticleHypothesis particleHypothesis ) const
+const Trk::MultiComponentStateOnSurface*
+Trk::GaussianSumFitter::makePerigee (const Trk::SmoothedTrajectory* smoothedTrajectory,
+ const Trk::ParticleHypothesis particleHypothesis ) const
{
- if (msgLvl(MSG::VERBOSE))
- msg() << "Trk::GaussianSumFilter::makePerigee... starting" << endmsg;
+ ATH_MSG_VERBOSE("Trk::GaussianSumFilter::makePerigee... starting");
// Propagate track to perigee
const Trk::PerigeeSurface perigeeSurface;
const Trk::TrackStateOnSurface* stateOnSurfaceNearestOrigin = smoothedTrajectory->back();
- const Trk::MultiComponentStateOnSurface* multiComponentStateOnSurfaceNearestOrigin = dynamic_cast<const Trk::MultiComponentStateOnSurface*>(stateOnSurfaceNearestOrigin);
+ const Trk::MultiComponentStateOnSurface* multiComponentStateOnSurfaceNearestOrigin =
+ dynamic_cast<const Trk::MultiComponentStateOnSurface*>(stateOnSurfaceNearestOrigin);
const Trk::MultiComponentState* multiComponentState = 0;
if ( !multiComponentStateOnSurfaceNearestOrigin ){
- if (msgLvl(MSG::VERBOSE))
- msg() << "State nearest perigee is not a multi-component state... Converting" << endmsg;
-
+ ATH_MSG_VERBOSE("State nearest perigee is not a multi-component state... Converting");
Trk::ComponentParameters componentParameters( stateOnSurfaceNearestOrigin->trackParameters(), 1. );
multiComponentState = new Trk::MultiComponentState( componentParameters );
-
}
-
- else
+ else{
multiComponentState = multiComponentStateOnSurfaceNearestOrigin->components();
-
+ }
// Extrapolate to perigee, taking material effects considerations into account
const Trk::MultiComponentState* stateExtrapolatedToPerigee = m_extrapolator->extrapolate( *multiComponentState,
- perigeeSurface,
- m_directionToPerigee,
- false,
- particleHypothesis );
+ perigeeSurface,
+ m_directionToPerigee,
+ false,
+ particleHypothesis );
if (!stateExtrapolatedToPerigee){
-
- if (msgLvl(MSG::DEBUG))
- msg() << "Track could not be extrapolated to perigee... returning 0" << endmsg;
-
- return 0;
+ ATH_MSG_DEBUG("Track could not be extrapolated to perigee... returning 0");
+ return 0;
}
// Clean-up & pointer reset
- if ( !multiComponentStateOnSurfaceNearestOrigin && stateExtrapolatedToPerigee != multiComponentState )
+ if ( !multiComponentStateOnSurfaceNearestOrigin && stateExtrapolatedToPerigee != multiComponentState ){
delete multiComponentState;
-
- multiComponentState = 0;
+ }
+ multiComponentState = nullptr;
// Calculate the mode of the q/p distribution
double modeQoverP = 0;
- if ( modeQoverP && msgLvl(MSG::VERBOSE) )
- msg() << "Calculated mode is stored by default in the Perigee Parameters and is NO Longer Stored as a seperate Parameter" << endmsg;
-
+ if ( modeQoverP){
+ ATH_MSG_VERBOSE("Calculated mode is stored by default in the Perigee Parameters"<<
+ "and is NO Longer Stored as a seperate Parameter");
+ }
// Determine the combined state as well to be passed to the MultiComponentStateOnSurface object
const Trk::TrackParameters* combinedPerigee = m_stateCombiner->combine( *stateExtrapolatedToPerigee, true );
@@ -831,8 +764,9 @@ const Trk::MultiComponentStateOnSurface* Trk::GaussianSumFitter::makePerigee (
std::bitset<Trk::TrackStateOnSurface::NumberOfTrackStateOnSurfaceTypes> pattern(0);
pattern.set(Trk::TrackStateOnSurface::Perigee);
- if (fabs(combinedPerigee->parameters()[Trk::qOverP])>1e8) { //GC: protection against 0-momentum track .. this check should NEVER be needed.
- // actual cutoff is 0.01eV track
+ if (fabs(combinedPerigee->parameters()[Trk::qOverP])>1e8) {
+ //GC: protection against 0-momentum track .. this check should NEVER be needed.
+ // actual cutoff is 0.01eV track
ATH_MSG_ERROR("makePerigee() about to return with 0 momentum!! Returning null instead");
delete stateExtrapolatedToPerigee;
delete combinedPerigee;
@@ -847,23 +781,15 @@ const Trk::MultiComponentStateOnSurface* Trk::GaussianSumFitter::makePerigee (
0,
pattern,
modeQoverP );
-
ATH_MSG_DEBUG( "makePerigee() returning sucessfully!" );
-
return perigeeMultiStateOnSurface;
}
-
-void Trk::GaussianSumFitter::validationAction() const
-{
-
-}
-
-const Trk::FitQuality* Trk::GaussianSumFitter::buildFitQuality(const Trk::SmoothedTrajectory& smoothedTrajectory) const
+const Trk::FitQuality*
+Trk::GaussianSumFitter::buildFitQuality(const Trk::SmoothedTrajectory& smoothedTrajectory) const
{
ATH_MSG_VERBOSE( "Gsf fitQuality" );
-
double chiSquared = 0.;
int numberDoF = -5;
@@ -885,5 +811,4 @@ const Trk::FitQuality* Trk::GaussianSumFitter::buildFitQuality(const Trk::Smooth
const FitQuality* fitQuality = new FitQuality( chiSquared, numberDoF );
return fitQuality;
-
}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfExtrapolator.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfExtrapolator.cxx
index 5c610c4d9b4685c83ab56bafd3e301f2a9f99b2f..f85ee4a0669dfef60411eccb919127b7f50a8d5c 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfExtrapolator.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfExtrapolator.cxx
@@ -126,7 +126,8 @@ StatusCode Trk::GsfExtrapolator::initialize()
ATH_CHECK( m_msupdators.retrieve() );
- m_fieldProperties = m_fastField ? Trk::MagneticFieldProperties(Trk::FastField) : Trk::MagneticFieldProperties(Trk::FullField);
+ m_fieldProperties = m_fastField ? Trk::MagneticFieldProperties(Trk::FastField) :
+ Trk::MagneticFieldProperties(Trk::FullField);
ATH_MSG_INFO( "Initialisation of " << name() << " was successful" );
@@ -142,7 +143,7 @@ StatusCode Trk::GsfExtrapolator::finalize()
ATH_MSG_INFO( " * - Number of navigation distance check breaks: " << m_navigationDistanceIncreaseBreaks );
ATH_MSG_INFO( " * - Number of volume boundary search failures: " << m_missedVolumeBoundary );
ATH_MSG_INFO( " * - Number of tracking volume oscillation breaks: " << m_oscillationBreaks );
- ATH_MSG_INFO( "*****************************************************************************************************************" );
+ ATH_MSG_INFO( "***************************************************************************************************" );
ATH_MSG_INFO( "Finalisation of " << name() << " was successful" );
return StatusCode::SUCCESS;
@@ -152,24 +153,27 @@ StatusCode Trk::GsfExtrapolator::finalize()
* This is the actual (non-direct) extrapolation method
* The other one will end up calling this one passing the internal cache
*/
-const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateImpl(Cache& cache,
- const Trk::IPropagator& propagator,
- const Trk::MultiComponentState& multiComponentState,
- const Trk::Surface& surface,
- Trk::PropDirection direction,
- Trk::BoundaryCheck boundaryCheck,
- Trk::ParticleHypothesis particleHypothesis ) const
+const Trk::MultiComponentState*
+Trk::GsfExtrapolator::extrapolateImpl(Cache& cache,
+ const Trk::IPropagator& propagator,
+ const Trk::MultiComponentState& multiComponentState,
+ const Trk::Surface& surface,
+ Trk::PropDirection direction,
+ Trk::BoundaryCheck boundaryCheck,
+ Trk::ParticleHypothesis particleHypothesis ) const
{
auto buff_extrapolateCalls=m_extrapolateCalls.buffer();
ATH_MSG_VERBOSE( "GSF extrapolate() in non-configured mode: " << multiComponentState.size() );
// If the extrapolation is to be without material effects simply revert to the extrapolateDirectly method
if ( particleHypothesis == Trk::nonInteracting ){
- return extrapolateDirectly( propagator, multiComponentState, surface, direction, boundaryCheck, particleHypothesis );
+ return extrapolateDirectly( propagator, multiComponentState, surface,
+ direction, boundaryCheck, particleHypothesis );
}
// Surface based material effects (assumes all material is on active sensor elements)
if ( m_surfaceBasedMaterialEffects ){
- return extrapolateSurfaceBasedMaterialEffects( propagator, multiComponentState, surface, direction, boundaryCheck, particleHypothesis );
+ return extrapolateSurfaceBasedMaterialEffects( propagator, multiComponentState, surface,
+ direction, boundaryCheck, particleHypothesis );
}
// statistics
++buff_extrapolateCalls;
@@ -201,16 +205,17 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateImpl(Cache& cac
- destination surface
*/
- Amg::Vector3D globalSeparation = referenceParameters ? referenceParameters->position() - combinedState->position() : surface.globalReferencePoint() - combinedState->position();
+ Amg::Vector3D globalSeparation = referenceParameters ?
+ referenceParameters->position() - combinedState->position() :
+ surface.globalReferencePoint() - combinedState->position();
double initialDistance = globalSeparation.mag();
- if (referenceParameters) printState("Intial Ref Parameters at next surface ", *referenceParameters);
- else ATH_MSG_DEBUG( "No reference parameters?? Gobal sep (r,z): (" <<globalSeparation.perp() << ",\t" <<globalSeparation.z() <<")" );
-
-
// ===============
// Debug print-out
// ===============
if (msgLvl(MSG::DEBUG)){
+ if (referenceParameters) printState("Intial Ref Parameters at next surface ", *referenceParameters);
+ else ATH_MSG_DEBUG( "No reference parameters?? Gobal sep (r,z): ("
+ <<globalSeparation.perp() << ",\t" <<globalSeparation.z() <<")" );
ATH_MSG_VERBOSE( "extrapolate() with configuration ++++++++++++++++++++++++++++++++++++++++++++" );
ATH_MSG_VERBOSE( " -> Combined state: " << *combinedState );
ATH_MSG_VERBOSE( " --------------------------------------------------------------------------------------------" );
@@ -219,16 +224,16 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateImpl(Cache& cac
ATH_MSG_VERBOSE( " -> Starting volume from navigator: " << startVolume->volumeName() );
ATH_MSG_VERBOSE( " -> Destination volume from navigator: " << destinationVolume->volumeName() );
ATH_MSG_VERBOSE( " --------------------------------------------------------------------------------------------" );
- ATH_MSG_VERBOSE( " -> Configuration (direction/boundaryCheck/particleHypothesis): " << direction << " / " << boundaryCheck << " / " << particleHypothesis );
+ ATH_MSG_VERBOSE( " -> Configuration (direction/boundaryCheck/particleHypothesis): " << direction << " / "
+ << boundaryCheck << " / " << particleHypothesis );
ATH_MSG_VERBOSE( "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" );
- }
- ATH_MSG_DEBUG( "Running extrapolation direction " << direction << " from: "
- << startVolume->volumeName() << " to " << destinationVolume->volumeName() << " and surface centre ("
- << surface.center().x() << ", " << surface.center().y() << ", " << surface.center().z() << ")" );
+ ATH_MSG_DEBUG( "Running extrapolation direction " << direction << " from: "
+ << startVolume->volumeName() << " to " << destinationVolume->volumeName() << " and surface centre ("
+ << surface.center().x() << ", " << surface.center().y() << ", " << surface.center().z() << ")" );
this->printState( "Extrapolation starting with", *combinedState );
-
+ }
// Clean up memory from combiner. It is no longer needed
combinedState = 0;
@@ -253,10 +258,10 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateImpl(Cache& cac
while ( currentVolume && currentVolume != destinationVolume && currentState ){
// Configure propagator based on the current tracking volume
- currentPropagator = m_propagatorStickyConfiguration ? &propagator : &(*m_propagators[ this->propagatorType( *currentVolume ) ]);
-
- if (referenceParameters) printState("Old Ref Parameters at next surface ", *referenceParameters);
-
+ currentPropagator = m_propagatorStickyConfiguration ?
+ &propagator :
+ &(*m_propagators[ this->propagatorType( *currentVolume ) ]);
+
// Extrapolate to volume boundary
extrapolateToVolumeBoundary( cache,
*currentPropagator,
@@ -282,13 +287,14 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateImpl(Cache& cac
// New reference parameters are the navigation parameters at the boundary surface
referenceParameters = cache.m_stateAtBoundarySurface.navigationParameters;
- //coverity 111522: null check is redundant here since referenceParameters is dereferenced later anyway.
- //if (referenceParameters) printState("New Ref Parameters at next surface ", *referenceParameters);
- printState("New Ref Parameters at next surface ", *referenceParameters);
-
+
+ if (msgLvl(MSG::DEBUG)){
+ printState("New Ref Parameters at next surface ", *referenceParameters);
+ }
// Break the lop if an oscillation is detected
- if ( previousVolume == nextVolume )
- ++fallbackOscillationCounter;
+ if ( previousVolume == nextVolume ){
+ ++fallbackOscillationCounter;
+ }
if ( fallbackOscillationCounter > 10 ){
ATH_MSG_DEBUG( "Navigation break: Oscillation" );
@@ -304,10 +310,13 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateImpl(Cache& cac
surface,
direction,
false,
- m_fieldProperties, Trk::electron );
+ m_fieldProperties,
+ Trk::electron );
Amg::Vector3D newDestination;
if (parametersAtDestination){
- printState("Parameters at next surface ", *parametersAtDestination);
+ if (msgLvl(MSG::DEBUG)){
+ printState("Parameters at next surface ", *parametersAtDestination);
+ }
newDestination = parametersAtDestination->position();
delete parametersAtDestination;
} else {
@@ -1152,13 +1161,11 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateToIntermediateL
ATH_MSG_VERBOSE( "GSF extrapolateToIntermediateLayer()" );
ATH_MSG_VERBOSE( "Starting track parameters (combined state): " << *combinedState );
ATH_MSG_VERBOSE( "Destination layer (surface representation): " << layer.surfaceRepresentation() );
-
- ATH_MSG_VERBOSE( "-----------------------------------------------------------------------------------------------------------" );
-
+ ATH_MSG_VERBOSE( "---------------------------------------------------------------------------------------------" );
delete combinedState;
+ printState( "extrapolateToIntermediateLayer(). Starting with ", *(multiComponentState.begin()->first) );
}
- printState( "extrapolateToIntermediateLayer(). Starting with ", *(multiComponentState.begin()->first) );
const Trk::Surface* startSurface = &(multiComponentState.begin()->first->associatedSurface());
@@ -1196,7 +1203,9 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateToIntermediateL
ATH_MSG_DEBUG( " [!] Perpendicular direction of track has changed -- checking" );
// reset the nextParameters if the radial change is not allowed
// resetting is ok - since the parameters are in the garbage bin already
- if (!radialDirectionCheck(propagator, multiComponentState, *destinationState,trackingVolume,direction,particleHypothesis)){
+ if (!radialDirectionCheck(propagator, multiComponentState,
+ *destinationState,trackingVolume,
+ direction,particleHypothesis)){
ATH_MSG_DEBUG( " [+] Perpendicular direction check cancelled this layer intersection." );
delete destinationState;
return 0;
@@ -1209,9 +1218,7 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateToIntermediateL
if (msgLvl(MSG::DEBUG)){
combinedState = m_stateCombiner->combine( *destinationState );
-
this->printState( "Propagation to intermediate completed with", *combinedState );
-
delete combinedState;
}
/* -------------------------------------
@@ -1245,12 +1252,9 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateToIntermediateL
reducedState = reducedState ? reducedState : updatedState;
if (msgLvl(MSG::DEBUG)){
-
combinedState = m_stateCombiner->combine( *reducedState );
-
this->printState( "Material update at intermediate completed with", *combinedState );
- ATH_MSG_DEBUG( "-----------------------------------------------------------------------------------------------------------" );
-
+ ATH_MSG_DEBUG( "-------------------------------------------------------------------------------------" );
delete combinedState;
}
@@ -1258,23 +1262,22 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateToIntermediateL
}
-/* =========================================================================================================================================
- =========================================================================================================================================
+/*===================================================================================================================
Extrapolate to Destination Layer
- =========================================================================================================================================
- ========================================================================================================================================= */
+==================================================================================================================== */
-const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateToDestinationLayer ( Cache& cache,
- const Trk::IPropagator& propagator,
- const Trk::MultiComponentState& multiComponentState,
- const Trk::Surface& surface,
- const Trk::Layer& layer,
- //const Trk::TrackingVolume& trackingVolume,
- const Trk::Layer* startLayer,
- Trk::PropDirection direction,
- Trk::BoundaryCheck boundaryCheck,
+const Trk::MultiComponentState*
+Trk::GsfExtrapolator::extrapolateToDestinationLayer ( Cache& cache,
+ const Trk::IPropagator& propagator,
+ const Trk::MultiComponentState& multiComponentState,
+ const Trk::Surface& surface,
+ const Trk::Layer& layer,
+ //const Trk::TrackingVolume& trackingVolume,
+ const Trk::Layer* startLayer,
+ Trk::PropDirection direction,
+ Trk::BoundaryCheck boundaryCheck,
Trk::ParticleHypothesis particleHypothesis ) const
{
@@ -1285,12 +1288,9 @@ const Trk::MultiComponentState* Trk::GsfExtrapolator::extrapolateToDestinationLa
const Trk::TrackParameters* combinedState = 0;
if (msgLvl(MSG::DEBUG)){
-
combinedState = m_stateCombiner->combine( *initialState );
-
ATH_MSG_DEBUG( "-----------------------------------------------------------------------------------------------------------" );
this->printState( "Starting extrapolation to destination with", *combinedState );
-
delete combinedState;
}
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
index 835e0ffa3966b80e2bf339888fb26a8e301d031e..ed81202f03819c1d13e3df31c667b74d3511074a 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/*********************************************************************************
@@ -19,15 +19,8 @@ decription : Implementation code for QuickCloseComponentsMultiStateMer
#include "TrkParameters/TrackParameters.h"
#include "GaudiKernel/Chrono.h"
-
-#include <boost/bimap.hpp>
-#include <boost/bimap/set_of.hpp>
-#include <boost/bimap/multiset_of.hpp>
-
-#include <map>
#include <limits>
-
-typedef boost::bimap<boost::bimaps::multiset_of<float>, boost::bimaps::set_of<int>> bimap_t;
+#include <map>
#if !defined(__GNUC__)
@@ -41,25 +34,15 @@ typedef boost::bimap<boost::bimaps::multiset_of<float>, boost::bimaps::set_of<in
#endif
-Trk::QuickCloseComponentsMultiStateMerger::QuickCloseComponentsMultiStateMerger(const std::string& type, const std::string& name, const IInterface* parent)
+Trk::QuickCloseComponentsMultiStateMerger::QuickCloseComponentsMultiStateMerger(const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
:
AthAlgTool(type, name, parent),
- m_maximumNumberOfComponents(5),
- m_distance("Trk::KullbackLeiblerComponentDistance/KullbackLeiblerComponentDistance"),
- m_stateCombiner("Trk::MultiComponentStateCombiner/CloseComponentsCombiner"),
- m_chronoSvc("ChronoStatSvc", name),
- m_useFullDistanceCalcArray(true),
- m_useFullDistanceCalcVector(true)
+ m_chronoSvc("ChronoStatSvc", name)
{
declareInterface<IMultiComponentStateMerger>(this);
-
- declareProperty("CombinerTool",m_stateCombiner);
- declareProperty("MaximumNumberOfComponents", m_maximumNumberOfComponents);
- declareProperty("DistanceType", m_distance);
- declareProperty("FullDistanceCalcArray", m_useFullDistanceCalcArray);
- declareProperty("FullDistanceCalcVector", m_useFullDistanceCalcVector);
-
}
Trk::QuickCloseComponentsMultiStateMerger::~QuickCloseComponentsMultiStateMerger()
@@ -101,14 +84,6 @@ StatusCode Trk::QuickCloseComponentsMultiStateMerger::initialize()
}
ATH_MSG_INFO( "Initialisation of " << type() << " under instance " << name() << " was successful" );
-
- if (m_useFullDistanceCalcArray)
- ATH_MSG_INFO("Using full KL-distance based merging : Array");
- else if (m_useFullDistanceCalcVector)
- ATH_MSG_INFO("Using full KL-distance based merging : Vector");
- else
- ATH_MSG_INFO("Using default distance based merging");
-
return StatusCode::SUCCESS;
}
@@ -122,17 +97,13 @@ StatusCode Trk::QuickCloseComponentsMultiStateMerger::finalize()
}
-const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::merge(const Trk::MultiComponentState& unmergedState) const
+const Trk::MultiComponentState*
+Trk::QuickCloseComponentsMultiStateMerger::merge(const Trk::MultiComponentState& unmergedState) const
{
- // Start the timer
- //Chrono chrono( &(*m_chronoSvc), "CloseComponentMerger" );
-
ATH_MSG_VERBOSE( "Merging state with " << unmergedState.size() << " components" );
-
- unsigned int numberOfComponents = unmergedState.size();
//Assembler Cache
- IMultiComponentStateAssembler::Cache cache;
+ IMultiComponentStateAssembler::Cache cache;
// Check that the assember is reset
bool isAssemblerReset = m_stateAssembler->reset(cache);
@@ -155,16 +126,16 @@ const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::merge
Trk::MultiComponentState::const_iterator component = unmergedState.begin();
- // Scan all components for covariance matricies. If one or more component is missing an error matrix, component reduction is impossible.
+ // Scan all components for covariance matricies. If one or more component
+ // is missing an error matrix, component reduction is impossible.
for ( ; component != unmergedState.end(); ++component){
-
const AmgSymMatrix(5)* measuredCov = component->first->covariance();
-
- if ( !measuredCov )
+ if ( !measuredCov ){
componentWithoutMeasurement = true;
+ break;
+ }
}
-
const Trk::TrackParameters* combinedState = unmergedState.begin()->first->clone();
const Trk::ComponentParameters reducedState( combinedState, 1. );
if ( componentWithoutMeasurement ){
@@ -172,456 +143,18 @@ const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::merge
return ( new Trk::MultiComponentState( reducedState ) );
}
- // Options to use full KL distance-based algorithm.
- if (m_useFullDistanceCalcArray) {
- delete combinedState;
- return mergeFullDistArray(cache,unmergedState);
- } else if(m_useFullDistanceCalcVector){
- delete combinedState;
- return mergeFullDistVector(cache,unmergedState);
- }
-
-
-
-
- m_chronoSvc->chronoStart("QCCM::merge");
-
- // These should be sorted by key....
- SortBySmallerWeight comparator;
- MultiComponentStateMap unmergedComponentsMap(comparator);
-
- // Clone unmerged state as STL methods deletes components
- Trk::MultiComponentState* clonedUnmergedState = unmergedState.clone();
-
- component = clonedUnmergedState->begin();
-
- for ( ; component != clonedUnmergedState->end(); ++component ){
-
- // Map components of multi-component state list into multi-map
- double distance = calculateDistance( reducedState, *component );
-
- if (distance == 0)
- ATH_MSG_DEBUG( "Distance == 0 hmmm interesting" );
-
- unmergedComponentsMap.insert( std::make_pair(distance, *component) );
- }
-
-
- ATH_MSG_VERBOSE(" Start Reducing Components " );
-
-
- while (numberOfComponents > m_maximumNumberOfComponents){
-
- // Reset the merged components multi-map for next iteration
-
- double minDistance(9.9e12);
- double key1(-99999999),key2(-99999999);
- MultiComponentStateMap::iterator mapComponent = unmergedComponentsMap.begin();
- MultiComponentStateMap::iterator mapComponentEnd = unmergedComponentsMap.end();
- --mapComponentEnd;
- MultiComponentStateMap::iterator tempIter;
-
- MultiComponentStateMap::iterator iterKey1,iterKey2;
-
- for ( ; mapComponent != mapComponentEnd; ++mapComponent){
- tempIter = mapComponent;
- ++tempIter;
-
- double distance = tempIter->first - mapComponent->first ;
- //std::cout << "1st " << mapComponent->first <<" 2nd " << tempIter->first <<" = "<< distance << std::endl;
-
- if ( distance < minDistance )
- {
- key1 = mapComponent->first;
- key2 = tempIter->first;
- iterKey1 = mapComponent;
- iterKey2 = tempIter;
- minDistance = distance;
- }
- }
-
- if ( key1 != -99999999 && key2 != -99999999 && iterKey1 != iterKey2 ){
-
- Trk::MultiComponentState* componentsToBeMerged = new Trk::MultiComponentState();
-
- ATH_MSG_VERBOSE( "key1 " << key1 << " key2 " << key2 );
-
- componentsToBeMerged->push_back( iterKey1->second );
- componentsToBeMerged->push_back( iterKey2->second );
-
- // Combine the closest distance components
- const Trk::ComponentParameters* combinedComponents = m_stateCombiner->combineWithWeight( *componentsToBeMerged );
-
- if (msgLvl(MSG::VERBOSE)) msg() << "Weight of new component"<< combinedComponents->second << endmsg;
-
- // Erase these components from the unmerged components map. These need to be deleted also as new memory is assigned in the combiner
- delete componentsToBeMerged;
-
- unmergedComponentsMap.erase( iterKey1 );
- unmergedComponentsMap.erase( iterKey2 );
-
- double distance = calculateDistance( reducedState, *combinedComponents );
-
- if (distance == 0)
- ATH_MSG_DEBUG("Distance == 0 hmmm interesting");
-
- unmergedComponentsMap.insert( std::make_pair(distance, *combinedComponents) );
-
- // Delete memory allocated to component parameters pair. This does not delete the inserted copy
- delete combinedComponents;
-
- // Decrement the number of components
- --numberOfComponents;
-
- } else {
-
- ATH_MSG_DEBUG( " Keys are either equal or totally nonsensical " );
-
- // Something has gone amiss...... what shall i do
- clonedUnmergedState->clear();
- delete clonedUnmergedState;
-
- m_chronoSvc->chronoStop("QCCM::merge");
- return ( new Trk::MultiComponentState( reducedState ) );
-
- }
-
- ATH_MSG_VERBOSE( "Number of components: " << numberOfComponents );
-
- }
-
- // std::cout << " Finished Reducing Components " <<std::endl;
delete combinedState;
+ return mergeFullDistArray(cache,unmergedState);
- // Build final state containing both merged and unmerged components
-
- MultiComponentStateMap::const_iterator mapComponent = unmergedComponentsMap.begin();
-
- for ( ; mapComponent != unmergedComponentsMap.end(); ++mapComponent) {
-
- // Add component to state being prepared for assembly and check that it is valid
- bool componentAdded = m_stateAssembler->addComponent(cache,mapComponent->second);
-
- if ( !componentAdded )
- ATH_MSG_WARNING( "Component could not be added to the state in the assembler" );
-
- // Free up memory from track parameters in unmerged components map
- delete mapComponent->second.first;
-
- }
-
- const Trk::MultiComponentState* mergedState = m_stateAssembler->assembledState(cache);
-
- ATH_MSG_VERBOSE( "Number of components in merged state: " << mergedState->size() );
-
- // Memory clean up
- clonedUnmergedState->clear();
- delete clonedUnmergedState;
-
- m_chronoSvc->chronoStop("QCCM::merge");
- return mergedState;
-
-}
-
-
-
-
-
-double Trk::QuickCloseComponentsMultiStateMerger::calculateDistance(const Trk::ComponentParameters referenceParameters , const Trk::ComponentParameters variableParameters ) const
-{
-
- double distance(0);
-
- distance = (*m_distance)( referenceParameters, variableParameters);
-
- return distance;
}
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// FUNCTIONS TO USE INDEX DISTANCE MAP //
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void Trk::QuickCloseComponentsMultiStateMerger::addComponentDistances(IndexDistanceMap& indexDistanceMap, std::vector<const ComponentParameters*> &tempComponents) const
+const Trk::MultiComponentState*
+Trk::QuickCloseComponentsMultiStateMerger::mergeFullDistArray(IMultiComponentStateAssembler::Cache& cache,
+ const Trk::MultiComponentState& mcs) const
{
- //ATH_MSG_VERBOSE("Adding component distances to map");
-
- std::vector<const ComponentParameters*>::iterator newDist = (tempComponents.end()-1);
- std::vector<const ComponentParameters*>::iterator tcIter = (tempComponents.begin());
-
- for (; tcIter != tempComponents.end(); ++tcIter) {
-
- if (tcIter == newDist) continue;
-
- float distance(calculateDistance(*(*tcIter), *(*newDist)));
-
- //ATH_MSG_VERBOSE("Adding new distance: " << distance << " to map key: " << std::distance(tempComponents.begin(),tcIter));
-
- indexDistanceMap[std::distance(tempComponents.begin(),tcIter)].push_back(distance);
-
- }
-
- //Need to resize to account for the fact we have a new entry now.
- indexDistanceMap.resize(indexDistanceMap.size()+1);
-
- //ATH_MSG_VERBOSE("Done adding component distances to map");
-
-}
-
-std::pair<int,int> Trk::QuickCloseComponentsMultiStateMerger::getMinDistanceIndicesFromMap(IndexDistanceMap& indexDistanceMap) const
-{
-
- std::pair<int,int> minIndices(std::make_pair(-1,-1));
-
- IndexDistanceMap::iterator idIter = indexDistanceMap.begin();
-
- float minDistance(std::numeric_limits<float>::max());
- for (; idIter != indexDistanceMap.end(); ++idIter) {
-
- if (idIter == indexDistanceMap.end()-1) continue;
-
- std::vector<float>::iterator distIter = std::min_element(idIter->begin(),idIter->end());
- float localMin(*distIter);
- if (localMin < minDistance) {
- minDistance = localMin;
- int index1(std::distance(indexDistanceMap.begin(),idIter)),
- index2(std::distance(idIter->begin(),distIter)+index1+1);
- minIndices = std::make_pair(index1, index2);
- }
- }
-
- //ATH_MSG_VERBOSE("From map, get minimum indices: " << minIndices.first << " and " << minIndices.second);
-
- return minIndices;
-
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-void Trk::QuickCloseComponentsMultiStateMerger::fillKLDistance(
- IndexDistanceMap& indexDistanceMap,
- const ComponentParameters* &ref,
- std::vector<const ComponentParameters*> &mcs) const
-{
-
- //ATH_MSG_VERBOSE("Getting minimum KL distance component");
-
- //Find location of ref in mcs to skip it.
- std::vector<const ComponentParameters*>::iterator refIter = std::find(mcs.begin(),mcs.end(),ref);
- if (refIter == mcs.end()) {
- ATH_MSG_FATAL("Couldn't find reference parameter in the component vector???");
- }
-
- //We can just start with the next component over, since otherwise we'd be
- //doing the same calculation 2x for every component.
- std::vector<const ComponentParameters*>::iterator mcsIter = refIter + 1;
-
- for (; mcsIter != mcs.end(); ++mcsIter) {
-
- float distance(calculateDistance(*ref, *(*mcsIter)));
-
- //Save the value in the map for later.
- indexDistanceMap[std::distance(mcs.begin(),refIter)].push_back(distance);
-
- }
-}
-
-
-void Trk::QuickCloseComponentsMultiStateMerger::buildMap( IndexDistanceMap& idm, std::vector<const ComponentParameters*> &tempComponents) const
-{
- // Calculate everything from scratch.
-
- std::vector<const ComponentParameters*>::iterator mcsIter = tempComponents.begin();
- for (; mcsIter != tempComponents.end(); ++mcsIter) {
- fillKLDistance(idm,*mcsIter,tempComponents);
- }
-}
-
-
-void Trk::QuickCloseComponentsMultiStateMerger::deleteStateComponents(int ind1, int ind2, std::vector<const ComponentParameters*> &mcs) const
-{
-
- //ATH_MSG_VERBOSE("Erasing merged components ...");
-
- int indexA(-1), indexB(-1);
-
- if (ind2>ind1) {
- indexA = ind2;
- indexB = ind1;
- } else {
- indexA = ind1;
- indexB = ind2;
- }
-
- //Best way to do this is probably get iterators corresponding to the
- //indices, and then use 'erase' to remove them from the MCS.
- std::vector<const ComponentParameters*>::iterator iterA = mcs.begin(), iterB = mcs.begin();
-
- //Shift iterators to right places.
- std::advance(iterA,indexA);
- std::advance(iterB,indexB);
-
- ATH_MSG_VERBOSE("Deleting component A ...");
- if (mcs[indexA]) {
- delete mcs[indexA];
- }
-
- ATH_MSG_VERBOSE("Deleting component B ...");
- if (mcs[indexB]) {
- delete mcs[indexB];
- }
-
- ATH_MSG_VERBOSE("Erasing iterators from vector ...");
- mcs.erase(iterA);
- mcs.erase(iterB);
-
- //ATH_MSG_VERBOSE("Done with erasing");
-
-}
-
-void Trk::QuickCloseComponentsMultiStateMerger::mergeStateComponents ( IndexDistanceMap& idm, std::vector<const ComponentParameters*> &mcs) const
-{
-
- //Step 1: Get the components to merged.
- std::pair<int,int> mergeIndices(getMinDistanceIndicesFromMap(idm));
-
- //ATH_MSG_VERBOSE("Indices are: " << mergeIndices.first << " and " << mergeIndices.second);
-
- //Step 2: Merge them.
- Trk::MultiComponentState* componentsToBeMerged = new Trk::MultiComponentState();
-
- componentsToBeMerged->push_back( *mcs[mergeIndices.first] );
- componentsToBeMerged->push_back( *mcs[mergeIndices.second] );
-
- const Trk::ComponentParameters* combinedComponents = m_stateCombiner->combineWithWeight( *componentsToBeMerged );
-
- //Step 3: Delete the old components from the map.
- delete componentsToBeMerged;
-
- deleteStateComponents(mergeIndices.first, mergeIndices.second, mcs);
-
- if (mergeIndices.first > mergeIndices.second)
- deleteStoredDistances(idm, mergeIndices.second, mergeIndices.first);
- else
- deleteStoredDistances(idm, mergeIndices.first, mergeIndices.second);
-
- //Step 4: Insert the newly merged component into the MCS.
- mcs.push_back(combinedComponents);
-
- //Step 5: Add new distance calculations to index distance map.
- addComponentDistances(idm, mcs);
-
-}
-
-// Method to take an input MCS and minimize it from 'X' components to
-// 'm_maximumNumberOfComponents' components.
-const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::mergeFullDistVector(IMultiComponentStateAssembler::Cache& cache,
- const Trk::MultiComponentState& mcs) const
-{
-
- m_chronoSvc->chronoStart("QCCM::mergeFullDist");
-
- //NEW: Clear storage for indices / distances.
- IndexDistanceMap indexDistanceMap;
- indexDistanceMap.resize(mcs.size());
-
- ATH_MSG_VERBOSE("Cloning unmerged state and getting components");
-
- // Clone unmerged state as STL methods deletes components.
- Trk::MultiComponentState::const_iterator component = mcs.begin();
-
- std::vector<const ComponentParameters*> tempComponents;
- for ( ; component != mcs.end(); ++component ) {
- tempComponents.push_back((*component).clone());
- }
-
- // Build map
- buildMap(indexDistanceMap,tempComponents);
-
- ATH_MSG_VERBOSE("Starting component merging");
-
- //Do component merging.
- while (tempComponents.size() > m_maximumNumberOfComponents) {
- mergeStateComponents( indexDistanceMap,tempComponents);
- }
-
- ATH_MSG_VERBOSE("Done component merging, adding components to state assembler");
-
- //Make a new MCS out of merged components.
- std::vector<const ComponentParameters*>::iterator mcsIter = tempComponents.begin();
-
- for ( ; mcsIter != tempComponents.end(); ++mcsIter){
-
- // Add component to state being prepared for assembly and check that it is valid
- bool componentAdded = m_stateAssembler->addComponent(cache,*(*mcsIter));
-
- if ( !componentAdded )
- ATH_MSG_WARNING( "Component could not be added to the state in the assembler" );
-
- }
-
- ATH_MSG_VERBOSE("Got states, doing final assembly of merged state");
-
- const Trk::MultiComponentState* mergedState = m_stateAssembler->assembledState(cache);
-
- // Memory clean up. Gotta also clean up those pesky track parameters.
- // for (unsigned int ic(0); ic < clonedUnmergedState->size(); ic++)
- // if (clonedUnmergedState->at(ic).first)
- // delete clonedUnmergedState->at(ic).first;
-
- // clonedUnmergedState->clear();
- // delete clonedUnmergedState;
-
- //Delete remaining track components, clear out the vector of states.
- for (unsigned int it(0); it < tempComponents.size(); it++) {
- if (tempComponents[it]) {
- if (tempComponents[it]->first)
- delete tempComponents[it]->first;
- delete tempComponents[it];
- }
- }
- tempComponents.clear();
-
- //std::vector<Trk::ComponentParameters>().swap(tempComponents);
- //delete tempComponents;
-
- //if (msgLvl(MSG::VERBOSE)) msg() << "Number of components in merged state: " << mergedState->size() << endmsg;
-
- m_chronoSvc->chronoStop("QCCM::mergeFullDist");
-
- return mergedState;
-
-}
-
-//Routine to get rid of all the distance calculations made with
-//merged components.
-void Trk::QuickCloseComponentsMultiStateMerger::deleteStoredDistances(IndexDistanceMap& indexDistanceMap, int i1, int i2) const {
-
- IndexDistanceMap::iterator iter1 = indexDistanceMap.begin();
- IndexDistanceMap::iterator iter2 = indexDistanceMap.begin();
-
- std::advance(iter1,i1);
- std::advance(iter2,i2);
-
- //Erase larger iterator entries first to avoid index shifting.
- indexDistanceMap.erase(iter2);
-
- for (int ik(0); ik < i2; ik++) {
- indexDistanceMap[ik].erase(indexDistanceMap[ik].begin()+(i2-ik)-1);
- }
-
- //Erase smaller iterator entries.
- indexDistanceMap.erase(iter1);
- for (int ik(0); ik < i1; ik++) {
- indexDistanceMap[ik].erase(indexDistanceMap[ik].begin()+(i1-ik)-1);
- }
-
-}
-
-const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::mergeFullDistArray(IMultiComponentStateAssembler::Cache& cache,
- const Trk::MultiComponentState& mcs) const
-{
- //m_chronoSvc->chronoStart("QCCM::mergeFullDistArray");
-
const int n = mcs.size();
const int nn2 = (n+1)*n / 2;
@@ -692,8 +225,6 @@ const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::merge
// This loop can be vectorised
calculateAllDistances( qonp, qonpCov, qonpG, distances, n);
-
-
//Loop over all componants until you reach the target amount
unsigned int numberOfComponents = n;
int minIndex = -1;
@@ -701,12 +232,8 @@ const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::merge
while (numberOfComponents > m_maximumNumberOfComponents){
- //Find minimum
- //std::pair <int ,int > min = findMinimumPair( distances,statesToMerge, n );
-
//Searching for the minimum distances is slowest part of the loop
- // lets try and speed it up by reducing the number searches by 2
- //Note that a boost::bimap could be used but it is really slow.
+ //lets try and speed it up by reducing the number searches by 2
if( nextMinIndex < 1 ){
//Run search again
std::pair <int ,int > min = findMinimumIndex( distances, nn2 );
@@ -721,7 +248,6 @@ const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::merge
int mini = indexToI[minIndex];
int minj = indexToJ[minIndex];
- //std::cout << mini << " " << minj << std::endl;
if(mini==minj) {
ATH_MSG_ERROR( "Err keys are equal key1 " << mini << " key2 " << minj );
@@ -739,7 +265,8 @@ const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::merge
ATH_MSG_VERBOSE( "Weight of new component "<< combinedComponents->second );
- // Erase these components from the unmerged components map. These needs to be deleted also as new memory is assigned in the combiner
+ // Erase these components from the unmerged components map.
+ // These needs to be deleted also as new memory is assigned in the combiner
// This will also delete the components in the vector statesToMerge
delete componentsToBeMerged;
delete statesToMerge[mini]; statesToMerge[mini]=0;
@@ -810,16 +337,15 @@ const Trk::MultiComponentState* Trk::QuickCloseComponentsMultiStateMerger::merge
}
statesToMerge.clear();
- //m_chronoSvc->chronoStop("QCCM::mergeFullDistArray");
-
return mergedState;
-
}
-void Trk::QuickCloseComponentsMultiStateMerger::resetDistances( floatPtrRestrict distancesIn, const int mini,const int n)const{
+void Trk::QuickCloseComponentsMultiStateMerger::resetDistances( floatPtrRestrict distancesIn,
+ const int mini,
+ const int n)const{
float *distances = (float*)__builtin_assume_aligned(distancesIn, 32);
@@ -836,10 +362,11 @@ void Trk::QuickCloseComponentsMultiStateMerger::resetDistances( floatPtrRestrict
}
-
-
-
-void Trk::QuickCloseComponentsMultiStateMerger::calculateAllDistances( floatPtrRestrict qonpIn, floatPtrRestrict qonpCovIn, floatPtrRestrict qonpGIn, floatPtrRestrict distancesIn, int n) const
+void Trk::QuickCloseComponentsMultiStateMerger::calculateAllDistances( floatPtrRestrict qonpIn,
+ floatPtrRestrict qonpCovIn,
+ floatPtrRestrict qonpGIn,
+ floatPtrRestrict distancesIn,
+ int n) const
{
float *qonp = (float*)__builtin_assume_aligned(qonpIn, 32);
@@ -857,13 +384,19 @@ void Trk::QuickCloseComponentsMultiStateMerger::calculateAllDistances( floatPtrR
float covarianceDifference = qonpCovi - qonpCov[j];
float G_difference = qonpG[j] - qonpGi;
float G_sum = qonpGi + qonpG[j];
- distances[ indexConst + j ] = covarianceDifference * G_difference + parametersDifference * G_sum * parametersDifference;
+ distances[ indexConst + j ] = covarianceDifference * G_difference +
+ parametersDifference * G_sum * parametersDifference;
}
}
}
-int Trk::QuickCloseComponentsMultiStateMerger::recalculateDistances( floatPtrRestrict qonpIn, floatPtrRestrict qonpCovIn, floatPtrRestrict qonpGIn, floatPtrRestrict distancesIn, int mini, int n) const
+int Trk::QuickCloseComponentsMultiStateMerger::recalculateDistances( floatPtrRestrict qonpIn,
+ floatPtrRestrict qonpCovIn,
+ floatPtrRestrict qonpGIn,
+ floatPtrRestrict distancesIn,
+ int mini,
+ int n) const
{
float *qonp = (float*)__builtin_assume_aligned(qonpIn, 32);
@@ -916,7 +449,9 @@ int Trk::QuickCloseComponentsMultiStateMerger::recalculateDistances( floatPtrRes
}
-std::pair<int, int> Trk::QuickCloseComponentsMultiStateMerger::findMinimumIndex( const floatPtrRestrict distancesIn, const int n) const
+std::pair<int, int>
+Trk::QuickCloseComponentsMultiStateMerger::findMinimumIndex(const floatPtrRestrict distancesIn,
+ const int n) const
{
float *distances = (float*)__builtin_assume_aligned(distancesIn, 32);
@@ -936,7 +471,10 @@ std::pair<int, int> Trk::QuickCloseComponentsMultiStateMerger::findMinimumIndex
}
-std::pair<int, int> Trk::QuickCloseComponentsMultiStateMerger::findMinimumPair( const floatPtrRestrict distancesIn,const std::vector <const Trk::ComponentParameters*>& comps, const int n) const
+std::pair<int, int>
+Trk::QuickCloseComponentsMultiStateMerger::findMinimumPair(const floatPtrRestrict distancesIn,
+ const std::vector <const Trk::ComponentParameters*>& comps,
+ const int n) const
{
float *distances = (float*)__builtin_assume_aligned(distancesIn, 32);
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/ATLAS_CHECK_THREAD_SAFETY b/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..5d049b8a192b6d1ca50f9fcac2c54f74e87d5d8b
--- /dev/null
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Tracking/TrkTools/TrkMeasurementUpdator
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdator.h b/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdator.h
index ab814524244f4f166ea3216592730a97f413f2a6..1f464f75c6d76c2aa1af4ef54d57d5cf7a8fcd6b 100755
--- a/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdator.h
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdator.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
//////////////////////////////////////////////////////////////////
@@ -47,55 +47,108 @@ class KalmanUpdator : virtual public IUpdator, public AthAlgTool {
~KalmanUpdator();
//! AlgTool initialisation
- StatusCode initialize();
+ virtual StatusCode initialize() override final;
//! AlgTool termination
- StatusCode finalize();
+ virtual StatusCode finalize() override final;
- //! measurement updator for the KalmanFitter getting the meas't coord' from Amg::Vector2D (use eg with PRD)
- virtual const TrackParameters* addToState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&) const;
- //! measurement updator for the KalmanFitter getting the coordinates from LocalParameters (use eg with MeasurementBase, ROT)
- virtual const TrackParameters* addToState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&) const;
- //! measurement updator interface for the KalmanFitter returning the fit quality of the state at the same time (Amg::Vector2D-version)
- virtual const TrackParameters* addToState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
- //! measurement updator interface for the KalmanFitter returning the fit quality of the state at the same time (LocalParameters-version)
- virtual const TrackParameters* addToState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
-
- //! reverse update eg for track property analysis (unbiased residuals) getting the measurement coordinates from the Amg::Vector2D class.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&) const;
- //! reverse update eg for track property analysis (unbiased residuals) getting the measurement coordinates from the LocalParameters class.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&) const;
- //! reverse updator for the KalmanFitter and other fitters using the interface with Amg::Vector2D and FitQualityOnSurface.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
- //! reverse updator for the KalmanFitter and other fitters using the interface with LocalParameters and FitQualityOnSurface.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ //! measurement updator for the KalmanFitter getting the meas't coord'
+ //from Amg::Vector2D (use eg with PRD)
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&) const override final;
+ //! measurement updator for the KalmanFitter getting the coordinates
+ //from LocalParameters (use eg with MeasurementBase, ROT)
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&) const override final;
+ //! measurement updator interface for the KalmanFitter returning the fit quality
+ //of the state at the same time (Amg::Vector2D-version)
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
+ //! measurement updator interface for the KalmanFitter returning the fit quality
+ //of the state at the same time (LocalParameters-version)
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
+
+ //! reverse update eg for track property analysis (unbiased residuals)
+ //getting the measurement coordinates from the Amg::Vector2D class.
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&) const override final;
+ //! reverse update eg for track property analysis (unbiased residuals)
+ //getting the measurement coordinates from the LocalParameters class.
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&) const override final ;
+ //! reverse updator for the KalmanFitter and other fitters using the
+ //interface with Amg::Vector2D and FitQualityOnSurface.
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
+ //! reverse updator for the KalmanFitter and other fitters using
+ //the interface with LocalParameters and FitQualityOnSurface.
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
/** @brief trajectory state updator which combines two parts of a trajectory on a common surface.
Make sure that the TPs' surfaces are identical and
that the local hit is not duplicated in both trajectories!
*/
- virtual const TrackParameters* combineStates (const TrackParameters&, const TrackParameters&) const;
- /** @brief trajectory state updator which combines two parts of a trajectory on a common surface and provides the FitQuality.
+ virtual const TrackParameters* combineStates (const TrackParameters&,
+ const TrackParameters&) const override final;
+ /** @brief trajectory state updator which combines two parts of a trajectory
+ * on a common surface and provides the FitQuality.
Make sure that the TPs' surfaces are identical and that the local hit is not duplicated!
*/
- virtual const TrackParameters* combineStates (const TrackParameters&, const TrackParameters&, FitQualityOnSurface*&) const;
-
- //! estimator for FitQuality on Surface from a full track state, that is a state which contains the current hit (expressed as Amg::Vector2D).
- virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX& ) const;
- //! estimator for FitQuality on Surface from a full track state, that is a state which contains the current hit (expressed as LocalParameters).
- virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&, const LocalParameters&, const Amg::MatrixX& ) const;
- //! estimator for FitQuality on Surface from a predicted track state, that is a state which contains the current hit (expressed as Amg::Vector2D).
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX& ) const;
- //! estimator for FitQuality on Surface from a predicted track state, that is a state which contains the current hit (expressed as LocalParameters).
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const LocalParameters&, const Amg::MatrixX& ) const;
- //! estimator for FitQuality on Surface for the situation when a track is fitted to the parameters of another trajectory part extrapolated to the common surface.
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const TrackParameters&) const;
+ virtual const TrackParameters* combineStates (const TrackParameters&,
+ const TrackParameters&,
+ FitQualityOnSurface*&) const override final;
+
+ //! estimator for FitQuality on Surface from a full track state, that is a state
+ //which contains the current hit (expressed as Amg::Vector2D).
+ virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX& ) const override final;
+
+ //! estimator for FitQuality on Surface from a full track state, that is
+ //a state which contains the current hit (expressed as LocalParameters).
+ virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX& ) const override final;
+ //! estimator for FitQuality on Surface from a predicted track state, that is a state
+ //which contains the current hit (expressed as Amg::Vector2D).
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX& ) const override final;
+ //! estimator for FitQuality on Surface from a predicted track state, that is a state
+ //which contains the current hit (expressed as LocalParameters).
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX& ) const override final;
+ //! estimator for FitQuality on Surface for the situation when a track is fitted to
+ //the parameters of another trajectory part extrapolated to the common surface.
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const TrackParameters&) const override final;
//! interface for reference-track KF, not implemented.
- virtual std::pair<AmgVector(5), AmgSymMatrix(5)>* updateParameterDifference (const AmgVector(5)&, const AmgSymMatrix(5)&, const Amg::VectorX&, const Amg::MatrixX&, const int&, Trk::FitQualityOnSurface*&, bool ) const {return 0;}
+ virtual std::pair<AmgVector(5), AmgSymMatrix(5)>* updateParameterDifference (const AmgVector(5)&,
+ const AmgSymMatrix(5)&,
+ const Amg::VectorX&,
+ const Amg::MatrixX&,
+ const int&, Trk::FitQualityOnSurface*&,
+ bool ) const override final
+ {return 0;}
//! gives back how updator is configured for inital covariances
- virtual const std::vector<double> initialErrors() const;
+ virtual const std::vector<double> initialErrors() const override final;
private:
//! Common maths calculation code for addToState and removeFromState - Amg::Vector2D interface.
@@ -207,10 +260,10 @@ private:
ATH_MSG_DEBUG("matrix inversion failed");
return new FitQualityOnSurface(0.0,(int)covRio.cols());
}
- R = R.inverse();
// get chi2 = r.T() * R^-1 * r
- double chiSquared = residual.transpose()*R*residual;
- ATH_MSG_VERBOSE("-U- fitQuality of "<< (sign>0?"predicted":"updated") <<" state, chi2 :" << chiSquared << " / ndof= " << covRio.cols());
+ double chiSquared = residual.transpose()*R.inverse()*residual;
+ ATH_MSG_VERBOSE("-U- fitQuality of "<< (sign>0?"predicted":"updated")
+ <<" state, chi2 :" << chiSquared << " / ndof= " << covRio.cols());
// return the FitQualityOnSurface object
return new FitQualityOnSurface(chiSquared, int(covRio.cols()));
}
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdatorAmg.h b/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdatorAmg.h
index fe7f79c5e82d43df6e00a35dbf9a79e471457990..99aca7d62ea074ef72889a624a02c748e4458bc7 100755
--- a/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdatorAmg.h
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdatorAmg.h
@@ -51,55 +51,93 @@ class KalmanUpdatorAmg : virtual public IUpdator, public AthAlgTool {
~KalmanUpdatorAmg();
//!< AlgTool initialisation
- StatusCode initialize();
+ virtual StatusCode initialize() override final;
//!< AlgTool termination
- StatusCode finalize();
+ virtual StatusCode finalize() override final;
//!< measurement updator for the KalmanFitter getting the meas't coord' from Amg::Vector2D (use eg with PRD)
// fails: @copydoc Trk::IUpdator::addToState(const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&)
- virtual const TrackParameters* addToState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&) const;
- //!< measurement updator for the KalmanFitter getting the coord' from LocalParameters (use for example with MeasurementBase, ROT)
- virtual const TrackParameters* addToState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&) const;
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&) const override final;
+ //!< measurement updator for the KalmanFitter getting the coord' from
+ //LocalParameters (use for example with MeasurementBase, ROT)
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&) const override final;
//!< measurement updator interface for the KalmanFitter returning the fit quality of the state at the same time (Amg::Vector2D-version)
- virtual const TrackParameters* addToState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
//!< measurement updator interface for the KalmanFitter returning the fit quality of the state at the same time (LocalParameters-version)
- virtual const TrackParameters* addToState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&, FitQualityOnSurface*& ) const override final;
//!< reverse update eg for track property analysis (unbiased residuals) getting the measurement coordinates from the Amg::Vector2D class.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&) const;
- //!< reverse update eg for track property analysis (unbiased residuals) getting the measurement coordinates from the LocalParameters class.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&) const;
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&) const override final;
+ //!< reverse update eg for track property analysis (unbiased residuals) getting the
+ //measurement coordinates from the LocalParameters class.
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&) const override final;
//!< reverse update for Kalman filters and other applications using the interface with Amg::Vector2D and FitQualityOnSurface.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
//!< reverse update for Kalman filters and other applications using the interface with LocalParameters and FitQualityOnSurface.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
/** @brief trajectory state updator which combines two parts of a trajectory on a common surface.
Make sure that the TPs' surfaces are identical and
that the local hit is not duplicated in both trajectories!
*/
- virtual const TrackParameters* combineStates (const TrackParameters&, const TrackParameters&) const;
+ virtual const TrackParameters* combineStates (const TrackParameters&,
+ const TrackParameters&) const override final;
/** @brief trajectory state updator which combines two parts of a trajectory on a common surface and provides the FitQuality.
Make sure that the TPs' surfaces are identical and that the local hit is not duplicated!*/
- virtual const TrackParameters* combineStates (const TrackParameters&, const TrackParameters&, FitQualityOnSurface*&) const;
+ virtual const TrackParameters* combineStates (const TrackParameters&,
+ const TrackParameters&,
+ FitQualityOnSurface*&) const override final;
//!< estimator for FitQuality on Surface from a full track state, that is a state which contains the current hit (expressed as Amg::Vector2D).
- virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX& ) const;
+ virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX& ) const override final;
//!< estimator for FitQuality on Surface from a full track state, that is a state which contains the current hit (expressed as LocalParameters).
- virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&, const LocalParameters&, const Amg::MatrixX& ) const;
+ virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX& ) const override final;
//!< estimator for FitQuality on Surface from a predicted track state, that is a state which contains the current hit (expressed as Amg::Vector2D).
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX& ) const;
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX& ) const override final;
//!< estimator for FitQuality on Surface from a predicted track state, that is a state which contains the current hit (expressed as LocalParameters).
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const LocalParameters&, const Amg::MatrixX& ) const;
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX& ) const override final;
//!< estimator for FitQuality on Surface for the situation when a track is fitted to the parameters of another trajectory part extrapolated to the common surface.
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const TrackParameters&) const;
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const TrackParameters&) const override final;
//!< interface for reference-track KF
- virtual std::pair<AmgVector(5), AmgSymMatrix(5)>* updateParameterDifference (const AmgVector(5)&, const AmgSymMatrix(5)&, const Amg::VectorX&, const Amg::MatrixX&, const int&, Trk::FitQualityOnSurface*&, bool ) const;
+ virtual std::pair<AmgVector(5), AmgSymMatrix(5)>* updateParameterDifference (const AmgVector(5)&,
+ const AmgSymMatrix(5)&,
+ const Amg::VectorX&,
+ const Amg::MatrixX&,
+ const int&,
+ Trk::FitQualityOnSurface*&, bool ) const override final;
//!< give back how updator is configured for inital covariances
- virtual const std::vector<double> initialErrors() const;
+ virtual const std::vector<double> initialErrors() const override final;
private:
//!< common code analysing the measurement's rank and calling the appropriate implementation for this rank.
@@ -218,7 +256,7 @@ private:
std::vector<double> m_cov_stdvec; //!<< job options for initial cov values
- mutable AmgVector(5) m_cov0Vec; //!<< initial cov values in AmgVector object
+ AmgVector(5) m_cov0Vec; //!<< initial cov values in AmgVector object
AmgSymMatrix(5)* m_covariance0; //!<< initial cov values in AmgMatrix
bool m_useFruehwirth8a; //!<< job options controlling update formula for covariance matrix
float m_thetaGainDampingValue;
@@ -227,7 +265,7 @@ private:
ProjectionMatricesSet m_reMatrices; //!< expansion and reduction matrices set
- static ParamDefsAccessor s_enumAccessor;
+ static const ParamDefsAccessor s_enumAccessor;
};
template <int DIM> const TrackParameters*
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdatorSMatrix.h b/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdatorSMatrix.h
index 004e5285288902e158790b297c6a216279d62dd5..cebfc5b34b9ee6bf84e1a55d9abf0424a17785dc 100755
--- a/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdatorSMatrix.h
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/TrkMeasurementUpdator/KalmanUpdatorSMatrix.h
@@ -77,22 +77,42 @@ class KalmanUpdatorSMatrix : virtual public IUpdator, public AthAlgTool {
//! measurement updator for the KalmanFitter getting the meas't coord' from Amg::Vector2D (use eg with PRD)
// fails: @copydoc Trk::IUpdator::addToState(const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&)
- virtual const TrackParameters* addToState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&) const;
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&) const override final;
//! measurement updator for the KalmanFitter getting the coord' from LocalParameters (use for example with MeasurementBase, ROT)
- virtual const TrackParameters* addToState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&) const;
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&) const override final;
//! measurement updator interface for the KalmanFitter returning the fit quality of the state at the same time (Amg::Vector2D-version)
- virtual const TrackParameters* addToState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
//! measurement updator interface for the KalmanFitter returning the fit quality of the state at the same time (LocalParameters-version)
- virtual const TrackParameters* addToState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ virtual const TrackParameters* addToState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
//! reverse update eg for track property analysis (unbiased residuals) getting the measurement coordinates from the Amg::Vector2D class.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&) const;
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&) const override final;
//! reverse update eg for track property analysis (unbiased residuals) getting the measurement coordinates from the LocalParameters class.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&) const;
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&) const override final;
//! reverse update for Kalman filters and other applications using the interface with Amg::Vector2D and FitQualityOnSurface.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
//! reverse update for Kalman filters and other applications using the interface with LocalParameters and FitQualityOnSurface.
- virtual const TrackParameters* removeFromState (const TrackParameters&, const LocalParameters&, const Amg::MatrixX&, FitQualityOnSurface*& ) const;
+ virtual const TrackParameters* removeFromState (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX&,
+ FitQualityOnSurface*& ) const override final;
/** @brief trajectory state updator which combines two parts of a trajectory on a common surface.
@@ -100,28 +120,47 @@ class KalmanUpdatorSMatrix : virtual public IUpdator, public AthAlgTool {
that the local hit is not duplicated in both trajectories!
*/
- virtual const TrackParameters* combineStates (const TrackParameters&, const TrackParameters&) const;
+ virtual const TrackParameters* combineStates (const TrackParameters&,
+ const TrackParameters&) const override final;
/** @brief trajectory state updator which combines two parts of a trajectory on a common surface and provides the FitQuality.
Make sure that the TPs' surfaces are identical and that the local hit is not duplicated!
*/
- virtual const TrackParameters* combineStates (const TrackParameters&, const TrackParameters&, FitQualityOnSurface*&) const;
+ virtual const TrackParameters* combineStates (const TrackParameters&,
+ const TrackParameters&,
+ FitQualityOnSurface*&) const override final;
//! estimator for FitQuality on Surface from a full track state, that is a state which contains the current hit (expressed as Amg::Vector2D).
- virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX& ) const;
+ virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX& ) const override final;
//! estimator for FitQuality on Surface from a full track state, that is a state which contains the current hit (expressed as LocalParameters).
- virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&, const LocalParameters&, const Amg::MatrixX& ) const;
+ virtual const FitQualityOnSurface* fullStateFitQuality (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX& ) const override final;
//! estimator for FitQuality on Surface from a predicted track state, that is a state which contains the current hit (expressed as Amg::Vector2D).
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const Amg::Vector2D&, const Amg::MatrixX& ) const;
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const Amg::Vector2D&,
+ const Amg::MatrixX& ) const override final;
//! estimator for FitQuality on Surface from a predicted track state, that is a state which contains the current hit (expressed as LocalParameters).
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const LocalParameters&, const Amg::MatrixX& ) const;
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const LocalParameters&,
+ const Amg::MatrixX& ) const override final;
//! estimator for FitQuality on Surface for the situation when a track is fitted to the parameters of another trajectory part extrapolated to the common surface.
- virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&, const TrackParameters&) const;
+ virtual const FitQualityOnSurface* predictedStateFitQuality (const TrackParameters&,
+ const TrackParameters&) const override final;
//! interface for reference-track KF, not implemented
- virtual std::pair<AmgVector(5), AmgSymMatrix(5)>* updateParameterDifference (const AmgVector(5)&, const AmgSymMatrix(5)&, const Amg::VectorX&, const Amg::MatrixX&, const int&, Trk::FitQualityOnSurface*&, bool ) const {return 0;}
+ virtual std::pair<AmgVector(5), AmgSymMatrix(5)>* updateParameterDifference (const AmgVector(5)&,
+ const AmgSymMatrix(5)&,
+ const Amg::VectorX&,
+ const Amg::MatrixX&,
+ const int&,
+ Trk::FitQualityOnSurface*&,
+ bool ) const override final
+ {return 0;}
//! give back how updator is configured for inital covariances
- virtual const std::vector<double> initialErrors() const;
+ virtual const std::vector<double> initialErrors() const override final;
private:
//! common code analysing the measurement's rank and calling the appropriate implementation for this rank.
@@ -260,7 +299,7 @@ private:
float m_thetaGainDampingValue;
SCovMatrix5 m_unitMatrix; //!< avoid mem allocation at every call
- static ParamDefsAccessor s_enumAccessor;
+ static const ParamDefsAccessor s_enumAccessor;
};
inline bool KalmanUpdatorSMatrix::thetaPhiWithinRange_5D (const SParVector5& V,
const RangeCheckDef rcd) const {
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/src/KalmanUpdatorAmg.cxx b/Tracking/TrkTools/TrkMeasurementUpdator/src/KalmanUpdatorAmg.cxx
index ccd3876d8cc5e8f2fd42fac426d90f512dc485d6..da64918b050152b6520bc498b06f5bc9b06aa8b0 100755
--- a/Tracking/TrkTools/TrkMeasurementUpdator/src/KalmanUpdatorAmg.cxx
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/src/KalmanUpdatorAmg.cxx
@@ -24,7 +24,7 @@
#include <math.h>
#include <cstring>
-Trk::ParamDefsAccessor Trk::KalmanUpdatorAmg::s_enumAccessor;
+const Trk::ParamDefsAccessor Trk::KalmanUpdatorAmg::s_enumAccessor;
// constructor
Trk::KalmanUpdatorAmg::KalmanUpdatorAmg(const std::string& t,const std::string& n,const IInterface* p) :
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator/src/KalmanUpdatorSMatrix.cxx b/Tracking/TrkTools/TrkMeasurementUpdator/src/KalmanUpdatorSMatrix.cxx
index 5886733babc5632e2d1a15f811a4fbf080bb3c7c..b086c73c1d502e985c8014a78b82b513245a11e7 100755
--- a/Tracking/TrkTools/TrkMeasurementUpdator/src/KalmanUpdatorSMatrix.cxx
+++ b/Tracking/TrkTools/TrkMeasurementUpdator/src/KalmanUpdatorSMatrix.cxx
@@ -25,7 +25,7 @@
// using namespace ROOT::Math;
// using ROOT::Math::SMatrix;
-Trk::ParamDefsAccessor Trk::KalmanUpdatorSMatrix::s_enumAccessor;
+const Trk::ParamDefsAccessor Trk::KalmanUpdatorSMatrix::s_enumAccessor;
// constructor
Trk::KalmanUpdatorSMatrix::KalmanUpdatorSMatrix(const std::string& t,const std::string& n,const IInterface* p) :
diff --git a/Tracking/TrkTools/TrkMeasurementUpdator_xk/TrkMeasurementUpdator_xk/ATLAS_CHECK_THREAD_SAFETY b/Tracking/TrkTools/TrkMeasurementUpdator_xk/TrkMeasurementUpdator_xk/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..2b721d477ea7589dec32b9fe24f70c8e09bdb55b
--- /dev/null
+++ b/Tracking/TrkTools/TrkMeasurementUpdator_xk/TrkMeasurementUpdator_xk/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Tracking/TrkTools/TrkMeasurementUpdator_xk
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
index c91155fe022aac04f6d19dbdd13b18d718977f67..9576fc0a2fb2567b020f65702c4e170ad82d88a2 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.cxx
@@ -42,6 +42,7 @@ StatusCode HLTCaloCellMaker::initialize() {
else
ATH_CHECK( m_cellContainerVKey.initialize() );
ATH_CHECK( m_tileEMScaleKey.initialize() );
+ ATH_CHECK( m_bcidAvgKey.initialize() );
CHECK( m_dataAccessSvc.retrieve() );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
index 963106c53d75722b9b43f48d3758c2b84a9fac26..ed0b1a4dfd0b397fd3cc920bdce5e45f0523ad1a 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/HLTCaloCellMaker.h
@@ -25,6 +25,7 @@
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
#include "StoreGate/ReadCondHandleKey.h"
+#include "CaloEvent/CaloBCIDAverage.h"
#include "CaloEvent/CaloCellContainerVector.h"
#include "AthContainers/ConstDataVector.h"
#include "CaloEvent/CaloConstCellContainer.h"
@@ -50,6 +51,8 @@ class HLTCaloCellMaker: public AthReentrantAlgorithm {
SG::WriteHandleKey<CaloConstCellContainer > m_cellContainerKey;
/// FIXME: Temporary (i hope) to get dependency needed by BS converter.
SG::ReadCondHandleKey<TileEMScale> m_tileEMScaleKey;
+ SG::ReadHandleKey<CaloBCIDAverage> m_bcidAvgKey
+ { this, "BCIDAvgKey", "CaloBCIDAverage", "" };
ServiceHandle<ITrigCaloDataAccessSvc> m_dataAccessSvc;
bool m_roiMode;
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/CMakeLists.txt b/Trigger/TrigAlgorithms/TrigFastTrackFinder/CMakeLists.txt
index fc65d520175efe348f8358c022c582d68ed23136..4ab1a418c76605aaf00713b0f9f1a73b0b2018e3 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/CMakeLists.txt
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/CMakeLists.txt
@@ -24,6 +24,7 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetConditions/BeamSpotConditionsData
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
InnerDetector/InDetRecEvent/SiSpacePointsSeed
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
InnerDetector/InDetRecTools/InDetRecToolInterfaces
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkRIO_OnTrack
@@ -43,7 +44,7 @@ atlas_add_component( TrigFastTrackFinder
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TBB_INCLUDE_DIRS}
- LINK_LIBRARIES ${TBB_LIBRARIES} GaudiKernel TrkEventPrimitives TrigInDetEvent TrigSteeringEvent TrigInterfacesLib TrigInDetPattRecoTools AthenaBaseComps IRegionSelector InDetIdentifier InDetPrepRawData InDetRIO_OnTrack SiSpacePointsSeed InDetRecToolInterfaces TrkParameters TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkToolInterfaces TrigInDetPattRecoEvent FTK_DataProviderInterfaces TrigTimeAlgsLib )
+ LINK_LIBRARIES ${TBB_LIBRARIES} GaudiKernel TrkEventPrimitives TrigInDetEvent TrigSteeringEvent TrigInterfacesLib TrigInDetPattRecoTools AthenaBaseComps IRegionSelector InDetIdentifier InDetPrepRawData InDetRIO_OnTrack SiSpacePointsSeed SiSPSeededTrackFinderData InDetRecToolInterfaces TrkParameters TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkToolInterfaces TrigInDetPattRecoEvent FTK_DataProviderInterfaces TrigTimeAlgsLib )
# Install files from the package:
atlas_install_headers( TrigFastTrackFinder )
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
index df5bf92e9dea22558cb039b49f99f9e07b32df23..f78126045d2a45d01a9bf513b315827719d24818 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
@@ -50,6 +50,7 @@
#include "InDetRecToolInterfaces/ISiTrackMaker.h"
+#include "SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h"
#include "TrigInDetPattRecoTools/TrigCombinatorialSettings.h"
#include "TrigInDetPattRecoTools/TrigTrackSeedGenerator.h"
@@ -727,8 +728,8 @@ StatusCode TrigFastTrackFinder::findTracks(const TrigRoiDescriptor& roi,
bool PIX = true;
bool SCT = true;
-
- m_trackMaker->newTrigEvent(PIX,SCT);
+ InDet::SiTrackMakerEventData_xk trackEventData;
+ m_trackMaker->newTrigEvent(trackEventData, PIX, SCT);
for(unsigned int tripletIdx=0;tripletIdx!=triplets.size();tripletIdx++) {
@@ -755,7 +756,7 @@ StatusCode TrigFastTrackFinder::findTracks(const TrigRoiDescriptor& roi,
++m_nSeeds;
- std::list<Trk::Track*> tracks = std::move(m_trackMaker->getTracks(spList));
+ std::list<Trk::Track*> tracks = m_trackMaker->getTracks(trackEventData, spList);
for(std::list<Trk::Track*>::const_iterator t=tracks.begin(); t!=tracks.end(); ++t) {
if((*t)) {
@@ -802,7 +803,7 @@ StatusCode TrigFastTrackFinder::findTracks(const TrigRoiDescriptor& roi,
}
}
- m_trackMaker->endEvent();
+ m_trackMaker->endEvent(trackEventData);
for(auto& seed : triplets) delete seed;
//clone removal
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/LArCellCont.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/LArCellCont.h
index ab8f291d823c71c8fe2602a505d65d89e59ec177..7f16514843b7df86af9b8f227971e58009654fa2 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/LArCellCont.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/TrigT2CaloCommon/LArCellCont.h
@@ -76,10 +76,6 @@ class LArCellCont : public std::vector<LArCellCollection*>
void eventNumber ( const unsigned int eN ) { m_event=eN; };
/** sets LumiBlock and BCID */
void lumiBlock_BCID(const unsigned int lumi_block, const unsigned int BCID);
- /** has to retrieve the pointer before in TrigDataAccess */
- void setCaloLumiBCIDPointer( ICaloLumiBCIDTool* caloLumiBCIDTool ) {
- m_caloLumiBCIDTool = caloLumiBCIDTool;
- }
/** List of Missing ROBs */
const std::vector<uint32_t>& MissingROBs( void ) {
@@ -118,8 +114,6 @@ private:
std::vector<float>& m_corrBCIDref;
/** update BCID dependent correction table */
void updateBCID();
- /** CaloLumiBCIDTool pointer */
- ICaloLumiBCIDTool* m_caloLumiBCIDTool;
/** index table */
std::map<HWIdentifier,int> m_indexset;
/** current lumi_block */
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
index 3642df254d12f13ec673976ac7b56b32c6d94b82..77470676e896c751a12eca2a6b21046fb6d8f356 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
@@ -5,7 +5,7 @@ from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
def setMinimalCaloSetup() :
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
if not hasattr(svcMgr,'TrigCaloDataAccessSvc'):
- from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc
+ from TrigT2CaloCommon.TrigT2CaloCommonConfig import TrigCaloDataAccessSvc
svcMgr+=TrigCaloDataAccessSvc()
svcMgr.TrigCaloDataAccessSvc.OutputLevel=ERROR
@@ -30,14 +30,16 @@ def _algoHLTCaloCell(name="HLTCaloCellMaker", inputEDM='FSRoI', outputEDM='Cells
def _algoHLTTopoCluster(inputEDM="CellsClusters", OutputLevel=ERROR, algSuffix="") :
from TrigCaloRec.TrigCaloRecConfig import TrigCaloClusterMakerMT_topo
algo = TrigCaloClusterMakerMT_topo(name="TrigCaloClusterMakerMT_topo"+algSuffix, doMoments=True, doLC=False, cells=inputEDM)
- algo.CaloClusters="HLT_TopoCaloCluster"
+ from TrigEDMConfig.TriggerEDMRun3 import recordable
+ algo.CaloClusters=recordable("HLT_TopoCaloClusters"+algSuffix)
algo.OutputLevel=OutputLevel
return algo
def _algoHLTTopoClusterLC(inputEDM="CellsClusters", OutputLevel=ERROR, algSuffix="") :
from TrigCaloRec.TrigCaloRecConfig import TrigCaloClusterMakerMT_topo
algo = TrigCaloClusterMakerMT_topo(name="TrigCaloClusterMakerMT_topo"+algSuffix, doMoments=True, doLC=True, cells=inputEDM)
- algo.CaloClusters="caloclusters"
+ from TrigEDMConfig.TriggerEDMRun3 import recordable
+ algo.CaloClusters=recordable("HLT_TopoCaloClustersLC"+algSuffix)
algo.OutputLevel=OutputLevel
return algo
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py
index 03a7a986123e4e65e16939f810099ef31003eca0..992a3e81c6a4aae6158591c2abdbe1a4b91a3abf 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigT2CaloCommonConfig.py
@@ -1,6 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigDataAccess as _TrigDataAccess
+from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc as _TrigCaloDataAccessSvc
class TrigDataAccess(_TrigDataAccess):
__slots__ = ()
@@ -11,15 +12,39 @@ class TrigDataAccess(_TrigDataAccess):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.GlobalFlags import globalflags
- from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
from AthenaCommon.Logging import logging
log = logging.getLogger(name)
self.loadFullCollections = ( TriggerFlags.doEF() or TriggerFlags.doHLT() )
self.loadAllSamplings = ( TriggerFlags.doLVL2() or TriggerFlags.doHLT() )
+ log.info('Not possible anymore to enable HLT calo offset correction, tools deprecated')
+
+ from RecExConfig.RecFlags import rec
+ transientBS = (rec.readRDO() and not globalflags.InputFormat()=='bytestream')
+ if ( transientBS or TriggerFlags.writeBS() ):
+ if ( not hasattr(svcMgr.ToolSvc,'LArRawDataContByteStreamTool') ):
+ from LArByteStream.LArByteStreamConfig import LArRawDataContByteStreamToolConfig
+ svcMgr.ToolSvc += LArRawDataContByteStreamToolConfig()
+ svcMgr.ToolSvc.LArRawDataContByteStreamTool.DSPRunMode=4
+ svcMgr.ToolSvc.LArRawDataContByteStreamTool.RodBlockVersion=10
+
+ return
+
+class TrigCaloDataAccessSvc(_TrigCaloDataAccessSvc):
+ __slots__ = ()
+
+ def __init__(self, name='TrigCaloDataAccessSvc'):
+ super(TrigCaloDataAccessSvc, self).__init__(name)
+
+ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+ from TriggerJobOpts.TriggerFlags import TriggerFlags
+ from AthenaCommon.GlobalFlags import globalflags
+ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+ from AthenaCommon.Logging import logging
+ log = logging.getLogger(name)
+
if ( globalflags.DatabaseInstance == "COMP200" and TriggerFlags.doCaloOffsetCorrection() ) :
- self.ApplyOffsetCorrection = False
log.warning("Not possible to run BCID offset correction with COMP200")
else:
if TriggerFlags.doCaloOffsetCorrection():
@@ -31,24 +56,18 @@ class TrigDataAccess(_TrigDataAccess):
svcMgr += LArFlatConditionSvc()
svcMgr.LArFlatConditionSvc.OFCInput="/LAR/ElecCalibFlat/OFC"
svcMgr.ProxyProviderSvc.ProviderNames += [ "LArFlatConditionSvc" ]
-
- from CaloTools.CaloLumiBCIDToolDefault import CaloLumiBCIDToolDefault
- theCaloLumiBCIDTool = CaloLumiBCIDToolDefault()
- svcMgr.ToolSvc += theCaloLumiBCIDTool
- self.CaloLumiBCIDTool = theCaloLumiBCIDTool
- self.ApplyOffsetCorrection = True
+
+ from IOVDbSvc.CondDB import conddb
+ conddb.addFolder("LAR_ONL","/LAR/ElecCalibFlat/OFC",className = 'CondAttrListCollection')
+
+ from AthenaCommon.AlgSequence import AthSequencer
+ condSequence = AthSequencer("AthCondSeq")
+ from LArRecUtils.LArRecUtilsConf import LArFlatConditionsAlg_LArOFCFlat_ as LArOFCCondAlg
+ condSequence += LArOFCCondAlg (ReadKey="/LAR/ElecCalibFlat/OFC", WriteKey='LArOFC')
+ from CaloRec.CaloBCIDAvgAlgDefault import CaloBCIDAvgAlgDefault
+ CaloBCIDAvgAlgDefault()
+
else:
log.info('Disable HLT calo offset correction')
- self.ApplyOffsetCorrection = False
-
- from RecExConfig.RecFlags import rec
- transientBS = (rec.readRDO() and not globalflags.InputFormat()=='bytestream')
- if ( transientBS or TriggerFlags.writeBS() ):
- if ( not hasattr(svcMgr.ToolSvc,'LArRawDataContByteStreamTool') ):
- from LArByteStream.LArByteStreamConfig import LArRawDataContByteStreamToolConfig
- svcMgr.ToolSvc += LArRawDataContByteStreamToolConfig()
- svcMgr.ToolSvc.LArRawDataContByteStreamTool.DSPRunMode=4
- svcMgr.ToolSvc.LArRawDataContByteStreamTool.RodBlockVersion=10
return
-
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
index c32240a15d213249cd77cefa84b16edba5365f6b..f2691c8c6ff99d687553ac17d8ef0ad6a077440c 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/share/testDataAccessService.py
@@ -54,8 +54,6 @@ if TriggerFlags.doCalo:
- svcMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection=False
-
from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
algo=T2CaloEgamma_ReFastAlgo("testReFastAlgo")
algo.OutputLevel=VERBOSE
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArCellCont.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArCellCont.cxx
index 3e6ce6c58cfba6200a87d2f89162b9e254abc315..0c124964498876232cff3936678550e305b605fc 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArCellCont.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/LArCellCont.cxx
@@ -17,15 +17,14 @@
#include "EventInfo/EventInfo.h"
#include "EventInfo/EventID.h"
#include "LArElecCalib/ILArMCSymTool.h"
-#include "CaloInterface/ICaloLumiBCIDTool.h"
#include <iostream>
//#include <time.h>
-LArCellCont::LArCellCont() : m_event(0), m_corrBCIDref( corrBCIDref_example ), m_caloLumiBCIDTool(nullptr), m_lumi_block(0), m_bcid(5000), m_larCablingSvc(nullptr), m_BCIDcache(false)
+LArCellCont::LArCellCont() : m_event(0), m_corrBCIDref( corrBCIDref_example ), m_lumi_block(0), m_bcid(5000), m_larCablingSvc(nullptr), m_BCIDcache(false)
{}
StatusCode
-LArCellCont::initialize(bool applyOffsetCorrection) {
+LArCellCont::initialize(bool /*applyOffsetCorrection*/) {
#ifdef TRIGLARCELLDEBUG
std::cout << "LArCellCont \t\t DEBUG \t in initialize" << std::endl;
@@ -95,16 +94,6 @@ if (sc.isFailure()){
return StatusCode::FAILURE;
}
-ICaloLumiBCIDTool* iclbt=0;
- if ( applyOffsetCorrection ) {
- if ( toolSvc->retrieveTool("ICaloLumiBCIDTool/CaloLumiBCIDToolDefault", iclbt).isFailure() ) {
- std::cout << "could not retrieve the tool" << std::endl;
- } else {
- std::cout << "Tool retrieved from within LArCellCont" << std::endl;
- m_caloLumiBCIDTool= iclbt;
- }
- }
-
LArRoI_Map* roiMap;
if(StatusCode::SUCCESS != toolSvc->retrieveTool("LArRoI_Map", roiMap ) )
{std::cout << " Can't get AlgTool LArRoI_Map " << std::endl;
@@ -345,20 +334,17 @@ void LArCellCont::lumiBlock_BCID(const unsigned int lumi_block, const unsigned i
void LArCellCont::updateBCID() {
//std::clock_t startT,endT;
//startT = clock();
- int bcid=m_bcid;
std::map<HWIdentifier,int>::const_iterator end = m_indexset.end ();
int indexsetmax = m_indexset.size();
//m_corrBCID.resize(1);
- if ( (m_larCablingSvc == 0) || (m_caloLumiBCIDTool==0) ) return;
+ if ( (m_larCablingSvc == 0) ) return;
std::vector<float>& BCID0=m_corrBCID[0];
BCID0.resize(indexsetmax+1);
std::map<HWIdentifier,int>::const_iterator beg = m_indexset.begin();
for( ; beg != end ; ++beg ) {
- HWIdentifier hwid = (*beg).first;
int idx = (*beg).second;
if ( idx < (int)BCID0.size() ){
- Identifier id = m_larCablingSvc->cnvToIdentifier(hwid);
- float corr = m_caloLumiBCIDTool->average(id,bcid);
+ float corr = 0.0;
BCID0[idx] = corr;
}
} // end of HWID
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx
index 689fda41a0a3de1c7036c0beaf318c8158f049e4..893faf804d9c112735c482a58bd749c01ca02ea9 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.cxx
@@ -11,6 +11,7 @@
TrigCaloDataAccessSvc::TrigCaloDataAccessSvc( const std::string& name, ISvcLocator* pSvcLocator )
: base_class( name, pSvcLocator ), m_lateInitDone(false), m_nSlots(0) {
+ m_bcidAvgKey="CaloBCIDAverage";
}
TrigCaloDataAccessSvc::~TrigCaloDataAccessSvc() {}
@@ -21,6 +22,7 @@ StatusCode TrigCaloDataAccessSvc::initialize() {
CHECK( m_tileDecoder.retrieve() );
CHECK( m_robDataProvider.retrieve() );
CHECK( m_regionSelector.retrieve() );
+ CHECK( m_bcidAvgKey.initialize() );
return StatusCode::SUCCESS;
}
@@ -63,6 +65,7 @@ StatusCode TrigCaloDataAccessSvc::loadCollections ( const EventContext& context,
LArTT_Selector<LArCellCont>& loadedCells ) {
std::vector<IdentifierHash> requestHashIDs;
+ SG::ReadHandle<CaloBCIDAverage> avg (m_bcidAvgKey, context);
ATH_MSG_DEBUG( "LArTT requested for event " << context << " and RoI " << roi );
unsigned int sc = prepareLArCollections( context, roi, sampling, detID );
@@ -143,6 +146,7 @@ StatusCode TrigCaloDataAccessSvc::loadFullCollections ( const EventContext& cont
ConstDataVector<CaloCellContainer>& cont ) {
+ SG::ReadHandle<CaloBCIDAverage> avg (m_bcidAvgKey, context);
// Gets all data
{
std::lock_guard<std::mutex> dataPrepLock { m_dataPrepMutex };
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h
index ff28aa31d2959b52fc95b60d700ffc1352c52e61..4b1b139db7388897f0d85808b68d9134ae00d33a 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigCaloDataAccessSvc.h
@@ -21,7 +21,8 @@
#include "IRegionSelector/IRegSelSvc.h"
#include "TrigT2CaloCommon/ITrigCaloDataAccessSvc.h"
#include "AthenaMonitoring/GenericMonitoringTool.h"
-
+#include "StoreGate/ReadHandleKey.h"
+#include "CaloEvent/CaloBCIDAverage.h"
class TrigCaloDataAccessSvc : public extends<AthService, ITrigCaloDataAccessSvc> {
public:
@@ -65,6 +66,8 @@ class TrigCaloDataAccessSvc : public extends<AthService, ITrigCaloDataAccessSvc>
Gaudi::Property<bool> m_applyOffsetCorrection { this, "ApplyOffsetCorrection", false, "Enable offset correction" };
+ SG::ReadHandleKey<CaloBCIDAverage> m_bcidAvgKey ;
+
void reset_LArCol ( LArCellCollection* coll ){
for(LArCellCollection::iterator ii=coll->begin();ii!=coll->end();++ii)
(*ii)->setEnergyFast(0.0);
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
index 429c5d13f85b62fa17f92e82d558eed90eccfa66..d7bfed8bf691e3893d854596d19690401eca5eb2 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.cxx
@@ -145,25 +145,6 @@ StatusCode TrigDataAccess::initialize()
m_zdc_rods.push_back(0x00830002);
m_zdc_rods.push_back(0x00830003);
- // luminosity tool
- if ( m_applyOffsetCorrection ) {
- ATH_MSG_INFO("Apply BCID/<mu> dependent offset correction");
- if ( m_caloLumiBCIDTool.retrieve().isFailure() ) {
- ATH_MSG_FATAL("Could not find m_caloLumiBCID");
- return StatusCode::FAILURE;
- }
- //
- //if ( m_lumiTool.retrieve().isFailure() ) {
- // (*m_log) << MSG::FATAL << "Could not find m_lumiTool" <<endmsg;
- // return StatusCode::FAILURE;
- //} else {
- // std::cout << "Retrieve lumiTool successfully" << std::endl;
- //}
- } else {
- ATH_MSG_INFO("No BCID/<mu> dependent offset correction");
- m_caloLumiBCIDTool.disable();
- }
-
ATH_CHECK(m_lardecoder.retrieve());
ATH_CHECK(m_tiledecoder.retrieve());
ATH_CHECK(m_zdcdecoder.retrieve());
@@ -207,7 +188,7 @@ StatusCode TrigDataAccess::beginRunHandle(IOVSVC_CALLBACK_ARGS){
}
m_larcell = new LArCellCont();
- if ( (m_larcell->initialize(m_applyOffsetCorrection)).isFailure() ){
+ if ( (m_larcell->initialize(false)).isFailure() ){
ATH_MSG_FATAL("Could not init larcell");
}
// set frequency
@@ -605,7 +586,6 @@ StatusCode TrigDataAccess::LoadCollections (
} else { // End of if small size
m_lardecoder->setRobFrag(m_robFrags[i]);
m_lardecoder->fillCollectionHLT(roddata1,roddatasize,*col);
- if (m_applyOffsetCorrection) m_larcell->applyBCIDCorrection(source_id);
// Accumulates inferior byte from ROD Decoder
m_error|=m_lardecoder->report_error();
} //roddatasize < 3
@@ -942,7 +922,6 @@ StatusCode TrigDataAccess::LoadFullCollections (
else {
m_lardecoder->setRobFrag(m_robFrags[i]);
m_lardecoder->fillCollectionHLT(roddata1,roddatasize,*col);
- if (m_applyOffsetCorrection) m_larcell->applyBCIDCorrection(source_id);
// Accumulates inferior byte from ROD Decoder
m_error|=m_lardecoder->report_error();
}
@@ -1266,7 +1245,6 @@ StatusCode TrigDataAccess::LoadFullCollections (
else {
m_lardecoder->setRobFrag(m_robFrags[i]);
m_lardecoder->fillCollectionHLT(roddata1,roddatasize,*col);
- if (m_applyOffsetCorrection) m_larcell->applyBCIDCorrection(source_id);
// Accumulates inferior byte from ROD Decoder
m_error|=m_lardecoder->report_error();
}
@@ -1350,7 +1328,6 @@ StatusCode TrigDataAccess::LoadFullCollections (
void TrigDataAccess::handle(const Incident & inc ) {
EventContext context = inc.context();
m_larcell->eventNumber(context.eventID().event_number());
- if (m_applyOffsetCorrection) m_larcell->lumiBlock_BCID(context.eventID().lumi_block(), context.eventID().bunch_crossing_id());
m_tilecell->eventNumber(context.eventID().event_number());
m_d0cells.clear();
//m_full_vrodid32.clear();
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.h b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.h
index 2afd63361139d9f1edb049fdb16ab174f735603b..98769293be1287b5be77a6f2123953200604c317 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/src/TrigDataAccess.h
@@ -88,9 +88,7 @@ public:
m_lardecoder("LArRodDecoder/LArRodDecoder"),
m_tiledecoder("TileROD_Decoder/TileROD_Decoder"),
m_zdcdecoder("ZdcByteStreamReadV1V2Tool/ZdcByteStreamTool"),
- m_zdcrectool("ZdcRecChannelTool/ZdcByteChannelTool"),
- m_applyOffsetCorrection(true),
- m_caloLumiBCIDTool("ICaloLumiBCIDTool/CaloLumiBCIDToolDefault")
+ m_zdcrectool("ZdcRecChannelTool/ZdcByteChannelTool")
//m_lumiTool("LuminosityTool")
// m_present_etamin(-10.0),
// m_present_etamax(10.0),
@@ -105,9 +103,6 @@ public:
declareProperty("TileROD_Decoder",m_tiledecoder,"TileROD_Decoder Tool for ByteStream Conversion");
declareProperty("ZdcByteStreamReadV1V2Tool",m_zdcdecoder,"ZdcByteStreamReadV1V2Tool for ByteStream Conversion");
declareProperty("ZdcRecTool",m_zdcrectool,"ZdcRecTool for RawChannel rec");
- declareProperty("ApplyOffsetCorrection",m_applyOffsetCorrection,"Apply offset correction or not (false by default)");
- declareProperty("CaloLumiBCIDTool",m_caloLumiBCIDTool,"Tool for BCID pileup offset average correction");
- //declareProperty("LuminosityTool",m_lumiTool,"Luminosity Tool");
// New property for MET slice
declareProperty("loadFullCollections", m_usefullcoll=false);
// Load all samplings in robDataProviderSvc
@@ -388,10 +383,6 @@ private:
/** Pointer to the Zdc Rec Tool. This will perform
the real ByteStream Conversion for Zdc data. */
ToolHandle<ZdcRecChannelTool> m_zdcrectool;
- /** CaloLumiCorrection */
- bool m_applyOffsetCorrection;
- ToolHandle<ICaloLumiBCIDTool> m_caloLumiBCIDTool;
- //ToolHandle<ILuminosityTool> m_lumiTool;
/** robFragments pointers */
std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*> m_robFrags;
/** space for Tile Calorimeter Identifier */
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_dataaccess.sh b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_dataaccess.sh
index a6ccf1fac98804778adbbadae65c2a48f3a69c00..c557fef623e725d153ade513b8e024f5eae07f00 100755
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_dataaccess.sh
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/test/test_dataaccess.sh
@@ -2,5 +2,5 @@
# art-type: build
# art-ci: master
-athena.py --concurrent-events=1 --threads=1 --evtMax=10 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" -c 'enableViews=False;doMuon=False;doID=False' TrigT2CaloCommon/testDataAccessService.py
+athena.py --concurrent-events=1 --threads=1 --evtMax=10 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" -c 'isOnline=True;enableViews=False;doMuon=False;doID=False' TrigT2CaloCommon/testDataAccessService.py
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaConfig.py
index 014899401a46c7325169cfafa13849111b75bee5..7a913fcf5f1225e52637c49161b7303983a3f9a7 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/python/TrigT2CaloEgammaConfig.py
@@ -416,8 +416,9 @@ class T2CaloEgamma_ReFastAlgo (T2CaloEgammaReFastAlgo):
super(T2CaloEgamma_ReFastAlgo, self).__init__(name)
# here put your customizations
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc
- svcMgr += TrigCaloDataAccessSvc()
+ if not hasattr(svcMgr,'TrigCaloDataAccessSvc'):
+ from TrigT2CaloCommon.TrigT2CaloCommonConfig import TrigCaloDataAccessSvc
+ svcMgr += TrigCaloDataAccessSvc()
samp2 = EgammaReSamp2FexConfig(name="ReFaAlgoSamp2FexConfig",
trigDataAccessMT=svcMgr.TrigCaloDataAccessSvc,
ExtraInputs=[( 'LArOnOffIdMapping' , 'ConditionStore+LArOnOffIdMap' )])
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
index 71dabbb2646db4c15aea3657651f644ff36f5816..2b3a60b7fe425f950020cddf6efcd0d00c4e6898 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.cxx
@@ -34,6 +34,7 @@ StatusCode T2CaloEgammaReFastAlgo::initialize()
ATH_CHECK(m_regionSelector.retrieve());
ATH_CHECK(m_clusterContainerKey.initialize());
ATH_CHECK(m_roiCollectionKey.initialize());
+ ATH_CHECK( m_bcidAvgKey.initialize() );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h
index 0e5026f2598dd6ab37b90aa00e884bd64cd674ef..21eea9b13741ac7122a5196a92f003f847d6b581 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h
+++ b/Trigger/TrigAlgorithms/TrigT2CaloEgamma/src/T2CaloEgammaReFastAlgo.h
@@ -22,6 +22,7 @@
#include "IRegionSelector/IRegSelSvc.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
+#include "CaloEvent/CaloBCIDAverage.h"
#include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
#include "TrigT2CaloCalibration/IEgammaCalibration.h"
#include "xAODTrigCalo/TrigEMCluster.h"
@@ -68,6 +69,8 @@ class T2CaloEgammaReFastAlgo : public AthReentrantAlgorithm {
ToolHandleArray<IReAlgToolCalo> m_emAlgTools{
this, "IReAlgToolList", {}, "list of ReAlgToolCalos for feature extraction"};
+ SG::ReadHandleKey<CaloBCIDAverage> m_bcidAvgKey {
+ this, "BCIDAvgKey", "CaloBCIDAverage", "" };
SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey{
this, "RoIs", "OutputRoIs", "input RoIs"};
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.h
index 176351abd4feae4f7ac0d62c3c78ee12efa81702..f2b6c8ecffa77837ee73916fb3b99eb76e68809c 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.h
@@ -121,10 +121,12 @@ namespace Trig {
* @param[in] eventStore Event store pointer. To migrate to readHandles with the rest of the TDT soon
* @param[in] condition Condition requirement. Only physics currently supported.
* @param[in] oneFeaturePerLeg If true, only collects the final feature from each object which passed the event for the Chain Group.
- * @return ElementLinkVector with one entry per located feature for the ChainGroup's chain(s)
+ * @return Vector of LinkInfo, where each entry wraps an ElementLink to the feature, and the Decision object it came from.
**/
template<class CONTAINER>
- const ElementLinkVector<CONTAINER> features(EventPtr_t eventStore, unsigned int condition = TrigDefs::Physics, const bool oneFeaturePerLeg = true) const;
+ const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > features(EventPtr_t eventStore,
+ unsigned int condition = TrigDefs::Physics,
+ const bool oneFeaturePerLeg = true) const;
//
const std::vector< std::string >& patterns() const {return m_patterns;}
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.icc b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.icc
index 67f865230b0dad2619902e22fb01d41eb27d371a..b5f2841f4d3baf7e921350e87be3c44c9e8bb04d 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.icc
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/ChainGroup.icc
@@ -1,56 +1,64 @@
-template<class CONTAINER>
-const ElementLinkVector<CONTAINER> Trig::ChainGroup::features(EventPtr_t eventStore, unsigned int condition, const bool oneFeaturePerLeg) const {
-
- // Proper adherence to the condition bits in Run 3 is to follow.
-
- bool errState = false;
- if ( !(condition & TrigDefs::Physics) ) {
- ATH_MSG_ERROR("Only TrigDefs::Physics is currently supported for Run 3 feature retrieval");
- errState = true;
- }
- if ( condition & TrigDefs::allowResurrectedDecision ) {
- ATH_MSG_ERROR("TrigDefs::allowResurrectedDecision is not yet supported for feature retrieval for Run 3");
- errState = true;
- }
-
- // TODO when we decide what happens to CacheGlobalMemory - this needs to be updated to use a ReadHandle
- const TrigCompositeUtils::DecisionContainer* navigationSummaryContainer = nullptr;
- if (eventStore->retrieve(navigationSummaryContainer, "HLTSummary").isFailure() || navigationSummaryContainer == nullptr) {
- ATH_MSG_ERROR("Unable to read Run 3 trigger navigation. Cannot retrieve features.");
- errState = true;
- }
-
- // We just support Physics decision for now
- const TrigCompositeUtils::Decision* terminusNode = nullptr;
-
- if (!errState) {
- for (const TrigCompositeUtils::Decision* decision : *navigationSummaryContainer) {
- if (decision->name() == "HLTPassRaw") {
- terminusNode = decision;
- break;
- }
- }
- if (terminusNode == nullptr) {
- ATH_MSG_ERROR("Unable to locate HLTPassRaw element of HLTSummary");
- errState = true;
- }
- }
-
- if (errState) {
- return ElementLinkVector<CONTAINER>();
- }
-
- // For each chain, collect Navigation information
- std::vector< ElementLinkVector<TrigCompositeUtils::DecisionContainer> > allLinearNavigationPaths;
-
- // Loop over HLT chains
- std::set<const TrigConf::HLTChain*>::const_iterator chIt;
- for (chIt=conf_chain_begin(); chIt != conf_chain_end(); ++chIt) {
- const HLT::Chain* fchain = cgm()->chain(**chIt);
- if (fchain) {
- TrigCompositeUtils::recursiveGetDecisions(terminusNode, allLinearNavigationPaths, fchain->getChainHashId());
- }
- }
-
- return TrigCompositeUtils::getFeaturesOfType<CONTAINER>(allLinearNavigationPaths, oneFeaturePerLeg);
-}
+template<class CONTAINER>
+const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::ChainGroup::features(EventPtr_t eventStore,
+ unsigned int condition, const bool oneFeaturePerLeg) const {
+
+ // Proper adherence to the condition bits in Run 3 is to follow.
+ bool errState = false;
+ if ( !(condition & TrigDefs::Physics) ) {
+ ATH_MSG_ERROR("Only TrigDefs::Physics is currently supported for Run 3 feature retrieval");
+ errState = true;
+ }
+ if ( condition & TrigDefs::allowResurrectedDecision ) {
+ ATH_MSG_ERROR("TrigDefs::allowResurrectedDecision is not yet supported for feature retrieval for Run 3");
+ errState = true;
+ }
+
+ // TODO when we decide what happens to CacheGlobalMemory - this needs to be updated to use a ReadHandle
+ const TrigCompositeUtils::DecisionContainer* navigationSummaryContainer = nullptr;
+ if (eventStore->retrieve(navigationSummaryContainer, "HLTSummary").isFailure() || navigationSummaryContainer == nullptr) {
+ ATH_MSG_ERROR("Unable to read Run 3 trigger navigation. Cannot retrieve features.");
+ errState = true;
+ }
+
+ // We just support Physics decision for now
+ const TrigCompositeUtils::Decision* terminusNode = nullptr;
+
+ if (!errState) {
+ for (const TrigCompositeUtils::Decision* decision : *navigationSummaryContainer) {
+ if (decision->name() == "HLTPassRaw") {
+ terminusNode = decision;
+ break;
+ }
+ }
+ if (terminusNode == nullptr) {
+ ATH_MSG_ERROR("Unable to locate HLTPassRaw element of HLTSummary");
+ errState = true;
+ }
+ }
+
+ if (errState) {
+ ATH_MSG_ERROR("Encountered one or more errors in Trig::ChainGroup::features. Returning empty vector.");
+ return std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >();
+ }
+
+ // For each chain, collect Navigation information
+ std::vector< ElementLinkVector<TrigCompositeUtils::DecisionContainer> > allLinearNavigationPaths;
+
+ // Loop over HLT chains
+ std::set<const TrigConf::HLTChain*>::const_iterator chIt;
+ for (chIt=conf_chain_begin(); chIt != conf_chain_end(); ++chIt) {
+ const HLT::Chain* fchain = cgm()->chain(**chIt);
+ if (fchain) {
+ TrigCompositeUtils::recursiveGetDecisions(terminusNode, allLinearNavigationPaths, fchain->getChainHashId());
+ ATH_MSG_DEBUG("Added all navigation paths for chain " << fchain->getChainName() << ", total paths:" << allLinearNavigationPaths.size());
+ } else {
+ ATH_MSG_ERROR("Cannot access configuration for one of the ChainGroup's chains");
+ }
+ }
+
+ if (allLinearNavigationPaths.size() == 0) {
+ ATH_MSG_WARNING("No navigation paths found for this chain group of " << names().size() << " chains.");
+ }
+
+ return TrigCompositeUtils::getFeaturesOfType<CONTAINER>(allLinearNavigationPaths, oneFeaturePerLeg);
+}
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.h b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.h
index fb2e7d9001d9252e13b11af400fbeafbd9dc5ed0..f69d411b4a4bbc8b6643cad2a70bb55e3692a4e0 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.h
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.h
@@ -107,17 +107,27 @@ namespace Trig {
/**
* @brief Runs 3+. Returns all features related to given chain group
+ * @param[in] group Chain group to return features for.
+ * @param[in] condition Condition bits which the chain group must satisfy.
+ * @param[in] oneFeaturePerLeg If true, only collects the final feature from each object which passed the event for the Chain Group.
+ * @return Vector of LinkInfo, where each entry wraps an ElementLink to the feature, and the Decision object it came from.
**/
template<class CONTAINER>
- const ElementLinkVector<CONTAINER> features(const Trig::ChainGroup* group,
- unsigned int condition = TrigDefs::Physics) const;
+ const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > features(const Trig::ChainGroup* group,
+ const unsigned int condition = TrigDefs::Physics,
+ const bool oneFeaturePerLeg = true) const;
/**
* @brief Runs 3+. Returns features related to given chain
+ * @param[in] group Chain group to return features for.
+ * @param[in] condition Condition bits which the chain group must satisfy.
+ * @param[in] oneFeaturePerLeg If true, only collects the final feature from each object which passed the event for the Chain Group.
+ * @return Vector of LinkInfo, where each entry wraps an ElementLink to the feature, and the Decision object it came from.
**/
template<class CONTAINER>
- const ElementLinkVector<CONTAINER> features(const std::string& chainName = "HLT_.*",
- unsigned int condition = TrigDefs::Physics) const;
+ const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > features(const std::string& chainName = "HLT_.*",
+ const unsigned int condition = TrigDefs::Physics,
+ const bool oneFeaturePerLeg = true) const;
/**
* @brief gives back feature matching (by seeding relation)
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.icc b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.icc
index 7071fca4c1bcf341e3182e777f5d5b506f818f1b..0d0f091f5e8b96e24868616fe84b28b0a4a47c2f 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.icc
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/TrigDecisionTool/DecisionAccess.icc
@@ -1,57 +1,59 @@
-#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
-
-template<class T>
-const Trig::Feature<T> Trig::DecisionAccess::ancestor(const HLT::TriggerElement* te, std::string label) const {
- Trig::Feature<T> f;
- std::vector<Trig::Feature<T> > data;
- FeatureAccessImpl::collect<T>(te, data, label, TrigDefs::alsoDeactivateTEs, "", const_cast<HLT::TrigNavStructure*>(cgm()->navigation()));
-
- BOOST_FOREACH( Feature<T>& f, data ) {
- if ( f.owned() ) {
- cgm()->deleteAtTheEndOfEvent( const_cast<T*>( f.cptr() ) );
- }
- }
-
- if (data.size() == 1)
- f = data[0];
- return f;
-}
-
-
-template<class T>
-const std::vector<Trig::Feature<T> > Trig::DecisionAccess::ancestors(const HLT::TriggerElement* te, std::string label, unsigned int condition, const std::string& teName) const {
- std::vector<Trig::Feature<T> > data;
- FeatureAccessImpl::collect<T>(te, data, label, condition, teName, const_cast<HLT::TrigNavStructure*>(cgm()->navigation()));
- BOOST_FOREACH( Feature<T>& f, data ) {
- if ( f.owned() ) {
- cgm()->deleteAtTheEndOfEvent(const_cast<T*>( f.cptr() ));
- }
- }
- return data;
-}
-#else
-template<class T>
-const Trig::Feature<T> Trig::DecisionAccess::ancestor(const HLT::TriggerElement* /*te*/, std::string /*label*/) const {
- ATH_MSG_WARNING("DecisionAccess::ancestor not implemented in Standalone mode, since it needs compile-time type information. Returning empty Feature");
- return Trig::Feature<T>();
-}
-template<class T>
-const std::vector<Trig::Feature<T> > Trig::DecisionAccess::ancestors(const HLT::TriggerElement* /*te*/, std::string /*label*/, unsigned int /*condition*/, const std::string& /*teName*/) const {
- ATH_MSG_WARNING("DecisionAccess::ancestor not implemented in Standalone mode, since it needs compile-time type information. Returning empty vector");
- return std::vector<Trig::Feature<T> >();
-}
-
-#endif // ASGTOOL_ATHENA
-
-template<class CONTAINER>
-const ElementLinkVector<CONTAINER> Trig::DecisionAccess::features(const Trig::ChainGroup* group,
- unsigned int condition) const {
- return group->features<CONTAINER>(cgm()->store(), condition, /*one feature per leg*/ true);
-}
-
-template<class CONTAINER>
-const ElementLinkVector<CONTAINER> Trig::DecisionAccess::features(const std::string& chainName,
- unsigned int condition) const {
- const Trig::ChainGroup *g = cgm()->createChainGroup(Trig::convertStringToVector(chainName));
- return features<CONTAINER>(g,condition);
-}
\ No newline at end of file
+#if defined(ASGTOOL_ATHENA) && !defined(XAOD_ANALYSIS)
+
+template<class T>
+const Trig::Feature<T> Trig::DecisionAccess::ancestor(const HLT::TriggerElement* te, std::string label) const {
+ Trig::Feature<T> f;
+ std::vector<Trig::Feature<T> > data;
+ FeatureAccessImpl::collect<T>(te, data, label, TrigDefs::alsoDeactivateTEs, "", const_cast<HLT::TrigNavStructure*>(cgm()->navigation()));
+
+ BOOST_FOREACH( Feature<T>& f, data ) {
+ if ( f.owned() ) {
+ cgm()->deleteAtTheEndOfEvent( const_cast<T*>( f.cptr() ) );
+ }
+ }
+
+ if (data.size() == 1)
+ f = data[0];
+ return f;
+}
+
+
+template<class T>
+const std::vector<Trig::Feature<T> > Trig::DecisionAccess::ancestors(const HLT::TriggerElement* te, std::string label, unsigned int condition, const std::string& teName) const {
+ std::vector<Trig::Feature<T> > data;
+ FeatureAccessImpl::collect<T>(te, data, label, condition, teName, const_cast<HLT::TrigNavStructure*>(cgm()->navigation()));
+ BOOST_FOREACH( Feature<T>& f, data ) {
+ if ( f.owned() ) {
+ cgm()->deleteAtTheEndOfEvent(const_cast<T*>( f.cptr() ));
+ }
+ }
+ return data;
+}
+#else
+template<class T>
+const Trig::Feature<T> Trig::DecisionAccess::ancestor(const HLT::TriggerElement* /*te*/, std::string /*label*/) const {
+ ATH_MSG_WARNING("DecisionAccess::ancestor not implemented in Standalone mode, since it needs compile-time type information. Returning empty Feature");
+ return Trig::Feature<T>();
+}
+template<class T>
+const std::vector<Trig::Feature<T> > Trig::DecisionAccess::ancestors(const HLT::TriggerElement* /*te*/, std::string /*label*/, unsigned int /*condition*/, const std::string& /*teName*/) const {
+ ATH_MSG_WARNING("DecisionAccess::ancestor not implemented in Standalone mode, since it needs compile-time type information. Returning empty vector");
+ return std::vector<Trig::Feature<T> >();
+}
+
+#endif // ASGTOOL_ATHENA
+
+template<class CONTAINER>
+const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::DecisionAccess::features(const Trig::ChainGroup* group,
+ const unsigned int condition,
+ const bool oneFeaturePerLeg) const {
+ return group->features<CONTAINER>(cgm()->store(), condition, oneFeaturePerLeg);
+}
+
+template<class CONTAINER>
+const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> > Trig::DecisionAccess::features(const std::string& chainName,
+ const unsigned int condition,
+ const bool oneFeaturePerLeg) const {
+ const Trig::ChainGroup *g = cgm()->createChainGroup(Trig::convertStringToVector(chainName));
+ return features<CONTAINER>(g,condition,oneFeaturePerLeg);
+}
diff --git a/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
index c3c71b0df561f13849977389cc0519c09f136074..bd55d5230262547733f810ae546a42d4230bb2b0 100644
--- a/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfData/CMakeLists.txt
@@ -6,7 +6,11 @@
atlas_subdir( TrigConfData )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( CxxUtils )
+atlas_depends_on_subdirs( PUBLIC
+ Control/AthenaKernel
+ PRIVATE
+ CxxUtils
+ )
# External dependencies:
find_package( Boost REQUIRED )
@@ -15,7 +19,7 @@ find_package( Boost REQUIRED )
atlas_add_library ( TrigConfData TrigConfData/*.h src/*.cxx
PUBLIC_HEADERS TrigConfData
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AthenaKernel )
atlas_add_test( ConstIter SOURCES test/itertest.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/DataStructure.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/DataStructure.h
index 3e5c1c35775ce06ed1d1f2bf74569d503bad20fa..3cc0a7a48bbc8431213ed86e819f3cbf691265e1 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/DataStructure.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/DataStructure.h
@@ -62,9 +62,17 @@ namespace TrigConf {
/** Access to the underlying data, if needed */
const ptree & data() const { return m_data; }
- /** Access to simple attribute */
+ /** Access to simple attribute
+ * @param key The path to the attribute name, relative to the current one in form "path.to.child"
+ */
std::string operator[](const std::string & key) const;
+ /** Access to simple attribute
+ * @param key The path to the attribute name, relative to the current one in form "path.to.child"
+ * @param ignoreIfMissing Controls the behavior in case of missing configuration child
+ */
+ std::string getAttribute(const std::string & key, bool ignoreIfMissing = false) const;
+
/** Access to array structure
* @param pathToChild The path to the configuration child, relative to the current one in form "path.to.child"
* @param ignoreIfMissing Controls the behavior in case of missing configuration child
@@ -91,6 +99,7 @@ namespace TrigConf {
/** Access to initialized state */
explicit operator bool() const { return m_initialized; }
+ bool isValid() const { return m_initialized; }
/** Check if children exist */
bool empty() const { return m_data.empty(); }
@@ -113,7 +122,7 @@ namespace TrigConf {
protected:
- bool m_initialized { false }; //!< if initialized, the underlying ptree is valid (can be empty)
+ bool m_initialized { false }; //!< if initialized, the underlying ptree is has been assigned to (can be empty)
ptree m_data; //!< object holding the configuration data
@@ -121,5 +130,11 @@ namespace TrigConf {
}
+#include "AthenaKernel/CLASS_DEF.h"
+CLASS_DEF( TrigConf::DataStructure , 98904516 , 1 )
+
+#include "AthenaKernel/CondCont.h"
+CONDCONT_DEF( TrigConf::DataStructure , 265887802 );
+
#endif
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/HLTMenu.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/HLTMenu.h
index 98433f4c0ebf9650788f98775c8c4985360acd2d..21fb81ec4d288046a61a56b43b518b7de83be8d2 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/HLTMenu.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/HLTMenu.h
@@ -16,7 +16,7 @@ namespace TrigConf {
*
* Provides access to menu attributes like its name and to the trigger chains
*/
- class HLTMenu final : virtual public DataStructure {
+ class HLTMenu final : public DataStructure {
public:
/** Constructor */
@@ -51,7 +51,13 @@ namespace TrigConf {
*/
const_iterator end() const;
};
-
}
+#include "AthenaKernel/CLASS_DEF.h"
+CLASS_DEF( TrigConf::HLTMenu , 24176960 , 1 )
+
+#include "AthenaKernel/CondCont.h"
+CONDCONT_DEF( TrigConf::HLTMenu , 155284098 );
+
+
#endif
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h
index b90cf64372d995918202f8bb04dd114b2f5da3b3..b65c87717ec93d95a0370e58b7368fc834d46085 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1Menu.h
@@ -67,4 +67,10 @@ namespace TrigConf {
}
+#include "AthenaKernel/CLASS_DEF.h"
+CLASS_DEF( TrigConf::L1Menu , 26419484 , 1 )
+
+#include "AthenaKernel/CondCont.h"
+CONDCONT_DEF( TrigConf::L1Menu , 11747932 );
+
#endif
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/DataStructure.cxx b/Trigger/TrigConfiguration/TrigConfData/src/DataStructure.cxx
index 433f9827ab1303b338b5d29eaff8cf49ca0187d4..6879b08edcd9c697fb774a5812894ef4b36002a9 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/DataStructure.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/DataStructure.cxx
@@ -47,10 +47,27 @@ TrigConf::DataStructure::operator[](const std::string & key) const
throw runtime_error(string("Structure \"") + key + "\" is not a simple attribute but an object {}, it needs to be accessed via getObject(\"" + key + "\") -> DataStructure");
}
}
-
return obj.data();
}
+std::string
+TrigConf::DataStructure::getAttribute(const std::string & key, bool ignoreIfMissing) const
+{
+ const auto & obj = m_data.get_child_optional(key);
+ if( !obj && ignoreIfMissing ) {
+ return "";
+ }
+ // check if the key points to a plain string value
+ if ( !obj.get().empty() ) {
+ if ( obj.get().front().first.empty() ) {
+ throw runtime_error(string("Structure \"") + key + "\" is not a simple attribute but a list [], it needs to be accessed via getList(\"" + key + "\") -> vector<DataStructure>");
+ } else {
+ throw runtime_error(string("Structure \"") + key + "\" is not a simple attribute but an object {}, it needs to be accessed via getObject(\"" + key + "\") -> DataStructure");
+ }
+ }
+ return obj.get().data();
+}
+
std::vector<TrigConf::DataStructure>
TrigConf::DataStructure::getList(const std::string & pathToChild, bool ignoreIfMissing) const
{
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
index c734a5a6d790e2bba3dd533f3dd171ff658ea191..d67a53b5fcda1e7bd7322eb089f1a92b654884b6 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/src/HLTConfigSvc.cxx
@@ -146,6 +146,35 @@ HLTConfigSvc::initialize() {
dummyChains["HLT_e3_etcut"] = "L1_EM3";
dummyChains["HLT_e5_etcut"] = "L1_EM3";
dummyChains["HLT_e7_etcut"] = "L1_EM7";
+ // for menu test
+ dummyChains["HLT_2mu4_bBmumu_L12MU4"] = "L1_2MU4";
+ dummyChains["HLT_2mu4_bJpsimumu_L12MU4"] = "L1_2MU4";
+ dummyChains["HLT_2mu4_bUpsimumu_L12MU4"] = "L1_2MU4";
+ dummyChains["HLT_2mu6"] = "L1_2MU6";
+ dummyChains["HLT_2mu6Comb"] = "L1_2MU6";
+ dummyChains["HLT_2mu6_bJpsimumu_L12MU6"] = "L1_2MU6";
+ dummyChains["HLT_3j200"] = "L1_J50";
+ dummyChains["HLT_5j70_0eta240"] = "L1_J50";
+ dummyChains["HLT_e3_etcut1step"] = "L1_EM3";
+ dummyChains["HLT_e3_etcut_mu6"] = "L1_EM8I_MU10";
+ dummyChains["HLT_g5_etcut"] = "L1_EM3";
+ dummyChains["HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet20"] = "L1_RD0_FILLED";
+ dummyChains["HLT_j225_gsc420_boffperf_split20"] = "L1_J100";
+ dummyChains["HLT_j260_320eta490"] = "L1_J100";
+ dummyChains["HLT_j420"] = "L1_J100";
+ dummyChains["HLT_j45"] = "L1_J20";
+ dummyChains["HLT_j460_a10_lcw_subjes"] = "L1_J100";
+ dummyChains["HLT_j460_a10r"] = "L1_J100";
+ dummyChains["HLT_j85"] = "L1_J20";
+ dummyChains["HLT_mu20_ivar"] = "L1_MU20";
+ dummyChains["HLT_mu6"] = "L1_MU6";
+ dummyChains["HLT_mu6Comb"] = "L1_MU6";
+ dummyChains["HLT_mu6fast"] = "L1_MU6";
+ dummyChains["HLT_mu6msonly"] = "L1_MU6";
+ dummyChains["HLT_mu6nol1"] = "L1_MU6";
+ dummyChains["HLT_xe30_L1XE10"] = "L1_XE20";
+ dummyChains["HLT_xe65_L1XE50"] = "L1_XE20";
+
m_HLTFrame.setMergedHLT( m_setMergedHLT );
for (const auto& mapPair : dummyChains) {
const std::string& chainName = mapPair.first;
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.cxx
index dca4e4d7947f48479d54a5621e7e87c66e347baa..5aab7c72ff787b0f2938ec8bac1488d158f90fd2 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.cxx
@@ -79,10 +79,15 @@ StatusCode TrigMultiTrkHypoMT::initialize()
Gaudi::Property<std::vector<float>> m_nTrkMassMin { this, "nTrkMassMin", {0},""}; // both min+max need to be defined
Gaudi::Property<std::vector<float>> m_nTrkMassMax { this, "nTrkMassMax", {-1},""};
*/
-
- ATH_CHECK( m_trackParticleContainerKey.initialize() );
- renounce(m_trackParticleContainerKey);
-
+ if(m_particleType == 0){
+ ATH_CHECK( m_trackParticleContainerKey.initialize() );
+ renounce(m_trackParticleContainerKey);
+ } else if (m_particleType == 1){
+ ATH_CHECK( m_muonContainerKey.initialize() );
+ renounce(m_muonContainerKey);
+ } else{
+ ATH_MSG_ERROR("Particle type > 1 requested, we are not configured for that yet!");
+ }
ATH_CHECK( m_bphysHelperTool.retrieve() );
if ( not m_monTool.name().empty() ) {
@@ -167,6 +172,7 @@ StatusCode TrigMultiTrkHypoMT::execute( const EventContext& context) const
//all that is necessary.
//tracks are SG::ReadHandle<xAOD::TrackParticleContainer>
+ if(m_particleType == 0){
auto tracks = ViewHelper::makeHandle( *viewELInfo.link, m_trackParticleContainerKey, context );
ATH_CHECK( tracks.isValid() );
//so each time the loop starts, tracks is reset to contain tracks from a different view
@@ -177,7 +183,7 @@ StatusCode TrigMultiTrkHypoMT::execute( const EventContext& context) const
const xAOD::TrackParticleContainer* tpcont = dynamic_cast<const xAOD::TrackParticleContainer* > (tracks->at(0)->container());
- for(auto track : *tracks){
+ for(auto track : *tracks){
const ElementLink<xAOD::TrackParticleContainer> track_link =
ElementLink<xAOD::TrackParticleContainer>(*tpcont, track->index(), context);
@@ -185,7 +191,28 @@ StatusCode TrigMultiTrkHypoMT::execute( const EventContext& context) const
all_tracks.push_back(track_link);
track_decision_map[track_link] = previousDecision;
- }
+ }
+ } else if(m_particleType == 1){
+ auto muons = ViewHelper::makeHandle( *viewELInfo.link, m_muonContainerKey, context );
+ ATH_CHECK( muons.isValid() );
+ //so each time the loop starts, tracks is reset to contain tracks from a different view
+ ATH_MSG_DEBUG( "Made handle " << m_muonContainerKey << " size: "
+ << muons->size() );
+
+ if(muons->size() == 0) continue;
+
+ for(auto muon : *muons){
+
+ const ElementLink<xAOD::TrackParticleContainer> track_link = muon->inDetTrackParticleLink();
+ ATH_CHECK(track_link.isValid());
+
+ all_tracks.push_back(track_link);
+ track_decision_map[track_link] = previousDecision;
+ }
+
+
+
+ }
}
mon_NTrk = all_tracks.size();
bool passNTrack_and_pTcuts = passNTracks(m_nTrk, m_ptTrkMin, all_tracks, good_tracks, m_mindR);
@@ -288,7 +315,7 @@ StatusCode TrigMultiTrkHypoMT::execute( const EventContext& context) const
// If you needed to re-map the previous decision(s), then call decisionIDs once
// for each previous decision
// if the same previous decision is called twice, that's fine - internally takes care of that
- linkToPrevious( newDecision, previousDecision );
+ linkToPrevious( newDecision, previousDecision, context );
if(itrk == 0 ){
decisionIDs(previousDecision, previousDecisionIDs0);
}else{
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.h b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.h
index e3e70a04ca29b3abf8451f99f8019f339da1dd56..64252bdaf445916c9d2fb65720f753f11565c253 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.h
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoMT.h
@@ -21,6 +21,8 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/StatusCode.h"
+#include "xAODMuon/MuonContainer.h"
+
#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "AthViews/View.h"
@@ -71,6 +73,11 @@ class TrigMultiTrkHypoMT: public ::HypoBase {
"Tracks", // default value of StoreGate key
"input TrackParticle container name"};
+ SG::ReadHandleKey<xAOD::MuonContainer> m_muonContainerKey{ this,
+ "MuonCollectionKey", // property name
+ "CBCombinedMuon", // default value of StoreGate key
+ "input EF Muon container name"};
+
SG::WriteHandleKey<xAOD::TrigBphysContainer> m_bphysObjContKey{ this,
"bphysCollectionKey", // property name
"TrigBphysContainer", // default value of StoreGate key
@@ -97,6 +104,8 @@ class TrigMultiTrkHypoMT: public ::HypoBase {
Gaudi::Property<float> m_mindR { this, "overlapdR",0.01 ,"Minimum dR between tracks (overlap removal)"};
+ Gaudi::Property<int> m_particleType { this, "particleType", 0, "Types of particles to use. 0 = tracks, 1 = EF Muons, 2 = tbd..."};
+
ToolHandle< GenericMonitoringTool > m_monTool { this, "MonTool", "", "Monitoring tool" };
};
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.cxx b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.cxx
index 53330b9009d74d4cdeab24b69619cd79aa756468..17eb7f9eb7186d999d519ac3ac1f3dfc80a97307 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/src/TrigMultiTrkHypoToolMT.cxx
@@ -88,7 +88,7 @@ bool TrigMultiTrkHypoToolMT::decideOnSingleObject( const xAOD::TrigBphys* trigBp
using namespace Monitored;
- ATH_MSG_DEBUG( "in TrigMultiTrkHypoToolMT::decideOnSingleObject(), looking at TrigBphys object");
+ ATH_MSG_DEBUG( "in TrigMultiTrkHypoToolMT::decideOnSingleObject(), looking at TrigBphys object");
bool thisPassedMassCut = false;
bool thisPassedChi2Cut = false;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/FordFulkerson.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/FordFulkerson.h
index 01d325c496553fb322b3ec70020de3b108980378..104a11e08457f0fc093cd1488b1045ed013ab12a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/FordFulkerson.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/TrigHLTJetHypo/TrigHLTJetHypoUtils/FordFulkerson.h
@@ -67,10 +67,12 @@ class FordFulkerson{
* @param G the flow network
* @param s the source vertex
* @param t the sink vertex
- * @throws std::out_of_range unless 0 <= s < V
- * @throws std::out_of_range unless 0 <= t < V
- * @throws std::invalid_argument if s = t
- * @throws std::runtime_error if initial flow is infeasible
+ *
+ * Error state true if:
+ * s = t
+ * initial flow is infeasible
+ *
+ * Throws if used while in error state
*/
FordFulkerson(const FlowNetwork& G, int s, int t);
@@ -79,7 +81,7 @@ class FordFulkerson{
* Returns the value of the maximum flow.
* @return the value of the maximum flow
*/
- double value() const noexcept;
+ double value() const;
/**
* Is vertex <tt>v</tt> on the <tt>s</tt> side of the minimum st-cut?
@@ -88,15 +90,17 @@ class FordFulkerson{
* the <tt>t</tt> side.
* @throws std::out_of_range unless 0 <= v < V
*/
- bool inCut(int v);
-
+ bool error() const {return m_hasError;}
+ std::string errMsg() const {return m_errMsg;}
private:
- // throw an exception if v is outside prescibed range
- void validate(int v, int V);
+ bool inCut(int v);
+
+ // check if v is outside prescibed range
+ bool validate(int v, int V);
- void checkFeasibility(const FlowNetwork& G, int s, int t) const;
+ void checkFeasibility(const FlowNetwork& G, int s, int t);
// return excess flow at vertex v
double excess(const FlowNetwork& G, int v) const noexcept;
@@ -113,6 +117,9 @@ class FordFulkerson{
// current value of max flow
double m_value;
+
+ bool m_hasError{false};
+ std::string m_errMsg{""};
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/AndHelperTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/AndHelperTool.cxx
index 3e5223e42d9c5468972a16bb6773534c06ac7526..b8f76e1035e7124d103966cb0352af6726ae95fb 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/AndHelperTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/AndHelperTool.cxx
@@ -25,8 +25,9 @@ AndHelperTool::AndHelperTool(const std::string& type,
}
-bool AndHelperTool::pass(HypoJetVector& jets,
- ITrigJetHypoInfoCollector* collector) const {
+bool
+AndHelperTool::pass(HypoJetVector& jets,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
ATH_MSG_DEBUG("AndHelperTool::pass... " << jets.size() << " jets");
JetTrigTimer timer;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/AndHelperTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/AndHelperTool.h
index 911580800352cacc3dd4327080f3ae00f38fe6c7..de26a2061166757b901c183584a58a653e5b0190 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/AndHelperTool.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/AndHelperTool.h
@@ -17,7 +17,7 @@
#include "ITrigJetHypoToolHelperMT.h"
#include "ITrigJetHypoToolConfig.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
-
+#include "./ITrigJetHypoInfoCollector.h"
class ITrigJetHypoInfoCollector;
class AndHelperTool: public extends<AthAlgTool, ITrigJetHypoToolHelperMT> {
@@ -29,7 +29,7 @@ class AndHelperTool: public extends<AthAlgTool, ITrigJetHypoToolHelperMT> {
const IInterface* parent);
bool pass(HypoJetVector&,
- ITrigJetHypoInfoCollector*) const override;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
virtual StatusCode getDescription(ITrigJetHypoInfoCollector&) const override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/CombinationsHelperTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/CombinationsHelperTool.cxx
index 1020b656fa8906f302559fef9287a1db1ad61ed6..c9511b67d90b19c8be175c749e9fe86df5938521 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/CombinationsHelperTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/CombinationsHelperTool.cxx
@@ -7,7 +7,7 @@
#include "./ITrigJetHypoInfoCollector.h"
#include "./nodeIDPrinter.h"
#include "./JetTrigTimer.h"
-#include "./ConditionDebugVisitor.h"
+#include "./DebugInfoCollector.h"
#include <sstream>
@@ -15,13 +15,14 @@ CombinationsHelperTool::CombinationsHelperTool(const std::string& type,
const std::string& name,
const IInterface* parent) :
base_class(type, name, parent){
-
+
}
StatusCode CombinationsHelperTool::initialize() {
-
+
m_conditions = m_config->getConditions();
- m_grouper = m_config->getJetGrouper();
+
+ m_grouper = std::move(m_config->getJetGrouper());
return StatusCode::SUCCESS;
}
@@ -30,20 +31,19 @@ StatusCode CombinationsHelperTool::initialize() {
void
CombinationsHelperTool::collectData(const std::string& setuptime,
const std::string& exetime,
- ITrigJetHypoInfoCollector* collector,
- std::unique_ptr<IConditionVisitor>& cVstr,
-
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
+
bool pass) const {
if(!collector){return;}
+ for(auto c: m_conditions){
+ collector->collect("Condition", c.toString());
+ }
auto helperInfo = nodeIDPrinter(name(),
- m_nodeID,
- m_parentNodeID,
- pass,
- exetime + setuptime
- );
-
-
- helperInfo += cVstr->toString();
+ m_nodeID,
+ m_parentNodeID,
+ pass,
+ exetime + setuptime
+ );
collector->collect(name(), helperInfo);
}
@@ -52,16 +52,16 @@ CombinationsHelperTool::collectData(const std::string& setuptime,
struct HypoJetSelector{
// Selector jets according to OR of ocnditions objects.
// This predicate is intended to be used with an STL algorithm
- HypoJetSelector(const ConditionsMT& c,
- std::unique_ptr<IConditionVisitor>&v ):m_conditions(c),
- m_visitor(v){
+ HypoJetSelector(const ConditionsMT& conditions,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&collector ):
+ m_conditions(conditions), m_collector(collector){
}
bool operator()(pHypoJet j){
std::vector<pHypoJet> v{j};
for(const auto& c : m_conditions)
{
- if (c.isSatisfied(v, m_visitor)) // there is a satisfied condition
+ if (c.isSatisfied(v, m_collector)) // there is a satisfied condition
{
return true;
}
@@ -70,43 +70,40 @@ struct HypoJetSelector{
return false; // no condition satisfied
}
ConditionsMT m_conditions;
- std::unique_ptr<IConditionVisitor>& m_visitor;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& m_collector;
};
-
-bool CombinationsHelperTool::pass(HypoJetVector& jets,
- ITrigJetHypoInfoCollector* collector) const {
+
+bool
+CombinationsHelperTool::pass(HypoJetVector& jets,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
/* seek first jet group that passes all children */
// create vector of vector of jets
-
+
JetTrigTimer exeTimer;
JetTrigTimer setupTimer;
-
+
setupTimer.start();
-
- std::unique_ptr<IConditionVisitor> cVisitor(nullptr);
- if (collector){
- cVisitor.reset(new ConditionDebugVisitor);
- }
- HypoJetSelector selector(m_conditions, cVisitor);
-
+
+ HypoJetSelector selector(m_conditions, collector);
+
// use conditions objects to select jets
auto end_iter = std::partition(jets.begin(),
- jets.end(),
- selector);
+ jets.end(),
+ selector);
// auto grouper = CombinationsGrouper(m_size);
auto begin = jets.begin();
auto jetGroups = m_grouper->group(begin, end_iter);
-
+
ATH_MSG_DEBUG("No of groups" << jetGroups.size());
-
+
bool pass = true;
setupTimer.stop();
exeTimer.start();
-
+
for(auto& gjets : jetGroups){
if (testGroup(gjets, collector)){
pass = true;
@@ -114,7 +111,6 @@ bool CombinationsHelperTool::pass(HypoJetVector& jets,
collectData(setupTimer.readAndReset(),
exeTimer.readAndReset(),
collector,
- cVisitor,
pass);
return pass;
@@ -126,17 +122,15 @@ bool CombinationsHelperTool::pass(HypoJetVector& jets,
collectData(setupTimer.readAndReset(),
exeTimer.readAndReset(),
collector,
- cVisitor,
pass);
return pass;
}
-
bool
CombinationsHelperTool::testGroup(HypoJetVector& jets,
- ITrigJetHypoInfoCollector* collector) const {
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
for(auto child : m_children){
auto childPass = child->pass(jets, collector);
if (!childPass){
@@ -149,7 +143,9 @@ CombinationsHelperTool::testGroup(HypoJetVector& jets,
std::string CombinationsHelperTool::toString() const{
std::stringstream ss;
- return nodeIDPrinter(name(), m_nodeID, m_parentNodeID);
+ std::string msg = nodeIDPrinter(name(), m_nodeID, m_parentNodeID) + "\n";
+ for(const auto& cond : m_conditions){ msg += cond.toString() + "\n";}
+ return msg;
}
StatusCode
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/CombinationsHelperTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/CombinationsHelperTool.h
index 20374bbb9952d18ae986ec5adced15eb197b30f0..2345b4fa2f73e1f9a7a6374b2e62e5cc9cb7062a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/CombinationsHelperTool.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/CombinationsHelperTool.h
@@ -26,7 +26,9 @@ class CombinationsHelperTool: public extends<AthAlgTool, ITrigJetHypoToolHelperM
virtual StatusCode initialize() override;
- virtual bool pass(HypoJetVector&, ITrigJetHypoInfoCollector*) const override;
+ virtual bool pass(HypoJetVector&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&
+ ) const override;
virtual StatusCode getDescription(ITrigJetHypoInfoCollector&) const override;
@@ -59,11 +61,11 @@ class CombinationsHelperTool: public extends<AthAlgTool, ITrigJetHypoToolHelperM
m_nodeID {this, "node_id", {}, "hypo tool tree node id"};
- bool testGroup(HypoJetVector&, ITrigJetHypoInfoCollector*) const;
+ bool testGroup(HypoJetVector&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const;
void collectData(const std::string& setuptime,
const std::string& exetime,
- ITrigJetHypoInfoCollector*,
- std::unique_ptr<IConditionVisitor>& cVstr,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
bool) const;
std::string toString() const;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionBridgeMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionBridgeMT.h
index e2d9f03557e314c9141e303a565cecde0ef97b69..d09aa18d941d6d7c18e87da6c00d28c8cd8758dd 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionBridgeMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionBridgeMT.h
@@ -16,9 +16,8 @@
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
#include <string>
#include <memory>
-#include <ostream>
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class ConditionBridgeMT{
// Bridge object: convert polymorphic pointer to monomorphic class
@@ -28,12 +27,12 @@ class ConditionBridgeMT{
m_pCondition(condition){}
bool isSatisfied(const HypoJetVector& ips,
- std::unique_ptr<IConditionVisitor>& v) const{
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& v) const{
return m_pCondition -> isSatisfied(ips, v);
}
bool operator()(const HypoJetVector& ips,
- std::unique_ptr<IConditionVisitor> v) const{
+ std::unique_ptr<ITrigJetHypoInfoCollector> v) const{
return isSatisfied(ips, v);
}
@@ -41,6 +40,7 @@ class ConditionBridgeMT{
return m_pCondition -> toString();
}
+ unsigned int capacity() const {return m_pCondition->capacity();}
private:
std::shared_ptr<IConditionMT> m_pCondition;
};
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionDebugVisitor.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionDebugVisitor.cxx
deleted file mode 100644
index 0da099a7dbe6cd8376a732bc880f19dea61a6617..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionDebugVisitor.cxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "./ConditionDebugVisitor.h"
-
-#include "./EtaEtConditionMT.h"
-#include "./EtaEtAsymmetricConditionMT.h"
-#include "./DijetConditionMT.h"
-#include "./HTConditionMT.h"
-#include "./TLAConditionMT.h"
-
-void ConditionDebugVisitor::visit(const EtaEtConditionMT*,
- const std::string& s){
- std::string key{"EtaEt"};
- m_debugStrings[key] += s;
-}
-
-void ConditionDebugVisitor::visit(const EtaEtAsymmetricConditionMT*,
- const std::string& s){
- std::string key{"EtaEtAsymmetric"};
- m_debugStrings[key] = m_debugStrings[key] + s;
-}
-
-void ConditionDebugVisitor::visit(const DijetConditionMT*,
- const std::string& s){
-std::string key{"Dijet"};
-m_debugStrings[key] = m_debugStrings[key] + s;
-}
-
-void ConditionDebugVisitor::visit(const HTConditionMT*,
- const std::string& s){
- std::string key{"HT"};
- m_debugStrings[key] = m_debugStrings[key] + s;
-}
-
-
-void ConditionDebugVisitor::visit(const TLAConditionMT*,
- const std::string& s){
-std::string key{"TLA"};
- m_debugStrings[key] = m_debugStrings[key] + s;
-}
-
-std::string ConditionDebugVisitor::toString() const {
- std::string s;
- for(const auto& kv : m_debugStrings){
- if (!(kv.first).empty()){
- s += kv.first + '\n' + kv.second;
- }
- }
- return s;
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionDebugVisitor.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionDebugVisitor.h
deleted file mode 100644
index c541bdce2d6420150c2556ff3e371776ceda6b73..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ConditionDebugVisitor.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_CONDITIONDEBUGVISITOR_H
-#define TRIGHLTJETHYPO_CONDITIONDEBUGVISITOR_H
-
-#include <map>
-#include <string>
-#include "./IConditionVisitor.h"
-
-class EtaEtConditionMT;
-class EtaEtAsymmetricConditionMT;
-class DijetConditionMT;
-class HTConditionMT;
-class TLAConditionMT;
-
-class ConditionDebugVisitor: public IConditionVisitor{
- public:
- virtual void visit(const EtaEtConditionMT*,
- const std::string&) override;
-
- virtual void visit(const EtaEtAsymmetricConditionMT*,
- const std::string&) override;
-
- virtual void visit(const DijetConditionMT*,
- const std::string&) override;
-
- virtual void visit(const HTConditionMT*,
- const std::string&) override;
-
- virtual void visit(const TLAConditionMT*,
- const std::string&) override;
-
- virtual std::string toString() const override;
-
- private:
- std::map<std::string, std::string> m_debugStrings;
-};
-
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DebugInfoCollector.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DebugInfoCollector.cxx
index f7ae03a6963255495d0b4dbe57d1b61574c0b5ce..0723ae9081aac62a0bb2caa1ea82c1183dbe89a6 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DebugInfoCollector.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DebugInfoCollector.cxx
@@ -5,39 +5,30 @@
#include "./DebugInfoCollector.h"
#include <sstream>
#include <fstream>
+
+DebugInfoCollector::DebugInfoCollector(const std::string& name):m_name(name){}
+
void DebugInfoCollector::collect(const std::string& key,
const std::string& info){
- m_info[key] += info;
- m_calls[key] += 1;
+ m_info[key].push_back(info);
}
-std::string DebugInfoCollector::toString() const noexcept{
+std::string DebugInfoCollector::toString() const {
std::stringstream ss;
- ss << "DEBUGInfoCollector:\n";
+ ss << "DEBUGInfoCollector: " << m_name << '\n';
for(const auto& i: m_info){
- ss << i.first << '\n';
- ss << " " << i.second << " calls " << m_calls.at(i.first) << '\n';
+ ss << " " << i.first << '\n';
+ for(const auto& m : i.second){
+ ss << " " << m << '\n';
+ }
}
return ss.str();
}
-void DebugInfoCollector::write(std::string name,
- uint32_t run,
- uint32_t event) const {
+void DebugInfoCollector::write() const{
auto report = this->toString();
- std::stringstream ss;
- ss << "jetHypo_" << name << "_" << run << "_" << event;
- std::ofstream out(ss.str());
+ std::ofstream out(m_name+".log");
out << report;
}
-
-void DebugInfoCollector::write(std::string name, std::size_t id) const {
- auto report = this->toString();
- std::stringstream ss;
- ss << "jetHypo_" << name << "_" << id;
- std::ofstream out(ss.str());
- out << report;
- out.close();
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DebugInfoCollector.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DebugInfoCollector.h
index e887115de2c4e8f9243edd1e3b9439cdbb517552..85aa18fac9d90c6e20f5e469d0c9a3c2adee1296 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DebugInfoCollector.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DebugInfoCollector.h
@@ -7,19 +7,20 @@
#include "./ITrigJetHypoInfoCollector.h"
#include <map>
+#include <vector>
class DebugInfoCollector: public ITrigJetHypoInfoCollector {
public:
+ DebugInfoCollector(const std::string& name="Unknown");
virtual void collect(const std::string&, const std::string&) override;
- std::string toString() const noexcept;
- void write(std::string, uint32_t run, uint32_t event) const;
- void write(std::string, std::size_t) const;
+ virtual std::string toString() const override;
+ virtual void write() const override;
private:
- std::map<std::string, std::string> m_info;
- std::map<std::string, std::size_t> m_calls;
+ std::map<std::string, std::vector<std::string>> m_info;
+ std::string m_name;
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DijetConditionMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DijetConditionMT.cxx
index f1b750f14536293347553abdb8de79c778a71847..1c76670ee06d5f2c545f02580dd97a91110f3b97 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DijetConditionMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DijetConditionMT.cxx
@@ -3,7 +3,7 @@
*/
#include "./DijetConditionMT.h"
-#include "./IConditionVisitor.h"
+#include "./ITrigJetHypoInfoCollector.h"
#include <sstream>
#include <stdexcept>
#include <TLorentzVector.h>
@@ -27,7 +27,7 @@ DijetConditionMT::DijetConditionMT(double massMin,
bool
DijetConditionMT::isSatisfied(const HypoJetVector& ips,
- std::unique_ptr<IConditionVisitor>& visitor) const{
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const{
if(ips.size() != 2){
std::stringstream ss;
@@ -58,18 +58,18 @@ DijetConditionMT::isSatisfied(const HypoJetVector& ips,
if (m_massMin > mass or mass >= m_massMax){pass = false;}
if (m_detaMin > adeta or adeta >= m_detaMax){pass = false;}
- if(visitor){
+ if(collector){
std::stringstream ss;
const void* address = static_cast<const void*>(this);
- ss << "Condition: " << address << " "
+ ss << "DijetConditionMT: " << address << " "
<< dphi << " " << mass << " " << adeta << " "
- <<std::boolalpha << pass << " jets: ";
+ <<std::boolalpha << pass << " jet group: \n";
for(auto ip : ips){
address = static_cast<const void*>(ip);
- ss << address << " ";
+ ss << " " << address << " " << ip->eta() << "\n";
}
ss << '\n';
- visitor->visit(this, ss.str());
+ collector->collect("DijetConditionMT", ss.str());
}
return pass;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DijetConditionMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DijetConditionMT.h
index 49da0f108e6a2a5d2ed8fea79d684dbe1446e78b..7a1be3e9d7c94a89e293617bcffeab58d69d443a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DijetConditionMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/DijetConditionMT.h
@@ -21,7 +21,7 @@
#include <vector>
#include <string>
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class DijetConditionMT: public IConditionMT{
public:
@@ -36,10 +36,12 @@ class DijetConditionMT: public IConditionMT{
~DijetConditionMT() override {}
bool isSatisfied(const HypoJetVector&,
- std::unique_ptr<IConditionVisitor>&) const override;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
std::string toString() const noexcept override;
+ virtual unsigned int capacity() const override{return s_capacity;}
+
private:
bool passJetCuts(pHypoJet, pHypoJet) const;
@@ -55,6 +57,9 @@ class DijetConditionMT: public IConditionMT{
double m_dphiMin;
double m_dphiMax;
+
+ const static unsigned int s_capacity{2};
+
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtAsymmetricConditionMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtAsymmetricConditionMT.cxx
index db12f2d35124aec8fb9c4ca0fa88fa06f09e6f36..3ab1a910ac888dd0f66b537b25635bf255cedd14 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtAsymmetricConditionMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtAsymmetricConditionMT.cxx
@@ -4,7 +4,7 @@
#include "./EtaEtAsymmetricConditionMT.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJet.h"
-#include "./IConditionVisitor.h"
+#include "./ITrigJetHypoInfoCollector.h"
#include <sstream>
#include <cmath>
@@ -21,7 +21,7 @@ EtaEtAsymmetricConditionMT::EtaEtAsymmetricConditionMT(double etaMin,
bool
EtaEtAsymmetricConditionMT::isSatisfied(const pHypoJet& ip,
- std::unique_ptr<IConditionVisitor>&) const {
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const {
auto eta = ip->eta();
auto et = ip->et();
return
@@ -33,7 +33,7 @@ EtaEtAsymmetricConditionMT::isSatisfied(const pHypoJet& ip,
bool
EtaEtAsymmetricConditionMT::isSatisfied(const HypoJetVector& ips,
- std::unique_ptr<IConditionVisitor>& v) const {
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& v) const {
return isSatisfied(ips[0], v);
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtAsymmetricConditionMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtAsymmetricConditionMT.h
index b5f40fec6dbcd95fd5aa6c0514515a3960ff4509..d3dea0101289f2b8d6a78e6090040bde28fd4512 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtAsymmetricConditionMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtAsymmetricConditionMT.h
@@ -20,7 +20,7 @@ namespace HypoJet{
class IJet;
}
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class EtaEtAsymmetricConditionMT: public IConditionMT{
public:
@@ -31,9 +31,12 @@ class EtaEtAsymmetricConditionMT: public IConditionMT{
~EtaEtAsymmetricConditionMT() override {}
bool isSatisfied(const HypoJetVector&,
- std::unique_ptr<IConditionVisitor>&) const override;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
std::string toString() const noexcept override;
+ virtual unsigned int capacity() const override {return s_capacity;}
+
+
private:
double m_etaMin;
@@ -41,7 +44,10 @@ class EtaEtAsymmetricConditionMT: public IConditionMT{
double m_threshold;
bool isSatisfied(const pHypoJet&,
- std::unique_ptr<IConditionVisitor>&) const;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const;
+
+ const static unsigned int s_capacity{1};
+
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtConditionMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtConditionMT.cxx
index 396b94da81a7ad4698d292f5e3d25acf9e79cc86..0b45a4a78fb1e98d10a57e319bd86254e1cc180d 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtConditionMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtConditionMT.cxx
@@ -3,7 +3,7 @@
*/
#
#include "./EtaEtConditionMT.h"
-#include "./IConditionVisitor.h"
+#include "./ITrigJetHypoInfoCollector.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJet.h"
#include <sstream>
@@ -18,18 +18,18 @@ EtaEtConditionMT::EtaEtConditionMT(double etaMin,
bool EtaEtConditionMT::isSatisfied(const pHypoJet& ip,
- std::unique_ptr<IConditionVisitor>& visitor) const {
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
auto abseta = std::abs(ip->eta());
auto et = ip->et();
bool result =
m_etaMin <= abseta and
m_etaMax > abseta and
m_threshold <= et;
- if(visitor){
- visitor->visit(this,
- std::to_string(abseta) + " " +
- std::to_string(et) + " " +
- std::to_string(result) + '\n');
+ if(collector){
+ collector->collect("EtaEtConditionMT",
+ std::to_string(abseta) + " " +
+ std::to_string(et) + " " +
+ std::to_string(result) + '\n');
}
return result;
}
@@ -37,15 +37,15 @@ bool EtaEtConditionMT::isSatisfied(const pHypoJet& ip,
bool
EtaEtConditionMT::isSatisfied(const HypoJetVector& ips,
- std::unique_ptr<IConditionVisitor>& v) const {
- auto result = isSatisfied(ips[0], v);
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& c) const {
+ auto result = isSatisfied(ips[0], c);
return result;
}
std::string EtaEtConditionMT::toString() const noexcept {
std::stringstream ss;
- ss << "Eta Et ConditionMT: etaMin "
+ ss << "EtaEtConditionMT: etaMin "
<< m_etaMin
<< " etaMax "
<< m_etaMax
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtConditionMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtConditionMT.h
index a1f4187fa47eea093c617f36189d4717a0cb9584..aa8deb723636fb06d5f958e8262b64e8acd2cd61 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtConditionMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/EtaEtConditionMT.h
@@ -20,7 +20,7 @@ namespace HypoJet{
class IJet;
}
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class EtaEtConditionMT: public IConditionMT{
public:
@@ -30,7 +30,9 @@ class EtaEtConditionMT: public IConditionMT{
~EtaEtConditionMT() override {}
bool isSatisfied(const HypoJetVector&,
- std::unique_ptr<IConditionVisitor>&) const override;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
+
+ virtual unsigned int capacity() const override{return s_capacity;}
std::string toString() const noexcept override;
private:
@@ -38,9 +40,12 @@ class EtaEtConditionMT: public IConditionMT{
double m_etaMin;
double m_etaMax;
double m_threshold;
-
+
bool isSatisfied(const pHypoJet&,
- std::unique_ptr<IConditionVisitor>&) const;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const;
+
+ const static unsigned int s_capacity{1};
+
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderBase.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderBase.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..4083564bdd2625ebef7158b3b1f0f123a351180b
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderBase.cxx
@@ -0,0 +1,90 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "./FlowNetworkBuilderBase.h"
+#include <map>
+#include <algorithm>
+#include <sstream>
+
+FlowNetworkBuilderBase::FlowNetworkBuilderBase(const ConditionsMT& conditions):
+m_conditions(conditions){
+ std::vector<std::shared_ptr<FlowEdge>> initialEdges;
+ auto icond{0};
+ for(const auto& cond : conditions){
+ initialEdges.push_back(std::make_shared<FlowEdge>(0, ++icond, cond.capacity()));
+ }
+ m_initialEdges.swap(initialEdges);
+}
+
+
+std::optional<std::unique_ptr<FlowNetwork>>
+FlowNetworkBuilderBase::create(const HypoJetGroupCIter& groups_b,
+ const HypoJetGroupCIter& groups_e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
+ std::map<int, pHypoJet>& nodeToJet) const {
+
+ std::vector<std::shared_ptr<FlowEdge>> initialEdges(m_initialEdges.begin(),
+ m_initialEdges.end());
+ int V{0};
+
+ auto edges = make_flowEdges(groups_b, groups_e, collector, V, nodeToJet);
+ if(!edges.has_value()){return std::optional<std::unique_ptr<FlowNetwork>>();}
+
+ auto G = std::make_unique<FlowNetwork>(V);
+
+ for(const auto & edge: (*edges)){G->addEdge(edge);}
+
+ return std::make_optional<std::unique_ptr<FlowNetwork>>(std::move(G));
+
+}
+
+
+std::optional<std::vector<std::vector<int>>>
+FlowNetworkBuilderBase::conditionGroupMatches(const HypoJetGroupCIter& groups_b,
+ const HypoJetGroupCIter& groups_e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const
+{
+
+ // return type: std::vector<int, std::vector<int>>
+ // Outer vector: m_conditions index (conditions node - 1)
+ // Inner vector: index numbers of the matching job groups.
+ // (node - m_conditions.size()).
+
+ std::vector<std::vector<int>> result;
+
+ if(collector){collector->collect("FlowNetworkBuilder", "start satisfsaction checks");}
+
+ for(const auto& cond : m_conditions){
+ std::vector<int> groups;
+ // jetgroup node numbers follow immediately after the condition node
+ // numbers jet each group is considered n times where n is the
+ // number of satisfied groups if no early return.
+
+ auto ijg{0};
+ for (auto jg = groups_b; jg != groups_e; ++jg){
+ if (cond.isSatisfied(*jg, collector)){
+ if (collector){
+ collector->collect("FlowNetworkBuilder",
+ "Satisfied Condition jet node "
+ + std::to_string(ijg) + " " + cond.toString());
+ }
+ groups.push_back(ijg);
+ // add source-condition link if condition satisfied
+ }
+ ++ijg;
+ }
+ if(groups.empty()){
+ if(collector){
+ collector->collect("FlowNetworkBuilder",
+ "Unsatisfied Condition" + cond.toString());
+ }
+ return std::optional<std::vector<std::vector<int>>>();
+ }
+
+ result.push_back(groups);
+ }
+ return std::make_optional<std::vector<std::vector<int>>>(result);
+}
+
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderBase.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderBase.h
new file mode 100644
index 0000000000000000000000000000000000000000..dbbb90b576b9d0e6f169e042110ff86c7aaa290f
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderBase.h
@@ -0,0 +1,39 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_FLOWNETWORKBUILDERBASE_H
+#define TRIGHLTJETHYPO_FLOWNETWORKBUILDERBASE_H
+
+#include "./IFlowNetworkBuilder.h"
+#include "./ConditionsDefsMT.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/FlowEdge.h"
+
+class FlowNetworkBuilderBase: virtual public IFlowNetworkBuilder{
+ public:
+ FlowNetworkBuilderBase(const ConditionsMT&);
+ virtual std::optional<std::unique_ptr<FlowNetwork>>
+ create(const HypoJetGroupCIter&,
+ const HypoJetGroupCIter&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
+ std::map<int, pHypoJet>& nodeToJet) const;
+
+ protected:
+
+ virtual std::optional<std::vector<std::shared_ptr<FlowEdge>>>
+ make_flowEdges(const HypoJetGroupCIter& groups_b,
+ const HypoJetGroupCIter& groups_e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
+ int& V,
+ std::map<int, pHypoJet>& nodeToJet) const = 0;
+
+ std::optional<std::vector<std::vector<int>>>
+ conditionGroupMatches(const HypoJetGroupCIter& groups_b,
+ const HypoJetGroupCIter& groups_e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const;
+ ConditionsMT m_conditions;
+ std::vector<std::shared_ptr<FlowEdge>> m_initialEdges;
+
+};
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderFactory.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderFactory.h
new file mode 100644
index 0000000000000000000000000000000000000000..738a657f54489fcebd1269350365bc028c160ba5
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/FlowNetworkBuilderFactory.h
@@ -0,0 +1,28 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_FLOWNETWORKBUILDERFACTORY_H
+#define TRIGHLTJETHYPO_FLOWNETWORKBUILDERFACTORY_H
+
+// ********************************************************************
+//
+// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
+//
+// AUTHOR: P Sherwood
+//
+// ********************************************************************
+//
+#include <string>
+#include "./IFlowNetworkBuilder.h"
+
+class FLowNetworkBuilder{
+
+ /* Instantiate a class usd to build a spcific kind of flow network */
+
+public:
+ FlowNetworkBuilderFactory();
+ std::unique_ptr<IFlowNetworkBuilder> create(const std::string&);
+};
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionMT.cxx
index 11d80a657bcff799f25032352f8c96c40bdc91b3..897f1a57e52310b6fcbe8dd957d4683498e9706a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionMT.cxx
@@ -3,7 +3,7 @@
*/
#include "./HTConditionMT.h"
-#include "./IConditionVisitor.h"
+#include "./ITrigJetHypoInfoCollector.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJet.h"
#include <sstream>
@@ -16,7 +16,7 @@ HTConditionMT::HTConditionMT(double htMin): m_htMin(htMin){
bool HTConditionMT::isSatisfied(const HypoJetVector& ips,
- std::unique_ptr<IConditionVisitor>&) const {
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const {
return std::accumulate(ips.begin(),
ips.end(),
0.0,
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionMT.h
index f62408c12f056699a8dcc8d2c563f4c6dbeb3e4b..2cd2bf145bec10c592223d2b009bff46cb37a1ae 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HTConditionMT.h
@@ -20,7 +20,7 @@ namespace HypoJet{
class IJet;
}
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class HTConditionMT: public IConditionMT{
public:
@@ -28,15 +28,21 @@ class HTConditionMT: public IConditionMT{
~HTConditionMT() override {}
bool isSatisfied(const HypoJetVector&,
- std::unique_ptr<IConditionVisitor>&) const override;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
std::string toString() const noexcept override;
+ virtual unsigned int capacity() const override {return s_capacity;}
+
private:
- bool isSatisfied(const pHypoJet&, IConditionVisitor*) const;
+ bool isSatisfied(const pHypoJet&,
+ std::unique_ptr<ITrigJetHypoInfoCollector>& ) const;
double m_htMin;
+
+ const static unsigned int s_capacity{1};
+
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HypoTreeInfoCollector.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HypoTreeInfoCollector.cxx
deleted file mode 100644
index 576273a51314436952519738d988593aa3e88fcf..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HypoTreeInfoCollector.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "./HypoTreeInfoCollector.h"
-#include <sstream>
-#include <fstream>
-
-void HypoTreeInfoCollector::collect(const std::string& key,
- const std::string& info){
- m_info[key] += info;
-}
-
-std::string HypoTreeInfoCollector::toString() const {
- std::stringstream ss;
- ss << "HypoTreeInfoCollector:\n";
- for(const auto& i: m_info){
- ss << i.first << "\n " << i.second << '\n';
- }
- return ss.str();
-}
-
-
-void HypoTreeInfoCollector::write(std::string name) const {
- auto report = this->toString();
- std::stringstream ss;
- ss << "HypoTree_" << name;
- std::ofstream out(ss.str());
- out << report;
- out.close();
-}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HypoTreeInfoCollector.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HypoTreeInfoCollector.h
deleted file mode 100644
index cede8c92d29888f569fafb2cfe36cdd6052842ec..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/HypoTreeInfoCollector.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_HYPOTREEINFOCOLLECTOR_H
-#define TRIGHLTJETHYPO_HYPOTREEINFOCOLLECTOR_H
-
-#include "./ITrigJetHypoInfoCollector.h"
-#include <map>
-
-class HypoTreeInfoCollector: public ITrigJetHypoInfoCollector {
-
-public:
- virtual void collect(const std::string&, const std::string&) override;
-
- std::string toString() const;
- void write(std::string) const;
-
- private:
- std::map<std::string, std::string> m_info;
-
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IConditionMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IConditionMT.h
index 383cf8078e122fe393604cb418e221434fbcf5cb..a6a1842d7511627136e6348074d8ddc879eb7006 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IConditionMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IConditionMT.h
@@ -17,13 +17,15 @@
#include <string>
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class IConditionMT {
public:
virtual ~IConditionMT(){}
virtual bool isSatisfied(const HypoJetVector&,
- std::unique_ptr<IConditionVisitor>&) const = 0;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const = 0;
+
+ virtual unsigned int capacity() const = 0;
virtual std::string toString() const noexcept = 0;
};
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IConditionVisitor.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IConditionVisitor.h
deleted file mode 100644
index b1b3317a3811af1eb03884000f41cc989333968e..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IConditionVisitor.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_ICONDITIONVISITOR_H
-#define TRIGHLTJETHYPO_ICONDITIONVISITOR_H
-
-#include <string>
-
-class EtaEtConditionMT;
-class EtaEtAsymmetricConditionMT;
-class DijetConditionMT;
-class HTConditionMT;
-class TLAConditionMT;
-
-class IConditionVisitor{
-
-public:
- virtual ~IConditionVisitor() = default;
- virtual void visit(const EtaEtConditionMT*, const std::string&) = 0;
- virtual void visit(const EtaEtAsymmetricConditionMT*, const std::string&) = 0;
- virtual void visit(const DijetConditionMT*, const std::string&) = 0;
- virtual void visit(const HTConditionMT*, const std::string&) = 0;
- virtual void visit(const TLAConditionMT*, const std::string&) = 0;
- virtual std::string toString() const = 0;
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IFlowNetworkBuilder.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IFlowNetworkBuilder.h
new file mode 100644
index 0000000000000000000000000000000000000000..844a450dc1d29d3f86ae1ca3c68fd63f138ca355
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IFlowNetworkBuilder.h
@@ -0,0 +1,36 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_IFLOWNETWORKBUILDER_H
+#define TRIGHLTJETHYPO_IFLOWNETWORKBUILDER_H
+
+// ********************************************************************
+//
+// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
+//
+// AUTHOR: P Sherwood
+//
+// ********************************************************************
+//
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/FlowNetwork.h"
+#include "./ITrigJetHypoInfoCollector.h"
+#include <map>
+#include <optional>
+
+class IFlowNetworkBuilder{
+
+ /* Instantiate a class usd to build a spcific kind of flow network */
+
+public:
+ IFlowNetworkBuilder(){};
+ ~IFlowNetworkBuilder(){};
+ virtual std::optional<std::unique_ptr<FlowNetwork>>
+ create(const HypoJetGroupCIter&,
+ const HypoJetGroupCIter&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
+ std::map<int, pHypoJet>& nodeToJet) const = 0;
+};
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IGroupsMatcherMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IGroupsMatcherMT.h
index 9582ecc66a4d5206f5519d5b01007f0c55ee70a4..ec8df1ffc06cd43708cb14cddedef55b238d99f3 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IGroupsMatcherMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/IGroupsMatcherMT.h
@@ -1,3 +1,4 @@
+
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -21,17 +22,20 @@
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
#include <string>
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class IGroupsMatcherMT{
public:
// Abstract interface used by a factory function
virtual ~IGroupsMatcherMT(){}
- virtual bool match(const HypoJetGroupCIter&,
- const HypoJetGroupCIter&,
- std::unique_ptr<IConditionVisitor>&) = 0;
+ virtual std::optional<bool>
+ match(const HypoJetGroupCIter&,
+ const HypoJetGroupCIter&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
+ bool debug=false) const = 0;
+
virtual ConditionsMT getConditions() const noexcept = 0;
- virtual std::string toString() const noexcept = 0;
+ virtual std::string toString() const = 0;
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoHelperVisitor.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoHelperVisitor.h
deleted file mode 100644
index d1fdab8af1c80572f081331a23e4faa63b2bd80b..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoHelperVisitor.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_ITRIGJETHYPOHELPERVISITOR_H
-#define TRIGHLTJETHYPO_ITRIGJETHYPOHELPERVISITOR_H
-#include <string>
-
-class TrigJetHypoToolHelperMT;
-class AndHelperTool;
-class OrHelperTool;
-class NotHelperTool;
-class CombinationsHelperTool;
-
-class ITrigJetHypoHelperVisitor{
-
-public:
- virtual void visit(const TrigJetHypoToolHelperMT*, const std::string&) = 0;
- virtual void visit(const AndHelperTool*, const std::string&) = 0;
- virtual void visit(const OrHelperTool*, const std::string&) = 0;
- virtual void visit(const NotHelperTool*, const std::string&) = 0;
- virtual void visit(const CombinationsHelperTool*, const std::string&) = 0;
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoInfoCollector.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoInfoCollector.h
index 45b4ff1ab43528be7b10089455573f532a254753..6df22086f8813c20020306516636b9b20b1fa4c0 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoInfoCollector.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoInfoCollector.h
@@ -10,5 +10,7 @@ class ITrigJetHypoInfoCollector{
public:
virtual void collect(const std::string&, const std::string&) = 0;
+ virtual std::string toString() const = 0;
+ virtual void write() const = 0;
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolHelperMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolHelperMT.h
index 274d960a0dbdcbffe9b24a58ab3de5294321b64f..9aadde0ceaffeb5d39b937bf764cf625602babd0 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolHelperMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/ITrigJetHypoToolHelperMT.h
@@ -22,8 +22,8 @@ public:
// generated at L1.
virtual bool pass(HypoJetVector& jets,
- ITrigJetHypoInfoCollector*) const = 0;
-
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const = 0;
+
virtual StatusCode getDescription(ITrigJetHypoInfoCollector&) const = 0;
};
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MaximumBipartiteGroupsMatcherMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MaximumBipartiteGroupsMatcherMT.cxx
index 9783209d7e8ce1dcec16c4c3cdd5695aa716a485..e3648512b5fabb5be003f368974210f582049198 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MaximumBipartiteGroupsMatcherMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MaximumBipartiteGroupsMatcherMT.cxx
@@ -15,126 +15,112 @@
#include "./MaximumBipartiteGroupsMatcherMT.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/FlowNetwork.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/FordFulkerson.h"
-#include <map>
+#include "./ITrigJetHypoInfoCollector.h"
+#include "./MultijetFlowNetworkBuilder.h"
+
#include <cmath>
#include <sstream>
-#include <stdexcept>
+#include <algorithm>
+#include <map>
-MaximumBipartiteGroupsMatcherMT::MaximumBipartiteGroupsMatcherMT(const ConditionsMT& cs):
- m_conditions(cs),
- m_G(FlowNetwork(0)){
+MaximumBipartiteGroupsMatcherMT::MaximumBipartiteGroupsMatcherMT(const ConditionsMT& cs): m_conditions(cs){
+ m_flowNetworkBuilder = std::unique_ptr<IFlowNetworkBuilder>();
+ m_flowNetworkBuilder.reset(new MultijetFlowNetworkBuilder(cs));
+ m_nConditions = cs.size();
}
+
+std::optional<bool>
+MaximumBipartiteGroupsMatcherMT::match(const HypoJetGroupCIter& groups_b,
+ const HypoJetGroupCIter& groups_e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
+ bool) const {
+ /* setup a FlowNetwork.
+ if group size == 1:
+ nodes include source, conditions, jets groups, sink
+ otherwise:
+ nodes include source, conditions, jets groups, jets, sink
+
+ Then solve the network (FordFulkerson)
+ */
-bool
-MaximumBipartiteGroupsMatcherMT::match(const HypoJetGroupCIter& jets_b,
- const HypoJetGroupCIter& jets_e,
- std::unique_ptr<IConditionVisitor>& visitor){
- // setup a FlowNetwork with number of nodes = number of conditions
- // + number of jets + 2 (source and sink)
- int n_conditions = m_conditions.size();
- int n_jets = jets_e - jets_b;
-
- if (n_conditions > n_jets){ // caller guarantees n_conditions > 0
- return false;
+ if(!m_nConditions){
+ if(collector){
+ collector->collect("MaximumBipartiteGroupsMatcherMT", "No conditions");
+ }
+ return std::make_optional<bool>(false);
}
-
- int V = n_conditions + n_jets + 2;
- m_G = FlowNetwork(V);
-
- constexpr double capacity = 1.0;
-
- // add in edges - source node to each condition node
- // the condition labels start at 1. 0 is reserved for the source node.
- std::map<int, ConditionsMT::value_type*> conditionsmap;
- int inode = 1;
- for(auto c = m_conditions.begin(); c != m_conditions.end(); ++c){
- m_G.addEdge(std::make_shared<FlowEdge>(0, inode, capacity));
- conditionsmap[inode] = &(*c);
- /*
- std::cout << "FordFulkerson stored condition "
- << inode << " "
- << *c
- <<" "
- << &(*c)
- << '\n';
- */
- ++inode;
+
+ // Determine jet group - condition satisfaction.
+
+ auto iter_diff = groups_e - groups_b; // number of jet groups
+ if (iter_diff < 0){return std::optional<bool>();} // must be postive
+ if(static_cast<std::size_t>(iter_diff) < m_nConditions) {
+ if(collector){
+ collector->collect("MaximumBipartiteGroupsMatcherMT",
+ "Too few jet groups " +
+ std::to_string(m_nConditions) + " " +
+ std::to_string(iter_diff));
+ }
+ return std::make_optional<bool>(false);
}
- /*
- for(const auto& c : conditionsmap){
- std::cout << "FordFulkerson condition "
- << c.first << " "
- << c.second << " "
- << *(c.second)
- << '\n';
+ std::map<int, pHypoJet> nodeToJet;
+
+ // auto edges = make_flowEdges(groups_b, groups_e, collector, V, nodeToJet);
+ auto G = m_flowNetworkBuilder -> create(groups_b,
+ groups_e,
+ collector,
+ nodeToJet);
+ if(!G.has_value()){
+ if(collector){collector -> collect("MaximumBipartiteGroupsMatcher",
+ "Network construction early return");}
+ return std::make_optional<bool> (false);
}
- */
- // add in edges - jet node to sink node of the jet meet a condition.
- // the jet labels start after the conditions labels.
- std::map<int, HypoJetVector> jetmap;
- for (auto c = jets_b; c != jets_e; ++c){
- jetmap[inode] = *c;
- m_G.addEdge(std::make_shared<FlowEdge>(inode, V-1, capacity));
- ++inode;
+
+ auto V = (*G)->V();
+ FordFulkerson ff (**G, 0, V-1);
+ if(ff.error()){
+ if(collector){
+ std::string msg("FordFulkerson error: ");
+ msg += ff.errMsg() + "\n";
+ collector -> collect("MaximumBipartiteGroupsMatcher", msg);
+ }
+ return std::optional<bool> ();
}
- if (inode != V-1){
- throw std::runtime_error("Last node in flow graph not the sink node");
+ if(collector){
+ std::stringstream ss;
+ ss << **G;
+ collector->collect("MaximumBipartiteGroupsMatcher - after", ss.str());
}
-
- // add in edges - condition node to jet node for each jet-condition pair where
- // the jet satisfies the condition
-
- for(auto c : conditionsmap){
- for (auto j : jetmap){
- //NEEDSFIX START
- // HypoJetVector v{j.second}; // load the jet into a container
- if (c.second->isSatisfied(j.second, visitor)){
- //NEEDSFIX end
- // if (c.second->isSatisfied(v)){
- m_G.addEdge(std::make_shared<FlowEdge>(c.first, j.first, capacity));
- }
- }
+
+ auto edges = (*G)->edges();
+
+
+ double totalCapacity = 0;
+ for(const auto& cond : m_conditions){
+ totalCapacity += cond.capacity();
}
-
- // std::cout << "FlowNetwork:\n " << G <<'\n';
-
- FordFulkerson ff (m_G, 0, V-1);
- bool pass = std::round(ff.value()) == m_conditions.size();
- /*
- std::cout<<"FordFulkerson value: "
- << ff.value()
- << " conditions: "
- << m_conditions.size()
- << " pass: "
- << std::boolalpha
- << '\n';
- */
- // record which jets participate in the pass decision
- auto mapend = jetmap.end();
+ bool pass = std::round(ff.value()) == totalCapacity;
// loop over edges, figure out if it is a condition - jet edge
// figure out if it the jet is used (flow == 1)
// add the jet to passing_jets. As this is a set, duplicates
// will be removed (each edge appears twice in G).
-
- HypoJetSet passing_jets;
- for(auto edge : m_G.edges()){
- auto it = jetmap.find(edge->to()); // label corresponds ot jet?
- if (it == mapend){continue;}
- if (std::round(edge->flow()) == 1){ // jet participates in hypo decision?
- //NEEDSFIX START
- // passing_jets.insert(it->second);
- for(auto j : it->second){passing_jets.insert(j);}
- //NEEDSFIX end
-
- jetmap.erase(it); // remove passing jets from map
- }
- }
+ HypoJetVector passing_jets;
+ auto iter = std::partition(edges.begin(),
+ edges.end(),
+ [V](const auto& edge){return edge->to() == V-1 and
+ std::round(edge->flow()) == 1;});
- return pass;
+ std::transform(edges.begin(),
+ iter,
+ std::back_inserter(passing_jets),
+ [&nodeToJet](const auto& edge){return nodeToJet[edge->from()];});
+
+
+ return std::make_optional<bool>(pass);
}
@@ -142,12 +128,11 @@ MaximumBipartiteGroupsMatcherMT::match(const HypoJetGroupCIter& jets_b,
std::string MaximumBipartiteGroupsMatcherMT::toString() const noexcept {
std::stringstream ss;
- ss << "MaimumBipartiteMatcherMT\n";
+ ss << "MaximumBipartiteMatcherMT\n";
ss << "ConditionsMT:\n";
for(auto c : m_conditions){ ss << c.toString() << '\n';}
ss << "FlowNetwork:\n";
- ss << m_G << '\n';
return ss.str();
}
@@ -156,4 +141,3 @@ ConditionsMT MaximumBipartiteGroupsMatcherMT::getConditions() const noexcept {
return m_conditions;
}
-
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MaximumBipartiteGroupsMatcherMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MaximumBipartiteGroupsMatcherMT.h
index 44acd11b0c6ac71522df1da4d179ded7795e8fc6..00098c69e45dacc5ef39bb4dc820ff30f29f7728 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MaximumBipartiteGroupsMatcherMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MaximumBipartiteGroupsMatcherMT.h
@@ -17,13 +17,13 @@
#include "./IGroupsMatcherMT.h"
#include "./ConditionsDefsMT.h"
+#include "./IFlowNetworkBuilder.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/FlowNetwork.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJet.h"
-#include <utility> // std::pair
-#include <set>
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/FlowEdge.h"
+#include <optional>
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class MaximumBipartiteGroupsMatcherMT:
virtual public IGroupsMatcherMT {
@@ -37,14 +37,19 @@ virtual public IGroupsMatcherMT {
public:
MaximumBipartiteGroupsMatcherMT(const ConditionsMT& cs);
~MaximumBipartiteGroupsMatcherMT(){}
- bool match(const HypoJetGroupCIter&,
- const HypoJetGroupCIter&,
- std::unique_ptr<IConditionVisitor>&) override;
+
+ // cannot match if internal problem (eg FlowNetwork error)
+ std::optional<bool> match(const HypoJetGroupCIter&,
+ const HypoJetGroupCIter&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
+ bool debug=false) const override;
std::string toString() const noexcept override;
ConditionsMT getConditions() const noexcept override;
private:
ConditionsMT m_conditions;
- FlowNetwork m_G;
+ bool m_compound; // true if jet group size >1
+ std::unique_ptr<IFlowNetworkBuilder> m_flowNetworkBuilder;
+ std::size_t m_nConditions{0};
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MultijetFlowNetworkBuilder.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MultijetFlowNetworkBuilder.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..09a6e7a58a088e9b02a0f6b5fcda8f0380b8cd78
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MultijetFlowNetworkBuilder.cxx
@@ -0,0 +1,138 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "./MultijetFlowNetworkBuilder.h"
+#include <map>
+#include <algorithm>
+#include <sstream>
+
+MultijetFlowNetworkBuilder::MultijetFlowNetworkBuilder(const ConditionsMT& conditions):
+FlowNetworkBuilderBase(conditions){
+}
+
+std::optional<std::vector<std::shared_ptr<FlowEdge>>>
+MultijetFlowNetworkBuilder::make_flowEdges(const HypoJetGroupCIter& groups_b,
+ const HypoJetGroupCIter& groups_e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
+ int& V,
+ std::map<int, pHypoJet>& nodeToJet) const{
+
+
+ auto matches = conditionGroupMatches(groups_b, groups_e, collector);
+ if(!matches.has_value()){
+ // there is a condition without any matches.
+ return std::optional<std::vector<std::shared_ptr<FlowEdge>>>();
+ }
+
+ // add edges from condition to matching job group
+ auto icond{0};
+ const auto jg_offset = m_conditions.size() + 1;
+
+ std::vector<std::shared_ptr<FlowEdge>> edges(m_initialEdges.begin(),
+ m_initialEdges.end());
+
+ // matches: std::optional<std::vector<std::vector<int>>>
+ for(const auto& jg_nodes : *matches){
+ // icond is m_conditons index
+ double cap = m_conditions[icond].capacity();
+
+ auto dest = std::back_inserter(edges);
+ std::transform(jg_nodes.begin(),
+ jg_nodes.end(),
+ dest,
+ [icond, jg_offset, cap](const auto& g) {
+ return std::make_shared<FlowEdge>(icond+1,
+ g + jg_offset,
+ cap);
+ });
+ ++icond;
+ }
+
+ //contains jets: jet - node for jets found in matching groups (nb type order)
+ std::map<pHypoJet, int> jets;
+
+ std::size_t jnode{m_conditions.size() + (groups_e-groups_b)};
+
+ // now add the jetgroup - jet edges
+ std::size_t sinkCapacity{0};
+ constexpr double unitCapacity = 1.0;
+
+ for(const auto& jgnodes : *matches){
+ // jgnodes - vector of jet group indices
+ for (auto jgnode : jgnodes){
+ // convert from (a job group index to a job group.
+ auto jgroup = *(groups_b + jgnode);
+
+ // loop over jets in group and identify group-jet edges
+ for(const auto& j : jgroup){
+ // do not allow duplicates
+
+ auto iter = jets.find(j);
+ if (iter == jets.end()){
+ jets[j] = ++jnode;
+ edges.push_back(std::make_shared<FlowEdge>(jgnode + jg_offset,
+ jnode,
+ unitCapacity));
+ if(collector){
+ std::stringstream ss;
+ ss << "new edge " << jgnode + jg_offset << "->" << jnode << '\n';
+ collector->collect("MultijetFlowNetworkBuilder", ss.str());
+ }
+ }
+ }
+ }
+ }
+
+ auto sourceCapacity = 0.;
+ for(const auto& c : m_conditions){sourceCapacity += c.capacity();}
+ sinkCapacity = jets.size();
+ if(sinkCapacity < sourceCapacity){
+
+ // no hope of matching
+ if(collector){
+ std::string msg =
+ "source capacity > sink capacity: " +
+ std::to_string(sourceCapacity) + " " +
+ std::to_string(sinkCapacity);
+ collector->collect("MultijetFlowNetworkBuilder", msg);
+ }
+ return std::optional<std::vector<std::shared_ptr<FlowEdge>>>();
+ }
+
+ if(collector){
+ std::stringstream ss;
+ ss << " No of matched jets in matched groups: " << jets.size() << " "
+ << static_cast<int>(jets.size())+ "\n";
+
+
+ collector->collect("MultijetFlowNetworkBuilder", ss.str());
+ }
+
+ V = jnode + 2; // now we have all the nodes, can index the sink
+
+ // finally add the jet - sink edges.
+
+ for(const auto& j: jets){
+ edges.push_back(std::make_shared<FlowEdge>(j.second,
+ V-1,
+ unitCapacity));
+ if(collector){
+ std::stringstream ss;
+ ss <<"new edge " << j.second << "->" << V-1 << '\n';
+ collector->collect("MultijetFlowNetworkBuilder", ss.str());
+ }
+
+ // fill the node to jet map - to be used to identify jets
+ // contirbuting to hypo success.
+ //
+ // NB: relies on the having no duplicates in the values
+ nodeToJet[j.second] = j.first;
+
+ }
+
+ return std::make_optional<std::vector<std::shared_ptr<FlowEdge>>>(edges);
+
+}
+
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MultijetFlowNetworkBuilder.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MultijetFlowNetworkBuilder.h
new file mode 100644
index 0000000000000000000000000000000000000000..1bbe6cf5878e483f7493d900373950aa4f2a7ca8
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/MultijetFlowNetworkBuilder.h
@@ -0,0 +1,27 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef TRIGHLTJETHYPO_MULTIJETFLOWNETWORKBUILDER_H
+#define TRIGHLTJETHYPO_MULTIJETFLOWNETWORKBUILDER_H
+
+
+#include "./IFlowNetworkBuilder.h"
+#include "./FlowNetworkBuilderBase.h"
+#include "./ConditionsDefsMT.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/FlowEdge.h"
+
+class MultijetFlowNetworkBuilder:
+virtual public IFlowNetworkBuilder, private FlowNetworkBuilderBase{
+ public:
+ MultijetFlowNetworkBuilder(const ConditionsMT&);
+ protected:
+ virtual std::optional<std::vector<std::shared_ptr<FlowEdge>>>
+ make_flowEdges(const HypoJetGroupCIter& groups_b,
+ const HypoJetGroupCIter& groups_e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
+ int& V,
+ std::map<int, pHypoJet>& nodeToJet) const override;
+};
+
+#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/NotHelperTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/NotHelperTool.cxx
index 32db6e7da78427a231e824b23082ec85fcdfc75c..9cbd5c8c05e87ff9562884b832264f56772e2574 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/NotHelperTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/NotHelperTool.cxx
@@ -25,8 +25,9 @@ NotHelperTool::NotHelperTool(const std::string& type,
base_class(type, name, parent){
}
-bool NotHelperTool::pass(HypoJetVector& jets,
- ITrigJetHypoInfoCollector* collector) const {
+bool
+NotHelperTool::pass(HypoJetVector& jets,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
ATH_MSG_DEBUG("NotHelperTool::pass... " << jets.size() << " jets");
JetTrigTimer timer;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/NotHelperTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/NotHelperTool.h
index 83b53b48dc9ee755a144ecd02364cfb1215b02c6..21b762b0f9c464281d83b1d27d2e8be84cfe041e 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/NotHelperTool.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/NotHelperTool.h
@@ -30,7 +30,7 @@ class NotHelperTool: public extends<AthAlgTool, ITrigJetHypoToolHelperMT> {
const IInterface* parent);
bool pass(HypoJetVector&,
- ITrigJetHypoInfoCollector*) const override;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
virtual StatusCode getDescription(ITrigJetHypoInfoCollector&) const override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/OrHelperTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/OrHelperTool.cxx
index 7b1114acf67e21f552a5f83c65ed597d8cf6a1f1..e9db2ff8b78fdb231ad15997091c9233f9120654 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/OrHelperTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/OrHelperTool.cxx
@@ -25,8 +25,9 @@ OrHelperTool::OrHelperTool(const std::string& type,
}
-bool OrHelperTool::pass(HypoJetVector& jets,
- ITrigJetHypoInfoCollector* collector) const {
+bool
+OrHelperTool::pass(HypoJetVector& jets,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
ATH_MSG_DEBUG("OrHelperTool::pass... " << jets.size() << " jets");
JetTrigTimer timer;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/OrHelperTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/OrHelperTool.h
index 17b5d6487f4d3cf3baac934e7e04e9bc7e9e366a..6d970bd36ee4d6684f730188f43fd0ad2a95f1ed 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/OrHelperTool.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/OrHelperTool.h
@@ -27,7 +27,7 @@ class OrHelperTool: public extends<AthAlgTool, ITrigJetHypoToolHelperMT> {
const IInterface* parent);
bool pass(HypoJetVector&,
- ITrigJetHypoInfoCollector*) const override;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
virtual StatusCode getDescription(ITrigJetHypoInfoCollector&) const override;
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/SingleConditionMatcherMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/SingleConditionMatcherMT.cxx
index e3da340f00808f1e0aa3d7af11b5cd2cac458f17..b1a67e37ae1f824394cb8a4c14baec134f500684 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/SingleConditionMatcherMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/SingleConditionMatcherMT.cxx
@@ -20,17 +20,19 @@ SingleConditionMatcherMT::SingleConditionMatcherMT(const ConditionBridgeMT& cb):
m_condition(cb){
}
-bool SingleConditionMatcherMT::match(const HypoJetGroupCIter& jets_b,
- const HypoJetGroupCIter& jets_e,
- std::unique_ptr<IConditionVisitor>& v) {
+std::optional<bool>
+SingleConditionMatcherMT::match(const HypoJetGroupCIter& jets_b,
+ const HypoJetGroupCIter& jets_e,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& v,
+ bool) const {
for(auto i=jets_b; i != jets_e; ++i){
if (m_condition.isSatisfied(*i, v)){
- return true;
+ return std::make_optional<bool>(true);
}
}
- return false;
+ return std::optional<bool>(false);
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/SingleConditionMatcherMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/SingleConditionMatcherMT.h
index 023f7998470cb56a96c649d7e2d9e46ea99f163e..d7d131c4a4c50d69452f236bcc105cdcff5f9f1a 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/SingleConditionMatcherMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/SingleConditionMatcherMT.h
@@ -20,7 +20,6 @@
#include "./ConditionsDefsMT.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJet.h"
-#include <utility> // std::pair
#include <set>
@@ -35,9 +34,13 @@ class SingleConditionMatcherMT: virtual public IGroupsMatcherMT {
public:
SingleConditionMatcherMT(const ConditionBridgeMT&);
~SingleConditionMatcherMT(){}
- bool match(const HypoJetGroupCIter&,
- const HypoJetGroupCIter&,
- std::unique_ptr<IConditionVisitor>&) override;
+
+ virtual std::optional<bool>
+ match(const HypoJetGroupCIter&,
+ const HypoJetGroupCIter&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
+ bool debug) const override;
+
std::string toString() const noexcept override;
ConditionsMT getConditions() const noexcept override;
private:
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TLAConditionMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TLAConditionMT.cxx
index 0a73274113096388df7bab01cace47d8e4d896e9..3cee408cd192b5ac6d97bbd4bba72819b6fc0537 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TLAConditionMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TLAConditionMT.cxx
@@ -3,7 +3,7 @@
*/
#include "./TLAConditionMT.h"
-#include "./IConditionVisitor.h"
+#include "./ITrigJetHypoInfoCollector.h"
#include <sstream>
#include <stdexcept>
@@ -57,7 +57,7 @@ TLAConditionMT::TLAConditionMT(double etaMin,
}
bool TLAConditionMT::isSatisfied(const HypoJetVector& ips,
- std::unique_ptr<IConditionVisitor>&) const{
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const{
if(ips.size() != 2){
std::stringstream ss;
ss << "TLA::isSatisfied must see exactly 2 particles, but recieved "
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TLAConditionMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TLAConditionMT.h
index d97e25b4a1eb2021679946c1d636ae9e99077b1b..4b2389f0adc70d8718a0f7da833eb6c3b5c20b26 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TLAConditionMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TLAConditionMT.h
@@ -17,7 +17,7 @@
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/IJet.h"
#include "./IConditionMT.h"
-class IConditionVisitor;
+class ITrigJetHypoInfoCollector;
class TLAConditionMT: public IConditionMT{
@@ -39,9 +39,11 @@ class TLAConditionMT: public IConditionMT{
~TLAConditionMT() override {}
bool isSatisfied(const HypoJetVector&,
- std::unique_ptr<IConditionVisitor>&) const override;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
std::string toString() const noexcept override;
+ virtual unsigned int capacity() const override {return s_capacity;}
+
private:
double m_etaMin;
double m_etaMax;
@@ -49,6 +51,9 @@ class TLAConditionMT: public IConditionMT{
double m_ystarMax;
double m_massMin;
double m_massMax;
+
+ const static unsigned int s_capacity{1};
+
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TreeInfoCollector.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TreeInfoCollector.h
deleted file mode 100644
index dbdcaa561d6fa339bd67b3ddceb6de671e36a2a9..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TreeInfoCollector.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRIGHLTJETHYPO_HYPOTREEINFOCOLLECTOR_H
-#ifndef TRIGHLTJETHYPO_HYPOTREEINFOCOLLECTOR_H
-
-#include "./ITrigJetHypoInfoCollector.h"
-#include <map>
-
-class HypoTreeInfoCollector: public ITrigJetHypoInfoCollector {
-
-public:
- virtual void collect(const std::string&, const std::string&) override;
-
- std::string toString() const noexcept;
- void write(std::string, uint32_t run, uint32_t event) const;
- void write(std::string, std::size_t) const;
-
- private:
- std::map<std::string, std::string> m_info;
-
-};
-#endif
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/FordFulkerson.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/FordFulkerson.cxx
index 24ea4cc9506da0422fde4fedaede164c8371a374..79976ec434e63fc11cfffbb359313d486dd91d33 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/FordFulkerson.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigHLTJetHypoUtils/FordFulkerson.cxx
@@ -24,14 +24,35 @@
FordFulkerson::FordFulkerson(const FlowNetwork& G, int s, int t):
m_marked{}, m_edgeTo{}, m_value(0){
- validate(s, G.V());
- validate(t, G.V());
- if(s == t){
- throw std::invalid_argument("FordFulkerson: source equals sink");
- }
-
- checkFeasibility(G, s, t); // throws if error
+
+ auto V = G.V();
+ if (not validate(s, V)){
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: source: " +
+ std::to_string(s) +
+ " must be in [0, " +
+ std::to_string(V) +
+ ")";
+ }
+
+ if (not validate(t, V)){
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: sink: " +
+ std::to_string(s) +
+ " must be in [0, " +
+ std::to_string(V) +
+ ")";
+ }
+
+ if(s == t){
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: source equals sink";
+ }
+
+
+ checkFeasibility(G, s, t);
+
// while there exists an augmenting path, use it
m_value = excess(G, t);
while (hasAugmentingPath(G, s, t)) {
@@ -50,71 +71,75 @@ FordFulkerson::FordFulkerson(const FlowNetwork& G, int s, int t):
m_value += bottle;
}
- check(G, s, t); // check optimality conditions, throws if error
+ check(G, s, t);
}
-double FordFulkerson::value() const noexcept {return m_value;}
+double FordFulkerson::value() const {
+ if(m_hasError){
+ throw std::runtime_error("FordFulkerson: Invalid state: value() " +
+ m_errMsg);
+ }
+ return m_value;
+}
// is v in the s side of the min s-t cut?
- bool FordFulkerson::inCut(int v) {
+ bool FordFulkerson::inCut(int v){
+ if(m_hasError){
+ throw std::runtime_error("FordFulkerson: inCut() Invalid state " +
+ m_errMsg);}
validate(v, m_marked.size());
return m_marked[v];
}
-void FordFulkerson::validate(int v, int V) {
- if (v < 0 || v >= V) {
-
- throw std::out_of_range("FordFulkerson: invalid vertex: " +
- std::to_string(v) +
- " must be in [0, " +
- std::to_string(V) +
- ")"
- );
- }
+bool FordFulkerson::validate(int v, int V) {
+ return !(v < 0 || v >= V);
}
-void FordFulkerson::checkFeasibility(const FlowNetwork& G, int s, int t) const{
+void FordFulkerson::checkFeasibility(const FlowNetwork& G, int s, int t){
constexpr auto EPSILON = 1E-11;
// check that capacity constraints are satisfied
for(auto v = 0; v < G.V(); v++) {
- for(auto e : G.adj(v)) {
+ for(const auto& e : G.adj(v)) {
if (e->flow() < -EPSILON || e->flow() > e->capacity() + EPSILON) {
- throw
- std::runtime_error("Edge does not satisfy capacity constraints");
+ m_hasError = true;
+ m_errMsg = "Ford Fulkerson: Edge does not satisfy capacity constraints";
}
}
}
// check that net flow into a vertex equals zero, except at source and sink
if (std::abs(m_value + excess(G, s)) > EPSILON) {
- throw std::runtime_error("FordFulkerson: "
- "Excess at source = " +
- std::to_string(excess(G, s)) +
- '\n' +
- "Max flow = " +
- std::to_string(m_value));
+
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: "
+ "Excess at source = " +
+ std::to_string(excess(G, s)) +
+ '\n' +
+ "Max flow = " +
+ std::to_string(m_value);
}
if (std::abs(m_value - excess(G, t)) > EPSILON) {
- throw std::runtime_error("FordFulkerson: "
- "Excess at sink = " +
- std::to_string(excess(G, t)) +
- "Max flow = " +
- std::to_string(m_value));
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: Excess at sink = " +
+ std::to_string(excess(G, t)) +
+ "Max flow = " +
+ std::to_string(m_value);
}
for (int v = 0; v < G.V(); v++) {
if (v == s || v == t) continue;
else if (std::abs(excess(G, v)) > EPSILON) {
- throw std::runtime_error("Net flow out of " +
- std::to_string(v) +
- " doesn't equal zero");
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: Net flow out of " +
+ std::to_string(v) +
+ " doesn't equal zero";
}
}
}
@@ -134,7 +159,8 @@ double FordFulkerson::excess(const FlowNetwork& G, int v) const noexcept{
}
-void FordFulkerson::check(const FlowNetwork& G, int s, int t) {
+void FordFulkerson::check(const FlowNetwork& G, int s, int t) {
+ if(m_hasError){return;}
// check optimality conditions
// check that flow is feasible
@@ -143,14 +169,16 @@ void FordFulkerson::check(const FlowNetwork& G, int s, int t) {
// check that s is on the source side of min cut and that t
// is not on source side
if (!inCut(s)) {
- throw std::runtime_error("FordFulkerson: source " +
- std::to_string(s) +
- " is not on source side of min cut");
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: source " +
+ std::to_string(s) +
+ " is not on source side of min cut";
}
if (inCut(t)) {
- throw std::runtime_error("FordFulkerson: sink " +
- std::to_string(t) +
- " is on source side of min cut");
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: sink " +
+ std::to_string(t) +
+ " is on source side of min cut";
}
// check that value of min cut = value of max flow
@@ -164,15 +192,17 @@ void FordFulkerson::check(const FlowNetwork& G, int s, int t) {
constexpr auto EPSILON = 1E-11;
if (std::abs(mincutValue - m_value) > EPSILON) {
- throw std::runtime_error("Max flow value = " +
- std::to_string(m_value) +
- ", min cut value = " +
- std::to_string(mincutValue));
+ m_hasError = true;
+ m_errMsg = "FordFulkerson: Max flow value = " +
+ std::to_string(m_value) +
+ ", min cut value = " +
+ std::to_string(mincutValue);
}
}
-bool FordFulkerson::hasAugmentingPath(const FlowNetwork& G, int s, int t) {
+bool
+FordFulkerson::hasAugmentingPath(const FlowNetwork& G, int s, int t) {
/* is there an augmenting path?
if so, upon termination m_edgeTo[] will contain a parent-link
representation of such a path
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperMT.cxx
index d051aefd6024da65618312eb598c9932653d32c3..4e49d8ba3fd49a77199b05a0e80181df839dbf20 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperMT.cxx
@@ -9,7 +9,7 @@
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CleanerFactory.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJet.h" // TLorentzVec
#include "./nodeIDPrinter.h"
-#include "./ConditionDebugVisitor.h"
+#include "./DebugInfoCollector.h"
#include <algorithm>
#include <sstream>
@@ -22,18 +22,16 @@ TrigJetHypoToolHelperMT::TrigJetHypoToolHelperMT(const std::string& type,
StatusCode TrigJetHypoToolHelperMT::initialize() {
auto conditions = m_config->getConditions();
- m_grouper = m_config->getJetGrouper();
- m_matcher = groupsMatcherFactoryMT(conditions);
- // std::string s = toString();
+ m_grouper = std::move(m_config->getJetGrouper());
+ m_matcher = std::move(groupsMatcherFactoryMT(conditions));
return StatusCode::SUCCESS;
}
void
TrigJetHypoToolHelperMT::collectData(const std::string& exetime,
- ITrigJetHypoInfoCollector* collector,
- std::unique_ptr<IConditionVisitor>& cVisitor,
- bool pass) const {
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector,
+ const std::optional<bool>& pass) const {
if(!collector){return;}
auto helperInfo = nodeIDPrinter(name(),
m_nodeID,
@@ -42,21 +40,14 @@ TrigJetHypoToolHelperMT::collectData(const std::string& exetime,
exetime
);
- helperInfo += cVisitor->toString();
-
collector->collect(name(), helperInfo);
}
-bool TrigJetHypoToolHelperMT::pass(HypoJetVector& jets,
- ITrigJetHypoInfoCollector* collector) const {
-
+bool
+TrigJetHypoToolHelperMT::pass(HypoJetVector& jets,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>& collector) const {
- // visit conditions if debugging
- std::unique_ptr<IConditionVisitor> cVisitor(nullptr);
- if (collector){
- cVisitor.reset(new ConditionDebugVisitor);
- }
JetTrigTimer timer;
timer.start();
@@ -64,7 +55,7 @@ bool TrigJetHypoToolHelperMT::pass(HypoJetVector& jets,
if(jets.empty()){
timer.stop();
bool pass = false;
- collectData(timer.readAndReset(), collector, cVisitor, pass);
+ collectData(timer.readAndReset(), collector, pass);
return pass;
}
@@ -79,11 +70,15 @@ bool TrigJetHypoToolHelperMT::pass(HypoJetVector& jets,
}
auto jetGroups = m_grouper->group(begin, end);
- bool pass = m_matcher->match(jetGroups.begin(), jetGroups.end(), cVisitor);
+ auto pass = m_matcher->match(jetGroups.begin(), jetGroups.end(), collector);
+
timer.stop();
- collectData(timer.readAndReset(), collector, cVisitor, pass);
- return pass;
+ collectData(timer.readAndReset(), collector, pass);
+ if(pass.has_value()){
+ return *pass;
+ }
+ return false;
}
std::string TrigJetHypoToolHelperMT::toString() const {
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperMT.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperMT.h
index 212796fcbff57657a7de5f406137f58611043645..5c4865e89e582498c85b8bd6302f2dd0137c0f12 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperMT.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolHelperMT.h
@@ -38,10 +38,11 @@ public extends<AthAlgTool, ITrigJetHypoToolHelperMT> {
const std::string& name,
const IInterface* parent);
- virtual StatusCode initialize() override;
- virtual bool pass(HypoJetVector&,
- ITrigJetHypoInfoCollector*) const override;
-
+ StatusCode initialize() override;
+ virtual bool
+ pass(HypoJetVector&,
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&) const override;
+
virtual StatusCode getDescription(ITrigJetHypoInfoCollector&) const override;
private:
@@ -76,9 +77,8 @@ Gaudi::Property<bool>
void collectData(const std::string& exetime,
- ITrigJetHypoInfoCollector* collector,
- std::unique_ptr<IConditionVisitor>&,
- bool pass) const;
+ const std::unique_ptr<ITrigJetHypoInfoCollector>&,
+ const std::optional<bool>& pass) const;
std::string toString() const;
};
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
index 266550420939c30542a32eb591fb14d673e2150e..9843c2a622e7cf5552c799be9886c72ec0d71e5c 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetHypoToolMT.cxx
@@ -18,7 +18,6 @@
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/lineSplitter.h"
#include "./DebugInfoCollector.h"
-#include "./HypoTreeInfoCollector.h"
#include "DecisionHandling/HLTIdentifier.h"
#include "DecisionHandling/TrigCompositeUtils.h"
@@ -41,7 +40,7 @@ TrigJetHypoToolMT::~TrigJetHypoToolMT(){
StatusCode TrigJetHypoToolMT::initialize(){
CHECK(m_evt.initialize());
- HypoTreeInfoCollector collector;
+ DebugInfoCollector collector(name());
CHECK(m_helper->getDescription(collector));
auto s = collector.toString();
@@ -50,7 +49,7 @@ StatusCode TrigJetHypoToolMT::initialize(){
}
if (m_visitDebug){
- collector.write(name());
+ collector.write();
}
return StatusCode::SUCCESS;
}
@@ -77,7 +76,11 @@ StatusCode TrigJetHypoToolMT::decide(const xAOD::JetContainer* jets,
<< "...");
// steady_clock::time_point t = steady_clock::now();
- auto infocollector = m_visitDebug? new DebugInfoCollector : nullptr;
+ std::unique_ptr<ITrigJetHypoInfoCollector> infocollector(nullptr);
+ if(m_visitDebug){
+ auto collectorName = name() + std::to_string(m_eventSN->getSN());
+ infocollector.reset(new DebugInfoCollector(collectorName));
+ }
try{
pass = m_helper->pass(hypoJets, infocollector);
@@ -88,7 +91,7 @@ StatusCode TrigJetHypoToolMT::decide(const xAOD::JetContainer* jets,
}
if (infocollector){
- infocollector->write(name(), m_eventSN->getSN());
+ infocollector->write();
}
// accumulateTime(steady_clock::now() - t);
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.cxx
index 5394b43a390e0b6e9b8625f2bf8d3bc90993d408..b5a3227d1d6b76d6cf82f36a929e8e1921f18764 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.cxx
@@ -18,6 +18,22 @@ std::string nodeIDPrinter(const std::string& name,
return ss.str();
}
+std::string nodeIDPrinter(const std::string& name,
+ int nodeID,
+ int parentID,
+ const std::optional<bool>& pass,
+ const std::string& timerStr){
+ if(pass.has_value()){
+ return nodeIDPrinter(name, nodeID, parentID, *pass, timerStr);
+ }
+ std::stringstream ss;
+ ss << name <<" node: " << nodeID
+ << " parent: " << parentID
+ << " pass: " << "ERROR " <<timerStr << '\n';
+
+ return ss.str();
+}
+
std::string nodeIDPrinter(const std::string& name,
int nodeID,
int parentID){
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.h
index acde30e0d945fc9a3cd83137436183fa5693850f..8b56fae12ccd10a8bde06911184c4960ff69636d 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/nodeIDPrinter.h
@@ -11,6 +11,7 @@
#include <string>
+#include <optional>
std::string nodeIDPrinter(const std::string& name,
int nodeID,
@@ -18,6 +19,12 @@ std::string nodeIDPrinter(const std::string& name,
bool pass,
const std::string& time="");
+std::string nodeIDPrinter(const std::string& name,
+ int nodeID,
+ int parentID,
+ const std::optional<bool>& pass,
+ const std::string& time="");
+
std::string nodeIDPrinter(const std::string& name,
int nodeID,
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/CMakeLists.txt b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/CMakeLists.txt
index e46817645720ad8ec340723602603b2c468805b8..3ef2e0ab36b6a37867e3ddd3e5d4ccb00f63fd38 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/CMakeLists.txt
@@ -31,7 +31,7 @@ atlas_add_test( TrigHLTJetHypoUnitTests
src/LooseCleanerTest.cxx
src/MaximumBipartiteGroupsMatcherTest.cxx
src/MaximumBipartiteGroupsMatcherMTTest.cxx
- src/MaximumBipartiteGroupsMatcherMTTest_BadConfig.cxx
+ src/MaximumBipartiteGroupsMatcherMTTest_Multijet.cxx
src/MultiJetMatcherTest.cxx
src/OrderedCollectionsMatcherTest.cxx
src/SelectedJetsMatcherTest.cxx
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/DijetDEtaMassConditionTest.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/DijetDEtaMassConditionTest.cxx
index 79cbe5d104450662ed5369e3ecf3e6b4a1cb97ca..b445516c4a7565d7337ea26f40d07455556c1f70 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/DijetDEtaMassConditionTest.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/DijetDEtaMassConditionTest.cxx
@@ -16,6 +16,7 @@
using ::testing::Return;
using ::testing::_;
using ::testing::SetArgReferee;
+using ::testing::AnyNumber;
class DijetDEtaMassConditionTest: public ::testing::Test {
@@ -81,7 +82,13 @@ TEST_F(DijetDEtaMassConditionTest, accepts) {
MockJetWithLorentzVector jet0{m_tl0};
MockJetWithLorentzVector jet1{m_tl1};
+
+ EXPECT_CALL(jet0, et());
+ EXPECT_CALL(jet0, eta());
+ EXPECT_CALL(jet1, et());
+ EXPECT_CALL(jet1, eta());
+
HypoJetVector jets{&jet0, &jet1};
DijetDEtaMassCondition condition({0.5-0.001, 0.5-0.001},
@@ -102,7 +109,13 @@ TEST_F(DijetDEtaMassConditionTest, belowAbsEtaMinCut) {
MockJetWithLorentzVector jet1{m_tl1};
HypoJetVector jets{&jet0, &jet1};
+
+ EXPECT_CALL(jet0, et()).Times(AnyNumber());
+ EXPECT_CALL(jet0, eta()).Times(AnyNumber());
+ EXPECT_CALL(jet1, et()).Times(AnyNumber());
+ EXPECT_CALL(jet1, eta()).Times(AnyNumber());
+
DijetDEtaMassCondition condition({0.5+0.001, 0.5+0.001},
{0.5 + 0.002, 0.5 + 0.002},
{100.-0.001, 100.-0.001},
@@ -128,7 +141,14 @@ TEST_F(DijetDEtaMassConditionTest, aboveAbsEtaMaxCut) {
MockJetWithLorentzVector jet0{m_tl0};
MockJetWithLorentzVector jet1{m_tl1};
-
+
+
+ EXPECT_CALL(jet0, et()).Times(AnyNumber());
+ EXPECT_CALL(jet0, eta()).Times(AnyNumber());
+
+ EXPECT_CALL(jet1, et()).Times(AnyNumber());
+ EXPECT_CALL(jet1, eta()).Times(AnyNumber());
+
HypoJetVector jets{&jet0, &jet1};
EXPECT_FALSE(condition.isSatisfied(jets));
@@ -147,7 +167,14 @@ TEST_F(DijetDEtaMassConditionTest, belowYStarCut) {
MockJetWithLorentzVector jet0{m_tl0};
MockJetWithLorentzVector jet1{m_tl1};
+
+
+ EXPECT_CALL(jet0, et()).Times(AnyNumber());
+ EXPECT_CALL(jet0, eta()).Times(AnyNumber());
+ EXPECT_CALL(jet1, et()).Times(AnyNumber());
+ EXPECT_CALL(jet1, eta()).Times(AnyNumber());
+
HypoJetVector jets{&jet0, &jet1};
EXPECT_FALSE(condition.isSatisfied(jets));
@@ -166,7 +193,13 @@ TEST_F(DijetDEtaMassConditionTest, aboveYStarCut) {
MockJetWithLorentzVector jet0{m_tl0};
MockJetWithLorentzVector jet1{m_tl1};
+
+ EXPECT_CALL(jet0, et()).Times(AnyNumber());
+ EXPECT_CALL(jet0, eta()).Times(AnyNumber());
+ EXPECT_CALL(jet1, et()).Times(AnyNumber());
+ EXPECT_CALL(jet1, eta()).Times(AnyNumber());
+
HypoJetVector jets{&jet0, &jet1};
EXPECT_FALSE(condition.isSatisfied(jets));
@@ -185,7 +218,13 @@ TEST_F(DijetDEtaMassConditionTest, belowMassCut) {
{104.2 + 0.2});
MockJetWithLorentzVector jet0{m_tl0};
MockJetWithLorentzVector jet1{m_tl1};
+
+ EXPECT_CALL(jet0, et()).Times(AnyNumber());
+ EXPECT_CALL(jet0, eta()).Times(AnyNumber());
+ EXPECT_CALL(jet1, et()).Times(AnyNumber());
+ EXPECT_CALL(jet1, eta()).Times(AnyNumber());
+
HypoJetVector jets{&jet0, &jet1};
EXPECT_FALSE(condition.isSatisfied(jets));
}
@@ -203,7 +242,13 @@ TEST_F(DijetDEtaMassConditionTest, aboveMassCut) {
MockJetWithLorentzVector jet0{m_tl0};
MockJetWithLorentzVector jet1{m_tl1};
+
+ EXPECT_CALL(jet0, et()).Times(AnyNumber());
+ EXPECT_CALL(jet0, eta()).Times(AnyNumber());
+ EXPECT_CALL(jet1, et()).Times(AnyNumber());
+ EXPECT_CALL(jet1, eta()).Times(AnyNumber());
+
HypoJetVector jets{&jet0, &jet1};
EXPECT_FALSE(condition.isSatisfied(jets));
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/MaximumBipartiteGroupsMatcherMTTest.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/MaximumBipartiteGroupsMatcherMTTest.cxx
index 6f217f14b3f2588465824b2d1dd57691c26da1de..4ecfd19faf7b21b1e9e916df97d2017fed4992e3 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/MaximumBipartiteGroupsMatcherMTTest.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/MaximumBipartiteGroupsMatcherMTTest.cxx
@@ -6,7 +6,7 @@
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
#include "TrigHLTJetHypo/../src/ConditionsDefsMT.h"
#include "TrigHLTJetHypo/../src/conditionsFactoryMT.h"
-#include "TrigHLTJetHypo/../src/ConditionDebugVisitor.h"
+#include "TrigHLTJetHypo/../src/DebugInfoCollector.h"
#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h"
#include "./MockJetWithLorentzVector.h"
@@ -55,25 +55,32 @@ public:
ConditionsMT m_conditions;
int m_nconditions;
+ bool m_debug{false};
};
HypoJetGroupVector makeJetGroupsMT(HypoJetIter b, HypoJetIter e){
CombinationsGrouper g(1); // single jet groups
return g.group(b, e);
}
-
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest, debugFlagIsFalse){
+ /* idiot tst to ensure dbug flag is of prior to commiting */
+ EXPECT_FALSE(m_debug);
+}
+
TEST_F(MaximumBipartiteGroupsMatcherMTTest, zeroInputJets){
/* test with 0 jets - fails, no passed for failed jets */
MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
-
+ EXPECT_TRUE(true);
HypoJetVector jets;
auto groups = makeJetGroupsMT(jets.begin(), jets.end());
- auto visitor = std::unique_ptr<IConditionVisitor>(nullptr);
+ EXPECT_TRUE(true);
+ auto visitor = std::unique_ptr<ITrigJetHypoInfoCollector>(nullptr);
+ EXPECT_TRUE(true);
- bool pass = matcher.match(groups.begin(), groups.end(), visitor);
-
- EXPECT_FALSE(pass);
+ auto pass = matcher.match(groups.begin(), groups.end(), visitor, false);
+ EXPECT_FALSE(*pass);
}
@@ -89,14 +96,24 @@ TEST_F(MaximumBipartiteGroupsMatcherMTTest, tooFewSelectedJets){
MockJetWithLorentzVector jet0(tl);
MockJetWithLorentzVector jet1{tl};
+ EXPECT_CALL(jet0, eta()).Times(0);
+ EXPECT_CALL(jet0, et()).Times(0);
+
+ EXPECT_CALL(jet1, eta()).Times(0);
+ EXPECT_CALL(jet1, et()).Times(0);
+
HypoJetVector jets{&jet0, &jet1};
auto groups = makeJetGroupsMT(jets.begin(), jets.end());
- auto visitor = std::unique_ptr<IConditionVisitor>(nullptr);
-
+ auto visitor = std::unique_ptr<ITrigJetHypoInfoCollector>(nullptr);
+ if(m_debug){
+ visitor.reset(new DebugInfoCollector("toofewselectedjets"));
+ }
MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
- bool pass = matcher.match(groups.begin(), groups.end(), visitor);
+ auto pass = matcher.match(groups.begin(), groups.end(), visitor);
+ if(visitor){visitor->write();}
+ EXPECT_TRUE(pass.has_value());
- EXPECT_FALSE(pass);
+ EXPECT_FALSE(*pass);
}
@@ -120,26 +137,34 @@ TEST_F(MaximumBipartiteGroupsMatcherMTTest, oneSelectedJet){
HypoJetVector jets{&jet0, &jet1, &jet2, &jet3};
- EXPECT_CALL(jet0, eta()).Times(m_nconditions);
- EXPECT_CALL(jet1, eta()).Times(m_nconditions);
- EXPECT_CALL(jet2, eta()).Times(m_nconditions);
- EXPECT_CALL(jet3, eta()).Times(m_nconditions);
-
- EXPECT_CALL(jet0, et()).Times(m_nconditions);
- EXPECT_CALL(jet1, et()).Times(m_nconditions);
- EXPECT_CALL(jet2, et()).Times(m_nconditions);
- EXPECT_CALL(jet3, et()).Times(m_nconditions);
-
+ // eta(), et() will be called by each of the three conditions.
+
+ EXPECT_CALL(jet0, eta()).Times(3);
+ EXPECT_CALL(jet0, et()).Times(3);
+ EXPECT_CALL(jet1, eta()).Times(3);
+ EXPECT_CALL(jet1, et()).Times(3);
+ EXPECT_CALL(jet2, eta()).Times(3);
+ EXPECT_CALL(jet2, et()).Times(3);
+ EXPECT_CALL(jet3, eta()).Times(3);
+ EXPECT_CALL(jet3, et()).Times(3);
+
auto groups = makeJetGroupsMT(jets.begin(), jets.end());
- auto visitor = std::unique_ptr<IConditionVisitor>(nullptr);
+
+ std::unique_ptr<ITrigJetHypoInfoCollector>
+ collector(new DebugInfoCollector("oneSelectedJet.log"));
+
+ EXPECT_TRUE(groups.end() - groups.begin() == 4);
+ auto groups_b = groups.begin();
+ auto groups_e = groups.end();
MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
- bool pass = matcher.match(groups.begin(), groups.end(), visitor);
-
- EXPECT_FALSE(pass);
+ auto pass = matcher.match(groups_b, groups_e, collector);
+ if(m_debug){collector->write();}
+ EXPECT_FALSE(*pass);
}
+
TEST_F(MaximumBipartiteGroupsMatcherMTTest, twoSelectedJets){
/* 2 jets over repsective thresholds - check good/bad jet list, fail. */
@@ -184,11 +209,11 @@ TEST_F(MaximumBipartiteGroupsMatcherMTTest, twoSelectedJets){
MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
auto groups = makeJetGroupsMT(jets.begin(), jets.end());
- auto visitor = std::unique_ptr<IConditionVisitor>(nullptr);
+ auto visitor = std::unique_ptr<ITrigJetHypoInfoCollector>(nullptr);
- bool pass = matcher.match(groups.begin(), groups.end(), visitor);
+ auto pass = matcher.match(groups.begin(), groups.end(), visitor);
- EXPECT_FALSE(pass);
+ EXPECT_FALSE(*pass);
}
@@ -237,11 +262,11 @@ TEST_F(MaximumBipartiteGroupsMatcherMTTest, threeSelectedJets){
MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
auto groups = makeJetGroupsMT(jets.begin(), jets.end());
- auto visitor = std::unique_ptr<IConditionVisitor>(nullptr);
+ auto visitor = std::unique_ptr<ITrigJetHypoInfoCollector>(nullptr);
- bool pass = matcher.match(groups.begin(), groups.end(), visitor);
+ auto pass = matcher.match(groups.begin(), groups.end(), visitor);
- EXPECT_TRUE(pass);
+ EXPECT_TRUE(*pass);
}
@@ -289,11 +314,17 @@ TEST_F(MaximumBipartiteGroupsMatcherMTTest, fourSelectedJets){
MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
auto groups = makeJetGroupsMT(jets.begin(), jets.end());
- auto visitor = std::unique_ptr<IConditionVisitor>(nullptr);
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>(nullptr);
+
+ if(m_debug){
+ collector.reset(new DebugInfoCollector("fourSelectedJets"));
+ }
- bool pass = matcher.match(groups.begin(), groups.end(), visitor);
+ auto pass = matcher.match(groups.begin(), groups.end(), collector, m_debug);
- EXPECT_TRUE(pass);
+ if(m_debug){collector->write();}
+
+ EXPECT_TRUE(*pass);
}
@@ -351,9 +382,12 @@ TEST_F(MaximumBipartiteGroupsMatcherMTTest, overlappingEtaRegions){
MaximumBipartiteGroupsMatcherMT matcher(conditions);
auto groups = makeJetGroupsMT(jets.begin(), jets.end());
- auto visitor = std::unique_ptr<IConditionVisitor>(nullptr);
+ auto visitor = std::unique_ptr<ITrigJetHypoInfoCollector>(nullptr);
+ if(m_debug){
+ visitor.reset(new DebugInfoCollector("overlappingEtaRegions"));
+ }
- bool pass = matcher.match(groups.begin(), groups.end(), visitor);
-
- EXPECT_TRUE(pass);
+ auto pass = matcher.match(groups.begin(), groups.end(), visitor);
+ if(visitor){visitor -> write();}
+ EXPECT_TRUE(*pass);
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/MaximumBipartiteGroupsMatcherMTTest_Multijet.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/MaximumBipartiteGroupsMatcherMTTest_Multijet.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..f1cc295fb51b56d2284455385d5077291c246c1c
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypoUnitTests/src/MaximumBipartiteGroupsMatcherMTTest_Multijet.cxx
@@ -0,0 +1,574 @@
+/*
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+*/
+
+#include "TrigHLTJetHypo/../src//MaximumBipartiteGroupsMatcherMT.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/HypoJetDefs.h"
+#include "TrigHLTJetHypo/../src/ConditionsDefsMT.h"
+#include "TrigHLTJetHypo/../src/conditionsFactoryMT.h"
+#include "TrigHLTJetHypo/../src/DebugInfoCollector.h"
+#include "TrigHLTJetHypo/../src/MultijetFlowNetworkBuilder.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/CombinationsGrouper.h"
+
+#include "./MockJetWithLorentzVector.h"
+#include "./TLorentzVectorFactory.h"
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+
+#include <TLorentzVector.h>
+#include <memory>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <limits>
+#include <algorithm>
+
+
+/*
+ * MaximumBipartiteMatcher functionality tested:
+ * 0 fail if no jet vector indices
+ * 1 fail if no if there are fewer passing jets than conditions
+ * 2 pass if there are at least as many passing jets as conditions
+ * 3 conditions are ordered by threshold
+ * 4 jets are ordered by Et
+ *
+ * Mocked objects:
+ * - jet: will be ordered on ET, need TLorentzVector, hence
+ * MockJetWithLorentzVector
+ * - ICondition
+ */
+
+using ::testing::Return;
+using ::testing::_;
+using ::testing::SetArgReferee;
+using ::testing::AnyNumber;
+
+
+class MaximumBipartiteGroupsMatcherMTTest_Multijet: public ::testing::Test {
+public:
+ MaximumBipartiteGroupsMatcherMTTest_Multijet() {
+ }
+
+ ConditionsMT m_conditions;
+ int m_nconditions;
+ bool m_debug{false};
+
+ HypoJetGroupVector makeJetGroupsMT(HypoJetIter b, HypoJetIter e){
+ CombinationsGrouper g(2); // dijet groups
+ return g.group(b, e);
+ }
+
+ void makeConditions(const std::vector<double>& detaMins,
+ const std::vector<double>& detaMaxs){
+ std::vector<double> massMins{0., 0.};
+ std::vector<double> massMaxs{
+ std::numeric_limits<double>::max(),
+ std::numeric_limits<double>::max(),
+ };
+
+
+ std::vector<double> dphiMins{0., 0.};
+ std::vector<double> dphiMaxs{
+ std::numeric_limits<double>::max(),
+ std::numeric_limits<double>::max(),
+ };
+
+
+ m_conditions = conditionsFactoryDijetMT(massMins, massMaxs,
+ detaMins, detaMaxs,
+ dphiMins, dphiMaxs);
+ m_nconditions = m_conditions.size();
+ }
+};
+
+
+
+std::vector<MockJetWithLorentzVector*>
+makeGMockJets(const std::vector<double>& etas) {
+
+ std::vector<MockJetWithLorentzVector*> jets;
+ // jets.resize(etas.size());
+
+ auto factory = TLorentzVectorFactory();
+
+ // auto dst = jets.begin();
+ auto make_jet = [&factory](double eta){
+ return new MockJetWithLorentzVector(factory.make(eta, 10.));
+ };
+
+ std::transform(etas.begin(),
+ etas.end(),
+ std::back_inserter(jets),
+ make_jet);
+
+ return jets;
+}
+
+HypoJetVector makeHypoJets(const std::vector<double>& etas) {
+ auto gmockJets = makeGMockJets(etas);
+ HypoJetVector jets(gmockJets.begin(), gmockJets.end());
+ return jets;
+}
+
+
+HypoJetVector makeHypoJets(const std::vector<MockJetWithLorentzVector*>& gj) {
+ HypoJetVector jets(gj.begin(), gj.end());
+ return jets;
+}
+
+
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, debugFlagIsFalse){
+ /* idiot test to ensure dbug flag is of prior to commiting */
+ EXPECT_FALSE(m_debug);
+}
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, mj_flowNetworkBuilder_0){
+ /* (j0, j1) -> c0
+ (j0, j2) -> c0
+ (j0, j1) -> c1
+ Fails - j0 is shared.
+ */
+
+ auto out = std::make_unique<std::ofstream>(nullptr);
+ if (m_debug){out.reset(new std::ofstream("mj_flowNetworkBuilder_0.log"));}
+
+ std::vector<double> detaMins{3.6, 5.5};
+
+ std::vector<double> detaMaxs{
+ std::numeric_limits<double>::max(),
+ std::numeric_limits<double>::max(),
+ };
+ makeConditions(detaMins, detaMaxs);
+
+
+ if(out){
+ for(const auto& c : m_conditions){*out << c.toString();}
+ }
+
+
+ std::vector<double> etas{-5.0, 1.0, -1.0, -2.5};
+ EXPECT_TRUE(etas.size() == 4);
+
+
+ auto g_jets = makeGMockJets(etas);
+
+ for(auto j: g_jets){
+ EXPECT_CALL(*j, eta()).Times(AnyNumber());
+ }
+
+ auto jets = makeHypoJets(g_jets);
+
+ EXPECT_TRUE(jets.size() == 4);
+ if(m_debug){
+ for(const auto & j: jets){*out<< j << " " << j->toString() <<'\n';}
+ }
+ EXPECT_TRUE(m_conditions.size() == 2);
+ auto builder = std::unique_ptr<IFlowNetworkBuilder>(nullptr);
+ builder.reset(new MultijetFlowNetworkBuilder(m_conditions));
+ std::map<int, pHypoJet> nodeToJet;
+
+ auto groups = makeJetGroupsMT(jets.begin(), jets.end());
+ EXPECT_TRUE(groups.size() == 6);
+
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>();
+ collector.reset(new DebugInfoCollector("mj_flowNetworkBuilder_0"));
+
+ auto G = builder->create(groups.begin(), groups.end(), collector, nodeToJet);
+ EXPECT_FALSE(G.has_value());
+
+ for(auto j : jets){delete j;}
+}
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, mj_flowNetworkBuilder_1){
+ /* (j0, j1) -> c0
+ (j0, j1) -> c1
+ (j3, j4) -> c1
+ Passes.
+ */
+
+ auto out = std::make_unique<std::ofstream>(nullptr);
+ if (m_debug){out.reset(new std::ofstream("mj_flowNetworkBuilder_1.log"));}
+
+ std::vector<double> detaMins{0., 0.};
+
+ std::vector<double> detaMaxs{1.0, 2.0};
+ makeConditions(detaMins, detaMaxs);
+
+
+ if(out){
+ for(const auto& c : m_conditions){*out << c.toString();}
+ }
+
+ std::vector<double> etas{-5.0, -4.9, 3.9, 5.0};
+ EXPECT_TRUE(etas.size() == 4);
+
+
+ auto g_jets = makeGMockJets(etas);
+
+ for(auto j: g_jets){
+ EXPECT_CALL(*j, eta()).Times(AnyNumber());
+ }
+
+ auto jets = makeHypoJets(g_jets);
+ EXPECT_TRUE(jets.size() == 4);
+ if(m_debug){
+ for(const auto & j: jets){*out<<j<< " " << j->toString() <<'\n';}
+ }
+ EXPECT_TRUE(m_conditions.size() == 2);
+
+ auto builder = std::unique_ptr<IFlowNetworkBuilder>(nullptr);
+ builder.reset(new MultijetFlowNetworkBuilder(m_conditions));
+ std::map<int, pHypoJet> nodeToJet;
+
+ auto groups = makeJetGroupsMT(jets.begin(), jets.end());
+ EXPECT_TRUE(groups.size() == 6);
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>();
+ collector.reset(new DebugInfoCollector("mj_flowNetworkBuilder_1_collector"));
+
+ auto G = builder->create(groups.begin(), groups.end(), collector, nodeToJet);
+ EXPECT_TRUE(G.has_value());
+
+ if(m_debug){
+ std::stringstream ss;
+ ss << **G << '\n';
+ collector->collect("FlowNetwork", ss.str());
+ collector->write();
+ }
+
+ EXPECT_TRUE((*G)->V() == 14);
+ EXPECT_TRUE(((*G)->edges()).size() == 13);
+
+ for(auto j : jets){delete j;}
+}
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, mj_flowNetworkBuilder_2){
+ /* (j0, j1) -> c0
+ (j0, j1) -> c1
+ (j3, j4) -> c1
+ Passes.
+ Test with no collector
+ */
+
+ auto out = std::make_unique<std::ofstream>(nullptr);
+ if (m_debug){out.reset(new std::ofstream("mj_flowNetworkBuilder_2.log"));}
+
+ std::vector<double> detaMins{0., 0.};
+
+ std::vector<double> detaMaxs{1.0, 2.0};
+ makeConditions(detaMins, detaMaxs);
+
+
+ if(out){
+ for(const auto& c : m_conditions){*out << c.toString();}
+ }
+
+ std::vector<double> etas{-5.0, -4.9, 3.9, 5.0};
+ EXPECT_TRUE(etas.size() == 4);
+
+ auto g_jets = makeGMockJets(etas);
+
+ for(auto j: g_jets){
+ EXPECT_CALL(*j, eta()).Times(AnyNumber());
+ }
+
+ auto jets = makeHypoJets(g_jets);
+
+ EXPECT_TRUE(jets.size() == 4);
+ if(m_debug){
+ for(const auto & j: jets){*out<<j<< " " << j->toString() <<'\n';}
+ }
+ EXPECT_TRUE(m_conditions.size() == 2);
+
+ auto builder = std::unique_ptr<IFlowNetworkBuilder>(nullptr);
+ builder.reset(new MultijetFlowNetworkBuilder(m_conditions));
+ std::map<int, pHypoJet> nodeToJet;
+
+ auto groups = makeJetGroupsMT(jets.begin(), jets.end());
+ EXPECT_TRUE(groups.size() == 6);
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>();
+ // collector.reset(new DebugInfoCollector("mj_flowNetworkBuilder_2_collector"));
+
+ auto G = builder->create(groups.begin(), groups.end(), collector, nodeToJet);
+ EXPECT_TRUE(G.has_value());
+
+ EXPECT_TRUE((*G)->V() == 14);
+ EXPECT_TRUE(((*G)->edges()).size() == 13);
+
+ for(auto j : jets){delete j;}
+}
+
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, mj0){
+ /* (j0, j1) -> c0
+ (j0, j2) -> c0
+ (j0, j1) -> c1
+ Fails - j0 is shared.
+ */
+
+ auto out = std::make_unique<std::ofstream>(nullptr);
+ if (m_debug){out.reset(new std::ofstream("Multijet_mj0.log"));}
+
+ std::vector<double> detaMins{3.6, 5.5};
+
+ std::vector<double> detaMaxs{
+ std::numeric_limits<double>::max(),
+ std::numeric_limits<double>::max(),
+ };
+ makeConditions(detaMins, detaMaxs);
+
+
+ if(out){
+ for(const auto& c : m_conditions){*out << c.toString();}
+ }
+
+ std::vector<double> etas{-5.0, 1.0, -1.0, -2.5};
+ EXPECT_TRUE(etas.size() == 4);
+
+ auto g_jets = makeGMockJets(etas);
+
+ for(auto j: g_jets){
+ EXPECT_CALL(*j, eta()).Times(AnyNumber());
+ }
+
+ auto jets = makeHypoJets(g_jets);
+
+ if(m_debug){
+ for(const auto & j: jets){*out<< j << " " << j->toString() <<'\n';}
+ }
+ EXPECT_TRUE(jets.size() == 4);
+
+
+ EXPECT_TRUE(m_conditions.size() == 2);
+ MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
+ auto groups = makeJetGroupsMT(jets.begin(), jets.end());
+ EXPECT_TRUE(groups.size() == 6);
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>();
+ collector.reset(new DebugInfoCollector("mj0"));
+
+ auto pass = matcher.match(groups.begin(), groups.end(), collector);
+ if (m_debug){collector->write();}
+
+ for(auto j : jets){delete j;}
+ EXPECT_FALSE(*pass);
+}
+
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, mj1){
+ /* (j0, j3) -> c0
+ (j0, j1) -> c1
+ Fails - shared j0.
+ */
+
+ auto out = std::make_unique<std::ofstream>(nullptr);
+ if (m_debug){out.reset(new std::ofstream("Multijet_mj1.log"));}
+
+ std::vector<double> detaMins{3.6, 5.5};
+
+ std::vector<double> detaMaxs{4.5, 6.5};
+ makeConditions(detaMins, detaMaxs);
+
+
+ if(out){
+ for(const auto& c : m_conditions){*out << c.toString();}
+ }
+
+ std::vector<double> etas{-5.0, 1.0, -1.0, -2.5};
+ EXPECT_TRUE(etas.size() == 4);
+
+ auto g_jets = makeGMockJets(etas);
+
+ for(auto j: g_jets){
+ EXPECT_CALL(*j, eta()).Times(AnyNumber());
+ }
+
+ auto jets = makeHypoJets(g_jets);
+
+ EXPECT_TRUE(jets.size() == 4);
+ if(m_debug){
+ for(const auto & j: jets){*out<<j<< " " << j->toString() <<'\n';}
+ }
+ EXPECT_TRUE(m_conditions.size() == 2);
+ MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
+ auto groups = makeJetGroupsMT(jets.begin(), jets.end());
+ EXPECT_TRUE(groups.size() == 6);
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>();
+
+ if(m_debug){
+ collector.reset(new DebugInfoCollector("mj1"));
+ }
+
+ auto pass = matcher.match(groups.begin(), groups.end(), collector, m_debug);
+
+ if(m_debug){collector->write();}
+
+ for(auto j : jets){delete j;}
+ EXPECT_FALSE(*pass);
+}
+
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, mj2){
+ /* (j0, j1) -> c0
+ (j3, j4) -> c1
+ Passes
+ */
+
+ auto out = std::make_unique<std::ofstream>(nullptr);
+ if (m_debug){out.reset(new std::ofstream("Multijet_mj2.log"));}
+
+ std::vector<double> detaMins{0.0, 1.0};
+
+ std::vector<double> detaMaxs{1.5, 2.0};
+ makeConditions(detaMins, detaMaxs);
+
+
+ if(out){
+ for(const auto& c : m_conditions){*out << c.toString();}
+ }
+
+ std::vector<double> etas{-5.0, -4.9, 5.0, 3.25};
+ EXPECT_TRUE(etas.size() == 4);
+
+
+
+ auto g_jets = makeGMockJets(etas);
+
+ for(auto j: g_jets){
+ EXPECT_CALL(*j, eta()).Times(AnyNumber());
+ }
+
+ auto jets = makeHypoJets(g_jets);
+
+ EXPECT_TRUE(jets.size() == 4);
+ if(m_debug){
+ for(const auto & j: jets){*out<<j<< " " << j->toString() <<'\n';}
+ }
+ EXPECT_TRUE(m_conditions.size() == 2);
+ MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
+ auto groups = makeJetGroupsMT(jets.begin(), jets.end());
+ EXPECT_TRUE(groups.size() == 6);
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>(nullptr);
+
+ if(m_debug){
+ collector.reset(new DebugInfoCollector("mj2"));
+ }
+
+ auto pass = matcher.match(groups.begin(), groups.end(), collector, m_debug);
+
+ if(m_debug){collector->write();}
+
+ for(auto j : jets){delete j;}
+ EXPECT_TRUE(*pass);
+}
+
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, mj3){
+ /* (j0, j1) -> c0
+ (j0, j1) -> c1
+ (j3, j4) -> c1
+ Passes.
+ */
+
+ auto out = std::make_unique<std::ofstream>(nullptr);
+ if (m_debug){out.reset(new std::ofstream("Multijet_mj3.log"));}
+
+ std::vector<double> detaMins{0., 0.};
+
+ std::vector<double> detaMaxs{1.0, 2.0};
+ makeConditions(detaMins, detaMaxs);
+
+
+ if(out){
+ for(const auto& c : m_conditions){*out << c.toString();}
+ }
+
+ std::vector<double> etas{-5.0, -4.9, 4.0, 5.0};
+ EXPECT_TRUE(etas.size() == 4);
+
+ auto g_jets = makeGMockJets(etas);
+
+ for(auto j: g_jets){
+ EXPECT_CALL(*j, eta()).Times(AnyNumber());
+ }
+
+ auto jets = makeHypoJets(g_jets);
+
+ EXPECT_TRUE(jets.size() == 4);
+ if(m_debug){
+ for(const auto & j: jets){*out<<j<< " " << j->toString() <<'\n';}
+ }
+ EXPECT_TRUE(m_conditions.size() == 2);
+ MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
+ auto groups = makeJetGroupsMT(jets.begin(), jets.end());
+ EXPECT_TRUE(groups.size() == 6);
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>();
+ collector.reset(new DebugInfoCollector("mj3"));
+
+ auto pass = matcher.match(groups.begin(), groups.end(), collector);
+
+ if(m_debug){collector->write();}
+
+ for(auto j : jets){delete j;}
+ EXPECT_TRUE(*pass);
+}
+
+
+TEST_F(MaximumBipartiteGroupsMatcherMTTest_Multijet, mj4){
+ /* (j0, j1) -> c0
+ (j0, j1) -> c1
+ (j3, j4) -> c0
+ (j3, j4) -> c1
+
+ Passes.
+ */
+
+ auto out = std::make_unique<std::ofstream>(nullptr);
+ if (m_debug){out.reset(new std::ofstream("Multijet_mj4.log"));}
+
+ std::vector<double> detaMins{0., 0.};
+
+ std::vector<double> detaMaxs{1.0, 2.0};
+ makeConditions(detaMins, detaMaxs);
+
+
+ if(out){
+ for(const auto& c : m_conditions){*out << c.toString();}
+ }
+
+ std::vector<double> etas{-5., -4.9, 4.9, 5.};
+ EXPECT_TRUE(etas.size() == 4);
+
+
+
+ auto g_jets = makeGMockJets(etas);
+
+ for(auto j: g_jets){
+ EXPECT_CALL(*j, eta()).Times(AnyNumber());
+ }
+
+ auto jets = makeHypoJets(g_jets);
+
+ EXPECT_TRUE(jets.size() == 4);
+ if(m_debug){
+ for(const auto & j: jets){*out<<j<< " " << j->toString() <<'\n';}
+ }
+
+
+ EXPECT_TRUE(m_conditions.size() == 2);
+ MaximumBipartiteGroupsMatcherMT matcher(m_conditions);
+ auto groups = makeJetGroupsMT(jets.begin(), jets.end());
+ EXPECT_TRUE(groups.size() == 6);
+ auto collector = std::unique_ptr<ITrigJetHypoInfoCollector>();
+
+ if(m_debug){
+ collector.reset(new DebugInfoCollector("mj4"));
+ }
+
+ auto pass = matcher.match(groups.begin(), groups.end(), collector, m_debug);
+
+ if(m_debug){collector->write();}
+
+ for(auto j : jets){delete j;}
+ EXPECT_TRUE(*pass);
+}
+
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
index f709144b2293813c1308ea1657607e9af3e2fe12..f9074cfbdd3d9b4b4544b1502367789389a7a608 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauCaloHypoAlgMT.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/Property.h"
@@ -76,7 +76,7 @@ StatusCode TrigTauCaloHypoAlgMT::execute( const EventContext& context ) const {
d->setObjectLink( "feature", el );
}
d->setObjectLink( "roi", roiELInfo.link );
- TrigCompositeUtils::linkToPrevious( d, previousDecision );
+ TrigCompositeUtils::linkToPrevious( d, previousDecision, context );
ATH_MSG_DEBUG( "Added view, roi, cluster, previous decision to new decision " << counter << " for view " << (*viewELInfo.link)->name() );
counter++;
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/TrigCostMonitor/TrigCostTool.h b/Trigger/TrigMonitoring/TrigCostMonitor/TrigCostMonitor/TrigCostTool.h
index 57d12845025aac9e1eeb7def84059c46deecfa3c..ac4ae2e3f2390f0e09f622175b6dc25aa5f6eb12 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/TrigCostMonitor/TrigCostTool.h
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/TrigCostMonitor/TrigCostTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGCOSTTOOL_H
@@ -12,7 +12,8 @@
// Framework
#include "AthenaMonitoring/IMonitorToolBase.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "CoolLumiUtilities/BunchGroupTool.h"
+#include "CoolLumiUtilities/BunchGroupCondData.h"
+#include "StoreGate/ReadCondHandleKey.h"
// Trigger
#include "TrigTimeAlgs/ITrigTimerSvc.h"
@@ -39,21 +40,21 @@ class TrigCostTool : public AthAlgTool, virtual public IMonitorToolBase {
const IInterface* parent);
virtual ~TrigCostTool();
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
- StatusCode bookHists();
- StatusCode fillHists();
- StatusCode finalHists();
+ virtual StatusCode bookHists() override;
+ virtual StatusCode fillHists() override;
+ virtual StatusCode finalHists() override;
- StatusCode setupOutputStreams(std::vector<std::string> Mapping
- = std::vector<std::string>());
+ virtual StatusCode setupOutputStreams(std::vector<std::string> Mapping
+ = std::vector<std::string>()) override;
- bool preSelector();
+ virtual bool preSelector() override;
- StatusCode runStat() { return StatusCode::SUCCESS; }
- StatusCode checkHists(bool) { return StatusCode::SUCCESS; }
- StatusCode convertLWHists() { return StatusCode::SUCCESS; }
+ virtual StatusCode runStat() override { return StatusCode::SUCCESS; }
+ virtual StatusCode checkHists(bool) override { return StatusCode::SUCCESS; }
+ virtual StatusCode convertLWHists() override { return StatusCode::SUCCESS; }
private:
@@ -106,9 +107,10 @@ class TrigCostTool : public AthAlgTool, virtual public IMonitorToolBase {
const HLT::TrigSteer *m_parentAlg;
TrigTimer *m_timer;
ServiceHandle<ITrigTimerSvc> m_timerSvc;
- ToolHandle<IBunchGroupTool> m_toolBunchGroup;
ToolHandle<HLT::IReusableScaler> m_scalerTool;
ToolHandle<HLT::IEventInfoAccessTool> m_eventInfoAccessTool;
+ SG::ReadCondHandleKey<BunchGroupCondData> m_bunchGroupKey
+ { this, "BunchGroupKey", "BunchGroupCondData", "" };
// Tools for operational data collection
ToolHandle<Trig::ITrigNtTool> m_toolConf;
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py b/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
index 5f4d33dbb6a7a2eded71e5b0da01ed603b84db2d..cedb8fddc7a29a3b67215eda9803bc024317db98 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from TrigCostMonitor.TrigCostMonitorConf import *
from AthenaCommon.Logging import logging
@@ -21,6 +21,9 @@ class TrigCostTool_Target(TrigCostTool):
from TrigSteering.TrigSteeringConfig import RandomScaler
self.scalerTool = RandomScaler('TrigCostScaler')
+
+ from CoolLumiUtilities.BunchGroupCondAlgDefault import BunchGroupCondAlgDefault
+ BunchGroupCondAlgDefault()
def target(self):
return [self.monitoringTarget]
diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigCostTool.cxx b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigCostTool.cxx
index 3c0df3534548a7c9ca3bf23fdef1070fe064e594..fac447a2f7f9e5bbb11db5fbb96ee40f7aea7beb 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigCostTool.cxx
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/src/TrigCostTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
@@ -15,6 +15,7 @@
#include "AthenaKernel/errorcheck.h"
#include "StoreGate/DataHandle.h"
#include "xAODEventInfo/EventInfo.h"
+#include "StoreGate/ReadCondHandle.h"
// #include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h" // Get CTP ROB
// Trigger
@@ -49,7 +50,6 @@ TrigCostTool::TrigCostTool(const std::string& type,
m_parentAlg(0),
m_timer(0),
m_timerSvc("TrigTimerSvc/TrigTimerSvc", name),
- m_toolBunchGroup("BunchGroupTool", this),
m_scalerTool("HLT::RandomScaler/TrigCostScaler", this),
m_eventInfoAccessTool("HLT::EventInfoAccessTool/EventInfoAccessTool", this),
m_toolConf("Trig::TrigNtConfTool/TrigNtConfTool", this),
@@ -156,11 +156,8 @@ StatusCode TrigCostTool::initialize()
m_keySteerOPI = "HLT_TrigOperationalInfoCollection_OPI_HLT";
}
- // Only get this tool offline
- if (m_costForCAF == true) {
- CHECK(m_toolBunchGroup.retrieve());
- ATH_MSG_INFO("Retrieved " << m_toolBunchGroup);
- }
+ // Only get this offline
+ ATH_CHECK( m_bunchGroupKey.initialize (m_costForCAF) );
CHECK(m_toolConf.retrieve());
ATH_MSG_INFO("Retrieved " << m_toolConf);
@@ -616,20 +613,13 @@ void TrigCostTool::ProcessConfig(xAOD::EventInfo* info)
//Offline, get the BunchGroup info at this point. TODO: Migrate to 16x BGs when the tool updates
if (m_costForCAF == true) {
- unsigned bunchGroupLength[8] = {0};
- bunchGroupLength[0] = m_toolBunchGroup->nBunchGroup0();
- bunchGroupLength[1] = m_toolBunchGroup->nBunchGroup1();
- bunchGroupLength[2] = m_toolBunchGroup->nBunchGroup2();
- bunchGroupLength[3] = m_toolBunchGroup->nBunchGroup3();
- bunchGroupLength[4] = m_toolBunchGroup->nBunchGroup4();
- bunchGroupLength[5] = m_toolBunchGroup->nBunchGroup5();
- bunchGroupLength[6] = m_toolBunchGroup->nBunchGroup6();
- bunchGroupLength[7] = m_toolBunchGroup->nBunchGroup7();
- for (unsigned bg = 0; bg < 8; ++bg) {
+ SG::ReadCondHandle<BunchGroupCondData> bunchGroup (m_bunchGroupKey);
+ for (unsigned bg = 0; bg < BunchGroupCondData::NBUNCHGROUPS; ++bg) {
+ unsigned int bglen = bunchGroup->bunchGroup(bg).size();
std::stringstream ssKey, ssVal;
ssKey << "DB:BGRP" << bg;
- ssVal << bunchGroupLength[bg];
- ATH_MSG_DEBUG( "Database DB:BGRP" << bg << " size:" << bunchGroupLength[bg] );
+ ssVal << bglen;
+ ATH_MSG_DEBUG( "Database DB:BGRP" << bg << " size:" << bglen );
m_config_sv.addValue(ssKey.str(), ssVal.str());
}
}
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
index f9169d53e792dfb1a79dfaeff3462eb3277b43c0..842e504d0b7173d0c0eeb68abefc27695419dda7 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.cxx
@@ -43,19 +43,19 @@ StatusCode TrigSignatureMoniMT::initialize() {
y, 1, y + 1 ); // Fill and GetBinContent use the same indexing then
m_countHistogram = (TH2*)m_passHistogram->Clone("DecisionCount");
- m_countHistogram->SetTitle("Positive decisions count per step;chain;step");
-
+ m_countHistogram->SetTitle("Positive decisions count per step;chain;step");
+
+ m_rateHistogram = (TH2*) m_passHistogram->Clone("RateCount");
+ m_rateHistogram->SetTitle("Rate of positive decisions");
ATH_CHECK( m_histSvc->regHist( m_bookingPath + "/"+m_passHistogram->GetName(), m_passHistogram ) );
ATH_CHECK( m_histSvc->regHist( m_bookingPath + "/"+m_countHistogram->GetName(), m_countHistogram ) );
-
-
-
+ ATH_CHECK( m_histSvc->regHist( m_bookingPath + "/"+m_rateHistogram->GetName(), m_rateHistogram ) );
}
ATH_CHECK( initHist( m_passHistogram ) );
ATH_CHECK( initHist( m_countHistogram ) );
-
+ ATH_CHECK( initHist( m_rateHistogram ) );
return StatusCode::SUCCESS;
}
@@ -110,19 +110,19 @@ StatusCode TrigSignatureMoniMT::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode TrigSignatureMoniMT::fillPass(const TrigCompositeUtils::DecisionIDContainer& dc, int row) {
+StatusCode TrigSignatureMoniMT::fillPassEvents(const TrigCompositeUtils::DecisionIDContainer& dc, int row, TH2 * histogram) {
for ( auto id : dc ) {
auto id2bin = m_chainIDToBinMap.find( id );
if ( id2bin == m_chainIDToBinMap.end() ) {
ATH_MSG_WARNING( "HLT chain " << HLT::Identifier(id) << " not configured to be monitored" );
} else {
- m_passHistogram->Fill( id2bin->second, double(row) );
+ histogram->Fill( id2bin->second, double(row) );
}
}
return StatusCode::SUCCESS;
}
-StatusCode TrigSignatureMoniMT::fillCount(const std::vector<TrigCompositeUtils::DecisionID>& dc, int row) {
+StatusCode TrigSignatureMoniMT::fillDecisionCount(const std::vector<TrigCompositeUtils::DecisionID>& dc, int row) {
for ( auto id : dc ) {
auto id2bin = m_chainIDToBinMap.find( id );
if ( id2bin == m_chainIDToBinMap.end() ) {
@@ -133,6 +133,9 @@ StatusCode TrigSignatureMoniMT::fillCount(const std::vector<TrigCompositeUtils::
return StatusCode::SUCCESS;
}
+StatusCode TrigSignatureMoniMT::fillRate(const TrigCompositeUtils::DecisionIDContainer& dc, int row) {
+ return fillPassEvents(dc, row, m_rateHistogram);
+}
StatusCode TrigSignatureMoniMT::execute() {
@@ -157,7 +160,7 @@ StatusCode TrigSignatureMoniMT::execute() {
TrigCompositeUtils::DecisionIDContainer ids;
TrigCompositeUtils::decisionIDs( l1Decisions->at( index ), ids );
ATH_MSG_DEBUG( "L1 " << index << " N positive decisions " << ids.size() );
- ATH_CHECK( fillPass( ids, index + 1 ) );
+ ATH_CHECK( fillPassEvents( ids, index + 1, m_passHistogram ) );
if ( not ids.empty() )
m_passHistogram->Fill( 1, double(index + 1) );
return StatusCode::SUCCESS;
@@ -171,9 +174,10 @@ StatusCode TrigSignatureMoniMT::execute() {
ctool->getDecisions( stepSum );
ATH_MSG_DEBUG( " Step " << step << " decisions " << stepSum.size() );
TrigCompositeUtils::DecisionIDContainer stepUniqueSum( stepSum.begin(), stepSum.end() );
- ATH_CHECK( fillPass( stepUniqueSum, 3+step ) );
- ATH_CHECK( fillCount( stepSum, 3+step ) );
-
+ ATH_CHECK( fillPassEvents( stepUniqueSum, 3+step, m_passHistogram ) );
+ ATH_CHECK( fillDecisionCount( stepSum, 3+step ) );
+ ATH_CHECK( fillRate( stepUniqueSum, 3+step ) );
+
++step;
}
@@ -187,7 +191,7 @@ StatusCode TrigSignatureMoniMT::execute() {
break;
}
}
- ATH_CHECK( fillPass( finalIDs, row ) );
+ ATH_CHECK( fillPassEvents( finalIDs, row, m_passHistogram ) );
if ( not finalIDs.empty() ) {
m_passHistogram->Fill( 1, double( row ) );
diff --git a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h
index e4441b4de0d0a8ba20850efefcb12319b3ca6c04..1b7b07e5c38c239ff68f9a1f8595d36521c24cb5 100644
--- a/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h
+++ b/Trigger/TrigMonitoring/TrigSteerMonitor/src/TrigSignatureMoniMT.h
@@ -48,14 +48,16 @@ class TrigSignatureMoniMT : public ::AthAlgorithm
TH2* m_passHistogram;
TH2* m_countHistogram;
+ TH2* m_rateHistogram;
ToolHandleArray<DecisionCollectorTool> m_collectorTools{ this, "CollectorTools", {}, "Tools that collect decisions for steps" };
int nBinsX() const;
int nBinsY() const;
StatusCode initHist(TH2*);
- StatusCode fillCount(const std::vector<TrigCompositeUtils::DecisionID>& dc, int row);
- StatusCode fillPass(const TrigCompositeUtils::DecisionIDContainer& dc, int row);
+ StatusCode fillDecisionCount(const std::vector<TrigCompositeUtils::DecisionID>& dc, int row);
+ StatusCode fillPassEvents(const TrigCompositeUtils::DecisionIDContainer& dc, int row, TH2* histogram);
+ StatusCode fillRate(const TrigCompositeUtils::DecisionIDContainer& dc, int row);
};
inline int TrigSignatureMoniMT::nBinsX() const {
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
index 28032b4f2e981d1ee23c7ddbfe7a1596ef36382a..d0e0ed08bc36ebcd08471c279b4b9dab3cebdc15 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.h
@@ -225,15 +225,6 @@ namespace TrigCompositeUtils {
**/
void recursiveGetDecisionsInternal( const Decision* start, const size_t location, std::vector<ElementLinkVector<DecisionContainer>>& linkVector, const DecisionID id = 0);
- /**
- * @brief Extract features from the supplied linkVector (obtained through recursiveGetDecisions).
- * @param[in] linkVector Vector of paths through the navigation which are to be considered.
- * @param[oneFeaturePerLeg] oneFeaturePerLeg If True, stops at the first feature (of the correct type) found per path through the navigation.
- * @return Typed vector of element links to all features found on the supplied linkVector.
- **/
- template<class CONTAINER>
- ElementLinkVector<CONTAINER> getFeaturesOfType( const std::vector<ElementLinkVector<DecisionContainer>>& linkVector, const bool oneFeaturePerLeg = true );
-
/**
* @brief Helper to keep the TC & object it has linked together (for convenience)
**/
@@ -256,6 +247,15 @@ namespace TrigCompositeUtils {
ElementLink<T> link;
};
+ /**
+ * @brief Extract features from the supplied linkVector (obtained through recursiveGetDecisions).
+ * @param[in] linkVector Vector of paths through the navigation which are to be considered.
+ * @param[oneFeaturePerLeg] oneFeaturePerLeg If True, stops at the first feature (of the correct type) found per path through the navigation.
+ * @return Typed vector of LinkInfo. Each LinkInfo wraps an ElementLink to a feature and a pointer to the feature's Decision object in the navigation.
+ **/
+ template<class CONTAINER>
+ const std::vector< LinkInfo<CONTAINER> > getFeaturesOfType( const std::vector<ElementLinkVector<DecisionContainer>>& linkVector, const bool oneFeaturePerLeg = true );
+
/**
* @brief search back the TC links for the object of type T linked to the one of TC (recursively)
* @arg start the TC from where the link back is to be looked for
diff --git a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
index 784b207047d608b9d7110e7eaa600ce9ab0ced36..549323c16767eb914c716bf48f658d3199408ba4 100644
--- a/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
+++ b/Trigger/TrigSteer/DecisionHandling/DecisionHandling/TrigCompositeUtils.icc
@@ -60,20 +60,20 @@ namespace TrigCompositeUtils {
}
template<class CONTAINER>
- ElementLinkVector<CONTAINER> getFeaturesOfType(const std::vector<ElementLinkVector<DecisionContainer>>& linkVector, const bool oneFeaturePerLeg) {
- ElementLinkVector<CONTAINER> features;
+ const std::vector< LinkInfo<CONTAINER> > getFeaturesOfType(const std::vector<ElementLinkVector<DecisionContainer>>& linkVector, const bool oneFeaturePerLeg) {
+ std::vector< LinkInfo<CONTAINER> > features;
// For each unique path through the navigation for a given chain
for (const ElementLinkVector<DecisionContainer>& decisionPath : linkVector) {
// For each step along this path, starting at the terminus and working back towards L1
for (const ElementLink<DecisionContainer>& decisionLink : decisionPath) {
const Decision* decision = (*decisionLink);
- if (decision->hasObjectLink("feature", ClassID_traits< CONTAINER >::ID())) {
+ if (decision->hasObjectLink(featureString(), ClassID_traits< CONTAINER >::ID())) {
// This try block protects against ExcCLIDMismatch throws from
// features which do not derive from IParticle, when an IParticle interface is requested.
try {
- const ElementLink<CONTAINER> featureLink = decision->objectLink<CONTAINER>("feature");
- features.push_back( featureLink );
+ const ElementLink<CONTAINER> featureLink = decision->objectLink<CONTAINER>( featureString() );
+ features.push_back( LinkInfo<CONTAINER>(decision, featureLink) );
if (oneFeaturePerLeg) {
break;
}
diff --git a/Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref b/Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref
index 7592d0dbb9c221812978d81293782199efd62d61..bee27322b7d9e515ba226410f7ff0a38f7965adf 100644
--- a/Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref
+++ b/Trigger/TrigSteer/DecisionHandling/share/TrigCompositeUtils_test.ref
@@ -35,26 +35,26 @@ xAOD::TrigComposite_v1::setObjectLink ERROR link is not valid
New decision d3b with name & context
d3b: TrigComposite_v1 name:'d3b'
- N Lnks:1
+ N Links:1, isRemapped:NO
Link Name:testlink, Key:1042135810, Index:1, CLID:1333228823
el2 1042135810 1
d3: TrigComposite_v1 name:''
- N Lnks:1
+ N Links:1, isRemapped:NO
Link Name:seed__COLL, Key:1042135810, Index:1, CLID:1333228823
N Decisions:2
95, 99,
d4: TrigComposite_v1 name:''
- N Lnks:1
+ N Links:1, isRemapped:NO
Link Name:seed__COLL, Key:1042135810, Index:1, CLID:1333228823
el: key 1042135810 index 1
create d5
set link
d5: TrigComposite_v1 name:'d5'
- N Lnks:1
+ N Links:1, isRemapped:NO
Link Name:feature, Key:1042135810, Index:1, CLID:1333228823
create d6
d6: TrigComposite_v1 name:'d6'
- N Lnks:1
+ N Links:1, isRemapped:NO
Link Name:seed__COLL, Key:1042135810, Index:5, CLID:1333228823
get d5 feature link
get d6 feature link
diff --git a/Trigger/TrigSteer/DecisionHandling/share/TrigTraversal_test.ref b/Trigger/TrigSteer/DecisionHandling/share/TrigTraversal_test.ref
index bb1a91f9ff5119b6a124f65487875477af718712..ea15ceb53b591dff3e2c78aac9bc21988ffe78cd 100644
--- a/Trigger/TrigSteer/DecisionHandling/share/TrigTraversal_test.ref
+++ b/Trigger/TrigSteer/DecisionHandling/share/TrigTraversal_test.ref
@@ -7,24 +7,25 @@ ApplicationMgr Ready
Context: s: 0 e: 0
Current context: s: 0 e: 0
1 paths for HLT_mufast_chain
- Path 0[HLTPassRaw -> END_MU_H_1__MU1 -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
-1 paths for HLT_mu_chain
- Path 0[HLTPassRaw -> END_MU_H_2__MU1 -> MU_H_2__MU1 F(21) -> MU_IM_2__MU1 -> MU_F_2__MU1 -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
+ Path 0[HLTPassRaw -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
+2 paths for HLT_mu_chain
+ Path 0[HLTPassRaw -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
+ Path 1[HLTPassRaw -> MU_H_2__MU1 F(21) -> MU_IM_2__MU1 -> MU_F_2__MU1 -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
2 paths for HLT_mu_em_chain
- Path 0[HLTPassRaw -> END_MUEM_CH_2__MU1 -> MUEM_CH_2__MU1 -> MUEM_H_2__MU1 F(21) -> MUEM_IM_2__MU1 -> MUEM_F_2__MU1 -> MUEM_CH_1__MU1 -> MUEM_H_1__MU1 F(20) -> MUEM_IM_1__MU1 -> MUEM_F_1__MU1 -> MU1]
- Path 1[HLTPassRaw -> END_MUEM_CH_2__EM0 -> MUEM_CH_2__EM0 -> MUEM_H_2__EM0 F(31) -> MUEM_IM_2__EM0 -> MUEM_F_2__EM0 -> MUEM_CH_1__EM0 -> MUEM_H_1__EM0 F(30) -> MUEM_IM_1__EM0 -> MUEM_F_1__EM0 -> EM0]
+ Path 0[HLTPassRaw -> MUEM_CH_2__MU1 -> MUEM_H_2__MU1 F(21) -> MUEM_IM_2__MU1 -> MUEM_F_2__MU1 -> MUEM_CH_1__MU1 -> MUEM_H_1__MU1 F(20) -> MUEM_IM_1__MU1 -> MUEM_F_1__MU1 -> MU1]
+ Path 1[HLTPassRaw -> MUEM_CH_2__EM0 -> MUEM_H_2__EM0 F(31) -> MUEM_IM_2__EM0 -> MUEM_F_2__EM0 -> MUEM_CH_1__EM0 -> MUEM_H_1__EM0 F(30) -> MUEM_IM_1__EM0 -> MUEM_F_1__EM0 -> EM0]
1 paths for HLT_em_chain
- Path 0[HLTPassRaw -> END_EM_H_2__EM0 -> EM_H_2__EM0 F(31) -> EM_IM_2__EM0 -> EM_F_2__EM0 -> EM_H_1__EM0 F(30) -> EM_IM_1__EM0 -> EM_F_1__EM0 -> EM0]
+ Path 0[HLTPassRaw -> EM_H_2__EM0 F(31) -> EM_IM_2__EM0 -> EM_F_2__EM0 -> EM_H_1__EM0 F(30) -> EM_IM_1__EM0 -> EM_F_1__EM0 -> EM0]
5 paths for All
- Path 0[HLTPassRaw -> END_MU_H_1__MU1 -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 1[HLTPassRaw -> END_MU_H_2__MU1 -> MU_H_2__MU1 F(21) -> MU_IM_2__MU1 -> MU_F_2__MU1 -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
- Path 2[HLTPassRaw -> END_MUEM_CH_2__MU1 -> MUEM_CH_2__MU1 -> MUEM_H_2__MU1 F(21) -> MUEM_IM_2__MU1 -> MUEM_F_2__MU1 -> MUEM_CH_1__MU1 -> MUEM_H_1__MU1 F(20) -> MUEM_IM_1__MU1 -> MUEM_F_1__MU1 -> MU1]
- Path 3[HLTPassRaw -> END_EM_H_2__EM0 -> EM_H_2__EM0 F(31) -> EM_IM_2__EM0 -> EM_F_2__EM0 -> EM_H_1__EM0 F(30) -> EM_IM_1__EM0 -> EM_F_1__EM0 -> EM0]
- Path 4[HLTPassRaw -> END_MUEM_CH_2__EM0 -> MUEM_CH_2__EM0 -> MUEM_H_2__EM0 F(31) -> MUEM_IM_2__EM0 -> MUEM_F_2__EM0 -> MUEM_CH_1__EM0 -> MUEM_H_1__EM0 F(30) -> MUEM_IM_1__EM0 -> MUEM_F_1__EM0 -> EM0]
+ Path 0[HLTPassRaw -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
+ Path 1[HLTPassRaw -> MU_H_2__MU1 F(21) -> MU_IM_2__MU1 -> MU_F_2__MU1 -> MU_H_1__MU1 F(20) -> MU_IM_1__MU1 -> MU_F_1__MU1 -> MU1]
+ Path 2[HLTPassRaw -> MUEM_CH_2__MU1 -> MUEM_H_2__MU1 F(21) -> MUEM_IM_2__MU1 -> MUEM_F_2__MU1 -> MUEM_CH_1__MU1 -> MUEM_H_1__MU1 F(20) -> MUEM_IM_1__MU1 -> MUEM_F_1__MU1 -> MU1]
+ Path 3[HLTPassRaw -> EM_H_2__EM0 F(31) -> EM_IM_2__EM0 -> EM_F_2__EM0 -> EM_H_1__EM0 F(30) -> EM_IM_1__EM0 -> EM_F_1__EM0 -> EM0]
+ Path 4[HLTPassRaw -> MUEM_CH_2__EM0 -> MUEM_H_2__EM0 F(31) -> MUEM_IM_2__EM0 -> MUEM_F_2__EM0 -> MUEM_CH_1__EM0 -> MUEM_H_1__EM0 F(30) -> MUEM_IM_1__EM0 -> MUEM_F_1__EM0 -> EM0]
[All features] HLT_mufast_chain features size:1
Feature 0:20,
-[All features] HLT_mu_chain features size:2
- Feature 0:21, Feature 1:20,
+[All features] HLT_mu_chain features size:3
+ Feature 0:20, Feature 1:21, Feature 2:20,
[All features] HLT_mu_em_chain features size:4
Feature 0:21, Feature 1:20, Feature 2:31, Feature 3:30,
[All features] HLT_em_chain features size:2
@@ -33,8 +34,8 @@ Current context: s: 0 e: 0
Feature 0:20, Feature 1:21, Feature 2:20, Feature 3:21, Feature 4:20, Feature 5:31, Feature 6:30, Feature 7:31, Feature 8:30,
[Final feature] HLT_mufast_chain features size:1
Feature 0:20,
-[Final feature] HLT_mu_chain features size:1
- Feature 0:21,
+[Final feature] HLT_mu_chain features size:2
+ Feature 0:20, Feature 1:21,
[Final feature] HLT_mu_em_chain features size:2
Feature 0:21, Feature 1:31,
[Final feature] HLT_em_chain features size:1
diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
index ae0ca549189339f413e44ba89063d5a8ba788ee2..af136d2582b01f97211f55313c3035a40eb22c71 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerBase.cxx
@@ -69,7 +69,7 @@ StatusCode InputMakerBase::decisionInputToOutput(const EventContext& context, st
TrigCompositeUtils::createAndStore(outputHandles[outputIndex]);
- auto outDecisions = outputHandles[outputIndex].ptr();
+ TrigCompositeUtils::DecisionContainer* outDecisions = outputHandles[outputIndex].ptr();
// If using m_mergeOutputs, then collate all RoIs that are stored in this input container
ElementLinkVector<TrigRoiDescriptorCollection> RoIsFromDecision;
@@ -112,7 +112,7 @@ StatusCode InputMakerBase::decisionInputToOutput(const EventContext& context, st
return StatusCode::FAILURE;
}
const size_t roiCounter = std::distance( RoIsFromDecision.begin(), roiIt );
- newDec = outDecisions[outputIndex][roiCounter];
+ newDec = outDecisions->at(roiCounter);
}
TrigCompositeUtils::linkToPrevious( newDec, inputDecision, context ); // Link inputDecision object as the 'seed' of newDec
diff --git a/Trigger/TrigSteer/DecisionHandling/src/TrigCompositeUtils.cxx b/Trigger/TrigSteer/DecisionHandling/src/TrigCompositeUtils.cxx
index ffd4959b554d5b743547b929bd9319488b5d900d..d83e54bbe65947f99db8cedd23fc278d98360820 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/TrigCompositeUtils.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/TrigCompositeUtils.cxx
@@ -169,12 +169,9 @@ namespace TrigCompositeUtils {
void recursiveGetDecisionsInternal(const Decision* start, const size_t location, std::vector<ElementLinkVector<DecisionContainer>>& linkVector, const DecisionID id) {
// Does this Decision satisfy the chain requirement?
- // Don't check this for HLTPassRaw or HLTRerun. These inital nodes have empty sets
- if (start->name() != "HLTPassRaw" && start->name() != "HLTRerun") {
- DecisionIDContainer idSet = {id};
- if (id != 0 && !isAnyIDPassing(start, idSet)) {
- return; // Stop propagating down this leg. It does not concern the chain with DecisionID = id
- }
+ DecisionIDContainer idSet = {id};
+ if (id != 0 && !isAnyIDPassing(start, idSet)) {
+ return; // Stop propagating down this leg. It does not concern the chain with DecisionID = id
}
// This Decision object is part of this linear path through the Navigation
@@ -211,7 +208,7 @@ namespace TrigCompositeUtils {
}
void recursiveGetDecisions(const Decision* start, std::vector<ElementLinkVector<DecisionContainer>>& linkVector, const DecisionID id) {
- // Note: we do not require recursiveGetDecisions to be an empty vector. We can append to it.
+ // Note: we do not require linkVector to be an empty vector. We can append to it.
linkVector.push_back( ElementLinkVector<DecisionContainer>() ); // Our starting point
const size_t startingElement = linkVector.size() - 1;
recursiveGetDecisionsInternal(start, startingElement, linkVector, id);
diff --git a/Trigger/TrigSteer/DecisionHandling/test/TrigTraversal_test.cxx b/Trigger/TrigSteer/DecisionHandling/test/TrigTraversal_test.cxx
index bf9b0841d146486933d01edf9aae2fd371e4709a..edecd00b0bee1ae79a0cf987cf591f3e86079fe8 100644
--- a/Trigger/TrigSteer/DecisionHandling/test/TrigTraversal_test.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/test/TrigTraversal_test.cxx
@@ -28,7 +28,7 @@ using TrigCompositeUtils::DecisionContainer;
void printPaths(const std::vector<ElementLinkVector<DecisionContainer>>& paths, const std::string& name);
template<class CONTAINER>
-void printFeatures(const ElementLinkVector<CONTAINER>& featureContainer, const std::string& name);
+void printFeatures(const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >& featureContainer, const std::string& name);
/// @brief Test to check traversal functions of a graph of interconnect TrigComposite objects
///
@@ -205,12 +205,23 @@ int main ATLAS_NOT_THREAD_SAFE () {
MU_H_1__MU1->setObjectLink<xAOD::MuonContainer>("feature", rec_1__mu1_link);
addDecisionID(HLT_mufast_chain, MU_H_1__MU1);
addDecisionID(HLT_mu_chain, MU_H_1__MU1);
-
// HLT_mufast_chain passes the event
- Decision* END_MU_H_1__MU1 = newDecisionIn(decisionContainerPtr, "END_MU_H_1__MU1");
- linkToPrevious(END_MU_H_1__MU1, MU_H_1__MU1);
- addDecisionID(HLT_mufast_chain, END_MU_H_1__MU1);
- linkToPrevious(END, END_MU_H_1__MU1);
+ addDecisionID(HLT_mufast_chain, END);
+ linkToPrevious(END, MU_H_1__MU1);
+
+ /// !!!
+ /// !!!
+ /// !!! When finding the first feature for the HLT_mu_chain, the navigation is here given two entry points into the graph,
+ /// !!! the correct one (MU_H_2__MU1) and an incorrect one (MU_H_1__MU1) due to HLT_mufast_chain also passing this event
+ /// !!! at this earlier Step.
+ /// !!!
+ /// !!! The feature access is currently "dumb", it doesn't know what should be the final step for each chain. Hence here
+ /// !!! it will return both the Step1 muon and the Step2 muon when asked for the first feature down each leg for HLT_mu_chain,
+ /// !!! Rather than just the Step2 muon.
+ /// !!!
+ /// !!! This will be corrected later, once the Trigger Decision Tool has access to more menu reflection information.
+ /// !!!
+ /// !!!
Decision* MU_F_2__MU1 = newDecisionIn(decisionContainerPtr, "MU_F_2__MU1");
linkToPrevious(MU_F_2__MU1, MU_H_1__MU1);
@@ -224,12 +235,9 @@ int main ATLAS_NOT_THREAD_SAFE () {
linkToPrevious(MU_H_2__MU1, MU_IM_2__MU1);
MU_H_2__MU1->setObjectLink<xAOD::MuonContainer>("feature", rec_2__mu1_link);
addDecisionID(HLT_mu_chain, MU_H_2__MU1);
-
// HLT_mu_chain passes the event
- Decision* END_MU_H_2__MU1 = newDecisionIn(decisionContainerPtr, "END_MU_H_2__MU1");
- linkToPrevious(END_MU_H_2__MU1, MU_H_2__MU1);
- addDecisionID(HLT_mu_chain, END_MU_H_2__MU1);
- linkToPrevious(END, END_MU_H_2__MU1);
+ addDecisionID(HLT_mu_chain, END);
+ linkToPrevious(END, MU_H_2__MU1);
}
///
@@ -272,12 +280,10 @@ int main ATLAS_NOT_THREAD_SAFE () {
Decision* MUEM_CH_2__MU1 = newDecisionIn(decisionContainerPtr, "MUEM_CH_2__MU1");
linkToPrevious(MUEM_CH_2__MU1, MUEM_H_2__MU1);
addDecisionID(HLT_mu_em_chain, MUEM_CH_2__MU1);
-
// HLT_mu_em_chain passes the event
- Decision* END_MUEM_CH_2__MU1 = newDecisionIn(decisionContainerPtr, "END_MUEM_CH_2__MU1");
- linkToPrevious(END_MUEM_CH_2__MU1, MUEM_CH_2__MU1);
- addDecisionID(HLT_mu_em_chain, END_MUEM_CH_2__MU1);
- linkToPrevious(END, END_MUEM_CH_2__MU1);
+ addDecisionID(HLT_mu_em_chain, END);
+ linkToPrevious(END, MUEM_CH_2__MU1);
+
}
///
@@ -312,12 +318,9 @@ int main ATLAS_NOT_THREAD_SAFE () {
linkToPrevious(EM_H_2__EM0, EM_IM_2__EM0);
EM_H_2__EM0->setObjectLink<xAOD::ElectronContainer>("feature", rec_2__em0_link);
addDecisionID(HLT_em_chain, EM_H_2__EM0);
-
// HLT_em_chain passes the event
- Decision* END_EM_H_2__EM0 = newDecisionIn(decisionContainerPtr, "END_EM_H_2__EM0");
- linkToPrevious(END_EM_H_2__EM0, EM_H_2__EM0);
- addDecisionID(HLT_em_chain, END_EM_H_2__EM0);
- linkToPrevious(END, END_EM_H_2__EM0);
+ linkToPrevious(END, EM_H_2__EM0);
+ addDecisionID(HLT_em_chain, END);
}
///
@@ -360,12 +363,9 @@ int main ATLAS_NOT_THREAD_SAFE () {
Decision* MUEM_CH_2__EM0 = newDecisionIn(decisionContainerPtr, "MUEM_CH_2__EM0");
linkToPrevious(MUEM_CH_2__EM0, MUEM_H_2__EM0);
addDecisionID(HLT_mu_em_chain, MUEM_CH_2__EM0);
-
// HLT_mu_em_chain passes the event
- Decision* END_MUEM_CH_2__EM0 = newDecisionIn(decisionContainerPtr, "END_MUEM_CH_2__EM0");
- linkToPrevious(END_MUEM_CH_2__EM0, MUEM_CH_2__EM0);
- addDecisionID(HLT_mu_em_chain, END_MUEM_CH_2__EM0);
- linkToPrevious(END, END_MUEM_CH_2__EM0);
+ addDecisionID(HLT_mu_em_chain, END);
+ linkToPrevious(END, MUEM_CH_2__EM0);
}
// Test the graph
@@ -388,11 +388,11 @@ int main ATLAS_NOT_THREAD_SAFE () {
printPaths(paths_HLT_em_chain, "HLT_em_chain");
printPaths(paths_HLT_all, "All");
- ElementLinkVector<xAOD::IParticleContainer> features_all_HLT_mufast_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mufast_chain, false);
- ElementLinkVector<xAOD::IParticleContainer> features_all_HLT_mu_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_chain, false);
- ElementLinkVector<xAOD::IParticleContainer> features_all_HLT_mu_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_em_chain, false);
- ElementLinkVector<xAOD::IParticleContainer> features_all_HLT_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_em_chain, false);
- ElementLinkVector<xAOD::IParticleContainer> features_all_HLT_all = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_all, false);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_all_HLT_mufast_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mufast_chain, false);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_all_HLT_mu_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_chain, false);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_all_HLT_mu_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_em_chain, false);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_all_HLT_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_em_chain, false);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_all_HLT_all = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_all, false);
printFeatures(features_all_HLT_mufast_chain, "[All features] HLT_mufast_chain");
printFeatures(features_all_HLT_mu_chain, "[All features] HLT_mu_chain");
@@ -400,11 +400,11 @@ int main ATLAS_NOT_THREAD_SAFE () {
printFeatures(features_all_HLT_em_chain, "[All features] HLT_em_chain");
printFeatures(features_all_HLT_all, "[All features] All chains");
- ElementLinkVector<xAOD::IParticleContainer> features_final_HLT_mufast_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mufast_chain, true);
- ElementLinkVector<xAOD::IParticleContainer> features_final_HLT_mu_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_chain, true);
- ElementLinkVector<xAOD::IParticleContainer> features_final_HLT_mu_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_em_chain, true);
- ElementLinkVector<xAOD::IParticleContainer> features_final_HLT_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_em_chain, true);
- ElementLinkVector<xAOD::IParticleContainer> features_final_HLT_all = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_all, true);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_final_HLT_mufast_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mufast_chain, true);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_final_HLT_mu_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_chain, true);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_final_HLT_mu_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_mu_em_chain, true);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_final_HLT_em_chain = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_em_chain, true);
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features_final_HLT_all = getFeaturesOfType<xAOD::IParticleContainer>(paths_HLT_all, true);
printFeatures(features_final_HLT_mufast_chain, "[Final feature] HLT_mufast_chain");
printFeatures(features_final_HLT_mu_chain, "[Final feature] HLT_mu_chain");
@@ -413,8 +413,8 @@ int main ATLAS_NOT_THREAD_SAFE () {
printFeatures(features_final_HLT_all, "[Final feature] All chains");
// Check typed retrieval too
- ElementLinkVector<xAOD::MuonContainer> features_final_mu = getFeaturesOfType<xAOD::MuonContainer>(paths_HLT_mu_em_chain);
- ElementLinkVector<xAOD::ElectronContainer> features_final_em = getFeaturesOfType<xAOD::ElectronContainer>(paths_HLT_mu_em_chain);
+ std::vector< LinkInfo<xAOD::MuonContainer> > features_final_mu = getFeaturesOfType<xAOD::MuonContainer>(paths_HLT_mu_em_chain);
+ std::vector< LinkInfo<xAOD::ElectronContainer> > features_final_em = getFeaturesOfType<xAOD::ElectronContainer>(paths_HLT_mu_em_chain);
printFeatures(features_final_mu, "[Explicit Final Muon Features] HLT_mu_em_chain");
printFeatures(features_final_em, "[Explicit Final Electron Features] HLT_mu_em_chain");
@@ -427,11 +427,11 @@ int main ATLAS_NOT_THREAD_SAFE () {
}
template<class CONTAINER>
-void printFeatures(const ElementLinkVector<CONTAINER>& featureContainer, const std::string& name) {
+void printFeatures(const std::vector< TrigCompositeUtils::LinkInfo<CONTAINER> >& featureContainer, const std::string& name) {
std::cout << name << " features size:" << featureContainer.size() << std::endl;
size_t count = 0;
- for (ElementLink<CONTAINER> featureLink : featureContainer) {
- std::cout << " Feature " << count++ << ":" << (*featureLink)->pt() << ",";
+ for (const TrigCompositeUtils::LinkInfo<CONTAINER>& featureLinkInfo : featureContainer) {
+ std::cout << " Feature " << count++ << ":" << (*featureLinkInfo.link)->pt() << ",";
}
std::cout << std::endl;
}
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
index 122b4fcb734e1d53bba86bbd9c3ffcbc71d92095..e3f91b0a20e9b7b1fa9eb0c523609b65de666d2c 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/DecisionSummaryMakerAlg.cxx
@@ -76,16 +76,17 @@ StatusCode DecisionSummaryMakerAlg::execute(const EventContext& context) const {
continue;
}
- // Copy decisions set into passRawOutput's persistent vector
- decisionIDs(passRawOutput).insert( decisionIDs(passRawOutput).end(),
- passingFinalIDs.begin(), passingFinalIDs.end() );
-
- if (msgLvl(MSG::DEBUG)) {
- allPassingFinalIDs.insert( passingFinalIDs.begin(), passingFinalIDs.end() );
- }
+ // Accumulate and de-duplicate passed IDs for which this hypo was the Chain's final step
+ allPassingFinalIDs.insert( passingFinalIDs.begin(), passingFinalIDs.end() );
+ // Create seed links for the navigation to follow
+ linkToPrevious(passRawOutput, decisionObject, context);
}
}
+ // Copy decisions set into passRawOutput's persistent vector
+ decisionIDs(passRawOutput).insert( decisionIDs(passRawOutput).end(),
+ allPassingFinalIDs.begin(), allPassingFinalIDs.end() );
+
if (msgLvl(MSG::DEBUG)) {
ATH_MSG_DEBUG( "Number of positive decisions " << allPassingFinalIDs.size() << " passing chains");
for ( auto d: allPassingFinalIDs ) {
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
index 6b800dfa56da7051b9993f29e595ed6a4ca9e5d2..30b5de790b6c8104bbd5baa414fc4670434bb9df 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx
@@ -10,8 +10,8 @@
#include "StoreGate/WriteDecorHandle.h"
HLTEDMCreator::HLTEDMCreator( const std::string& type,
- const std::string& name,
- const IInterface* parent )
+ const std::string& name,
+ const IInterface* parent )
: base_class( type, name, parent ) {}
template<typename T>
@@ -60,16 +60,21 @@ StatusCode HLTEDMCreator::initialize()
INIT_XAOD( MuonContainer );
INIT_XAOD( TauJetContainer );
+ INIT_XAOD( CaloClusterContainer );
#undef INIT
#undef INIT_XAOD
- if ( m_fixLinks ) {
- for ( auto writeHandleKey: m_TrigCompositeContainer ) {
- m_remapLinkCollKeys.emplace_back( writeHandleKey.key()+".remap_linkCollKeys" );
- m_remapLinkColIndices.emplace_back( writeHandleKey.key()+".remap_linkCollIndices" );
+ if ( m_fixLinks.size() > 0 ) {
+ for ( const auto& writeHandleKey: m_TrigCompositeContainer ) {
+ const bool doFixLinks = std::any_of(m_fixLinks.begin(), m_fixLinks.end(), [&](const std::string& s) { return s == writeHandleKey.key(); } );
+ if (doFixLinks) {
+ // This writeHandleKey is being included in the element link remapping
+ m_remapLinkColKeys.emplace_back( writeHandleKey.key()+".remap_linkColKeys" );
+ m_remapLinkColIndices.emplace_back( writeHandleKey.key()+".remap_linkColIndices" );
+ }
}
- ATH_CHECK( m_remapLinkCollKeys.initialize() ) ;
+ ATH_CHECK( m_remapLinkColKeys.initialize() ) ;
ATH_CHECK( m_remapLinkColIndices.initialize() );
}
@@ -105,7 +110,7 @@ struct xAODGenerator {
template<typename T>
StatusCode HLTEDMCreator::noMerge( ViewContainer const&, const SG::ReadHandleKey<T>&,
- EventContext const&, T & ) const {
+ EventContext const&, T & ) const {
// if we are called it means views merging is requested but Type T does not support it (i.e. missing copy c'tor)
return StatusCode::FAILURE;
@@ -113,7 +118,7 @@ StatusCode HLTEDMCreator::noMerge( ViewContainer const&, const SG::ReadHandleKe
template<typename T>
StatusCode HLTEDMCreator::viewsMerge( ViewContainer const& views, const SG::ReadHandleKey<T>& inViewKey,
- EventContext const& context, T & output ) const {
+ EventContext const& context, T & output ) const {
typedef typename T::base_value_type type_in_container;
StoreGateSvc* sg = evtStore().operator->(); // why the get() method is returing a null ptr is a puzzle, we have to use this ugly call to operator instead of it
@@ -127,68 +132,75 @@ StatusCode HLTEDMCreator::viewsMerge( ViewContainer const& views, const SG::Rea
StatusCode HLTEDMCreator::fixLinks( const ConstHandlesGroup< xAOD::TrigCompositeContainer >& handles ) const {
- // Make a list of the collections we're going to mess with
- // std::set< std::string > remappedCollections;
- // for ( auto writeHandleKey : handles.out ) {
- // remappedCollections.insert( writeHandleKey.key() );
- // }
-
static const SG::AuxElement::ConstAccessor< std::vector< uint32_t > > keyAccessor( "linkColKeys" );
- static const SG::AuxElement::ConstAccessor< std::vector< uint16_t > > offsetAccessor( "linkColIndices" );
+ static const SG::AuxElement::ConstAccessor< std::vector< uint16_t > > indexAccessor( "linkColIndices" );
ATH_MSG_DEBUG("Fixing links called for " << handles.out.size() << " object(s)");
// Do the remapping
- int index = -1;
+ int writeHandleArrayIndex = -1;
for ( auto writeHandleKey : handles.out ) {
- index++;
- ATH_MSG_DEBUG("Fixing links: see if collection is there: " << writeHandleKey.key() << " index " << index);
+ ++writeHandleArrayIndex;
+ // Check if we are re-mapping this handle
+ const bool doFixLinks = std::any_of(m_fixLinks.begin(), m_fixLinks.end(), [&](const std::string& s) { return s == writeHandleKey.key(); } );
+ if ( not doFixLinks ) {
+ ATH_MSG_DEBUG("Not requested to fix TrigComposite ElementLinks for " << writeHandleKey.key());
+ continue;
+ }
+
+ ATH_MSG_DEBUG("Fixing links: see if collection is there: " << writeHandleKey.key() << ", write hand array index: " << writeHandleArrayIndex);
SG::ReadHandle<xAOD::TrigCompositeContainer> readHandle( writeHandleKey.key() );
if ( not readHandle.isValid() ) { // object missing, ok, may be early rejection
continue;
}
- ATH_MSG_DEBUG("Fixing links: collection is there: " << writeHandleKey.key() );
- ATH_MSG_DEBUG("Adding decorations: " << m_remapLinkCollKeys.at( index ).key() << " and " << m_remapLinkColIndices.at( index ).key() );
+ ATH_MSG_DEBUG("Fixing links: collection exists: " << writeHandleKey.key() << " with size " << readHandle->size() << " Decision objects" );
+ ATH_MSG_DEBUG("Adding decorations: " << m_remapLinkColKeys.at( writeHandleArrayIndex ).key() << " and " << m_remapLinkColIndices.at( writeHandleArrayIndex ).key() );
- SG::WriteDecorHandle<xAOD::TrigCompositeContainer, std::vector<uint32_t> > keyDecor( m_remapLinkCollKeys.at( index ) );
- SG::WriteDecorHandle<xAOD::TrigCompositeContainer, std::vector<uint16_t> > offsetDecor( m_remapLinkColIndices.at( index ) );
+ SG::WriteDecorHandle<xAOD::TrigCompositeContainer, std::vector<uint32_t> > keyDecor( m_remapLinkColKeys.at( writeHandleArrayIndex ) );
+ SG::WriteDecorHandle<xAOD::TrigCompositeContainer, std::vector<uint16_t> > indexDecor( m_remapLinkColIndices.at( writeHandleArrayIndex ) );
-
// Examine each input TC
+ int decisionObjectIndex = -1;
for ( auto inputDecision : *( readHandle.cptr() ) ) {
+ ++decisionObjectIndex;
-
// Retrieve the link information for remapping
std::vector< uint32_t > remappedKeys = keyAccessor( *inputDecision );
- std::vector< uint16_t > remappedOffsets = offsetAccessor( *inputDecision );
+ std::vector< uint16_t > remappedIndexes = indexAccessor( *inputDecision );
// Search the linked collections for remapping
- unsigned int const collectionTotal = inputDecision->linkColNames().size();
- for ( unsigned int collectionIndex = 0; collectionIndex < collectionTotal; ++collectionIndex ) {
-
- // Load identifiers
- std::string const collectionName = inputDecision->linkColNames()[ collectionIndex ];
- uint32_t const collectionKey = inputDecision->linkColKeys()[ collectionIndex ];
- std::string const keyString = *( evtStore()->keyToString( collectionKey ) );
- uint16_t const collectionOffset = inputDecision->linkColIndices()[ collectionIndex ];
-
- // Check for remapping in a merge
- uint32_t newKey = 0;
- size_t newOffset = 0;
- bool isRemapped = evtStore()->tryELRemap( collectionKey, collectionOffset, newKey, newOffset);
- if ( isRemapped ) {
-
- ATH_MSG_DEBUG( "Remap link from " << *( evtStore()->keyToString( collectionKey ) ) << " to " << *( evtStore()->keyToString( newKey ) ) );
- remappedKeys[ collectionIndex ] = newKey;
- remappedOffsets[ collectionIndex ] = newOffset;
- }
-
+ size_t const collectionTotal = inputDecision->linkColNames().size();
+ ATH_MSG_DEBUG("Decision object #" << decisionObjectIndex << " has " << collectionTotal << " links");
+ for ( size_t elementLinkIndex = 0; elementLinkIndex < collectionTotal; ++elementLinkIndex ) {
+
+ // Load ElementLink identifiers (except for CLID)
+ std::string const collectionName = inputDecision->linkColNames().at(elementLinkIndex);
+ uint32_t const collectionKey = remappedKeys.at(elementLinkIndex); //Note: This is the existing before-remap key
+ std::string const keyString = *( evtStore()->keyToString( collectionKey ) );
+ uint16_t const collectionIndex = remappedIndexes.at(elementLinkIndex); //Note: This is the existing before-remap index
+
+ // Check for remapping in a merge
+ uint32_t newKey = 0;
+ size_t newIndex = 0;
+ bool isRemapped = evtStore()->tryELRemap( collectionKey, collectionIndex, newKey, newIndex);
+ if ( isRemapped ) {
+
+ ATH_MSG_DEBUG( "Remap link [" << collectionName <<"] from " << keyString << " to " << *( evtStore()->keyToString( newKey ) ) << ", from index " << collectionIndex << " to index " << newIndex );
+ remappedKeys[ elementLinkIndex ] = newKey;
+ remappedIndexes[ elementLinkIndex ] = newIndex;
+
+ } else {
+
+ ATH_MSG_DEBUG( "StoreGate did not remap link [" << collectionName << "] from " << keyString << " index " << collectionIndex );
+
+ }
+
}
// Save the remaps
keyDecor( *inputDecision ) = remappedKeys;
- offsetDecor( *inputDecision ) = remappedOffsets;
+ indexDecor( *inputDecision ) = remappedIndexes;
}
}
@@ -202,33 +214,33 @@ StatusCode HLTEDMCreator::createIfMissing( const EventContext& context, const Co
for ( auto writeHandleKey : handles.out ) {
SG::ReadHandle<T> readHandle( writeHandleKey.key() );
-
+
if ( readHandle.isValid() ) {
ATH_MSG_DEBUG( "The " << writeHandleKey.key() << " already present" );
- } else {
+ } else {
ATH_MSG_DEBUG( "The " << writeHandleKey.key() << " was absent, creating it" );
generator.create();
if ( handles.views.size() != 0 ) {
- ATH_MSG_DEBUG("Will be trying to merge from " << handles.views.size() << " view containers into that output");
- auto viewCollKeyIter = handles.views.begin();
- auto inViewCollKeyIter = handles.in.begin();
-
- for ( ; viewCollKeyIter != handles.views.end(); ++viewCollKeyIter, ++inViewCollKeyIter ) {
- // get the views handle
-
- auto viewsHandle = SG::makeHandle( *viewCollKeyIter, context );
- if ( viewsHandle.isValid() ) {
- ATH_MSG_DEBUG("Will be merging from " << viewsHandle->size() << " views " << viewCollKeyIter->key() << " view container using key " << inViewCollKeyIter->key() );
- CHECK( (this->*merger)( *viewsHandle, *inViewCollKeyIter , context, *generator.data.get() ) );
- } else {
- ATH_MSG_DEBUG("Views " << viewCollKeyIter->key() << " are missing");
- }
- }
+ ATH_MSG_DEBUG("Will be trying to merge from " << handles.views.size() << " view containers into that output");
+ auto viewCollKeyIter = handles.views.begin();
+ auto inViewCollKeyIter = handles.in.begin();
+
+ for ( ; viewCollKeyIter != handles.views.end(); ++viewCollKeyIter, ++inViewCollKeyIter ) {
+ // get the views handle
+
+ auto viewsHandle = SG::makeHandle( *viewCollKeyIter, context );
+ if ( viewsHandle.isValid() ) {
+ ATH_MSG_DEBUG("Will be merging from " << viewsHandle->size() << " views " << viewCollKeyIter->key() << " view container using key " << inViewCollKeyIter->key() );
+ CHECK( (this->*merger)( *viewsHandle, *inViewCollKeyIter , context, *generator.data.get() ) );
+ } else {
+ ATH_MSG_DEBUG("Views " << viewCollKeyIter->key() << " are missing");
+ }
+ }
}
auto writeHandle = SG::makeHandle( writeHandleKey, context );
CHECK( generator.record( writeHandle ) );
- }
+ }
}
return StatusCode::SUCCESS;
}
@@ -236,12 +248,13 @@ StatusCode HLTEDMCreator::createIfMissing( const EventContext& context, const Co
StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
+ ATH_MSG_DEBUG("Confirming / Creating this tool's output");
if ( m_dumpSGBefore )
ATH_MSG_DEBUG( evtStore()->dump() );
#define CREATE(__TYPE) \
- { \
- plainGenerator<__TYPE> generator; \
+ { \
+ plainGenerator<__TYPE> generator; \
CHECK( createIfMissing<__TYPE>( context, ConstHandlesGroup<__TYPE>( m_##__TYPE, m_##__TYPE##InViews, m_##__TYPE##Views ), generator, &HLTEDMCreator::noMerge<__TYPE> ) ); \
}
@@ -256,7 +269,7 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
}
-#define CREATE_XAOD_NO_MERGE(__TYPE, __STORE_TYPE) \
+#define CREATE_XAOD_NO_MERGE(__TYPE, __STORE_TYPE) \
{ \
xAODGenerator<xAOD::__TYPE, xAOD::__STORE_TYPE> generator; \
CHECK( createIfMissing<xAOD::__TYPE>( context, ConstHandlesGroup<xAOD::__TYPE>( m_##__TYPE, m_##__TYPE##InViews, m_##__TYPE##Views ), generator, &HLTEDMCreator::noMerge<xAOD::__TYPE> ) ); \
@@ -276,8 +289,9 @@ StatusCode HLTEDMCreator::createOutput(const EventContext& context) const {
CREATE_XAOD( MuonContainer, MuonAuxContainer );
CREATE_XAOD( TauJetContainer, TauJetAuxContainer );
+ CREATE_XAOD( CaloClusterContainer, CaloClusterAuxContainer );
// After view collections are merged, need to update collection links
- if ( m_fixLinks ) {
+ if ( m_fixLinks.size() > 0 ) {
ATH_CHECK( fixLinks( ConstHandlesGroup<xAOD::TrigCompositeContainer>( m_TrigCompositeContainer, m_TrigCompositeContainerInViews, m_TrigCompositeContainerViews ) ) );
}
diff --git a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
index 065d7355b1fe7a1c739f1e0642389a0d9d802aba..0acdd10f7edd36a0234d26357e7d2e65475461ef 100644
--- a/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
+++ b/Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h
@@ -44,6 +44,8 @@
#include "xAODTau/TauJetContainer.h"
#include "xAODTau/TauJetAuxContainer.h"
+#include "xAODCaloEvent/CaloClusterContainer.h"
+#include "xAODCaloEvent/CaloClusterAuxContainer.h"
/**
* @class Tool capable of creating collections missing (early rejection) after HLT processing
@@ -73,9 +75,9 @@ class HLTEDMCreator: public extends<AthAlgTool, IHLTOutputTool> {
private:
HLTEDMCreator();
- Gaudi::Property<bool> m_fixLinks{ this, "FixLinks", false, "Fix links that may be pointing objects in views"};
- SG::WriteDecorHandleKeyArray<xAOD::TrigCompositeContainer, std::vector<uint32_t> > m_remapLinkCollKeys{ this, "DoNotSet_RemapLinkCollKeys", {}, "Do not set, it is configured accordingly to FixLinks & TC output property"};
- SG::WriteDecorHandleKeyArray<xAOD::TrigCompositeContainer, std::vector<uint16_t> > m_remapLinkColIndices{ this, "DoNotSet_RemapLinkCollIndices", {}, "Do not set, it is configured accordingly to FixLinks & TC output property"};
+ Gaudi::Property<std::vector<std::string>> m_fixLinks{ this, "FixLinks", {}, "Which keys of the TrigCompositeContainer WriteHandleKeyArray might need to have their (e.g. feature) element links re-mapped outside of views"};
+ SG::WriteDecorHandleKeyArray<xAOD::TrigCompositeContainer, std::vector<uint32_t> > m_remapLinkColKeys{ this, "DoNotSet_RemapLinkColKeys", {}, "Do not set, it is configured accordingly to FixLinks & TC output property"};
+ SG::WriteDecorHandleKeyArray<xAOD::TrigCompositeContainer, std::vector<uint16_t> > m_remapLinkColIndices{ this, "DoNotSet_RemapLinkColIndices", {}, "Do not set, it is configured accordingly to FixLinks & TC output property"};
Gaudi::Property<bool> m_dumpSGBefore{ this, "dumpSGBefore", false, "Dump SG content before the merging"}; // for debugging
Gaudi::Property<bool> m_dumpSGAfter { this, "dumpSGAfter", false, "Dump SG content after the merging"};
@@ -109,7 +111,7 @@ class HLTEDMCreator: public extends<AthAlgTool, IHLTOutputTool> {
DEF_XAOD_KEY( L2IsoMuonContainer );
DEF_XAOD_KEY( MuonContainer );
DEF_XAOD_KEY( TauJetContainer );
-
+ DEF_XAOD_KEY( CaloClusterContainer );
#undef DEF_VIEWS
#undef DEF_KEY
#undef DEF_XAOD_KEY
diff --git a/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py b/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py
index 37f01672de70f314d6c8d1bb43ca6ed04d58e7b0..aa8962fc0d6477297b1c82f6ba51ed11e99e121d 100755
--- a/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py
+++ b/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py
@@ -58,28 +58,39 @@ svcMgr.EventSelector.InputCollections=glob.glob(customInput)
from AthenaCommon.DetFlags import DetFlags
#with tgc setOn we get sagfault and crash
-DetFlags.ID_setOff()
-DetFlags.Calo_setOff()
-DetFlags.Muon_setOff()
-DetFlags.MDT_setOff()
-DetFlags.CSC_setOff()
-DetFlags.TGC_setOff()
-DetFlags.RPC_setOff()
+#DetFlags.ID_setOff()
+#DetFlags.Calo_setOff()
+#DetFlags.Muon_setOff()
+#DetFlags.MDT_setOff()
+#DetFlags.CSC_setOff()
+#DetFlags.TGC_setOff()
+#DetFlags.RPC_setOff()
DetFlags.sTGC_setOn()
DetFlags.Micromegas_setOff()
-DetFlags.digitize.MDT_setOff()
-DetFlags.digitize.TGC_setOff()
-DetFlags.digitize.RPC_setOff()
-DetFlags.digitize.CSC_setOff()
-DetFlags.digitize.Micromegas_setOff()
-DetFlags.digitize.sTGC_setOff()
-DetFlags.Truth_setOff()
+#DetFlags.digitize.MDT_setOff()
+#DetFlags.digitize.TGC_setOff()
+#DetFlags.digitize.RPC_setOff()
+#DetFlags.digitize.CSC_setOff()
+#DetFlags.digitize.Micromegas_setOff()
+DetFlags.digitize.sTGC_setOn()
+#DetFlags.Truth_setOff()
# initialize GeoModel with layout set in globalflags.DetDescrVersion
from AtlasGeoModel import SetGeometryVersion
from AtlasGeoModel import GeoModelInit
+from GeoModelSvc.GeoModelSvcConf import GeoModelSvc
+GeoModelSvc = GeoModelSvc()
+GeoModelSvc.MuonVersionOverride = "MuonSpectrometer-R.09.00.NSW"
+from MuonGeoModel.MuonGeoModelConf import MuonDetectorTool
+MuonDetectorTool=MuonDetectorTool(UseCSC=False)
+DetDescrCnvSvc = Service( "DetDescrCnvSvc" )
+DetDescrCnvSvc.UseCSC = False
+
+
+
+
# get AGDD service
from AGDD2GeoSvc.AGDD2GeoSvcConf import AGDDtoGeoSvc
Agdd2GeoSvc = AGDDtoGeoSvc()
@@ -107,54 +118,62 @@ include ('TrigT1NSW/TrigT1NSW_jobOptions.py')
#Switch on and off trigger simulaton components sTGC / MicroMegas
topSequence.NSWL1Simulation.DosTGC=True
-topSequence.NSWL1Simulation.DoPadTrigger=True
topSequence.NSWL1Simulation.DoMM=False
-
-
-
-topSequence.NSWL1Simulation.DoNtuple=True
-topSequence.NSWL1Simulation.PadTdsTool.DoNtuple=True
-topSequence.NSWL1Simulation.PadTriggerTool.DoNtuple=True
-topSequence.NSWL1Simulation.StripTdsTool.DoNtuple=True
-topSequence.NSWL1Simulation.StripSegmentTool.DoNtuple=True
-
+topSequence.NSWL1Simulation.DoPadTrigger=True
topSequence.NSWL1Simulation.StripSegmentTool.rIndexScheme=0
topSequence.NSWL1Simulation.StripSegmentTool.NSWTrigRDOContainerName="NSWTRGRDO"
+# Simulation parameters
+#topSequence.NSWL1Simulation.PadTdsTool.VMM_DeadTime=3
+#topSequence.NSWL1Simulation.PadTdsTool.ApplyVMM_DeatTime=True
+#Toggle Ntuple making
+topSequence.NSWL1Simulation.DoNtuple=True
+topSequence.NSWL1Simulation.PadTdsTool.DoNtuple=False
+topSequence.NSWL1Simulation.PadTriggerTool.DoNtuple=True
+topSequence.NSWL1Simulation.StripTdsTool.DoNtuple=False
+topSequence.NSWL1Simulation.StripClusterTool.DoNtuple=False
+topSequence.NSWL1Simulation.StripSegmentTool.DoNtuple=False
#Tools' Messaging Levels
-topSequence.NSWL1Simulation.OutputLevel=INFO
-topSequence.NSWL1Simulation.PadTdsTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.PadTriggerTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.StripTdsTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.StripClusterTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.StripSegmentTool.OutputLevel=INFO
+topSequence.NSWL1Simulation.OutputLevel=DEBUG
+topSequence.NSWL1Simulation.PadTdsTool.OutputLevel=DEBUG
+topSequence.NSWL1Simulation.PadTriggerTool.OutputLevel=DEBUG
+topSequence.NSWL1Simulation.StripTdsTool.OutputLevel=DEBUG
+topSequence.NSWL1Simulation.StripClusterTool.OutputLevel=DEBUG
+topSequence.NSWL1Simulation.StripSegmentTool.OutputLevel=DEBUG
+
-# Simulation parameters
-#topSequence.NSWL1Simulation.PadTdsTool.VMM_DeadTime=3
-#topSequence.NSWL1Simulation.PadTdsTool.ApplyVMM_DeatTime=True
#-----------------------------------------------------------------------------
# save ROOT histograms and Tuple
#-----------------------------------------------------------------------------
-if not hasattr( ServiceMgr, "THistSvc" ):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-ServiceMgr.THistSvc.Output = ["EXPERT DATAFILE='Monitoring.root' OPT='RECREATE'"];
+if topSequence.NSWL1Simulation.DoNtuple:
+
+ if not hasattr( ServiceMgr, "THistSvc" ):
+ from GaudiSvc.GaudiSvcConf import THistSvc
+ ServiceMgr += THistSvc()
+ ServiceMgr.THistSvc.Output = ["EXPERT DATAFILE='Monitoring.root' OPT='RECREATE'"];
-if not hasattr( theApp.Dlls, "RootHistCnv" ):
- theApp.Dlls += [ "RootHistCnv" ]
- theApp.HistogramPersistency = "ROOT"
+ if not hasattr( theApp.Dlls, "RootHistCnv" ):
+ theApp.Dlls += [ "RootHistCnv" ]
+ theApp.HistogramPersistency = "ROOT"
-if not hasattr( ServiceMgr, "NTupleSvc" ):
- from GaudiSvc.GaudiSvcConf import NTupleSvc
- ServiceMgr += NTupleSvc()
+ if not hasattr( ServiceMgr, "NTupleSvc" ):
+ from GaudiSvc.GaudiSvcConf import NTupleSvc
+ ServiceMgr += NTupleSvc()
-ServiceMgr.THistSvc.Output += [ "NSWL1Simulation DATAFILE='NSWL1Simulation.root' OPT='RECREATE'" ]
+ ServiceMgr.THistSvc.Output += [ "NSWL1Simulation DATAFILE='NSWL1Simulation.root' OPT='RECREATE'" ]
-print ServiceMgr
+ print ServiceMgr
+else:#to avoid any possible crash. If DoNtuple is set to true for a tool but false for NSWL1Simulation the code will crash
+ # ideally that should have been already handled in C++ side
+ topSequence.NSWL1Simulation.PadTdsTool.DoNtuple=False
+ topSequence.NSWL1Simulation.PadTriggerTool.DoNtuple=False
+ topSequence.NSWL1Simulation.StripTdsTool.DoNtuple=False
+ topSequence.NSWL1Simulation.StripClusterTool.DoNtuple=False
+ topSequence.NSWL1Simulation.StripSegmentTool.DoNtuple=False
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/L1TdrStgcTriggerLogic.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/L1TdrStgcTriggerLogic.cxx
index f88470b6f521325e63eab66f5043501b11e40a4f..6583c6ef3005141d54673ae32f84f5dd3d1f5101 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/L1TdrStgcTriggerLogic.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/L1TdrStgcTriggerLogic.cxx
@@ -62,13 +62,12 @@ namespace NSWL1{
//-------------------------------------
//S.I : a method should not have so many arguments..
std::vector< SingleWedgePadTrigger > L1TdrStgcTriggerLogic::buildSingleWedgeTriggers(
- const std::vector< std::shared_ptr<PadOfflineData> > &pads, const std::vector< size_t > &padIndicesLayer0,
- const std::vector< size_t > &padIndicesLayer1, const std::vector< size_t > &padIndicesLayer2,
- const std::vector< size_t > &padIndicesLayer3, bool isLayer1, bool isLayer2,
- bool isLayer3, bool isLayer4) {
+ const std::vector< std::shared_ptr<PadOfflineData> > &pads, const std::vector< size_t > &padIndicesLayer0,
+ const std::vector< size_t > &padIndicesLayer1, const std::vector< size_t > &padIndicesLayer2,
+ const std::vector< size_t > &padIndicesLayer3, bool isLayer1, bool isLayer2,
+ bool isLayer3, bool isLayer4) {
- std::vector< SingleWedgePadTrigger > triggers;
-
+ std::vector< SingleWedgePadTrigger > triggers;
size_t nHL1 = (isLayer1 ? padIndicesLayer0.size() : 1);
size_t nHL2 = (isLayer2 ? padIndicesLayer1.size() : 1);
size_t nHL3 = (isLayer3 ? padIndicesLayer2.size() : 1);
@@ -117,8 +116,8 @@ namespace NSWL1{
std::string sl3("33");
if (isLayer3) {
l3Idx = padIndicesLayer2.at(il3);
- if (!hitPattern(pads.at(iL1st), pads.at(l3Idx), sl3))
- continue;
+ if (!hitPattern(pads.at(iL1st), pads.at(l3Idx), sl3))
+ continue;
}
for (size_t il4 = 0; il4 < nHL4; il4++) {
int l4Idx = -1;
@@ -130,6 +129,124 @@ namespace NSWL1{
}
std::string pattern(sl4 + sl3 + sl2 + sl1);
+ // the above line is replaced by a normal order l1,l2,l3,l4 and
+ // separated in phi and eta but it remains the same for later usage in
+ // the trigger selection
+ // Hence the following is only for internal ease of calculation. The
+ // pattern to be passed is the "pattern" not "patternPhi" or
+ // "patternEta"
+ std::string patternPhi;
+ patternPhi.push_back(sl1.at(1));
+ patternPhi.push_back(sl2.at(1));
+ patternPhi.push_back(sl3.at(1));
+ patternPhi.push_back(sl4.at(1));
+
+ std::string patternEta;
+ patternEta.push_back(sl1.at(0));
+ patternEta.push_back(sl2.at(0));
+ patternEta.push_back(sl3.at(0));
+ patternEta.push_back(sl4.at(0));
+
+ int multipletid=-999;
+ int moduleid=-999;
+ int sectortype=-999;
+ //Please mind the indentation
+ if (sl1 == "11") {
+ multipletid = pads.at(l1Idx)->multipletId() ;
+ moduleid = pads.at(l1Idx)->moduleId();
+ sectortype = pads.at(l1Idx)->sectorType();
+ }
+ else if (sl2 == "11") {
+ multipletid = pads.at(l2Idx)->multipletId() ;
+ moduleid = pads.at(l2Idx)->moduleId();
+ sectortype = pads.at(l2Idx)->sectorType();
+ }
+ else continue;
+ std::string etamove, phimove;
+ if (sectortype == 1) {
+ if (multipletid == 1) {
+ etamove = "D";
+ phimove = "U";
+ if (moduleid == 2) {
+ etamove = "U";
+ phimove = "U";
+ }
+ }
+ else{ // multiplet = 2 15-7-18 YR - Confirm new geometry
+ etamove = "U";
+ phimove = "DU";
+ }
+ }
+
+ if (sectortype == 0) {
+ if (multipletid == 1) { // 15-7-18 YR - Confirm new geometry
+ if (moduleid == 1) {
+ etamove = "U";
+ phimove = "DU";
+ }
+ if (moduleid == 2) {
+ etamove = "D";
+ phimove = "UD";
+ }
+ if (moduleid == 3) {
+ etamove = "U";
+ phimove = "UD";
+ }
+ }
+ else { // multiplet = 2
+ if (moduleid == 1) {
+ etamove = "U";
+ phimove = "D";
+ }
+ else{
+ etamove = "U";
+ phimove = "U";
+ }
+ }
+ }
+
+ if (etamove == "D") {
+ if (find(PatternsEtaDown.begin(), PatternsEtaDown.end(),
+ patternEta) == PatternsEtaDown.end()) {
+ continue;
+ }
+ }
+
+ if (etamove == "U") {
+ if (find(PatternsEtaUp.begin(), PatternsEtaUp.end(),
+ patternEta) == PatternsEtaUp.end()) {
+ continue;
+ }
+ }
+
+ if (phimove == "U") {
+ if (find(PatternsPhiUp.begin(), PatternsPhiUp.end(),
+ patternPhi) == PatternsPhiUp.end()) {
+ continue;
+ }
+ }
+
+ if (phimove == "D") {
+ if (find(PatternsPhiDown.begin(), PatternsPhiDown.end(),
+ patternPhi) == PatternsPhiDown.end()) {
+ continue;
+ }
+ }
+
+ if (phimove == "UD") {
+ if (find(PatternsPhiUpDown.begin(), PatternsPhiUpDown.end(),
+ patternPhi) == PatternsPhiUpDown.end()) {
+ continue;
+ }
+ }
+
+ if (phimove == "DU") {
+ if (find(PatternsPhiDownUp.begin(), PatternsPhiDownUp.end(),
+ patternPhi) == PatternsPhiDownUp.end()) {
+ continue;
+ }
+ }
+
std::vector< size_t > padIndices;
if (isLayer1) {
@@ -140,14 +257,17 @@ namespace NSWL1{
assert(l2Idx > -1);
padIndices.push_back(l2Idx);
}
+
if (isLayer3) {
assert(l3Idx > -1);
padIndices.push_back(l3Idx);
}
+
if (isLayer4) {
assert(l4Idx > -1);
padIndices.push_back(l4Idx);
}
+
triggers.push_back(SingleWedgePadTrigger(pattern, pads, padIndices));
if (triggers.size() > 4) {
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTdsOfflineTool.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTdsOfflineTool.cxx
index 9cd4cd9471a3560817c724b9c0904a3dd47cf97c..ac4da742311aba905344a48baae5cb37f904685c 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTdsOfflineTool.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/PadTdsOfflineTool.cxx
@@ -180,7 +180,7 @@ namespace NSWL1 {
void PadTdsOfflineTool::handle(const Incident& inc) {
if( inc.type()==IncidentType::BeginEvent ) {
this->clear_cache();
- m_validation_tree.reset_ntuple_variables();
+ if(m_doNtuple) m_validation_tree.reset_ntuple_variables();
m_pad_cache_status = CLEARED;
}
}
@@ -350,7 +350,7 @@ namespace NSWL1 {
store_pads(pad_hits);
print_pad_cache();
- this->fill_pad_validation_id();
+ if(m_doNtuple) this->fill_pad_validation_id();
ATH_MSG_DEBUG( "fill_pad_cache: end of processing" );
return OK;
}
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/StripClusterTool.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/StripClusterTool.cxx
index d00b74aa3aba8f4fe06810180982494bbf2d26c9..b00bb4e94b249f3b0c6d1d28866d3cdbf6d45d18 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/StripClusterTool.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/StripClusterTool.cxx
@@ -51,7 +51,7 @@ namespace NSWL1 {
m_clusters()
{
declareInterface<NSWL1::IStripClusterTool>(this);
- declareProperty("DoNtuple", m_doNtuple = true, "input the StripTds branches into the analysis ntuple");
+ declareProperty("DoNtuple", m_doNtuple = false, "input the StripTds branches into the analysis ntuple");
declareProperty("sTGC_SdoContainerName", m_sTgcSdoContainer = "sTGC_SDO", "the name of the sTGC SDO container");
}
@@ -505,7 +505,6 @@ void StripClusterTool::fill_strip_validation_id(std::vector<std::unique_ptr<Stri
else{
m_clusters.push_back(std::move(cr_cluster));//put the current cluster into the clusters buffer
- ATH_MSG_DEBUG("Adding Cluster with " << cr_cluster->size() << "hits" << m_clusters.size() << " m_clusters so far");
cr_cluster=std::make_shared<std::vector<std::unique_ptr<StripData>>>();//create a new empty cluster and assign this hit as the first hit
cr_cluster->push_back(std::move(this_hit));
}
@@ -514,7 +513,7 @@ void StripClusterTool::fill_strip_validation_id(std::vector<std::unique_ptr<Stri
if(cr_cluster->size() != 0)m_clusters.push_back(std::move(cr_cluster));//don't forget the last cluster in the loop
// No sector implemented yet!!!
ATH_MSG_DEBUG("Found :" << m_clusters.size() << " M_Clusters ");
- fill_strip_validation_id(clusters);
+ if(m_doNtuple) fill_strip_validation_id(clusters);
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigT1/TrigT1NSWSimTools/src/StripSegmentTool.cxx b/Trigger/TrigT1/TrigT1NSWSimTools/src/StripSegmentTool.cxx
index 3038d6309372944f52f6407947ebc6434e1d6a59..ebd61486206d32931aec725af861cff3b89a4080 100644
--- a/Trigger/TrigT1/TrigT1NSWSimTools/src/StripSegmentTool.cxx
+++ b/Trigger/TrigT1/TrigT1NSWSimTools/src/StripSegmentTool.cxx
@@ -60,7 +60,7 @@ namespace NSWL1 {
{
declareInterface<NSWL1::IStripSegmentTool>(this);
- declareProperty("DoNtuple", m_doNtuple = true, "input the StripTds branches into the analysis ntuple");
+ declareProperty("DoNtuple", m_doNtuple = false, "input the StripTds branches into the analysis ntuple");
declareProperty("sTGC_SdoContainerName", m_sTgcSdoContainer = "sTGC_SDO", "the name of the sTGC SDO container");
declareProperty("rIndexBits", m_rIndexBits = 8, "number bits in R-index calculation");
declareProperty("dthetaBits", m_dThetaBits = 5, "number bits in dTheta calculation");
@@ -395,26 +395,28 @@ namespace NSWL1 {
auto rdo_segment= std::make_unique<Muon::NSW_TrigRawDataSegment>( dtheta_int, (uint8_t)phiId, (rIndex), lowRes, phiRes);
trgRawData->push_back(std::move(rdo_segment));
+
+ if(m_doNtuple){
//Fill ntuple info
- m_seg_wedge1_size->push_back(band.second[0].size());
- m_seg_wedge2_size->push_back(band.second[1].size());
- m_seg_bandId->push_back(bandId);
- m_seg_phiId->push_back(phiId);
- m_seg_rIdx->push_back(rIndex);
- m_seg_theta->push_back(theta);
- m_seg_dtheta->push_back(dtheta);
- m_seg_dtheta_int->push_back(dtheta_int);
- m_seg_eta->push_back(eta);
- m_seg_eta_inf->push_back(eta_inf);
- m_seg_phi->push_back(phi);
- m_seg_global_r->push_back(avg_r);
- m_seg_global_x->push_back(glx);
- m_seg_global_y->push_back(gly);
- m_seg_global_z->push_back(avg_z);
- m_seg_dir_r->push_back(slope);
- m_seg_dir_y->push_back(-99);
- m_seg_dir_z->push_back(-99);
-
+ m_seg_wedge1_size->push_back(band.second[0].size());
+ m_seg_wedge2_size->push_back(band.second[1].size());
+ m_seg_bandId->push_back(bandId);
+ m_seg_phiId->push_back(phiId);
+ m_seg_rIdx->push_back(rIndex);
+ m_seg_theta->push_back(theta);
+ m_seg_dtheta->push_back(dtheta);
+ m_seg_dtheta_int->push_back(dtheta_int);
+ m_seg_eta->push_back(eta);
+ m_seg_eta_inf->push_back(eta_inf);
+ m_seg_phi->push_back(phi);
+ m_seg_global_r->push_back(avg_r);
+ m_seg_global_x->push_back(glx);
+ m_seg_global_y->push_back(gly);
+ m_seg_global_z->push_back(avg_z);
+ m_seg_dir_r->push_back(slope);
+ m_seg_dir_y->push_back(-99);
+ m_seg_dir_z->push_back(-99);
+ }
}//end of clmap loop
diff --git a/Trigger/TrigTools/IDScanHitFilter/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigTools/IDScanHitFilter/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..61d96e367e6069905544cb36c5d86e1fdbbb4a16
--- /dev/null
+++ b/Trigger/TrigTools/IDScanHitFilter/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigTools/IDScanHitFilter
diff --git a/Trigger/TrigTools/IDScanHitFilter/CMakeLists.txt b/Trigger/TrigTools/IDScanHitFilter/CMakeLists.txt
index 551e7242262b0809415f100f6c3d17f5357a37fe..3b7ddeae822c7153691b20cff4de40f2c6b01a45 100644
--- a/Trigger/TrigTools/IDScanHitFilter/CMakeLists.txt
+++ b/Trigger/TrigTools/IDScanHitFilter/CMakeLists.txt
@@ -6,23 +6,15 @@
atlas_subdir( IDScanHitFilter )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
+atlas_depends_on_subdirs( PRIVATE
Control/AthenaBaseComps
GaudiKernel
Trigger/TrigEvent/TrigInDetEvent
Trigger/TrigEvent/TrigSteeringEvent
Trigger/TrigTools/TrigInDetToolInterfaces
- PRIVATE
DetectorDescription/IRegionSelector )
# Component(s) in the package:
-atlas_add_library( IDScanHitFilterLib
- src/*.cxx
- PUBLIC_HEADERS IDScanHitFilter
- LINK_LIBRARIES AthenaBaseComps GaudiKernel TrigInDetEvent TrigSteeringEvent
- PRIVATE_LINK_LIBRARIES IRegionSelector )
-
atlas_add_component( IDScanHitFilter
- src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel TrigInDetEvent TrigSteeringEvent IRegionSelector IDScanHitFilterLib )
-
+ src/*.cxx src/components/*.cxx
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel TrigInDetEvent TrigSteeringEvent IRegionSelector )
diff --git a/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.cxx b/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.cxx
index 92b84b63934da32469a1a66f600b73e1817c600f..38784fc8a17aab7842f9ff1ef4c7ea7415208588 100644
--- a/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.cxx
+++ b/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.cxx
@@ -11,7 +11,7 @@
// $Id: FilyterBin.cxx, v0.0 Sun 17 Mar 2013 10:06:51 GMT sutt $
-#include "IDScanHitFilter/FilterBin.h"
+#include "FilterBin.h"
long FilterBin::m_maxLayers = 19;
long FilterBin::m_maxBarrelLayer = 6;
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/FilterBin.h b/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.h
old mode 100755
new mode 100644
similarity index 85%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/FilterBin.h
rename to Trigger/TrigTools/IDScanHitFilter/src/FilterBin.h
index f401099cb9e29b4ff722facb746a673e062bf964..144e603b72f98ea5e1149e13505dc269442948c9
--- a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/FilterBin.h
+++ b/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////////
@@ -21,8 +21,11 @@
#if ! defined( IDSCAN_FILTERBIN_H )
#define IDSCAN_FILTERBIN_H
-#include "IDScanHitFilter/FixedBitSet.h"
-#include "IDScanHitFilter/IdScanSpPoint.h"
+#include "FixedBitSet.h"
+#include "IdScanSpPoint.h"
+
+#include "CxxUtils/checker_macros.h"
+
#include <iostream>
#include <list>
#include <map>
@@ -46,8 +49,8 @@ class FilterBin
std::list<IdScanSpPoint* >& hitList();
const std::list<IdScanSpPoint* >& hitList() const;
- static void setMaxLayers(long layer) { m_maxLayers = layer; }
- static void setMaxBarrelLayer(long layer) { m_maxBarrelLayer = layer; }
+ static void setMaxLayers ATLAS_NOT_THREAD_SAFE (long layer) { m_maxLayers = layer; }
+ static void setMaxBarrelLayer ATLAS_NOT_THREAD_SAFE (long layer) { m_maxBarrelLayer = layer; }
private:
void neighborKeys( long key, long* np ) const;
@@ -58,8 +61,9 @@ private:
FixedBitSet m_Ldirect; // keeps direct layers
FixedBitSet m_Ltotal; // keeps direct+indirect layers
- static long m_maxLayers;
- static long m_maxBarrelLayer;
+ // statics set once during initialize() via the above non-thread-safe methods:
+ static long m_maxLayers ATLAS_THREAD_SAFE;
+ static long m_maxBarrelLayer ATLAS_THREAD_SAFE;
};
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/FixedBitSet.h b/Trigger/TrigTools/IDScanHitFilter/src/FixedBitSet.h
similarity index 100%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/FixedBitSet.h
rename to Trigger/TrigTools/IDScanHitFilter/src/FixedBitSet.h
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/GC_Constants.h b/Trigger/TrigTools/IDScanHitFilter/src/GC_Constants.h
similarity index 100%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/GC_Constants.h
rename to Trigger/TrigTools/IDScanHitFilter/src/GC_Constants.h
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/Group.h b/Trigger/TrigTools/IDScanHitFilter/src/Group.h
old mode 100755
new mode 100644
similarity index 98%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/Group.h
rename to Trigger/TrigTools/IDScanHitFilter/src/Group.h
index 3a4316e7768b1acb5cd0072cfb19fe4f9bd11efc..b7467307baf99e47eb586f433a808a1cce95ebfa
--- a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/Group.h
+++ b/Trigger/TrigTools/IDScanHitFilter/src/Group.h
@@ -27,7 +27,7 @@
#include <iomanip>
-#include "IDScanHitFilter/IdScanSpPoint.h"
+#include "IdScanSpPoint.h"
typedef std::vector<IdScanSpPoint*> hitVec;
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/HF_Constants.h b/Trigger/TrigTools/IDScanHitFilter/src/HF_Constants.h
similarity index 100%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/HF_Constants.h
rename to Trigger/TrigTools/IDScanHitFilter/src/HF_Constants.h
diff --git a/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.cxx b/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.cxx
index 859bd31c2717aa35be7bec1fca7a8fb7f495d49c..32296e9c71cb803f1342887a6513d4e099cf271a 100755
--- a/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.cxx
+++ b/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////////
@@ -12,6 +12,7 @@
#include <iostream>
#include "GaudiKernel/MsgStream.h"
+#include "CxxUtils/checker_macros.h"
#include "TrigInDetEvent/TrigVertex.h"
#include "TrigInDetEvent/TrigSiSpacePoint.h"
@@ -19,9 +20,9 @@
#include "TrigInDetEvent/TrigInDetTrackCollection.h"
#include "IRegionSelector/IRoiDescriptor.h"
-#include "IDScanHitFilter/IDScanHitFilter.h"
-#include "IDScanHitFilter/IdScanSpPoint.h"
-#include "IDScanHitFilter/Group.h"
+#include "IDScanHitFilter.h"
+#include "IdScanSpPoint.h"
+#include "Group.h"
IDScanHitFilter::IDScanHitFilter(const std::string& t,
@@ -65,10 +66,8 @@ IDScanHitFilter::IDScanHitFilter(const std::string& t,
}
-StatusCode IDScanHitFilter::initialize()
+StatusCode IDScanHitFilter::initialize ATLAS_NOT_THREAD_SAFE()
{
- StatusCode sc = AthAlgTool::initialize();
-
m_dPhidRCut = 0.3/m_pTcutInMeV;
ATH_MSG_INFO( "IDScanHitFilter constructed " );
@@ -79,10 +78,7 @@ StatusCode IDScanHitFilter::initialize()
ATH_MSG_INFO( "Clone removal set to " << m_cloneRemoval );
ATH_MSG_INFO( "dphidrcut set to " << m_dPhidRCut );
- if (m_numberingTool.retrieve().isFailure()){
- ATH_MSG_FATAL( "Tool " << m_numberingTool << " not found " );
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( m_numberingTool.retrieve() );
/// get first endcap layer, so we know how
/// barrel layers there are
@@ -109,14 +105,7 @@ StatusCode IDScanHitFilter::initialize()
//
// m_fullScan = (2*m_ROIphiHalfWidth > 6.28);
- return sc;
-}
-
-
-StatusCode IDScanHitFilter::finalize()
-{
- StatusCode sc = AthAlgTool::finalize();
- return sc;
+ return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/IDScanHitFilter.h b/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.h
old mode 100755
new mode 100644
similarity index 94%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/IDScanHitFilter.h
rename to Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.h
index 85fa2e0c6314e2564a6fa68677239a92e30c3adc..765dff11eda9ba71089aeda3aafb6e023b1d5ffb
--- a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/IDScanHitFilter.h
+++ b/Trigger/TrigTools/IDScanHitFilter/src/IDScanHitFilter.h
@@ -31,7 +31,7 @@
#include "AthenaBaseComps/AthAlgTool.h"
-#include "IDScanHitFilter/iHitFilter.h"
+#include "iHitFilter.h"
#include "TrigInDetEvent/TrigInDetTrackCollection.h"
#include "TrigInDetToolInterfaces/ITrigHitFilter.h"
@@ -54,9 +54,8 @@ class IDScanHitFilter: public iHitFilter, public AthAlgTool, virtual public ITri
IDScanHitFilter( const std::string&, const std::string&, const IInterface* );
virtual ~IDScanHitFilter(){ };
- virtual StatusCode initialize();
- virtual StatusCode finalize ();
-
+ virtual StatusCode initialize() override;
+
void findTracks( std::vector<const TrigSiSpacePoint* >,
TrigInDetTrackCollection&,
const IRoiDescriptor*, double zvertex,
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/IdScanSpPoint.h b/Trigger/TrigTools/IDScanHitFilter/src/IdScanSpPoint.h
old mode 100755
new mode 100644
similarity index 95%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/IdScanSpPoint.h
rename to Trigger/TrigTools/IDScanHitFilter/src/IdScanSpPoint.h
index f0e96190be4a51a8d48061bf929ca2f5a13e40b8..d9912c2b17d5e32f0b5b963cc7eafd6dd51d1047
--- a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/IdScanSpPoint.h
+++ b/Trigger/TrigTools/IDScanHitFilter/src/IdScanSpPoint.h
@@ -25,7 +25,7 @@
#include <vector>
#include <iostream>
-#include "IDScanHitFilter/tIdScanSpPoint.h"
+#include "tIdScanSpPoint.h"
#include "TrigInDetEvent/TrigSiSpacePoint.h"
diff --git a/Trigger/TrigTools/IDScanHitFilter/src/components/IDScanHitFilter_entries.cxx b/Trigger/TrigTools/IDScanHitFilter/src/components/IDScanHitFilter_entries.cxx
index df0d854f7c96664f0143e20ef90747b83aca6484..170355fa38f0bc80a8f6e8fe30844a72a4c94078 100644
--- a/Trigger/TrigTools/IDScanHitFilter/src/components/IDScanHitFilter_entries.cxx
+++ b/Trigger/TrigTools/IDScanHitFilter/src/components/IDScanHitFilter_entries.cxx
@@ -4,7 +4,7 @@
// ATLAS Collaboration
////////////////////////////////////////////////////////////////////////////////
-#include "IDScanHitFilter/IDScanHitFilter.h"
+#include "../IDScanHitFilter.h"
DECLARE_COMPONENT( IDScanHitFilter )
diff --git a/Trigger/TrigTools/IDScanHitFilter/src/iHitFilter.cxx b/Trigger/TrigTools/IDScanHitFilter/src/iHitFilter.cxx
index 3281165eed6fe213a7be6822577c9ec601faad40..8892d4dfc174714bf7d54d16518bd77d3eec0bfd 100755
--- a/Trigger/TrigTools/IDScanHitFilter/src/iHitFilter.cxx
+++ b/Trigger/TrigTools/IDScanHitFilter/src/iHitFilter.cxx
@@ -10,11 +10,11 @@
////////////////////////////////////////////////////////////////////////////////
// IdScan stuff
-#include "IDScanHitFilter/GC_Constants.h"
-#include "IDScanHitFilter/IdScanSpPoint.h"
-#include "IDScanHitFilter/Group.h"
-#include "IDScanHitFilter/FilterBin.h"
-#include "IDScanHitFilter/iHitFilter.h"
+#include "GC_Constants.h"
+#include "IdScanSpPoint.h"
+#include "Group.h"
+#include "FilterBin.h"
+#include "iHitFilter.h"
#include <iostream>
#include <algorithm>
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/iHitFilter.h b/Trigger/TrigTools/IDScanHitFilter/src/iHitFilter.h
old mode 100755
new mode 100644
similarity index 96%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/iHitFilter.h
rename to Trigger/TrigTools/IDScanHitFilter/src/iHitFilter.h
index 1e5515e18df5d64d6f08fd01dda00933cb524369..18c7c969433195d0a2f25ef15c419ba445d68b87
--- a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/iHitFilter.h
+++ b/Trigger/TrigTools/IDScanHitFilter/src/iHitFilter.h
@@ -1,7 +1,7 @@
// emacs: this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////////
@@ -26,11 +26,11 @@
#include <vector>
-#include "IDScanHitFilter/HF_Constants.h"
+#include "HF_Constants.h"
-#include "IDScanHitFilter/FilterBin.h"
-#include "IDScanHitFilter/Group.h"
-#include "IDScanHitFilter/IdScanSpPoint.h"
+#include "FilterBin.h"
+#include "Group.h"
+#include "IdScanSpPoint.h"
struct groupCleanerParams;
struct GCP_loose;
diff --git a/Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/tIdScanSpPoint.h b/Trigger/TrigTools/IDScanHitFilter/src/tIdScanSpPoint.h
similarity index 100%
rename from Trigger/TrigTools/IDScanHitFilter/IDScanHitFilter/tIdScanSpPoint.h
rename to Trigger/TrigTools/IDScanHitFilter/src/tIdScanSpPoint.h
diff --git a/Trigger/TrigTools/IDScanZFinder/ATLAS_CHECK_THREAD_SAFETY b/Trigger/TrigTools/IDScanZFinder/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..c891654f027c55eb17f4f75ba2e7d76567b80aaa
--- /dev/null
+++ b/Trigger/TrigTools/IDScanZFinder/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Trigger/TrigTools/IDScanZFinder
diff --git a/Trigger/TrigTools/IDScanZFinder/CMakeLists.txt b/Trigger/TrigTools/IDScanZFinder/CMakeLists.txt
index 59ee2239d2defa47142ddbd5ec4a29aca560b433..2ccca418ca61c9894d4cc9f5d7800120658c25a1 100644
--- a/Trigger/TrigTools/IDScanZFinder/CMakeLists.txt
+++ b/Trigger/TrigTools/IDScanZFinder/CMakeLists.txt
@@ -6,7 +6,7 @@
atlas_subdir( IDScanZFinder )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
+atlas_depends_on_subdirs( PRIVATE
Control/AthenaBaseComps
DetectorDescription/IRegionSelector
GaudiKernel
@@ -17,15 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
find_package( CLHEP )
# Component(s) in the package:
-atlas_add_library( IDScanZFinderLib
- src/*.cxx
- PUBLIC_HEADERS IDScanZFinder
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps IRegionSelector GaudiKernel TrigInDetEvent )
-
atlas_add_component( IDScanZFinder
- src/components/*.cxx
+ src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps IRegionSelector GaudiKernel TrigInDetEvent IDScanZFinderLib )
-
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps IRegionSelector GaudiKernel TrigInDetEvent )
diff --git a/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx
index 628c80560e46dbbb30e1ad6446d0e1949b41894f..3b3a27f101ca376556f79212e68a81e61b51986c 100755
--- a/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////////
@@ -12,10 +12,8 @@
#include <cmath>
#include <vector>
-#include "GaudiKernel/MsgStream.h"
-
-#include "IDScanZFinder/IDScanZFinder.h"
-#include "IDScanZFinder/ZFinderConstants.h"
+#include "IDScanZFinder.h"
+#include "ZFinderConstants.h"
#include "TrigInDetEvent/TrigVertex.h"
#include "TrigInDetEvent/TrigSiSpacePoint.h"
@@ -35,9 +33,6 @@ IDScanZFinder::IDScanZFinder( const std::string& type, const std::string& name,
{
declareInterface< ITrigRun1ZFinder >( this );
- // std::cout << "ZFinder::ZFinder() " << name << " " << type << "\tm_nFirstLayers " << m_nFirstLayers << std::endl;
- // std::cout << "ZFinder::ZFinder() version " << name << " " << type << "\tIDScanZFinder-00-00-62"<< std::endl;
-
declareProperty( "PhiBinSize", m_phiBinSize = 0.2 );
declareProperty( "UseOnlyPixels", m_pixOnly = false );
declareProperty( "MinZBinSize", m_minZBinSize = 0.2 );
@@ -59,24 +54,11 @@ IDScanZFinder::IDScanZFinder( const std::string& type, const std::string& name,
declareProperty( "TripletDK", m_tripletDK = 0.005 );
declareProperty( "TripletDP", m_tripletDP = 0.05 );
declareProperty( "WeightThreshold", m_weightThreshold = 0 );
-
- // std::cout << "ZFinder::ZFinder() " << name << " " << type << "\tm_nFirstLayers " << m_nFirstLayers << std::endl;
-
}
StatusCode IDScanZFinder::initialize()
{
- StatusCode sc = AthAlgTool::initialize(); // sets properties
-
- MsgStream athenaLog( msgSvc(), name() );
-
- if ( sc.isFailure() ){
- athenaLog << MSG::ERROR << "Error in AthAlgTool::initialize() " << endmsg;
- // msg(MSG::ERROR) << "Error in AthAlgTool::initialize() " << endmsg;
- return sc;
- }
-
// NB: This should go into the InitializeInternal !!!!!!!!!
// NO internal settings should be changed in here, this should just
// be an athena wrapper !!!
@@ -87,28 +69,20 @@ StatusCode IDScanZFinder::initialize()
/// NB: These only have to go here, because they need to write to the msgsvc, and because
/// is rubbish, we can't pass in a pointer to a (non-athena) sub algorithm.
if ( m_phiBinSize < ZFinder_MinPhiSliceSize ){
- athenaLog << MSG::WARNING << "IDScanZFinder constructor: " << name() << endmsg;
- athenaLog << MSG::WARNING
- << "Requested PhiBinSize of " << m_phiBinSize
- << " degrees is smaller than the minimum allowed (" << ZFinder_MinPhiSliceSize
- << " degrees). Set to the minimum value." << endmsg;
+ ATH_MSG_WARNING("Requested PhiBinSize of " << m_phiBinSize
+ << " degrees is smaller than the minimum allowed (" << ZFinder_MinPhiSliceSize
+ << " degrees). Set to the minimum value.");
// m_phiBinSize = ZFinder_MinPhiSliceSize;
}
// NB: This should go into the InitializeInternal !!!!
if ( m_dphideta > 0 ){
- athenaLog << MSG::WARNING << "IDScanZFinder constructor: " << name() << endmsg;
- athenaLog << MSG::WARNING
- << "Requested DPhiDEta of " << m_dphideta
- << " is positive. Setting to its negative!" << endmsg;
+ ATH_MSG_WARNING("Requested DPhiDEta of " << m_dphideta
+ << " is positive. Setting to its negative!");
// m_dphideta *= -1.;
}
- if (m_numberingTool.retrieve().isFailure()){
- athenaLog << MSG::FATAL << "Tool " << m_numberingTool
- << " not found " << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( m_numberingTool.retrieve() );
/// get first endcap layer, so we know how
/// barrel layers there are
@@ -127,49 +101,44 @@ StatusCode IDScanZFinder::initialize()
/// endcap pixel layer
initializeInternal(maxSiliconLayerNum,offsetEndcapPixels-1);
- athenaLog << MSG::INFO << "IDScanZFinder constructed: name() " << name() << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinderInternal version: " << getVersion() << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::PixOnly set to " << m_pixOnly << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::FullScanMode " << m_fullScanMode << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::PhiBinSize set to " << m_phiBinSize << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::# of peaks to consider: " << m_numberOfPeaks << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::z bin size " << m_minZBinSize << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::eta coeff " << m_zBinSizeEtaCoeff << endmsg;
+ ATH_MSG_INFO("IDScanZFinder constructed: name() " << name() );
+ ATH_MSG_INFO("IDScanZFinderInternal version: " << getVersion() );
+ ATH_MSG_INFO("IDScanZFinder::PixOnly set to " << m_pixOnly );
+ ATH_MSG_INFO("IDScanZFinder::FullScanMode " << m_fullScanMode );
+ ATH_MSG_INFO("IDScanZFinder::PhiBinSize set to " << m_phiBinSize );
+ ATH_MSG_INFO("IDScanZFinder::# of peaks to consider: " << m_numberOfPeaks );
+ ATH_MSG_INFO("IDScanZFinder::z bin size " << m_minZBinSize );
+ ATH_MSG_INFO("IDScanZFinder::eta coeff " << m_zBinSizeEtaCoeff);
- athenaLog << MSG::INFO << "IDScanZFinder::m_nFirstLayers = " << m_nFirstLayers << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_invPhiSliceSize = " << m_invPhiSliceSize << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_phiBinSize = " << m_phiBinSize << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_dphideta = " << m_dphideta << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_neighborMultiplier = " << m_neighborMultiplier << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_minZBinSize = " << m_minZBinSize << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_zBinSizeEtaCoeff = " << m_zBinSizeEtaCoeff << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_chargeAware = " << m_chargeAware << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_zHistoPerPhi = " << m_zHistoPerPhi << endmsg;
+ ATH_MSG_INFO("IDScanZFinder::m_nFirstLayers = " << m_nFirstLayers );
+ ATH_MSG_INFO("IDScanZFinder::m_invPhiSliceSize = " << m_invPhiSliceSize );
+ ATH_MSG_INFO("IDScanZFinder::m_phiBinSize = " << m_phiBinSize );
+ ATH_MSG_INFO("IDScanZFinder::m_dphideta = " << m_dphideta );
+ ATH_MSG_INFO("IDScanZFinder::m_neighborMultiplier = " << m_neighborMultiplier);
+ ATH_MSG_INFO("IDScanZFinder::m_minZBinSize = " << m_minZBinSize );
+ ATH_MSG_INFO("IDScanZFinder::m_zBinSizeEtaCoeff = " << m_zBinSizeEtaCoeff);
+ ATH_MSG_INFO("IDScanZFinder::m_chargeAware = " << m_chargeAware );
+ ATH_MSG_INFO("IDScanZFinder::m_zHistoPerPhi = " << m_zHistoPerPhi );
- athenaLog << MSG::INFO << "IDScanZFinder::m_nvrtxSeparation = " << m_nvrtxSeparation << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_vrtxDistCut = " << m_vrtxDistCut << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_vrtxMixing = " << m_vrtxMixing << endmsg;
- athenaLog << MSG::INFO << "IDScanZFinder::m_preferCentralZ = " << m_preferCentralZ << endmsg;
+ ATH_MSG_INFO("IDScanZFinder::m_nvrtxSeparation = " << m_nvrtxSeparation );
+ ATH_MSG_INFO("IDScanZFinder::m_vrtxDistCut = " << m_vrtxDistCut );
+ ATH_MSG_INFO("IDScanZFinder::m_vrtxMixing = " << m_vrtxMixing );
+ ATH_MSG_INFO("IDScanZFinder::m_preferCentralZ = " << m_preferCentralZ );
- athenaLog << MSG::INFO << "IDScanZFinder::m_trustSPprovider = " << m_trustSPprovider << endmsg;
+ ATH_MSG_INFO("IDScanZFinder::m_trustSPprovider = " << m_trustSPprovider );
- athenaLog << MSG::INFO << "IDScanZFinder::m_tripletMode = " << m_tripletMode << endmsg;
+ ATH_MSG_INFO("IDScanZFinder::m_tripletMode = " << m_tripletMode );
- athenaLog << MSG::INFO << "IDScanZFinder::m_weigthThreshold = " << m_weightThreshold << endmsg;
+ ATH_MSG_INFO("IDScanZFinder::m_weigthThreshold = " << m_weightThreshold );
- return sc;
+ return StatusCode::SUCCESS;
}
-StatusCode IDScanZFinder::finalize() {
- return AthAlgTool::finalize();
-}
-
TrigVertexCollection* IDScanZFinder::findZ( const std::vector<const TrigSiSpacePoint *>& spVec, const IRoiDescriptor& roi)
{
TrigVertexCollection* output = new TrigVertexCollection;
- // int outputLevel = msgSvc()->outputLevel( name() );
std::vector<vertex>* vertices = findZInternal( spVec, roi);
@@ -185,7 +154,6 @@ TrigVertexCollection* IDScanZFinder::findZ( const std::vector<const TrigSiSpaceP
for ( unsigned int i=0 ; i<vertices->size() ; i++ ) {
output->push_back( new TrigVertex( (*vertices)[i]._z, (*vertices)[i]._weight, TrigVertex::NULLID ) );
- // std::cout << "SUTT vertex " << i << "\tz "<< (*vertices)[i]._z << "\tn " << (*vertices)[i]._weight << std::endl;
}
delete vertices;
diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/IDScanZFinder.h b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.h
old mode 100755
new mode 100644
similarity index 84%
rename from Trigger/TrigTools/IDScanZFinder/IDScanZFinder/IDScanZFinder.h
rename to Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.h
index 73ba80a8c8bd4fef6548223155ace90d46a9a9a4..10fe6cb7e0730f4acdec948b2cfd36ce4f75c5de
--- a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/IDScanZFinder.h
+++ b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.h
@@ -1,7 +1,7 @@
// emacs: this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////////
@@ -27,11 +27,9 @@
#include "GaudiKernel/ToolHandle.h"
#include "TrigInDetToolInterfaces/ITrigRun1ZFinder.h"
-// #include "GaudiKernel/AlgTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigInDetEvent/TrigVertexCollection.h"
-#include "IDScanZFinder/IDScanZFinderInternal.h"
-// for some reason it cannot find the header with the usual cmt path resolution
+#include "IDScanZFinderInternal.h"
#include "TrigInDetToolInterfaces/ITrigL2LayerNumberTool.h"
class TrigVertex;
@@ -46,8 +44,7 @@ class IDScanZFinder: public Run1::IDScanZFinderInternal<TrigSiSpacePoint>, publi
IDScanZFinder( const std::string&, const std::string&, const IInterface* );
virtual ~IDScanZFinder(){};
- virtual StatusCode initialize();
- virtual StatusCode finalize ();
+ virtual StatusCode initialize() override;
TrigVertexCollection* findZ( const std::vector<const TrigSiSpacePoint *>& spVec, const IRoiDescriptor& roi);
diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/IDScanZFinderInternal.h b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinderInternal.h
old mode 100755
new mode 100644
similarity index 99%
rename from Trigger/TrigTools/IDScanZFinder/IDScanZFinder/IDScanZFinderInternal.h
rename to Trigger/TrigTools/IDScanZFinder/src/IDScanZFinderInternal.h
index 75ec09de18a94019a3f9eefe80f11f180b9531e1..9d608fe54b19bd9c32aeb92bcb1497f0230adc5e
--- a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/IDScanZFinderInternal.h
+++ b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinderInternal.h
@@ -25,8 +25,8 @@
#include <vector>
#include <string>
-#include "IDScanZFinder/ZFinderConstants.h"
-#include "IDScanZFinder/PhiSlice.h"
+#include "ZFinderConstants.h"
+#include "PhiSlice.h"
#include "IRegionSelector/IRoiDescriptor.h"
static const std::string mZFIVER("$Id: IDScanZFinderInternal.h 700483 2015-10-14 09:37:16Z sutt $");
diff --git a/Trigger/TrigTools/IDScanZFinder/src/PhiSlice.cxx b/Trigger/TrigTools/IDScanZFinder/src/PhiSlice.cxx
index 9138f32b0bcd7676b3abaa45052218a02f5e0468..3f02492538b997826495c0bc33f88c3efdab78b6 100644
--- a/Trigger/TrigTools/IDScanZFinder/src/PhiSlice.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/PhiSlice.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "IDScanZFinder/PhiSlice.h"
+#include "PhiSlice.h"
#include <cmath>
#include <iostream>
diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/PhiSlice.h b/Trigger/TrigTools/IDScanZFinder/src/PhiSlice.h
similarity index 100%
rename from Trigger/TrigTools/IDScanZFinder/IDScanZFinder/PhiSlice.h
rename to Trigger/TrigTools/IDScanZFinder/src/PhiSlice.h
diff --git a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx
index c30c83d990b87d0bb34068780c19301c3c47ba6a..8e4acf2960cc9c5064fabcca71866a93fbe8b7ce 100755
--- a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////////
// IdScan: TrigZFinder
@@ -11,10 +11,8 @@
#include <cmath>
#include <vector>
-#include "GaudiKernel/MsgStream.h"
-
-#include "IDScanZFinder/TrigZFinder.h"
-#include "IDScanZFinder/ZFinderConstants.h"
+#include "TrigZFinder.h"
+#include "ZFinderConstants.h"
#include "TrigInDetEvent/TrigVertex.h"
#include "TrigInDetEvent/TrigSiSpacePointBase.h"
@@ -69,16 +67,6 @@ TrigZFinder::TrigZFinder( const std::string& type, const std::string& name, cons
StatusCode TrigZFinder::initialize()
{
- StatusCode sc = AthAlgTool::initialize(); // sets properties
-
- MsgStream athenaLog( msgSvc(), name() );
-
- if ( sc.isFailure() ){
- athenaLog << MSG::ERROR << "Error in AthAlgTool::initialize() " << endmsg;
- // msg(MSG::ERROR) << "Error in AthAlgTool::initialize() " << endmsg;
- return sc;
- }
-
// NB: This should go into the InitializeInternal !!!!!!!!!
// NO internal settings should be changed in here, this should just
// be an athena wrapper !!!
@@ -89,28 +77,20 @@ StatusCode TrigZFinder::initialize()
/// NB: These only have to go here, because they need to write to the msgsvc, and because
/// is rubbish, we can't pass in a pointer to a (non-athena) sub algorithm.
if ( m_phiBinSize < ZFinder_MinPhiSliceSize ){
- athenaLog << MSG::WARNING << "TrigZFinder constructor: " << name() << endmsg;
- athenaLog << MSG::WARNING
- << "Requested PhiBinSize of " << m_phiBinSize
- << " degrees is smaller than the minimum allowed (" << ZFinder_MinPhiSliceSize
- << " degrees). Set to the minimum value." << endmsg;
+ ATH_MSG_WARNING("Requested PhiBinSize of " << m_phiBinSize
+ << " degrees is smaller than the minimum allowed (" << ZFinder_MinPhiSliceSize
+ << " degrees). Set to the minimum value.");
// m_phiBinSize = ZFinder_MinPhiSliceSize;
}
// NB: This should go into the InitializeInternal !!!!
if ( m_dphideta > 0 ){
- athenaLog << MSG::WARNING << "TrigZFinder constructor: " << name() << endmsg;
- athenaLog << MSG::WARNING
- << "Requested DPhiDEta of " << m_dphideta
- << " is positive. Setting to its negative!" << endmsg;
+ ATH_MSG_WARNING("Requested DPhiDEta of " << m_dphideta
+ << " is positive. Setting to its negative!");
// m_dphideta *= -1.;
}
- if (m_numberingTool.retrieve().isFailure()){
- athenaLog << MSG::FATAL << "Tool " << m_numberingTool
- << " not found " << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_CHECK(m_numberingTool.retrieve());
/// get first endcap layer, so we know how
/// barrel layers there are
@@ -130,51 +110,47 @@ StatusCode TrigZFinder::initialize()
initializeInternal(maxSiliconLayerNum,offsetEndcapPixels-1);
- athenaLog << MSG::INFO << "TrigZFinder constructed: name() " << name() << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::PixOnly set to " << m_pixOnly << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::FullScanMode " << m_fullScanMode << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::PhiBinSize set to " << m_phiBinSize << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::# of peaks to consider: " << m_numberOfPeaks << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::z bin size " << m_minZBinSize << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::eta coeff " << m_zBinSizeEtaCoeff << endmsg;
+ ATH_MSG_INFO("TrigZFinder constructed: name() " << name() );
+ ATH_MSG_INFO("TrigZFinder::PixOnly set to " << m_pixOnly );
+ ATH_MSG_INFO("TrigZFinder::FullScanMode " << m_fullScanMode );
+ ATH_MSG_INFO("TrigZFinder::PhiBinSize set to " << m_phiBinSize );
+ ATH_MSG_INFO("TrigZFinder::# of peaks to consider: " << m_numberOfPeaks );
+ ATH_MSG_INFO("TrigZFinder::z bin size " << m_minZBinSize );
+ ATH_MSG_INFO("TrigZFinder::eta coeff " << m_zBinSizeEtaCoeff);
- athenaLog << MSG::INFO << "TrigZFinder::m_nFirstLayers = " << m_nFirstLayers << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_invPhiSliceSize = " << m_invPhiSliceSize << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_phiBinSize = " << m_phiBinSize << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_dphideta = " << m_dphideta << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_neighborMultiplier = " << m_neighborMultiplier << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_minZBinSize = " << m_minZBinSize << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_zBinSizeEtaCoeff = " << m_zBinSizeEtaCoeff << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_chargeAware = " << m_chargeAware << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_zHistoPerPhi = " << m_zHistoPerPhi << endmsg;
+ ATH_MSG_INFO("TrigZFinder::m_nFirstLayers = " << m_nFirstLayers );
+ ATH_MSG_INFO("TrigZFinder::m_invPhiSliceSize = " << m_invPhiSliceSize );
+ ATH_MSG_INFO("TrigZFinder::m_phiBinSize = " << m_phiBinSize );
+ ATH_MSG_INFO("TrigZFinder::m_dphideta = " << m_dphideta );
+ ATH_MSG_INFO("TrigZFinder::m_neighborMultiplier = " << m_neighborMultiplier);
+ ATH_MSG_INFO("TrigZFinder::m_minZBinSize = " << m_minZBinSize );
+ ATH_MSG_INFO("TrigZFinder::m_zBinSizeEtaCoeff = " << m_zBinSizeEtaCoeff);
+ ATH_MSG_INFO("TrigZFinder::m_chargeAware = " << m_chargeAware );
+ ATH_MSG_INFO("TrigZFinder::m_zHistoPerPhi = " << m_zHistoPerPhi );
- athenaLog << MSG::INFO << "TrigZFinder::m_nvrtxSeparation = " << m_nvrtxSeparation << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_vrtxDistCut = " << m_vrtxDistCut << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_vrtxMixing = " << m_vrtxMixing << endmsg;
- athenaLog << MSG::INFO << "TrigZFinder::m_preferCentralZ = " << m_preferCentralZ << endmsg;
+ ATH_MSG_INFO("TrigZFinder::m_nvrtxSeparation = " << m_nvrtxSeparation );
+ ATH_MSG_INFO("TrigZFinder::m_vrtxDistCut = " << m_vrtxDistCut );
+ ATH_MSG_INFO("TrigZFinder::m_vrtxMixing = " << m_vrtxMixing );
+ ATH_MSG_INFO("TrigZFinder::m_preferCentralZ = " << m_preferCentralZ );
- athenaLog << MSG::INFO << "TrigZFinder::m_trustSPprovider = " << m_trustSPprovider << endmsg;
+ ATH_MSG_INFO("TrigZFinder::m_trustSPprovider = " << m_trustSPprovider );
- athenaLog << MSG::INFO << "TrigZFinder::m_tripletMode = " << m_tripletMode << endmsg;
+ ATH_MSG_INFO("TrigZFinder::m_tripletMode = " << m_tripletMode );
- athenaLog << MSG::INFO << "TrigZFinder::m_maxLayer = " << m_maxLayer << endmsg;
+ ATH_MSG_INFO("TrigZFinder::m_maxLayer = " << m_maxLayer );
- athenaLog << MSG::INFO << "TrigZFinder::m_minVtxSignificance = " << m_minVtxSignificance << endmsg;
+ ATH_MSG_INFO("TrigZFinder::m_minVtxSignificance = " << m_minVtxSignificance );
if ( m_minVtxSignificance>0 ) {
- athenaLog << MSG::INFO << "TrigZFinder::m_percentile = " << m_percentile << endmsg;
+ ATH_MSG_INFO("TrigZFinder::m_percentile = " << m_percentile );
}
- athenaLog << MSG::INFO << "TrigZFinder::m_weigthThreshold = " << m_weightThreshold << endmsg;
+ ATH_MSG_INFO("TrigZFinder::m_weigthThreshold = " << m_weightThreshold );
- return sc;
+ return StatusCode::SUCCESS;
}
-StatusCode TrigZFinder::finalize() {
- return AthAlgTool::finalize();
-}
-
TrigVertexCollection* TrigZFinder::findZ( const std::vector<TrigSiSpacePointBase>& spVec, const IRoiDescriptor& roi)
{
@@ -193,7 +169,6 @@ TrigVertexCollection* TrigZFinder::findZ( const std::vector<TrigSiSpacePointBase
for ( unsigned int i=0 ; i<vertices->size() ; i++ ) {
output->push_back( new TrigVertex( (*vertices)[i]._z, (*vertices)[i]._weight, TrigVertex::NULLID ) );
- // std::cout << "SUTT vertex " << i << "\tz "<< (*vertices)[i]._z << "\tn " << (*vertices)[i]._weight << std::endl;
}
delete vertices;
diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinder.h b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.h
old mode 100755
new mode 100644
similarity index 87%
rename from Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinder.h
rename to Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.h
index 117f6d256604e3f08c960e6de3ff76b4a2ea33c7..e13da95f925ed83edf5afc40469db071906d1847
--- a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinder.h
+++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.h
@@ -1,7 +1,7 @@
// emacs: this is -*- c++ -*-
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////////
@@ -27,10 +27,9 @@
#include "GaudiKernel/ToolHandle.h"
#include "TrigInDetToolInterfaces/ITrigZFinder.h"
-// #include "GaudiKernel/AlgTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigInDetEvent/TrigVertexCollection.h"
-#include "IDScanZFinder/TrigZFinderInternal.h"
+#include "TrigZFinderInternal.h"
#include "TrigInDetToolInterfaces/ITrigL2LayerNumberTool.h"
class TrigVertex;
@@ -45,8 +44,7 @@ class TrigZFinder: public TrigZFinderInternal, public AthAlgTool, virtual public
TrigZFinder( const std::string&, const std::string&, const IInterface* );
virtual ~TrigZFinder(){};
- virtual StatusCode initialize();
- virtual StatusCode finalize ();
+ virtual StatusCode initialize() override;
TrigVertexCollection* findZ( const std::vector<TrigSiSpacePointBase>& spVec, const IRoiDescriptor& roi);
diff --git a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
index e1ad6be56f604221e6c4a9a05419ca4f8d73e824..b11dd642ce606a738317970fd57b30c2900da994 100644
--- a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
@@ -2,8 +2,8 @@
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#include "IDScanZFinder/TrigZFinderInternal.h"
-#include "IDScanZFinder/PhiSlice.h"
+#include "TrigZFinderInternal.h"
+#include "PhiSlice.h"
////////////////////////////////////////////////////////////////////////////////
//// TrigZFinderInternal implementation
diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.h
old mode 100755
new mode 100644
similarity index 99%
rename from Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
rename to Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.h
index b336ea20a55b24fd533d06a5e76720e058724f1c..c538ff6878a5f6edd8439632480fa642ce40860c
--- a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
+++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.h
@@ -25,7 +25,7 @@
#include <vector>
#include <string>
-#include "IDScanZFinder/ZFinderConstants.h"
+#include "ZFinderConstants.h"
#include "IRegionSelector/IRoiDescriptor.h"
#include "TrigInDetEvent/TrigSiSpacePointBase.h"
diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/ZFinderConstants.h b/Trigger/TrigTools/IDScanZFinder/src/ZFinderConstants.h
similarity index 100%
rename from Trigger/TrigTools/IDScanZFinder/IDScanZFinder/ZFinderConstants.h
rename to Trigger/TrigTools/IDScanZFinder/src/ZFinderConstants.h
diff --git a/Trigger/TrigTools/IDScanZFinder/src/components/IDScanZFinder_entries.cxx b/Trigger/TrigTools/IDScanZFinder/src/components/IDScanZFinder_entries.cxx
index 03c78ad16e6583f65049bdfd5d04ed431f255b26..5fd3194feb42543f3055c691064e3f68fc6c896f 100644
--- a/Trigger/TrigTools/IDScanZFinder/src/components/IDScanZFinder_entries.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/components/IDScanZFinder_entries.cxx
@@ -1,5 +1,5 @@
-#include "IDScanZFinder/IDScanZFinder.h"
-#include "IDScanZFinder/TrigZFinder.h"
+#include "../IDScanZFinder.h"
+#include "../TrigZFinder.h"
DECLARE_COMPONENT( IDScanZFinder )
DECLARE_COMPONENT( TrigZFinder )
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/CMakeLists.txt b/Trigger/TrigTools/TrigInDetRecoTools/CMakeLists.txt
index 057e30b438adb58a026d8acb5e2de56bd1d07ce8..cf35fad73fe4e76c9f0fda9e04d4f446086cd2d6 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigInDetRecoTools/CMakeLists.txt
@@ -29,6 +29,7 @@ atlas_depends_on_subdirs( PUBLIC
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
InnerDetector/InDetRecEvent/InDetRIO_OnTrack
+ InnerDetector/InDetRecEvent/SiSPSeededTrackFinderData
Tracking/TrkDetDescr/TrkSurfaces
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkParameters
@@ -45,7 +46,7 @@ atlas_add_component( TrigInDetRecoTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel InDetPrepRawData SiSpacePoint InDetRecToolInterfaces TrkSpacePoint TrkTrack TrigInDetEvent TrigInDetPattRecoEvent TrigSteeringEvent AthenaKernel GeoPrimitives IRegionSelector ByteStreamCnvSvcBaseLib EventInfo InDetIdentifier InDetReadoutGeometry InDetRIO_OnTrack TrkSurfaces TrkEventPrimitives TrkParameters TrkRIO_OnTrack TrkSegment TrigTimeAlgsLib )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel InDetPrepRawData SiSpacePoint InDetRecToolInterfaces TrkSpacePoint TrkTrack TrigInDetEvent TrigInDetPattRecoEvent TrigSteeringEvent AthenaKernel GeoPrimitives IRegionSelector ByteStreamCnvSvcBaseLib EventInfo InDetIdentifier InDetReadoutGeometry InDetRIO_OnTrack SiSPSeededTrackFinderData TrkSurfaces TrkEventPrimitives TrkParameters TrkRIO_OnTrack TrkSegment TrigTimeAlgsLib )
# Install files from the package:
atlas_install_headers( TrigInDetRecoTools )
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyC.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyC.cxx
index 0b60cdde08d06ea72fa95ac09ec0fbc51ab22c2c..6c80477807a4e3a3bd3e94ecc2784c3fcc0e4c49 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyC.cxx
+++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyC.cxx
@@ -35,6 +35,9 @@
#include "SiSpacePoint/SCT_SpacePoint.h"
#include "SiSpacePoint/PixelSpacePoint.h"
+#include "SiSPSeededTrackFinderData/SiSpacePointsSeedMakerEventData.h"
+#include "SiSPSeededTrackFinderData/SiTrackMakerEventData_xk.h"
+
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
#include "TrkSpacePoint/SpacePoint.h"
#include "TrkSpacePoint/SpacePointCollection.h"
@@ -277,13 +280,14 @@ HLT::ErrorCode TrigL2PattRecoStrategyC::findTracks(const std::vector<const TrigS
if(m_timers) m_timer[0]->start();
+ InDet::SiSpacePointsSeedMakerEventData seedEventData;
std::list<Trk::Vertex> VZ;
if( m_useZvertexTool ) {
if(m_timers) m_timer[9]->start();
- VZ = m_zvertexmaker->newRegion(listOfPixIds,listOfSCTIds,roi);
+ VZ = m_zvertexmaker->newRegion(seedEventData, listOfPixIds, listOfSCTIds, roi);
std::for_each(VZ.begin(),VZ.end(),ZVertexCopyFunctor(m_zVertices));
if(m_timers) m_timer[9]->stop();
if (outputLevel <= MSG::DEBUG)
@@ -291,19 +295,19 @@ HLT::ErrorCode TrigL2PattRecoStrategyC::findTracks(const std::vector<const TrigS
}
else{
if(m_timers) m_timer[1]->start();
- m_seedsmaker->newRegion(listOfPixIds,listOfSCTIds,roi);
+ m_seedsmaker->newRegion(seedEventData, listOfPixIds, listOfSCTIds, roi);
if(m_timers) m_timer[1]->stop();
}
if(m_timers) m_timer[2]->start();
- m_seedsmaker->find3Sp(VZ);
+ m_seedsmaker->find3Sp(seedEventData, VZ);
if(m_timers) m_timer[2]->stop();
bool PIX = true;
bool SCT = true;
-
+ InDet::SiTrackMakerEventData_xk trackEventData;
if(m_timers) m_timer[4]->start();
- m_trackmaker->newTrigEvent(PIX,SCT);
+ m_trackmaker->newTrigEvent(trackEventData, PIX, SCT);
if(m_timers) m_timer[4]->stop();
// Loop through all seeds and reconsrtucted tracks collection preparation
@@ -325,14 +329,14 @@ HLT::ErrorCode TrigL2PattRecoStrategyC::findTracks(const std::vector<const TrigS
while(true) {
if(m_timers) m_timer[3]->resume();
- seed = m_seedsmaker->next();
+ seed = m_seedsmaker->next(seedEventData);
if(m_timers) m_timer[3]->pause();
if(seed==0) break;
++m_nseeds;
if(m_timers) m_timer[5]->resume();
- std::list<Trk::Track*> T = std::move(m_trackmaker->getTracks(seed->spacePoints()));
+ std::list<Trk::Track*> T = m_trackmaker->getTracks(trackEventData, seed->spacePoints());
if(m_timers) m_timer[5]->pause();
if(m_timers) m_timer[6]->resume();
for(std::list<Trk::Track*>::const_iterator t=T.begin(); t!=T.end(); ++t) {
@@ -355,7 +359,7 @@ HLT::ErrorCode TrigL2PattRecoStrategyC::findTracks(const std::vector<const TrigS
if(m_timers) m_timer[7]->start();
- m_trackmaker->endEvent();
+ m_trackmaker->endEvent(trackEventData);
if(m_timers) m_timer[7]->stop();
// Remove shared tracks with worse quality
@@ -432,13 +436,14 @@ HLT::ErrorCode TrigL2PattRecoStrategyC::findTracks(const std::vector<const TrigS
bool PIX = true;
bool SCT = true;
+ InDet::SiSpacePointsSeedMakerEventData seedEventData;
std::list<Trk::Vertex> VZ;
if(m_timers) m_timer[0]->start();
if( m_useZvertexTool ) {
if(m_timers) m_timer[9]->start();
- VZ = m_zvertexmaker->newEvent();
+ VZ = m_zvertexmaker->newEvent(seedEventData);
std::for_each(VZ.begin(),VZ.end(),ZVertexCopyFunctor(m_zVertices));
if(m_timers) m_timer[9]->stop();
if (outputLevel <= MSG::DEBUG)
@@ -446,16 +451,17 @@ HLT::ErrorCode TrigL2PattRecoStrategyC::findTracks(const std::vector<const TrigS
}
else{
if(m_timers) m_timer[1]->start();
- m_seedsmaker->newEvent();
+ m_seedsmaker->newEvent(seedEventData);
if(m_timers) m_timer[1]->stop();
}
if(m_timers) m_timer[2]->start();
- m_seedsmaker->find3Sp(VZ);
+ m_seedsmaker->find3Sp(seedEventData, VZ);
if(m_timers) m_timer[2]->stop();
if(m_timers) m_timer[4]->start();
- m_trackmaker->newTrigEvent(PIX,SCT);
+ InDet::SiTrackMakerEventData_xk trackEventData;
+ m_trackmaker->newTrigEvent(trackEventData, PIX, SCT);
if(m_timers) m_timer[4]->stop();
// Loop through all seeds and reconsrtucted tracks collection preparation
@@ -477,14 +483,14 @@ HLT::ErrorCode TrigL2PattRecoStrategyC::findTracks(const std::vector<const TrigS
while(true) {
if(m_timers) m_timer[3]->resume();
- seed = m_seedsmaker->next();
+ seed = m_seedsmaker->next(seedEventData);
if(m_timers) m_timer[3]->pause();
if(seed==0) break;
++m_nseeds;
if(m_timers) m_timer[5]->resume();
- std::list<Trk::Track*> T = std::move(m_trackmaker->getTracks(seed->spacePoints()));
+ std::list<Trk::Track*> T = m_trackmaker->getTracks(trackEventData, seed->spacePoints());
if(m_timers) m_timer[5]->pause();
if(m_timers) m_timer[6]->resume();
for(std::list<Trk::Track*>::const_iterator t=T.begin(); t!=T.end(); ++t) {
@@ -507,7 +513,7 @@ HLT::ErrorCode TrigL2PattRecoStrategyC::findTracks(const std::vector<const TrigS
if(m_timers) m_timer[7]->start();
- m_trackmaker->endEvent();
+ m_trackmaker->endEvent(trackEventData);
if(m_timers) m_timer[7]->stop();
// Remove shared tracks with worse quality
diff --git a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyT.cxx b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyT.cxx
index 1a11a02a2b84c1ab00b6e0bbdc944ca46ec52475..5aad52c93e627df95a10263a6c665f96349613b7 100644
--- a/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyT.cxx
+++ b/Trigger/TrigTools/TrigInDetRecoTools/src/TrigL2PattRecoStrategyT.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////////
@@ -29,6 +29,7 @@
#include "IRegionSelector/IRoiDescriptor.h"
#include "InDetRecToolInterfaces/ITRT_SeededTrackFinder.h"
+#include "SiSPSeededTrackFinderData/SiCombinatorialTrackFinderData_xk.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
@@ -252,7 +253,8 @@ HLT::ErrorCode TrigL2PattRecoStrategyT::findTracks(const TrigInDetTrackCollectio
m_regionSelector->DetHashIDList(SCT, roi, listOfSCTIds );
m_regionSelector->DetHashIDList(PIXEL, roi, listOfPixIds);
- m_trackmaker->newRegion(listOfPixIds,listOfSCTIds); //RoI-based reconstruction
+ InDet::SiCombinatorialTrackFinderData_xk combinatorialData;
+ m_trackmaker->newRegion(combinatorialData, listOfPixIds, listOfSCTIds); //RoI-based reconstruction
TrackCollection* tempTracks = new TrackCollection; //Temporary track collection per event
@@ -275,7 +277,7 @@ HLT::ErrorCode TrigL2PattRecoStrategyT::findTracks(const TrigInDetTrackCollectio
}
nTrtSegGood++;
- std::list<Trk::Track*> trackSi = m_trackmaker->getTrack(*trtTrack); //Get the possible Si extensions
+ std::list<Trk::Track*> trackSi = m_trackmaker->getTrack(combinatorialData, *trtTrack); //Get the possible Si extensions
if(trackSi.size()==0){
if (outputLevel <= MSG::INFO)
@@ -365,7 +367,8 @@ HLT::ErrorCode TrigL2PattRecoStrategyT::findTracks(const TrigInDetTrackCollectio
if(m_timers) m_timer[2]->stop();
if(m_timers) m_timer[4]->start();
- m_trackmaker->newTrigEvent(PIX,SCT);
+ InDet::SiCombinatorialTrackFinderData_xk combinatorialData;
+ m_trackmaker->newTrigEvent(combinatorialData, PIX, SCT);
if(m_timers) m_timer[4]->stop();
// Loop through all seeds and reconsrtucted tracks collection preparation
@@ -394,7 +397,7 @@ HLT::ErrorCode TrigL2PattRecoStrategyT::findTracks(const TrigInDetTrackCollectio
++m_nseeds;
if(m_timers) m_timer[5]->resume();
- const std::list<Trk::Track*>& T = m_trackmaker->getTracks(seed->spacePoints());
+ const std::list<Trk::Track*>& T = m_trackmaker->getTracks(combinatorialData, seed->spacePoints());
if(m_timers) m_timer[5]->pause();
if(m_timers) m_timer[6]->resume();
for(std::list<Trk::Track*>::const_iterator t=T.begin(); t!=T.end(); ++t) {
@@ -417,7 +420,7 @@ HLT::ErrorCode TrigL2PattRecoStrategyT::findTracks(const TrigInDetTrackCollectio
if(m_timers) m_timer[7]->start();
- m_trackmaker->endEvent();
+ m_trackmaker->endEvent(combinatorialData);
if(m_timers) m_timer[7]->stop();
// Remove shared tracks with worse quality
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..22498effa8063a62cea3ff7d72f01cae24fab6af
--- /dev/null
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_build.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# art-description: Test of the RDOtoRDOTrigger transform with serial athena (legacy trigger)
+# art-type: build
+# art-include: master/Athena
+# art-output: log.*
+# art-output: *.log
+# art-output: *.txt
+# art-output: *.root
+# art-output: runargs.*
+# art-output: runwrapper.*
+
+export NAME="trigAna_q221_RDOtoRDOTrig_build"
+export TEST="TrigAnalysisTest"
+export INPUT="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000001.pool.root.1"
+export EVENTS=20
+export JOB_LOG="athena.log"
+export AODTOCHECK="RDO_TRIG.pool.root" # to run checkFile and checkxAOD on this
+
+echo "Running Reco_tf command:"
+(set -x
+Reco_tf.py \
+--AMI=q221 \
+--imf=True \
+--maxEvents=${EVENTS} \
+--inputRDOFile=${INPUT} \
+--outputRDO_TRIGFile=RDO_TRIG.pool.root \
+>${JOB_LOG} 2>&1
+) 2>&1
+
+export ATH_RETURN=$?
+echo "art-result: ${ATH_RETURN} ${JOB_LOG%.*}"
+
+# use TrigUpgradeTest post-processing script
+source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e272996791fbea4f9eff69d1b1ead220ecdce75d
--- /dev/null
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_q221_RDOtoRDOTrig_mt1_build.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# art-description: Test of the RDOtoRDOTrigger transform with threads=1
+# art-type: build
+# art-include: master/Athena
+# art-output: log.*
+# art-output: *.log
+# art-output: *.txt
+# art-output: *.root
+# art-output: runargs.*
+# art-output: runwrapper.*
+
+export NAME="trigAna_q221_RDOtoRDOTrig_build"
+export TEST="TrigAnalysisTest"
+export INPUT="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000001.pool.root.1"
+export EVENTS=20
+export THREADS=1
+export JOB_LOG="athena.log"
+export AODTOCHECK="RDO_TRIG.pool.root" # to run checkFile and checkxAOD on this
+
+echo "Running Reco_tf command:"
+(set -x
+Reco_tf.py \
+--AMI=q221 \
+--imf=True \
+--athenaopts="--threads=${THREADS}" \
+--maxEvents=${EVENTS} \
+--inputRDOFile=${INPUT} \
+--outputRDO_TRIGFile=RDO_TRIG.pool.root \
+>${JOB_LOG} 2>&1
+) 2>&1
+
+export ATH_RETURN=$?
+echo "art-result: ${ATH_RETURN} ${JOB_LOG%.*}"
+
+# use TrigUpgradeTest post-processing script
+source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh b/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh
index 0af28a962f10324239b5eadee748a72d20c399b6..110893da634c067dbdd921bf496af961ea142436 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_HelloWorldHLT_run_stop_run_build.sh
@@ -7,7 +7,7 @@
export NAME=HelloWorldHLT_run_stop_run
# use export ART_FILE_NAME=... to set the INPUT_FILE value
export TRANSITIONS="run-stop-run-saveHist.trans"
-export ART_CMD="get_files -data ${TRANSITIONS}; athenaHLT.py -i -M --rewind -f INPUT_FILE AthExHelloWorld/HelloWorldOptions.py < ${TRANSITIONS}"
+export ART_CMD="get_files -data ${TRANSITIONS}; athenaHLT.py -i -M -f INPUT_FILE AthExHelloWorld/HelloWorldOptions.py < ${TRANSITIONS}"
export ART_TIMEOUT="20m"
export ART_NO_COUNT="true"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
deleted file mode 100644
index 4d9daeeebf76f4bf6d2c88e123eddc707feadf2a..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
+++ /dev/null
@@ -1,266 +0,0 @@
-#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-#
-
-
-from AthenaCommon.CFElements import parOR, seqAND
-from AthenaCommon.Constants import ERROR
-
-
-def jetAthSequence(ConfigFlags):
- from TrigT2CaloCommon.CaloDef import clusterFSInputMaker
- InputMakerAlg= clusterFSInputMaker()
-
- dataOrMC = "data"
- #if ConfigFlags.Input.isMC:
- # dataOrMC = "mc"
- # want to make this automatic.
-
- jetDefString = ConfigFlags.jetdefinition
- jetDefString += "_"+dataOrMC
-
-
- (recoSequence, sequenceOut) = jetRecoSequence( jetDefString )
-
- JetAthSequence = seqAND("jetAthSequence_"+jetDefString,[InputMakerAlg, recoSequence ])
- return (JetAthSequence, InputMakerAlg, sequenceOut)
-
-
-def jetRecoSequence( jetDefString , RoIs = 'FSJETRoI'):
-
- dataType = "data"
- if jetDefString.endswith("mc"):
- dataType = "mc"
-
- # construct calibration key word.
- calibSeq = ""
- if "subjesis" in jetDefString:
- calibSeq += "SubJESIS"
- elif "subjes" in jetDefString:
- calibSeq += "SubJES"
- if calibSeq: calibSeq = "Trig"+calibSeq
-
- radius = 0.4
- if "a10_" in jetDefString:
- radius = 1.0
- #if calibSeq:
- # calibSeq += "JMS"
-
- doLC=False
- jetConstitName = "EM"
- if "lcw" in jetDefString:
- doLC=True
- jetConstitName = "LC"
-
- # now avoid duplicate tool name errors for a4 emtopo and a10r chains.
- extraSuffix = ""
- if "a10r_" in jetDefString:
- extraSuffix += "a10r"
-
- cellMakerAlgo = _getHLTCellMakerAlgoForJets("cellMaker"+jetConstitName, RoIs, outputEDM='CaloCells'+jetConstitName, OutputLevel=ERROR)
- topoClusterMakerAlgo = _getHLTTopoClusterMakerAlgoForJets( "topoClusterMaker"+jetConstitName, inputEDM=cellMakerAlgo.CellsName, doLC=doLC, OutputLevel=ERROR)
-
- caloMakerSequence = parOR("TopoClusterRecoSequence"+jetConstitName+extraSuffix+calibSeq, [cellMakerAlgo, topoClusterMakerAlgo])
- caloclusters = topoClusterMakerAlgo.CaloClusters
-
- from JetRecConfig.JetDefinition import JetConstit, JetDefinition, xAODType, JetModifier
-
- # chosen jet collection
- prefix = "TrigAntiKt4"
- if "a10_" in jetDefString:
- prefix = "TrigAntiKt10"
- jetsFullName = prefix+jetConstitName+calibSeq
- trigJetConstit = JetConstit( xAODType.CaloCluster, [jetConstitName]) # 'EM' or 'LC' for trigger jets
- trigJetConstit.istrigger = False
- trigJetConstit.ptmin = 2e3
- trigJetConstit.ptminfilter = 7e3
- trigJetDef = JetDefinition( "AntiKt", radius, trigJetConstit)#, ptmin=trigMinPt,ptminfilter=trigMinPt)
-
- from JetRecConfig import JetRecConfig
-
- modList = [ (JetModifier("JetCaloEnergies", "jetens"), '') ]
- modList += [ (JetModifier("JetSorter","jetsort"), '') ]
- if calibSeq:
- from JetCalibTools import JetCalibToolsConfig
- jetCalibTool = JetCalibToolsConfig.getJetCalibTool( trigJetDef.basename, calibSeq, dataType )
- modList += [(JetModifier("JetCalibrationTool", jetCalibTool.name()), calibSeq+':'+dataType)]
- modList += [ ( JetModifier("JetFilterTool","jetptfilter"), str(int(trigJetConstit.ptminfilter))) ]
-
- trigJetConstit.rawname = caloclusters
- trigJetConstit.inputname = jetConstitName+trigJetConstit.inputname
- constitAlg = _getConstitAlg( trigJetConstit )
- jetRecoSequence = parOR( "JetRecSeq_"+jetsFullName+"_"+extraSuffix, [constitAlg])
-
- constitPJAlg = _getConstitPJGAlg( trigJetConstit )
- constitPJKey = constitPJAlg.PJGetter.OutputContainer
-
- pjs = [constitPJKey]
-
- jetRecoSequence += constitPJAlg
-
- eventShapeAlg = _getEventShapeAlg( trigJetConstit, constitPJKey )
- jetRecoSequence += eventShapeAlg
-
- # Generate a JetAlgorithm to run the jet finding and modifiers
- # (via a JetRecTool instance).
- jetRecAlg = JetRecConfig.getJetAlgorithm(jetsFullName, trigJetDef, pjs, modList)
-
- jetRecoSequence += jetRecAlg
-
- # check if asked for reclustering
- if 'a10r' in jetDefString:
-
- a10rJetsFullName = "TrigAntiKt10rSubJESIS"
- a10rJetConstit = JetConstit( xAODType.Jet, [])
- trigAntiKt10rJetDef = JetDefinition( "AntiKt", 1.0, a10rJetConstit)
-
- a10rmodList= []
- a10rJetConstit.inputname = jetsFullName
-
- a10rconstitPJAlg = _getConstitPJGAlg( a10rJetConstit )
- a10rconstitPJKey = a10rconstitPJAlg.PJGetter.OutputContainer
- jetRecoSequence += a10rconstitPJAlg
-
- a10rpjs = [a10rconstitPJKey]
- a10rjetRecAlg = JetRecConfig.getJetAlgorithm(a10rJetsFullName, trigAntiKt10rJetDef, a10rpjs, a10rmodList)
-
- jetRecoSequence += a10rjetRecAlg
- jetsFullName = a10rJetsFullName
-
- sequenceOut = jetsFullName
-
- caloMakerSequence += jetRecoSequence
-
- jetRecoFullSequence = caloMakerSequence
-
- return (jetRecoFullSequence,sequenceOut)
-
-def _getConstitAlg( constit ):
-
- from JetRecConfig import ConstModHelpers
- constitalg = ConstModHelpers.getConstitModAlg(constit)
- return constitalg
-
-def _getConstitPJGAlg(basedef):
-
- from JetRec import JetRecConf
- getter = JetRecConf.PseudoJetGetter("pjg_"+basedef.label,
- InputContainer = basedef.inputname,
- OutputContainer = "PseudoJet"+basedef.label,
- Label = basedef.label,
- SkipNegativeEnergy=True,
- GhostScale=0.
- )
-
- pjgalg = JetRecConf.PseudoJetAlgorithm(
- "pjgalg_"+basedef.label,
- PJGetter = getter
- )
- return pjgalg
-
-def _getGhostPJGAlg(ghostdef):
-
- label = "Ghost"+ghostdef.inputtype
- kwargs = {
- "OutputContainer": "PseudoJet"+label,
- "Label": label,
- "SkipNegativeEnergy": True,
- "GhostScale": 1e-40
- }
-
- from JetRec import JetRecConf
- pjgclass = JetRecConf.PseudoJetGetter
- if ghostdef.inputtype=="MuonSegment":
- # Muon segments have a specialised type
- pjgclass = JetRecConf.MuonSegmentPseudoJetGetter
- kwargs = {
- "InputContainer":"MuonSegments",
- "OutputContainer":"PseudoJet"+label,
- "Label":label,
- "Pt":1e-20
- }
- elif ghostdef.inputtype=="Track":
- kwargs["InputContainer"] = "JetSelectedTracks"
- elif ghostdef.inputtype.startswith("TruthLabel"):
- truthsuffix = ghostdef.inputtype[5:]
- kwargs["InputContainer"] = "TruthLabel"+truthsuffix
- elif ghostdef.inputtype == "Truth":
- kwargs["InputContainer"] = "JetInputTruthParticles"
- else:
- raise ValueError("Unhandled ghost type {0} received!".format(ghostdef.inputtype))
-
- getter = pjgclass("pjg_"+label, **kwargs)
-
- pjgalg = JetRecConf.PseudoJetAlgorithm(
- "pjgalg_"+label,
- PJGetter = getter
- )
- return pjgalg
-
-def _getTrackPrepAlg( trackPrepAlgName ):
-
- from JetRecTools import JetRecToolsConfig
- from JetRec import JetRecConf
- # Jet track selection
- jettrackselloose = JetRecToolsConfig.getTrackSelTool()
- jettvassoc = JetRecToolsConfig.getTrackVertexAssocTool()
-
- jettrkprepalg = JetRecConf.JetAlgorithm(trackPrepAlgName)
- jettrkprepalg.Tools = [ jettrackselloose, jettvassoc ]
-
- return jettrkprepalg
-
-def _getEventShapeAlg( constit, constitpjkey ):
-
- rhokey = "Kt4"+constit.label+"EventShape"
- rhotoolname = "EventDensity_Kt4"+constit.label
-
- from EventShapeTools import EventShapeToolsConf
- rhotool = EventShapeToolsConf.EventDensityTool(rhotoolname)
- rhotool.InputContainer = constitpjkey
- rhotool.OutputContainer = rhokey
-
- eventshapealg = EventShapeToolsConf.EventDensityAthAlg("{0}Alg".format(rhotoolname))
- eventshapealg.EventDensityTool = rhotool
-
- return eventshapealg
-
-def _getHLTCellMakerAlgoForJets( name, RoIs, outputEDM='CaloCells', OutputLevel=ERROR ):
-
- from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- if not hasattr(svcMgr,'TrigCaloDataAccessSvc'):
- from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc
- svcMgr+=TrigCaloDataAccessSvc()
- svcMgr.TrigCaloDataAccessSvc.OutputLevel=ERROR
- from AthenaCommon.AppMgr import ServiceMgr as svcMgr
- from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
-
- inputEDM = RoIs
- algo=HLTCaloCellMaker(name)
- algo.RoIs=inputEDM
- algo.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
- algo.OutputLevel=OutputLevel
- algo.CellsName=outputEDM
-
- return algo
-
-def _getHLTTopoClusterMakerAlgoForJets(name, inputEDM, doLC=False, OutputLevel=ERROR):
-
- from TrigCaloRec.TrigCaloRecConfig import TrigCaloClusterMakerMT_topo
-
- algo = TrigCaloClusterMakerMT_topo(name, doMoments=True, doLC=doLC, cells=inputEDM)
- algo.CaloClusters="caloclusters"
- if doLC:
- algo.CaloClusters+="LC"
- algo.OutputLevel=OutputLevel
- return algo
-
-def _getJetFilterTool( threshold ):
-
- from JetRec import JetRecConf
- threshold = int(threshold)
- jetptfilter = JetRecConf.JetFilterTool("jetptfilter_{0}mev".format(threshold))
- jetptfilter.PtMin = threshold
- return jetptfilter
-
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
index 6d21d9a8137af419497fa4cbc3828a5d51f8b825..a597d280d59ee356d16345ca4075a54a64055143 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
@@ -1,27 +1,24 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
-
-def jetMenuSequence(jet_def_string, hypoName):
+from TriggerMenuMT.HLTMenuConfig.Jet.JetMenuSequences import jetMenuSequence
+
+def jetMenuSequenceFromString(jet_def_string):
""" Function to create the jet Menu Sequence"""
- ConfigFlags.jetdefinition=jet_def_string
- ## RoIs = 'FSJETRoI'
- #reco sequence
- from TrigUpgradeTest.jetDefs import jetAthSequence
- #(JetAthSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(jetAthSequence,ConfigFlags)
- (JetAthSequence, InputMakerAlg, sequenceOut) = jetAthSequence(ConfigFlags)
-
- #hypo
- from TrigHLTJetHypo.TrigHLTJetHypoConf import TrigJetHypoAlgMT
- from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetHypoToolFromDict
- hypo = TrigJetHypoAlgMT(hypoName)
- hypo.Jets = sequenceOut
-
+ # Translate the definition string into an approximation
+ # of the "recoParts" in the jet chainParts.
+ jetRecoDict = {}
+ # Insert values from string
+ # Python names are more descriptive. May want to sync
+ # these names with the SignatureDict, needs coordination with
+ # menu group when they start to implement this
+ jetalg, inputtype, clusterscale, jetcalib = jet_def_string.split('_')
+ jetRecoDict = {
+ "recoAlg": jetalg,
+ "dataType": inputtype,
+ "calib": clusterscale,
+ "jetCalib": jetcalib
+ }
- return MenuSequence( Sequence = JetAthSequence,
- Maker = InputMakerAlg,
- Hypo = hypo,
- HypoToolGen = trigJetHypoToolFromDict )
+ return jetMenuSequence(None,**jetRecoDict) # First arg dummy flags for RecoFragmentsPool
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py b/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py
index 2ee7c807c6c19de28701efaa8d7af228bc12ffc9..6d0061c46b8a23eee2e1adb9fbcc45b3f8e87193 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/decodeBS.py
@@ -41,7 +41,6 @@ StreamESD.ItemList += [ "xAOD::TrigCompositeAuxContainer#remap_"+d+"Aux." for d
from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator
egammaCreator = HLTEDMCreator("egammaCreator")
-egammaCreator.FixLinks=False
egammaCreator.OutputLevel=DEBUG
egammaCreator.TrigCompositeContainer = [ "remap_"+d for d in decisions ]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index d472370b1c8f3284ff068a27b775b3e44097e741..cfc03aac85992feb756e0ea83e73b624dc2abd74 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -204,7 +204,7 @@ summary.InputDecision = "L1DecoderSummary"
summary.FinalDecisions = [ "ElectronL2Decisions", "MuonL2Decisions" ]
from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator, HLTEDMCreatorAlg
-egammaCaloViewsMerger = HLTEDMCreator("egammaCaloViewsMerger", FixLinks=True)
+egammaCaloViewsMerger = HLTEDMCreator("egammaCaloViewsMerger", FixLinks=["EgammaCaloDecisions"])
egammaCaloViewsMerger.TrigCompositeContainer = ["EgammaCaloDecisions"]
egammaCaloViewsMerger.TrigEMClusterContainerViews = [ "EMCaloViews" ]
@@ -213,7 +213,7 @@ egammaCaloViewsMerger.TrigEMClusterContainer = [ clustersKey ]
#[ "filterCaloRoIsAlg", "EgammaCaloDecisions","ElectronL2Decisions", "MuonL2Decisions", "EMRoIDecisions", "METRoIDecisions", "MURoIDecisions", "L1DecoderSummary", "JRoIDecisions", "MonitoringSummaryStep1", "RerunEMRoIDecisions", "RerunMURoIDecisions", "TAURoIDecisions", "L2CaloLinks", "FilteredEMRoIDecisions", "FilteredEgammaCaloDecisions" ]
-egammaElectronViewsMerger = HLTEDMCreator("egammaelectronViewsMerger", FixLinks=True)
+egammaElectronViewsMerger = HLTEDMCreator("egammaelectronViewsMerger", FixLinks=["ElectronL2Decisions"])
egammaElectronViewsMerger.TrigCompositeContainer = ["ElectronL2Decisions"]
egammaElectronViewsMerger.TrackParticleContainerViews = [ l2ElectronViewsMaker.Views ]
egammaElectronViewsMerger.TrackParticleContainerInViews = [ TrackParticlesName ]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
index 730a1cbbd692780d4a25c15cf5e911a3725ac8d7..3e85d57fe07068ed0ad0a0b3247af66e4f776b88 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu.py
@@ -2,6 +2,9 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
+from AthenaCommon.Logging import logging
+__log = logging.getLogger('full_menu')
+
# import flags
from RecExConfig.RecFlags import rec
rec.doESD=True
@@ -30,37 +33,44 @@ inDetSetup()
# egamma chains
##################################################################
if opt.doElectronSlice == True:
- from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
- from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronSequenceSetup import electronMenuSequence
- from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import fastCaloSequenceCfg, electronSequenceCfg, precisionCaloSequenceCfg
- fastCaloStep = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None )
- electronStep = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
- precisionCaloStep = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
+ from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import electronFastCaloCfg, electronSequenceCfg, precisionCaloSequenceCfg
+ fastCaloSeq = RecoFragmentsPool.retrieve( electronFastCaloCfg, None )
+ electronSeq = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
+ precisionCaloSeq = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
- step1=ChainStep("ElectronFastCalo", [fastCaloStep])
- step2=ChainStep("ElectronFastTrack", [electronStep])
- step3=ChainStep("ElectronPrecisionCalo", [precisionCaloStep])
+ FastCaloStep = ChainStep("ElectronFastCaloStep", [fastCaloSeq])
+ step2 = ChainStep("ElectronFastTrackStep", [electronSeq])
+ step3 = ChainStep("ElectronPrecisionCaloStep", [precisionCaloSeq])
egammaChains = [
- Chain(name='HLT_e3_etcut1step', Seed="L1_EM3", ChainSteps=[step1] ),
- Chain(name='HLT_e3_etcut', Seed="L1_EM3", ChainSteps=[step1, step2, step3] ),
- Chain(name='HLT_e5_etcut', Seed="L1_EM3", ChainSteps=[step1, step2, step3] ),
- Chain(name='HLT_e7_etcut', Seed="L1_EM3", ChainSteps=[step1, step2, step3] )
+ Chain(name='HLT_e3_etcut1step', Seed="L1_EM3", ChainSteps=[FastCaloStep] ),
+ Chain(name='HLT_e3_etcut', Seed="L1_EM3", ChainSteps=[FastCaloStep, step2, step3] ),
+ Chain(name='HLT_e5_etcut', Seed="L1_EM3", ChainSteps=[FastCaloStep, step2, step3] ),
+ Chain(name='HLT_e7_etcut', Seed="L1_EM3", ChainSteps=[FastCaloStep, step2, step3] )
]
+
+# DiEleStep1=ChainStep("DiEleStep1",[fastCaloSeq, fastCaloSeq], multiplicity=2) #same step
+# DiEleStep2=ChainStep("DiEleStep2",[electronSeq, electronSeq], multiplicity=2) #need to be: one leg with only one step, one with 3 steps!
+
+# egammaChains += [Chain(name='HLT_e5_etcut1step_e8_etcut', Seed="L1_EM3_EM3", ChainSteps=[DiEleStep1, DiEleStep2 ] )]
testChains += egammaChains
##################################################################
# photon chains
##################################################################
if opt.doPhotonSlice == True:
- from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import fastCaloMenuSequence
- from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonSequenceSetup import photonMenuSequence
- fastCaloStep = fastCaloMenuSequence("Gamma")
- photonstep = photonMenuSequence()
+ from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonDef import gammaFastCaloCfg
+ from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonDef import photonSequenceCfg
+
+ fastCaloSeq = RecoFragmentsPool.retrieve( gammaFastCaloCfg, None )
+ PhotonSeq = RecoFragmentsPool.retrieve( photonSequenceCfg, None )
+
+ FastCaloStep = ChainStep("PhotonFastCaloStep", [fastCaloSeq])
+ photon_step2 = ChainStep("PhotonStep2", [PhotonSeq])
photonChains = [
- Chain(name='HLT_g5_etcut', Seed="L1_EM3", ChainSteps=[ ChainStep("Step1_g5_etcut", [fastCaloStep]), ChainStep("Step2_g5_etcut", [photonstep])] )
+ Chain(name='HLT_g5_etcut', Seed="L1_EM3", ChainSteps=[ FastCaloStep, photon_step2] )
]
testChains += photonChains
@@ -87,14 +97,6 @@ if opt.doMuonSlice == True:
stepFSmuEFSA=ChainStep("Step_FSmuEFSA", [muEFSAFSSequence()])
stepFSmuEFCB=ChainStep("Step_FSmuEFCB", [muEFCBFSSequence()])
-
- # 2muons
- step1_2mufast= ChainStep("Step1_2muFast", [ muFastSequence(), muFastSequence()], multiplicity=2)
- step2_2muComb= ChainStep("Step1_2muComb", [ muCombSequence(), muCombSequence()], multiplicity=2)
- step3_2muEFSA= ChainStep("Step3_2muEFSA", [ muEFSASequence(), muEFSASequence()], multiplicity=2)
- step4_2muEFCB= ChainStep("Step4_2muEFCB", [ muEFCBSequence(), muEFCBSequence()], multiplicity=2)
-
-
emptyStep=ChainStep("Step2_empty")
## single muon trigger
@@ -104,12 +106,17 @@ if opt.doMuonSlice == True:
MuonChains += [Chain(name='HLT_mu6msonly', Seed="L1_MU6", ChainSteps=[ step1mufast, emptyStep, step3muEFSA ])] # removed due to muEFSA isuue(?)
MuonChains += [Chain(name='HLT_mu20_ivar', Seed="L1_MU6", ChainSteps=[ step1mufast, step2muComb, step3muIso ])]
- # multi muon trigger
- MuonChains += [Chain(name='HLT_2mu6Comb', Seed="L1_MU6", ChainSteps=[ step1mufast, step2muComb ])]
- MuonChains += [Chain(name='HLT_2mu6', Seed="L1_MU6", ChainSteps=[ step1mufast, step2muComb, step3muEFSA, step4muEFCB ])]
+ # multi muon trigger
+ # 2muons
+ step1_2mufast_sym= ChainStep("Step1_2muFast_sym", [ muFastSequence()], multiplicity=2)
+ step2_2muComb_sym= ChainStep("Step1_2muComb_sym", [ muCombSequence()], multiplicity=2)
+
+ step3_2muEFSA_sym= ChainStep("Step3_2muEFSA_sym", [ muEFSASequence()], multiplicity=2)
+ step4_2muEFCB_sym= ChainStep("Step4_2muEFCB_sym", [ muEFCBSequence()], multiplicity=2)
+
+ MuonChains += [Chain(name='HLT_2mu6Comb', Seed="L1_MU6", ChainSteps=[ step1_2mufast_sym, step2_2muComb_sym ])]
+ MuonChains += [Chain(name='HLT_2mu6', Seed="L1_MU6", ChainSteps=[ step1_2mufast_sym, step2_2muComb_sym, step3_2muEFSA_sym, step4_2muEFCB_sym ])]
- ## MuonChains += [Chain(name='HLT_2mu6Comb', Seed="L1_2MU6", ChainSteps=[ step1_2mufast, step2_2muComb ])]
- ## MuonChains += [Chain(name='HLT_2mu6', Seed="L1_2MU6", ChainSteps=[ step1_2mufast, step2_2muComb, step3_2muEFSA, step4_2muEFCB ])]
#FS Muon trigger
MuonChains += [Chain(name='HLT_mu6nol1', Seed="L1_MU6", ChainSteps=[stepFSmuEFSA, stepFSmuEFCB])]
@@ -121,40 +128,39 @@ if opt.doMuonSlice == True:
# jet chains
##################################################################
if opt.doJetSlice == True:
- #from TriggerMenuMT.HLTMenuConfig.Jet.JetSequenceSetup import jetMenuSequence
- from TrigUpgradeTest.jetMenuDefs import jetMenuSequence
+ from TrigUpgradeTest.jetMenuDefs import jetMenuSequenceFromString
# small-R jets, different calibrations
- jetSeq_a4_emtopo = jetMenuSequence("a4_emtopo_subjesis", "TrigJetHypoAlgMT_a4_emtopo")
- step_a4_emtopo =ChainStep("Step_jet_a4_emtopo", [jetSeq_a4_emtopo])
+ jetSeq_a4_tc_em = jetMenuSequenceFromString("a4_tc_em_subjesIS")
+ step_a4_tc_em =ChainStep("Step_jet_a4_tc_em", [jetSeq_a4_tc_em])
- jetSeq_a4_emtopo_subjes = jetMenuSequence("a4_emtopo_subjes", "TrigJetHypoAlgMT_a4_emtopo_subjes")
- step_a4_emtopo_subjes = ChainStep("Step_jet_a4_subjes_emtopo", [jetSeq_a4_emtopo_subjes])
+ jetSeq_a4_tc_em_subjes = jetMenuSequenceFromString("a4_tc_em_subjes")
+ step_a4_tc_em_subjes = ChainStep("Step_jet_a4_subjes_tc_em", [jetSeq_a4_tc_em_subjes])
- jetSeq_a4_emtopo_nocalib = jetMenuSequence("a4_emtopo_nocalib", "TrigJetHypoAlgMT_a4_emtopo_nocalib")
- step_a4_emtopo_nocalib=ChainStep("Step_jet_a4_nocalib_emtopo", [jetSeq_a4_emtopo_nocalib])
+ jetSeq_a4_tc_em_nocalib = jetMenuSequenceFromString("a4_tc_em_nojcalib")
+ step_a4_tc_em_nocalib=ChainStep("Step_jet_a4_nojcalib_tc_em", [jetSeq_a4_tc_em_nocalib])
- jetSeq_a4_lcw = jetMenuSequence("a4_lcw_subjesis", "TrigJetHypoAlgMT_a4_lcw")
- step_a4_lcw=ChainStep("Step_jet_a4_lcw", [jetSeq_a4_lcw])
+ jetSeq_a4_tc_lcw = jetMenuSequenceFromString("a4_tc_lcw_subjesIS")
+ step_a4_tc_lcw=ChainStep("Step_jet_a4_tc_lcw", [jetSeq_a4_tc_lcw])
# large-R jets
- jetSeq_a10_lcw_subjes = jetMenuSequence("a10_lcw_subjes", "TrigJetHypoAlgMT_a10_lcw_subjes")
- step_a10_lcw_subjes=ChainStep("Step_jet_a10_subjes_lcw", [jetSeq_a10_lcw_subjes])
+ jetSeq_a10_tc_lcw_subjes = jetMenuSequenceFromString("a10_tc_lcw_subjes")
+ step_a10_tc_lcw_subjes=ChainStep("Step_jet_a10_subjes_tc_lcw", [jetSeq_a10_tc_lcw_subjes])
- jetSeq_a10r = jetMenuSequence("a10r_emtopo_subjesis", "TrigJetHypoAlgMT_a10r")
+ jetSeq_a10r = jetMenuSequenceFromString("a10r_tc_em_subjesIS")
step_a10r=ChainStep("Step_jet_a10r", [jetSeq_a10r])
jetChains = [
- Chain(name='HLT_j45', Seed="L1_J20", ChainSteps=[step_a4_emtopo] ),
- Chain(name='HLT_j85', Seed="L1_J20", ChainSteps=[step_a4_emtopo] ),
- Chain(name='HLT_j420', Seed="L1_J20", ChainSteps=[step_a4_emtopo] ),
- Chain(name='HLT_j260_320eta490', Seed="L1_J20", ChainSteps=[step_a4_emtopo] ),
- Chain(name='HLT_j225_gsc420_boffperf_split', Seed="L1_J20", ChainSteps=[step_a4_emtopo] ),
- Chain(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet', Seed="L1_J20", ChainSteps=[step_a4_emtopo] ),
- Chain(name='HLT_j460_a10_lcw_subjes', Seed="L1_J20", ChainSteps=[step_a10_lcw_subjes] ),
+ Chain(name='HLT_j45', Seed="L1_J20", ChainSteps=[step_a4_tc_em] ),
+ Chain(name='HLT_j85', Seed="L1_J20", ChainSteps=[step_a4_tc_em] ),
+ Chain(name='HLT_j420', Seed="L1_J20", ChainSteps=[step_a4_tc_em] ),
+ Chain(name='HLT_j260_320eta490', Seed="L1_J20", ChainSteps=[step_a4_tc_em] ),
+ Chain(name='HLT_j225_gsc420_boffperf_split', Seed="L1_J20", ChainSteps=[step_a4_tc_em] ),
+ Chain(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet', Seed="L1_J20", ChainSteps=[step_a4_tc_em] ),
+ Chain(name='HLT_j460_a10_lcw_subjes', Seed="L1_J20", ChainSteps=[step_a10_tc_lcw_subjes] ),
Chain(name='HLT_j460_a10r', Seed="L1_J20", ChainSteps=[step_a10r] ),
- Chain(name='HLT_3j200', Seed="L1_J20", ChainSteps=[step_a4_emtopo] ),
- Chain(name='HLT_5j70_0eta240', Seed="L1_J20", ChainSteps=[step_a4_emtopo] ), # 5j70_0eta240_L14J15 (J20 until multi-object L1 seeds supported)
+ Chain(name='HLT_3j200', Seed="L1_J20", ChainSteps=[step_a4_tc_em] ),
+ Chain(name='HLT_5j70_0eta240', Seed="L1_J20", ChainSteps=[step_a4_tc_em] ), # 5j70_0eta240_L14J15 (J20 until multi-object L1 seeds supported)
]
testChains += jetChains
@@ -211,7 +217,7 @@ if opt.doMETSlice == True:
##################################################################
if opt.doBphysicsSlice == True:
from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muEFSASequence, muEFCBSequence
- from TriggerMenuMT.HLTMenuConfig.Bphysics.BphysicsSequenceSetup import dimuL2Sequence
+ from TriggerMenuMT.HLTMenuConfig.Bphysics.BphysicsSequenceSetup import dimuL2Sequence, dimuEFSequence
BphysChains = []
@@ -219,10 +225,11 @@ if opt.doBphysicsSlice == True:
step2L2Dimu=ChainStep("Step2_L2Dimu", [dimuL2Sequence()])
#still to come
- #step3muEFSA=ChainStep("Step3_muEFSA", [ muEFSASequence() ])
- #step4muEFCB=ChainStep("Step4_muEFCB", [ muEFCBSequence() ])
- #step5EFJpsi=ChainStep("Step5_L2Jpsimumu",[jpsimumuEFSequence()])
+ step3muEFSA=ChainStep("Step3_muEFSA", [ muEFSASequence() ])
+ step4muEFCB=ChainStep("Step4_muEFCB", [ muEFCBSequence() ])
+ step5EFDimu=ChainStep("Step5_EFDimu", [ dimuEFSequence() ])
+ BphysChains += [Chain(name='HLT_2mu4_bDimu_L12MU4', Seed="L1_MU4", ChainSteps=[ step1mufast, step2L2Dimu, step3muEFSA, step4muEFCB, step5EFDimu])]
BphysChains += [Chain(name='HLT_2mu6_bJpsimumu_L12MU6', Seed="L1_MU6", ChainSteps=[ step1mufast, step2L2Dimu])]
BphysChains += [Chain(name='HLT_2mu4_bBmumu_L12MU4', Seed="L1_MU4", ChainSteps=[ step1mufast, step2L2Dimu])]
BphysChains += [Chain(name='HLT_2mu4_bUpsimumu_L12MU4', Seed="L1_MU4", ChainSteps=[ step1mufast, step2L2Dimu])]
@@ -237,9 +244,16 @@ if opt.doBphysicsSlice == True:
##################################################################
if opt.doComboSlice == True:
# combo chains
- comboStep=ChainStep("Step1_mufast_et", [fastCaloStep,muFastSequence()], multiplicity=2)
+ from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import electronFastCaloCfg
+
+ fastCaloSeq = RecoFragmentsPool.retrieve( electronFastCaloCfg, None )
+
+ comboStep_et_mufast = ChainStep("Step1_et_mufast", [fastCaloSeq, muFastSequence()], multiplicity=2)
+ comboStep_mufast_etcut1_step1 = ChainStep("Step1_mufast_etcut1", [muFastSequence(), fastCaloSeq], multiplicity=2)
+
- comboChains = [Chain(name='HLT_e3_etcut_mu6', Seed="L1_EM8I_MU10", ChainSteps=[comboStep ])]
+ comboChains = [Chain(name='HLT_e3_etcut_mu6', Seed="L1_EM8I_MU10", ChainSteps=[comboStep_et_mufast ])]
+ # comboChains += [Chain(name='HLT_mu8fast_e8_etcut1step', Seed="L1_MU6_EM7", ChainSteps=[ comboStep_mufast_etcut1_step1 ])]
testChains += comboChains
@@ -269,8 +283,8 @@ for a in AthSequencer("HLTAllSteps").getChildren():
# this part uses parts from the NewJO configuration, it is very hacky for the moment
from TriggerJobOpts.TriggerConfig import collectHypos, collectFilters, collectDecisionObjects, triggerOutputStreamCfg
-hypos = collectHypos(topSequence)
-filters = collectFilters(topSequence)
+hypos = collectHypos(AthSequencer("HLTAllSteps"))
+filters = collectFilters(AthSequencer("HLTAllSteps"))
# try to find L1Decoder
from AthenaCommon.CFElements import findAlgorithm,findSubSequence
@@ -280,7 +294,8 @@ if not l1decoder:
if l1decoder:
decObj = collectDecisionObjects( hypos, filters, l1decoder )
- print decObj
+ __log.debug("Decision Objects to export to ESD [hack method - should be replaced with triggerRunCfg()]")
+ __log.debug(decObj)
from TrigEDMConfig.TriggerEDMRun3 import TriggerHLTList
ItemList = [ 'xAOD::TrigCompositeContainer#{}'.format(d) for d in decObj ]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index 479a86da8ca32ee4cef4eebb8f4c14c9caedd340..592855e4153a1a42ff5f2a56c25bf47b238a5296 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -248,63 +248,65 @@ TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut ID#271
TriggerSummaryStep3 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep3 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep3 19 0 DEBUG +++ HLT_e3_etcut ID#2711808158
-TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6Comb 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6Comb decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_3j200 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_3j200 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_5j70_0eta240 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_5j70_0eta240 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 17 0 17
-TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 343 91 0
-TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 0 0 18
-TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0 0 0
-TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 20 20 10 0 0 0 1
-TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 decisions 17 0 0 0
-TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16 0 16
-TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 330 54 0
-TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 12 0 12
-TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 265 28 0
-TrigSignatureMoniMT INFO HLT_g5_etcut 20 20 17 17 0 0 17
-TrigSignatureMoniMT INFO HLT_g5_etcut decisions 50 50 0 0
-TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_gsc420_boffperf_split20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_gsc420_boffperf_split decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j260_320eta490 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j260_320eta490 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j420 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j420 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j45 20 20 5 0 0 0 5
-TrigSignatureMoniMT INFO HLT_j45 decisions 5 0 0 0
-TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j460_a10r 20 20 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j460_a10r decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j85 20 20 1 0 0 0 1
-TrigSignatureMoniMT INFO HLT_j85 decisions 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu20_ivar 20 20 3 2 2 0 2
-TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 3 2 2 0
-TrigSignatureMoniMT INFO HLT_mu6 20 20 3 2 1 1 1
-TrigSignatureMoniMT INFO HLT_mu6 decisions 3 2 1 1
-TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 0 0 2
-TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 2 0 0
-TrigSignatureMoniMT INFO HLT_mu6fast 20 20 3 0 0 0 3
-TrigSignatureMoniMT INFO HLT_mu6fast decisions 3 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6msonly 20 20 3 0 2 0 2
-TrigSignatureMoniMT INFO HLT_mu6msonly decisions 3 0 2 0
-TrigSignatureMoniMT INFO HLT_mu6nol1 20 20 4 0 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6nol1 decisions 5 0 0 0
-TrigSignatureMoniMT INFO HLT_xe30_L1XE10 20 20 12 0 0 0 12
-TrigSignatureMoniMT INFO HLT_xe30_L1XE10 decisions 12 0 0 0
-TrigSignatureMoniMT INFO HLT_xe65_L1XE50 20 20 3 0 0 0 3
-TrigSignatureMoniMT INFO HLT_xe65_L1XE50 decisions 3 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6Comb 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6Comb decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3j200 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_3j200 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_5j70_0eta240 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_5j70_0eta240 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut 20 20 18 17 17 0 0 17
+TrigSignatureMoniMT INFO HLT_e3_etcut decisions 54 313 81 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut1step 20 20 18 0 0 0 0 18
+TrigSignatureMoniMT INFO HLT_e3_etcut1step decisions 54 0 0 0 0
+TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 20 20 10 0 0 0 0 1
+TrigSignatureMoniMT INFO HLT_e3_etcut_mu6 decisions 17 0 0 0 0
+TrigSignatureMoniMT INFO HLT_e5_etcut 20 20 17 16 16 0 0 16
+TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 300 47 0 0
+TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 12 0 0 12
+TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 238 25 0 0
+TrigSignatureMoniMT INFO HLT_g5_etcut 20 20 17 17 0 0 0 17
+TrigSignatureMoniMT INFO HLT_g5_etcut decisions 50 50 0 0 0
+TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc420_boffperf_split20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_gsc420_boffperf_split decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j260_320eta490 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j260_320eta490 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j420 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j420 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j45 20 20 5 0 0 0 0 5
+TrigSignatureMoniMT INFO HLT_j45 decisions 5 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10r 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10r decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j85 20 20 1 0 0 0 0 1
+TrigSignatureMoniMT INFO HLT_j85 decisions 1 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu20_ivar 20 20 3 2 2 0 0 2
+TrigSignatureMoniMT INFO HLT_mu20_ivar decisions 3 2 2 0 0
+TrigSignatureMoniMT INFO HLT_mu6 20 20 3 2 1 1 0 1
+TrigSignatureMoniMT INFO HLT_mu6 decisions 3 2 1 1 0
+TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 0 0 0 2
+TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 2 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6fast 20 20 3 0 0 0 0 3
+TrigSignatureMoniMT INFO HLT_mu6fast decisions 3 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6msonly 20 20 3 0 2 0 0 2
+TrigSignatureMoniMT INFO HLT_mu6msonly decisions 3 0 2 0 0
+TrigSignatureMoniMT INFO HLT_mu6nol1 20 20 4 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_mu6nol1 decisions 5 0 0 0 0
+TrigSignatureMoniMT INFO HLT_xe30_L1XE10 20 20 12 0 0 0 0 12
+TrigSignatureMoniMT INFO HLT_xe30_L1XE10 decisions 12 0 0 0 0
+TrigSignatureMoniMT INFO HLT_xe65_L1XE50 20 20 3 0 0 0 0 3
+TrigSignatureMoniMT INFO HLT_xe65_L1XE50 decisions 3 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromCells.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromCells.ref
index 411aed960438769b9fc0df4c9c08fab56173fb31..ae93cec5af38543c011e84b59632997451ec2e9f 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromCells.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromCells.ref
@@ -1,10 +1,10 @@
METHypoAlg 0 0 DEBUG The MET value is 81
-METHypoAlg 1 0 DEBUG The MET value is 31
-METHypoAlg 2 0 DEBUG The MET value is 39
-METHypoAlg 3 0 DEBUG The MET value is 67
+METHypoAlg 1 0 DEBUG The MET value is 33
+METHypoAlg 2 0 DEBUG The MET value is 38
+METHypoAlg 3 0 DEBUG The MET value is 66
METHypoAlg 4 0 DEBUG The MET value is 40
-METHypoAlg 5 0 DEBUG The MET value is 29
+METHypoAlg 5 0 DEBUG The MET value is 28
METHypoAlg 6 0 DEBUG The MET value is 73
METHypoAlg 7 0 DEBUG The MET value is 11
-METHypoAlg 8 0 DEBUG The MET value is 65
-METHypoAlg 9 0 DEBUG The MET value is 19
+METHypoAlg 8 0 DEBUG The MET value is 66
+METHypoAlg 9 0 DEBUG The MET value is 17
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromClusters.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromClusters.ref
index b90c7d4a93437701f5ca2041521027f38321aece..7c633c0cc858635a6dd242c6eedc3a395bd665d2 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromClusters.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromClusters.ref
@@ -1,10 +1,10 @@
-METHypoAlg 0 0 DEBUG The MET value is 13
-METHypoAlg 1 0 DEBUG The MET value is 23
-METHypoAlg 2 0 DEBUG The MET value is 35
-METHypoAlg 3 0 DEBUG The MET value is 20
-METHypoAlg 4 0 DEBUG The MET value is 21
-METHypoAlg 5 0 DEBUG The MET value is 59
-METHypoAlg 6 0 DEBUG The MET value is 32
+METHypoAlg 0 0 DEBUG The MET value is 11
+METHypoAlg 1 0 DEBUG The MET value is 19
+METHypoAlg 2 0 DEBUG The MET value is 32
+METHypoAlg 3 0 DEBUG The MET value is 21
+METHypoAlg 4 0 DEBUG The MET value is 20
+METHypoAlg 5 0 DEBUG The MET value is 54
+METHypoAlg 6 0 DEBUG The MET value is 33
METHypoAlg 7 0 DEBUG The MET value is 51
-METHypoAlg 8 0 DEBUG The MET value is 31
-METHypoAlg 9 0 DEBUG The MET value is 39
+METHypoAlg 8 0 DEBUG The MET value is 34
+METHypoAlg 9 0 DEBUG The MET value is 43
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromClustersPufit.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromClustersPufit.ref
index a7d469350bd8ad14e157792a43dac75d7692a60a..d630e83fbe5d5c4d60e4cbec6fc692d7a4a69cdb 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromClustersPufit.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromClustersPufit.ref
@@ -1,10 +1,10 @@
METHypoAlg 0 0 DEBUG The MET value is 12
-METHypoAlg 1 0 DEBUG The MET value is 31
+METHypoAlg 1 0 DEBUG The MET value is 28
METHypoAlg 2 0 DEBUG The MET value is 0
METHypoAlg 3 0 DEBUG The MET value is 0
-METHypoAlg 4 0 DEBUG The MET value is 16
-METHypoAlg 5 0 DEBUG The MET value is 30
-METHypoAlg 6 0 DEBUG The MET value is 7
+METHypoAlg 4 0 DEBUG The MET value is 15
+METHypoAlg 5 0 DEBUG The MET value is 29
+METHypoAlg 6 0 DEBUG The MET value is 6
METHypoAlg 7 0 DEBUG The MET value is 0
METHypoAlg 8 0 DEBUG The MET value is 7
METHypoAlg 9 0 DEBUG The MET value is 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromJets.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromJets.ref
index 1d78a55d2ff4145387f34b3a62d5bcee62fe5ede..f3bdafbba3bdeaaea5109c967abc77b5c014bdd6 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromJets.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/met_fromJets.ref
@@ -1,10 +1,10 @@
-METHypoAlg 0 0 DEBUG The MET value is 11
-METHypoAlg 1 0 DEBUG The MET value is 47
-METHypoAlg 2 0 DEBUG The MET value is 12
-METHypoAlg 3 0 DEBUG The MET value is 34
-METHypoAlg 4 0 DEBUG The MET value is 13
-METHypoAlg 5 0 DEBUG The MET value is 43
+METHypoAlg 0 0 DEBUG The MET value is 12
+METHypoAlg 1 0 DEBUG The MET value is 33
+METHypoAlg 2 0 DEBUG The MET value is 3
+METHypoAlg 3 0 DEBUG The MET value is 27
+METHypoAlg 4 0 DEBUG The MET value is 16
+METHypoAlg 5 0 DEBUG The MET value is 39
METHypoAlg 6 0 DEBUG The MET value is 12
-METHypoAlg 7 0 DEBUG The MET value is 52
+METHypoAlg 7 0 DEBUG The MET value is 54
METHypoAlg 8 0 DEBUG The MET value is 19
-METHypoAlg 9 0 DEBUG The MET value is 48
+METHypoAlg 9 0 DEBUG The MET value is 52
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.py
index a8fdf603faa0ad0f93eddcfa9c1cbf7c654de020..e884a6e6768acc21846064100b843a73080b6963 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.py
@@ -18,6 +18,7 @@ def signaturesToGenerate():
TriggerFlags.METSlice.setAll()
TriggerFlags.JetSlice.setAll()
TriggerFlags.TauSlice.setAll()
+ TriggerFlags.CombinedSlice.setAll()
# generate the Chains from the Menu Dictionary
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
index 87eb4f6220f091849621687d591775aa7a3d4439..48e4fdfcb2099e76c64c42a61e650bcd3b8dcc81 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/runMenuTest.ref
@@ -1,5 +1,5 @@
-TrigSignatureMoniMT INFO Chains passing step (1st row events & 2nd row decision counts
-TrigSignatureMoniMT INFO Chain name L1, AfterPS, [... steps ...], Output
+TrigSignatureMoniMT INFO Chains passing step (1st row events & 2nd row decision counts):
+TrigSignatureMoniMT INFO Chain name L1, AfterPS, step1 step2 step3 step4 step5 Output
TrigSignatureMoniMT INFO All 20 20 0 0 0 0 0 20
TrigSignatureMoniMT INFO HLT_2mu6Comb_L1MU6 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_2mu6Comb_L1MU6 decisions 0 0 0 0 0
@@ -27,10 +27,14 @@ TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 decisions 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 20 20 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 decisions 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j45_L1J20 20 20 4 0 0 0 0 4
-TrigSignatureMoniMT INFO HLT_j45_L1J20 decisions 4 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j85_L1J20 20 20 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j45_L1J20 20 20 5 0 0 0 0 5
+TrigSignatureMoniMT INFO HLT_j45_L1J20 decisions 5 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 20 20 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 decisions 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j85_L1J20 20 20 1 0 0 0 0 1
+TrigSignatureMoniMT INFO HLT_j85_L1J20 decisions 1 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 20 20 3 2 2 0 0 2
TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 decisions 3 2 2 0 0
TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 3 2 0 0 0 2
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bphysics.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bphysics.ref
index f70dd5cddf202249974ed2b9c6ddf8c89d05bf0f..e39c4e9da4f88ded8cbed92fc7a522544ae19e01 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bphysics.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bphysics.ref
@@ -1,12 +1,15 @@
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_2mu4_bDimu_L12MU4 ID#1730084172
TriggerSummaryStep1 6 0 DEBUG +++ HLT_2mu6_bJpsimumu_L12MU6 ID#1924924067
TriggerSummaryStep1 6 0 DEBUG +++ HLT_2mu4_bBmumu_L12MU4 ID#3163510355
TriggerSummaryStep1 6 0 DEBUG +++ HLT_2mu4_bUpsimumu_L12MU4 ID#4008168535
TriggerSummaryStep1 6 0 DEBUG +++ HLT_2mu4_bJpsimumu_L12MU4 ID#4276347155
-TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 10 10 1 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 decisions 2 0
-TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 10 10 1 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 decisions 2 0
-TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 10 10 1 0 0
-TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 decisions 2 0
-TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 10 10 1 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 decisions 2 0
+TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 10 10 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bBmumu_L12MU4 decisions 2 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 10 10 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bDimu_L12MU4 decisions 2 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 10 10 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 decisions 2 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 10 10 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 decisions 2 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 10 10 1 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_2mu6_bJpsimumu_L12MU6 decisions 2 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
index 28f0bfa9562bcd00290dafeb106dd1b55a8d798f..9c5dd734a0c75132b6bf2d77f219af67e5235a1c 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py
@@ -354,132 +354,8 @@ svcMgr += LVL1ConfigSvc()
svcMgr.LVL1ConfigSvc.XMLMenuFile = findFileInXMLPATH(TriggerFlags.inputLVL1configFile())
if opt.doL1Sim:
- from TrigT1CaloSim.TrigT1CaloSimRun2Config import Run2TriggerTowerMaker
- caloTowerMaker = Run2TriggerTowerMaker("Run2TriggerTowerMaker")
- caloTowerMaker.ZeroSuppress = True
- caloTowerMaker.CellType = 3
-
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Run2CPMTowerMaker
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Run2JetElementMaker
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__CPMSim
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__JEMJetSim
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__JEMEnergySim
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__CPCMX
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__JetCMX
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__EnergyCMX
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__RoIROD
- from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Tester
-
- from TrigT1MBTS.TrigT1MBTSConf import LVL1__TrigT1MBTS
- from TrigT1ZDC.TrigT1ZDCConf import LVL1__TrigT1ZDC
-
-
- from AthenaCommon.CFElements import seqAND
-
- l1CaloSim = seqAND('l1CaloSim',[
- caloTowerMaker,
- #LVL1__Run2CPMTowerMaker( 'CPMTowerMaker', ExtraInputs=["XYZ#1"], ExtraOutputs=["XYZ#2"]) ,
- LVL1__Run2CPMTowerMaker( 'CPMTowerMaker') ,
- LVL1__Run2JetElementMaker( 'JetElementMaker'),
- LVL1__CPMSim( 'CPMSim' ) ,
- LVL1__JEMJetSim( 'JEMJetSim' ) ,
- LVL1__JEMEnergySim( 'JEMEnergySim' ) ,
- LVL1__CPCMX( 'CPCMX' ) ,
- LVL1__JetCMX( 'JetCMX' ) ,
- LVL1__EnergyCMX( 'EnergyCMX' ) ,
- LVL1__RoIROD( 'RoIROD' ),
- LVL1__TrigT1MBTS(),
- LVL1__TrigT1ZDC()
- ])
-
- from IOVDbSvc.CondDB import conddb
- L1CaloFolderList = []
- #L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Calibration/Physics/PprChanCalib"]
- L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Physics/PprChanCalib"]
- #L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Conditions/RunParameters"]
- #L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Conditions/DerivedRunPars"]
- #L1CaloFolderList += ["/TRIGGER/Receivers/Conditions/VgaDac"]
- #L1CaloFolderList += ["/TRIGGER/Receivers/Conditions/Strategy"]
- L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Conditions/DisabledTowers"]
- L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/PpmDeadChannels"]
- L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Configuration/PprChanDefaults"]
-
-
- for l1calofolder in L1CaloFolderList:
- #conddb.addFolderWithTag("TRIGGER_OFL", l1calofolder, "HEAD")
- conddb.addFolder( "TRIGGER_OFL", l1calofolder )
- # muons
- from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MuonRdoToMuonDigitTool
- MuonRdoToMuonDigitTool = MuonRdoToMuonDigitTool (DecodeMdtRDO = True,
- DecodeRpcRDO = True,
- DecodeTgcRDO = True,
- DecodeCscRDO = True )
-
- MuonRdoToMuonDigitTool.cscCalibTool = ToolSvc.CscCalibTool
-
- ToolSvc += MuonRdoToMuonDigitTool
-
- from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MuonRdoToMuonDigit
- from TrigT1RPCsteering.TrigT1RPCsteeringConf import TrigT1RPC
- from TrigT1TGC.TrigT1TGCConf import LVL1TGCTrigger__LVL1TGCTrigger
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
- from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
-
- ToolSvc += L1MuctpiTool("L1MuctpiTool")
- ToolSvc.L1MuctpiTool.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
-
- ToolSvc += L1MuctpiTool("LVL1MUCTPI__L1MuctpiTool") # one for topo, no idea why we need two
- ToolSvc.LVL1MUCTPI__L1MuctpiTool.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
-
-
-
-
- muctpi = L1Muctpi()
- muctpi.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
-
- l1MuonSim = seqAND("l1MuonSim", [
-
- MuonRdoToMuonDigit( "MuonRdoToMuonDigit",
- MuonRdoToMuonDigitTool = ToolSvc.MuonRdoToMuonDigitTool),
-
- TrigT1RPC("TrigT1RPC",
- Hardware = True, # not sure if needed, not there in old config, present in JO
- DataDetail = False,
- RPCbytestream = False,
- RPCbytestreamFile = ""),
-
- # based on Trigger/TrigT1/TrigT1TGC/python/TrigT1TGCConfig.py
- # interesting is that this JO sets inexisting properties, commented out below
- LVL1TGCTrigger__LVL1TGCTrigger("LVL1TGCTrigger",
- InputData_perEvent = "TGC_DIGITS",
- # ASDOutDataLocation = "ASDOutDataLocation",
- # MuonTrigConfig = "/Run/MuonTrigConfig",
- MuCTPIInput_TGC = "L1MuctpiStoreTGC",
- MaskFileName = "TrigT1TGCMaskedChannel.db",
- MaskFileName12 = "TrigT1TGCMaskedChannel._12.db"),
- muctpi
- ])
- # only needed for MC
- conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_EIFI", className="CondAttrListCollection")
- conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_BW", className="CondAttrListCollection")
- conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_TILE", className="CondAttrListCollection")
- from L1TopoSimulation.L1TopoSimulationConfig import L1TopoSimulation
- from TrigT1CTP.TrigT1CTPConfig import CTPSimulationInReco
- from TrigT1RoIB.TrigT1RoIBConfig import RoIBuilder
- condSeq = AthSequencer("AthCondSeq")
- from MuonCondSvc.MuonCondSvcConf import TGCTriggerDbAlg
- condSeq += TGCTriggerDbAlg()
-
- ctp = CTPSimulationInReco("CTPSimulation")
- ctp.DoLUCID = False
- ctp.DoBCM = False
- ctp.DoL1Topo = False
- ctp.TrigConfigSvc = svcMgr.LVL1ConfigSvc
- ctpSim = seqAND("ctpSim", [ctp, RoIBuilder("RoIBuilder")])
-
- l1Sim = seqAND("l1Sim", [l1CaloSim, l1MuonSim, ctpSim] )
-
- topSequence += l1Sim
+ from TriggerJobOpts.Lvl1SimulationConfig import Lvl1SimulationSequence
+ topSequence += Lvl1SimulationSequence()
if opt.doL1Unpacking:
if globalflags.InputFormat.is_bytestream():
diff --git a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
index 51e75508b14633e75b5ca0b289ad14fed36238b5..bb371fdab6106a83c52d468ab8a98825d7d2c6ee 100644
--- a/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
+++ b/Trigger/TrigValidation/TrigValAlgs/src/TrigEDMChecker.cxx
@@ -55,8 +55,6 @@
#include "tauEvent/TauJetContainer.h"
#include "tauEvent/TauJet.h"
-#include "xAODEventInfo/EventInfo.h"
-
#include "xAODMuon/MuonContainer.h"
#include "MuonCombinedToolInterfaces/IMuonPrintingTool.h"
@@ -99,6 +97,8 @@
#include "TrigT1Interfaces/RecEmTauRoI.h"
+
+
#include "AthViews/ViewHelper.h"
#include "AthViews/View.h"
@@ -559,12 +559,8 @@ StatusCode TrigEDMChecker::execute() {
if (m_doDumpAll || m_doDumpTrigCompsiteNavigation) {
std::string trigCompositeSteering;
ATH_CHECK(TrigCompositeNavigationToDot(trigCompositeSteering));
- const xAOD::EventInfo* evtInfo = nullptr;
- if (evtStore()->contains<xAOD::EventInfo>("EventInfo")) {
- ATH_CHECK( evtStore()->retrieve(evtInfo) );
- }
- static int eventStatic = 0; // Might not always have EventInfo (early testing of Run-3 software)
- const std::string evtNumber = (evtInfo == nullptr ? std::to_string(eventStatic++) : std::to_string(evtInfo->eventNumber()));
+ const EventContext& context = Gaudi::Hive::currentContext();
+ const std::string evtNumber = std::to_string(context.eventID().event_number());
std::ofstream ofile(std::string("NavigationGraph_" + evtNumber + ".dot").c_str());
ofile << trigCompositeSteering;
}
@@ -4015,17 +4011,24 @@ StatusCode TrigEDMChecker::dumpxAODVertex() {
}
StatusCode TrigEDMChecker::dumpTDT() {
+ using namespace TrigCompositeUtils; // LinkInfo
ATH_MSG_INFO( "REGTEST ==========START of TDT DUMP===========" );
// Note: This minimal TDT dumper is for use during run-3 dev
std::vector<std::string> confChains = m_trigDec->getListOfTriggers("HLT_.*");
for (const auto& item : confChains) {
bool passed = m_trigDec->isPassed(item, TrigDefs::requireDecision);
- ATH_MSG_INFO(" HLT Item " << item << " passed raw? " << passed);
- // TODO Enable this section after !22102 is merged
- // if (passed) {
- // ElementLinkVector<IParticleContainer> features = m_trigDec->features<IParticleContainer>(item);
- // ATH_MSG_INFO(" " << item << " features size: " << features.size());
- // }
+ ATH_MSG_INFO(" HLT Item " << item << " (numeric ID " << TrigConf::HLTUtils::string2hash(item, "Identifier") << ") passed raw? " << passed);
+ if (passed) {
+ std::vector< LinkInfo<xAOD::IParticleContainer> > features = m_trigDec->features<xAOD::IParticleContainer>(item);
+ ATH_MSG_INFO(" " << item << " IParticle features size: " << features.size());
+ for (const LinkInfo<xAOD::IParticleContainer>& li : features) {
+ if (!li.isValid()) {
+ ATH_MSG_WARNING(" Unable to access feature - link invalid.");
+ } else {
+ ATH_MSG_INFO(" IParticle Feature pt:" << (*li.link)->pt() << " eta:" << (*li.link)->eta() << " phi:" << (*li.link)->phi());
+ }
+ }
+ }
}
ATH_MSG_INFO( "REGTEST ==========END of TDT DUMP===========" );
return StatusCode::SUCCESS;
@@ -4099,6 +4102,25 @@ StatusCode TrigEDMChecker::checkTrigCompositeElementLink(const xAOD::TrigComposi
if (!elementLink.isValid()) ATH_MSG_WARNING(" Invalid element link to View, link name:'" << name << "'");
else ATH_MSG_DEBUG(" Dereferenced link '" << name << "' to View:'" << *elementLink);
+ } else if (name == "feature") {
+
+ if (clid == ClassID_traits< xAOD::TrigEMClusterContainer >::ID()) {
+
+ const ElementLink<xAOD::TrigEMClusterContainer> elementLink = tc->objectLink<xAOD::TrigEMClusterContainer>(name);
+ if (!elementLink.isValid()) ATH_MSG_WARNING(" Invalid element link to xAOD::TrigEMClusterContainer 'feature'");
+ else ATH_MSG_DEBUG(" Dereferenced xAOD::TrigEMClusterContainer link 'feature', Energy:" << (*elementLink)->energy());
+
+ } else {
+
+ try {
+ const ElementLink<xAOD::IParticleContainer> elementLink = tc->objectLink<xAOD::IParticleContainer>(name);
+ if (!elementLink.isValid()) ATH_MSG_WARNING(" Invalid element link to 'feature'");
+ else ATH_MSG_DEBUG(" Dereferenced IParticle link 'feature', pt:" << (*elementLink)->pt() << " eta:" << (*elementLink)->eta() << " phi:" << (*elementLink)->phi());
+ } catch(std::runtime_error& e) {
+ ATH_MSG_WARNING(" Cannot dereference 'feature' as IParticle: '" << e.what() << "'");
+ }
+
+ }
} else {
ATH_MSG_DEBUG(" Ignoring link to '" << name << "' with link CLID " << clid);
@@ -4162,7 +4184,7 @@ StatusCode TrigEDMChecker::TrigCompositeNavigationToDot(std::string& returnValue
const uint32_t selfIndex = selfEL.index();
ss << " \"" << selfKey << "_" << selfIndex << "\" [label=\"Container=" << typeNameTC;
if (tc->name() != "") ss << "\\nName=" << tc->name();
- ss << "\\nKey=" << key << "\\nIndex=" << selfIndex;
+ ss << "\\nKey=" << key << "\\nIndex=" << selfIndex << " linksRemapped=" << (tc->isRemapped() ? "Y" : "N");
const std::vector<DecisionID> decisions = tc->decisions();
if (decisions.size() > 0) {
ss << "\\nPass=";
diff --git a/Trigger/TrigValidation/TrigValTools/bin/check_log.pl b/Trigger/TrigValidation/TrigValTools/bin/check_log.pl
index 051cb7cd3cc22cc2a62727116d4b65f5a008aa29..791bd9bfe4437bd03ac9ac35ac930b4c87a32759 100755
--- a/Trigger/TrigValidation/TrigValTools/bin/check_log.pl
+++ b/Trigger/TrigValidation/TrigValTools/bin/check_log.pl
@@ -101,7 +101,7 @@ sub scan_logfile(){
@patterns=();
if ($errors) {
push @patterns, "^ERROR | ERROR | FATAL |CRITICAL |ABORT_CHAIN ";
- push @patterns, "^Exception\:|^Caught signal|^Core dump|Traceback|Shortened traceback|stack trace|^Algorithm stack\:|IncludeError|inconsistent use of tabs and spaces in indentation|glibc detected|tcmalloc\: allocation failed"
+ push @patterns, "^Exception\:|^Caught signal|^Core dump|Traceback|Shortened traceback|stack trace|^Algorithm stack\:|IncludeError|ImportError|inconsistent use of tabs and spaces in indentation|glibc detected|tcmalloc\: allocation failed"
}
if ($warnings) {
push @patterns, "WARNING ";
diff --git a/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py b/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
index 6dd8d554438a4303a4775cdcb620aa5d5ea08713..0b68921a617873d01214a0f7675907b51082960a 100755
--- a/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
+++ b/Trigger/TrigValidation/TrigValTools/bin/runTrigART.py
@@ -166,6 +166,21 @@ def print_summary(all_test_results, failed_tests, failed_rootcomp):
logging.info("All %d executed tests succeeded", len(all_test_results))
logging.info("==================================================")
+def prep_dirs(topdir, scripts):
+ """ Creates test result structure if missing, if present clears the area only for the tests to be run"""
+ import errno
+ try:
+ os.mkdir(topdir)
+ except OSError as e:
+ if e.errno != errno.EEXIST:
+ raise e
+ shutil.rmtree(topdir+'/test', ignore_errors=True)
+ os.mkdir(topdir+'/test')
+
+ # clear results dir
+ for script in scripts:
+ toerase=topdir+'/result/'+os.path.basename(script).replace('.sh', '')
+ shutil.rmtree(toerase, ignore_errors=True)
def main():
args = get_parser().parse_args()
@@ -181,10 +196,8 @@ def main():
topdir = 'runTrigART'
success = True
with remember_cwd():
- shutil.rmtree(topdir, ignore_errors=True)
- os.mkdir(topdir)
+ prep_dirs(topdir, scripts)
os.chdir(topdir)
- os.mkdir('test')
for script_path in scripts:
target = 'test/' + os.path.basename(script_path)
os.symlink(script_path, target)
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2c0327707e53c2e0c02bc5bcf8b2feca6ee7d5c1
--- /dev/null
+++ b/Trigger/TrigValidation/TriggerTest/test/test_slice_minbias_hmt_build.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# art-description: MinBias Enhanced (High Multiplicity Trigger) slice TriggerTest on MC
+# art-type: build
+# art-include: 21.1/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# art-output: HLTChain.txt
+# art-output: HLTTE.txt
+# art-output: L1AV.txt
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
+# art-output: *.log
+# art-output: costMonitoring_*
+# art-output: *.root
+# art-output: ntuple.pmon.gz
+# art-output: *perfmon*
+# art-output: TotalEventsProcessed.txt
+# art-output: *.regtest.new
+
+export NAME="slice_minbias_hmt_build"
+export SLICE="minbiasEnhanced"
+export MENU="Physics_pp_v7_primaries"
+export EVENTS="10"
+export COST_MONITORING="False"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..47d4eeb543667d6ec6ae53d82df86cabeb0873ca
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
@@ -0,0 +1,160 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+
+def Lvl1SimulationSequence( flags = None ):
+ """
+ Configure L1 simulation for Athena MT jobs
+
+ The code is structure in a way that should be easier to change once New JO system with ComponentAccumulators will be in use
+ """
+ # for the New JO migration
+ # from AthenaCommon.ComponentAccumulator import ComponentAccumulator
+ # acc = ComponentAccumulator()
+ # all tools then should be added to the acc, cond folders as well.
+ # L1ConfigSvc CA has to be imported and merged
+ # at the end the sequence added to the CA
+ #
+ from AthenaCommon.CFElements import seqAND
+ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+ from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
+ from TriggerJobOpts.TriggerFlags import TriggerFlags
+ from AthenaCommon.Constants import DEBUG
+
+ TriggerFlags.readLVL1configFromXML = True
+ TriggerFlags.outputLVL1configFile = None
+ from TrigConfigSvc.TrigConfigSvcConfig import LVL1ConfigSvc, findFileInXMLPATH
+ svcMgr += LVL1ConfigSvc()
+ svcMgr.LVL1ConfigSvc.XMLMenuFile = findFileInXMLPATH(TriggerFlags.inputLVL1configFile())
+
+
+
+ from TrigT1CaloSim.TrigT1CaloSimRun2Config import Run2TriggerTowerMaker
+ caloTowerMaker = Run2TriggerTowerMaker("Run2TriggerTowerMaker25ns")
+ caloTowerMaker.ExtraInputs = ["LArTTL1Container#LArTTL1EM", "LArTTL1Container#LArTTL1HAD", "TileTTL1Container#TileTTL1Cnt" ]
+ caloTowerMaker.OutputLevel=DEBUG
+ caloTowerMaker.ZeroSuppress = True
+ caloTowerMaker.CellType = 3
+
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Run2CPMTowerMaker
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Run2JetElementMaker
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__CPMSim
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__JEMJetSim
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__JEMEnergySim
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__CPCMX
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__JetCMX
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__EnergyCMX
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__RoIROD
+ from TrigT1CaloSim.TrigT1CaloSimConf import LVL1__Tester
+
+ from TrigT1MBTS.TrigT1MBTSConf import LVL1__TrigT1MBTS
+ from TrigT1ZDC.TrigT1ZDCConf import LVL1__TrigT1ZDC
+
+
+ from AthenaCommon.CFElements import seqAND
+
+ l1CaloSim = seqAND('l1CaloSim',[
+ caloTowerMaker,
+ #LVL1__Run2CPMTowerMaker( 'CPMTowerMaker', ExtraInputs=["XYZ#1"], ExtraOutputs=["XYZ#2"]) ,
+ LVL1__Run2CPMTowerMaker( 'CPMTowerMaker') ,
+ LVL1__Run2JetElementMaker( 'JetElementMaker'),
+ LVL1__CPMSim( 'CPMSim' ) ,
+ LVL1__JEMJetSim( 'JEMJetSim' ) ,
+ LVL1__JEMEnergySim( 'JEMEnergySim' ) ,
+ LVL1__CPCMX( 'CPCMX' ) ,
+ LVL1__JetCMX( 'JetCMX' ) ,
+ LVL1__EnergyCMX( 'EnergyCMX' ) ,
+ LVL1__RoIROD( 'RoIROD' ),
+ LVL1__TrigT1MBTS(),
+ LVL1__TrigT1ZDC()
+ ])
+
+ from IOVDbSvc.CondDB import conddb
+ L1CaloFolderList = []
+ #L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Calibration/Physics/PprChanCalib"]
+ L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/Physics/PprChanCalib"]
+ #L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Conditions/RunParameters"]
+ #L1CaloFolderList += ["/TRIGGER/L1Calo/V1/Conditions/DerivedRunPars"]
+ #L1CaloFolderList += ["/TRIGGER/Receivers/Conditions/VgaDac"]
+ #L1CaloFolderList += ["/TRIGGER/Receivers/Conditions/Strategy"]
+ L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Conditions/DisabledTowers"]
+ L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Calibration/PpmDeadChannels"]
+ L1CaloFolderList += ["/TRIGGER/L1Calo/V2/Configuration/PprChanDefaults"]
+
+
+ for l1calofolder in L1CaloFolderList:
+ #conddb.addFolderWithTag("TRIGGER_OFL", l1calofolder, "HEAD")
+ conddb.addFolder( "TRIGGER_OFL", l1calofolder )
+ # muons
+
+ from AthenaCommon.Include import include ## TODO, see if can be replaced by new JO
+ include( "MuonByteStreamCnvTest/jobOptions_MuonRDOToDigit.py" )
+ from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MuonRdoToMuonDigitTool
+ MuonRdoToMuonDigitTool = MuonRdoToMuonDigitTool (DecodeMdtRDO = True,
+ DecodeRpcRDO = True,
+ DecodeTgcRDO = True,
+ DecodeCscRDO = True )
+
+ MuonRdoToMuonDigitTool.cscCalibTool = "CscCalibTool"
+ from AthenaCommon.AppMgr import ToolSvc
+ ToolSvc += MuonRdoToMuonDigitTool
+
+ from MuonByteStreamCnvTest.MuonByteStreamCnvTestConf import MuonRdoToMuonDigit
+ from TrigT1RPCsteering.TrigT1RPCsteeringConf import TrigT1RPC
+ from TrigT1TGC.TrigT1TGCConf import LVL1TGCTrigger__LVL1TGCTrigger
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1Muctpi
+ from TrigT1Muctpi.TrigT1MuctpiConfig import L1MuctpiTool
+
+ ToolSvc += L1MuctpiTool("L1MuctpiTool")
+ ToolSvc.L1MuctpiTool.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
+
+ ToolSvc += L1MuctpiTool("LVL1MUCTPI__L1MuctpiTool") # one for topo, no idea why we need two
+ ToolSvc.LVL1MUCTPI__L1MuctpiTool.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
+
+ muctpi = L1Muctpi()
+ muctpi.LVL1ConfigSvc = svcMgr.LVL1ConfigSvc
+
+ l1MuonSim = seqAND("l1MuonSim", [
+
+ MuonRdoToMuonDigit( "MuonRdoToMuonDigit",
+ MuonRdoToMuonDigitTool = ToolSvc.MuonRdoToMuonDigitTool),
+
+ TrigT1RPC("TrigT1RPC",
+ Hardware = True, # not sure if needed, not there in old config, present in JO
+ DataDetail = False,
+ RPCbytestream = False,
+ RPCbytestreamFile = ""),
+
+ # based on Trigger/TrigT1/TrigT1TGC/python/TrigT1TGCConfig.py
+ # interesting is that this JO sets inexisting properties, commented out below
+ LVL1TGCTrigger__LVL1TGCTrigger("LVL1TGCTrigger",
+ InputData_perEvent = "TGC_DIGITS",
+ # ASDOutDataLocation = "ASDOutDataLocation",
+ # MuonTrigConfig = "/Run/MuonTrigConfig",
+ MuCTPIInput_TGC = "L1MuctpiStoreTGC",
+ MaskFileName = "TrigT1TGCMaskedChannel.db",
+ MaskFileName12 = "TrigT1TGCMaskedChannel._12.db"),
+ muctpi
+ ])
+
+ # only needed for MC
+ conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_EIFI", className="CondAttrListCollection")
+ conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_BW", className="CondAttrListCollection")
+ conddb.addFolder("TGC_OFL", "/TGC/TRIGGER/CW_TILE", className="CondAttrListCollection")
+ from L1TopoSimulation.L1TopoSimulationConfig import L1TopoSimulation
+ from TrigT1CTP.TrigT1CTPConfig import CTPSimulationInReco
+ from TrigT1RoIB.TrigT1RoIBConfig import RoIBuilder
+ condSeq = AthSequencer("AthCondSeq")
+ from MuonCondSvc.MuonCondSvcConf import TGCTriggerDbAlg
+ condSeq += TGCTriggerDbAlg()
+
+ ctp = CTPSimulationInReco("CTPSimulation")
+ ctp.DoLUCID = False
+ ctp.DoBCM = False
+ ctp.DoL1Topo = False
+ ctp.TrigConfigSvc = svcMgr.LVL1ConfigSvc
+ ctpSim = seqAND("ctpSim", [ctp, RoIBuilder("RoIBuilder")])
+
+ #l1Sim = seqAND("l1Sim", [caloTowerMaker] )
+ l1Sim = seqAND("l1Sim", [l1CaloSim, l1MuonSim, ctpSim] )
+ return l1Sim
+
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py
index 7d21f92130d5ca8a70d5fb9f2a55e891a48cd879..6aaf06eb84141b428a3a5eed5cc89ee4a29f7d1c 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1TriggerGetter.py
@@ -52,13 +52,12 @@ class Lvl1SimulationGetter (Configured):
def configure(self):
log = logging.getLogger( "Lvl1SimulationGetter" )
-
+
from AthenaServices.AthenaServicesConf import AthenaOutputStream
from AthenaCommon.AppMgr import ServiceMgr
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
-
-
+
if (not TriggerFlags.fakeLVL1()) and TriggerFlags.doLVL1():
if TriggerFlags.doCalo():
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
index 7b0b71ea61921e9c4b35fb2a10178a020ee2be5c..793eabb90c10c7073023f494d6e6bdf297300d50 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfig.py
@@ -72,6 +72,8 @@ def collectFilters( steps ):
for stepSeq in steps.getChildren():
if "filter" in stepSeq.name():
filters[stepSeq.name()] = stepSeq.getChildren()
+ __log.info("Found Filters in Step {} : {}".format(stepSeq.name(), stepSeq.getChildren()))
+
return filters
@@ -80,12 +82,12 @@ def collectDecisionObjects( hypos, filters, l1decoder ):
Returns the set of all decision objects of HLT
"""
decisionObjects = set()
- __log.info("Collecting decision obejcts from L1 decoder instance")
+ __log.info("Collecting decision objects from L1 decoder instance")
decisionObjects.update([ d.Decisions for d in l1decoder.roiUnpackers ])
decisionObjects.update([ d.Decisions for d in l1decoder.rerunRoiUnpackers ])
- __log.info("Collecting decision obejcts from hypos")
+ __log.info("Collecting decision objects from hypos")
__log.info(hypos)
for step, stepHypos in hypos.iteritems():
for hypoAlg in stepHypos:
@@ -97,7 +99,7 @@ def collectDecisionObjects( hypos, filters, l1decoder ):
decisionObjects.add( hypoAlg.HypoInputDecisions )
decisionObjects.add( hypoAlg.HypoOutputDecisions )
- __log.info("Collecting decision obejcts from filters")
+ __log.info("Collecting decision objects from filters")
for step, stepFilters in filters.iteritems():
for filt in stepFilters:
decisionObjects.update( filt.Input )
@@ -108,7 +110,7 @@ def collectDecisionObjects( hypos, filters, l1decoder ):
def triggerSummaryCfg(flags, hypos):
"""
- Configures an algorithm(s) that should be run after the slection process
+ Configures an algorithm(s) that should be run after the section process
Returns: ca, algorithm
"""
acc = ComponentAccumulator()
@@ -169,7 +171,7 @@ def triggerMonitoringCfg(flags, hypos, filters, l1Decoder):
def triggerOutputStreamCfg( flags, decObj, outputType ):
"""
Configure output stream according to the menu setup (decision objects)
- and TrigEDMCOnfig
+ and TrigEDMConfig
"""
from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
itemsToRecord = []
@@ -185,10 +187,10 @@ def triggerOutputStreamCfg( flags, decObj, outputType ):
itemsToRecord.extend( [ el[0] for el in EDMCollectionsToRecord ] )
# summary objects
- __log.debug( outputType + " trigger content "+str( itemsToRecord ) )
+ __log.info( outputType + " trigger content "+str( itemsToRecord ) )
acc = OutputStreamCfg( flags, outputType, ItemList=itemsToRecord )
streamAlg = acc.getEventAlgo("OutputStream"+outputType)
- streamAlg.ExtraInputs = [("xAOD::TrigCompositeContainer", "HLTSummary")]
+ streamAlg.ExtraInputs = [("xAOD::TrigCompositeContainer", "HLTSummary")] # OutputStream has a data dependency on HLTSummary
return acc
@@ -268,13 +270,37 @@ def triggerMergeViewsAndAddMissingEDMCfg( edmSet, hypos, viewMakers, decObj ):
continue
producer = producer[0]
- tool.TrigCompositeContainer = producer.InputMakerOutputDecisions
- tool.FixLinks = True
+ # NOTE: The below loop is going to find the HypoAlg which consume this output, and collate these HypoAlg's output
+ # It might be nicer to instead split up the GapFiller below to have a different GapFiller for Hypos and for Filters
+ # Then we could go back to having FixLinks be a boolean, rather than specifying a sub-set of the write handles
+ # attached to the TrigCompositeContainer parameter.
+
+ # We have a InputMaker with configured outputs, we need to identify all HypoAlg which consume these inputs.
+ # These HypoAlg all need to have their output element link collections remapped via FixLinks
+ TCHypoOutputCollections = list()
+ for step, stepHypos in hypos.iteritems():
+ for hypoAlg in stepHypos:
+ if isinstance( hypoAlg.HypoInputDecisions, list): # Support multiple inputs and outputs to this HypoAlg
+ counter = -1
+ for inputDecision in hypoAlg.HypoInputDecisions:
+ ++counter
+ if inputDecision in producer.InputMakerOutputDecisions:
+ TCHypoOutputCollections.append(hypoAlg.HypoOutputDecisions[counter])
+ else: # Normal case - consume one input, produce one output
+ if hypoAlg.HypoInputDecisions in producer.InputMakerOutputDecisions:
+ TCHypoOutputCollections.append(hypoAlg.HypoOutputDecisions)
+ tool.FixLinks = TCHypoOutputCollections
+
+ # We need to register in storegate these Hypo outputs, but also the InputMaker outputs as well so we add them to the list here too
+ TCOutputCollections = TCHypoOutputCollections[:] # copy the list
+ TCOutputCollections.extend(producer.InputMakerOutputDecisions)
+ tool.TrigCompositeContainer = TCOutputCollections
+ tool.dumpSGBefore = False
+ tool.dumpSGAfter = False
alg.OutputTools += [ tool ]
-
+ tool = HLTEDMCreator( "GapFiller" )
if len(edmSet) != 0:
- tool = HLTEDMCreator( "GapFiller" )
from collections import defaultdict
groupedByType = defaultdict( list )
@@ -291,13 +317,14 @@ def triggerMergeViewsAndAddMissingEDMCfg( edmSet, hypos, viewMakers, decObj ):
propName = collType.split(":")[-1]
if hasattr( tool, propName ):
setattr( tool, propName, collNameList )
+ __log.info("GapFiller will create EDM collection type '{}' for '{}'".format( collType, collNameList ))
else:
- __log.info("The {} is not going to be added if missing".format( collType ))
+ __log.info("EDM collections of type {} are not going to be added to StoreGate, if not created by the HLT".format( collType ))
+ # append all decision objects
+ __log.debug("The GapFiller is ensuring the creation of all the decision object collections: '{}'".format( decObj ) )
+ tool.TrigCompositeContainer += list(decObj)
+ alg.OutputTools += [tool]
- # append all decision objects
- tool.TrigCompositeContainer += list(decObj)
- alg.OutputTools += [tool]
-
return alg
@@ -365,10 +392,12 @@ def triggerRunCfg( flags, menu=None ):
edmSet = []
if flags.Output.ESDFileName != "":
+ __log.debug( "Setting up trigger EDM output for ESD" )
acc.merge( triggerOutputStreamCfg( flags, decObj, "ESD" ) )
edmSet.append('ESD')
if flags.Output.AODFileName != "":
+ __log.debug( "Setting up trigger EDM output for AOD" )
acc.merge( triggerOutputStreamCfg( flags, decObj, "AOD" ) )
edmSet.append('AOD')
@@ -378,6 +407,7 @@ def triggerRunCfg( flags, menu=None ):
# configure actual streams
if flags.Trigger.writeBS:
+ __log.debug( "Setting up trigger output for ByteStream" )
acc.merge( triggerBSOutputCfg( flags, decObj ) )
return acc
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index a31fc917f0556f4dfcaef0b9a135be18d13fdd01..39fb028a92470576ff756ef32fab1ad23da86362 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -80,13 +80,20 @@ def createTriggerFlags():
flags.addFlag('Trigger.triggerConfig', 'MCRECO:DEFAULT')
# name of the trigger menu
- flags.addFlag('Trigger.triggerMenuSetup', 'MC_pp_v7_tight_mc_prescale')
+ flags.addFlag('Trigger.triggerMenuSetup', 'Physics_pp_v7_primaries')
# version of the menu
from AthenaCommon.AppMgr import release_metadata
flags.addFlag('Trigger.menuVersion',
lambda prevFlags: release_metadata()['release'] )
+ # generate or not the HLT configuration
+ flags.addFlag('Trigger.generateHLTConfig', False)
+
+ # HLT XML file name
+ flags.addFlag('Trigger.HLTConfigFile',
+ lambda prevFlags: 'HLTconfig_'+prevFlags.Trigger.triggerMenuSetup+'_' + prevFlags.Trigger.menuVersion + '.xml')
+
# generate or not the L1 configuration
flags.addFlag('Trigger.generateLVL1Config', False)
@@ -98,8 +105,14 @@ def createTriggerFlags():
flags.addFlag('Trigger.generateLVL1TopoConfig', False)
# L1 topo XML file name
- flags.addFlag('Trigger.LVL1TopoConfigFile',
- lambda prevFlags: 'LVL1config_'+prevFlags.Trigger.triggerMenuSetup+'_' + prevFlags.Trigger.menuVersion + '.xml')
+ def _deriveTopoConfigName(prevFlags):
+ import re
+ menuSetup = prevFlags.Trigger.triggerMenuSetup
+ m = re.match(r'(.*v\d).*', menuSetup)
+ if m:
+ menuSetup = m.groups()[0]
+ return "L1Topoconfig_" + menuSetup + "_" + prevFlags.Trigger.menuVersion + ".xml"
+ flags.addFlag('Trigger.LVL1TopoConfigFile', _deriveTopoConfigName)
# trigger reconstruction
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index 6a1164102a313e89ec86c23c33eac6f45e834957..997e8f4c9162f633dcd81e812067b236b553e6a8 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -138,14 +138,14 @@ class doHLT(JobProperty):
_flags.append(doHLT)
# Define Default Flags
-class doMTHLT(JobProperty):
+class doMT(JobProperty):
""" Run upgrade type of config """
statusOn=True
allowedType=['bool']
from AthenaCommon.ConcurrencyFlags import jobproperties
StoredValue= bool(jobproperties.ConcurrencyFlags.NumThreads >= 1)
-_flags.append(doMTHLT)
+_flags.append(doMT)
class doMergedHLTResult(JobProperty):
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py
index 77348d7b0993b79b426b0909b14f6d737de92c6d..929fca761384e9b5eb70d0176125ed3915af77eb 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.GlobalFlags import jobproperties
from AthenaCommon.AthenaCommonFlags import jobproperties
@@ -24,6 +24,9 @@ excludeTracePattern.append ("*/TriggerMenu/*")
excludeTracePattern.append("*/TrigSteering/TrigSteeringConfig.py")
+
+
+
class TriggerGetter(Configured):
# _output = {"HLT::HLTResult" : ["HLTResult_L2", "HLTResult_EF"] }
_configured=True
@@ -46,16 +49,11 @@ class TriggerGetter(Configured):
# start with print some information what this will do
log.info("Basic configuration flags RecAlgsFlag.doTrigger: %d RecFlags.doTrigger: %d TriggerFlags.doTriggerConfigOnly %d" % (recAlgs.doTrigger(), rec.doTrigger(), TF.doTriggerConfigOnly()) )
- log.info("TriggerFlags: doL1Topo: %s, doLVL1: %s, doLVL2: %s, doEF: %s, doHLT: %s, doMTHLT: %s" % (TF.doL1Topo(), TF.doLVL1(), TF.doLVL2(), TF.doEF(), TF.doHLT(), TF.doMTHLT() ) )
+ log.info("TriggerFlags: doL1Topo: %s, doLVL1: %s, doLVL2: %s, doEF: %s, doHLT: %s, doMT: %s" % (TF.doL1Topo(), TF.doLVL1(), TF.doLVL2(), TF.doEF(), TF.doHLT(), TF.doMT() ) )
- if TF.doMTHLT():
+ if TF.doMT():
log.info("configuring MT Trigger, actually nothing happens for now")
-
return True
-
-
-
-
willGenerateMenu = recAlgs.doTrigger() and (TF.doLVL1() or TF.doLVL2() or TF.doEF() or TF.doHLT()) and not TF.doTriggerConfigOnly()
willRunTriggerConfigGetter = recAlgs.doTrigger() or rec.doTrigger() or TF.doTriggerConfigOnly()
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerAPI.py b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerAPI.py
index 9c1eb4223217b53fc3a3353691fbb05ac74cf506..8e938e412596ccb955b0ebaeb131f22b16ccf934 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerAPI.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerAPI.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
__author__ = 'Javier Montejo'
__version__="$Revision: 1.01 $"
__doc__="Interface to retrieve lists of unprescaled triggers according to types and periods"
@@ -10,23 +10,32 @@ from PathResolver import PathResolver
from AthenaCommon.Logging import logging
class TriggerAPI:
- centralPickleFile = PathResolver.FindCalibFile("TriggerMenu/TriggerInfo_20180703.pickle")
- if centralPickleFile: centralPickleFile = os.path.realpath(centralPickleFile)
+ log = logging.getLogger( 'TriggerMenu.api.TriggerAPI.py' )
+ centralPickleFile = PathResolver.FindCalibFile("TriggerMenu/TriggerInfo_20181112.pickle")
+ if not centralPickleFile:
+ log.warning("Couldn't find primary pickle file, try backup")
+ centralPickleFile = PathResolver.FindCalibFile("TriggerMenu/TriggerInfo_20180925.pickle")
+ if centralPickleFile:
+ log.info("Found pickle file:"+centralPickleFile)
+ centralPickleFile = os.path.realpath(centralPickleFile)
+ else: log.error("Couldn't find backup pickle file")
privatePickleFile = "TriggerInfo.pickle"
- dbQueries = None
+ dbQueries = {}
privatedbQueries = {}
customGRL = None
- log = logging.getLogger( 'TriggerMenu.api.TriggerAPI.py' )
+ release = None
+ pickleread = False
@classmethod
def init(cls):
- if cls.dbQueries: return
+ if cls.pickleread: return
+ cls.pickleread = True
if cls.centralPickleFile:
try:
with open(cls.centralPickleFile, 'r') as f:
cls.log.info("Reading cached information from: "+cls.centralPickleFile)
cls.dbQueries = pickle.load(f)
- except pickle.PickleError:
+ except (pickle.PickleError, ValueError):
cls.log.info("Reading cached information failed")
cls.dbQueries = {}
else:
@@ -35,11 +44,21 @@ class TriggerAPI:
with open(cls.privatePickleFile, 'r') as f:
cls.privatedbQueries = pickle.load(f)
cls.dbQueries.update(cls.privatedbQueries)
- except pickle.PickleError:
+ except (pickle.PickleError, ValueError):
cls.log.error("Error unpickling the private file")
except IOError:
pass
+ @classmethod
+ def setRelease(cls, release):
+ import re
+ if release and re.match('21\.1(\.[0-9]+)+$',release):
+ cls.release = release
+ elif release=="current": #Don't allow the release to be automatically overwritten
+ cls.release = release
+ else:
+ cls.log.warning("Release doesn't seem to be a well-formed 21.1 release, ignoring: "+release)
+
@classmethod
def setCustomGRL(cls, grl):
if TriggerInfo.testCustomGRL(grl):
@@ -67,13 +86,7 @@ class TriggerAPI:
def getLowestUnprescaledAnyPeriod(cls, period, triggerType=TriggerType.ALL, additionalTriggerType=TriggerType.UNDEFINED, matchPattern="", livefraction=1.0, reparse=False):
''' Returns a list of the lowest-pt-threshold HLT chains that were unprescaled in at least one of
the subperiods within the given period. The lowest granularity can be seen in TriggerEnums.TriggerPeriod
- period: see TriggerEnums.TriggerPeriod for all possibilities, recommeded TriggerPeriod.y2017
- triggerType: see TriggerEnums.TriggerType for all possibilities, example TriggerType.el_single
- additionalTriggerType: can request additional types to match, use TriggerType.ALL to show combined triggers of any kind
- accepts also a list as input in that case all types have to match
- matchPattern: provide additionally a regex-like expression to be applied
- livefraction: accept items that are not unprescaled but have a live fraction above this threshold, example 0.95
- The live fraction is only an approximation, weighting the number of lumiblocks by prescale.
+ See getLowestUnprescaled for a detailed description of the options
'''
lowset = set()
for i, ibin in enumerate(reversed(bin(period)[2:])): #to binary
@@ -88,13 +101,7 @@ class TriggerAPI:
@classmethod
def getUnprescaled(cls, period, triggerType=TriggerType.ALL, additionalTriggerType=TriggerType.UNDEFINED, matchPattern="", livefraction=1.0, reparse=False):
''' Returns a list of always-unprescaled HLT chains, including backup items with higher thresholds.
- period: see TriggerEnums.TriggerPeriod for all possibilities, recommeded TriggerPeriod.y2017
- triggerType: see TriggerEnums.TriggerType for all possibilities, example TriggerType.el_single
- additionalTriggerType: can request additional types to match, use TriggerType.ALL to show combined triggers of any kind
- accepts also a list as input in that case all types have to match
- matchPattern: provide additionally a regex-like expression to be applied
- livefraction: accept items that are not unprescaled but have a live fraction above this threshold, example 0.95
- The live fraction is only an approximation, weighting the number of lumiblocks by prescale.
+ See getLowestUnprescaled for a detailed description of the options
'''
cls._loadTriggerPeriod(period,reparse)
return cls.dbQueries[(period,cls.customGRL)]._getUnprescaled(triggerType, additionalTriggerType, matchPattern, livefraction)
@@ -103,13 +110,7 @@ class TriggerAPI:
def getUnprescaledAnyPeriod(cls, period, triggerType=TriggerType.ALL, additionalTriggerType=TriggerType.UNDEFINED, matchPattern="", livefraction=1.0, reparse=False):
''' Returns a list of HLT chains that were unprescaled in at least one of
the subperiods within the given period. The lowest granularity can be seen in TriggerEnums.TriggerPeriod
- period: see TriggerEnums.TriggerPeriod for all possibilities, recommeded TriggerPeriod.y2017
- triggerType: see TriggerEnums.TriggerType for all possibilities, example TriggerType.el_single
- additionalTriggerType: can request additional types to match, use TriggerType.ALL to show combined triggers of any kind
- accepts also a list as input in that case all types have to match
- matchPattern: provide additionally a regex-like expression to be applied
- livefraction: accept items that are not unprescaled but have a live fraction above this threshold, example 0.95
- The live fraction is only an approximation, weighting the number of lumiblocks by prescale.
+ See getLowestUnprescaled for a detailed description of the options
'''
lowset = set()
for i, ibin in enumerate(reversed(bin(period)[2:])): #to binary
@@ -124,13 +125,7 @@ class TriggerAPI:
@classmethod
def getInactive(cls, period, triggerType=TriggerType.ALL, additionalTriggerType=TriggerType.UNDEFINED, matchPattern="", livefraction=1e-99, reparse=False):
''' Returns a list of HLT chains that were fully inactive, excluding disabled chains in rerun.
- period: see TriggerEnums.TriggerPeriod for all possibilities, recommeded TriggerPeriod.y2017
- triggerType: see TriggerEnums.TriggerType for all possibilities, example TriggerType.el_single
- additionalTriggerType: can request additional types to match, use TriggerType.ALL to show combined triggers of any kind
- accepts also a list as input in that case all types have to match
- matchPattern: provide additionally a regex-like expression to be applied
- livefraction: accept items that are not unprescaled but have a live fraction above this threshold, example 0.95
- The live fraction is only an approximation, weighting the number of lumiblocks by prescale.
+ See getLowestUnprescaled for a detailed description of the options
'''
cls._loadTriggerPeriod(period,reparse)
return cls.dbQueries[(period,cls.customGRL)]._getInactive(triggerType, additionalTriggerType, matchPattern, livefraction)
@@ -138,40 +133,26 @@ class TriggerAPI:
@classmethod
def getActive(cls, period, triggerType=TriggerType.ALL, additionalTriggerType=TriggerType.UNDEFINED, matchPattern="", livefraction=1e-99, reparse=False):
''' Returns a list of HLT chains that were active at some point, including disabled chains in rerun.
- period: see TriggerEnums.TriggerPeriod for all possibilities, recommeded TriggerPeriod.y2017
- triggerType: see TriggerEnums.TriggerType for all possibilities, example TriggerType.el_single
- additionalTriggerType: can request additional types to match, use TriggerType.ALL to show combined triggers of any kind
- accepts also a list as input in that case all types have to match
- matchPattern: provide additionally a regex-like expression to be applied
- livefraction: accept items that are not unprescaled but have a live fraction above this threshold, example 0.95
- The live fraction is only an approximation, weighting the number of lumiblocks by prescale.
+ See getLowestUnprescaled for a detailed description of the options
'''
cls._loadTriggerPeriod(period,reparse)
return cls.dbQueries[(period,cls.customGRL)]._getActive(triggerType, additionalTriggerType, matchPattern, livefraction)
@classmethod
- def getAllHLT(cls, period, triggerType=TriggerType.ALL, additionalTriggerType=TriggerType.UNDEFINED, matchPattern="", reparse=False):
+ def getAllHLT(cls, period, triggerType=TriggerType.ALL, additionalTriggerType=TriggerType.UNDEFINED, matchPattern="", livefraction=0, reparse=False):
''' Returns a map of {HLT chains: average live fraction} for a given period.
The average live fraction is an approximation weighting the number of lumiblocks by prescale.
*** Don't use this number in analysis!!! ***
- period: see TriggerEnums.TriggerPeriod for all possibilities, recommeded TriggerPeriod.y2017
- triggerType: see TriggerEnums.TriggerType for all possibilities, example TriggerType.el_single
- additionalTriggerType: can request additional types to match, use TriggerType.ALL to show combined triggers of any kind
- accepts also a list as input in that case all types have to match
- matchPattern: provide additionally a regex-like expression to be applied
+ See getLowestUnprescaled for a detailed description of the options
'''
cls._loadTriggerPeriod(period,reparse)
- return cls.dbQueries[(period,cls.customGRL)]._getAllHLT(triggerType, additionalTriggerType, matchPattern)
+ return cls.dbQueries[(period,cls.customGRL)]._getAllHLT(triggerType, additionalTriggerType, matchPattern, livefraction)
@classmethod
def checkPeriodConsistency(cls, period=TriggerPeriod.future, triggerType=TriggerType.ALL, additionalTriggerType=TriggerType.UNDEFINED, matchPattern="", reparse=False):
''' Returns a list of triggers that are tighter than the lowest unprescaled but are not flagged as primary
This only makes sense for future periods, the past is already consistent :)
- period: see TriggerEnums.TriggerPeriod for all possibilities, recommeded TriggerPeriod.future
- triggerType: see TriggerEnums.TriggerType for all possibilities, example TriggerType.el_single
- additionalTriggerType: can request additional types to match, use TriggerType.ALL to show combined triggers of any kind
- accepts also a list as input in that case all types have to match
- matchPattern: provide additionally a regex-like expression to be applied
+ See getLowestUnprescaled for a detailed description of the options
'''
period &= TriggerPeriod.future #Only meaningful for future periods
cls._loadTriggerPeriod(period,reparse)
@@ -179,10 +160,10 @@ class TriggerAPI:
@classmethod
def _loadTriggerPeriod(cls, period, reparse):
- cls.init()
+ if not period & TriggerPeriod.future: cls.init()
if (period,cls.customGRL) not in cls.dbQueries:
if TriggerPeriod.isRunNumber(period) or (isinstance(period,TriggerPeriod) and period.isBasePeriod()):
- cls.dbQueries[(period,cls.customGRL)] = TriggerInfo(period,cls.customGRL)
+ cls.dbQueries[(period,cls.customGRL)] = TriggerInfo(period,cls.customGRL,cls.release)
cls.privatedbQueries[(period,cls.customGRL)] = cls.dbQueries[(period,cls.customGRL)]
if not period & TriggerPeriod.future or TriggerPeriod.isRunNumber(period):
#Don't pickle TM information since it can change, very cheap to retrieve anyway
@@ -198,6 +179,9 @@ class TriggerAPI:
@classmethod
def dumpFullPickle(cls):
+ for period,grl in cls.dbQueries.keys():
+ if TriggerPeriod.isRunNumber(period) or (isinstance(period,TriggerPeriod) and period.isBasePeriod()): continue
+ del cls.dbQueries[(period,grl)]
with open(cls.privatePickleFile, 'w') as f:
pickle.dump( cls.dbQueries , f)
print sorted(cls.dbQueries.keys())
@@ -217,7 +201,7 @@ def main(dumpFullPickle=False):
TriggerAPI.dumpFullPickle()
else:
try: period = int(sys.argv[1])
- except: period = TriggerPeriod.y2017
+ except: period = TriggerPeriod.y2018
for triggerType in TriggerType:
unprescaled = TriggerAPI.getLowestUnprescaled(period,triggerType)
print triggerType
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerDataAccess.py b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerDataAccess.py
index 4e68557efb6ee838526a3edad87c8f99a57cae4b..32b812ca22184f28fe3f011698a439d17c9981a3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerDataAccess.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerDataAccess.py
@@ -1,10 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
__author__ = 'Javier Montejo'
__version__="$Revision: 1.01 $"
__doc__="Access to Trigger DB and TriggerMenu to read past and future prescales"
import sys
-from TriggerMenu.api.TriggerEnums import TriggerPeriod, LBexceptions
+from TriggerMenu.api.TriggerEnums import TriggerPeriod, LBexceptions, TriggerRenaming
from TriggerMenu.api.TriggerPeriodData import TriggerPeriodData
def getRunLBFromU64(runlb):
@@ -156,8 +156,12 @@ def queryHLTPrescaleTableRun2(connection,psk):
return res
-def fillHLTlist( info, hltList , lbCount, run, grlblocks):
+def fillHLTmap( info, hltMap_prev , lbCount, run, grlblocks):
from TrigConfigSvc.TrigConfigSvcUtils import getL1Items, getL1Prescales
+ from AthenaCommon.Logging import logging
+
+ log = logging.getLogger( "TrigConfigSvcUtils.py" )
+ log.setLevel(logging.ERROR) #avoid the spam from TrigConfigSvcUtils
items = getL1Items('TRIGGERDB', info['smk']) # returs map item name => CTP ID
chainsHLT = getChainsWithL1seed('TRIGGERDB', info['smk']) # returns map HLT ID => (HLT name, L1 seed)
@@ -204,6 +208,7 @@ def fillHLTlist( info, hltList , lbCount, run, grlblocks):
continue
if run in LBexceptions.exceptions:
if any([lbstart>=exc_start and lbstart<=exc_end for exc_start, exc_end in LBexceptions.exceptions[run]]): continue
+ if any([lbend>=exc_start and lbend<=exc_end for exc_start, exc_end in LBexceptions.exceptions[run]]): continue
#print "Accepted:",(lboverlap, lbstart, lbend, grlblocks)
lbCount += lboverlap
@@ -218,17 +223,21 @@ def fillHLTlist( info, hltList , lbCount, run, grlblocks):
if tmpl1ps < 1: tmpl1ps = 1e99
l1ps = min(l1ps, tmpl1ps)
- efflb = lboverlap/(hltps*l1ps)
+ #if hltps*l1ps!=1 and chainsHLT[hltid][0]=="HLT_mu60_0eta105_msonly": #muon primary since 2015 as standard candle to find problematic LBs
+ # print "WARNING: Prescaled HLT_mu60_0eta105_msonly",l1ps,hltps,lbstart, lbend, grlblocks
+
+ if hltps*l1ps < 1e99: efflb = lboverlap/(hltps*l1ps)
+ else: efflb = 0
if not chainsHLT[hltid][0] in hltMap: hltMap[chainsHLT[hltid][0]] = [l1seeds, 0, hltrerun>0]
hltMap[chainsHLT[hltid][0]][1] += efflb
- for i, (hlt,(l1,efflb,rerun)) in enumerate(hltList):
+ for hlt,(l1,efflb,rerun) in hltMap_prev.iteritems():
if hlt in hltMap:
hltMap[hlt][1] += efflb
hltMap[hlt][2] |= rerun
- else: hltMap[hlt] = (l1, efflb,rerun)
+ else: hltMap[hlt] = [l1, efflb,rerun]
- return hltMap.items(), lbCount
+ return hltMap, lbCount
def getChainsWithL1seed(connection, smk):
@@ -263,42 +272,47 @@ def getChainsWithL1seed(connection, smk):
-def getHLTlist_fromDB(period, customGRL):
- ''' Return a list of (HLT chain, L1 seed, average prescale ) for a given period
- The average prescale is an approximation weighting the PS by number of lumiblocks.
- *** Don't use this number in analysis!!! ***
+def getHLTmap_fromDB(period, customGRL):
+ ''' Return a map of HLT chain: (L1 seed, active LBs, is-rerun) for a given period
'''
triggerPeriod = TriggerPeriodData( period, customGRL ).grl
- if not triggerPeriod: return [],0
+ if not triggerPeriod: return {},0
runsWithReadyForPhysics = getReadyForPhysicsInRange(triggerPeriod)
keys = getKeys( runsWithReadyForPhysics)
- hltList = []
+ hltMap = {}
lbCount = 0
for run in keys:
print "Filling run:",run
- hltList, lbCount = fillHLTlist( keys[run], hltList, lbCount , run, triggerPeriod[run])
+ hltMap, lbCount = fillHLTmap( keys[run], hltMap, lbCount , run, triggerPeriod[run])
- hltList = [(x, l1, activeLB/float(lbCount), activeLB, hasRerun) for x, (l1, activeLB, hasRerun) in hltList]
- return hltList, lbCount
+ return hltMap, lbCount
-def getHLTlist_fromTM(period):
- ''' Return a list of (HLT chain, L1 seed, prescale ) for a given period
+def getHLTmap_fromTM(period, release):
+ ''' Return a map of HLT chain: (L1 seed, active LBs, is-rerun) for a given period
Only "Future" periods make sense here
- The format is the same as for TriggerDBAccess for compatibility but the l1seeds are empty
+ The format is the same as for TriggerDBAccess for compatibility but rerun is always false
'''
- from TriggerMenu.menu import Physics_pp_v7
+
+ from os import getenv
+ asetupversion = getenv('AtlasVersion','')
+ forceRel21 = not (asetupversion.startswith("21.1") or asetupversion.startswith("22."))
+ if (forceRel21 or release) and release!="current":
+ sys.path.insert(0, getMenuPathFromRelease(release))
+ import Physics_pp_v7_primaries as theMenu
+ else:
+ from TriggerMenu.menu import Physics_pp_v7_primaries as theMenu
from TriggerJobOpts.TriggerFlags import TriggerFlags
- Physics_pp_v7.setupMenu()
- if not period & TriggerPeriod.future: return []
+ theMenu.setupMenu()
+ if not period & TriggerPeriod.future: return {}, 0
maxlumi = 20000
if period & TriggerPeriod.future1p8e34: maxlumi = 17000
elif period & TriggerPeriod.future2e34: maxlumi = 20000
else: print "Warning non-recongnized future",period
- hltList = []
+ hltMap = {}
dummyfutureLBs = 1e6
for prop in dir(TriggerFlags):
if prop[-5:]!='Slice': continue
@@ -312,25 +326,45 @@ def getHLTlist_fromTM(period):
ps = 0
if maxlumi <= 20000 and 'Primary:20000' in comment: ps = 1
if maxlumi <= 17000 and 'Primary:17000' in comment: ps = 1
- hltList.append( (hltname, l1seed, ps, dummyfutureLBs*ps, False) ) #hasRerun=False
+ hltMap[hltname] = (l1seed, dummyfutureLBs*ps, False) #hasRerun=False
- return hltList, dummyfutureLBs
+ return hltMap, dummyfutureLBs
-def getHLTlist(period, customGRL):
- ''' For a given period it returns: [HLT chain, L1 seed, average livefraction, active LB], total LB
- The average prescale is an approximation weighting the PS by number of lumiblocks.
+def getMenuPathFromRelease(release):
+ if release: #already format-proofed in TriggerAPI
+ return "/cvmfs/atlas.cern.ch/repo/sw/software/21.1/AthenaP1/%s/InstallArea/x86_64-slc6-gcc62-opt/python/TriggerMenu/menu"%release
+ #21.1.50 contains the final menu, no need to find the last release
+ return "/cvmfs/atlas.cern.ch/repo/sw/software/21.1/AthenaP1/21.1.50/InstallArea/x86_64-slc6-gcc62-opt/python/TriggerMenu/menu"
+
+
+def getHLTlist(period, customGRL, release):
+ ''' For a given period it returns: [HLT chain, L1 seed, average livefraction, active LB, is-rerun], total LB
+ The average livefraction is an approximation weighting the PS by number of lumiblocks.
*** Don't use this number in analysis!!! ***
- For "future" periods, the average prescale is 1 for items flagged as primary in TM and 0 for non-primaries
+ For "future" periods, the average livefraction is 1 for items flagged as primary in TM and 0 for non-primaries
'''
if not period & TriggerPeriod.future or TriggerPeriod.isRunNumber(period):
- hltlist, totalLB = getHLTlist_fromDB(period, customGRL)
+ hltmap, totalLB = getHLTmap_fromDB(period, customGRL)
else:
- hltlist, totalLB = getHLTlist_fromTM(period)
+ hltmap, totalLB = getHLTmap_fromTM(period, release)
- vetoes = ['calib','noise','noalg','satmon','peb']
- hltlist = [(name, l1seed, livefraction, activeLB, hasRerun) for name, l1seed, livefraction, activeLB, hasRerun in hltlist if not any(v in name for v in vetoes)]
+ hltlist = cleanHLTmap(hltmap, totalLB)
return (hltlist, totalLB)
+def cleanHLTmap(hltmap, totalLB):
+
+ from copy import deepcopy
+ for name, (l1seed, activeLB, hasRerun) in deepcopy(hltmap).iteritems(): #since it will modify on the fly
+ for pair in TriggerRenaming.pairs:
+ if name==pair[0] and pair[1] in hltmap: hltmap[pair[1]][1] += activeLB
+ #if name==pair[0] and not pair[1] in hltmap: hltmap[pair[1]] = [l1seed, activeLB, hasRerun]
+ if name==pair[1] and pair[0] in hltmap: hltmap[pair[0]][1] += activeLB
+ #if name==pair[1] and not pair[0] in hltmap: hltmap[pair[0]] = [l1seed, activeLB, hasRerun]
+
+ vetoes = ['calib','noise','noalg','satmon','peb']
+ hltlist = [(name, l1seed, activeLB/totalLB, activeLB, hasRerun) for name, (l1seed, activeLB, hasRerun) in hltmap.iteritems() if not any(v in name for v in vetoes)]
+ return hltlist
+
def test():
print getHLTlist(TriggerPeriod.y2017,None)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerEnums.py b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerEnums.py
index 0c41e47c1a1cea1292818f770613177f1ff5812f..b5709875d59f41a4f418f044c0122e54b90473de 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerEnums.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerEnums.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
__author__ = 'Javier Montejo'
__version__="$Revision: 1.01 $"
__doc__="Enumerations for trigger types and periods"
@@ -22,6 +22,7 @@ class TriggerType(IntEnum):
ht = 1 << 13
mu_bphys = 1 << 14
exotics = 1 << 15
+ afp = 1 << 16
el = el_single | el_multi
mu = mu_single | mu_multi
@@ -30,7 +31,7 @@ class TriggerType(IntEnum):
tau = tau_single| tau_multi
g = g_single | g_multi
- ALL = el | mu | j | bj | tau | g | xe | ht | mu_bphys | exotics
+ ALL = el | mu | j | bj | tau | g | xe | ht | mu_bphys | exotics | afp
UNDEFINED = 0
@@ -48,8 +49,11 @@ class TriggerPeriod(IntEnum):
y2017periodD6 = 1 << 10
y2017periodEF = 1 << 11
y2017periodGHIK = 1 << 12
- y2017periodN = 1 << 13
- y2018periodBF = 1 << 14
+ y2017lowmu = 1 << 13
+ y2018periodBE = 1 << 14
+ y2018periodFI = 1 << 15
+ y2018lowmu = 1 << 16
+ y2018periodKQ = 1 << 17
runNumber = 1 << 18 #Can't get higher than this, enters the run number domain
future1p8e34 = 1 << 19
@@ -57,8 +61,8 @@ class TriggerPeriod(IntEnum):
y2017periodB = y2017periodB1 | y2017periodB2B4 | y2017periodB5B7 | y2017periodB8
y2017periodD = y2017periodD1D5 | y2017periodD6
- y2017periodAll = y2017periodB | y2017periodC | y2017periodD | y2017periodEF | y2017periodGHIK | y2017periodN
- y2018 = y2018periodBF
+ y2017periodAll = y2017periodB | y2017periodC | y2017periodD | y2017periodEF | y2017periodGHIK #low-mu period is not considered
+ y2018 = y2018periodBE | y2018periodFI | y2018periodKQ #low-mu period is not considered
y2017 = y2017periodAll
y2016 = y2016periodA | y2016periodBD3 | y2016periodD4plus
future = future1p8e34 | future2e34
@@ -87,8 +91,24 @@ class LBexceptions:
301932: [(233, 234)], #Accidentaly moved to MuScan prescales
302831: [(4 , 10 )], #toroid off keys
336506: [(212, 260)], #Regular muscan but the defect is not in sync with the switch of keys
+ 341294: [(137, 156)], #Standby keys
+ 355650: [(117, 117)], #Last LB of emittance scan
+ 357283: [(117, 117)], #Last LB of emittance scan
+ 359623: [(129, 129)], #Last LB of emittance scan
}
+class TriggerRenaming:
+ ''' Pairs of triggers that have been renamed at some point
+ The code will complete each other so that each contains
+ luminosity of both
+ Assumes that they are orthogonal, i.e. they haven't run both at the same time
+ '''
+ pairs = [
+ ("HLT_mu20_mu8noL1_e9_lhvloose_nod0","HLT_e9_lhvloose_nod0_mu20_mu8noL1"),
+ ("HLT_mu20_mu8noL1_e9_lhvloose_nod0_L1EM8VH_MU20","HLT_e9_lhvloose_nod0_mu20_mu8noL1_L1EM8VH_MU20"),
+ ("HLT_mu20_mu8noL1_e9_lhvloose_nod0_L1EM7_MU20","HLT_e9_lhvloose_nod0_mu20_mu8noL1_L1EM7_MU20"),
+ ]
+
if __name__ == "__main__":
print TriggerPeriod.y2015.isBasePeriod()
print TriggerPeriod.y2017.isBasePeriod()
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerInfo.py
index 3d7d17bf49e21855c06d9e2c82558b2468c5c80c..a0850e5eae12da5bddfedf673fd7cf68906044e2 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerInfo.py
@@ -1,23 +1,24 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
__author__ = 'Javier Montejo'
__version__="$Revision: 1.01 $"
__doc__="Class containing all the information of an HLT chain"
import re
-from TriggerMenu.api.TriggerEnums import TriggerType
+from TriggerMenu.api.TriggerEnums import TriggerType, TriggerPeriod
+from collections import Counter
class TriggerInfo:
''' Object containing all the HLT information related to a given period.
Stores a list of TriggerChain objects and the functions to skim them
'''
- def __init__(self,period=0, customGRL=None):
+ def __init__(self,period=0, customGRL=None, release=None):
self.triggerChains = []
self.period = period
self.totalLB = 0
if not period: return
from TriggerDataAccess import getHLTlist
- HLTlist, totalLB = getHLTlist(period, customGRL)
+ HLTlist, totalLB = getHLTlist(period, customGRL, release)
self.totalLB = totalLB
for hlt, l1, livefraction, activeLB, hasRerun in HLTlist:
self.triggerChains.append( TriggerChain(hlt, l1, livefraction, activeLB, hasRerun))
@@ -59,7 +60,7 @@ class TriggerInfo:
continue
append = False
for other in typeMap[chain.triggerType][:]:
- comp = chain.isLowerThan(other)
+ comp = chain.isLowerThan(other,self.period)
if comp == 0:
append = False
break
@@ -70,12 +71,12 @@ class TriggerInfo:
return [x.name for t in typeMap.itervalues() for x in t ]
- def _getAllHLT(self,triggerType, additionalTriggerType, matchPattern):
- return {x.name: x.livefraction for x in self.triggerChains if x.passType(triggerType, additionalTriggerType) and re.search(matchPattern, x.name)}
+ def _getAllHLT(self,triggerType, additionalTriggerType, matchPattern, livefraction):
+ return {x.name: x.livefraction for x in self.triggerChains if x.passType(triggerType, additionalTriggerType) and re.search(matchPattern, x.name) and x.isUnprescaled(livefraction)}
- def _getActive(self,triggerType, additionalTriggerType, matchPattern, livefraction=1.0):
+ def _getActive(self,triggerType, additionalTriggerType, matchPattern, livefraction):
return [x.name for x in self.triggerChains if x.isActive(livefraction) and x.passType(triggerType, additionalTriggerType) and re.search(matchPattern, x.name)]
- def _getInactive(self,triggerType, additionalTriggerType, matchPattern, livefraction=1.0):
+ def _getInactive(self,triggerType, additionalTriggerType, matchPattern, livefraction):
return [x.name for x in self.triggerChains if x.isInactive(livefraction) and x.passType(triggerType, additionalTriggerType) and re.search(matchPattern, x.name)]
def _checkPeriodConsistency(self,triggerType, additionalTriggerType, matchPattern):
@@ -86,31 +87,32 @@ class TriggerInfo:
for j in range(i+1,len(self.triggerChains)):
probe2 = self.triggerChains[j]
if not (probe2.passType(triggerType, additionalTriggerType) and re.search(matchPattern, probe2.name)): continue
- if probe1.isUnprescaled() and not probe2.isUnprescaled() and probe1.isLowerThan(probe2)==1: inconsistent.add(probe2.name)
- if probe2.isUnprescaled() and not probe1.isUnprescaled() and probe2.isLowerThan(probe1)==1: inconsistent.add(probe1.name)
+ if probe1.isUnprescaled() and not probe2.isUnprescaled() and probe1.isLowerThan(probe2,self.period)==1: inconsistent.add(probe2.name)
+ if probe2.isUnprescaled() and not probe1.isUnprescaled() and probe2.isLowerThan(probe1,self.period)==1: inconsistent.add(probe1.name)
return inconsistent
class TriggerLeg:
types = ('e','j','mu','tau','xe','g','ht')
- legpattern = re.compile('([0-9]*)(%s)([0-9]+)' % '|'.join(types))
- detailpattern = re.compile('(?:-?\d+)|(?:[^0-9|-]+)')
- bjetpattern = re.compile('bmv|btight|bmedium|bloose')
+ legpattern = re.compile('([0-9]*)(%s)([0-9]+)(noL1)?' % '|'.join(types))
+ detailpattern = re.compile('(?:-?\d+)|(?:[^0-9 -]+)') #split into text-only vs number-only
+ bjetpattern = re.compile('bmv|bhmv|btight|bmedium|bloose')
bphyspattern = re.compile('b[A-Z]')
exoticspattern = re.compile('llp|LLP|muvtx|hiptrt|LATE|NOMATCH')
+ afppattern = re.compile('afp|AFP')
def __init__(self,legname, chainseed, chainname):
self.legname = legname
- self.details = []
self.l1seed = ""
+ details = []
chainseed= chainseed.replace("L1_","")
blocks = legname.split("_L1")
for token in blocks[0].split("_"):
m = self.legpattern.match(token)
if m:
- count,legtype,thr = m.groups()
+ count,legtype,thr,noL1 = m.groups()
self.count = int(count) if count else 1
self.thr = int(thr)
if legtype == 'e':
@@ -134,6 +136,7 @@ class TriggerLeg:
self.legtype = TriggerType.ht
else:
print "Unknown trigger type:",legtype
+ if noL1: details.append(noL1)
else:
if self.bjetpattern.match(token):
if self.legtype == TriggerType.j_single: self.legtype = TriggerType.bj_single
@@ -142,21 +145,32 @@ class TriggerLeg:
self.legtype = TriggerType.mu_bphys
if self.exoticspattern.search(token):
self.legtype = TriggerType.exotics
- self.details.append(token)
+ if self.afppattern.search(token):
+ self.legtype = TriggerType.afp
+ details.append(token)
for l1seed in blocks[1:]:
if self.exoticspattern.search(l1seed):
self.legtype = TriggerType.exotics
+ if self.afppattern.search(l1seed):
+ self.legtype = TriggerType.afp
if l1seed == chainseed: continue
else:
assert self.l1seed=="", (self.l1seed, chainseed, chainname, blocks[1:])
self.l1seed = l1seed
if not self.l1seed: self.l1seed = chainseed
+ self.details = tuple(details)
+
+ def __eq__(self,other):
+ return (self.l1seed == other.l1seed and self.count == other.count and self.thr == other.thr and self.legtype == other.legtype and self.details == other.details)
+
+ def __hash__(self):
+ return hash((self.l1seed,self.count,self.thr,self.legtype,self.details))
def __repr__(self):
- return self.legname+" {0:b}".format(self.legtype)
+ return "{0} {1} {2} {3} {4} {5:b}".format(self.legname,self.l1seed,self.count,self.thr,self.details,self.legtype)
- def isLegLowerThan(self, other, debug=False):
+ def isLegLowerThan(self, other, is2015, debug=False):
''' Returns -9 if none of them is lower than the other (e.g. different met flavour).
Returns -1 if identical
Returns 0 if other is lower than self.
@@ -169,21 +183,21 @@ class TriggerLeg:
print self.l1seed, other.l1seed
print self.details, other.details
print self.thr, other.thr
- print self.compareDetails(other, debug=True)
+ print self.compareDetails(other, is2015, debug=True)
print self.details == other.details
print "DEBUG LEGS END --------"
if self.legtype != other.legtype: return -9
- if self.compareDetails(other) == -1:
+ if self.compareDetails(other, is2015) == -1:
if self.thr < other.thr: return 1
if self.thr > other.thr: return 0
else: return -1
- if self.compareDetails(other) == 1 and self.thr <= other.thr: return 1
- if self.compareDetails(other) == 0 and other.thr <= self.thr: return 0
+ if self.compareDetails(other, is2015) == 1 and self.thr <= other.thr: return 1
+ if self.compareDetails(other, is2015) == 0 and other.thr <= self.thr: return 0
return -9
- def compareDetails(self, other, debug=False):
+ def compareDetails(self, other, is2015, debug=False):
''' Returns -9 if none of them is lower than the other (e.g. different met flavour).
Returns -1 if identical
Returns 0 if other is lower than self.
@@ -193,33 +207,45 @@ class TriggerLeg:
if debug: print "compareDetails:",len(self.details), len(other.details),(self.l1seed == other.l1seed),(self.details == other.details)
if len(self.details) != len(other.details):
- if any([x.startswith("nod0") for x in self.details]):
+ if not is2015 and any([x.startswith("noL1") for x in self.details]):
+ cloneself = deepcopy(self)
+ cloneself.details = [ x for x in self.details if not x.startswith("noL1")]
+ compno = cloneself.compareDetails(other,is2015,debug)
+ if compno ==1 or compno == -1:
+ return 1
+ if not is2015 and any([x.startswith("noL1") for x in other.details]):
+ cloneother = deepcopy(other)
+ cloneother.details = [ x for x in other.details if not x.startswith("noL1")]
+ compno = self.compareDetails(cloneother,is2015,debug)
+ if compno ==0 or compno == -1:
+ return 0
+ if not is2015 and any([x.startswith("nod0") for x in self.details]):
cloneself = deepcopy(self)
cloneself.details = [ x for x in self.details if not x.startswith("nod0")]
- compno = cloneself.compareDetails(other,debug)
+ compno = cloneself.compareDetails(other,is2015,debug)
if compno ==1 or compno == -1:
return 1
- if any([x.startswith("nod0") for x in other.details]):
+ if not is2015 and any([x.startswith("nod0") for x in other.details]):
cloneother = deepcopy(other)
cloneother.details = [ x for x in other.details if not x.startswith("nod0")]
- compno = self.compareDetails(cloneother,debug)
+ compno = self.compareDetails(cloneother,is2015,debug)
if compno ==0 or compno == -1:
return 0
if any([x.startswith("cut") for x in self.details]):
cloneself = deepcopy(self)
cloneself.details = [ x for x in self.details if not x.startswith("cut")]
- compno = cloneself.compareDetails(other,debug)
+ compno = cloneself.compareDetails(other,is2015,debug)
if compno ==0 or compno == -1:
return 0
if any([x.startswith("cut") for x in other.details]):
cloneother = deepcopy(other)
cloneother.details = [ x for x in other.details if not x.startswith("cut")]
- compno = self.compareDetails(cloneother,debug)
+ compno = self.compareDetails(cloneother,is2015,debug)
if compno ==1 or compno == -1:
return 1
return -9
compl1seed = self.compareTags(self.l1seed, other.l1seed, stringSubset=True, debug=debug)
- compdetails = self.compareTags("".join(self.details), "".join(other.details), debug=debug )
+ compdetails = self.compareTags(" ".join(self.details), " ".join(other.details), debug=debug )
if self.l1seed == other.l1seed:
if self.details == other.details: return -1
if debug: print "compareTags 1:",compdetails
@@ -258,9 +284,11 @@ class TriggerLeg:
return -9
if tag1 == tag2: return -1
- #lower mv2 values are tighter, put a minus sign to trick it
- tag1 = tag1.replace("mv2c","mv2c-")
- tag2 = tag2.replace("mv2c","mv2c-")
+ #lower mv2 and deltaR/deltaZ/deltaPhi values are tighter, put a minus sign to trick it
+ inverseCuts = ("mv2c","dr","dz","dphi")
+ for cut in inverseCuts:
+ tag1 = tag1.replace(cut,cut+"-")
+ tag2 = tag2.replace(cut,cut+"-")
#only make a statement on the numerical values, with everything else identical
reself = self.detailpattern.findall(tag1)
reother = self.detailpattern.findall(tag2)
@@ -358,10 +386,14 @@ class TriggerChain:
mtype &= ~(TriggerType.mu_single | TriggerType.mu_multi)
elif l.legtype & TriggerType.exotics:
mtype |= TriggerType.exotics
+ elif l.legtype & TriggerType.afp:
+ mtype = TriggerType.afp #on purpose not OR-ed
else:
mtype |= l.legtype
l1seed= l1seed.replace("L1_","")
+ if mtype & TriggerType.exotics or mtype & TriggerType.afp:
+ return mtype
for token in l1seed.split("_"):
m = self.l1pattern.match(token)
if m:
@@ -420,11 +452,29 @@ class TriggerChain:
print self.name, self.legs, "{0:b}".format(self.triggerType), self.livefraction, self.activeLB
return ""
- def isLowerThan(self, other):
+ def isSubsetOf(self, other):
+ ''' Returns -1 if none of them is a strict subset of the other
+ Returns 0 if the legs in other are a subset of self.
+ Returns 1 if the legs in self are a subset of other.
+ '''
+ if not self.legs or not other.legs: return -1 #problems with AFP
+ selfcounter = Counter(self.legs)
+ othercounter = Counter(other.legs)
+ for leg, count in selfcounter.iteritems():
+ if not leg in othercounter or count > othercounter[leg]: break
+ else: return 1
+ for leg, count in othercounter.iteritems():
+ if not leg in selfcounter or count > selfcounter[leg]: break
+ else: return 0
+ return -1
+
+ def isLowerThan(self, other,period=TriggerPeriod.future):
''' Returns -1 if none of them is lower than the other (e.g. asymmetric dilepton).
Returns 0 if other is lower than self.
Returns 1 if self is lower than other.
'''
+ is2015 = period & TriggerPeriod.y2015 and not TriggerPeriod.isRunNumber(period)
+ is2015 |= period <= 284484 and TriggerPeriod.isRunNumber(period)
if self.triggerType != other.triggerType: return -1
if len(self.legs) != len(other.legs): return -1
comp = -1
@@ -432,7 +482,7 @@ class TriggerChain:
#if re.search("HLT_j55_gsc75_bmv2c1040_split_3j55_gsc75_boffperf_split", self.name): debug = True
if debug: print "DEBUG:",self.name,other.name
for selfleg, otherleg in zip(self.legs, other.legs):
- legcomp = selfleg.isLegLowerThan(otherleg, debug)
+ legcomp = selfleg.isLegLowerThan(otherleg, is2015, debug)
if debug: print "DEBUG LEG return:", legcomp
if legcomp == -9: return -1
elif legcomp == -1: continue
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerPeriodData.py b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerPeriodData.py
index 8e346003fbe26ccc654d374d72739d94a3d0b1e8..1f275b8b8fbd0546abeaaf4626c90f5a58ed8582 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerPeriodData.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/api/TriggerPeriodData.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
__author__ = 'Javier Montejo'
__version__="$Revision: 1.01 $"
__doc__="Class defining data periods and access to GRLs"
@@ -88,13 +88,30 @@ class TriggerPeriodData:
'D':(350310,352107,20422),
'E':(352123,352137,18296),
'F':(352274,352514,19938),
+ 'G' :(354107,354494,17012),
+ 'G1':(354107,354174,4676 ),
+ 'G2':(354176,354311,61.2 ),
+ 'G3':(354309,354359,17012),
+ 'G4':(354396,354396,11098),
+ 'G5':(354476,354494,8.73 ),
+
+ 'I':(355261,355273,17318),
+ 'J':(355331,355468,18781),
+ 'K':(355529,356259,19958),
+ 'L':(357050,359171,19935),
+ 'M':(359191,360414,20904),
+ 'N':(361635,361696,9464 ),
+ 'O':(361738,363400,19822),
+ 'Q':(363664,364292,19618),
}
grlbase = "/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/GoodRunsLists/"
- y2018grlpath = grlbase+"data18_13TeV/20180702/data18_13TeV.periodAllYear_DetStatus-v100-pro22-02_Unknown_PHYS_StandardGRL_All_Good_25ns_Triggerno17e33prim.xml"
+ y2018grlpath = grlbase+"data18_13TeV/20181105/data18_13TeV.periodAllYear_DetStatus-v102-pro22-04_Unknown_PHYS_StandardGRL_All_Good_25ns_Triggerno17e33prim.xml"
y2017grlpath = grlbase+"data17_13TeV/20180619/data17_13TeV.periodAllYear_DetStatus-v99-pro22-01_Unknown_PHYS_StandardGRL_All_Good_25ns_Triggerno17e33prim.xml"
y2016grlpath = grlbase+"data16_13TeV/20180129/data16_13TeV.periodAllYear_DetStatus-v89-pro21-01_DQDefects-00-02-04_PHYS_StandardGRL_All_Good_25ns.xml"
y2015grlpath = grlbase+"data15_13TeV/20170619/data15_13TeV.periodAllYear_DetStatus-v89-pro21-02_Unknown_PHYS_StandardGRL_All_Good_25ns.xml"
+ y2017lowmugrlpath = grlbase+"data17_13TeV/20180117/data17_13TeV.periodN_DetStatus-v98-pro21-16_Unknown_PHYS_StandardGRL_All_Good_25ns_ignore_GLOBAL_LOWMU.xml"
+ y2018lowmugrlpath = grlbase+"data18_13TeV/20180830/data18_13TeV.periodG4J_MERGED_PHYS_StandardGRL_All_Good_25ns_ignore_GLOBAL_LOWMU.xml"
def __init__(self, period, customGRL=None):
if customGRL:
self.loadGRL(customGRL)
@@ -104,8 +121,12 @@ class TriggerPeriodData:
self.loadGRL(self.y2015grlpath)
elif period & TriggerPeriod.y2016:
self.loadGRL(self.y2016grlpath)
+ elif period & TriggerPeriod.y2017lowmu:
+ self.loadGRL(self.y2017lowmugrlpath)
elif period & TriggerPeriod.y2017:
self.loadGRL(self.y2017grlpath)
+ elif period & TriggerPeriod.y2018lowmu:
+ self.loadGRL(self.y2018lowmugrlpath)
elif period & TriggerPeriod.y2018:
self.loadGRL(self.y2018grlpath)
self.skimPeriod(period)
@@ -168,19 +189,35 @@ class TriggerPeriodData:
ranges.append( self.periodMap2017['H'] )
ranges.append( self.periodMap2017['I'] )
ranges.append( self.periodMap2017['K'] )
- if period & TriggerPeriod.y2017periodN :
+ if period & TriggerPeriod.y2017lowmu :
ranges.append( self.periodMap2017['N'] )
- if period & TriggerPeriod.y2018periodBF :
+ if period & TriggerPeriod.y2018periodBE :
ranges.append( self.periodMap2018['B'] )
ranges.append( self.periodMap2018['C'] )
ranges.append( self.periodMap2018['D'] )
ranges.append( self.periodMap2018['E'] )
+ if period & TriggerPeriod.y2018periodFI :
ranges.append( self.periodMap2018['F'] )
+ ranges.append( self.periodMap2018['G1'] )
+ ranges.append( self.periodMap2018['G2'] )
+ ranges.append( self.periodMap2018['G3'] )
+ ranges.append( self.periodMap2018['I'] )
+ if period & TriggerPeriod.y2018lowmu :
+ ranges.append( self.periodMap2018['G4'] )
+ ranges.append( self.periodMap2018['J'] )
+ if period & TriggerPeriod.y2018periodKQ :
+ ranges.append( self.periodMap2018['K'] )
+ ranges.append( self.periodMap2018['L'] )
+ ranges.append( self.periodMap2018['M'] )
+ ranges.append( self.periodMap2018['N'] )
+ ranges.append( self.periodMap2018['O'] )
+ ranges.append( self.periodMap2018['Q'] )
for run in self.grl.keys()[:]:
if not any([run >= x[0] and run <= x[1] for x in ranges]): self.grl.pop(run)
def test():
- print TriggerPeriodData( TriggerPeriod.y2015 ).grl
+ print TriggerPeriodData( TriggerPeriod.y2017 ).grl
+ print TriggerPeriodData( TriggerPeriod.y2017lowmu ).grl
if __name__ == "__main__":
sys.exit(test())
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
index d963373270464a13a57a91ac7b242afb25e4af1e..b0a1b4f9e2f457ed4dc41a760a327a4ab938c309 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
@@ -357,6 +357,7 @@ class ItemDef:
LVL1MenuItem('L1_TAU20_2TAU12I' ).setLogic( HA20 & HA12I.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU40_2TAU20IM' ).setLogic( HA40 & HA20IM.x(2) & physcond).setTriggerType( TT.calo )
LVL1MenuItem('L1_TAU20IM_2TAU12IM' ).setLogic( HA20IM & HA12IM.x(2) & physcond).setTriggerType( TT.calo )
+ LVL1MenuItem('L1_TAU60_2TAU40').setLogic( HA60 & HA40.x(2) & physcond).setTriggerType( TT.calo )
# mixed tau
LVL1MenuItem('L1_EM15VH_2TAU12' ).setLogic( EM15VH & HA12.x(2) & physcond).setTriggerType( TT.calo )
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py
index e70fe735b55d3312a6af04ce42938b3751d646ba..44cfd87ac533102666fbbc2f508ad1ceaab34aae 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py
@@ -411,7 +411,7 @@ def defineMenu():
"L1_TAU8_UNPAIRED_ISO","L1_TAU8_FIRSTEMPTY","L1_TAU8_UNPAIRED_NONISO",
# multi tau
- "L1_TAU20IM_2TAU12IM", "L1_TAU20_2TAU12", "L1_TAU40_2TAU20IM",
+ "L1_TAU20IM_2TAU12IM", "L1_TAU20_2TAU12", "L1_TAU40_2TAU20IM", "L1_TAU60_2TAU40",
# combined tau - lepton
"L1_EM15HI_2TAU12IM",
@@ -1111,6 +1111,7 @@ def defineMenu():
'L1_J40.0ETA25_XE50' : 177,
'L1_MU10_2J20' : 278,
'L1_TAU40_2TAU20IM' : 254,
+ 'L1_TAU60_2TAU40' : 274,
'L1_MU10_2J15_J20' : 255,
# freeing some CTPIDs
# 'L1_MBTSA0' : 170,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py
index f1e72ffddeac6166b8da411868cd74502cefb74d..0c01f98945bb6dfa8ff1d090dca4fc12cf0f8ae0 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v8.py
@@ -642,6 +642,7 @@ def setupMenu():
['tau0_perf_ptonly_L1TAU12', 'L1_TAU12', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
['tau0_perf_ptonly_L1TAU12IM', 'L1_TAU12IM', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
['tau0_perf_ptonly_L1TAU8', 'L1_TAU8', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
+
]
if TriggerFlags.doFTK():
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py
index 33dbb61adf9520ad2b0659a7daf74dc22a814f82..7442c6b7f9acd706e2e79f4842a80959e2a601d9 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7_primaries.py
@@ -210,11 +210,14 @@ def setupMenu():
TriggerFlags.METSlice.signatures = [
['xe110_pufit_L1XE50', 'L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
['xe110_pufit_L1XE55', 'L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe110_tc_lcw_L1XE50', 'L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe110_mht_L1XE50', 'L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
- #low pT
- ['xe35', 'L1_XE35',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe90_L1XE50', 'L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
['xe90_pufit_L1XE50', 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ #low pT
+ ['xe35', 'L1_XE35',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
]
if TriggerFlags.doFTK():
@@ -247,6 +250,24 @@ def setupMenu():
#ATR-19062
['tau25_medium1_tracktwo', 'L1_TAU12IM', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
['tau25_mediumRNN_tracktwoMVA', 'L1_TAU12IM', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
+
+ # ATR-19803
+ ['tau0_perf_ptonly_L1TAU12', 'L1_TAU12', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau160_perf_tracktwo_L1TAU100', 'L1_TAU100', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau160_idperf_tracktwo_L1TAU100', 'L1_TAU100', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau25_perf_tracktwo', 'L1_TAU12IM', [], [PhysicsStream, 'express'], [ 'RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau25_perf_tracktwoEF', 'L1_TAU12IM', [], [PhysicsStream, 'express'], [ 'RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau25_perf_tracktwoMVA', 'L1_TAU12IM', [], [PhysicsStream, 'express'], [ 'RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau25_medium1_tracktwoEF', 'L1_TAU12IM', [], [PhysicsStream, 'express'], [ 'RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau25_looseRNN_tracktwoMVA', 'L1_TAU12IM', [], [PhysicsStream, 'express'], [ 'RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau25_medium1NoPt_tracktwoEFmvaTES', 'L1_TAU12IM', [], [PhysicsStream, 'express'], [ 'RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau25_medium1_tracktwoEFmvaTES', 'L1_TAU12IM', [], [PhysicsStream, 'express'], [ 'RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM', 'L1_TAU20IM_2TAU12IM',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]]],
+ ['tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12', 'L1_TAU60',['L1_TAU60','L1_TAU12'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau80_medium1_tracktwo_L1TAU60","tau50_medium1_tracktwo_L1TAU12"]]],
+ ['tau80_medium1_tracktwo_L1TAU60_tau60_medium1_tracktwo_L1TAU40', 'L1_TAU60_2TAU40',['L1_TAU60','L1_TAU40'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau80_medium1_tracktwo_L1TAU60","tau60_medium1_tracktwo_L1TAU40"]]],
+ ['tau160_medium1_tracktwoEF_L1TAU100', 'L1_TAU100', [], [PhysicsStream], ['Legacy:Primary','RATE:SingleTau', 'BW:Tau'], -1],
+ ['tau160_mediumRNN_tracktwoMVA_L1TAU100', 'L1_TAU100', [], [PhysicsStream], ['Legacy:Primary','RATE:SingleTau', 'BW:Tau'], -1],
+
]
if TriggerFlags.doFTK():
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index 68785341ebd3904801225678ede6aa36ad44e373..a8f45863acb50415b3d0d29e41ac5e3e5fc2ab1c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -259,7 +259,7 @@ TauChainParts = {
'L1item' : '',
'chainPartName': '',
'threshold' : '',
- 'preselection' : ['r1', 'FTK', 'FTKRefit', 'FTKNoPrec', 'calo', 'track', 'ptonly', 'tracktwo', 'tracktwoEF', 'tracktwoMVA', 't2MVA' ],
+ 'preselection' : ['r1', 'FTK', 'FTKRefit', 'FTKNoPrec', 'calo', 'track', 'ptonly', 'tracktwo', 'tracktwoEF', 'tracktwoMVA', 't2MVA', 'tracktwoEFmvaTES' ],
'selection' : ['medium0', 'loose1', 'medium1', 'medium1NoPt', 'perf', 'perf0', 'cosmic', 'kaonpi1', 'kaonpi2', 'dipion1', 'dipion1loose', 'dipion2', 'dipion3', 'dikaon', 'dikaontight', 'dikaonmass', 'dikaonmasstight', 'singlepion', 'singlepiontight', 'verylooseRNN', 'looseRNN', 'mediumRNN', 'mRNN', 'tightRNN'],
'multiplicity' : '',
'trigType' : ['tau'],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py b/Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py
index 8583f40c1759c93bddd550891b583b973a5c5230..9ed750701322fdc7f7ddeb52b5d8a0b8c4f306d3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py
@@ -291,13 +291,13 @@ class L2EFChain_tau(L2EFChainDef):
# Strategies which need calorimeter pre-selection
needsCaloPre = ['calo', 'ptonly',
'track', 'tracktwo', 'tracktwoEF']
- needsCaloMVAPre = ['tracktwoMVA']
+ needsCaloMVAPre = ['tracktwoMVA', 'tracktwoEFmvaTES' ]
# Strategies which need fast-track finding
needsTrackTwoPre = ['tracktwo', 'tracktwoonly']
- needsTrackTwoNoPre = ['tracktwoEF','tracktwoMVA']
+ needsTrackTwoNoPre = ['tracktwoEF','tracktwoMVA', 'tracktwoEFmvaTES']
needsTrackPre = ['track', 'FTK', 'FTKRefit', 'FTKNoPrec']
# Strategies which need Run-II final hypo
- needsRun2Hypo = ['calo', 'ptonly', 'track', 'tracktwo', 'tracktwoEF', 'tracktwoMVA', 'FTK', 'FTKRefit', 'FTKNoPrec']
+ needsRun2Hypo = ['calo', 'ptonly', 'track', 'tracktwo', 'tracktwoEF', 'tracktwoMVA', 'FTK', 'FTKRefit', 'FTKNoPrec', 'tracktwoEFmvaTES']
fastTrackingUsed = needsTrackPre + needsTrackTwoPre + needsTrackTwoNoPre
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/tau/TauHypoProvider.py b/Trigger/TriggerCommon/TriggerMenu/python/tau/TauHypoProvider.py
index 7dbb0a4b77d4913c74391f439030130a725ccf5a..cff8b166f16c7ea58149c89d82ada502b77385e3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/tau/TauHypoProvider.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/tau/TauHypoProvider.py
@@ -104,7 +104,7 @@ class TauHypoProvider:
theThresh = self.thresholdsEF[(criteria, int(threshold))]
currentHypo = EFTauMVHypo(currentHypoKey, theVars, theThresh)
- if strategy in [ 'calo', 'ptonly', 'track', 'tracktwo', 'tracktwoEF', 'tracktwoMVA', 'FTK', 'FTKRefit', 'FTKNoPrec' ]:
+ if strategy in [ 'calo', 'ptonly', 'track', 'tracktwo', 'tracktwoEF', 'tracktwoMVA', 'FTK', 'FTKRefit', 'FTKNoPrec' , 'tracktwoEFmvaTES' ]:
# Simple implementation of 2015 pre-selection
currentHypoKey = 'l2'+part+'_tau'+threshold+'_'+criteria+'_'+strategy
@@ -142,7 +142,7 @@ class TauHypoProvider:
theThresh = [0,3,1,0.*self.GeV,-1111,0]
currentHypo = EFTauMVHypo(currentHypoKey, theVars, theThresh)
else:
- if strategy not in [ 'tracktwo', 'tracktwoEF', 'tracktwoMVA', 'FTK', 'FTKRefit', 'FTKNoPrec' ]:
+ if strategy not in [ 'tracktwo', 'tracktwoEF', 'tracktwoMVA', 'FTK', 'FTKRefit', 'FTKNoPrec', 'tracktwoEFmvaTES' ]:
theVars = ['LowerPtCut','LowerTrackPtCut']
theThresh = [int(threshold)*self.GeV,1.*self.GeV]
currentHypo = HLTTrackTauHypo(currentHypoKey, theVars, theThresh)
diff --git a/Trigger/TriggerCommon/TriggerMenu/scripts/generateUnprescaledLists.py b/Trigger/TriggerCommon/TriggerMenu/scripts/generateUnprescaledLists.py
index c55787993d9b1cd9b60bccc4412d7f8bc3e87e76..15d06fa8f6f8a05b43196741751dfab93157c018 100755
--- a/Trigger/TriggerCommon/TriggerMenu/scripts/generateUnprescaledLists.py
+++ b/Trigger/TriggerCommon/TriggerMenu/scripts/generateUnprescaledLists.py
@@ -8,6 +8,7 @@ from TriggerMenu.api.TriggerAPI import TriggerAPI
from TriggerMenu.api.TriggerEnums import TriggerPeriod, TriggerType
def main(outfolder):
+ TriggerAPI.setRelease("current")
with open(outfolder+"/list_unprescaled1p8e34.py","w") as outfile:
outfile.write(header())
for triggerType in TriggerType:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsSequenceSetup.py
index d0b2a9121727b08c8c214c366bd8747cbf5ee7ec..5411fba6d922feb94391f89a4d6df6d793c5f276 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bphysics/BphysicsSequenceSetup.py
@@ -4,14 +4,9 @@
# OutputLevel: INFO < DEBUG < VERBOSE
#
-from AthenaCommon.AppMgr import ServiceMgr
-
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
from AthenaConfiguration.AllConfigFlags import ConfigFlags
-
-ServiceMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection = False
-
TrackParticlesName = "HLT_xAODTracks_Muon"
def dimuL2Sequence(name = 'Dimu'):
@@ -36,4 +31,46 @@ def dimuL2Sequence(name = 'Dimu'):
return MenuSequence( Sequence = l2muNotCombSequence,
Maker = l2muNotCombViewsMaker,
Hypo = jpsiHypo,
- HypoToolGen = TrigMultiTrkHypoToolMTFromDict )
\ No newline at end of file
+ HypoToolGen = TrigMultiTrkHypoToolMTFromDict )
+
+def dimuEFSequence(name = 'Dimu'):
+ from AthenaCommon import CfgMgr
+ from AthenaCommon.CFElements import parOR, seqAND
+ from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+
+
+ dimuefViewNode = parOR("dimuefViewNode")
+
+ dimuefViewsMaker = EventViewCreatorAlgorithm("dimuefViewsMaker")
+ dimuefViewsMaker.ViewFallThrough = True
+ dimuefViewsMaker.RoIsLink = "roi" # -||-
+ dimuefViewsMaker.InViewRoIs = "DimuEFRoIs" # contract with the consumer
+ dimuefViewsMaker.Views = "DimuEFViewRoIs"
+ dimuefViewsMaker.ViewNodeName = dimuefViewNode.name()
+
+ dimuefRecoSequence = parOR("dimuefViewNode")
+
+ ViewVerifyEFCB = CfgMgr.AthViews__ViewDataVerifier("dimuefViewDataVerifier")
+ ViewVerifyEFCB.DataObjects = [( 'xAOD::MuonContainer' , 'StoreGateSvc+MuonsCB' )]
+ dimuefRecoSequence += ViewVerifyEFCB
+ dimuefSequence = seqAND( "dimuefSequence", [dimuefViewsMaker, dimuefRecoSequence] )
+
+ ### set up muCombHypo algorithm ###
+ from TrigBphysHypo.TrigMultiTrkHypoMTConfig import TrigMultiTrkHypoMT
+ from TrigBphysHypo.TrigMultiTrkHypoMTMonitoringConfig import TrigMultiTrkHypoAlgMTMonitoring
+
+ jpsiHypo = TrigMultiTrkHypoMT(name+"HypoAlgEF")
+ jpsiHypo.MuonCollectionKey = "MuonsCB"
+ jpsiHypo.particleType = 1
+ jpsiHypo.bphysCollectionKey = "TrigBphysEF"+name
+ jpsiHypo.nTrackMassMin = [100]
+ jpsiHypo.nTrackMassMax = [20000]
+ jpsiHypo.nTrk = 2
+ jpsiHypo.MonTool = TrigMultiTrkHypoAlgMTMonitoring("TrigMultiTrkHypoAlgEFMTMonitoring_"+name)
+
+ from TrigBphysHypo.TrigMultiTrkHypoMTConfig import TrigMultiTrkHypoToolMTFromDict
+
+ return MenuSequence( Sequence = dimuefSequence,
+ Maker = dimuefViewsMaker,
+ Hypo = jpsiHypo,
+ HypoToolGen = TrigMultiTrkHypoToolMTFromDict )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 3bfdc4f6634bc15e6204df932bdd706df0ea2dd0..5915722720e5c018a6de6b533bbe6bf896e005f9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -19,7 +19,7 @@ from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloSequenceSetup import precis
# so let's make them functions already now
#----------------------------------------------------------------
-def fastCaloSequenceCfg( flags ):
+def electronFastCaloCfg( flags ):
return fastCaloMenuSequence("ElectronFastCalo")
def electronSequenceCfg( flags ):
@@ -54,7 +54,7 @@ class ElectronChainConfiguration(ChainConfigurationBase):
elif 'etcut' in self.chainPart['addInfo']:
myStepNames += ["Step1_etcut"]
myStepNames += ["Step2_etcut"]
- #myStepNames += ["Step3_etcut"]
+ myStepNames += ["Step3_etcut"]
for step in myStepNames:
chainSteps += [self.getEtCutStep(step)]
else:
@@ -69,16 +69,16 @@ class ElectronChainConfiguration(ChainConfigurationBase):
def getEtCutStep(self, stepName):
if stepName == "Step1_etcut":
log.debug("Configuring step " + stepName)
- fastCalo = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None ) # the None will be used for flags in future
- chainStep =ChainStep(stepName, [fastCalo])
+ fastCalo = RecoFragmentsPool.retrieve( electronFastCaloCfg, None ) # the None will be used for flags in future
+ chainStep =ChainStep(stepName, [fastCalo], self.mult)
elif stepName == "Step2_etcut":
log.debug("Configuring step " + stepName)
electronReco = RecoFragmentsPool.retrieve( electronSequenceCfg, None )
- chainStep=ChainStep(stepName, [electronReco])
- #elif stepName == "Step3_etcut":
- # log.debug("Configuring step " + stepName)
- # precisionReco = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
- # chainStep=ChainStep(stepName, [precisionReco])
+ chainStep=ChainStep(stepName, [electronReco], self.mult)
+ elif stepName == "Step3_etcut":
+ log.debug("Configuring step " + stepName)
+ precisionReco = RecoFragmentsPool.retrieve( precisionCaloSequenceCfg, None )
+ chainStep=ChainStep(stepName, [precisionReco], self.mult)
else:
raise RuntimeError("chainStepName unknown: " + stepName )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
index 3f6a17edb10ff6e999cbcadb1fc9c0bf5e594101..ad4a67d946b50ad54b6f06cabce7c6db397e19ae 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/GenerateElectronChainDefs.py
@@ -2,6 +2,7 @@
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
from TriggerMenuMT.HLTMenuConfig.Egamma.ElectronDef import ElectronChainConfiguration as ElectronChainConfiguration
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
from AthenaCommon.Logging import logging
@@ -27,8 +28,7 @@ def generateChainConfigs( chainDict ):
if len(listOfChainDefs)>1:
- log.warning("Implement case for multi-electron chain!!")
- theChainDef = listOfChainDefs[0] #needs to be implemented properly
+ theChainDef = mergeChainDefs(listOfChainDefs, chainDict)
else:
theChainDef = listOfChainDefs[0]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
index 7391601534014e956ef14eff15ee97e4e2f9ec5f..b6c8e28638ab189ad5a78fde5c268ce71dd644ae 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonDef.py
@@ -15,8 +15,8 @@ from TriggerMenuMT.HLTMenuConfig.Egamma.PhotonSequenceSetup import photonMenuSeq
# fragments generating configuration will be functions in New JO,
# so let's make them functions already now
#----------------------------------------------------------------
-def fastCaloSequenceCfg( flags ):
- return fastCaloMenuSequence("Gamma")
+def gammaFastCaloCfg( flags ):
+ return fastCaloMenuSequence("GammaFastCalo")
def photonSequenceCfg( flags ):
return photonMenuSequence()
@@ -60,7 +60,7 @@ class PhotonChainConfiguration(ChainConfigurationBase):
def getFastCalo(self):
stepName = "Step1_g5_etcut"
log.debug("Configuring step " + stepName)
- fastCalo = RecoFragmentsPool.retrieve( fastCaloSequenceCfg, None ) # the None will be used for flags in future
+ fastCalo = RecoFragmentsPool.retrieve( gammaFastCaloCfg, None ) # the None will be used for flags in future
return ChainStep(stepName, [fastCalo])
def getPhoton(self):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloSequenceSetup.py
index c48af15cc0a2ef8672d6e9da3533e8b8a5904dce..0564f429f223d006dea5a1788e31a6e043888ef9 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PrecisionCaloSequenceSetup.py
@@ -7,7 +7,12 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFr
from AthenaCommon.CFElements import seqAND
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
from AthenaConfiguration.AllConfigFlags import ConfigFlags
+from TrigEDMConfig.TriggerEDMRun3 import recordable
+class precisionCaloMenuDefs(object):
+ """Static class to collect all string manipulation in Calo sequences """
+ precisionCaloClusters= recordable("HLT_CaloEMClusters")
+
def precisionCaloSequence(ConfigFlags):
""" Creates PrecisionCalo sequence """
# EV creator
@@ -20,7 +25,6 @@ def precisionCaloSequence(ConfigFlags):
# reco sequence
from TriggerMenuMT.HLTMenuConfig.Egamma.PrecisionCaloRec import precisionCaloRecoSequence
- # from TrigUpgradeTest.precisionCaloRec import precisionCaloRecoSequence
(precisionCaloInViewSequence, sequenceOut) = precisionCaloRecoSequence(InViewRoIs)
precisionCaloViewsMaker.ViewNodeName = precisionCaloInViewSequence.name()
@@ -39,6 +43,7 @@ def precisionCaloMenuSequence():
thePrecisionCaloHypo = TrigEgammaPrecisionCaloHypoAlgMT("precisionCaloHypo")
thePrecisionCaloHypo.CaloClusters = sequenceOut
+ precisionCaloMenuDefs.precisionCaloClusters = sequenceOut
return MenuSequence( Sequence = sequence,
Maker = precisionCaloViewsMaker,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/GenerateJetChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/GenerateJetChainDefs.py
index 582460c3dd9815fcc834415159cd65f8c1129a50..0a9e54852836d65dfb198a259ff80d0f44867222 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/GenerateJetChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/GenerateJetChainDefs.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
-from TriggerMenuMT.HLTMenuConfig.Jet.JetDef import JetChainConfiguration as JetChainConfiguration
+from TriggerMenuMT.HLTMenuConfig.Jet.JetChainConfiguration import JetChainConfiguration
from AthenaCommon.Logging import logging
@@ -25,9 +25,12 @@ def generateChainConfigs( chainDict ):
listOfChainDefs += [Jet]
log.debug('length of chaindefs %s', len(listOfChainDefs) )
-
+ # We should never use multiple reco definitions, as this
+ # cannot be handled by the hypos.
+ # FIXME: Check that all jet reco configs are identical
if len(listOfChainDefs)>1:
- log.warning("Implement case for multi-electron chain!!")
+ # Add reco consistency checking between all
+ log.warning("Multiple jet chainParts detected; reco consistency checks not yet implemented")
theChainDef = listOfChainDefs[0] #needs to be implemented properly
else:
theChainDef = listOfChainDefs[0]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
similarity index 60%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetDef.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
index 398b8722b7fb16c279fa4e45b16ac2d9115b8c96..209aebc19131c2b56e2c034934c714836c77c349 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
@@ -8,15 +8,6 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Egamma.JetDef")
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import ChainStep, RecoFragmentsPool
-from TriggerMenuMT.HLTMenuConfig.Jet.JetSequenceSetup import jetMenuSequence
-
-#----------------------------------------------------------------
-# fragments generating configuration will be functions in New JO,
-# so let's make them functions already now
-#----------------------------------------------------------------
-def jetSequence1Cfg( flags ):
- return jetMenuSequence()
-
#----------------------------------------------------------------
# Class to configure chain
#----------------------------------------------------------------
@@ -24,6 +15,11 @@ class JetChainConfiguration(ChainConfigurationBase):
def __init__(self, chainDict):
ChainConfigurationBase.__init__(self,chainDict)
+
+ # interpret the reco configuration only
+ # eventually should just be a subdict in the chainDict
+ recoKeys = ['recoAlg','dataType','calib','jetCalib','trkopt','cleaning']
+ self.recoDict = { key:self.dict["chainParts"][key] for key in recoKeys }
# ----------------------
# Assemble the chain depending on information from chainName
@@ -34,13 +30,9 @@ class JetChainConfiguration(ChainConfigurationBase):
# --------------------
# define here the names of the steps and obtain the chainStep configuration
# --------------------
- stepDictionary = {
- "": [self.getJetSequence1()]
- }
-
- ## This needs to be configured by the Jet Developer!!
- key = self.chainPart['extra']
- steps=stepDictionary[key]
+ # Only one step for now, but we might consider adding steps for
+ # reclustering and trimming workflows
+ steps=[self.getJetChainStep()]
chainSteps = []
for step in steps:
@@ -53,11 +45,16 @@ class JetChainConfiguration(ChainConfigurationBase):
# --------------------
# Configuration of steps
# --------------------
- def getJetSequence1(self):
- stepName = "Step1_jet"
- log.debug("Configuring step " + stepName)
- jetSeq1 = RecoFragmentsPool.retrieve( jetSequence1Cfg, None ) # the None will be used for flags in future
- return ChainStep(stepName, [jetSeq1])
+ def getJetChainStep(self):
+ from TriggerMenuMT.HLTMenuConfig.Jet.JetMenuSequences import jetMenuSequence
+ from TriggerMenuMT.HLTMenuConfig.Jet.JetRecoSequences import jetRecoDictToString
+
+ jetDefStr = jetRecoDictToString(self.recoDict)
+
+ stepName = "Step1_jet_"+jetDefStr
+ jetSeq1 = RecoFragmentsPool.retrieve( jetMenuSequence, None, **self.recoDict ) # the None will be used for flags in future
+ return ChainStep(stepName, [jetSeq1], self.mult)
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
similarity index 73%
rename from Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetSequenceSetup.py
rename to Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
index d97294178a4ce1fad36c8ec27d070a5312b4cc01..2e3fa9c8cc2b025f2c6934f0f5e66618de8b2162 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
@@ -2,23 +2,21 @@
#
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, MenuSequence
-from AthenaConfiguration.AllConfigFlags import ConfigFlags
-def jetMenuSequence():
+def jetMenuSequence(dummyFlags,**recoDict):
""" Function to create the jet Menu Sequence"""
## RoIs = 'FSJETRoI'
#reco sequence
- from TriggerMenuMT.HLTMenuConfig.Jet.JetSequenceDefs import jetAthSequence
- (JetAthSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(jetAthSequence,ConfigFlags)
-
+ from TriggerMenuMT.HLTMenuConfig.Jet.JetRecoSequences import jetAthSequence, jetRecoDictToString
+ (JetAthSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(jetAthSequence,None,**recoDict)
+
#hypo
from TrigHLTJetHypo.TrigHLTJetHypoConf import TrigJetHypoAlgMT
from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetHypoToolFromDict
- hypo = TrigJetHypoAlgMT("TrigJetHypoAlgMT")
+ hypo = TrigJetHypoAlgMT("TrigJetHypoAlgMT_"+jetRecoDictToString(recoDict))
hypo.Jets = sequenceOut
-
return MenuSequence( Sequence = JetAthSequence,
Maker = InputMakerAlg,
Hypo = hypo,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
new file mode 100644
index 0000000000000000000000000000000000000000..b1a42b68239e0a7a08f084a6e86050824fd916c0
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
@@ -0,0 +1,178 @@
+#
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+
+from AthenaCommon.CFElements import parOR, seqAND
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import RecoFragmentsPool
+
+# Translate the reco dict to a string for suffixing etc
+def jetRecoDictToString(jetRecoDict):
+ strtemp = "{recoAlg}_{dataType}_{calib}_{jetCalib}"
+ return strtemp.format(**jetRecoDict)
+
+# Configure reco from a dict of options
+# Start from a FullScan inputs maker
+def jetAthSequence(dummyFlags, **jetRecoDict):
+ from TrigT2CaloCommon.CaloDef import clusterFSInputMaker
+ InputMakerAlg= clusterFSInputMaker()
+
+ # Does nothing now, but may need to use this to toggle Insitu calib step
+ # in which case it should be deduced from input flags
+ dataSource = "data" # or mc
+
+ (recoSequence, sequenceOut) = RecoFragmentsPool.retrieve( jetRecoSequence, None, dataSource=dataSource, **jetRecoDict )
+
+ jetDefString = jetRecoDictToString(jetRecoDict)
+ JetAthSequence = seqAND("jetAthSequence_"+jetDefString,[InputMakerAlg, recoSequence ])
+ return (JetAthSequence, InputMakerAlg, sequenceOut)
+
+# Dummy flag arg needed so that each reco sequence is held separately
+# in the RecoFragmentsPool -- only the kwargs are used to distinguish
+# different sequences. New convention is just to pass "None" for flags
+def jetRecoSequence( dummyFlags, dataSource, RoIs = 'FSJETRoI', **jetRecoDict):
+
+ jetDefString = jetRecoDictToString(jetRecoDict)
+ recoSeq = parOR( "JetRecSeq_"+jetDefString, [])
+
+ recoAlg = jetRecoDict["recoAlg"]
+ doGrooming = recoAlg.endswith("t") # Maybe other grooming strategies
+ doRecluster = recoAlg.endswith("r")
+ radius = float(recoAlg.lstrip("a").rstrip("tr"))/10
+ jetNamePrefix = "Trig"
+
+ from JetRecConfig.JetDefinition import JetConstit, xAODType, JetDefinition
+ from JetRecConfig.JetRecConfig import getConstitPJGAlg, getJetAlgorithm
+ if doRecluster:
+ # Reclustering -- recursively call the basic jet reco and add this to the sequence,
+ # then add another jet algorithm to run the reclustering step
+ basicJetRecoDict = dict(jetRecoDict)
+ basicJetRecoDict["recoAlg"] = "a4"
+ (basicJetRecoSequence,basicJetsName) = RecoFragmentsPool.retrieve(jetRecoSequence,None,dataSource=dataSource, **basicJetRecoDict)
+ recoSeq += basicJetRecoSequence
+
+ rcJetConstit = JetConstit( xAODType.Jet, [])
+ rcJetDef = JetDefinition( "AntiKt", 1.0, rcJetConstit)
+ rcJetsFullName = jetNamePrefix+rcJetDef.basename+"RCJets_"+jetRecoDict["jetCalib"]
+
+ rcModList= []
+ rcJetConstit.inputname = basicJetsName
+
+ rcConstitPJAlg = getConstitPJGAlg( rcJetConstit )
+ rcConstitPJKey = rcConstitPJAlg.PJGetter.OutputContainer
+ recoSeq += rcConstitPJAlg
+
+ rcPJs = [rcConstitPJKey]
+ rcJetRecAlg = getJetAlgorithm(rcJetsFullName, rcJetDef, rcPJs, rcModList)
+
+ recoSeq += rcJetRecAlg
+
+ sequenceOut = rcJetsFullName
+
+ elif doGrooming:
+ # Grooming needs to be set up similarly to reclustering
+ # --> build ungroomed jets, then add a grooming alg
+ pass
+ else:
+ # Normal jet reconstruction, no reclustering or grooming
+
+ # Start by adding the topocluster reco sequence
+ # We always make LCW topoclusters, then deal with
+ # calibration states later
+ from TrigT2CaloCommon.CaloDef import HLTFSTopoRecoSequence
+ (topoClusterSequence, clustersKey) = RecoFragmentsPool.retrieve(HLTFSTopoRecoSequence,RoIs)
+ recoSeq += topoClusterSequence
+
+ # Potentially add particle flow reconstruction
+ # Work in progress
+ if jetRecoDict["dataType"] == "pf":
+ from eflowRec.PFHLTSequence import PFHLTSequence
+ pfseq = RecoFragmentsPool.retrieve(PFHLTSequence,clustersKey)
+ recoSeq += pfseq
+
+ # Define the jet constituents to be interpreted by JetRecConfig
+ def defineJetConstit(jetRecoDict,clustersKey):
+ # Get the details of the constituent definition:
+ # type, mods and the input container name
+ if "tc" in jetRecoDict["dataType"]:
+ # apply this scale
+ if jetRecoDict["calib"] == "em":
+ constitMods = ["EM"]
+ elif jetRecoDict["calib"] == "lcw":
+ constitMods = ["LC"]
+ # read from this cluster collection,
+ # overriding the standard offline collection
+ jetConstit = JetConstit( xAODType.CaloCluster, constitMods )
+ jetConstit.rawname = clustersKey
+ # apply constituent pileup suppression
+ if "sk" in jetRecoDict["dataType"]:
+ constitMods.append("SK")
+ else:
+ jetConstit.inputname = clustersKey
+ return jetConstit
+
+ jetConstit = defineJetConstit(jetRecoDict,clustersKey)
+ doConstitMods = ("sk" in jetRecoDict["dataType"])
+ if doConstitMods:
+ from JetRecConfig.ConstModHelpers import getConstitModAlg
+ recoSeq += getConstitModAlg(jetConstit,"HLT")
+
+ # Arbitrary min pt for fastjet, set to be low enough for MHT(?)
+ # Could/should adjust higher for large-R
+ jetDef = JetDefinition( "AntiKt", radius, jetConstit, ptmin=5000.)
+
+ # chosen jet collection
+ jetsFullName = jetNamePrefix+jetDef.basename+"Jets_"+jetRecoDict["jetCalib"]
+ sequenceOut = jetsFullName
+
+ from JetRecConfig import JetRecConfig
+ # Import the standard jet modifiers as defined for offline
+ # We can add/configure these differently if desired. In particular,
+ # we could define a TriggerJetMods module if settings need to
+ # diverge substantially e.g. track/vertex collections
+ from JetRecConfig.StandardJetMods import jetmoddict
+ # Make generating the list a bit more comprehensible
+ def getModSpec(modname,modspec=''):
+ return (jetmoddict[modname],str(modspec))
+ # Minimum modifier set for calibration w/o track GSC
+ # Should eventually build in more mods, depend on track info etc
+ calibMods = []
+
+ if jetRecoDict["jetCalib"] != "nojcalib":
+ # Translate calib specification into something understood by
+ # the calibration config helper
+ calibContext,calibSeq = {
+ ("a4","subjes"): ("TrigRun2","JetArea_EtaJES_GSC"), # Calo GSC only
+ ("a4","subjesIS"): ("TrigRun2","JetArea_EtaJES_GSC_Insitu"), # Calo GSC only
+ ("a10","subjes"): ("TrigUngroomed","JetArea_EtaJES"),
+ }[(jetRecoDict["recoAlg"],jetRecoDict["jetCalib"])]
+
+ calibSpec = calibContext+":"+dataSource+":"+calibSeq
+ calibMods = [getModSpec("ConstitFourMom"),
+ getModSpec("CaloEnergies"),
+ getModSpec("Calib",calibSpec),
+ getModSpec("Sort")]
+ jetModList = calibMods + [getModSpec("Filter",5000)]
+
+ # Add the PseudoJetGetter alg to the sequence
+ constitPJAlg = getConstitPJGAlg( jetConstit )
+ constitPJKey = constitPJAlg.PJGetter.OutputContainer
+ recoSeq += constitPJAlg
+ # Basic list of PseudoJets is just the constituents
+ # Append ghosts (tracks) if desired
+ pjs = [constitPJKey]
+
+ if "sub" in jetRecoDict["jetCalib"]:
+ # Add the event shape alg if needed for area subtraction
+ from JetRecConfig.JetRecConfig import getEventShapeAlg
+ eventShapeAlg = getEventShapeAlg( jetConstit, constitPJKey, "TrigJet" )
+ recoSeq += eventShapeAlg
+
+ # Generate a JetAlgorithm to run the jet finding and modifiers
+ # (via a JetRecTool instance).
+ jetRecAlg = JetRecConfig.getJetAlgorithm(jetsFullName, jetDef, pjs, jetModList)
+ recoSeq += jetRecAlg
+ # End of basic jet reco
+ pass
+
+ return (recoSeq,sequenceOut)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetSequenceDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetSequenceDefs.py
deleted file mode 100644
index e5e3da26ab99f7e461cda57c79fc77d1e942deda..0000000000000000000000000000000000000000
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetSequenceDefs.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-#
-
-from AthenaCommon.CFElements import seqAND
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool
-
-## def jetFSInputMaker( ):
-## """ Creates the jet inputMaker for FS"""
-## RoIs = jetCollections.L1RoIs
-## #'FSJETRoI'
-## from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
-## InputMakerAlg = InputMakerForRoI("JetInputMaker", RoIsLink="initialRoI")
-## InputMakerAlg.RoIs=RoIs
-## return InputMakerAlg
-
-
-def jetAthSequence(ConfigFlags):
- from TrigT2CaloCommon.CaloDef import clusterFSInputMaker
- InputMakerAlg= clusterFSInputMaker()
- (recoSequence, sequenceOut) = jetRecoSequence()
-
- JetAthSequence = seqAND("jetAthSequence",[InputMakerAlg, recoSequence ])
- return (JetAthSequence, InputMakerAlg, sequenceOut)
-
-
-def jetRecoSequence(RoIs = 'FSJETRoI'):
- from TrigT2CaloCommon.CaloDef import HLTFSTopoRecoSequence
- (jetRecoSequence, caloclusters) = RecoFragmentsPool.retrieve(HLTFSTopoRecoSequence, RoIs)
-
- from AthenaCommon.AppMgr import ToolSvc
- # Jet Reco:
-
- # PseudoJetAlgorithm uses a tool to convert IParticles (eg CaloClusters)
- # to PseudoJets, which are the input to FastJet. The PseudoJets are
- # stored in a PseudoJetContainer, which is written top the event store.
-
- from JetRec.JetRecConf import (PseudoJetAlgorithm,
- PseudoJetGetter)
-
-
- pseudoJetGetter = PseudoJetGetter('simpleJobPJGetter')
- pseudoJetGetter.InputContainer = caloclusters
- pseudoJetGetter.OutputContainer = 'PseudoJetEMTopo'
- pseudoJetGetter.Label = ''
-
- ToolSvc += pseudoJetGetter
-
- algo3 = PseudoJetAlgorithm()
- algo3.PJGetter = pseudoJetGetter
-
- jetRecoSequence += algo3
-
-
-
- # JetAlgorithm and its Tools... Reads in PseudoJetContainers,
- # alls FastJet to cluster PseudoJets,
- # and then convert the output of FastJet (new pseudojets) to Atlas jets.
-
- from JetRec.JetRecConf import (JetAlgorithm,
- JetRecTool,
- JetFromPseudojet,
- JetFinder)
-
-
- name = 'simpleJob'
-
- # jet from Pseudo jet takes a pseudo jet returned by FastJet
- jetBuilder = JetFromPseudojet(name+'JetBuilder')
- ToolSvc += jetBuilder
-
- jetFinder = JetFinder(name+'JetFinder')
- jetFinder.JetBuilder = jetBuilder
- jetFinder.JetAlgorithm = 'AntiKt'
- jetFinder.VariableRMinRadius = -1
- jetFinder.VariableRMassScale = -1
- jetFinder.GhostArea = 0.01
- jetFinder.JetRadius = 0.4
- jetFinder.PtMin = 7000.
- jetFinder.RandomOption = 1 # 1: used run/evt number to make seed
-
- ToolSvc += jetFinder
-
- jetRecTool = JetRecTool()
- jetRecTool.InputContainer = '' # name of a jet collection.
- jetRecTool.OutputContainer = 'jets'
- jetRecTool.JetFinder = jetFinder
- jetRecTool.JetModifiers = []
- jetRecTool.Trigger = False
- jetRecTool.InputPseudoJets = ['StoreGateSvc+PseudoJetEMTopo']
-
- ToolSvc += jetRecTool
-
- algo4 = JetAlgorithm()
- algo4.Tools = [jetRecTool]
- jetRecoSequence += algo4
-
-
- sequenceOut= jetRecTool.OutputContainer
-
- return (jetRecoSequence,sequenceOut)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/README.md b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..91146d2d8e0d70e403ba33c9f385d5998432a2f8
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/README.md
@@ -0,0 +1,39 @@
+# Overview of HLT jet reco configuration modules
+
+## GenerateJetChainDefs.py
+
+Called by the menu code in `[TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py](https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py)` to translate the HLT chain item into a concrete algorithm sequence.
+
+The menu code creates a chain dictionary from the chain name, of which the jet parts are given to `GenerateJetChainDefs.generateChainConfigs` to be interpreted by `JetChainConfiguration`.
+
+## JetChainConfiguration.py
+
+Defines the `JetChainConfiguration` object responsible for interpreting the chain dictionary and building a `Chain` object that is returned to the menu.
+
+This extracts the reco configuration from the jet chain dictionary, using it to generate a `MenuSequence` that forms the jet `ChainStep`. It may be desirable to implement multiple `ChainSteps` for filtering purposes in the future, mainly to allow fast reco and filtering before slower reco is executed.
+
+`JetChainConfiguration` internally calls `JetMenuSequences.jetMenuSequence()` to produce the `MenuSequence` item, which contains a reco sequence followed by a hypo selection.
+
+## JetMenuSequences.py
+
+The jet chains are currently made up of only a single step, which runs reco+hypo. The menu sequence is constructed from:
+* a concrete reco sequence, generated by `JetRecoSequences.jetAthSequence()`;
+* the `InputMakerAlg` for this sequence (largely irrelevant as jets work in FullScan rather than in EventViews);
+* a hypo alg (one instance per jet collection i.e. reco config); and
+* a hypo tool generator function that will define the selection based on the `chainDict` contents (configuration defined in `TrigHLTJetHypo`).
+
+The reco sequence and hypo alg names are suffixed with a string summarising the reco options.
+
+## JetRecoSequences.py
+
+This module provides the `jetAthSequence()` and `jetRecoSequence()` functions that define the reconstruction sequence for any given reconstruction configuration.
+
+The `jetAthSequence` holds the full reconstruction as well as an `InputMakerAlg` which for FullScan jet triggers (AFAIK) mostly serves to communicate L1 seed information to determine which hypo tools should be run.
+
+The reconstruction sequence is determined from the contents of the reco information in the `chainDict`, and will contain some subset of:
+* Calo reco sequence: cell unpacking and topoclustering -- one instance shared between all jet chains
+* Constituent modifications [optional] -- pileup suppression on topoclusters or corrections to PFlow four-vectors
+* PseudoJetGetters & algs -- conversion of the ATLAS EDM into `fastjet` EDM
+* JetAlgorithm -- holds the jet finder tools and any modifiers e.g. calibration
+The reco sequence may be nested further in the case of reclustering or trimming workflows, in which case the "basic" jet reco from clusters is embedded in a second sequence, which continues by running the second step reconstruction.
+Configuration of the Athena components is handled by the `Reconstruction/Jet/JetRecConfig` package.
\ No newline at end of file
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/GenerateMETChainDefs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/GenerateMETChainDefs.py
index dec42fa8158b76c2920485b0622ae65c20e02357..ba5bbd9bee4c64194ae14cc74fc778890af296fe 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/GenerateMETChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/GenerateMETChainDefs.py
@@ -2,6 +2,7 @@
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitChainDict
from TriggerMenuMT.HLTMenuConfig.MET.METChainDef import MetChainConfiguration as MetChainConfiguration
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
from AthenaCommon.Logging import logging
@@ -28,7 +29,7 @@ def generateChainConfigs( chainDict ):
if len(listOfChainDefs)>1:
log.warning("Implement case for mulit-step met chain!!")
- theChainDef = listOfChainDefs[0] #needs to be implemented properly
+ theChainDef = mergeChainDefs(listOfChainDefs, chainDict)
else:
theChainDef = listOfChainDefs[0]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
index e20e1f2f327d58605a87c6a5fbacb1d4a5f76f4f..9865c0e8702339ed0c84a1a6559ba75bffff9d34 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainConfigurationBase.py
@@ -1,5 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+from AthenaCommon.Logging import logging
+log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase' )
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, RecoFragmentsPool
@@ -24,19 +26,32 @@ class ChainConfigurationBase(object):
self.chainPartL1Item = self.chainPart['L1item']
self.mult = int(self.chainPart['multiplicity'])
self.chainPartName = self.chainPart['chainPartName']
+ self.chainPartNameNoMult = ''
+ self.chainPartNameNoMultwL1 = ''
+
self.chainPartNameNoMult = self.chainPartName[1:] if self.mult > 1 else self.chainPartName
- self.chainPartNameNoMult += "_"+self.chainL1Item
+ self.chainPartNameNoMultwL1 += "_"+self.chainL1Item
+
+ self.L1Threshold = self.chainPartL1Item or self.chainL1Item
+ if ('L1_' in self.L1Threshold):
+ self.L1Threshold = self.L1Threshold.replace('L1_', '')
+ self.L1Threshold = self.L1Threshold.split('_')[0]
+ self.L1Threshold = self.L1Threshold[1:] if self.L1Threshold[0].isdigit() else self.L1Threshold
+ self.L1ItemToPass = 'L1_'+self.L1Threshold
# this is the cache, hoping to be able to get rid of it in future
def checkRecoFragmentPool(mySequenceCfg):
mySequence = RecoFragmentsPool.retrieve(mySequenceCfg, None) # the None will be used for flags in future
return mySequence
- def buildChain(self, chainSteps):
+ def buildChain(self, chainSteps):
+ log.debug("Building Chain %s with L1 seed %s, and multiplicity %s", (self.chainName, self.L1ItemToPass, str(self.mult)))
+
myChain = Chain(name = self.chainName,
- Seed = self.chainL1Item,
+ Seed = self.L1ItemToPass,
ChainSteps = chainSteps)
+
return myChain
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDefInMenu.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDefInMenu.py
index a269f70b14af2fa89ca3cb9021f3a9d6c694f757..2d9c19b2c7bfe299ef34c1d83264fb176c6013cc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDefInMenu.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDefInMenu.py
@@ -15,7 +15,13 @@ def namedtuple_with_defaults(typename, field_names, default_values=()):
# namedtuple class with some defaults set for those entries that do not require settings
ChainProp = namedtuple_with_defaults("ChainProp",
- ['name', 'l1SeedItem', 'l1SeedThresholds', 'stream', 'groups', 'merging', 'topoStartFrom'],
- {'stream':['Main'], 'l1SeedItem': '', 'l1SeedThresholds': [], 'merging':[], 'topoStartFrom': False})
+ ['name', 'l1SeedItem', 'l1SeedThresholds', 'stream', 'groups', 'mergingStrategy', 'mergingOrder', 'mergingOffset', 'topoStartFrom'],
+ {'stream':['Main'],
+ 'l1SeedItem': '',
+ 'l1SeedThresholds': [],
+ 'mergingStrategy':'parallel',
+ 'mergingOrder': [],
+ 'mergingOffset': -1,
+ 'topoStartFrom': False})
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
index 326ab7510317d14859bbce354e57df8f9d6d1e3f..010a52669a47ac4ab4224effcba9c7b19d6d316e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainDictTools.py
@@ -1,8 +1,8 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from copy import deepcopy
from AthenaCommon.Logging import logging
-log = logging.getLogger( 'TriggerMenu.menu.ChainDictTools' )
+log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools' )
def splitInterSignatureChainDict(chainDict):
@@ -98,7 +98,6 @@ def splitChainDict(chainDict):
def setupTopoStartFrom(topoThresholds, theChainDef):
-
from TrigGenericAlgs.TrigGenericAlgsConf import MergeTopoStarts
if len(topoThresholds) > 1:
@@ -106,7 +105,6 @@ def setupTopoStartFrom(topoThresholds, theChainDef):
m = MergeTopoStartsConfig("testInstance")
log.debug(m)
-
te0 = None
te1 = None
outTE = None
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
new file mode 100644
index 0000000000000000000000000000000000000000..8be517e129baebbcb8f564830ba701f00e451348
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/ChainMerging.py
@@ -0,0 +1,112 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.Logging import logging
+log = logging.getLogger( 'TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging' )
+
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
+from copy import deepcopy
+
+
+def mergeChainDefs(listOfChainDefs, chainDict, strategy="parallel", offset=-1):
+
+ log.debug("Combine by using %s merging", strategy)
+
+ if strategy=="parallel":
+ return mergeParallel(listOfChainDefs, chainDict['L1item'], offset)
+ elif strategy=="serial":
+ #return mergeSerial(listOfChainDefs,offset)
+ log.error("Serial mergin not yet implemented.")
+ return -1
+ else:
+ log.error("Merging failed for %s. Merging strategy '%s' not known.", (listOfChainDefs, strategy))
+ return -1
+
+
+
+def mergeParallel(chainDefList, chainL1Item, offset):
+
+ if offset != -1:
+ log.error("Offset for parallel merging not implemented.")
+
+ allSteps = []
+ nSteps = []
+ chainName = ''
+ #l1Seed = ''
+ l1Seed = chainL1Item
+ combChainSteps =[]
+
+ for cConfig in chainDefList:
+ if chainName == '':
+ chainName = cConfig.name
+ elif chainName != cConfig.name:
+ log.error("Something is wrong with the combined chain name: cConfig.name = %s while chainName = %s", cConfig.name, chainName)
+
+ if l1Seed == '':
+ l1Seed = cConfig.seed
+ elif l1Seed != cConfig.seed:
+ log.debug("Taking the overall L1 item of the chain (%s) and not the indiv set ones for the chain parts (%s)", l1Seed, cConfig.seed)
+
+ allSteps.append(cConfig.steps)
+ nSteps.append(len(cConfig.steps))
+
+ from itertools import izip_longest
+ orderedSteps = list(izip_longest(*allSteps))
+ myOrderedSteps = deepcopy(orderedSteps)
+
+ for steps in myOrderedSteps:
+ mySteps = list(steps)
+ combStep = makeChainSteps(mySteps)
+ combChainSteps.append(combStep)
+
+ # check if all chain parts have the same number of steps
+ sameNSteps = all(x==nSteps[0] for x in nSteps)
+ if sameNSteps is True:
+ log.debug("All chain parts have the same number of steps")
+ else:
+ log.debug("Have to deal with uneven number of chain steps, there might be none's appearing in sequence list => to be fixed")
+
+ combinedChainDef = Chain(chainName, l1Seed, combChainSteps)
+ for step in combinedChainDef.steps:
+ log.debug(' Step %s', step)
+
+ return combinedChainDef
+
+
+
+
+def makeChainSteps(steps):
+ stepName = ''
+ stepSeq = []
+ stepMult = 0
+ stepNumber = ''
+ log.debug(" steps %s ", steps)
+ for step in steps:
+ if step is None:
+ continue
+ if len(step.sequences) > 1:
+ log.error("More than one menu sequence found in combined chain!!")
+ seq = step.sequences[0]
+ log.debug(" step type %s", type(step.sequences))
+ log.debug(" step.name %s", step.name)
+ log.debug(" step.seq %s", step.sequences)
+ log.debug(" step.mult %s", step.multiplicity)
+ currentStep = step.name
+ stepNameParts = currentStep.split('_')
+ if stepNumber == '':
+ stepNumber = stepNameParts[0]
+
+ # the step naming for combined chains needs to be revisted!!
+ stepName = stepNumber + '_' + stepNameParts[1]
+ stepSeq.append(seq)
+ stepMult += step.multiplicity
+
+ log.debug(" - BB stepName %s", stepName)
+ log.debug(" - BB stepSeq %s", stepSeq)
+ log.debug(" - BB stepMult %s", stepMult)
+
+ theChainStep = ChainStep(stepName, stepSeq, stepMult)
+ log.debug(" - BBB the chain step %s", theChainStep)
+
+ return theChainStep
+
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
index 12765c6813f601b208255784d3000099fd12ebc3..2d3c95df342732d6e1e2a3132eda993adab4160d 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
@@ -31,50 +31,62 @@ class DictFromChainName(object):
# these if/elif/else statements are due to temporary development
if type(chainInfo) == str:
m_chainName = chainInfo
- m_L1item = ''
m_L1chainParts = []
m_stream = ''
m_groups = []
+ m_mergingStrategy = 'parallel'
+ m_mergingOffset = -1
+ m_mergingOrder = []
+ m_topoStartFrom = ''
elif type(chainInfo) == list:
m_chainName = chainInfo[0]
- m_L1item = ''
m_L1chainParts = chainInfo[1]
m_stream = chainInfo[2]
m_groups = chainInfo[3]
+ m_mergingStrategy = 'parallel'
+ m_mergingOffset = -1
+ m_mergingOrder = []
+ m_topoStartFrom = ''
elif 'ChainProp' in str(type(chainInfo)):
m_chainName = chainInfo.name
- m_L1item = ''
m_L1chainParts = chainInfo.l1SeedThresholds
m_stream = chainInfo.stream
m_groups = chainInfo.groups
+ m_mergingStrategy = chainInfo.mergingStrategy
+ m_mergingOffset = chainInfo.mergingOffset
+ m_mergingOrder = chainInfo.mergingOrder
+ m_topoStartFrom = chainInfo.topoStartFrom
else:
logDict.error("Format of chainInfo passed to genChainDict not known")
- m_L1item = self.getOverallL1item(m_chainName)
+ m_L1item = self.getOverallL1item(m_chainName)
logDict.debug("Analysing chain with name: %s", m_chainName)
chainDict = self.analyseShortName(m_chainName, m_L1chainParts, m_L1item)
logDict.debug('ChainProperties: %s', chainDict)
+ # setting the L1 item
+ chainDict['L1item'] = m_L1item
chainDict['stream'] = m_stream
chainDict['groups'] = m_groups
+ chainDict['mergingStrategy']= m_mergingStrategy
+ chainDict['mergingOffset']= m_mergingOffset
+ chainDict['mergingOrder'] = m_mergingOrder
+ chainDict['topoStartFrom']= m_topoStartFrom
logDict.debug('Setting chain multiplicities')
allChainMultiplicities = self.getChainMultFromDict(chainDict)
chainDict['chainMultiplicities'] = allChainMultiplicities
- # setting the L1 item
- if (chainDict['L1item']== ''):
- chainDict['L1item'] = m_L1item
if logDict.isEnabledFor(logging.DEBUG):
import pprint
pp = pprint.PrettyPrinter(indent=4, depth=8)
- logDict.debug('FINAL dictionary: %s', pp.pformat(chainDict))
-
+ logDict.debug('SUPER FINAL dictionary: %s', pp.pformat(chainDict))
+
return chainDict
@@ -82,24 +94,20 @@ class DictFromChainName(object):
if '_L1' in m_chainName:
return True
else:
+ logDict.warning("Chain name %s not complying with naming convention: L1 item missing! PLEASE FIX THIS!!", m_chainName)
return False
def getOverallL1item(self, chainName):
mainL1 = ''
- if not self.checkL1inName(chainName):
- logDict.warning("Chain name %s not complying with naming convention: L1 item missing! PLEASE FIX THIS!!", chainName)
+ if self.checkL1inName(chainName) is False:
+ logDict.warning("Cannot determine L1 item name for dictionary, please fix naming")
+ return mainL1
+ else:
+ # this assumes that the last string of a chain name is the overall L1 item
+ cNameParts = chainName.split("_L1")
+ mainL1 = 'L1_' + cNameParts[-1]
return mainL1
- # this assumes that the last string of a chain name is the overall L1 item
- cNameParts = chainName.split("_")
- mainL1 = cNameParts[-1]
-
- if "L1" not in mainL1:
- logDict.warning("Chain name not complying with naming convention: L1 item missing! PLEASE FIX THIS!!")
- return ''
- mainL1 = mainL1.replace("L1", "L1_")
-
- return mainL1
def getChainMultFromDict(self, chainDict):
@@ -165,10 +173,14 @@ class DictFromChainName(object):
genchainDict = deepcopy(ChainDictTemplate)
genchainDict['chainName'] = chainName
+ # remove the L1 item from the name
+ cName = deepcopy(chainName)
+ cName = cName.replace(L1item_main.replace("L1_", "_L1"),'')
+
# ---- specific chain part information ----
allChainProperties=[]
- cparts = chainName.split("_")
- if 'HLT' in chainName:
+ cparts = cName.split("_")
+ if 'HLT' in cName:
cparts.remove('HLT')
@@ -184,7 +196,7 @@ class DictFromChainName(object):
topo = cpart
topoindex = cindex
toposIndexed.update({topo : topoindex})
- chainName=chainName.replace('_'+cpart, '')
+ cName=cName.replace('_'+cpart, '')
topos.append(topo)
genchainDict['topo'] = topos
@@ -221,19 +233,19 @@ class DictFromChainName(object):
m_groupdict = m.groupdict()
# Check whether the extra contains a special keyword
- multiChainIndices = [i for i in range(len(chainName)) if ( chainName.startswith(cpart, i) ) ]
+ multiChainIndices = [i for i in range(len(cName)) if ( cName.startswith(cpart, i) ) ]
logDict.debug("MultiChainIndices: %s", multiChainIndices)
for theMultiChainIndex in multiChainIndices:
# this check is necessary for the bjet chains, example: j45_bloose_3j45
# j45 would be found in [0, 13], and 3j45 in [12]
# so need to make sure the multiplicities are considered here!
- if (theMultiChainIndex != 0) & (chainName[theMultiChainIndex-1] != '_'):
+ if (theMultiChainIndex != 0) & (cName[theMultiChainIndex-1] != '_'):
continue
if theMultiChainIndex not in multichainindex:
multichainindex.append(theMultiChainIndex)
- logDict.debug("ChainName: %s", chainName)
+ logDict.debug("ChainName: %s", cName)
logDict.debug("cpart: %s", cpart)
logDict.debug("m_groupdict: %s", m_groupdict)
logDict.debug("multichainindex: %s", multichainindex)
@@ -248,7 +260,7 @@ class DictFromChainName(object):
elif cpart =='noalg':
- multichainindex.append(chainName.index(cpart))
+ multichainindex.append(cName.index(cpart))
m_groupdict = {'signature': 'Streaming', 'threshold': '', 'multiplicity': '',
'trigType': 'streamer', 'extra': ''}
if 'Streaming' not in signatureNames:
@@ -258,7 +270,7 @@ class DictFromChainName(object):
elif cpart=='mb':
logDict.debug('Doing MB')
- multichainindex.append(chainName.index(cpart))
+ multichainindex.append(cName.index(cpart))
m_groupdict = {'signature': 'MinBias', 'threshold': '', 'multiplicity': '',
'trigType': 'mb', 'extra': ''}
if 'MinBias' not in signatureNames:
@@ -267,7 +279,7 @@ class DictFromChainName(object):
elif cpart=='hi':
logDict.debug('Doing HI')
- multichainindex.append(chainName.index(cpart))
+ multichainindex.append(cName.index(cpart))
m_groupdict = {'signature': 'HeavyIon', 'threshold': '', 'multiplicity': '',
'trigType': 'mb', 'extra': ''}
if 'HeavyIon' not in signatureNames:
@@ -276,7 +288,7 @@ class DictFromChainName(object):
elif cpart in AllowedCosmicChainIdentifiers:
logDict.debug('COSMIC CHAIN from CosmicDef.py')
- multichainindex.append(chainName.index(cpart))
+ multichainindex.append(cName.index(cpart))
m_groupdict = {'signature': 'Cosmic', 'threshold': '', 'multiplicity': '',
'trigType': 'cosmic', 'extra': ''}
if 'Cosmic' not in signatureNames:
@@ -286,7 +298,7 @@ class DictFromChainName(object):
elif cpart in AllowedCalibChainIdentifiers:
logDict.debug('CALIB CHAIN from Calibration')
- multichainindex.append(chainName.index(cpart))
+ multichainindex.append(cName.index(cpart))
m_groupdict = {'signature': 'Calibration', 'threshold': '', 'multiplicity': '',
'trigType': 'calib', 'extra': ''}
if 'Calibration' not in signatureNames:
@@ -296,7 +308,7 @@ class DictFromChainName(object):
elif cpart in AllowedMonitorChainIdentifiers:
logDict.debug('Mon CHAIN from Monitor')
- multichainindex.append(chainName.index(cpart))
+ multichainindex.append(cName.index(cpart))
m_groupdict = {'signature': 'Monitoring', 'threshold': '', 'multiplicity': '',
'trigType': 'calib', 'extra': ''}
if 'Monitoring' not in signatureNames:
@@ -306,7 +318,7 @@ class DictFromChainName(object):
elif cpart in AllowedBeamspotChainIdentifiers:
logDict.debug('Beamspot CHAIN from Beamspot')
- multichainindex.append(chainName.index(cpart))
+ multichainindex.append(cName.index(cpart))
m_groupdict = {'signature': 'Beamspot', 'threshold': '', 'multiplicity': '',
'trigType': 'beamspot', 'extra': ''}
if 'Beamspot' not in signatureNames:
@@ -316,7 +328,7 @@ class DictFromChainName(object):
elif cpart=='eb':
logDict.debug('EnhancedBias chain')
- multichainindex.append(chainName.index(cpart))
+ multichainindex.append(cName.index(cpart))
m_groupdict = {'signature': 'EnhancedBias', 'threshold': '', 'multiplicity': '',
'trigType': 'eb', 'extra': ''}
if 'EnhancedBias' not in signatureNames:
@@ -329,15 +341,15 @@ class DictFromChainName(object):
# ---- ----
multichainparts=[]
multichainindex = sorted(multichainindex, key=int)
- cN = chainName
+ cN = deepcopy(cName)
for i in reversed(multichainindex):
if i!=0:
- logDict.debug('Appending to multichainparts (i!=0): %s', chainName[i:len(cN)])
+ logDict.debug('Appending to multichainparts (i!=0): %s', cName[i:len(cN)])
- multichainparts.append(chainName[i:len(cN)])
+ multichainparts.append(cName[i:len(cN)])
cN = cN[0:i-1]
else:
- logDict.debug('Appending to multichainparts: %s', chainName[i:len(cN)])
+ logDict.debug('Appending to multichainparts: %s', cName[i:len(cN)])
multichainparts.append(cN)
logDict.debug("multichainparts: %s",multichainparts)
@@ -391,7 +403,7 @@ class DictFromChainName(object):
L1index = L1index+1 # to compensate the _
L1itemfromChainName = chainparts[L1index:]
if (L1itemfromChainName[2]=='_'):
- raise RuntimeError('ERROR IN CHAIN NAMING: L1 items in chainNames are specified e.g. *_L1EM4, not *_L1_EM4')
+ raise RuntimeError('ERROR IN CHAIN NAMING: L1 items in cNames are specified e.g. *_L1EM4, not *_L1_EM4')
else:
L1item = L1itemfromChainName[:2]+'_'+L1itemfromChainName[2:]
if (L1item[-1] == '_'):
@@ -413,7 +425,7 @@ class DictFromChainName(object):
chainProperties['L1item'] = L1items_chainParts[chainindex]
if (L1item != chainProperties['L1item']) & (L1item !=''):
logDict.info("L1 item in name (%s) of chain %s does not match with given L1item list (%s)!",
- L1item, chainName, chainProperties['L1item'])
+ L1item, cName, chainProperties['L1item'])
else:
logDict.debug('No L1 item specified in the name')
@@ -517,9 +529,12 @@ class DictFromChainName(object):
# ---- depending on if signatures are different in this chain, break up the chainProperties dictionary ----
- # ---- finally also taking care of the signatrue key ----
+ # ---- finally also taking care of the signature key ----
genchainDict['chainParts'] = allChainProperties
- genchainDict['signature'] = allChainProperties[0]['signature']
+ for cPart in allChainProperties:
+ genchainDict['signatures'] += [cPart['signature']]
+
+ #genchainDict['signature'] = allChainProperties[0]['signature']
logDict.debug('genchainDict that is passed as Final dict %s', genchainDict)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
index 7554a582b21131ab962433bfc5e5e82d5749f7d6..fbccbb4ef22a7bd62864f170ea28ea7c43a9659d 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/GenerateMenuMT.py
@@ -12,6 +12,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import makeHLTTree
from TriggerMenuMT.HLTMenuConfig.Menu import DictFromChainName
from TriggerMenuMT.HLTMenuConfig.Menu.ChainDictTools import splitInterSignatureChainDict
from TriggerMenuMT.HLTMenuConfig.Menu.MenuPrescaleConfig import MenuPrescaleConfig
+from TriggerMenuMT.HLTMenuConfig.Menu.ChainMerging import mergeChainDefs
from AthenaCommon.Logging import logging
@@ -47,7 +48,7 @@ class GenerateMenuMT(object):
self.signaturesToGenerate = []
self.allSignatures = ['Egamma', 'Muon', 'Jet', 'Bjet', 'Bphysics', 'MET', 'Tau',
'HeavyIon', 'Beamspot', 'Cosmic', 'EnhancedBias',
- 'Monitor', 'Calib', 'Streaming', ] #, AFP, 'Combined'
+ 'Monitor', 'Calib', 'Streaming', 'Combined'] #, AFP
self.calibCosmicMonSigs = ['Beamspot', 'Cosmic', 'EnhancedBias', 'Monitor', 'Calib', 'Streaming']
# flags
@@ -202,7 +203,7 @@ class GenerateMenuMT(object):
return chains
- def generateChainConfig(self, chainDicts):
+ def generateChainConfig(self, mainChainDict):
"""
# Assembles the chain configuration and returns a chain object with (name, L1see and list of ChainSteps)
"""
@@ -221,16 +222,19 @@ class GenerateMenuMT(object):
sigFolder = sig
subSigs = [sig]
- for ss in subSigs:
- exec('import TriggerMenuMT.HLTMenuConfig.' + sigFolder + '.Generate' + ss + 'ChainDefs')
- self.availableSignatures.append(ss)
+ for ss in subSigs:
+ if sigFolder == 'Combined':
+ continue
+ else:
+ exec('import TriggerMenuMT.HLTMenuConfig.' + sigFolder + '.Generate' + ss + 'ChainDefs')
+ self.availableSignatures.append(ss)
except ImportError:
log.exception('Problems when importing ChainDef generating code for %s', sig)
# split the the chainDictionaries for each chain and print them in a pretty way
- chainDicts = splitInterSignatureChainDict(chainDicts)
+ chainDicts = splitInterSignatureChainDict(mainChainDict)
if log.isEnabledFor(logging.DEBUG):
import pprint
@@ -254,7 +258,7 @@ class GenerateMenuMT(object):
else:
sigFolder = currentSig
- if currentSig in self.availableSignatures:
+ if currentSig in self.availableSignatures and currentSig != 'Combined':
try:
log.debug("Trying to get chain config for %s", currentSig)
functionToCall ='TriggerMenuMT.HLTMenuConfig.' + sigFolder + '.Generate' + currentSig + 'ChainDefs.generateChainConfigs(chainDict)'
@@ -268,15 +272,26 @@ class GenerateMenuMT(object):
log.debug('ChainConfigs %s ', chainConfigs)
listOfChainConfigs.append(chainConfigs)
+ if log.isEnabledFor(logging.DEBUG):
+ import pprint
+ pp = pprint.PrettyPrinter(indent=4, depth=8)
+ log.debug('mainChainDict dictionary: %s', pp.pformat(mainChainDict))
+
+
+ # This part is to deal with combined chains between different signatures
if len(listOfChainConfigs) == 0:
log.error('No Chain Configuration found ')
return False
+
elif len(listOfChainConfigs)>1:
- if ("mergingStrategy" in chainDicts[0].keys()):
- log.warning("Need to define merging strategy, returning only first chain part configuration")
- theChainConfig = listOfChainConfigs[0]
- else:
- log.error("No merging strategy specified for combined chain %s", chainDicts[0]['chainName'])
+ log.debug("Merging strategy from dictionary: %s", mainChainDict["mergingStrategy"])
+ theChainConfig = mergeChainDefs(listOfChainConfigs, mainChainDict, mainChainDict["mergingStrategy"], mainChainDict["mergingOffset"])
+
+ # This needs to be added for topological chains - needs implementation
+ #doTopo = self.CheckIntraSignatureTopo(chainDicts) and chainDict["topo"]
+ #if doTopo:
+ # theChainDef = TriggerMenu.combined.generateCombinedChainDefs._addTopoInfo(theChainDef,chainDicts,listOfChainDefs)
+
else:
theChainConfig = listOfChainConfigs[0]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
index e4abbdd371d7b40a278514dc43e8715512b8342d..b611de9da676038cd1ee2fa83ad2f0d5cc862812 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
@@ -9,7 +9,7 @@
++ Seeds
-++ Combined chains
+++ Combined chain strategy
- The combined chains use duplicates of the single-object-HypoAlg, called HypoAlgName_for_stepName.
These duplicates are connected to a dedicated ComboHypoAlg (added by the framework), able to count object multiplicity
@@ -25,9 +25,6 @@
"""
-
-
-
# Classes to configure the CF graph, via Nodes
from AthenaCommon.CFElements import parOR, seqAND, seqOR, isSequence
from AthenaCommon.Logging import logging
@@ -35,7 +32,7 @@ from AthenaCommon.AlgSequence import dumpSequence
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFDot import stepCF_DataFlow_to_dot, stepCF_ControlFlow_to_dot, all_DataFlow_to_dot
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponentsNaming import CFNaming
-import sys, copy
+import copy
log = logging.getLogger('HLTCFConfig')
@@ -186,6 +183,8 @@ def makeHLTTree(HLTChains, newJO=False, triggerConfigHLT = None):
if len(l1decoder) != 1 :
raise RuntimeError(" Can't find 1 instance of L1Decoder in topSequence, instead found this in topSequence "+str(topSequence.getChildren()) )
+ # take L1Decoder out of topSeq
+ topSequence.remove( l1decoder )
# set CTP chains before creating the full tree (and the monitor)
EnabledChainNamesToCTP = dict([ (c.name, c.seed) for c in HLTChains])
@@ -193,6 +192,9 @@ def makeHLTTree(HLTChains, newJO=False, triggerConfigHLT = None):
# main HLT top sequence
hltTop = seqOR("HLTTop")
+
+ # put L1Decoder here
+ hltTop += l1decoder
# add the HLT steps Node
steps = seqAND("HLTAllSteps")
@@ -354,7 +356,6 @@ def createDataFlow(chains, allDicts):
if len(filter_input) == 0 or (len(filter_input) != 1 and not chain_step.isCombo):
log.error("ERROR: Filter for step %s has %d inputs! One is expected", chain_step.name, len(filter_input))
- sys.exit("ERROR, in configuration of step "+chain_step.name)
# get the filter:
@@ -589,7 +590,6 @@ def findFilter(filter_name, cfseqList):
#foundFilters = [cfseq.filter for cfseq in cfseqList if filter_name in cfseq.filter.Alg.name()]
if len(foundFilters) > 1:
log.error("found %d filters with name %s", len( foundFilters ), filter_name)
- sys.exit("ERROR, in filter configuration")
found = bool(foundFilters)
if found:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
index 8c35f9213f0690ee79929159989ca44ff354c59b..8add498930e67e6e948e6d0c8a38717ff0642a14 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFDot.py
@@ -248,10 +248,10 @@ def getValuesProperties(node):
for k, cval in alg.getValuedProperties().items():
if type(cval) is list:
for val in cval:
- if val is '': # CAT type(val) is None ??
+ if val == '': # CAT type(val) is None ??
if val not in Excluded:
values.append(val)
- elif cval is '': # CAT type(val) is None ??
+ elif cval == '': # CAT type(val) is None ??
if cval not in Excluded:
values.append(cval)
else:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 6cf942c9e463280b8d4c0880ac3230e047bfba63..9fcadb4750bb9ad5920841eadc79786e9069b7b0 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -17,12 +17,13 @@ def setupMenu():
PhysicsStream="Main"
SingleMuonGroup = ['RATE:SingleMuon', 'BW:Muon']
- #MultiMuonGroup = ['RATE:MultiMuon', 'BW:Muon']
+ MultiMuonGroup = ['RATE:MultiMuon', 'BW:Muon']
SingleElectronGroup = ['RATE:SingleElectron', 'BW:Electron']
- #MultiElectronGroup = ['RATE:MultiElectron', 'BW:Electron']
+ MultiElectronGroup = ['RATE:MultiElectron', 'BW:Electron']
SinglePhotonGroup = ['RATE:SinglePhoton', 'BW:Photon']
#MultiPhotonGroup = ['RATE:MultiPhoton', 'BW:Photon']
SingleMETGroup = ['RATE:MET', 'BW:MET']
+ #MultiMETGroup = ['RATE:MultiMET', 'BW:MultiMET']
SingleJetGroup = ['RATE:SingleJet', 'BW:Jet']
MultiJetGroup = ['RATE:MultiJet', 'BW:Jet']
SingleBjetGroup = ['RATE:SingleBJet', 'BW:BJet']
@@ -40,12 +41,14 @@ def setupMenu():
ChainProp(name='HLT_mu6_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu20_ivar_L1MU6', groups=SingleMuonGroup),
- ChainProp(name='HLT_2mu6Comb_L1MU6', groups=SingleMuonGroup),
- ChainProp(name='HLT_2mu6_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6_ivarmedium_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6noL1_L1MU6', groups=SingleMuonGroup),
ChainProp(name='HLT_mu6_msonly_L1MU6', groups=SingleMuonGroup),
+
+ ChainProp(name='HLT_2mu6Comb_L12MU6', groups=MultiMuonGroup),
+ ChainProp(name='HLT_2mu6_L12MU6', groups=MultiMuonGroup),
+
]
TriggerFlags.EgammaSlice.signatures = [
@@ -54,21 +57,28 @@ def setupMenu():
ChainProp(name='HLT_e3_etcut_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e5_etcut_L1EM3', groups=SingleElectronGroup),
ChainProp(name='HLT_e7_etcut_L1EM3', stream=[PhysicsStream, 'express'], groups=SingleElectronGroup),
- #-------------END OF ElectronChains
+ # currently disabled, seems to be a problem with the precision calo step
+ #ChainProp(name='HLT_2e3_etcut_L12EM3', stream=[PhysicsStream], groups=MultiElectronGroup),
+ #ChainProp(name='HLT_e3_etcut_e7_etcut_L12EM3', stream=[PhysicsStream], groups=MultiElectronGroup),
+ # enabling only one step
+ #ChainProp(name='HLT_2e3_etcut1step_L12EM3', stream=[PhysicsStream], groups=MultiElectronGroup),
+ #ChainProp(name='HLT_e3_etcut1step_e7_etcut1step_L12EM3', stream=[PhysicsStream], groups=MultiElectronGroup),
+
+ #chain with asymmetric number of steps not yet working
+ #ChainProp(name='HLT_e3_etcut1step_e7_etcut_L12EM3', stream=[PhysicsStream], groups=MultiElectronGroup),
# PhotonChains------------
ChainProp(name='HLT_g5_etcut_L1EM3', groups=SinglePhotonGroup),
- #-------------END OF PhotonChains
-
]
TriggerFlags.METSlice.signatures = [
ChainProp(name='HLT_xe30_cell_L1XE10', groups=SingleMETGroup),
ChainProp(name='HLT_xe65_cell_L1XE50', groups=SingleMETGroup),
-# ChainProp(name='HLT_xe30_mht_L1XE10', groups=SingleMETGroup),
+ #ChainProp(name='HLT_xe30_mht_L1XE10', groups=SingleMETGroup),
ChainProp(name='HLT_xe30_tcpufit_L1XE10', groups=SingleMETGroup),
- #waiting for merging strategy of chain parts
- #ChainProp(name='HLT_xe30_cell_xe30_tcpufit_L1XE10', groups=SingleMETGroup),
+
+ # MultiMET Chain
+ #ChainProp(name='HLT_xe30_cell_xe30_tcpufit_L1XE10', groups=MultiMETGroup),
]
TriggerFlags.JetSlice.signatures = [
@@ -78,6 +88,9 @@ def setupMenu():
ChainProp(name='HLT_j225_gsc420_boffperf_split_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j260_320eta490_L1J20', groups=SingleJetGroup),
+
+ ChainProp(name='HLT_j460_a10_lcw_subjes_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10r_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_3j200_L1J20', groups=MultiJetGroup),
ChainProp(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20', groups=SingleJetGroup),
@@ -96,7 +109,11 @@ def setupMenu():
#ChainProp(name="HLT_tau25_medium1_tracktwo_L1TAU12IM", groups=SingleTauGroup),
]
TriggerFlags.BphysicsSlice.signatures = [ ]
- TriggerFlags.CombinedSlice.signatures = []
+ TriggerFlags.CombinedSlice.signatures = [
+ ChainProp(name='HLT_e3_etcut1step_mu6fast_L1EM8I_MU10', l1SeedThresholds=['L1_EM8I', 'L1_MU10'], stream=[PhysicsStream], groups=MultiElectronGroup), #L1 item thresholds in wrong order (EM first, then MU)
+ #ChainProp(name='HLT_mu8_e8_etcut_L1MU6_EM7', l1SeedThresholds=['L1_MU6', 'L1_EM7'], stream=[PhysicsStream], groups=MultiElectronGroup), #L1 item thresholds in wrong order (EM first, then MU)
+ #ChainProp(name='HLT_e8_etcut1step_j85_L1EM3_J20', l1SeedThresholds=['L1_EM3', 'L1_J20'], stream=[PhysicsStream], groups=MultiElectronGroup),
+ ]
TriggerFlags.HeavyIonSlice.signatures = []
TriggerFlags.BeamspotSlice.signatures = []
TriggerFlags.MinBiasSlice.signatures = []
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 886b368c86a4193a1b3ca7b40b51f7b79fca0115..5baceed10a73ae8d872499f5e62340f76276aacc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-import sys, re, copy
+import re, copy
from AthenaCommon.Logging import logging
log = logging.getLogger('MenuComponents')
@@ -42,7 +42,7 @@ class AlgNode(Node):
self.inputProp=inputProp
def addDefaultOutput(self):
- if self.outputProp is not '':
+ if self.outputProp != '':
self.addOutput(("%s_%s"%(self.Alg.name(),self.outputProp)))
def setPar(self, prop, name):
@@ -78,10 +78,10 @@ class AlgNode(Node):
if name in outputs:
log.debug("Warning, %s already set in %s, DH not added",name, self.name)
else:
- if self.outputProp is not '':
+ if self.outputProp != '':
self.setPar(self.outputProp,name)
else:
- sys.exit("no OutputProp set")
+ log.error("no OutputProp set")
Node.addOutput(self, name)
@@ -101,10 +101,10 @@ class AlgNode(Node):
if name in inputs:
log.debug("Warning, %s already set in %s, DH not added",name, self.name)
else:
- if self.inputProp is not '':
+ if self.inputProp != '':
self.setPar(self.inputProp,name)
else:
- sys.exit("no InputProp set")
+ log.error("no InputProp set")
Node.addInput(self, name)
@@ -230,15 +230,14 @@ class ComboMaker(AlgNode):
cval = self.Alg.getProperties()[self.prop] # check necessary to see if chain was added already?
if type(cval) is dict:
if chain in cval.keys():
- log.error("ERROR in cofiguration: ComboAlg %s has already been configured for chain %s", self.name, chain)
- sys.exit("ERROR, in chain configuration")
+ log.error("ERROR in cofiguration: ComboAlg %s has already been configured for chain %s", self.Alg.name(), chain)
else:
- cval[chain]=[allMultis]
+ cval[chain]=allMultis
else:
cval=newdict
setattr(self.Alg, self.prop, cval)
- log.debug("Added chain %s to ComboAlg %s", self.getPar(self.prop), self.name)
+ log.debug("ComboAlg %s has now these chains chain %s", self.Alg.name(), self.getPar(self.prop))
@@ -325,7 +324,6 @@ class MenuSequence(object):
hypo_output = CFNaming.hypoAlgOutName(self.hypo.Alg.name(), input_maker_output)
if len(self.hypo.getOutputList()):
log.error("Hypo " + self.hypo.name() +" has already an output configured: you may want to duplicate the Hypo!")
- sys.exit("ERROR, in chain configuration")
self.hypo.addOutput(hypo_output)
# needed for drawing
@@ -363,7 +361,6 @@ def DoMapSeedToL1Decoder(seed):
stripSeed = filter(lambda x: x.isalpha(), seed)
if stripSeed not in mapSeedToL1Decoder:
log.error("Seed "+ seed + " not mapped to any Decision objects! Available are: " + str(mapSeedToL1Decoder.values()))
- sys.exit("ERROR, in chain configuration")
return (mapSeedToL1Decoder[stripSeed])
#################################################
@@ -376,7 +373,10 @@ class Chain(object):
self.seed=Seed
self.vseeds=[]
vseeds = Seed.strip().split("_")
- vseeds.pop(0) #remove first L1 string
+ if vseeds[0] == 'L1':
+ vseeds.pop(0) #remove first L1 string
+ else:
+ log.debug('Threshol(d)s were passed')
# split multi seeds
for seed in vseeds:
split=re.findall(r"(\d+)?([A-Z]+\d+)", seed)
@@ -419,7 +419,6 @@ class Chain(object):
else:
log.error("found %d sequences in this chain and %d seeds. What to do??", tot_seq, tot_seed)
- sys.exit("ERROR, in chain configuration")
def decodeHypoToolConfs(self, allChainDicts):
""" This is extrapolating the hypotool configuration from the (combined) chain name"""
@@ -433,7 +432,6 @@ class Chain(object):
if len(chainDict['chainParts']) != len(step.sequences):
log.error("Error in step %s: found %d chain parts and %d sequences", step.name, len(chainDict['chainParts']), len(step.sequences))
- sys.exit("ERROR, in chain configuration")
for seq, chainDictPart in zip(step.sequences, chainDict['chainParts']):
if seq.ca is not None: # The CA merging took care of everything
@@ -478,14 +476,13 @@ class CFSequence(object):
filter_output = self.filter.getOutputList()
if len(filter_output) == 0:
log.error("ERROR, no filter outputs are set!")
- sys.exit("ERROR, no filter outputs are set!")
+
if len(self.step.sequences):
# check whether the number of filter outputs are the same as the number of sequences in the step
if len(filter_output) != len(self.step.sequences):
log.error("Found %d filter outputs and %d MenuSequences in Step %s", len(self.filter.getOutputList()), len(self.step.sequences), self.step.name)
- sys.exit("ERROR: Found %d filter outputs differnt from %d MenuSequences in Step %s", len(self.filter.getOutputList()), len(self.step.sequences), self.step.name)
nseq=0
for seq in self.step.sequences:
filter_out = filter_output[nseq]
@@ -530,6 +527,7 @@ class ChainStep(object):
def __init__(self, name, Sequences=[], multiplicity=1):
self.name = name
self.sequences=[]
+ self.multiplicity = multiplicity
self.isCombo=multiplicity>1
#self.isCombo=len(Sequences)>1
self.combo=None
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuUtil.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuUtil.py
index 4a80299d726b6627f5cceb6b99c0114a7d819358..9f283b70f0eb61c089d9bb3431f5ce50c0c3171a 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuUtil.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuUtil.py
@@ -4,7 +4,7 @@ from TriggerJobOpts.TriggerFlags import TriggerFlags
from AthenaCommon.Logging import logging
-log = logging.getLogger('TriggerMenu.menu.MenuUtil.py')
+log = logging.getLogger('TriggerMenuMT.HLTMenuConfig.Menu.MenuUtil.py')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 417996738b1999cbd9be5458775b95d4ec863bef..353f03c4ea8f75d23a5dad76951b7bb01c693e5b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -48,7 +48,7 @@ ChainDictTemplate = {
'chainName' : '',
'L1item' : '',
'topo' : '',
- 'signatures' : '',
+ 'signatures' : [],
'stream' : '',
'groups' : [],
'EBstep' : '',
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
index 80f64c23d8428b883daf9278521f040066e12396..655d7530f11a8b1a8ac9c54cf103448c5925ae39 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py
@@ -94,63 +94,63 @@ class MuonChainConfiguration(ChainConfigurationBase):
stepName = 'Step1_mufast'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( muFastSequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
# --------------------
def getmuComb(self):
stepName = 'Step1_muComb'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( muCombSequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
# --------------------
def getmuEFSA(self):
stepName = 'Step1_muEFSA'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( muEFSASequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
# --------------------
def getmuEFMS(self):
stepName = 'Step1_muEFMS'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( muEFMSSequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
# --------------------
def getmuIso(self):
stepName = 'Step1_muIso'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( muIsoSequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
# --------------------
def getmuEFCB(self):
stepName = 'Step1_muEFCB'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( muEFCBSequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
# --------------------
def getFSmuEFSA(self):
stepName = 'Step1_FSmuEFSA'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( FSmuEFSASequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
# --------------------
def getFSmuEFCB(self):
stepName = 'Step1_FSmuEFCB'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( FSmuEFCBSequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
#---------------------
def getmuEFIso(self):
stepName = 'Step1_muEFIso'
log.debug("Configuring step " + stepName)
muSeq = RecoFragmentsPool.retrieve( muEFIsoSequenceCfg, None)
- return ChainStep(stepName, [muSeq])
+ return ChainStep(stepName, [muSeq], self.mult)
#--------------------
def getmuMSEmpty(self):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
index f78730a9665374c99a5111318d5c3303712c446d..4d72263622b482d048c35c09a40784af02599069 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py
@@ -2,8 +2,6 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
#
-from AthenaCommon.AppMgr import ServiceMgr
-
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
from AthenaCommon.CFElements import parOR, seqAND
from AthenaConfiguration.AllConfigFlags import ConfigFlags
@@ -24,8 +22,6 @@ muonCombinedRecFlags.printSummary = False
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
-ServiceMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection = False
-
#-----------------------------------------------------#
### ************* Step1 ************* ###
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index b71d57d6adcf1d29d073fb8cb617aeb30ff0450a..7da657b3330758e7571e561000b2c42903e40798 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -598,7 +598,6 @@ def muEFCBRecoSequence( RoIs, name ):
ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("muonCBIDViewDataVerifier")
ViewVerifyTrk.DataObjects = [( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+'+TrackParticlesName ),
( 'SCT_FlaggedCondData' , 'StoreGateSvc+SCT_FlaggedCondData' ),
- ( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),
( 'xAOD::IParticleContainer' , 'StoreGateSvc+'+TrackParticlesName )]
if globalflags.InputFormat.is_bytestream():