diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
index b91dc7a9cb673c89faa2b18ab96db880d34f66ff..12f3ebb13d59421501fb7f8be8afdaaf47542ad0 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
@@ -59,7 +59,7 @@ atlas_add_component( AthenaPoolTest
src/RDOReaderDoubleSelector.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaPoolTestData CaloDetDescrLib CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GeoPrimitives Identifier EventInfo GaudiKernel InDetIdentifier InDetReadoutGeometry InDetRawData InDetCompetingRIOsOnTrack InDetPrepRawData InDetRIO_OnTrack LArRecEvent TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMaterialOnTrack TrkParameters TrkTrack TrkVertexOnTrack )
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaPoolTestData CaloDetDescrLib CaloEvent CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities GeoPrimitives Identifier EventInfo GaudiKernel InDetIdentifier InDetReadoutGeometry InDetRawData InDetCompetingRIOsOnTrack InDetPrepRawData InDetRIO_OnTrack LArRecEvent TrkSurfaces TrkCompetingRIOsOnTrack TrkEventPrimitives TrkMaterialOnTrack TrkParameters TrkTrack TrkVertexOnTrack EventInfoMgtLib )
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/Calorimeter/CaloBadChannelTool/CMakeLists.txt b/Calorimeter/CaloBadChannelTool/CMakeLists.txt
index bab675063dc5307c0e581dede0460078560fae5d..c39f645f516c8da248454da5c954207ce7c06ebb 100644
--- a/Calorimeter/CaloBadChannelTool/CMakeLists.txt
+++ b/Calorimeter/CaloBadChannelTool/CMakeLists.txt
@@ -23,14 +23,9 @@ atlas_add_component( CaloBadChannelTool
# Install files from the package:
atlas_install_headers( CaloBadChannelTool )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_python_modules( python/*.py )
-
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
+# Tests:
atlas_add_test( CaloBadChanToolConfig_test
SCRIPT python -m CaloBadChannelTool.CaloBadChanToolConfig
PROPERTIES TIMEOUT 300
diff --git a/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt b/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
index 2c6f36cb696f6c29daf7e87865a56fabafb41991..50707e0da7fc38e100df5d6a8f44fe383d500797 100644
--- a/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
+++ b/Calorimeter/CaloCondBlobAlgs/CMakeLists.txt
@@ -30,13 +30,5 @@ atlas_add_component( CaloCondBlobAlgs
# Install files from the package:
atlas_install_headers( CaloCondBlobAlgs )
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/Calorimeter/CaloCondBlobAlgs/python/CaloCondTools.py b/Calorimeter/CaloCondBlobAlgs/python/CaloCondTools.py
index e5a7d33dc982fa976cc2e17fd4d0b7d33990b2ab..0c6cca9d1d1f2b0904afedb53854ae878f1b6b91 100644
--- a/Calorimeter/CaloCondBlobAlgs/python/CaloCondTools.py
+++ b/Calorimeter/CaloCondBlobAlgs/python/CaloCondTools.py
@@ -461,12 +461,12 @@ class CaloBlobWriter(CaloCondLogger):
if isinstance(since, tuple):
iovString = "[%i,%i] - [%i,%i]" % (since[0],since[1],until[0],until[1])
else:
- sinceInfo = time.localtime( sinceCool / UNIX2COOL )
- untilInfo = time.localtime(min(UNIXTMAX, (untilCool/UNIX2COOL)))
+ sinceInfo = time.localtime( sinceCool//UNIX2COOL )
+ untilInfo = time.localtime(min(UNIXTMAX, (untilCool//UNIX2COOL)))
untilStr = "<infinity>"
if untilCool<cool.ValidityKeyMax:
untilStr = time.asctime(untilInfo)
- if (untilCool/UNIX2COOL)>UNIXTMAX:
+ if (untilCool//UNIX2COOL)>UNIXTMAX:
untilStr = " > "+untilStr
iovString = "[%s] - [%s]" % (time.asctime(sinceInfo), untilStr)
diff --git a/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt b/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
index b7bc891cede1f2ef5d8399bf563d6d99d4ab50bc..51d446b0f6ab4702fb282ba71322dfd1085b06d3 100644
--- a/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
+++ b/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
@@ -50,14 +50,6 @@ atlas_add_component( CaloCondPhysAlgs
CaloConditions CaloEvent CaloUtilsLib AthenaPoolUtilities Identifier xAODEventInfo LArHV LArReadoutGeometry LArSimEvent CxxUtils)
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_install_scripts( share/CaloRescaleNoiseHV.sh share/CaloNoise_fillDB.py share/CaloPedestalShift.sh share/CaloPedestal_fillDB.py share/CaloScaleNoise_jobOptions.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMB-EMEC_PS_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/EMB-EMEC_PS_Energy_Rescale.py
index f63d91abf33b9373cc1821c3f7bc029033040439..42534df70dbf3eb939efd9aefcbdd3f520546256 100644
--- a/Calorimeter/CaloCondPhysAlgs/share/EMB-EMEC_PS_Energy_Rescale.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/EMB-EMEC_PS_Energy_Rescale.py
@@ -141,10 +141,10 @@ theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.roo
#Periode C1-C8 (28 Jun - 23 Jul)
theOutputConditionsAlg.Run1 = RunNumber
theOutputConditionsAlg.LB1 = 1
-
+
#theOutputConditionsAlg.Run2 = LastRunNumber + 1
#theOutputConditionsAlg.LB2 = 0
-
+
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=CONDBR2"
from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
svcMgr += IOVRegistrationSvc()
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale.py
index 306939d251298ff3ef87290bd00e1cabe1e59299..198a88c227de9a5076499f2ee8501351552b8ad5 100644
--- a/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale.py
@@ -141,10 +141,10 @@ theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.roo
#Periode C1-C8 (28 Jun - 23 Jul)
theOutputConditionsAlg.Run1 = RunNumber
theOutputConditionsAlg.LB1 = 1
-
+
theOutputConditionsAlg.Run2 = LastRunNumber + 1
theOutputConditionsAlg.LB2 = 0
-
+
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
svcMgr += IOVRegistrationSvc()
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale_1.py b/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale_1.py
index 35f835d71a16b639bf9dde9c7a55a9c03ea6eb6a..9200741a73f37eee20edd80b360fd376820ac9a3 100644
--- a/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale_1.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale_1.py
@@ -139,10 +139,10 @@ theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.roo
#Periode C1-C8 (28 Jun - 23 Jul)
theOutputConditionsAlg.Run1 = RunNumber
theOutputConditionsAlg.LB1 = 1
-
+
#theOutputConditionsAlg.Run2 = LastRunNumber + 1
#theOutputConditionsAlg.LB2 = 0
-
+
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
svcMgr += IOVRegistrationSvc()
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMB_EMEC_PS_HV_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/EMB_EMEC_PS_HV_Energy_Rescale.py
index 0a091099b03cc90211a2351d927bd5dc00e516c0..28b45c8ae67bb79beef49bf8607face95fcaeb17 100644
--- a/Calorimeter/CaloCondPhysAlgs/share/EMB_EMEC_PS_HV_Energy_Rescale.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/EMB_EMEC_PS_HV_Energy_Rescale.py
@@ -146,10 +146,10 @@ theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.roo
#Periode C1-C8 (28 Jun - 23 Jul)
theOutputConditionsAlg.Run1 = RunNumber
theOutputConditionsAlg.LB1 = 1
-
+
#theOutputConditionsAlg.Run2 = LastRunNumber + 1
#theOutputConditionsAlg.LB2 = 0
-
+
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=CONDBR2"
from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
svcMgr += IOVRegistrationSvc()
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMB_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/EMB_Energy_Rescale.py
index 9cc6217392ae0ae373968c36851698d1b02f39d9..1bed3bd5935f5c03f8f035b1166ddaace114cbd5 100644
--- a/Calorimeter/CaloCondPhysAlgs/share/EMB_Energy_Rescale.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/EMB_Energy_Rescale.py
@@ -140,10 +140,10 @@ theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.roo
#Periode C1-C8 (28 Jun - 23 Jul)
theOutputConditionsAlg.Run1 = RunNumber
theOutputConditionsAlg.LB1 = 1
-
+
theOutputConditionsAlg.Run2 = LastRunNumber + 1
theOutputConditionsAlg.LB2 = 0
-
+
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
svcMgr += IOVRegistrationSvc()
diff --git a/Calorimeter/CaloCondPhysAlgs/share/FCAL_HV_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/FCAL_HV_Energy_Rescale.py
index 5a6f533dec30254c59cc1636982cb136b1cb0576..196a8de0f4011725582ed49787704fb2c725251b 100644
--- a/Calorimeter/CaloCondPhysAlgs/share/FCAL_HV_Energy_Rescale.py
+++ b/Calorimeter/CaloCondPhysAlgs/share/FCAL_HV_Energy_Rescale.py
@@ -136,10 +136,10 @@ theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.roo
#Periode C1-C8 (28 Jun - 23 Jul)
theOutputConditionsAlg.Run1 = 205248
theOutputConditionsAlg.LB1 = 1
-
+
theOutputConditionsAlg.Run2 = 207332 + 1
theOutputConditionsAlg.LB2 = 0
-
+
svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
svcMgr += IOVRegistrationSvc()
diff --git a/Calorimeter/CaloDetDescr/CMakeLists.txt b/Calorimeter/CaloDetDescr/CMakeLists.txt
index 554ef87f6f6ad5824dd265a9d13f0db9af764b11..5f965d517daefd33a24314c06b2cee342b5d5226 100644
--- a/Calorimeter/CaloDetDescr/CMakeLists.txt
+++ b/Calorimeter/CaloDetDescr/CMakeLists.txt
@@ -49,18 +49,9 @@ atlas_add_dictionary( CaloDetDescrDict
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel AthContainers GeoPrimitives Identifier GaudiKernel LArReadoutGeometry CaloConditions CaloGeoHelpers StoreGateLib SGtests CaloDetDescrLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_add_test( CaloConstIteratorAdaptor_test
SOURCES test/CaloConstIteratorAdaptor_test.cxx
LINK_LIBRARIES CaloDetDescrLib )
-
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/Calorimeter/CaloLocalHadCalib/CMakeLists.txt b/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
index c3dd5e52a93e45ccb6c65bad71838e5abeda36bb..39c7914a7451a59d796becedf759fe93ad3df950 100644
--- a/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
+++ b/Calorimeter/CaloLocalHadCalib/CMakeLists.txt
@@ -11,6 +11,7 @@ atlas_depends_on_subdirs( PUBLIC
Calorimeter/CaloGeoHelpers
Control/AthenaBaseComps
Control/StoreGate
+ Control/CxxUtils
Event/xAOD/xAODCaloEvent
GaudiKernel
PRIVATE
@@ -38,13 +39,15 @@ atlas_add_component( CaloLocalHadCalib
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib CxxUtils
+ SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
atlas_add_dictionary( CaloLocalHadCalibDict
CaloLocalHadCalib/CaloLocalHadCalibDict.h
CaloLocalHadCalib/selection.xml
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
+ LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} CaloConditions CaloGeoHelpers AthenaBaseComps StoreGateLib CxxUtils
+ SGtests xAODCaloEvent GaudiKernel CaloDetDescrLib CaloDmDetDescr CaloEvent CaloIdentifier CaloSimEvent CaloUtilsLib AthenaKernel GeneratorObjects TBEvent PathResolver )
# Install files from the package:
atlas_install_headers( CaloLocalHadCalib )
diff --git a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..86bb4e22b53a00bc467230ebf05cb557385fae78
--- /dev/null
+++ b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Calorimeter/CaloLocalHadCalib
diff --git a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffCheck.h b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffCheck.h
index 3cb827800ae52c7994f9d4583f393cbe4df546d8..c2bb6ed551d8501391c201b2c7bb8ccf8ce444e9 100644
--- a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffCheck.h
+++ b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffCheck.h
@@ -15,12 +15,14 @@
* Class is used for quick validation of dead material constants, it runs on
* data provided by special dead material tree and fills dmreco .vs. dmtrue
* histograms for different dead material areas
+ *
+ *
* */
#include <vector>
#include <string>
#include <math.h>
-
+#include "CxxUtils/checker_macros.h"
class CaloLocalHadCoeff;
class CaloLocalHadCoeffHelper;
class CaloHadDMCoeffData;
@@ -30,7 +32,12 @@ class TH1F;
-class CaloHadDMCoeffCheck {
+/*
+ * Not thread safe due to ROOT facilities like gStyle
+ * but is used only for validation/plotting
+ * so should be fine
+ */
+class ATLAS_NOT_THREAD_SAFE CaloHadDMCoeffCheck {
public :
CaloHadDMCoeffCheck();
diff --git a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffData.h b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffData.h
index ecd8249ab66d16e3fa32e212300d83cd1e35b82d..5e8d92fc0a6f66013ce9e1a15323d9788f9765d9 100644
--- a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffData.h
+++ b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffData.h
@@ -22,10 +22,12 @@
#include <TFile.h>
#include <TObject.h>
+#include "CxxUtils/checker_macros.h"
+
class TTree;
class TBranch;
-class CaloHadDMCoeffData {
+class ATLAS_NOT_THREAD_SAFE CaloHadDMCoeffData {
public :
TTree *fChain; //!pointer to the analyzed TTree or TChain
diff --git a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffFit.h b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffFit.h
index f547f62c6a05651701c878bac36e62af1da78e3f..3b695fd96894df2bb3b81883ba04c2fea3b22ec0 100644
--- a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffFit.h
+++ b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffFit.h
@@ -22,6 +22,7 @@
#include <vector>
#include <string>
#include <math.h>
+#include "CxxUtils/checker_macros.h"
class CaloLocalHadCoeff;
class CaloLocalHadCoeffHelper;
@@ -32,8 +33,7 @@ class TH1F;
class TProfile2D;
-
-class CaloHadDMCoeffFit {
+class ATLAS_NOT_THREAD_SAFE CaloHadDMCoeffFit {
public :
// average and rms on-the-flight calculation
diff --git a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffMinim.h b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffMinim.h
index 56b4dc04e73b8bfd8145c9dc2f798b44ebb51815..4128bb182c110cddf528de0348d4a24d2fe839c3 100644
--- a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffMinim.h
+++ b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/CaloHadDMCoeffMinim.h
@@ -21,13 +21,14 @@
#include <TROOT.h>
#include "CaloGeoHelpers/CaloSampling.h"
+#include "CxxUtils/checker_macros.h"
class CaloLocalHadCoeff;
class CaloLocalHadCoeffHelper;
class CaloHadDMCoeffData;
-class CaloHadDMCoeffMinim {
+class ATLAS_NOT_THREAD_SAFE CaloHadDMCoeffMinim {
public :
// to handle minuit parameters and fit results
diff --git a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/GetLCDeadMaterial.h b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/GetLCDeadMaterial.h
index e00a0aca1d6a39ffacc1ca678a6dbbab46f75ab9..9495b863554599eea09d2e5753183bc317ef606c 100644
--- a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/GetLCDeadMaterial.h
+++ b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/GetLCDeadMaterial.h
@@ -21,13 +21,14 @@
#include "AthenaBaseComps/AthAlgorithm.h"
#include <vector>
#include <string>
+#include "CxxUtils/checker_macros.h"
class TChain;
class TProfile;
class CaloLocalHadCoeff;
-class GetLCDeadMaterial : public AthAlgorithm {
+class ATLAS_NOT_THREAD_SAFE GetLCDeadMaterial : public AthAlgorithm {
public:
diff --git a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/GetLCDeadMaterialTree.h b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/GetLCDeadMaterialTree.h
index a418e426157ff6575cd777806d889384d7c161de..99c8544883e77dd1211dda59751580ca9a061308 100644
--- a/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/GetLCDeadMaterialTree.h
+++ b/Calorimeter/CaloLocalHadCalib/CaloLocalHadCalib/GetLCDeadMaterialTree.h
@@ -22,6 +22,7 @@
#include "StoreGate/ReadHandleKey.h"
#include <vector>
#include <string>
+#include "CxxUtils/checker_macros.h"
class TTree;
class TFile;
@@ -30,7 +31,7 @@ class CaloCell_ID;
class CaloLocalHadCoeff;
class CaloHadDMCoeffData;
-class GetLCDeadMaterialTree : public AthAlgorithm {
+class ATLAS_NOT_THREAD_SAFE GetLCDeadMaterialTree : public AthAlgorithm {
public:
diff --git a/Calorimeter/CaloLocalHadCalib/src/CaloHadDMCoeffCheck.cxx b/Calorimeter/CaloLocalHadCalib/src/CaloHadDMCoeffCheck.cxx
index cdc9b23e3258f862d8f4d218a759c727c4193e05..ca6d167ecfbd9b610b510f80eb1c0ffb0d1971ab 100644
--- a/Calorimeter/CaloLocalHadCalib/src/CaloHadDMCoeffCheck.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/CaloHadDMCoeffCheck.cxx
@@ -73,15 +73,6 @@ CaloHadDMCoeffCheck::CaloHadDMCoeffCheck() :
CaloHadDMCoeffCheck::~CaloHadDMCoeffCheck()
{
-// for(unsigned int i_area=0; i_area<m_ereco.size(); i_area++){
-// for(unsigned int i_eta=0; i_eta<m_ereco[i_area].size(); i_eta++){
-// for(unsigned int i_ener=0; i_ener<m_ereco[i_area][i_eta].size(); i_ener++){
-// if(m_ereco[i_area][i_eta][i_ener]) delete m_ereco[i_area][i_eta][i_ener];
-// if(m_etrue[i_area][i_eta][i_ener]) delete m_etrue[i_area][i_eta][i_ener];
-// } // i_ener
-// } // i_eta
-// } // i_area
-
delete m_HadDMHelper;
}
diff --git a/Calorimeter/CaloLocalHadCalib/src/GetLCSinglePionsPerf.cxx b/Calorimeter/CaloLocalHadCalib/src/GetLCSinglePionsPerf.cxx
index fb27ab93d0f8b14c6590538647d496269f6d5924..62748ba5103a7321e943a7853cc3105885fb73b0 100644
--- a/Calorimeter/CaloLocalHadCalib/src/GetLCSinglePionsPerf.cxx
+++ b/Calorimeter/CaloLocalHadCalib/src/GetLCSinglePionsPerf.cxx
@@ -1345,14 +1345,14 @@ convert incident particle eta,phi from testbeam to ATLAS-like values
void GetLCSinglePionsPerf::as_in_atlas ( double &eta, double &phi,
double X0, double Y0, double xCryo, int iCalo)
{
- static const int Ncalo = 3;
- static double Zcalo[Ncalo] = { 3691.0, 4329.5, 4668.5 };
- static double Z0 = -21600.;
- static double Alpha = 4.668*M_PI/180.; // [degree]
- static double PhiSh = 45.*M_PI/180.;
- static double Eta0 = 2.8;
- static double z0emec = 11115;
- static double Yrun2 = 70;
+ constexpr int Ncalo = 3;
+ constexpr double Zcalo[Ncalo] = { 3691.0, 4329.5, 4668.5 };
+ constexpr double Z0 = -21600.;
+ constexpr double Alpha = 4.668*M_PI/180.; // [degree]
+ constexpr double PhiSh = 45.*M_PI/180.;
+ constexpr double Eta0 = 2.8;
+ constexpr double z0emec = 11115;
+ constexpr double Yrun2 = 70;
// Get transformation parameters
double Beta = 2*atan( exp(-Eta0) );
diff --git a/Calorimeter/CaloMonitoring/CMakeLists.txt b/Calorimeter/CaloMonitoring/CMakeLists.txt
index 4ab7bc3fe1932a8d0de31b4382210e973b0e12fe..ffd9847da66c26f2b637eea57a24d0e86f9b307b 100644
--- a/Calorimeter/CaloMonitoring/CMakeLists.txt
+++ b/Calorimeter/CaloMonitoring/CMakeLists.txt
@@ -51,17 +51,12 @@ atlas_add_component( CaloMonitoring
RecBackgroundEvent )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
-# Install files from the package:
-atlas_install_python_modules( python/*.py
- POST_BUILD_CMD ${ATLAS_FLAKE8} )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+# Tests:
atlas_add_test( flake8_rootMacros
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/rootMacros
+ SCRIPT ${ATLAS_FLAKE8} ${CMAKE_CURRENT_SOURCE_DIR}/rootMacros
POST_EXEC_SCRIPT nopost.sh )
atlas_add_test( TileCaloCellMonAlg_test
diff --git a/Calorimeter/CaloTTDetDescr/CaloTTDetDescr/ATLAS_CHECK_THREAD_SAFETY b/Calorimeter/CaloTTDetDescr/CaloTTDetDescr/ATLAS_CHECK_THREAD_SAFETY
new file mode 100644
index 0000000000000000000000000000000000000000..0e6ecd138599155c1d2d5a3d0496a6764390ba79
--- /dev/null
+++ b/Calorimeter/CaloTTDetDescr/CaloTTDetDescr/ATLAS_CHECK_THREAD_SAFETY
@@ -0,0 +1 @@
+Calorimeter/CaloTTDetDescr
diff --git a/Calorimeter/CaloTrackingGeometry/CMakeLists.txt b/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
index e6fef03aad3702afc1056b75cbd6a23d366c8706..6465c5c24b463435c3f1ea96081b7196276004b2 100644
--- a/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
+++ b/Calorimeter/CaloTrackingGeometry/CMakeLists.txt
@@ -46,13 +46,5 @@ atlas_add_dictionary( CaloTrackingGeometryDict
LINK_LIBRARIES CaloTrackingGeometryLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.h b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.h
index 64f4977ae34ef8f9eacdeeb875fb7b9c6fc37bc0..84b0614291b2590699ddbef39f1f4accc33a007d 100644
--- a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.h
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.h
@@ -115,6 +115,12 @@ public:
const_pointer_type ptr();
+ /**
+ * @brief Can the handle be successfully dereferenced?
+ */
+ bool isValid();
+
+
/**
* @brief Dereference the pointer, but don't cache anything.
*/
diff --git a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.icc b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.icc
index 7d3ea32a873e4475b30839b66dae5702f340b430..25b2e07fdff4b8c09de50edf7be09876c9d48a8e 100644
--- a/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.icc
+++ b/Control/AthToolSupport/AsgDataHandles/AsgDataHandles/ReadHandle.icc
@@ -141,15 +141,16 @@ ReadHandle<T>::ptr()
// }
-// /**
-// * @brief Can the handle be successfully dereferenced?
-// */
-// template <class T>
-// inline
-// bool ReadHandle<T>::isValid()
-// {
-// return 0 != this->typeless_dataPointer(true);
-// }
+/**
+ * @brief Can the handle be successfully dereferenced?
+ */
+template <class T>
+inline
+bool ReadHandle<T>::isValid()
+{
+ const T *result = nullptr;
+ return xAOD::TActiveEvent::event()->retrieve (result, key(), true);
+}
/**
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.h b/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.h
index 225ad0845195bdfccfc84d70c5e08851c312975e..076e43735857d67d121bd432e35eba24000b0637 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.h
+++ b/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.h
@@ -38,6 +38,9 @@ public:
ToolHandleArray( const std::initializer_list< ToolHandle< T > >& l );
/// Constructor with a string initialiser list
ToolHandleArray( const std::initializer_list< std::string >& l );
+ /// Constructor declaring a property
+ template<typename Parent>
+ ToolHandleArray( Parent *parent, const std::string& name, const std::initializer_list< std::string >& l, const std::string& description = "" );
/// Retrieve all tools in the array
StatusCode retrieve() const;
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.icc b/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.icc
index adefec02ac2130d8d67b554311a36129762c9d26..e321b180524b41d89b97435caf2bf577405c086a 100644
--- a/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.icc
+++ b/Control/AthToolSupport/AsgTools/AsgTools/ToolHandleArray.icc
@@ -29,6 +29,14 @@ ToolHandleArray( const std::initializer_list< std::string >& l )
}
}
+template< class T > template< typename Parent >
+ToolHandleArray< T >::
+ToolHandleArray( Parent *parent, const std::string& name, const std::initializer_list< std::string >& l, const std::string& description )
+ : ToolHandleArray (l) {
+
+ parent->declareProperty (name, *this, description);
+}
+
template< class T >
StatusCode ToolHandleArray< T >::retrieve() const {
diff --git a/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx b/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx
index f0104ed3333a0ba4d06591271d55b68813e07282..ae0382c34cbbfbea747ea785b2343ce08cfa04c6 100644
--- a/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx
+++ b/Control/AthenaIPCTools/src/AthenaSharedMemoryTool.cxx
@@ -68,12 +68,6 @@ StatusCode AthenaSharedMemoryTool::initialize() {
std::ostringstream pidstr;
pidstr << getpid();
m_sharedMemory.setValue(m_sharedMemory.value() + std::string("_") + pidstr.str());
- boost::interprocess::shared_memory_object::remove(m_sharedMemory.value().c_str());
- ATH_MSG_DEBUG("creating shared memory object with name \"" << m_sharedMemory.value() << "\"");
- boost::interprocess::shared_memory_object shm(boost::interprocess::create_only,
- m_sharedMemory.value().c_str(),
- boost::interprocess::read_write);
- shm.truncate(m_maxSize + m_maxDataClients * sizeof(ShareEventHeader));
return(StatusCode::SUCCESS);
}
@@ -109,7 +103,6 @@ StatusCode AthenaSharedMemoryTool::finalize() {
//___________________________________________________________________________
StatusCode AthenaSharedMemoryTool::makeServer(int num) {
- ATH_MSG_DEBUG("Creating shared memory object for writer.");
if (m_isServer || m_isClient) {
ATH_MSG_ERROR("Cannot make AthenaSharedMemoryTool a Server.");
return(StatusCode::FAILURE);
@@ -120,9 +113,11 @@ StatusCode AthenaSharedMemoryTool::makeServer(int num) {
}
m_num = num;
m_isServer = true;
- boost::interprocess::shared_memory_object shm(boost::interprocess::open_only,
+ ATH_MSG_DEBUG("Creating shared memory object with name \"" << m_sharedMemory.value() << "\"");
+ boost::interprocess::shared_memory_object shm(boost::interprocess::create_only,
m_sharedMemory.value().c_str(),
boost::interprocess::read_write);
+ shm.truncate(m_maxSize + m_maxDataClients * sizeof(ShareEventHeader));
m_payload = new boost::interprocess::mapped_region(shm, boost::interprocess::read_write, 0, m_maxSize);
m_status = new boost::interprocess::mapped_region(shm, boost::interprocess::read_write, m_maxSize, num * sizeof(ShareEventHeader));
ShareEventHeader evtH = { ShareEventHeader::UNLOCKED, -1, -1, 0, 0, 0, 0, "" };
@@ -139,7 +134,6 @@ bool AthenaSharedMemoryTool::isServer() const {
//___________________________________________________________________________
StatusCode AthenaSharedMemoryTool::makeClient(int num) {
- ATH_MSG_DEBUG("Creating shared memory object for Client.");
if (m_isServer) {
ATH_MSG_ERROR("Cannot make AthenaSharedMemoryTool a Client.");
return(StatusCode::FAILURE);
@@ -148,7 +142,8 @@ StatusCode AthenaSharedMemoryTool::makeClient(int num) {
ATH_MSG_ERROR("Too many clients for AthenaSharedMemoryTool.");
return(StatusCode::FAILURE);
}
- if (m_num > 0 && num <= 0) {
+ if (m_num > 0 && num <= 0) {// stop running client
+ ATH_MSG_DEBUG("Stop AthenaSharedMemoryTool Client.");
m_num = -1;
while (lockObject("stop").isRecoverable()) {
usleep(100);
@@ -157,15 +152,21 @@ StatusCode AthenaSharedMemoryTool::makeClient(int num) {
while (evtH->evtProcessStatus != ShareEventHeader::UNLOCKED) {
usleep(100);
}
+ delete m_payload ; m_payload = nullptr;
+ delete m_status ; m_status = nullptr;
+ m_isClient = false;
+ return(StatusCode::SUCCESS);
}
- if (!m_isClient) {
- m_isClient = true;
- boost::interprocess::shared_memory_object shm(boost::interprocess::open_only,
- m_sharedMemory.value().c_str(),
- boost::interprocess::read_write);
- if (m_payload == nullptr) {
+ while (!m_isClient) {
+ try { // Check whether Server created shared memory object
+ boost::interprocess::shared_memory_object shm(boost::interprocess::open_only,
+ m_sharedMemory.value().c_str(),
+ boost::interprocess::read_write);
+ m_isClient = true;
m_payload = new boost::interprocess::mapped_region(shm, boost::interprocess::read_write, 0, m_maxSize);
m_status = new boost::interprocess::mapped_region(shm, boost::interprocess::read_write, m_maxSize + num * sizeof(ShareEventHeader), sizeof(ShareEventHeader));
+ } catch (boost::interprocess::interprocess_exception& e) {
+ usleep(100000);
}
}
if (m_num <= 0 && num > 0) {
diff --git a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/GenericMonitoringTool.h b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/GenericMonitoringTool.h
index 07978a651af8dc517c18ee0a0563d11e991763fe..a8254335614a9f845209f063489ec70c3df837fa 100644
--- a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/GenericMonitoringTool.h
+++ b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/GenericMonitoringTool.h
@@ -82,6 +82,9 @@ namespace Monitored {
* colon is required). In case of a 2D histogram the labels are assigned consecutively to the x-axis
* and then y-axis bins.
*/
+namespace Monitored {
+ class Group;
+}
class GenericMonitoringTool : public AthAlgTool {
public:
GenericMonitoringTool(const std::string & type, const std::string & name, const IInterface* parent);
@@ -90,8 +93,9 @@ public:
virtual StatusCode start() override;
virtual StatusCode stop() override;
- /// Retrieve the histogram fillers
- std::vector<std::shared_ptr<Monitored::HistogramFiller>> getHistogramsFillers(const std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>>& monitoredVariables) const;
+ /// feed the fillers
+ void invokeFillers(const std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>>& monitoredVariables) const;
+
/// Book histograms
StatusCode book();
/// Overrride configured booking path
@@ -101,6 +105,8 @@ public:
virtual uint32_t runNumber();
virtual uint32_t lumiBlock();
private:
+
+
/// THistSvc (do NOT fix the service type (only the name) to allow for a different implementation online
ServiceHandle<ITHistSvc> m_histSvc { this, "THistSvc", "THistSvc", "Histogramming svc" };
Gaudi::Property<std::string> m_histoPath { this, "HistPath", {}, "Directory for histograms [name of parent if not set]" };
@@ -108,6 +114,7 @@ private:
Gaudi::Property<bool> m_explicitBooking { this, "ExplicitBooking", false, "Do not create histograms automatically in initialize but wait until the method book is called." };
std::unordered_map<std::string, std::vector<std::shared_ptr<Monitored::HistogramFiller>>> m_fillerMap; //!< map from variables to fillers
+ mutable std::mutex m_fillMutex;
};
/**
diff --git a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramFiller.h b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramFiller.h
index ac83270ded0b5d54cf69c99dc8a1a6b4e0e506bc..8263005a8f2ff8ed8c58b0feddcc275bd94a78e0 100644
--- a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramFiller.h
+++ b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/HistogramFiller.h
@@ -6,7 +6,6 @@
#define AthenaMonitoringKernel_HistogramFiller_h
#include <functional>
-#include <mutex>
#include <memory>
#include <vector>
@@ -33,8 +32,7 @@ namespace Monitored {
* @param histDef Histogram definition of ROOT object
*/
HistogramFiller(const HistogramDef& histDef, std::shared_ptr<IHistogramProvider> histogramProvider)
- : m_mutex(std::make_shared<std::mutex>()),
- m_histDef(new HistogramDef(histDef)),
+ : m_histDef(new HistogramDef(histDef)),
m_histogramProvider(histogramProvider) {}
/**
* @brief Copy constructor
@@ -42,8 +40,7 @@ namespace Monitored {
* @param hf Other HistogramFiller
*/
HistogramFiller(const HistogramFiller& hf)
- : m_mutex(hf.m_mutex),
- m_histDef(hf.m_histDef),
+ : m_histDef(hf.m_histDef),
m_histogramProvider(hf.m_histogramProvider),
m_monWeight(hf.m_monWeight),
m_monCutMask(hf.m_monCutMask) {}
@@ -145,12 +142,10 @@ namespace Monitored {
return fill<H>(weight, cut, m..., m1.getStringVectorRepresentation());
} else {
// All IMonitoreVariables have been converted to vector<double/string>
- std::scoped_lock lock(*m_mutex);
return detail::fill(this->histogram<H>(), weight, cut, m1, m...);
}
}
- std::shared_ptr<std::mutex> m_mutex;
std::shared_ptr<HistogramDef> m_histDef;
std::shared_ptr<IHistogramProvider> m_histogramProvider;
std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>> m_monVariables;
diff --git a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/MonitoredGroup.h b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/MonitoredGroup.h
index 1abfae85fa146a53fa186811c1e0ed408f4a26b7..5644fd1f7d6473944e62fae6100f2bf25487c77c 100644
--- a/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/MonitoredGroup.h
+++ b/Control/AthenaMonitoringKernel/AthenaMonitoringKernel/MonitoredGroup.h
@@ -65,22 +65,22 @@ namespace Monitored {
template <typename... T>
Group(const ToolHandle<GenericMonitoringTool>& tool, T&&... monitoredGroup)
: m_tool(tool),
- m_autoFill(true),
- m_monitoredGroup{monitoredGroup...},
- m_histogramsFillers(!m_tool.empty() ? m_tool->getHistogramsFillers(m_monitoredGroup) : std::vector<std::shared_ptr<Monitored::HistogramFiller>>()) { }
+ m_autoFill(true),
+ m_monitoredGroup{monitoredGroup...}
+ { }
Group(const ToolHandle<GenericMonitoringTool>& tool, const std::vector<std::reference_wrapper<IMonitoredVariable>>& monitoredGroup)
: m_tool(tool),
- m_autoFill(true),
- m_monitoredGroup(monitoredGroup),
- m_histogramsFillers(!m_tool.empty() ? m_tool->getHistogramsFillers(m_monitoredGroup) : std::vector<std::shared_ptr<Monitored::HistogramFiller>>()) { }
+ m_autoFill(true),
+ m_monitoredGroup(monitoredGroup)
+ { }
Group(const ToolHandle<GenericMonitoringTool>& tool, std::vector<std::reference_wrapper<IMonitoredVariable>>&& monitoredGroup)
: m_tool(tool),
- m_autoFill(true),
- m_monitoredGroup(std::move(monitoredGroup)),
- m_histogramsFillers(!m_tool.empty() ? m_tool->getHistogramsFillers(m_monitoredGroup) : std::vector<std::shared_ptr<Monitored::HistogramFiller>>()) { }
-
+ m_autoFill(true),
+ m_monitoredGroup(std::move(monitoredGroup))
+ { }
+
virtual ~Group() {
if (m_autoFill) {
fill();
@@ -98,11 +98,9 @@ namespace Monitored {
* @snippet Control/AthenaMonitoringKernel/test/GenericMonFilling_test.cxx fillExplicitly_fill
**/
virtual void fill() {
+ if ( m_tool.empty() ) return;
setAutoFill(false);
-
- for (auto filler : m_histogramsFillers) {
- filler->fill();
- }
+ m_tool->invokeFillers(m_monitoredGroup);
}
/**
@@ -118,15 +116,12 @@ namespace Monitored {
ToolHandle<GenericMonitoringTool> m_tool;
bool m_autoFill;
const std::vector<std::reference_wrapper<IMonitoredVariable>> m_monitoredGroup;
- const std::vector<std::shared_ptr<Monitored::HistogramFiller>> m_histogramsFillers;
};
template <typename... T>
void fill(const ToolHandle<GenericMonitoringTool>& tool, T&&... variables) {
if (!tool.empty()) {
- for (auto filler : tool->getHistogramsFillers({std::forward<T>(variables)...})) {
- filler->fill();
- }
+ tool->invokeFillers({std::forward<T>(variables)...});
}
}
diff --git a/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx b/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx
index 9430a4d56831569191d3b66f3d788952486adfed..77dadc9eecd213d9f38123ddef57aabfd37a2c42 100644
--- a/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx
+++ b/Control/AthenaMonitoringKernel/src/GenericMonitoringTool.cxx
@@ -110,10 +110,11 @@ namespace Monitored {
}
}
-std::vector<std::shared_ptr<HistogramFiller>> GenericMonitoringTool::getHistogramsFillers(const std::vector<std::reference_wrapper<IMonitoredVariable>>& monitoredVariables) const {
+
+void GenericMonitoringTool::invokeFillers(const std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>>& monitoredVariables) const {
// stage 1: get candidate fillers (assume generally we get only a few variables)
- std::vector<const HistogramFiller*> candidates;
+ std::vector<HistogramFiller*> candidates;
for (const auto& monValue : monitoredVariables) {
const auto& match = m_fillerMap.find(monValue.get().name());
if (match != m_fillerMap.end()) {
@@ -126,10 +127,7 @@ std::vector<std::shared_ptr<HistogramFiller>> GenericMonitoringTool::getHistogra
// dedup vector (yes, this is faster than using std::set above)
std::sort(candidates.begin(), candidates.end());
candidates.erase(std::unique(candidates.begin(), candidates.end()), candidates.end());
-
// stage 2: refine for fillers that have all variables set
- std::vector<std::shared_ptr<HistogramFiller>> result;
- result.reserve(candidates.size());
std::vector<std::reference_wrapper<IMonitoredVariable>> variables;
variables.reserve(3); // enough for all current fillers
@@ -190,14 +188,13 @@ std::vector<std::shared_ptr<HistogramFiller>> GenericMonitoringTool::getHistogra
<< "\n Asked to fill from mon. vars: " << monitoredVariables);
continue;
}
- HistogramFiller* fillerCopy(filler->clone());
- fillerCopy->setMonitoredVariables(std::move(variables));
- fillerCopy->setMonitoredWeight(weight);
- fillerCopy->setMonitoredCutMask(cutmask);
- result.emplace_back(fillerCopy);
- }
-
- return result;
+
+ std::scoped_lock guard(m_fillMutex);
+ filler->setMonitoredVariables(std::move(variables));
+ filler->setMonitoredWeight(weight);
+ filler->setMonitoredCutMask(cutmask);
+ filler->fill();
+ }
}
uint32_t GenericMonitoringTool::runNumber() {
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/CumulativeHistogramFiller1D.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/CumulativeHistogramFiller1D.h
index 1f08de49fa689af8c498294b725925dc808935f5..d534622e6ce2ec6b7bab017fcffa8f24a3883225 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/CumulativeHistogramFiller1D.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/CumulativeHistogramFiller1D.h
@@ -41,7 +41,6 @@ namespace Monitored {
unsigned i(0);
auto histogram = this->histogram<TH1>();
auto valuesVector{m_monVariables[0].get().getVectorRepresentation()};
- std::scoped_lock lock(*m_mutex);
size_t idx = 0;
for (auto value : valuesVector) {
if (!cutMaskValue(idx++)) { continue; }
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFiller2DProfile.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFiller2DProfile.h
index da193fedf3399c28c5349e4d96aa24bb66eeada7..3c4f1912592602235c4830d3fff478f4500d17b5 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFiller2DProfile.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFiller2DProfile.h
@@ -38,7 +38,6 @@ namespace Monitored {
const auto valuesVector1{m_monVariables[0].get().getVectorRepresentation()};
const auto valuesVector2{m_monVariables[1].get().getVectorRepresentation()};
const auto valuesVector3{m_monVariables[2].get().getVectorRepresentation()};
- std::scoped_lock lock(*m_mutex);
/*HERE NEED TO INCLUDE CASE IN WHICH SOME VARIABLES ARE SCALAR AND SOME VARIABLES ARE VECTORS
unsigned i(0);
if (m_variable1->size() != m_variable2->size() || m_variable1->size() != m_variable3->size() || m_variable2->size() != m_variable3->size() ) {
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerEfficiency.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerEfficiency.h
index 2bb643ef46ce5f9dc20389e82399d130e1a098fd..475e0c89a3cf444341b6cc0bfcfd4a4af93ef544 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerEfficiency.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerEfficiency.h
@@ -36,7 +36,6 @@ namespace Monitored {
auto cutMaskAccessor = cutMaskValuePair.second;
auto efficiency = this->histogram<TEfficiency>();
- std::scoped_lock lock(*m_mutex);
int nMonVar = m_monVariables.size();
if ( nMonVar==2 ) { // Single observable (1D TEfficiency)
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerRebinable.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerRebinable.h
index edc383946d75332f93f6ea1fb5298cd2c7db5948..077b61c87c28454c4252571aa4857fb328d4bb59 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerRebinable.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerRebinable.h
@@ -43,7 +43,6 @@ namespace Monitored {
{ // scope for mutex
const auto valuesVector = this->m_monVariables[AXIS].get().getVectorRepresentation();
- std::scoped_lock lock(*this->m_mutex);
TH1* hist = this->template histogram<TH1>();
TAxis* axis = detail::getAxis<TH1,AXIS>(hist);
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
index 103aa92b8381b7369c246d23bb543296ff769c3f..773da09c3a6eaccb5583bb1f04d63e3cb9d59602 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/HistogramFillerTree.h
@@ -50,7 +50,6 @@ namespace Monitored {
}
auto cutMaskAccessor = cutMaskValuePair.second;
- std::scoped_lock<std::mutex> lock(*(this->m_mutex));
auto tree = this->histogram<TTree>();
if (tree->GetListOfBranches()->GetEntries() == 0) {
@@ -210,4 +209,4 @@ namespace Monitored {
}
}
-#endif // AthenaMonitoringKernel_HistogramFiller_HistogramFillerTree_h
\ No newline at end of file
+#endif // AthenaMonitoringKernel_HistogramFiller_HistogramFillerTree_h
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/LumiblockHistogramProvider.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/LumiblockHistogramProvider.h
index 97cac1f22d81429417e35a6c2790ce53b266d9ae..293d007e7a866802759e81cae343a0bf84f9f3d4 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/LumiblockHistogramProvider.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/LumiblockHistogramProvider.h
@@ -58,7 +58,10 @@ namespace Monitored {
const unsigned minLumi = lumiPage * historyDepth;
const unsigned maxLumi = minLumi + historyDepth - 1;
- def.alias = def.alias + "(" + std::to_string(minLumi) + "-" + std::to_string(maxLumi) + ")";
+ if ( historyDepth > 1 )
+ def.alias = def.alias + "_LB" + std::to_string(minLumi) + "_" + std::to_string(maxLumi);
+ else
+ def.alias = def.alias + "_LB" + std::to_string(minLumi);
return m_factory->create(def);
}
@@ -69,4 +72,4 @@ namespace Monitored {
};
}
-#endif /* AthenaMonitoringKernel_HistogramFiller_LumiblockHistogramProvider_h */
\ No newline at end of file
+#endif /* AthenaMonitoringKernel_HistogramFiller_LumiblockHistogramProvider_h */
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/VecHistogramFiller1D.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/VecHistogramFiller1D.h
index 1a712d5205f06752547208c8257ba97034dfa957..290868ff492f2e2caefea4ce2879a6e271f80b4b 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/VecHistogramFiller1D.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/VecHistogramFiller1D.h
@@ -34,7 +34,6 @@ namespace Monitored {
log << MSG::ERROR << "CutMask does not match the size of plotted variable: "
<< cutMaskValuePair.first << " " << valuesVector.size() << endmsg;
}
- std::scoped_lock lock(*m_mutex);
for (unsigned i = 0; i < std::size(valuesVector); ++i) {
if (cutMaskAccessor(i)) {
diff --git a/Control/AthenaMonitoringKernel/src/HistogramFiller/VecHistogramFiller1DWithOverflows.h b/Control/AthenaMonitoringKernel/src/HistogramFiller/VecHistogramFiller1DWithOverflows.h
index e0524711631025369486caf10ce199fb9d2152aa..5b183d58b61180ffc3c635467ceef9746dd83390 100644
--- a/Control/AthenaMonitoringKernel/src/HistogramFiller/VecHistogramFiller1DWithOverflows.h
+++ b/Control/AthenaMonitoringKernel/src/HistogramFiller/VecHistogramFiller1DWithOverflows.h
@@ -34,7 +34,6 @@ namespace Monitored {
log << MSG::ERROR << "CutMask does not match the size of plotted variable: "
<< cutMaskValuePair.first << " " << valuesVector.size() << endmsg;
}
- std::scoped_lock lock(*m_mutex);
for (unsigned i = 0; i < std::size(valuesVector); ++i) {
if (cutMaskAccessor(i)) {
diff --git a/Control/AthenaMonitoringKernel/test/LumiblockHistogramProviderTestSuite.cxx b/Control/AthenaMonitoringKernel/test/LumiblockHistogramProviderTestSuite.cxx
index 08a232a99bcfe366c028020addb91c90e934cbfa..4f2f7fc3163e03336666b3a777e8739d0885081d 100644
--- a/Control/AthenaMonitoringKernel/test/LumiblockHistogramProviderTestSuite.cxx
+++ b/Control/AthenaMonitoringKernel/test/LumiblockHistogramProviderTestSuite.cxx
@@ -75,16 +75,16 @@ class LumiblockHistogramProviderTestSuite {
void test_shouldCreateNewHistogramWithUpdatedAlias() {
auto expectedFlow = {
- make_tuple(0, "test alias(0-2)"),
- make_tuple(1, "test alias(0-2)"),
- make_tuple(2, "test alias(0-2)"),
- make_tuple(3, "test alias(3-5)"),
- make_tuple(4, "test alias(3-5)"),
- make_tuple(5, "test alias(3-5)"),
- make_tuple(6, "test alias(6-8)"),
- make_tuple(7, "test alias(6-8)"),
- make_tuple(8, "test alias(6-8)"),
- make_tuple(9, "test alias(9-11)"),
+ make_tuple(0, "test alias_LB0_2"),
+ make_tuple(1, "test alias_LB0_2"),
+ make_tuple(2, "test alias_LB0_2"),
+ make_tuple(3, "test alias_LB3_5"),
+ make_tuple(4, "test alias_LB3_5"),
+ make_tuple(5, "test alias_LB3_5"),
+ make_tuple(6, "test alias_LB6_8"),
+ make_tuple(7, "test alias_LB6_8"),
+ make_tuple(8, "test alias_LB6_8"),
+ make_tuple(9, "test alias_LB9_11"),
};
TNamed histogram;
diff --git a/Control/StoreGate/CMakeLists.txt b/Control/StoreGate/CMakeLists.txt
index 274955820c1224fa702bdcf2e54eb5496e51d413..eeb5cbcf2056caf341e0d4aabc2c9db7cc099de9 100644
--- a/Control/StoreGate/CMakeLists.txt
+++ b/Control/StoreGate/CMakeLists.txt
@@ -40,25 +40,22 @@ atlas_add_library( SGtests test/SGtests.cxx
NO_PUBLIC_HEADERS
LINK_LIBRARIES StoreGateLib TestTools )
-# Declare the package's tests:
+# Declare the package's tests:o
atlas_add_test( ActiveStore_test
SOURCES test/ActiveStore_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
set( _hivePatterns "JobOptionsSvc +INFO|StoreGateSvc.*DEBUG|HiveMgrSvc +DEBUG" )
atlas_add_test( SGTiming_test
SOURCES test/SGTiming_test.cxx
LINK_LIBRARIES SGtests
- LOG_IGNORE_PATTERN "${_hivePatterns}|rec:|averages"
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LOG_IGNORE_PATTERN "${_hivePatterns}|rec:|averages" )
atlas_add_test( SGHive_test
SOURCES test/SGHive_test.cxx
LINK_LIBRARIES SGtests
- LOG_IGNORE_PATTERN "${_hivePatterns}"
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LOG_IGNORE_PATTERN "${_hivePatterns}" )
atlas_add_test( DataHandle_test
SOURCES test/DataHandle_test.cxx
@@ -94,13 +91,11 @@ atlas_add_test( VarHandleKey_test
atlas_add_test( VarHandleKeyProperty_test
SOURCES test/VarHandleKeyProperty_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( VarHandleProperty_test
SOURCES test/VarHandleProperty_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( ReadHandleKey_test
SOURCES test/ReadHandleKey_test.cxx
@@ -120,9 +115,7 @@ atlas_add_test( TypelessWriteHandleKey_test
atlas_add_test( VarHandleBase_test
SOURCES test/VarHandleBase_test.cxx
- LINK_LIBRARIES SGtests
- LOG_IGNORE_PATTERN "could not get proxy for|try using a ReadHandle"
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( VarHandles_test
SOURCES test/VarHandles_test.cxx
@@ -130,23 +123,19 @@ atlas_add_test( VarHandles_test
atlas_add_test( WriteHandle_test
SOURCES test/WriteHandle_test.cxx
- LINK_LIBRARIES SGtests AthContainers
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests AthContainers )
atlas_add_test( ReadHandle_test
SOURCES test/ReadHandle_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( UpdateHandle_test
SOURCES test/UpdateHandle_test.cxx
- LINK_LIBRARIES SGtests
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests )
atlas_add_test( TypelessWriteHandle_test
SOURCES test/TypelessWriteHandle_test.cxx
- LINK_LIBRARIES SGtests AthContainers
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES SGtests AthContainers )
atlas_add_test( DecorKeyHelpers_test
SOURCES test/DecorKeyHelpers_test.cxx
@@ -155,73 +144,59 @@ atlas_add_test( DecorKeyHelpers_test
atlas_add_test( ReadDecorHandleKey_test
SOURCES test/ReadDecorHandleKey_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib TestTools )
atlas_add_test( WriteDecorHandleKey_test
SOURCES test/WriteDecorHandleKey_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib TestTools )
atlas_add_test( ReadDecorHandle_test
SOURCES test/ReadDecorHandle_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( WriteDecorHandle_test
SOURCES test/WriteDecorHandle_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( CondHandleKeyArray_test
SOURCES test/CondHandleKeyArray_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( WriteCondHandle_test
SOURCES test/WriteCondHandle_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( WriteDecorHandleKeyArray_test
SOURCES test/WriteDecorHandleKeyArray_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib TestTools )
atlas_add_test( ReadDecorHandleKeyArray_test
SOURCES test/ReadDecorHandleKeyArray_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib TestTools )
atlas_add_test( ThinningHandleKey_test
SOURCES test/ThinningHandleKey_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( ThinningHandleBase_test
SOURCES test/ThinningHandleBase_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
atlas_add_test( ThinningHandle_test
SOURCES test/ThinningHandle_test.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES StoreGateLib AthContainers TestTools
- ENVIRONMENT "JOBOPTSEARCHPATH=${CMAKE_CURRENT_SOURCE_DIR}/share" )
+ LINK_LIBRARIES StoreGateLib AthContainers TestTools )
# Install files from the package:
-atlas_install_joboptions( share/StoreGate_jobOptions.txt
- share/StoreGate_jobOptions.py
- share/SGHive_test.txt
- share/SGTiming_test.txt
- share/ActiveStore_test.txt )
+atlas_install_joboptions( share/*.txt
+ share/StoreGate_jobOptions.py )
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandle.h b/Control/StoreGate/StoreGate/WriteDecorHandle.h
index 3c3ca915c6af454a8282f4ea8b5ffaa575ca7656..3d447c95f9861d4c08a3a30e5a79f08f891c5f8d 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandle.h
+++ b/Control/StoreGate/StoreGate/WriteDecorHandle.h
@@ -235,6 +235,24 @@ private:
virtual void* typeless_dataPointer_impl (bool quiet) override;
+ /**
+ * @brief Test to see if this variable exists in the store,
+ * for the referenced object.
+ * Specialization for the case of a standalone object
+ * (@c T derives from @c SG::AuxElement).
+ */
+ bool isAvailable (std::true_type);
+
+
+ /**
+ * @brief Test to see if this variable exists in the store,
+ * for the referenced object.
+ * Specialization for the case of a container
+ * (@c T does not derive from @c SG::AuxElement).
+ */
+ bool isAvailable (std::false_type);
+
+
/**
* @brief Return the referenced object as a @c SG::AuxVectorData.
* Specialization for the case of a standalone object
@@ -268,6 +286,8 @@ private:
/// Accessor for the aux data item.
accessor_t m_acc;
+
+ bool m_madeAlias;
};
diff --git a/Control/StoreGate/StoreGate/WriteDecorHandle.icc b/Control/StoreGate/StoreGate/WriteDecorHandle.icc
index 409e1ab0bdd8691dea7cd3e54cacf122fbabbde2..61c68ffd4fdc06f68a830f9b3aa1501aa671eb82 100644
--- a/Control/StoreGate/StoreGate/WriteDecorHandle.icc
+++ b/Control/StoreGate/StoreGate/WriteDecorHandle.icc
@@ -26,7 +26,8 @@ template <class T, class D>
WriteDecorHandle<T, D>::WriteDecorHandle (const WriteDecorHandleKey<T>& key)
: Base (key, nullptr),
m_contHandle (key.contHandleKey()),
- m_acc (SG::decorKeyFromKey (key.key()))
+ m_acc (SG::decorKeyFromKey (key.key())),
+ m_madeAlias (false)
{
}
@@ -47,7 +48,8 @@ WriteDecorHandle<T, D>::WriteDecorHandle (const WriteDecorHandleKey<T>& key,
const EventContext& ctx)
: Base (key, &ctx),
m_contHandle (key.contHandleKey(), ctx),
- m_acc (SG::decorKeyFromKey (key.key()))
+ m_acc (SG::decorKeyFromKey (key.key())),
+ m_madeAlias (false)
{
}
@@ -59,7 +61,8 @@ template <class T, class D>
WriteDecorHandle<T, D>::WriteDecorHandle (const WriteDecorHandle& rhs)
: Base (rhs),
m_contHandle (rhs.m_contHandle),
- m_acc (rhs.m_acc)
+ m_acc (rhs.m_acc),
+ m_madeAlias (rhs.m_madeAlias)
{
}
@@ -71,8 +74,10 @@ template <class T, class D>
WriteDecorHandle<T, D>::WriteDecorHandle (WriteDecorHandle&& rhs)
: Base (std::move (rhs)),
m_contHandle (std::move (rhs.m_contHandle)),
- m_acc (std::move (rhs.m_acc))
+ m_acc (std::move (rhs.m_acc)),
+ m_madeAlias (rhs.m_madeAlias)
{
+ rhs.m_madeAlias = false;
}
@@ -83,7 +88,7 @@ template <class T, class D>
WriteDecorHandle<T, D>::~WriteDecorHandle()
{
// Lock the decoration. But don't do anything if we haven't touched it.
- if (this->cachedPtr()) {
+ if (m_madeAlias) {
const IConstAuxStore* store = this->vectorData()->getConstStore();
if (store) {
IConstAuxStore* store_nc ATLAS_THREAD_SAFE = const_cast<IConstAuxStore*> (store);
@@ -103,6 +108,7 @@ WriteDecorHandle<T, D>& WriteDecorHandle<T, D>::operator= (const WriteDecorHandl
*static_cast<Base*>(this) = rhs;
m_acc = rhs.m_acc;
m_contHandle = rhs.m_contHandle;
+ m_madeAlias = rhs.m_madeAlias;
}
return *this;
}
@@ -118,6 +124,8 @@ WriteDecorHandle<T, D>& WriteDecorHandle<T, D>::operator= (WriteDecorHandle&& rh
*static_cast<Base*>(this) = std::move (rhs);
m_acc = std::move (rhs.m_acc);
m_contHandle = std::move (rhs.m_contHandle);
+ m_madeAlias = rhs.m_madeAlias;
+ rhs.m_madeAlias = false;
}
return *this;
}
@@ -150,6 +158,7 @@ bool WriteDecorHandle<T, D>::isPresent() const
template <class T, class D>
StatusCode WriteDecorHandle<T, D>::setProxyDict (IProxyDict* store)
{
+ m_madeAlias = false;
if (m_contHandle.setProxyDict (store).isFailure())
return StatusCode::FAILURE;
return Base::setProxyDict (store);
@@ -201,24 +210,59 @@ WriteDecorHandle<T, D>::getDecorationArray()
/**
* @brief Test to see if this variable exists in the store,
* for the referenced object.
+ * Specialization for the case of a standalone object
+ * (@c T derives from @c SG::AuxElement).
*/
template <class T, class D>
inline
-bool WriteDecorHandle<T, D>::isAvailable()
+bool WriteDecorHandle<T, D>::isAvailable (std::true_type)
{
- const SG::AuxVectorData* obj = static_cast<SG::AuxVectorData*> (this->m_ptr);
- if (!obj) {
- obj = static_cast<SG::AuxVectorData*> (ReadHandle<T>::typeless_dataPointer_impl (true));
+ if (this->m_ptr) {
+ const SG::AuxVectorData* obj = static_cast<const T*>(this->m_ptr)->container();
+ if (obj) {
+ return obj->isAvailable (m_acc.auxid());
+ }
}
- if (obj) {
- return obj->isAvailable (m_acc.auxid());
+ return false;
+}
+
+
+/**
+ * @brief Test to see if this variable exists in the store,
+ * for the referenced object.
+ * Specialization for the case of a container
+ * (@c T does not derive from @c SG::AuxElement).
+ */
+template <class T, class D>
+inline
+bool WriteDecorHandle<T, D>::isAvailable (std::false_type)
+{
+ if (this->m_ptr) {
+ return static_cast<const T*>(this->m_ptr)->isAvailable (m_acc.auxid());
}
return false;
}
+/**
+ * @brief Test to see if this variable exists in the store,
+ * for the referenced object.
+ */
+template <class T, class D>
+inline
+bool WriteDecorHandle<T, D>::isAvailable()
+{
+ if (!this->m_ptr) {
+ ReadHandle<T>::typeless_dataPointer_impl (true);
+ }
+ // We can't just use vectorData() because that will create the decoration
+ // as a side effect.
+ return isAvailable (typename std::is_base_of<SG::AuxElement, T>::type());
+}
+
+
/**
* @brief Return the aux id for this variable.
*/
@@ -239,18 +283,21 @@ SG::auxid_t WriteDecorHandle<T, D>::auxid() const
template <class T, class D>
void* WriteDecorHandle<T, D>::typeless_dataPointer_impl (bool quiet)
{
- if (this->m_ptr)
+ if (this->m_ptr && this->m_madeAlias)
return this->m_ptr;
if (m_contHandle.alias (WriteHandleKey<T> (this->key())).isFailure())
return nullptr;
- void* ptr = ReadHandle<T>::typeless_dataPointer_impl (quiet);
+ if (!this->m_ptr) {
+ ReadHandle<T>::typeless_dataPointer_impl (quiet);
+ }
// Important to call the base class method above before calling vectorData;
// otherwise, we'll get an infinite recursion.
// Also don't call getDecorationArray if the container is empty.
- if (ptr && this->vectorData()->size_v() > 0) {
+ if (this->m_ptr && this->vectorData()->size_v() > 0) {
m_acc.getDecorationArray (*this->vectorData());
}
- return ptr;
+ this->m_madeAlias = true;
+ return this->m_ptr;
}
diff --git a/Control/StoreGate/test/ActiveStore_test.cxx b/Control/StoreGate/test/ActiveStore_test.cxx
index b0be54800403b1d88d07869a55adb7c5627e501f..002d3a7f6f55a8c709662dd3e8ea3b02ca819b8f 100644
--- a/Control/StoreGate/test/ActiveStore_test.cxx
+++ b/Control/StoreGate/test/ActiveStore_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -8,9 +8,6 @@
ATLAS Collaboration
***************************************************************************/
-// $Id: ActiveStore_test.cxx 698338 2015-10-03 18:39:22Z ssnyder $
-
-//<<<<<< INCLUDES >>>>>>
#include <string>
#include "TestTools/initGaudi.h"
#include "TestTools/SGassert.h"
@@ -41,7 +38,7 @@ CLASS_DEF(Foo, 8101, 1)
int main() {
cout << "*** ActiveStoreTest BEGINS ***" << endl;
ISvcLocator* pSvcLoc;
- if (!initGaudi("ActiveStore_test.txt", pSvcLoc)) {
+ if (!initGaudi("StoreGate/ActiveStore_test.txt", pSvcLoc)) {
return 1;
}
ActiveStoreSvc* pASS(0);
diff --git a/Control/StoreGate/test/CondHandleKeyArray_test.cxx b/Control/StoreGate/test/CondHandleKeyArray_test.cxx
index 946a9d04e22f315515514a999072434614611a97..80547cba532f075361481ca9c4553248403b9e83 100644
--- a/Control/StoreGate/test/CondHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/CondHandleKeyArray_test.cxx
@@ -129,7 +129,7 @@ int main()
{
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("CondHandleKeyArray_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/CondHandleKeyArray_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx b/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
index 9b714c1b5fc8b51b5f1701a5c70635caab2fda83..ada84e817ba92dce3c305a255c87870aa7c9204c 100644
--- a/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandleKeyArray_test.cxx
@@ -1,10 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
-
-// $Id$
/**
* @file StoreGate/test/ReadDecorHandleKeyArrau_test.cxx
* @author Jovan Mitrevski <Jovan.Mitrevski.cern.ch>
diff --git a/Control/StoreGate/test/ReadDecorHandleKey_test.cxx b/Control/StoreGate/test/ReadDecorHandleKey_test.cxx
index 839c8ae0fc06118d134f01d804173066f8e4a031..4acde5b3ec1700431b1754334eb4b663e9aaa428 100644
--- a/Control/StoreGate/test/ReadDecorHandleKey_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandleKey_test.cxx
@@ -1,8 +1,6 @@
/*
* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
*/
-
-// $Id$
/**
* @file StoreGate/test/ReadDecorHandleKey_test.cxx
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/StoreGate/test/ReadDecorHandle_test.cxx b/Control/StoreGate/test/ReadDecorHandle_test.cxx
index fa2f249216da831d63345020e3c257bef7cb8a26..30e781ec901a233ae544a269258285cfcee2e5f0 100644
--- a/Control/StoreGate/test/ReadDecorHandle_test.cxx
+++ b/Control/StoreGate/test/ReadDecorHandle_test.cxx
@@ -1,10 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
-
-// $Id$
/**
* @file StoreGate/test/ReadDecorHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -315,7 +311,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/ReadHandle_test.cxx b/Control/StoreGate/test/ReadHandle_test.cxx
index d58b989bc5621188355b11f5552624a1b1cc7070..de00f13bbacbca7099b46859c257a959c7717fc0 100644
--- a/Control/StoreGate/test/ReadHandle_test.cxx
+++ b/Control/StoreGate/test/ReadHandle_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/ReadHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -375,7 +373,7 @@ int main (int argc, char** argv)
errorcheck::ReportMessage::hideErrorLocus();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/SGHive_test.cxx b/Control/StoreGate/test/SGHive_test.cxx
index e0262012be75fdc18622aeef652b260d9ce6f4c1..69969e475d31df3a387e4e7f9990fb3f934adcd9 100644
--- a/Control/StoreGate/test/SGHive_test.cxx
+++ b/Control/StoreGate/test/SGHive_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -8,8 +8,6 @@
ATLAS Collaboration
***************************************************************************/
-// $Id: SGHive_test.cxx 797434 2017-02-15 23:30:43Z ssnyder $
-
#undef NDEBUG
#include <string>
@@ -115,7 +113,7 @@ public:
int main() {
cout << "*** SGHiveTest BEGINS ***" << endl;
ISvcLocator* pSvcLoc;
- if (!initGaudi("SGHive_test.txt", pSvcLoc)) {
+ if (!initGaudi("StoreGate/SGHive_test.txt", pSvcLoc)) {
return 1;
}
IHiveWhiteBoard* pWB(0);
diff --git a/Control/StoreGate/test/SGTiming_test.cxx b/Control/StoreGate/test/SGTiming_test.cxx
index befd1dc4555c63f52068fac9f5286173c93de2c5..dbe3a1345152545edec6a59ce856f8975a7cd927 100644
--- a/Control/StoreGate/test/SGTiming_test.cxx
+++ b/Control/StoreGate/test/SGTiming_test.cxx
@@ -21,7 +21,7 @@ int main() {
std::cout << "**** SGTimingTest BEGINS ****" << std::endl;
ISvcLocator* pSvcLoc;
- if (!Athena_test::initGaudi("SGTiming_test.txt", pSvcLoc)) {
+ if (!Athena_test::initGaudi("StoreGate/SGTiming_test.txt", pSvcLoc)) {
return 1;
}
diff --git a/Control/StoreGate/test/ThinningHandleBase_test.cxx b/Control/StoreGate/test/ThinningHandleBase_test.cxx
index 1bc3870cebf2fd6a153a71a2c930c95d1a95e15d..72ce48bc7e682961f9b76051fd7bf6fa1495eedd 100644
--- a/Control/StoreGate/test/ThinningHandleBase_test.cxx
+++ b/Control/StoreGate/test/ThinningHandleBase_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file StoreGate/test/ThinningHandleBase_test.cxx
@@ -114,7 +114,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
errorcheck::ReportMessage::hideFunctionNames();
ISvcLocator* svcloc;
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/ThinningHandle_test.cxx b/Control/StoreGate/test/ThinningHandle_test.cxx
index 616995cfd1d8f7d403d357f933916b496953bd7a..1a610fd53aa617a8bc0881ce470330e6888ad919 100644
--- a/Control/StoreGate/test/ThinningHandle_test.cxx
+++ b/Control/StoreGate/test/ThinningHandle_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file StoreGate/test/ThinningHandle_test.cxx
@@ -122,7 +122,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
errorcheck::ReportMessage::hideFunctionNames();
ISvcLocator* svcloc;
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/UpdateHandle_test.cxx b/Control/StoreGate/test/UpdateHandle_test.cxx
index 9fe4e9a42a8a5f12f91efdc48898be5b25d5abc6..e6dbeb62bfaf35cc262d6da2b6dd8046c984d0e0 100644
--- a/Control/StoreGate/test/UpdateHandle_test.cxx
+++ b/Control/StoreGate/test/UpdateHandle_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/UpdateHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -264,7 +262,7 @@ int main()
errorcheck::ReportMessage::hideFunctionNames();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/VarHandleBase_test.cxx b/Control/StoreGate/test/VarHandleBase_test.cxx
index 98f9e71a4c5e5b9e6d6cc6d0a961b5f1fcc5dffa..df5283ce6f7db336d8577a83d1154fd3c08f8e4c 100644
--- a/Control/StoreGate/test/VarHandleBase_test.cxx
+++ b/Control/StoreGate/test/VarHandleBase_test.cxx
@@ -1,8 +1,6 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/VarHandleBase_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -757,7 +755,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
index f25e7d2d4db211d742958abdc776948ab37a55b2..e05f07c80d44984cf762cfc075fcfe822bb0f680 100644
--- a/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleKeyProperty_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/VarHandleKeyProperty_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -265,7 +263,7 @@ void test5()
int main()
{
ISvcLocator* pDum;
- if (!Athena_test::initGaudi("VarHandleKeyProperty_test.txt", pDum)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleKeyProperty_test.txt", pDum)) {
return 1;
}
diff --git a/Control/StoreGate/test/VarHandleProperty_test.cxx b/Control/StoreGate/test/VarHandleProperty_test.cxx
index f76accc00abba7ab4ddbd1f2ece757f1391e8f74..8443c28fee2ad017e1d7296c263b3b9cc7877394 100644
--- a/Control/StoreGate/test/VarHandleProperty_test.cxx
+++ b/Control/StoreGate/test/VarHandleProperty_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/VarHandleProperty_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -113,7 +111,7 @@ void test1()
int main()
{
ISvcLocator* pDum;
- if (!Athena_test::initGaudi("VarHandleProperty_test.txt", pDum)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleProperty_test.txt", pDum)) {
return 1;
}
diff --git a/Control/StoreGate/test/WriteCondHandle_test.cxx b/Control/StoreGate/test/WriteCondHandle_test.cxx
index 13da01a0189b804eaecedd3d47dc7a4c1b90c532..7a8329f150838affa86528a5902b39129fd3969a 100644
--- a/Control/StoreGate/test/WriteCondHandle_test.cxx
+++ b/Control/StoreGate/test/WriteCondHandle_test.cxx
@@ -433,7 +433,7 @@ int main()
{
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("WriteCondHandle_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/WriteCondHandle_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/WriteDecorHandleKey_test.cxx b/Control/StoreGate/test/WriteDecorHandleKey_test.cxx
index b9e8c76b52ae71cedfcb2cc8aafd68409a928552..7fc7170853781ebfa36ca0a7ab3c2bfd760a2b13 100644
--- a/Control/StoreGate/test/WriteDecorHandleKey_test.cxx
+++ b/Control/StoreGate/test/WriteDecorHandleKey_test.cxx
@@ -1,8 +1,6 @@
/*
* Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
*/
-
-// $Id$
/**
* @file StoreGate/test/WriteDecorHandleKey_test.cxx
* @author scott snyder <snyder@bnl.gov>
diff --git a/Control/StoreGate/test/WriteDecorHandle_test.cxx b/Control/StoreGate/test/WriteDecorHandle_test.cxx
index d4cf6175989e8736849688842662e6b42791ac36..c625497cb16d701ec23301a95878e756f0a0d7af 100644
--- a/Control/StoreGate/test/WriteDecorHandle_test.cxx
+++ b/Control/StoreGate/test/WriteDecorHandle_test.cxx
@@ -1,10 +1,6 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*
- */
-
-// $Id$
/**
* @file StoreGate/test/WriteDecorHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -247,11 +243,13 @@ void test4()
SG::WriteDecorHandle<MyObj, int> h1 (k1);
assert (h1.setProxyDict (&testStore).isSuccess());
assert (h1.auxid() == ityp);
+ assert (!h1.isAvailable());
h1 (*pobj) = 22;
MyObj::Accessor<int> bdec ("bbb");
assert (bdec (*pobj) == 22);
+ assert (h1.isAvailable());
}
@@ -309,7 +307,7 @@ int main()
errorcheck::ReportMessage::hideErrorLocus();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/StoreGate/test/WriteHandle_test.cxx b/Control/StoreGate/test/WriteHandle_test.cxx
index 4439e74bb3ae354538cbdb02382a52df6c98677c..ea464a3ee808da56f34e9e1be680ff5e04dedabf 100644
--- a/Control/StoreGate/test/WriteHandle_test.cxx
+++ b/Control/StoreGate/test/WriteHandle_test.cxx
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file StoreGate/test/WriteHandle_test.cxx
* @author scott snyder <snyder@bnl.gov>
@@ -720,7 +718,7 @@ int main()
errorcheck::ReportMessage::hideFunctionNames();
ISvcLocator* svcloc;
//need MessageSvc
- if (!Athena_test::initGaudi("VarHandleBase_test.txt", svcloc)) {
+ if (!Athena_test::initGaudi("StoreGate/VarHandleBase_test.txt", svcloc)) {
return 1;
}
diff --git a/Control/xAODDataSource/CMakeLists.txt b/Control/xAODDataSource/CMakeLists.txt
index 083575e27c5d087faea0cd8f4c5b0b271c45fda5..c5963b181df4d7b05f8a411f315d47b87b963c40 100644
--- a/Control/xAODDataSource/CMakeLists.txt
+++ b/Control/xAODDataSource/CMakeLists.txt
@@ -61,4 +61,4 @@ atlas_add_test( dataFrame_pytest
LOG_IGNORE_PATTERN "Can.t find BranchInfo|Function should only be called" )
# Install files from the package.
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/DataQuality/DataQualityUtils/python/hanwriter.py b/DataQuality/DataQualityUtils/python/hanwriter.py
index 8cebebd6844cc718d04c681096e71f9b3a264cf1..3995982cf990dccc17dd01c43d072881e633bdc0 100755
--- a/DataQuality/DataQualityUtils/python/hanwriter.py
+++ b/DataQuality/DataQualityUtils/python/hanwriter.py
@@ -88,7 +88,11 @@ class Node(DQHanConfMaker.Node):
"""
convert the object in a formatted han string
"""
- writer = DQHanConfMaker._get_StringIO()
+ # restore the following in a future tdaq release
+ # writer = DQHanConfMaker._get_StringIO()
+ import io
+ import six
+ writer = io.BytesIO() if six.PY2 else io.StringIO()
if encoding is not None:
import codecs
writer = codecs.lookup(encoding)[3](writer)
@@ -769,3 +773,4 @@ def writeHanConfiguration(filename='dq.han.config', roots=[]):
fileout = open(filename, 'w')
print(doc.toprettyhan(" "), file=fileout)
+
\ No newline at end of file
diff --git a/DataQuality/DataQualityUtils/src/HanOutputFile.cxx b/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
index f0b1565d1db18e2c97291b3ab642c87ea202b085..75777b0477f4145249cf20a2db42c7d04cef6e73 100644
--- a/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
+++ b/DataQuality/DataQualityUtils/src/HanOutputFile.cxx
@@ -36,6 +36,7 @@
#include <TBufferJSON.h>
#include <TString.h>
#include <TEfficiency.h>
+#include "TPluginManager.h"
#define BINLOEDGE(h,n) h->GetXaxis()->GetBinLowEdge(n)
#define BINWIDTH(h,n) h->GetXaxis()->GetBinWidth(n)
@@ -80,6 +81,11 @@ HanOutputFile()
, m_style(0)
{
clearData();
+ TPluginHandler* h;
+ if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualPS", "image"))) {
+ if (h->LoadPlugin() == -1) return;
+ h->ExecPlugin(0);
+ }
}
@@ -90,6 +96,11 @@ HanOutputFile( std::string fileName )
{
clearData();
setFile( fileName );
+ TPluginHandler* h;
+ if ((h = gROOT->GetPluginManager()->FindHandler("TVirtualPS", "image"))) {
+ if (h->LoadPlugin() == -1) return;
+ h->ExecPlugin(0);
+ }
}
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
index 74fcd060642ce0e6b7f1eefaa1fcb5110fa3c09e..57327c0bbbf2728143d202c84703daeadab8ceed 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/src/AthenaPoolCnvSvc.cxx
@@ -386,12 +386,12 @@ StatusCode AthenaPoolCnvSvc::commitOutput(const std::string& outputConnectionSpe
std::string fileName;
if (!m_outputStreamingTool.empty() && m_streamServer < m_outputStreamingTool.size()
&& m_outputStreamingTool[m_streamServer]->isServer()) {
- auto streamingTool = m_outputStreamingTool[m_streamServer];
+ auto& streamingTool = m_outputStreamingTool[m_streamServer];
// Clear object to get Placements for all objects in a Stream
char* placementStr = nullptr;
int num = -1;
StatusCode sc = streamingTool->clearObject(&placementStr, num);
- if (sc.isSuccess() && placementStr != nullptr && strlen(placementStr) > 0 && num > 0) {
+ if (sc.isSuccess() && placementStr != nullptr && strlen(placementStr) > 6 && num > 0) {
fileName = strstr(placementStr, "[FILE=");
fileName = fileName.substr(6, fileName.find(']') - 6);
if (!this->connectOutput(fileName).isSuccess()) {
@@ -458,7 +458,6 @@ StatusCode AthenaPoolCnvSvc::commitOutput(const std::string& outputConnectionSpe
return abortSharedWrClients(num);
}
tokenStr = token->toString();
-
if (className == "DataHeader_p6") {
// Found DataHeader
GenericAddress address(POOL_StorageType, ClassID_traits<DataHeader>::ID(),
@@ -498,6 +497,9 @@ StatusCode AthenaPoolCnvSvc::commitOutput(const std::string& outputConnectionSpe
}
// Send Token back to Client
sc = streamingTool->lockObject(tokenStr.c_str(), num);
+ while (sc.isRecoverable()) {
+ sc = streamingTool->lockObject(tokenStr.c_str(), num);
+ }
if (!sc.isSuccess()) {
ATH_MSG_ERROR("Failed to lock Data for " << tokenStr);
return abortSharedWrClients(-1);
@@ -523,6 +525,8 @@ StatusCode AthenaPoolCnvSvc::commitOutput(const std::string& outputConnectionSpe
}
}
placementStr = nullptr;
+ } else if (sc.isSuccess() && placementStr != nullptr && strncmp(placementStr, "stop", 4) == 0) {
+ return(StatusCode::RECOVERABLE);
} else if (sc.isRecoverable() || num == -1) {
return(StatusCode::RECOVERABLE);
}
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.cxx
index 02b31ef6a852d5050f0aafb437fd802e5ea74650..72d5a86c2a8696791f9353f22fb5d4eafdbb13ae 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.cxx
@@ -21,7 +21,7 @@ MetadataTest::MetadataTest(const std::string& name, ISvcLocator* pSvcLocator) :
m_hkey("CutBookkeepers","MetaDataStore"),
m_hinckey("IncompleteCutBookkeepers","MetaDataStore"),
m_eihkey("StreamAOD","MetaDataStore"),
- m_bshkey("ByteStreamMetadata","MetaDataStore"),
+ m_metadataStore("StoreGateSvc/MetaDataStore", name),
m_esidone(false),
m_inputstream("StreamAOD")
{
@@ -40,7 +40,7 @@ StatusCode MetadataTest::start()
ATH_CHECK( m_hkey.initialize() );
ATH_CHECK( m_hinckey.initialize() );
ATH_CHECK( m_eihkey.initialize() );
- ATH_CHECK( m_bshkey.initialize() );
+ ATH_CHECK( m_metadataStore.retrieve() );
m_esidone = false;
return StatusCode::SUCCESS;
}
@@ -85,8 +85,8 @@ StatusCode MetadataTest::execute()
ATH_MSG_INFO("== BYTESTREAMMETADATACONTAINER CHECKS ==");
// create handle, get pointer to object
- SG::ReadMetaHandle<ByteStreamMetadataContainer> bskey(m_bshkey,this->getContext());
- const ByteStreamMetadataContainer* bsmc(*bskey);
+ const ByteStreamMetadataContainer* bsmc =
+ m_metadataStore->tryConstRetrieve<ByteStreamMetadataContainer>("ByteStreamMetadata");
if (bsmc!=nullptr) {
ATH_MSG_INFO("ByteStreamMetadataContainer size " << bsmc->size());
for (auto it = bsmc->begin(); it != bsmc->end(); ++it) {
diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.h b/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.h
index 536ce36a6bfc5210cab2bfddc1095fc00aa4cc3b..17aa2dd94971da80cc1a7a3b9dd45c3bc50a772e 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.h
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/MetadataTest.h
@@ -27,6 +27,8 @@
#include "xAODCutFlow/CutBookkeeperContainer.h"
#include "EventInfo/EventStreamInfo.h"
#include "ByteStreamData/ByteStreamMetadataContainer.h"
+#include "StoreGate/StoreGateSvc.h"
+#include "GaudiKernel/ServiceHandle.h"
class MetadataTest : public AthAlgorithm {
public:
@@ -43,7 +45,7 @@ private:
SG::ReadMetaHandleKey<xAOD::CutBookkeeperContainer> m_hkey;
SG::ReadMetaHandleKey<xAOD::CutBookkeeperContainer> m_hinckey;
SG::ReadMetaHandleKey<EventStreamInfo> m_eihkey;
- SG::ReadMetaHandleKey<ByteStreamMetadataContainer> m_bshkey;
+ ServiceHandle<StoreGateSvc> m_metadataStore;
bool m_esidone;
std::string m_inputstream;
diff --git a/DetectorDescription/RegSelLUT/src/RegSelSiLUT.cxx b/DetectorDescription/RegSelLUT/src/RegSelSiLUT.cxx
index f06eafd80c60a7b2faa43f8c51edb01dae598ecc..9259a7ed7c2d670a17a629dc5407cdf7c508d1e3 100644
--- a/DetectorDescription/RegSelLUT/src/RegSelSiLUT.cxx
+++ b/DetectorDescription/RegSelLUT/src/RegSelSiLUT.cxx
@@ -134,8 +134,8 @@ void RegSelSiLUT::initialise() {
m_SubDet.push_back( RegSelSubDetector(subdetid[i]) );
m_idmap.insert( std::map<int, int>::value_type(subdetid[i], i) );
- int ii = subdetid.size()-1-i;
- std::cout << "\tsubdet " << ii << "\tid " << subdetid[ii] << std::endl;
+ //int ii = subdetid.size()-1-i;
+ //std::cout << "\tsubdet " << ii << "\tid " << subdetid[ii] << std::endl;
}
diff --git a/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamInputSvc.h b/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamInputSvc.h
index 377473a07b910a282dde981debe7802cf8d198c3..fb7498dd3105ffea65b3ab432517f40e5e1f5d97 100644
--- a/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamInputSvc.h
+++ b/Event/ByteStreamCnvSvc/ByteStreamCnvSvc/ByteStreamInputSvc.h
@@ -40,7 +40,7 @@ public:
virtual unsigned int currentEventStatus() const;
virtual std::pair<long,std::string> getBlockIterator(const std::string /* file */);
virtual void closeBlockIterator(bool);
- virtual bool ready();
+ virtual bool ready() const;
virtual StatusCode generateDataHeader();
virtual long positionInBlock();
virtual void validateEvent();
@@ -59,7 +59,7 @@ inline unsigned int ByteStreamInputSvc::currentEventStatus() const {
// Virtual methods needed for file input
inline std::pair<long,std::string> ByteStreamInputSvc::getBlockIterator(const std::string /* file */) {return std::make_pair(-1,"GUID");}
inline void ByteStreamInputSvc::closeBlockIterator(bool) {}
-inline bool ByteStreamInputSvc::ready() {return false;}
+inline bool ByteStreamInputSvc::ready() const {return false;}
inline StatusCode ByteStreamInputSvc::generateDataHeader() {return StatusCode::SUCCESS;}
inline long ByteStreamInputSvc::positionInBlock() {return -1;}
inline void ByteStreamInputSvc::validateEvent() {}
diff --git a/Event/ByteStreamCnvSvc/share/BSEventSelector.ref b/Event/ByteStreamCnvSvc/share/BSEventSelector.ref
index a090d5ba63b8d2bf5508a2f1ead412a7c4f7c9da..9a5cc37a2b3df8bd1e705a5a859eae0a86e80c44 100644
--- a/Event/ByteStreamCnvSvc/share/BSEventSelector.ref
+++ b/Event/ByteStreamCnvSvc/share/BSEventSelector.ref
@@ -1,21 +1,29 @@
-ByteStreamInputSvc DEBUG Recorded ByteStreamMetadata in InputMetadataStore
-ByteStreamInputSvc DEBUG run parameters =
-ByteStreamInputSvc DEBUG Number of Free meta data strings: 0
+ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
+ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
+ByteStreamInputSvc DEBUG Property update for OutputLevel : new value = 2
+ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
+ByteStreamInputSvc DEBUG Service base class initialized successfully
+ROBDataProviderSvc INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
+ByteStreamInputSvc DEBUG ByteStreamMetadata:
+ByteStreamInputSvc DEBUG Recorded ByteStreamMetadata in InputMetaDataStore
ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
ByteStreamInputSvc DEBUG nextEvent _above_ high water mark
ByteStreamInputSvc DEBUG Event Size 1038508
ByteStreamInputSvc DEBUG First word of the fragment aa1234aa
-ByteStreamInputSvc DEBUG Format version 500
+ByteStreamInputSvc DEBUG Format version500
+ByteStreamInputSvc DEBUG Made an FullEventFragment from ES 0x15bd2000
ByteStreamInputSvc DEBUG switched to next event in slot INVALID
-ByteStreamInputSvc DEBUG ByteStream File GUID:1C43C4AA-2555-E711-BB1F-02163E01794D
+ByteStreamInputSvc DEBUG ByteStream File GUID: 1C43C4AA-2555-E711-BB1F-02163E01794D
ByteStreamInputSvc DEBUG ByteStream Event Position in File: 1324
+ByteStreamCnvSvc DEBUG Property update for OutputLevel : new value = 2
EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
ByteStreamInputSvc DEBUG nextEvent _above_ high water mark
ByteStreamInputSvc DEBUG Event Size 1000648
ByteStreamInputSvc DEBUG First word of the fragment aa1234aa
-ByteStreamInputSvc DEBUG Format version 500
+ByteStreamInputSvc DEBUG Format version500
+ByteStreamInputSvc DEBUG Made an FullEventFragment from ES 0x15cd0000
ByteStreamInputSvc DEBUG switched to next event in slot s: 0 e: 0
-ByteStreamInputSvc DEBUG ByteStream File GUID:1C43C4AA-2555-E711-BB1F-02163E01794D
+ByteStreamInputSvc DEBUG ByteStream File GUID: 1C43C4AA-2555-E711-BB1F-02163E01794D
ByteStreamInputSvc DEBUG ByteStream Event Position in File: 1039848
ByteStreamInputSvc DEBUG Calling ByteStreamInputSvc::stop()
ByteStreamCnvSvc DEBUG releasing all workers
diff --git a/Event/ByteStreamCnvSvc/share/TBEventSelector_jobOptions.py b/Event/ByteStreamCnvSvc/share/TBEventSelector_jobOptions.py
index af634cd1f0a90354f9dfd866d0fd388d359f6509..571741ecfed8af890d3f659bb092f0f58419ee0c 100644
--- a/Event/ByteStreamCnvSvc/share/TBEventSelector_jobOptions.py
+++ b/Event/ByteStreamCnvSvc/share/TBEventSelector_jobOptions.py
@@ -21,7 +21,7 @@ svcMgr += ByteStreamCnvSvc()
# Properties
EventSelector = svcMgr.EventSelector
-EventSelector.ByteStreamInputSvc = "ByteStreamInputSvc";
+EventSelector.ByteStreamInputSvc = "ByteStreamInputSvc";
EventPersistencySvc = svcMgr.EventPersistencySvc
EventPersistencySvc.CnvServices += [ "ByteStreamCnvSvc" ]
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
index c96dc1fd64ca787d7e4374c86b8d6cbceb9f2097..8a81b365194775e6ae0441cfb094329590aa32ad 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.cxx
@@ -8,6 +8,7 @@
#include "ByteStreamData/ByteStreamMetadataContainer.h"
#include "ByteStreamCnvSvcBase/ByteStreamAddress.h"
#include "EventStorage/pickDataReader.h"
+#include "EventStorage/DataReader.h"
#include "GaudiKernel/IJobOptionsSvc.h"
#include "GaudiKernel/Property.h"
@@ -32,140 +33,106 @@
#include <unistd.h>
+/******************************************************************************/
// Constructor.
-ByteStreamEventStorageInputSvc::ByteStreamEventStorageInputSvc(const std::string& name,
- ISvcLocator* svcloc) : ByteStreamInputSvc(name, svcloc),
- //m_totalEventCounter(0),
- m_reader(0),
- m_evtInFile(0),
- m_sgSvc("StoreGateSvc", name),
- m_mdSvc("StoreGateSvc/InputMetaDataStore", name),
- m_robProvider("ROBDataProviderSvc", name),
- m_sequential(false),
- m_fileCount(0) {
- declareProperty("FullFileName", m_vExplicitFile);
- declareProperty("EnableSequential", m_sequential);
- declareProperty("DumpFlag", m_dump = false);
- declareProperty("WaitSecs", m_wait = 0);
- declareProperty("ValidateEvent", m_valEvent = true);
- declareProperty("ProcessBadEvent", m_procBadEvent = false); // Defunct property, backward compatibility only
- declareProperty("MaxBadEvents", m_maxBadEvts = -1); // Defunct property, backward compatibility only
-
- declareProperty("EventStore", m_sgSvc);
- declareProperty("MetaDataStore", m_mdSvc);
-}
-//------------------------------------------------------------------------------
-ByteStreamEventStorageInputSvc::~ByteStreamEventStorageInputSvc() {
-
- delete m_reader; m_reader = 0;
+ByteStreamEventStorageInputSvc::ByteStreamEventStorageInputSvc(
+ const std::string& name, ISvcLocator* pSvcLocator)
+ : ByteStreamInputSvc(name, pSvcLocator)
+ , m_readerMutex()
+ , m_eventsCache()
+ , m_reader()
+ , m_evtOffsets()
+ , m_evtInFile(0)
+ , m_evtFileOffset(0)
+ , m_fileGUID("")
+ , m_storeGate ("StoreGateSvc", name)
+ , m_inputMetadata("StoreGateSvc/InputMetaDataStore", name)
+ , m_robProvider ("ROBDataProviderSvc", name)
+ , m_vExplicitFile(this, "FullFileName", {}, "")
+ , m_sequential (this, "EnableSequential", false, "")
+ , m_dump (this, "DumpFlag", false, "Dump fragments")
+ , m_wait (this, "WaitSecs", 0., "Seconds to wait if input is in wait state")
+ , m_valEvent (this, "ValidateEvent", true, "switch on check_tree when reading events")
+ , m_eventInfoKey (this, "EventInfoKey", "EventInfo", "Key of EventInfo in metadata store")
+{
+ assert(pSvcLocator != nullptr);
+
+ declareProperty("EventStore", m_storeGate);
+ declareProperty("MetaDataStore", m_inputMetadata);
}
-//------------------------------------------------------------------------------
-StatusCode ByteStreamEventStorageInputSvc::initialize() {
- ATH_MSG_INFO("Initializing " << name() << " - package version " << PACKAGE_VERSION);
- if (!ByteStreamInputSvc::initialize().isSuccess()) {
- ATH_MSG_FATAL("Cannot initialize ByteStreamInputSvc base class.");
- return(StatusCode::FAILURE);
- }
-
- // Retrieve InputMetaDataStore
- if (!m_mdSvc.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Cannot get InputMetaDataStore.");
- return(StatusCode::FAILURE);
- }
- if (!m_robProvider.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Cannot get rob data provider");
- return(StatusCode::FAILURE);
- }
-
- // Check if defunct properties set, and give instructions
- if (m_procBadEvent != false) ATH_MSG_WARNING("ProcessBadEvent property has been moved to EventSelector, please use svgMgr.EventSelector.ProcessBadEvent instead");
- if (m_maxBadEvts != -1) ATH_MSG_WARNING("MaxBadEvents property has been moved to EventSelector, please use svgMgr.EventSelector.MaxBadEvents instead");
-
- // Retrieve StoreGateSvc
- if (!m_sgSvc.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Cannot get StoreGateSvc.");
- return(StatusCode::FAILURE);
- }
-
- return(StatusCode::SUCCESS);
+
+
+/******************************************************************************/
+ByteStreamEventStorageInputSvc::~ByteStreamEventStorageInputSvc()
+{}
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageInputSvc::initialize()
+{
+ ATH_MSG_INFO("Initializing " << name() << " - package version " << PACKAGE_VERSION);
+
+ ATH_CHECK(ByteStreamInputSvc::initialize());
+ ATH_CHECK(m_inputMetadata.retrieve());
+ ATH_CHECK(m_storeGate.retrieve());
+ ATH_CHECK(m_robProvider.retrieve());
+
+ return(StatusCode::SUCCESS);
}
-//________________________________________________________________________________
-StatusCode ByteStreamEventStorageInputSvc::stop() {
- ATH_MSG_DEBUG("Calling ByteStreamInputSvc::stop()");
- // close moved to EventSelector for explicit coupling with incident
- //if (m_reader != 0) closeBlockIterator(false);
- return(StatusCode::SUCCESS);
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageInputSvc::stop()
+{
+ ATH_MSG_DEBUG("Calling ByteStreamInputSvc::stop()");
+ // close moved to EventSelector for explicit coupling with incident
+ //if (m_reader != 0) closeBlockIterator(false);
+ return(StatusCode::SUCCESS);
}
-//------------------------------------------------------------------------------
-StatusCode ByteStreamEventStorageInputSvc::finalize() {
- // delete the old event
- // releaseCurrentEvent(); // destruction of service obj will clear it
-
- if (!m_sgSvc.release().isSuccess()) {
- ATH_MSG_WARNING("Cannot release StoreGateSvc");
- }
- if (!m_robProvider.release().isSuccess()) {
- ATH_MSG_WARNING("Cannot release rob data provider");
- }
- if (!m_mdSvc.release().isSuccess()) {
- ATH_MSG_WARNING("Cannot release InputMetaDataStore");
- }
- return(ByteStreamInputSvc::finalize());
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageInputSvc::finalize() {
+
+ ATH_CHECK(m_storeGate.release());
+ ATH_CHECK(m_robProvider.release());
+ ATH_CHECK(m_inputMetadata.release());
+
+ return(ByteStreamInputSvc::finalize());
}
-//------------------------------------------------------------------------------
-long ByteStreamEventStorageInputSvc::positionInBlock()
+
+
+/******************************************************************************/
+// Can't inline this because it is called via pointer to the base class
+long
+ByteStreamEventStorageInputSvc::positionInBlock()
{
return m_evtOffsets.size();
}
-//------------------------------------------------------------------------------
-// Load freemetadata into store
-bool ByteStreamEventStorageInputSvc::loadMetadata()
-{
- bool good = true;
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageInputSvc::loadMetadata()
+{
// default goes into ByteStreamMetadata
- std::bitset<64> word1;
- std::bitset<64> word2;
- for (unsigned int i=0; i<64; ++i) {
- word1[i] = m_reader->detectorMask()[i];
- word2[i] = m_reader->detectorMask()[i+64];
- }
- ByteStreamMetadata* metadata = new ByteStreamMetadata(m_reader->runNumber(), m_reader->eventsInFile(),
- m_reader->maxEvents(), m_reader->recEnable(), m_reader->triggerType(), word1.to_ulong(), word2.to_ulong(),
- m_reader->beamType(), m_reader->beamEnergy(), m_reader->GUID(), m_reader->stream(),
- m_reader->projectTag(), m_reader->lumiblockNumber(), m_reader->freeMetaDataStrings());
- ByteStreamMetadataContainer* bsmdc = new ByteStreamMetadataContainer;
- bsmdc->push_back(metadata);
- StatusCode status = m_mdSvc->record(bsmdc, "ByteStreamMetadata");
- if (!status.isSuccess()) {
- delete metadata; metadata = 0;
- ATH_MSG_WARNING("Unable to record Input MetaData for ByteStream");
- good = false;
- }
- else ATH_MSG_DEBUG("Recorded ByteStreamMetadata in InputMetadataStore");
-
- ATH_MSG_DEBUG(" run parameters = \n "
- << " run number " << m_reader->runNumber() << "\n"
- << " max events " << m_reader->maxEvents() << "\n"
- << " rec enable " << m_reader->recEnable() << "\n"
- << " trigger_type " << m_reader->triggerType() << "\n"
- << " detector mask " << m_reader->detectorMask() << "\n"
- << " beam type " << m_reader->beamType() << "\n"
- << " beam energy " << m_reader->beamEnergy());
-
- std::vector<std::string> vMetaData = m_reader->freeMetaDataStrings();
- ATH_MSG_DEBUG("Number of Free meta data strings: " << vMetaData.size());
- for (unsigned int i = 0; i < vMetaData.size(); ++i) {
- ATH_MSG_DEBUG("MetaData[" << i << "]:" << vMetaData[i]);
- }
+ auto bsmdc = std::make_unique<ByteStreamMetadataContainer>();
+ bsmdc->push_back(std::make_unique<ByteStreamMetadata>(*m_reader));
+ ATH_MSG_DEBUG("ByteStreamMetadata:\n" << *(bsmdc->front()));
- return good;
+ return m_inputMetadata->record(std::move(bsmdc), "ByteStreamMetadata");
}
-const RawEvent* ByteStreamEventStorageInputSvc::previousEvent() {
- std::lock_guard<std::mutex> lock( m_readerMutex );
- const EventContext context{ Gaudi::Hive::currentContext() };
+/******************************************************************************/
+const RawEvent*
+ByteStreamEventStorageInputSvc::previousEvent()
+{
+ std::lock_guard<std::mutex> lock(m_readerMutex);
+ const EventContext context{Gaudi::Hive::currentContext()};
// Load data buffer from file
char *buf;
@@ -174,19 +141,20 @@ const RawEvent* ByteStreamEventStorageInputSvc::previousEvent() {
//get current event position (cast to long long until native tdaq implementation)
m_evtInFile--;
m_evtFileOffset = m_evtOffsets.at(m_evtInFile);
- DRError ecode = m_reader->getData(eventSize,&buf,m_evtOffsets.at(m_evtInFile -1));
+ DRError ecode = m_reader->getData(eventSize, &buf, m_evtOffsets.at(m_evtInFile - 1));
+
if (DRWAIT == ecode && m_wait > 0) {
do {
// wait for n seconds
ATH_MSG_DEBUG("Waiting for input: " << m_wait << " seconds");
- int result = usleep((int)(m_wait*1000000));
+ int result = usleep(static_cast<int>(m_wait * 1e6));
if (result != 0) {
ATH_MSG_ERROR("System Error while running sleep");
- return 0;
+ return nullptr;
}
- } while(m_reader->getData(eventSize,&buf,m_evtFileOffset) == DRWAIT);
+ } while(m_reader->getData(eventSize, &buf, m_evtFileOffset) == DRWAIT);
} else if (DROK != ecode) {
- ATH_MSG_ERROR("Error reading next event");
+ ATH_MSG_ERROR("Error reading previous event");
throw ByteStreamExceptions::readError();
}
ATH_MSG_DEBUG("Event Size " << eventSize);
@@ -198,37 +166,39 @@ const RawEvent* ByteStreamEventStorageInputSvc::previousEvent() {
EventCache* cache = m_eventsCache.get(context);
// initialize before building RawEvent
- releaseEvent( cache );
-
+ cache->releaseEvent();
+
// Use buffer to build FullEventFragment
try {
- buildFragment( cache, buf, eventSize, true);
+ buildFragment(cache, buf, eventSize, true);
}
catch (...) {
// rethrow any exceptions
throw;
}
- if ( cache->rawEvent == 0 ) {
+ if (cache->rawEvent == nullptr) {
ATH_MSG_ERROR("Failure to build fragment");
- return 0;
+ return nullptr;
}
// Set it for the data provider
- m_robProvider->setNextEvent(context, cache->rawEvent);
+ m_robProvider->setNextEvent(context, cache->rawEvent.get());
m_robProvider->setEventStatus(context, cache->eventStatus);
// dump
if (m_dump) {
- DumpFrags::dump( cache->rawEvent );
+ DumpFrags::dump(cache->rawEvent.get());
}
- ATH_MSG_DEBUG( "switched to previous event in slot " << context );
- return( cache->rawEvent );
-
+ ATH_MSG_DEBUG( "switched to previous event in slot " << context);
+ return(cache->rawEvent.get());
}
-//------------------------------------------------------------------------------
+
+
+/******************************************************************************/
// Read the next event.
-const RawEvent* ByteStreamEventStorageInputSvc::nextEvent() {
+const RawEvent*
+ByteStreamEventStorageInputSvc::nextEvent() {
std::lock_guard<std::mutex> lock( m_readerMutex );
const EventContext context{ Gaudi::Hive::currentContext() };
@@ -239,418 +209,487 @@ const RawEvent* ByteStreamEventStorageInputSvc::nextEvent() {
if (readerReady()) {
DRError ecode;
// Check if have moved back from high water mark
- m_evtInFile ++; // increment iterator
+ m_evtInFile++; // increment iterator
if (m_evtInFile+1 > m_evtOffsets.size()) {
//get current event position (cast to long long until native tdaq implementation)
ATH_MSG_DEBUG("nextEvent _above_ high water mark");
- m_evtFileOffset = (long long)m_reader->getPosition();
+ m_evtFileOffset = static_cast<long long>(m_reader->getPosition());
m_evtOffsets.push_back(m_evtFileOffset);
- ecode = m_reader->getData(eventSize,&buf);
- }
-
- else {
+ ecode = m_reader->getData(eventSize, &buf);
+ } else {
// Load from previous offset
ATH_MSG_DEBUG("nextEvent below high water mark");
- m_evtFileOffset = m_evtOffsets.at( m_evtInFile-1 );
- ecode = m_reader->getData( eventSize, &buf, m_evtFileOffset );
+ m_evtFileOffset = m_evtOffsets.at(m_evtInFile - 1);
+ ecode = m_reader->getData(eventSize, &buf, m_evtFileOffset);
}
if (DRWAIT == ecode && m_wait > 0) {
do {
// wait for n seconds
ATH_MSG_DEBUG("Waiting for input: " << m_wait << " seconds");
- int result = usleep((int)(m_wait*1000000));
+ int result = usleep(static_cast<int>(m_wait * 1e6));
if (result != 0) {
ATH_MSG_ERROR("System Error while running sleep");
return 0;
}
- } while(m_reader->getData( eventSize, &buf ) == DRWAIT);
+ } while(m_reader->getData(eventSize, &buf) == DRWAIT);
} else if (DROK != ecode) {
ATH_MSG_ERROR("Error reading next event");
throw ByteStreamExceptions::readError();
}
ATH_MSG_DEBUG("Event Size " << eventSize);
- }
- else {
+
+ } else {
ATH_MSG_ERROR("DataReader not ready. Need to getBlockIterator first");
return 0;
}
+
EventCache* cache = m_eventsCache.get(context);
// initialize before building RawEvent
- releaseEvent( cache );
-
+ cache->releaseEvent();
+
// Use buffer to build FullEventFragment
try {
- buildFragment( cache, buf, eventSize, true );
+ buildFragment(cache, buf, eventSize, true);
}
catch (...) {
// rethrow any exceptions
throw;
}
- if ( cache->rawEvent == 0 ) {
+ if (cache->rawEvent == nullptr) {
ATH_MSG_ERROR("Failure to build fragment");
- return 0;
+ return nullptr;
}
-
// Set it for the data provider
- m_robProvider->setNextEvent( context, cache->rawEvent );
- m_robProvider->setEventStatus( context, cache->eventStatus );
+ m_robProvider->setNextEvent(context, cache->rawEvent.get());
+ m_robProvider->setEventStatus(context, cache->eventStatus);
//++m_totalEventCounter;
// dump
if (m_dump) {
- DumpFrags::dump( cache->rawEvent );
+ DumpFrags::dump(cache->rawEvent.get());
}
- ATH_MSG_DEBUG( "switched to next event in slot " << context );
- return( cache->rawEvent );
+ ATH_MSG_DEBUG("switched to next event in slot " << context);
+ return(cache->rawEvent.get());
}
-void ByteStreamEventStorageInputSvc::validateEvent() {
- const EventContext context{ Gaudi::Hive::currentContext() };
- m_eventsCache.get(context)->eventStatus = validateEvent( m_eventsCache.get(context)->rawEvent );
+
+/******************************************************************************/
+void
+ByteStreamEventStorageInputSvc::validateEvent()
+{
+ const EventContext& context{Gaudi::Hive::currentContext()};
+ const RawEvent* const event = m_eventsCache.get(context)->rawEvent.get();
+ m_eventsCache.get(context)->eventStatus = validateEvent(event);
}
-unsigned ByteStreamEventStorageInputSvc::validateEvent( const RawEvent* rawEvent ) const
+
+/******************************************************************************/
+unsigned
+ByteStreamEventStorageInputSvc::validateEvent(const RawEvent* const rawEvent) const
{
unsigned int status = 0;
if (m_valEvent) {
// check validity
- std::vector<eformat::FragmentProblem> p;
- rawEvent->problems(p);
- if (!p.empty()) {
+ std::vector<eformat::FragmentProblem> problems;
+ rawEvent->problems(problems);
+
+ if(!problems.empty()) {
status += 0x01000000;
+
// bad event
ATH_MSG_WARNING("Failed to create FullEventFragment");
- for (std::vector<eformat::FragmentProblem>::const_iterator i = p.begin(), iEnd = p.end();
- i != iEnd; i++) {
- ATH_MSG_WARNING(eformat::helper::FragmentProblemDictionary.string(*i));
- }
- // releaseCurrentEvent();
+ for(const auto& problem : problems)
+ ATH_MSG_WARNING(eformat::helper::FragmentProblemDictionary.string(problem));
+
throw ByteStreamExceptions::badFragmentData();
}
- if ( !ROBFragmentCheck( rawEvent ) ) {
+
+ if(!ROBFragmentCheck(rawEvent)) {
status += 0x02000000;
+
// bad event
- // releaseCurrentEvent();
ATH_MSG_ERROR("Skipping bad event");
throw ByteStreamExceptions::badFragmentData();
}
- }
- else {
+ } else {
ATH_MSG_DEBUG("Processing event without validating.");
}
return status;
}
-void ByteStreamEventStorageInputSvc::buildFragment(EventCache* cache, void* data, uint32_t eventSize, bool validate) const
+
+/******************************************************************************/
+void
+ByteStreamEventStorageInputSvc::buildFragment(
+ EventCache* cache, char* data, uint32_t eventSize,
+ bool validate) const
{
- OFFLINE_FRAGMENTS_NAMESPACE::DataType* fragment = reinterpret_cast<OFFLINE_FRAGMENTS_NAMESPACE::DataType*>(data);
+ using OFFLINE_FRAGMENTS_NAMESPACE::DataType;
+ using OFFLINE_FRAGMENTS_NAMESPACE::PointerType;
+ DataType* fragment = reinterpret_cast<DataType*>(data);
+
if (validate) {
// check fragment type
- const uint32_t headWord = fragment[0];
+ const DataType headWord = fragment[0];
ATH_MSG_DEBUG("First word of the fragment " << MSG::hex << headWord << MSG::dec);
// format version
- const uint32_t formatVersion = eformat::helper::Version(fragment[3]).major_version();
- ATH_MSG_DEBUG("Format version " << MSG::hex << formatVersion << MSG::dec);
+ const DataType formatVersion = eformat::helper::Version(fragment[3]).major_version();
+ ATH_MSG_DEBUG("Format version" << MSG::hex << formatVersion << MSG::dec);
// error message
- if ((formatVersion != eformat::MAJOR_DEFAULT_VERSION) &&
- (formatVersion != eformat::MAJOR_V24_VERSION) &&
- (formatVersion != eformat::MAJOR_V30_VERSION) &&
- (formatVersion != eformat::MAJOR_V40_VERSION) &&
- (formatVersion != eformat::MAJOR_V31_VERSION) ) {
- ATH_MSG_ERROR("unsupported Format Version : " << MSG::hex << formatVersion << MSG::dec);
+ if((formatVersion != eformat::MAJOR_DEFAULT_VERSION) &&
+ (formatVersion != eformat::MAJOR_V24_VERSION) &&
+ (formatVersion != eformat::MAJOR_V30_VERSION) &&
+ (formatVersion != eformat::MAJOR_V40_VERSION) &&
+ (formatVersion != eformat::MAJOR_V31_VERSION) ) {
+ ATH_MSG_ERROR("unsupported Format Version : "
+ << MSG::hex << formatVersion << MSG::dec);
}
- if (eformat::FULL_EVENT == headWord || 0xcc1234cc == headWord) { // ROS = 0xcc1234cc
+ if(eformat::FULL_EVENT == headWord || 0xcc1234cc == headWord) { // ROS = 0xcc1234cc
try {
// convert old fragment
- if (formatVersion != eformat::MAJOR_DEFAULT_VERSION) {
+ if(formatVersion != eformat::MAJOR_DEFAULT_VERSION) {
// 100 for increase of data-size due to header conversion
- uint32_t newEventSize = eventSize + 1000;
- OFFLINE_FRAGMENTS_NAMESPACE::DataType* newFragment = new OFFLINE_FRAGMENTS_NAMESPACE::DataType[newEventSize];
+ const uint32_t newEventSize = eventSize + 1000;
+ DataType* newFragment = new DataType[newEventSize];
eformat::old::convert(fragment, newFragment, newEventSize);
+
// delete old fragment
- delete [] fragment; fragment = 0;
+ delete [] fragment; fragment = nullptr;
+
// set new pointer
fragment = newFragment;
}
- } catch (eformat::Issue& ex) {
+ } catch (const eformat::Issue& ex) {
// bad event
ATH_MSG_WARNING(ex.what());
- // releaseCurrentEvent();
ATH_MSG_ERROR("Skipping bad event");
throw ByteStreamExceptions::badFragment();
}
- }
- else {
+ } else {
// Unknown fragment
ATH_MSG_FATAL("Unknown Header work in input fragment " << MSG::hex << headWord);
throw ByteStreamExceptions::badFragment();
}
- }
+ }
+
// This is a FullEventFragment
// make a new FEFrag in memory from it
cache->eventStatus = 0;
- if (fragment[5] > 0) {
+ if(fragment[5] > 0) {
cache->eventStatus += eformat::helper::Status(fragment[6]).specific();
cache->eventStatus += (eformat::helper::Status(fragment[6]).generic() & 0x000000ff) << 16;
}
// This is a FullEventFragment
// make a new RawEvent in memory from it
- cache->rawEvent = new RawEvent(fragment);
+ cache->rawEvent = std::make_unique<RawEvent>(fragment);
ATH_MSG_DEBUG("Made an FullEventFragment from ES " << fragment);
-
}
-//__________________________________________________________________________
-StatusCode ByteStreamEventStorageInputSvc::generateDataHeader()
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageInputSvc::generateDataHeader()
{
// get file GUID
m_fileGUID = m_reader->GUID();
+
// reader returns -1 when end of the file is reached
- if (m_evtFileOffset != -1) {
- ATH_MSG_DEBUG("ByteStream File GUID:" << m_fileGUID);
+ if(m_evtFileOffset != -1) {
+ ATH_MSG_DEBUG("ByteStream File GUID: " << m_fileGUID);
ATH_MSG_DEBUG("ByteStream Event Position in File: " << m_evtFileOffset);
- // Created data header element with BS provenance information
- Token* token = new Token();
- token->setDb(m_fileGUID);
- token->setTechnology(0x00001000);
- token->setOid(Token::OID_t(0LL, m_evtFileOffset));
- DataHeaderElement Dhe(ClassID_traits<DataHeader>::ID(), "StreamRAW", token);
- // Create data header itself
- DataHeader* Dh = new DataHeader();
+
// To accomodate for skipEvents option in EventSelector
// While skipping BS event Selector does not return SUCCESS code,
// just advances silently through events. So SG content is not refreshed
// Lets do refresh of the event header here
- if (m_sgSvc->contains<DataHeader>("ByteStreamDataHeader")) {
- // Temporary event header pointer for retrieval of the old one , if exists
- DataHeader* Dh_temp;
- Dh_temp = m_sgSvc->retrieve<DataHeader>("ByteStreamDataHeader");
- StatusCode sc = m_sgSvc->remove<DataHeader>(Dh_temp);
- if (!sc.isSuccess()) {
- ATH_MSG_ERROR("Failed to remove DataHeader ByteStreamDataHeader");
- }
- }
+ std::string key = "ByteStreamDataHeader";
+ ATH_CHECK(deleteEntry<DataHeader>(key));
+
+ // Created data header element with BS provenance information
+ std::unique_ptr<DataHeaderElement> dataHeaderElement = makeBSProvenance();
+ // Create data header itself
+ std::unique_ptr<DataHeader> dataHeader = std::make_unique<DataHeader>();
// Declare header primary
- Dh->setStatus(DataHeader::Input);
- //add the Dhe self reference to the object vector
- Dh->insert(Dhe);
-
- // Cleanup EventInfo from the previous event, if exists
- if (m_sgSvc->contains<xAOD::EventInfo>(m_eventInfoKey.value())) {
- // Temporary event info pointer for retrieval of the old one
- const xAOD::EventInfo* Ei_temp{nullptr};
- if (m_sgSvc->retrieve(Ei_temp, m_eventInfoKey.value()).isSuccess()) {
- StatusCode sc = m_sgSvc->remove(Ei_temp);
- if (!sc.isSuccess()) {
- ATH_MSG_ERROR("Failed to remove EventInfo");
- }
- }
- }
- if (m_sgSvc->contains<xAOD::EventAuxInfo>(m_eventInfoKey.value() + "Aux.")) {
- // Temporary event info Aux store pointer for retrieval of the old one
- const xAOD::EventAuxInfo* EiAux_temp{nullptr};
- if (m_sgSvc->retrieve(EiAux_temp, m_eventInfoKey.value() + "Aux.").isSuccess()) {
- StatusCode sc = m_sgSvc->remove(EiAux_temp);
- if (!sc.isSuccess()) {
- ATH_MSG_ERROR("Failed to remove EventAuxInfo");
- }
- }
- }
+ dataHeader->setStatus(DataHeader::Input);
+ //add the data header elenebt self reference to the object vector
+ dataHeader->insert(*std::move(dataHeaderElement));
+ // Clean up EventInfo from the previous event
+ key = m_eventInfoKey.value();
+ ATH_CHECK(deleteEntry<xAOD::EventInfo>(key));
// Now add ref to xAOD::EventInfo
- IOpaqueAddress* iopx = new ByteStreamAddress(ClassID_traits<xAOD::EventInfo>::ID(), m_eventInfoKey.value(), "");
- StatusCode iocx = m_sgSvc->recordAddress(m_eventInfoKey.value(), iopx);
- if (iocx.isSuccess()) {
- const SG::DataProxy* ptmpx = m_sgSvc->transientProxy(ClassID_traits<xAOD::EventInfo>::ID(), m_eventInfoKey.value());
- if (ptmpx !=0) {
- DataHeaderElement DheEIx(ptmpx, 0, m_eventInfoKey.value());
- Dh->insert(DheEIx);
- }
+ std::unique_ptr<IOpaqueAddress> iopx = std::make_unique<ByteStreamAddress>(
+ ClassID_traits<xAOD::EventInfo>::ID(), key, "");
+ ATH_CHECK(m_storeGate->recordAddress(key, iopx.release()));
+ const SG::DataProxy* ptmpx = m_storeGate->transientProxy(
+ ClassID_traits<xAOD::EventInfo>::ID(), key);
+ if (ptmpx != nullptr) {
+ DataHeaderElement element(ptmpx, 0, key);
+ dataHeader->insert(element);
}
+ // Clean up auxiliary EventInfo from the previous event
+ key = m_eventInfoKey.value() + "Aux.";
+ ATH_CHECK(deleteEntry<xAOD::EventAuxInfo>(key));
// Now add ref to xAOD::EventAuxInfo
- IOpaqueAddress* iopaux = new ByteStreamAddress(ClassID_traits<xAOD::EventAuxInfo>::ID(), m_eventInfoKey.value() + "Aux.", "");
- StatusCode iocaux = m_sgSvc->recordAddress(m_eventInfoKey.value() + "Aux.", iopaux);
- if (iocaux.isSuccess()) {
- const SG::DataProxy* ptmpaux = m_sgSvc->transientProxy(ClassID_traits<xAOD::EventAuxInfo>::ID(), m_eventInfoKey.value() + "Aux.");
- if (ptmpaux !=0) {
- DataHeaderElement DheEIAux(ptmpaux, 0, m_eventInfoKey.value() + "Aux.");
- Dh->insert(DheEIAux);
- }
+ std::unique_ptr<IOpaqueAddress> iopaux = std::make_unique<ByteStreamAddress>(
+ ClassID_traits<xAOD::EventAuxInfo>::ID(), key, "");
+ ATH_CHECK(m_storeGate->recordAddress(key, iopaux.release()));
+ const SG::DataProxy* ptmpaux = m_storeGate->transientProxy(
+ ClassID_traits<xAOD::EventAuxInfo>::ID(), key);
+ if (ptmpaux !=0) {
+ DataHeaderElement element(ptmpaux, 0, key);
+ dataHeader->insert(element);
}
// Record new data header.Boolean flags will allow it's deletionin case
// of skipped events.
- return m_sgSvc->record<DataHeader>(Dh, "ByteStreamDataHeader", true, false, true);
+ ATH_CHECK(m_storeGate->record<DataHeader>(dataHeader.release(),
+ "ByteStreamDataHeader", true, false, true));
}
- return StatusCode::FAILURE;
+ return StatusCode::SUCCESS;
}
-//__________________________________________________________________________
-void ByteStreamEventStorageInputSvc::releaseEvent( EventCache* cache)
+
+/******************************************************************************/
+void
+ByteStreamEventStorageInputSvc::EventCache::releaseEvent()
{
- // cleanup parts of previous event and re-init them
- if ( cache->rawEvent ) {
- OFFLINE_FRAGMENTS_NAMESPACE::PointerType fragment = 0;
- cache->rawEvent->start(fragment);
- delete [] fragment; fragment = 0;
- delete cache->rawEvent; cache->rawEvent = 0;
- cache->eventStatus = 0;
- }
+ // cleanup parts of previous event and re-init them
+ if(rawEvent) {
+ OFFLINE_FRAGMENTS_NAMESPACE::PointerType fragment = rawEvent->start();
+ delete [] fragment; fragment = nullptr;
+ rawEvent.reset(nullptr);
+ eventStatus = 0;
+ }
}
-//__________________________________________________________________________
-void ByteStreamEventStorageInputSvc::closeBlockIterator(bool clearMetadata)
+
+/******************************************************************************/
+ByteStreamEventStorageInputSvc::EventCache::~EventCache()
{
- if (clearMetadata) {
- ATH_MSG_WARNING("Clearing input metadata store");
- StatusCode status = m_mdSvc->clearStore();
- if (!status.isSuccess()) {
- ATH_MSG_WARNING("Unable to clear Input MetaData Proxies");
- }
- }
- if (!readerReady()) {
- ATH_MSG_INFO("No more events in this run, high water mark for this file = " << m_evtOffsets.size()-1);
+ releaseEvent();
+}
+
+
+/******************************************************************************/
+void
+ByteStreamEventStorageInputSvc::closeBlockIterator(bool clearMetadata)
+{
+ if (clearMetadata) {
+ ATH_MSG_WARNING("Clearing input metadata store");
+ StatusCode status = m_inputMetadata->clearStore();
+ if (!status.isSuccess()) {
+ ATH_MSG_WARNING("Unable to clear Input MetaData Proxies");
}
- delete m_reader; m_reader = 0;
+ }
+
+ if (!readerReady()) {
+ ATH_MSG_INFO("No more events in this run, high water mark for this file = "
+ << m_evtOffsets.size()-1);
+ }
+
+ m_reader.reset();
}
-//__________________________________________________________________________
-bool ByteStreamEventStorageInputSvc::setSequentialRead()
+
+/******************************************************************************/
+bool
+ByteStreamEventStorageInputSvc::setSequentialRead()
{
- // enable SequenceReading
- m_reader->enableSequenceReading();
- return true;
+ // enable SequenceReading
+ m_reader->enableSequenceReading();
+ return true;
}
-bool ByteStreamEventStorageInputSvc::ready()
+
+/******************************************************************************/
+bool
+ByteStreamEventStorageInputSvc::ready() const
{
- return readerReady();
+ return readerReady();
}
-//__________________________________________________________________________
-std::pair<long,std::string> ByteStreamEventStorageInputSvc::getBlockIterator(const std::string fileName)
+
+/******************************************************************************/
+std::pair<long,std::string>
+ByteStreamEventStorageInputSvc::getBlockIterator(const std::string fileName)
{
- m_fullFile = fileName;
-
- // open the file
- if (m_reader != 0) closeBlockIterator();
- m_reader = pickDataReader(fileName);
- if (!m_reader) {
- ATH_MSG_ERROR("Failed to open file " << fileName);
- closeBlockIterator();
- return std::make_pair(-1,"END");
- }
- // Initilaize offset vector
- m_evtOffsets.resize(m_reader->eventsInFile(), -1);
- m_evtOffsets.clear();
- // Get ByteStream Metadata into Input MetaData Store (include begin Input File Incident)
- loadMetadata();
-
- m_evtInFile = 0;
- ++m_fileCount;
-
- // enable sequentialReading if multiple files
- if (m_sequential) {
- bool test = setSequentialRead();
- if (!test) return std::make_pair(-1,"SEQ");
- }
- ATH_MSG_INFO("Picked valid file: " << m_reader->fileName());
- // initialize offsets and counters
- m_evtOffsets.push_back((long long)m_reader->getPosition());
- return std::make_pair(m_reader->eventsInFile(),m_reader->GUID());;
+ // open the file
+ if(m_reader != 0) closeBlockIterator();
+
+ m_reader = std::move(std::unique_ptr<EventStorage::DataReader>(pickDataReader(fileName)));
+
+ if(m_reader == nullptr) {
+ ATH_MSG_ERROR("Failed to open file " << fileName);
+ closeBlockIterator();
+ return std::make_pair(-1,"END");
+ }
+
+ // Initilaize offset vector
+ m_evtOffsets.resize(m_reader->eventsInFile(), -1);
+ m_evtOffsets.clear();
+
+ // Get ByteStream Metadata into Input MetaData Store
+ // (include begin Input File Incident)
+ if (loadMetadata().isSuccess()) {
+ ATH_MSG_DEBUG("Recorded ByteStreamMetadata in InputMetaDataStore");
+ } else {
+ ATH_MSG_ERROR("Unable to record ByteStreamMetadata in InputMetaDataStore");
+ return std::make_pair(-1, "FAIL");
+ }
+
+ m_evtInFile = 0;
+
+ // enable sequentialReading if multiple files
+ if(m_sequential) {
+ bool test = setSequentialRead();
+ if (!test) return std::make_pair(-1,"SEQ");
+ }
+
+ ATH_MSG_INFO("Picked valid file: " << m_reader->fileName());
+ // initialize offsets and counters
+ m_evtOffsets.push_back(static_cast<long long>(m_reader->getPosition()));
+ return std::make_pair(m_reader->eventsInFile(), m_reader->GUID());
}
-//__________________________________________________________________________
-bool ByteStreamEventStorageInputSvc::readerReady()
+
+/******************************************************************************/
+bool
+ByteStreamEventStorageInputSvc::readerReady() const
{
- bool eofFlag(false);
- if (m_reader!=0) eofFlag = m_reader->endOfFile();
- else {
- ATH_MSG_INFO("eformat reader object not initialized");
- return false;
- }
- bool moreEvent = m_reader->good();
-
- return (!eofFlag)&&moreEvent;
+ bool eofFlag(false);
+
+ if (m_reader) eofFlag = m_reader->endOfFile();
+ else {
+ ATH_MSG_INFO("eformat reader object not initialized");
+ return false;
+ }
+
+ bool moreEvent = m_reader->good();
+
+ return (!eofFlag) && moreEvent;
}
-//__________________________________________________________________________
-bool ByteStreamEventStorageInputSvc::ROBFragmentCheck( const RawEvent* re ) const
+
+
+/******************************************************************************/
+bool
+ByteStreamEventStorageInputSvc::ROBFragmentCheck(const RawEvent* re) const
{
- bool allOK = true;
- uint32_t total = re->nchildren(), lastId = 0;
- std::vector<eformat::FragmentProblem> p;
- for (size_t i = 0; i<total; ++i) {
- OFFLINE_FRAGMENTS_NAMESPACE::PointerType fp;
- re->child(fp, i);
- OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment f(fp);
- lastId = f.source_id();
- p.clear();
- f.problems(p);
- if (!p.empty()) {
- allOK = false;
- for (std::vector<eformat::FragmentProblem>::const_iterator i = p.begin(), iEnd = p.end();
- i != iEnd; i++) {
- ATH_MSG_WARNING("Failed to create ROBFragment id = " << lastId << ", " << eformat::helper::SourceIdentifier(lastId).human() << " : " << eformat::helper::FragmentProblemDictionary.string(*i));
- }
- }
- }
- return allOK;
+ bool allOK = true;
+ uint32_t total = re->nchildren();
+ uint32_t lastId = 0;
+ std::vector<eformat::FragmentProblem> problems;
+
+ for (size_t i = 0; i<total; ++i) {
+ OFFLINE_FRAGMENTS_NAMESPACE::PointerType fp;
+ re->child(fp, i);
+
+ OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment f(fp);
+ lastId = f.source_id();
+
+ problems.clear();
+ f.problems(problems);
+ if(!problems.empty()) {
+ allOK = false;
+ for(const auto& problem : problems) {
+ ATH_MSG_WARNING("Failed to create ROBFragment id = " << lastId << ", "
+ << eformat::helper::SourceIdentifier(lastId).human() << " : "
+ << eformat::helper::FragmentProblemDictionary.string(problem));
+ }
+ }
+ }
+
+ return allOK;
}
-//__________________________________________________________________________
-void ByteStreamEventStorageInputSvc::setEvent(void* data, unsigned int eventStatus) {
- const EventContext context{ Gaudi::Hive::currentContext() };
- return setEvent( context, data, eventStatus );
+
+
+/******************************************************************************/
+void
+ByteStreamEventStorageInputSvc::setEvent(void* data, unsigned int eventStatus)
+{
+ const EventContext context{Gaudi::Hive::currentContext()};
+ return setEvent(context, data, eventStatus);
}
-void ByteStreamEventStorageInputSvc::setEvent( const EventContext& context, void* data, unsigned int eventStatus )
+
+/******************************************************************************/
+void
+ByteStreamEventStorageInputSvc::setEvent(const EventContext& context,
+ void* data, unsigned int eventStatus)
{
- EventCache* cache = m_eventsCache.get( context );
- releaseEvent( cache );
- OFFLINE_FRAGMENTS_NAMESPACE::DataType* fragment = reinterpret_cast<OFFLINE_FRAGMENTS_NAMESPACE::DataType*>(data);
- cache->rawEvent = new RawEvent(fragment);
- cache->eventStatus = eventStatus;
- // Set it for the data provider
- m_robProvider->setNextEvent(context, cache->rawEvent );
- m_robProvider->setEventStatus(context, cache->eventStatus );
-
- // Build a DH for use by other components
- StatusCode rec_sg = generateDataHeader();
- if (rec_sg != StatusCode::SUCCESS) {
- ATH_MSG_ERROR("Fail to record BS DataHeader in StoreGate. Skipping events?! " << rec_sg);
- }
+ using OFFLINE_FRAGMENTS_NAMESPACE::DataType;
+ EventCache* cache = m_eventsCache.get(context);
+ cache->releaseEvent();
+
+ DataType* fragment = reinterpret_cast<DataType*>(data);
+ cache->rawEvent = std::make_unique<RawEvent>(fragment);
+ cache->eventStatus = eventStatus;
+
+ // Set it for the data provider
+ m_robProvider->setNextEvent(context, cache->rawEvent.get());
+ m_robProvider->setEventStatus(context, cache->eventStatus);
+
+ // Build a DH for use by other components
+ StatusCode rec_sg = generateDataHeader();
+ if (rec_sg != StatusCode::SUCCESS) {
+ ATH_MSG_ERROR("Fail to record BS DataHeader in StoreGate. Skipping events?! "
+ << rec_sg);
+ }
}
-//__________________________________________________________________________
-const RawEvent* ByteStreamEventStorageInputSvc::currentEvent() const {
- const EventContext context{ Gaudi::Hive::currentContext() };
- return m_eventsCache.get(context)->rawEvent;
+
+
+/******************************************************************************/
+const
+RawEvent* ByteStreamEventStorageInputSvc::currentEvent() const
+{
+ const EventContext context{Gaudi::Hive::currentContext()};
+ return m_eventsCache.get(context)->rawEvent.get();
}
-//__________________________________________________________________________
-unsigned int ByteStreamEventStorageInputSvc::currentEventStatus() const {
- const EventContext context{ Gaudi::Hive::currentContext() };
+
+
+/******************************************************************************/
+unsigned int
+ByteStreamEventStorageInputSvc::currentEventStatus() const
+{
+ const EventContext context{Gaudi::Hive::currentContext()};
return m_eventsCache.get(context)->eventStatus;
}
-//________________________________________________________________________________
-StatusCode ByteStreamEventStorageInputSvc::queryInterface(const InterfaceID& riid, void** ppvInterface) {
- if (ByteStreamInputSvc::interfaceID().versionMatch(riid)) {
- *ppvInterface = dynamic_cast<ByteStreamInputSvc*>(this);
- } else {
- // Interface is not directly available: try out a base class
- return(::AthService::queryInterface(riid, ppvInterface));
- }
- addRef();
- return(StatusCode::SUCCESS);
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageInputSvc::queryInterface(const InterfaceID& riid,
+ void** ppvInterface)
+{
+ if(ByteStreamInputSvc::interfaceID().versionMatch(riid))
+ *ppvInterface = dynamic_cast<ByteStreamInputSvc*>(this);
+ else // Interface is not directly available: try out a base class
+ return(::AthService::queryInterface(riid, ppvInterface));
+
+ addRef();
+ return(StatusCode::SUCCESS);
}
-ByteStreamEventStorageInputSvc::EventCache::~EventCache() {
- delete rawEvent;
- rawEvent = 0;
+
+/******************************************************************************/
+std::unique_ptr<DataHeaderElement>
+ByteStreamEventStorageInputSvc::makeBSProvenance() const
+{
+ std::unique_ptr<Token> token = std::make_unique<Token>();
+ token->setDb(m_fileGUID);
+ token->setTechnology(0x00001000);
+ token->setOid(Token::OID_t(0LL, m_evtFileOffset));
+
+ // note: passing ownership of token to DataHeaderElement
+ return std::make_unique<DataHeaderElement>(ClassID_traits<DataHeader>::ID(),
+ "StreamRAW", token.release());
}
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
index f4465f69221eab40244b3504f543f3ef2f9fa0c6..7385c5cb4b8576fb69f91f1de47f6355f5e5708e 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageInputSvc.h
@@ -8,6 +8,7 @@
/** @file ByteStreamEventStorageInputSvc.h
* @brief This file contains the class definition for the ByteStreamEventStorageInputSvc class.
* @author Peter van Gemmeren <gemmeren@anl.gov>
+ * @author Frank Berghaus <fberghaus@anl.gov>
**/
// Include files.
@@ -15,111 +16,116 @@
#include "ByteStreamCnvSvcBase/IROBDataProviderSvc.h"
#include "ByteStreamData/RawEvent.h"
#include "AthenaKernel/SlotSpecificObj.h"
-#include "EventStorage/DataReader.h"
// FrameWork includes
#include "GaudiKernel/ServiceHandle.h"
+namespace EventStorage
+{
+ class DataReader;
+}
class StoreGateSvc;
+class DataHeaderElement;
+
/** @class ByteStreamEventStorageInputSvc
* @brief This class is the ByteStreamInputSvc for reading events written by EventStorage.
**/
-class ByteStreamEventStorageInputSvc :
- public ByteStreamInputSvc {
+class ByteStreamEventStorageInputSvc
+: public ByteStreamInputSvc
+{
public:
- /// Constructors:
- ByteStreamEventStorageInputSvc(const std::string& name, ISvcLocator* svcloc);
-
- /// Destructor.
- virtual ~ByteStreamEventStorageInputSvc();
+ /// Constructors:
+ ByteStreamEventStorageInputSvc(const std::string& name,
+ ISvcLocator* pSvcLocator);
- /// Required of all Gaudi Services
- virtual StatusCode initialize();
- virtual StatusCode stop();
- /// Required of all Gaudi Services
- virtual StatusCode finalize();
+ /// Destructor.
+ virtual ~ByteStreamEventStorageInputSvc();
- /// Required of all Gaudi services: see Gaudi documentation for details
- StatusCode queryInterface(const InterfaceID& riid, void** ppvInterface);
+ /// Required of all Gaudi Services
+ virtual StatusCode initialize();
+ virtual StatusCode stop ();
+ virtual StatusCode finalize ();
- /// Implementation of the ByteStreamInputSvc interface methods.
- virtual const RawEvent* currentEvent() const;
- virtual const RawEvent* nextEvent(); //!< ++, new
- virtual const RawEvent* previousEvent(); //!< --, old
- virtual void setEvent(void* data, unsigned int eventStatus);
+ /// Required of all Gaudi services: see Gaudi documentation for details
+ StatusCode queryInterface(const InterfaceID& riid, void** ppvInterface);
- /// Return the current event status
- virtual unsigned int currentEventStatus() const;
- virtual void validateEvent();
+ /// Implementation of the ByteStreamInputSvc interface methods.
+ virtual const RawEvent* currentEvent () const;
+ virtual const RawEvent* nextEvent (); //!< ++, new
+ virtual const RawEvent* previousEvent(); //!< --, old
+ virtual void setEvent (void* data, unsigned int eventStatus);
+ /// Return the current event status
+ virtual unsigned int currentEventStatus() const;
+ virtual void validateEvent ();
- virtual long positionInBlock();
- virtual std::pair<long,std::string> getBlockIterator(const std::string fileName);
- void closeBlockIterator(bool clearMetadata=true);
- bool setSequentialRead();
- bool ready();
- StatusCode generateDataHeader();
+ virtual long positionInBlock ();
+ virtual std::pair<long,std::string> getBlockIterator(const std::string fileName);
+ void closeBlockIterator(bool clearMetadata=true);
+ bool setSequentialRead ();
+ bool ready () const;
+ StatusCode generateDataHeader();
-private: // internal member functions
- bool loadMetadata();
private: // data
- std::mutex m_readerMutex;
+ std::mutex m_readerMutex;
- struct EventCache {
- ~EventCache();
- RawEvent* rawEvent = 0; //!< current event
- unsigned int eventStatus = 0; //!< check_tree() status of the current event
- long long int eventOffset = 0; //!< event offset within a file, can be -1
- };
+ struct EventCache {
+ std::unique_ptr<RawEvent> rawEvent = nullptr; //!< current event
+ unsigned int eventStatus = 0; //!< check_tree() status of the current event
+ long long int eventOffset = 0; //!< event offset within a file, can be -1
+ void releaseEvent(); //!< deletes fragments and raw event
+ virtual ~EventCache(); //!< calls releaseEvent
+ };
- SG::SlotSpecificObj<EventCache> m_eventsCache;
+ SG::SlotSpecificObj<EventCache> m_eventsCache;
- //int m_totalEventCounter; //!< event Counter
- DataReader* m_reader; //!< DataReader from EventStorage
+ std::unique_ptr<EventStorage::DataReader> m_reader; //!< DataReader from EventStorage
- mutable std::vector<int> m_numEvt; //!< number of events in that file
- mutable std::vector<int> m_firstEvt; //!< event number of first event in that file
- mutable std::vector<long long int> m_evtOffsets; //!< offset for event i in that file
- unsigned int m_evtInFile;
- long long int m_evtFileOffset = 0; //!< last read in event offset within a file, can be -1
- // Event back navigation info
- std::string m_fileGUID; //!< current file GUID
+ mutable std::vector<long long int> m_evtOffsets; //!< offset for event i in that file
+ unsigned int m_evtInFile;
+ long long int m_evtFileOffset; //!< last read in event offset within a file, can be -1
+ // Event back navigation info
+ std::string m_fileGUID; //!< current file GUID
- /// Pointer to StoreGate
- ServiceHandle<StoreGateSvc> m_sgSvc; //!< StoreGateSvc
- ServiceHandle<StoreGateSvc> m_mdSvc; //!< StoreGateSvc
- ServiceHandle<IROBDataProviderSvc> m_robProvider;
private: // properties
- std::vector<std::string> m_vExplicitFile; //!< prefix of the file names
-
- std::vector<std::string>::const_iterator m_itFullFile; //!< iter for full filename
-
- bool m_sequential; //!< enable sequential reading.
- int m_fileCount; //!< number of files to process.
- std::string m_fullFile; //!< current full file name
+ /// Pointer to StoreGate
+ ServiceHandle<StoreGateSvc> m_storeGate; //!< StoreGateSvc
+ ServiceHandle<StoreGateSvc> m_inputMetadata; //!< StoreGateSvc
+ ServiceHandle<IROBDataProviderSvc> m_robProvider;
+ Gaudi::Property<std::vector<std::string> > m_vExplicitFile;
+ Gaudi::Property<bool> m_sequential; //!< enable sequential reading.
+ Gaudi::Property<bool> m_dump;
+ Gaudi::Property<float> m_wait;
+ Gaudi::Property<bool> m_valEvent;
+ Gaudi::Property<std::string> m_eventInfoKey;
- Gaudi::Property<bool> m_dump; //!< flag for Dump fragments
- Gaudi::Property<float> m_wait; //!< Number of seconds to wait if the input is in the wait state.
- Gaudi::Property<bool> m_valEvent; //!< switch on check_tree() call when reading events.
- Gaudi::Property<bool> m_procBadEvent; //!< DEFUNCT process bad events, which fail check_tree().
- Gaudi::Property<int> m_maxBadEvts; //!< DEFUNCT number of bad events allowed before quitting.
- Gaudi::Property<std::string> m_eventInfoKey{this, "EventInfoKey", "EventInfo", ""};
private: // internal helper functions
+ StatusCode loadMetadata ();
+ void buildFragment (EventCache* cache, char* data, uint32_t eventSize, bool validate) const;
+ bool readerReady () const;
+ bool ROBFragmentCheck(const RawEvent*) const;
+ unsigned validateEvent (const RawEvent* const rawEvent) const;
+ void setEvent (const EventContext& context, void* data, unsigned int eventStatus);
+
+ enum Advance{ PREVIOUS = -1, NEXT = 1 };
+ const RawEvent* getEvent( Advance step );
+ std::unique_ptr<DataHeaderElement> makeBSProvenance() const;
+
+ template<typename T>
+ StatusCode deleteEntry(const std::string& key)
+ {
+ if (m_storeGate->contains<T>(key)) {
+ const T* tmp = m_storeGate->tryConstRetrieve<T>(key);
+ if (tmp != nullptr) ATH_CHECK(m_storeGate->remove<T>(tmp));
+ }
+ return StatusCode::SUCCESS;
+ }
- void buildFragment( EventCache* cache, void* data, uint32_t eventSize, bool validate ) const;
- void releaseEvent( EventCache* );
- bool readerReady();
- bool ROBFragmentCheck( const RawEvent* ) const;
- unsigned validateEvent( const RawEvent* rawEvent ) const;
- void setEvent( const EventContext& context, void* data, unsigned int eventStatus );
-
- enum Advance{ PREVIOUS = -1, NEXT = 1 };
- const RawEvent* getEvent( Advance step );
};
-#endif
+#endif // BYTESTREAMEVENTSTORAGEINPUTSVC_H
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
index 5f7097f20a034efd1c1bb9cbd5b9577d4525d2d6..1ce60ee24cef94ee8903958ab0c352db69848461 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
@@ -28,356 +28,382 @@
#include <boost/shared_ptr.hpp>
#include <stdlib.h>
-// Constructor.
-ByteStreamEventStorageOutputSvc::ByteStreamEventStorageOutputSvc(const std::string& name, ISvcLocator* svcloc) :
- ByteStreamOutputSvc(name,svcloc),
- m_totalEventCounter(0)
+
+/******************************************************************************/
+ByteStreamEventStorageOutputSvc::ByteStreamEventStorageOutputSvc(
+ const std::string& name, ISvcLocator* pSvcLocator)
+ : ByteStreamOutputSvc(name, pSvcLocator)
+ , m_totalEventCounter (0)
+ , m_inputDir (this, "OutputDirectory", "", "directory for the data files")
+ , m_projectTag (this, "ProjectTag", "", "part of filename")
+ , m_appName (this, "AppName", "", "part of filename")
+ , m_fileTag (this, "FileTag", "", "part of filename")
+ , m_streamType (this, "StreamType", "Single", "part of filename")
+ , m_streamName (this, "StreamName", "Stream", "part of filename")
+ , m_lumiBlockNumber (this, "LumiBlockNumber", 0, "part of filename")
+ , m_run (this, "RunNumber", 0, "part of filename")
+ , m_dump (this, "DumpFlag", false, "dump fragments")
+ , m_writeEventless (this, "WriteEventlessFiles", true, "")
+ , m_compressEvents (this, "CompressEvents", false, "")
+ , m_maxFileMB (this, "MaxFileMB", 10000, "MB per file")
+ , m_maxFileNE (this, "MaxFileNE", 100000, "evens per file")
+ , m_eformatVersion (this, "EformatVersion", "current",
+ "Version of the event format data, use \"v40\" or \"run1\" "
+ "for run1, \"current\" for most current version (default).")
+ , m_eventStorageVersion(this, "EventStorageVersion", "current",
+ "Version of the ByteStream file data, use \"v5\" or \"run1\" "
+ "for run1, \"current\" for most current version (default).")
+ , m_bsOutputStreamName (this, "BSOutputStreamName", name, "stream name for muliple output")
+ , m_simpleFileName (this, "SimpleFileName", "", "for filename not from AgreedFileName")
{
- declareProperty("OutputDirectory", m_inputDir);
- // a set of fields for making up filename
- declareProperty("ProjectTag", m_projectTag);
- declareProperty("AppName", m_appName);
- declareProperty("FileTag", m_fileTag);
- declareProperty("StreamType", m_streamType = "Single");
- declareProperty("StreamName", m_streamName = "Stream");
- declareProperty("LumiBlockNumber", m_lumiBlockNumber = 0);
- declareProperty("RunNumber", m_run = 0);
-
- // This is used by ByteStreamCnvSvc when multiple streams are written out.
- declareProperty("BSOutputStreamName", m_bsOutputStreamName = name);
- // or just give a simple filename
- // this will be the filename if it is non-empty
- declareProperty("SimpleFileName", m_simpleFileName);
-
- // flag for dumping all fragments to logfile
- declareProperty("DumpFlag", m_dump = false);
-
- // flag for writing eventless files
- declareProperty("WriteEventlessFiles", m_writeEventless = true);
-
- // flag for compressing events
- declareProperty("CompressEvents", m_compressEvents = false);
-
- declareProperty("MaxFileMB", m_maxFileMB = 10000);
- declareProperty("MaxFileNE", m_maxFileNE = 100000);
-
- declareProperty("EformatVersion", m_eformatVersion = "current",
- "Version of the event format data, use \"v40\" or \"run1\" "
- "for run1, \"current\" for most current version (default).");
- declareProperty("EventStorageVersion", m_eventStorageVersion = "current",
- "Version of the ByteStream file data, use \"v5\" or \"run1\" "
- "for run1, \"current\" for most current version (default).");
-}
-//__________________________________________________________________________
-ByteStreamEventStorageOutputSvc::~ByteStreamEventStorageOutputSvc() {
+ assert(pSvcLocator != nullptr);
}
-//__________________________________________________________________________
-StatusCode ByteStreamEventStorageOutputSvc::initialize() {
- ATH_MSG_INFO("Initializing " << name() << " - package version " << PACKAGE_VERSION);
- if (!ByteStreamOutputSvc::initialize().isSuccess()) {
- ATH_MSG_FATAL("Cannot initialize ByteStreamOutputSvc base class.");
- return(StatusCode::FAILURE);
- }
- // register this service for 'I/O' events
- ServiceHandle<IIoComponentMgr> iomgr("IoComponentMgr", name());
- if (!iomgr.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Could not retrieve IoComponentMgr !");
- return(StatusCode::FAILURE);
- }
- if (!iomgr->io_register(this).isSuccess()) {
- ATH_MSG_FATAL("Could not register myself with the IoComponentMgr !");
+
+/******************************************************************************/
+ByteStreamEventStorageOutputSvc::~ByteStreamEventStorageOutputSvc()
+{}
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageOutputSvc::initialize()
+{
+ ATH_MSG_INFO("Initializing " << name() << " - package version " << PACKAGE_VERSION);
+ if (!ByteStreamOutputSvc::initialize().isSuccess()) {
+ ATH_MSG_FATAL("Cannot initialize ByteStreamOutputSvc base class.");
+ return(StatusCode::FAILURE);
+ }
+
+ // register this service for 'I/O' events
+ ServiceHandle<IIoComponentMgr> iomgr("IoComponentMgr", name());
+ if (!iomgr.retrieve().isSuccess()) {
+ ATH_MSG_FATAL("Could not retrieve IoComponentMgr !");
+ return(StatusCode::FAILURE);
+ }
+ if (!iomgr->io_register(this).isSuccess()) {
+ ATH_MSG_FATAL("Could not register myself with the IoComponentMgr !");
+ return(StatusCode::FAILURE);
+ }
+
+ // Register output file's name with the I/O manager
+ if (!m_simpleFileName.value().empty()) {
+ if (!iomgr->io_register(this, IIoComponentMgr::IoMode::WRITE, m_simpleFileName.value()).isSuccess()) {
+ ATH_MSG_FATAL("could not register [" << m_simpleFileName.value() << "] for output !");
return(StatusCode::FAILURE);
- }
-
- // Register output file's name with the I/O manager
- if (!m_simpleFileName.value().empty()) {
- if (!iomgr->io_register(this, IIoComponentMgr::IoMode::WRITE, m_simpleFileName.value()).isSuccess()) {
- ATH_MSG_FATAL("could not register [" << m_simpleFileName.value() << "] for output !");
- return(StatusCode::FAILURE);
- } else {
- ATH_MSG_VERBOSE("io_register[" << this->name() << "](" << m_simpleFileName.value() << ") [ok]");
- }
- }
-
- // validate m_eformatVersion and m_eventStorageVersion
- const char* choices_ef[] = {"current", "v40", "run1"};
- if (std::find(std::begin(choices_ef), std::end(choices_ef), m_eformatVersion.value()) == std::end(choices_ef)) {
- ATH_MSG_FATAL("Unexpected value for EformatVersion property: " << m_eformatVersion);
- return(StatusCode::FAILURE);
- }
- const char* choices_es[] = {"current", "v5", "run1"};
- if (std::find(std::begin(choices_es), std::end(choices_es), m_eventStorageVersion.value()) == std::end(choices_es)) {
- ATH_MSG_FATAL("Unexpected value for EventStorageVersion property: " << m_eventStorageVersion);
- return(StatusCode::FAILURE);
- }
- ATH_MSG_INFO("eformat version to use: \"" << m_eformatVersion.value() << "\"");
- ATH_MSG_INFO("event storage (BS) version to use: \"" << m_eventStorageVersion.value() << "\"");
-
- return(this->reinit());
+ } else {
+ ATH_MSG_VERBOSE("io_register[" << this->name() << "](" << m_simpleFileName.value() << ") [ok]");
+ }
+ }
+
+ // validate m_eformatVersion and m_eventStorageVersion
+ const char* choices_ef[] = {"current", "v40", "run1"};
+ if (std::find(std::begin(choices_ef), std::end(choices_ef), m_eformatVersion.value()) == std::end(choices_ef)) {
+ ATH_MSG_FATAL("Unexpected value for EformatVersion property: " << m_eformatVersion);
+ return(StatusCode::FAILURE);
+ }
+ const char* choices_es[] = {"current", "v5", "run1"};
+ if (std::find(std::begin(choices_es), std::end(choices_es), m_eventStorageVersion.value()) == std::end(choices_es)) {
+ ATH_MSG_FATAL("Unexpected value for EventStorageVersion property: " << m_eventStorageVersion);
+ return(StatusCode::FAILURE);
+ }
+ ATH_MSG_INFO("eformat version to use: \"" << m_eformatVersion.value() << "\"");
+ ATH_MSG_INFO("event storage (BS) version to use: \"" << m_eventStorageVersion.value() << "\"");
+
+ return(this->reinit());
}
-//__________________________________________________________________________
-StatusCode ByteStreamEventStorageOutputSvc::reinit() {
- ATH_MSG_INFO("Reinitialization...");
- return(StatusCode::SUCCESS);
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageOutputSvc::reinit()
+{
+ ATH_MSG_INFO("Reinitialization...");
+ return(StatusCode::SUCCESS);
}
-//__________________________________________________________________________
-StatusCode ByteStreamEventStorageOutputSvc::stop() {
- // Check whether anything has been written && whether the user wants metadata only files
- bool dWok = false;
- if (m_dataWriter == 0 && m_writeEventless) {
- const ByteStreamMetadataContainer* metaDataCont = 0;
- const ByteStreamMetadata* metaData = 0;
- ServiceHandle<StoreGateSvc> mds("MetaDataStore", name());
- StatusCode status = mds.retrieve();
- if (!status.isFailure()) {
- StatusCode stat = mds->retrieve(metaDataCont);
- if (stat.isSuccess()) metaData = *(metaDataCont->begin());
- }
- // Try to write metadata to file
- dWok = initDataWriterContents(0, metaData);
- if (!dWok) ATH_MSG_WARNING("Could not write Metadata for eventless file");
- }
- return(StatusCode::SUCCESS);
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageOutputSvc::stop()
+{
+ // Check whether anything has been written && whether the user wants metadata only files
+ bool dWok = false;
+ if (m_dataWriter == 0 && m_writeEventless) {
+ const ByteStreamMetadataContainer* metaDataCont = 0;
+ const ByteStreamMetadata* metaData = 0;
+ ServiceHandle<StoreGateSvc> mds("StoreGateSvc/MetaDataStore", name());
+ StatusCode status = mds.retrieve();
+ if (!status.isFailure()) {
+ StatusCode stat = mds->retrieve(metaDataCont, "ByteStreamMetadata");
+ if (stat.isSuccess()) metaData = *(metaDataCont->begin());
+ }
+ // Try to write metadata to file
+ dWok = initDataWriterContents(0, metaData);
+ if (!dWok) ATH_MSG_WARNING("Could not write Metadata for eventless file");
+ }
+ return(StatusCode::SUCCESS);
}
-//__________________________________________________________________________
-StatusCode ByteStreamEventStorageOutputSvc::finalize() {
- // clean up
- ATH_MSG_DEBUG("deleting DataWriter");
- m_dataWriter.reset();
- ATH_MSG_INFO("number of events written: " << m_totalEventCounter);
- return(StatusCode::SUCCESS);
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageOutputSvc::finalize()
+{
+ // clean up
+ ATH_MSG_DEBUG("deleting DataWriter");
+ m_dataWriter.reset();
+ ATH_MSG_INFO("number of events written: " << m_totalEventCounter);
+ return(StatusCode::SUCCESS);
}
-//__________________________________________________________________________
+
+
+/******************************************************************************/
// Open the first input file and read the first event.
-bool ByteStreamEventStorageOutputSvc::initDataWriter() {
- // Retrieve EventInfo to get run number, detector mask and event type
- const EventInfo* evtInfo = 0;
- ServiceHandle<StoreGateSvc> sg("StoreGateSvc", name());
- if (sg.retrieve().isFailure()) {
- ATH_MSG_ERROR("Cannot get StoreGateSvc");
- return(false);
- }
- if (sg->retrieve(evtInfo).isFailure() || evtInfo == 0) {
- ATH_MSG_ERROR("Cannot retrieve EventInfo");
- return(false);
- }
- // Now try to write metadata to file
- return initDataWriterContents(evtInfo, 0);
+bool
+ByteStreamEventStorageOutputSvc::initDataWriter()
+{
+ // Retrieve EventInfo to get run number, detector mask and event type
+ const EventInfo* evtInfo = 0;
+ ServiceHandle<StoreGateSvc> sg("StoreGateSvc", name());
+ if (sg.retrieve().isFailure()) {
+ ATH_MSG_ERROR("Cannot get StoreGateSvc");
+ return(false);
+ }
+ if (sg->retrieve(evtInfo).isFailure() || evtInfo == 0) {
+ ATH_MSG_ERROR("Cannot retrieve EventInfo");
+ return(false);
+ }
+ // Now try to write metadata to file
+ return initDataWriterContents(evtInfo, 0);
}
-//__________________________________________________________________________
+
+
+/******************************************************************************/
// Open the first input file and read the first event.
-bool ByteStreamEventStorageOutputSvc::initDataWriterContents(const EventInfo* evtInfo,
- const ByteStreamMetadata* metaData)
+bool
+ByteStreamEventStorageOutputSvc::initDataWriterContents(
+ const EventInfo* evtInfo, const ByteStreamMetadata* metaData)
{
- // Initialize parameters
- EventStorage::run_parameters_record runPara = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
- EventStorage::freeMetaDataStrings freeMetaDataStrings;
- runPara.detector_mask_LS=0xFFFFFFFFFFFFFFFFULL;
- runPara.detector_mask_MS=0xFFFFFFFFFFFFFFFFULL;
- int run = 0;
- int lumiNum = 0;
- // The heirarchy of run/lumiblock number, GNARR
- // 1) User override
- // 2) Event data
- // 3) File metadata
- // 4) default = unknown = 0
- if (m_run != 0) {
- run = m_run;
- } else if (evtInfo != 0) {
- run = evtInfo->event_ID()->run_number();
- } else if (metaData != 0) {
- run = metaData->getRunNumber();
- }
- runPara.run_number = run;
-
- if (m_lumiBlockNumber != 0) {
- lumiNum = m_lumiBlockNumber;
- } else if (evtInfo != 0) {
- lumiNum = evtInfo->event_ID()->lumi_block();
- } else if (metaData != 0) {
- lumiNum = metaData->getLumiBlock();
- }
-
- if (evtInfo != 0) {
- uint64_t result = evtInfo->event_ID()->detector_mask1();
- result = result << 32;
- result |= evtInfo->event_ID()->detector_mask0();
- runPara.detector_mask_LS = result;
- result = evtInfo->event_ID()->detector_mask3();
- result = result << 32;
- result |= evtInfo->event_ID()->detector_mask2();
- runPara.detector_mask_MS = result;
-
- freeMetaDataStrings.push_back(evtInfo->event_type()->EventType::typeToString());
- } else {
- runPara.detector_mask_LS=0xFFFFFFFFFFFFFFFFULL;
- runPara.detector_mask_MS=0xFFFFFFFFFFFFFFFFULL;
- }
- if (metaData != 0) {
- runPara.max_events = metaData->getMaxEvents();
- runPara.rec_enable = metaData->getRecEnable();
- runPara.trigger_type = metaData->getTriggerType();
- runPara.beam_type = metaData->getBeamType();
- runPara.beam_energy = metaData->getBeamEnergy();
- for (EventStorage::freeMetaDataStrings::const_iterator iter = metaData->getFreeMetaDataStrings().begin(),
- iterEnd = metaData->getFreeMetaDataStrings().end(); iter != iterEnd; iter++) {
- if((*iter).find("Compression=") == std::string::npos) {
- freeMetaDataStrings.push_back(*iter);
- }
+ // Initialize parameters
+ EventStorage::run_parameters_record runPara = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+ EventStorage::freeMetaDataStrings freeMetaDataStrings;
+ runPara.detector_mask_LS=0xFFFFFFFFFFFFFFFFULL;
+ runPara.detector_mask_MS=0xFFFFFFFFFFFFFFFFULL;
+ int run = 0;
+ int lumiNum = 0;
+ // The heirarchy of run/lumiblock number, GNARR
+ // 1) User override
+ // 2) Event data
+ // 3) File metadata
+ // 4) default = unknown = 0
+ if (m_run != 0) {
+ run = m_run;
+ } else if (evtInfo != 0) {
+ run = evtInfo->event_ID()->run_number();
+ } else if (metaData != 0) {
+ run = metaData->getRunNumber();
+ }
+ runPara.run_number = run;
+
+ if (m_lumiBlockNumber != 0) {
+ lumiNum = m_lumiBlockNumber;
+ } else if (evtInfo != 0) {
+ lumiNum = evtInfo->event_ID()->lumi_block();
+ } else if (metaData != 0) {
+ lumiNum = metaData->getLumiBlock();
+ }
+
+ if (evtInfo != 0) {
+ uint64_t result = evtInfo->event_ID()->detector_mask1();
+ result = result << 32;
+ result |= evtInfo->event_ID()->detector_mask0();
+ runPara.detector_mask_LS = result;
+ result = evtInfo->event_ID()->detector_mask3();
+ result = result << 32;
+ result |= evtInfo->event_ID()->detector_mask2();
+ runPara.detector_mask_MS = result;
+
+ freeMetaDataStrings.push_back(evtInfo->event_type()->EventType::typeToString());
+ } else {
+ runPara.detector_mask_LS=0xFFFFFFFFFFFFFFFFULL;
+ runPara.detector_mask_MS=0xFFFFFFFFFFFFFFFFULL;
+ }
+ if (metaData != 0) {
+ runPara.max_events = metaData->getMaxEvents();
+ runPara.rec_enable = metaData->getRecEnable();
+ runPara.trigger_type = metaData->getTriggerType();
+ runPara.beam_type = metaData->getBeamType();
+ runPara.beam_energy = metaData->getBeamEnergy();
+ for (EventStorage::freeMetaDataStrings::const_iterator iter = metaData->getFreeMetaDataStrings().begin(),
+ iterEnd = metaData->getFreeMetaDataStrings().end(); iter != iterEnd; iter++) {
+ if((*iter).find("Compression=") == std::string::npos) {
+ freeMetaDataStrings.push_back(*iter);
}
- } else {
- ATH_MSG_DEBUG("Cannot retrieve MetaData");
- metaData = 0;
- runPara.max_events = 0;
- runPara.rec_enable = 0;
- runPara.trigger_type = 0;
- runPara.beam_type = 0;
- runPara.beam_energy = 0;
- }
- const TagInfo* tagInfo = 0;
- ServiceHandle<StoreGateSvc> ds("DetectorStore", name());
- if (ds.retrieve().isSuccess()) {
- if (ds->retrieve(tagInfo).isFailure() || tagInfo == 0) {
- ATH_MSG_DEBUG("Cannot retrieve TagInfo");
- } else {
- std::string tagName, tagValue;
- if (metaData == 0) { // FIXME: Set TriggerType, BeamType?
- tagName = "beam_energy";
- tagInfo->findTag(tagName, tagValue);
- runPara.beam_type = atof(tagValue.c_str());
- }
- tagName = "GeoAtlas";
- tagInfo->findTag(tagName, tagValue);
- freeMetaDataStrings.push_back(tagName + ": " + tagValue);
- tagName = "IOVDbGlobalTag";
- tagInfo->findTag(tagName, tagValue);
- freeMetaDataStrings.push_back(tagName + ": " + tagValue);
+ }
+ } else {
+ ATH_MSG_DEBUG("Cannot retrieve MetaData");
+ metaData = 0;
+ runPara.max_events = 0;
+ runPara.rec_enable = 0;
+ runPara.trigger_type = 0;
+ runPara.beam_type = 0;
+ runPara.beam_energy = 0;
+ }
+ const TagInfo* tagInfo = 0;
+ ServiceHandle<StoreGateSvc> ds("DetectorStore", name());
+ if (ds.retrieve().isSuccess()) {
+ if (ds->retrieve(tagInfo).isFailure() || tagInfo == 0) {
+ ATH_MSG_DEBUG("Cannot retrieve TagInfo");
+ } else {
+ std::string tagName, tagValue;
+ if (metaData == 0) { // FIXME: Set TriggerType, BeamType?
+ tagName = "beam_energy";
+ tagInfo->findTag(tagName, tagValue);
+ runPara.beam_type = atof(tagValue.c_str());
}
- }
-
- std::string fileNameCore;
- EventStorage::CompressionType compression = m_compressEvents ? EventStorage::ZLIB : EventStorage::NONE;
- int eventStorageVersion = 0;
- if (m_eventStorageVersion.value() == "v5" || m_eventStorageVersion.value() == "run1") {
- eventStorageVersion = 5;
- }
- if (!m_simpleFileName.value().empty()) {
- fileNameCore = m_simpleFileName.value();
- boost::shared_ptr<EventStorage::SimpleFileName> sfn(new EventStorage::SimpleFileName(m_simpleFileName.value()));
- m_dataWriter = ByteStreamDataWriter::makeWriter(eventStorageVersion,
- m_inputDir.value(), sfn, runPara, m_projectTag.value(),
- m_streamType.value(), m_streamName.value(),
- m_streamType.value() + "_" + m_streamName.value(),
- lumiNum, m_appName.value(), freeMetaDataStrings,
- m_maxFileNE.value(), m_maxFileMB.value(), compression);
- } else {
- // construct file name
- daq::RawFileName fileNameObj(m_projectTag.value(), run, m_streamType.value(), m_streamName.value(), lumiNum, m_appName.value());
- fileNameCore = fileNameObj.fileNameCore();
- m_dataWriter = ByteStreamDataWriter::makeWriter(eventStorageVersion,
- m_inputDir.value(), fileNameCore, runPara, freeMetaDataStrings,
- m_maxFileNE.value(), m_maxFileMB.value(), compression);
- }
- if (!m_dataWriter->good()) {
- ATH_MSG_ERROR("Unable to initialize file");
- return(false);
- } else {
- ATH_MSG_DEBUG("initialized file for with name " << fileNameCore);
- }
- return(true);
+ tagName = "GeoAtlas";
+ tagInfo->findTag(tagName, tagValue);
+ freeMetaDataStrings.push_back(tagName + ": " + tagValue);
+ tagName = "IOVDbGlobalTag";
+ tagInfo->findTag(tagName, tagValue);
+ freeMetaDataStrings.push_back(tagName + ": " + tagValue);
+ }
+ }
+
+ std::string fileNameCore;
+ EventStorage::CompressionType compression = m_compressEvents ? EventStorage::ZLIB : EventStorage::NONE;
+ int eventStorageVersion = 0;
+ if (m_eventStorageVersion.value() == "v5" || m_eventStorageVersion.value() == "run1") {
+ eventStorageVersion = 5;
+ }
+ if (!m_simpleFileName.value().empty()) {
+ fileNameCore = m_simpleFileName.value();
+ boost::shared_ptr<EventStorage::SimpleFileName> sfn(new EventStorage::SimpleFileName(m_simpleFileName.value()));
+ m_dataWriter = ByteStreamDataWriter::makeWriter(eventStorageVersion,
+ m_inputDir.value(), sfn, runPara, m_projectTag.value(),
+ m_streamType.value(), m_streamName.value(),
+ m_streamType.value() + "_" + m_streamName.value(),
+ lumiNum, m_appName.value(), freeMetaDataStrings,
+ m_maxFileNE.value(), m_maxFileMB.value(), compression);
+ } else {
+ // construct file name
+ daq::RawFileName fileNameObj(m_projectTag.value(), run, m_streamType.value(), m_streamName.value(), lumiNum, m_appName.value());
+ fileNameCore = fileNameObj.fileNameCore();
+ m_dataWriter = ByteStreamDataWriter::makeWriter(eventStorageVersion,
+ m_inputDir.value(), fileNameCore, runPara, freeMetaDataStrings,
+ m_maxFileNE.value(), m_maxFileMB.value(), compression);
+ }
+ if (!m_dataWriter->good()) {
+ ATH_MSG_ERROR("Unable to initialize file");
+ return(false);
+ } else {
+ ATH_MSG_DEBUG("initialized file for with name " << fileNameCore);
+ }
+ return(true);
}
-//__________________________________________________________________________
+/******************************************************************************/
// Read the next event.
-bool ByteStreamEventStorageOutputSvc::putEvent(RawEvent* re) {
- if (!m_dataWriter) {
- if (!initDataWriter()) {
- ATH_MSG_ERROR("Failed to initialize DataWriter");
- return(false);
- }
- }
- uint32_t size = re->fragment_size_word();
- // write
- OFFLINE_FRAGMENTS_NAMESPACE::PointerType st;
- re->start(st);
- ATH_MSG_DEBUG("event size = " << size << " start = " << st);
-
- // convert to different version
- bool deleteBuffer = false;
- if (m_eformatVersion.value() == "v40" or m_eformatVersion.value() == "run1") {
- // allocate some extra space just in case
- uint32_t bufSize = size + 128;
- auto buf = new OFFLINE_FRAGMENTS_NAMESPACE::DataType[bufSize];
-
- // This builds no-checksum headers, should use the same
- // checksum type as original event
- size = offline_eformat::old::convert_to_40(st, buf, bufSize);
- if (size == 0) {
- // not enough space in buffer
- ATH_MSG_ERROR("Failed to convert event, buffer is too small");
- delete [] buf;
- return false;
- }
-
- st = buf;
- deleteBuffer = true;
- ATH_MSG_DEBUG("event size after conversion = " << size << " version = " << st[3]);
- }
-
- if (m_dataWriter->putData(sizeof(OFFLINE_FRAGMENTS_NAMESPACE::DataType) * size,
- reinterpret_cast<void*>(const_cast<OFFLINE_FRAGMENTS_NAMESPACE::DataType*>(st))) != EventStorage::DWOK) {
- ATH_MSG_ERROR("Failed to write event to DataWriter");
- if (deleteBuffer) delete [] st;
+bool
+ByteStreamEventStorageOutputSvc::putEvent(RawEvent* re)
+{
+ if (!m_dataWriter) {
+ if (!initDataWriter()) {
+ ATH_MSG_ERROR("Failed to initialize DataWriter");
return(false);
- }
- ++m_totalEventCounter;
- if (deleteBuffer) delete [] st;
- return(true);
+ }
+ }
+ uint32_t size = re->fragment_size_word();
+ // write
+ OFFLINE_FRAGMENTS_NAMESPACE::PointerType st;
+ re->start(st);
+ ATH_MSG_DEBUG("event size = " << size << " start = " << st);
+
+ // convert to different version
+ bool deleteBuffer = false;
+ if (m_eformatVersion.value() == "v40" or m_eformatVersion.value() == "run1") {
+ // allocate some extra space just in case
+ uint32_t bufSize = size + 128;
+ auto buf = new OFFLINE_FRAGMENTS_NAMESPACE::DataType[bufSize];
+
+ // This builds no-checksum headers, should use the same
+ // checksum type as original event
+ size = offline_eformat::old::convert_to_40(st, buf, bufSize);
+ if (size == 0) {
+ // not enough space in buffer
+ ATH_MSG_ERROR("Failed to convert event, buffer is too small");
+ delete [] buf;
+ return false;
+ }
+
+ st = buf;
+ deleteBuffer = true;
+ ATH_MSG_DEBUG("event size after conversion = " << size << " version = " << st[3]);
+ }
+
+ if (m_dataWriter->putData(sizeof(OFFLINE_FRAGMENTS_NAMESPACE::DataType) * size,
+ reinterpret_cast<void*>(const_cast<OFFLINE_FRAGMENTS_NAMESPACE::DataType*>(st))) != EventStorage::DWOK) {
+ ATH_MSG_ERROR("Failed to write event to DataWriter");
+ if (deleteBuffer) delete [] st;
+ return(false);
+ }
+ ++m_totalEventCounter;
+ if (deleteBuffer) delete [] st;
+ return(true);
}
-//__________________________________________________________________________
-StatusCode ByteStreamEventStorageOutputSvc::queryInterface(const InterfaceID& riid, void** ppvInterface) {
- if (ByteStreamOutputSvc::interfaceID().versionMatch(riid)) {
- *ppvInterface = dynamic_cast<ByteStreamOutputSvc*>(this);
- } else {
- // Interface is not directly available: try out a base class
- return(::AthService::queryInterface(riid, ppvInterface));
- }
- addRef();
- return(StatusCode::SUCCESS);
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageOutputSvc::queryInterface(
+ const InterfaceID& riid, void** ppvInterface)
+{
+ if (ByteStreamOutputSvc::interfaceID().versionMatch(riid)) {
+ *ppvInterface = dynamic_cast<ByteStreamOutputSvc*>(this);
+ } else {
+ // Interface is not directly available: try out a base class
+ return(::AthService::queryInterface(riid, ppvInterface));
+ }
+ addRef();
+ return(StatusCode::SUCCESS);
}
-//__________________________________________________________________________
-StatusCode ByteStreamEventStorageOutputSvc::io_reinit() {
- ATH_MSG_INFO("I/O reinitialization...");
- ServiceHandle<IIoComponentMgr> iomgr("IoComponentMgr", name());
- if (!iomgr.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Could not retrieve IoComponentMgr !");
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamEventStorageOutputSvc::io_reinit()
+{
+ ATH_MSG_INFO("I/O reinitialization...");
+ ServiceHandle<IIoComponentMgr> iomgr("IoComponentMgr", name());
+ if (!iomgr.retrieve().isSuccess()) {
+ ATH_MSG_FATAL("Could not retrieve IoComponentMgr !");
+ return(StatusCode::FAILURE);
+ }
+ if (!iomgr->io_hasitem(this)) {
+ ATH_MSG_FATAL("IoComponentMgr does not know about myself !");
+ return(StatusCode::FAILURE);
+ }
+ if (!m_simpleFileName.value().empty()) {
+ std::string outputFile = m_simpleFileName.value();
+ ATH_MSG_INFO("I/O reinitialization, file = " << outputFile);
+ std::string &fname = outputFile;
+ if (!iomgr->io_contains(this, fname)) {
+ ATH_MSG_ERROR("IoComponentMgr does not know about [" << fname << "] !");
return(StatusCode::FAILURE);
- }
- if (!iomgr->io_hasitem(this)) {
- ATH_MSG_FATAL("IoComponentMgr does not know about myself !");
+ }
+ if (!iomgr->io_retrieve(this, fname).isSuccess()) {
+ ATH_MSG_FATAL("Could not retrieve new value for [" << fname << "] !");
return(StatusCode::FAILURE);
- }
- if (!m_simpleFileName.value().empty()) {
- std::string outputFile = m_simpleFileName.value();
- ATH_MSG_INFO("I/O reinitialization, file = " << outputFile);
- std::string &fname = outputFile;
- if (!iomgr->io_contains(this, fname)) {
- ATH_MSG_ERROR("IoComponentMgr does not know about [" << fname << "] !");
- return(StatusCode::FAILURE);
- }
- if (!iomgr->io_retrieve(this, fname).isSuccess()) {
- ATH_MSG_FATAL("Could not retrieve new value for [" << fname << "] !");
- return(StatusCode::FAILURE);
- }
- // all good... copy over.
- // modify directory
- m_inputDir.setValue(outputFile.substr(0, outputFile.find_last_of("/")));
- // FIXME: modify file name, not done for now because of IoUtils.update_io_registry vs. merge conflict.
- //m_simpleFileName.setValue(outputFile.substr(outputFile.find_last_of("/") + 1));
- }
- ATH_MSG_DEBUG("Deleting DataWriter");
- m_dataWriter.reset();
- return(this->reinit());
+ }
+ // all good... copy over.
+ // modify directory
+ m_inputDir.setValue(outputFile.substr(0, outputFile.find_last_of("/")));
+ // FIXME: modify file name, not done for now because of IoUtils.update_io_registry vs. merge conflict.
+ //m_simpleFileName.setValue(outputFile.substr(outputFile.find_last_of("/") + 1));
+ }
+ ATH_MSG_DEBUG("Deleting DataWriter");
+ m_dataWriter.reset();
+ return(this->reinit());
}
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.h b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.h
index d469adca6663436cb76c0dfd6e38a929751b89aa..9bf035bf44f0bbfb77b9e15dce7db6122d857e7f 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.h
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.h
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ */
#ifndef BYTESTREAMEVENTSTORAGEOUTPUTSVC_H
#define BYTESTREAMEVENTSTORAGEOUTPUTSVC_H
@@ -21,71 +21,74 @@
#include "GaudiKernel/IIoComponent.h"
#include "GaudiKernel/ServiceHandle.h"
+
class EventInfo;
class ByteStreamMetadata;
+
/** @class ByteStreamEventStorageOutputSvc
* @brief This class provides the services for writing FullEventFragment into file.
* This class implements the interface ByteStreamOutputSvc for the conversion service to write the output.
**/
-class ByteStreamEventStorageOutputSvc : public ByteStreamOutputSvc, virtual public IIoComponent {
+class ByteStreamEventStorageOutputSvc
+: public ByteStreamOutputSvc
+, virtual public IIoComponent
+{
public:
- /// Constructors:
- ByteStreamEventStorageOutputSvc(const std::string& name, ISvcLocator* svcloc);
+ /// Constructors:
+ ByteStreamEventStorageOutputSvc(const std::string& name, ISvcLocator* pSvcLocator);
+
+ /// Destructor.
+ virtual ~ByteStreamEventStorageOutputSvc();
- /// Destructor.
- virtual ~ByteStreamEventStorageOutputSvc();
+ /// Required of all Gaudi Services
+ virtual StatusCode initialize();
+ virtual StatusCode stop ();
+ virtual StatusCode finalize ();
- /// Required of all Gaudi Services
- virtual StatusCode initialize();
- /// Required of all Gaudi Services
- virtual StatusCode stop();
- virtual StatusCode finalize();
+ /// Required of all Gaudi services: see Gaudi documentation for details
+ StatusCode queryInterface(const InterfaceID& riid, void** ppvInterface);
- /// Required of all Gaudi services: see Gaudi documentation for details
- StatusCode queryInterface(const InterfaceID& riid, void** ppvInterface);
+ /// Implementation of the ByteStreamOutputSvc interface method putEvent.
+ virtual bool putEvent(RawEvent* re);
- /// Implementation of the ByteStreamOutputSvc interface method putEvent.
- virtual bool putEvent(RawEvent* re);
+ // Callback method to reinitialize the internal state of the component
+ // for I/O purposes (e.g. upon @c fork(2))
+ virtual StatusCode io_reinit();
- /// Callback method to reinitialize the internal state of the component for I/O purposes (e.g. upon @c fork(2))
- virtual StatusCode io_reinit();
private: // internal member functions
- /// reinitialize the service when a @c fork() occured/was-issued
- StatusCode reinit();
- void checkForUserMetadata(EventStorage::freeMetaDataStrings& freeMetaDataStrings);
+ /// reinitialize the service when a @c fork() occured/was-issued
+ StatusCode reinit();
+ void checkForUserMetadata(EventStorage::freeMetaDataStrings& freeMetaDataStrings);
private: // data
- int m_totalEventCounter; //!< number of event counter
- std::unique_ptr<ByteStreamDataWriter> m_dataWriter; //!< pointer to DataWriter
+ int m_totalEventCounter; //!< number of event counter
+ std::unique_ptr<ByteStreamDataWriter> m_dataWriter; //!< pointer to DataWriter
private: // properties
- Gaudi::Property<std::string> m_inputDir; //!< directory for the data files
- Gaudi::Property<std::string> m_projectTag; //!< Project Tag
- Gaudi::Property<std::string> m_appName; //!< Application Name
- Gaudi::Property<std::string> m_fileTag; //!< File Tag
- Gaudi::Property<std::string> m_streamType; //!< stream type
- Gaudi::Property<std::string> m_streamName; //!< stream name
- Gaudi::Property<int> m_lumiBlockNumber;//!< luminosity block number
- Gaudi::Property<int> m_run; //!< run number
-
- Gaudi::Property<bool> m_dump; //!< Dump fragments
- Gaudi::Property<bool> m_writeEventless; //!< Write eventless files
- Gaudi::Property<bool> m_compressEvents; //!< Compress events
-
- Gaudi::Property<unsigned int> m_maxFileMB; //!< number of MB per file
- Gaudi::Property<unsigned int> m_maxFileNE; //!< number of events per file
-
- Gaudi::Property<std::string> m_eformatVersion; //!< eformat event version to produce, "v40" for run1, or "current"
- Gaudi::Property<std::string> m_eventStorageVersion; //!< EventStorage BS version to produce, "v5" for run1, or "current"
- Gaudi::Property<std::string> m_bsOutputStreamName;//!< stream name for multiple output
- Gaudi::Property<std::string> m_simpleFileName; //!< use this string for filename, not from the "AgreedFileName"
+ Gaudi::Property<std::string> m_inputDir; //!< directory for the data files
+ Gaudi::Property<std::string> m_projectTag; //!< Project Tag
+ Gaudi::Property<std::string> m_appName; //!< Application Name
+ Gaudi::Property<std::string> m_fileTag; //!< File Tag
+ Gaudi::Property<std::string> m_streamType; //!< stream type
+ Gaudi::Property<std::string> m_streamName; //!< stream name
+ Gaudi::Property<int> m_lumiBlockNumber;//!< luminosity block number
+ Gaudi::Property<int> m_run; //!< run number
+ Gaudi::Property<bool> m_dump; //!< Dump fragments
+ Gaudi::Property<bool> m_writeEventless; //!< Write eventless files
+ Gaudi::Property<bool> m_compressEvents; //!< Compress events
+ Gaudi::Property<unsigned int> m_maxFileMB; //!< number of MB per file
+ Gaudi::Property<unsigned int> m_maxFileNE; //!< number of events per file
+ Gaudi::Property<std::string> m_eformatVersion; //!< eformat event version to produce, "v40" for run1, or "current"
+ Gaudi::Property<std::string> m_eventStorageVersion; //!< EventStorage BS version to produce, "v5" for run1, or "current"
+ Gaudi::Property<std::string> m_bsOutputStreamName;//!< stream name for multiple output
+ Gaudi::Property<std::string> m_simpleFileName; //!< use this string for filename, not from the "AgreedFileName"
private: // internal helper functions
- /// initialize EventStorage's DataWriter
- bool initDataWriter();
- bool initDataWriterContents(const EventInfo*, const ByteStreamMetadata* );
+ /// initialize EventStorage's DataWriter
+ bool initDataWriter();
+ bool initDataWriterContents(const EventInfo*, const ByteStreamMetadata* );
};
-#endif
+#endif // BYTESTREAMEVENTSTORAGEOUTPUTSVC_H
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.cxx
index d9e65ca8e7c755d607c04eb615dfc236bdfdad83..b7d77ae693478997d9e5cb563817b2f0721338ee 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.cxx
@@ -1,6 +1,6 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ */
/** @file ByteStreamMetadataTool.cxx
* @brief This file contains the implementation for the ByteStreamMetadataTool class.
@@ -13,155 +13,168 @@
#include "ByteStreamData/ByteStreamMetadataContainer.h"
#include "StoreGate/StoreGateSvc.h"
-//___________________________________________________________________________
-ByteStreamMetadataTool::ByteStreamMetadataTool(const std::string& type,
- const std::string& name,
- const IInterface* parent) : AthAlgTool(type, name, parent),
- m_pMetaDataStore("StoreGateSvc/MetaDataStore", name),
- m_pInputStore("StoreGateSvc/InputMetaDataStore", name) {
- declareInterface<IMetaDataTool>(this);
-}
-//___________________________________________________________________________
-ByteStreamMetadataTool::~ByteStreamMetadataTool() {
+/******************************************************************************/
+ByteStreamMetadataTool::ByteStreamMetadataTool(
+ const std::string& type,
+ const std::string& name,
+ const IInterface* parent)
+ : AthAlgTool(type, name, parent)
+ , m_metadataStore("StoreGateSvc/MetaDataStore", name)
+ , m_inputStore ("StoreGateSvc/InputMetaDataStore", name)
+{
+ declareInterface<IMetaDataTool>(this);
}
-//___________________________________________________________________________
-StatusCode ByteStreamMetadataTool::initialize() {
- ATH_MSG_INFO("Initializing " << name() << " - package version " << PACKAGE_VERSION);
- if (!::AthAlgTool::initialize().isSuccess()) {
- ATH_MSG_FATAL("Cannot initialize AthService base class.");
- return(StatusCode::FAILURE);
- }
-
- // locate the DetectorStore and initialize our local ptr
- StatusCode status = m_pMetaDataStore.retrieve();
- if (!status.isSuccess() || 0 == m_pMetaDataStore) {
- ATH_MSG_ERROR("Could not find MetaDataStore");
- return(status);
- }
- status = m_pInputStore.retrieve();
- if (!status.isSuccess() || 0 == m_pInputStore) {
- ATH_MSG_ERROR("Could not find InputMetaDataStore");
- return(status);
- }
- return(StatusCode::SUCCESS);
+
+/******************************************************************************/
+ByteStreamMetadataTool::~ByteStreamMetadataTool()
+{}
+
+
+/******************************************************************************/
+StatusCode
+ByteStreamMetadataTool::initialize()
+{
+ ATH_MSG_INFO("Initializing " << name() << " - package version " << PACKAGE_VERSION);
+
+ ATH_CHECK(::AthAlgTool::initialize());
+ ATH_CHECK(m_metadataStore.retrieve());
+ ATH_CHECK(m_inputStore.retrieve());
+
+ return(StatusCode::SUCCESS);
}
-//___________________________________________________________________________
-StatusCode ByteStreamMetadataTool::finalize() {
- ATH_MSG_INFO("in finalize()");
- return(::AthAlgTool::finalize());
+
+/******************************************************************************/
+StatusCode
+ByteStreamMetadataTool::finalize()
+{
+ ATH_MSG_INFO("in finalize()");
+ return(::AthAlgTool::finalize());
}
-StatusCode ByteStreamMetadataTool::beginInputFile(const SG::SourceID&)
+/******************************************************************************/
+StatusCode
+ByteStreamMetadataTool::beginInputFile(const SG::SourceID&)
{
- return this->beginInputFile();
+ return this->beginInputFile();
}
-StatusCode ByteStreamMetadataTool::beginInputFile()
+
+/******************************************************************************/
+StatusCode
+ByteStreamMetadataTool::beginInputFile()
{
- std::vector<std::string> vKeys;
- std::set<std::string> keys;
- m_pInputStore->keys<ByteStreamMetadata>(vKeys);
- keys.insert(vKeys.begin(), vKeys.end());
- m_pInputStore->keys<ByteStreamMetadataContainer>(vKeys);
- keys.insert(vKeys.begin(), vKeys.end());
-
- std::vector<ByteStreamMetadata*> copy;
- std::set<std::string> transGuids;
- for (std::set<std::string>::const_iterator keyIter = keys.begin(), keyEnd = keys.end();
- keyIter != keyEnd; keyIter++) {
- ATH_MSG_DEBUG("Processing Input ByteStreamMetadata, key = " << *keyIter);
- copy.clear();
- if (m_pInputStore->contains<ByteStreamMetadata>(*keyIter)) {
- std::list<SG::ObjectWithVersion<ByteStreamMetadata> > allVersions;
- StatusCode status = m_pInputStore->retrieveAllVersions(allVersions, *keyIter);
- if (!status.isSuccess()) {
- ATH_MSG_ERROR("Could not find Input ByteStreamMetadata");
- return StatusCode::FAILURE;
- } else {
- ATH_MSG_DEBUG("Found Input ByteStreamMetadata");
- }
- for (SG::ObjectWithVersion<ByteStreamMetadata>& obj : allVersions) {
- copy.push_back(new ByteStreamMetadata(*obj.dataObject));
- }
- }
- if (m_pInputStore->contains<ByteStreamMetadataContainer>(*keyIter)) {
- std::list<SG::ObjectWithVersion<ByteStreamMetadataContainer> > allVersions;
- StatusCode status = m_pInputStore->retrieveAllVersions(allVersions, *keyIter);
- if (!status.isSuccess()) {
- ATH_MSG_ERROR("Could not find Input ByteStreamMetadataContainer");
- return StatusCode::FAILURE;
- } else {
- ATH_MSG_DEBUG("Found Input ByteStreamMetadataContainer");
- }
- for (SG::ObjectWithVersion<ByteStreamMetadataContainer>& obj : allVersions) {
- const ByteStreamMetadataContainer& bsmdc = *obj.dataObject;
- for (const ByteStreamMetadata* md : bsmdc) {
- copy.push_back(new ByteStreamMetadata(*md));
- }
- }
+ std::set<std::string> keys = keysFromInput();
+
+ std::vector<std::unique_ptr<ByteStreamMetadata> > copy;
+ std::set<std::string> transGuids;
+
+
+ for(const auto& key : keys) {
+ ATH_MSG_DEBUG("Processing Input ByteStreamMetadata, key = " << key);
+ copy.clear();
+
+ if(m_inputStore->contains<ByteStreamMetadata>(key)) {
+
+ std::list<SG::ObjectWithVersion<ByteStreamMetadata> > allVersions;
+ ATH_CHECK(m_inputStore->retrieveAllVersions(allVersions, key));
+
+ for(SG::ObjectWithVersion<ByteStreamMetadata>& obj : allVersions)
+ copy.push_back(std::make_unique<ByteStreamMetadata>(*obj.dataObject));
+
+ }
+
+
+ if(m_inputStore->contains<ByteStreamMetadataContainer>(key)) {
+
+ std::list<SG::ObjectWithVersion<ByteStreamMetadataContainer> > allVersions;
+ ATH_CHECK(m_inputStore->retrieveAllVersions(allVersions, key));
+
+ for(SG::ObjectWithVersion<ByteStreamMetadataContainer>& obj : allVersions)
+ for(const ByteStreamMetadata* md : *obj.dataObject)
+ copy.push_back(std::make_unique<ByteStreamMetadata>(*md));
+ }
+
+
+ if(!copy.empty()) {
+
+ transGuids.clear();
+ // Check for existing container
+ ByteStreamMetadataContainer* bsmdc = 0;
+
+ if (m_metadataStore->contains<ByteStreamMetadataContainer>(key)) {
+
+ ATH_MSG_DEBUG("Pre-existing ByteStreamMetadataContainer found");
+ ATH_CHECK(m_metadataStore->retrieve(bsmdc, key));
+
+ for (const auto& bsmd : *bsmdc)
+ transGuids.insert(bsmd->getGuid());
+
+ } else {
+
+ bsmdc = new ByteStreamMetadataContainer;
+ ATH_CHECK(m_metadataStore->record(bsmdc, key));
+
}
- if (!copy.empty()) {
- transGuids.clear();
- // Check for existing container
- ByteStreamMetadataContainer* bsmdc = 0;
- if (m_pMetaDataStore->contains<ByteStreamMetadataContainer>(*keyIter)) {
- ATH_MSG_DEBUG("Pre-existing ByteStreamMetadataContainer found");
- StatusCode status = m_pMetaDataStore->retrieve(bsmdc, *keyIter);
- if (!status.isSuccess()) {
- ATH_MSG_ERROR("Could not retrieve " << *keyIter << " ByteStreamMetadataContainer");
- return StatusCode::FAILURE;
- }
- for (ByteStreamMetadataContainer::const_iterator iter = bsmdc->begin(), iterEnd = bsmdc->end();
- iter != iterEnd; iter++) {
- transGuids.insert((*iter)->getGuid());
- }
- } else {
- bsmdc = new ByteStreamMetadataContainer;
- StatusCode status = m_pMetaDataStore->record(bsmdc, *keyIter);
- if (!status.isSuccess()) {
- ATH_MSG_ERROR("Could not store ByteStreamMetadata in Metadata store");
- return StatusCode::FAILURE;
- } else {
- ATH_MSG_DEBUG("ByteStreamMetadata copied to MetaDataStore");
- }
- }
- for (std::vector<ByteStreamMetadata*>::iterator iter = copy.begin(), iterEnd = copy.end();
- iter != iterEnd; iter++) {
- // Only insert new metadata records (with GUID not yet in container)
- if (transGuids.insert((*iter)->getGuid()).second) {
- bsmdc->push_back(*iter);
- *iter = 0;
- } else {
- delete *iter; *iter = 0;
- }
- }
+
+ for(auto& pBSMD : copy) {
+ // Only insert new metadata records (with GUID not yet in container)
+ if(transGuids.insert(pBSMD->getGuid()).second)
+ bsmdc->push_back(std::move(pBSMD));
}
- }
- return StatusCode::SUCCESS;
+ }
+ }
+
+ return StatusCode::SUCCESS;
}
-StatusCode ByteStreamMetadataTool::endInputFile(const SG::SourceID&)
+
+/******************************************************************************/
+inline
+std::set<std::string>
+ByteStreamMetadataTool::keysFromInput() const
{
- return StatusCode::SUCCESS;
+ std::vector<std::string> vKeys;
+ std::set<std::string> keys;
+
+ m_inputStore->keys<ByteStreamMetadata>(vKeys);
+ keys.insert(vKeys.begin(), vKeys.end());
+
+ m_inputStore->keys<ByteStreamMetadataContainer>(vKeys);
+ keys.insert(vKeys.begin(), vKeys.end());
+
+ return keys;
}
-StatusCode ByteStreamMetadataTool::endInputFile()
+
+/******************************************************************************/
+StatusCode
+ByteStreamMetadataTool::endInputFile(const SG::SourceID&)
{
- return StatusCode::SUCCESS;
+ return StatusCode::SUCCESS;
}
-StatusCode ByteStreamMetadataTool::metaDataStop(const SG::SourceID&)
+
+StatusCode
+ByteStreamMetadataTool::endInputFile()
{
- return StatusCode::SUCCESS;
+ return StatusCode::SUCCESS;
}
-StatusCode ByteStreamMetadataTool::metaDataStop()
+
+StatusCode
+ByteStreamMetadataTool::metaDataStop(const SG::SourceID&)
{
- return StatusCode::SUCCESS;
+ return StatusCode::SUCCESS;
}
+
+StatusCode
+ByteStreamMetadataTool::metaDataStop()
+{
+ return StatusCode::SUCCESS;
+}
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.h b/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.h
index 6a2ff656b363aed7b71056fea8dc99534645698d..98379a57ba4f929a66423c131c31f4e359ee1099 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.h
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamMetadataTool.h
@@ -8,6 +8,7 @@
/** @file ByteStreamMetadataTool.h
* @brief This file contains the class definition for the ByteStreamMetadataTool class.
* @author Peter van Gemmeren <gemmeren@anl.gov>
+ * @author Frank Berghaus <fberghaus@anl.gov>
* $Id: $
**/
@@ -17,37 +18,48 @@
#include "AthenaKernel/IMetaDataTool.h"
#include <string>
+#include <set>
class StoreGateSvc;
+
/** @class ByteStreamMetadataTool
* @brief This class provides the MetaDataTool for ByteStreamMetadata objects
**/
-class ByteStreamMetadataTool : public ::AthAlgTool,
- virtual public IMetaDataTool {
+class ByteStreamMetadataTool
+: public ::AthAlgTool,
+ virtual public IMetaDataTool
+{
public:
- /// Standard Service Constructor
- ByteStreamMetadataTool(const std::string& type, const std::string& name, const IInterface* parent);
- /// Destructor
- virtual ~ByteStreamMetadataTool();
-
- /// Gaudi Service Interface method implementations:
- StatusCode initialize();
- StatusCode finalize();
-
- /// Incident service handle listening for BeginInputFile and EndInputFile.
- virtual StatusCode beginInputFile();
- virtual StatusCode endInputFile();
- virtual StatusCode metaDataStop(const SG::SourceID&);
- virtual StatusCode beginInputFile(const SG::SourceID&);
- virtual StatusCode endInputFile(const SG::SourceID&);
- virtual StatusCode metaDataStop();
+ /// Standard Service Constructor
+ ByteStreamMetadataTool(const std::string& type, const std::string& name,
+ const IInterface* parent);
+
+
+ /// Destructor
+ virtual ~ByteStreamMetadataTool();
+
+
+ /// Gaudi Service Interface method implementations:
+ StatusCode initialize();
+ StatusCode finalize ();
+
+
+ /// Incident service handle listening for BeginInputFile and EndInputFile.
+ virtual StatusCode beginInputFile();
+ virtual StatusCode beginInputFile(const SG::SourceID&);
+ virtual StatusCode metaDataStop ();
+ virtual StatusCode metaDataStop (const SG::SourceID&);
+ virtual StatusCode endInputFile ();
+ virtual StatusCode endInputFile (const SG::SourceID&);
+
private:
- typedef ServiceHandle<StoreGateSvc> StoreGateSvc_t;
- StoreGateSvc_t m_pMetaDataStore;
- StoreGateSvc_t m_pInputStore;
-};
+ typedef ServiceHandle<StoreGateSvc> StoreGateSvc_t;
+ StoreGateSvc_t m_metadataStore;
+ StoreGateSvc_t m_inputStore;
-#endif
+ std::set<std::string> keysFromInput() const;
+};
+#endif // BYTESTREAMMETADATATOOL_H
diff --git a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
index aeaa3f9091a23369709f02c7da74d9340ba60841..f4bf2ee6b2d916e33d122fc349fa4213584b9491 100644
--- a/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
+++ b/Event/ByteStreamCnvSvc/src/EventSelectorByteStream.cxx
@@ -181,41 +181,6 @@ StatusCode EventSelectorByteStream::initialize() {
return(StatusCode::FAILURE);
}
- // For backward compatibility, check InputSvc properties for bad events
- ServiceHandle<IJobOptionsSvc> joSvc("JobOptionsSvc", name());
- if (!joSvc.retrieve().isSuccess()) {
- ATH_MSG_FATAL("Cannot get JobOptionsSvc.");
- return(StatusCode::FAILURE);
- }
- typedef std::vector<const Property*> Properties_t;
- const Properties_t* esProps = joSvc->getProperties("ByteStreamInputSvc");
- if (esProps != 0) {
- std::vector<const Property*>::const_iterator ii = esProps->begin();
- while (ii != esProps->end()) {
- IntegerProperty temp;
- if ((*ii)->name() == "MaxBadEvents") { // find it
- if ((*ii)->load(temp)) { // load it
- if (temp.value() != -1) { // check if it is set
- m_maxBadEvts = temp.value();
- ATH_MSG_INFO("Retrieved MaxBadEvents=" << m_maxBadEvts << " from ByteStreamInputSvc");
- }
- }
- }
- BooleanProperty temp2;
- if ((*ii)->name() == "ProcessBadEvents") { // find it
- if ((*ii)->load(temp)) { // load it
- if (temp.value()) { // check if it is set
- m_procBadEvent = temp.value();
- ATH_MSG_INFO("Retrieved ProcessBadEvents=" << m_procBadEvent << " from ByteStreamInputSvc");
- }
- }
- }
- ++ii;
- }
- } else {
- ATH_MSG_WARNING("Did not find ByteStreamInputSvc jobOptions properties");
- }
-
// Must happen before trying to open a file
StatusCode risc = this->reinit();
diff --git a/Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py b/Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py
index db960851af8b12f166dc96170b6690c5303669d4..80020fc764748d9d9df3068e3db794e1d5786637 100644
--- a/Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py
+++ b/Event/ByteStreamCnvSvcBase/share/testROBDataProviderSvcMT.py
@@ -9,7 +9,6 @@ svcMgr.ByteStreamInputSvc.FullFileName = [ "/cvmfs/atlas-nightlies.cern.ch/repo/
#svcMgr.ByteStreamInputSvc.FullFileName = [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
#svcMgr.ByteStreamInputSvc.FullFileName += [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
#svcMgr.EventSelector.InputCollections = [ "/afs/cern.ch/atlas/offline/test/daq.m4_combined.0020720.extract.L1TT-b00000010._0001.data" ]
-#svcMgr.ByteStreamInputSvc.MaxBadEvents = 1
#svcMgr.ByteStreamInputSvc.ValidateEvent = False
#from AthenaCommon.AppMgr import theApp
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
index 15f6a5d43a2dcedc31b2c74c275164c5e5e63834..83066ab18beaffecc9193d31e32136b3fcc35783 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadata.h
@@ -8,82 +8,116 @@
/** @file ByteStreamMetadata.h
* @brief This file contains the class definition for the ByteStreamMetadata class.
* @author Peter van Gemmeren <gemmeren@anl.gov>
+ * @author Frank Berghaus <fberghaus@anl.gov>
* $Id: ByteStreamMetadata.h,v 1.2 2009-04-02 14:47:40 gemmeren Exp $
**/
#include <vector>
#include <string>
#include <stdint.h>
+#include <iostream>
+
+namespace EventStorage { class DataReader; }
/** @class ByteStreamMetadata
* @brief This class is the StoreGate data object for bytestream metadata.
**/
class ByteStreamMetadata {
-public: // Constructor and Destructor
- ByteStreamMetadata();
- // 64 bit det mask constructor
- ByteStreamMetadata(unsigned int runNumber,
- unsigned int numEvents,
- unsigned int maxEvents,
- unsigned int recEnable,
- unsigned int triggerType,
- uint64_t detectorMask,
- unsigned int beamType,
- unsigned int beamEnergy,
- const std::string& guid,
- const std::string& stream,
- const std::string& project,
- unsigned int lumiBlock,
- const std::vector<std::string>& freeMetaDataStrings);
- // 128 bit det mask constructor
- ByteStreamMetadata(unsigned int runNumber,
- unsigned int numEvents,
- unsigned int maxEvents,
- unsigned int recEnable,
- unsigned int triggerType,
- uint64_t detectorMask,
- uint64_t detectorMask2,
- unsigned int beamType,
- unsigned int beamEnergy,
- const std::string& guid,
- const std::string& stream,
- const std::string& project,
- unsigned int lumiBlock,
- const std::vector<std::string>& freeMetaDataStrings);
- virtual ~ByteStreamMetadata();
-
- unsigned int getRunNumber() const;
- unsigned int getNumEvents() const;
- unsigned int getMaxEvents() const;
- unsigned int getRecEnable() const;
- unsigned int getTriggerType() const;
- uint64_t getDetectorMask() const;
- uint64_t getDetectorMask2() const;
- unsigned int getBeamType() const;
- unsigned int getBeamEnergy() const;
- const std::string& getGuid() const;
- const std::string& getStream() const;
- const std::string& getProject() const;
- unsigned int getLumiBlock() const;
- const std::vector<std::string>& getFreeMetaDataStrings() const;
+public:
+
+
+ ByteStreamMetadata();
+
+
+ /**
+ * Constructure for 64 bit det mask constructor
+ */
+ ByteStreamMetadata(
+ unsigned int runNumber,
+ unsigned int numEvents,
+ unsigned int maxEvents,
+ unsigned int recEnable,
+ unsigned int triggerType,
+ uint64_t detectorMask,
+ unsigned int beamType,
+ unsigned int beamEnergy,
+ const std::string& guid,
+ const std::string& stream,
+ const std::string& project,
+ unsigned int lumiBlock,
+ const std::vector<std::string>& freeMetaDataStrings);
+
+
+ /**
+ * Constructor using 128 bit det mask
+ */
+ ByteStreamMetadata(
+ unsigned int runNumber,
+ unsigned int numEvents,
+ unsigned int maxEvents,
+ unsigned int recEnable,
+ unsigned int triggerType,
+ uint64_t detectorMask,
+ uint64_t detectorMask2,
+ unsigned int beamType,
+ unsigned int beamEnergy,
+ const std::string& guid,
+ const std::string& stream,
+ const std::string& project,
+ unsigned int lumiBlock,
+ const std::vector<std::string>& freeMetaDataStrings);
+
+ /**
+ * Construct bytestream metadata directly from data reader provided by online
+ * EventStorage
+ */
+ ByteStreamMetadata(EventStorage::DataReader& reader);
+
+
+ virtual ~ByteStreamMetadata();
+
+
+ unsigned int getRunNumber() const;
+ unsigned int getNumEvents() const;
+ unsigned int getMaxEvents() const;
+ unsigned int getRecEnable() const;
+ unsigned int getTriggerType() const;
+ uint64_t getDetectorMask() const;
+ uint64_t getDetectorMask2() const;
+ unsigned int getBeamType() const;
+ unsigned int getBeamEnergy() const;
+ const std::string& getGuid() const;
+ const std::string& getStream() const;
+ const std::string& getProject() const;
+ unsigned int getLumiBlock() const;
+ const std::vector<std::string>& getFreeMetaDataStrings() const;
+
+
+ /**
+ * pretty print bytestream metadata content
+ */
+ friend std::ostream& operator<<(std::ostream& os,
+ const ByteStreamMetadata& bsmd);
+
private:
- unsigned int m_runNumber;
- unsigned int m_numEvents;
- unsigned int m_maxEvents;
- unsigned int m_recEnable;
- unsigned int m_triggerType;
- uint64_t m_detectorMask;
- uint64_t m_detectorMask2;
- unsigned int m_beamType;
- unsigned int m_beamEnergy;
- std::string m_guid;
- std::string m_stream;
- std::string m_project;
- unsigned int m_lumiBlock;
- std::vector<std::string> m_freeMetaDataStrings;
+ unsigned int m_runNumber;
+ unsigned int m_numEvents;
+ unsigned int m_maxEvents;
+ unsigned int m_recEnable;
+ unsigned int m_triggerType;
+ uint64_t m_detectorMask;
+ uint64_t m_detectorMask2;
+ unsigned int m_beamType;
+ unsigned int m_beamEnergy;
+ std::string m_guid;
+ std::string m_stream;
+ std::string m_project;
+ unsigned int m_lumiBlock;
+ std::vector<std::string> m_freeMetaDataStrings;
};
+
#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(ByteStreamMetadata, 170625359, 1)
#endif
diff --git a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
index 70f4c3064c4fcd2eeaa04c62f037bf226f42c659..19451f3a070a6cae22cb0ac6753d8f3d6febe551 100644
--- a/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
+++ b/Event/ByteStreamData/ByteStreamData/ByteStreamMetadataContainer.h
@@ -17,16 +17,11 @@
/** @class ByteStreamMetadataContainer
* @brief This class is the StoreGate data object for bytestream metadata.
**/
-class ByteStreamMetadataContainer : public DataVector<ByteStreamMetadata> {
-};
+class ByteStreamMetadataContainer
+ : public DataVector<ByteStreamMetadata>
+{};
#include "AthenaKernel/CLASS_DEF.h"
CLASS_DEF(ByteStreamMetadataContainer, 1076128893, 1)
-#ifndef XAOD_STANDALONE
-#include "AthenaKernel/MetaCont.h"
-CLASS_DEF( MetaCont<ByteStreamMetadataContainer> , 1174128703 , 1 )
-#include "AthenaKernel/BaseInfo.h"
-SG_BASE( MetaCont<ByteStreamMetadataContainer>, MetaContBase );
-#endif // not XAOD_STANDALONE
#endif
diff --git a/Event/ByteStreamData/CMakeLists.txt b/Event/ByteStreamData/CMakeLists.txt
index 04342fcf2d5ca1d07273fec1c0867c28132d92af..4b0fb94f8f2b87d54861d872133a76330d403812 100644
--- a/Event/ByteStreamData/CMakeLists.txt
+++ b/Event/ByteStreamData/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_depends_on_subdirs(
Control/AthContainers )
# External dependencies:
-find_package( tdaq-common )
+find_package( tdaq-common COMPONENTS DataReader )
# Treat tdaq-common as an optional dependency:
set( extra_inc )
diff --git a/Event/ByteStreamData/src/ByteStreamMetadata.cxx b/Event/ByteStreamData/src/ByteStreamMetadata.cxx
index 6a9c2d1c50023616424b5e626ab4069d96a31b7b..360ca2bc6678002ea6384a465c0c3528909b061e 100644
--- a/Event/ByteStreamData/src/ByteStreamMetadata.cxx
+++ b/Event/ByteStreamData/src/ByteStreamMetadata.cxx
@@ -10,122 +10,207 @@
#include "ByteStreamData/ByteStreamMetadata.h"
-//______________________________________________________________________________
-ByteStreamMetadata::ByteStreamMetadata() : m_runNumber(0U),
- m_numEvents(0U),
- m_maxEvents(0U),
- m_recEnable(0U),
- m_triggerType(0U),
- m_detectorMask(0L),
- m_detectorMask2(0L),
- m_beamType(0U),
- m_beamEnergy(0U),
- m_guid(),
- m_stream(),
- m_project(),
- m_lumiBlock(0U),
- m_freeMetaDataStrings() {
-}
-//______________________________________________________________________________
-ByteStreamMetadata::ByteStreamMetadata(unsigned int runNumber,
- unsigned int numEvents,
- unsigned int maxEvents,
- unsigned int recEnable,
- unsigned int triggerType,
- uint64_t detectorMask,
- unsigned int beamType,
- unsigned int beamEnergy,
- const std::string& guid,
- const std::string& stream,
- const std::string& project,
- unsigned int lumiBlock,
- const std::vector<std::string>& freeMetaDataStrings) : m_runNumber(runNumber),
- m_numEvents(numEvents),
- m_maxEvents(maxEvents),
- m_recEnable(recEnable),
- m_triggerType(triggerType),
- m_detectorMask(detectorMask),
- m_detectorMask2(0),
- m_beamType(beamType),
- m_beamEnergy(beamEnergy),
- m_guid(guid),
- m_stream(stream),
- m_project(project),
- m_lumiBlock(lumiBlock),
- m_freeMetaDataStrings(freeMetaDataStrings) {
-}
-//______________________________________________________________________________
+#include "EventStorage/DataReader.h"
+
+#include <bitset>
+
+/******************************************************************************/
+ByteStreamMetadata::ByteStreamMetadata()
+ : m_runNumber(0U)
+ , m_numEvents(0U)
+ , m_maxEvents(0U)
+ , m_recEnable(0U)
+ , m_triggerType(0U)
+ , m_detectorMask(0L)
+ , m_detectorMask2(0L)
+ , m_beamType(0U)
+ , m_beamEnergy(0U)
+ , m_guid()
+ , m_stream()
+ , m_project()
+ , m_lumiBlock(0U)
+ , m_freeMetaDataStrings()
+{}
+
+
+/******************************************************************************/
ByteStreamMetadata::ByteStreamMetadata(unsigned int runNumber,
- unsigned int numEvents,
- unsigned int maxEvents,
- unsigned int recEnable,
- unsigned int triggerType,
- uint64_t detectorMask,
- uint64_t detectorMask2,
- unsigned int beamType,
- unsigned int beamEnergy,
- const std::string& guid,
- const std::string& stream,
- const std::string& project,
- unsigned int lumiBlock,
- const std::vector<std::string>& freeMetaDataStrings) : m_runNumber(runNumber),
- m_numEvents(numEvents),
- m_maxEvents(maxEvents),
- m_recEnable(recEnable),
- m_triggerType(triggerType),
- m_detectorMask(detectorMask),
- m_detectorMask2(detectorMask2),
- m_beamType(beamType),
- m_beamEnergy(beamEnergy),
- m_guid(guid),
- m_stream(stream),
- m_project(project),
- m_lumiBlock(lumiBlock),
- m_freeMetaDataStrings(freeMetaDataStrings) {
-}
-//______________________________________________________________________________
-ByteStreamMetadata::~ByteStreamMetadata() {
-}
-unsigned int ByteStreamMetadata::getRunNumber() const {
- return(m_runNumber);
-}
-unsigned int ByteStreamMetadata::getNumEvents() const {
- return(m_numEvents);
-}
-unsigned int ByteStreamMetadata::getMaxEvents() const {
- return(m_maxEvents);
-}
-unsigned int ByteStreamMetadata::getRecEnable() const {
- return(m_recEnable);
-}
-unsigned int ByteStreamMetadata::getTriggerType() const {
- return(m_triggerType);
-}
-uint64_t ByteStreamMetadata::getDetectorMask() const {
- return(m_detectorMask);
-}
-uint64_t ByteStreamMetadata::getDetectorMask2() const {
- return(m_detectorMask2);
-}
-unsigned int ByteStreamMetadata::getBeamType() const {
- return(m_beamType);
-}
-unsigned int ByteStreamMetadata::getBeamEnergy() const {
- return(m_beamEnergy);
-}
-const std::string& ByteStreamMetadata::getGuid() const {
- return(m_guid);
-}
-const std::string& ByteStreamMetadata::getStream() const {
- return(m_stream);
-}
-const std::string& ByteStreamMetadata::getProject() const {
- return(m_project);
-}
-unsigned int ByteStreamMetadata::getLumiBlock() const {
- return(m_lumiBlock);
+ unsigned int numEvents,
+ unsigned int maxEvents,
+ unsigned int recEnable,
+ unsigned int triggerType,
+ uint64_t detectorMask,
+ unsigned int beamType,
+ unsigned int beamEnergy,
+ const std::string& guid,
+ const std::string& stream,
+ const std::string& project,
+ unsigned int lumiBlock,
+ const std::vector<std::string>& freeMetaDataStrings)
+ : m_runNumber(runNumber)
+ , m_numEvents(numEvents)
+ , m_maxEvents(maxEvents)
+ , m_recEnable(recEnable)
+ , m_triggerType(triggerType)
+ , m_detectorMask(detectorMask)
+ , m_detectorMask2(0)
+ , m_beamType(beamType)
+ , m_beamEnergy(beamEnergy)
+ , m_guid(guid)
+ , m_stream(stream)
+ , m_project(project)
+ , m_lumiBlock(lumiBlock)
+ , m_freeMetaDataStrings(freeMetaDataStrings)
+{}
+
+
+/******************************************************************************/
+ByteStreamMetadata::ByteStreamMetadata(
+ unsigned int runNumber,
+ unsigned int numEvents,
+ unsigned int maxEvents,
+ unsigned int recEnable,
+ unsigned int triggerType,
+ uint64_t detectorMask,
+ uint64_t detectorMask2,
+ unsigned int beamType,
+ unsigned int beamEnergy,
+ const std::string& guid,
+ const std::string& stream,
+ const std::string& project,
+ unsigned int lumiBlock,
+ const std::vector<std::string>& freeMetaDataStrings)
+ : m_runNumber(runNumber)
+ , m_numEvents(numEvents)
+ , m_maxEvents(maxEvents)
+ , m_recEnable(recEnable)
+ , m_triggerType(triggerType)
+ , m_detectorMask(detectorMask)
+ , m_detectorMask2(detectorMask2)
+ , m_beamType(beamType)
+ , m_beamEnergy(beamEnergy)
+ , m_guid(guid)
+ , m_stream(stream)
+ , m_project(project)
+ , m_lumiBlock(lumiBlock)
+ , m_freeMetaDataStrings(freeMetaDataStrings)
+{}
+
+
+/******************************************************************************/
+ByteStreamMetadata::ByteStreamMetadata(EventStorage::DataReader& reader)
+ : m_runNumber (reader.runNumber())
+ , m_numEvents (reader.eventsInFile())
+ , m_maxEvents (reader.maxEvents())
+ , m_recEnable (reader.recEnable())
+ , m_triggerType (reader.triggerType())
+ , m_detectorMask (0)
+ , m_detectorMask2 (0)
+ , m_beamType (reader.beamType())
+ , m_beamEnergy (reader.beamEnergy())
+ , m_guid (reader.GUID())
+ , m_stream (reader.stream())
+ , m_project (reader.projectTag())
+ , m_lumiBlock (reader.lumiblockNumber())
+ , m_freeMetaDataStrings(reader.freeMetaDataStrings())
+{
+ // default goes into ByteStreamMetadata
+ std::bitset<64> word1;
+ std::bitset<64> word2;
+ for (unsigned int i=0; i<64; ++i) {
+ word1[i] = reader.detectorMask()[i];
+ word2[i] = reader.detectorMask()[i+64];
+ }
+ m_detectorMask = word1.to_ulong();
+ m_detectorMask2 = word2.to_ulong();
}
-const std::vector<std::string>& ByteStreamMetadata::getFreeMetaDataStrings() const {
- return(m_freeMetaDataStrings);
+
+
+/******************************************************************************/
+ByteStreamMetadata::~ByteStreamMetadata() {}
+
+
+/******************************************************************************/
+// TODO: inline these getters
+unsigned int
+ByteStreamMetadata::getRunNumber() const
+{return(m_runNumber);}
+
+unsigned int
+ByteStreamMetadata::getNumEvents() const
+{return(m_numEvents);}
+
+unsigned int
+ByteStreamMetadata::getMaxEvents() const
+{return(m_maxEvents);}
+
+unsigned int
+ByteStreamMetadata::getRecEnable() const
+{return(m_recEnable);}
+
+unsigned int
+ByteStreamMetadata::getTriggerType() const
+{return(m_triggerType);}
+
+uint64_t
+ByteStreamMetadata::getDetectorMask() const
+{return(m_detectorMask);}
+
+uint64_t
+ByteStreamMetadata::getDetectorMask2() const
+{return(m_detectorMask2);}
+
+unsigned int
+ByteStreamMetadata::getBeamType() const
+{return(m_beamType);}
+
+unsigned int
+ByteStreamMetadata::getBeamEnergy() const
+{return(m_beamEnergy);}
+
+const std::string&
+ByteStreamMetadata::getGuid() const
+{return(m_guid);}
+
+const std::string&
+ByteStreamMetadata::getStream() const
+{return(m_stream);}
+
+const std::string&
+ByteStreamMetadata::getProject() const
+{return(m_project);}
+
+unsigned int
+ByteStreamMetadata::getLumiBlock() const
+{return(m_lumiBlock);}
+
+const std::vector<std::string>&
+ByteStreamMetadata::getFreeMetaDataStrings() const
+{return(m_freeMetaDataStrings);}
+
+
+/******************************************************************************/
+std::ostream& operator<<(std::ostream& os, const ByteStreamMetadata& bsmd) {
+ std::bitset<64> word1(bsmd.getDetectorMask());
+ std::bitset<64> word2(bsmd.getDetectorMask2());
+
+ os << " runNumber: " << bsmd.getRunNumber() << '\n'
+ << " numEvents: " << bsmd.getNumEvents() << '\n'
+ << " m_maxEvents: " << bsmd.getMaxEvents() << '\n'
+ << " recEnable: " << bsmd.getRecEnable() << '\n'
+ << " triggerType: " << bsmd.getTriggerType() << '\n'
+ << " detectorMask: " << word1 << '\n'
+ << " detectorMask2: " << word2 << '\n'
+ << " beamType: " << bsmd.getBeamType() << '\n'
+ << " beamEnergy: " << bsmd.getBeamEnergy() << '\n'
+ << " guid: " << bsmd.getGuid() << '\n'
+ << " stream: " << bsmd.getStream() << '\n'
+ << " project: " << bsmd.getProject() << '\n'
+ << " lumiBlock: " << bsmd.getLumiBlock() << '\n';
+
+ os << " freeMetaDataStrings: ";
+ for (const std::string& key : bsmd.getFreeMetaDataStrings())
+ os << key << " ";
+
+ return os;
}
-//______________________________________________________________________________
diff --git a/Event/ByteStreamTest/share/BadEvents.py b/Event/ByteStreamTest/share/BadEvents.py
index 759d2456f7e1a72b15ed7616efe73dc367958df5..7e3bc8967b1a71ef16fe242f9b63a5d0b31422b6 100755
--- a/Event/ByteStreamTest/share/BadEvents.py
+++ b/Event/ByteStreamTest/share/BadEvents.py
@@ -12,7 +12,7 @@ svcMgr = theApp.serviceMgr()
theApp.EvtMax = 500
svcMgr.EventSelector.Input += ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
-svcMgr.ByteStreamInputSvc.MaxBadEvents = 10
+svcMgr.EventSelector.MaxBadEvents = 10
#MessageSvc.OutputLevel = DEBUG
svcMgr.EventSelector.OutputLevel = DEBUG
diff --git a/Event/ByteStreamTest/share/ByteStreamTestBadEvents.ref b/Event/ByteStreamTest/share/ByteStreamTestBadEvents.ref
index fe1a6fd577e2baa76d7f7d574e4c6e1b9319564d..5fcb078c79f6639b6721ed8d3a3ac92937c58f24 100644
--- a/Event/ByteStreamTest/share/ByteStreamTestBadEvents.ref
+++ b/Event/ByteStreamTest/share/ByteStreamTestBadEvents.ref
@@ -1,599 +1,8 @@
-Fri Jan 24 17:44:11 CET 2020
-Preloading tcmalloc_minimal.so
-Py:Athena INFO including file "AthenaCommon/Preparation.py"
-Py:Athena INFO using release [WorkDir-22.0.9] [x86_64-centos7-gcc8-opt] [atlas-work3g/b1aa4d492c9] -- built on [2020-01-24T1658]
-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 "ByteStreamTest/BadEvents.py"
-Py:ConfigurableDb INFO Read module info for 5625 configurables from 37 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-Py:Athena INFO including file "AthenaCommon/runbatch.py"
-Warning in <TInterpreter::ReadRootmapFile>: class CP::IMuonCalibrationAndSmearingTool found in libMuonMomentumCorrectionsDict.so is already in libMuonAnalysisInterfacesDict.so
-Warning in <TInterpreter::ReadRootmapFile>: class CP::IMuonSelectionTool found in libMuonSelectorToolsDict.so is already in libMuonAnalysisInterfacesDict.so
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r0)
- running on lxplus730.cern.ch on Fri Jan 24 17:44:20 2020
-====================================================================================================================================
-ApplicationMgr INFO Application Manager Configured successfully
-ApplicationMgr INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
-StatusCodeSvc INFO initialize
-AthDictLoaderSvc INFO in initialize...
-AthDictLoaderSvc INFO acquired Dso-registry
-ClassIDSvc INFO getRegistryEntries: read 3459 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)
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ByteStreamAddre... DEBUG Property update for OutputLevel : new value = 2
-ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ByteStreamAddre... DEBUG Service base class initialized successfully
-ByteStreamAddre... INFO initialized
-ByteStreamAddre... INFO -- Will fill Store with id = 0
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
-PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
-PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master--py3/2020-01-23T2132/Athena/22.0.9/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus730.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool','ByteStreamMetadataTool'])
-ByteStreamAddre... DEBUG in preLoadAddress
-ByteStreamAddre... DEBUG StoreID = 3 does not match required id (0) skip
-ByteStreamAddre... DEBUG in preLoadAddress
-ByteStreamAddre... DEBUG StoreID = 3 does not match required id (0) skip
-ByteStreamAddre... DEBUG in preLoadAddress
EventSelector DEBUG Property update for OutputLevel : new value = 2
EventSelector DEBUG Initializing EventSelector
EventSelector DEBUG Service base class initialized successfully
ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
-ROBDataProviderSvc INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ROBDataProviderSvc INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
-ROBDataProviderSvc INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
-ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
-ByteStreamInputSvcWARNING MaxBadEvents property has been moved to EventSelector, please use svgMgr.EventSelector.MaxBadEvents instead
-EventSelector INFO Retrieved MaxBadEvents= 'MaxBadEvents':10 from ByteStreamInputSvc
EventSelector INFO reinitialization...
AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
-ApplicationMgr INFO Application Manager Initialized successfully
EventSelector DEBUG Calling EventSelectorByteStream::start()
-ClassIDSvc INFO getRegistryEntries: read 3112 CLIDRegistry entries for module ALL
-ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-EventSelector DEBUG Opened block/file /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-ApplicationMgr INFO Application Manager Started successfully
-ByteStreamCnvSvc DEBUG Property update for OutputLevel : new value = 2
-EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
-EventInfoByteSt... INFO IsSimulation : 0
-EventInfoByteSt... INFO IsTestbeam : 0
-EventInfoByteSt... INFO IsCalibration : 0
-AthenaEventLoopMgr INFO ===>>> start of run 327265 <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186525031, run #327265 0 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186525031, run #327265 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186524665, run #327265 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186524665, run #327265 2 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186542447, run #327265 2 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186542447, run #327265 3 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186543405, run #327265 3 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186543405, run #327265 4 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186548387, run #327265 4 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186548387, run #327265 5 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186515186, run #327265 5 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186515186, run #327265 6 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186556019, run #327265 6 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186556019, run #327265 7 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186542866, run #327265 7 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186542866, run #327265 8 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186537901, run #327265 8 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186537901, run #327265 9 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186517811, run #327265 9 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186517811, run #327265 10 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186534221, run #327265 10 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186534221, run #327265 11 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186540986, run #327265 11 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186540986, run #327265 12 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186535104, run #327265 12 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186535104, run #327265 13 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186539903, run #327265 13 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186539903, run #327265 14 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186552713, run #327265 14 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186552713, run #327265 15 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186524730, run #327265 15 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186524730, run #327265 16 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186547632, run #327265 16 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186547632, run #327265 17 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186555621, run #327265 17 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186555621, run #327265 18 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186568452, run #327265 18 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186568452, run #327265 19 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186580451, run #327265 19 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186580451, run #327265 20 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186535608, run #327265 20 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186535608, run #327265 21 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186583753, run #327265 21 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186583753, run #327265 22 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186553141, run #327265 22 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186553141, run #327265 23 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186582746, run #327265 23 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186582746, run #327265 24 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186583174, run #327265 24 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186583174, run #327265 25 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186590851, run #327265 25 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186590851, run #327265 26 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186585306, run #327265 26 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186585306, run #327265 27 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186575285, run #327265 27 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186575285, run #327265 28 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186585984, run #327265 28 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186585984, run #327265 29 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186539710, run #327265 29 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186539710, run #327265 30 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186591032, run #327265 30 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186591032, run #327265 31 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186588956, run #327265 31 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186588956, run #327265 32 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186576768, run #327265 32 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186576768, run #327265 33 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186601222, run #327265 33 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186601222, run #327265 34 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186572663, run #327265 34 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186572663, run #327265 35 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186577411, run #327265 35 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186577411, run #327265 36 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186599854, run #327265 36 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186599854, run #327265 37 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186604353, run #327265 37 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186604353, run #327265 38 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186612782, run #327265 38 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186612782, run #327265 39 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186591907, run #327265 39 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186591907, run #327265 40 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186570839, run #327265 40 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186570839, run #327265 41 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186601132, run #327265 41 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186601132, run #327265 42 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186597670, run #327265 42 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186597670, run #327265 43 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186607522, run #327265 43 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186607522, run #327265 44 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186526080, run #327265 44 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186526080, run #327265 45 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186602200, run #327265 45 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186602200, run #327265 46 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186560321, run #327265 46 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186560321, run #327265 47 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186624442, run #327265 47 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186624442, run #327265 48 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186608781, run #327265 48 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186608781, run #327265 49 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186550866, run #327265 49 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186550866, run #327265 50 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186628839, run #327265 50 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186628839, run #327265 51 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186623350, run #327265 51 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186623350, run #327265 52 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186632949, run #327265 52 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186632949, run #327265 53 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186571041, run #327265 53 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186571041, run #327265 54 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186626376, run #327265 54 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186626376, run #327265 55 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186617693, run #327265 55 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186617693, run #327265 56 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186564608, run #327265 56 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186564608, run #327265 57 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186555851, run #327265 57 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186555851, run #327265 58 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186643444, run #327265 58 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186643444, run #327265 59 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186632654, run #327265 59 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186632654, run #327265 60 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186636034, run #327265 60 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186636034, run #327265 61 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186542869, run #327265 61 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186542869, run #327265 62 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186517781, run #327265 62 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186517781, run #327265 63 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186559285, run #327265 63 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186559285, run #327265 64 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186643065, run #327265 64 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186643065, run #327265 65 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186658559, run #327265 65 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186658559, run #327265 66 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186655355, run #327265 66 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186655355, run #327265 67 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186601977, run #327265 67 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186601977, run #327265 68 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186584562, run #327265 68 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186584562, run #327265 69 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186593754, run #327265 69 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186593754, run #327265 70 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186613131, run #327265 70 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186613131, run #327265 71 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186668507, run #327265 71 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186668507, run #327265 72 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186605769, run #327265 72 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186605769, run #327265 73 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186675279, run #327265 73 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186675279, run #327265 74 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186648601, run #327265 74 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186648601, run #327265 75 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186586172, run #327265 75 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186586172, run #327265 76 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186594108, run #327265 76 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186594108, run #327265 77 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186587808, run #327265 77 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186587808, run #327265 78 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186559989, run #327265 78 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186559989, run #327265 79 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186694427, run #327265 79 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186694427, run #327265 80 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186560463, run #327265 80 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186560463, run #327265 81 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186656654, run #327265 81 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186656654, run #327265 82 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186669690, run #327265 82 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186669690, run #327265 83 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186661885, run #327265 83 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186661885, run #327265 84 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186696271, run #327265 84 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186696271, run #327265 85 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186679566, run #327265 85 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186679566, run #327265 86 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186698691, run #327265 86 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186698691, run #327265 87 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186690050, run #327265 87 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186690050, run #327265 88 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186652514, run #327265 88 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186652514, run #327265 89 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186681251, run #327265 89 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186681251, run #327265 90 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186702451, run #327265 90 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186702451, run #327265 91 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186604733, run #327265 91 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186604733, run #327265 92 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186701849, run #327265 92 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186701849, run #327265 93 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186711201, run #327265 93 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186711201, run #327265 94 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186707463, run #327265 94 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186707463, run #327265 95 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186689265, run #327265 95 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186689265, run #327265 96 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186712432, run #327265 96 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186712432, run #327265 97 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186719092, run #327265 97 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186719092, run #327265 98 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186705874, run #327265 98 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186705874, run #327265 99 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186712152, run #327265 99 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186712152, run #327265 100 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186709416, run #327265 100 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186709416, run #327265 101 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186648363, run #327265 101 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186648363, run #327265 102 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186672590, run #327265 102 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186672590, run #327265 103 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186735944, run #327265 103 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186735944, run #327265 104 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186656866, run #327265 104 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186656866, run #327265 105 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186719941, run #327265 105 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186719941, run #327265 106 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186725877, run #327265 106 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186725877, run #327265 107 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186710147, run #327265 107 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186710147, run #327265 108 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186729622, run #327265 108 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186729622, run #327265 109 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186719439, run #327265 109 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186719439, run #327265 110 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186662104, run #327265 110 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186662104, run #327265 111 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186718858, run #327265 111 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186718858, run #327265 112 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186696696, run #327265 112 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186696696, run #327265 113 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186723374, run #327265 113 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186723374, run #327265 114 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186676771, run #327265 114 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186676771, run #327265 115 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186714379, run #327265 115 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186714379, run #327265 116 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186753188, run #327265 116 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186753188, run #327265 117 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186768110, run #327265 117 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186768110, run #327265 118 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186715681, run #327265 118 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186715681, run #327265 119 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186694508, run #327265 119 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186694508, run #327265 120 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186749947, run #327265 120 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186749947, run #327265 121 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186702141, run #327265 121 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186702141, run #327265 122 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186742388, run #327265 122 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186742388, run #327265 123 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186763234, run #327265 123 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186763234, run #327265 124 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186672468, run #327265 124 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186672468, run #327265 125 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186764005, run #327265 125 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186764005, run #327265 126 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186746683, run #327265 126 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186746683, run #327265 127 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186659212, run #327265 127 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186659212, run #327265 128 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186785946, run #327265 128 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186785946, run #327265 129 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186702220, run #327265 129 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186702220, run #327265 130 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186616169, run #327265 130 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186616169, run #327265 131 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186701524, run #327265 131 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186701524, run #327265 132 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186758085, run #327265 132 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186758085, run #327265 133 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186726977, run #327265 133 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186726977, run #327265 134 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186740235, run #327265 134 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186740235, run #327265 135 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186788124, run #327265 135 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186788124, run #327265 136 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186708778, run #327265 136 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186708778, run #327265 137 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186795239, run #327265 137 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186795239, run #327265 138 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186723887, run #327265 138 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186723887, run #327265 139 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186775492, run #327265 139 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186775492, run #327265 140 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186682091, run #327265 140 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186682091, run #327265 141 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186753997, run #327265 141 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186753997, run #327265 142 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186764460, run #327265 142 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186764460, run #327265 143 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186745693, run #327265 143 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186745693, run #327265 144 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186710688, run #327265 144 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186710688, run #327265 145 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186802326, run #327265 145 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186802326, run #327265 146 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186797801, run #327265 146 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186797801, run #327265 147 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186778551, run #327265 147 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186778551, run #327265 148 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186813147, run #327265 148 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186813147, run #327265 149 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186785797, run #327265 149 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186785797, run #327265 150 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186685966, run #327265 150 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186685966, run #327265 151 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186811385, run #327265 151 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186811385, run #327265 152 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186814497, run #327265 152 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186814497, run #327265 153 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186756848, run #327265 153 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186756848, run #327265 154 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186818234, run #327265 154 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186818234, run #327265 155 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186836460, run #327265 155 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186836460, run #327265 156 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186840455, run #327265 156 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186840455, run #327265 157 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186837707, run #327265 157 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186837707, run #327265 158 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186824767, run #327265 158 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186824767, run #327265 159 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186809298, run #327265 159 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186809298, run #327265 160 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186838388, run #327265 160 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186838388, run #327265 161 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186781049, run #327265 161 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186781049, run #327265 162 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186830888, run #327265 162 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186830888, run #327265 163 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186838981, run #327265 163 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186838981, run #327265 164 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186847210, run #327265 164 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186847210, run #327265 165 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186836465, run #327265 165 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186836465, run #327265 166 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186831188, run #327265 166 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186831188, run #327265 167 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186848540, run #327265 167 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186848540, run #327265 168 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186792811, run #327265 168 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186792811, run #327265 169 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186853421, run #327265 169 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186853421, run #327265 170 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186846289, run #327265 170 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186846289, run #327265 171 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186816237, run #327265 171 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186816237, run #327265 172 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186829848, run #327265 172 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186829848, run #327265 173 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186864525, run #327265 173 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186864525, run #327265 174 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186840237, run #327265 174 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186840237, run #327265 175 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186837137, run #327265 175 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186837137, run #327265 176 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186780407, run #327265 176 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186780407, run #327265 177 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186788595, run #327265 177 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186788595, run #327265 178 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186799596, run #327265 178 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186799596, run #327265 179 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186860115, run #327265 179 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186860115, run #327265 180 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186871617, run #327265 180 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186871617, run #327265 181 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186866190, run #327265 181 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186866190, run #327265 182 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186770048, run #327265 182 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186770048, run #327265 183 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186884605, run #327265 183 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186884605, run #327265 184 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186887133, run #327265 184 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186887133, run #327265 185 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186744842, run #327265 185 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186744842, run #327265 186 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186858735, run #327265 186 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186858735, run #327265 187 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186895282, run #327265 187 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186895282, run #327265 188 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186868084, run #327265 188 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186868084, run #327265 189 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186875877, run #327265 189 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186875877, run #327265 190 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186778521, run #327265 190 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186778521, run #327265 191 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186825494, run #327265 191 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186825494, run #327265 192 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186907029, run #327265 192 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186907029, run #327265 193 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186892099, run #327265 193 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186892099, run #327265 194 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186921290, run #327265 194 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186921290, run #327265 195 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186919780, run #327265 195 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186919780, run #327265 196 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186917083, run #327265 196 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186917083, run #327265 197 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186848118, run #327265 197 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186848118, run #327265 198 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186866322, run #327265 198 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186866322, run #327265 199 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186896738, run #327265 199 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186896738, run #327265 200 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186920902, run #327265 200 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186920902, run #327265 201 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186860164, run #327265 201 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186860164, run #327265 202 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186915572, run #327265 202 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186915572, run #327265 203 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186894279, run #327265 203 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186894279, run #327265 204 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186739247, run #327265 204 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186739247, run #327265 205 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186935750, run #327265 205 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186935750, run #327265 206 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186863475, run #327265 206 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186863475, run #327265 207 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186852555, run #327265 207 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186852555, run #327265 208 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186882810, run #327265 208 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186882810, run #327265 209 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186935468, run #327265 209 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186935468, run #327265 210 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186711649, run #327265 210 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186711649, run #327265 211 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186910160, run #327265 211 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186910160, run #327265 212 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186944545, run #327265 212 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186944545, run #327265 213 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186952911, run #327265 213 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186952911, run #327265 214 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186924618, run #327265 214 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186924618, run #327265 215 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186916578, run #327265 215 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186916578, run #327265 216 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186959341, run #327265 216 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186959341, run #327265 217 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186912302, run #327265 217 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186912302, run #327265 218 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186963661, run #327265 218 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186963661, run #327265 219 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186905553, run #327265 219 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186905553, run #327265 220 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186900745, run #327265 220 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186900745, run #327265 221 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186938008, run #327265 221 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186938008, run #327265 222 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186864200, run #327265 222 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186864200, run #327265 223 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186967525, run #327265 223 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186967525, run #327265 224 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186937177, run #327265 224 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186937177, run #327265 225 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186957692, run #327265 225 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186957692, run #327265 226 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186945772, run #327265 226 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186945772, run #327265 227 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186989883, run #327265 227 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186989883, run #327265 228 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186926295, run #327265 228 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186926295, run #327265 229 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186954552, run #327265 229 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186954552, run #327265 230 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186890872, run #327265 230 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186890872, run #327265 231 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186920732, run #327265 231 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186920732, run #327265 232 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186961898, run #327265 232 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186961898, run #327265 233 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186965145, run #327265 233 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186965145, run #327265 234 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186996129, run #327265 234 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186996129, run #327265 235 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186986130, run #327265 235 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186986130, run #327265 236 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186993826, run #327265 236 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186993826, run #327265 237 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186988901, run #327265 237 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186988901, run #327265 238 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186902269, run #327265 238 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186902269, run #327265 239 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186938613, run #327265 239 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186938613, run #327265 240 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186973357, run #327265 240 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186973357, run #327265 241 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #187008237, run #327265 241 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #187008237, run #327265 242 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186863906, run #327265 242 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186863906, run #327265 243 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186951585, run #327265 243 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186951585, run #327265 244 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186982294, run #327265 244 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186982294, run #327265 245 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #187008101, run #327265 245 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #187008101, run #327265 246 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186850748, run #327265 246 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186850748, run #327265 247 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186997627, run #327265 247 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186997627, run #327265 248 events processed so far <<<===
-AthenaEventLoopMgrWARNING INFO message limit (500) reached for AthenaEventLoopMgr. Suppressing further output.
EventSelector DEBUG Calling EventSelectorByteStream::stop()
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
-ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
-IncidentProcAlg2 INFO Finalize
-ByteStreamCnvSvc DEBUG releasing all workers
-AthDictLoaderSvc INFO in finalize...
-ToolSvc INFO Removing all tools created by ToolSvc
-ToolSvc.ByteStr... INFO in finalize()
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-ChronoStatSvc INFO Time User : Tot= 6.01 [s] #= 1
-*****Chrono***** INFO ****************************************************************************************************
-ChronoStatSvc.f... INFO Service finalized successfully
-ApplicationMgr INFO Application Manager Finalized successfully
-ApplicationMgr INFO Application Manager Terminated successfully
-Py:Athena INFO leaving with code 0: "successful run"
-Listing sources of suppressed message:
-=====================================================
- Message Source | Level | Count
------------------------------+---------+-------------
- AthenaEventLoopMgr | INFO | 1003
-=====================================================
diff --git a/Event/xAOD/xAODViews/CMakeLists.txt b/Event/xAOD/xAODViews/CMakeLists.txt
index 36010c9e40cbff1d9e0a4b01df2b2b531e80cb65..f15b55682ed1ddb34947b8e6bad864cdf46a2d78 100644
--- a/Event/xAOD/xAODViews/CMakeLists.txt
+++ b/Event/xAOD/xAODViews/CMakeLists.txt
@@ -1,26 +1,16 @@
-################################################################################
-# Package: xAODViews
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-# Declare the package name:
+# Declare the package name.
atlas_subdir( xAODViews )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthContainers
- Event/xAOD/xAODCore
- Event/xAOD/xAODTracking )
+# Component(s) in the package.
+atlas_add_library( xAODViewsLib
+ xAODViews/*.h
+ INTERFACE
+ PUBLIC_HEADERS xAODViews
+ LINK_LIBRARIES AthContainers xAODCore xAODTracking )
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-# Component(s) in the package:
atlas_add_dictionary( xAODViewsDict
- xAODViews/xAODViewsDict.h
- xAODViews/selection.xml
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers xAODCore xAODTracking )
-
-# Install files from the package:
-atlas_install_headers( xAODViews )
-
+ xAODViews/xAODViewsDict.h
+ xAODViews/selection.xml
+ LINK_LIBRARIES xAODViewsLib )
diff --git a/Event/xAOD/xAODViewsAthenaPool/CMakeLists.txt b/Event/xAOD/xAODViewsAthenaPool/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b119f39b4fe8654fabd777d56a0bdef53796019b
--- /dev/null
+++ b/Event/xAOD/xAODViewsAthenaPool/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+# Declare the package name.
+atlas_subdir( xAODViewsAthenaPool )
+
+# Component(s) in the package.
+atlas_add_poolcnv_library( xAODViewsAthenaPoolPoolCnv
+ FILES xAODViews/TrackParticleViewVector.h xAODViews/VertexViewVector.h
+ TYPES_WITH_NAMESPACE xAOD::TrackParticleViewVector xAOD::VertexViewVector
+ CNV_PFX xAOD
+ LINK_LIBRARIES AthenaPoolCnvSvcLib xAODViewsLib )
diff --git a/Event/xAOD/xAODViewsCnv/CMakeLists.txt b/Event/xAOD/xAODViewsCnv/CMakeLists.txt
deleted file mode 100644
index c344d73e8ad79d55eeabce6faf301fd5e1d93983..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODViewsCnv/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-################################################################################
-# Package: xAODViewsCnv
-################################################################################
-
-
-
-# Declare the package name:
-atlas_subdir( xAODViewsCnv )
-
-
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Database/AthenaPOOL/AthenaPoolUtilities
- Tracking/TrkEvent/TrkTrack
- Event/xAOD/xAODTracking
- PRIVATE
- Database/AthenaPOOL/AthenaPoolCnvSvc
- Event/xAOD/xAODViews )
-
-# Component(s) in the package:
-
-atlas_add_poolcnv_library( xAODViewsCnvPoolCnv
- FILES xAODViews/TrackParticleViewVector.h xAODViews/VertexViewVector.h
- INCLUDE_DIRS xAODViews
- TYPES_WITH_NAMESPACE xAOD::TrackParticleViewVector xAOD::VertexViewVector
- CNV_PFX xAOD
- LINK_LIBRARIES AthenaPoolUtilities AthenaPoolCnvSvcLib TrkTrack xAODTracking)
-
diff --git a/Generators/GeneratorObjectsTPCnv/CMakeLists.txt b/Generators/GeneratorObjectsTPCnv/CMakeLists.txt
index ea4a81a1217b68aaf8b1a54e98fb5ad2f38a2924..aa5d5b632f0b2fd84e293b226572c7a7974210a7 100644
--- a/Generators/GeneratorObjectsTPCnv/CMakeLists.txt
+++ b/Generators/GeneratorObjectsTPCnv/CMakeLists.txt
@@ -26,7 +26,7 @@ atlas_add_tpcnv_library( GeneratorObjectsTPCnv
src/*.cxx
PUBLIC_HEADERS GeneratorObjectsTPCnv
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaPoolCnvSvcLib GaudiKernel GeneratorObjects AthAllocators AthenaKernel TestTools )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaPoolCnvSvcLib GaudiKernel GeneratorObjects AthAllocators AthenaKernel GenInterfacesLib TestTools )
atlas_add_dictionary( GeneratorObjectsTPCnvDict
GeneratorObjectsTPCnv/GeneratorObjectsTPCnvDict.h
diff --git a/HLT/Trigger/TrigControl/TrigCommon/share/test_athenaHLT.sh b/HLT/Trigger/TrigControl/TrigCommon/share/test_athenaHLT.sh
index 75d5c4119a9b4bca6dd92147d89365d3ed8567ec..35013c57bf3ce59d4973c62ee3f9f15ae8b51acc 100755
--- a/HLT/Trigger/TrigControl/TrigCommon/share/test_athenaHLT.sh
+++ b/HLT/Trigger/TrigControl/TrigCommon/share/test_athenaHLT.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
# Configuration testing script for athenaHLT.py
#
@@ -25,4 +25,4 @@ detmask="0000000000000001c10069fffffffff7"
# If there was a failure, the exit code will be non-zero
log=test_athenaHLT-${BASHPID}
echo "e" | athenaHLT.py --stdcmalloc --file ${file} --detector-mask ${detmask} --run-number ${run} --sor-time ${sortime} --interactive ${test_options} &> $log
-cat $log | sed -n '/<Configuration>/,/<\/Magnets>/p;/<\/Magnets>/q' | grep '<' | grep -v 'LogRoot'
+cat $log | sed -n '/<Configuration>/,/<\/Magnets>/p;/<\/Magnets>/q' | grep '<' | grep -v 'LogRoot' | sed 's#<\/Configuration>.*#<\/Configuration>#'
diff --git a/InnerDetector/InDetCalibTools/TRT_CalibTools/CMakeLists.txt b/InnerDetector/InDetCalibTools/TRT_CalibTools/CMakeLists.txt
index 4a973b0130cf35e665095a2133fb1039d29e7653..f2ca44f8da80b6050b133656c2cfa0077e189c03 100644
--- a/InnerDetector/InDetCalibTools/TRT_CalibTools/CMakeLists.txt
+++ b/InnerDetector/InDetCalibTools/TRT_CalibTools/CMakeLists.txt
@@ -45,7 +45,7 @@ atlas_add_component( TRT_CalibTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} Identifier GaudiKernel InDetRawData CommissionEvent AthenaBaseComps StoreGateLib AtlasDetDescr EventPrimitives xAODEventInfo xAODTracking TRT_ConditionsData TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack TrkEventPrimitives TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkToolInterfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} Identifier GaudiKernel InDetRawData CommissionEvent AthenaBaseComps StoreGateLib AtlasDetDescr EventPrimitives xAODEventInfo xAODTracking TRT_ConditionsData TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack TrkEventPrimitives TrkParameters TrkPrepRawData TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkToolInterfaces TRT_DriftFunctionToolLib )
# Install files from the package:
atlas_install_headers( TRT_CalibTools )
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/FillFromStringUtility.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/FillFromStringUtility.h
new file mode 100644
index 0000000000000000000000000000000000000000..6e445fcc875e87dde1b298f5d1f2f5fa4bc3b387
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/FillFromStringUtility.h
@@ -0,0 +1,63 @@
+// -*- C++ -*-
+
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef FillFromStringUtility_h
+#define FillFromStringUtility_h
+
+// Include STL stuff
+#include <limits>
+#include <string>
+
+// Include boost stuff
+#include "boost/tokenizer.hpp"
+#include "boost/lexical_cast.hpp"
+
+namespace {
+ template <typename C>
+ bool fillArrayFromString(const std::string& source, C& userContainer) {
+ if (source.empty()) return false;
+ typedef typename C::value_type V_t;
+ V_t errVal{std::numeric_limits<V_t>::has_quiet_NaN ? (std::numeric_limits<V_t>::quiet_NaN()) : 0};
+ boost::char_separator<char> sep{" "};
+ typedef boost::tokenizer<boost::char_separator<char> > Tokenizer;
+ Tokenizer tok{source, sep};
+ bool noNan{true};
+ const Tokenizer::iterator end{tok.end()};
+ int j{0};
+ for (Tokenizer::iterator i{tok.begin()}; i!=end; ++i) {
+ try {
+ userContainer[j]=boost::lexical_cast<V_t>(*i);
+ } catch (const boost::bad_lexical_cast&) {
+ userContainer[j]=errVal;
+ noNan=false;
+ }
+ ++j;
+ }
+ return noNan;
+ }
+ template <typename C>
+ bool fillEmptyVectorFromString(const std::string& source, C& userContainer) {
+ if (source.empty()) return false;
+ typedef typename C::value_type V_t;
+ V_t errVal{std::numeric_limits<V_t>::has_quiet_NaN ? (std::numeric_limits<V_t>::quiet_NaN()) : 0};
+ boost::char_separator<char> sep{" "};
+ typedef boost::tokenizer<boost::char_separator<char> > Tokenizer;
+ Tokenizer tok{source, sep};
+ bool noNan{true};
+ const Tokenizer::iterator end{tok.end()};
+ for (Tokenizer::iterator i{tok.begin()}; i!=end; ++i) {
+ try {
+ userContainer.push_back(boost::lexical_cast<V_t>(*i));
+ } catch (const boost::bad_lexical_cast&) {
+ userContainer.push_back(errVal);
+ noNan=false;
+ }
+ }
+ return noNan;
+ }
+} // end of anonymous namespace
+
+#endif // FillFromStringUtility_h
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx
index 7e07294bc35086ed4be5ae54edab9665f3e830d0..fc9751e48e25303270458b86d9e2cd7c062569c4 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.cxx
@@ -4,15 +4,17 @@
#include "SCT_ReadCalibChipGainCondAlg.h"
+#include "FillFromStringUtility.h"
+
#include "Identifier/IdentifierHash.h"
#include "InDetIdentifier/SCT_ID.h"
#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
-#include "SCT_ConditionsTools/SCT_ReadCalibChipUtilities.h"
+#include "SCT_ConditionsTools/SCT_ReadCalibChipDefs.h"
#include <memory>
using namespace SCT_ConditionsData;
-using namespace SCT_ReadCalibChipUtilities;
+using namespace SCT_ReadCalibChipDefs;
SCT_ReadCalibChipGainCondAlg::SCT_ReadCalibChipGainCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
: ::AthReentrantAlgorithm(name, pSvcLocator)
@@ -116,6 +118,6 @@ SCT_ReadCalibChipGainCondAlg::insertNptGainFolderData(SCT_ModuleGainCalibData& t
for (int i{0}; i!=N_NPTGAIN; ++i) {
SCT_ModuleCalibParameter& datavec{theseCalibData[i]};
const std::string &dbData{((folderData)[nPtGainDbParameterNames[i]]).data<std::string>()};
- fillFromString(dbData, datavec);
+ fillArrayFromString(dbData, datavec);
}
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
index 257b845fc5cc6c6de9096593101ff75337e6769d..ba692aa027f104c0cc1e1684cfab37f9bd3ebdd1 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipGainCondAlg.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef SCT_ReadCalibChipGainCondAlg_h
@@ -20,9 +20,6 @@
#include "AthenaPoolUtilities/CondAttrListCollection.h"
#include "SCT_ConditionsData/SCT_GainCalibData.h"
-// Include boost stuff
-#include "boost/array.hpp"
-
// Forward declarations
class SCT_ID;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx
index 2bd04aa4293586b2d8a2663f443d590066f5536c..1cf9a3525a100aa098567629b20b81ef60b8379f 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.cxx
@@ -4,16 +4,18 @@
#include "SCT_ReadCalibChipNoiseCondAlg.h"
+#include "FillFromStringUtility.h"
+
#include "Identifier/IdentifierHash.h"
#include "InDetIdentifier/SCT_ID.h"
#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
-#include "SCT_ConditionsTools/SCT_ReadCalibChipUtilities.h"
+#include "SCT_ConditionsTools/SCT_ReadCalibChipDefs.h"
#include <limits>
#include <memory>
using namespace SCT_ConditionsData;
-using namespace SCT_ReadCalibChipUtilities;
+using namespace SCT_ReadCalibChipDefs;
SCT_ReadCalibChipNoiseCondAlg::SCT_ReadCalibChipNoiseCondAlg(const std::string& name, ISvcLocator* pSvcLocator)
: ::AthReentrantAlgorithm(name, pSvcLocator)
@@ -117,6 +119,6 @@ SCT_ReadCalibChipNoiseCondAlg::insertNoiseOccFolderData(SCT_ModuleNoiseCalibData
for (int i{0}; i!=N_NOISEOCC; ++i) {
SCT_ModuleCalibParameter& datavec{theseCalibData[i]};
std::string dbData{((folderData)[noiseOccDbParameterNames[i]]).data<std::string>()};
- fillFromString(dbData, datavec);
+ fillArrayFromString(dbData, datavec);
}
}
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
index 7ee71338ca0ec2cd03464c42c49df05433bbfbdd..f6415cc34da3a41e99273674d9a3206f0615f63b 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibChipNoiseCondAlg.h
@@ -1,7 +1,7 @@
// -*- C++ -*-
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef SCT_ReadCalibChipNoiseCondAlg_h
@@ -20,9 +20,6 @@
#include "GaudiKernel/ICondSvc.h"
#include "GaudiKernel/Property.h"
-// Include boost stuff
-#include "boost/array.hpp"
-
// Forward declarations
class SCT_ID;
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx
index 5e950f6851a3ba2d87d4fc37066adf5869669c25..a3939169869abf9625b7f5c17b978b62f3b34fdd 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataCondAlg.cxx
@@ -4,15 +4,13 @@
#include "SCT_ReadCalibDataCondAlg.h"
+#include "FillFromStringUtility.h"
+
#include "Identifier/IdentifierHash.h"
#include "InDetIdentifier/SCT_ID.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
-// Include boost stuff
-#include "boost/lexical_cast.hpp"
-#include "boost/tokenizer.hpp"
-
// Include STL stuff
#include <limits>
#include <memory>
@@ -21,24 +19,6 @@ using namespace SCT_ConditionsData;
// Utility functions
namespace {
- template <typename C>
- bool fillFromString(const std::string& source, C& userContainer) {
- typedef typename C::value_type V_t;
- V_t errVal{0};
- boost::char_separator<char> sep{" "};
- typedef boost::tokenizer<boost::char_separator<char> > Tokenizer;
- Tokenizer tok{source, sep};
- bool noNan{true};
- for (Tokenizer::iterator i{tok.begin()}; i!=tok.end(); ++i) {
- try {
- userContainer.push_back(boost::lexical_cast<V_t>(*i));
- } catch (const boost::bad_lexical_cast&) {
- userContainer.push_back(errVal);
- noNan=false;
- }
- }
- return noNan;
- }
float coerceToFloatRange(const double value) {
const float maxfloat{std::numeric_limits<float>::max()};
if (value>maxfloat) return maxfloat;
@@ -236,13 +216,13 @@ StatusCode SCT_ReadCalibDataCondAlg::execute(const EventContext& ctx) const {
// Convert the defect strings to vectors
std::vector<unsigned int> gaindefectbvec;
- fillFromString(gaindefectb, gaindefectbvec);
+ fillEmptyVectorFromString(gaindefectb, gaindefectbvec);
std::vector<unsigned int> gaindefectevec;
- fillFromString(gaindefecte, gaindefectevec);
+ fillEmptyVectorFromString(gaindefecte, gaindefectevec);
std::vector<unsigned int> defectTypevec;
- fillFromString(defectType, defectTypevec);
+ fillEmptyVectorFromString(defectType, defectTypevec);
std::vector<double> parValuevec;
- fillFromString(parValue, parValuevec);
+ fillEmptyVectorFromString(parValue, parValuevec);
// Fill the Calib defect objects
long unsigned int gainvec_size{gaindefectbvec.size()};
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
index 6d41bde90889f4024e036219cf3245bbc0eeeeaa..ec789f13c9bbdd8a83aeb7ec6c82e56c1b85d6ac 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ReadCalibDataTestAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/** @file SCT_ReadCalibDataTestAlg.cxx Implementation file for SCT_ReadCalibDataTestAlg class
@@ -7,18 +7,17 @@
adapted first to test a tool and the a service
*/
-// Include SCT_ReadCalibDataTestAlg and Svc
+// Include SCT_ReadCalibDataTestAlg
#include "SCT_ReadCalibDataTestAlg.h"
// Include Athena stuff
#include "Identifier/IdentifierHash.h"
#include "InDetIdentifier/SCT_ID.h"
-// Include Gaudi stuff
-
// Include STL stuff
-#include <vector>
+#include <cstdint>
#include <string>
+#include <vector>
//----------------------------------------------------------------------
SCT_ReadCalibDataTestAlg::SCT_ReadCalibDataTestAlg(const std::string& name, ISvcLocator* pSvcLocator) :
@@ -109,10 +108,10 @@ StatusCode SCT_ReadCalibDataTestAlg::execute(const EventContext& ctx) const
int ngood{0};
int nbad{0};
//Loop over all wafers using hashIds from the cabling service
- std::vector<boost::uint32_t> listOfRODs;
+ std::vector<std::uint32_t> listOfRODs;
m_cabling->getAllRods(listOfRODs, ctx);
- std::vector<boost::uint32_t>::iterator rodIter{listOfRODs.begin()};
- std::vector<boost::uint32_t>::iterator rodEnd{listOfRODs.end()};
+ std::vector<std::uint32_t>::iterator rodIter{listOfRODs.begin()};
+ std::vector<std::uint32_t>::iterator rodEnd{listOfRODs.end()};
for (; rodIter != rodEnd; ++rodIter) {
std::vector<IdentifierHash> listOfHashes;
m_cabling->getHashesForRod(listOfHashes, *rodIter, ctx);
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/SCT_ReadCalibChipDefs.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/SCT_ReadCalibChipDefs.h
new file mode 100644
index 0000000000000000000000000000000000000000..4d42232c271297bd6f7f56dd65ae219c22dd658b
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/SCT_ReadCalibChipDefs.h
@@ -0,0 +1,29 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef SCT_ReadCalibDataDefs_h
+#define SCT_ReadCalibDataDefs_h
+
+// Include STL stuff
+#include <array>
+#include <string>
+
+#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
+
+namespace SCT_ReadCalibChipDefs {
+ const std::array<std::string, SCT_ConditionsData::N_NPTGAIN> nPtGainDbParameterNames{
+ {"gainByChip", "gainRMSByChip", "offsetByChip", "offsetRMSByChip", "noiseByChip", "noiseRMSByChip"}
+ };
+ const std::array<std::string, SCT_ConditionsData::N_NPTGAIN> nPtGainParameterNames{
+ {"GainByChip", "GainRMSByChip", "OffsetByChip", "OffsetRMSByChip", "NoiseByChip", "NoiseRMSByChip"}
+ };
+ const std::array<std::string, SCT_ConditionsData::N_NOISEOCC> noiseOccDbParameterNames{
+ {"occupancyByChip", "occupancyRMSByChip", "offsetByChip", "noiseByChip"}
+ };
+ const std::array<std::string, SCT_ConditionsData::N_NOISEOCC> noiseOccParameterNames{
+ {"OccupancyByChip", "OccupancyRMSByChip", "OffsetByChip", "NoiseByChip"}
+ };
+} // end of namespace
+
+#endif // SCT_ReadCalibDataDefs_h
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/SCT_ReadCalibChipUtilities.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/SCT_ReadCalibChipUtilities.h
deleted file mode 100644
index 1191bf4fcfcf38d55d18e9037f84f9376d26602c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/SCT_ReadCalibChipUtilities.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef SCT_ReadCalibDataUtilities_h
-#define SCT_ReadCalibDataUtilities_h
-
-// Include STL stuff
-#include <limits>
-#include <string>
-
-// Include boost stuff
-#include "boost/array.hpp"
-#include "boost/tokenizer.hpp"
-#include "boost/lexical_cast.hpp"
-
-#include "SCT_ConditionsData/SCT_ConditionsParameters.h"
-
-namespace SCT_ReadCalibChipUtilities {
- template <typename C>
- bool fillFromString(const std::string& source, C& userContainer) {
- if (source.empty()) return false;
- typedef typename C::value_type V_t;
- V_t errVal{std::numeric_limits<V_t>::has_quiet_NaN ? (std::numeric_limits<V_t>::quiet_NaN()) : 0};
- boost::char_separator<char> sep{" "};
- typedef boost::tokenizer<boost::char_separator<char> > Tokenizer;
- Tokenizer tok{source, sep};
- bool noNan{true};
- const Tokenizer::iterator end{tok.end()};
- int j{0};
- for (Tokenizer::iterator i{tok.begin()}; i!=end; ++i) {
- try {
- userContainer[j]=boost::lexical_cast<V_t>(*i);
- } catch (const boost::bad_lexical_cast&) {
- userContainer[j]=errVal;
- noNan=false;
- }
- ++j;
- }
- return noNan;
- }
-
- const boost::array<std::string, SCT_ConditionsData::N_NPTGAIN> nPtGainDbParameterNames{
- {"gainByChip", "gainRMSByChip", "offsetByChip", "offsetRMSByChip", "noiseByChip", "noiseRMSByChip"}
-};
- const boost::array<std::string, SCT_ConditionsData::N_NPTGAIN> nPtGainParameterNames{
- {"GainByChip", "GainRMSByChip", "OffsetByChip", "OffsetRMSByChip", "NoiseByChip", "NoiseRMSByChip"}
-};
- const boost::array<std::string, SCT_ConditionsData::N_NOISEOCC> noiseOccDbParameterNames{
- {"occupancyByChip", "occupancyRMSByChip", "offsetByChip", "noiseByChip"}
-};
- const boost::array<std::string, SCT_ConditionsData::N_NOISEOCC> noiseOccParameterNames{
- {"OccupancyByChip", "OccupancyRMSByChip", "OffsetByChip", "NoiseByChip"}
-};
-
- const std::string nPtGainFolder{"/SCT/DAQ/Calibration/ChipGain"};
- const std::string noiseOccFolder{"/SCT/DAQ/Calibration/ChipNoise"};
-
-}//end of anon namespace
-
-#endif // SCT_ReadCalibDataUtilities_h
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsParameterTool.h b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsParameterTool.h
index ea8c59f53e40d7eb755076e7a9515bea4681b5ba..5af2bac4637df93df982eeff4b4e6668aa619636 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsParameterTool.h
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConditionsParameterTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -9,24 +9,18 @@
**/
#ifndef SCT_ConditionsParameterTool_h
#define SCT_ConditionsParameterTool_h
-//STL includes
-#include <list>
-#include <vector>
-
-//boost include
-#include "boost/array.hpp"
-//Gaudi Includes
-#include "AthenaBaseComps/AthAlgTool.h"
+//local includes
+#include "SCT_ConditionsTools/ISCT_ConditionsParameterTool.h"
//Athena includes
-#include "StoreGate/ReadCondHandleKey.h"
-
-//InnerDetector includes
+#include "AthenaBaseComps/AthAlgTool.h"
#include "SCT_ConditionsData/SCT_CondParameterData.h"
+#include "StoreGate/ReadCondHandleKey.h"
-//local includes
-#include "SCT_ConditionsTools/ISCT_ConditionsParameterTool.h"
+//STL includes
+#include <list>
+#include <vector>
/**
* @class SCT_ConditionsParameterTool
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
index 54060b99a7686886492f29fe06bd0462682b87b9..c29d5466e69db2aa37d31a1b99d698e4283f5d08 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/** @file SCT_ReadCalibChipDataTool.cxx Implementation file for SCT_ReadCalibChipDataTool.
@@ -14,10 +14,10 @@
#include "SCT_ConditionsData/SCT_ModuleCalibParameter.h"
#include "SCT_ConditionsData/SCT_ModuleGainCalibData.h"
#include "SCT_ConditionsData/SCT_ModuleNoiseCalibData.h"
-#include "SCT_ConditionsTools/SCT_ReadCalibChipUtilities.h"
+#include "SCT_ConditionsTools/SCT_ReadCalibChipDefs.h"
using namespace SCT_ConditionsData;
-using namespace SCT_ReadCalibChipUtilities;
+using namespace SCT_ReadCalibChipDefs;
//----------------------------------------------------------------------
SCT_ReadCalibChipDataTool::SCT_ReadCalibChipDataTool (const std::string& type, const std::string& name, const IInterface* parent) :
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
index d7e9d0c8dfaebc0397c8194e3a127e9a1f96c246..eb86301d01d86e6ea4e26007c9d56510d3606c84 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibDataTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/** @file SCT_ReadCalibDataTool.cxx Implementation file for SCT_ReadCalibDataTool.
@@ -12,6 +12,9 @@
#include "InDetIdentifier/SCT_ID.h"
#include "InDetReadoutGeometry/SiDetectorElement.h"
+// Include STL
+#include <cstdint>
+
//----------------------------------------------------------------------
SCT_ReadCalibDataTool::SCT_ReadCalibDataTool(const std::string& type, const std::string& name, const IInterface* parent) :
base_class(type, name, parent)
@@ -286,10 +289,10 @@ std::list<Identifier> SCT_ReadCalibDataTool::defectList(const std::string& defec
}
//Loop over all wafers using hashIds from the cabling service
- std::vector<boost::uint32_t> listOfRODs;
+ std::vector<std::uint32_t> listOfRODs;
m_cabling->getAllRods(listOfRODs, ctx);
- std::vector<boost::uint32_t>::iterator rodIter{listOfRODs.begin()};
- std::vector<boost::uint32_t>::iterator rodEnd{listOfRODs.end()};
+ std::vector<std::uint32_t>::iterator rodIter{listOfRODs.begin()};
+ std::vector<std::uint32_t>::iterator rodEnd{listOfRODs.end()};
for (; rodIter!=rodEnd; ++rodIter) {
std::vector<IdentifierHash> listOfHashes;
m_cabling->getHashesForRod(listOfHashes, *rodIter, ctx);
diff --git a/InnerDetector/InDetConfig/CMakeLists.txt b/InnerDetector/InDetConfig/CMakeLists.txt
index 0ead2c151e5eaa4029ec1ac0da117b5dca1c2030..35347ff4edbf58525153cc177075ded2b65494de 100644
--- a/InnerDetector/InDetConfig/CMakeLists.txt
+++ b/InnerDetector/InDetConfig/CMakeLists.txt
@@ -9,6 +9,6 @@ atlas_subdir( InDetConfig )
atlas_install_python_modules( python/*.py )
-# atlas_add_test( InDetClusterization_test
-# SCRIPT python -m InDetConfig.ClusterizationConfig
-# PROPERTIES TIMEOUT 600)
+atlas_add_test( InDetClusterization_test
+ SCRIPT python -m InDetConfig.ClusterizationConfig
+ PROPERTIES TIMEOUT 600)
diff --git a/InnerDetector/InDetConfig/python/ClusterizationConfig.py b/InnerDetector/InDetConfig/python/ClusterizationConfig.py
index 6600159e2bfd9de4b3efb1c3deb873d4229c4dad..5099e9272c141c1cfc3e8748cbc9409ab2a0bca5 100644
--- a/InnerDetector/InDetConfig/python/ClusterizationConfig.py
+++ b/InnerDetector/InDetConfig/python/ClusterizationConfig.py
@@ -1,23 +1,16 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from InDetConfig.TrackReco import InDetBCM_ZeroSuppressionCfg, InDetPixelClusterizationCfg, \
- InDetPixelClusterizationPUCfg, InDet_SCTClusterizationCfg, \
- InDet_SCTClusterizationPUCfg
+from InDetConfig.TrackRecoConfig import BCM_ZeroSuppressionCfg, PixelClusterizationCfg, \
+ PixelClusterizationPUCfg, SCTClusterizationCfg, \
+ SCTClusterizationPUCfg
#arg_TrackingCuts = 'TrackingCuts'
#arg_TrackCollectionKeys = 'tracks'
#arg_TrackCollectionTruthKeys = 'truth'
def InDetClusterizationAlgorithmsCfg(flags, **kwargs) :
-
- from AthenaCommon.Configurable import Configurable
- Configurable.configurableRun3Behavior = 1
-
- from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg
- #top_acc=MainServicesMiniCfg(flags)
- top_acc = MainServicesThreadedCfg(flags)
- #top_acc=MainServicesSerialCfg()
- ##top_acc = ComponentAccumulator()
+ top_acc = ComponentAccumulator()
### configure top_acc to be able to read input file
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
top_acc.merge(PoolReadCfg(flags))
@@ -31,21 +24,21 @@ def InDetClusterizationAlgorithmsCfg(flags, **kwargs) :
#redoPatternRecoAndTracking = kwargs.pop('redoPatternRecoAndTracking')
# @TODO propagate suffix and/or prefix ?
- top_acc.merge(InDetBCM_ZeroSuppressionCfg(flags))
+ top_acc.merge( BCM_ZeroSuppressionCfg(flags))
# Pixel clusterization
## @TODO is this correct flag to be used here to turn on pixel clusterization
if flags.Detector.GeometryPixel:
- top_acc.merge(InDetPixelClusterizationCfg(flags, **kwargs) )
+ top_acc.merge( PixelClusterizationCfg(flags, **kwargs) )
if flags.InDet.doSplitReco :
- top_acc.merge(InDetPixelClusterizationPUCfg(flags, **kwargs) )
+ top_acc.merge( PixelClusterizationPUCfg(flags, **kwargs) )
# SCT clusterization
## @TODO is this correct flag to be used here to turn on SCT clusterization
if flags.Detector.GeometrySCT:
- top_acc.merge( InDet_SCTClusterizationCfg(flags, **kwargs) )
+ top_acc.merge( SCTClusterizationCfg(flags, **kwargs) )
if flags.InDet.doSplitReco :
- top_acc.merge( InDet_SCTClusterizationPUCfg(flags, **kwargs) )
+ top_acc.merge( SCTClusterizationPUCfg(flags, **kwargs) )
# from PixelConditionsTools.PixelConditionsSummaryConfig import PixelConditionsSummaryCfg
# top_acc.merge( PixelConditionsSummaryCfg(flags))
@@ -61,15 +54,13 @@ if __name__ == "__main__":
Configurable.configurableRun3Behavior=1
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- flags = ConfigFlags
+
+ numThreads=1
+ ConfigFlags.Concurrency.NumThreads=numThreads
+ ConfigFlags.Concurrency.NumConcurrentEvents=numThreads # Might change this later, but good enough for the moment.
ConfigFlags.Detector.GeometryPixel = True
ConfigFlags.Detector.GeometrySCT = True
-
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
- ConfigFlags.Input.isMC = True
- ConfigFlags.GeoModel.Align.Dynamic = False
- ConfigFlags.GeoModel.AtlasVersion = 'ATLAS-R2-2016-01-00-01'
ConfigFlags.InDet.doPixelClusterSplitting = True
from AthenaConfiguration.TestDefaults import defaultTestFiles
@@ -77,11 +68,20 @@ if __name__ == "__main__":
ConfigFlags.lock()
ConfigFlags.dump()
- acc = InDetClusterizationAlgorithmsCfg(ConfigFlags)
+ from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg
+ top_acc = MainServicesThreadedCfg(ConfigFlags)
+ msgService = top_acc.getService('MessageSvc')
+ msgService.Format = "S:%s E:%e % F%138W%S%7W%R%T %0W%M"
+
+ acc = InDetClusterizationAlgorithmsCfg(ConfigFlags)
+ top_acc.merge(acc)
+ # import pdb ; pdb.set_trace()
+ iovsvc = top_acc.getService('IOVDbSvc')
+ iovsvc.OutputLevel=5
##acc.setAppProperty("EvtMax",25)
##acc.store(open("test_SiClusterization.pkl", "w"))
- acc.run(25)
+ top_acc.run(25)
#with open('test4.pkl', mode="wb") as f:
# dill.dump(acc, f)
- acc.store(open("test00.pkl", "w"))
\ No newline at end of file
+ top_acc.store(open("test00.pkl", "w"))
\ No newline at end of file
diff --git a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
index f4bf6e7a561a59f604183b7cecbcffe08b093337..deca9782a380ac6e7c713abf191c6a4b172956ce 100644
--- a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
@@ -32,7 +32,7 @@ def InDetTrackHoleSearchToolCfg(flags, name = 'InDetHoleSearchTool', **kwargs):
if ('PixelSummaryTool' not in kwargs):
if flags.Detector.PixelOn:
- tmpAcc = InDetPixelConditionsSummaryToolCfg(flags)
+ tmpAcc = PixelConditionsSummaryToolCfg(flags)
kwargs.setdefault("PixelSummaryTool", tmpAcc.popPrivateTools())
result.merge(tmpAcc)
else:
@@ -108,7 +108,10 @@ def InDetExtrapolatorCfg(flags, name='InDetExtrapolator', **kwargs) :
result.addPublicTool(extrapolator, primary=True)
return result
-def InDetPixelConditionsSummaryToolCfg(flags, name = "InDetPixelConditionsSummaryTool", **kwargs):
+def PixelConditionsSummaryToolCfg(flags, name = "InDetPixelConditionsSummaryTool", **kwargs):
+ #FIXME - fix the duplication in TrigInDetConfig.py and PixelConditionsSummaryConfig.py
+ from PixelConditionsAlgorithms.PixelConditionsConfig import PixelConfigCondAlgCfg, PixelDCSCondStateAlgCfg, PixelDCSCondStatusAlgCfg, PixelTDAQCondAlgCfg
+
kwargs.setdefault( "UseByteStream", not flags.Input.isMC)
if flags.InDet.usePixelDCS:
@@ -116,6 +119,11 @@ def InDetPixelConditionsSummaryToolCfg(flags, name = "InDetPixelConditionsSummar
kwargs.setdefault( "IsActiveStatus", [ 'OK', 'WARNING', 'ERROR', 'FATAL' ] )
result = ComponentAccumulator()
+ result.merge(PixelConfigCondAlgCfg(flags))
+ result.merge(PixelDCSCondStateAlgCfg(flags))
+ result.merge(PixelDCSCondStatusAlgCfg(flags))
+ result.merge(PixelTDAQCondAlgCfg(flags))
+
result.setPrivateTools(CompFactory.PixelConditionsSummaryTool(name, **kwargs))
return result
@@ -173,43 +181,33 @@ def InDetSCT_ConditionsSummaryToolCfg(flags, name = "InDetSCT_ConditionsSummaryT
if (flags.InDet.doPrintConfigurables):
print (SCT_MonitorConditionsTool)
-# FIXME: can this be deleted? tool is not used, other consumers of implicitly setup condAlg are not setup here (other consumer only LinkMaskingTool?)
-# if flags.InDet.doSCTModuleVeto:
-# from SCT_ConditionsTools.SCT_ModuleVetoToolSetup import SCT_ModuleVetoToolSetup
-# sct_ModuleVetoToolSetup = SCT_ModuleVetoToolSetup()
-# sct_ModuleVetoToolSetup.setup()
-# InDetSCT_ModuleVetoTool = sct_ModuleVetoToolSetup.getTool()
-# if (flags.InDet.doPrintConfigurables):
-# print (InDetSCT_ModuleVetoTool)
-
# Load bytestream errors tool (use default instance without "InDet")
SCT_BSToolAcc = SCT_ByteStreamErrorsToolCfg(flags, **{"ConfigTool" : SCT_ConfigurationConditionsTool})
SCT_ByteStreamErrorsTool = SCT_BSToolAcc.popPrivateTools()
result.merge(SCT_BSToolAcc)
if (flags.InDet.doPrintConfigurables):
print (SCT_ByteStreamErrorsTool)
-
+
+ ConditionsTools = []
if flags.InDet.useSctDCS:
from SCT_ConditionsTools.SCT_DCSConditionsConfig import SCT_DCSConditionsCfg # FIXME this doesn't seem to have the UseDefaultHV hack from the old config?
SCT_DCSCondAcc = SCT_DCSConditionsCfg(flags)
SCT_DCSConditionsTool = SCT_DCSCondAcc.popPrivateTools()
+ ConditionsTools += [ SCT_DCSConditionsTool ]
result.merge(SCT_DCSCondAcc)
if (flags.InDet.doPrintConfigurables):
print (SCT_DCSConditionsTool)
-
-
-
+ if withFlaggedCondTool:
+ ConditionsTools.append(SCT_FlaggedConditionTool)
if not flags.Input.isMC :
print ("Conditions db instance is ", flags.IOVDb.DatabaseInstance)
# Configure summary tool
- ConditionsTools = [SCT_ConfigurationConditionsTool,]
- if withFlaggedCondTool:
- ConditionsTools.append(SCT_FlaggedConditionTool)
+ ConditionsTools += [SCT_ConfigurationConditionsTool,]
+
ConditionsTools+= [SCT_ByteStreamErrorsTool,
SCT_ReadCalibDataTool]
-
if kwargs.pop("withTdaqTool", True):
SCT_TdaqEnabledTool = result.popToolsAndMerge(SCT_TdaqEnabledToolCfg(flags))
ConditionsTools += [ SCT_TdaqEnabledTool ]
@@ -219,23 +217,15 @@ def InDetSCT_ConditionsSummaryToolCfg(flags, name = "InDetSCT_ConditionsSummaryT
if not flags.Common.isOnline:
ConditionsTools += [ SCT_MonitorConditionsTool ]
- if flags.InDet.useSctDCS:
- ConditionsTools += [ SCT_DCSConditionsTool ]
-
# switch conditions off for SLHC usage
elif flags.InDet.doSLHC:
ConditionsTools= []
else :
+ # Not SLHC and is MC
ConditionsTools= [ SCT_ConfigurationConditionsTool,
SCT_MonitorConditionsTool,
SCT_ReadCalibDataTool]
- if withFlaggedCondTool:
- ConditionsTools.append(SCT_FlaggedConditionTool)
-
- if flags.InDet.useSctDCS:
- SCT_TdaqEnabledTool = result.popToolsAndMerge(SCT_TdaqEnabledToolCfg(flags))
- ConditionsTools += [ SCT_DCSConditionsTool ]
if flags.InDet.doSCTModuleVeto:
ConditionsTools += [ SCT_MonitorConditionsTool ]
@@ -326,6 +316,10 @@ def SCT_ConfigurationCondAlgCfg(flags, name="SCT_ConfigurationCondAlg", **kwargs
offline_folders=config_folder_prefix+"MUR",
className='CondAttrListVec',
splitMC=True))
+ acc = SCT_CablingToolCfg(flags)
+ kwargs.setdefault("SCT_CablingTool", acc.popPrivateTools())
+ result.merge(acc)
+
result.addCondAlgo(CompFactory.SCT_ConfigurationCondAlg(name, **kwargs))
return result
@@ -341,19 +335,22 @@ def SCT_ReadCalibDataToolCfg(flags, name="SCT_ReadCalibDataTool", cond_kwargs={}
detDb="SCT",
online_folders=cond_kwargs["NoiseFolder"],
offline_folders=cond_kwargs["NoiseFolder"],
- className='CondAttrListVec',
+ className='CondAttrListCollection',
splitMC=True))
result.merge(addFoldersSplitOnline(flags,
detDb="SCT",
online_folders=cond_kwargs["GainFolder"],
offline_folders=cond_kwargs["GainFolder"],
- className='CondAttrListVec',
+ className='CondAttrListCollection',
splitMC=True))
result.addCondAlgo(CompFactory.SCT_ReadCalibDataCondAlg(
name = cond_kwargs["ReadCalibDataCondAlgName"],
ReadKeyGain = cond_kwargs["GainFolder"],
ReadKeyNoise = cond_kwargs["NoiseFolder"]))
+ acc = SCT_CablingToolCfg(flags)
+ kwargs.setdefault("SCT_CablingTool", acc.popPrivateTools())
+ result.merge(acc)
result.setPrivateTools(CompFactory.SCT_ReadCalibDataTool(name,**kwargs))
return result
@@ -403,14 +400,22 @@ def SCT_ByteStreamErrorsToolCfg(flags, name="SCT_ByteStreamErrorsTool", **kwargs
result.setPrivateTools(tool)
return result
+def SCT_CablingToolCfg(flags):
+ from SCT_Cabling.SCT_CablingConfig import SCT_CablingCondAlgCfg
+ result = SCT_CablingCondAlgCfg(flags)
+
+ tool = CompFactory.SCT_CablingTool()
+ result.setPrivateTools(tool)
+ return result
+
def SCT_TdaqEnabledToolCfg(flags):
# Copied from https://gitlab.cern.ch/atlas/athena/blob/master/InnerDetector/InDetConditions/SCT_ConditionsTools/python/SCT_TdaqEnabledToolSetup.py
- result = SCT_TdaqEnabledCondAlg(flags)
+ result = SCT_TdaqEnabledCondAlgCfg(flags)
tool = CompFactory.SCT_TdaqEnabledTool()
result.setPrivateTools(tool)
return result
-def SCT_TdaqEnabledCondAlg(flags):
+def SCT_TdaqEnabledCondAlgCfg(flags, name="SCT_TdaqEnabledCondAlg", **kwargs):
if flags.Input.isMC:
print("Warning: should not setup SCT_TdaqEnabledCond for MC")
return
@@ -420,16 +425,19 @@ def SCT_TdaqEnabledCondAlg(flags):
folder = '/TDAQ/Resources/ATLAS/SCT/Robins' if (flags.IOVDb.DatabaseInstance == "CONDBR2") else '/TDAQ/EnabledResources/ATLAS/SCT/Robins'
result.merge( addFolders(flags, [folder], detDb="TDAQ", className="CondAttrListCollection") )
+
+ acc = SCT_CablingToolCfg(flags)
+ kwargs.setdefault( "SCT_CablingTool", acc.popPrivateTool() )
+ result.merge(acc)
- # Think there's no need to configure the SCT_TdaqEnabledCondAlg - the default is fine.
- result.addCondAlgo( CompFactory.SCT_TdaqEnabledCondAlg() )
+ result.addCondAlgo( CompFactory.SCT_TdaqEnabledCondAlg(name=name, **kwargs) )
return result
def InDetTestPixelLayerToolCfg(flags, name = "InDetTestPixelLayerTool", **kwargs):
the_name = makeName( name, kwargs)
result = ComponentAccumulator()
if 'PixelSummaryTool' not in kwargs :
- tmpAcc = InDetPixelConditionsSummaryToolCfg(flags)
+ tmpAcc = PixelConditionsSummaryToolCfg(flags)
kwargs.setdefault( "PixelSummaryTool", tmpAcc.getPrimary())
result.merge(tmpAcc)
diff --git a/InnerDetector/InDetConfig/python/TrackReco.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
similarity index 78%
rename from InnerDetector/InDetConfig/python/TrackReco.py
rename to InnerDetector/InDetConfig/python/TrackRecoConfig.py
index 3d2c6a8040a471555552a0dbac219430f18dc7d6..6b9d134785c108e1e4dc5405c5f23b312b5c9740 100644
--- a/InnerDetector/InDetConfig/python/TrackReco.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -4,7 +4,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
##------------------------------------------------------------------------------
-def InDetBCM_ZeroSuppressionCfg(flags, **kwargs):
+def BCM_ZeroSuppressionCfg(flags, **kwargs):
acc = ComponentAccumulator()
kwargs.setdefault("BcmContainerName", "BCM_RDOs")
algo = CompFactory.BCM_ZeroSuppression("InDetBCM_ZeroSuppression", **kwargs)
@@ -12,12 +12,12 @@ def InDetBCM_ZeroSuppressionCfg(flags, **kwargs):
return acc
##------------------------------------------------------------------------------
-def InDetPixelClusterizationCfg(flags, **kwargs) :
+def PixelClusterizationCfg(flags, **kwargs) :
acc = ComponentAccumulator()
- sub_acc = InDetMergedPixelsToolCfg(flags, **kwargs)
+ sub_acc = MergedPixelsToolCfg(flags, **kwargs)
merged_pixels_tool = sub_acc.getPrimary()
acc.merge(sub_acc)
- sub_acc = InDetPixelGangedAmbiguitiesFinderCfg(flags)
+ sub_acc = PixelGangedAmbiguitiesFinderCfg(flags)
ambi_finder=sub_acc.getPrimary()
acc.merge(sub_acc)
acc.addEventAlgo( CompFactory.InDet.PixelClusterization( name = "InDetPixelClusterization",
@@ -27,17 +27,17 @@ def InDetPixelClusterizationCfg(flags, **kwargs) :
ClustersName = "PixelClusters" ))
return acc
##------------------------------------------------------------------------------
-def InDetPixelClusterizationPUCfg(flags, **kwargs) :
+def PixelClusterizationPUCfg(flags, **kwargs) :
kwargs.setdefault("name", "InDetPixelClusterizationPU")
kwargs.setdefault("DataObjectName", "Pixel_PU_RDOs")
kwargs.setdefault("ClustersName", "PixelPUClusters")
kwargs.setdefault("AmbiguitiesMap", "PixelClusterAmbiguitiesMapPU")
- return InDetPixelClusterizationCfg(flags, **kwargs)
+ return PixelClusterizationCfg(flags, **kwargs)
##------------------------------------------------------------------------------
##------------------------------------------------------------------------------
-def InDet_SCTClusterizationCfg(flags, **kwargs) :
+def SCTClusterizationCfg(flags, **kwargs) :
acc = ComponentAccumulator()
# Need to get SCT_ConditionsSummaryTool for e.g. SCT_ClusteringTool
@@ -45,7 +45,7 @@ def InDet_SCTClusterizationCfg(flags, **kwargs) :
InDetSCT_ConditionsSummaryToolWithoutFlagged = acc.popToolsAndMerge(InDetSCT_ConditionsSummaryToolCfg(flags,withFlaggedCondTool=False))
#### Clustering tool ######
- accbuf = InDetClusterMakerToolCfg(flags, **kwargs)
+ accbuf = ClusterMakerToolCfg(flags)
InDetClusterMakerTool = accbuf.getPrimary()
acc.merge(accbuf)
InDetSCT_ClusteringTool = CompFactory.InDet.SCT_ClusteringTool( name = "InDetSCT_ClusteringTool",
@@ -70,14 +70,14 @@ def InDet_SCTClusterizationCfg(flags, **kwargs) :
##------------------------------------------------------------------------------
##------------------------------------------------------------------------------
-def InDet_SCTClusterizationPUCfg(flags, **kwargs) :
+def SCTClusterizationPUCfg(flags, **kwargs) :
kwargs.setdefault("name", "InDetSCT_ClusterizationPU")
kwargs.setdefault("DataObjectName", "SCT_PU_RDOs" ) #flags.InDetKeys.SCT_PU_RDOs
kwargs.setdefault("ClustersName", "SCT_PU_Clusters") #flags.InDetKeys.SCT_PU_Clusters
- return InDet_SCTClusterizationCfg(flags, **kwargs)
+ return SCTClusterizationCfg(flags, **kwargs)
##------------------------------------------------------------------------------
-def InDetPixelGangedAmbiguitiesFinderCfg(flags) :
+def PixelGangedAmbiguitiesFinderCfg(flags) :
acc = ComponentAccumulator()
InDetPixelGangedAmbiguitiesFinder = CompFactory.InDet.PixelGangedAmbiguitiesFinder( name = "InDetPixelGangedAmbiguitiesFinder")
acc.addPublicTool( InDetPixelGangedAmbiguitiesFinder, primary=True)
@@ -85,12 +85,12 @@ def InDetPixelGangedAmbiguitiesFinderCfg(flags) :
##------------------------------------------------------------------------------
-def InDetMergedPixelsToolCfg(flags, **kwargs) :
+def MergedPixelsToolCfg(flags, **kwargs) :
acc = ComponentAccumulator()
clusterSplitProbTool = None
clusterSplitterTool = None
-
- if flags.InDet.doPixelClusterSplitting :
+ # FIXME - should we just not set InDet.doPixelClusterSplitting if flags.InDet.doTIDE_Ambi?
+ if flags.InDet.doPixelClusterSplitting and not flags.InDet.doTIDE_Ambi:
# --- Neutral Network version
if flags.InDet.pixelClusterSplittingType == 'NeuralNet':
useBeamConstraint = flags.InDet.useBeamConstraint
@@ -132,32 +132,46 @@ def InDetMergedPixelsToolCfg(flags, **kwargs) :
# new splitter tool & remember splitter tool
clusterSplitterTool=CompFactory.InDet.TotPixelClusterSplitter (name = "TotPixelClusterSplitter")
+ if clusterSplitProbTool is not None: kwargs.setdefault("SplitProbTool", clusterSplitProbTool )
+ if clusterSplitterTool is not None: kwargs.setdefault("ClusterSplitter", clusterSplitterTool )
# --- now load the framework for the clustering
#InDetClusterMakerTool = CompFactory.InDet.ClusterMakerTool(name = "InDetClusterMakerTool")
#acc.addPublicTool(InDetClusterMakerTool)
- accbuf = InDetClusterMakerToolCfg(flags, **kwargs)
+ accbuf = ClusterMakerToolCfg(flags)
InDetClusterMakerTool = accbuf.getPrimary()
+ kwargs.setdefault("globalPosAlg", InDetClusterMakerTool )
+ acc.merge(accbuf)
+
+ # PixelClusteringToolBase uses PixelConditionsSummaryTool
+ from InDetConfig.InDetRecToolConfig import PixelConditionsSummaryToolCfg
+ accbuf = PixelConditionsSummaryToolCfg(flags)
+ conditionssummarytool = accbuf.popPrivateTools()
+ kwargs.setdefault("PixelConditionsSummaryTool", conditionssummarytool )
acc.merge(accbuf)
- InDetMergedPixelsTool = CompFactory.InDet.MergedPixelsTool( name = "InDetMergedPixelsTool",
- globalPosAlg = InDetClusterMakerTool,
- MinimalSplitSize = 0,
- MaximalSplitSize = 49,
- MinimalSplitProbability = 0,
- DoIBLSplitting = True)
- # assign the tools if there are any
- if not flags.InDet.doTIDE_Ambi and clusterSplitProbTool is not None : InDetMergedPixelsTool.SplitProbTool = clusterSplitProbTool
- if not flags.InDet.doTIDE_Ambi and clusterSplitterTool is not None : InDetMergedPixelsTool.ClusterSplitter = clusterSplitterTool
+ kwargs.setdefault("MinimalSplitSize", 0 )
+ kwargs.setdefault("MaximalSplitSize", 49 )
+ kwargs.setdefault("MinimalSplitProbability", 0 )
+ kwargs.setdefault("DoIBLSplitting", True )
+ InDetMergedPixelsTool = CompFactory.InDet.MergedPixelsTool( name = "InDetMergedPixelsTool", **kwargs)
+
acc.addPublicTool(InDetMergedPixelsTool, primary=True)
return acc
##------------------------------------------------------------------------------
-def InDetClusterMakerToolCfg(flags, **kwargs) :
+def ClusterMakerToolCfg(flags, **kwargs) :
+ from PixelConditionsAlgorithms.PixelConditionsConfig import PixelChargeCalibCondAlgCfg, PixelConfigCondAlgCfg
+
acc = ComponentAccumulator()
- InDetClusterMakerTool = CompFactory.InDet.ClusterMakerTool(name = "InDetClusterMakerTool")
+ # This directly needs the following Conditions data:
+ # PixelModuleData & PixelChargeCalibCondData
+ acc.merge( PixelChargeCalibCondAlgCfg(flags))
+ acc.merge( PixelConfigCondAlgCfg(flags))
+
+ InDetClusterMakerTool = CompFactory.InDet.ClusterMakerTool(name = "InDetClusterMakerTool", **kwargs)
- SCTLorentzAngleTool = CompFactory.SiLorentzAngleTool(name = "SCTLorentzAngleTool", DetectorName="SCT", SiLorentzAngleCondData="SCTSiLorentzAngleCondData")
- SCTLorentzAngleTool.UseMagFieldCache = True
+ from SiLorentzAngleTool.SCT_LorentzAngleConfig import SCT_LorentzAngleCfg
+ SCTLorentzAngleTool = acc.popToolsAndMerge( SCT_LorentzAngleCfg(flags) )
acc.addPublicTool(SCTLorentzAngleTool)
acc.addPublicTool(InDetClusterMakerTool, primary=True)
return acc
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfig.py b/InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfig.py
index b85269c9680cb3142380f556441fa90d0dda75d1..d311ff8a4d4ecaad22a2047169149c4c283ded57 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfig.py
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/python/SCT_GeoModelConfig.py
@@ -24,6 +24,8 @@ def SCT_GeometryCfg( flags ):
SCT_DetectorTool=CompFactory.SCT_DetectorTool
sctDetectorTool = SCT_DetectorTool()
sctDetectorTool.useDynamicAlignFolders = flags.GeoModel.Align.Dynamic
+ sctDetectorTool.Alignable = True # make this a flag?
+ sctDetectorTool.DetectorName = "SCT"
geoModelSvc.DetectorTools += [ sctDetectorTool ]
if flags.GeoModel.Align.Dynamic:
acc.merge(addFoldersSplitOnline(flags,"INDET","/Indet/Onl/AlignL1/ID","/Indet/AlignL1/ID",className="CondAttrListCollection"))
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt b/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
index 4d0791002f9272896ab5c0e849f57f1b9d80e287..8c7b07e48c60450ffcbb8a0be81701e07a563f68 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/CMakeLists.txt
@@ -50,11 +50,10 @@ find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
atlas_add_component( FastSiDigitization
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel PileUpToolsLib EventPrimitives xAODEventInfo GaudiKernel InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry InDetSimData InDetPrepRawData SiClusterizationToolLib InDetSimEvent HitManagement ISF_FatrasDetDescrModel ISF_FatrasEvent TrkTruthData StoreGateLib SGtests Identifier GeneratorObjects InDetIdentifier TrkDetDescrInterfaces TrkDigEvent TrkGeometry TrkSurfaces TrkExUtils )
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib AthenaBaseComps AthenaKernel PileUpToolsLib EventPrimitives xAODEventInfo GaudiKernel InDetReadoutGeometry PixelReadoutGeometry SCT_ReadoutGeometry InDetSimData InDetPrepRawData SiClusterizationToolLib InDetSimEvent HitManagement ISF_FatrasDetDescrModel ISF_FatrasEvent TrkTruthData StoreGateLib SGtests Identifier GeneratorObjects InDetIdentifier TrkDetDescrInterfaces TrkDigEvent TrkDigInterfaces TrkGeometry TrkSurfaces TrkExUtils )
# Install files from the package:
-atlas_install_headers( FastSiDigitization )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/IPixelFastDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/IPixelFastDigitizationTool.h
deleted file mode 100644
index 589fa66ee3dbb3504be6b36b27583d01f18813c9..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/IPixelFastDigitizationTool.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FASTSIDIGITIZATION_IPIXELFASTDIGITIZATIONTOOL_H
-#define FASTSIDIGITIZATION_IPIXELFASTDIGITIZATIONTOOL_H
-
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/EventContext.h"
-
-static const InterfaceID IID_IPixelFastDigitizationTool ("IPixelFastDigitizationTool",1,0);
-
-class IPixelFastDigitizationTool : virtual public IAlgTool
-{
-
- public:
-
- static const InterfaceID& interfaceID();
-
- ///alternative interface which uses the PileUpMergeSvc to obtain all
- ///the required SubEvents.
- virtual StatusCode processAllSubEvents(const EventContext& ctx) = 0;
-
-};
-
-inline const InterfaceID& IPixelFastDigitizationTool::interfaceID()
-{
- return IID_IPixelFastDigitizationTool;
-}
-
-#endif // FASTSIDIGITIZATION_IPIXELFASTDIGITIZATIONTOOL_H
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/ISCT_FastDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/ISCT_FastDigitizationTool.h
deleted file mode 100644
index fb6d06e30fd7fbafd5fc887dc0c9e89cc60a1470..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/ISCT_FastDigitizationTool.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FASTSIDIGITIZATION_ISCTFASTDIGITIZATIONTOOL_H
-#define FASTSIDIGITIZATION_ISCTFASTDIGITIZATIONTOOL_H
-
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/EventContext.h"
-
-static const InterfaceID IID_ISCT_FastDigitizationTool ("ISCT_FastDigitizationTool",1,0);
-
-class ISCT_FastDigitizationTool : virtual public IAlgTool
-{
-
- public:
-
- static const InterfaceID& interfaceID();
-
- ///alternative interface which uses the PileUpMergeSvc to obtain all
- ///the required SubEvents.
- virtual StatusCode processAllSubEvents(const EventContext& ctx) = 0;
-
-};
-
-inline const InterfaceID& ISCT_FastDigitizationTool::interfaceID()
-{
- return IID_ISCT_FastDigitizationTool;
-}
-
-#endif // FASTSIDIGITIZATION_ISCTFASTDIGITIZATIONTOOL_H
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/ISiSmearedDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/ISiSmearedDigitizationTool.h
deleted file mode 100644
index 390a8a564245cdac79dc6671f032802a96e17781..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/ISiSmearedDigitizationTool.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef FASTSIDIGITIZATION_ISISMEAREDDIGITIZATIONTOOL_H
-#define FASTSIDIGITIZATION_ISISMEAREDDIGITIZATIONTOOL_H
-
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/EventContext.h"
-
-static const InterfaceID IID_ISiSmearedDigitizationTool ("ISiSmearedDigitizationTool",1,0);
-
-class ISiSmearedDigitizationTool : virtual public IAlgTool
-{
-
- public:
-
- static const InterfaceID& interfaceID();
-
- ///alternative interface which uses the PileUpMergeSvc to obtain all
- ///the required SubEvents.
- virtual StatusCode processAllSubEvents(const EventContext& ctx) = 0;
-
-};
-
-inline const InterfaceID& ISiSmearedDigitizationTool::interfaceID()
-{
- return IID_ISiSmearedDigitizationTool;
-}
-
-#endif // FASTSIDIGITIZATION_ISISMEAREDDIGITIZATIONTOOL_H
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitization.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitization.h
index e5bb1e5d5408571e4c1a53924f50f8eb6fa78c99..1b5dee8a599bb8081e6351e346ed3f05673fbbad 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitization.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitization.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef FASTSIDIGITIZATION_PIXELFASTDIGITIZATION_H
@@ -8,7 +8,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-class IPixelFastDigitizationTool;
+class IPileUpTool;
/** Top algorithm class for Pixel digitization */
class PixelFastDigitization : public AthAlgorithm {
@@ -18,13 +18,15 @@ class PixelFastDigitization : public AthAlgorithm {
/** Constructor with parameters */
PixelFastDigitization(const std::string &name,ISvcLocator *pSvcLocator);
+ /** Destructor */
+ virtual ~PixelFastDigitization() = default;
+
/** Basic algorithm methods */
- virtual StatusCode initialize();
- virtual StatusCode execute();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override final;
+ virtual StatusCode execute() override final;
private:
- ToolHandle<IPixelFastDigitizationTool> m_digTool;
+ ToolHandle<IPileUpTool> m_digTool{this, "DigitizationTool", "PixelFastDigitizationTool", "AthAlgTool which performs the Pixel digitization"};
};
#endif // FASTSIDIGITIZATION_PIXELFASTDIGITIZATION_H
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
index 1e1dadec8f3e7bb96bc3543cd5c972a2725b55a7..d96b8a98dc7f8b98c139721b764ee853b0e7fb5e 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/PixelFastDigitizationTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -14,7 +14,6 @@
#define FASTSIDIGITIZATION_PIXELFASTDIGITIZATIONTOOL_H
#include "PileUpTools/PileUpToolBase.h"
-#include "FastSiDigitization/IPixelFastDigitizationTool.h"
#include "HitManagement/TimedHitCollection.h"
#include "InDetSimEvent/SiHit.h"
#include "InDetSimEvent/SiHitCollection.h" // cannot fwd declare
@@ -58,7 +57,7 @@ namespace InDet {
}
class PixelFastDigitizationTool :
- virtual public PileUpToolBase, virtual public IPixelFastDigitizationTool
+ virtual public PileUpToolBase
{
public:
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitization.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitization.h
index c864c44942cccb5ffaeb4138a8f935ef6c8e1862..5499c779d0103dd50fd82a16cd7fc3e4ab9d9133 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitization.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitization.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef FASTSIDIGITIZATION_SCT_FASTDIGITIZATION_H
@@ -8,7 +8,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-class ISCT_FastDigitizationTool;
+class IPileUpTool;
/** Top algorithm class for SCT digitization */
class SCT_FastDigitization : public AthAlgorithm {
@@ -19,12 +19,11 @@ class SCT_FastDigitization : public AthAlgorithm {
SCT_FastDigitization(const std::string &name,ISvcLocator *pSvcLocator);
/** Basic algorithm methods */
- virtual StatusCode initialize();
- virtual StatusCode execute();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override final;
+ virtual StatusCode execute() override final;
private:
- ToolHandle<ISCT_FastDigitizationTool> m_digTool;
+ ToolHandle<IPileUpTool> m_digTool{this, "DigitizationTool", "SCT_FastDigitizationTool", "AthAlgTool which performs the SCT digitization"};
};
#endif // FASTSIDIGITIZATION_SCT_FASTDIGITIZATION_H
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h
index 7cc312d1bcb2c4d3378ced8c75e60ffa45e338ee..edb97a6fb6b22bb551c98a08fc40fd1bcec89bed 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SCT_FastDigitizationTool.h
@@ -2,7 +2,7 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef FASTSIDIGITZATION_SCT_FASTDIGITZATIONTOOL_H
@@ -13,8 +13,6 @@
* @author John Chapman - ATLAS Collaboration
*/
-#include "FastSiDigitization/ISCT_FastDigitizationTool.h"
-
#include "PileUpTools/PileUpToolBase.h"
#include "AthenaKernel/IAtRndmGenSvc.h"
@@ -41,8 +39,6 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/AlgTool.h"
-#include "boost/shared_ptr.hpp"
-
#include <vector>
#include <list>
#include <utility> /* pair */
@@ -86,7 +82,7 @@ namespace CLHEP {
}
class SCT_FastDigitizationTool :
- virtual public PileUpToolBase, virtual public ISCT_FastDigitizationTool
+ virtual public PileUpToolBase
{
public:
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitization.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitization.h
index e5edea097f99d110804d9826eebb4c61b30a55c0..50ea05bf6c1178c6ef52e843f9e3442a32c3b735 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitization.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitization.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef FASTSIDIGITIZATION_SISMEAREDDIGITIZATION_H
@@ -8,7 +8,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-class ISiSmearedDigitizationTool;
+class IPileUpTool;
/** Top algorithm class for Pixel digitization */
class SiSmearedDigitization : public AthAlgorithm {
@@ -19,12 +19,11 @@ class SiSmearedDigitization : public AthAlgorithm {
SiSmearedDigitization(const std::string &name,ISvcLocator *pSvcLocator);
/** Basic algorithm methods */
- virtual StatusCode initialize();
- virtual StatusCode execute();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override final;
+ virtual StatusCode execute() override final;
private:
- ToolHandle<ISiSmearedDigitizationTool> m_smearTool;
+ ToolHandle<IPileUpTool> m_smearTool{this, "DigitizationTool", "SiSmearedDigitizationTool", "AthAlgTool which performs the Pixel or SCT smearing"};
};
#endif // FASTSIDIGITIZATION_SISMEAREDDIGITIZATION_H
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitizationTool.h b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitizationTool.h
index 0b5c240b262d701dbd6504c3bca883ec324a0ca0..de8b59c63c5b850c9c50e8d0565a08a6813df629 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/FastSiDigitization/SiSmearedDigitizationTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -23,7 +23,6 @@
#include "xAODEventInfo/EventInfo.h"
#include "xAODEventInfo/EventAuxInfo.h"
#include "InDetSimData/InDetSimDataCollection.h"
-#include "FastSiDigitization/ISiSmearedDigitizationTool.h"
#include <string>
#include "HitManagement/TimedHitCollection.h"
@@ -69,8 +68,7 @@ namespace Trk {
}
-class SiSmearedDigitizationTool : virtual public PileUpToolBase,
- virtual public ISiSmearedDigitizationTool
+class SiSmearedDigitizationTool : virtual public PileUpToolBase
{
public:
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitization.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitization.cxx
index 770f8ada212b74ae67a7a372024462de6a798fbe..4dac60b15fb71e1509a5b7ec15fa948529059dc5 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitization.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitization.cxx
@@ -1,29 +1,25 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "FastSiDigitization/PixelFastDigitization.h"
-#include "FastSiDigitization/IPixelFastDigitizationTool.h"
+#include "PileUpTools/IPileUpTool.h"
//----------------------------------------------------------------------
// Constructor with parameters:
//----------------------------------------------------------------------
PixelFastDigitization::PixelFastDigitization(const std::string &name, ISvcLocator *pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
- m_digTool("PixelFastDigitizationTool", this )
+ AthAlgorithm(name, pSvcLocator)
{
- declareProperty("DigitizationTool", m_digTool, "AthAlgTool which performs the Pixel digitization");
}
//----------------------------------------------------------------------
// Initialize method:
//----------------------------------------------------------------------
StatusCode PixelFastDigitization::initialize() {
-// intitialize store gate active store
- if (m_digTool.retrieve().isFailure()) {
- ATH_MSG_FATAL ( "Could not retrieve Pixel Digitization Tool!" );
- return StatusCode::FAILURE;
- }
+
+ ATH_CHECK (m_digTool.retrieve());
+
ATH_MSG_VERBOSE ( "Retrieved Pixel Digitization Tool." );
return StatusCode::SUCCESS;
@@ -32,25 +28,13 @@ StatusCode PixelFastDigitization::initialize() {
//----------------------------------------------------------------------
// Execute method:
//----------------------------------------------------------------------
-
StatusCode PixelFastDigitization::execute() {
ATH_MSG_VERBOSE ( " PixelFastDigitization : execute()" );
- StatusCode sc = m_digTool->processAllSubEvents(Gaudi::Hive::currentContext());
+ ATH_CHECK (m_digTool->processAllSubEvents(Gaudi::Hive::currentContext()));
ATH_MSG_VERBOSE ( " PixelFastDigitization : m_digTool->processAllSubEvents()" );
-
- return sc;
-}
-
-//----------------------------------------------------------------------//
-// Finalize method: //
-//----------------------------------------------------------------------//
-StatusCode PixelFastDigitization::finalize() {
-
- ATH_MSG_VERBOSE ( "PixelFastDigitization : finalize()" );
-
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
index 4a59f62aad3d53f64b82e15bc8e0624051b1455e..972379c352bdd24ed8b1ebc3b95c7f90790cd9ac 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/PixelFastDigitizationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////
@@ -111,7 +111,6 @@ PixelFastDigitizationTool::PixelFastDigitizationTool(const std::string &type, co
m_ambiguitiesMap(nullptr),
m_digitizationStepper("Trk::PlanarModuleStepper")
{
- declareInterface<IPixelFastDigitizationTool>(this);
declareProperty("RndmSvc" , m_rndmSvc, "Random Number Service used in Pixel digitization" );
declareProperty("RndmEngine" , m_randomEngineName, "Random engine name");
declareProperty("ClusterMaker" , m_clusterMaker);
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitization.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitization.cxx
index 28a55496d6557fcfb7cf33d067f73a631ba7b536..b63d9133c93803d95596b734db35d847060a4c5d 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitization.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitization.cxx
@@ -1,16 +1,15 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "FastSiDigitization/SCT_FastDigitization.h"
-#include "FastSiDigitization/ISCT_FastDigitizationTool.h"
+#include "PileUpTools/IPileUpTool.h"
//----------------------------------------------------------------------
// Constructor with parameters:
//----------------------------------------------------------------------
SCT_FastDigitization::SCT_FastDigitization(const std::string &name, ISvcLocator *pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
- m_digTool("SCT_FastDigitizationTool", this )
+ AthAlgorithm(name, pSvcLocator)
{
declareProperty("DigitizationTool", m_digTool, "AthAlgTool which performs the SCT digitization");
}
@@ -19,11 +18,9 @@ SCT_FastDigitization::SCT_FastDigitization(const std::string &name, ISvcLocator
// Initialize method:
//----------------------------------------------------------------------
StatusCode SCT_FastDigitization::initialize() {
-// intitialize store gate active store
- if (m_digTool.retrieve().isFailure()) {
- ATH_MSG_FATAL ( "Could not retrieve SCT Digitization Tool!" );
- return StatusCode::FAILURE;
- }
+
+ ATH_CHECK (m_digTool.retrieve());
+
ATH_MSG_VERBOSE ( "Retrieved SCT Digitization Tool." );
return StatusCode::SUCCESS;
@@ -37,20 +34,9 @@ StatusCode SCT_FastDigitization::execute() {
ATH_MSG_VERBOSE ( " SCT_FastDigitization : execute()" );
- StatusCode sc = m_digTool->processAllSubEvents(Gaudi::Hive::currentContext());
+ ATH_CHECK (m_digTool->processAllSubEvents(Gaudi::Hive::currentContext()));
ATH_MSG_VERBOSE ( " SCT_FastDigitization : m_digTool->processAllSubEvents()" );
-
- return sc;
-}
-
-//----------------------------------------------------------------------//
-// Finalize method: //
-//----------------------------------------------------------------------//
-StatusCode SCT_FastDigitization::finalize() {
-
- ATH_MSG_VERBOSE ( "SCT_FastDigitization : finalize()" );
-
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitizationTool.cxx
index aa8fd1750f7f7fb9cb8a1c1aa91cade076af5716..8efbc404c519a04f95f353b06a688e00daaf1eda 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/SCT_FastDigitizationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "FastSiDigitization/SCT_FastDigitizationTool.h"
@@ -80,7 +80,6 @@ SCT_FastDigitizationTool::SCT_FastDigitizationTool(const std::string& type,
m_DiffusionShiftY_endcap(15),
m_sctMinimalPathCut(90.)
{
- declareInterface<ISCT_FastDigitizationTool>(this);
declareProperty("InputObjectName" , m_inputObjectName, "Input Object name" );
declareProperty("MergeSvc" , m_mergeSvc, "Merge service" );
declareProperty("RndmSvc" , m_rndmSvc, "Random Number Service used in SCT & Pixel digitization" );
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitization.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitization.cxx
index 8d061160b98cca454b6dc8b42b995556cef89a57..535c9e8c87a52a52c6089cf1c80de9930cf62715 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitization.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitization.cxx
@@ -1,34 +1,27 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "FastSiDigitization/SiSmearedDigitization.h"
-#include "FastSiDigitization/ISiSmearedDigitizationTool.h"
+#include "PileUpTools/IPileUpTool.h"
//----------------------------------------------------------------------
// Constructor with parameters:
//----------------------------------------------------------------------
SiSmearedDigitization::SiSmearedDigitization(const std::string &name, ISvcLocator *pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
- m_smearTool("SiSmearedDigitizationTool", this )
-
+ AthAlgorithm(name, pSvcLocator)
{
- declareProperty("SiSmearedDigitizationTool", m_smearTool, "AthAlgTool which performs the Pixel or SCT smearing");
}
//----------------------------------------------------------------------
// Initialize method:
//----------------------------------------------------------------------
StatusCode SiSmearedDigitization::initialize() {
-// intitialize store gate active store
-
- if (m_smearTool.retrieve().isFailure()) {
- ATH_MSG_FATAL ( "Could not retrieve Silicon Smearing Tool!" );
- return StatusCode::FAILURE;
- }
-
+
+ ATH_CHECK (m_smearTool.retrieve());
+
ATH_MSG_INFO ( "Retrieved Silicon Smearing Tool." );
-
+
return StatusCode::SUCCESS;
}
@@ -40,29 +33,9 @@ StatusCode SiSmearedDigitization::execute() {
ATH_MSG_INFO ( " SiSmearedDigitization : execute()" );
- StatusCode sc = m_smearTool->processAllSubEvents(Gaudi::Hive::currentContext());
-
- ATH_MSG_INFO ( " SiSmearedDigitization : m_smearTool->processAllSubEvents()" );
-
- if (sc.isFailure()) {
- ATH_MSG_FATAL ( "Error in SiSmearedDigitization : m_smearTool->processAllSubEvents()" );
- return StatusCode::FAILURE;
- }
-
- if (sc.isFailure()) {
- ATH_MSG_FATAL ( "Error in SiSmearedDigitization : m_digTool->processAllSubEvents()" );
- return StatusCode::FAILURE;
- }
-
- return sc;
-}
+ ATH_CHECK (m_smearTool->processAllSubEvents(Gaudi::Hive::currentContext()));
-//----------------------------------------------------------------------//
-// Finalize method: //
-//----------------------------------------------------------------------//
-StatusCode SiSmearedDigitization::finalize() {
-
- ATH_MSG_INFO ( "SiSmearedDigitization : finalize()" );
+ ATH_MSG_INFO ( " SiSmearedDigitization : m_smearTool->processAllSubEvents()" );
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitizationTool.cxx
index c0f277ddf86f92544aaefa212952deaf83f5c08d..c2de5e1952742b9bf873f4ba6ee9b7bc939cc3be 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/SiSmearedDigitizationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
////////////////////////////////////////////////////////////////////////////
@@ -129,7 +129,6 @@ SiSmearedDigitizationTool::SiSmearedDigitizationTool(const std::string &type, co
m_trackingGeometryName("AtlasTrackingGeometry"),
m_useCustomGeometry(false)
{
- declareInterface<ISiSmearedDigitizationTool>(this);
declareProperty("RndmSvc", m_rndmSvc, "Random Number Service used in SCT & Pixel digitization" );
declareProperty("RndmEngine", m_randomEngineName, "Random engine name");
declareProperty("InputObjectName", m_inputObjectName="PixelHits", "Input Object name" );
diff --git a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
index 3e0f4ee14751c2440a89e16578153bccb87d5126..1686c6fbc3402b1b55a060bcd14e99622828dca3 100644
--- a/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/FastSiDigitization/src/components/FastSiDigitization_entries.cxx
@@ -1,13 +1,10 @@
#include "FastSiDigitization/PixelFastDigitizationTool.h"
#include "FastSiDigitization/PixelFastDigitization.h"
-#include "FastSiDigitization/IPixelFastDigitizationTool.h"
#include "FastSiDigitization/SCT_FastDigitizationTool.h"
#include "FastSiDigitization/SCT_FastDigitization.h"
-#include "FastSiDigitization/ISCT_FastDigitizationTool.h"
#include "FastSiDigitization/SiSmearedDigitizationTool.h"
-#include "FastSiDigitization/ISiSmearedDigitizationTool.h"
#include "FastSiDigitization/SiSmearedDigitization.h"
DECLARE_COMPONENT( PixelFastDigitization )
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/CMakeLists.txt b/InnerDetector/InDetDigitization/FastTRT_Digitization/CMakeLists.txt
index 552ed3102423e0892e2c19fd4399699a90f7a5a9..887f1cce9d83a8e9803bb42e8e967776454a1ebe 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/CMakeLists.txt
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/CMakeLists.txt
@@ -17,7 +17,7 @@ atlas_depends_on_subdirs( PUBLIC
GaudiKernel
InnerDetector/InDetConditions/TRT_ConditionsServices
InnerDetector/InDetRecEvent/InDetPrepRawData
- InnerDetector/InDetRecTools/TRT_DriftFunctionTool
+ InnerDetector/InDetRecTools/TRT_DriftFunctionTool # FIXME this package only builds a component library!
InnerDetector/InDetSimEvent
Simulation/HitManagement
Tracking/TrkEvent/TrkParameters
@@ -29,7 +29,7 @@ atlas_depends_on_subdirs( PUBLIC
Generators/GeneratorObjects
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
- InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
+ InnerDetector/InDetDetDescr/TRT_ReadoutGeometry
InnerDetector/InDetRawEvent/InDetSimData
Tracking/TrkDetDescr/TrkDetElementBase )
@@ -43,10 +43,9 @@ atlas_add_component( FastTRT_Digitization
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier EventInfo xAODEventInfo GaudiKernel TRT_ConditionsServicesLib InDetPrepRawData InDetSimEvent HitManagement TrkParameters TrkTruthData TrkToolInterfaces GeoPrimitives GeneratorObjects InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetSimData TrkDetElementBase EventContainers)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps AthenaKernel PileUpToolsLib StoreGateLib SGtests Identifier EventInfo xAODEventInfo GaudiKernel TRT_ConditionsServicesLib InDetPrepRawData InDetSimEvent HitManagement TrkParameters TrkTruthData TrkToolInterfaces GeoPrimitives GeneratorObjects InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetSimData TrkDetElementBase EventContainers TRT_DriftFunctionToolLib )
# Install files from the package:
-atlas_install_headers( FastTRT_Digitization )
atlas_install_python_modules( python/*.py )
atlas_install_joboptions( share/*.py )
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/ITRTFastDigitizationTool.h b/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/ITRTFastDigitizationTool.h
deleted file mode 100644
index a2328a91ad15f991f5b49f1cc8e4e6564ad27909..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/ITRTFastDigitizationTool.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRT_DIGITIZATION_ITRTFASTDIGITIZATIONTOOL_H
-#define TRT_DIGITIZATION_ITRTFASTDIGITIZATIONTOOL_H
-
-#include "GaudiKernel/IAlgTool.h"
-#include "GaudiKernel/StatusCode.h"
-#include "GaudiKernel/EventContext.h"
-
-static const InterfaceID IID_ITRTFastDigitizationTool ("ITRTFastDigitizationTool",1,0);
-
-class ITRTFastDigitizationTool : virtual public IAlgTool
-{
-
- public:
-
- static const InterfaceID& interfaceID();
-
- ///alternative interface which uses the PileUpMergeSvc to obtain all
- ///the required SubEvents.
- virtual StatusCode processAllSubEvents(const EventContext& ctx) = 0;
-
-};
-
-inline const InterfaceID& ITRTFastDigitizationTool::interfaceID()
-{
- return IID_ITRTFastDigitizationTool;
-}
-
-#endif // ITRTFASTDIGITIZATIONTOOL_H
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitization.h b/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitization.h
index 63167130f7462d86152644c1d7da01bbfbd293f6..8bc30e0994c06dd2715be08c227210e26f22e8d3 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitization.h
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitization.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef FASTTRT_DIGITIZATION_TRTFASTDIGITIZATION_H
@@ -8,7 +8,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "AthenaBaseComps/AthAlgorithm.h"
-class ITRTFastDigitizationTool;
+class IPileUpTool;
/** Top algorithm class for TRT digitization */
class TRTFastDigitization : public AthAlgorithm {
@@ -19,12 +19,11 @@ class TRTFastDigitization : public AthAlgorithm {
TRTFastDigitization(const std::string &name,ISvcLocator *pSvcLocator);
/** Basic algorithm methods */
- virtual StatusCode initialize();
- virtual StatusCode execute();
- virtual StatusCode finalize();
+ virtual StatusCode initialize() override final;
+ virtual StatusCode execute() override final;
private:
- ToolHandle<ITRTFastDigitizationTool> m_digTool;
+ ToolHandle<IPileUpTool> m_digTool{this, "DigitizationTool", "TRTFastDigitizationTool", "AthAlgTool which performs the TRT digitization"};
};
#endif // FASTTRT_DIGITIZATION_TRTFASTDIGITIZATION_H
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitizationTool.h b/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitizationTool.h
index 4aa3e2e89b5c1ad3775804f39ad12db178ea6402..969295376011e2cea912cd6c6054b0ca46bcf858 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitizationTool.h
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/FastTRT_Digitization/TRTFastDigitizationTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef FASTTRT_DIGITIZATION_FASTTRT_DIGITIZATIONTOOL_H
@@ -12,7 +12,6 @@
#include "EventInfo/PileUpEventInfo.h"
#include "PileUpTools/PileUpToolBase.h"
-#include "FastTRT_Digitization/ITRTFastDigitizationTool.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
@@ -60,7 +59,7 @@ class StoreGateSvc;
class ITRT_DriftFunctionTool;
-class TRTFastDigitizationTool : public PileUpToolBase, virtual public ITRTFastDigitizationTool {
+class TRTFastDigitizationTool : public PileUpToolBase {
public:
TRTFastDigitizationTool( const std::string &type, const std::string &name, const IInterface *parent );
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitization.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitization.cxx
index a5660d3a66397d6e83e8d8fb6da3e702bf7dd980..9bfac9ce784d6efd1b92f8040bb16e9e02e79f38 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitization.cxx
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitization.cxx
@@ -1,18 +1,16 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "FastTRT_Digitization/TRTFastDigitization.h"
-#include "FastTRT_Digitization/ITRTFastDigitizationTool.h"
+#include "PileUpTools/IPileUpTool.h"
//----------------------------------------------------------------------
// Constructor with parameters:
//----------------------------------------------------------------------
TRTFastDigitization::TRTFastDigitization(const std::string &name, ISvcLocator *pSvcLocator) :
- AthAlgorithm(name, pSvcLocator),
- m_digTool("TRTFastDigitizationTool", this )
+ AthAlgorithm(name, pSvcLocator)
{
- declareProperty("DigitizationTool", m_digTool, "AthAlgTool which performs the TRT digitization");
}
//----------------------------------------------------------------------
@@ -20,10 +18,8 @@ TRTFastDigitization::TRTFastDigitization(const std::string &name, ISvcLocator *p
//----------------------------------------------------------------------
StatusCode TRTFastDigitization::initialize() {
// intitialize store gate active store
- if (m_digTool.retrieve().isFailure()) {
- ATH_MSG_FATAL ( "Could not retrieve TRT Digitization Tool!" );
- return StatusCode::FAILURE;
- }
+ ATH_CHECK (m_digTool.retrieve());
+
ATH_MSG_DEBUG ( "Retrieved TRT Digitization Tool." );
return StatusCode::SUCCESS;
@@ -37,20 +33,9 @@ StatusCode TRTFastDigitization::execute() {
ATH_MSG_VERBOSE ( "execute()" );
- StatusCode sc = m_digTool->processAllSubEvents(Gaudi::Hive::currentContext());
+ ATH_CHECK (m_digTool->processAllSubEvents(Gaudi::Hive::currentContext()));
ATH_MSG_DEBUG ( "m_digTool->processAllSubEvents()" );
-
- return sc;
-}
-
-//----------------------------------------------------------------------//
-// Finalize method: //
-//----------------------------------------------------------------------//
-StatusCode TRTFastDigitization::finalize() {
-
- ATH_MSG_VERBOSE ( "finalize()" );
-
return StatusCode::SUCCESS;
}
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx
index 6592963af482cc71c64f3967f14bfc511c5bdf19..fc367b698b431706a2c456b0f3c06a3c17efd08c 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/TRTFastDigitizationTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -82,7 +82,6 @@ TRTFastDigitizationTool::TRTFastDigitizationTool( const std::string &type,
m_trtHighProbabilityBoostBkg(1.),
m_trtHighProbabilityBoostEle(1.)
{
- declareInterface< ITRTFastDigitizationTool >( this );
declareProperty( "TRT_DriftFunctionTool", m_trtDriftFunctionTool );
declareProperty( "TRT_ElectronPidTool", m_trtElectronPidTool );
declareProperty( "TRT_StrawStatusSummaryTool", m_trtStrawStatusSummaryTool );
diff --git a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
index e3702b7c1e3eb573c2384f8430918b0e43b6eeb7..52b4d2e530f08e0b27839aa6fd6c23a634bb8c5f 100644
--- a/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
+++ b/InnerDetector/InDetDigitization/FastTRT_Digitization/src/components/TRTDigitization_entries.cxx
@@ -1,6 +1,5 @@
#include "../../FastTRT_Digitization/TRTFastDigitization.h"
#include "../../FastTRT_Digitization/TRTFastDigitizationTool.h"
-#include "../../FastTRT_Digitization/ITRTFastDigitizationTool.h"
DECLARE_COMPONENT( TRTFastDigitization )
diff --git a/InnerDetector/InDetEventCnv/InDetEventCnvTools/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventCnvTools/CMakeLists.txt
index 0815e99976b47a378e9759033dfd5a7300e878e9..f7874a30f6c4d1f7769ef7e6eb827dc79ba0d79d 100644
--- a/InnerDetector/InDetEventCnv/InDetEventCnvTools/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventCnvTools/CMakeLists.txt
@@ -25,7 +25,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( InDetEventCnvTools
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps AtlasDetDescr IdDictDetDescr Identifier GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack TrkPrepRawData TrkRIO_OnTrack )
+ LINK_LIBRARIES AthenaBaseComps AtlasDetDescr IdDictDetDescr Identifier GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry InDetPrepRawData InDetRIO_OnTrack TrkPrepRawData TrkRIO_OnTrack TrkEventCnvToolsLib )
# Install files from the package:
atlas_install_headers( InDetEventCnvTools )
diff --git a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
index fc0ecb7ee87812be31a132c6c2ae76767e0a57e9..ea949226b0b0d2c028aefc0f0dc4f02b1fbe807a 100644
--- a/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD/CMakeLists.txt
@@ -41,7 +41,7 @@ atlas_add_component( InDetPrepRawDataToxAOD
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel AthenaBaseComps StoreGateLib SGtests Identifier InDetByteStreamErrors PixelConditionsData xAODTracking TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry TRT_ReadoutGeometry InDetRawData InDetSimData InDetPrepRawData InDetSimEvent TrkSurfaces TrkTruthData )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib GaudiKernel AthenaBaseComps StoreGateLib SGtests Identifier InDetByteStreamErrors PixelConditionsData xAODTracking TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry PixelReadoutGeometry TRT_ReadoutGeometry InDetRawData InDetSimData InDetPrepRawData InDetSimEvent TrkSurfaces TrkTruthData TRT_DriftFunctionToolLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx
index 9f7643ca2b45e4bc90e18c46c0fb25950be34f26..c27779a91dac0da71ba38d5c9ff3dc9de99a4a5a 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx
@@ -15,7 +15,7 @@ using OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment;
PixelRawDataProvider::PixelRawDataProvider(const std::string& name,
ISvcLocator* pSvcLocator) :
- AthAlgorithm(name, pSvcLocator) {
+ AthReentrantAlgorithm(name, pSvcLocator) {
declareProperty("RDOCacheKey", m_rdoCacheKey);
declareProperty("BSErrorsCacheKey", m_bsErrorsCacheKey);
}
@@ -69,7 +69,7 @@ StatusCode PixelRawDataProvider::initialize() {
typedef EventContainers::IdentifiableContTemp<InDetRawDataCollection<PixelRDORawData>> DummyPixelRDO;
-StatusCode PixelRawDataProvider::execute() {
+StatusCode PixelRawDataProvider::execute(const EventContext& ctx) const {
#ifdef PIXEL_DEBUG
ATH_MSG_DEBUG("Create Pixel RDO Container");
@@ -80,10 +80,10 @@ StatusCode PixelRawDataProvider::execute() {
// write into StoreGate
- SG::WriteHandle<PixelRDO_Container> rdoContainer(m_rdoContainerKey);
+ SG::WriteHandle<PixelRDO_Container> rdoContainer(m_rdoContainerKey, ctx);
if( m_rdoCacheKey.empty() ) rdoContainer = std::make_unique<PixelRDO_Container>(m_pixel_id->wafer_hash_max());
else{
- SG::UpdateHandle<PixelRDO_Cache> updateh(m_rdoCacheKey);
+ SG::UpdateHandle<PixelRDO_Cache> updateh(m_rdoCacheKey, ctx);
if( ! updateh.isValid() ) {
ATH_MSG_FATAL("Failure to retrieve cache " << m_rdoCacheKey.key());
return StatusCode::FAILURE;
@@ -101,11 +101,11 @@ StatusCode PixelRawDataProvider::execute() {
if (!m_roiSeeded) {
ATH_MSG_DEBUG("No RoI seed, fetching all ROBs");
- listOfRobs = SG::ReadCondHandle<PixelCablingCondData>(m_condCablingKey)->get_allRobs(); // need ROB id (not ROD)
+ listOfRobs = SG::ReadCondHandle<PixelCablingCondData>(m_condCablingKey, ctx)->get_allRobs(); // need ROB id (not ROD)
}
else {//Enter RoI-seeded mode
ATH_MSG_DEBUG("RoI seed, fetching regions infromation");
- SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection(m_roiCollectionKey);
+ SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection(m_roiCollectionKey, ctx);
ATH_CHECK(roiCollection.isValid());
TrigRoiDescriptorCollection::const_iterator roi = roiCollection->begin();
@@ -137,7 +137,7 @@ StatusCode PixelRawDataProvider::execute() {
std::unique_ptr<IDCInDetBSErrContainer> decodingErrors;
if ( not m_bsErrorsCacheKey.empty() ) {
- SG::UpdateHandle<IDCInDetBSErrContainer_Cache> bsErrorsCacheHandle( m_bsErrorsCacheKey );
+ SG::UpdateHandle<IDCInDetBSErrContainer_Cache> bsErrorsCacheHandle( m_bsErrorsCacheKey, ctx);
decodingErrors = std::make_unique<IDCInDetBSErrContainer>( bsErrorsCacheHandle.ptr() );
} else {
decodingErrors = std::make_unique<IDCInDetBSErrContainer>( m_pixel_id->wafer_hash_max(), std::numeric_limits<int>::min() );
@@ -152,7 +152,7 @@ StatusCode PixelRawDataProvider::execute() {
if(tempcont) ATH_CHECK(tempcont->MergeToRealContainer(rdoContainer.ptr()));
- SG::WriteHandle<IDCInDetBSErrContainer> bsErrorsHandle(m_bsErrorsKey);
+ SG::WriteHandle<IDCInDetBSErrContainer> bsErrorsHandle(m_bsErrorsKey, ctx);
ATH_CHECK( bsErrorsHandle.record( std::move( decodingErrors ) ) );
#ifdef PIXEL_DEBUG
diff --git a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
index 53cc29f06c6a862a4f2182d61f191b875cc938e4..888a96778f02652497832757efcdb87e3de22c48 100644
--- a/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
+++ b/InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.h
@@ -10,7 +10,7 @@
#define PIXELRAWDATABYTESTREAMCNV_PIXELRAWDATAPROVIDER_H
// Base class
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
#include "StoreGate/ReadHandleKey.h"
@@ -29,7 +29,7 @@
// Forward declarations
class PixelID;
-class PixelRawDataProvider : public AthAlgorithm {
+class PixelRawDataProvider : public AthReentrantAlgorithm {
public:
@@ -39,7 +39,7 @@ class PixelRawDataProvider : public AthAlgorithm {
//! Initialize
StatusCode initialize() override;
//! Execute
- StatusCode execute() override;
+ StatusCode execute(const EventContext& ctx) const override;
//! Don't need to override Finalize
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
index bf15e3950caa070d36e92f92e64af0c9976abddd..640bc6d9f8e140f9f0f3a6bda91db0df866381c4 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
@@ -14,7 +14,7 @@
#include "Identifier/IdentifierHash.h"
#include <algorithm>
-#include <deque>
+#include <array>
#include <utility>
union RawWord {
@@ -46,7 +46,7 @@ StatusCode SCT_RodDecoder::initialize()
ATH_CHECK(m_configTool.retrieve());
- // See if strip numbers go from 0 to 767 or vice versa for all the wafers.
+ // See if strip numbers go from 0 to N_STRIPS_PER_SIDE-1(=767) or vice versa for all the wafers.
// swapPhiReadoutDirection will not change during a run.
// Since this is access to SiDetectorElement during initialization,
// condition object of SiDetectorElementCollection is not accessible.
@@ -162,7 +162,6 @@ StatusCode SCT_RodDecoder::finalize()
ATH_MSG_INFO("Number of SCT RDOs created-> " << m_nRDOs);
if (m_numMissingLinkHeader > 0) ATH_MSG_WARNING("SCT Missing Link Headers found " << m_numMissingLinkHeader);
- if (m_numUnknownOfflineID > 0) ATH_MSG_WARNING("SCT unknown onlineIDs found " << m_numUnknownOfflineID);
ATH_CHECK(AlgTool::finalize());
ATH_MSG_DEBUG("SCT_RodDecoder::finalize()");
@@ -182,13 +181,13 @@ class SCT_RodDecoderErrorsHelper {
public:
SCT_RodDecoderErrorsHelper( IDCInDetBSErrContainer& idcContainer )
: m_errorsIDC{ idcContainer } {}
- ~SCT_RodDecoderErrorsHelper() {
+ ~SCT_RodDecoderErrorsHelper() {
for ( auto [id, err]: m_accumulatedErrors ) {
m_errorsIDC.setOrDrop( id, err );
}
}
- void add( const IdentifierHash id, SCT_ByteStreamErrors::ErrorType etype) {
- SCT_ByteStreamErrors::addError( m_accumulatedErrors[id], etype);
+ void add(const IdentifierHash id, SCT_ByteStreamErrors::ErrorType etype) {
+ SCT_ByteStreamErrors::addError(m_accumulatedErrors[id], etype);
}
private:
@@ -207,11 +206,11 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
const uint32_t robID{robFrag.rod_source_id()};
// Determine whether this data was generated using the ROD simulator
const uint32_t rodDataType{robFrag.rod_detev_type()};
- const bool rodSimulatedData{static_cast<bool>((rodDataType >> 20) & 1)};
+ const bool rodSimulatedData{static_cast<bool>((rodDataType >> 20) & 0x1)};
if (rodSimulatedData) ATH_CHECK(addRODError(robID, SCT_ByteStreamErrors::RODSimulatedData, errs));
// Look for the bit that denotes "Super-condensed" mode
- const bool superCondensedMode{static_cast<bool>((rodDataType >> 21) & 1)};
+ const bool superCondensedMode{static_cast<bool>((rodDataType >> 21) & 0x1)};
bool condensedMode{true};
@@ -221,27 +220,28 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
int chip{0};
int side{0};
int nStripsInWord{0};
- int linkNumber{0};
- uint32_t onlineID{0};
+ int linkNumber{0}; // Determined from header and may be changed for links using Rx redundancy
+ uint32_t onlineID{0}; // Determined from header and may be changed for links using Rx redundancy
+ IdentifierHash currentLinkIDHash; // Determined from header and changed for links using Rx redundancy
int timeBin{0};
int groupSize{0};
- bool saved[768*2]{false};
- int abcError{0};
- int wordCount{-1};
+ std::array<bool, N_STRIPS_PER_SIDE*N_SIDES> saved;
+ saved.fill(false);
RawWord robData;
robData.word32=0;
- int n;
int errors{0}; // Encodes the errors on the header (bit 4: error in condensed mode 1st hit, bit 5: error in condensed mode 2nd hit)
// These are for the trigger
CacheHelper cache;
cache.vecHash = vecHash;
- IdentifierHash currentLinkIDHash;
-
std::vector<int> errorHit;
+ // For MissingLinkHeaderError
+ bool foundMissingLinkHeaderError{false};
+ std::unordered_set<IdentifierHash> foundHashes;
+
StatusCode sc{StatusCode::SUCCESS, true};
// Look at ROB status word
@@ -290,8 +290,8 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
sc=StatusCode::RECOVERABLE;
}
// Look at bits 20-23 for DCS HV
- // const int hvBits{static_cast<int>((statusWord >> 20) & 0xf)};
- // const bool hvOn{hvBits==0xf};
+ // const int hvBits{static_cast<int>((statusWord >> 20) & 0xF)};
+ // const bool hvOn{hvBits==0xF};
}
}
@@ -301,21 +301,111 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
OFFLINE_FRAGMENTS_NAMESPACE::PointerType vecROBData;
const unsigned long int vecROBDataSize{robFrag.rod_ndata()};
robFrag.rod_data(vecROBData);
-
+
+ // Loop over header, hit element, flagged ABCD error, raw data, trailer words
for (unsigned long int i{0}; i<vecROBDataSize; i++) {
- wordCount++;
robData.word32 = vecROBData[i];
// The data is 16-bits wide packed to a 32-bit word (rob_it1). So we unpack it here.
uint16_t data16[2];
data16[1] = robData.word16[0];
data16[0] = robData.word16[1];
- for (n=0; n<2; n++) {
+ for (int n{0}; n<2; n++) {
+ // Header
+ if (((data16[n]>>13)&0x7) == 0x1) {
+ foundHeader=true;
+ m_headNumber++;
+
+ // Create the last RDO of the previous link if any
+ if (saved[side*N_STRIPS_PER_SIDE+strip]==false and oldStrip>=0) {
+ const int rdoMade{makeRDO(strip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
+ if (rdoMade == -1) {
+ sc=StatusCode::RECOVERABLE;
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
+ }
+ else {
+ saved[side*N_STRIPS_PER_SIDE+strip] = rdoMade;
+ }
+ }
+
+ // Everything is set to default for a new hunt of RDO
+ strip =0;
+ oldStrip = -1;
+ oldSide = -1;
+ groupSize = 0;
+ errors = 0;
+ saved.fill(false);
+ errorHit.clear();
+
+ // Link Number (or stream) in the ROD fragment
+ const int rodlinkNumber{static_cast<int>(data16[n] & 0x7F)};
+
+ // This is the real calculation for the offline
+ linkNumber = (((rodlinkNumber >>4)&0x7)*12+(rodlinkNumber &0xF));
+ onlineID = ((robID & 0xFFFFFF) | (linkNumber << 24));
+ if ((onlineID ==0) or (linkNumber > 95)) {
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
+ sc=StatusCode::RECOVERABLE;
+ ATH_MSG_DEBUG("Header: xxx Link number out of range (skipping following data)"
+ << std::dec << linkNumber);
+ break;
+ }
+ else {
+ currentLinkIDHash = m_cabling->getHashFromOnlineId(onlineID);
+ foundHashes.insert(currentLinkIDHash);
+ }
+ // Look for masked off links - bit 7
+ if ((data16[n] >> 7) & 0x1) {
+ ATH_MSG_DEBUG("Masked link " << onlineID << " " << currentLinkIDHash);
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::MaskedLink, errs));
+ sc=StatusCode::RECOVERABLE;
+ }
+ if (data16[n]&0x800) {
+ ATH_MSG_DEBUG(" Header: xxx TimeOut Error " << currentLinkIDHash);
+ m_headErrorTimeout++;
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::TimeOutError, errs));
+ sc=StatusCode::RECOVERABLE;
+ }
+
+ if (data16[n]&0x1000) {
+ ATH_MSG_DEBUG(" Header: xxx Preamble Error " << currentLinkIDHash);
+ m_headErrorPreamble++;
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::PreambleError, errs));
+ sc=StatusCode::RECOVERABLE;
+ }
+
+ if (data16[n]&0x400) {
+ ATH_MSG_DEBUG(" Header: xxx LVL1 ID Error " << currentLinkIDHash);
+ m_headErrorLvl1ID++;
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::LVL1IDError, errs));
+ sc=StatusCode::RECOVERABLE;
+ }
+
+ if (data16[n]&0x200) {
+ ATH_MSG_DEBUG(" Header: xxx BCID Error " << currentLinkIDHash);
+ m_headErrorBCID++;
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::BCIDError, errs));
+ sc=StatusCode::RECOVERABLE;
+ }
+
+ if ((data16[n]&0xF) > 11) {
+ ATH_MSG_DEBUG(" Header: xxx Error in formatter " << currentLinkIDHash);
+ m_headErrorFormatter++;
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::FormatterError, errs));
+ sc=StatusCode::RECOVERABLE;
+ }
+
+ condensedMode = static_cast<bool>(data16[n]&0x100);
+
+ continue;
+
+ } // End header
+
// Hit element
- if (data16[n]&0x8000) {
+ else if (data16[n]&0x8000) {
if (not foundHeader) {
ATH_MSG_INFO(" Missing link header in ROD " << std::hex << robID << std::dec);
- ATH_CHECK(addRODError(robID, SCT_ByteStreamErrors::MissingLinkHeaderError, errs));
+ foundMissingLinkHeaderError = true;
m_numMissingLinkHeader++;
sc = StatusCode::RECOVERABLE;
continue;
@@ -324,61 +414,68 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
m_nHits++;
if (superCondensedMode) {
// Super-condensed mode:
- // Chip info: 4 bits data16[n]>>11)0xF
+ // Chip info: 4 bits data16[n]>>11)&0xF
// Chip number == (data16[n]>>11)&0x7
// Chip side == (data16[n]>>14)&0x1
- // For example if data16[n]>>11)0xF = 0101 => chip5 or chip5 on side0, data16[n]>>11)0xF = 1101 => chip13 or chip5 on side1
+ // For example if (data16[n]>>11)&0xF = 0101 => chip 5 or chip5 on side0, (data16[n]>>11)&0xF = 1101 => chip13 or chip5 on side1
chip = ((data16[n]>>11)&0x7);
side = ((data16[n]>>14)&0x1);
- strip = chip*128 + ((data16[n]>>4)&0x7F);
+ strip = chip*N_STRIPS_PER_CHIP + ((data16[n]>>4)&0x7F);
timeBin = 0x2; // Assuming timeBin is 010 in super-condensed mode
- nStripsInWord = (data16[n]&0xf)+1;
- if (chip>5) {
- ATH_MSG_DEBUG(" Hit super-condensed : xxx Chip number = " << chip << " > 5 " << " for hit "
+ nStripsInWord = (data16[n]&0xF)+1;
+ if (chip>=N_CHIPS_PER_SIDE) {
+ ATH_MSG_DEBUG(" Hit super-condensed : xxx Chip number = " << chip << " >= "<< N_CHIPS_PER_SIDE << " for hit "
<< std::hex << data16[n]);
m_chipNumberError++;
- ATH_CHECK( addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs) );
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
sc=StatusCode::RECOVERABLE;
continue;
}
// Search for redundancy only for the master chip
+ bool secondSide{false};
if ((side==1) and ((linkNumber%2)==0)) {
if (((strip!=oldStrip) or (side!=oldSide)) and (groupSize>0)) {
// If it is a new cluster, make RDO with the previous cluster
- const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[oldSide*768+oldStrip] = rdoMade;
+ saved[oldSide*N_STRIPS_PER_SIDE+oldStrip] = rdoMade;
}
oldStrip = strip;
oldSide = side;
groupSize = 0;
}
linkNumber++;
+ secondSide = true;
}
- if ((side==0) and ((linkNumber%2)!=0)) {
+ else if ((side==0) and ((linkNumber%2)!=0)) {
if (((strip!=oldStrip) or (side!=oldSide)) and (groupSize>0)) {
// If it is a new cluster, make RDO with the previous cluster
- const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[oldSide*768+oldStrip] = rdoMade;
+ saved[oldSide*N_STRIPS_PER_SIDE+oldStrip] = rdoMade;
}
oldStrip = strip;
oldSide = side;
groupSize = 0;
}
linkNumber--;
+ secondSide = true;
}
- onlineID = ((robID & 0xFFFFFF)|(linkNumber << 24));
-
+ if (secondSide) {
+ onlineID = ((robID & 0xFFFFFF) | (linkNumber << 24));
+ currentLinkIDHash = m_cabling->getHashFromOnlineId(onlineID);
+ foundHashes.insert(currentLinkIDHash);
+ }
+
if (groupSize == 0) {
oldStrip = strip; // If it's the first super-condensed word
oldSide = side;
@@ -386,13 +483,13 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
if ((strip!=oldStrip) or (side!=oldSide)) {
// If it is a new cluster, make RDO with the previous cluster
- const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[oldSide*768+oldStrip] = rdoMade;
+ saved[oldSide*N_STRIPS_PER_SIDE+oldStrip] = rdoMade;
}
oldStrip = strip;
oldSide = side;
@@ -403,16 +500,16 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
}
else if (condensedMode) {
// Super-condensed mode:
- // Chip info: 4 bits data16[n]>>11)0xF
+ // Chip info: 4 bits data16[n]>>11)&0xF
// Chip number == (data16[n]>>11)&0x7
// Chip side == (data16[n]>>14)&0x1
- // For example if data16[n]>>11)0xF = 0101 => chip5 or chip5 on side0, data16[n]>>11)0xF = 1101 => chip13 or chip5 on side1
+ // For example if (data16[n]>>11)&0xF = 0101 => chip5 or chip5 on side0, (data16[n]>>11)&0xF = 1101 => chip13 or chip5 on side1
chip = ((data16[n]>>11)&0x7);
side = ((data16[n]>>14)&0x1);
- strip = chip*128 + ((data16[n]>>4)&0x7F);
+ strip = chip*N_STRIPS_PER_CHIP + ((data16[n]>>4)&0x7F);
timeBin = 0x2; // Assuming timeBin is 010 in condensed mode
- if (chip>5) {
- ATH_MSG_DEBUG(" Hit condensed : xxx Chip number = " << chip << " > 5 " << " for hit "
+ if (chip>=N_CHIPS_PER_SIDE) {
+ ATH_MSG_DEBUG(" Hit condensed : xxx Chip number = " << chip << " >= " << N_CHIPS_PER_SIDE << " for hit "
<< std::hex << data16[n]);
m_chipNumberError++;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
@@ -421,56 +518,65 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
}
// Search for redundancy only for the master chip
+ bool secondSide{false};
if ((side==1) and ((linkNumber%2)==0)) {
if (((strip!=oldStrip) or (side!=oldSide)) and (groupSize>0)) {
// If it is a new cluster, make RDO with the previous cluster
- const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[oldSide*768+oldStrip] = rdoMade;
+ saved[oldSide*N_STRIPS_PER_SIDE+oldStrip] = rdoMade;
}
oldStrip = strip;
oldSide = side;
groupSize = 0;
}
linkNumber++;
+ secondSide = true;
}
- if ((side==0) and ((linkNumber%2)!=0)) {
+ else if ((side==0) and ((linkNumber%2)!=0)) {
if (((strip!=oldStrip) or (side!=oldSide)) and (groupSize>0)) {
// If it is a new cluster, make RDO with the previous cluster
- const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[oldSide*768+oldStrip] = rdoMade;
+ saved[oldSide*N_STRIPS_PER_SIDE+oldStrip] = rdoMade;
}
oldStrip = strip;
oldSide = side;
groupSize = 0;
}
linkNumber--;
+ secondSide = true;
}
- onlineID = ((robID & 0xFFFFFF)|(linkNumber << 24));
+ if (secondSide) {
+ onlineID = ((robID & 0xFFFFFF) | (linkNumber << 24));
+ currentLinkIDHash = m_cabling->getHashFromOnlineId(onlineID);
+ foundHashes.insert(currentLinkIDHash);
+ }
+
if (groupSize == 0) {
oldStrip = strip; // If it's the first condensed word
oldSide = side;
}
+
if (not (data16[n]&0x1)) { // 1-hit
m_singleCondHitNumber++;
if ((strip!=oldStrip) or (side!=oldSide)) {
// If it is a new cluster, make RDO with the previous cluster
- const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[oldSide*768+oldStrip] = rdoMade;
+ saved[oldSide*N_STRIPS_PER_SIDE+oldStrip] = rdoMade;
}
oldStrip = strip;
oldSide = side;
@@ -487,7 +593,7 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
groupSize = (groupSize>=2 ? groupSize : 1);
}
else { // 2-hits
- if (strip > 767) {
+ if (strip >= N_STRIPS_PER_SIDE) {
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
sc=StatusCode::RECOVERABLE;
@@ -498,13 +604,13 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
m_pairedCondHitNumber++;
if ((strip!=oldStrip) or (side!=oldSide)) {
// If it is a new cluster, make RDO with the previous cluster
- const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade{makeRDO(oldStrip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[oldSide*768+oldStrip] = rdoMade;
+ saved[oldSide*N_STRIPS_PER_SIDE+oldStrip] = rdoMade;
}
oldStrip = strip;
oldSide = side;
@@ -529,55 +635,61 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
}
else {
// Expanded mode:
- // Chip info from the first word of expanded cluster : 4 bits data16[n]>>11)0xF
+ // Chip info from the first word of expanded cluster : 4 bits (data16[n]>>11)&0xF
// Chip number == (data16[n]>>11)&0x7
// Chip side == (data16[n]>>14)&0x1
- // For example if data16[n]>>11)0xF = 0101 => chip5 or chip5 on side0, data16[n]>>11)0xF = 1101 => chip13 or chip5 on side1
+ // For example if (data16[n]>>11)&0xF = 0101 => chip5 or chip5 on side0, (data16[n]>>11)&0xF = 1101 => chip13 or chip5 on side1
if (not (data16[n]&0x8)) { // 1st hit cluster expanded
m_firstExpHitNumber++;
chip = ((data16[n]>>11)&0x7);
side = ((data16[n]>>14)&0x1);
- strip = chip*128 + ((data16[n]>>4)&0x7F);
+ strip = chip*N_STRIPS_PER_CHIP + ((data16[n]>>4)&0x7F);
timeBin = data16[n]&0x7; // Real way for obtaining timeBin info
- if (chip>5) {
- ATH_MSG_DEBUG("Expanded hit: First hit xxx ERROR chip Nb = " << chip << " > 5");
+ if (chip>=N_CHIPS_PER_SIDE) {
+ ATH_MSG_DEBUG("Expanded hit: First hit xxx ERROR chip Nb = " << chip << " >= " << N_CHIPS_PER_SIDE);
m_chipNumberError++;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
continue;
}
-
// Search for redundancy only for the master chip
+ bool secondSide{false};
if ((side==1) and ((linkNumber%2)==0)) {
linkNumber++;
+ secondSide = true;
}
- if ((side==0) and ((linkNumber%2)!=0)) {
+ else if ((side==0) and ((linkNumber%2)!=0)) {
linkNumber--;
+ secondSide = true;
}
- onlineID = ((robID & 0xFFFFFF) | (linkNumber << 24));
- groupSize = 1;
- const int rdoMade{makeRDO(strip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ if (secondSide) {
+ onlineID = ((robID & 0xFFFFFF) | (linkNumber << 24));
+ currentLinkIDHash = m_cabling->getHashFromOnlineId(onlineID);
+ foundHashes.insert(currentLinkIDHash);
+ }
+ groupSize = 1;
+ const int rdoMade{makeRDO(strip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[side*768+strip] = rdoMade;
+ saved[side*N_STRIPS_PER_SIDE+strip] = rdoMade;
}
groupSize = 0;
}
else { // Next hits cluster expanded
if (data16[n]&0x80) { // Paired hits
- if (strip > 767) {
+ if (strip >= N_STRIPS_PER_SIDE) {
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
sc=StatusCode::RECOVERABLE;
ATH_MSG_DEBUG("Expanded mode - strip number out of range");
continue;
}
m_evenExpHitNumber++;
- if (chip>5) {
- ATH_MSG_DEBUG("Expanded Hit: paired hits xxx ERROR chip Nb = " << chip << " > 5");
+ if (chip>=N_CHIPS_PER_SIDE) {
+ ATH_MSG_DEBUG("Expanded Hit: paired hits xxx ERROR chip Nb = " << chip << " >= " << N_CHIPS_PER_SIDE);
m_chipNumberError++;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
continue;
@@ -586,31 +698,31 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
strip++;
timeBin = data16[n]&0x7;
groupSize = 1;
- const int rdoMade1{makeRDO(strip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade1{makeRDO(strip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade1 == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[side*768+strip] = rdoMade1;
+ saved[side*N_STRIPS_PER_SIDE+strip] = rdoMade1;
}
// Second hit from the pair
strip++;
timeBin = ((data16[n] >> 4) & 0x7);
- const int rdoMade2{makeRDO(strip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade2{makeRDO(strip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade2 == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[side*768+strip] = rdoMade2;
+ saved[side*N_STRIPS_PER_SIDE+strip] = rdoMade2;
}
groupSize = 0;
}
else { // Last hit of the cluster
m_lastExpHitNumber++;
- if (chip>5) {
- ATH_MSG_DEBUG("Expanded Hit: last hit xxx ERROR chip Nb = " << chip << " > 5");
+ if (chip>=N_CHIPS_PER_SIDE) {
+ ATH_MSG_DEBUG("Expanded Hit: last hit xxx ERROR chip Nb = " << chip << " >= " << N_CHIPS_PER_SIDE);
m_chipNumberError++;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
continue;
@@ -618,13 +730,13 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
strip++;
timeBin = (data16[n]&0x7);
groupSize = 1;
- const int rdoMade{makeRDO(strip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ const int rdoMade{makeRDO(strip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[side*768+strip] = rdoMade;
+ saved[side*N_STRIPS_PER_SIDE+strip] = rdoMade;
}
groupSize = 0;
}
@@ -632,95 +744,85 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
} // End expanded mode
} // End of hit element
-
- // Header
- else if (((data16[n]>>13)&0x7) == 0x1) {
- foundHeader=true;
-
- m_headNumber++;
- if (saved[side*768+strip]==false and oldStrip>=0) {
- const int rdoMade{makeRDO(strip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
- if (rdoMade == -1) {
- sc=StatusCode::RECOVERABLE;
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
- }
- else {
- saved[side*768+strip] = rdoMade;
- }
- }
-
- // Everything is set to default for a new hunt of RDO
- strip =0;
- oldStrip = -1;
- oldSide = -1;
- groupSize = 0;
- errors = 0;
- memset(saved,0,768*2);
- errorHit.clear();
+ // FlaggedABCD error
+ else if (((data16[n]>>13)&0x7) == 0x0) {
+ // 000xxxxxxFFFFEEE
+ // 000: FlaggedABCD error: xxxxxxx not used, FFFF: chip, EEE: error code
- // Link Number (or stream) in the ROD fragment
- const int rodlinkNumber{static_cast<int>(data16[n] & 0x7F)};
+ if (not foundHeader) {
+ ATH_MSG_INFO(" Missing link header in ROD " << std::hex << robID << std::dec);
+ foundMissingLinkHeaderError = true;
+ m_numMissingLinkHeader++;
+ sc = StatusCode::RECOVERABLE;
+ continue;
+ }
- // This is the real calculation for the offline
- linkNumber = (((rodlinkNumber >>4)&0x7)*12+(rodlinkNumber &0xF));
- onlineID = ((robID & 0xFFFFFF)|(linkNumber << 24));
- if ((onlineID ==0) or (linkNumber > 95)) {
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
- sc=StatusCode::RECOVERABLE;
- ATH_MSG_DEBUG("Header: xxx Link number out of range (skipping following data)"
- << std::dec << linkNumber);
- break;
+ chip = ((data16[n]>>3)&0xF);
+ int abcError{data16[n]&0x7};
+ ATH_MSG_DEBUG(" xxx Flagged ABCD ERROR in chip " << chip
+ << " Error code abcError " << abcError << " Link Number (or Stream) "<<linkNumber);
+ m_flagErrorBit++;
+ // Error code of ABCD error should be 1, 2, 4 or 7.
+ if (abcError!=0x1 and abcError!=0x2 and abcError!=0x4 and abcError!=0x7) {
+ ATH_MSG_DEBUG("ABCD error has an invalid error code " << abcError
+ << " the 16-bit word is 0x" << std::hex << data16[n] << std::dec
+ << " for hash " << currentLinkIDHash);
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Invalid, errs));
}
else {
- currentLinkIDHash = m_cabling->getHashFromOnlineId(onlineID);
- }
- // Look for masked off links - bit 7
- if (data16[n] >> 7 & 0x1) {
- ATH_MSG_DEBUG("Masked link " << onlineID << " " << currentLinkIDHash);
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::MaskedLink, errs));
- sc=StatusCode::RECOVERABLE;
- }
- if (data16[n]&0x800) {
- ATH_MSG_DEBUG(" Header: xxx TimeOut Error " << currentLinkIDHash);
- m_headErrorTimeout++;
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::TimeOutError, errs));
- sc=StatusCode::RECOVERABLE;
- }
-
- if (data16[n]&0x1000) {
- ATH_MSG_DEBUG(" Header: xxx Preamble Error " << currentLinkIDHash);
- m_headErrorPreamble++;
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::PreambleError, errs));
- sc=StatusCode::RECOVERABLE;
- }
-
- if (data16[n]&0x400) {
- ATH_MSG_DEBUG(" Header: xxx LVL1 ID Error " << currentLinkIDHash);
- m_headErrorLvl1ID++;
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::LVL1IDError, errs));
- sc=StatusCode::RECOVERABLE;
- }
-
- if (data16[n]&0x200) {
- ATH_MSG_DEBUG(" Header: xxx BCID Error " << currentLinkIDHash);
- m_headErrorBCID++;
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::BCIDError, errs));
- sc=StatusCode::RECOVERABLE;
- }
-
- if ((data16[n]&0xF) > 11) {
- ATH_MSG_DEBUG(" Header: xxx Error in formatter " << currentLinkIDHash);
- m_headErrorFormatter++;
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::FormatterError, errs));
- sc=StatusCode::RECOVERABLE;
+ // Chip is 4 bits. The highest bit 3 represents side. Chip 0-5 on side 0 and chip 8-13 on side 1.
+ const unsigned int sideABCDError{static_cast<unsigned int>(chip/8)};
+ if (currentLinkIDHash.value()%2!=sideABCDError) {
+ // If the sides from the ABCD error and online ID are different,
+ // the module is expected to read side 0 via link 1 and side 1 and via link 0.
+ // Hash Id is flipped.
+ ATH_MSG_DEBUG("ABCD error and online ID have different side information for hash " << currentLinkIDHash << ". "
+ << sideABCDError << " from ABCD error and " << currentLinkIDHash.value()%2 << " from online ID");
+ currentLinkIDHash = (currentLinkIDHash.value()/2)*2+sideABCDError;
+ }
+ // Chip should be 0-5 or 8-13.
+ if (chip%8>=N_CHIPS_PER_SIDE) {
+ ATH_MSG_DEBUG("ABCD error has an invalid chip 0x" << std::hex << chip << std::dec
+ << " the 16-bit word is 0x" << std::hex << data16[n] << std::dec
+ << " for hash " << currentLinkIDHash.value());
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Invalid, errs));
+ }
+ else {
+ if ( abcError==0x1) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Error1, errs));
+ else if (abcError==0x2) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Error2, errs));
+ else if (abcError==0x4) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Error4, errs));
+ else if (abcError==0x7) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Error7, errs));
+ if ( chip%8==0) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Chip0, errs));
+ else if (chip%8==1) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Chip1, errs));
+ else if (chip%8==2) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Chip2, errs));
+ else if (chip%8==3) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Chip3, errs));
+ else if (chip%8==4) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Chip4, errs));
+ else if (chip%8==5) ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError_Chip5, errs));
+ }
}
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ABCDError, errs));
+ sc=StatusCode::RECOVERABLE;
+ continue;
+ }
- condensedMode = static_cast<bool>(data16[n]&0x100);
+ // Raw Data
+ else if (((data16[n]>>13)&0x7) == 0x3) {
+ if (not foundHeader) {
+ ATH_MSG_INFO(" Missing link header in ROD " << std::hex << robID << std::dec);
+ foundMissingLinkHeaderError = true;
+ m_numMissingLinkHeader++;
+ sc = StatusCode::RECOVERABLE;
+ continue;
+ }
+ ATH_MSG_DEBUG(" xxx Raw Data Mode " << std::hex << data16[n] << std::dec << ": Config Data Mode ");
+ // Too many errors in the BS for the ROD to decode the data
+ m_configDataBit++;
+ ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::RawError, errs));
+ sc=StatusCode::RECOVERABLE;
continue;
-
- } // End header
-
+ }
+
// Trailer
else if (((data16[n]>>13)&0x7) == 0x2) {
foundHeader=false;
@@ -776,85 +878,8 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
}
continue;
}
-
- // FlaggedABCD error
- // 000xxxxxxFFFFEEE
- // 000: FlaggedABCD error: xxxxxxx not used, FFFF: chip, EEE: error code
- else if (((data16[n]>>13)&0x7) == 0x0) {
- chip = ((data16[n]>>3)&0xF);
- abcError = data16[n]&0x7;
- // No data should appear for that chip but how do we want to transmit this information?
- IdentifierHash flagIDHash;
- if (onlineID == 0) {
- ATH_MSG_VERBOSE("There is ByteStreamParseError but we don't know which wafer has it.");
- continue;
- }
- else {
- flagIDHash = m_cabling->getHashFromOnlineId(onlineID);
- }
- ATH_MSG_DEBUG(" xxx Flagged ABCD ERROR in chip " << chip
- << " Error code abcError " << abcError << " Link Number (or Stream) "<<linkNumber);
- m_flagErrorBit++;
- // Error code of ABCD error should be 1, 2, 4 or 7.
- if (abcError!=0x1 and abcError!=0x2 and abcError!=0x4 and abcError!=0x7) {
- ATH_MSG_DEBUG("ABCD error has an invalid error code " << abcError
- << " the 16-bit word is 0x" << std::hex << data16[n] << std::dec
- << " for hash " << flagIDHash);
- ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Invalid, errs));
- }
- else {
- // Chip is 4 bits. The highest bit 3 represents side. Chip 0-5 on side 0 and chip 8-13 on side 1.
- const unsigned int sideABCDError{static_cast<unsigned int>(chip/8)};
- if (flagIDHash.value()%2!=sideABCDError) {
- // If the sides from the ABCD error and online ID are different,
- // the module is expected to read side 0 via link 1 and side 1 and via link 0.
- // Hash Id is flipped.
- ATH_MSG_DEBUG("ABCD error and online ID have different side information for hash " << flagIDHash << ". "
- << sideABCDError << " from ABCD error and " << flagIDHash.value()%2 << " from online ID");
- flagIDHash = (flagIDHash.value()/2)*2+sideABCDError;
- }
- // Chip should be 0-5 or 8-13.
- if (chip%8>=6) {
- ATH_MSG_DEBUG("ABCD error has an invalid chip 0x" << std::hex << chip << std::dec
- << " the 16-bit word is 0x" << std::hex << data16[n] << std::dec
- << " for hash " << flagIDHash.value());
- ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Invalid, errs));
- }
- else {
- if ( abcError==0x1) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Error1, errs));
- else if (abcError==0x2) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Error2, errs));
- else if (abcError==0x4) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Error4, errs));
- else if (abcError==0x7) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Error7, errs));
- if ( chip%8==0) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Chip0, errs));
- else if (chip%8==1) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Chip1, errs));
- else if (chip%8==2) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Chip2, errs));
- else if (chip%8==3) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Chip3, errs));
- else if (chip%8==4) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Chip4, errs));
- else if (chip%8==5) ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError_Chip5, errs));
- }
- }
- ATH_CHECK(addSingleError(flagIDHash, SCT_ByteStreamErrors::ABCDError, errs));
- sc=StatusCode::RECOVERABLE;
- continue;
- }
- else if (((data16[n]>>13)&0x7) == 0x3) {
- // Raw Data
- IdentifierHash rawIDHash{0};
- if (onlineID == 0) {
- ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
- continue;
- }
- else {
- rawIDHash = m_cabling->getHashFromOnlineId(onlineID);
- }
- ATH_MSG_DEBUG(" xxx Raw Data Mode " << std::hex << data16[n] << std::dec << ": Config Data Mode ");
- // Too many errors in the BS for the ROD to decode the data
- m_configDataBit++;
- ATH_CHECK(addSingleError(rawIDHash, SCT_ByteStreamErrors::RawError, errs));
- sc=StatusCode::RECOVERABLE;
- continue;
- }
+ /// Unknown
else {
ATH_MSG_DEBUG("Data word format unknown ");
m_unknownDataFormat++;
@@ -864,44 +889,38 @@ StatusCode SCT_RodDecoder::fillCollection(const OFFLINE_FRAGMENTS_NAMESPACE::ROB
} // End of 16-bit word loop
} // End of 32-bit word loop
- // Create RDO of the last ink or stream of the event
- if (saved[side*768+strip]==false and oldStrip>=0) {
- const int rdoMade{makeRDO(strip, groupSize, timeBin, onlineID, errors, rdoIDCont, cache, errorHit)};
+ // Create the last RDO of the last link of the event
+ if (saved[side*N_STRIPS_PER_SIDE+strip]==false and oldStrip>=0) {
+ const int rdoMade{makeRDO(strip, groupSize, timeBin, currentLinkIDHash, errors, rdoIDCont, cache, errorHit)};
if (rdoMade == -1) {
sc=StatusCode::RECOVERABLE;
ATH_CHECK(addSingleError(currentLinkIDHash, SCT_ByteStreamErrors::ByteStreamParseError, errs));
}
else {
- saved[side*768+strip] = rdoMade;
+ saved[side*N_STRIPS_PER_SIDE+strip] = rdoMade;
}
}
+ // MissingLinkHeaderError is filled in only FE-lins of the ROD whose headers are not found.
+ // We cannot know which FE-link does not have header. However, we should not add the error to found ones.
+ if (foundMissingLinkHeaderError) {
+ ATH_CHECK(addRODError(robID, SCT_ByteStreamErrors::MissingLinkHeaderError, errs, &foundHashes));
+ }
+
if (sc.isFailure()) ATH_MSG_DEBUG("One or more ByteStream errors found ");
return sc;
}
// makeRDO method
-int SCT_RodDecoder::makeRDO(int strip, int groupSize, int timeBin, uint32_t onlineID, int errors,
+int SCT_RodDecoder::makeRDO(int strip, int groupSize, int timeBin,
+ const IdentifierHash& collIDHash,
+ int errors,
ISCT_RDO_Container& rdoIDCont,
CacheHelper& cache,
const std::vector<int>& errorHit) const
{
- if (onlineID == 0x0) {
- ATH_MSG_WARNING("No link header found, possibly corrupt ByteStream. Will not try to make RDO");
- return -1;
- }
- // Get offlineId from the link number and ROB number
- const IdentifierHash collIDHash{m_cabling->getHashFromOnlineId(onlineID)};
- if (not collIDHash.is_valid()) {
- m_numUnknownOfflineID++;
- ATH_MSG_ERROR("Unknown OfflineId for OnlineId -> cannot create RDO");
- ATH_MSG_WARNING("Unknown OfflineId for OnlineId " << std::hex << onlineID
- << " -> cannot create RDO" << std::dec);
- return -1;
- }
-
- if (((strip & 0x7f) + (groupSize-1) > 127) or (strip<0) or (strip>767)) {
+ if (((strip & 0x7f) + (groupSize-1) >= N_STRIPS_PER_CHIP) or (strip<0) or (strip>=N_STRIPS_PER_SIDE)) {
ATH_MSG_WARNING("Cluster with " << groupSize << " strips, starting at strip " << strip
<< " in collection " << collIDHash << " out of range. Will not make RDO");
return -1;
@@ -933,9 +952,9 @@ int SCT_RodDecoder::makeRDO(int strip, int groupSize, int timeBin, uint32_t onli
return 0;
}
- // See if strips go from 0 to 767 or vice versa
+ // See if strips go from 0 to N_STRIPS_PER_SIDE-1(=767) or vice versa
if (m_swapPhiReadoutDirection[collIDHash]) {
- strip = 767 - strip;
+ strip = N_STRIPS_PER_SIDE-1 - strip;
strip = strip-(groupSize-1);
}
@@ -978,12 +997,20 @@ int SCT_RodDecoder::makeRDO(int strip, int groupSize, int timeBin, uint32_t onli
// addRODError method
StatusCode SCT_RodDecoder::addRODError(uint32_t rodID, SCT_ByteStreamErrors::ErrorType error,
- SCT_RodDecoderErrorsHelper& errs) const
+ SCT_RodDecoderErrorsHelper& errs,
+ const std::unordered_set<IdentifierHash>* foundHashes) const
{
std::vector<IdentifierHash> hashIDs;
m_cabling->getHashesForRod(hashIDs, rodID);
for (const IdentifierHash& hash: hashIDs) {
- ATH_CHECK( addSingleError(hash, error, errs) );
+ // MissingLinkHeaderError is filled in only FE-links of the ROD whose headers are not found.
+ // We cannot know which FE-link does not have header. However, we should not add the error to found ones.
+ if ((error==SCT_ByteStreamErrors::MissingLinkHeaderError) and
+ foundHashes and foundHashes->count(hash)) {
+ continue;
+ }
+
+ ATH_CHECK(addSingleError(hash, error, errs));
}
return StatusCode::SUCCESS;
}
@@ -991,8 +1018,8 @@ StatusCode SCT_RodDecoder::addRODError(uint32_t rodID, SCT_ByteStreamErrors::Err
// addSingleError method
StatusCode SCT_RodDecoder::addSingleError(const IdentifierHash& hashID,
- SCT_ByteStreamErrors::ErrorType error,
- SCT_RodDecoderErrorsHelper& errs) const
+ SCT_ByteStreamErrors::ErrorType error,
+ SCT_RodDecoderErrorsHelper& errs) const
{
if (not hashID.is_valid()) {
ATH_MSG_INFO("addSingleError hashID " << hashID << " is invalid.");
@@ -1022,8 +1049,8 @@ StatusCode SCT_RodDecoder::addSingleError(const IdentifierHash& hashID,
// setFirstTempMaskedChip method
StatusCode SCT_RodDecoder::setFirstTempMaskedChip(const IdentifierHash& hashID,
- unsigned int firstTempMaskedChip,
- SCT_RodDecoderErrorsHelper& errs) const
+ unsigned int firstTempMaskedChip,
+ SCT_RodDecoderErrorsHelper& errs) const
{
if (not hashID.is_valid()) {
ATH_MSG_INFO("setFirstTempMaskedChip hashID " << hashID << " is invalid.");
@@ -1112,7 +1139,7 @@ StatusCode SCT_RodDecoder::setFirstTempMaskedChip(const IdentifierHash& hashID,
// Readout sequence is 6, 7, 8, 9, 10, 11, 1, 2, 3, 4, 5.
}
- static const int chipOrder[5][12]{
+ static const int chipOrder[5][N_SIDES*N_CHIPS_PER_SIDE]{
// type=0 not prepared for both link-0 and link-1 are working
{},
// type=1 link-1 is broken: chip 0 1 2 3 4 5 6 7 8 9 10 11
@@ -1138,33 +1165,37 @@ StatusCode SCT_RodDecoder::setFirstTempMaskedChip(const IdentifierHash& hashID,
// side 1 via link-0. If the first masked chip value on side 1 (0) is
// between 1 to 6 (7 to 12), it indicates the module is a special one.
// In that case, information is swapped.
- if ((6<firstTempMaskedChipSide0 and firstTempMaskedChipSide0<=12) or
- (0<firstTempMaskedChipSide1 and firstTempMaskedChipSide1<= 6)) {
+ if ((N_CHIPS_PER_SIDE<firstTempMaskedChipSide0 and firstTempMaskedChipSide0<=N_SIDES*N_CHIPS_PER_SIDE) or
+ ( 0<firstTempMaskedChipSide1 and firstTempMaskedChipSide1<= N_CHIPS_PER_SIDE)) {
const unsigned int swapFirstTempMaskedChipSide0{firstTempMaskedChipSide0};
firstTempMaskedChipSide0 = firstTempMaskedChipSide1;
firstTempMaskedChipSide1 = swapFirstTempMaskedChipSide0;
}
if (firstTempMaskedChipSide0>0) {
- for (unsigned int iChip{firstTempMaskedChipSide0-1}; iChip<6; iChip++) {
- ATH_CHECK( addSingleError(hashSide0, SCT_ByteStreamErrors::TempMaskedChipToBit(iChip), errs) );
+ for (unsigned int iChip{firstTempMaskedChipSide0-1}; iChip<N_CHIPS_PER_SIDE; iChip++) {
+ ATH_CHECK(addSingleError(hashSide0, SCT_ByteStreamErrors::TempMaskedChipToBit(iChip), errs));
}
}
- if (firstTempMaskedChipSide1>6) {
- for (unsigned int iChip{firstTempMaskedChipSide1-1}; iChip<12; iChip++) {
- ATH_CHECK( addSingleError(hashSide1, SCT_ByteStreamErrors::TempMaskedChipToBit(iChip-6), errs) );
+ if (firstTempMaskedChipSide1>N_CHIPS_PER_SIDE) {
+ for (unsigned int iChip{firstTempMaskedChipSide1-1}; iChip<N_SIDES*N_CHIPS_PER_SIDE; iChip++) {
+ ATH_CHECK(addSingleError(hashSide1, SCT_ByteStreamErrors::TempMaskedChipToBit(iChip-N_CHIPS_PER_SIDE), errs));
}
}
}
else {
// type=1, 2, 3, 4: cases using Rx redundancy
bool toBeMasked{false};
- for (int iChip{0}; iChip<12; iChip++) {
+ for (int iChip{0}; iChip<N_SIDES*N_CHIPS_PER_SIDE; iChip++) {
int jChip{chipOrder[type][iChip]};
if (jChip==static_cast<int>(firstTempMaskedChip-1)) toBeMasked = true;
if (toBeMasked) {
- if (jChip<6) ATH_CHECK( addSingleError(hashSide0, SCT_ByteStreamErrors::TempMaskedChipToBit(jChip), errs));
- else ATH_CHECK( addSingleError(hashSide1, SCT_ByteStreamErrors::TempMaskedChipToBit(jChip-6), errs));
+ if (jChip<N_CHIPS_PER_SIDE) {
+ ATH_CHECK(addSingleError(hashSide0, SCT_ByteStreamErrors::TempMaskedChipToBit(jChip), errs));
+ }
+ else {
+ ATH_CHECK(addSingleError(hashSide1, SCT_ByteStreamErrors::TempMaskedChipToBit(jChip-N_CHIPS_PER_SIDE), errs));
+ }
}
}
}
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.h b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.h
index 69872e543b745aeadad853292eaebfd9ad9e89e8..3337bcd375ee3c539125f65a19276e4f104447dc 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.h
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.h
@@ -21,6 +21,7 @@
#include <atomic>
#include <cstdint>
#include <string>
+#include <unordered_set>
#include <vector>
class IdentifierHash;
@@ -73,6 +74,15 @@ class SCT_RodDecoder : public extends<AthAlgTool, ISCT_RodDecoder>
private:
+ /**
+ * @enum SCT_DecoderNumbers
+ * @brief Define frequently used magic numbers
+ */
+ enum SCT_DecoderNumbers { N_SIDES = 2,
+ N_CHIPS_PER_SIDE = 6,
+ N_STRIPS_PER_CHIP = 128,
+ N_STRIPS_PER_SIDE = N_CHIPS_PER_SIDE*N_STRIPS_PER_CHIP,
+ };
/**
* @brief Builds RawData RDO and adds to RDO container
*
@@ -83,17 +93,18 @@ class SCT_RodDecoder : public extends<AthAlgTool, ISCT_RodDecoder>
* 0 if collection was deliberately skipped (for trigger)
* -1 if there was an error in the decoding - will be passed on as StatusCode::RECOVERABLE by fillCollection()
*
- * @param strip Strip number info from the RDO.
- * @param groupSize Group size info from the RDO.
+ * @param strip Strip number info for the RDO.
+ * @param groupSize Group size info for the RDO.
* @param timeBin Time bin info for RDO.
- * @param onlineID Online Identifier from the RDO.
+ * @param collIDHash IdentifierHash for the wafer/side/FE-link where the RDO exists
* @param errors Error info.
* @param rdoIDCont RDO ID Container to be filled.
* @param cache Cache.
* @param errorHit Hit error info.
*/
int makeRDO(int strip, int groupSize, int timeBin,
- uint32_t onlineID, int errors,
+ const IdentifierHash& collIDHash,
+ int errors,
ISCT_RDO_Container& rdoIDCont,
CacheHelper& cache,
const std::vector<int>& errorHit) const;
@@ -104,9 +115,11 @@ class SCT_RodDecoder : public extends<AthAlgTool, ISCT_RodDecoder>
* @param rodID Identifer of ROD.
* @param errorType Error type info.
* @param errs Byte stream error container.
+ * @param foundHashes FE-links whose headers are found. Used only for MissingLinkHeaderError.
*/
StatusCode addRODError(uint32_t rodID, SCT_ByteStreamErrors::ErrorType error,
- SCT_RodDecoderErrorsHelper& errs) const;
+ SCT_RodDecoderErrorsHelper& errs,
+ const std::unordered_set<IdentifierHash>* foundHashes=nullptr) const;
/**
* @brief Add single eror
*
@@ -115,8 +128,8 @@ class SCT_RodDecoder : public extends<AthAlgTool, ISCT_RodDecoder>
* @param errs Byte stream error container.
*/
StatusCode addSingleError(const IdentifierHash& hashID,
- SCT_ByteStreamErrors::ErrorType error,
- SCT_RodDecoderErrorsHelper& errs) const;
+ SCT_ByteStreamErrors::ErrorType error,
+ SCT_RodDecoderErrorsHelper& errs) const;
/**
* @brief Set first temporarily masked chip information from byte stream trailer
@@ -126,8 +139,8 @@ class SCT_RodDecoder : public extends<AthAlgTool, ISCT_RodDecoder>
* @param errs Byte stream error container.
*/
StatusCode setFirstTempMaskedChip(const IdentifierHash& hashID,
- unsigned int firstTempMaskedChip,
- SCT_RodDecoderErrorsHelper& errs) const;
+ unsigned int firstTempMaskedChip,
+ SCT_RodDecoderErrorsHelper& errs) const;
/** Identifier helper class for the SCT subdetector that creates compact Identifier objects and
IdentifierHash or hash IDs. Also allows decoding of these IDs. */
@@ -233,9 +246,6 @@ class SCT_RodDecoder : public extends<AthAlgTool, ISCT_RodDecoder>
/** Total number of missing link headers */
mutable std::atomic_uint m_numMissingLinkHeader{0};
- /** Total number of SCT unknown online IDs */
- mutable std::atomic_uint m_numUnknownOfflineID{0};
-
/** Swap phi readout direction */
std::vector<bool> m_swapPhiReadoutDirection{};
};
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
index 57b86d06a6b92f50fdeef4a15cb4ac0f3b9f9c1c..8084ccf10ccd65234c9791d468db1f2d28e40ab3 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/CMakeLists.txt
@@ -21,7 +21,6 @@ atlas_depends_on_subdirs(
Event/xAOD/xAODEventInfo
Event/EventPrimitives
InnerDetector/InDetConditions/InDetConditionsSummaryService
- InnerDetector/InDetConditions/InDetByteStreamErrors
InnerDetector/InDetConditions/PixelConditionsTools
InnerDetector/InDetDetDescr/InDetIdentifier
InnerDetector/InDetDetDescr/InDetReadoutGeometry
@@ -40,10 +39,10 @@ find_package( ROOT COMPONENTS Core MathCore Hist )
# Component(s) in the package:
atlas_add_component( PixelMonitoring
- PixelMonitoring/*.h src/*.cxx src/components/*.cxx
+ src/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib AtlasDetDescr
- GaudiKernel InDetRawData InDetPrepRawData TrkTrack InDetByteStreamErrors
+ GaudiKernel InDetRawData InDetPrepRawData TrkTrack
AthenaPoolUtilities GeoPrimitives xAODEventInfo EventPrimitives InDetIdentifier
InDetReadoutGeometry InDetRIO_OnTrack LWHists TrkParameters TrkSpacePoint
TrkTrackSummary TrkToolInterfaces PixelCablingLib PixelGeoModelLib PathResolver
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthErrorMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthErrorMonAlg.h
deleted file mode 100644
index 2333b4f10cc5e4e6a8e415b9ffd78b9f403811de..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthErrorMonAlg.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef PIXELATHERRORMONTOOL_H
-#define PIXELATHERRORMONTOOL_H
-
-#include "AthenaMonitoring/AthMonitorAlgorithm.h"
-#include "AthenaMonitoringKernel/Monitored.h"
-
-#include "InDetIdentifier/PixelID.h"
-#include "PixelConditionsTools/IPixelByteStreamErrorsTool.h"
-#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
-#include "StoreGate/ReadHandleKey.h"
-
-#include "PixelAthMonitoringBase.h"
-
-class PixelID;
-class IPixelByteStreamErrorsSvc;
-
-class PixelAthErrorMonAlg : public PixelAthMonitoringBase {
-
- public:
-
- PixelAthErrorMonAlg( const std::string& name, ISvcLocator* pSvcLocator );
- virtual ~PixelAthErrorMonAlg();
- virtual StatusCode initialize() override;
- virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
- std::string findComponentString(int bec, int ld) const;
-
- private:
-
- ToolHandle<IPixelByteStreamErrorsTool> m_pixelErrorTool{this, "PixelByteStreamErrorsTool", "PixelByteStreamErrorsTool", "Tool for PixelByteStreamErrors"};
- ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
-
- const PixelID* m_pixelid;
-
- bool m_doOnline;
- bool m_doModules;
- bool m_doLumiBlock;
- bool m_doLowOccupancy;
- bool m_doHighOccupancy;
- bool m_doHeavyIonMon;
-};
-#endif
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
index 687afb3501e8ee4725baf6bf4319e3f4fafa07fe..c778ba94a673068cff94204fa37727284d31015e 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthErrorMonAlgCfg.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
#
'''
@@ -7,11 +7,14 @@
@brief Configuration of Pixel Error Monitoring Histograms for Run 3
'''
from PixelMonitoring.PixelAthMonitoringBase import define2DProfHist
-from PixelMonitoring.PixelAthMonitoringBase import define1DLayers
+from PixelMonitoring.PixelAthMonitoringBase import define1DLayers, defineMapVsLumiLayers
from PixelMonitoring.PixelAthMonitoringBase import define1DProfLumiLayers
from PixelMonitoring.PixelAthMonitoringBase import layers, totcuts, xbinsem, xminsem, lumibinsx
from PixelMonitoring.PixelAthMonitoringBase import addOnTrackTxt, fullDressTitle
from PixelMonitoring.PixelAthMonitoringBase import runtext
+from PixelMonitoring.PixelAthMonitoringBase import errbbinsy, errbminsy, errbbsizy, errtbinsy
+from PixelMonitoring.PixelAthMonitoringBase import ErrBitLabels, ErrCatRODModLabels, ErrCatLabels, ErrCatRODModLabelsNorm, ErrCatLabelsNorm
+from PixelMonitoring.PixelAthMonitoringBase import ErrStateLabelsFEI3, ErrStateLabelsFEI4
def PixelAthErrorMonAlgCfg(helper, alg, **kwargs):
'''
@@ -21,11 +24,95 @@ def PixelAthErrorMonAlgCfg(helper, alg, **kwargs):
kwargs -- jo agruments
'''
doOnline = kwargs.get('doOnline', False)
+ doLumiBlock = kwargs.get('doLumiBlock', False)
path = '/Pixel/Errors/'
+ pathExpert = '/Pixel/ErrorsExpert/'
pathLowStat = '/Pixel/LumiBlock/'
+ errorGroup = helper.addGroup(alg, 'Error')
+
histoGroupName = 'errors_per_lumi'
title = 'Average Total Errors'
yaxistext = ';# errors/event'
define1DProfLumiLayers(helper, alg, histoGroupName, title, path, yaxistext, type='TProfile')
+
+ histoGroupName = 'ErrorBit_per_lumi'
+ title = 'Average Errors by Error Bits'
+ defineMapVsLumiLayers(helper, alg, histoGroupName, title, path, ';lumi block', ';error bit', ybins=errbbinsy, ymins=errbminsy, binsizes=errbbsizy, ylabels=ErrBitLabels, type='TProfile2D')
+
+ histoGroupName = 'ErrorCatRODMod_per_lumi'
+ title = 'Average Errors by Error Types'
+ ylabels = [[i[1] for i in ErrCatRODModLabels]]*len(layers)
+ defineMapVsLumiLayers(helper, alg, histoGroupName, title, path, ';lumi block', ';error type', ybins=errtbinsy, ymins=errbminsy, binsizes=errbbsizy, ylabels=ylabels, type='TProfile2D')
+
+ for i, cat in enumerate(ErrCatRODModLabels):
+ if i==4: #other histograms are covered by ErrCatLabels below
+ break
+ histoGroupName = cat[0]
+ title = "Total "+cat[1]
+ define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F')
+
+ for cat in ErrCatLabels:
+ histoGroupName = cat[0]
+ title = "Total "+cat[1]
+ define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F')
+
+ yaxistext = ';# errors/module/event'
+ for i, cat in enumerate(ErrCatRODModLabelsNorm):
+ histoGroupName = cat
+ title = "Average "+ErrCatRODModLabels[i][1]+" per Module"
+ define1DProfLumiLayers(helper, alg, histoGroupName, title, path, yaxistext, type='TProfile')
+
+ for i, cat in enumerate(ErrCatLabelsNorm):
+ histoGroupName = cat
+ title = "Average "+ErrCatLabels[i][1]+" per Module"
+ define1DProfLumiLayers(helper, alg, histoGroupName, title, path, yaxistext, type='TProfile')
+
+ histoGroupName = "femcc_errorwords"
+ title = "Average FE/MCC Error Words"
+ define2DProfHist(helper, alg, histoGroupName, title, path, type='TProfile2D')
+
+ histoGroupName = "Errors_LB"
+ title = "Errors"
+ define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F', lifecycle='lowStat')
+
+ histoGroupName = "Errors_ModSync_LB"
+ title = "Errors_ModSync"
+ define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F', lifecycle='lowStat')
+
+ histoGroupName = "Errors_RODSync_LB"
+ title = "Errors_RODSync"
+ define2DProfHist(helper, alg, histoGroupName, title, path, type='TH2F', lifecycle='lowStat')
+
+ for state in ErrStateLabelsFEI3:
+ histoGroupName = state[0]+"_Map"
+ title = state[1]+" per event per LB"
+ define2DProfHist(helper, alg, histoGroupName, title, pathExpert, type='TH2F')
+ histoGroupName = state[0]+"_per_lumi"
+ title = 'Average '+state[1]
+ yaxistext = ';# errors/event'
+ define1DProfLumiLayers(helper, alg, histoGroupName, title, pathExpert, yaxistext, type='TProfile')
+
+ for state in ErrStateLabelsFEI4:
+ histoGroupName = state[0]+"_Map"
+ title = state[1]+" per event per LB"
+ define2DProfHist(helper, alg, histoGroupName, title, pathExpert, type='TH2F')
+ histoGroupName = state[0]+"_per_lumi"
+ title = 'Average '+state[1]
+ yaxistext = ';# errors/event'
+ define1DProfLumiLayers(helper, alg, histoGroupName, title, pathExpert, yaxistext, type='TProfile')
+
+ varName = 'ServiceRecord_val'
+ title = fullDressTitle('IBL ServiceRecord Unweighted', False, ';SR',';# errors/event')
+ varName += ';ServiceRecord_Unweighted_IBL'
+ errorGroup.defineHistogram(varName,
+ type='TH1F', path=pathExpert, title=title,
+ xbins=40, xmin=-0.5, xmax=39.5)
+ varName = 'ServiceRecord_val'
+ title = fullDressTitle('IBL ServiceRecord Weighted with Payload', False, ';SR',';# errors/event')
+ varName += ';ServiceRecord_Weighted_IBL'
+ errorGroup.defineHistogram(varName, weight='ServiceRecord_wgt',
+ type='TH1F', path=pathExpert, title=title,
+ xbins=40, xmin=-0.5, xmax=39.5)
+
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py
index a91bce116aa07022081c1a0053efd65897af2030..a303ae81e45416818c05436260ca5481099ed840 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/python/PixelAthMonitoringBase.py
@@ -49,6 +49,10 @@ xbinstotz= [ 3, 3, 13, 13, 13, 20, 3, 3]
xminstotz= [ -0.5, -0.5,-0.5,-0.5,-0.5, -0.5, -0.5, -0.5]
ztotbinsy= [ 20, 20, 20, 20, 20, 20, 20, 20]
ztotminsy= [ 19.5, 19.5, 7.5,19.5,19.5, -0.5, -0.5, -0.5]
+errbbinsy= [ 32, 32, 32, 32, 32, 40, 40, 40]
+errbminsy= [ 0, 0, 0, 0, 0, 0, 0, 0]
+errbbsizy= [ 1, 1, 1, 1, 1, 1, 1, 1]
+errtbinsy= [ 7, 7, 7, 7, 7, 7, 7, 7]
pp0layers= ["ECA","ECC","B0","B1","B2","IBLA","IBLC"]
pp0xbins = [ 24, 24, 22, 38, 52, 14, 14]
@@ -139,6 +143,112 @@ PP0sEC = [
PP0LabelX = [PP0sEC, PP0sEC, StavesL0, StavesL1, StavesL2, StavesIBL, StavesIBL]
+#Errors
+ErrBitsFEI3 = [
+ "ROD Overflow Trunc", "ROD H/T Limit Trunc", "2", "3",
+ "FE/MCC EoC Trunc", "SEU Hit Parity", "SEU Register Parity", "SEU Hamming Code",
+ "FE Warning (Bit Flip)", "9", "10", "11",
+ "FE/MCC Hit Overflow Trunc", "FE/MCC EoE Overflow Trunc", "FE/MCC BCID1 Sync", "FE/MCC BCID2 Sync",
+ "FE/MCC LVL1ID Sync", "17", "18", "19",
+ "ROD BCID Sync", "ROD LVL1ID Sync", "ROD Formatter Timeout", "Preamble/Header",
+ "24", "25", "26", "27",
+ "28", "29", "30", "31"]
+
+ErrBitsFEI4 = [
+ "Row/ Column Error", "Limit Error", "Trailer Error", "BCID Error",
+ "LVL1ID Error", "Preamble Error", "Masked Link", "Timeout Error",
+ "BCID counter", "Hamming code 0", "Hamming code 1", "Hamming code 2",
+ "L1_in counter", "L1 request counter", "L1 register", "L1 Trigger ID",
+ "Readout processor", "17", "18", "19",
+ "20", "21", "22", "Skipped trig counter",
+ "Truncated event flag", "25", "26", "27",
+ "28", "29", "30" "31"
+ "Triple redundant CNFGMEM", "Write reg data", "Address error", "Other CMD decoder",
+ "CMD decoder bit flip", "CMD decoder SEU", "Data bus address", "Triple redundant EFUSE"]
+
+ErrBitLabels = [ErrBitsFEI3, ErrBitsFEI3, ErrBitsFEI3, ErrBitsFEI3, ErrBitsFEI3, ErrBitsFEI4, ErrBitsFEI4, ErrBitsFEI4]
+
+ErrStateLabelsFEI3 = [
+ ("Mod_Sync_BCID1_errors", "FE/MCC BCID1 Sync Errors"),
+ ("Mod_Sync_BCID2_errors", "FE/MCC BCID2 Sync Errors"),
+ ("Mod_Sync_LVL1ID_errors", "FE/MCC LVL1ID Sync Errors"),
+ ("ROD_Sync_BCID_errors", "ROD BCID Sync Errors"),
+ ("ROD_Sync_LVL1ID_errors", "ROD LVL1ID Sync Errors"),
+ ("Mod_Trunc_EOC_errors", "FE/MCC EoC Trunc Errors"),
+ ("Mod_Trunc_Hit_Overflow_errors", "FE/MCC Hit Overflow Trunc Errors"),
+ ("Mod_Trunc_EoE_Overflow_errors", "FE/MCC EoE Overflow Trunc Errors"),
+ ("ROD_Trunc_HT_Limit_errors", "ROD H/T Limit Trunc Errors"),
+ ("ROD_Trunc_ROD_OF_errors", "ROD Overflow Trunc Errors"),
+ ("Optical_Errors", "Preamble/Header Errors"),
+ ("SEU_Hit_Parity", "SEU Hit Parity Errors"),
+ ("SEU_Register_Parity", "SEU Register Parity Errors"),
+ ("SEU_Hamming", "SEU Hamming Code Errors"),
+ ("ROD_Timeout", "ROD Formatter Timeout Errors"),
+ ("FE_Warning", "FE Warning Errors"),
+]
+ErrStateLabelsFEI4 = [
+ ("ROD_BCID_errors", "ROD BCID synchronization errors"),
+ ("ROD_LVL1ID_errors", "ROD LVL1ID synchronization errors"),
+ ("SR_BCID_counter_errors", "SR BCID counter errors"),
+ ("SR_L1_in_counter_errors", "SR L1 in counter errors"),
+ ("SR_L1_request_counter_errors", "SR L1 request counter errors"),
+ ("SR_L1_register_errors", "SR L1 register errors"),
+ ("SR_L1_Trigger_ID_errors", "SR L1 trigger ID errors"),
+ ("SR_Skippped_trig_count_errors", "SR Skipped trigger counter errors"),
+ ("SR_Row-Column_errors", "SR row-column errors"),
+ ("SR_Limit_errors", "SR Header Trailer limit errors"),
+ ("SR_Truncated_event_flag_errors", "SR Truncated event errors"),
+ ("ROD_Preamble_errors", "ROD Preamble errors"),
+ ("SR_Hamming_code_0_errors", "SR Hamming code in word 0 errors"),
+ ("SR_Hamming_code_1_errors", "SR Hamming code in word 1 errors"),
+ ("SR_Hamming_code_2_errors", "SR Hamming code in word 2 errors"),
+ ("SR_Triple_redundant_errors_CNFGMEM", "SR Triple redundant errors CNFGMEM"),
+ ("SR_CMD_decoder_bitflip_errors", "SR CMD decoder bit flip errors"),
+ ("SR_Triple_redundant_errors_CMD", "SR Triple redundant errors CMD"),
+ ("SR_Triple_redundant_errors_EFUSE", "SR Triple redundant errors EFUSE"),
+ ("ROD_Trailer_errors", "ROD Trailer errors"),
+ ("ROD_Timeout_errors", "ROD Timeout errors"),
+ ("SR_Masked_link", "SR Masked link errors"),
+ ("SR_FE_readout_process_errors", "SR FE readout process errors"),
+ ("SR_Write_reg_data_errors", "SR Write register data errors"),
+ ("SR Address_errors", "SR Address errors"),
+ ("SR_Other_CMD_decoder_errors", "SR CMD decoder errors"),
+ ("SR_Data_bus_address_errors", "SR Data bus address errors")
+]
+
+ErrCatRODModLabels = [
+ ("SyncErrors_Mod", "FE/MCC Sync Errors"),
+ ("SyncErrors_ROD", "ROD Sync Errors"),
+ ("TruncErrors_Mod", "FE/MCC Trunc Errors"),
+ ("TruncErrors_ROD", "ROD Trunc Errors"),
+ ("OpticalErrors_RODMod", "Preamble/Header Errors"),
+ ("SEUErrors_RODMod", "SEU Errors"),
+ ("TimeoutErrors_RODMod", "Timeout Errors")
+]
+
+ErrCatRODModLabelsNorm = [
+ "SyncErrors_Mod_Frac_per_event",
+ "SyncErrors_ROD_Frac_per_event",
+ "TruncErrors_Mod_Frac_per_event",
+ "TruncErrors_ROD_Frac_per_event"
+]
+
+ErrCatLabels = [
+ ("SyncErrors", "Sync Errors (FE/MCC & ROD)"),
+ ("TruncErrors", "Trunc Errors (FE/MCC & ROD)"),
+ ("OpticalErrors", "Preamble/Header Errors"),
+ ("SEUErrors", "SEU Errors"),
+ ("TimeoutErrors", "Timeout Errors")
+]
+
+ErrCatLabelsNorm = [
+ "SyncErrorsFrac_per_event",
+ "TruncationErrorsFrac_per_event",
+ "OpticalErrorsFrac_per_event",
+ "SEUErrorsFrac_per_event",
+ "TimeoutErrorsFrac_per_event"
+]
+
layergroups = {}
def getLayerGroup(helper, alg, layer):
if alg not in layergroups:
@@ -247,7 +357,7 @@ def define1DProfLumiLayers(helper, alg, name, title, path, yaxistext, type='TPro
type=type, path=path, title=fulltitle,
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx)
-def defineMapVsLumiLayers(helper, alg, name, title, path, xaxistext, yaxistext, ybins, ymins, binsizes=[1.0], type='TH2F', histname=None):
+def defineMapVsLumiLayers(helper, alg, name, title, path, xaxistext, yaxistext, ybins, ymins, binsizes=[1.0], ylabels=None, type='TH2F', histname=None):
'''
This function configures 2D histograms vs lumi for Pixel layers.
@@ -259,7 +369,7 @@ def defineMapVsLumiLayers(helper, alg, name, title, path, xaxistext, yaxistext,
path -- Path in ouput file for histogram
ybins, ymin, ymax, yaxistext
-- Configure Y-axis
- type -- Type of TH2 histogram (TH2I, TH2F)
+ type -- Type of histogram (TH2I, TH2F, TProfile2D)
histname-- alternative root name of the histogram (to be filled with the same variables defined by 'name' above)
'''
@@ -269,6 +379,7 @@ def defineMapVsLumiLayers(helper, alg, name, title, path, xaxistext, yaxistext,
fulltitle = title + ' {0}'.format(layer) + runtext + lumitext + yaxistext
layerGroup = getLayerGroup(helper, alg, layer)
fullvarstring = '{0}_{1}'.format(name,'lb')
+ if 'Profile' in type: fullvarstring += ',{0}_{1}'.format(name, 'cat')
fullvarstring += ',{0}_{1}'.format(name, 'val')
fullvarstring += ';' + histname + '_{0}'.format(layer)
if ( len(ybins)==1 and len(ymins)==1 and len(binsizes)==1):
@@ -276,11 +387,11 @@ def defineMapVsLumiLayers(helper, alg, name, title, path, xaxistext, yaxistext,
type=type, path=path, title=fulltitle,
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx,
ybins=ybins[0], ymin=ymins[0], ymax=ymins[0]+binsizes[0]*ybins[0])
- elif (len(ybins)==len(layers) and len(ymins)==len(layers) and len(binsizes)==len(layers)):
+ elif (len(ybins)==len(layers) and len(ymins)==len(layers) and len(binsizes)==len(layers) and len(ylabels)==len(layers)):
layerGroup.defineHistogram(fullvarstring,
type=type, path=path, title=fulltitle,
xbins=lumibinsx, xmin=-0.5, xmax=-0.5+lumibinsx,
- ybins=ybins[idx], ymin=ymins[idx], ymax=ymins[idx]+binsizes[idx]*ybins[idx])
+ ybins=ybins[idx], ymin=ymins[idx], ymax=ymins[idx]+binsizes[idx]*ybins[idx], ylabels=ylabels[idx])
def define1DLayers(helper, alg, name, title, path, xaxistext, yaxistext, xbins, xmins, binsizes=[1.0], type='TH1F', histname=None):
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
index 5ab09d3197bdf90a7a45781a2e188d32fa747300..349928bf1ec5d6c7954e756b89bfc9a1864e0551 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.cxx
@@ -1,8 +1,8 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "PixelMonitoring/PixelAthClusterMonAlg.h"
+#include "PixelAthClusterMonAlg.h"
PixelAthClusterMonAlg::PixelAthClusterMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
AthMonitorAlgorithm(name, pSvcLocator),
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthClusterMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
similarity index 92%
rename from InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthClusterMonAlg.h
rename to InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
index 7c2aa8969d167fe399f34724da6736ddfc614ec4..7e2e3783e5c371691767d91c9ec558ff4e5709af 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthClusterMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthClusterMonAlg.h
@@ -5,14 +5,10 @@
#ifndef PIXELATHCLUSTERMONTOOL_H
#define PIXELATHCLUSTERMONTOOL_H
-#include "AthenaMonitoring/AthMonitorAlgorithm.h"
-#include "AthenaMonitoringKernel/Monitored.h"
#include "PixelAthMonitoringBase.h"
#include "AtlasDetDescr/AtlasDetectorID.h"
-#include "InDetIdentifier/PixelID.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
-#include "StoreGate/ReadHandleKey.h"
#include "InDetPrepRawData/PixelClusterContainer.h"
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
index af8a7bbb0bdbb377c4c22b2c2c8b835a5799feef..2378a8e29b9159aa86cca5a07020a14288333bb9 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.cxx
@@ -1,16 +1,15 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "PixelMonitoring/PixelAthErrorMonAlg.h"
-#include "PixelMonitoring/PixelAthMonitoringBase.h"
-#include "InDetIdentifier/PixelID.h"
+#include "PixelAthErrorMonAlg.h"
PixelAthErrorMonAlg::PixelAthErrorMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
AthMonitorAlgorithm(name, pSvcLocator),
m_pixelid(nullptr)
{
//jo flags
+ declareProperty("ErrorsTool", m_pixelErrorTool);
declareProperty("doOnline", m_doOnline = false);
declareProperty("doModules", m_doModules = false);
declareProperty("doLumiBlock", m_doLumiBlock = false);
@@ -27,7 +26,7 @@ StatusCode PixelAthErrorMonAlg::initialize() {
ATH_CHECK( detStore()->retrieve(m_pixelid, "PixelID") );
ATH_CHECK( m_pixelCondSummaryTool.retrieve() );
- ATH_CHECK( m_pixelErrorTool.retrieve() );
+ if ( !m_pixelErrorTool.empty() ) ATH_CHECK( m_pixelErrorTool.retrieve() );
return AthMonitorAlgorithm::initialize();
}
@@ -37,24 +36,457 @@ StatusCode PixelAthErrorMonAlg::fillHistograms( const EventContext& ctx ) const
using namespace Monitored;
int lb = GetEventInfo(ctx)->lumiBlock();
+ auto errorGroup = getGroup("Error");
- //*******************************************************************************
- //************************** Begin of filling Error Histograms ********************
- //*******************************************************************************
+ ATH_MSG_DEBUG("Filling Error Monitoring Histograms");
+ // Array to count number of errors occurring in all components.
+ float num_errors[PixLayers::COUNT] = {0};
- ATH_MSG_DEBUG("Filling Error Monitoring Histograms");
+ // taking the largest - FEI4's - error bit/state sizes
+ float num_errors_per_bit[kNumErrorBitsFEI4][PixLayers::COUNT] = {{0}};
+ float num_errors_per_state[error_names_stateFEI4.size()][PixLayers::COUNT] = {{0}};
+
+ // Counters for erroneous modules in a layer, per
+ // error category, w/ and w/o ROD/MOD distinction.
+ float num_errormodules_per_cat[ErrorCategory::COUNT][PixLayers::COUNT] = {{0}};
+ float num_errormodules_per_cat_rodmod[ErrorCategoryRODMOD::COUNT][PixLayers::COUNT] = {{0}};
+
+ const auto& kFeErrorWords = m_pixelErrorTool->getAllFeErrors();
+
+ // const auto& kFeSvcRecord = m_pixelErrorTool->getAllServiceCodes(); //REVIEW n.y. implemented
+ // temporary kFeSvcRecord
+ std::map<IdentifierHash, std::map<unsigned int, std::vector<std::pair<int, unsigned int>>>> kFeSvcRecord;
+
+ // Generate a vector of error maps for all different error states.
+ std::vector<VecAccumulator2DMap> error_maps_per_state;
+ error_maps_per_state.reserve(error_names_stateFEI3.size() + error_names_stateFEI4.size());
+ for (const auto& state : error_names_stateFEI3) {
+ error_maps_per_state.emplace_back(state + std::string("_Map"), true);
+ }
+ for (const auto& state : error_names_stateFEI4) {
+ error_maps_per_state.emplace_back(state + std::string("_Map"), true);
+ }
+ std::vector<VecAccumulator2DMap> error_maps_per_cat_rodmod;
+ // only first four rodmod histos are unique, others are covered by
+ // the overall, rod/mod-agnostic categories below
+ for (unsigned int cat = 0; cat < ErrorCategoryRODMOD::kTruncROD+1; ++cat) {
+ error_maps_per_cat_rodmod.emplace_back(error_names_cat_rodmod[cat], true);
+ }
+ std::vector<VecAccumulator2DMap> error_maps_per_cat;
+ for (unsigned int cat = 0; cat < ErrorCategory::COUNT; ++cat) {
+ error_maps_per_cat.emplace_back(error_names_cat[cat], true);
+ }
+ // Generate femcc_errwords and per LB maps.
+ VecAccumulator2DMap femcc_errwords_maps("femcc_errorwords", true); //simple counting per _module_
+ VecAccumulator2DMap all_errors_maps("Errors_LB", true);
+ VecAccumulator2DMap modsync_errors_maps("Errors_ModSync_LB", true);
+ VecAccumulator2DMap rodsync_errors_maps("Errors_RODSync_LB", true);
+
+ // containers to keep IBL service records info
+ std::vector<int> flagged_ibl_error_bits;
+ std::vector<unsigned int> weights_of_flagged_ibl_error_bits;
+
+ int nActive_layer[PixLayers::COUNT] = {0};
+
+ // Perform a loop over all pixel IDs to fill the error-bit maps.
+ PixelID::const_id_iterator idIt = m_pixelid->wafer_begin();
+ PixelID::const_id_iterator idItEnd = m_pixelid->wafer_end();
+ for (; idIt != idItEnd; ++idIt) {
+ Identifier waferID = *idIt;
+ IdentifierHash id_hash = m_pixelid->wafer_hash(waferID);
+ const auto& kErrorWord = m_pixelErrorTool->getModuleErrors(id_hash);
+
+ bool is_fei4 = false;
+ if (m_pixelErrorTool->isActive(id_hash) && // isActive from PixelBytestreamErrorTool to REVIEW
+ ( (m_pixelid->barrel_ec(waferID) == 0 && m_pixelid->layer_disk(waferID) == 0) ||
+ abs(m_pixelid->barrel_ec(waferID)) == 4) ) is_fei4 = true;
+
+ int pixlayer = getPixLayersID(m_pixelid->barrel_ec(waferID), m_pixelid->layer_disk(waferID) );
+
+ // Boolean whether current module has a categorized error.
+ bool has_err_cat[ErrorCategory::COUNT] = {false};
+ bool has_err_cat_rodmod[ErrorCategoryRODMOD::COUNT] = {false};
+
+ if (!is_fei4) {
+ // Bit-shifting over module errors, only for ROD-type errors for FE-I3
+ for (unsigned int bit = 0; bit < kNumErrorBitsFEI3; bit++) {
+ if ((kErrorWord & (static_cast<uint64_t>(1) << bit)) != 0) {
+ if (bit >=4 && bit <=16) continue;
+ num_errors[pixlayer]++;
+ num_errors_per_bit[bit][pixlayer]++;
+
+ int error_cat_rodmod = 0;
+ if (bit == 20 || bit == 21) error_cat_rodmod = 2; // ROD synchronization errors (20: BCID, 21: LVL1ID)
+ if (bit == 0 || bit == 1) error_cat_rodmod = 4; // ROD truncation errors (0: FIFO Overflow, 1: H/T Limit)
+ if (bit == 23) error_cat_rodmod = 5; // optical errors (23: preamble (bitflip))
+ if (bit == 22) error_cat_rodmod = 7; // timeout errors (22: timeout on ROD formatter)
+ if (error_cat_rodmod) {
+ has_err_cat_rodmod[error_cat_rodmod - 1] = true;
+ if (!m_doOnline) {
+ all_errors_maps.add(pixlayer, waferID, m_pixelid, 1.0);
+ }
+ if (getErrorCategory(error_cat_rodmod)!=99) has_err_cat[getErrorCategory(error_cat_rodmod)] = true;
+ }
+ if (getErrorState(bit, is_fei4) != 99) {
+ num_errors_per_state[getErrorState(bit, is_fei4)][pixlayer]++;
+ error_maps_per_state[getErrorState(bit, is_fei4)].add(pixlayer, waferID, m_pixelid, 1.0);
+ }
+ }
+ }
+ } //end of FEI3-only part
+
+ // Bit-shifting over FE errors, kFeErrorWords are common to both FEI3 and FEI4
+ // but bits are different, see
+ // InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRodDecoder.cxx
+ unsigned int num_femcc_errwords = 0;
+ if (kFeErrorWords.find(id_hash) != kFeErrorWords.end()) {
+ // Collection of: FE ID, associated error word
+ std::map<unsigned int, unsigned int> fe_errorword_map = kFeErrorWords.find(id_hash)->second;
+
+ for (const auto& [fe_id, fe_errorword] : fe_errorword_map) {
+ bool has_femcc_errbits(false);
+
+ for (unsigned int bit = 0; bit < kNumErrorBitsFEI3; bit++) {
+ if ((fe_errorword & (static_cast<uint64_t>(1) << bit)) != 0) {
+ if (is_fei4 && bit > 7) continue; // For FE-I4 we are interested only in trailer errors, which are the first 8 bits, service records are taken separately
+ // For FE-I3, no double-counting w/ other bits? REVIEW
+
+ num_errors[pixlayer]++;
+ num_errors_per_bit[bit][pixlayer]++;
+ // This error word contains FE/MCC related errors.
+ if (bit >=4 && bit <=16) has_femcc_errbits = true;
+
+ int error_cat_rodmod = 0;
+ if (!is_fei4) {
+ if (bit == 14 || bit == 15 || bit == 16) error_cat_rodmod = 1; // module synchronization errors (14: BCID, 15: BCID. 16: LVL1ID)
+ if (bit == 4 || bit == 12 || bit == 13) error_cat_rodmod = 3; // module truncation errors (4: EOC, 12: hit overflow, 13: EoE overflow)
+ if (bit >= 5 && bit <= 7) error_cat_rodmod = 6; // SEU (single event upset) errors (5,6,7: hit parity, register parity, hammingcode)
+ } else {
+ if (bit == 3 || bit == 4) error_cat_rodmod = 2; // synchronization error (3:LVL1ID, 4:BCID)
+ if (bit == 0 || bit == 1) error_cat_rodmod = 4; // ROD truncation error (0:Row/Column error, 1:Limit error)
+ if (bit == 5) error_cat_rodmod = 5; // optical error (5:Preable error)
+ if (bit == 2 || bit == 7) error_cat_rodmod = 7; // Timeout error (2:Trailer timeout error, 7:Timeout error)
+ }
+ if (error_cat_rodmod) {
+ has_err_cat_rodmod[error_cat_rodmod - 1] = true;
+ if (!m_doOnline) {
+ all_errors_maps.add(pixlayer, waferID, m_pixelid, 1.0);
+ }
+ if (getErrorCategory(error_cat_rodmod)!=99) has_err_cat[getErrorCategory(error_cat_rodmod)] = true;
+ }
+ if (getErrorState(bit, is_fei4) != 99) {
+ if (!is_fei4) {
+ num_errors_per_state[getErrorState(bit, is_fei4)][pixlayer]++;
+ } else {
+ num_errors_per_state[getErrorState(bit, is_fei4)-error_names_stateFEI3.size()][pixlayer]++;
+ }
+ error_maps_per_state[getErrorState(bit, is_fei4)].add(pixlayer, waferID, m_pixelid, 1.0);
+ }
+ }
+ }
+ // If we have bits generated by FE/MCC, count this error word.
+ if (has_femcc_errbits) num_femcc_errwords++;
+ }
+ }
- float num_errors[PixLayers::COUNT] = {0,1,2,3,4,5,6,7};
- // filling tbd
+ // Loop over IBL service records, FE-I4 only
+ if (is_fei4 && kFeSvcRecord.find(id_hash) != kFeSvcRecord.end()) {
+ // map of FE ID and a vector of pairs of associated service record and payload
+ std::map<unsigned int, std::vector<std::pair<int, unsigned int>>> map_svc_record = kFeSvcRecord.find(id_hash)->second;
+ for (const auto& [fe_id, svc_record_vec] : map_svc_record) {
+ for (const auto& [svc_record, payload_read] : svc_record_vec) {
+ const unsigned int payload = payload_read + 1;
+
+ // svc_record starts from bit 8 of kNumErrorBitsIBL
+ int bit = svc_record+8;
+
+ num_errors[pixlayer] += payload;
+ num_errors_per_bit[bit][pixlayer] += payload;
+
+ int error_cat_rodmod = 0;
+ if (bit == 8) error_cat_rodmod = 1; // synchronization error (8:BCID counter)
+ if (bit == 24) error_cat_rodmod = 3; // truncation error (24:Truncated event)
+ if (bit == 9 || bit == 10 || // (9:Hamming code 0, 10:Hamming code 1,
+ bit == 11 || bit == 32 || // 12:Hamming code 2, 32:Triple redundant CNFGMEM,
+ bit == 36 || bit == 37 || // 36:Bit flip in CMD, 37:Triple redundant CMD,
+ bit == 39) // 39:Triple redundant EFUSE)
+ error_cat_rodmod = 6; // SEU error
+ if (error_cat_rodmod) {
+ has_err_cat_rodmod[error_cat_rodmod - 1] = true;
+ if (!m_doOnline) {
+ all_errors_maps.add(pixlayer, waferID, m_pixelid, 1.0);
+ }
+ if (getErrorCategory(error_cat_rodmod)!=99) has_err_cat[getErrorCategory(error_cat_rodmod)] = true;
+ }
+ if (getErrorState(bit, is_fei4) != 99) {
+ num_errors_per_state[getErrorState(bit, is_fei4)-error_names_stateFEI3.size()][pixlayer] += payload;
+
+ error_maps_per_state[getErrorState(bit, is_fei4)].add(pixlayer, waferID, m_pixelid, payload);
+ }
+ if (pixlayer==PixLayers::kIBL) {
+ flagged_ibl_error_bits.push_back(bit);
+ weights_of_flagged_ibl_error_bits.push_back(payload);
+ }
+ }
+ } // end loop over service records
+ }
+
+ femcc_errwords_maps.add(pixlayer, waferID, m_pixelid, num_femcc_errwords);
+
+ // access categorized error information per module
+ // it is only flagged - the actual number of errors in the same category
+ // is not tracked for those particular arrays
+ for (int i = 0; i < ErrorCategoryRODMOD::COUNT; i++) {
+ if (has_err_cat_rodmod[i]) {
+ num_errormodules_per_cat_rodmod[i][pixlayer]++;
+ if (!m_doOnline && i<ErrorCategoryRODMOD::kTruncROD+1) {
+ error_maps_per_cat_rodmod[i].add(pixlayer, waferID, m_pixelid, 1.0);
+ if (i==0) modsync_errors_maps.add(pixlayer, waferID, m_pixelid, 1.0);
+ if (i==1) rodsync_errors_maps.add(pixlayer, waferID, m_pixelid, 1.0);
+ }
+ }
+ }
+ for (int i = 0; i < ErrorCategory::COUNT; i++) {
+ if (has_err_cat[i]) {
+ num_errormodules_per_cat[i][pixlayer]++;
+ if (!m_doOnline) {
+ error_maps_per_cat[i].add(pixlayer, waferID, m_pixelid, 1.0);
+ }
+ }
+ }
+ // filling nActive modules per layer for later normalization
+ // for IBL (and DBM) normalization is effectively done by number of FEI4
+ // REVIEW once per-FE active info is available
+ //
+ if (m_pixelCondSummaryTool->isActive(id_hash) == true) {
+ if (pixlayer == PixLayers::kIBL && m_pixelid->eta_module(waferID)>-7 && m_pixelid->eta_module(waferID)<6) nActive_layer[pixlayer]+=2;
+ else nActive_layer[pixlayer]++;
+ }
+ } // Loop over all pixel IDs (i.e. modules)
+
+ // Fill the accumulated maps.
+ for (unsigned int state = 0; state < error_names_stateFEI3.size()+error_names_stateFEI4.size(); state++) {
+ fill2DProfLayerAccum(error_maps_per_state[state]);
+ if (state < error_names_stateFEI3.size()) {
+ for (int i = 0; i < PixLayers::kIBL; i++) {
+ if (nActive_layer[i]>0) num_errors_per_state[state][i] /= nActive_layer[i];
+ }
+ fill1DProfLumiLayers(error_names_stateFEI3[state] + std::string("_per_lumi"), lb, num_errors_per_state[state]);
+ } else {
+ for (int i = PixLayers::kIBL; i < PixLayers::COUNT; i++) {
+ if (nActive_layer[i]>0) num_errors_per_state[state-error_names_stateFEI3.size()][i] /= nActive_layer[i];
+ }
+ fill1DProfLumiLayers(error_names_stateFEI4[state-error_names_stateFEI3.size()] + std::string("_per_lumi"), lb, num_errors_per_state[state-error_names_stateFEI3.size()]);
+ }
+ }
+ fill2DProfLayerAccum(femcc_errwords_maps);
+ fill2DProfLayerAccum(all_errors_maps);
+ fill2DProfLayerAccum(modsync_errors_maps);
+ fill2DProfLayerAccum(rodsync_errors_maps);
+
+ if (!m_doOnline) {
+ for (unsigned int cat = 0; cat < ErrorCategoryRODMOD::kTruncROD+1; ++cat) {
+ fill2DProfLayerAccum(error_maps_per_cat_rodmod[cat]);
+ }
+ for (unsigned int cat = 0; cat < ErrorCategory::COUNT; ++cat) {
+ fill2DProfLayerAccum(error_maps_per_cat[cat]);
+ }
+ }
+ // Fill the luminosity error profiles for all layers.
fill1DProfLumiLayers("errors_per_lumi", lb, num_errors);
+ // Fill the luminosity error profiles per error cat_rodmod for all layers.
+
+ auto vals = Monitored::Collection( "ServiceRecord_val", flagged_ibl_error_bits );
+ auto wgts = Monitored::Collection( "ServiceRecord_wgt", weights_of_flagged_ibl_error_bits );
+ fill( errorGroup, vals, wgts);
- //*******************************************************************************
- //************************** End of filling Error Histograms **********************
- //*******************************************************************************
+ // NORMALIZATION by active modules (or FE's in IBL/DBM case)
+ //
+ // Normalize error bit and cat histograms by active modules
+ for (int i = 0; i < PixLayers::COUNT; i++) {
+ if (nActive_layer[i]>0) {
+ for (int bit = 0; bit < numErrorBitsLayer[i]; bit++) {
+ num_errors_per_bit[bit][i] /= nActive_layer[i];
+ }
+ for (int cat = 0; cat < ErrorCategoryRODMOD::COUNT; cat++) {
+ num_errormodules_per_cat_rodmod[cat][i] /= nActive_layer[i];
+ }
+ for (int cat = 0; cat < ErrorCategory::COUNT; cat++) {
+ num_errormodules_per_cat[cat][i] /= nActive_layer[i];
+ }
+ }
+ }
+ // Fill 2D luminosity error profiles per error bit and cat split by ROD/MOD for all layers.
+ fill2DProfLumiLayers("ErrorBit_per_lumi", lb, num_errors_per_bit, numErrorBitsLayer);
+ fill2DProfLumiLayers("ErrorCatRODMod_per_lumi", lb, num_errormodules_per_cat_rodmod, numErrorCatRODModsLayer);
+ // Fill 1D luminosity error profiles for error catergory for all layers.
+ for (unsigned int cat = 0; cat < error_names_cat_rodmod_norm.size(); ++cat) {
+ fill1DProfLumiLayers(error_names_cat_rodmod_norm[cat], lb, num_errormodules_per_cat_rodmod[cat]);
+ }
+ for (unsigned int cat = 0; cat < ErrorCategory::COUNT; ++cat) {
+ fill1DProfLumiLayers(error_names_cat_norm[cat], lb, num_errormodules_per_cat[cat]);
+ }
+
return StatusCode::SUCCESS;
}
+int PixelAthErrorMonAlg::getErrorState(int bit, bool isibl) const {
+ int erstate = 99;
+ if (!isibl) {
+ switch (bit) {
+ case 14:
+ erstate = 0; // FE/MCC BCID1 Sync
+ break;
+ case 15:
+ erstate = 1; // FE/MCC BCID2 Sync
+ break;
+ case 16:
+ erstate = 2; // FE/MCC LVL1ID Sync
+ break;
+ case 20:
+ erstate = 3; // ROD BCID Sync
+ break;
+ case 21:
+ erstate = 4; // ROD LVL1ID Sync
+ break;
+ case 4:
+ erstate = 5; // FE/MCC EoC Trunc
+ break;
+ case 12:
+ erstate = 6; // FE/MCC Hit Overflow Trunc
+ break;
+ case 13:
+ erstate = 7; // FE/MCC EoE Overflow Trunc
+ break;
+ case 1:
+ erstate = 8; // ROD H/T Limit Trunc
+ break;
+ case 0:
+ erstate = 9; // ROD Overflow Trunc
+ break;
+ case 23:
+ erstate = 10; // Preamble/Header
+ break;
+ case 5:
+ erstate = 11; // SEU Hit Parity
+ break;
+ case 6:
+ erstate = 12; // SEU Register Parity
+ break;
+ case 7:
+ erstate = 13; // SEU Hamming Code
+ break;
+ case 22:
+ erstate = 14; // ROD Formatter Timeout
+ break;
+ case 8:
+ erstate = 15; // FE Warning
+ break;
+ default:
+ erstate = 99;
+ break;
+ }
+ } else {
+ switch (bit) {
+ case 3:
+ erstate = 16; // BCID, ROD Synch
+ break;
+ case 4:
+ erstate = 17; // LVL1ID, ROD Synch
+ break;
+ case 8:
+ erstate = 18; // BCID counter, FE Synch
+ break;
+ case 12:
+ erstate = 19; // L1 trigger input in EODCL counter (write pointer), FE Synch
+ break;
+ case 13:
+ erstate = 20; // L1 trigger request counter to EODCL (read pointer), FE Synch
+ break;
+ case 14:
+ erstate = 21; // L1 register, register is full, FE Synch
+ break;
+ case 15:
+ erstate = 22; // L1 trigger ID in BC register, FE Synch
+ break;
+ case 23:
+ erstate = 23; // Skipped trigger because the L1 register is full, FE Synch
+ break;
+ case 0:
+ erstate = 24; // Row/Column, ROD Trunc
+ break;
+ case 1:
+ erstate = 25; // Limit error, ROD Trunc
+ break;
+ case 24:
+ erstate = 26; // Truncated event, FE Trunc
+ break;
+ case 5:
+ erstate = 27; // Preamble error, ROD Optical
+ break;
+ case 9:
+ erstate = 28; // Hamming code in word 0 in EOCHL, FE SEU
+ break;
+ case 10:
+ erstate = 29; // Hamming code in word 1 in EOCHL, FE SEU
+ break;
+ case 11:
+ erstate = 30; // Hamming code in word 2 in EOCHL, FE SEU
+ break;
+ case 32:
+ erstate = 31; // Triple redundant mismatch in Global Configuration Memory (CNFGMEM,) FE SEU
+ break;
+ case 36:
+ erstate = 32; // Bit flip in CMD, FE SEU
+ break;
+ case 37:
+ erstate = 33; // Triple redundant mismatch in CMD, FE SEU
+ break;
+ case 39:
+ erstate = 34; // Triple redundant mismatch in EFUSE, FE SEU
+ break;
+ case 2:
+ erstate = 35; // Trailer error, ROD
+ break;
+ case 7:
+ erstate = 36; // Timeout error, ROD
+ break;
+ case 6:
+ erstate = 37; // Masked link, ROD
+ break;
+ case 16:
+ erstate = 38; // Readout process error, FE
+ break;
+ case 33:
+ erstate = 39; // Write register data error, FE
+ break;
+ case 34:
+ erstate = 40; // Address error, FE
+ break;
+ case 35:
+ erstate = 41; // Other CMD decoder error, FE
+ break;
+ case 38:
+ erstate = 42; // Data bus address, FE
+ break;
+ default:
+ erstate = 99;
+ break;
+ }
+ }
+ return erstate;
+}
+
+int PixelAthErrorMonAlg::getErrorCategory(int error_cat_rodmod) const {
+ int error_cat = 99;
+ if (error_cat_rodmod == 1 || error_cat_rodmod == 2) error_cat = ErrorCategory::kSync;
+ if (error_cat_rodmod == 3 || error_cat_rodmod == 4) error_cat = ErrorCategory::kTrunc;
+ if (error_cat_rodmod == 5) error_cat = ErrorCategory::kOpt;
+ if (error_cat_rodmod == 6) error_cat = ErrorCategory::kSeu;
+ if (error_cat_rodmod == 7) error_cat = ErrorCategory::kTout;
+ return error_cat;
+}
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
new file mode 100644
index 0000000000000000000000000000000000000000..6eb8baf04c6e698b15bb594f110ac2a7381f3861
--- /dev/null
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthErrorMonAlg.h
@@ -0,0 +1,149 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+#ifndef PIXELATHERRORMONTOOL_H
+#define PIXELATHERRORMONTOOL_H
+
+#include "PixelAthMonitoringBase.h"
+#include "PixelConditionsTools/IPixelByteStreamErrorsTool.h"
+#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
+
+class PixelID;
+class IPixelByteStreamErrorsTool;
+
+class ErrorCategory {
+ public:
+ enum ErrorCategoryID {kSync = 0, kTrunc, kOpt, kSeu, kTout, COUNT};
+};
+
+class ErrorCategoryRODMOD {
+ public:
+ enum ErrorCategoryRODMODID {kSyncMod = 0, kSyncROD, kTruncMod, kTruncROD, kOpt, kSeu, kTout, COUNT};
+};
+
+static const int kNumErrorBitsFEI3{32};
+static const int kNumErrorBitsFEI4{40};
+
+// error states = error bits we care about but also ordered differently
+// order and naming is inherited from Run 2
+// (all state histograms go into ErrorsExpert folder)
+static constexpr std::array<const char*, 16> error_names_stateFEI3 {
+ "Mod_Sync_BCID1_errors",
+ "Mod_Sync_BCID2_errors",
+ "Mod_Sync_LVL1ID_errors",
+ "ROD_Sync_BCID_errors",
+ "ROD_Sync_LVL1ID_errors",
+ "Mod_Trunc_EOC_errors",
+ "Mod_Trunc_Hit_Overflow_errors",
+ "Mod_Trunc_EoE_Overflow_errors",
+ "ROD_Trunc_HT_Limit_errors",
+ "ROD_Trunc_ROD_OF_errors",
+ "Optical_Errors",
+ "SEU_Hit_Parity",
+ "SEU_Register_Parity",
+ "SEU_Hamming",
+ "ROD_Timeout",
+ "FE_Warning"
+};
+
+static constexpr std::array<const char*, 27> error_names_stateFEI4 {
+ "ROD_BCID_errors",
+ "ROD_LVL1ID_errors",
+ "SR_BCID_counter_errors",
+ "SR_L1_in_counter_errors",
+ "SR_L1_request_counter_errors",
+ "SR_L1_register_errors",
+ "SR_L1_Trigger_ID_errors",
+ "SR_Skippped_trig_count_errors",
+ "SR_Row-Column_errors",
+ "SR_Limit_errors",
+ "SR_Truncated_event_flag_errors",
+ "ROD_Preamble_errors",
+ "SR_Hamming_code_0_errors",
+ "SR_Hamming_code_1_errors",
+ "SR_Hamming_code_2_errors",
+ "SR_Triple_redundant_errors_CNFGMEM",
+ "SR_CMD_decoder_bitflip_errors",
+ "SR_Triple_redundant_errors_CMD",
+ "SR_Triple_redundant_errors_EFUSE",
+ "ROD_Trailer_errors",
+ "ROD_Timeout_errors",
+ "SR_Masked_link",
+ "SR_FE_readout_process_errors",
+ "SR_Write_reg_data_errors",
+ "SR Address_errors",
+ "SR_Other_CMD_decoder_errors",
+ "SR_Data_bus_address_errors"
+};
+
+static constexpr std::array<const char*, ErrorCategoryRODMOD::COUNT> error_names_cat_rodmod {
+ "SyncErrors_Mod",
+ "SyncErrors_ROD",
+ "TruncErrors_Mod",
+ "TruncErrors_ROD",
+ "OpticalErrors_RODMod",
+ "SEUErrors_RODMod",
+ "TimeoutErrors_RODMod"
+};
+
+static constexpr std::array<const char*, 4> error_names_cat_rodmod_norm {
+ "SyncErrors_Mod_Frac_per_event",
+ "SyncErrors_ROD_Frac_per_event",
+ "TruncErrors_Mod_Frac_per_event",
+ "TruncErrors_ROD_Frac_per_event"
+};
+
+static constexpr std::array<const char*, ErrorCategory::COUNT> error_names_cat {
+ "SyncErrors",
+ "TruncErrors",
+ "OpticalErrors",
+ "SEUErrors",
+ "TimeoutErrors"
+};
+
+static constexpr std::array<const char*, ErrorCategory::COUNT> error_names_cat_norm {
+ "SyncErrorsFrac_per_event",
+ "TruncationErrorsFrac_per_event",
+ "OpticalErrorsFrac_per_event",
+ "SEUErrorsFrac_per_event",
+ "TimeoutErrorsFrac_per_event"
+};
+
+static const int numErrorBitsLayer[PixLayers::COUNT] = {
+ kNumErrorBitsFEI3, kNumErrorBitsFEI3, kNumErrorBitsFEI3, kNumErrorBitsFEI3,
+ kNumErrorBitsFEI3, kNumErrorBitsFEI4, kNumErrorBitsFEI4, kNumErrorBitsFEI4
+};
+static const int kNumErrorCatRODMods{ErrorCategoryRODMOD::COUNT};
+static const int numErrorCatRODModsLayer[PixLayers::COUNT] = {
+ kNumErrorCatRODMods, kNumErrorCatRODMods, kNumErrorCatRODMods, kNumErrorCatRODMods,
+ kNumErrorCatRODMods, kNumErrorCatRODMods, kNumErrorCatRODMods, kNumErrorCatRODMods
+};
+
+class PixelAthErrorMonAlg : public PixelAthMonitoringBase {
+
+ public:
+
+ PixelAthErrorMonAlg( const std::string& name, ISvcLocator* pSvcLocator );
+ virtual ~PixelAthErrorMonAlg();
+ virtual StatusCode initialize() override;
+ virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
+ std::string findComponentString(int bec, int ld) const;
+ int getErrorState(int bit, bool isibl) const;
+ int getErrorCategory(int error_cat_rodmod) const;
+
+ private:
+
+ ToolHandle<IPixelByteStreamErrorsTool> m_pixelErrorTool{this, "PixelByteStreamErrorsTool", "PixelByteStreamErrorsTool", "Tool to retrieve PixelByteStreamErrors"};
+ ToolHandle<IInDetConditionsTool> m_pixelCondSummaryTool{this, "PixelConditionsSummaryTool", "PixelConditionsSummaryTool", "Tool to retrieve Pixel Conditions summary"};
+
+ const PixelID* m_pixelid;
+
+ bool m_doOnline;
+ bool m_doModules;
+ bool m_doLumiBlock;
+ bool m_doLowOccupancy;
+ bool m_doHighOccupancy;
+ bool m_doHeavyIonMon;
+};
+#endif
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
index 934ed5a1b4cffa8db35b492c241e8aba8a1bd71a..ba6a3eaa6e881ba333d6a2ee4f05bb19028a0520 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.cxx
@@ -1,11 +1,8 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "PixelMonitoring/PixelAthHitMonAlg.h"
-#include "PixelMonitoring/PixelAthMonitoringBase.h"
-#include "InDetIdentifier/PixelID.h"
-
+#include "PixelAthHitMonAlg.h"
#include "PixelCabling/IPixelCablingSvc.h"
PixelAthHitMonAlg::PixelAthHitMonAlg( const std::string& name, ISvcLocator* pSvcLocator ) :
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthHitMonAlg.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
similarity index 88%
rename from InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthHitMonAlg.h
rename to InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
index 93f3fdf5447a868ab6bafc1dad6a5867d04a79ef..8e2fd5a7764cea68de910d08cd5bbb1476b42fc5 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthHitMonAlg.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthHitMonAlg.h
@@ -5,21 +5,14 @@
#ifndef PIXELATHHITMONTOOL_H
#define PIXELATHHITMONTOOL_H
-#include "AthenaMonitoring/AthMonitorAlgorithm.h"
-#include "AthenaMonitoringKernel/Monitored.h"
-
-#include "InDetIdentifier/PixelID.h"
+#include "PixelAthMonitoringBase.h"
#include "InDetConditionsSummaryService/IInDetConditionsTool.h"
//#include "InDetReadoutGeometry/SiDetectorElementCollection.h"
-#include "StoreGate/ReadHandleKey.h"
-
#include "InDetRawData/InDetRawDataCLASS_DEF.h"
#include "InDetRawData/InDetRawDataContainer.h"
#include "InDetRawData/InDetTimeCollection.h"
-#include "PixelAthMonitoringBase.h"
-
class PixelID;
class IPixelCablingSvc;
class PixelRDORawData;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.cxx
index 3bc0596dffe65aec499e3ec260cbca6e0ca9be33..ec74ca188073886e693419a73dbb19da0128a77b 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.cxx
@@ -1,8 +1,8 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include "PixelMonitoring/PixelAthMonitoringBase.h"
+#include "PixelAthMonitoringBase.h"
//////////////////////////////////////////////
@@ -77,6 +77,27 @@ void PixelAthMonitoringBase::fill1DProfLumiLayers( const std::string& prof1Dname
}
//////////////////////////////////////////////
+///
+/// filling 2DProf per-lumi per-layer histograms ["ECA","ECC","B0","B1","B2","IBL","DBMA","DBMC"]
+///
+void PixelAthMonitoringBase::fill2DProfLumiLayers( const std::string& prof2Dname, int lumiblock, float(*values)[PixLayers::COUNT], const int* nCategories) const {
+ ATH_MSG_VERBOSE( "in fill2DProfLumiLayers()" );
+
+ // Define the monitored variables
+ auto lb = Monitored::Scalar<int>( prof2Dname + "_lb", lumiblock );
+ auto val = Monitored::Scalar<float>( prof2Dname + "_val", 1.0);
+ auto cat = Monitored::Scalar<int>( prof2Dname + "_cat");
+
+ for (int i = 0; i < PixLayers::COUNT; i++) {
+ for (cat = 0; cat < nCategories[i]; cat++) {
+ val = values[cat][i];
+ fill( pixLayersLabel[i], lb, cat, val);
+ }
+ }
+}
+//////////////////////////////////////////////
+
+
///
/// filling 1DProfile per-pp0(ROD) histograms for ["ECA","ECC","B0","B1","B2","IBLA","IBLC"]
///
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthMonitoringBase.h b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.h
similarity index 93%
rename from InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthMonitoringBase.h
rename to InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.h
index 8457de21adb07010330f4b58310bafa761b030dc..c7fe10d5b2e9642b060c9b6ebeed55c7dfdd25e5 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/PixelMonitoring/PixelAthMonitoringBase.h
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/PixelAthMonitoringBase.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef PIXELATHMONITORINGBASE_H
@@ -42,6 +42,7 @@ class PixelAthMonitoringBase : public virtual AthMonitorAlgorithm {
public:
void fill1DProfLumiLayers( const std::string& prof1Dname, int lb, float* weights ) const;
+ void fill2DProfLumiLayers( const std::string& prof2Dname, int lb, float (*weights)[PixLayers::COUNT], const int* nCategories ) const;
int getPixLayersID(int ec, int ld) const;
void getPhiEtaMod(const PixelID* pid, Identifier& id, int& phiMod, int& etaMod, bool& copyFE) const;
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
index cfc84d88e4bc6476ec81a478740b0392b4b87f48..a0595a26ed8e7fc9088c74565ccfca62c9229633 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/components/PixelMonitoring_entries.cxx
@@ -1,6 +1,6 @@
-#include "PixelMonitoring/PixelAthClusterMonAlg.h"
-#include "PixelMonitoring/PixelAthErrorMonAlg.h"
-#include "PixelMonitoring/PixelAthHitMonAlg.h"
+#include "src/PixelAthClusterMonAlg.h"
+#include "src/PixelAthErrorMonAlg.h"
+#include "src/PixelAthHitMonAlg.h"
DECLARE_COMPONENT( PixelAthClusterMonAlg )
DECLARE_COMPONENT( PixelAthErrorMonAlg )
diff --git a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/CMakeLists.txt b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/CMakeLists.txt
index 1a0476c1b88874c8256078a1e8e28831e293f259..f0669dbc4fdeedb3f86a33fccbc51d54b313851c 100644
--- a/InnerDetector/InDetMonitoring/TRTMonitoringRun3/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/TRTMonitoringRun3/CMakeLists.txt
@@ -67,13 +67,13 @@ atlas_add_library( TRTMonitoringRun3Lib
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} AthenaBaseComps xAODEventInfo InDetPrepRawData GaudiKernel TRT_ConditionsServicesLib InDetReadoutGeometry TRT_ReadoutGeometry InDetRawData TrkTrack TrkToolInterfaces AthenaMonitoringLib CommissionEvent TrkSpacePoint
- PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools SGAudCore AthenaPoolUtilities LumiBlockCompsLib EventInfo LWHists TrkTrackSummary InDetRIO_OnTrack InDetIdentifier TrkRIO_OnTrack TrkParameters TrkMeasurementBase TrkEventUtils TrkSurfaces PathResolver EventPrimitives Identifier AtlasDetDescr AthContainers )
+ PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} AthenaKernel SGTools SGAudCore AthenaPoolUtilities LumiBlockCompsLib EventInfo LWHists TrkTrackSummary InDetRIO_OnTrack InDetIdentifier TrkRIO_OnTrack TrkParameters TrkMeasurementBase TrkEventUtils TrkSurfaces PathResolver EventPrimitives Identifier AtlasDetDescr AthContainers TRT_DriftFunctionToolLib )
atlas_add_component( TRTMonitoringRun3
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${GEOMODELCORE_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} TRTMonitoringRun3Lib AthenaMonitoringLib SGAudCore SGTools AthenaPoolUtilities GaudiKernel EventInfo InDetRawData InDetPrepRawData LumiBlockCompsLib CommissionEvent AthContainers AtlasDetDescr Identifier xAODEventInfo EventPrimitives TRT_ConditionsServicesLib InDetReadoutGeometry TRT_ReadoutGeometry InDetRIO_OnTrack LWHists TrkTrack TrkTrackSummary TrkToolInterfaces AthenaKernel InDetIdentifier MagFieldInterfaces PathResolver TrkSurfaces TrkEventUtils TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkSpacePoint)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODELCORE_LIBRARIES} TRTMonitoringRun3Lib AthenaMonitoringLib SGAudCore SGTools AthenaPoolUtilities GaudiKernel EventInfo InDetRawData InDetPrepRawData LumiBlockCompsLib CommissionEvent AthContainers AtlasDetDescr Identifier xAODEventInfo EventPrimitives TRT_ConditionsServicesLib InDetReadoutGeometry TRT_ReadoutGeometry InDetRIO_OnTrack LWHists TrkTrack TrkTrackSummary TrkToolInterfaces AthenaKernel InDetIdentifier MagFieldInterfaces PathResolver TrkSurfaces TrkEventUtils TrkMeasurementBase TrkParameters TrkRIO_OnTrack TrkSpacePoint TRT_DriftFunctionToolLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/InnerDetector/InDetMonitoring/TRT_Monitoring/CMakeLists.txt b/InnerDetector/InDetMonitoring/TRT_Monitoring/CMakeLists.txt
index de05dcba5e690065978b037cbbb9670c58f5513e..14a6d8830d8901648b53d634b74019d9a7866bfb 100644
--- a/InnerDetector/InDetMonitoring/TRT_Monitoring/CMakeLists.txt
+++ b/InnerDetector/InDetMonitoring/TRT_Monitoring/CMakeLists.txt
@@ -43,7 +43,7 @@ atlas_add_component( TRT_Monitoring
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaMonitoringLib GaudiKernel InDetRawData LumiBlockCompsLib CommissionEvent AthContainers AtlasDetDescr Identifier xAODEventInfo xAODTrigger EventPrimitives TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetRIO_OnTrack LWHists TrkTrack TrkTrackSummary TrkToolInterfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${Boost_LIBRARIES} AthenaMonitoringLib GaudiKernel InDetRawData LumiBlockCompsLib CommissionEvent AthContainers AtlasDetDescr Identifier xAODEventInfo xAODTrigger EventPrimitives TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry InDetRIO_OnTrack LWHists TrkTrack TrkTrackSummary TrkToolInterfaces TRT_DriftFunctionToolLib )
# Install files from the package:
atlas_install_headers( TRT_Monitoring )
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
index 5e72a4d8f49965656de13d7e695006fe43c9412d..969b27bb8bbd938fa47005483d29a868696d7825 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/PixelClusterization.h
@@ -18,7 +18,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
// Base class
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "StoreGate/ReadHandleKey.h"
#include "StoreGate/WriteHandleKey.h"
@@ -52,7 +52,7 @@ namespace InDet {
* The clustering algorithm is actually a private Tool in the
* SiClusterizationTool package
**/
-class PixelClusterization : public AthAlgorithm {
+class PixelClusterization : public AthReentrantAlgorithm {
public:
typedef InDetRawDataCollection<PixelRDORawData> COLLECTION;
@@ -62,7 +62,7 @@ public:
//@name Usual algorithm methods
//@{
virtual StatusCode initialize() override;
- virtual StatusCode execute() override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
virtual StatusCode finalize() override;
/** @name Disallow default instantiation, copy, assignment */
//@{
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
index db0c7def4a389a5a6a2a589ec9c014d31ad83cff..87d61f41bedcfe0a3a8e2b523e575d63b927d4d4 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
@@ -19,7 +19,7 @@
#include "GaudiKernel/ToolHandle.h"
// Base class
-#include "AthenaBaseComps/AthAlgorithm.h"
+#include "AthenaBaseComps/AthReentrantAlgorithm.h"
#include "StoreGate/ReadHandleKey.h"
//InDet
@@ -43,7 +43,7 @@ namespace InDet{
* Top Algorithm for InDetRawDataContainer<TRT_RDORawData> conversion
* to TRT_DriftCircleContainer
**/
- class TRT_RIO_Maker : public AthAlgorithm {
+ class TRT_RIO_Maker : public AthReentrantAlgorithm {
public:
///constructor
TRT_RIO_Maker(const std::string &name, ISvcLocator *pSvcLocator);
@@ -51,9 +51,9 @@ namespace InDet{
virtual ~TRT_RIO_Maker() ;
/** @name Usual algorithm methods */
//@{
- StatusCode initialize () override;
- StatusCode execute () override;
- StatusCode finalize () override;
+ virtual StatusCode initialize () override;
+ virtual StatusCode execute(const EventContext& ctx) const override;
+ virtual StatusCode finalize () override;
//@}
private:
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
index 87347723dc267afe2761d5b70c8bf9b5c73c89d5..f6560df5b1205ee7407b0ec22b8ab62aa8be41d0 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx
@@ -30,7 +30,7 @@ namespace InDet{
using namespace InDet;
// Constructor with parameters:
PixelClusterization::PixelClusterization(const std::string &name, ISvcLocator *pSvcLocator) :
- AthAlgorithm(name,pSvcLocator),
+ AthReentrantAlgorithm(name, pSvcLocator),
m_clusteringTool("InDet::MergedPixelsTool", this), //made private
m_gangedAmbiguitiesFinder("InDet::PixelGangedAmbiguitiesFinder", this), //made private
m_rdoContainerKey(""),
@@ -103,14 +103,14 @@ namespace InDet{
//----------------------------------------------------------------------------
// Execute method:
- StatusCode PixelClusterization::execute() {
+ StatusCode PixelClusterization::execute(const EventContext& ctx) const {
- SG::WriteHandle<PixelClusterContainer> clusterContainer(m_clusterContainerKey);
+ SG::WriteHandle<PixelClusterContainer> clusterContainer(m_clusterContainerKey, ctx);
if(m_clusterContainercacheKey.key().empty()){
ATH_CHECK( clusterContainer.record (std::make_unique<PixelClusterContainer>(m_idHelper->wafer_hash_max())) );
}else{
- SG::UpdateHandle<PixelClusterContainerCache> clusterContainercache(m_clusterContainercacheKey);
+ SG::UpdateHandle<PixelClusterContainerCache> clusterContainercache(m_clusterContainercacheKey, ctx);
ATH_CHECK(clusterContainercache.isValid());
ATH_CHECK( clusterContainer.record (std::make_unique<PixelClusterContainer>(clusterContainercache.ptr() )));
}
@@ -122,10 +122,10 @@ namespace InDet{
ATH_MSG_DEBUG( "Pixel clusters '" << clusterContainer.name() << "' symlinked in StoreGate");
ATH_MSG_DEBUG( "Creating the ganged ambiguities map");
- SG::WriteHandle<PixelGangedClusterAmbiguities> ambiguitiesMap(m_ambiguitiesMapKey);
+ SG::WriteHandle<PixelGangedClusterAmbiguities> ambiguitiesMap(m_ambiguitiesMapKey, ctx);
ambiguitiesMap = std::make_unique<PixelGangedClusterAmbiguities>();
- SG::ReadHandle<PixelRDO_Container> rdoContainer(m_rdoContainerKey);
+ SG::ReadHandle<PixelRDO_Container> rdoContainer(m_rdoContainerKey, ctx);
ATH_CHECK(rdoContainer.isValid());
@@ -153,7 +153,7 @@ namespace InDet{
}
}
else {//enter RoI-seeded mode
- SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection(m_roiCollectionKey);
+ SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection(m_roiCollectionKey, ctx);
ATH_CHECK(roiCollection.isValid());
TrigRoiDescriptorCollection::const_iterator roi = roiCollection->begin();
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
index f4dda209ddc4370078ad68d4fd113ba44903393e..b5351ac681a4282614e476d39e0b4ed7a0ede5e3 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
@@ -27,7 +27,7 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
TRT_RIO_Maker::TRT_RIO_Maker
(const std::string& name,ISvcLocator* pSvcLocator) :
- AthAlgorithm(name,pSvcLocator),
+ AthReentrantAlgorithm(name,pSvcLocator),
m_pTRTHelper(nullptr),
m_rdoContainerKey("TRT_RDOs"),
m_driftcircle_tool("InDet::TRT_DriftCircleTool", this), //made private
@@ -73,21 +73,21 @@ namespace InDet {
///////////////////////////////////////////////////////////////////
// Execute
///////////////////////////////////////////////////////////////////
- StatusCode TRT_RIO_Maker::execute() {
+ StatusCode TRT_RIO_Maker::execute(const EventContext& ctx) const {
// TRT_DriftCircle container registration
- SG::WriteHandle<InDet::TRT_DriftCircleContainer> rioContainer(m_rioContainerKey);
+ SG::WriteHandle<InDet::TRT_DriftCircleContainer> rioContainer(m_rioContainerKey, ctx);
if(m_rioContainerCacheKey.key().empty()){
rioContainer = std::make_unique<InDet::TRT_DriftCircleContainer>(m_pTRTHelper->straw_layer_hash_max());
}else{
- SG::UpdateHandle<TRT_DriftCircleContainerCache> clusterContainercache(m_rioContainerCacheKey);
+ SG::UpdateHandle<TRT_DriftCircleContainerCache> clusterContainercache(m_rioContainerCacheKey, ctx);
ATH_CHECK( rioContainer.record (std::make_unique<TRT_DriftCircleContainer>(clusterContainercache.ptr()) ));
}
ATH_CHECK(rioContainer.isValid());
ATH_MSG_DEBUG( "Container "<< rioContainer.name() << " initialised" );
- SG::ReadHandle<TRT_RDO_Container> rdoContainer(m_rdoContainerKey);
+ SG::ReadHandle<TRT_RDO_Container> rdoContainer(m_rdoContainerKey, ctx);
ATH_CHECK(rdoContainer.isValid());
// Get TRT_RDO and produce TRT_RIO collections
@@ -98,13 +98,13 @@ namespace InDet {
InDet::TRT_DriftCircleContainer::IDC_WriteHandle lock = rioContainer->getWriteHandle(currentCollection->identifyHash());
if( lock.alreadyPresent() ) continue;
std::unique_ptr<TRT_DriftCircleCollection> p_rio(m_driftcircle_tool->convert(m_mode_rio_production,
- currentCollection , m_trtBadChannels));
+ currentCollection, ctx, m_trtBadChannels));
if(p_rio && !p_rio->empty()) {
ATH_CHECK(lock.addOrDelete(std::move(p_rio)));
}
}
}else{
- SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection(m_roiCollectionKey);
+ SG::ReadHandle<TrigRoiDescriptorCollection> roiCollection(m_roiCollectionKey, ctx);
ATH_CHECK(roiCollection.isValid());
std::vector<IdentifierHash> listOfTRTIds;
for(const TrigRoiDescriptor* roi : *roiCollection){
@@ -124,7 +124,7 @@ namespace InDet {
// Use one of the specific clustering AlgTools to make clusters
std::unique_ptr<TRT_DriftCircleCollection> p_rio(m_driftcircle_tool->convert(m_mode_rio_production,
- RDO_Collection , m_trtBadChannels));
+ RDO_Collection , ctx, m_trtBadChannels));
if (p_rio && !p_rio->empty()){
#ifndef NDEBUG
ATH_MSG_VERBOSE( "REGTEST: TRT : DriftCircleCollection contains "
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelGangedAmbiguitiesFinder.h b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelGangedAmbiguitiesFinder.h
index aa859429a4dfd0eb5f5955d7e9aee32ae37e71d6..f61325e794d6c3dde4565430fe8df8c893564bd5 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelGangedAmbiguitiesFinder.h
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelGangedAmbiguitiesFinder.h
@@ -58,7 +58,7 @@ namespace InDet{
// Inputs are the cluster collection of a module, and the silicon
// detector manager, and the map to be filled.
void execute(PixelClusterCollection* collection,
- PixelGangedClusterAmbiguities& map);
+ PixelGangedClusterAmbiguities& map) const;
private:
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelGangedAmbiguitiesFinder.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelGangedAmbiguitiesFinder.cxx
index d422b19340df23ad550cdf90401c9bd1039f9385..37fde0838e0ab0f8e14302e3905c20692a7a9a9d 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelGangedAmbiguitiesFinder.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelGangedAmbiguitiesFinder.cxx
@@ -53,7 +53,7 @@ StatusCode PixelGangedAmbiguitiesFinder::initialize() {
// Output is the map.
void PixelGangedAmbiguitiesFinder::execute(
PixelClusterCollection* collection,
- PixelGangedClusterAmbiguities& theMap){
+ PixelGangedClusterAmbiguities& theMap) const{
if (collection->size()<2) return;
ATH_MSG_DEBUG(collection->size() << " clusters");
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/CMakeLists.txt
index bc1ce89dd62980adf3861ca21c7f21e38e452878..d0073825fa24af143a3969d3b2f465fd12bc0962 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleOnTrackTool/CMakeLists.txt
@@ -23,7 +23,7 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_component( TRT_DriftCircleOnTrackTool
src/*.cxx
src/components/*.cxx
- LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRIO_OnTrack TrkRIO_OnTrack TrkToolInterfaces InDetReadoutGeometry TRT_ReadoutGeometry TrkEventPrimitives TrkRIO_OnTrack LumiBlockData)
+ LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRIO_OnTrack TrkRIO_OnTrack TrkToolInterfaces InDetReadoutGeometry TRT_ReadoutGeometry TrkEventPrimitives TrkRIO_OnTrack LumiBlockData TRT_DriftFunctionToolLib )
# Install files from the package:
atlas_install_headers( TRT_DriftCircleOnTrackTool )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/CMakeLists.txt
index a01d1abc7e0037d0aa38a617bfaa73a4d93064a0..0f7d1391f63d2d65237bc5932e681115f050cb54 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/CMakeLists.txt
@@ -32,7 +32,7 @@ atlas_add_component( TRT_DriftCircleTool
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel TRT_ConditionsServicesLib InDetRawData InDetPrepRawData TrkPrepRawData CommissionEvent GeoPrimitives EventPrimitives xAODEventInfo InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry LumiBlockData)
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps GaudiKernel TRT_ConditionsServicesLib InDetRawData InDetPrepRawData TrkPrepRawData CommissionEvent GeoPrimitives EventPrimitives xAODEventInfo InDetIdentifier InDetReadoutGeometry TRT_ReadoutGeometry LumiBlockData TRT_DriftFunctionToolLib )
# Install files from the package:
atlas_install_headers( TRT_DriftCircleTool )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/ITRT_DriftCircleTool.h b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/ITRT_DriftCircleTool.h
index 27150051f2fb6a586868261c61e81d2d997ce2b8..05b31efb6eb9f6d1e28cf40fca795c6c28a83739 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/ITRT_DriftCircleTool.h
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/ITRT_DriftCircleTool.h
@@ -43,7 +43,7 @@ namespace InDet {
static const InterfaceID& interfaceID( ) { return IID_ITRT_DriftCircleTool; };
/** Interface method */
- virtual InDet::TRT_DriftCircleCollection* convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const bool m_CTBBadChannels) = 0;
+ virtual InDet::TRT_DriftCircleCollection* convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const EventContext& ctx, const bool CTBBadChannels) const = 0;
/** test validity gate for corrected drift times */
virtual bool passValidityGate(unsigned int word, float lowGate, float highGate, float t0) const =0;
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleTool.h b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleTool.h
index ac813706da9585703d30f981bbc791e0def48c7e..4d6c27297bd686de124e581fd836a93a0b2a2f97 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleTool.h
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleTool.h
@@ -60,7 +60,7 @@ public:
virtual StatusCode finalize ();
/** make the conversion from RDOs to DriftCircles */
virtual InDet::TRT_DriftCircleCollection*
- convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const bool m_CTBBadChannels );
+ convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const EventContext& ctx, const bool CTBBadChannels) const;
/** test validity gate for corrected drift times */
virtual bool passValidityGate(unsigned int word, float lowGate, float highGate, float t0) const;
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h
index 4cf8f14446bb9145bca5e86b61ee14118dbe1da6..dd5e1cb1746033e99fb2858c5e07a779d7944de8 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/TRT_DriftCircleTool/TRT_DriftCircleToolCosmics.h
@@ -25,7 +25,7 @@
#include "TRT_ConditionsServices/ITRT_StrawStatusSummaryTool.h"
#include "TRT_ReadoutGeometry/TRT_DetElementContainer.h"
#include "CommissionEvent/ComTime.h"
-#include "StoreGate/ReadHandleKey.h"
+#include "StoreGate/ReadCondHandleKey.h"
class IInDetConditionsSvc;
class ITRT_DriftFunctionTool;
@@ -58,7 +58,7 @@ public:
virtual StatusCode finalize ();
/** make the conversion from RDOs to DriftCircles */
virtual InDet::TRT_DriftCircleCollection*
- convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const bool m_CTBBadChannels );
+ convert(int,const InDetRawDataCollection<TRT_RDORawData>*, const EventContext& ctx, const bool CTBBadChannels) const;
virtual bool passValidityGate(unsigned int word, float lowGate, float highGate, float t0) const;
///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx
index 5bfe95747cb0e75bff024d17e3480ac9501db6e0..d1c1d754782cbcad588478aa9448809eabb45345 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleTool.cxx
@@ -28,7 +28,7 @@
#include "EventPrimitives/EventPrimitives.h"
#include "xAODEventInfo/EventInfo.h"
-#include "StoreGate/ReadHandle.h"
+#include "StoreGate/ReadCondHandle.h"
///////////////////////////////////////////////////////////////////
// Constructior
///////////////////////////////////////////////////////////////////
@@ -183,7 +183,7 @@ bool InDet::TRT_DriftCircleTool::passValidityGate(unsigned int word, float lowGa
// Trk::TRT_DriftCircles collection production
///////////////////////////////////////////////////////////////////
-InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleTool::convert(int Mode,const InDetRawDataCollection<TRT_RDORawData>* rdo, const bool getTRTBadChannel)
+InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleTool::convert(int Mode,const InDetRawDataCollection<TRT_RDORawData>* rdo, const EventContext& ctx, const bool getTRTBadChannel) const
{
//Initialise a new TRT_DriftCircleCollection
@@ -194,7 +194,7 @@ InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleTool::convert(int Mode,c
return rio;
}
- SG::ReadCondHandle<InDetDD::TRT_DetElementContainer> trtDetEleHandle(m_trtDetEleContKey);
+ SG::ReadCondHandle<InDetDD::TRT_DetElementContainer> trtDetEleHandle(m_trtDetEleContKey, ctx);
const InDetDD::TRT_DetElementCollection* elements(trtDetEleHandle->getElements());
if (not trtDetEleHandle.isValid() or elements==nullptr) {
ATH_MSG_FATAL(m_trtDetEleContKey.fullKey() << " is not available.");
@@ -203,7 +203,7 @@ InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleTool::convert(int Mode,c
float mu = 0;
if (!m_lumiDataKey.empty()) {
- SG::ReadCondHandle<LuminosityCondData> lumiData (m_lumiDataKey);
+ SG::ReadCondHandle<LuminosityCondData> lumiData (m_lumiDataKey, ctx);
mu = lumiData->lbAverageInteractionsPerCrossing();
}
diff --git a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
index da032316eb6f82a4dcef841a2af57cbcaf91a4a6..1e4c8619f386e00b4208da4c7cde5a018d48d3d8 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftCircleTool/src/TRT_DriftCircleToolCosmics.cxx
@@ -34,7 +34,7 @@
#include "GeoPrimitives/GeoPrimitives.h"
#include "EventPrimitives/EventPrimitives.h"
-#include "StoreGate/ReadHandle.h"
+#include "StoreGate/ReadCondHandle.h"
///////////////////////////////////////////////////////////////////
// Constructior
///////////////////////////////////////////////////////////////////
@@ -188,7 +188,7 @@ StatusCode InDet::TRT_DriftCircleToolCosmics::finalize()
// Trk::TRT_DriftCircles collection production
///////////////////////////////////////////////////////////////////
-InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleToolCosmics::convert(int Mode,const InDetRawDataCollection<TRT_RDORawData>* rdo, const bool /* m_getTRTBadChannel */)
+InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleToolCosmics::convert(int Mode,const InDetRawDataCollection<TRT_RDORawData>* rdo, const EventContext& ctx, const bool /* _getTRTBadChannel */) const
{
//Initialise a new TRT_DriftCircleCollection
@@ -199,9 +199,9 @@ InDet::TRT_DriftCircleCollection* InDet::TRT_DriftCircleToolCosmics::convert(int
return rio;
}
- SG::ReadHandle<ComTime> theComTime(m_evtPhaseKey);
+ SG::ReadHandle<ComTime> theComTime(m_evtPhaseKey, ctx);
- SG::ReadCondHandle<InDetDD::TRT_DetElementContainer> trtDetEleHandle(m_trtDetEleContKey);
+ SG::ReadCondHandle<InDetDD::TRT_DetElementContainer> trtDetEleHandle(m_trtDetEleContKey, ctx);
const InDetDD::TRT_DetElementCollection* elements(trtDetEleHandle->getElements());
if (not trtDetEleHandle.isValid() or elements==nullptr) {
ATH_MSG_FATAL(m_trtDetEleContKey.fullKey() << " is not available.");
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/CMakeLists.txt
index 0f177cfb76414cb8a6d1abda21525792c49039a8..f3741dd7004b7bfa84b84fbf67874453c34690d7 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/CMakeLists.txt
@@ -21,13 +21,16 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies:
find_package( CLHEP )
+atlas_add_library( TRT_DriftFunctionToolLib
+ TRT_DriftFunctionTool/*..h
+ INTERFACE
+ PUBLIC_HEADERS TRT_DriftFunctionTool
+ LINK_LIBRARIES GaudiKernel )
+
# Component(s) in the package:
atlas_add_component( TRT_DriftFunctionTool
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry GeoModelUtilities EventInfo TRT_ConditionsServicesLib InDetIdentifier )
-
-# Install files from the package:
-atlas_install_headers( TRT_DriftFunctionTool )
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel InDetReadoutGeometry TRT_ReadoutGeometry GeoModelUtilities EventInfo TRT_ConditionsServicesLib InDetIdentifier TRT_DriftFunctionToolLib )
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/TRT_DriftFunctionTool/ITRT_DriftFunctionTool.h b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/TRT_DriftFunctionTool/ITRT_DriftFunctionTool.h
index 27b49ecb6c9d577ba5f70195e81e615513f76959..20ff6f71a9f9955bf1a4fcc220c9288bea4cc8d3 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/TRT_DriftFunctionTool/ITRT_DriftFunctionTool.h
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/TRT_DriftFunctionTool/ITRT_DriftFunctionTool.h
@@ -1,27 +1,27 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef ITRT_DRIFTFUNCTIONTOOL_H
-#define ITRT_DRIFTFUNCTIONTOOL_H
+#define ITRT_DRIFTFUNCTIONTOOL_H
// Include files
#include "GaudiKernel/IAlgTool.h"
class Identifier;
-/** Declaration of the interface ID ( interface id, major version, minor version) */
-static const InterfaceID IID_ITRT_DriftFunctionTool("ITRT_DriftFunctionTool", 1 , 0);
-
/** @class ITRT_DriftFunctionTool
Interface to AlgTool TRT_DriftFunctionTool */
class ITRT_DriftFunctionTool : virtual public IAlgTool {
-
+
public:
-
- /// Retrieve interface ID
- static const InterfaceID& interfaceID() { return IID_ITRT_DriftFunctionTool; }
+
+ /** Virtual destructor */
+ virtual ~ITRT_DriftFunctionTool(){}
+
+ /// Creates the InterfaceID and interfaceID() method
+ DeclareInterfaceID(ITRT_DriftFunctionTool, 1, 0);
virtual bool isValidTime(double drifttime) const = 0;
@@ -35,7 +35,7 @@ class ITRT_DriftFunctionTool : virtual public IAlgTool {
virtual double approxDriftTime(double driftradius) const = 0;
- virtual double errorOfDriftRadius(double drifttime, Identifier id, float mu = -10, unsigned int word=0) const = 0;
+ virtual double errorOfDriftRadius(double drifttime, Identifier id, float mu = -10, unsigned int word=0) const = 0;
virtual double driftTimeToTCorrection(double tot, Identifier id, bool isArgonStraw=false) const = 0;
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.cxx b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.cxx
index 4f886873de7a24e3361ccf63d9f147a117561cb5..e90f2b15acf276ff65c0315641a8dc44170ff6f7 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
///////////////////////////////////////////////////////////////////
@@ -12,7 +12,7 @@
///////////////////////////////////////////////////////////////////
-#include "TRT_DriftFunctionTool/TRT_DriftFunctionTool.h"
+#include "TRT_DriftFunctionTool.h"
#include "GaudiKernel/IToolSvc.h"
#include "GeoModelInterfaces/IGeoModelSvc.h"
@@ -34,7 +34,7 @@
TRT_DriftFunctionTool::TRT_DriftFunctionTool(const std::string& type,
const std::string& name,
const IInterface* parent)
- : AthAlgTool(type, name, parent),
+ : base_class(type, name, parent),
m_TRTCalDbTool("TRT_CalDbTool",this),
m_TRTCalDbTool2("",this),
m_drifttimeperbin(3.125 * CLHEP::ns),
@@ -65,7 +65,6 @@ TRT_DriftFunctionTool::TRT_DriftFunctionTool(const std::string& type,
m_tot_corrections_barrel_Ar(20, 0.), // initialised from python
m_tot_corrections_endcap_Ar(20, 0.) // initialised from python
{
- declareInterface<ITRT_DriftFunctionTool>(this);
m_drifttimeperhalfbin = m_drifttimeperbin/2.;
declareProperty("IsMC",m_ismc);
declareProperty("AllowDigiVersionOverride",m_allow_digi_version_override);
@@ -125,9 +124,6 @@ TRT_DriftFunctionTool::TRT_DriftFunctionTool(const std::string& type,
// Destructor--------------------------------------------------
TRT_DriftFunctionTool::~TRT_DriftFunctionTool(){}
-const InterfaceID& TRT_DriftFunctionTool::interfaceID( )
-{ return IID_ITRT_DriftFunctionTool; }
-
//
// Initialize--------------------------------------------------
StatusCode TRT_DriftFunctionTool::initialize()
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/TRT_DriftFunctionTool/TRT_DriftFunctionTool.h b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.h
similarity index 96%
rename from InnerDetector/InDetRecTools/TRT_DriftFunctionTool/TRT_DriftFunctionTool/TRT_DriftFunctionTool.h
rename to InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.h
index ca9edbb31dbfea1d3ed408ed347b8938b4011f68..0df90c51dd82149330c5b7bfe17f44655b41c674 100755
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/TRT_DriftFunctionTool/TRT_DriftFunctionTool.h
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/TRT_DriftFunctionTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -31,8 +31,7 @@ class TRT_ID;
* ie transforms a raw drifttime to a calibrated drift radius
*/
-class TRT_DriftFunctionTool: public AthAlgTool,
- virtual public ITRT_DriftFunctionTool{
+class TRT_DriftFunctionTool: public extends<AthAlgTool, ITRT_DriftFunctionTool>{
public:
/** Constructor */
@@ -43,9 +42,6 @@ public:
/** Destructor */
virtual ~TRT_DriftFunctionTool();
- /** AlgTool InterfaceID */
- static const InterfaceID& interfaceID();
-
/** Retrieves needed services */
virtual StatusCode initialize() override;
diff --git a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
index fcaffef4b324f5e0e133185fe422f0e333c2826a..515f6fb2bd9a6e8ec855403b8cc2425dccfbe06a 100644
--- a/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
+++ b/InnerDetector/InDetRecTools/TRT_DriftFunctionTool/src/components/TRT_DriftFunctionTool_entries.cxx
@@ -1,4 +1,4 @@
-#include "TRT_DriftFunctionTool/TRT_DriftFunctionTool.h"
+#include "../TRT_DriftFunctionTool.h"
DECLARE_COMPONENT( TRT_DriftFunctionTool )
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/CMakeLists.txt b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/CMakeLists.txt
index 6e19e500fab78b4b31400bb9ff1e5f9d8e7dfbfa..d610f999664d6ed90183a061fa945e6f7dba8bdf 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/CMakeLists.txt
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/CMakeLists.txt
@@ -20,6 +20,7 @@ atlas_depends_on_subdirs(
Control/AthContainers
Control/AthLinks
Control/AthToolSupport/AsgTools
+ Control/AthToolSupport/AsgDataHandles
Event/xAOD/xAODCore
Event/xAOD/xAODTracking
PRIVATE
@@ -33,7 +34,7 @@ find_package( ROOT COMPONENTS Core Hist RIO )
atlas_add_library( TrackVertexAssociationToolLib
Root/*.cxx
PUBLIC_HEADERS TrackVertexAssociationTool
- LINK_LIBRARIES AthContainers AthLinks AsgTools xAODCore xAODTracking
+ LINK_LIBRARIES AthContainers AthLinks AsgTools xAODCore xAODTracking AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES xAODEventInfo )
if( NOT XAOD_STANDALONE )
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/BaseTrackVertexAssociationTool.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/BaseTrackVertexAssociationTool.cxx
index d1ca4978451e011825ac81b42f1a9e4c46e6f63e..8e02937f36227b7ae842cf19ae0d0903572c2de7 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/BaseTrackVertexAssociationTool.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/BaseTrackVertexAssociationTool.cxx
@@ -4,6 +4,7 @@
#include "TrackVertexAssociationTool/BaseTrackVertexAssociationTool.h"
+#include "AsgDataHandles/ReadHandle.h"
#include "xAODEventInfo/EventInfo.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/TrackParticleContainer.h"
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TrackVertexAssociationTool.cxx b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TrackVertexAssociationTool.cxx
index 80bf11ab3c058ace3658020462b62bb9c56fd307..3af91028a5ccedc5dd70b31bc51dc7a5e1a6751b 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TrackVertexAssociationTool.cxx
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/Root/TrackVertexAssociationTool.cxx
@@ -4,6 +4,7 @@
#include "TrackVertexAssociationTool/TrackVertexAssociationTool.h"
+#include "AsgDataHandles/ReadHandle.h"
#include "xAODTracking/TrackParticle.h"
#include "xAODTracking/TrackParticleContainer.h"
#include "xAODTracking/TrackParticlexAODHelpers.h"
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/TrackVertexAssociationTool/BaseTrackVertexAssociationTool.h b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/TrackVertexAssociationTool/BaseTrackVertexAssociationTool.h
index 43916ba5565d0c04e74b8ea9240a71f653bd8878..21035bd9f9c3117843f8fd362ea72450c9dc93fd 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/TrackVertexAssociationTool/BaseTrackVertexAssociationTool.h
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/TrackVertexAssociationTool/BaseTrackVertexAssociationTool.h
@@ -9,6 +9,7 @@
#include "TrackVertexAssociationTool/ITrackVertexAssociationTool.h"
#include "AthContainers/AuxElement.h"
#include "AthLinks/ElementLink.h"
+#include "AsgDataHandles/ReadHandleKey.h"
#include "xAODTracking/TrackParticleFwd.h"
#include "xAODTracking/TrackParticleContainerFwd.h"
diff --git a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/TrackVertexAssociationTool/TrackVertexAssociationTool.h b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/TrackVertexAssociationTool/TrackVertexAssociationTool.h
index 2ba0ba4382cdb73fbafdda391786d2339922f68d..26f7e90c49c4f275e74d5c1e8055796f9e77a59e 100644
--- a/InnerDetector/InDetRecTools/TrackVertexAssociationTool/TrackVertexAssociationTool/TrackVertexAssociationTool.h
+++ b/InnerDetector/InDetRecTools/TrackVertexAssociationTool/TrackVertexAssociationTool/TrackVertexAssociationTool.h
@@ -9,6 +9,7 @@
#include "TrackVertexAssociationTool/ITrackVertexAssociationTool.h"
#include "AthContainers/AuxElement.h"
#include "AthLinks/ElementLink.h"
+#include "AsgDataHandles/ReadHandleKey.h"
#include "xAODEventInfo/EventInfo.h"
#include "xAODTracking/TrackParticleFwd.h"
@@ -111,4 +112,4 @@ namespace CP {
} // namespace CP
-#endif // TRACKVERTEXASSOCIATIONTOOL_H
\ No newline at end of file
+#endif // TRACKVERTEXASSOCIATIONTOOL_H
diff --git a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
index fd00d5d21e9535281afbd54e5cb1d4d715cfab2a..1ff1ff465119d6450e53e3ed1b8f23744ac5b3d2 100755
--- a/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
+++ b/InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/TRT_TrgRIO_Maker.cxx
@@ -387,7 +387,7 @@ namespace InDet{
if (RDO_Collection->size() != 0){
const InDet::TRT_DriftCircleCollection* p_rio =
- m_driftcircle_tool->convert (m_mode_rio_production, RDO_Collection, true);
+ m_driftcircle_tool->convert (m_mode_rio_production, RDO_Collection, getContext(), true);
m_numTrtDriftCircles += p_rio->size();
// -me- fix test
@@ -429,7 +429,7 @@ namespace InDet{
const InDetRawDataCollection<TRT_RDORawData>* currentCollection(*rdoCollections);
const InDet::TRT_DriftCircleCollection* p_rio=
- m_driftcircle_tool->convert(m_mode_rio_production, currentCollection , true);
+ m_driftcircle_tool->convert(m_mode_rio_production, currentCollection, getContext(), true);
if(p_rio) {
if (p_rio->size() != 0) {
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/CMakeLists.txt b/InnerDetector/InDetValidation/InDetPhysValMonitoring/CMakeLists.txt
index 1e4b9df08845a6e04295e8005aef30be169a5944..8d378ae75a4f1779264b68286d7e37219023798d 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/CMakeLists.txt
@@ -80,7 +80,7 @@ atlas_add_component( InDetPhysValMonitoring
# Install files from the package:
atlas_install_headers( InDetPhysValMonitoring )
atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_joboptions( share/*.py share/*.txt )
atlas_install_runtime( share/*.hdef share/*.xml share/*.xsl )
atlas_install_runtime( test/InDetPhysValMonitoring_TestConfiguration.xml )
@@ -97,5 +97,12 @@ atlas_add_test( SingleHistogramDefinition_test
POST_EXEC_SCRIPT "nopost.sh"
)
+atlas_add_test( HistogramDefinitionSvc_test
+ SOURCES
+ test/HistogramDefinitionSvc_test.cxx
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
+ LINK_LIBRARIES ${Boost_LIBRARIES} InDetPhysValMonitoringLib
+ POST_EXEC_SCRIPT "nopost.sh"
+)
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/IDPVM_Test.txt b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/IDPVM_Test.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f5103f439bb6f83c4739d72a8f37b51b0418debf
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/share/IDPVM_Test.txt
@@ -0,0 +1,6 @@
+ApplicationMgr.OutputLevel = 5;
+ApplicationMgr.DLLs += { "InDetPhysValMonitoring" };
+ApplicationMgr.CreateSvc += { "HistogramDefinitionSvc/HistogramDefinitionSvc" };
+HistogramDefinitionSvc.DefinitionFormat = "text/xml";
+HistogramDefinitionSvc.DefinitionSource = "testHDef.xml";
+MessageSvc.OutputLevel = 5;
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/HistogramDefinitionSvc_test.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/HistogramDefinitionSvc_test.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..4fd89b2545b60e901d57ef619b1dda8ecd0ae654
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/HistogramDefinitionSvc_test.cxx
@@ -0,0 +1,111 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+
+/**
+ * @file InDetPhysValMonitoring/test/HistogramDefinitionSvc_test.cxx
+ * @author Shaun Roe
+ * @date May 2020
+ * @brief Some tests for HistogramDefinitionSvc service
+ */
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MAIN
+#define BOOST_TEST_MODULE TEST_IOVDBSVC
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverloaded-virtual"
+#include <boost/test/unit_test.hpp>
+#pragma GCC diagnostic pop
+
+#include "IDPVM_GaudiFixtureBase.h"
+#include "../InDetPhysValMonitoring/HistogramDefinitionSvc.h"
+#include "../InDetPhysValMonitoring/SingleHistogramDefinition.h"
+#include <utility> //std::pair
+
+static const std::string testJobOptionsFile("IDPVM_Test.txt");
+
+struct GaudiKernelFixture:public IDPVM_GaudiFixtureBase{
+ GaudiKernelFixture():IDPVM_GaudiFixtureBase(testJobOptionsFile){
+ //nop, everything in base.
+ }
+};
+
+BOOST_AUTO_TEST_SUITE(HistogramDefinitionSvcTest)
+ GaudiKernelFixture g;
+ const auto & svcLoc=g.svcLoc;
+ ServiceHandle<IHistogramDefinitionSvc> hDefSvc ("HistogramDefinitionSvc", "test");
+
+ BOOST_AUTO_TEST_CASE( SanityCheck ){
+ const bool svcLocatorIsOk=(svcLoc != nullptr);
+ BOOST_TEST(svcLocatorIsOk);
+ }
+
+ BOOST_AUTO_TEST_CASE(HistogramDefinitionSvcRetrieved){
+ BOOST_TEST (hDefSvc.retrieve().isSuccess());
+ }
+
+ BOOST_AUTO_TEST_CASE(interfaceID){
+ InterfaceID testId("IHistogramDefinitionSvc",1,0);
+ BOOST_TEST(hDefSvc->interfaceID()==testId);
+ }
+
+ BOOST_AUTO_TEST_CASE(publicMethods){
+ //Histogram definitions are in the test file ../share/testHDef.xml and its inclusion,
+ //../share/inc.xml
+ /**
+ This is a straightforward definition in the testHDef.xml file:
+ <h id="002_Al_N_01" type="TH1F" title="[SRoe] Number of Selected Tracks">
+ <x title="Num. tracks" n="200" lo="0" hi="1000"/>
+ <y title="Entries"/>
+ </h>
+ **/
+ const std::string hId{"002_Al_N_01"};
+ const std::string hType{"TH1F"};
+ const std::string hTitle{"[SRoe] Number of Selected Tracks"};
+ const std::string xTitle{"Num. tracks"};
+ const unsigned int nXbins{200};
+ const float xLo{0.};
+ const float xHi{1000.};
+ const std::string yTitle{"Entries"};
+ SingleHistogramDefinition referenceDefinition(hId, hType, hTitle, nXbins, xLo, xHi, xTitle, yTitle );
+ //operator == is not defined on SingleHistogramDefinition, so make an ad-hoc lambda
+ auto sameDefinition = [](const SingleHistogramDefinition &s1, const SingleHistogramDefinition &s2){
+ bool sameTitles = (s1.titleDigest() == s2.titleDigest());
+ bool sameNames = (s1.name == s2.name);
+ bool sameBinning = (s1.nBinsX == s2.nBinsX) and (s1.xAxis == s2.xAxis);
+ return sameTitles and sameNames and sameBinning;
+ };
+ BOOST_TEST(sameDefinition(hDefSvc->definition("002_Al_N_01"), referenceDefinition));
+ // check facade methods which just pass through to the SingleHistogramDefinition InterfaceID
+ BOOST_TEST(hDefSvc->histoType("002_Al_N_01") == hType);
+ BOOST_TEST(hDefSvc->title("002_Al_N_01") == hTitle);
+ BOOST_TEST(hDefSvc->nBinsX("002_Al_N_01") == 200);
+ BOOST_TEST(hDefSvc->nBinsY("002_Al_N_01") == 0);
+ BOOST_TEST(hDefSvc->nBinsZ("002_Al_N_01") == 0);
+ const std::pair<float, float> xAxis{xLo,xHi};
+ BOOST_TEST((hDefSvc->xLimits("002_Al_N_01") == xAxis));
+ //not checking y axis, z axis
+ BOOST_TEST(hDefSvc->xTitle("002_Al_N_01") == xTitle);
+ BOOST_TEST(hDefSvc->yTitle("002_Al_N_01") == yTitle);
+ BOOST_TEST(hDefSvc->zTitle("002_Al_N_01").empty());
+ //what happens if you try to retrieve a non existent definition?
+ BOOST_TEST(hDefSvc->definition("non_existent_definition").isValid() == false);
+ BOOST_TEST(hDefSvc->definition("non_existent_definition").empty());
+ // The following are just tests of the xml parsing capability, could be moved to
+ // another test module
+ //
+ // Does in-file entity definition work? e.g. <!ENTITY ETAMAX "2.5">,
+ // <x title="#eta" n="20" lo="-&ETAMAX;" hi="&ETAMAX;"/>
+ const std::string definitionIdUsingEntity("track_fakerate_vs_eta");
+ const std::pair<float, float> etaRange{-2.5,2.5};
+ BOOST_TEST((hDefSvc->definition(definitionIdUsingEntity).xAxis == etaRange));
+ //Does the XInclude capability work?
+ const std::string xincludedDefinition("include");
+ BOOST_TEST(hDefSvc->definition(xincludedDefinition).isValid());
+ //Does file inclusion using entities work? (todo)
+ //
+ // What has not been checked: Non-existent file or XML parsing errors
+ }
+BOOST_AUTO_TEST_SUITE_END()
+
\ No newline at end of file
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/IDPVM_GaudiFixtureBase.h b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/IDPVM_GaudiFixtureBase.h
new file mode 100644
index 0000000000000000000000000000000000000000..4b8296fe0acd689a620a28d76e681dec19eae5d5
--- /dev/null
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/IDPVM_GaudiFixtureBase.h
@@ -0,0 +1,37 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+*/
+/*
+ */
+/**
+ * @file InDetPhysValMonitoring/test/IDPVM_GaudiFixtureBase.h
+ * @author Shaun Roe
+ * @date May 2020
+ * @brief Base class for initialising Gaudi in fixtures
+ */
+
+#ifndef InDetPhysValMonitoring_IDPVM_GaudiFixtureBase_h
+#define InDetPhysValMonitoring_IDPVM_GaudiFixtureBase_h
+
+
+#include "TestTools/initGaudi.h"
+#include "TInterpreter.h"
+#include "CxxUtils/ubsan_suppress.h"
+#include <string>
+
+struct IDPVM_GaudiFixtureBase{
+ ISvcLocator* svcLoc{};
+ static bool gaudiIsInitialised;
+ const std::string jobOpts{};
+ IDPVM_GaudiFixtureBase(const std::string & jobOptionFile = "IDPVM_Test.txt"):jobOpts(jobOptionFile){
+ CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); } );
+ if (not gaudiIsInitialised){
+ std::string fullJobOptsName="InDetPhysValMonitoring/" + jobOpts;
+ gaudiIsInitialised=Athena_test::initGaudi(fullJobOptsName, svcLoc);
+ }
+ }
+};
+
+bool IDPVM_GaudiFixtureBase::gaudiIsInitialised=false;
+
+#endif
diff --git a/LArCalorimeter/LArBadChannelTool/CMakeLists.txt b/LArCalorimeter/LArBadChannelTool/CMakeLists.txt
index f1e6ffa1287319f1224c154bc014e568a7eae369..b241c2c5c6f3b35924a825127e0b36f460f866a4 100644
--- a/LArCalorimeter/LArBadChannelTool/CMakeLists.txt
+++ b/LArCalorimeter/LArBadChannelTool/CMakeLists.txt
@@ -51,14 +51,6 @@ atlas_add_test( LArBadChannelConfigTest
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_install_scripts( share/LArBuildBadChannelDB.sh share/LArBuildMissingFebDB.sh )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/LArCalorimeter/LArBadChannelTool/share/LArBadChannel2Ascii.py b/LArCalorimeter/LArBadChannelTool/share/LArBadChannel2Ascii.py
index 6c83c1d7b41e206bc52b8439fda38294cc9ccbb2..f3eed1363c4205023024f53b63a715133687bad0 100644
--- a/LArCalorimeter/LArBadChannelTool/share/LArBadChannel2Ascii.py
+++ b/LArCalorimeter/LArBadChannelTool/share/LArBadChannel2Ascii.py
@@ -41,7 +41,7 @@ globalflags.DataSource="data"
globalflags.InputFormat="bytestream"
if 'OFLP' not in DBInstance:
globalflags.DatabaseInstance=DBInstance
-
+
from AthenaCommon.JobProperties import jobproperties
jobproperties.Global.DetDescrVersion = "ATLAS-R2-2015-04-00-00"
diff --git a/LArCalorimeter/LArBadChannelTool/share/LArBadChannelDBAlg.py b/LArCalorimeter/LArBadChannelTool/share/LArBadChannelDBAlg.py
index f05d83a5f750291a306aedd28011d2ee9faffc2e..ffc27289cba4e03e4d1ac570e62bb95496d6affb 100644
--- a/LArCalorimeter/LArBadChannelTool/share/LArBadChannelDBAlg.py
+++ b/LArCalorimeter/LArBadChannelTool/share/LArBadChannelDBAlg.py
@@ -100,7 +100,7 @@ OutputTagList=[Tag]
from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.root",
- OutputList,OutputTagList,True)
+ OutputList,OutputTagList,True)
theOutputConditionsAlg.Run1 = IOVBeginRun
theOutputConditionsAlg.LB1 = IOVBeginLB
diff --git a/LArCalorimeter/LArBadChannelTool/share/LArBadChannelReadTest.py b/LArCalorimeter/LArBadChannelTool/share/LArBadChannelReadTest.py
index 23c47a9fe93b3bd0813cb0717ce73ed6c5e46a2c..2bd22534b250e8903ef2b40e5fa4c9c0c54aac9b 100644
--- a/LArCalorimeter/LArBadChannelTool/share/LArBadChannelReadTest.py
+++ b/LArCalorimeter/LArBadChannelTool/share/LArBadChannelReadTest.py
@@ -61,7 +61,6 @@ theApp.EvtMax=1
## theByteStreamInputSvc=svcMgr.ByteStreamInputSvc
## theByteStreamInputSvc.FullFileName=["/home/wlampl/LArOFIter/ramp/inputs/daq.Ramp.0029146.No.Streaming.LB0000.EB-EMBA._0001.data"]
-## theByteStreamInputSvc.MaxBadEvents=0
#That's the dumper, keep for now
diff --git a/LArCalorimeter/LArBadChannelTool/share/LArMissingFebDbAlg.py b/LArCalorimeter/LArBadChannelTool/share/LArMissingFebDbAlg.py
index 985416680830466c8895bf81f3c04fcd2e3a6411..30d9bd2b91ab6abeb16e06700166e951cebd4868 100644
--- a/LArCalorimeter/LArBadChannelTool/share/LArMissingFebDbAlg.py
+++ b/LArCalorimeter/LArBadChannelTool/share/LArMissingFebDbAlg.py
@@ -34,7 +34,7 @@ import AthenaCommon.AtlasUnixGeneratorJob
from AthenaCommon.GlobalFlags import globalflags
globalflags.DataSource="data"
globalflags.InputFormat="bytestream"
-
+
from AthenaCommon.JobProperties import jobproperties
jobproperties.Global.DetDescrVersion = "ATLAS-R2-2015-04-00-00"
@@ -97,7 +97,7 @@ OutputTagList=[FEBTag]
WriteIOV=True
from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.root",
- OutputList,OutputTagList,WriteIOV)
+ OutputList,OutputTagList,WriteIOV)
theOutputConditionsAlg.Run1 = IOVBeginRun
theOutputConditionsAlg.LB1 = IOVBeginLB
diff --git a/LArCalorimeter/LArBadChannelTool/share/LArMissingFebs2Ascii.py b/LArCalorimeter/LArBadChannelTool/share/LArMissingFebs2Ascii.py
index e6d2b3e335e98d345f4b756aefd8494cd37e563b..d8f767d1a060b70263d17c2ad40ad10f0a4bb183 100644
--- a/LArCalorimeter/LArBadChannelTool/share/LArMissingFebs2Ascii.py
+++ b/LArCalorimeter/LArBadChannelTool/share/LArMissingFebs2Ascii.py
@@ -30,7 +30,7 @@ import AthenaCommon.AtlasUnixGeneratorJob
from AthenaCommon.GlobalFlags import globalflags
globalflags.DataSource="data"
globalflags.InputFormat="bytestream"
-
+
from AthenaCommon.JobProperties import jobproperties
jobproperties.Global.DetDescrVersion = "ATLAS-R2-2015-04-00-00"
diff --git a/LArCalorimeter/LArCabling/CMakeLists.txt b/LArCalorimeter/LArCabling/CMakeLists.txt
index f0f6104d6035fcc03c85cb462880d136e96a0a75..2b24348c698a7aa49d4983be1efae9d5fcfaaa83 100644
--- a/LArCalorimeter/LArCabling/CMakeLists.txt
+++ b/LArCalorimeter/LArCabling/CMakeLists.txt
@@ -43,18 +43,10 @@ atlas_add_dictionary( LArCablingDict
LINK_LIBRARIES ${ROOT_LIBRARIES} ${CORAL_LIBRARIES} CaloIdentifier AthenaBaseComps AthenaKernel StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel LArIdentifier PathResolver LArCablingLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_install_runtime( share/FEBtoRODfred_v10.data )
if( NOT SIMULATIONBASE AND NOT GENERATIONBASE )
atlas_add_test( LArCablingConfig SCRIPT python -m LArCabling.LArCablingConfig POST_EXEC_SCRIPT nopost.sh )
endif()
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/LArCalorimeter/LArCafJobs/CMakeLists.txt b/LArCalorimeter/LArCafJobs/CMakeLists.txt
index 76918f736c954c2af79115e9f2384c63cc72708a..dc9e4624743c4850e043c3f0d07aa719e70d5562 100644
--- a/LArCalorimeter/LArCafJobs/CMakeLists.txt
+++ b/LArCalorimeter/LArCafJobs/CMakeLists.txt
@@ -96,14 +96,6 @@ atlas_add_executable( LArSamplesMerge
LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES} CaloIdentifier AthenaBaseComps StoreGateLib SGtests GaudiKernel LArIdentifier LArRawConditions LArRawEvent LArToolsLib TrigDecisionToolLib TrigSteeringEvent CaloDetDescrLib DataQualityUtils Identifier xAODEventInfo LArRecConditions TrigConfHLTData TrigT1Result LArCafJobsLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_install_scripts( share/LArHistMerge_trf.py share/LArCAF_tf.py share/LArNoiseBursts_tf.py share/LArNoiseBursts_fromraw_tf.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/LArCalorimeter/LArCalibTools/share/LArDigits2Ntuple_jobOptions.py b/LArCalorimeter/LArCalibTools/share/LArDigits2Ntuple_jobOptions.py
index 96c3471e2d64a606302448b42c79e2442c62b485..add93e7a5c15331519d77f0515c37d68f4fdc9e4 100755
--- a/LArCalorimeter/LArCalibTools/share/LArDigits2Ntuple_jobOptions.py
+++ b/LArCalorimeter/LArCalibTools/share/LArDigits2Ntuple_jobOptions.py
@@ -139,7 +139,7 @@ if not 'FullFileName' in dir():
else :
theByteStreamInputSvc.FullFileName=FullFileName
-theByteStreamInputSvc.MaxBadEvents=0
+scvMgr.EventSelector.MaxBadEvents = 0
svcMgr.ByteStreamCnvSvc.InitCnvs += [ "EventInfo"]
theByteStreamAddressProviderSvc =svcMgr.ByteStreamAddressProviderSvc
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DelayXtalk_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DelayXtalk_jobOptions.py
index ebca655d996c1649e3b2f36f1bc64d13e166f2cb..82a87d4bb1c07993b65989e2fb8f81a1ce5b44d2 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DelayXtalk_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_DelayXtalk_jobOptions.py
@@ -265,7 +265,7 @@ if not 'FullFileName' in dir():
else :
theByteStreamInputSvc.FullFileName=FullFileName
-theByteStreamInputSvc.MaxBadEvents=0
+svcMgr.EventSelector.MaxBadEvents = 0
theByteStreamAddressProviderSvc =svcMgr.ByteStreamAddressProviderSvc
theByteStreamAddressProviderSvc.TypeNames += ["LArFebHeaderContainer/LArFebHeader"]
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_Cali_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_Cali_jobOptions.py
index 36b4e78a1013e4c2e5ab149e9a4e5880581a480c..1fc6e113ac4fe5626a9ebc17c31d6117c8bfa028 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_Cali_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_Cali_jobOptions.py
@@ -454,7 +454,7 @@ else :
#theByteStreamInputSvc.FullFileName=FullFileName
svcMgr.EventSelector.Input = FullFileName
-theByteStreamInputSvc.MaxBadEvents=0
+scvMgr.EventSelector.MaxBadEvents = 0
##############################################################################################
# #
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_splitter_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_splitter_jobOptions.py
index 00ddca51be42780557d793694b74bb10686bd0da..d318758a2df18b20c6f722012bc4219d5bc93f8e 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_splitter_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_OFC_splitter_jobOptions.py
@@ -451,8 +451,8 @@ if not 'FullFileName' in dir():
theApp.exit(-1)
else :
theByteStreamInputSvc.FullFileName=FullFileName
-
-theByteStreamInputSvc.MaxBadEvents=0
+
+svcMgr.EventSelector.MaxBadEvents = 0
##############################################################################################
# #
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_jobOptions.py
index 55e57ea4d299dd096d22440b614bde7f5d630f9c..d6bde46597b78d0ede04654d92c026a0e10cdaf5 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_jobOptions.py
@@ -270,7 +270,7 @@ if not 'FullFileName' in dir():
else :
theByteStreamInputSvc.FullFileName=FullFileName
-theByteStreamInputSvc.MaxBadEvents=0
+scvMgr.EventSelector.MaxBadEvents = 0
##############################################################################################
# #
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_splitter_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_splitter_jobOptions.py
index 2169546e74664be818a4656d41552e7080301d91..f4798504b7d213c80f5e2e4d51dbc2d6cdf626df 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_splitter_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Delay_splitter_jobOptions.py
@@ -298,7 +298,7 @@ if not 'FullFileName' in dir():
else :
theByteStreamInputSvc.FullFileName=FullFileName
-theByteStreamInputSvc.MaxBadEvents=0
+scvMgr.EventSelector.MaxBadEvents = 0
##############################################################################################
# #
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_PedestalAutoCorr_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_PedestalAutoCorr_jobOptions.py
index 0dffa8fcc190b096523e51c1bdc3db148eae14e6..7e8acce43737142c6cb8ec8e3e1ec77df3bbceb5 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_PedestalAutoCorr_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_PedestalAutoCorr_jobOptions.py
@@ -285,7 +285,7 @@ if not 'FullFileName' in dir():
else :
theByteStreamInputSvc.FullFileName=FullFileName
-theByteStreamInputSvc.MaxBadEvents=0
+scvMgr.EventSelector.MaxBadEvents = 0
##############################################################################################
# #
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_jobOptions.py
index 88a3f8f6efbbb199ae71b5465d7fbf3dd946cd6a..42b97e043065bd416aca2fc9936fe9edc6d5aa01 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_jobOptions.py
@@ -346,7 +346,7 @@ if not 'FullFileName' in dir():
else :
theByteStreamInputSvc.FullFileName=FullFileName
-theByteStreamInputSvc.MaxBadEvents=0
+scvMgr.EventSelector.MaxBadEvents = 0
##############################################################################################
# #
diff --git a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_splitter_jobOptions.py b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_splitter_jobOptions.py
index 9f5566aac260c61ac10d6c9df1cf1edeebb47ce2..c4a990f607f6304ad67c8487ce7a87e738cb52b6 100644
--- a/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_splitter_jobOptions.py
+++ b/LArCalorimeter/LArExample/LArCalibProcessing/share/LArCalib_Ramp_splitter_jobOptions.py
@@ -322,7 +322,7 @@ if not 'FullFileName' in dir():
else :
theByteStreamInputSvc.FullFileName=FullFileName
-theByteStreamInputSvc.MaxBadEvents=0
+scvMgr.EventSelector.MaxBadEvents = 0
##############################################################################################
# #
diff --git a/LArCalorimeter/LArG4/LArG4EC/python/LArG4ECConfigNew.py b/LArCalorimeter/LArG4/LArG4EC/python/LArG4ECConfigNew.py
index b51a5b116abbf9f4a89f033367336acac69008a7..37c0405d59ac30207cc910a7ab37ce6cfb656b71 100644
--- a/LArCalorimeter/LArG4/LArG4EC/python/LArG4ECConfigNew.py
+++ b/LArCalorimeter/LArG4/LArG4EC/python/LArG4ECConfigNew.py
@@ -1,8 +1,9 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
from LArG4EC import LArWheelCalculatorEnum
+from LArG4SD.LArG4SDToolConfig import CalibrationDefaultCalculatorCfg
def CalibrationCalculatorCfg(name="CalibrationCalculator", **kwargs):
result = ComponentAccumulator()
result.addService(CompFactory.LArG4.EC.CalibrationCalculator(name, **kwargs))
@@ -53,7 +54,8 @@ def EndcapCryostatCalibrationCalculatorCfg(ConfigFlags, name="EndcapCryostatCali
return result
def EndcapCryostatCalibrationLArCalculatorCfg(ConfigFlags, name="EndcapCryostatCalibrationLArCalculator", **kwargs):
- result = ComponentAccumulator()
+ result = CalibrationDefaultCalculatorCfg(ConfigFlags)
+ kwargs.setdefault("CalibrationDefaultCalculator", result.getService("CalibrationDefaultCalculator"))
result.addService( CompFactory.LArG4.EndcapCryostat.CalibrationLArCalculator(name, **kwargs) )
return result
@@ -63,12 +65,14 @@ def EndcapCryostatCalibrationMixedCalculatorCfg(ConfigFlags, name="EndcapCryosta
return result
def EMECSupportCalibrationCalculatorCfg(ConfigFlags, name="EMECSupportCalibrationCalculator", **kwargs):
- result = ComponentAccumulator()
+ result = EndcapCryostatCalibrationLArCalculatorCfg(ConfigFlags)
+ kwargs.setdefault("BackupCalculator", result.getService("EndcapCryostatCalibrationLArCalculator"))
result.addService( CompFactory.LArG4.EMECSupportCalibrationCalculator(name, **kwargs))
return result
-def EnergyCalculatorCfg(name="EnergyCalculator", **kwargs):
- result = ComponentAccumulator()
+def EnergyCalculatorCfg(ConfigFlags, name="EnergyCalculator", **kwargs):
+ result = EMECSupportCalibrationCalculatorCfg(ConfigFlags)
+ kwargs.setdefault("SupportCalculator", result.getService("EMECSupportCalibrationCalculator"))
from AthenaCommon.SystemOfUnits import ns
kwargs.setdefault("OOTcut", 300.0*ns)
@@ -79,36 +83,36 @@ def EMECPosInnerWheelCalculatorCfg(ConfigFlags, name="EMECPosInnerWheelCalculato
kwargs.setdefault("WheelType", LArWheelCalculatorEnum.InnerAbsorberWheel)
#kwargs.setdefault("EnergyCorrection", 8) #LArG4::EMEC_ECOR_CHCL1
kwargs.setdefault("zSide", 1)
- return EnergyCalculatorCfg(name, **kwargs)
+ return EnergyCalculatorCfg(ConfigFlags, name, **kwargs)
def EMECNegInnerWheelCalculatorCfg(ConfigFlags, name="EMECNegInnerWheelCalculator", **kwargs):
kwargs.setdefault("WheelType", LArWheelCalculatorEnum.InnerAbsorberWheel)
#kwargs.setdefault("EnergyCorrection", 8) #LArG4::EMEC_ECOR_CHCL1
kwargs.setdefault("zSide", -1)
- return EnergyCalculatorCfg(name, **kwargs)
+ return EnergyCalculatorCfg(ConfigFlags, name, **kwargs)
def EMECPosOuterWheelCalculatorCfg(ConfigFlags, name="EMECPosOuterWheelCalculator", **kwargs):
kwargs.setdefault("WheelType", LArWheelCalculatorEnum.OuterAbsorberWheel)
#kwargs.setdefault("EnergyCorrection", 8) #LArG4::EMEC_ECOR_CHCL1
kwargs.setdefault("zSide", 1)
- return EnergyCalculatorCfg(name, **kwargs)
+ return EnergyCalculatorCfg(ConfigFlags, name, **kwargs)
def EMECNegOuterWheelCalculatorCfg(ConfigFlags, name="EMECNegOuterWheelCalculator", **kwargs):
kwargs.setdefault("WheelType", LArWheelCalculatorEnum.OuterAbsorberWheel)
#kwargs.setdefault("EnergyCorrection", 8) #LArG4::EMEC_ECOR_CHCL1
kwargs.setdefault("zSide", -1)
- return EnergyCalculatorCfg(name, **kwargs)
+ return EnergyCalculatorCfg(ConfigFlags, name, **kwargs)
def EMECPosBackOuterBarretteCalculatorCfg(ConfigFlags, name="EMECPosBackOuterBarretteCalculator", **kwargs):
kwargs.setdefault("WheelType", LArWheelCalculatorEnum.BackOuterBarretteWheel)
#kwargs.setdefault("EnergyCorrection", 8) #LArG4::EMEC_ECOR_CHCL1
- return EnergyCalculatorCfg(name, **kwargs)
+ return EnergyCalculatorCfg(ConfigFlags, name, **kwargs)
def EMECNegBackOuterBarretteCalculatorCfg(ConfigFlags, name="EMECNegBackOuterBarretteCalculator", **kwargs):
kwargs.setdefault("WheelType", LArWheelCalculatorEnum.BackOuterBarretteWheel)
#kwargs.setdefault("EnergyCorrection", 8) #LArG4::EMEC_ECOR_CHCL1
kwargs.setdefault("zSide", -1)
- return EnergyCalculatorCfg(name, **kwargs)
+ return EnergyCalculatorCfg(ConfigFlags, name, **kwargs)
def EMECPosInnerWheelCorrOffCalculatorCfg(ConfigFlags, name="EMECPosInnerWheelCorrOffCalculator", **kwargs):
kwargs.setdefault("EnergyCorrection", 1) #LArG4::EMEC_ECOR_OFF
diff --git a/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
index 9e731829fbf9dec146e3f16a60869a7c26f36310..ac94939aa710b17a4d452ca8094afc81424d117b 100644
--- a/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4GenShowerLib/CMakeLists.txt
@@ -47,13 +47,5 @@ atlas_add_dictionary( LArG4GenShowerLibDict
LINK_LIBRARIES ${XERCESC_LIBRARIES} ${GEANT4_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps AthContainers GaudiKernel G4AtlasToolsLib GeneratorObjects LArG4Code LArG4ShowerLib LArG4GenShowerLibLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( share/*.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
index b0a45222a994d3b0dd1baf8f6f69da67f2e44954..bce9b6c29ee1a3e0762608468caeee75008ea332 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4H6SD/CMakeLists.txt
@@ -49,8 +49,4 @@ atlas_add_component( LArG4H6SD
LINK_LIBRARIES ${CORAL_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${GEANT4_LIBRARIES} GaudiKernel CaloG4SimLib CaloSimEvent AthenaBaseComps AthenaKernel StoreGateLib SGtests GeoModelUtilities Identifier GeneratorObjects LArG4Code LArG4RunControl LArG4TBSimEvent LArReadoutGeometry LArSimEvent G4AtlasInterfaces G4AtlasToolsLib SimHelpers HitManagement MCTruth TBEvent PathResolver GeoModelInterfaces RDBAccessSvcLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py b/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
index 71b53300cbc362860fbebb17788f1ce26b6900ca..9a32083059e755c63f25388a296284dbd84f1931 100644
--- a/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
+++ b/LArCalorimeter/LArG4/LArG4SD/python/LArG4SDToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -187,10 +187,7 @@ def LArEMBSensitiveDetectorCfg(ConfigFlags,name="LArEMBSensitiveDetector", **kwa
kwargs.setdefault("OutputCollectionNames", [hits_collection_name])
# Hook for fast simulation
- #from G4AtlasApps.SimFlags import simFlags
- #kwargs.setdefault("UseFrozenShowers", simFlags.LArParameterization()>0)
-
- #Note - frozen showers to be migrated later
+ kwargs.setdefault("UseFrozenShowers", ConfigFlags.Sim.LArParameterization > 0)
from LArG4Barrel.LArG4BarrelConfigNew import EMBPresamplerCalculatorCfg, EMBCalculatorCfg
result.merge(EMBPresamplerCalculatorCfg(ConfigFlags))
@@ -224,9 +221,7 @@ def LArEMECSensitiveDetectorCfg(ConfigFlags, name="LArEMECSensitiveDetector", **
kwargs.setdefault("OutputCollectionNames", [hits_collection_name])
# Hook for fast simulation
- #kwargs.setdefault("UseFrozenShowers", simFlags.LArParameterization()>0)
-
- #Note - frozen showers to be migrated later
+ kwargs.setdefault("UseFrozenShowers", ConfigFlags.Sim.LArParameterization > 0)
from LArG4EC.LArG4ECConfigNew import EMECPosInnerWheelCalculatorCfg, EMECNegInnerWheelCalculatorCfg, EMECPosOuterWheelCalculatorCfg, EMECNegOuterWheelCalculatorCfg, EMECPresamplerCalculatorCfg, EMECPosBackOuterBarretteCalculatorCfg, EMECNegBackOuterBarretteCalculatorCfg
@@ -271,10 +266,7 @@ def LArFCALSensitiveDetectorCfg(ConfigFlags, name="LArFCALSensitiveDetector", **
kwargs.setdefault("OutputCollectionNames", [hits_collection_name])
# Hook for fast simulation
- #from G4AtlasApps.SimFlags import simFlags
- #kwargs.setdefault("UseFrozenShowers", simFlags.LArParameterization()>0)
-
- #Note - frozen showers to be migrated later
+ kwargs.setdefault("UseFrozenShowers", ConfigFlags.Sim.LArParameterization > 0)
from LArG4FCAL.LArG4FCALConfigNew import FCAL1CalculatorCfg, FCAL2CalculatorCfg, FCAL3CalculatorCfg
diff --git a/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt b/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
index fe54bd51a05976856fd7bc42e52ff01022c3a631..dd64ac528e3709625d88109c67db47442f92be8b 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
+++ b/LArCalorimeter/LArG4/LArG4Validation/CMakeLists.txt
@@ -32,15 +32,7 @@ atlas_add_component( LArG4Validation
LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} GaudiKernel CaloDetDescrLib CaloIdentifier AthenaBaseComps StoreGateLib SGtests GeoAdaptors GeneratorObjects LArSimEvent MagFieldInterfaces egammaEvent )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_install_runtime( test/*.xml )
atlas_install_scripts( share/AODElectronContainerReader.py share/LArG4ValidationGenerate.py share/LArG4AODNtuplePlotter.py share/LArG4ValidationPlotter.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/LArCalorimeter/LArG4/LArG4Validation/share/LArG4AODNtuplePlotter.py b/LArCalorimeter/LArG4/LArG4Validation/share/LArG4AODNtuplePlotter.py
index 78ffd9a9fa92691a5bee427dc16448a727dca55a..0c558ca4793ec4c68c73ed8c5c554ee67dbf2bcd 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/share/LArG4AODNtuplePlotter.py
+++ b/LArCalorimeter/LArG4/LArG4Validation/share/LArG4AODNtuplePlotter.py
@@ -80,8 +80,8 @@ split_canv = options.split_canvas.split(":")
split_canv = map(int,split_canv)
from LArG4Validation.LArG4PlottingScript import parseRoots, defaultRoots, \
- parsePlots, fillPlots, dividePlots, savePlots, drawPlots, PlotEntry, \
- createPlots
+ parsePlots, fillPlots, dividePlots, savePlots, drawPlots, PlotEntry, \
+ createPlots
if (len(split_canv) != 2) :
printfunc ("ERROR: wrong split parameter")
diff --git a/LArCalorimeter/LArG4/LArG4Validation/share/LArG4ValidationGenerate.py b/LArCalorimeter/LArG4/LArG4Validation/share/LArG4ValidationGenerate.py
index 5e33d7fa7459536899288fb5dc7865871a399260..df242d29f64bce61e51b23e5afc9045e937f1b68 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/share/LArG4ValidationGenerate.py
+++ b/LArCalorimeter/LArG4/LArG4Validation/share/LArG4ValidationGenerate.py
@@ -100,7 +100,7 @@ if (options.parameterize > 0):
ServiceMgr += LArG4ShowerLibSvc()
ServiceMgr.LArG4ShowerLibSvc.FileNameList = options.fsLibs
-
+
## Set Event #
simFlags.RunNumber = options.runNumber
diff --git a/LArCalorimeter/LArG4/LArG4Validation/share/LArG4ValidationPlotter.py b/LArCalorimeter/LArG4/LArG4Validation/share/LArG4ValidationPlotter.py
index 934ce8273ec1a095ff245886cb5c3027e41a40cc..b40f643db637cf2473a7efe07ccd78db64c00457 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/share/LArG4ValidationPlotter.py
+++ b/LArCalorimeter/LArG4/LArG4Validation/share/LArG4ValidationPlotter.py
@@ -74,8 +74,8 @@ split_canv = options.split_canvas.split(":")
split_canv = map(int,split_canv)
from LArG4Validation.LArG4PlottingScript import parseRoots, defaultRoots, \
- parsePlots, fillPlots, dividePlots, savePlots, drawPlots, PlotEntry, \
- createPlots
+ parsePlots, fillPlots, dividePlots, savePlots, drawPlots, PlotEntry, \
+ createPlots
if (len(split_canv) != 2) :
printfunc ("ERROR: wrong split parameter")
diff --git a/LArCalorimeter/LArG4/LArG4Validation/share/postInclude.SingleTrackValidation.py b/LArCalorimeter/LArG4/LArG4Validation/share/postInclude.SingleTrackValidation.py
index 339496ac9471017082bf310d390a7a8a0b5b190b..f57902df7202b5a30ce521baa8eaf68611f52009 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/share/postInclude.SingleTrackValidation.py
+++ b/LArCalorimeter/LArG4/LArG4Validation/share/postInclude.SingleTrackValidation.py
@@ -9,7 +9,7 @@ topSequence += SingleTrackValidation()
# The following lines are to construct our ntuple:
if "RootFileName" not in dir() :
- RootFileName = "sp.tuple.root"
+ RootFileName = "sp.tuple.root"
NtupleSvc = Service( "NTupleSvc" )
NtupleSvc.Output = [ "FILE DATAFILE=\'" + RootFileName + "\' OPT='NEW'" ]
diff --git a/LArCalorimeter/LArG4TB/H6G4Sim/CMakeLists.txt b/LArCalorimeter/LArG4TB/H6G4Sim/CMakeLists.txt
index 25903fc116ba1ac59b728b9dba86a13f48627c87..3c9b06cbaee12276c2521f690c40220f90633391 100644
--- a/LArCalorimeter/LArG4TB/H6G4Sim/CMakeLists.txt
+++ b/LArCalorimeter/LArG4TB/H6G4Sim/CMakeLists.txt
@@ -6,15 +6,7 @@
atlas_subdir( H6G4Sim )
# Install files from the package:
-atlas_install_python_modules( python/h6prod_getxy.py python/__init__.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/h6prod_getxy.py python/__init__.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F403,F405,F821 )
atlas_install_runtime( G4macros/*.mac )
atlas_install_scripts( share/cbtG4_trf.py )
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F403,F405,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/LArCalorimeter/LArMonTools/share/LArMonByteStream.py b/LArCalorimeter/LArMonTools/share/LArMonByteStream.py
index 843471ffe9d54b4bcb2d15d7addb38cd69bdfb7a..3e29cdf1a47d3d21bff88edf0c942a1be236beca 100755
--- a/LArCalorimeter/LArMonTools/share/LArMonByteStream.py
+++ b/LArCalorimeter/LArMonTools/share/LArMonByteStream.py
@@ -5,7 +5,7 @@
if not online:
theByteStreamInputSvc = svcMgr.ByteStreamInputSvc
theByteStreamInputSvc.FullFileName = FullFileName
- theByteStreamInputSvc.MaxBadEvents=0
+ svcMgr.EventSelector.MaxBadEvents = 0
else:
theApp.CreateSvc += ["ByteStreamCnvSvc"]
diff --git a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
index a798195448c30e620c99334dc03a4bfd81675a38..e5451342d76b36cc31115fcd8ea6512137c35126 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
@@ -88,8 +88,8 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
#-- badChannels groups --
- badChannelToolArrayBarrel = helper.addArray([lArDQGlobals.Sides],larCoverageAlg,badChannelsGroupName,'/LAr/','lb')
- badChannelToolArrayEndcap = helper.addArray([lArDQGlobals.Sides],larCoverageAlg,badChannelsGroupName,'/LAr/','lb')
+ badChannelToolArrayBarrel = helper.addArray([lArDQGlobals.Sides],larCoverageAlg,badChannelsGroupName+"Barrel",'/LAr/','lb')
+ badChannelToolArrayEndcap = helper.addArray([lArDQGlobals.Sides],larCoverageAlg,badChannelsGroupName+"EndCap",'/LAr/','lb')
#-- CoverageHW groups --
availErrCode = larCoverageAlg.AvailableErrorCodes
@@ -106,9 +106,11 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
### Configure histograms
+ coveragePath='CoverageNewAlg/'
+
# -- caloNoiseTool histograms --
- caloNoiseTool_path='CoverageNewAlg/CaloNoiseTool/'
+ caloNoiseTool_path=coveragePath+'CaloNoiseTool/'
#LB histogram: need to know which LB the CaloNoiseTool histogram is about. Only add to caloNoiseToolGroup to avoid duplicates
caloNoiseToolGroup.defineHistogram('lb1_x;FirstLBnumber',
type='TH1D',
@@ -136,15 +138,15 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
# -- badChannels histograms --
- badChannels_path='Coverage/BadChannels/'
+ badChannels_path=coveragePath+'BadChannels/'
badChannelToolArrayBarrel.defineHistogram('mon_FtSlot,single_channel;DBBadChannelsBarrel',
type='TH2I',
path=badChannels_path,
- title='Known Bad Channels - Barrel;Feedthrough(+Slot increasing);Channel',
+ title='Known Bad Channels - Barrel {0};Feedthrough(+Slot increasing);Channel',
weight='flag',
- xbins=lArDQGlobals.Feedthrough_Slot_Nbins["EMB"+side],
- xmin=lArDQGlobals.Feedthrough_Slot_range["EMB"+side][0],
- xmax=lArDQGlobals.Feedthrough_Slot_range["EMB"+side][1],
+ xbins=lArDQGlobals.Feedthrough_Slot_Nbins["EMBA"], #bins from A side also used for C, they're the same
+ xmin=lArDQGlobals.Feedthrough_Slot_range["EMBA"][0],
+ xmax=lArDQGlobals.Feedthrough_Slot_range["EMBA"][1],
ybins=lArDQGlobals.FEB_N_channels,
ymin=-0.5,
ymax=lArDQGlobals.FEB_N_channels-0.5,
@@ -153,11 +155,11 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
badChannelToolArrayEndcap.defineHistogram('mon_FtSlot,single_channel;DBBadChannelsEndcap',
type='TH2I',
path=badChannels_path,
- title='Known Bad Channels - Endcap '+side+';Feedthrough(+Slot increasing);Channel',
+ title='Known Bad Channels - Endcap {0};Feedthrough(+Slot increasing);Channel',
weight='flag',
- xbins=lArDQGlobals.Feedthrough_Slot_Nbins["EMEC"+side],
- xmin=lArDQGlobals.Feedthrough_Slot_range["EMEC"+side][0],
- xmax=lArDQGlobals.Feedthrough_Slot_range["EMEC"+side][1],
+ xbins=lArDQGlobals.Feedthrough_Slot_Nbins["EMECA"], #bins from A side also used for C, they're the same
+ xmin=lArDQGlobals.Feedthrough_Slot_range["EMECA"][0],
+ xmax=lArDQGlobals.Feedthrough_Slot_range["EMECA"][1],
ybins=lArDQGlobals.FEB_N_channels,
ymin=-0.5,
ymax=lArDQGlobals.FEB_N_channels-0.5,
@@ -166,7 +168,7 @@ def LArCoverageConfigCore(helper, algoinstance,inputFlags):
#--coverageHW histograms
- coverage_path='CoverageNewAlg/perPartition/'
+ coverage_path=coveragePath+'perPartition/'
coverageToolArrayEMBA.defineHistogram('mon_ChanFtSlot,mon_Channels;CoverageHW_EMBA_statusCode',
type='TH2I',
path=coverage_path,
diff --git a/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.cxx b/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.cxx
index 6acb2818d1f24116ace060c1e39e2d555bc57c9f..1279e5f28ba466ddf75c5ea9d7104793e72b4491 100755
--- a/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.cxx
+++ b/LArCalorimeter/LArMonitoring/src/LArCoverageAlg.cxx
@@ -108,8 +108,8 @@ LArCoverageAlg::initialize()
m_CoverageToolArrayHECC = Monitored::buildToolMap<int>(m_tools,m_CoverageHWGroupName+"HECC",m_availableErrorCodes);
m_CoverageToolArrayFCalC = Monitored::buildToolMap<int>(m_tools,m_CoverageHWGroupName+"FCalC",m_availableErrorCodes);
- m_BadChannelToolArrayBarrel = Monitored::buildToolMap<int>(m_tools,m_BadChannelsGroupName,m_Sides);
- m_BadChannelToolArrayEndcap = Monitored::buildToolMap<int>(m_tools,m_BadChannelsGroupName,m_Sides);
+ m_BadChannelToolArrayBarrel = Monitored::buildToolMap<int>(m_tools,m_BadChannelsGroupName+"Barrel",m_Sides);
+ m_BadChannelToolArrayEndcap = Monitored::buildToolMap<int>(m_tools,m_BadChannelsGroupName+"EndCap",m_Sides);
/** End Initialize */
return AthMonitorAlgorithm::initialize();
@@ -265,10 +265,10 @@ LArCoverageAlg::fillHistograms( const EventContext& ctx ) const
if (flag!=0) {//only fill bad channels
std::string the_side= (etaChan >= 0 ? "A" : "C");
if(m_LArOnlineIDHelper->isEMBchannel(id)){
- mon_FtSlot=ft*m_NftEMB+slot;
+ mon_FtSlot=ft*m_NslotEMB+slot;
fill(m_tools[m_BadChannelToolArrayBarrel.at(the_side)],mon_FtSlot,single_channel,flag);
}else{
- mon_FtSlot=ft*m_NftEMEC+slot;
+ mon_FtSlot=ft*m_NslotEMEC+slot;
fill(m_tools[m_BadChannelToolArrayEndcap.at(the_side)],mon_FtSlot,single_channel,flag);
}
}
diff --git a/LArCalorimeter/LArRecUtils/CMakeLists.txt b/LArCalorimeter/LArRecUtils/CMakeLists.txt
index 76668618861c492ac45f57c7c9688b098bb5923d..e670a84e222883a62e52af6573028746eef79528 100644
--- a/LArCalorimeter/LArRecUtils/CMakeLists.txt
+++ b/LArCalorimeter/LArRecUtils/CMakeLists.txt
@@ -64,8 +64,8 @@ atlas_add_test( dummy_test
LINK_LIBRARIES ${Boost_LIBRARIES} ${CORAL_LIBRARIES} ${CLHEP_LIBRARIES} ${EIGEN_LIBRARIES} CaloDetDescrLib CaloEvent CaloIdentifier CaloUtilsLib AthenaBaseComps AthenaKernel AthAllocators StoreGateLib SGtests AthenaPoolUtilities Identifier GaudiKernel LArCablingLib LArIdentifier LArRawConditions LArRawEvent LArRecEvent TestTools CaloGeoHelpers SGTools xAODEventInfo LArCOOLConditions LArRawUtilsLib CaloConditions PathResolver LArRecUtilsLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
atlas_add_test( LArFCalTowerBuilderTool
SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/LArFCalTowerBuilderTool_test.sh
@@ -79,13 +79,3 @@ atlas_add_test( LArRecUtilsConfig_test
atlas_add_test( LArADC2MeVCondAlgConfig_test
SCRIPT python -m LArRecUtils.LArADC2MeVCondAlgConfig
LOG_SELECT_PATTERN "ComponentAccumulator|^---" )
-
-
-
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
-
-atlas_add_test( flake8_share
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/LArCalorimeter/LArRecUtils/python/LArMCSymCondAlg.py b/LArCalorimeter/LArRecUtils/python/LArMCSymCondAlg.py
index ba06f935618da4f910a9cffa3c94a2a0d82b7c2f..32d543f193e9bd1b092305f529fd916a05680b5a 100644
--- a/LArCalorimeter/LArRecUtils/python/LArMCSymCondAlg.py
+++ b/LArCalorimeter/LArRecUtils/python/LArMCSymCondAlg.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
def LArMCSymCondAlgDefault():
from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py b/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py
index 43e07cbb34b3efd7aeb3bb7c34793c50dc726105..de2eefef723cd1ac10ff195e4629ba4a650a80a2 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py
+++ b/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py
@@ -38,6 +38,7 @@ svcMgr.EventSelector.RunNumber = 1
svcMgr.EventSelector.FirstEvent = 1
#svcMgr.EventSelector.InitialTimeStamp = 0
#svcMgr.EventSelector.TimeStampInterval = 5
+# svcMgr.EventSelector.MaxBadEvents = 0
#
# Provides ByteStreamInputSvc name of the data file to process in the offline context
@@ -55,8 +56,6 @@ theApp.EvtMax=1
## theByteStreamInputSvc=svcMgr.ByteStreamInputSvc
## theByteStreamInputSvc.FullFileName=["/home/wlampl/LArOFIter/ramp/inputs/daq.Ramp.0029146.No.Streaming.LB0000.EB-EMBA._0001.data"]
-## theByteStreamInputSvc.MaxBadEvents=0
-
from LArCalibTest.LArCalibTestConf import DumpCaloBadChannels
diff --git a/MagneticField/MagFieldElements/CMakeLists.txt b/MagneticField/MagFieldElements/CMakeLists.txt
index 30aa8f0454f23ed120e0b60aed3a388e8f2d38aa..13dde183f9d9d9a5eb0842117929b9b3479e73f0 100644
--- a/MagneticField/MagFieldElements/CMakeLists.txt
+++ b/MagneticField/MagFieldElements/CMakeLists.txt
@@ -9,11 +9,9 @@ atlas_subdir( MagFieldElements )
atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
MagneticField/MagFieldInterfaces
- MagneticField/MagFieldConditions
Control/CxxUtils
Event/EventPrimitives
PRIVATE
- MagneticField/MagFieldElements
Control/StoreGate
Database/AthenaPOOL/AthenaPoolUtilities
GaudiKernel
@@ -28,7 +26,8 @@ atlas_add_library( MagFieldElements
src/*.cxx
PUBLIC_HEADERS MagFieldElements
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel CxxUtils EventPrimitives)
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel CxxUtils EventPrimitives
+ PRIVATE_LINK_LIBRARIES PathResolver )
# Install files from the package:
atlas_install_headers( MagFieldElements )
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/CMakeLists.txt
index b7c90f3acad94d0adddb9849a0f0356bb9bf5b4e..b463b193cffd6c2c65b46531e81d03589b5817f1 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibFitters/CMakeLists.txt
@@ -24,6 +24,6 @@ atlas_add_library( MdtCalibFitters
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives MuonCalibEventBase MuonCalibMath
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} GeoPrimitives EventPrimitives MuonCalibEventBase MuonCalibMath MdtCalibInterfacesLib
PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} )
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/src/T0CalibrationClassic.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/src/T0CalibrationClassic.cxx
index 4d6d72ba5a37433cc6d597feb94bc16197cc9d89..2b57b0dddfc92199417b3f492af41a06bb026522 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/src/T0CalibrationClassic.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibT0/src/T0CalibrationClassic.cxx
@@ -46,20 +46,18 @@ namespace MuonCalib {
m_settings = new T0ClassicSettings(0.,300.,100,-100.,900.,1000,1,1000,1,8,params,10.,4);
m_delete_settings=true;
}
- if(m_settings->printLevel() <= 3)
- std::cout<<"T0CalibrationClassic::T0CalibrationClassic"<<m_name<<" "<<name<<std::endl;
+ MsgStream log(Athena::getMessageSvc(),"T0ClassicSettings");
+ if (log.level()<=MSG::INFO) log << MSG::INFO << "T0CalibrationClassic::T0CalibrationClassic"<<m_name<<" "<<name<<endmsg;
if(m_settings->printLevel() <= 2) m_settings->print();
m_currentItnum=1;
std::string HistoFileName="T0Classic_"+m_name+".root";
- if(m_settings->printLevel() <= 3)
- std::cout<<"T0CalibrationClassic::T0CalibrationClassic"<<m_name
- <<" "<<name<<" "<<HistoFileName<<std::endl;
+ if (log.level()<=MSG::INFO) log << MSG::INFO << "T0CalibrationClassic::T0CalibrationClassic"<<m_name
+ <<" "<<name<<" "<<HistoFileName<<endmsg;
p_file = new TFile(HistoFileName.c_str(),"recreate");
m_regiondir = p_file->mkdir(m_name.c_str());
}
T0CalibrationClassic::~T0CalibrationClassic() {
- if(m_settings->printLevel() <= 3) std::cout << "T0CalibrationClassic::~T0CalibrationClassic()" << std::endl;
p_file->Write();
p_file->Close();
delete p_file;
@@ -86,11 +84,12 @@ namespace MuonCalib {
int nT=id.mdtTube();
const MdtTubeFitContainer::SingleTubeCalib * stc=m_result->getCalib(nML-1,nL-1,nT-1);
if(!stc) {
- std::cout<<"no Single Tube Calib info found for ML="<<nML<<" L="<<nL<<" T="<<nT<<std::endl;
- std::cout<<"container size "<<m_result->size()<<std::endl;
- std::cout<<"container nML "<<m_result->numMultilayers()<<std::endl;
- std::cout<<"container nL "<<m_result->numLayers()<<std::endl;
- std::cout<<"container nT "<<m_result->numTubes()<<std::endl;
+ MsgStream log(Athena::getMessageSvc(),"T0ClassicSettings");
+ log << MSG::WARNING << "no Single Tube Calib info found for ML="<<nML<<" L="<<nL<<" T="<<nT<<endmsg;
+ log << MSG::WARNING << "container size "<<m_result->size()<<endmsg;
+ log << MSG::WARNING << "container nML "<<m_result->numMultilayers()<<endmsg;
+ log << MSG::WARNING << "container nL "<<m_result->numLayers()<<endmsg;
+ log << MSG::WARNING << "container nT "<<m_result->numTubes()<<endmsg;
}
// get histos
@@ -127,8 +126,8 @@ namespace MuonCalib {
}
bool T0CalibrationClassic::analyse() {
- if(m_settings->printLevel() <= 3)
- std::cout << "T0CalibrationClassic::analyse iteration "<<m_currentItnum << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"T0ClassicSettings");
+ if (log.level()<=MSG::INFO) log << MSG::INFO << "T0CalibrationClassic::analyse iteration "<<m_currentItnum << endmsg;
// loop over m_histos histograms
for(std::vector<T0ClassicHistos*>::iterator it=m_histos.begin(); it!=m_histos.end();++it) {
@@ -145,11 +144,9 @@ namespace MuonCalib {
int nT=fId.mdtTube();
bool setInfo=m_result->setCalib(nML-1,nL-1,nT-1,st);
- if(!setInfo)
- std::cout<<"T0CalibrationClassic::PROBLEM! could not set SingleTubeCalib info "<<std::endl;
+ if(!setInfo) log << MSG::WARNING << "T0CalibrationClassic::PROBLEM! could not set SingleTubeCalib info "<<endmsg;
setInfo=m_result->setFit(nML-1,nL-1,nT-1,full);
- if(!setInfo)
- std::cout<<"T0CalibrationClassic::PROBLEM! could not set SingleTubeFullInfo info "<<std::endl;
+ if(!setInfo) log << MSG::WARNING << "T0CalibrationClassic::PROBLEM! could not set SingleTubeFullInfo info "<<endmsg;
}
}
@@ -190,12 +187,13 @@ namespace MuonCalib {
if (T0h->id==1 || T0h->id==2 || (T0h->id>10&&T0h->id<=23)) isMultilayer=1;
+ MsgStream log(Athena::getMessageSvc(),"T0ClassicSettings");
if (( fId.isValid() && fId.is_mdt()) || isMultilayer ) {
- std::cout<<" STARTING doTimeFit "<< std::endl;
+ if (log.level()<=MSG::INFO) log << MSG::INFO << " STARTING doTimeFit "<<endmsg;
TH1* h = nullptr;
if ( isMultilayer) {
- std::cout<< " DEBUGGGG : " << T0h->id << std::endl ;
+ if (log.level()<=MSG::DEBUG) log << MSG::DEBUG << T0h->id << endmsg;
h=T0h->time;
}
@@ -204,9 +202,9 @@ namespace MuonCalib {
ToString ts;
std::string HistoId(std::string("time_mezz_") + ts((hIdMezz)%(900000000)));
- if (m_settings->printLevel() <= 2) {
- std::cout<<" doTimeFit HistogramId : "<< T0h->id << std::endl;
- std::cout<<" doTimeFit Histogram : "<< HistoId << std::endl;
+ if (log.level()<=MSG::DEBUG) {
+ log << MSG::DEBUG << " doTimeFit HistogramId : "<< T0h->id <<endmsg;
+ log << MSG::DEBUG << " doTimeFit Histogram : "<< HistoId <<endmsg;
}
TH1F * timeHis=(TH1F*) m_regiondir->Get(HistoId.c_str());
if(!timeHis) {
@@ -224,7 +222,7 @@ namespace MuonCalib {
Stat_t entries=h->GetEntries();
fi.statistics=(int)entries;
- if(m_settings->printLevel() <= 1) std::cout<<" histogram "<<h->GetName()
+ if(log.level()<=MSG::VERBOSE) log << MSG::VERBOSE << " histogram "<<h->GetName()
<<" "<<h->GetTitle()
<<" entries="<<h->GetEntries()
<<" min entries="<<m_settings->entries()
@@ -248,16 +246,15 @@ namespace MuonCalib {
m_settings->minTime(),m_settings->maxTime());
for(int i=0;i<np;i++) {
pfit[i]=*(pdefault++);
- if(m_settings->printLevel() <= 2)
- std::cout<<"T0CalibrationClassic::doTimeFit initial parameters"
- <<i<<"="<<pfit[i]<<std::endl;
+ if(log.level()<=MSG::DEBUG)
+ log << MSG::DEBUG << "T0CalibrationClassic::doTimeFit initial parameters"
+ <<i<<"="<<pfit[i]<<endmsg;
}
searchParams(h,&pfit[0],np);
- if(m_settings->printLevel() <= 2) {
- std::cout<<"T0CalibrationClassic::doTimeFit parameters after searchParams "<<std::endl;
- for(int i=0;i<np;++i){std::cout << "i,pfit(i) "<<i<<" "<<pfit[i]<<std::endl;}
+ if(log.level()<=MSG::DEBUG) {
+ log << MSG::DEBUG << "T0CalibrationClassic::doTimeFit parameters after searchParams "<<endmsg;
+ for(int i=0;i<np;++i){log << MSG::DEBUG << "i,pfit(i) "<<i<<" "<<pfit[i]<<endmsg;}
}
- std::cout <<" Sto per mettere i limiti"<<std::endl;
TimeSpectrum->SetParameters(pfit);
TimeSpectrum->SetParLimits(0,0.,5.);
TimeSpectrum->SetParLimits(1,0.,1000.);
@@ -295,8 +292,8 @@ namespace MuonCalib {
// THE NEW HISTOGRAM HAS BEEN FITTED
if( ndof == 0. ) ndof = -1;
- if(m_settings->printLevel() <= 1)
- std::cout<<" fit results chi2/ndof="<<chi2/ndof<<" T0="<<pfit[4]<<" err="<<errfit[4]<<std::endl;
+ if(log.level()<=MSG::VERBOSE)
+ log << MSG::VERBOSE << " fit results chi2/ndof="<<chi2/ndof<<" T0="<<pfit[4]<<" err="<<errfit[4]<<endmsg;
if(chi2/ndof < m_settings->chi2max()) {
stc.statusCode=0 ;// success
} else {
@@ -342,7 +339,7 @@ namespace MuonCalib {
for(int i=0; i<np; i++) delete [] matrix[i];
delete [] matrix;
- std::cout<<" ENDING doTimeFit "<< std::endl;
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << " ENDING doTimeFit "<< endmsg;
}
@@ -362,9 +359,10 @@ namespace MuonCalib {
errpar[ii] = 0.0 ;
}
+ MsgStream log(Athena::getMessageSvc(),"T0ClassicSettings");
MuonFixedId fId(T0h->id);
if (fId.isValid() && fId.is_mdt()) {
- std::cout<<" doAdcFit : checking Single tube entries"<< std::endl;
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << " doAdcFit : checking Single tube entries"<< endmsg;
double adcThreshold = 50. ;
TH1 * hcheck ;
hcheck = T0h->adc;
@@ -372,12 +370,12 @@ namespace MuonCalib {
int adcBinThreshold = (int)((adcThreshold-hcheck->GetBinLowEdge(1))/(hcheck->GetBinWidth(1))+1) ; //
int nhitsAboveAdcCut = (int) hcheck->Integral(adcBinThreshold,hcheck->GetNbinsX()) ;
- std::cout<<" doAdcFit : TotHits, nhitsAboveAdcCut "<< nhits <<" "<<nhitsAboveAdcCut<< std::endl;
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << " doAdcFit : TotHits, nhitsAboveAdcCut "<< nhits <<" "<<nhitsAboveAdcCut<< endmsg;
fi.cov[20]=nhits ;
fi.cov[21]=nhitsAboveAdcCut ;
- std::cout<<" STARTING doAdcFit "<< std::endl;
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << " STARTING doAdcFit "<< endmsg;
TH1 * h = nullptr;
@@ -385,9 +383,9 @@ namespace MuonCalib {
int hIdMezz = fId.mdtMezzanine() ;
ToString ts;
std::string HistoId(std::string("charge_mezz_") + ts((hIdMezz)%(900000000)));
- if (m_settings->printLevel() <= 2) {
- std::cout<<" doAdcFit HistogramId : "<< T0h->id << std::endl;
- std::cout<<" doAdcFit Histogram : "<< HistoId << std::endl;
+ if (log.level()<=MSG::DEBUG) {
+ log << MSG::DEBUG <<" doAdcFit HistogramId : "<< T0h->id << endmsg;
+ log << MSG::DEBUG <<" doAdcFit Histogram : "<< HistoId << endmsg;
}
TH1F * adcHis=(TH1F*) m_regiondir->Get(HistoId.c_str());
if(!adcHis) return;
@@ -395,16 +393,10 @@ namespace MuonCalib {
T0ClassicHistos* histosMezz = getHistos(fId.mdtMezzanine());
h= histosMezz->adc;
}
-// E. Diehl 141211 This code cannot be executed since fitMezz!=1 option never implemented (see above)
-// if (fitMezz==2) { // FIT MULTILAYER
-// int nML=fId.mdtMultilayer();
-// T0ClassicHistos* histosML = getHistos(nML);
-// h= histosML->adc;
-// }
-
- if(m_settings->printLevel() <= 1)
- std::cout<<" histogram "<<h->GetName()<<" "<<h->GetTitle()
- <<" entries="<<h->GetEntries()<<std::endl;
+
+ if(log.level()<=MSG::VERBOSE)
+ log << MSG::VERBOSE <<" histogram "<<h->GetName()<<" "<<h->GetTitle()
+ <<" entries="<<h->GetEntries()<<endmsg;
Stat_t entries=h->GetEntries();
// CHECK whether the Selected Histogram has enough entries
@@ -444,20 +436,16 @@ namespace MuonCalib {
par[i] = AdcSpectrum->GetParameter(i);
errpar[i] = AdcSpectrum->GetParError(i);
}
- if (m_settings->printLevel() <=1)
- std::cout<<"chi2/ndof="<<chi2/ndof<<" "<<"Mean="<<m<<" "<<"RMS="<<r
- <<" par 0 1 2 3 " << par[0] <<" "<<par[1]<<" "<<par[2]<< " "<<par[3]<< std::endl;
+ if (log.level()<=MSG::VERBOSE)
+ log << MSG::VERBOSE <<"chi2/ndof="<<chi2/ndof<<" "<<"Mean="<<m<<" "<<"RMS="<<r
+ <<" par 0 1 2 3 " << par[0] <<" "<<par[1]<<" "<<par[2]<< " "<<par[3]<<endmsg;
}
// THE NEW HISTOGRAM HAS BEEN FITTED
-
- // } else {
- // stc.statusCode=2; // too few entries - DO NOT CHANGE statusCode coming from doTimeFit
+
}
stc.adcCal=par[1];
- // fi.chi2Adc=chi2/ndof; // ??? esiste fi.chi2Adc ????
- // for (int i=0 ; i<np; i++) fi.par[i]=pfit[i] ; ...dove li mettiamo ???
fi.adc_par[0] = par[1] ;
fi.adc_par[1] = par[2] ;
fi.adc_err[0] = errpar[1] ;
@@ -475,12 +463,13 @@ namespace MuonCalib {
// extract starting values for fit params p[np] from the Time Spectrum h
TH1 *hnew = h->Rebin(RebinFactor,"hnew"); // creates a new histogram hnew
//merging 5 bins of h1 in one bin
- std::cout << "nbinsx,sizex,rebinfactor="<<nbinsX<<" "<<sizeX<<" "<<RebinFactor<<std::endl;
+ MsgStream log(Athena::getMessageSvc(),"T0ClassicSettings");
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << "nbinsx,sizex,rebinfactor="<<nbinsX<<" "<<sizeX<<" "<<RebinFactor<<endmsg;
float minDeriv(9999.);
int minDerivBin(0);
sizeX = hnew->GetBinWidth(1);
int newbins = hnew->GetNbinsX();
- for(int i=0;i<np;++i){std::cout << "i,p(i) "<<i<<" "<<p[i]<<std::endl;}
+ for(int i=0;i<np;++i){if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << "i,p(i) "<<i<<" "<<p[i]<<endmsg;}
for(int i=0; i<newbins-1; ++i) {
if(hnew->GetBinContent(i)-hnew->GetBinContent(i+1)
<minDeriv) {
@@ -492,7 +481,7 @@ namespace MuonCalib {
if (minDerivBin<newbins-1) {
t0guess += (hnew->GetBinCenter(minDerivBin+1)-hnew->GetBinCenter(minDerivBin))/2.;
}
- std::cout << " t0guess is "<<t0guess<<std::endl;
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << " t0guess is "<<t0guess<<endmsg;
//
// =================== Noise level search ===================================
//
@@ -517,18 +506,18 @@ namespace MuonCalib {
}
noise = noise/(float)(icount) ;
- std::cout << " noise is "<<noise<<std::endl;
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << " noise is "<<noise<<endmsg;
//
// =================== Normalization =========================================
//
int t0bin = minDerivBin;
int ix1 = t0bin+(int)(50/sizeX);
int ix2 = t0bin+(int)(500/sizeX);
- std::cout << "t0bin,ix1,ix2 "<<t0bin<<" "<<ix1<<" "<<ix2<<std::endl;
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << "t0bin,ix1,ix2 "<<t0bin<<" "<<ix1<<" "<<ix2<<endmsg;
float P1=p[1];
float P2=p[2];
float P3=p[3];
- std::cout <<"P1,P2,P3 start are "<<P1<<" "<<P2<<" "<<P3<<std::endl;
+ if(log.level()<=MSG::DEBUG) log << MSG::DEBUG << "P1,P2,P3 start are "<<P1<<" "<<P2<<" "<<P3<<endmsg;
p[0]=noise;
p[4]=t0guess;
p[5]=p[4]+700;
@@ -547,8 +536,10 @@ namespace MuonCalib {
P1 = cont1/(1+P2*A1);
P1=P1*oldSizeX/sizeX ;
P2=P2*oldSizeX/sizeX ;
- std::cout << "a1,a2 "<<a1<<" "<<a2<<" cont1,cont2 "<<cont1<<" "<<cont2<<" A1,A2 "<<A1<<" "<<A2<<std::endl;
- std::cout << " t0Guess .... P1, P2 " <<P1<<" "<<P2<<std::endl;
+ if(log.level()<=MSG::DEBUG) {
+ log << MSG::DEBUG << "a1,a2 "<<a1<<" "<<a2<<" cont1,cont2 "<<cont1<<" "<<cont2<<" A1,A2 "<<A1<<" "<<A2<<endmsg;
+ log << MSG::DEBUG << " t0Guess .... P1, P2 " <<P1<<" "<<P2<<endmsg;
+ }
p[1]=P1;
p[2]=P2;
}
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/CMakeLists.txt
index df82f7f55b5d456b05decbeab7306fe7445fb1d4..3fa162a1995c2e349fe984b4c0ab59c10357a8f1 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/CMakeLists.txt
@@ -19,5 +19,5 @@ atlas_depends_on_subdirs( PUBLIC
atlas_add_library( MdtCalibUtils
src/*.cxx
PUBLIC_HEADERS MdtCalibUtils
- LINK_LIBRARIES MdtCalibData MuonCalibEvent MuonCalibEventBase MuonCalibIdentifier )
+ LINK_LIBRARIES MdtCalibData MuonCalibEvent MuonCalibEventBase MuonCalibIdentifier MdtCalibInterfacesLib )
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtDataFromFile.h b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtDataFromFile.h
index cdee818089bdc0c010f9e90b64192724ab7217b0..d8eb59197031d3c2cc33d02cec8bcd78dc8f52d4 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtDataFromFile.h
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/MdtCalibUtils/RtDataFromFile.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONCALIB_RTDATAFROMFILE_H
@@ -7,10 +7,11 @@
#include "MdtCalibUtils/RtData_t_r_reso.h"
#include "MdtCalibData/RtFullInfo.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
#include <vector>
#include <iostream>
-#include <string>
namespace MuonCalib {
@@ -23,7 +24,7 @@ namespace MuonCalib {
typedef std::vector<RtRelation*> RtRelations;
public:
RtDataFromFile() : m_rts(0), m_major_version(1), m_minor_version(0) {}
- ~RtDataFromFile();
+ ~RtDataFromFile()=default;
/** return number of rt relations */
unsigned int nRts() const { return m_rts; }
@@ -31,9 +32,9 @@ namespace MuonCalib {
/** retrieve rt-relation for a give regionId */
RtRelation* getRt( unsigned int regionId ) const {
if( regionId >= (unsigned int)m_rts ){
- std::cout << "RtDataFromFile::getRt ERROR <regionId out of range> "
- << regionId << " size " << m_rts << std::endl;
- return 0;
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"getRt() <regionId out of range> " << regionId << " size " << m_rts <<endmsg;
+ return 0;
}
return m_rtRelations[regionId];
}
@@ -44,13 +45,14 @@ namespace MuonCalib {
/** RtDataFromFile takes ownership of rt */
bool addRt( int regionId, RtRelation* rt ){
if( regionId < 0 || regionId >= (int)m_rts ){
- std::cout << "RtDataFromFile::addRt ERROR <regionId out of range> "
- << regionId << " size " << m_rts << std::endl;
- return false;
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"addRt() <regionId out of range> " << regionId << " size " << m_rts <<endmsg;
+ return false;
}
if( m_rtRelations[regionId] != 0 ){
- std::cout << "RtDataFromFile::addRt ERROR <rt already set> " << std::endl;
- return false;
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"addRt() <rt already set>" << endmsg;
+ return false;
}
m_rtRelations[regionId] = rt;
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/GlobalTimeFitter.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/GlobalTimeFitter.cxx
index f4fe9a56b1109514a8366be4089fc6aedd671af8..379739678d2b6224a6ce20fa2f17756d7fc05998 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/GlobalTimeFitter.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/GlobalTimeFitter.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MdtCalibUtils/GlobalTimeFitter.h"
@@ -15,13 +15,9 @@ double GlobalTimeFitter::GTFit( MuonCalibSegment * seg ) {
float tdcmin=1000000;
double timeoffset=0.;
int stepf,stepff[13],stepl,stepr,dtt,dttbuono(0);
-// double abuona,bbuona,chibuo,chi2r,chi2l;
-// double aoutr,aoutl,boutr,boutl;
double chi2r,chi2l;
double chi2min = 100000;
double bestchi2 = 100000;
-// double sig2al,sig2ar,sig2bl,sig2br,corrabl,corrabr;
-// double sig2abuona,sig2bbuona,corrabbuona;
stepff[0]=512;stepff[1]=256;stepff[2]=128;stepff[3]=64;stepff[4]=32;
stepff[5]=16;stepff[6]=8;stepff[7]=4;stepff[8]=2;stepff[9]=1 ;
@@ -41,13 +37,10 @@ double GlobalTimeFitter::GTFit( MuonCalibSegment * seg ) {
for(std::vector<MdtCalibHitBase*>::iterator it = seg->mdtHOTBegin() ;
it != seg->mdtHOTEnd(); ++it) {
double newtime = (double)((*it)->tdcCount()-tdcmin+stepl)*25./32.;
- // newtime = newtime + ..... ADD HERE OTHER CORRECTIONS like :
- // newtime = newtime - (*it)->propagationTime() - (*it)->timeOfFlight()
if ( newtime<0. || newtime>750.) outofrange = 1 ;
(*it)->setDriftTime(newtime);
double r=m_rtRel->radius(newtime);
- // double dr=(*it)->sigmaDriftRadius(); // ??? NO it's wrong !
double dr=getDefaultResolution(r); // get H8 resolution
(*it)->setDriftRadius(r,dr);
}
@@ -61,13 +54,10 @@ double GlobalTimeFitter::GTFit( MuonCalibSegment * seg ) {
for(std::vector<MdtCalibHitBase*>::iterator it = seg->mdtHOTBegin() ;
it != seg->mdtHOTEnd(); ++it) {
double newtime = (double)((*it)->tdcCount()-tdcmin+stepr)*25./32.;
- // newtime = newtime + ..... ADD HERE OTHER CORRECTIONS like :
- // newtime = newtime - (*it)->propagationTime() - (*it)->timeOfFlight()
if ( newtime<0. || newtime>750.) outofrange = 1 ;
(*it)->setDriftTime(newtime);
double r=m_rtRel->radius(newtime);
- // double dr=(*it)->sigmaDriftRadius(); // ??? NO it's wrong !
double dr=getDefaultResolution(r); // get H8 resolution
(*it)->setDriftRadius(r,dr);
}
@@ -104,12 +94,8 @@ double GlobalTimeFitter::GTFit( MuonCalibSegment * seg ) {
for(std::vector<MdtCalibHitBase*>::iterator it = seg->mdtHOTBegin() ;
it != seg->mdtHOTEnd(); ++it) {
double newtime = (double)((*it)->tdcCount()-tdcmin+timeoffset)*25./32.;
- // newtime = newtime + ..... ADD HERE OTHER CORRECTIONS like :
- // newtime = newtime - (*it)->propagationTime() - (*it)->timeOfFlight()
- // newtime = 400.;
(*it)->setDriftTime(newtime);
double r=m_rtRel->radius(newtime);
- // double dr=(*it)->sigmaDriftRadius(); // ??? NO it's wrong !
double dr=getDefaultResolution(r); // get H8 resolution
(*it)->setDriftRadius(r,dr);
}
@@ -130,7 +116,6 @@ double GlobalTimeFitter::GTFit2( MuonCalibSegment * seg ) {
double dr=(*it)->sigmaDriftRadius();
(*it)->setDriftRadius(r,dr);
- std::cout << " TEST GTFit2 : " << r << std::endl ;
timeShift = t ;
}
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RegionDataFromFile.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RegionDataFromFile.cxx
index 38d83fe77ef56bfe42da71b3b3a9590377658206..52abc99892fe40732fb50cff433837503ff5016b 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RegionDataFromFile.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RegionDataFromFile.cxx
@@ -1,8 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MdtCalibUtils/RegionDataFromFile.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#define MAX_VALUE 100000
namespace MuonCalib {
@@ -12,8 +15,8 @@ namespace MuonCalib {
if( regionId >= 0 && regionId < (int)m_identifiersPerRegions.size() ){
return m_identifiersPerRegions[regionId];
}else{
- std::cout << "RegionDataFromFile::getIdentifiers: WARNING <index out of range> "
- << regionId << " size " << m_identifiersPerRegions.size() << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"RegionDataFromFile");
+ log<<MSG::WARNING<<"getIdentifiers() <index out of range> " << regionId << " size " << m_identifiersPerRegions.size()<<endmsg;
return id_vec();
}
}
@@ -24,8 +27,8 @@ namespace MuonCalib {
m_identifiersPerRegions[regionId] = ids;
return true;
}else{
- std::cout << "RegionDataFromFile::addRegion: WARNING <index out of range> "
- << regionId << " size " << m_identifiersPerRegions.size() << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"RegionDataFromFile");
+ log<<MSG::WARNING<<"addRegion() <index out of range> " << regionId << " size " << m_identifiersPerRegions.size()<<endmsg;
return false;
}
}
@@ -53,11 +56,10 @@ namespace MuonCalib {
is >> dummy >> regionId >> nelements;
nelements = (nelements > MAX_VALUE) ? MAX_VALUE : nelements;
if( regionId != i ){
- std::cout << "RegionDataFromFile::read ERROR <read wrong regionId> "
- << regionId << " current " << i << std::endl;
- std::cout << "Aborting reading " << std::endl;
- clear();
- return is;
+ MsgStream log(Athena::getMessageSvc(),"RegionDataFromFile");
+ log<<MSG::WARNING<<"read() <read wrong regionId> " << regionId << " current " << i<<". Aborting reading"<<endmsg;
+ clear();
+ return is;
}
id_vec ids;
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RtDataFromFile.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RtDataFromFile.cxx
index bae3f5b5a3ba887237c07d2ea60153af9805c900..e7ed6e8c674841991e6d133ddcac224f2371d4fc 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RtDataFromFile.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RtDataFromFile.cxx
@@ -1,19 +1,16 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MdtCalibUtils/RtDataFromFile.h"
#include "MuonCalibStl/DeleteObject.h"
-#define M_MAX_RTS 100000
+#include <TString.h> // for Form
#include <string>
+#define M_MAX_RTS 100000
+
namespace MuonCalib {
- RtDataFromFile::~RtDataFromFile()
- {
- //delete rt relations
- //std::for_each(m_rtRelations.begin(),m_rtRelations.end(),DeleteObject());
- }
std::istream& RtDataFromFile::read( std::istream& is )
{
@@ -23,12 +20,10 @@ namespace MuonCalib {
// read number of rts in file
is >> version >> rts_str;
- unsigned long int pos = 0;
+ unsigned long int pos = 0;
std::string::size_type start = rts_str.find_first_not_of(" ",pos);
- if(start == std::string::npos) {
- std::cout << "RtDataFromFile::read -- problems extracting m_rts -- crashing." << std::endl;
- throw;
- }
+ if(start == std::string::npos) throw std::runtime_error(Form("File: %s, Line: %d\nRtDataFromFile::read() - problems extracting m_rts, exiting", __FILE__, __LINE__));
+
std::string::size_type stop = rts_str.find_first_of(" ",start+1);
if (stop == std::string::npos) stop = rts_str.size();
m_rts = std::stoi(rts_str.substr(start,stop-start),nullptr);
@@ -55,17 +50,14 @@ namespace MuonCalib {
std::ostream& RtDataFromFile::write( std::ostream& os , int region) const
{
- if( m_rts != m_rtRelations.size() ){
- std::cout << "RtDataFromFile::write ERROR <inconsistent rt count>"
- << std::endl;
+ if( m_rts != m_rtRelations.size() ){
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"write() <inconsistent rt count>"<<endmsg;
}
- if( region >= static_cast<int>(m_rts) ) {
- std::cout << "RtDataFromFile::write ERROR <requested not existent region>"
- << std::endl;
+ if( region >= static_cast<int>(m_rts) ) {
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"write() <requested not existent region>"<<endmsg;
}
-
- // os << "v0.0 " << 1 ;//<< std::endl;
-
os << "v" << m_major_version << "." << m_minor_version << " 1" ;// full info added
if( m_fullInfo[region] ) os << *(m_fullInfo[region]);
@@ -76,11 +68,9 @@ namespace MuonCalib {
std::ostream& RtDataFromFile::write( std::ostream& os ) const
{
if( m_rts != m_rtRelations.size() ){
- std::cout << "RtDataFromFile::write ERROR <inconsistent rt count>"
- << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"write() <inconsistent rt count>"<<endmsg;
}
-
- // os << "v0.0 " << m_rts ;//<< std::endl;
os << "v1.0 " << m_rts ;// full info added
@@ -93,15 +83,14 @@ namespace MuonCalib {
void RtDataFromFile::write_forDB( FILE *frt, FILE *frtt, FILE *frtr, FILE *frts , int region) const
{
- if( m_rts != m_rtRelations.size() ){
- std::cout << "RtDataFromFile::write_forDB ERROR <inconsistent rt count>"
- << std::endl;
+ if( m_rts != m_rtRelations.size() ){
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"write_forDB() <inconsistent rt count>"<<endmsg;
}
- if( region >= static_cast<int>(m_rts) ) {
- std::cout << "RtDataFromFile::write_forDB ERROR <requested not existent region>"
- << std::endl;
+ if( region >= static_cast<int>(m_rts) ) {
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"write_forDB() <requested not existent region>"<<endmsg;
}
- std::cout<<"RtDataFromFile::write_forDB "<<std::endl;
if( m_fullInfo[region] ){
(m_fullInfo[region])->write_forDB(frt);
}
@@ -114,8 +103,8 @@ namespace MuonCalib {
void RtDataFromFile::write_forDB( FILE *frt, FILE *frtt, FILE *frtr, FILE *frts ) const
{
if( m_rts != m_rtRelations.size() ){
- std::cout << "RtDataFromFile::write ERROR <inconsistent rt count>"
- << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"RtDataFromFile");
+ log<<MSG::WARNING<<"write_forDB() <inconsistent rt count>"<<endmsg;
}
for( unsigned int i=0;i<m_rtRelations.size();++i ){
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RtData_t_r_reso.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RtData_t_r_reso.cxx
index ab99366dc8f4fd6a1767ebf4974c4ceefc6b8842..96e6cf430ddea11b3a57fe02b34ac65d3a28b431 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RtData_t_r_reso.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/RtData_t_r_reso.cxx
@@ -1,10 +1,15 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MdtCalibUtils/RtData_t_r_reso.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#include <stdio.h>
+
#define M_MAX_PARS 1000
+
namespace MuonCalib {
std::istream& RtData_t_r_reso::read( std::istream& is )
@@ -25,11 +30,10 @@ namespace MuonCalib {
for( unsigned int i=0;i<m_npars;++i){
// check if eof reached before last entry was read
if( is.eof() ){
- std::cout << "RtData_t_r_reso::read ERROR <unexpected eof>" << std::endl;
- std::cout << " -> exit after " << i-1 << " entries out of " << m_npars
- << " were read from file" << std::endl;
- reset();
- return is;
+ MsgStream log(Athena::getMessageSvc(),"RtData_t_r_reso");
+ log<<MSG::WARNING<<"read() <unexpected eof> -> exit after " << i-1 << " entries out of " << m_npars << " were read from file" <<endmsg;
+ reset();
+ return is;
}
// read next entry
@@ -48,14 +52,13 @@ namespace MuonCalib {
std::ostream& RtData_t_r_reso::write( std::ostream& os ) const
{
if( m_isValid ){
- //os << " RegionId " << m_regionId << " " << m_npars << std::endl;
os << " dummy "<<m_regionId << " " << m_npars << std::endl;
- // loop over data and write to std::ostream
for( unsigned int i=0;i<m_npars;++i){
os << " " << m_radiusVec[i] << " " << m_timeVec[i] << " " << m_resoVec[i] << std::endl;
}
}else{
- std::cout << "RtData_t_r_reso::write ERROR <data not valid>" << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"RtData_t_r_reso");
+ log<<MSG::WARNING<<"write() <data not valid>" <<endmsg;
}
return os;
@@ -63,15 +66,8 @@ namespace MuonCalib {
void RtData_t_r_reso::write_forDB( FILE *frtt, FILE *frtr, FILE *frts ) const
{
- // int mdt_rt_id=98; // FAB:280208: to be set!!!
- // int mdt_rt_map_t_id=97; // FAB:280208: to be set!!!
- // int mdt_rt_map_r_id=96; // FAB:280208: to be set!!!
- // int mdt_rt_map_s_id=95; // FAB:280208: to be set!!!
if( m_isValid ){
- // fprintf(frtt," %d,%d,%d,%d",mdt_rt_map_t_id,mdt_rt_id,mdt_rt_id,m_npars);
- // fprintf(frtr," %d,%d,%d,%d",mdt_rt_map_r_id,mdt_rt_id,mdt_rt_map_t_id,m_npars);
- // fprintf(frts," %d,%d,%d",mdt_rt_map_s_id,mdt_rt_id,m_npars);
fprintf(frtt,"%d",m_npars);
fprintf(frtr,"%d",m_npars);
fprintf(frts,"%d",m_npars);
@@ -86,7 +82,8 @@ namespace MuonCalib {
fprintf(frtr,"\n");
fprintf(frts,"\n");
}else{
- std::cout << "RtData_t_r_reso::write_forDB ERROR <data not valid>" << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"RtData_t_r_reso");
+ log<<MSG::WARNING<<"write_forDB() <data not valid>" <<endmsg;
}
return;
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/SimpleMdtSegmentSelector.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/SimpleMdtSegmentSelector.cxx
index 33661ce2936df8c47fa3fed29ed9ed4a0a82a83a..8451cff03099487830751869a8c5128ede750b82 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/SimpleMdtSegmentSelector.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/SimpleMdtSegmentSelector.cxx
@@ -1,10 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MdtCalibUtils/SimpleMdtSegmentSelector.h"
-
#include "MuonCalibEventBase/MuonCalibSegment.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
#include <iostream>
@@ -15,20 +16,20 @@ namespace MuonCalib {
: m_chi2_max(chi2_max),m_hits_min(hits_min)
{
m_printLevel = 0;
-
- std::cout << "SimpleMdtSegmentSelector::SimpleMdtSegmentSelector" << std::endl;
- std::cout << "New SimpleMdtSegmentSelector : " << std::endl;
- std::cout << " chi2 cut " << m_chi2_max << std::endl;
- std::cout << " hits cut " << m_hits_min << std::endl;
+
+ MsgStream log(Athena::getMessageSvc(),"SimpleMdtSegmentSelector");
+ log<<MSG::INFO<<"SimpleMdtSegmentSelector::SimpleMdtSegmentSelector" << endmsg;
+ log<<MSG::INFO<<"New SimpleMdtSegmentSelector : " << endmsg;
+ log<<MSG::INFO<<" chi2 cut " << m_chi2_max << endmsg;
+ log<<MSG::INFO<<" hits cut " << m_hits_min << endmsg;
}
- bool SimpleMdtSegmentSelector::select(const MuonCalibSegment& seg) const
- {
- if( m_printLevel >= 1){
- std::cout << "SimpleMdtSegmentSelector::select" << std::endl;
- std::cout << "Segment: chi2 " << seg.chi2() << " mdtHits " << seg.mdtHitsOnTrack()
- << " tan " << seg.direction().y()/seg.direction().z() << std::endl;
+ bool SimpleMdtSegmentSelector::select(const MuonCalibSegment& seg) const {
+ MsgStream log(Athena::getMessageSvc(),"SimpleMdtSegmentSelector");
+ if (log.level()<=MSG::VERBOSE){
+ log<<MSG::VERBOSE<<"SimpleMdtSegmentSelector::select" << endmsg;
+ log<<MSG::VERBOSE<<"Segment: chi2 " << seg.chi2() << " mdtHits " << seg.mdtHitsOnTrack() << " tan " << seg.direction().y()/seg.direction().z() << endmsg;
}
// test if segments satisfies the selectors selection criteria
@@ -36,22 +37,17 @@ namespace MuonCalib {
// test chi2
if( seg.chi2() > m_chi2_max ) return false;
- if( m_printLevel >= 2)
- std::cout << "segment passed chi2 cut " << seg.chi2() << std::endl;
+ if (log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<"segment passed chi2 cut " << seg.chi2() << endmsg;
// test total numbers of hits on segment
if( seg.mdtHitsOnTrack() < m_hits_min ) return false;
- if( m_printLevel >= 2)
- std::cout << "segment passed mdtHits cut "
- << seg.mdtHitsOnTrack() << std::endl;
+ if (log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<"segment passed mdtHits cut " << seg.mdtHitsOnTrack() << endmsg;
double tanphi = seg.direction().y()/seg.direction().z();
//if( std::abs(tanphi) > 1. ) return false;
- if( m_printLevel >= 2)
- std::cout << "segment passed angular cut "
- << tanphi << std::endl;
+ if (log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<"segment passed angular cut " << tanphi << endmsg;
return true;
}
diff --git a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/SimplePatternSelector.cxx b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/SimplePatternSelector.cxx
index 54ff912df8b8ad8247efbe1d139837bfa3734d63..1cebb60dd4ff727b5d60e29a736253410b3c5c5c 100644
--- a/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/SimplePatternSelector.cxx
+++ b/MuonSpectrometer/MuonCalib/MdtCalib/MdtCalibUtils/src/SimplePatternSelector.cxx
@@ -1,10 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MdtCalibUtils/SimplePatternSelector.h"
-
#include "MuonCalibEventBase/MuonCalibPattern.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
#include <iostream>
@@ -17,34 +18,31 @@ namespace MuonCalib {
: m_chi2_max(chi2_max),m_mdtSeg_min(mdtSeg_min)
{
m_printLevel = 0;
- if( m_printLevel >= 1 ){
- std::cout << "SimplePatternSelector::SimplePatternSelector" << std::endl;
- std::cout << "New SimplePatternSelector : " << std::endl;
- std::cout << " chi2 cut " << m_chi2_max << std::endl;
- std::cout << " muon seg cut " << m_mdtSeg_min << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"SimplePatternSelector");
+ if(log.level()<=MSG::VERBOSE) {
+ log<<MSG::VERBOSE<<"SimplePatternSelector::SimplePatternSelector" << endmsg;
+ log<<MSG::VERBOSE<<"New SimplePatternSelector : " << endmsg;
+ log<<MSG::VERBOSE<<" chi2 cut " << m_chi2_max << endmsg;
+ log<<MSG::VERBOSE<<" muon seg cut " << m_mdtSeg_min << endmsg;
}
}
- bool SimplePatternSelector::select(const MuonCalibPattern& pattern) const
- {
- if( m_printLevel >= 1)
- std::cout << "SimplePatternSelector::select" << std::endl;
+ bool SimplePatternSelector::select(const MuonCalibPattern& pattern) const {
+ MsgStream log(Athena::getMessageSvc(),"SimplePatternSelector");
+ if (log.level()<=MSG::VERBOSE) log<<MSG::VERBOSE<<"SimplePatternSelector::select" << endmsg;
// test if pattern satisfies the selectors selection criteria
// test chi2
if( pattern.chi2() > m_chi2_max ) return false;
- if( m_printLevel >= 2)
- std::cout << "pattern passed chi2 cut " << pattern.chi2() << std::endl;
+ if (log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<"pattern passed chi2 cut " << pattern.chi2() << endmsg;
// test total numbers of mdt segments on pattern
if( pattern.muonSegments() < m_mdtSeg_min ) return false;
- if( m_printLevel >= 2)
- std::cout << "pattern passed muon segments cut "
- << pattern.muonSegments() << std::endl;
+ if (log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<"pattern passed muon segments cut " << pattern.muonSegments() << endmsg;
return true;
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/CalibrationDbIOTool.cxx b/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/CalibrationDbIOTool.cxx
index e3a64cc4a2cacf0e361741a92391b40f76d0a331..7f531d323184f8c30d0448fd6f316f91b0196542 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/CalibrationDbIOTool.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibDbOperations/src/CalibrationDbIOTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//this
@@ -133,15 +133,10 @@ StatusCode CalibrationDbIOTool::WriteT0(MdtTubeFitContainer* t0, const NtupleSta
return StatusCode::FAILURE;
}
m_data_connections[1]->OpenConnection();
- std::cout<<"."<<std::endl;
CalibT0DbOperations t0_op(*m_data_connections[1]);
- std::cout<<"."<<std::endl;
std::vector<int> val(0);
- std::cout<<"."<<std::endl;
if(!t0_op.WriteT0Chamber(it, t0, val, m_headid, m_sitename)) {
- std::cout<<"."<<std::endl;
log << MSG::FATAL <<"Writing t0 failed!"<<endmsg;
- std::cout<<"."<<std::endl;
return StatusCode::FAILURE;
}
}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibEventBase/MuonCalibEventBase/MuonCalibRawTriggerHitCollection.h b/MuonSpectrometer/MuonCalib/MuonCalibEventBase/MuonCalibEventBase/MuonCalibRawTriggerHitCollection.h
index f5fc5d1433e05afd9eb21cf9099f553b86b4b5da..79e1cc897aff7031635927f3525c303a5bcb4e02 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibEventBase/MuonCalibEventBase/MuonCalibRawTriggerHitCollection.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibEventBase/MuonCalibEventBase/MuonCalibRawTriggerHitCollection.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*********************************************************//
@@ -11,6 +11,9 @@
#ifndef MuonCalibRawTriggerHitCollection_h
#define MuonCalibRawTriggerHitCollection_h
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#include <vector>
#include <iostream>
@@ -55,10 +58,12 @@ namespace MuonCalib{
inline int MuonCalibRawTriggerHitCollection::numberOfMuonCalibRawRpcTriggerHits() const { return m_rawRpcTriggerHitVec.size() ; }
inline void MuonCalibRawTriggerHitCollection::addMuonCalibRawTriggerHit( MuonCalibRawRpcTriggerHit* rawTriggerHit ) {
- if(rawTriggerHit){
+ if(rawTriggerHit) {
m_rawRpcTriggerHitVec.push_back(rawTriggerHit) ;
+ } else {
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibRawTriggerHitCollection");
+ log<<MSG::WARNING<<"Refuse to put an empty MuonCalibRawRpcTriggerHit in MuonCalibRawTriggerHitCollection"<<endmsg;
}
- else std::cout << "!!!!Refuse to put an empty MuonCalibRawRpcTriggerHit in MuonCalibRawTriggerHitCollection" << std::endl;
}
}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibEventBase/MuonCalibEventBase/MuonCalibTruthCollection.h b/MuonSpectrometer/MuonCalib/MuonCalibEventBase/MuonCalibEventBase/MuonCalibTruthCollection.h
index d823c1c0c52d04290c1f328264a70dfd305df2bd..fa4bd3353f40492c913a325429a79409ad418bd4 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibEventBase/MuonCalibEventBase/MuonCalibTruthCollection.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibEventBase/MuonCalibEventBase/MuonCalibTruthCollection.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//*********************************************************//
@@ -11,6 +11,9 @@
#ifndef MuonCalibTruthCollection_h
#define MuonCalibTruthCollection_h
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#include <vector>
#include <iostream>
@@ -134,39 +137,49 @@ namespace MuonCalib{
}
inline void MuonCalibTruthCollection::addTruth( MuonCalibTruth* truth ) {
- if(truth){
+ if (truth) {
m_truthVec.push_back(truth) ;
+ } else {
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibTruthCollection");
+ log<<MSG::WARNING<<"MuonCalibTruth not passed to MuonCalibTruthCollection"<<endmsg;
}
- else std::cout << "MuonCalibTruth not passed to MuonCalibTruthCollection" << std::endl;
}
inline void MuonCalibTruthCollection::addTruth( MuonCalibMdtTruthHit* truth ) {
- if(truth){
+ if (truth) {
m_mdtTruthVec.push_back(truth) ;
+ } else {
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibTruthCollection");
+ log<<MSG::WARNING<<"MuonCalibMdtTruthHit not passed to MuonCalibTruthCollection"<<endmsg;
}
- else std::cout << "MuonCalibMdtTruthHit not passed to MuonCalibTruthCollection" << std::endl;
}
inline void MuonCalibTruthCollection::addTruth( MuonCalibRpcTruthHit* truth ) {
- if(truth){
+ if (truth) {
m_rpcTruthVec.push_back(truth) ;
+ } else {
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibTruthCollection");
+ log<<MSG::WARNING<<"MuonCalibRpcTruthHit not passed to MuonCalibTruthCollection"<<endmsg;
}
- else std::cout << "MuonCalibRpcTruthHit not passed to MuonCalibTruthCollection" << std::endl;
}
inline void MuonCalibTruthCollection::addTruth( MuonCalibTgcTruthHit* truth ) {
- if(truth){
+ if (truth) {
m_tgcTruthVec.push_back(truth) ;
+ } else {
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibTruthCollection");
+ log<<MSG::WARNING<<"MuonCalibTgcTruthHit not passed to MuonCalibTruthCollection"<<endmsg;
}
- else std::cout << "MuonCalibTgcTruthHit not passed to MuonCalibTruthCollection" << std::endl;
}
inline void MuonCalibTruthCollection::addTruth( MuonCalibCscTruthHit* truth ) {
- if(truth){
+ if (truth) {
m_cscTruthVec.push_back(truth) ;
+ } else {
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibTruthCollection");
+ log<<MSG::WARNING<<"MuonCalibCscTruthHit not passed to MuonCalibTruthCollection"<<endmsg;
}
- else std::cout << "MuonCalibCscTruthHit not passed to MuonCalibTruthCollection" << std::endl;
}
}//end namespace MuonCalib
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedTrack.h b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedTrack.h
index d1845d2b4ce7997c8b4d73a612623de207831172..1ab0d47880c5fd62a7de34697ef1c9c41b2f5b7b 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedTrack.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/MuonCalibExtraTreeEvent/MuonCalibExtendedTrack.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MUONCALIBEXTENDEDTRACK_H
@@ -11,7 +11,8 @@
#include "MuonCalibExtraTreeEvent/MuonCalibTrackSummary.h"
#include "MuonCalibExtraTreeEvent/MuonCalibRawHitAssociationMap.h"
#include "MuonCalibExtraTreeEvent/MuonCalibExtendedTrackOverlap.h"
-
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include <string>
@@ -273,11 +274,14 @@ namespace MuonCalib {
for( ;it!=it_end;++it ){
if( idAuthors.count((*it)->author()) ) return true;
if( (*it)->author() == 140 ) {
- const MuonCalibExtendedTrack* mbTrack = (*it)->getAssociatedTrack(100);
- if( mbTrack ){
- if( mbTrack->ndof() != (*it)->ndof() ) return true;
- else std::cout << " STACO track without ID " << std::endl;
- }
+ const MuonCalibExtendedTrack* mbTrack = (*it)->getAssociatedTrack(100);
+ if( mbTrack ){
+ if( mbTrack->ndof() != (*it)->ndof() ) return true;
+ else {
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibExtendedTrack");
+ log<<MSG::WARNING<<"STACO track without IDn"<<endmsg;
+ }
+ }
}
}
return false;
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
index 3cbec9bcea365b83068e36297ce73111fa4b4325..57932cef85252787a32d2fdd62670cfddf1ba2f0 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/EventHandler.cxx
@@ -12,22 +12,21 @@
#include "MuonCalibExtraTreeEvent/MuonCalibEvent_E.h"
#include "MuonCalibExtraTreeEvent/MuonCalibExtendedTrack.h"
#include "MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h"
-
#include "MuonCalibEventBase/MuonCalibTruthCollection.h"
#include "MuonCalibEventBase/MuonCalibTruth.h"
#include "MuonCalibEventBase/MuonCalibMdtTruthHit.h"
#include "MuonCalibEventBase/MuonCalibRpcTruthHit.h"
#include "MuonCalibEventBase/MuonCalibTgcTruthHit.h"
#include "MuonCalibEventBase/MuonCalibCscTruthHit.h"
-
#include "MuonCalibIdentifier/MuonFixedId.h"
#include "MuonCalibEventBase/MuonCalibEvent.h"
#include "MuonCalibEventBase/MuonCalibPattern.h"
#include "MuonCalibEventBase/MuonCalibSegment.h"
#include "MuonCalibEventBase/MuonCalibRawHitCollection.h"
#include "MuonCalibEventBase/MuonCalibTruthCollection.h"
-
#include "MuonCalibStl/DeleteObject.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
#include <iostream>
#include <sstream>
@@ -271,11 +270,11 @@ namespace MuonCalib{
std::map <int, std::set <MuonCalibRpcTruthHit*> > truthTrkRpcHitMap;
std::map <int, std::set <MuonCalibTgcTruthHit*> > truthTrkTgcHitMap;
-
+ MsgStream log(Athena::getMessageSvc(),"EventHandler");
for ( ; truth_it!=truth_it_end; truth_it++) {
int barcode = ((*truth_it)->barCode());
if(barcode<=0) continue;
- if(m_debug) std::cout << " truth track barcode " << barcode << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<"createExtendedTruthTracks() truth track barcode " << barcode << endmsg;
if ((*truth_it)->position().perp()< 4000 && std::abs((*truth_it)->position().z())<6000.) {
if ((*truth_it)->position().perp()< 100 && std::abs((*truth_it)->position().z())<500.) {
// Close to IP
@@ -314,10 +313,10 @@ namespace MuonCalib{
if( itt== truthTrkME.end() ) {
itt = truthTrkRest.find(barcode);
if( itt== truthTrkRest.end() ) {
- if(m_debug) std::cout << " Mdt Truth hit not found with barcode: " << barcode << std::endl;
- } else { if(m_debug) std::cout << " Mdt Truth hit at Rest " << barcode << std::endl; }
- } else { if(m_debug) std::cout << " Mdt Truth hit at ME " << barcode << std::endl; }
- } else { if(m_debug) std::cout << " Mdt Truth hit at IP " << barcode << std::endl; }
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Mdt Truth hit not found with barcode: " << barcode<<endmsg;
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Mdt Truth hit at Rest " << barcode<<endmsg; }
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Mdt Truth hit at ME " << barcode<<endmsg; }
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Mdt Truth hit at IP " << barcode<<endmsg; }
}
if(truthTrkMdtHitMap.size()==0) return;
@@ -347,10 +346,10 @@ namespace MuonCalib{
if( itt== truthTrkME.end() ) {
itt = truthTrkRest.find(barcode);
if( itt== truthTrkRest.end() ) {
- if(m_debug) std::cout << " Csc Truth hit not found with barcode: " << barcode << std::endl;
- } else { if(m_debug) std::cout << " Csc Truth hit at Rest " << barcode << std::endl; }
- } else { if(m_debug) std::cout << " Csc Truth hit at ME " << barcode << std::endl; }
- } else { if(m_debug) std::cout << " Csc Truth hit at IP " << barcode << std::endl; }
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Csc Truth hit not found with barcode: " << barcode<<endmsg;
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Csc Truth hit at Rest " << barcode<<endmsg; }
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Csc Truth hit at ME " << barcode<<endmsg; }
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Csc Truth hit at IP " << barcode<<endmsg; }
}
//
@@ -377,10 +376,10 @@ namespace MuonCalib{
if( itt== truthTrkME.end() ) {
itt = truthTrkRest.find(barcode);
if( itt== truthTrkRest.end() ) {
- if(m_debug) std::cout << " Rpc Truth hit not found with barcode: " << barcode << std::endl;
- } else { if(m_debug) std::cout << " Rpc Truth hit at Rest " << barcode << std::endl; }
- } else { if(m_debug) std::cout << " Rpc Truth hit at ME " << barcode << std::endl; }
- } else { if(m_debug) std::cout << " Rpc Truth hit at IP " << barcode << std::endl; }
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Rpc Truth hit not found with barcode: " << barcode<<endmsg;
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Rpc Truth hit at Rest " << barcode<<endmsg; }
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Rpc Truth hit at ME " << barcode<<endmsg; }
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Rpc Truth hit at IP " << barcode<<endmsg; }
}
//
@@ -407,10 +406,10 @@ namespace MuonCalib{
if( itt== truthTrkME.end() ) {
itt = truthTrkRest.find(barcode);
if( itt== truthTrkRest.end() ) {
- if(m_debug) std::cout << " Tgc Truth hit not found with barcode: " << barcode << std::endl;
- } else { if(m_debug) std::cout << " Tgc Truth hit at Rest " << barcode << std::endl; }
- } else { if(m_debug) std::cout << " Tgc Truth hit at ME " << barcode << std::endl; }
- } else { if(m_debug) std::cout << " Tgc Truth hit at IP " << barcode << std::endl; }
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Tgc Truth hit not found with barcode: " << barcode<<endmsg;
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Tgc Truth hit at Rest " << barcode<<endmsg; }
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Tgc Truth hit at ME " << barcode<<endmsg; }
+ } else { if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Tgc Truth hit at IP " << barcode<<endmsg; }
}
@@ -422,7 +421,7 @@ namespace MuonCalib{
int pdgcode = itIP->second->PDGCode();
std::map <int, std::set <MuonCalibMdtTruthHit*> >::iterator its = truthTrkMdtHitMap.find(barcode);
if (its!=truthTrkMdtHitMap.end()) {
- if(m_debug) std::cout << " Truth track at IP " << barcode << " with Mdt hits " << its->second.size() << " pdg " << pdgcode << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track at IP " << barcode << " with Mdt hits " << its->second.size() << " pdg " << pdgcode<<endmsg;
double posx = itIP->second->position().x();
double posy = itIP->second->position().y();
double posz = itIP->second->position().z();
@@ -432,7 +431,7 @@ namespace MuonCalib{
if(pdgcode<0) qOverP = - qOverP;
int author = -13;
if(std::abs(pdgcode)!=13) author = -113;
- if(m_debug) std::cout << " pdgcode " << pdgcode << " author " << author << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" pdgcode " << pdgcode << " author " << author<<endmsg;
int ndof = 0;
double cov00 = -999.;
double cov01 = -999.;
@@ -463,7 +462,7 @@ namespace MuonCalib{
Amg::Vector3D pos(0.,(*ith)->positionAlongTube(),0.);
MuonCalibHit_E* muonHit = new MuonCalibHit_E(id, pos, driftRadius, error, residual, pull, 1 );
truthTrack->addHit(muonHit);
- if(m_debug) std::cout << " Truth track Add Mdt hit " << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track Add Mdt hit "<<endmsg;
}
std::map <int, std::set <MuonCalibCscTruthHit*> >::iterator itcs = truthTrkCscHitMap.find(barcode);
@@ -479,7 +478,7 @@ namespace MuonCalib{
Amg::Vector3D pos(0.,0.,0.);
MuonCalibHit_E* muonHit = new MuonCalibHit_E(id, pos, driftRadius, error, residual, pull, 1 );
truthTrack->addHit(muonHit);
- if(m_debug) std::cout << " Truth track Add Csc hit " << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track Add Csc hit "<<endmsg;
}
}
@@ -496,7 +495,7 @@ namespace MuonCalib{
Amg::Vector3D pos(0.,0.,0.);
MuonCalibHit_E* muonHit = new MuonCalibHit_E(id, pos, driftRadius, error, residual, pull, 1 );
truthTrack->addHit(muonHit);
- if(m_debug) std::cout << " Truth track Add Rpc hit " << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track Add Rpc hit "<<endmsg;
}
}
@@ -513,7 +512,7 @@ namespace MuonCalib{
Amg::Vector3D pos(0.,0.,0.);
MuonCalibHit_E* muonHit = new MuonCalibHit_E(id, pos, driftRadius, error, residual, pull, 1 );
truthTrack->addHit(muonHit);
- if(m_debug) std::cout << " Truth track Add Tgc hit " << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track Add Tgc hit "<<endmsg;
}
}
@@ -536,7 +535,7 @@ namespace MuonCalib{
int pdgcode = itME->second->PDGCode();
std::map <int, std::set <MuonCalibMdtTruthHit*> >::iterator its = truthTrkMdtHitMap.find(barcode);
if (its!=truthTrkMdtHitMap.end()) {
- if(m_debug) std::cout << " Truth track at ME " << barcode << " with Mdt hits " << its->second.size() << " pdg " << pdgcode << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track at ME " << barcode << " with Mdt hits " << its->second.size() << " pdg " << pdgcode<<endmsg;
double posx = itME->second->position().x();
double posy = itME->second->position().y();
double posz = itME->second->position().z();
@@ -546,7 +545,7 @@ namespace MuonCalib{
if(pdgcode<0) qOverP = - qOverP;
int author = -1013;
if(std::abs(pdgcode)!=13) author = -1113;
- if(m_debug) std::cout << " pdgcode " << pdgcode << " author " << author << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" pdgcode " << pdgcode << " author " << author<<endmsg;
int ndof = 0;
double cov00 = -999.;
double cov01 = -999.;
@@ -577,7 +576,7 @@ namespace MuonCalib{
Amg::Vector3D pos(0.,(*ith)->positionAlongTube(),0.);
MuonCalibHit_E* muonHit = new MuonCalibHit_E(id, pos, driftRadius, error, residual, pull, 1 );
truthTrack->addHit(muonHit);
- if(m_debug) std::cout << " Truth track Add Mdt hit " << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track Add Mdt hit "<<endmsg;
}
@@ -594,7 +593,7 @@ namespace MuonCalib{
Amg::Vector3D pos(0.,0.,0.);
MuonCalibHit_E* muonHit = new MuonCalibHit_E(id, pos, driftRadius, error, residual, pull, 1 );
truthTrack->addHit(muonHit);
- if(m_debug) std::cout << " Truth track Add Csc hit " << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track Add Csc hit "<<endmsg;
}
}
std::map <int, std::set <MuonCalibRpcTruthHit*> >::iterator itrs = truthTrkRpcHitMap.find(barcode);
@@ -610,7 +609,7 @@ namespace MuonCalib{
Amg::Vector3D pos(0.,0.,0.);
MuonCalibHit_E* muonHit = new MuonCalibHit_E(id, pos, driftRadius, error, residual, pull, 1 );
truthTrack->addHit(muonHit);
- if(m_debug) std::cout << " Truth track Add Rpc hit " << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track Add Rpc hit "<<endmsg;
}
}
@@ -627,7 +626,7 @@ namespace MuonCalib{
Amg::Vector3D pos(0.,0.,0.);
MuonCalibHit_E* muonHit = new MuonCalibHit_E(id, pos, driftRadius, error, residual, pull, 1 );
truthTrack->addHit(muonHit);
- if(m_debug) std::cout << " Truth track Add Tgc hit " << std::endl;
+ if(log.level()<=MSG::DEBUG) log<<MSG::DEBUG<<" Truth track Add Tgc hit "<<endmsg;
}
}
@@ -725,8 +724,9 @@ namespace MuonCalib{
const MdtCalibHitBase& hit = **mdtIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid MDT id! " << std::endl;
- continue;
+ MsgStream log(Athena::getMessageSvc(),"EventHandler");
+ log<<MSG::WARNING<<"segmentOverlap(), invalid MDT id! "<<endmsg;
+ continue;
}
segmentIds.push_back(id);
}
@@ -736,8 +736,9 @@ namespace MuonCalib{
const MdtCalibHitBase& hit = **mdtIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid MDT id! " << std::endl;
- continue;
+ MsgStream log(Athena::getMessageSvc(),"EventHandler");
+ log<<MSG::WARNING<<"segmentOverlap(), invalid MDT id! "<<endmsg;
+ continue;
}
std::vector <MuonFixedId> ::iterator it = std::find( segmentIds.begin(), segmentIds.end(), id );
if( it == segmentIds.end() ) {
@@ -754,7 +755,8 @@ namespace MuonCalib{
const CscCalibHitBase& hit = **cscIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid CSC id! " << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"EventHandler");
+ log<<MSG::WARNING<<"segmentOverlap(), invalid CSC id! "<<endmsg;
continue;
}
segmentIds.push_back(id);
@@ -766,7 +768,8 @@ namespace MuonCalib{
const CscCalibHitBase& hit = **cscIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid CSC id! " << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"EventHandler");
+ log<<MSG::WARNING<<"segmentOverlap(), invalid CSC id! "<<endmsg;
continue;
}
std::vector <MuonFixedId> ::iterator it = std::find( segmentIds.begin(), segmentIds.end(), id );
@@ -792,8 +795,9 @@ namespace MuonCalib{
const MdtCalibHitBase& hit = **mdtIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid MDT id! " << std::endl;
- continue;
+ MsgStream log(Athena::getMessageSvc(),"EventHandler");
+ log<<MSG::WARNING<<"associateSegmentWithTrack(), invalid MDT id! "<<endmsg;
+ continue;
}
// look up hit on track
IdHitMap::const_iterator trkHit = track.idHitMap().find(id);
@@ -814,7 +818,8 @@ namespace MuonCalib{
const CscCalibHitBase& hit = **cscIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid CSC id! " << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"EventHandler");
+ log<<MSG::WARNING<<"associateSegmentWithTrack(), invalid CSC id! "<<endmsg;
continue;
}
// look up hit on track
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedSegment.cxx b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedSegment.cxx
index a9c1f43a2c3af4541d648de19fc957257940f70c..1fd4205957f576844358aa7e91695916f86f9896 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedSegment.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibExtraTree/MuonCalibExtraTreeEvent/src/MuonCalibExtendedSegment.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonCalibExtraTreeEvent/MuonCalibExtendedSegment.h"
@@ -7,6 +7,8 @@
#include "MuonCalibIdentifier/MuonFixedId.h"
#include "MuonCalibExtraUtils/MuonFixedIdPrinter.h"
#include "MuonCalibExtraUtils/MuonFixedIdManipulator.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
#include <sstream>
@@ -14,9 +16,7 @@ namespace MuonCalib {
MuonCalibExtendedSegment::MuonCalibExtendedSegment( const MuonCalibSegment& segment ) : MuonCalibSegment(segment) {
-
MuonFixedIdManipulator idManip;
- // MuonFixedIdPrinter printer;
m_summary.nhits = 0;
m_summary.nscatters = 0;
@@ -37,8 +37,9 @@ namespace MuonCalib {
const MdtCalibHitBase& hit = **mdtIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid MDT id! " << std::endl;
- continue;
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibExtendedSegment");
+ log<<MSG::WARNING<<"invalid MDT id!"<<endmsg;
+ continue;
}
m_idSet.insert(id);
@@ -88,8 +89,9 @@ namespace MuonCalib {
const RpcCalibHitBase& hit = **rpcIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid RPC id! " << std::endl;
- continue;
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibExtendedSegment");
+ log<<MSG::WARNING<<"invalid RPC id!"<<endmsg;
+ continue;
}
m_idSet.insert(id);
@@ -134,8 +136,9 @@ namespace MuonCalib {
const TgcCalibHitBase& hit = **tgcIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid TGC id! " << std::endl;
- continue;
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibExtendedSegment");
+ log<<MSG::WARNING<<"invalid TGC id!"<<endmsg;
+ continue;
}
m_idSet.insert(id);
@@ -179,8 +182,9 @@ namespace MuonCalib {
const CscCalibHitBase& hit = **cscIt;
MuonFixedId id = hit.identify();
if( !id.isValid() ) {
- std::cout << " MuonCalibExtendedSegment(), invalid CSC id! " << std::endl;
- continue;
+ MsgStream log(Athena::getMessageSvc(),"MuonCalibExtendedSegment");
+ log<<MSG::WARNING<<"invalid CSC id!"<<endmsg;
+ continue;
}
m_idSet.insert(id);
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierHashCalc.h b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierHashCalc.h
index 1efb0b4a5ac9dcc05ee120cb8f87295fed51234d..204a479ac5992b64a6525cac834963bfbe71a0d4 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierHashCalc.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierHashCalc.h
@@ -1,7 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#ifndef MUONCALIBIDENTIFIER_IDENTIFIERHASHCALC_H
+#define MUONCALIBIDENTIFIER_IDENTIFIERHASHCALC_H
+
/***************************************************************************
* Identifier hashes
* -----------------------------------------
@@ -15,16 +18,12 @@
* makes identifier hashes based on identifier fields using calculations.
*/
-#ifndef MUONCALIBIDENTIFIER_IDENTIFIERHASHCALC_H
-# define MUONCALIBIDENTIFIER_IDENTIFIERHASHCALC_H
-// std
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#include <limits.h>
#include <iostream>
#include <iomanip>
-// other packages
-
-// this package
-
template <class T>
class IdentifierHashCalc {
@@ -189,34 +188,36 @@ template <class T>
bool IdentifierHashCalc<T>::checkValidity() const {
// check that table is non-empty
if ( !size() ) {
- std::cout << "IdentifierHashCalc<T>::checkValidity() WARNING: Table is empty." << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"IdentifierHashCalc");
+ log<<MSG::WARNING<<"IdentifierHashCalc<T>::checkValidity() Table is empty."<<endmsg;
return false;
}
// check that tables are each other's inverse
unsigned int nErrors = 0;
+#ifdef IDENTIFIERHASHCALC_DEBUG
+ MsgStream log(Athena::getMessageSvc(),"IdentifierHashCalc");
+#endif
for ( unsigned int i = 0; i < size(); ++i ) {
HashType iHash(i);
IdType id = getIdentifier( iHash );
unsigned int hash = getHash( id );
if ( hash != i ) {
- std::cout << "IdentifierHashCalc<T>::checkValidity() ERROR: getIdentifier("
- << i << ")=0x" << std::hex << id << std::dec
- << " whereas getHash(" << std::hex << id << std::dec << ")=" << hash
- << std::endl;
- ++nErrors;
+#ifndef IDENTIFIERHASHCALC_DEBUG
+ MsgStream log(Athena::getMessageSvc(),"IdentifierHashCalc");
+#endif
+ log<<MSG::WARNING<<"IdentifierHashCalc<T>::checkValidity() getIdentifier(" << i << ")=0x" << std::hex << id << std::dec << " whereas getHash(" << std::hex << id << std::dec << ")=" << hash<<endmsg;
+ ++nErrors;
} else {
#ifdef IDENTIFIERHASHCALC_DEBUG
- std::cout << "hash=" << i
- << " <--> id=0x" << std::hex << id << std::dec << ": OK" << std::endl;
+ log<<MSG::DEBUG<<"hash=" << i << " <--> id=0x" << std::hex << id << std::dec << ": OK"<<endmsg;
#endif
}
}
#ifdef IDENTIFIERHASHCALC_DEBUG
if ( nErrors ) {
- std::cout << "IdentifierHashCalc<T>::checkValidity() ERROR: table contains "
- << nErrors << " errors." << std::endl;
+ log<<MSG::WARNING<<"IdentifierHashCalc<T>::checkValidity() table contains " << nErrors << " errors." << endmsg;
} else {
- std::cout << "IdentifierHashCalc<T>::checkValidity(): table OK" << std::endl;
+ log<<MSG::DEBUG<<"IdentifierHashCalc<T>::checkValidity(): table OK"<<endmsg;
}
#endif
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierHashTable.h b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierHashTable.h
index f706607b8e0bbb6017dbb3ce0594fec85849db87..fb1116ad44491b78531937ac53fd1b25c3a1d98e 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierHashTable.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierHashTable.h
@@ -1,7 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#ifndef MUONCALIBIDENTIFIER_IDENTIFIERHASHTABLE_H
+#define MUONCALIBIDENTIFIER_IDENTIFIERHASHTABLE_H
+
/***************************************************************************
* Identifier utility
* -----------------------------------------
@@ -11,15 +14,13 @@
* Last Update : 07 May 2004
***************************************************************************/
-#ifndef MUONCALIBIDENTIFIER_IDENTIFIERHASHTABLE_H
-# define MUONCALIBIDENTIFIER_IDENTIFIERHASHTABLE_H
-// std
+#include "MuonCalibIdentifier/IdentifierToHash.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#include <iostream>
#include <sstream>
#include <limits.h>
-// other packages
-// this package
-#include "MuonCalibIdentifier/IdentifierToHash.h"
/** @class IdentifierHashTable<T>
* it uses a multi-dimensional array and identifier fields for fast access of
@@ -88,27 +89,28 @@ template <class T>
typename IdentifierHashTable<T>::HashType
IdentifierHashTable<T>::addEntry( const typename IdentifierHashTable<T>::IdType& id ) {
#ifdef IDENTIFIERHASHTABLE_DEBUG
- std::cout << "IdentifierHashTable<T>::addEntry(0x" << std::hex << id << std::dec << ")";
+ MsgStream log(Athena::getMessageSvc(),"IdentifierHashTable");
+ log<<MSG::DEBUG<<"IdentifierHashTable<T>::addEntry(0x" << std::hex << id << std::dec << ")"<<endmsg;
#endif
if ( !T::isValid( id ) ) {
#ifdef IDENTIFIERHASHTABLE_DEBUG
- std::cout << ": id is invalid. Nothing added." << std::endl;
+ log<<MSG::DEBUG<<": id is invalid. Nothing added."<<endmsg;
#endif
return defaultHashValue();
}
#ifdef IDENTIFIERHASHTABLE_DEBUG
- std::cout << "::IdToHashTable";
+ log<<MSG::DEBUG<<"::IdToHashTable"<<endmsg;
#endif
HashType theHash( m_hashToId.size() );
if ( !m_idToHash.addEntry( id, theHash ) ) {
#ifdef IDENTIFIERHASHTABLE_DEBUG
- std::cout << " WARNING: could not add to table" << std::endl;
+ log<<MSG::DEBUG<<" WARNING: could not add to table"<<endmsg;
#endif
return defaultHashValue();
} else {
m_hashToId.push_back( id );
#ifdef IDENTIFIERHASHTABLE_DEBUG
- std::cout << " ADDED at hash=" << theHash << std::endl;
+ log<<MSG::DEBUG<<" ADDED at hash=" << theHash<<endmsg;
#endif
}
@@ -145,16 +147,19 @@ bool IdentifierHashTable<T>::checkValidity() const {
// check that both tables are same size
unsigned int idToHashSize = m_idToHash.size();
if ( idToHashSize != m_hashToId.size() ) {
- std::cout << "IdentifierHashTable<T>::checkValidity() ERROR: idToHash size ("
- << idToHashSize << ") not equal to hashToId size ("
- << m_hashToId.size() << ")" << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"IdentifierHashTable");
+ log<<MSG::WARNING<<"IdentifierHashTable<T>::checkValidity() idToHash size (" << idToHashSize << ") not equal to hashToId size (" << m_hashToId.size() << ")"<<endmsg;
return false;
}
// check that table is non-empty
if ( !m_hashToId.size() ) {
- std::cout << "IdentifierHashTable<T>::checkValidity() WARNING: Table is empty." << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"IdentifierHashTable");
+ log<<MSG::WARNING<<"IdentifierHashTable<T>::checkValidity() Table is empty."<<endmsg;
return false;
}
+#ifdef IDENTIFIERHASHTABLE_DEBUG
+ MsgStream log(Athena::getMessageSvc(),"IdentifierHashTable");
+#endif
// check that tables are each other's inverse
unsigned int nErrors = 0;
for ( unsigned int i = 0; i < m_hashToId.size(); ++i ) {
@@ -162,24 +167,22 @@ bool IdentifierHashTable<T>::checkValidity() const {
IdType id = getIdentifier( tryHash );
HashType gotHash = getHash( id );
if ( gotHash != tryHash ) {
- std::cout << "IdentifierHashTable<T>::checkValidity() ERROR: getIdentifier("
- << tryHash << ")=0x" << std::hex << id << std::dec
- << " whereas getHash(" << std::hex << id << std::dec << ")=" << gotHash
- << std::endl;
+#ifndef IDENTIFIERHASHTABLE_DEBUG
+ MsgStream log(Athena::getMessageSvc(),"IdentifierHashTable");
+#endif
+ log<<MSG::WARNING<<"IdentifierHashTable<T>::checkValidity() getIdentifier(" << tryHash << ")=0x" << std::hex << id << std::dec << " whereas getHash(" << std::hex << id << std::dec << ")=" << gotHash<<endmsg;
++nErrors;
} else {
#ifdef IDENTIFIERHASHTABLE_DEBUG
- std::cout << "hash=" << i
- << " <--> id=0x" << std::hex << id << std::dec << ": OK" << std::endl;
+ log<<MSG::DEBUG<<"hash=" << i << " <--> id=0x" << std::hex << id << std::dec << ": OK" <<endmsg;
#endif
}
}
#ifdef IDENTIFIERHASHTABLE_DEBUG
if ( nErrors ) {
- std::cout << "IdentifierHashTable<T>::checkValidity() ERROR: table contains "
- << nErrors << " errors." << std::endl;
+ log<<MSG::WARNING<<"IdentifierHashTable<T>::checkValidity() table contains " << nErrors << " errors." << endmsg;
} else {
- std::cout << "IdentifierHashTable<T>::checkValidity(): table OK" << std::endl;
+ log<<MSG::DEBUG<<"IdentifierHashTable<T>::checkValidity(): table OK" << endmsg;
}
#endif
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierToHash.h b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierToHash.h
index 83284d323dca4a61714fb9f088584a9ef85af605..16a65fa217ea6ae23aa7cd1799568419aa731e09 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierToHash.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/IdentifierToHash.h
@@ -1,7 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#ifndef MUONCALIBIDENTIFIER_IDENTIFIERTOHASH_H
+#define MUONCALIBIDENTIFIER_IDENTIFIERTOHASH_H
+
/***************************************************************************
* Identifier utility
* -----------------------------------------
@@ -11,16 +14,14 @@
* Last Update : 27 April 2005
***************************************************************************/
-#ifndef MUONCALIBIDENTIFIER_IDENTIFIERTOHASH_H
-# define MUONCALIBIDENTIFIER_IDENTIFIERTOHASH_H
-// std
+#include "MuonCalibIdentifier/MultiDimArray.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#include <iostream>
#include <sstream>
#include <string>
#include <limits.h>
-// other packages
-// this package
-#include "MuonCalibIdentifier/MultiDimArray.h"
/**
* The IdentifierToHash table.
@@ -63,14 +64,15 @@ public:
static const typename K::ValueType& getConstRef( const K& obj, const T& indices ) {
int idx = indices[N-1];
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << "[" << idx << "]";
+ MsgStream log(Athena::getMessageSvc(),"RecursiveIndexCall");
+ log<<MSG::DEBUG<<"[" << idx << "]"<<endmsg;
#endif
return RecursiveIndexCall<N-1,typename K::SubType>::getConstRef( obj[ idx ], indices );
}
static typename K::ValueType& getRef( K& obj, const T& indices ) {
int idx = indices[N-1];
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << "{" << idx << "}";
+ log<<MSG::DEBUG<<"{" << idx << "}"<<endmsg;
#endif
return RecursiveIndexCall<N-1,typename K::SubType>::getRef( obj[ idx ], indices );
}
@@ -83,14 +85,15 @@ public:
static const typename K::ValueType& getConstRef( const K& obj, const T& indices ) {
int idx = indices[0];
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << "[" << idx << "]";
+ MsgStream log(Athena::getMessageSvc(),"RecursiveIndexCall");
+ log<<MSG::DEBUG<<"[" << idx << "]"<<endmsg;
#endif
return obj[ idx ];
}
static typename K::ValueType& getRef( K& obj, const T& indices ) {
int idx = indices[0];
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << "{" << idx << "}";
+ log<<MSG::DEBUG<<"{" << idx << "}"<<endmsg;
#endif
return obj[ idx ];
}
@@ -110,11 +113,10 @@ public:
int idx = indices[N-1];
bool bOK = obj.isInRange( idx );
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << "(" << idx << ")";
+ MsgStream log(Athena::getMessageSvc(),"RecursiveRangeCheck");
+ log<<MSG::DEBUG<<"(" << idx << ")"<<endmsg;
if ( !bOK ) {
- std::cout << " CHECK: " << idx << " Out of range (" << obj.minIndex()
- << "," << obj.maxIndex() << ")"
- << std::endl;
+ log<<MSG::DEBUG<<" CHECK: " << idx << " Out of range (" << obj.minIndex() << "," << obj.maxIndex() << ")"<<endmsg;
}
#endif
return bOK && RecursiveRangeCheck<N-1,typename K::SubType>::isInRange( obj[ idx ], indices );
@@ -129,13 +131,13 @@ public:
int idx = indices[0];
bool bOK = obj.isInRange( idx );
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << "(" << idx << ")";
+ MsgStream log(Athena::getMessageSvc(),"RecursiveRangeCheck");
+ log<<MSG::DEBUG<<"(" << idx << ")"<<endmsg;
if ( !bOK ) {
- std::cout << " CHECK: Out of range (" << obj.minIndex() << "," << obj.maxIndex() << ")";
+ log<<MSG::DEBUG<<" CHECK: Out of range (" << obj.minIndex() << "," << obj.maxIndex() << ")"<<endmsg;
}else {
- std::cout << " CHECK: Range OK";
+ log<<MSG::DEBUG<<" CHECK: Range OK"<<endmsg;
}
- std::cout << std::endl;
#endif
return bOK;
}
@@ -198,18 +200,18 @@ bool
IdentifierToHash<T>::addEntry( const typename IdentifierToHash<T>::IdType& id,
const typename IdentifierToHash<T>::HashType& aHash ) {
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << "IdentifierToHash<T>::addEntry(0x" << std::hex << id << std::dec
- << "," << aHash << ")";
+ MsgStream log(Athena::getMessageSvc(),"IdentifierToHash<T>");
+ log<<MSG::DEBUG<<"IdentifierToHash<T>::addEntry(0x" << std::hex << id << std::dec << "," << aHash << ")"<<endmsg;
#endif
if ( !T::isValid( id ) ) {
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << ": id is invalid. Nothing added." << std::endl;
+ log<<MSG::DEBUG<<": id is invalid. Nothing added."<<endmsg;
#endif
return false;
}
m_idFields.setAll( id );
-#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << "::IdToHashTable";
+#ifdef
+ log<<MSG::DEBUG<<"::IdToHashTable"<<endmsg;
#endif
HashType& hashRef =
@@ -217,15 +219,14 @@ IdentifierToHash<T>::addEntry( const typename IdentifierToHash<T>::IdType& id,
// only add hash if entry is not yet taken
if ( hashRef != defaultHashValue() ) {
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << " WARNING: id already taken by hash=" << hashRef
- << ". Nothing added." << std::endl;
+ log<<MSG::WARNING<<"id already taken by hash=" << hashRef << ". Nothing added."<<endmsg;
#endif
return false;
} else {
// set the hash to the indicated value
hashRef = aHash;
#ifdef IDENTIFIERTOHASH_DEBUG
- std::cout << " ADDED." << std::endl;
+ log<<MSG::DEBUG<<" ADDED."<<endmsg;
#endif
}
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/MdtGasChannel.h b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/MdtGasChannel.h
index b6de46da0c97829eebf3be8ba0f56c469a15f27b..20598533d3e2518977ee2667662cf1645f8cda93 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/MdtGasChannel.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/MdtGasChannel.h
@@ -1,31 +1,31 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MuonCalib_MdtGasChannel_h
#define MuonCalib_MdtGasChannel_h
+#include "MuonCalibIdentifier/MuonFixedId.h"
+#include "GaudiKernel/MsgStream.h"
+#include "AthenaKernel/getMessageSvc.h"
+
#include "string"
#include "map"
#include "set"
-#include "MuonCalibIdentifier/MuonFixedId.h"
#include "iostream"
namespace MuonCalib {
-//class MuonFixedId;
-
class MdtGasChannel
{
public:
typedef std::pair<int, int> GasChannel;
- inline MdtGasChannel()
- {
- if(!readFile())
- {
- std::cout<<"ERROR: Gas channel file not found!"<<std::endl;
- }
+ inline MdtGasChannel() {
+ if(!readFile()) {
+ MsgStream log(Athena::getMessageSvc(),"MdtGasChannel");
+ log<<MSG::WARNING<<"Gas channel file not found!"<<endmsg;
}
+ }
const GasChannel & GetGasChannel(const MuonFixedId &id) const;
static const GasChannel INVALID_CHANNEL;
private:
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/MultiDimArray.h b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/MultiDimArray.h
index 275809a3f47639adc043e6bff025f528b3dda529..09b1edfc1d367531eb3af2f962c03eeaf1b8a917 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/MultiDimArray.h
+++ b/MuonSpectrometer/MuonCalib/MuonCalibIdentifier/MuonCalibIdentifier/MultiDimArray.h
@@ -1,7 +1,10 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#ifndef MUONCALIBIDENTIFIER_MULTIDIMARRAY_H
+#define MUONCALIBIDENTIFIER_MULTIDIMARRAY_H
+
/***************************************************************************
* Variable Multidimensional Array
* -----------------------------------------
@@ -11,16 +14,10 @@
* Last Update : 26 April 2005
***************************************************************************/
-#ifndef MUONCALIBIDENTIFIER_MULTIDIMARRAY_H
-# define MUONCALIBIDENTIFIER_MULTIDIMARRAY_H
-// std
#include <iostream>
#include <sstream>
#include <limits.h>
#include <float.h>
-// other packages
-
-// this package
// general default value calls default constructor
@@ -167,9 +164,8 @@ inline MultiDimArray<T,N>::MultiDimArray()
{
#ifdef MULTIDIMARRAY_DEBUG
++s_objectCount;
- std::cout << "Creating MultiDimArray<" << N << ">"
- << " at " << this << " #objects: " << s_objectCount
- << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"MultiDimArray<T,N>");
+ log<<MSG::DEBUG<<"Creating MultiDimArray<" << N << ">" << " at " << this << " #objects: " << s_objectCount<<endmsg;
#endif
}
@@ -177,9 +173,8 @@ template <class T, unsigned int N>
inline MultiDimArray<T,N>::~MultiDimArray() {
#ifdef MULTIDIMARRAY_DEBUG
--s_objectCount;
- std::cout << "Deleting MultiDimArray<" << N << ">"
- << " at " << this << " #objects: " << s_objectCount
- << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"MultiDimArray<T,N>");
+ log<<MSG::DEBUG<<"Deleting MultiDimArray<" << N << ">" << " at " << this << " #objects: " << s_objectCount<<endmsg;
#endif
delete[] m_data;
}
@@ -190,9 +185,8 @@ inline MultiDimArray<T,N>::MultiDimArray( const MultiDimArray& rhs )
{
#ifdef MULTIDIMARRAY_DEBUG
++s_objectCount;
- std::cout << "Copying MultiDimArray<" << N << ">"
- << " at " << this << " #objects: " << s_objectCount
- << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"MultiDimArray<T,N>");
+ log<<MSG::DEBUG<<"Copying MultiDimArray<" << N << ">" << " at " << this << " #objects: " << s_objectCount<<endmsg;
#endif
operator=( rhs );
}
@@ -233,8 +227,8 @@ inline bool MultiDimArray<T,N>::isInRange( int index ) const {
template <class T, unsigned int N>
MultiDimArray<T,N>& MultiDimArray<T,N>::operator=( const MultiDimArray<T,N>& rhs ) {
#ifdef MULTIDIMARRAY_DEBUG
- std::cout << "Assigning MultiDimArray<" << N << ">"
- << " to " << this << " from " << &rhs << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"MultiDimArray<T,N>");
+ log<<MSG::DEBUG<<"Assigning MultiDimArray<" << N << ">" << " to " << this << " from " << &rhs<<endmsg;
#endif
// ensure equal data size
if ( m_size != rhs.m_size ) {
@@ -257,9 +251,8 @@ MultiDimArray<T,N>& MultiDimArray<T,N>::operator=( const MultiDimArray<T,N>& rhs
template <class T, unsigned int N>
inline const typename MultiDimArray<T,N>::SubType& MultiDimArray<T,N>::operator[]( int index ) const {
if ( !isInRange( index ) ) {
- std::cout << "MultiDimArray<" << N << ">::operator["<< index << "]"
- << " ERROR: index out of range ("
- << minIndex() << "," << maxIndex() << ")" << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"MultiDimArray<T,N>");
+ log<<MSG::WARNING<<"MultiDimArray<" << N << ">::operator["<< index << "]" << " index out of range (" << minIndex() << "," << maxIndex() << ")"<<endmsg;
return s_invalidSubType;
}
return m_data[index - m_minIndex];
@@ -267,16 +260,15 @@ inline const typename MultiDimArray<T,N>::SubType& MultiDimArray<T,N>::operator[
template <class T, unsigned int N>
typename MultiDimArray<T,N>::SubType& MultiDimArray<T,N>::operator[]( int index ) {
- if ( !m_data ) {
+#ifdef MULTIDIMARRAY_DEBUG
+ MsgStream log(Athena::getMessageSvc(),"MultiDimArray<T,N>");
+#endif if ( !m_data ) {
m_minIndex = index;
m_size = 1;
m_data = new SubType[1];
m_data[0] = s_invalidSubType;
#ifdef MULTIDIMARRAY_DEBUG
- std::cout << "MultiDimArray<" << N << ">::operator["<< index << "]"
- << " at " << this << ":"
- << " new data array. size=" << m_size
- << " range=(" << minIndex() << "," << maxIndex() << ")" << std::endl;
+ log<<MSG::DEBUG<<"MultiDimArray<" << N << ">::operator["<< index << "]" << " at " << this << ":" << " new data array. size=" << m_size << " range=(" << minIndex() << "," << maxIndex() << ")"<<endmsg;
#endif
} else if ( index > maxIndex() ) {
// add to vector at back
@@ -291,10 +283,7 @@ typename MultiDimArray<T,N>::SubType& MultiDimArray<T,N>::operator[]( int index
delete[] m_data;
m_data = newData;
#ifdef MULTIDIMARRAY_DEBUG
- std::cout << "MultiDimArray<" << N << ">::operator["<< index << "]"
- << " at " << this << ":"
- << " added " << nAdd << " at back. size=" << m_size
- << " range=(" << minIndex() << "," << maxIndex() << ")" << std::endl;
+ log<<MSG::DEBUG<<"MultiDimArray<" << N << ">::operator["<< index << "]" << " at " << this << ":" << " added " << nAdd << " at back. size=" << m_size << " range=(" << minIndex() << "," << maxIndex() << ")"<<endmsg;
#endif
} else if ( index < minIndex() ) {
// add to vector at front
@@ -309,10 +298,7 @@ typename MultiDimArray<T,N>::SubType& MultiDimArray<T,N>::operator[]( int index
m_data = newData;
m_minIndex = index;
#ifdef MULTIDIMARRAY_DEBUG
- std::cout << "MultiDimArray<" << N << ">::operator["<< index << "]"
- << " at " << this << ":"
- << " added " << nAdd << " at front. size=" << m_size
- << " range=(" << minIndex() << "," << maxIndex() << ")" << std::endl;
+ log<<MSG::DEBUG<<"MultiDimArray<" << N << ">::operator["<< index << "]" << " at " << this << ":" << " added " << nAdd << " at front. size=" << m_size << " range=(" << minIndex() << "," << maxIndex() << ")"<<endmsg;
#endif
}
// return ref to indexed value
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionLogicalOperation.cxx b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionLogicalOperation.cxx
index 811802dddfb97d82d78934689eff9c467b71ee78..808b794b5bae0d853f40b54c7b987500f83b4312 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionLogicalOperation.cxx
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MuonCalibStandAloneBase/src/RegionLogicalOperation.cxx
@@ -1,18 +1,15 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-//this
#include "MuonCalibStandAloneBase/RegionLogicalOperation.h"
-
-//c- c++
#include "iostream"
#include <cstdlib>
namespace MuonCalib {
-bool RegionLogicalOperation ::AddRegion(const RegionSelectorBase *region, bool invert)
+bool RegionLogicalOperation::AddRegion(const RegionSelectorBase *region, bool invert)
{
if(m_regions.size() > m_operator.size()) return false;
m_regions.push_back(region);
@@ -20,14 +17,14 @@ bool RegionLogicalOperation ::AddRegion(const RegionSelectorBase *region, bool i
return true;
}
-bool RegionLogicalOperation :: AddOperator(bool op)
+bool RegionLogicalOperation::AddOperator(bool op)
{
if((m_regions.size() <= m_operator.size())) return false;
m_operator.push_back(op);
return true;
}
-bool RegionLogicalOperation :: Result(const MuonFixedId & id) const
+bool RegionLogicalOperation::Result(const MuonFixedId & id) const
{
if(m_regions.size()==0) return true;
bool ret(m_inverse[0] xor m_regions[0]->Result(id));
@@ -46,7 +43,7 @@ bool RegionLogicalOperation :: Result(const MuonFixedId & id) const
return ret;
}
-void RegionLogicalOperation :: Print(std::ostream & os) const
+void RegionLogicalOperation::Print(std::ostream & os) const
{
os<<"(";
for(unsigned int i=0; i<m_regions.size(); i++)
@@ -55,8 +52,8 @@ void RegionLogicalOperation :: Print(std::ostream & os) const
m_regions[i]->Print(os);
if(i<m_operator.size())
{
- if(m_operator[i]) std::cout<<" | ";
- else std::cout<<" & ";
+ if(m_operator[i]) os<<" | ";
+ else os<<" & ";
}
}
os<<")";
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/CMakeLists.txt
index fb566512cf68d9eca736b2a4d48ce982a3c3e21f..83222af75a18b69df81247aadf0bf57e191fbb98 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibUtils/MuonCalibStl/CMakeLists.txt
@@ -5,6 +5,9 @@
# Declare the package name:
atlas_subdir( MuonCalibStl )
-# Install files from the package:
-atlas_install_headers( MuonCalibStl )
+atlas_add_library( MuonCalibStl
+ MuonCalibStl/*.h
+ INTERFACE
+ PUBLIC_HEADERS MuonCalibStl )
+
diff --git a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/selection.xml b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/selection.xml
index 0ad8d55f601d5d931e6ab4968b73b57691fa7994..f397d911e286baa235dc59a31b68b369453af2c2 100755
--- a/MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/selection.xml
+++ b/MuonSpectrometer/MuonCnv/MuonEventTPCnv/MuonEventTPCnv/selection.xml
@@ -59,7 +59,6 @@
<class name="Muon::sTgcPrepData_p1" />
<class name="std::vector<Muon::sTgcPrepData_p1>" />
- <class name="Muon::STGC_RawDataCollection_p1" />
<class name="Muon::sTgcPrepDataContainer_p1" id="7AB87DDE-8D7C-11E2-AA7C-001517648C14"/>
<!--MuonTrigCoinData-->
@@ -129,11 +128,13 @@
<!-- MuonRDO -->
<class name="Muon::STGC_RawData_p1" />
<class name="std::vector<Muon::STGC_RawData_p1>" />
+ <class name="Muon::STGC_RawDataCollection_p1" />
<class name="std::vector<Muon::STGC_RawDataCollection_p1>" />
<class name="Muon::STGC_RawDataContainer_p1" id="E9229710-DB8A-447E-9546-4BAB079C7547" />
<class name="Muon::MM_RawData_p1" />
<class name="std::vector<Muon::MM_RawData_p1>" />
+ <class name="Muon::MM_RawDataCollection_p1" />
<class name="std::vector<Muon::MM_RawDataCollection_p1>" />
<class name="Muon::MM_RawDataContainer_p1" id="5F202045-CE2C-4AD4-96BA-7DA18053B90F" />
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/CMakeLists.txt
index 86bd1087a20c34353727bac4f301a82c00fceccf..cd633c83144f7a8e16c6bab7fca24cd06fa9e600 100644
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/CMakeLists.txt
@@ -13,7 +13,7 @@ atlas_add_component( MuonRPC_CnvTools
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests ByteStreamCnvSvcBaseLib MuonCondInterface MuonCondData MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonTrigCoinData TrkSurfaces TrigT1RPChardwareLib RPChardware RPC_CondCablingLib RPCcablingInterfaceLib MuonCnvToolInterfacesLib )
+ LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} ByteStreamData ByteStreamData_test GaudiKernel AthenaBaseComps AthenaKernel StoreGateLib SGtests ByteStreamCnvSvcBaseLib MuonCondInterface MuonCondData MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonTrigCoinData TrkSurfaces TrigT1RPChardwareLib RPChardware RPC_CondCablingLib RPCcablingInterfaceLib MuonCnvToolInterfacesLib xAODEventInfo )
# Install files from the package:
atlas_install_headers( MuonRPC_CnvTools )
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx
index 17d231fabc9da67b5db9e49640c5aab043c2e2e1..8850dae69dd2509309af6a8258aac11bb1d2312d 100755
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.cxx
@@ -6,10 +6,6 @@
#include "MuonReadoutGeometry/MuonDetectorManager.h"
#include "MuonReadoutGeometry/RpcReadoutElement.h"
-#include "RPCcablingInterface/IRPCcablingServerSvc.h"
-#include "RPCcablingInterface/IRPCcablingSvc.h"
-#include "RPCcablingInterface/CablingRPCBase.h"
-#include "RPCcablingInterface/RpcPadIdHash.h"
#include "MuonPrepRawData/MuonPrepDataContainer.h"
#include "MuonTrigCoinData/RpcCoinDataContainer.h"
#include "TrkSurfaces/Surface.h"
@@ -29,7 +25,6 @@ Muon::RpcRdoToPrepDataToolCore::RpcRdoToPrepDataToolCore( const std::string& typ
AthAlgTool( type, name, parent ),
m_etaphi_coincidenceTime(0.), //!< time for phi*eta coincidence
m_overlap_timeTolerance(0.), //!< tolerance of the timing calibration
- m_processingData(false), //!< data or MC
m_producePRDfromTriggerWords(false), //!< if 1 store as prd the trigger hits
m_solvePhiAmbiguities(true), //!< toggle on/off the removal of phi ambiguities
m_doingSecondLoopAmbigColls(false), //!< true if running a second loop over ambiguous collections in RoI-based mode
@@ -45,7 +40,6 @@ Muon::RpcRdoToPrepDataToolCore::RpcRdoToPrepDataToolCore( const std::string& typ
// declare any properties here
declareProperty("etaphi_coincidenceTime", m_etaphi_coincidenceTime = 20.);//!< 15 ns should be the max.diff. in prop.time in phi and eta strips
declareProperty("overlap_timeTolerance", m_overlap_timeTolerance = 10.);//!< 3 ns is the resolution of the RPC readout electronics
- declareProperty("processingData", m_processingData = false);
declareProperty("solvePhiAmbiguities", m_solvePhiAmbiguities = true);
declareProperty("produceRpcCoinDatafromTriggerWords",m_producePRDfromTriggerWords = true);
declareProperty("reduceCablingOverlap", m_reduceCablingOverlap = true);
@@ -84,7 +78,6 @@ StatusCode Muon::RpcRdoToPrepDataToolCore::initialize() {
ATH_MSG_INFO("package version = "<<PACKAGE_VERSION);
ATH_MSG_INFO("properties are ");
- ATH_MSG_INFO("processingData "<<m_processingData);
ATH_MSG_INFO("produceRpcCoinDatafromTriggerWords "<<m_producePRDfromTriggerWords);
ATH_MSG_INFO("reduceCablingOverlap "<<m_reduceCablingOverlap);
ATH_MSG_INFO("solvePhiAmbiguities "<<m_solvePhiAmbiguities );
@@ -101,47 +94,14 @@ StatusCode Muon::RpcRdoToPrepDataToolCore::initialize() {
/// get the detector descriptor manager
ATH_CHECK(detStore()->retrieve(m_muonMgr));
ATH_MSG_VERBOSE("MuonDetectorManager retrieved");
-
- // Get RpcRdoDecoderTool
ATH_CHECK(m_rpcRdoDecoderTool.retrieve());
-
ATH_CHECK(m_idHelperSvc.retrieve());
-
ATH_CHECK(m_rpcReadKey.initialize());
-
- // get RPC cablingSvc
- const IRPCcablingServerSvc* RpcCabGet = nullptr;
- ATH_CHECK(service("RPCcablingServerSvc", RpcCabGet));
- ATH_MSG_VERBOSE(" RPCcablingServerSvc retrieved");
- ATH_CHECK(RpcCabGet->giveCabling(m_rpcCabling));
- ATH_MSG_VERBOSE("RPCcablingSvc obtained: " << (dynamic_cast<const Service*>(m_rpcCabling))->name());
- std::string svcName=m_rpcCabling->rpcCabSvcType();
- ATH_MSG_VERBOSE("Rpc Cabling Svc name is "<<svcName);
- // LBTAG 29/01/10: case RPCcabling or RPCcablingSim
- if (svcName.find("sim")!=std::string::npos) {
- // LBTAG 29/01/10: case RPCcabling
- if (svcName.find("simulationLikeInitialization")!=std::string::npos) m_processingData = true;
- // LBTAG 29/01/10: case MuonRPC_Cabling maps from files
- else if (svcName.find("simLike_MapsFromFiles")!=std::string::npos) m_processingData = true;
- // LBTAG 29/01/10: case RPCcablingSim
- else m_processingData = false;
- }
- // LBTAG 29/01/10: case MuonRPC_Cabling maps from COOL
- else {
- //Data-Style Cabling Svc
- m_processingData = true;
- }
-
-
ATH_CHECK(m_readKey.initialize(m_RPCInfoFromDb));
-
- // check if initializing of DataHandle objects success
ATH_CHECK(m_rdoContainerKey.initialize());
-
ATH_CHECK(m_rpcPrepDataContainerKey.initialize());
-
ATH_CHECK(m_rpcCoinDataContainerKey.initialize());
-
+ ATH_CHECK(m_eventInfo.initialize());
return StatusCode::SUCCESS;
}
@@ -594,7 +554,8 @@ void Muon::RpcRdoToPrepDataToolCore::printInputRdo()
ATH_MSG_INFO("--------------------------------------------------------------------------------------------");
int ipad = 0;
- const RpcPad * rdoColl;
+ const RpcPad* rdoColl=nullptr;
+ SG::ReadHandle<xAOD::EventInfo> evtInfo(m_eventInfo);
for (RpcPadContainer::const_iterator rdoColli = rdoContainerHandle->begin(); rdoColli!=rdoContainerHandle->end(); ++rdoColli) {
// loop over all elements of the pad container
rdoColl = *rdoColli;
@@ -623,14 +584,14 @@ void Muon::RpcRdoToPrepDataToolCore::printInputRdo()
for (; itCM != itCM_e ; ++itCM) {
icm++;
bool etaview = false;
- if (m_processingData) etaview = true;
+ if (!evtInfo->eventType(xAOD::EventInfo::IS_SIMULATION)) etaview = true;
bool highPtCm = false;
// Get CM online Id
uint16_t cmaId = (*itCM)->onlineId();
if (cmaId<4) {
if (cmaId<2) {
etaview = true;
- if (m_processingData) {
+ if (!evtInfo->eventType(xAOD::EventInfo::IS_SIMULATION)) {
etaview = false;
}
}
@@ -639,7 +600,7 @@ void Muon::RpcRdoToPrepDataToolCore::printInputRdo()
highPtCm = true;
if (cmaId<6) {
etaview = true;
- if (m_processingData) {
+ if (!evtInfo->eventType(xAOD::EventInfo::IS_SIMULATION)) {
etaview = false;
}
}
@@ -856,11 +817,12 @@ StatusCode Muon::RpcRdoToPrepDataToolCore::processPad(const RpcPad *rdoColl,
RpcPad::const_iterator itCM = rdoColl->begin();
RpcPad::const_iterator itCM_e = rdoColl->end();
int icm = 0;
+ SG::ReadHandle<xAOD::EventInfo> evtInfo(m_eventInfo);
for (; itCM != itCM_e ; ++itCM) {
icm++;
bool etaview = false;
- if (m_processingData) etaview = true;
+ if (!evtInfo->eventType(xAOD::EventInfo::IS_SIMULATION)) etaview = true;
bool highPtCm = false;
// Get CM online Id
uint16_t cmaId = (*itCM)->onlineId();
@@ -870,7 +832,7 @@ StatusCode Muon::RpcRdoToPrepDataToolCore::processPad(const RpcPad *rdoColl,
ATH_MSG_DEBUG(" low pt ");
if (cmaId<2) {
etaview = true;
- if (m_processingData) {
+ if (!evtInfo->eventType(xAOD::EventInfo::IS_SIMULATION)) {
etaview = false;
}
ATH_MSG_DEBUG( " eta view = "<<etaview);
@@ -885,7 +847,7 @@ StatusCode Muon::RpcRdoToPrepDataToolCore::processPad(const RpcPad *rdoColl,
highPtCm = true;
if (cmaId<6) {
etaview = true;
- if (m_processingData) {
+ if (!evtInfo->eventType(xAOD::EventInfo::IS_SIMULATION)) {
etaview = false;
}
ATH_MSG_DEBUG(" eta view = "<<etaview);
diff --git a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h
index 696a9260b00efb574a9a78b28cef57a5e642f6a8..04d83a72e3249f56d7842fbe4266b8e3e4c91ae5 100755
--- a/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h
+++ b/MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RpcRdoToPrepDataToolCore.h
@@ -20,6 +20,7 @@
#include "MuonRPC_CnvTools/IRPC_RDO_Decoder.h"
#include "RPC_CondCabling/RpcCablingCondData.h"
#include "StoreGate/ReadCondHandleKey.h"
+#include "xAODEventInfo/EventInfo.h"
#include <string>
#include <set>
@@ -31,8 +32,6 @@ namespace MuonGM
class MuonDetectorManager;
}
-class IRPCcablingSvc;
-
namespace Muon {
/////////////////////////////////////////////////////////////////////////////
@@ -76,7 +75,6 @@ protected:
float m_etaphi_coincidenceTime; //!< time for phi*eta coincidence
float m_overlap_timeTolerance; //!< tolerance of the timing calibration
- bool m_processingData; //!< data or MC
bool m_producePRDfromTriggerWords; //!< if 1 store as prd the trigger hits
bool m_solvePhiAmbiguities; //!< toggle on/off the removal of phi ambiguities
bool m_doingSecondLoopAmbigColls; //!< true if running a second loop over ambiguous collections in RoI-based mode
@@ -100,15 +98,13 @@ protected:
SG::ReadHandleKey<RpcPadContainer> m_rdoContainerKey;
- /// RPC cabling Svc
- const IRPCcablingSvc *m_rpcCabling;
-
// Rob Data Provider handle
ToolHandle<Muon::IRPC_RDO_Decoder> m_rpcRdoDecoderTool;
SG::ReadCondHandleKey<RpcCondDbData> m_readKey{this, "ReadKey", "RpcCondDbData", "Key of RpcCondDbData"};
SG::ReadCondHandleKey<RpcCablingCondData> m_rpcReadKey{this, "RpcCablingKey", "RpcCablingCondData", "Key of RpcCablingCondData"};
-
+ SG::ReadHandleKey<xAOD::EventInfo> m_eventInfo{this, "EventInfoContName", "EventInfo", "event info key"};
+
//keepTrackOfFullEventDecoding
bool m_fullEventDone;
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index 1a67d1583531390023f3ae72adf455ea6cb014da..76b4edd7c4d4d1c2bf861a3170ed2a6d05124b4c 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -63,7 +63,6 @@ def RpcRDODecodeCfg(flags, forTrigger=False):
RpcRdoToRpcPrepDataTool = Muon__RpcRdoToPrepDataToolMT(name = "RpcRdoToRpcPrepDataTool")
if flags.Common.isOnline:
RpcRdoToRpcPrepDataTool.ReadKey = "" ## cond data not needed online
- acc.addPublicTool( RpcRdoToRpcPrepDataTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
# Get the RDO -> PRD alorithm
RpcRdoToRpcPrepData=CompFactory.RpcRdoToRpcPrepData
@@ -95,7 +94,6 @@ def TgcRDODecodeCfg(flags, forTrigger=False):
# Get the RDO -> PRD tool
Muon__TgcRdoToPrepDataToolMT=CompFactory.Muon.TgcRdoToPrepDataToolMT
TgcRdoToTgcPrepDataTool = Muon__TgcRdoToPrepDataToolMT(name = "TgcRdoToTgcPrepDataTool")
- acc.addPublicTool( TgcRdoToTgcPrepDataTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
# Get the RDO -> PRD alorithm
TgcRdoToTgcPrepData=CompFactory.TgcRdoToTgcPrepData
@@ -129,7 +127,6 @@ def MdtRDODecodeCfg(flags, forTrigger=False):
# Get the RDO -> PRD tool
Muon__MdtRdoToPrepDataToolMT=CompFactory.Muon.MdtRdoToPrepDataToolMT
MdtRdoToMdtPrepDataTool = Muon__MdtRdoToPrepDataToolMT(name = "MdtRdoToMdtPrepDataTool")
- acc.addPublicTool( MdtRdoToMdtPrepDataTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
# Get the RDO -> PRD alorithm
MdtRdoToMdtPrepData=CompFactory.MdtRdoToMdtPrepData
@@ -166,7 +163,6 @@ def CscRDODecodeCfg(flags, forTrigger=False):
# Get the RDO -> PRD tool
Muon__CscRdoToCscPrepDataToolMT=CompFactory.Muon.CscRdoToCscPrepDataToolMT
CscRdoToCscPrepDataTool = Muon__CscRdoToCscPrepDataToolMT(name = "CscRdoToCscPrepDataTool")
- acc.addPublicTool( CscRdoToCscPrepDataTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
# Get the RDO -> PRD alorithm
CscRdoToCscPrepData=CompFactory.CscRdoToCscPrepData
@@ -189,7 +185,6 @@ def CscClusterBuildCfg(flags, forTrigger=False):
# Get cluster creator tool
CscThresholdClusterBuilderTool=CompFactory.CscThresholdClusterBuilderTool
CscClusterBuilderTool = CscThresholdClusterBuilderTool(name = "CscThresholdClusterBuilderTool" )
- acc.addPublicTool( CscClusterBuilderTool ) # This should be removed, but now defined as PublicTool at MuFastSteering
#CSC cluster building
CscThresholdClusterBuilder=CompFactory.CscThresholdClusterBuilder
diff --git a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
index 28b682a17f7406cadf3ec16c9bd5e7787714688f..bc6b15f7cab90d90e36813932dd08f028fb60e82 100644
--- a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
+++ b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest.ref
@@ -1,564 +1,21 @@
-Flag Name : Value
-Beam.BunchSpacing : 25
-Beam.Energy : [function]
-Beam.NumberOfCollisions : [function]
-Beam.Type : [function]
-Beam.estimatedLuminosity : [function]
-Common.Project : 'Athena'
-Common.bunchCrossingSource : [function]
-Common.doExpressProcessing : False
-Common.isOnline : False
-Common.useOnlineLumi : [function]
-Concurrency.NumConcurrentEvents : 0
-Concurrency.NumProcs : 0
-Concurrency.NumThreads : 0
-GeoModel.Align.Dynamic : [function]
-GeoModel.AtlasVersion : 'ATLAS-R2-2016-01-00-01'
-GeoModel.IBLLayout : [function]
-GeoModel.Layout : 'atlas'
-GeoModel.Run : [function]
-GeoModel.StripGeoType : [function]
-GeoModel.Type : [function]
-IOVDb.DatabaseInstance : [function]
-IOVDb.GlobalTag : 'CONDBR2-BLKPA-2018-13'
-Input.Collections : [function]
-Input.Files : ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
-Input.Format : [function]
-Input.ProjectName : [function]
-Input.RunNumber : [function]
-Input.SecondaryCollections : [function]
-Input.SecondaryFiles : []
-Input.isMC : [function]
-Output.AODFileName : ''
-Output.ESDFileName : ''
-Output.EVNTFileName : ''
-Output.HISTFileName : ''
-Output.HITSFileName : ''
-Output.RDOFileName : ''
-Output.RDO_SGNLFileName : ''
-Output.doESD : [function]
-Output.doWriteAOD : [function]
-Output.doWriteBS : False
-Output.doWriteESD : [function]
-Output.doWriteRDO : [function]
-Output.doWriteRDO_SGNL : [function]
-Random.Engine : 'dSFMT'
-Scheduler.CheckDependencies : True
-Scheduler.ShowControlFlow : True
-Scheduler.ShowDataDeps : True
-Scheduler.ShowDataFlow : True
-TrackingGeometry.MagneticFileMode : 6
-TrackingGeometry.MaterialSource : 'COOL'
-Flag categories that can be loaded dynamically
-Category : Generator name : Defined in
-BField : __bfield : AthenaConfiguration/AllConfigFlags.py
-BTagging : __btagging : AthenaConfiguration/AllConfigFlags.py
-Calo : __calo : AthenaConfiguration/AllConfigFlags.py
-DQ : __dq : AthenaConfiguration/AllConfigFlags.py
-Detector : __detector : AthenaConfiguration/AllConfigFlags.py
-Digitization : __digitization : AthenaConfiguration/AllConfigFlags.py
-Egamma : __egamma : AthenaConfiguration/AllConfigFlags.py
-InDet : __indet : AthenaConfiguration/AllConfigFlags.py
-LAr : __lar : AthenaConfiguration/AllConfigFlags.py
-Muon : __muon : AthenaConfiguration/AllConfigFlags.py
-MuonCombined : __muoncombined : AthenaConfiguration/AllConfigFlags.py
-Overlay : __overlay : AthenaConfiguration/AllConfigFlags.py
-PF : __pflow : AthenaConfiguration/AllConfigFlags.py
-Sim : __simulation : AthenaConfiguration/AllConfigFlags.py
-Tile : __tile : AthenaConfiguration/AllConfigFlags.py
-Trigger : __trigger : AthenaConfiguration/AllConfigFlags.py
-Py:Athena INFO About to setup Raw data decoding
-Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-Py:MetaReader INFO Current mode used: peeker
-Py:MetaReader INFO Current filenames: ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
-Py:Athena INFO using release [WorkDir-22.0.13] [x86_64-centos7-gcc8-opt] [atlas-work3/c0397ca1951] -- built on [2020-05-12T1917]
-Py:ConfigurableDb INFO Read module info for 5576 configurables from 41 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.13
-Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:Athena INFO Print Config
-Py:ComponentAccumulator INFO Event Inputs
-Py:ComponentAccumulator INFO Event Algorithm Sequences
-Py:ComponentAccumulator INFO Top sequence 0
-Py:ComponentAccumulator INFO \__ AthAlgSeq (seq: SEQ AND)
-Py:ComponentAccumulator INFO \__ RpcRawDataProvider (alg)
-Py:ComponentAccumulator INFO \__ TgcRawDataProvider (alg)
-Py:ComponentAccumulator INFO \__ MdtRawDataProvider (alg)
-Py:ComponentAccumulator INFO \__ CscRawDataProvider (alg)
-Py:ComponentAccumulator INFO \__ RpcRdoToRpcPrepData (alg)
-Py:ComponentAccumulator INFO \__ TgcRdoToTgcPrepData (alg)
-Py:ComponentAccumulator INFO \__ CscRdoToCscPrepData (alg)
-Py:ComponentAccumulator INFO \__ CscThresholdClusterBuilder (alg)
-Py:ComponentAccumulator INFO Condition Algorithms
-Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg)
-Py:ComponentAccumulator INFO \__ MuonAlignmentCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ MuonDetectorCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ RpcCablingCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ MuonMDT_CablingAlg (cond alg)
-Py:ComponentAccumulator INFO \__ AtlasFieldMapCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ AtlasFieldCacheCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ RpcCondDbAlg (cond alg)
-Py:ComponentAccumulator INFO \__ MdtCalibDbAlg (cond alg)
-Py:ComponentAccumulator INFO \__ CscCondDbAlg (cond alg)
-Py:ComponentAccumulator INFO Services
-Py:ComponentAccumulator INFO ['EventSelector', 'ByteStreamInputSvc', 'EventPersistencySvc', 'ByteStreamCnvSvc', 'ROBDataProviderSvc', 'ByteStreamAddressProviderSvc', 'MetaDataStore', 'InputMetaDataStore', 'MetaDataSvc', 'ProxyProviderSvc', 'IOVDbSvc', 'PoolSvc', 'CondSvc', 'DBReplicaSvc', 'TagInfoMgr', 'GeoModelSvc', 'DetDescrCnvSvc', 'AthenaPoolCnvSvc', 'MuonIdHelperSvc', 'RPCcablingServerSvc', 'MuonRPC_CablingSvc', 'LVL1TGC::TGCRecRoiSvc', 'TGCcablingServerSvc', 'MuonMDT_CablingSvc', 'AtlasFieldSvc', 'CSCcablingSvc']
-Py:ComponentAccumulator INFO Public Tools
-Py:ComponentAccumulator INFO [
-Py:ComponentAccumulator INFO IOVDbMetaDataTool/IOVDbMetaDataTool,
-Py:ComponentAccumulator INFO ByteStreamMetadataTool/ByteStreamMetadataTool,
-Py:ComponentAccumulator INFO RPCCablingDbTool/RPCCablingDbTool,
-Py:ComponentAccumulator INFO Muon::RPC_RawDataProviderToolMT/RPC_RawDataProviderToolMT,
-Py:ComponentAccumulator INFO Muon::TGC_RawDataProviderToolMT/TGC_RawDataProviderToolMT,
-Py:ComponentAccumulator INFO MDTCablingDbTool/MDTCablingDbTool,
-Py:ComponentAccumulator INFO Muon::MDT_RawDataProviderToolMT/MDT_RawDataProviderToolMT,
-Py:ComponentAccumulator INFO Muon::CSC_RawDataProviderToolMT/CSC_RawDataProviderToolMT,
-Py:ComponentAccumulator INFO Muon::RpcRdoToPrepDataToolMT/RpcRdoToRpcPrepDataTool,
-Py:ComponentAccumulator INFO Muon::TgcRdoToPrepDataToolMT/TgcRdoToTgcPrepDataTool,
-Py:ComponentAccumulator INFO Muon::MdtRdoToPrepDataToolMT/MdtRdoToMdtPrepDataTool,
-Py:ComponentAccumulator INFO Muon::CscRdoToCscPrepDataToolMT/CscRdoToCscPrepDataTool,
-Py:ComponentAccumulator INFO CscThresholdClusterBuilderTool/CscThresholdClusterBuilderTool,
-Py:ComponentAccumulator INFO ]
-Py:ComponentAccumulator INFO Private Tools
-Py:ComponentAccumulator INFO [
-Py:ComponentAccumulator INFO ]
-Py:ComponentAccumulator INFO TheApp properties
-Py:ComponentAccumulator INFO EvtSel : EventSelector
-Py:Athena INFO Save Config
-
-JOs reading stage finished, launching CARunner from pickle file
-
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus728.cern.ch on Tue May 12 19:41:27 2020
-====================================================================================================================================
-ApplicationMgr INFO Application Manager Configured successfully
-PublicTool IOVDbMetaDataTool
-PublicTool ByteStreamMetadataTool
-PublicTool RPCCablingDbTool
-PublicTool RPC_RawDataProviderToolMT
-PublicTool TGC_RawDataProviderToolMT
-PublicTool MDTCablingDbTool
-PublicTool MDT_RawDataProviderToolMT
-PublicTool CSC_RawDataProviderToolMT
-PublicTool RpcRdoToRpcPrepDataTool
-PublicTool TgcRdoToTgcPrepDataTool
-PublicTool MdtRdoToMdtPrepDataTool
-PublicTool CscRdoToCscPrepDataTool
-PublicTool CscThresholdClusterBuilderTool
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = 438)
-CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-ClassIDSvc INFO getRegistryEntries: read 3838 CLIDRegistry entries for module ALL
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
-PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
-PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-11T2140/Athena/22.0.13/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus728.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-DBReplicaSvc INFO COOL SQLite replicas will be excluded if matching pattern /DBRelease/
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool','ByteStreamMetadataTool/ByteStreamMetadataTool'])
-ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ByteStreamAddre... INFO initialized
-ByteStreamAddre... INFO -- Will fill Store with id = 0
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: CONDBR2-BLKPA-2018-13 set from joboptions
-IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Initialised with 11 connections and 30 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 3039 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLONL_TDAQ/CONDBR2
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 230 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 4058 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 139 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 3331 CLIDRegistry entries for module ALL
-IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
-IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
-IOVDbSvc INFO Opening COOL connection for COOLOFL_MUONALIGN/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_TDAQ/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_RPC/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_MUONALIGN/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_TGC/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_RPC/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_MDT/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_TGC/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_GLOBAL/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_MDT/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_GLOBAL/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_RPC/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_MDT/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_RPC/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_CSC/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_MDT/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_CSC/CONDBR2
-IOVDbSvc INFO Added taginfo remove for /CSC/FTHOLD
-IOVDbSvc INFO Added taginfo remove for /CSC/NOISE
-IOVDbSvc INFO Added taginfo remove for /CSC/PED
-IOVDbSvc INFO Added taginfo remove for /CSC/PSLOPE
-IOVDbSvc INFO Added taginfo remove for /CSC/RMS
-IOVDbSvc INFO Added taginfo remove for /CSC/STAT
-IOVDbSvc INFO Added taginfo remove for /CSC/T0BASE
-IOVDbSvc INFO Added taginfo remove for /CSC/T0PHASE
-IOVDbSvc INFO Added taginfo remove for /EXT/DCS/MAGNETS/SENSORDATA
-IOVDbSvc INFO Added taginfo remove for /GLOBAL/BField/Maps
-IOVDbSvc INFO Added taginfo remove for /MDT/CABLING/MAP_SCHEMA
-IOVDbSvc INFO Added taginfo remove for /MDT/CABLING/MEZZANINE_SCHEMA
-IOVDbSvc INFO Added taginfo remove for /MDT/RTBLOB
-IOVDbSvc INFO Added taginfo remove for /MDT/T0BLOB
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/CSC/ILINES
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/MDT/ASBUILTPARAMS
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/MDT/BARREL
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/MDT/ENDCAP/SIDEA
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/MDT/ENDCAP/SIDEC
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/TGC/SIDEA
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/TGC/SIDEC
-IOVDbSvc INFO Added taginfo remove for /RPC/CABLING/MAP_SCHEMA
-IOVDbSvc INFO Added taginfo remove for /RPC/CABLING/MAP_SCHEMA_CORR
-IOVDbSvc INFO Added taginfo remove for /RPC/DCS/DeadRopanels
-IOVDbSvc INFO Added taginfo remove for /RPC/DCS/OffRopanels
-IOVDbSvc INFO Added taginfo remove for /RPC/DQMF/ELEMENT_STATUS
-IOVDbSvc INFO Added taginfo remove for /RPC/TRIGGER/CM_THR_ETA
-IOVDbSvc INFO Added taginfo remove for /RPC/TRIGGER/CM_THR_PHI
-IOVDbSvc INFO Added taginfo remove for /TDAQ/RunCtrl/SOR_Params
-IOVDbSvc INFO Added taginfo remove for /TGC/CABLING/MAP_SCHEMA
-GeoModelSvc INFO Explicitly initializing DetDescrCnvSvc
-DetDescrCnvSvc INFO initializing
-DetDescrCnvSvc INFO Found DetectorStore service
-DetDescrCnvSvc INFO filling proxies for detector managers
-DetDescrCnvSvc INFO filling address for CaloTTMgr with CLID 117659265 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloMgr with CLID 4548337 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloSuperCellMgr with CLID 241807251 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloIdManager with CLID 125856940 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArIdManager with CLID 79554919 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for IdDict with CLID 2411 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for PixelID with CLID 2516 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for SCT_ID with CLID 2517 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TRT_ID with CLID 2518 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for SiliconID with CLID 129452393 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArEM_ID with CLID 163583365 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArEM_SuperCell_ID with CLID 99488227 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHEC_ID with CLID 3870484 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHEC_SuperCell_ID with CLID 254277678 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArFCAL_ID with CLID 45738051 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArFCAL_SuperCell_ID with CLID 12829437 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArMiniFCAL_ID with CLID 79264204 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArOnlineID with CLID 158698068 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TTOnlineID with CLID 38321944 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArOnline_SuperCellID with CLID 115600394 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHVLineID with CLID 27863673 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArElectrodeID with CLID 80757351 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileID with CLID 2901 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for Tile_SuperCell_ID with CLID 49557789 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileHWID with CLID 2902 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileTBID with CLID 2903 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for MDTIDHELPER with CLID 4170 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CSCIDHELPER with CLID 4171 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for RPCIDHELPER with CLID 4172 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TGCIDHELPER with CLID 4173 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloLVL1_ID with CLID 108133391 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloCell_SuperCell_ID with CLID 128365736 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloDM_ID with CLID 167756483 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for ZdcID with CLID 190591643 and storage type 68 to detector store
-GeoModelSvc.Muo... INFO Initializing ...
-GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
-GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
-GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
-GeoModelSvc::RD...WARNING Getting InDetMaterials with default tag
-MuonGeoModel INFO MuonDetectorFactory - constructor MuonSystem OuterRadius 13000 Length 22030
-GeoModelSvc.Muo... INFO create MuonDetectorTool - package version = MuonGeoModel-00-00-00
-GeoModelSvc.Muo... INFO (from GeoModelSvc) AtlasVersion = <ATLAS-R2-2016-01-00-01> MuonVersion = <>
-GeoModelSvc.Muo... INFO Keys for Muon Switches are (key) ATLAS-R2-2016-01-00-01 (node) ATLAS
-GeoModelSvc.Muo... INFO (from GeoModelSvc) in AtlasVersion = <ATLAS-R2-2016-01-00-01> default MuonVersion is <MuonSpectrometer-R.08.01>
-GeoModelSvc.Muo... INFO Properties have been set as follows:
-GeoModelSvc.Muo... INFO LayoutName R
-GeoModelSvc.Muo... INFO IncludeCutouts 0
-GeoModelSvc.Muo... INFO IncludeCutoutsBog 0
-GeoModelSvc.Muo... INFO IncludeCtbBis 0
-GeoModelSvc.Muo... INFO ControlAlines 111111
-GeoModelSvc.Muo... INFO MinimalGeoFlag 0
-GeoModelSvc.Muo... INFO EnableCscIntAlignment 1
-GeoModelSvc.Muo... INFO EnableCscIntAlignmentFromGM 0
-GeoModelSvc.Muo... INFO ControlCscIntAlines 111111
-GeoModelSvc.Muo... INFO EnableMdtDeformations 1
-GeoModelSvc.Muo... INFO EnableMdtAsBuiltParameters 1
-MuGM:MuonFactory INFO MuonLayout set to <R.08.01> = Development version for DC3 - infrastructures
-MuGM:MuonFactory INFO BOG cutouts are activated 1 , all other cutouts are disabled 1
-MuGM:MuonFactory INFO Manager created for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
-MuonGeoModel.MYSQL INFO GeometryVersion set to <R.08.01>
-MuGM:MuonFactory INFO Mysql helper class created here for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
-MuGM:MuonFactory INFO MDTIDHELPER retrieved from DetStore
-EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-MDT_IDDetDescrCnv INFO in createObj: creating a MdtIdHelper object in the detector store
-IdDictDetDescrCnv INFO in initialize
-IdDictDetDescrCnv INFO in createObj: creating a IdDictManager object in the detector store
-IdDictDetDescrCnv INFO IdDictName: IdDictParser/ATLAS_IDS.xml
-IdDictDetDescrCnv INFO Reading InnerDetector IdDict file InDetIdDictFiles/IdDictInnerDetector_IBL3D25-03.xml
-IdDictDetDescrCnv INFO Reading LArCalorimeter IdDict file IdDictParser/IdDictLArCalorimeter_DC3-05-Comm-01.xml
-IdDictDetDescrCnv INFO Reading TileCalorimeter IdDict file IdDictParser/IdDictTileCalorimeter.xml
-IdDictDetDescrCnv INFO Reading Calorimeter IdDict file IdDictParser/IdDictCalorimeter_L1Onl.xml
-IdDictDetDescrCnv INFO Reading MuonSpectrometer IdDict file IdDictParser/IdDictMuonSpectrometer_R.03.xml
-IdDictDetDescrCnv INFO Reading ForwardDetectors IdDict file IdDictParser/IdDictForwardDetectors_2010.xml
-IdDictDetDescrCnv INFO Found id dicts:
-IdDictDetDescrCnv INFO Using dictionary tag: null
-IdDictDetDescrCnv INFO Dictionary ATLAS version default DetDescr tag (using default) file
-IdDictDetDescrCnv INFO Dictionary Calorimeter version default DetDescr tag CaloIdentifier-LVL1-02 file IdDictParser/IdDictCalorimeter_L1Onl.xml
-IdDictDetDescrCnv INFO Dictionary ForwardDetectors version default DetDescr tag ForDetIdentifier-01 file IdDictParser/IdDictForwardDetectors_2010.xml
-IdDictDetDescrCnv INFO Dictionary InnerDetector version IBL-DBM DetDescr tag InDetIdentifier-IBL3D25-02 file InDetIdDictFiles/IdDictInnerDetector_IBL3D25-03.xml
-IdDictDetDescrCnv INFO Dictionary LArCalorimeter version fullAtlas DetDescr tag LArIdentifier-DC3-05-Comm file IdDictParser/IdDictLArCalorimeter_DC3-05-Comm-01.xml
-IdDictDetDescrCnv INFO Dictionary LArElectrode version fullAtlas DetDescr tag (using default) file
-IdDictDetDescrCnv INFO Dictionary LArHighVoltage version fullAtlas DetDescr tag (using default) file
-IdDictDetDescrCnv INFO Dictionary MuonSpectrometer version R.03 DetDescr tag MuonIdentifier-08 file IdDictParser/IdDictMuonSpectrometer_R.03.xml
-IdDictDetDescrCnv INFO Dictionary TileCalorimeter version fullAtlasAndTestBeam DetDescr tag TileIdentifier-00 file IdDictParser/IdDictTileCalorimeter.xml
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
-AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
- AtlasDetectorID::initialize_from_dictionary - OK
-MdtIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 210
-MdtIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 241
-MdtIdHelper INFO MultiRange built successfully to tube: MultiRange size is 241
-MdtIdHelper INFO Initializing MDT hash indices ...
-MdtIdHelper INFO The element hash max is 1188
-MdtIdHelper INFO The detector element hash max is 2328
-MdtIdHelper INFO Initializing MDT hash indices for finding neighbors ...
-MuGM:MuonFactory INFO RPCIDHELPER retrieved from DetStore
-RPC_IDDetDescrCnv INFO in createObj: creating a RpcIdHelper object in the detector store
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
-AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
- AtlasDetectorID::initialize_from_dictionary - OK
-RpcIdHelper INFO MultiRange built successfully to doubletR: MultiRange size is 241
-RpcIdHelper INFO MultiRange built successfully to detectorElement: DetectorElement MultiRange size is 241
-RpcIdHelper INFO MultiRange built successfully to rpcStrip: MultiRange size is 241
-RpcIdHelper INFO Initializing RPC hash indices ...
-RpcIdHelper INFO The element hash max is 600
-RpcIdHelper INFO The detector element hash max is 1122
-RpcIdHelper INFO Initializing RPC hash indices for finding neighbors ...
-MuGM:MuonFactory INFO TGCIDHELPER retrieved from DetStore
-TGC_IDDetDescrCnv INFO in createObj: creating a TgcIdHelper object in the detector store
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
-AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
- AtlasDetectorID::initialize_from_dictionary - OK
-TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 210
-TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 210
-TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 241
-TgcIdHelper INFO Initializing TGC hash indices ...
-TgcIdHelper INFO The element hash max is 1578
-TgcIdHelper INFO The detector element hash max is 1578
-TgcIdHelper INFO Initializing TGC hash indices for finding neighbors ...
-MuGM:MuonFactory INFO CSCIDHELPER retrieved from DetStore
-CSC_IDDetDescrCnv INFO in createObj: creating a CcscIdHelper object in the detector store
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
-AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
- AtlasDetectorID::initialize_from_dictionary - OK
-CscIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 210
-CscIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 237
-CscIdHelper INFO MultiRange built successfully to cscStrip: MultiRange size is 241
-CscIdHelper INFO Initializing CSC hash indices ...
-CscIdHelper INFO The element hash max is 32
-CscIdHelper INFO The detector element hash max is 64
-CscIdHelper INFO The channel hash max is 61440
-CscIdHelper INFO Initializing CSC hash indices for finding neighbors ...
-MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ************************
-MuGM:MuonFactory INFO *** Start building the Muon Geometry Tree **********************
-MuGM:RDBReadAtlas INFO Start retriving dbObjects with tag = <ATLAS-R2-2016-01-00-01> node <ATLAS>
-RDBAccessSvc WARNING Could not get the tag for XtomoData node. Returning 0 pointer to IRDBQuery
-MuGM:RDBReadAtlas INFO After getQuery XtomoData
-In DblQ00Xtomo(data)
-No XtomoData table in the MuonDD Database
-MuGM:RDBReadAtlas INFO After new DblQ00Xtomo
-MuGM:RDBReadAtlas INFO After m_dhxtomo.data()
-MuGM:RDBReadAtlas INFO No Ascii aszt input found: looking for A-lines in ORACLE
-MuGM:RDBReadAtlas INFO ASZT table found in Oracle
-MuGM:RDBReadAtlas INFO ASZT size is 32
-MuGM:RDBReadAtlas INFO No Ascii iacsc input found: looking for A-lines in ORACLE
-RDBAccessSvc WARNING Could not get the tag for ISZT node. Returning 0 pointer to IRDBQuery
-MuGM:RDBReadAtlas INFO No ISZT table in Oracle
-MuGM:RDBReadAtlas INFO Access granted for all dbObjects needed by muon detectors
-MuonGeoModel.MYSQL INFO LayoutName (from DBAM) set to <R.08> -- relevant for CTB2004
-MuGM:ProcStations INFO Processing Stations and Components
-MuGM:ProcStations INFO Processing Stations and Components DONE
-MuGM:ProcTechnol.s INFO nMDT 13 nCSC 2 nTGC 22 nRPC 25
-MuGM:ProcTechnol.s INFO nDED 2 nSUP 4 nSPA 2
-MuGM:ProcTechnol.s INFO nCHV 7 nCRO 7 nCMI 6 nLBI 6
-MuGM:ProcPosition INFO *** N. of stations positioned in the setup 234
-MuGM:ProcPosition INFO *** N. of stations described in mysql 234
-MuGM:ProcPosition INFO *** N. of types 32 size of jtypvec 32
-MuGM:ProcPosition INFO *** : 234 kinds of stations (type*sub_type)
-MuGM:ProcPosition INFO *** : 1758 physical stations in space - according to the MuonDD DataBase
-MuGM:ProcCutouts INFO Processing Cutouts for geometry layout R.08
-MuGM:ProcCutouts INFO Processing Cutouts DONE
-MuGM:RDBReadAtlas INFO ProcessTGCreadout - version 7 wirespacing 1.8
-MuGM:RDBReadAtlas INFO Intermediate Objects built from primary numbers
-MuGM:MuonFactory INFO theMaterialManager retrieven successfully from the DetStore
-MuGM:MuonFactory INFO MuonSystem description from OracleTag=<ATLAS-R2-2016-01-00-01> and node=<ATLAS>
-MuGM:MuonFactory INFO TreeTop added to the Manager
-MuGM:MuonFactory INFO Muon Layout R.08.01
-MuGM:MuonFactory INFO Fine Clash Fixing disabled: (should be ON/OFF for Simulation/Reconstruction)
-MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ****************************
-MuGM:MuonFactory INFO *** The Muon Chamber Geometry Tree is built with
-MuGM:MuonFactory INFO *** 1758 child volumes
-MuGM:MuonFactory INFO *** 1839 independent elements and
-MuGM:MuonFactory INFO *** 11473 elements cloned or shared
-MuGM:MuonFactory INFO *** 234 kinds of stations
-MuGM:MuonFactory INFO *** 1758 stations with alignable transforms
-MuGM:MuonFactory INFO *** 148 stations are described as Assemblies
-MuGM:MuonFactory INFO *** 1758 MuonStations
-MuGM:MuonFactory INFO *** 2324 MDT Readout Elements 1186 MDT Detector Elements
-MuGM:MuonFactory INFO *** 32 CSC Readout Elements 32 CSC Detector Elements
-MuGM:MuonFactory INFO *** 1122 RPC Readout Elements 600 RPC Detector Elements
-MuGM:MuonFactory INFO *** 1578 TGC Readout Elements 1578 TGC Detector Elements
-MuGM:MuonFactory INFO ********************************************************************
-MuGM:MuonFactory INFO *** Inert Material built according to DB switches and config. ******
-MuGM:MuonFactory INFO *** The Muon Geometry Tree has 1758 child vol.s in total ********
-MuGM:MuonFactory INFO ********************************************************************
-
-MGM::MuonDetect... INFO Init A/B Line Containers - done - size is respectively 1758/0
-MGM::MuonDetect... INFO Init of CSC I-Lines will be done via Conditions DB
-MGM::MuonDetect... INFO Init I-Line Container - done - size is respectively 128
-MGM::MuonDetect... INFO I-Line for CSC wire layers loaded (Csc Internal Alignment)
-MGM::MuonDetect... INFO According to configuration they WILL be used
-MGM::MuonDetect... INFO Filling cache
-GeoModelSvc INFO GeoModelSvc.MuonDetectorTool SZ= 228364Kb Time = 1.66S
-ClassIDSvc INFO getRegistryEntries: read 2703 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 839 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 436 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 305 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 291 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-CondInputLoader INFO Adding base classes:
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/FTHOLD' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/NOISE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/PED' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/PSLOPE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/RMS' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/STAT' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/T0BASE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/T0PHASE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/RTBLOB' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/T0BLOB' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/CSC/ILINES' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ASBUILTPARAMS' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/BARREL' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEC' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEC' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/CABLING/MAP_SCHEMA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/CABLING/MAP_SCHEMA_CORR' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DCS/DeadRopanels' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DCS/OffRopanels' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DQMF/ELEMENT_STATUS' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/TRIGGER/CM_THR_ETA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/TRIGGER/CM_THR_PHI' ) ->
-CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/FTHOLD' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/NOISE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/PED' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/PSLOPE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/RMS' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/STAT' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/T0BASE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/T0PHASE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/RTBLOB' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/T0BLOB' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/CSC/ILINES' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ASBUILTPARAMS' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/BARREL' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEC' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEC' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/CABLING/MAP_SCHEMA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/CABLING/MAP_SCHEMA_CORR' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DCS/DeadRopanels' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DCS/OffRopanels' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DQMF/ELEMENT_STATUS' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/TRIGGER/CM_THR_ETA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/TRIGGER/CM_THR_PHI' )
-MuonAlignmentCo... INFO Initilalizing
-MuonAlignmentCo... INFO In initialize ---- # of folders registered is 7
-MuonAlignmentCo... INFO geometry version from the MuonDetectorManager = R.08.01
-MuonDetectorCon... INFO Initializing ...
-AtlasFieldMapCo... INFO Initialize
-AtlasFieldMapCo... INFO Initialize: Key ( 'AtlasFieldMapCondObj' , 'ConditionStore+fieldMapCondObj' ) has been succesfully registered
-AtlasFieldMapCo... INFO Initialize: Will update the field map from conditions
-AtlasFieldCache... INFO Initialize
-AtlasFieldCache... INFO Initialize: Key ( 'AtlasFieldCacheCondObj' , 'ConditionStore+fieldCondObj' ) has been succesfully registered
-AtlasFieldCache... INFO Initialize: Will update current from conditions
-AtlasFieldCache... INFO Initialize: useDCS, useSoleCurrent, useToroCurrent. 1, 'UseSoleCurrent':7730.0000, 'UseToroCurrent':20400.000 LockMapCurrents 0
-ClassIDSvc INFO getRegistryEntries: read 2353 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1043 CLIDRegistry entries for module ALL
RpcRawDataProvider INFO RpcRawDataProvider::initialize
RpcRawDataProvider INFO 'DoSeededDecoding':False
-ClassIDSvc INFO getRegistryEntries: read 2064 CLIDRegistry entries for module ALL
-ROBDataProviderSvc INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ROBDataProviderSvc INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
-ROBDataProviderSvc INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
-ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
RpcRawDataProvi... INFO initialize() successful in RpcRawDataProvider.RPC_RawDataProviderToolMT
TgcRawDataProvider INFO TgcRawDataProvider::initialize
TgcRawDataProvider INFO 'DoSeededDecoding':False
-ClassIDSvc INFO getRegistryEntries: read 1223 CLIDRegistry entries for module ALL
TgcRawDataProvi... INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderToolMT.TgcROD_Decoder
-TgcRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
-TgcRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
-MuonTGC_CablingSvc INFO for 1/12 sector initialize
-ToolSvc.TGCCabl... INFO initialize
-ToolSvc.TGCCabl... INFO readTGCMap from text
-ToolSvc.TGCCabl... INFO readTGCMap found file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-11T2140/Athena/22.0.13/InstallArea/x86_64-centos7-gcc8-opt/share/ASD2PP_diff_12_ONL.db
-ToolSvc.TGCCabl... INFO giveASD2PP_DIFF_12 (m_ASD2PP_DIFF_12 is not NULL)
TgcRawDataProvi... INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderToolMT
MdtRawDataProvider INFO MdtRawDataProvider::initialize
MdtRawDataProvider INFO 'DoSeededDecoding':False
-ClassIDSvc INFO getRegistryEntries: read 1375 CLIDRegistry entries for module ALL
MdtRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
MdtRawDataProvi... INFO Processing configuration for layouts with BME chambers.
MdtRawDataProvi... INFO Processing configuration for layouts with BMG chambers.
MdtRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
MdtRawDataProvi... INFO initialize() successful in MdtRawDataProvider.MDT_RawDataProviderToolMT
-ClassIDSvc INFO getRegistryEntries: read 1048 CLIDRegistry entries for module ALL
CscRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
CscRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
CscRawDataProvi... INFO The Muon Geometry version is R.08.01
CscRawDataProvi... INFO initialize() successful in CscRawDataProvider.CSC_RawDataProviderToolMT
-ClassIDSvc INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
-RpcRdoToRpcPrep... INFO package version = MuonRPC_CnvTools-00-00-00
RpcRdoToRpcPrep... INFO properties are
RpcRdoToRpcPrep... INFO processingData 0
RpcRdoToRpcPrep... INFO produceRpcCoinDatafromTriggerWords 1
@@ -568,501 +25,11 @@ RpcRdoToRpcPrep... INFO timeShift -12.5
RpcRdoToRpcPrep... INFO etaphi_coincidenceTime 20
RpcRdoToRpcPrep... INFO overlap_timeTolerance 10
RpcRdoToRpcPrep... INFO Correct prd time from cool db 0
-MuonRPC_CablingSvc INFO Initializing MuonRPC_CablingSvc - package version MuonRPC_Cabling-00-00-00
-ToolSvc.RPCCabl... INFO Initializing - folders names are: conf /RPC/CABLING/MAP_SCHEMA / corr /RPC/CABLING/MAP_SCHEMA_CORR
-MuonRPC_CablingSvc INFO RPCCablingDbTool retrieved with handle TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')
-MuonRPC_CablingSvc INFO Register call-back against 2 folders listed below
-MuonRPC_CablingSvc INFO Folder n. 1 </RPC/CABLING/MAP_SCHEMA> found in the DetStore
-ClassIDSvc INFO getRegistryEntries: read 239 CLIDRegistry entries for module ALL
-MuonRPC_CablingSvc INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA>
-MuonRPC_CablingSvc INFO Folder n. 2 </RPC/CABLING/MAP_SCHEMA_CORR> found in the DetStore
-MuonRPC_CablingSvc INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA_CORR>
-MuonRPC_CablingSvc INFO RPCTriggerDbTool retrieved with statusCode = SUCCESS pointer = TheRpcTriggerDbTool = PublicToolHandle('RPCTriggerDbTool')
-MuonRPC_CablingSvc INFO Register call-back against 2 folders listed below
-MuonRPC_CablingSvc INFO Folder n. 1 </RPC/TRIGGER/CM_THR_ETA> found in the DetStore
-MuonRPC_CablingSvc INFO initTrigRoadsModel registered for call-back against folder </RPC/TRIGGER/CM_THR_ETA>
-MuonRPC_CablingSvc INFO Folder n. 2 </RPC/TRIGGER/CM_THR_PHI> found in the DetStore
-MuonRPC_CablingSvc INFO initTrigRoadsModel registered for call-back against folder </RPC/TRIGGER/CM_THR_PHI>
RpcRdoToRpcPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::RpcRdoToPrepDataToolMT/RpcRdoToRpcPrepDataTool')
TgcRdoToTgcPrep... INFO initialize() successful in TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool
TgcRdoToTgcPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::TgcRdoToPrepDataToolMT/TgcRdoToTgcPrepDataTool')
CscRdoToCscPrep... INFO The Geometry version is MuonSpectrometer-R.08.01
-ClassIDSvc INFO getRegistryEntries: read 114 CLIDRegistry entries for module ALL
CscRdoToCscPrep... INFO Retrieved CscRdoToCscPrepDataTool = PrivateToolHandle('Muon::CscRdoToCscPrepDataToolMT/CscRdoToCscPrepDataTool')
-EventSelector WARNING InputCollections not properly set, checking EventStorageInputSvc properties
-EventSelector INFO reinitialization...
-ClassIDSvc INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
-EventSelector INFO Retrieved InputCollections from InputSvc
-ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
-EventSelector INFO reinitialization...
-AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
-ApplicationMgr INFO Application Manager Initialized successfully
-ApplicationMgr SUCCESS ****************************** Algorithm Sequence ****************************
-ApplicationMgr SUCCESS AthSequencer/AthMasterSeq
-ApplicationMgr SUCCESS AthSequencer/AthAlgEvtSeq
-ApplicationMgr SUCCESS AthSequencer/AthBeginSeq
-ApplicationMgr SUCCESS AthIncFirerAlg/BeginIncFiringAlg
-ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg1
-ApplicationMgr SUCCESS AthSequencer/AthAllAlgSeq
-ApplicationMgr SUCCESS AthSequencer/AthCondSeq
-ApplicationMgr SUCCESS CondInputLoader/CondInputLoader
-ApplicationMgr SUCCESS MuonAlignmentCondAlg/MuonAlignmentCondAlg
-ApplicationMgr SUCCESS MuonDetectorCondAlg/MuonDetectorCondAlg
-ApplicationMgr SUCCESS RpcCablingCondAlg/RpcCablingCondAlg
-ApplicationMgr SUCCESS MuonMDT_CablingAlg/MuonMDT_CablingAlg
-ApplicationMgr SUCCESS MagField::AtlasFieldMapCondAlg/AtlasFieldMapCondAlg
-ApplicationMgr SUCCESS MagField::AtlasFieldCacheCondAlg/AtlasFieldCacheCondAlg
-ApplicationMgr SUCCESS RpcCondDbAlg/RpcCondDbAlg
-ApplicationMgr SUCCESS MdtCalibDbAlg/MdtCalibDbAlg
-ApplicationMgr SUCCESS CscCondDbAlg/CscCondDbAlg
-ApplicationMgr SUCCESS AthSequencer/AthAlgSeq
-ApplicationMgr SUCCESS Muon::RpcRawDataProvider/RpcRawDataProvider
-ApplicationMgr SUCCESS Muon::TgcRawDataProvider/TgcRawDataProvider
-ApplicationMgr SUCCESS Muon::MdtRawDataProvider/MdtRawDataProvider
-ApplicationMgr SUCCESS Muon::CscRawDataProvider/CscRawDataProvider
-ApplicationMgr SUCCESS RpcRdoToRpcPrepData/RpcRdoToRpcPrepData
-ApplicationMgr SUCCESS TgcRdoToTgcPrepData/TgcRdoToTgcPrepData
-ApplicationMgr SUCCESS CscRdoToCscPrepData/CscRdoToCscPrepData
-ApplicationMgr SUCCESS CscThresholdClusterBuilder/CscThresholdClusterBuilder
-ApplicationMgr SUCCESS AthSequencer/AthEndSeq
-ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
-ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
-ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
-ApplicationMgr SUCCESS ******************************************************************************
-ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/FTHOLD'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/NOISE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/PED'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/PSLOPE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/RMS'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/STAT'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/T0BASE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/T0PHASE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/GLOBAL/BField/Maps'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MAP_SCHEMA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/RTBLOB'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/T0BLOB'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/CSC/ILINES'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/MDT/ASBUILTPARAMS'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/MDT/BARREL'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEC'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/TGC/SIDEA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/TGC/SIDEC'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/CABLING/MAP_SCHEMA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/CABLING/MAP_SCHEMA_CORR'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/DCS/DeadRopanels'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/DCS/OffRopanels'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/DQMF/ELEMENT_STATUS'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/TRIGGER/CM_THR_ETA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/TRIGGER/CM_THR_PHI'
-ApplicationMgr INFO Application Manager Started successfully
-EventInfoByteSt... INFO IsSimulation : 0
-EventInfoByteSt... INFO IsTestbeam : 0
-EventInfoByteSt... INFO IsCalibration : 0
-AthenaEventLoopMgr INFO ===>>> start of run 327265 <<<===
-IOVDbSvc INFO Opening COOL connection for COOLONL_RPC/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCCablingMapSchema_2016_2017_01 for folder /RPC/CABLING/MAP_SCHEMA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCCablingMapSchemaCorr_2016_2017_01 for folder /RPC/CABLING/MAP_SCHEMA_CORR
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCTriggerCMThrEta_RUN1-RUN2-HI-02 for folder /RPC/TRIGGER/CM_THR_ETA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCTriggerCMThrPhi_RUN1-RUN2-HI-02 for folder /RPC/TRIGGER/CM_THR_PHI
-IOVDbSvc INFO Disconnecting from COOLONL_RPC/CONDBR2
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-MuonRPC_CablingSvc INFO initMappingModel has been called
-MuonRPC_CablingSvc INFO ToolHandle in initMappingModel - <TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')>
-MuonRPC_CablingSvc INFO Retrieving cabling singleton; to create an empty one or to get the existing one
-RPCcabling INFO CablingRPC---singleton constructor ---- this must be executed just once
-RPCcabling INFO CablingRPC---The singleton will fill the maps from the COOL streams
-RPCcabling INFO CablingRPC---InitMaps from COOL cannot be executed NOW: empty string
-RPCcabling INFO CablingRPC---The singleton is created here
-RPCcabling INFO CablingRPC--- cacheCleared: s_status = 0
-MuonRPC_CablingSvc INFO Cabling singleton cache has been cleared
-MuonRPC_CablingSvc INFO Trigger roads will be loaded from COOL
-ToolSvc.RPCCabl... INFO LoadParameters /RPC/CABLING/MAP_SCHEMA I=2
-ToolSvc.RPCCabl... INFO loadRPCMap --- Load Map from DB
-ToolSvc.RPCCabl... INFO Try to read from folder </RPC/CABLING/MAP_SCHEMA>
-ToolSvc.RPCCabl... INFO CondAttrListCollection from DB folder have been obtained with size 1
-ToolSvc.RPCCabl... INFO Loop over CondAttrListCollection ic = 1
-ToolSvc.RPCCabl... INFO After Reading folder, Configuration string size is 222202
-ToolSvc.RPCCabl... INFO LoadParameters /RPC/CABLING/MAP_SCHEMA_CORR I=2
-ToolSvc.RPCCabl... INFO loadRPCCorr --- Load Corrections from DB
-ToolSvc.RPCCabl... INFO Try to read from folder </RPC/CABLING/MAP_SCHEMA_CORR>
-ToolSvc.RPCCabl... INFO CondAttrListCollection from DB folder have been obtained with size 1
-ToolSvc.RPCCabl... INFO After Reading folder, Correction string size is 29369
-MuonRPC_CablingSvc INFO InitMappingModel: Trigger roads not yet loaded from COOL - postpone cabling initialization
-MuonRPC_CablingSvc INFO initTrigRoadsModel has been called
-MuonRPC_CablingSvc INFO Trigger roads will be loaded from COOL
-MuonRPC_CablingSvc INFO Retrieve the pointer to the cabling singleton
-RPCcabling INFO CablingRPC--- cacheCleared: s_status = 0
-MuonRPC_CablingSvc INFO Cabling singleton cache has been cleared
-ToolSvc.RPCTrig... INFO LoadParameters /RPC/TRIGGER/CM_THR_ETA I=2
-ToolSvc.RPCTrig... INFO LoadParameters /RPC/TRIGGER/CM_THR_PHI I=2
-MuonRPC_CablingSvc INFO ======== RPC Trigger Roads from COOL - Header infos ========
-MuonRPC_CablingSvc INFO
-RPC LVL1 Configuration 10.6 with roads from Feb 2012
-L1 THRESHOLDS: MU4 MU6 MU10 MU11 MU15 MU20
-Road version: "road_files_120209"
-CMA th0 th1 th2
-eta low-pt mu4 mu6 mu10
-phi low-pt mu4 mu6 mu10
-eta high-pt mu11 mu15 mu20
-phi high-pt mu11 mu15 mu15
-
-
-RPCcabling INFO CablingRPC---InitMaps from COOL: going to read configuration
-RPCcabling INFO CablingRPC--->> RPC cabling map from COOL <<
-RPCcabling INFO CablingRPC--- ReadConf: map has size 222202
-RPCcabling INFO CablingRPC--- ReadConf: map n. of lines read is 924
-RPCcabling INFO CablingRPC--- ReadConf: version is 5.0 Atlas R_07_03_RUN2ver104
-RPCcabling INFO CablingRPC--- buildRDOmap
-RPCcabling INFO CablingRPC---InitMaps from COOL: going to read corrections to configuration
-RPCcabling INFO CablingRPC--->> RPC cabling corrections from COOL <<
-RPCcabling INFO CablingRPC--- ReadCorr: CorrMap has size 29369
-RPCcabling INFO CablingRPC--- ReadConf: CorrMap n. of lines read is 743
-RPCcabling INFO CablingRPC---InitMaps from COOL - maps have been parsed
-MuonRPC_CablingSvc INFO InitTrigRoadsModel: RPC cabling model is loaded!
-Level-1 configuration database version 5.0 Atlas R_07_03_RUN2ver104 read.
-Contains 26 Trigger Sector Types:
-negative sectors 0 - 15 ==> 18 2 24 3 19 2 24 4 20 2 24 1 18 5 25 6
-negative sectors 16 - 31 ==> 21 13 26 6 21 7 16 8 14 7 16 6 21 13 26 1
-positive sectors 32 - 47 ==> 9 24 2 22 9 24 2 23 10 24 2 18 1 25 5 18
-positive sectors 48 - 63 ==> 1 26 13 21 6 17 12 15 11 17 12 21 6 26 13 22
-
-MuonRPC_CablingSvc INFO buildOfflineOnlineMap
-MuonRPC_CablingSvc INFO Applying FeetPadThresholds : 0,2,5
-MuonRPC_CablingSvc INFO MuonRPC_CablingSvc initialized succesfully
-ByteStreamCnvSvc INFO problem adding converter for CLID [2101]
-ByteStreamCnvSvc WARNING Cannot get converter for EventInfo
-AthenaEventLoopMgr INFO ===>>> start processing event #186525031, run #327265 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_CSC/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscFthold-RUN2-BLK-UPD1-007-00 for folder /CSC/FTHOLD
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscNoise-RUN2-BLK-UPD1-007-00 for folder /CSC/NOISE
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscPed-RUN2-BLK-UPD1-007-00 for folder /CSC/PED
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscPslope-RUN2-BLK-UPD1-000-00 for folder /CSC/PSLOPE
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscRms-RUN2-BLK-UPD1-003-00 for folder /CSC/RMS
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscStat-RUN2-BLK-UPD1-008-00 for folder /CSC/STAT
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscT0base-RUN2-BLK-UPD1-001-00 for folder /CSC/T0BASE
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscT0phase-RUN2-BLK-UPD2-001-00 for folder /CSC/T0PHASE
-IOVDbSvc INFO Disconnecting from COOLOFL_CSC/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_GLOBAL/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to BFieldMap-Run1-14m-v01 for folder /GLOBAL/BField/Maps
-IOVDbSvc INFO Disconnecting from COOLONL_GLOBAL/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_MDT/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMapSchema_BMG_01 for folder /MDT/CABLING/MAP_SCHEMA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMezzanineSchema_M5-RUN2 for folder /MDT/CABLING/MEZZANINE_SCHEMA
-IOVDbSvc INFO Disconnecting from COOLONL_MDT/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_MDT/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTRT-RUN2-UPD4-21 for folder /MDT/RTBLOB
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTT0-RUN2-UPD4-21 for folder /MDT/T0BLOB
-IOVDbSvc INFO Disconnecting from COOLOFL_MDT/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_MUONALIGN/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignCscIlines-UPD1-02 for folder /MUONALIGN/CSC/ILINES
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignMdtAsbuiltparams-RUN2-BA_ONLY-UPD4-00 for folder /MUONALIGN/MDT/ASBUILTPARAMS
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignMDTBarrelAlign-RUN2-BA_ROLLING_11-BLKP-UPD4-00 for folder /MUONALIGN/MDT/BARREL
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignMDTEndCapAAlign-RUN2-ECA_ROLLING_2015_03_01-UPD4-02 for folder /MUONALIGN/MDT/ENDCAP/SIDEA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignMDTEndCapCAlign-RUN2-ECC_ROLLING_2015_03_01-UPD4-02 for folder /MUONALIGN/MDT/ENDCAP/SIDEC
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignTGCEndCapAAlign-RUN2-TGCA_ROLLING_2011_01-ES1-UPD1-03 for folder /MUONALIGN/TGC/SIDEA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignTGCEndCapCAlign-RUN2-TGCC_ROLLING_2011_01-ES1-UPD1-03 for folder /MUONALIGN/TGC/SIDEC
-IOVDbSvc INFO Disconnecting from COOLOFL_MUONALIGN/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_RPC/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCDQMFElementStatus_Run1_UPD4-RUN2-01 for folder /RPC/DQMF/ELEMENT_STATUS
-IOVDbSvc INFO Disconnecting from COOLOFL_RPC/CONDBR2
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/CSC/ILINES>
-MuonAlignmentCo... INFO Size of CSC/ILINES CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/CSC/ILINES' ) readCscILinesCdo->size()= 1
-MuonAlignmentCo... INFO Range of CSC/ILINES input is {[0,0,t:1425168000] - [t:4294967294.854775807]}
-MGM::MuonDetect... INFO temporary CSC I-line container with size = 128
-MGM::MuonDetect... INFO # of CSC I-lines read from the ILineMapContainer in StoreGate is 128
-MGM::MuonDetect... INFO # of deltaTransforms updated according to A-lines is 128
-MGM::MuonDetect... INFO # of entries in the CSC I-lines historical container is 128
-MuonAlignmentCo... INFO recorded new CscInternalAlignmentMapContainer with range {[0,0,t:1425168000] - [t:4294967294.854775807]} into Conditions Store
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/MDT/ASBUILTPARAMS>
-MuonAlignmentCo... INFO Size of MDT/ASBUILTPARAMS CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ASBUILTPARAMS' ) ->size()= 1
-MuonAlignmentCo... INFO Range of MDT/ASBUILTPARAMS input is {[0,0,t:0] - [t:4294967294.854775807]}
-MGM::MuonDetect... INFO temporary As-Built container with size = 628
-MGM::MuonDetect... INFO # of MDT As-Built read from the MdtAsBuiltMapContainer in StoreGate is 628
-MGM::MuonDetect... INFO # of deltaTransforms updated according to As-Built is 628
-MGM::MuonDetect... INFO # of entries in the MdtAsBuilt historical container is 628
-MuonAlignmentCo... INFO recorded new MdtAsBuiltMapContainer with range {[0,0,t:0] - [t:4294967294.854775807]} into Conditions Store
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/MDT/BARREL>
-MuonAlignmentCo... INFO Size of /MUONALIGN/MDT/BARREL CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/BARREL' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/MDT/BARREL input is, ALines: {[0,0,t:1497851700] - [t:1498737300]} BLines: {[0,0,t:1497851700] - [t:1498737300]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/MDT/BARREL have IoV = 195569
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/MDT/BARREL> loaded
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/MDT/ENDCAP/SIDEA>
-MuonAlignmentCo... INFO Size of /MUONALIGN/MDT/ENDCAP/SIDEA CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEA' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/MDT/ENDCAP/SIDEA input is, ALines: {[0,0,t:1497891240] - [t:1497898380]} BLines: {[0,0,t:1497891240] - [t:1497898380]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/MDT/ENDCAP/SIDEA have IoV = 195588
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/MDT/ENDCAP/SIDEA> loaded
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/MDT/ENDCAP/SIDEC>
-MuonAlignmentCo... INFO Size of /MUONALIGN/MDT/ENDCAP/SIDEC CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEC' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/MDT/ENDCAP/SIDEC input is, ALines: {[0,0,t:1497892260] - [t:1497899460]} BLines: {[0,0,t:1497892260] - [t:1497899460]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/MDT/ENDCAP/SIDEC have IoV = 195599
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/MDT/ENDCAP/SIDEC> loaded
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/TGC/SIDEA>
-MuonAlignmentCo... INFO No BLines decoding will be attempted for folder named /MUONALIGN/TGC/SIDEA
-MuonAlignmentCo... INFO Size of /MUONALIGN/TGC/SIDEA CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEA' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/TGC/SIDEA input is, ALines: {[0,0,t:0] - [t:4294967294.854775807]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/TGC/SIDEA have IoV = 82360
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/TGC/SIDEA> loaded
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/TGC/SIDEC>
-MuonAlignmentCo... INFO No BLines decoding will be attempted for folder named /MUONALIGN/TGC/SIDEC
-MuonAlignmentCo... INFO Size of /MUONALIGN/TGC/SIDEC CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEC' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/TGC/SIDEC input is, ALines: {[0,0,t:0] - [t:4294967294.854775807]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/TGC/SIDEC have IoV = 82359
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/TGC/SIDEC> loaded
-MGM::MuonDetect... INFO temporary A-line container with size = 2694
-MGM::MuonDetect... INFO # of A-lines read from the ALineMapContainer in StoreGate is 2694
-MGM::MuonDetect... INFO # of deltaTransforms updated according to A-lines is 2694
-MGM::MuonDetect... INFO # of entries in the A-lines historical container is 2814
-MuonAlignmentCo... INFO recorded new ALineMapContainer with range {[0,0,t:1497892260,l:0] - [t:1497898380]} into Conditions Store
-MGM::MuonDetect... INFO In updateDeformations()
-MGM::MuonDetect... INFO temporary B-line container with size = 1206
-MGM::MuonDetect... INFO # of B-lines read from the ALineMapContainer in StoreGate is 1206
-MGM::MuonDetect... INFO # of deform-Transforms updated according to B-lines is 1174
-MGM::MuonDetect... INFO # of entries in the B-lines historical container is 1174
-MuonAlignmentCo... INFO recorded new BLineMapContainer with range {[0,0,t:1497892260,l:0] - [t:1497898380]} into Conditions Store
-MuonGeoModel INFO MuonDetectorFactory - constructor MuonSystem OuterRadius 13000 Length 22030
-MuonDetectorCon... INFO create MuonDetectorTool - package version = MuonGeoModel-00-00-00
-MuonDetectorCon... INFO (from GeoModelSvc) AtlasVersion = <ATLAS-R2-2016-01-00-01> MuonVersion = <>
-MuonDetectorCon... INFO Keys for Muon Switches are (key) ATLAS-R2-2016-01-00-01 (node) ATLAS
-MuonDetectorCon... INFO (from GeoModelSvc) in AtlasVersion = <ATLAS-R2-2016-01-00-01> default MuonVersion is <MuonSpectrometer-R.08.01>
-MuonDetectorCon... INFO Properties have been set as follows:
-MuonDetectorCon... INFO LayoutName R
-MuonDetectorCon... INFO IncludeCutouts 0
-MuonDetectorCon... INFO IncludeCutoutsBog 0
-MuonDetectorCon... INFO IncludeCtbBis 0
-MuonDetectorCon... INFO ControlAlines 111111
-MuonDetectorCon... INFO MinimalGeoFlag 0
-MuonDetectorCon... INFO EnableCscIntAlignment 1
-MuonDetectorCon... INFO EnableCscIntAlignmentFromGM 0
-MuonDetectorCon... INFO ControlCscIntAlines 111111
-MuonDetectorCon... INFO EnableMdtDeformations 1
-MuonDetectorCon... INFO EnableMdtAsBuiltParameters 1
-MuGM:MuonFactory INFO MuonLayout set to <R.08.01> = Development version for DC3 - infrastructures
-MuGM:MuonFactory INFO BOG cutouts are activated 1 , all other cutouts are disabled 1
-MuGM:MuonFactory INFO Manager created for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
-MuonGeoModel.MYSQL INFO GeometryVersion set to <R.08.01>
-MuGM:MuonFactory INFO Mysql helper class created here for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
-MuGM:MuonFactory INFO MDTIDHELPER retrieved from DetStore
-MuGM:MuonFactory INFO RPCIDHELPER retrieved from DetStore
-MuGM:MuonFactory INFO TGCIDHELPER retrieved from DetStore
-MuGM:MuonFactory INFO CSCIDHELPER retrieved from DetStore
-MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ************************
-MuGM:MuonFactory INFO *** Start building the Muon Geometry Tree **********************
-MuGM:RDBReadAtlas INFO Start retriving dbObjects with tag = <ATLAS-R2-2016-01-00-01> node <ATLAS>
-RDBAccessSvc WARNING Could not get the tag for XtomoData node. Returning 0 pointer to IRDBQuery
-MuGM:RDBReadAtlas INFO After getQuery XtomoData
-In DblQ00Xtomo(data)
-No XtomoData table in the MuonDD Database
-MuGM:RDBReadAtlas INFO After new DblQ00Xtomo
-MuGM:RDBReadAtlas INFO After m_dhxtomo.data()
-MuGM:RDBReadAtlas INFO No Ascii aszt input found: looking for A-lines in ORACLE
-MuGM:RDBReadAtlas INFO ASZT table found in Oracle
-MuGM:RDBReadAtlas INFO ASZT size is 32
-MuGM:RDBReadAtlas INFO No Ascii iacsc input found: looking for A-lines in ORACLE
-RDBAccessSvc WARNING Could not get the tag for ISZT node. Returning 0 pointer to IRDBQuery
-MuGM:RDBReadAtlas INFO No ISZT table in Oracle
-MuGM:RDBReadAtlas INFO Access granted for all dbObjects needed by muon detectors
-MuonGeoModel.MYSQL INFO LayoutName (from DBAM) set to <R.08> -- relevant for CTB2004
-MuGM:ProcStations INFO Processing Stations and Components
-MuGM:ProcStations INFO Processing Stations and Components DONE
-MuGM:ProcTechnol.s INFO nMDT 26 nCSC 4 nTGC 44 nRPC 50
-MuGM:ProcTechnol.s INFO nDED 4 nSUP 8 nSPA 4
-MuGM:ProcTechnol.s INFO nCHV 14 nCRO 14 nCMI 12 nLBI 12
-MuGM:ProcPosition INFO *** N. of stations positioned in the setup 234
-MuGM:ProcPosition INFO *** N. of stations described in mysql 234
-MuGM:ProcPosition INFO *** N. of types 32 size of jtypvec 32
-MuGM:ProcPosition INFO *** : 234 kinds of stations (type*sub_type)
-MuGM:ProcPosition INFO *** : 1758 physical stations in space - according to the MuonDD DataBase
-MuGM:ProcCutouts INFO Processing Cutouts for geometry layout R.08
-MuGM:ProcCutouts INFO Processing Cutouts DONE
-MuGM:RDBReadAtlas INFO ProcessTGCreadout - version 7 wirespacing 1.8
-MuGM:RDBReadAtlas INFO Intermediate Objects built from primary numbers
-MuGM:MuonFactory INFO theMaterialManager retrieven successfully from the DetStore
-MuGM:MuonFactory INFO MuonSystem description from OracleTag=<ATLAS-R2-2016-01-00-01> and node=<ATLAS>
-MuGM:MuonFactory INFO TreeTop added to the Manager
-MuGM:MuonFactory INFO Muon Layout R.08.01
-MuGM:MuonFactory INFO Fine Clash Fixing disabled: (should be ON/OFF for Simulation/Reconstruction)
-MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ****************************
-MuGM:MuonFactory INFO *** The Muon Chamber Geometry Tree is built with
-MuGM:MuonFactory INFO *** 1758 child volumes
-MuGM:MuonFactory INFO *** 1839 independent elements and
-MuGM:MuonFactory INFO *** 11473 elements cloned or shared
-MuGM:MuonFactory INFO *** 234 kinds of stations
-MuGM:MuonFactory INFO *** 1758 stations with alignable transforms
-MuGM:MuonFactory INFO *** 148 stations are described as Assemblies
-MuGM:MuonFactory INFO *** 1758 MuonStations
-MuGM:MuonFactory INFO *** 2324 MDT Readout Elements 1186 MDT Detector Elements
-MuGM:MuonFactory INFO *** 32 CSC Readout Elements 32 CSC Detector Elements
-MuGM:MuonFactory INFO *** 1122 RPC Readout Elements 600 RPC Detector Elements
-MuGM:MuonFactory INFO *** 1578 TGC Readout Elements 1578 TGC Detector Elements
-MuGM:MuonFactory INFO ********************************************************************
-MuGM:MuonFactory INFO *** Inert Material built according to DB switches and config. ******
-MuGM:MuonFactory INFO *** The Muon Geometry Tree has 1758 child vol.s in total ********
-MuGM:MuonFactory INFO ********************************************************************
-
-MGM::MuonDetect... INFO Init A/B Line Containers - done - size is respectively 1758/0
-MGM::MuonDetect... INFO Init of CSC I-Lines will be done via Conditions DB
-MGM::MuonDetect... INFO Init I-Line Container - done - size is respectively 128
-MGM::MuonDetect... INFO I-Line for CSC wire layers loaded (Csc Internal Alignment)
-MGM::MuonDetect... INFO According to configuration they WILL be used
-MGM::MuonDetect... INFO Filling cache
-MGM::MuonDetect... INFO temporary CSC I-line container with size = 128
-MGM::MuonDetect... INFO # of CSC I-lines read from the ILineMapContainer in StoreGate is 128
-MGM::MuonDetect... INFO # of deltaTransforms updated according to A-lines is 128
-MGM::MuonDetect... INFO # of entries in the CSC I-lines historical container is 128
-MGM::MuonDetect... INFO temporary As-Built container with size = 628
-MGM::MuonDetect... INFO # of MDT As-Built read from the MdtAsBuiltMapContainer in StoreGate is 628
-MGM::MuonDetect... INFO # of deltaTransforms updated according to As-Built is 628
-MGM::MuonDetect... INFO # of entries in the MdtAsBuilt historical container is 628
-MGM::MuonDetect... INFO temporary A-line container with size = 2694
-MGM::MuonDetect... INFO # of A-lines read from the ALineMapContainer in StoreGate is 2694
-MGM::MuonDetect... INFO # of deltaTransforms updated according to A-lines is 2694
-MGM::MuonDetect... INFO # of entries in the A-lines historical container is 2814
-MGM::MuonDetect... INFO In updateDeformations()
-MGM::MuonDetect... INFO temporary B-line container with size = 1206
-MGM::MuonDetect... INFO # of B-lines read from the ALineMapContainer in StoreGate is 1206
-MGM::MuonDetect... INFO # of deform-Transforms updated according to B-lines is 1174
-MGM::MuonDetect... INFO # of entries in the B-lines historical container is 1174
-MuonDetectorCon... INFO recorded new MuonDetectorManager with range {[0,0,t:1497892260,l:0] - [t:1497898380]} into Conditions Store
-RpcCablingCondAlg INFO maps configuration have been parsed
-RpcCablingCondAlg INFO recorded new RpcCablingCondData with range {[315000,l:0] - [999999,l:0]}
-MuonMDT_CablingAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' ) readCdoMez->size()= 24
-MuonMDT_CablingAlg INFO Range of input is {[0,l:0] - [INVALID]}
-MuonMDT_CablingAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' ) readCdoMap->size()= 2312
-MuonMDT_CablingAlg INFO Range of input is {[327264,l:4294640031] - [327265,l:4294640030]}
-MuonMDT_CablingAlg INFO recorded new MuonMDT_CablingMap with range {[327264,t:0,l:4294640031] - [327265,l:4294640030]} into Conditions Store
-AtlasFieldMapCo... INFO updateFieldMap: Update map from conditions
-AtlasFieldMapCo... INFO updateFieldMap: Update map from conditions: Range of input/output is {[0,l:0] - [INVALID]}
-AtlasFieldMapCo... INFO updateFieldMap: reading magnetic field map filenames from COOL
-AtlasFieldMapCo... INFO updateFieldMap: found map of type GlobalMap with soleCur=7730 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_7730_20400_14m.root)
-AtlasFieldMapCo... INFO updateFieldMap: found map of type SolenoidMap with soleCur=7730 toroCur=0 (path file:MagneticFieldMaps/bfieldmap_7730_0_14m.root)
-AtlasFieldMapCo... INFO updateFieldMap: found map of type ToroidMap with soleCur=0 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_0_20400_14m.root)
-AtlasFieldMapCo... INFO updateFieldMap: tagInfoH ( 'TagInfo' , 'DetectorStore+ProcessingTags' ) is valid.
-AtlasFieldMapCo... INFO updateFieldMap: DID NOT reset currents from TagInfo
-AtlasFieldMapCo... INFO updateFieldMap: Set map currents from FieldSvc: solenoid/toroid 7730,20400
-AtlasFieldMapCo... INFO updateFieldMap: Use map file MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldMapCo... INFO updateFieldMap: Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldMapCo... INFO execute: solenoid zone id 7000
-AtlasFieldMapCo... INFO execute: recored AtlasFieldMapCondObj with field map
-AtlasFieldCache... INFO UpdateCurrentFromConditions
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Range of input/output is {[0,0,t:1497895317.371000000] - [t:1497898549.609000000]}
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Attempt 1 at reading currents from DCS (using channel name)
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] CentralSol_Current , 1 , 7729.99
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] CentralSol_SCurrent , 2 , 7730
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_Current , 3 , 20399.9
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20397.7
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Currents read from DCS - solenoid 7729.99 toroid 20399.9
-AtlasFieldCache... INFO scaleField: Solenoid field scale factor 1. Solenoid and map currents: 7729.99,7730
-AtlasFieldCache... INFO scaleField: Toroid field scale factor 1. Toroid and map currents: 20399.9,20400
-AtlasFieldCache... INFO execute: initialized AtlasFieldCacheCondObj and cache with SFs - sol/tor 1/1
-AtlasFieldCache... INFO execute: solenoid zone id 7000
-MdtCalibDbAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/RTBLOB' ) readCdoRt->size()= 1186
-MdtCalibDbAlg INFO Range of input is {[327265,l:0] - [327342,l:0]}
-MdtCalibDbAlg INFO MdtCalibDbAlg::loadRt Read 1188RTs from COOL
-MdtCalibDbAlg INFO recorded new MdtRtRelationCollection with range {[327265,l:0] - [327342,l:0]} into Conditions Store
-MdtCalibDbAlg INFO recorded new MdtCorFuncSetCollection with range {[327265,l:0] - [327342,l:0]} into Conditions Store
-MdtCalibDbAlg INFO Ignoring nonexistant station in calibration DB: MuonSpectrometer BML -6 stationPhi 7 MDT multiLayer 1 tubeLayer 1 tube 1
-MdtCalibDbAlg INFO Ignoring nonexistant station in calibration DB: MuonSpectrometer BML stationEta 6 stationPhi 7 MDT multiLayer 1 tubeLayer 1 tube 1
-MdtCalibDbAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/T0BLOB' ) readCdoTube->size()= 1186
-MdtCalibDbAlg INFO Range of input is {[319000,l:0] - [INVALID]}
-MdtCalibDbAlg INFO recorded new MdtTubeCalibContainerCollection with range {[319000,l:0] - [INVALID]} into Conditions Store
-CscCondDbData INFO Maximum Layer hash is 255
-AthenaEventLoopMgr INFO ===>>> done processing event #186525031, run #327265 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186524665, run #327265 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186524665, run #327265 2 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186542447, run #327265 2 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186542447, run #327265 3 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186543405, run #327265 3 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186543405, run #327265 4 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186548387, run #327265 4 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186548387, run #327265 5 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186515186, run #327265 5 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186515186, run #327265 6 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186556019, run #327265 6 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186556019, run #327265 7 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186542866, run #327265 7 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186542866, run #327265 8 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186537901, run #327265 8 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186537901, run #327265 9 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186517811, run #327265 9 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186517811, run #327265 10 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186534221, run #327265 10 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186534221, run #327265 11 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186540986, run #327265 11 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186540986, run #327265 12 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186535104, run #327265 12 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186535104, run #327265 13 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186539903, run #327265 13 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186539903, run #327265 14 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186552713, run #327265 14 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186552713, run #327265 15 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186524730, run #327265 15 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186524730, run #327265 16 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186547632, run #327265 16 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186547632, run #327265 17 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186555621, run #327265 17 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186555621, run #327265 18 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186568452, run #327265 18 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186568452, run #327265 19 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186580451, run #327265 19 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186580451, run #327265 20 events processed so far <<<===
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
-ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
-CondInputLoader INFO Finalizing CondInputLoader...
-AtlasFieldMapCo... INFO in finalize
-AtlasFieldCache... INFO in finalize
-IncidentProcAlg2 INFO Finalize
-IOVDbFolder INFO Folder /CSC/FTHOLD (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/322656 (( 0.03 ))s
-IOVDbFolder INFO Folder /CSC/NOISE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/350062 (( 0.03 ))s
-IOVDbFolder INFO Folder /CSC/PED (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/411187 (( 0.14 ))s
-IOVDbFolder INFO Folder /CSC/PSLOPE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/353376 (( 0.04 ))s
-IOVDbFolder INFO Folder /CSC/RMS (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/411395 (( 0.02 ))s
-IOVDbFolder INFO Folder /CSC/STAT (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/230496 (( 0.09 ))s
-IOVDbFolder INFO Folder /CSC/T0BASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/314380 (( 0.01 ))s
-IOVDbFolder INFO Folder /CSC/T0PHASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/3136 (( 0.02 ))s
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 (( 0.02 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 0.03 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 2312/2437/216520 (( 0.13 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MEZZANINE_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 24/24/288 (( 0.03 ))s
-IOVDbFolder INFO Folder /MDT/RTBLOB (AttrListColl) db-read 1/1 objs/chan/bytes 2372/1186/2251209 (( 0.12 ))s
-IOVDbFolder INFO Folder /MDT/T0BLOB (AttrListColl) db-read 1/1 objs/chan/bytes 1186/1186/1374284 (( 0.07 ))s
-IOVDbFolder INFO Folder /MUONALIGN/CSC/ILINES (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/10814 (( 0.04 ))s
-IOVDbFolder INFO Folder /MUONALIGN/MDT/ASBUILTPARAMS (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/128992 (( 0.04 ))s
-IOVDbFolder INFO Folder /MUONALIGN/MDT/BARREL (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/140293 (( 0.02 ))s
-IOVDbFolder INFO Folder /MUONALIGN/MDT/ENDCAP/SIDEA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/65494 (( 0.02 ))s
-IOVDbFolder INFO Folder /MUONALIGN/MDT/ENDCAP/SIDEC (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/65497 (( 0.02 ))s
-IOVDbFolder INFO Folder /MUONALIGN/TGC/SIDEA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/165643 (( 0.02 ))s
-IOVDbFolder INFO Folder /MUONALIGN/TGC/SIDEC (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/165643 (( 0.02 ))s
-IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/2 objs/chan/bytes 1/1/222235 (( 0.09 ))s
-IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA_CORR (AttrListColl) db-read 1/2 objs/chan/bytes 1/1/29402 (( 0.04 ))s
-IOVDbFolder INFO Folder /RPC/DCS/DeadRopanels (AttrListColl) db-read 1/1 objs/chan/bytes 32/48/6200 (( 0.00 ))s
-IOVDbFolder INFO Folder /RPC/DCS/OffRopanels (AttrListColl) db-read 1/1 objs/chan/bytes 4/48/16 (( 0.00 ))s
-IOVDbFolder INFO Folder /RPC/DQMF/ELEMENT_STATUS (AttrListColl) db-read 1/1 objs/chan/bytes 8320/8320/6180700 (( 0.24 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_ETA (AttrListColl) db-read 1/2 objs/chan/bytes 1613/1613/7562651 (( 2.26 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_PHI (AttrListColl) db-read 1/2 objs/chan/bytes 1612/1612/8096306 (( 0.11 ))s
-IOVDbFolder INFO Folder /TDAQ/RunCtrl/SOR_Params (AttrListColl) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /TGC/CABLING/MAP_SCHEMA (AttrListColl) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbSvc INFO bytes in (( 3.70 ))s
-IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=CONDBR2 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLONL_TDAQ/CONDBR2 : nConnect: 1 nFolders: 1 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_MUONALIGN/CONDBR2 : nConnect: 2 nFolders: 7 ReadTime: (( 0.17 ))s
-IOVDbSvc INFO Connection COOLONL_RPC/CONDBR2 : nConnect: 2 nFolders: 4 ReadTime: (( 2.50 ))s
-IOVDbSvc INFO Connection COOLONL_TGC/CONDBR2 : nConnect: 1 nFolders: 1 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLONL_MDT/CONDBR2 : nConnect: 2 nFolders: 2 ReadTime: (( 0.16 ))s
-IOVDbSvc INFO Connection COOLONL_GLOBAL/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.03 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/CONDBR2 : nConnect: 2 nFolders: 3 ReadTime: (( 0.02 ))s
-IOVDbSvc INFO Connection COOLOFL_RPC/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.24 ))s
-IOVDbSvc INFO Connection COOLOFL_MDT/CONDBR2 : nConnect: 2 nFolders: 2 ReadTime: (( 0.19 ))s
-IOVDbSvc INFO Connection COOLOFL_CSC/CONDBR2 : nConnect: 2 nFolders: 8 ReadTime: (( 0.38 ))s
-ToolSvc INFO Removing all tools created by ToolSvc
-TgcRdoToTgcPrep... INFO finalize(): input RDOs->output PRDs [Hit: 6807->6807, Tracklet: 28->28, TrackletEIFI: 692->692, HiPt: 4031->4031, SL: 3->3]
MdtRawDataProvi... INFO Fraction of fills that use the cache = 0
TgcRawDataProvi... INFO Fraction of fills that use the cache = 0
RpcROD_Decoder:... INFO ============ FINAL RPC DATA FORMAT STAT. ===========
@@ -1080,15 +47,3 @@ RpcROD_Decoder:... INFO SL Footer Errors.............0
RpcROD_Decoder:... INFO RX Footer Errors.............0
RpcROD_Decoder:... INFO CRC8 check Failures..........0
RpcROD_Decoder:... INFO ====================================================
-ToolSvc.ByteStr... INFO in finalize()
-ToolSvc.TGCCabl... INFO finalize
-IdDictDetDescrCnv INFO in finalize
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-cObj_ALL INFO Time User : Tot= 0 [us] Ave/Min/Max= 0(+- 0)/ 0/ 0 [us] #= 32
-ChronoStatSvc INFO Time User : Tot= 27.3 [s] #= 1
-*****Chrono***** INFO ****************************************************************************************************
-ChronoStatSvc.f... INFO Service finalized successfully
-ApplicationMgr INFO Application Manager Finalized successfully
-ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
index b1122b5002294aee7c0d8d8d56af06b3c45e9d6a..bc6b15f7cab90d90e36813932dd08f028fb60e82 100644
--- a/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
+++ b/MuonSpectrometer/MuonConfig/share/MuonDataDecodeTest_Cache.ref
@@ -1,565 +1,21 @@
-Flag Name : Value
-Beam.BunchSpacing : 25
-Beam.Energy : [function]
-Beam.NumberOfCollisions : [function]
-Beam.Type : [function]
-Beam.estimatedLuminosity : [function]
-Common.Project : 'Athena'
-Common.bunchCrossingSource : [function]
-Common.doExpressProcessing : False
-Common.isOnline : False
-Common.useOnlineLumi : [function]
-Concurrency.NumConcurrentEvents : 0
-Concurrency.NumProcs : 0
-Concurrency.NumThreads : 0
-GeoModel.Align.Dynamic : [function]
-GeoModel.AtlasVersion : 'ATLAS-R2-2016-01-00-01'
-GeoModel.IBLLayout : [function]
-GeoModel.Layout : 'atlas'
-GeoModel.Run : [function]
-GeoModel.StripGeoType : [function]
-GeoModel.Type : [function]
-IOVDb.DatabaseInstance : [function]
-IOVDb.GlobalTag : 'CONDBR2-BLKPA-2018-13'
-Input.Collections : [function]
-Input.Files : ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
-Input.Format : [function]
-Input.ProjectName : [function]
-Input.RunNumber : [function]
-Input.SecondaryCollections : [function]
-Input.SecondaryFiles : []
-Input.isMC : [function]
-Output.AODFileName : ''
-Output.ESDFileName : ''
-Output.EVNTFileName : ''
-Output.HISTFileName : ''
-Output.HITSFileName : ''
-Output.RDOFileName : ''
-Output.RDO_SGNLFileName : ''
-Output.doESD : [function]
-Output.doWriteAOD : [function]
-Output.doWriteBS : False
-Output.doWriteESD : [function]
-Output.doWriteRDO : [function]
-Output.doWriteRDO_SGNL : [function]
-Random.Engine : 'dSFMT'
-Scheduler.CheckDependencies : True
-Scheduler.ShowControlFlow : True
-Scheduler.ShowDataDeps : True
-Scheduler.ShowDataFlow : True
-TrackingGeometry.MagneticFileMode : 6
-TrackingGeometry.MaterialSource : 'COOL'
-Flag categories that can be loaded dynamically
-Category : Generator name : Defined in
-BField : __bfield : AthenaConfiguration/AllConfigFlags.py
-BTagging : __btagging : AthenaConfiguration/AllConfigFlags.py
-Calo : __calo : AthenaConfiguration/AllConfigFlags.py
-DQ : __dq : AthenaConfiguration/AllConfigFlags.py
-Detector : __detector : AthenaConfiguration/AllConfigFlags.py
-Digitization : __digitization : AthenaConfiguration/AllConfigFlags.py
-Egamma : __egamma : AthenaConfiguration/AllConfigFlags.py
-InDet : __indet : AthenaConfiguration/AllConfigFlags.py
-LAr : __lar : AthenaConfiguration/AllConfigFlags.py
-Muon : __muon : AthenaConfiguration/AllConfigFlags.py
-MuonCombined : __muoncombined : AthenaConfiguration/AllConfigFlags.py
-Overlay : __overlay : AthenaConfiguration/AllConfigFlags.py
-PF : __pflow : AthenaConfiguration/AllConfigFlags.py
-Sim : __simulation : AthenaConfiguration/AllConfigFlags.py
-Tile : __tile : AthenaConfiguration/AllConfigFlags.py
-Trigger : __trigger : AthenaConfiguration/AllConfigFlags.py
-Py:Athena INFO About to setup Raw data decoding
-Py:AutoConfigFlags INFO Obtaining metadata of auto-configuration by peeking into /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-Py:MetaReader INFO Current mode used: peeker
-Py:MetaReader INFO Current filenames: ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1']
-Py:Athena INFO using release [WorkDir-22.0.13] [x86_64-centos7-gcc8-opt] [atlas-work3/c0397ca1951] -- built on [2020-05-12T1917]
-Py:ConfigurableDb INFO Read module info for 5576 configurables from 41 genConfDb files
-Py:ConfigurableDb INFO No duplicates have been found: that's good !
-EventInfoMgtInit: Got release version Athena-22.0.13
-Py:IOVDbSvc.CondDB INFO Setting up conditions DB access to instance OFLP200
-Py:Athena INFO Print Config
-Py:ComponentAccumulator INFO Event Inputs
-Py:ComponentAccumulator INFO Event Algorithm Sequences
-Py:ComponentAccumulator INFO Top sequence 0
-Py:ComponentAccumulator INFO \__ AthAlgSeq (seq: SEQ AND)
-Py:ComponentAccumulator INFO \__ MuonCacheCreator (alg)
-Py:ComponentAccumulator INFO \__ RpcRawDataProvider (alg)
-Py:ComponentAccumulator INFO \__ TgcRawDataProvider (alg)
-Py:ComponentAccumulator INFO \__ MdtRawDataProvider (alg)
-Py:ComponentAccumulator INFO \__ CscRawDataProvider (alg)
-Py:ComponentAccumulator INFO \__ RpcRdoToRpcPrepData (alg)
-Py:ComponentAccumulator INFO \__ TgcRdoToTgcPrepData (alg)
-Py:ComponentAccumulator INFO \__ CscRdoToCscPrepData (alg)
-Py:ComponentAccumulator INFO \__ CscThresholdClusterBuilder (alg)
-Py:ComponentAccumulator INFO Condition Algorithms
-Py:ComponentAccumulator INFO \__ CondInputLoader (cond alg)
-Py:ComponentAccumulator INFO \__ MuonAlignmentCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ MuonDetectorCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ RpcCablingCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ MuonMDT_CablingAlg (cond alg)
-Py:ComponentAccumulator INFO \__ AtlasFieldMapCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ AtlasFieldCacheCondAlg (cond alg)
-Py:ComponentAccumulator INFO \__ RpcCondDbAlg (cond alg)
-Py:ComponentAccumulator INFO \__ MdtCalibDbAlg (cond alg)
-Py:ComponentAccumulator INFO \__ CscCondDbAlg (cond alg)
-Py:ComponentAccumulator INFO Services
-Py:ComponentAccumulator INFO ['EventSelector', 'ByteStreamInputSvc', 'EventPersistencySvc', 'ByteStreamCnvSvc', 'ROBDataProviderSvc', 'ByteStreamAddressProviderSvc', 'MetaDataStore', 'InputMetaDataStore', 'MetaDataSvc', 'ProxyProviderSvc', 'IOVDbSvc', 'PoolSvc', 'CondSvc', 'DBReplicaSvc', 'TagInfoMgr', 'GeoModelSvc', 'DetDescrCnvSvc', 'AthenaPoolCnvSvc', 'MuonIdHelperSvc', 'RPCcablingServerSvc', 'MuonRPC_CablingSvc', 'LVL1TGC::TGCRecRoiSvc', 'TGCcablingServerSvc', 'MuonMDT_CablingSvc', 'AtlasFieldSvc', 'CSCcablingSvc']
-Py:ComponentAccumulator INFO Public Tools
-Py:ComponentAccumulator INFO [
-Py:ComponentAccumulator INFO IOVDbMetaDataTool/IOVDbMetaDataTool,
-Py:ComponentAccumulator INFO ByteStreamMetadataTool/ByteStreamMetadataTool,
-Py:ComponentAccumulator INFO RPCCablingDbTool/RPCCablingDbTool,
-Py:ComponentAccumulator INFO Muon::RPC_RawDataProviderToolMT/RPC_RawDataProviderToolMT,
-Py:ComponentAccumulator INFO Muon::TGC_RawDataProviderToolMT/TGC_RawDataProviderToolMT,
-Py:ComponentAccumulator INFO MDTCablingDbTool/MDTCablingDbTool,
-Py:ComponentAccumulator INFO Muon::MDT_RawDataProviderToolMT/MDT_RawDataProviderToolMT,
-Py:ComponentAccumulator INFO Muon::CSC_RawDataProviderToolMT/CSC_RawDataProviderToolMT,
-Py:ComponentAccumulator INFO Muon::RpcRdoToPrepDataToolMT/RpcRdoToRpcPrepDataTool,
-Py:ComponentAccumulator INFO Muon::TgcRdoToPrepDataToolMT/TgcRdoToTgcPrepDataTool,
-Py:ComponentAccumulator INFO Muon::MdtRdoToPrepDataToolMT/MdtRdoToMdtPrepDataTool,
-Py:ComponentAccumulator INFO Muon::CscRdoToCscPrepDataToolMT/CscRdoToCscPrepDataTool,
-Py:ComponentAccumulator INFO CscThresholdClusterBuilderTool/CscThresholdClusterBuilderTool,
-Py:ComponentAccumulator INFO ]
-Py:ComponentAccumulator INFO Private Tools
-Py:ComponentAccumulator INFO [
-Py:ComponentAccumulator INFO ]
-Py:ComponentAccumulator INFO TheApp properties
-Py:ComponentAccumulator INFO EvtSel : EventSelector
-Py:Athena INFO Save Config
-
-JOs reading stage finished, launching CARunner from pickle file
-
-ApplicationMgr SUCCESS
-====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus728.cern.ch on Tue May 12 19:45:41 2020
-====================================================================================================================================
-ApplicationMgr INFO Application Manager Configured successfully
-PublicTool IOVDbMetaDataTool
-PublicTool ByteStreamMetadataTool
-PublicTool RPCCablingDbTool
-PublicTool RPC_RawDataProviderToolMT
-PublicTool TGC_RawDataProviderToolMT
-PublicTool MDTCablingDbTool
-PublicTool MDT_RawDataProviderToolMT
-PublicTool CSC_RawDataProviderToolMT
-PublicTool RpcRdoToRpcPrepDataTool
-PublicTool TgcRdoToTgcPrepDataTool
-PublicTool MdtRdoToMdtPrepDataTool
-PublicTool CscRdoToCscPrepDataTool
-PublicTool CscThresholdClusterBuilderTool
-CoreDumpSvc INFO install f-a-t-a-l handler... (flag = 438)
-CoreDumpSvc INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception)
-ClassIDSvc INFO getRegistryEntries: read 3838 CLIDRegistry entries for module ALL
-MetaDataSvc INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
-AthenaPoolCnvSvc INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
-PoolSvc INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
-PoolSvc INFO Set connectionsvc retry/timeout/IDLE timeout to 'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
-PoolSvc INFO Frontier compression level set to 5
-DBReplicaSvc INFO Frontier server at (serverurl=http://atlasfrontier-local.cern.ch:8000/atlr)(serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy-atlas.cern.ch:3128)(proxyurl=http://ca-proxy-meyrin.cern.ch:3128)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://atlasbpfrontier.cern.ch:3127)(proxyurl=http://atlasbpfrontier.fnal.gov:3127) will be considered for COOL data
-DBReplicaSvc INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-11T2140/Athena/22.0.13/InstallArea/x86_64-centos7-gcc8-opt/share/dbreplica.config
-DBReplicaSvc INFO Total of 10 servers found for host lxplus728.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
-DBReplicaSvc INFO COOL SQLite replicas will be excluded if matching pattern /DBRelease/
-PoolSvc INFO Successfully setup replica sorting algorithm
-PoolSvc INFO Setting up APR FileCatalog and Streams
-PoolSvc INFO Resolved path (via ATLAS_POOLCOND_PATH) is /cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_oflcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for prfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc WARNING Unable to locate catalog for apcfile:poolcond/PoolCat_comcond.xml check your ATLAS_POOLCOND_PATH and DATAPATH variables
-PoolSvc INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
-DbSession INFO Open DbSession
-Domain[ROOT_All] INFO > Access DbDomain READ [ROOT_All]
-ToolSvc.ByteStr... INFO Initializing ToolSvc.ByteStreamMetadataTool - package version ByteStreamCnvSvc-00-00-00
-MetaDataSvc INFO Found MetaDataTools = PublicToolHandleArray(['IOVDbMetaDataTool/IOVDbMetaDataTool','ByteStreamMetadataTool/ByteStreamMetadataTool'])
-ByteStreamAddre... INFO Initializing ByteStreamAddressProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ByteStreamAddre... INFO initialized
-ByteStreamAddre... INFO -- Will fill Store with id = 0
-IOVDbSvc INFO Opened read transaction for POOL PersistencySvc
-IOVDbSvc INFO Only 5 POOL conditions files will be open at once
-IOVDbSvc INFO Cache alignment will be done in 3 slices
-IOVDbSvc INFO Global tag: CONDBR2-BLKPA-2018-13 set from joboptions
-IOVDbFolder INFO Inputfile tag override disabled for /GLOBAL/BField/Maps
-IOVDbSvc INFO Initialised with 11 connections and 30 folders
-IOVDbSvc INFO Service IOVDbSvc initialised successfully
-ClassIDSvc INFO getRegistryEntries: read 3039 CLIDRegistry entries for module ALL
-IOVDbSvc INFO Opening COOL connection for COOLONL_TDAQ/CONDBR2
-ClassIDSvc INFO getRegistryEntries: read 268 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 230 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 4058 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 139 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 3331 CLIDRegistry entries for module ALL
-IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"
-IOVSvc.IOVSvcTool INFO IOVRanges will be checked at every Event
-IOVDbSvc INFO Opening COOL connection for COOLOFL_MUONALIGN/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_TDAQ/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_RPC/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_MUONALIGN/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_TGC/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_RPC/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_MDT/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_TGC/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_GLOBAL/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_MDT/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLONL_GLOBAL/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_RPC/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_MDT/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_RPC/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_CSC/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_MDT/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_CSC/CONDBR2
-IOVDbSvc INFO Added taginfo remove for /CSC/FTHOLD
-IOVDbSvc INFO Added taginfo remove for /CSC/NOISE
-IOVDbSvc INFO Added taginfo remove for /CSC/PED
-IOVDbSvc INFO Added taginfo remove for /CSC/PSLOPE
-IOVDbSvc INFO Added taginfo remove for /CSC/RMS
-IOVDbSvc INFO Added taginfo remove for /CSC/STAT
-IOVDbSvc INFO Added taginfo remove for /CSC/T0BASE
-IOVDbSvc INFO Added taginfo remove for /CSC/T0PHASE
-IOVDbSvc INFO Added taginfo remove for /EXT/DCS/MAGNETS/SENSORDATA
-IOVDbSvc INFO Added taginfo remove for /GLOBAL/BField/Maps
-IOVDbSvc INFO Added taginfo remove for /MDT/CABLING/MAP_SCHEMA
-IOVDbSvc INFO Added taginfo remove for /MDT/CABLING/MEZZANINE_SCHEMA
-IOVDbSvc INFO Added taginfo remove for /MDT/RTBLOB
-IOVDbSvc INFO Added taginfo remove for /MDT/T0BLOB
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/CSC/ILINES
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/MDT/ASBUILTPARAMS
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/MDT/BARREL
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/MDT/ENDCAP/SIDEA
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/MDT/ENDCAP/SIDEC
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/TGC/SIDEA
-IOVDbSvc INFO Added taginfo remove for /MUONALIGN/TGC/SIDEC
-IOVDbSvc INFO Added taginfo remove for /RPC/CABLING/MAP_SCHEMA
-IOVDbSvc INFO Added taginfo remove for /RPC/CABLING/MAP_SCHEMA_CORR
-IOVDbSvc INFO Added taginfo remove for /RPC/DCS/DeadRopanels
-IOVDbSvc INFO Added taginfo remove for /RPC/DCS/OffRopanels
-IOVDbSvc INFO Added taginfo remove for /RPC/DQMF/ELEMENT_STATUS
-IOVDbSvc INFO Added taginfo remove for /RPC/TRIGGER/CM_THR_ETA
-IOVDbSvc INFO Added taginfo remove for /RPC/TRIGGER/CM_THR_PHI
-IOVDbSvc INFO Added taginfo remove for /TDAQ/RunCtrl/SOR_Params
-IOVDbSvc INFO Added taginfo remove for /TGC/CABLING/MAP_SCHEMA
-GeoModelSvc INFO Explicitly initializing DetDescrCnvSvc
-DetDescrCnvSvc INFO initializing
-DetDescrCnvSvc INFO Found DetectorStore service
-DetDescrCnvSvc INFO filling proxies for detector managers
-DetDescrCnvSvc INFO filling address for CaloTTMgr with CLID 117659265 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloMgr with CLID 4548337 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloSuperCellMgr with CLID 241807251 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloIdManager with CLID 125856940 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArIdManager with CLID 79554919 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for IdDict with CLID 2411 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for AtlasID with CLID 164875623 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for PixelID with CLID 2516 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for SCT_ID with CLID 2517 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TRT_ID with CLID 2518 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for SiliconID with CLID 129452393 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArEM_ID with CLID 163583365 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArEM_SuperCell_ID with CLID 99488227 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHEC_ID with CLID 3870484 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHEC_SuperCell_ID with CLID 254277678 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArFCAL_ID with CLID 45738051 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArFCAL_SuperCell_ID with CLID 12829437 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArMiniFCAL_ID with CLID 79264204 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArOnlineID with CLID 158698068 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TTOnlineID with CLID 38321944 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArOnline_SuperCellID with CLID 115600394 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArHVLineID with CLID 27863673 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for LArElectrodeID with CLID 80757351 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileID with CLID 2901 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for Tile_SuperCell_ID with CLID 49557789 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileHWID with CLID 2902 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TileTBID with CLID 2903 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for MDTIDHELPER with CLID 4170 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CSCIDHELPER with CLID 4171 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for RPCIDHELPER with CLID 4172 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for TGCIDHELPER with CLID 4173 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloLVL1_ID with CLID 108133391 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloCell_ID with CLID 123500438 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloCell_SuperCell_ID with CLID 128365736 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for CaloDM_ID with CLID 167756483 and storage type 68 to detector store
-DetDescrCnvSvc INFO filling address for ZdcID with CLID 190591643 and storage type 68 to detector store
-GeoModelSvc.Muo... INFO Initializing ...
-GeoModelSvc::RD...WARNING Getting PixTBMatComponents with default tag
-GeoModelSvc::RD...WARNING Getting PixTBMaterials with default tag
-GeoModelSvc::RD...WARNING Getting InDetMatComponents with default tag
-GeoModelSvc::RD...WARNING Getting InDetMaterials with default tag
-MuonGeoModel INFO MuonDetectorFactory - constructor MuonSystem OuterRadius 13000 Length 22030
-GeoModelSvc.Muo... INFO create MuonDetectorTool - package version = MuonGeoModel-00-00-00
-GeoModelSvc.Muo... INFO (from GeoModelSvc) AtlasVersion = <ATLAS-R2-2016-01-00-01> MuonVersion = <>
-GeoModelSvc.Muo... INFO Keys for Muon Switches are (key) ATLAS-R2-2016-01-00-01 (node) ATLAS
-GeoModelSvc.Muo... INFO (from GeoModelSvc) in AtlasVersion = <ATLAS-R2-2016-01-00-01> default MuonVersion is <MuonSpectrometer-R.08.01>
-GeoModelSvc.Muo... INFO Properties have been set as follows:
-GeoModelSvc.Muo... INFO LayoutName R
-GeoModelSvc.Muo... INFO IncludeCutouts 0
-GeoModelSvc.Muo... INFO IncludeCutoutsBog 0
-GeoModelSvc.Muo... INFO IncludeCtbBis 0
-GeoModelSvc.Muo... INFO ControlAlines 111111
-GeoModelSvc.Muo... INFO MinimalGeoFlag 0
-GeoModelSvc.Muo... INFO EnableCscIntAlignment 1
-GeoModelSvc.Muo... INFO EnableCscIntAlignmentFromGM 0
-GeoModelSvc.Muo... INFO ControlCscIntAlines 111111
-GeoModelSvc.Muo... INFO EnableMdtDeformations 1
-GeoModelSvc.Muo... INFO EnableMdtAsBuiltParameters 1
-MuGM:MuonFactory INFO MuonLayout set to <R.08.01> = Development version for DC3 - infrastructures
-MuGM:MuonFactory INFO BOG cutouts are activated 1 , all other cutouts are disabled 1
-MuGM:MuonFactory INFO Manager created for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
-MuonGeoModel.MYSQL INFO GeometryVersion set to <R.08.01>
-MuGM:MuonFactory INFO Mysql helper class created here for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
-MuGM:MuonFactory INFO MDTIDHELPER retrieved from DetStore
-EventPersistenc... INFO Added successfully Conversion service:ByteStreamCnvSvc
-EventPersistenc... INFO Added successfully Conversion service:TagInfoMgr
-EventPersistenc... INFO Added successfully Conversion service:DetDescrCnvSvc
-MDT_IDDetDescrCnv INFO in createObj: creating a MdtIdHelper object in the detector store
-IdDictDetDescrCnv INFO in initialize
-IdDictDetDescrCnv INFO in createObj: creating a IdDictManager object in the detector store
-IdDictDetDescrCnv INFO IdDictName: IdDictParser/ATLAS_IDS.xml
-IdDictDetDescrCnv INFO Reading InnerDetector IdDict file InDetIdDictFiles/IdDictInnerDetector_IBL3D25-03.xml
-IdDictDetDescrCnv INFO Reading LArCalorimeter IdDict file IdDictParser/IdDictLArCalorimeter_DC3-05-Comm-01.xml
-IdDictDetDescrCnv INFO Reading TileCalorimeter IdDict file IdDictParser/IdDictTileCalorimeter.xml
-IdDictDetDescrCnv INFO Reading Calorimeter IdDict file IdDictParser/IdDictCalorimeter_L1Onl.xml
-IdDictDetDescrCnv INFO Reading MuonSpectrometer IdDict file IdDictParser/IdDictMuonSpectrometer_R.03.xml
-IdDictDetDescrCnv INFO Reading ForwardDetectors IdDict file IdDictParser/IdDictForwardDetectors_2010.xml
-IdDictDetDescrCnv INFO Found id dicts:
-IdDictDetDescrCnv INFO Using dictionary tag: null
-IdDictDetDescrCnv INFO Dictionary ATLAS version default DetDescr tag (using default) file
-IdDictDetDescrCnv INFO Dictionary Calorimeter version default DetDescr tag CaloIdentifier-LVL1-02 file IdDictParser/IdDictCalorimeter_L1Onl.xml
-IdDictDetDescrCnv INFO Dictionary ForwardDetectors version default DetDescr tag ForDetIdentifier-01 file IdDictParser/IdDictForwardDetectors_2010.xml
-IdDictDetDescrCnv INFO Dictionary InnerDetector version IBL-DBM DetDescr tag InDetIdentifier-IBL3D25-02 file InDetIdDictFiles/IdDictInnerDetector_IBL3D25-03.xml
-IdDictDetDescrCnv INFO Dictionary LArCalorimeter version fullAtlas DetDescr tag LArIdentifier-DC3-05-Comm file IdDictParser/IdDictLArCalorimeter_DC3-05-Comm-01.xml
-IdDictDetDescrCnv INFO Dictionary LArElectrode version fullAtlas DetDescr tag (using default) file
-IdDictDetDescrCnv INFO Dictionary LArHighVoltage version fullAtlas DetDescr tag (using default) file
-IdDictDetDescrCnv INFO Dictionary MuonSpectrometer version R.03 DetDescr tag MuonIdentifier-08 file IdDictParser/IdDictMuonSpectrometer_R.03.xml
-IdDictDetDescrCnv INFO Dictionary TileCalorimeter version fullAtlasAndTestBeam DetDescr tag TileIdentifier-00 file IdDictParser/IdDictTileCalorimeter.xml
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
-AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
- AtlasDetectorID::initialize_from_dictionary - OK
-MdtIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 210
-MdtIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 241
-MdtIdHelper INFO MultiRange built successfully to tube: MultiRange size is 241
-MdtIdHelper INFO Initializing MDT hash indices ...
-MdtIdHelper INFO The element hash max is 1188
-MdtIdHelper INFO The detector element hash max is 2328
-MdtIdHelper INFO Initializing MDT hash indices for finding neighbors ...
-MuGM:MuonFactory INFO RPCIDHELPER retrieved from DetStore
-RPC_IDDetDescrCnv INFO in createObj: creating a RpcIdHelper object in the detector store
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
-AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
- AtlasDetectorID::initialize_from_dictionary - OK
-RpcIdHelper INFO MultiRange built successfully to doubletR: MultiRange size is 241
-RpcIdHelper INFO MultiRange built successfully to detectorElement: DetectorElement MultiRange size is 241
-RpcIdHelper INFO MultiRange built successfully to rpcStrip: MultiRange size is 241
-RpcIdHelper INFO Initializing RPC hash indices ...
-RpcIdHelper INFO The element hash max is 600
-RpcIdHelper INFO The detector element hash max is 1122
-RpcIdHelper INFO Initializing RPC hash indices for finding neighbors ...
-MuGM:MuonFactory INFO TGCIDHELPER retrieved from DetStore
-TGC_IDDetDescrCnv INFO in createObj: creating a TgcIdHelper object in the detector store
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
-AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
- AtlasDetectorID::initialize_from_dictionary - OK
-TgcIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 210
-TgcIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 210
-TgcIdHelper INFO MultiRange built successfully to channel: MultiRange size is 241
-TgcIdHelper INFO Initializing TGC hash indices ...
-TgcIdHelper INFO The element hash max is 1578
-TgcIdHelper INFO The detector element hash max is 1578
-TgcIdHelper INFO Initializing TGC hash indices for finding neighbors ...
-MuGM:MuonFactory INFO CSCIDHELPER retrieved from DetStore
-CSC_IDDetDescrCnv INFO in createObj: creating a CcscIdHelper object in the detector store
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find mm region index: group, region size 0 0
-AtlasDetectorIDHelper::initialize_from_dictionary - Warning: unable to find stgc region index: group, region size 0 0
-AtlasDetectorID::initLevelsFromDict - there are no sTGC entries in the dictionary!
-AtlasDetectorID::initLevelsFromDict - there are no MM entries in the dictionary!
- AtlasDetectorID::initialize_from_dictionary - OK
-CscIdHelper INFO MultiRange built successfully to Technology: MultiRange size is 210
-CscIdHelper INFO MultiRange built successfully to detector element: Multilayer MultiRange size is 237
-CscIdHelper INFO MultiRange built successfully to cscStrip: MultiRange size is 241
-CscIdHelper INFO Initializing CSC hash indices ...
-CscIdHelper INFO The element hash max is 32
-CscIdHelper INFO The detector element hash max is 64
-CscIdHelper INFO The channel hash max is 61440
-CscIdHelper INFO Initializing CSC hash indices for finding neighbors ...
-MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ************************
-MuGM:MuonFactory INFO *** Start building the Muon Geometry Tree **********************
-MuGM:RDBReadAtlas INFO Start retriving dbObjects with tag = <ATLAS-R2-2016-01-00-01> node <ATLAS>
-RDBAccessSvc WARNING Could not get the tag for XtomoData node. Returning 0 pointer to IRDBQuery
-MuGM:RDBReadAtlas INFO After getQuery XtomoData
-In DblQ00Xtomo(data)
-No XtomoData table in the MuonDD Database
-MuGM:RDBReadAtlas INFO After new DblQ00Xtomo
-MuGM:RDBReadAtlas INFO After m_dhxtomo.data()
-MuGM:RDBReadAtlas INFO No Ascii aszt input found: looking for A-lines in ORACLE
-MuGM:RDBReadAtlas INFO ASZT table found in Oracle
-MuGM:RDBReadAtlas INFO ASZT size is 32
-MuGM:RDBReadAtlas INFO No Ascii iacsc input found: looking for A-lines in ORACLE
-RDBAccessSvc WARNING Could not get the tag for ISZT node. Returning 0 pointer to IRDBQuery
-MuGM:RDBReadAtlas INFO No ISZT table in Oracle
-MuGM:RDBReadAtlas INFO Access granted for all dbObjects needed by muon detectors
-MuonGeoModel.MYSQL INFO LayoutName (from DBAM) set to <R.08> -- relevant for CTB2004
-MuGM:ProcStations INFO Processing Stations and Components
-MuGM:ProcStations INFO Processing Stations and Components DONE
-MuGM:ProcTechnol.s INFO nMDT 13 nCSC 2 nTGC 22 nRPC 25
-MuGM:ProcTechnol.s INFO nDED 2 nSUP 4 nSPA 2
-MuGM:ProcTechnol.s INFO nCHV 7 nCRO 7 nCMI 6 nLBI 6
-MuGM:ProcPosition INFO *** N. of stations positioned in the setup 234
-MuGM:ProcPosition INFO *** N. of stations described in mysql 234
-MuGM:ProcPosition INFO *** N. of types 32 size of jtypvec 32
-MuGM:ProcPosition INFO *** : 234 kinds of stations (type*sub_type)
-MuGM:ProcPosition INFO *** : 1758 physical stations in space - according to the MuonDD DataBase
-MuGM:ProcCutouts INFO Processing Cutouts for geometry layout R.08
-MuGM:ProcCutouts INFO Processing Cutouts DONE
-MuGM:RDBReadAtlas INFO ProcessTGCreadout - version 7 wirespacing 1.8
-MuGM:RDBReadAtlas INFO Intermediate Objects built from primary numbers
-MuGM:MuonFactory INFO theMaterialManager retrieven successfully from the DetStore
-MuGM:MuonFactory INFO MuonSystem description from OracleTag=<ATLAS-R2-2016-01-00-01> and node=<ATLAS>
-MuGM:MuonFactory INFO TreeTop added to the Manager
-MuGM:MuonFactory INFO Muon Layout R.08.01
-MuGM:MuonFactory INFO Fine Clash Fixing disabled: (should be ON/OFF for Simulation/Reconstruction)
-MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ****************************
-MuGM:MuonFactory INFO *** The Muon Chamber Geometry Tree is built with
-MuGM:MuonFactory INFO *** 1758 child volumes
-MuGM:MuonFactory INFO *** 1839 independent elements and
-MuGM:MuonFactory INFO *** 11473 elements cloned or shared
-MuGM:MuonFactory INFO *** 234 kinds of stations
-MuGM:MuonFactory INFO *** 1758 stations with alignable transforms
-MuGM:MuonFactory INFO *** 148 stations are described as Assemblies
-MuGM:MuonFactory INFO *** 1758 MuonStations
-MuGM:MuonFactory INFO *** 2324 MDT Readout Elements 1186 MDT Detector Elements
-MuGM:MuonFactory INFO *** 32 CSC Readout Elements 32 CSC Detector Elements
-MuGM:MuonFactory INFO *** 1122 RPC Readout Elements 600 RPC Detector Elements
-MuGM:MuonFactory INFO *** 1578 TGC Readout Elements 1578 TGC Detector Elements
-MuGM:MuonFactory INFO ********************************************************************
-MuGM:MuonFactory INFO *** Inert Material built according to DB switches and config. ******
-MuGM:MuonFactory INFO *** The Muon Geometry Tree has 1758 child vol.s in total ********
-MuGM:MuonFactory INFO ********************************************************************
-
-MGM::MuonDetect... INFO Init A/B Line Containers - done - size is respectively 1758/0
-MGM::MuonDetect... INFO Init of CSC I-Lines will be done via Conditions DB
-MGM::MuonDetect... INFO Init I-Line Container - done - size is respectively 128
-MGM::MuonDetect... INFO I-Line for CSC wire layers loaded (Csc Internal Alignment)
-MGM::MuonDetect... INFO According to configuration they WILL be used
-MGM::MuonDetect... INFO Filling cache
-GeoModelSvc INFO GeoModelSvc.MuonDetectorTool SZ= 228388Kb Time = 1.63S
-ClassIDSvc INFO getRegistryEntries: read 2703 CLIDRegistry entries for module ALL
-AthenaEventLoopMgr INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-ClassIDSvc INFO getRegistryEntries: read 839 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 436 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 305 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 291 CLIDRegistry entries for module ALL
-CondInputLoader INFO Initializing CondInputLoader...
-CondInputLoader INFO Adding base classes:
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/FTHOLD' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/NOISE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/PED' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/PSLOPE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/RMS' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/STAT' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/T0BASE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/T0PHASE' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/RTBLOB' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/T0BLOB' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/CSC/ILINES' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ASBUILTPARAMS' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/BARREL' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEC' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEC' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/CABLING/MAP_SCHEMA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/CABLING/MAP_SCHEMA_CORR' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DCS/DeadRopanels' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DCS/OffRopanels' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DQMF/ELEMENT_STATUS' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/TRIGGER/CM_THR_ETA' ) ->
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/TRIGGER/CM_THR_PHI' ) ->
-CondInputLoader INFO Will create WriteCondHandle dependencies for the following DataObjects:
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/FTHOLD' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/NOISE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/PED' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/PSLOPE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/RMS' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/STAT' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/T0BASE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/CSC/T0PHASE' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/GLOBAL/BField/Maps' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/RTBLOB' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MDT/T0BLOB' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/CSC/ILINES' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ASBUILTPARAMS' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/BARREL' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEC' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEC' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/CABLING/MAP_SCHEMA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/CABLING/MAP_SCHEMA_CORR' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DCS/DeadRopanels' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DCS/OffRopanels' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/DQMF/ELEMENT_STATUS' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/TRIGGER/CM_THR_ETA' )
- + ( 'CondAttrListCollection' , 'ConditionStore+/RPC/TRIGGER/CM_THR_PHI' )
-MuonAlignmentCo... INFO Initilalizing
-MuonAlignmentCo... INFO In initialize ---- # of folders registered is 7
-MuonAlignmentCo... INFO geometry version from the MuonDetectorManager = R.08.01
-MuonDetectorCon... INFO Initializing ...
-AtlasFieldMapCo... INFO Initialize
-AtlasFieldMapCo... INFO Initialize: Key ( 'AtlasFieldMapCondObj' , 'ConditionStore+fieldMapCondObj' ) has been succesfully registered
-AtlasFieldMapCo... INFO Initialize: Will update the field map from conditions
-AtlasFieldCache... INFO Initialize
-AtlasFieldCache... INFO Initialize: Key ( 'AtlasFieldCacheCondObj' , 'ConditionStore+fieldCondObj' ) has been succesfully registered
-AtlasFieldCache... INFO Initialize: Will update current from conditions
-AtlasFieldCache... INFO Initialize: useDCS, useSoleCurrent, useToroCurrent. 1, 'UseSoleCurrent':7730.0000, 'UseToroCurrent':20400.000 LockMapCurrents 0
-ClassIDSvc INFO getRegistryEntries: read 2353 CLIDRegistry entries for module ALL
-ClassIDSvc INFO getRegistryEntries: read 1043 CLIDRegistry entries for module ALL
RpcRawDataProvider INFO RpcRawDataProvider::initialize
RpcRawDataProvider INFO 'DoSeededDecoding':False
-ClassIDSvc INFO getRegistryEntries: read 2064 CLIDRegistry entries for module ALL
-ROBDataProviderSvc INFO Initializing ROBDataProviderSvc - package version ByteStreamCnvSvcBase-00-00-00
-ROBDataProviderSvc INFO ---> Filter out empty ROB fragments = 'filterEmptyROB':False
-ROBDataProviderSvc INFO ---> Filter out specific ROBs by Status Code: # ROBs = 0
-ROBDataProviderSvc INFO ---> Filter out Sub Detector ROBs by Status Code: # Sub Detectors = 0
RpcRawDataProvi... INFO initialize() successful in RpcRawDataProvider.RPC_RawDataProviderToolMT
TgcRawDataProvider INFO TgcRawDataProvider::initialize
TgcRawDataProvider INFO 'DoSeededDecoding':False
-ClassIDSvc INFO getRegistryEntries: read 1223 CLIDRegistry entries for module ALL
TgcRawDataProvi... INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderToolMT.TgcROD_Decoder
-TgcRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::TGC_RodDecoderReadout/TgcROD_Decoder')
-TgcRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
-MuonTGC_CablingSvc INFO for 1/12 sector initialize
-ToolSvc.TGCCabl... INFO initialize
-ToolSvc.TGCCabl... INFO readTGCMap from text
-ToolSvc.TGCCabl... INFO readTGCMap found file /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/2020-05-11T2140/Athena/22.0.13/InstallArea/x86_64-centos7-gcc8-opt/share/ASD2PP_diff_12_ONL.db
-ToolSvc.TGCCabl... INFO giveASD2PP_DIFF_12 (m_ASD2PP_DIFF_12 is not NULL)
TgcRawDataProvi... INFO initialize() successful in TgcRawDataProvider.TGC_RawDataProviderToolMT
MdtRawDataProvider INFO MdtRawDataProvider::initialize
MdtRawDataProvider INFO 'DoSeededDecoding':False
-ClassIDSvc INFO getRegistryEntries: read 1375 CLIDRegistry entries for module ALL
MdtRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
MdtRawDataProvi... INFO Processing configuration for layouts with BME chambers.
MdtRawDataProvi... INFO Processing configuration for layouts with BMG chambers.
MdtRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('MdtROD_Decoder/MdtROD_Decoder')
MdtRawDataProvi... INFO initialize() successful in MdtRawDataProvider.MDT_RawDataProviderToolMT
-ClassIDSvc INFO getRegistryEntries: read 1048 CLIDRegistry entries for module ALL
CscRawDataProvi... INFO Retrieved service ServiceHandle('ROBDataProviderSvc')
CscRawDataProvi... INFO Retrieved tool Decoder = PrivateToolHandle('Muon::CscROD_Decoder/CscROD_Decoder')
CscRawDataProvi... INFO The Muon Geometry version is R.08.01
CscRawDataProvi... INFO initialize() successful in CscRawDataProvider.CSC_RawDataProviderToolMT
-ClassIDSvc INFO getRegistryEntries: read 53 CLIDRegistry entries for module ALL
-RpcRdoToRpcPrep... INFO package version = MuonRPC_CnvTools-00-00-00
RpcRdoToRpcPrep... INFO properties are
RpcRdoToRpcPrep... INFO processingData 0
RpcRdoToRpcPrep... INFO produceRpcCoinDatafromTriggerWords 1
@@ -569,502 +25,11 @@ RpcRdoToRpcPrep... INFO timeShift -12.5
RpcRdoToRpcPrep... INFO etaphi_coincidenceTime 20
RpcRdoToRpcPrep... INFO overlap_timeTolerance 10
RpcRdoToRpcPrep... INFO Correct prd time from cool db 0
-MuonRPC_CablingSvc INFO Initializing MuonRPC_CablingSvc - package version MuonRPC_Cabling-00-00-00
-ToolSvc.RPCCabl... INFO Initializing - folders names are: conf /RPC/CABLING/MAP_SCHEMA / corr /RPC/CABLING/MAP_SCHEMA_CORR
-MuonRPC_CablingSvc INFO RPCCablingDbTool retrieved with handle TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')
-MuonRPC_CablingSvc INFO Register call-back against 2 folders listed below
-MuonRPC_CablingSvc INFO Folder n. 1 </RPC/CABLING/MAP_SCHEMA> found in the DetStore
-ClassIDSvc INFO getRegistryEntries: read 239 CLIDRegistry entries for module ALL
-MuonRPC_CablingSvc INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA>
-MuonRPC_CablingSvc INFO Folder n. 2 </RPC/CABLING/MAP_SCHEMA_CORR> found in the DetStore
-MuonRPC_CablingSvc INFO initMappingModel registered for call-back against folder </RPC/CABLING/MAP_SCHEMA_CORR>
-MuonRPC_CablingSvc INFO RPCTriggerDbTool retrieved with statusCode = SUCCESS pointer = TheRpcTriggerDbTool = PublicToolHandle('RPCTriggerDbTool')
-MuonRPC_CablingSvc INFO Register call-back against 2 folders listed below
-MuonRPC_CablingSvc INFO Folder n. 1 </RPC/TRIGGER/CM_THR_ETA> found in the DetStore
-MuonRPC_CablingSvc INFO initTrigRoadsModel registered for call-back against folder </RPC/TRIGGER/CM_THR_ETA>
-MuonRPC_CablingSvc INFO Folder n. 2 </RPC/TRIGGER/CM_THR_PHI> found in the DetStore
-MuonRPC_CablingSvc INFO initTrigRoadsModel registered for call-back against folder </RPC/TRIGGER/CM_THR_PHI>
RpcRdoToRpcPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::RpcRdoToPrepDataToolMT/RpcRdoToRpcPrepDataTool')
TgcRdoToTgcPrep... INFO initialize() successful in TgcRdoToTgcPrepData.TgcRdoToTgcPrepDataTool
TgcRdoToTgcPrep... INFO Retrieved DecodingTool = PrivateToolHandle('Muon::TgcRdoToPrepDataToolMT/TgcRdoToTgcPrepDataTool')
CscRdoToCscPrep... INFO The Geometry version is MuonSpectrometer-R.08.01
-ClassIDSvc INFO getRegistryEntries: read 114 CLIDRegistry entries for module ALL
CscRdoToCscPrep... INFO Retrieved CscRdoToCscPrepDataTool = PrivateToolHandle('Muon::CscRdoToCscPrepDataToolMT/CscRdoToCscPrepDataTool')
-EventSelector WARNING InputCollections not properly set, checking EventStorageInputSvc properties
-EventSelector INFO reinitialization...
-ClassIDSvc INFO getRegistryEntries: read 440 CLIDRegistry entries for module ALL
-EventSelector INFO Retrieved InputCollections from InputSvc
-ByteStreamInputSvc INFO Initializing ByteStreamInputSvc - package version ByteStreamCnvSvc-00-00-00
-EventSelector INFO reinitialization...
-AthenaEventLoopMgr INFO Setup EventSelector service EventSelector
-ApplicationMgr INFO Application Manager Initialized successfully
-ApplicationMgr SUCCESS ****************************** Algorithm Sequence ****************************
-ApplicationMgr SUCCESS AthSequencer/AthMasterSeq
-ApplicationMgr SUCCESS AthSequencer/AthAlgEvtSeq
-ApplicationMgr SUCCESS AthSequencer/AthBeginSeq
-ApplicationMgr SUCCESS AthIncFirerAlg/BeginIncFiringAlg
-ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg1
-ApplicationMgr SUCCESS AthSequencer/AthAllAlgSeq
-ApplicationMgr SUCCESS AthSequencer/AthCondSeq
-ApplicationMgr SUCCESS CondInputLoader/CondInputLoader
-ApplicationMgr SUCCESS MuonAlignmentCondAlg/MuonAlignmentCondAlg
-ApplicationMgr SUCCESS MuonDetectorCondAlg/MuonDetectorCondAlg
-ApplicationMgr SUCCESS RpcCablingCondAlg/RpcCablingCondAlg
-ApplicationMgr SUCCESS MuonMDT_CablingAlg/MuonMDT_CablingAlg
-ApplicationMgr SUCCESS MagField::AtlasFieldMapCondAlg/AtlasFieldMapCondAlg
-ApplicationMgr SUCCESS MagField::AtlasFieldCacheCondAlg/AtlasFieldCacheCondAlg
-ApplicationMgr SUCCESS RpcCondDbAlg/RpcCondDbAlg
-ApplicationMgr SUCCESS MdtCalibDbAlg/MdtCalibDbAlg
-ApplicationMgr SUCCESS CscCondDbAlg/CscCondDbAlg
-ApplicationMgr SUCCESS AthSequencer/AthAlgSeq
-ApplicationMgr SUCCESS MuonCacheCreator/MuonCacheCreator
-ApplicationMgr SUCCESS Muon::RpcRawDataProvider/RpcRawDataProvider
-ApplicationMgr SUCCESS Muon::TgcRawDataProvider/TgcRawDataProvider
-ApplicationMgr SUCCESS Muon::MdtRawDataProvider/MdtRawDataProvider
-ApplicationMgr SUCCESS Muon::CscRawDataProvider/CscRawDataProvider
-ApplicationMgr SUCCESS RpcRdoToRpcPrepData/RpcRdoToRpcPrepData
-ApplicationMgr SUCCESS TgcRdoToTgcPrepData/TgcRdoToTgcPrepData
-ApplicationMgr SUCCESS CscRdoToCscPrepData/CscRdoToCscPrepData
-ApplicationMgr SUCCESS CscThresholdClusterBuilder/CscThresholdClusterBuilder
-ApplicationMgr SUCCESS AthSequencer/AthEndSeq
-ApplicationMgr SUCCESS AthIncFirerAlg/EndIncFiringAlg
-ApplicationMgr SUCCESS IncidentProcAlg/IncidentProcAlg2
-ApplicationMgr SUCCESS AthSequencer/AthOutSeq
-ApplicationMgr SUCCESS AthSequencer/AthRegSeq
-ApplicationMgr SUCCESS ******************************************************************************
-ByteStreamInputSvc INFO Picked valid file: /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/FTHOLD'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/NOISE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/PED'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/PSLOPE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/RMS'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/STAT'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/T0BASE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/CSC/T0PHASE'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/EXT/DCS/MAGNETS/SENSORDATA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/GLOBAL/BField/Maps'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MAP_SCHEMA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/RTBLOB'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MDT/T0BLOB'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/CSC/ILINES'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/MDT/ASBUILTPARAMS'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/MDT/BARREL'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEC'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/TGC/SIDEA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/MUONALIGN/TGC/SIDEC'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/CABLING/MAP_SCHEMA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/CABLING/MAP_SCHEMA_CORR'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/DCS/DeadRopanels'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/DCS/OffRopanels'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/DQMF/ELEMENT_STATUS'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/TRIGGER/CM_THR_ETA'
-CondInputLoader INFO created CondCont<CondAttrListCollection> with key 'ConditionStore+/RPC/TRIGGER/CM_THR_PHI'
-ApplicationMgr INFO Application Manager Started successfully
-EventInfoByteSt... INFO IsSimulation : 0
-EventInfoByteSt... INFO IsTestbeam : 0
-EventInfoByteSt... INFO IsCalibration : 0
-AthenaEventLoopMgr INFO ===>>> start of run 327265 <<<===
-IOVDbSvc INFO Opening COOL connection for COOLONL_RPC/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCCablingMapSchema_2016_2017_01 for folder /RPC/CABLING/MAP_SCHEMA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCCablingMapSchemaCorr_2016_2017_01 for folder /RPC/CABLING/MAP_SCHEMA_CORR
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCTriggerCMThrEta_RUN1-RUN2-HI-02 for folder /RPC/TRIGGER/CM_THR_ETA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCTriggerCMThrPhi_RUN1-RUN2-HI-02 for folder /RPC/TRIGGER/CM_THR_PHI
-IOVDbSvc INFO Disconnecting from COOLONL_RPC/CONDBR2
-EventPersistenc... INFO Added successfully Conversion service:AthenaPoolCnvSvc
-MuonRPC_CablingSvc INFO initMappingModel has been called
-MuonRPC_CablingSvc INFO ToolHandle in initMappingModel - <TheRpcCablingDbTool = PublicToolHandle('RPCCablingDbTool/RPCCablingDbTool')>
-MuonRPC_CablingSvc INFO Retrieving cabling singleton; to create an empty one or to get the existing one
-RPCcabling INFO CablingRPC---singleton constructor ---- this must be executed just once
-RPCcabling INFO CablingRPC---The singleton will fill the maps from the COOL streams
-RPCcabling INFO CablingRPC---InitMaps from COOL cannot be executed NOW: empty string
-RPCcabling INFO CablingRPC---The singleton is created here
-RPCcabling INFO CablingRPC--- cacheCleared: s_status = 0
-MuonRPC_CablingSvc INFO Cabling singleton cache has been cleared
-MuonRPC_CablingSvc INFO Trigger roads will be loaded from COOL
-ToolSvc.RPCCabl... INFO LoadParameters /RPC/CABLING/MAP_SCHEMA I=2
-ToolSvc.RPCCabl... INFO loadRPCMap --- Load Map from DB
-ToolSvc.RPCCabl... INFO Try to read from folder </RPC/CABLING/MAP_SCHEMA>
-ToolSvc.RPCCabl... INFO CondAttrListCollection from DB folder have been obtained with size 1
-ToolSvc.RPCCabl... INFO Loop over CondAttrListCollection ic = 1
-ToolSvc.RPCCabl... INFO After Reading folder, Configuration string size is 222202
-ToolSvc.RPCCabl... INFO LoadParameters /RPC/CABLING/MAP_SCHEMA_CORR I=2
-ToolSvc.RPCCabl... INFO loadRPCCorr --- Load Corrections from DB
-ToolSvc.RPCCabl... INFO Try to read from folder </RPC/CABLING/MAP_SCHEMA_CORR>
-ToolSvc.RPCCabl... INFO CondAttrListCollection from DB folder have been obtained with size 1
-ToolSvc.RPCCabl... INFO After Reading folder, Correction string size is 29369
-MuonRPC_CablingSvc INFO InitMappingModel: Trigger roads not yet loaded from COOL - postpone cabling initialization
-MuonRPC_CablingSvc INFO initTrigRoadsModel has been called
-MuonRPC_CablingSvc INFO Trigger roads will be loaded from COOL
-MuonRPC_CablingSvc INFO Retrieve the pointer to the cabling singleton
-RPCcabling INFO CablingRPC--- cacheCleared: s_status = 0
-MuonRPC_CablingSvc INFO Cabling singleton cache has been cleared
-ToolSvc.RPCTrig... INFO LoadParameters /RPC/TRIGGER/CM_THR_ETA I=2
-ToolSvc.RPCTrig... INFO LoadParameters /RPC/TRIGGER/CM_THR_PHI I=2
-MuonRPC_CablingSvc INFO ======== RPC Trigger Roads from COOL - Header infos ========
-MuonRPC_CablingSvc INFO
-RPC LVL1 Configuration 10.6 with roads from Feb 2012
-L1 THRESHOLDS: MU4 MU6 MU10 MU11 MU15 MU20
-Road version: "road_files_120209"
-CMA th0 th1 th2
-eta low-pt mu4 mu6 mu10
-phi low-pt mu4 mu6 mu10
-eta high-pt mu11 mu15 mu20
-phi high-pt mu11 mu15 mu15
-
-
-RPCcabling INFO CablingRPC---InitMaps from COOL: going to read configuration
-RPCcabling INFO CablingRPC--->> RPC cabling map from COOL <<
-RPCcabling INFO CablingRPC--- ReadConf: map has size 222202
-RPCcabling INFO CablingRPC--- ReadConf: map n. of lines read is 924
-RPCcabling INFO CablingRPC--- ReadConf: version is 5.0 Atlas R_07_03_RUN2ver104
-RPCcabling INFO CablingRPC--- buildRDOmap
-RPCcabling INFO CablingRPC---InitMaps from COOL: going to read corrections to configuration
-RPCcabling INFO CablingRPC--->> RPC cabling corrections from COOL <<
-RPCcabling INFO CablingRPC--- ReadCorr: CorrMap has size 29369
-RPCcabling INFO CablingRPC--- ReadConf: CorrMap n. of lines read is 743
-RPCcabling INFO CablingRPC---InitMaps from COOL - maps have been parsed
-MuonRPC_CablingSvc INFO InitTrigRoadsModel: RPC cabling model is loaded!
-Level-1 configuration database version 5.0 Atlas R_07_03_RUN2ver104 read.
-Contains 26 Trigger Sector Types:
-negative sectors 0 - 15 ==> 18 2 24 3 19 2 24 4 20 2 24 1 18 5 25 6
-negative sectors 16 - 31 ==> 21 13 26 6 21 7 16 8 14 7 16 6 21 13 26 1
-positive sectors 32 - 47 ==> 9 24 2 22 9 24 2 23 10 24 2 18 1 25 5 18
-positive sectors 48 - 63 ==> 1 26 13 21 6 17 12 15 11 17 12 21 6 26 13 22
-
-MuonRPC_CablingSvc INFO buildOfflineOnlineMap
-MuonRPC_CablingSvc INFO Applying FeetPadThresholds : 0,2,5
-MuonRPC_CablingSvc INFO MuonRPC_CablingSvc initialized succesfully
-ByteStreamCnvSvc INFO problem adding converter for CLID [2101]
-ByteStreamCnvSvc WARNING Cannot get converter for EventInfo
-AthenaEventLoopMgr INFO ===>>> start processing event #186525031, run #327265 0 events processed so far <<<===
-IOVDbSvc INFO Opening COOL connection for COOLOFL_CSC/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscFthold-RUN2-BLK-UPD1-007-00 for folder /CSC/FTHOLD
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscNoise-RUN2-BLK-UPD1-007-00 for folder /CSC/NOISE
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscPed-RUN2-BLK-UPD1-007-00 for folder /CSC/PED
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscPslope-RUN2-BLK-UPD1-000-00 for folder /CSC/PSLOPE
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscRms-RUN2-BLK-UPD1-003-00 for folder /CSC/RMS
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscStat-RUN2-BLK-UPD1-008-00 for folder /CSC/STAT
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscT0base-RUN2-BLK-UPD1-001-00 for folder /CSC/T0BASE
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to CscT0phase-RUN2-BLK-UPD2-001-00 for folder /CSC/T0PHASE
-IOVDbSvc INFO Disconnecting from COOLOFL_CSC/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_DCS/CONDBR2
-IOVDbSvc INFO Disconnecting from COOLOFL_DCS/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_GLOBAL/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to BFieldMap-Run1-14m-v01 for folder /GLOBAL/BField/Maps
-IOVDbSvc INFO Disconnecting from COOLONL_GLOBAL/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLONL_MDT/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMapSchema_BMG_01 for folder /MDT/CABLING/MAP_SCHEMA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTCablingMezzanineSchema_M5-RUN2 for folder /MDT/CABLING/MEZZANINE_SCHEMA
-IOVDbSvc INFO Disconnecting from COOLONL_MDT/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_MDT/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTRT-RUN2-UPD4-21 for folder /MDT/RTBLOB
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MDTT0-RUN2-UPD4-21 for folder /MDT/T0BLOB
-IOVDbSvc INFO Disconnecting from COOLOFL_MDT/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_MUONALIGN/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignCscIlines-UPD1-02 for folder /MUONALIGN/CSC/ILINES
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignMdtAsbuiltparams-RUN2-BA_ONLY-UPD4-00 for folder /MUONALIGN/MDT/ASBUILTPARAMS
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignMDTBarrelAlign-RUN2-BA_ROLLING_11-BLKP-UPD4-00 for folder /MUONALIGN/MDT/BARREL
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignMDTEndCapAAlign-RUN2-ECA_ROLLING_2015_03_01-UPD4-02 for folder /MUONALIGN/MDT/ENDCAP/SIDEA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignMDTEndCapCAlign-RUN2-ECC_ROLLING_2015_03_01-UPD4-02 for folder /MUONALIGN/MDT/ENDCAP/SIDEC
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignTGCEndCapAAlign-RUN2-TGCA_ROLLING_2011_01-ES1-UPD1-03 for folder /MUONALIGN/TGC/SIDEA
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to MuonAlignTGCEndCapCAlign-RUN2-TGCC_ROLLING_2011_01-ES1-UPD1-03 for folder /MUONALIGN/TGC/SIDEC
-IOVDbSvc INFO Disconnecting from COOLOFL_MUONALIGN/CONDBR2
-IOVDbSvc INFO Opening COOL connection for COOLOFL_RPC/CONDBR2
-IOVDbFolder INFO HVS tag CONDBR2-BLKPA-2018-13 resolved to RPCDQMFElementStatus_Run1_UPD4-RUN2-01 for folder /RPC/DQMF/ELEMENT_STATUS
-IOVDbSvc INFO Disconnecting from COOLOFL_RPC/CONDBR2
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/CSC/ILINES>
-MuonAlignmentCo... INFO Size of CSC/ILINES CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/CSC/ILINES' ) readCscILinesCdo->size()= 1
-MuonAlignmentCo... INFO Range of CSC/ILINES input is {[0,0,t:1425168000] - [t:4294967294.854775807]}
-MGM::MuonDetect... INFO temporary CSC I-line container with size = 128
-MGM::MuonDetect... INFO # of CSC I-lines read from the ILineMapContainer in StoreGate is 128
-MGM::MuonDetect... INFO # of deltaTransforms updated according to A-lines is 128
-MGM::MuonDetect... INFO # of entries in the CSC I-lines historical container is 128
-MuonAlignmentCo... INFO recorded new CscInternalAlignmentMapContainer with range {[0,0,t:1425168000] - [t:4294967294.854775807]} into Conditions Store
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/MDT/ASBUILTPARAMS>
-MuonAlignmentCo... INFO Size of MDT/ASBUILTPARAMS CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ASBUILTPARAMS' ) ->size()= 1
-MuonAlignmentCo... INFO Range of MDT/ASBUILTPARAMS input is {[0,0,t:0] - [t:4294967294.854775807]}
-MGM::MuonDetect... INFO temporary As-Built container with size = 628
-MGM::MuonDetect... INFO # of MDT As-Built read from the MdtAsBuiltMapContainer in StoreGate is 628
-MGM::MuonDetect... INFO # of deltaTransforms updated according to As-Built is 628
-MGM::MuonDetect... INFO # of entries in the MdtAsBuilt historical container is 628
-MuonAlignmentCo... INFO recorded new MdtAsBuiltMapContainer with range {[0,0,t:0] - [t:4294967294.854775807]} into Conditions Store
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/MDT/BARREL>
-MuonAlignmentCo... INFO Size of /MUONALIGN/MDT/BARREL CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/BARREL' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/MDT/BARREL input is, ALines: {[0,0,t:1497851700] - [t:1498737300]} BLines: {[0,0,t:1497851700] - [t:1498737300]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/MDT/BARREL have IoV = 195569
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/MDT/BARREL> loaded
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/MDT/ENDCAP/SIDEA>
-MuonAlignmentCo... INFO Size of /MUONALIGN/MDT/ENDCAP/SIDEA CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEA' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/MDT/ENDCAP/SIDEA input is, ALines: {[0,0,t:1497891240] - [t:1497898380]} BLines: {[0,0,t:1497891240] - [t:1497898380]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/MDT/ENDCAP/SIDEA have IoV = 195588
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/MDT/ENDCAP/SIDEA> loaded
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/MDT/ENDCAP/SIDEC>
-MuonAlignmentCo... INFO Size of /MUONALIGN/MDT/ENDCAP/SIDEC CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/MDT/ENDCAP/SIDEC' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/MDT/ENDCAP/SIDEC input is, ALines: {[0,0,t:1497892260] - [t:1497899460]} BLines: {[0,0,t:1497892260] - [t:1497899460]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/MDT/ENDCAP/SIDEC have IoV = 195599
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/MDT/ENDCAP/SIDEC> loaded
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/TGC/SIDEA>
-MuonAlignmentCo... INFO No BLines decoding will be attempted for folder named /MUONALIGN/TGC/SIDEA
-MuonAlignmentCo... INFO Size of /MUONALIGN/TGC/SIDEA CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEA' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/TGC/SIDEA input is, ALines: {[0,0,t:0] - [t:4294967294.854775807]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/TGC/SIDEA have IoV = 82360
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/TGC/SIDEA> loaded
-MuonAlignmentCo... INFO Load alignment parameters from DB folder </MUONALIGN/TGC/SIDEC>
-MuonAlignmentCo... INFO No BLines decoding will be attempted for folder named /MUONALIGN/TGC/SIDEC
-MuonAlignmentCo... INFO Size of /MUONALIGN/TGC/SIDEC CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MUONALIGN/TGC/SIDEC' ) readCdo->size()= 1
-MuonAlignmentCo... INFO Range of /MUONALIGN/TGC/SIDEC input is, ALines: {[0,0,t:0] - [t:4294967294.854775807]}
-MuonAlignmentCo... INFO Data read from folder /MUONALIGN/TGC/SIDEC have IoV = 82359
-MuonAlignmentCo... INFO A- and B-Lines parameters from DB folder </MUONALIGN/TGC/SIDEC> loaded
-MGM::MuonDetect... INFO temporary A-line container with size = 2694
-MGM::MuonDetect... INFO # of A-lines read from the ALineMapContainer in StoreGate is 2694
-MGM::MuonDetect... INFO # of deltaTransforms updated according to A-lines is 2694
-MGM::MuonDetect... INFO # of entries in the A-lines historical container is 2814
-MuonAlignmentCo... INFO recorded new ALineMapContainer with range {[0,0,t:1497892260,l:0] - [t:1497898380]} into Conditions Store
-MGM::MuonDetect... INFO In updateDeformations()
-MGM::MuonDetect... INFO temporary B-line container with size = 1206
-MGM::MuonDetect... INFO # of B-lines read from the ALineMapContainer in StoreGate is 1206
-MGM::MuonDetect... INFO # of deform-Transforms updated according to B-lines is 1174
-MGM::MuonDetect... INFO # of entries in the B-lines historical container is 1174
-MuonAlignmentCo... INFO recorded new BLineMapContainer with range {[0,0,t:1497892260,l:0] - [t:1497898380]} into Conditions Store
-MuonGeoModel INFO MuonDetectorFactory - constructor MuonSystem OuterRadius 13000 Length 22030
-MuonDetectorCon... INFO create MuonDetectorTool - package version = MuonGeoModel-00-00-00
-MuonDetectorCon... INFO (from GeoModelSvc) AtlasVersion = <ATLAS-R2-2016-01-00-01> MuonVersion = <>
-MuonDetectorCon... INFO Keys for Muon Switches are (key) ATLAS-R2-2016-01-00-01 (node) ATLAS
-MuonDetectorCon... INFO (from GeoModelSvc) in AtlasVersion = <ATLAS-R2-2016-01-00-01> default MuonVersion is <MuonSpectrometer-R.08.01>
-MuonDetectorCon... INFO Properties have been set as follows:
-MuonDetectorCon... INFO LayoutName R
-MuonDetectorCon... INFO IncludeCutouts 0
-MuonDetectorCon... INFO IncludeCutoutsBog 0
-MuonDetectorCon... INFO IncludeCtbBis 0
-MuonDetectorCon... INFO ControlAlines 111111
-MuonDetectorCon... INFO MinimalGeoFlag 0
-MuonDetectorCon... INFO EnableCscIntAlignment 1
-MuonDetectorCon... INFO EnableCscIntAlignmentFromGM 0
-MuonDetectorCon... INFO ControlCscIntAlines 111111
-MuonDetectorCon... INFO EnableMdtDeformations 1
-MuonDetectorCon... INFO EnableMdtAsBuiltParameters 1
-MuGM:MuonFactory INFO MuonLayout set to <R.08.01> = Development version for DC3 - infrastructures
-MuGM:MuonFactory INFO BOG cutouts are activated 1 , all other cutouts are disabled 1
-MuGM:MuonFactory INFO Manager created for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
-MuonGeoModel.MYSQL INFO GeometryVersion set to <R.08.01>
-MuGM:MuonFactory INFO Mysql helper class created here for geometry version R.08.01 from DB MuonVersion <MuonSpectrometer-R.08.01>
-MuGM:MuonFactory INFO MDTIDHELPER retrieved from DetStore
-MuGM:MuonFactory INFO RPCIDHELPER retrieved from DetStore
-MuGM:MuonFactory INFO TGCIDHELPER retrieved from DetStore
-MuGM:MuonFactory INFO CSCIDHELPER retrieved from DetStore
-MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ************************
-MuGM:MuonFactory INFO *** Start building the Muon Geometry Tree **********************
-MuGM:RDBReadAtlas INFO Start retriving dbObjects with tag = <ATLAS-R2-2016-01-00-01> node <ATLAS>
-RDBAccessSvc WARNING Could not get the tag for XtomoData node. Returning 0 pointer to IRDBQuery
-MuGM:RDBReadAtlas INFO After getQuery XtomoData
-In DblQ00Xtomo(data)
-No XtomoData table in the MuonDD Database
-MuGM:RDBReadAtlas INFO After new DblQ00Xtomo
-MuGM:RDBReadAtlas INFO After m_dhxtomo.data()
-MuGM:RDBReadAtlas INFO No Ascii aszt input found: looking for A-lines in ORACLE
-MuGM:RDBReadAtlas INFO ASZT table found in Oracle
-MuGM:RDBReadAtlas INFO ASZT size is 32
-MuGM:RDBReadAtlas INFO No Ascii iacsc input found: looking for A-lines in ORACLE
-RDBAccessSvc WARNING Could not get the tag for ISZT node. Returning 0 pointer to IRDBQuery
-MuGM:RDBReadAtlas INFO No ISZT table in Oracle
-MuGM:RDBReadAtlas INFO Access granted for all dbObjects needed by muon detectors
-MuonGeoModel.MYSQL INFO LayoutName (from DBAM) set to <R.08> -- relevant for CTB2004
-MuGM:ProcStations INFO Processing Stations and Components
-MuGM:ProcStations INFO Processing Stations and Components DONE
-MuGM:ProcTechnol.s INFO nMDT 26 nCSC 4 nTGC 44 nRPC 50
-MuGM:ProcTechnol.s INFO nDED 4 nSUP 8 nSPA 4
-MuGM:ProcTechnol.s INFO nCHV 14 nCRO 14 nCMI 12 nLBI 12
-MuGM:ProcPosition INFO *** N. of stations positioned in the setup 234
-MuGM:ProcPosition INFO *** N. of stations described in mysql 234
-MuGM:ProcPosition INFO *** N. of types 32 size of jtypvec 32
-MuGM:ProcPosition INFO *** : 234 kinds of stations (type*sub_type)
-MuGM:ProcPosition INFO *** : 1758 physical stations in space - according to the MuonDD DataBase
-MuGM:ProcCutouts INFO Processing Cutouts for geometry layout R.08
-MuGM:ProcCutouts INFO Processing Cutouts DONE
-MuGM:RDBReadAtlas INFO ProcessTGCreadout - version 7 wirespacing 1.8
-MuGM:RDBReadAtlas INFO Intermediate Objects built from primary numbers
-MuGM:MuonFactory INFO theMaterialManager retrieven successfully from the DetStore
-MuGM:MuonFactory INFO MuonSystem description from OracleTag=<ATLAS-R2-2016-01-00-01> and node=<ATLAS>
-MuGM:MuonFactory INFO TreeTop added to the Manager
-MuGM:MuonFactory INFO Muon Layout R.08.01
-MuGM:MuonFactory INFO Fine Clash Fixing disabled: (should be ON/OFF for Simulation/Reconstruction)
-MuGM:MuonFactory INFO **************** MuonDetectorFactory001 ****************************
-MuGM:MuonFactory INFO *** The Muon Chamber Geometry Tree is built with
-MuGM:MuonFactory INFO *** 1758 child volumes
-MuGM:MuonFactory INFO *** 1839 independent elements and
-MuGM:MuonFactory INFO *** 11473 elements cloned or shared
-MuGM:MuonFactory INFO *** 234 kinds of stations
-MuGM:MuonFactory INFO *** 1758 stations with alignable transforms
-MuGM:MuonFactory INFO *** 148 stations are described as Assemblies
-MuGM:MuonFactory INFO *** 1758 MuonStations
-MuGM:MuonFactory INFO *** 2324 MDT Readout Elements 1186 MDT Detector Elements
-MuGM:MuonFactory INFO *** 32 CSC Readout Elements 32 CSC Detector Elements
-MuGM:MuonFactory INFO *** 1122 RPC Readout Elements 600 RPC Detector Elements
-MuGM:MuonFactory INFO *** 1578 TGC Readout Elements 1578 TGC Detector Elements
-MuGM:MuonFactory INFO ********************************************************************
-MuGM:MuonFactory INFO *** Inert Material built according to DB switches and config. ******
-MuGM:MuonFactory INFO *** The Muon Geometry Tree has 1758 child vol.s in total ********
-MuGM:MuonFactory INFO ********************************************************************
-
-MGM::MuonDetect... INFO Init A/B Line Containers - done - size is respectively 1758/0
-MGM::MuonDetect... INFO Init of CSC I-Lines will be done via Conditions DB
-MGM::MuonDetect... INFO Init I-Line Container - done - size is respectively 128
-MGM::MuonDetect... INFO I-Line for CSC wire layers loaded (Csc Internal Alignment)
-MGM::MuonDetect... INFO According to configuration they WILL be used
-MGM::MuonDetect... INFO Filling cache
-MGM::MuonDetect... INFO temporary CSC I-line container with size = 128
-MGM::MuonDetect... INFO # of CSC I-lines read from the ILineMapContainer in StoreGate is 128
-MGM::MuonDetect... INFO # of deltaTransforms updated according to A-lines is 128
-MGM::MuonDetect... INFO # of entries in the CSC I-lines historical container is 128
-MGM::MuonDetect... INFO temporary As-Built container with size = 628
-MGM::MuonDetect... INFO # of MDT As-Built read from the MdtAsBuiltMapContainer in StoreGate is 628
-MGM::MuonDetect... INFO # of deltaTransforms updated according to As-Built is 628
-MGM::MuonDetect... INFO # of entries in the MdtAsBuilt historical container is 628
-MGM::MuonDetect... INFO temporary A-line container with size = 2694
-MGM::MuonDetect... INFO # of A-lines read from the ALineMapContainer in StoreGate is 2694
-MGM::MuonDetect... INFO # of deltaTransforms updated according to A-lines is 2694
-MGM::MuonDetect... INFO # of entries in the A-lines historical container is 2814
-MGM::MuonDetect... INFO In updateDeformations()
-MGM::MuonDetect... INFO temporary B-line container with size = 1206
-MGM::MuonDetect... INFO # of B-lines read from the ALineMapContainer in StoreGate is 1206
-MGM::MuonDetect... INFO # of deform-Transforms updated according to B-lines is 1174
-MGM::MuonDetect... INFO # of entries in the B-lines historical container is 1174
-MuonDetectorCon... INFO recorded new MuonDetectorManager with range {[0,0,t:1497892260,l:0] - [t:1497898380]} into Conditions Store
-RpcCablingCondAlg INFO maps configuration have been parsed
-RpcCablingCondAlg INFO recorded new RpcCablingCondData with range {[315000,l:0] - [999999,l:0]}
-MuonMDT_CablingAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MEZZANINE_SCHEMA' ) readCdoMez->size()= 24
-MuonMDT_CablingAlg INFO Range of input is {[0,l:0] - [INVALID]}
-MuonMDT_CablingAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/CABLING/MAP_SCHEMA' ) readCdoMap->size()= 2312
-MuonMDT_CablingAlg INFO Range of input is {[327264,l:4294640031] - [327265,l:4294640030]}
-MuonMDT_CablingAlg INFO recorded new MuonMDT_CablingMap with range {[327264,t:0,l:4294640031] - [327265,l:4294640030]} into Conditions Store
-AtlasFieldMapCo... INFO updateFieldMap: Update map from conditions
-AtlasFieldMapCo... INFO updateFieldMap: Update map from conditions: Range of input/output is {[0,l:0] - [INVALID]}
-AtlasFieldMapCo... INFO updateFieldMap: reading magnetic field map filenames from COOL
-AtlasFieldMapCo... INFO updateFieldMap: found map of type GlobalMap with soleCur=7730 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_7730_20400_14m.root)
-AtlasFieldMapCo... INFO updateFieldMap: found map of type SolenoidMap with soleCur=7730 toroCur=0 (path file:MagneticFieldMaps/bfieldmap_7730_0_14m.root)
-AtlasFieldMapCo... INFO updateFieldMap: found map of type ToroidMap with soleCur=0 toroCur=20400 (path file:MagneticFieldMaps/bfieldmap_0_20400_14m.root)
-AtlasFieldMapCo... INFO updateFieldMap: tagInfoH ( 'TagInfo' , 'DetectorStore+ProcessingTags' ) is valid.
-AtlasFieldMapCo... INFO updateFieldMap: DID NOT reset currents from TagInfo
-AtlasFieldMapCo... INFO updateFieldMap: Set map currents from FieldSvc: solenoid/toroid 7730,20400
-AtlasFieldMapCo... INFO updateFieldMap: Use map file MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldMapCo... INFO updateFieldMap: Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldMapCo... INFO execute: solenoid zone id 7000
-AtlasFieldMapCo... INFO execute: recored AtlasFieldMapCondObj with field map
-AtlasFieldCache... INFO UpdateCurrentFromConditions
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Range of input/output is {[0,0,t:1497895317.371000000] - [t:1497898549.609000000]}
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Attempt 1 at reading currents from DCS (using channel name)
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] CentralSol_Current , 1 , 7729.99
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] CentralSol_SCurrent , 2 , 7730
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_Current , 3 , 20399.9
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Trying to read from DCS: [channel name, index, value] Toroids_SCurrent , 4 , 20397.7
-AtlasFieldCache... INFO UpdateCurrentFromConditions: Currents read from DCS - solenoid 7729.99 toroid 20399.9
-AtlasFieldCache... INFO scaleField: Solenoid field scale factor 1. Solenoid and map currents: 7729.99,7730
-AtlasFieldCache... INFO scaleField: Toroid field scale factor 1. Toroid and map currents: 20399.9,20400
-AtlasFieldCache... INFO execute: initialized AtlasFieldCacheCondObj and cache with SFs - sol/tor 1/1
-AtlasFieldCache... INFO execute: solenoid zone id 7000
-MdtCalibDbAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/RTBLOB' ) readCdoRt->size()= 1186
-MdtCalibDbAlg INFO Range of input is {[327265,l:0] - [327342,l:0]}
-MdtCalibDbAlg INFO MdtCalibDbAlg::loadRt Read 1188RTs from COOL
-MdtCalibDbAlg INFO recorded new MdtRtRelationCollection with range {[327265,l:0] - [327342,l:0]} into Conditions Store
-MdtCalibDbAlg INFO recorded new MdtCorFuncSetCollection with range {[327265,l:0] - [327342,l:0]} into Conditions Store
-MdtCalibDbAlg INFO Ignoring nonexistant station in calibration DB: MuonSpectrometer BML -6 stationPhi 7 MDT multiLayer 1 tubeLayer 1 tube 1
-MdtCalibDbAlg INFO Ignoring nonexistant station in calibration DB: MuonSpectrometer BML stationEta 6 stationPhi 7 MDT multiLayer 1 tubeLayer 1 tube 1
-MdtCalibDbAlg INFO Size of CondAttrListCollection ( 'CondAttrListCollection' , 'ConditionStore+/MDT/T0BLOB' ) readCdoTube->size()= 1186
-MdtCalibDbAlg INFO Range of input is {[319000,l:0] - [INVALID]}
-MdtCalibDbAlg INFO recorded new MdtTubeCalibContainerCollection with range {[319000,l:0] - [INVALID]} into Conditions Store
-CscCondDbData INFO Maximum Layer hash is 255
-AthenaEventLoopMgr INFO ===>>> done processing event #186525031, run #327265 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186524665, run #327265 1 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186524665, run #327265 2 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186542447, run #327265 2 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186542447, run #327265 3 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186543405, run #327265 3 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186543405, run #327265 4 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186548387, run #327265 4 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186548387, run #327265 5 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186515186, run #327265 5 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186515186, run #327265 6 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186556019, run #327265 6 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186556019, run #327265 7 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186542866, run #327265 7 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186542866, run #327265 8 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186537901, run #327265 8 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186537901, run #327265 9 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186517811, run #327265 9 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186517811, run #327265 10 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186534221, run #327265 10 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186534221, run #327265 11 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186540986, run #327265 11 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186540986, run #327265 12 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186535104, run #327265 12 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186535104, run #327265 13 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186539903, run #327265 13 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186539903, run #327265 14 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186552713, run #327265 14 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186552713, run #327265 15 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186524730, run #327265 15 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186524730, run #327265 16 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186547632, run #327265 16 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186547632, run #327265 17 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186555621, run #327265 17 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186555621, run #327265 18 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186568452, run #327265 18 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186568452, run #327265 19 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> start processing event #186580451, run #327265 19 events processed so far <<<===
-AthenaEventLoopMgr INFO ===>>> done processing event #186580451, run #327265 20 events processed so far <<<===
-Domain[ROOT_All] INFO > Deaccess DbDomain READ [ROOT_All]
-ApplicationMgr INFO Application Manager Stopped successfully
-IncidentProcAlg1 INFO Finalize
-CondInputLoader INFO Finalizing CondInputLoader...
-AtlasFieldMapCo... INFO in finalize
-AtlasFieldCache... INFO in finalize
-IncidentProcAlg2 INFO Finalize
-IOVDbFolder INFO Folder /CSC/FTHOLD (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/322656 (( 0.03 ))s
-IOVDbFolder INFO Folder /CSC/NOISE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/350062 (( 0.04 ))s
-IOVDbFolder INFO Folder /CSC/PED (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/411187 (( 0.19 ))s
-IOVDbFolder INFO Folder /CSC/PSLOPE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/353376 (( 0.04 ))s
-IOVDbFolder INFO Folder /CSC/RMS (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/411395 (( 0.11 ))s
-IOVDbFolder INFO Folder /CSC/STAT (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/230496 (( 0.09 ))s
-IOVDbFolder INFO Folder /CSC/T0BASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/314380 (( 0.02 ))s
-IOVDbFolder INFO Folder /CSC/T0PHASE (AttrListColl) db-read 1/1 objs/chan/bytes 32/32/3136 (( 0.01 ))s
-IOVDbFolder INFO Folder /EXT/DCS/MAGNETS/SENSORDATA (AttrListColl) db-read 1/1 objs/chan/bytes 4/4/20 (( 0.08 ))s
-IOVDbFolder INFO Folder /GLOBAL/BField/Maps (AttrListColl) db-read 1/1 objs/chan/bytes 3/3/202 (( 0.10 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 2312/2437/216520 (( 0.14 ))s
-IOVDbFolder INFO Folder /MDT/CABLING/MEZZANINE_SCHEMA (AttrListColl) db-read 1/1 objs/chan/bytes 24/24/288 (( 0.01 ))s
-IOVDbFolder INFO Folder /MDT/RTBLOB (AttrListColl) db-read 1/1 objs/chan/bytes 2372/1186/2251209 (( 0.13 ))s
-IOVDbFolder INFO Folder /MDT/T0BLOB (AttrListColl) db-read 1/1 objs/chan/bytes 1186/1186/1374284 (( 0.07 ))s
-IOVDbFolder INFO Folder /MUONALIGN/CSC/ILINES (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/10814 (( 0.03 ))s
-IOVDbFolder INFO Folder /MUONALIGN/MDT/ASBUILTPARAMS (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/128992 (( 0.01 ))s
-IOVDbFolder INFO Folder /MUONALIGN/MDT/BARREL (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/140293 (( 0.02 ))s
-IOVDbFolder INFO Folder /MUONALIGN/MDT/ENDCAP/SIDEA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/65494 (( 0.02 ))s
-IOVDbFolder INFO Folder /MUONALIGN/MDT/ENDCAP/SIDEC (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/65497 (( 0.02 ))s
-IOVDbFolder INFO Folder /MUONALIGN/TGC/SIDEA (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/165643 (( 0.02 ))s
-IOVDbFolder INFO Folder /MUONALIGN/TGC/SIDEC (AttrListColl) db-read 1/1 objs/chan/bytes 1/1/165643 (( 0.02 ))s
-IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA (AttrListColl) db-read 1/2 objs/chan/bytes 1/1/222235 (( 0.05 ))s
-IOVDbFolder INFO Folder /RPC/CABLING/MAP_SCHEMA_CORR (AttrListColl) db-read 1/2 objs/chan/bytes 1/1/29402 (( 0.03 ))s
-IOVDbFolder INFO Folder /RPC/DCS/DeadRopanels (AttrListColl) db-read 1/1 objs/chan/bytes 32/48/6200 (( 0.02 ))s
-IOVDbFolder INFO Folder /RPC/DCS/OffRopanels (AttrListColl) db-read 1/1 objs/chan/bytes 4/48/16 (( 0.03 ))s
-IOVDbFolder INFO Folder /RPC/DQMF/ELEMENT_STATUS (AttrListColl) db-read 1/1 objs/chan/bytes 8320/8320/6180700 (( 0.24 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_ETA (AttrListColl) db-read 1/2 objs/chan/bytes 1613/1613/7562651 (( 0.16 ))s
-IOVDbFolder INFO Folder /RPC/TRIGGER/CM_THR_PHI (AttrListColl) db-read 1/2 objs/chan/bytes 1612/1612/8096306 (( 0.09 ))s
-IOVDbFolder INFO Folder /TDAQ/RunCtrl/SOR_Params (AttrListColl) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbFolder INFO Folder /TGC/CABLING/MAP_SCHEMA (AttrListColl) db-read 0/0 objs/chan/bytes 0/1/0 (( 0.00 ))s
-IOVDbSvc INFO bytes in (( 1.81 ))s
-IOVDbSvc INFO Connection sqlite://;schema=mycool.db;dbname=CONDBR2 : nConnect: 0 nFolders: 0 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLONL_TDAQ/CONDBR2 : nConnect: 1 nFolders: 1 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLOFL_MUONALIGN/CONDBR2 : nConnect: 2 nFolders: 7 ReadTime: (( 0.13 ))s
-IOVDbSvc INFO Connection COOLONL_RPC/CONDBR2 : nConnect: 2 nFolders: 4 ReadTime: (( 0.33 ))s
-IOVDbSvc INFO Connection COOLONL_TGC/CONDBR2 : nConnect: 1 nFolders: 1 ReadTime: (( 0.00 ))s
-IOVDbSvc INFO Connection COOLONL_MDT/CONDBR2 : nConnect: 2 nFolders: 2 ReadTime: (( 0.16 ))s
-IOVDbSvc INFO Connection COOLONL_GLOBAL/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.10 ))s
-IOVDbSvc INFO Connection COOLOFL_DCS/CONDBR2 : nConnect: 2 nFolders: 3 ReadTime: (( 0.13 ))s
-IOVDbSvc INFO Connection COOLOFL_RPC/CONDBR2 : nConnect: 2 nFolders: 1 ReadTime: (( 0.24 ))s
-IOVDbSvc INFO Connection COOLOFL_MDT/CONDBR2 : nConnect: 2 nFolders: 2 ReadTime: (( 0.20 ))s
-IOVDbSvc INFO Connection COOLOFL_CSC/CONDBR2 : nConnect: 2 nFolders: 8 ReadTime: (( 0.52 ))s
-ToolSvc INFO Removing all tools created by ToolSvc
-TgcRdoToTgcPrep... INFO finalize(): input RDOs->output PRDs [Hit: 6807->6807, Tracklet: 28->28, TrackletEIFI: 692->692, HiPt: 4031->4031, SL: 3->3]
MdtRawDataProvi... INFO Fraction of fills that use the cache = 0
TgcRawDataProvi... INFO Fraction of fills that use the cache = 0
RpcROD_Decoder:... INFO ============ FINAL RPC DATA FORMAT STAT. ===========
@@ -1082,15 +47,3 @@ RpcROD_Decoder:... INFO SL Footer Errors.............0
RpcROD_Decoder:... INFO RX Footer Errors.............0
RpcROD_Decoder:... INFO CRC8 check Failures..........0
RpcROD_Decoder:... INFO ====================================================
-ToolSvc.ByteStr... INFO in finalize()
-ToolSvc.TGCCabl... INFO finalize
-IdDictDetDescrCnv INFO in finalize
-*****Chrono***** INFO ****************************************************************************************************
-*****Chrono***** INFO The Final CPU consumption ( Chrono ) Table (ordered)
-*****Chrono***** INFO ****************************************************************************************************
-cObj_ALL INFO Time User : Tot= 10 [ms] Ave/Min/Max=0.312(+- 1.74)/ 0/ 10 [ms] #= 32
-ChronoStatSvc INFO Time User : Tot= 27.6 [s] #= 1
-*****Chrono***** INFO ****************************************************************************************************
-ChronoStatSvc.f... INFO Service finalized successfully
-ApplicationMgr INFO Application Manager Finalized successfully
-ApplicationMgr INFO Application Manager Terminated successfully
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
index a07242494fb8fe46832d79f8e91bb3c75dd05ee8..abdf632b9556e5b0709caf5ee051cc3d62980940 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDToolHelper.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "MuonAGDDToolHelper.h"
@@ -170,8 +170,7 @@ bool MuonAGDDToolHelper::BuildMScomponents() const
bool MuonAGDDToolHelper::BuildReadoutGeometry(MuonGM::MuonDetectorManager* mgr/*, std::map<GeoFullPhysVol*, std::string>* vec*/) const
{
- bool geoBuilt = true;
-
+ bool geoBuilt = true;
// ATH_MSG_INFO("In BuildReadoutGeometry - start");
//std::map<std::string, GeoFullPhysVol*>* myMap = NULL;
@@ -223,6 +222,7 @@ bool MuonAGDDToolHelper::BuildReadoutGeometry(MuonGM::MuonDetectorManager* mgr/*
re->initDesign(-999., -999., -999., -999., -999.);
re->fillCache();
mgr->addMMReadoutElement_withIdFields(re, iLS, etaIndex, phiIndex, mLayer);
+ re->setDelta(mgr);
}
else if (chTag.substr(0,3)=="sTG")
{
@@ -244,6 +244,7 @@ bool MuonAGDDToolHelper::BuildReadoutGeometry(MuonGM::MuonDetectorManager* mgr/*
re->initDesign(-999., -999., -999., 3.2, -999., 2.7, -999., 2.6);
re->fillCache();
mgr->addsTgcReadoutElement_withIdFields(re, iLS, etaIndex, phiIndex, mLayer);
+ re->setDelta(mgr);
}
}
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
index 94d9e628ef2eae734a55456c586f17783da5fb48..90f2f19df3ae02864a15283ae4fb8c3ba829e892 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MMReadoutElement.h
@@ -118,6 +118,7 @@ namespace MuonGM {
inline bool has_ALines() const;
inline bool has_BLines() const;
void setDelta(double, double, double, double, double, double); //input: translations, rotations
+ void setDelta(MuonDetectorManager* mgr);
void setBLinePar(BLinePar* bLine);
inline void clearBLinePar();
inline const BLinePar* getBLinePar() const { return m_BLinePar;}
@@ -145,7 +146,7 @@ namespace MuonGM {
bool m_hasALines;
bool m_hasBLines;
- HepGeom::Transform3D* m_delta;
+ Amg::Transform3D m_delta;
BLinePar* m_BLinePar;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
index 960de37f960799c84e82ccc1155a32f6dfa685a7..c9f42c62e5ce804ee21981b3bad643524dd41526 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/sTgcReadoutElement.h
@@ -148,6 +148,7 @@ namespace MuonGM {
inline bool has_ALines() const;
inline bool has_BLines() const;
void setDelta(double, double, double, double, double, double);
+ void setDelta(MuonDetectorManager* mgr);
void setBLinePar(BLinePar* bLine);
inline void clearBLinePar();
@@ -173,7 +174,7 @@ namespace MuonGM {
bool m_hasALines;
bool m_hasBLines;
- HepGeom::Transform3D* m_delta;
+ Amg::Transform3D m_delta;
//const double m_largeSectorOpeningAngle = 28.0;
//const double m_smallSectorOpeningAngle = 17.0;
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
index 11784751c4dd13f9436bee54fae3a44df29abe7e..e8edc6f671b6fc4dc1e7a5d96d9b11ed43183929 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/MMReadoutElement.cxx
@@ -38,7 +38,7 @@ namespace MuonGM {
m_hasALines = false;
m_hasBLines = false;
- m_delta = NULL;
+ m_delta = Amg::Transform3D::Identity();
m_ml = mL;
// get the setting of the caching flag from the manager
@@ -308,7 +308,8 @@ namespace MuonGM {
log << MSG::DEBUG<<"locP in the multilayer r.f. "<<locP<<endmsg;
}
#endif
- return absTransform()*locP;
+ Amg::Vector3D gVec = absTransform()*locP;
+ return m_delta*gVec;
}
void MMReadoutElement::setDelta(double tras, double traz, double trat,
@@ -327,6 +328,30 @@ namespace MuonGM {
HepGeom::RotateY3D(rotz)*HepGeom::RotateZ3D(rott);
m_hasALines = true;
}
+ Amg::Transform3D deltaToAmg = Amg::CLHEPTransformToEigen(delta);
+ m_delta = deltaToAmg;
+ }
+
+ void MMReadoutElement::setDelta(MuonDetectorManager* mgr)
+ {
+ const ALineMapContainer* alineMap = mgr->ALineContainer();
+ Identifier id = mgr->mmIdHelper()->elementID(getStationName(), getStationEta(), getStationPhi());
+ Identifier idMult = mgr->mmIdHelper()->multilayerID(id, m_ml);
+ if( alineMap->find(idMult) == alineMap->cend())
+ {
+ MsgStream log(Athena::getMessageSvc(),"MMReadoutElement");
+ if(log.level()<=MSG::DEBUG)
+ {
+ log << MSG::DEBUG << "m_aLineMapContainer does not contain any ALine for MM" << endmsg;
+ }
+ }
+ else
+ {
+ ALinePar aline = alineMap->find(idMult)->second;
+ float s, z, t, rots, rotz, rott;
+ aline.getParameters(s, z, t, rots, rotz, rott);
+ setDelta(s, z, t, rots, rotz, rott);
+ }
}
void MMReadoutElement::setBLinePar(BLinePar* bLine)
diff --git a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx
index 04b24ef9ed3c894758b0f2baea89aa3dea589035..9eb83dc2a66a5bba90235af0f5258a8c7823c073 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx
@@ -43,7 +43,7 @@ namespace MuonGM {
m_hasALines = false;
m_hasBLines = false;
- m_delta = NULL;
+ m_delta = Amg::Transform3D::Identity();
m_ml = mL;
// get the setting of the caching flag from the manager
@@ -508,7 +508,8 @@ namespace MuonGM {
log << MSG::DEBUG << "locP in the multilayer r.f. "<<locP<<endmsg;
}
#endif
- return absTransform()*locP;
+ Amg::Vector3D gVec = absTransform()*locP;
+ return m_delta*gVec;
}
void sTgcReadoutElement::setDelta(double tras, double traz, double trat,
@@ -527,6 +528,30 @@ namespace MuonGM {
HepGeom::RotateY3D(rotz)*HepGeom::RotateZ3D(rott);
m_hasALines = true;
}
+ Amg::Transform3D deltaToAmg = Amg::CLHEPTransformToEigen(delta);
+ m_delta = deltaToAmg;
+ }
+
+ void sTgcReadoutElement::setDelta(MuonDetectorManager* mgr)
+ {
+ const ALineMapContainer* alineMap = mgr->ALineContainer();
+ Identifier id = mgr->stgcIdHelper()->elementID(getStationName(), getStationEta(), getStationPhi());
+ Identifier idMult = mgr->stgcIdHelper()->multilayerID(id, m_ml);
+ if( alineMap->find(idMult) == alineMap->cend())
+ {
+ MsgStream log(Athena::getMessageSvc(),"sTgcReadoutElement");
+ if(log.level()<=MSG::DEBUG)
+ {
+ log << MSG::DEBUG << "m_aLineMapContainer does not contain any ALine for sTGC" << endmsg;
+ }
+ }
+ else
+ {
+ ALinePar aline = alineMap->find(idMult)->second;
+ float s, z, t, rots, rotz, rott;
+ aline.getParameters(s, z, t, rots, rotz, rott);
+ setDelta(s, z, t, rots, rotz, rott);
+ }
}
void sTgcReadoutElement::setBLinePar(BLinePar* bLine)
diff --git a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx
index 2908b6ee0a37ab3c3036aa90b3ec7e8bc80ad2b7..1d090b1276595b9e8c2181bd95eb765c04f12f00 100755
--- a/MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx
+++ b/MuonSpectrometer/MuonGeoModel/src/MuonDetectorFactory001.cxx
@@ -163,6 +163,8 @@ namespace MuonGM {
m_manager->setCachingFlag(m_caching);
m_manager->setCacheFillingFlag(m_cacheFillingFlag);
m_manager->setControlAlinesFlag(m_controlAlines);
+ m_manager->setNSWABLinesAsciiSideA(m_NSWABLinesSideA);
+ m_manager->setNSWABLinesAsciiSideC(m_NSWABLinesSideC);
// set here the flag defining the geometry granularity
// minimalgeo = 1 => The geo tree is built up to the Detector Level (Full PhysVol)
// no internal structure of the Detector is built
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/MuonRDODict.h b/MuonSpectrometer/MuonRDO/MuonRDO/MuonRDODict.h
index 90b11bfcfd7234006acbfc01e662c05190c9d9b3..6f9aa7293aa4f1b8cd2242a730050edc16ddf8d1 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/MuonRDODict.h
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/MuonRDODict.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/*
@@ -17,6 +17,7 @@
#include "MuonRDO/TgcRdoContainer.h"
#include "MuonRDO/CscRawDataContainer.h"
#include "MuonRDO/STGC_RawDataContainer.h"
+#include "MuonRDO/MM_RawDataContainer.h"
// collection
#include "MuonRDO/MdtCsm.h"
@@ -24,6 +25,7 @@
#include "MuonRDO/TgcRdo.h"
#include "MuonRDO/CscRawDataCollection.h"
#include "MuonRDO/STGC_RawDataCollection.h"
+#include "MuonRDO/MM_RawDataCollection.h"
// cache
#include "MuonRDO/MdtCsm_Cache.h"
@@ -31,5 +33,6 @@
#include "MuonRDO/TgcRdo_Cache.h"
#include "MuonRDO/CscRawDataCollection_Cache.h"
#include "MuonRDO/STGC_RawDataCollection_Cache.h"
+#include "MuonRDO/MM_RawDataCollection_Cache.h"
#endif
diff --git a/MuonSpectrometer/MuonRDO/MuonRDO/selection.xml b/MuonSpectrometer/MuonRDO/MuonRDO/selection.xml
index 7e8b304148d0f9d266e33965a26d4b27a0a611c9..61f80d0c87148b6307e0bbe8923f16db92c2a0b4 100755
--- a/MuonSpectrometer/MuonRDO/MuonRDO/selection.xml
+++ b/MuonSpectrometer/MuonRDO/MuonRDO/selection.xml
@@ -2,6 +2,8 @@
<class pattern="std::vector<short*int>" />
+ <class name="Muon::MM_RawData" />
+ <class name="Muon::STGC_RawData" />
<class name="TgcRawData" />
<class name="MdtAmtHit" />
<class name="RpcFiredChannel" />
@@ -21,12 +23,18 @@
<class name="std::vector<RpcCoinMatrix*>" />
<class name="DataVector<CscRawData>" />
<class name="std::vector<CscRawData*>" />
+ <class name="DataVector<Muon::MM_RawData>" />
+ <class name="std::vector<Muon::MM_RawData*>" />
+ <class name="DataVector<Muon::STGC_RawData>" />
+ <class name="std::vector<Muon::STGC_RawData*>" />
<class name="IdentifiableContainer<TgcRdo>" />
<class name="IdentifiableContainer<MdtCsm>" />
<class name="IdentifiableContainer<RpcPad>" />
<class name="IdentifiableContainer<CscRawDataCollection>" />
+ <class name="IdentifiableContainer<Muon::MM_RawDataCollection>" />
+ <class name="IdentifiableContainer<Muon::STGC_RawDataCollection>" />
<class name="DataLinkVector<TgcRdo>" >
<field name="m_last" transient="true" />
@@ -44,12 +52,22 @@
<field name="m_last" transient="true" />
<field name="m_vect" transient="true" />
</class>
+ <class name="DataLinkVector<Muon::MM_RawDataCollection>" >
+ <field name="m_last" transient="true" />
+ <field name="m_vect" transient="true" />
+ </class>
+ <class name="DataLinkVector<Muon::STGC_RawDataCollection>" >
+ <field name="m_last" transient="true" />
+ <field name="m_vect" transient="true" />
+ </class>
<class name="TgcRdo" />
<class name="MdtCsm" />
<class name="RpcPad" />
<class name="CscRawDataCollection" />
+ <class name="Muon::MM_RawDataCollection" />
+ <class name="Muon::STGC_RawDataCollection" />
<class name="TgcRdoContainer" />
<class name="std::vector<TgcRdo * >" />
@@ -71,12 +89,18 @@
<class name="DataVector<CscRawDataCollection>" id="D7600810-31BC-4344-A3C6-9C59F47E5551" />
<class name="CscRawDataCollection_Cache" />
- <class name="STGC_RawDataContainer" />
- <class name="std::vector<STGC_RawDataCollection * >" />
- <class name="DataVector<STGC_RawDataCollection>" id="3786AB67-8A7A-4DA5-B178-3FE9CB3A6FD2" />
+ <class name="Muon::MM_RawDataContainer" />
+ <class name="std::vector<Muon::MM_RawDataCollection * >" />
+ <class name="DataVector<Muon::MM_RawDataCollection>" id="5F202045-CE2C-4AD4-96BA-7DA18053B90F" />
+ <class name="MM_RawDataCollection_Cache" />
+
+ <class name="Muon::STGC_RawDataContainer" />
+ <class name="std::vector<Muon::STGC_RawDataCollection * >" />
+ <class name="DataVector<Muon::STGC_RawDataCollection>" id="3786AB67-8A7A-4DA5-B178-3FE9CB3A6FD2" />
<class name="STGC_RawDataCollection_Cache" />
+
</lcgdict>
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
index fbd2b3b88671ef70292123c3077bb708c95391f7..0ea9e5bcc7b9ef2e8eb8edcb3181e7edc14a355e 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonPrdProviderToolsConfig.py
@@ -20,7 +20,6 @@ def RpcPrepDataProviderTool(name="RpcPrepDataProviderTool",**kwargs):
import MuonCnvExample.MuonCablingConfig
if source == 'data':
- kwargs["processingData"] = True
kwargs["reduceCablingOverlap"] = True
kwargs["produceRpcCoinDatafromTriggerWords"] = True
kwargs["overlap_timeTolerance"] = 1000
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
index 116498c0f46d4d9f38c2d5d857c64c257baf1e4e..6103c499c849ed2d72b43fc0052f217c28e16433 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/share/MuonRec_jobOptions.py
@@ -117,9 +117,13 @@ if rec.doTruth() and DetFlags.makeRIO.Muon_on():
from AthenaCommon import CfgGetter
topSequence.MuonTruthDecorationAlg.MCTruthClassifier = CfgGetter.getPublicTool(MCTruthClassifier(name="MCTruthClassifier",ParticleCaloExtensionTool=""))
topSequence.MuonTruthDecorationAlg.SDOs=["RPC_SDO","TGC_SDO","MDT_SDO"]
+ PRD_TruthMaps = ["RPC_TruthMap","TGC_TruthMap","MDT_TruthMap"]
if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
topSequence.MuonTruthDecorationAlg.SDOs+=["MM_SDO","sTGC_SDO"]
+ PRD_TruthMaps += ["MM_TruthMap", "STGC_TruthMap"]
if not MuonGeometryFlags.hasCSC(): topSequence.MuonTruthDecorationAlg.CSCSDOs = ""
+ else: PRD_TruthMaps += ["CSC_TruthMap"]
+ topSequence.MuonTruthDecorationAlg.PRD_TruthMaps = PRD_TruthMaps
try:
from PyUtils.MetaReaderPeeker import metadata
diff --git a/MuonSpectrometer/MuonTruthAlgs/src/MuonDetailedTrackTruthMaker.cxx b/MuonSpectrometer/MuonTruthAlgs/src/MuonDetailedTrackTruthMaker.cxx
index d1b612cd9a67e47353df06335eab6ee91f212ffc..cbd7fdf08f1153d739d8110b80c5333e2d17bd14 100755
--- a/MuonSpectrometer/MuonTruthAlgs/src/MuonDetailedTrackTruthMaker.cxx
+++ b/MuonSpectrometer/MuonTruthAlgs/src/MuonDetailedTrackTruthMaker.cxx
@@ -34,8 +34,8 @@ StatusCode MuonDetailedTrackTruthMaker::initialize()
}
if (m_hasSTgc && m_hasMM) {
- if (m_hasCSC) m_PRD_TruthNames={"sTGC_TruthMap","MM_TruthMap","RPC_TruthMap","TGC_TruthMap","MDT_TruthMap","CSC_TruthMap"};
- else m_PRD_TruthNames={"sTGC_TruthMap","MM_TruthMap","RPC_TruthMap","TGC_TruthMap","MDT_TruthMap"};
+ if (m_hasCSC) m_PRD_TruthNames={"STGC_TruthMap","MM_TruthMap","RPC_TruthMap","TGC_TruthMap","MDT_TruthMap","CSC_TruthMap"};
+ else m_PRD_TruthNames={"STGC_TruthMap","MM_TruthMap","RPC_TruthMap","TGC_TruthMap","MDT_TruthMap"};
}
m_detailedTrackTruthNames.reserve ( m_trackCollectionNames.size());
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
index 6f0966b8812ecd3c3e8dd3ad391a3060b382c5cf..fbdc31d5c82df4e1e1d1721153b8f5da11caa9f4 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_asymmetric_fullChain.sh
@@ -8,7 +8,9 @@
# art-include: 21.9/Athena
# art-output: OUT_HITS.root
# art-output: OUT_RDO.root
+# art-output: NSWPRDValAlg.digi.ntuple.root
# art-output: OUT_ESD.root
+# art-output: NSWPRDValAlg.reco.ntuple.root
#####################################################################
# run simulation on 25 events using the asymmetric Run3 layout
@@ -36,9 +38,12 @@ echo "Found ${NWARNING} WARNING, ${NERROR} ERROR and ${NFATAL} FATAL messages in
# now use the produced HITS file and run digitisation
# (since the 21.X and master branches use a different Geant4 version, we use the HITS file produced in 21.X
# to avoid tiny differences in the number of secondary particles and hit positions and start from the same HITS file)
+# the postInclude adds a validation algorithm which writes out an ntuple for digit/RDO validation
+# (without the postInclude, a standard digitisation job would run)
LOG_DIGI="log_Run3_asymmetric_digi.log"
Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/Run3/HITS/AsymmetricLayout_HITS_v1.root \
--imf False \
+ --postInclude MuonPRDTest/NSWPRDValAlg.digi.py \
--outputRDOFile OUT_RDO.root &> ${LOG_DIGI}
exit_code=$?
echo "art-result: ${exit_code} Digi_tf.py"
@@ -55,11 +60,14 @@ echo "Found ${NWARNING} WARNING, ${NERROR} ERROR and ${NFATAL} FATAL messages in
#####################################################################
# now use the produced RDO file and run reconstruction
+# the postInclude adds a validation algorithm which writes out an ntuple for digit/RDO/PRD validation
+# (without the postInclude, a standard reconstruction job would run)
LOG_RECO="log_Run3_asymmetric_reco.log"
Reco_tf.py --inputRDOFile OUT_RDO.root \
--preExec "from MuonRecExample.MuonRecFlags import muonRecFlags;muonRecFlags.setDefaults();muonRecFlags.doFastDigitization=False;muonRecFlags.useLooseErrorTuning.set_Value_and_Lock(True);from RecExConfig.RecFlags import rec;rec.doTrigger=False;rec.doEgamma=True;rec.doLucid=True;rec.doZdc=True;rec.doJetMissingETTag=True" \
--autoConfiguration everything \
--imf False \
+ --postInclude MuonPRDTest/NSWPRDValAlg.reco.py \
--outputESDFile OUT_ESD.root &> ${LOG_RECO}
exit_code=$?
echo "art-result: ${exit_code} Reco_tf.py"
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
index 848fe228384a442c903f3d2ddba1ba7673668683..c8b2cadc799f58a5ca6ebc74db70df738080bced 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_Run3_symmetric_fullChain.sh
@@ -8,7 +8,9 @@
# art-include: 21.9/Athena
# art-output: OUT_HITS.root
# art-output: OUT_RDO.root
+# art-output: NSWPRDValAlg.digi.ntuple.root
# art-output: OUT_ESD.root
+# art-output: NSWPRDValAlg.reco.ntuple.root
#####################################################################
# run simulation on 25 events using the symmetric Run3 layout
@@ -36,9 +38,12 @@ echo "Found ${NWARNING} WARNING, ${NERROR} ERROR and ${NFATAL} FATAL messages in
# now use the produced HITS file and run digitisation
# (since the 21.X and master branches use a different Geant4 version, we use the HITS file produced in 21.X
# to avoid tiny differences in the number of secondary particles and hit positions and start from the same HITS file)
+# the postInclude adds a validation algorithm which writes out an ntuple for digit/RDO validation
+# (without the postInclude, a standard digitisation job would run)
LOG_DIGI="log_Run3_symmetric_digi.log"
Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/Run3/HITS/SymmetricLayout_HITS_v1.root \
--imf False \
+ --postInclude MuonPRDTest/NSWPRDValAlg.digi.py \
--outputRDOFile OUT_RDO.root &> ${LOG_DIGI}
exit_code=$?
echo "art-result: ${exit_code} Digi_tf.py"
@@ -55,11 +60,14 @@ echo "Found ${NWARNING} WARNING, ${NERROR} ERROR and ${NFATAL} FATAL messages in
#####################################################################
# now use the produced RDO file and run reconstruction
+# the postInclude adds a validation algorithm which writes out an ntuple for digit/RDO/PRD validation
+# (without the postInclude, a standard reconstruction job would run)
LOG_RECO="log_Run3_symmetric_reco.log"
Reco_tf.py --inputRDOFile OUT_RDO.root \
--preExec "from MuonRecExample.MuonRecFlags import muonRecFlags;muonRecFlags.setDefaults();muonRecFlags.doFastDigitization=False;muonRecFlags.useLooseErrorTuning.set_Value_and_Lock(True);from RecExConfig.RecFlags import rec;rec.doTrigger=False;rec.doEgamma=True;rec.doLucid=True;rec.doZdc=True;rec.doJetMissingETTag=True" \
--autoConfiguration everything \
--imf False \
+ --postInclude MuonPRDTest/NSWPRDValAlg.reco.py \
--outputESDFile OUT_ESD.root &> ${LOG_RECO}
exit_code=$?
echo "art-result: ${exit_code} Reco_tf.py"
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt
index 44c39deb7c52c37b440dd9c9dd84cf7cf6955052..fc0bb65d980884f80fa2b420cde208fc1379ee59 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/CMakeLists.txt
@@ -16,14 +16,13 @@ atlas_depends_on_subdirs(
Reconstruction/Jet/JetCPInterfaces
Reconstruction/Jet/JetInterface
Reconstruction/Jet/JetJvtEfficiency
- Reconstruction/Jet/JetResolution
Reconstruction/MET/METUtilities )
atlas_add_library( JetAnalysisAlgorithmsLib
JetAnalysisAlgorithms/*.h JetAnalysisAlgorithms/*.icc Root/*.cxx
PUBLIC_HEADERS JetAnalysisAlgorithms
LINK_LIBRARIES xAODJet SelectionHelpersLib SystematicsHandlesLib
- AnaAlgorithmLib JetCalibToolsLib JetInterface JetResolutionLib
+ AnaAlgorithmLib JetCalibToolsLib JetInterface
JetCPInterfaces JetJvtEfficiencyLib JetAnalysisInterfacesLib METUtilitiesLib )
atlas_add_dictionary( JetAnalysisAlgorithmsDict
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithmsDict.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithmsDict.h
index 3f2128c28272d43e761db7c4fb7aeee482afcea6..dcaea58543cf6cbc6e03a64b2f0c103245230505 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithmsDict.h
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithmsDict.h
@@ -12,7 +12,6 @@
#include <JetAnalysisAlgorithms/JetGhostMuonAssociationAlg.h>
#include <JetAnalysisAlgorithms/JetModifierAlg.h>
#include <JetAnalysisAlgorithms/JetSelectionAlg.h>
-#include <JetAnalysisAlgorithms/JetSmearingAlg.h>
#include <JetAnalysisAlgorithms/JetUncertaintiesAlg.h>
#include <JetAnalysisAlgorithms/JvtEfficiencyAlg.h>
#include <JetAnalysisAlgorithms/JvtUpdateAlg.h>
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetSmearingAlg.h b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetSmearingAlg.h
deleted file mode 100644
index ef56cf1848191122ce48b1dcc1e1baa3753690d5..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/JetSmearingAlg.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-/// @author Nils Krumnack
-
-
-#ifndef JET_ANALYSIS_ALGORITHMS__JET_SMEARING_ALG_H
-#define JET_ANALYSIS_ALGORITHMS__JET_SMEARING_ALG_H
-
-#include <AnaAlgorithm/AnaAlgorithm.h>
-#include <JetResolution/IJERSmearingTool.h>
-#include <SelectionHelpers/OutOfValidityHelper.h>
-#include <SelectionHelpers/SelectionReadHandle.h>
-#include <SystematicsHandles/SysCopyHandle.h>
-#include <SystematicsHandles/SysListHandle.h>
-#include <xAODJet/JetContainer.h>
-
-namespace CP
-{
- /// \brief an algorithm for calling \ref IJERSmearingTool
-
- class JetSmearingAlg final : public EL::AnaAlgorithm
- {
- /// \brief the standard constructor
- public:
- JetSmearingAlg (const std::string& name,
- ISvcLocator* pSvcLocator);
-
-
- public:
- StatusCode initialize () override;
-
- public:
- StatusCode execute () override;
-
-
-
- /// \brief the smearing tool
- private:
- ToolHandle<IJERSmearingTool> m_smearingTool;
-
- /// \brief the systematics list we run
- private:
- SysListHandle m_systematicsList {this};
-
- /// \brief the jet collection we run on
- private:
- SysCopyHandle<xAOD::JetContainer> m_jetHandle {
- this, "jets", "AntiKt4EMTopoJets", "the jet collection to run on"};
-
- /// \brief the preselection we apply to our input
- private:
- SelectionReadHandle m_preselection {
- this, "preselection", "", "the preselection to apply"};
-
- /// \brief the helper for OutOfValidity results
- private:
- OutOfValidityHelper m_outOfValidity {this};
- };
-}
-
-#endif
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/selection.xml b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/selection.xml
index a851d1f967b420f8c737f111984a2d02834e751c..ba900eeb5e6e5e603c194936395126500785ba99 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/selection.xml
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/JetAnalysisAlgorithms/selection.xml
@@ -4,7 +4,6 @@
<class name="CP::JetGhostMuonAssociationAlg" />
<class name="CP::JetModifierAlg" />
<class name="CP::JetSelectionAlg" />
- <class name="CP::JetSmearingAlg" />
<class name="CP::JetUncertaintiesAlg" />
<class name="CP::JvtEfficiencyAlg" />
<class name="CP::JvtUpdateAlg" />
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetSmearingAlg.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetSmearingAlg.cxx
deleted file mode 100644
index 55438e290a57f925ac07b9b2c8814eb6c95bdc63..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/Root/JetSmearingAlg.cxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-/// @author Nils Krumnack
-
-
-//
-// includes
-//
-
-#include <JetAnalysisAlgorithms/JetSmearingAlg.h>
-
-//
-// method implementations
-//
-
-namespace CP
-{
- JetSmearingAlg ::
- JetSmearingAlg (const std::string& name,
- ISvcLocator* pSvcLocator)
- : AnaAlgorithm (name, pSvcLocator)
- , m_smearingTool ("JERSmearingTool", this)
- {
- declareProperty ("smearingTool", m_smearingTool, "the smearing tool we apply");
- }
-
-
-
- StatusCode JetSmearingAlg ::
- initialize ()
- {
- ANA_CHECK (m_smearingTool.retrieve());
- m_systematicsList.addHandle (m_jetHandle);
- ANA_CHECK (m_systematicsList.addAffectingSystematics (m_smearingTool->affectingSystematics()));
- ANA_CHECK (m_systematicsList.initialize());
- ANA_CHECK (m_preselection.initialize());
- ANA_CHECK (m_outOfValidity.initialize());
- return StatusCode::SUCCESS;
- }
-
-
-
- StatusCode JetSmearingAlg ::
- execute ()
- {
- return m_systematicsList.foreach ([&] (const CP::SystematicSet& sys) -> StatusCode {
- ANA_CHECK (m_smearingTool->applySystematicVariation (sys));
- xAOD::JetContainer *jets = nullptr;
- ANA_CHECK (m_jetHandle.getCopy (jets, sys));
- for (xAOD::Jet *jet : *jets)
- {
- if (m_preselection.getBool (*jet))
- {
- ANA_CHECK_CORRECTION (m_outOfValidity, *jet, m_smearingTool->applyCorrection (*jet));
- }
- }
- return StatusCode::SUCCESS;
- });
- }
-}
diff --git a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/src/components/JetAnalysisAlgorithms_entries.cxx b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/src/components/JetAnalysisAlgorithms_entries.cxx
index 757495457d3f4a77d15d045efb528c2840434c29..1a30a1c75242ef9391f6f74fdfb104cb6bc0848a 100644
--- a/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/src/components/JetAnalysisAlgorithms_entries.cxx
+++ b/PhysicsAnalysis/Algorithms/JetAnalysisAlgorithms/src/components/JetAnalysisAlgorithms_entries.cxx
@@ -6,7 +6,6 @@
#include <JetAnalysisAlgorithms/JetGhostMuonAssociationAlg.h>
#include <JetAnalysisAlgorithms/JetModifierAlg.h>
#include <JetAnalysisAlgorithms/JetSelectionAlg.h>
-#include <JetAnalysisAlgorithms/JetSmearingAlg.h>
#include <JetAnalysisAlgorithms/JetUncertaintiesAlg.h>
#include <JetAnalysisAlgorithms/JvtEfficiencyAlg.h>
#include <JetAnalysisAlgorithms/JvtUpdateAlg.h>
@@ -15,7 +14,6 @@ DECLARE_ALGORITHM_FACTORY (CP::JetCalibrationAlg)
DECLARE_ALGORITHM_FACTORY (CP::JetGhostMuonAssociationAlg)
DECLARE_ALGORITHM_FACTORY (CP::JetModifierAlg)
DECLARE_ALGORITHM_FACTORY (CP::JetSelectionAlg)
-DECLARE_ALGORITHM_FACTORY (CP::JetSmearingAlg)
DECLARE_ALGORITHM_FACTORY (CP::JetUncertaintiesAlg)
DECLARE_ALGORITHM_FACTORY (CP::JvtEfficiencyAlg)
DECLARE_ALGORITHM_FACTORY (CP::JvtUpdateAlg)
@@ -25,7 +23,6 @@ DECLARE_FACTORY_ENTRIES(JetAnalysisAlgorithms) {
DECLARE_ALGORITHM (CP::JetGhostMuonAssociationAlg)
DECLARE_ALGORITHM (CP::JetModifierAlg)
DECLARE_ALGORITHM (CP::JetSelectionAlg)
- DECLARE_ALGORITHM (CP::JetSmearingAlg)
DECLARE_ALGORITHM (CP::JetUncertaintiesAlg)
DECLARE_ALGORITHM (CP::JvtEfficiencyAlg)
DECLARE_ALGORITHM (CP::JvtUpdateAlg)
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt
index 49c743ff159d6e393d0ff4005027797132c9a4f3..53271a76703bd9ec092aeb677a39396776a50bd4 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CMakeLists.txt
@@ -46,7 +46,6 @@ atlas_depends_on_subdirs(
PhysicsAnalysis/MuonID/MuonIDAnalysis/MuonMomentumCorrections
PhysicsAnalysis/MuonID/MuonSelectorTools
PhysicsAnalysis/TauID/TauAnalysisTools
- Reconstruction/Jet/JetResolution
Reconstruction/Jet/JetUncertainties
Reconstruction/Jet/JetCalibTools
Reconstruction/Jet/JetInterface
@@ -82,7 +81,7 @@ atlas_add_library( CPAnalysisExamplesLib
ElectronPhotonFourMomentumCorrectionLib IsolationCorrectionsLib
JetSelectorToolsLib xAODBTaggingEfficiencyLib MuonEfficiencyCorrectionsLib
MuonMomentumCorrectionsLib MuonSelectorToolsLib TauAnalysisToolsLib
- JetResolutionLib JetUncertaintiesLib JetCalibToolsLib JetInterface
+ JetUncertaintiesLib JetCalibToolsLib JetInterface
METInterface METUtilitiesLib TrigDecisionToolLib
TriggerMatchingToolLib ${extra_libs}
PRIVATE_LINK_LIBRARIES xAODBase xAODMetaData )
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/MyToolProvider.h b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/MyToolProvider.h
index ca6ca3082942727ebd75f91a8265f15778a85d56..9da35f14ef2a1aba7a11da8b430b04decbe20dc2 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/MyToolProvider.h
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/CPAnalysisExamples/MyToolProvider.h
@@ -16,9 +16,7 @@
#include "AsgTools/ToolHandle.h"
#include "JetCalibTools/JetCalibrationTool.h"
-#include "JetSelectorTools/JetCleaningTool.h"
-#include "JetResolution/JERTool.h"
-#include "JetResolution/JERSmearingTool.h"
+#include "JetSelectorTools/JetCleaningTool.h"
#include "JetUncertainties/JetUncertaintiesTool.h"
#include "MuonAnalysisInterfaces/MuonCalibrationAndSmearingTool.h"
#include "MuonEfficiencyCorrections/MuonEfficiencyScaleFactors.h"
@@ -48,8 +46,6 @@ class MyToolProvider : public asg::AsgMessaging
// Jet tools
JetCalibrationTool * jetCalibTool;
- JERTool * jerTool;
- JERSmearingTool * jerSmearingTool;
JetUncertaintiesTool * jetUncertaintiesTool;
JetCleaningTool * jetCleaningTool;
diff --git a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/Root/MyToolProvider.cxx b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/Root/MyToolProvider.cxx
index 176d823d09981e2deb9b860c6ddffa0d612e4b32..96124cf8c35034058cef9d571d1f4b7197573632 100644
--- a/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/Root/MyToolProvider.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/CPAnalysisExamples/Root/MyToolProvider.cxx
@@ -7,8 +7,6 @@
MyToolProvider::MyToolProvider(const std::string& name):
AsgMessaging(name),
jetCalibTool(0),
- jerTool(0),
- jerSmearingTool(0),
jetUncertaintiesTool(0),
jetCleaningTool(0),
muonCalibrationAndSmearingTool(0),
@@ -26,8 +24,6 @@ MyToolProvider::MyToolProvider(const std::string& name):
MyToolProvider::~MyToolProvider()
{
if (jetCalibTool) delete jetCalibTool;
- if (jerTool) delete jerTool;
- if (jerSmearingTool) delete jerSmearingTool;
if (jetUncertaintiesTool) delete jetUncertaintiesTool;
if (jetCleaningTool) delete jetCleaningTool;
if (muonCalibrationAndSmearingTool) delete muonCalibrationAndSmearingTool;
@@ -75,24 +71,7 @@ StatusCode MyToolProvider::initialize(bool isData, bool isAtlfast)
}
ATH_CHECK( jetCalibTool->initialize() );
- // jet resolution tool
-
- jerTool = new JERTool("JERTool");
-
- ATH_CHECK( jerTool->setProperty("PlotFileName", "JetResolution/Prerec2015_xCalib_2012JER_ReducedTo9NP_Plots_v2.root") );
- ATH_CHECK( jerTool->setProperty("CollectionName", "AntiKt4EMTopoJets") );
- ATH_CHECK( jerTool->initialize() );
-
- // jet smearing tool
-
- ToolHandle<IJERTool> jerToolHandle(jerTool);
-
- jerSmearingTool = new JERSmearingTool("JERSmearingTool");
- ATH_CHECK( jerSmearingTool->setProperty("ApplyNominalSmearing",false) );
- ATH_CHECK( jerSmearingTool->setProperty("JERTool",jerToolHandle) );
- ATH_CHECK( jerSmearingTool->initialize() );
-
- ///////////////////////////////////////////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////////////////////////////////////////
// Initialise jet uncertainty tool
jetUncertaintiesTool = new JetUncertaintiesTool("JetUncertaintiesTool");
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/CMakeLists.txt
index 34fbd419944de3bec466758a36e715dcf6c26b3f..d14b7a1e4d11129e1f7b6e5858af3bc77339797a 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/CMakeLists.txt
@@ -11,6 +11,7 @@ atlas_subdir( ParticleJetTools )
if( XAOD_STANDALONE )
atlas_depends_on_subdirs(
PUBLIC
+ Control/AthToolSupport/AsgDataHandles
Control/AthToolSupport/AsgTools
Event/EventPrimitives
Event/xAOD/xAODJet
@@ -24,6 +25,7 @@ if( XAOD_STANDALONE )
else()
atlas_depends_on_subdirs(
PUBLIC
+ Control/AthToolSupport/AsgDataHandles
Control/AthToolSupport/AsgTools
Event/EventPrimitives
Event/xAOD/xAODJet
@@ -44,14 +46,14 @@ if( XAOD_STANDALONE )
ParticleJetTools/*.h Root/*.cxx src/*.cxx
PUBLIC_HEADERS ParticleJetTools
LINK_LIBRARIES AsgTools EventPrimitives xAODJet xAODTruth
- JetInterface MCTruthClassifierLib JetRecLib
+ JetInterface MCTruthClassifierLib JetRecLib AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES AthContainers TruthUtils )
else()
atlas_add_library( ParticleJetToolsLib
ParticleJetTools/*.h Root/*.cxx src/*.cxx
PUBLIC_HEADERS ParticleJetTools
LINK_LIBRARIES AsgTools EventPrimitives xAODJet xAODTruth GaudiKernel
- JetInterface MCTruthClassifierLib JetRecLib
+ JetInterface MCTruthClassifierLib JetRecLib AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES AthAnalysisBaseCompsLib AthContainers TruthUtils )
endif()
diff --git a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/CMakeLists.txt
index be475e86a92c452666f30bb37bd44c5ca7ee460d..2daf5f88a7130a962a4a2c2284d2659224c3c42d 100644
--- a/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/InDetD3PDMaker/CMakeLists.txt
@@ -59,7 +59,7 @@ atlas_add_component( InDetD3PDMaker
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HEPPDT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} AtlasHepMCLib ${HEPPDT_LIBRARIES} GaudiKernel CommissionEvent AthContainers AthenaKernel StoreGateLib AtlasDetDescr GeoAdaptors Identifier EventPrimitives xAODEventInfo xAODTracking InDetBeamSpotServiceLib SCT_ConditionsToolsLib TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry SCT_CablingLib InDetRawData InDetPrepRawData InDetRIO_OnTrack InDetSimEvent D3PDMakerUtils MCTruthClassifierLib ParticleTruth ITrackToVertex muonEvent Particle TrkCompetingRIOsOnTrack TrkEventPrimitives TrkParameters TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData TrkV0Vertex VxVertex TrkToolInterfaces TrkVertexFitterValidationUtilsLib )
+ LINK_LIBRARIES ${Boost_LIBRARIES} AtlasHepMCLib ${HEPPDT_LIBRARIES} GaudiKernel CommissionEvent AthContainers AthenaKernel StoreGateLib AtlasDetDescr GeoAdaptors Identifier EventPrimitives xAODEventInfo xAODTracking InDetBeamSpotServiceLib SCT_ConditionsToolsLib TRT_ConditionsServicesLib InDetIdentifier InDetReadoutGeometry SCT_CablingLib InDetRawData InDetPrepRawData InDetRIO_OnTrack InDetSimEvent D3PDMakerUtils MCTruthClassifierLib ParticleTruth ITrackToVertex muonEvent Particle TrkCompetingRIOsOnTrack TrkEventPrimitives TrkParameters TrkParticleBase TrkPrepRawData TrkRIO_OnTrack TrkTrack TrkTrackSummary TrkTruthData TrkV0Vertex VxVertex TrkToolInterfaces TrkVertexFitterValidationUtilsLib TRT_DriftFunctionToolLib )
# Install files from the package:
atlas_install_python_modules( python/*.py )
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.cxx
index 45737639ff7387eeb80595a995e9ab0d39de80f8..2620c80af5e7d03aa53f65ffdda0a8d745b4c360 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.cxx
@@ -1,28 +1,19 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-//////////////////////////////////////////////////////
-//
-// Author : Srivas Prasad (srivas.prasad@cern.ch)
-// Date : February 2010
-//
-//////////////////////////////////////////////////////
#include "MuonSegmentLocationFillerTool.h"
#include "TrkSegment/Segment.h"
#include "MuonSegment/MuonSegment.h"
#include "AthenaKernel/errorcheck.h"
#include "TrkEventPrimitives/LocalDirection.h"
-
namespace D3PD {
-
MuonSegmentLocationFillerTool::MuonSegmentLocationFillerTool (const std::string& type,
const std::string& name,
const IInterface* parent)
: BlockFillerTool<Trk::Segment> (type, name, parent),
- m_idHelperTool("Muon::MuonIdHelperTool/MuonIdHelperTool"),
m_idToFixedIdTool("MuonCalib::IdToFixedIdTool"),
m_slPropagator("Trk::StraightLinePropagator/MuonStraightLinePropagator"),
m_pullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator")
@@ -35,7 +26,7 @@ StatusCode MuonSegmentLocationFillerTool::initialize()
{
CHECK( BlockFillerTool<Trk::Segment>::initialize() );
CHECK( m_edmHelperSvc.retrieve() );
- CHECK( m_idHelperTool.retrieve() );
+ CHECK( m_idHelperSvc.retrieve() );
CHECK( m_idToFixedIdTool.retrieve() );
CHECK( m_slPropagator.retrieve() );
CHECK( m_pullCalculator.retrieve() );
@@ -116,7 +107,7 @@ StatusCode MuonSegmentLocationFillerTool::fill (const Trk::Segment& ts) {
*m_thetaYZ_IP = (float) localIPDir.angleYZ();
Identifier chid = m_edmHelperSvc->chamberId(mSeg);
- if( !(m_idHelperTool->isMuon(chid)) ) { // bad chid
+ if( !(m_idHelperSvc->isMuon(chid)) ) { // bad chid
*m_stationName = -1;
*m_sector = -1;
*m_stationEta = -1;
@@ -126,10 +117,10 @@ StatusCode MuonSegmentLocationFillerTool::fill (const Trk::Segment& ts) {
*m_stationName = fid.stationName();
// chamber location information
// should not happen...chamberId is supposed to return id only for MDT or CSC hits.
- if(!fid.is_tgc() ) *m_sector = m_idHelperTool->sector(chid);
+ if(!fid.is_tgc() ) *m_sector = m_idHelperSvc->sector(chid);
else *m_sector = 0;
- *m_stationEta = m_idHelperTool->stationEta(chid);
- *m_isEndcap = m_idHelperTool->isEndcap(chid);
+ *m_stationEta = m_idHelperSvc->stationEta(chid);
+ *m_isEndcap = m_idHelperSvc->isEndcap(chid);
}
const Trk::AtaPlane* pars = m_edmHelperSvc->createTrackParameters( mSeg );
@@ -148,20 +139,20 @@ StatusCode MuonSegmentLocationFillerTool::fill (const Trk::Segment& ts) {
m_id->push_back(m_idToFixedIdTool->idToFixedId(id).getIdInt());
int type = 6;
if( id.is_valid() ){
- if( m_idHelperTool->isMdt(id) ) type = 0;
- else if( m_idHelperTool->isRpc(id) ) type = 1;
- else if( m_idHelperTool->isTgc(id) ) type = 2;
- else if( m_idHelperTool->isCsc(id) ) type = 3;
- else if( m_idHelperTool->isMM(id) ) type = 4;
- else if( m_idHelperTool->issTgc(id) ) type = 5;
+ if( m_idHelperSvc->isMdt(id) ) type = 0;
+ else if( m_idHelperSvc->isRpc(id) ) type = 1;
+ else if( m_idHelperSvc->isTgc(id) ) type = 2;
+ else if( m_idHelperSvc->isCsc(id) ) type = 3;
+ else if( m_idHelperSvc->isMM(id) ) type = 4;
+ else if( m_idHelperSvc->issTgc(id) ) type = 5;
- if( m_idHelperTool->issTgc(id) ){
- int chtype = m_idHelperTool->stgcIdHelper().channelType(id);
+ if( m_idHelperSvc->issTgc(id) ){
+ int chtype = m_idHelperSvc->stgcIdHelper().channelType(id);
type += 1000*chtype;
if( chtype == 0 ) ++npadHits;
else if( chtype == 1 ) ++netaTrigHits;
else ++nphiHits;
- }else if( !m_idHelperTool->measuresPhi(id) ) {
+ }else if( !m_idHelperSvc->measuresPhi(id) ) {
if( type == 1 || type ==3 ) ++netaTrigHits;
else ++netaHits;
type += 1000;
@@ -191,16 +182,16 @@ StatusCode MuonSegmentLocationFillerTool::fill (const Trk::Segment& ts) {
res = resPull->residual().front();
pullub = resPull->pull().front();
delete resPull;
- }else ATH_MSG_WARNING("Failed to calculate biased residual for " << m_idHelperTool->toString(id) );
+ }else ATH_MSG_WARNING("Failed to calculate biased residual for " << m_idHelperSvc->toString(id) );
resPull = m_pullCalculator->residualPull( &meas, exPars, Trk::ResidualPull::Unbiased );
if( resPull ) {
pullb = resPull->pull().front();
delete resPull;
- }else ATH_MSG_WARNING("Failed to calculate biased residual for " << m_idHelperTool->toString(id) );
+ }else ATH_MSG_WARNING("Failed to calculate biased residual for " << m_idHelperSvc->toString(id) );
delete exPars;
}else{
- ATH_MSG_WARNING("Failed to obtain track parameters for " << m_idHelperTool->toString(id) );
+ ATH_MSG_WARNING("Failed to obtain track parameters for " << m_idHelperSvc->toString(id) );
}
m_residual->push_back(res);
m_biasedPull->push_back(pullb);
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.h
index ffef66de28b2c087c54902be86b7d3e9447d31b7..a3542fc5bb8116d26169c64f78decb8172ab6d62 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentLocationFillerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -16,8 +16,9 @@
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
+
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-#include "MuonIdHelpers/MuonIdHelperTool.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "MuonCalibITools/IIdToFixedIdTool.h"
#include "TrkExInterfaces/IPropagator.h"
#include "TrkGeometry/MagneticFieldProperties.h"
@@ -27,10 +28,8 @@ namespace Trk {
class Segment;
}
-
namespace D3PD {
-
class MuonSegmentLocationFillerTool
: public BlockFillerTool<Trk::Segment>
{
@@ -90,7 +89,7 @@ private:
ServiceHandle<Muon::IMuonEDMHelperSvc> m_edmHelperSvc {this, "edmHelper",
"Muon::MuonEDMHelperSvc/MuonEDMHelperSvc",
"Handle to the service providing the IMuonEDMHelperSvc interface" };
- ToolHandle<Muon::MuonIdHelperTool> m_idHelperTool;
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
ToolHandle<MuonCalib::IIdToFixedIdTool> m_idToFixedIdTool;
ToolHandle<Trk::IPropagator> m_slPropagator;
ToolHandle<Trk::IResidualPullCalculator> m_pullCalculator;
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.cxx
index 0cb6ef9ca20a0ab2a8200f891752da5554f6caf9..4a332c5fd7db23b787d4084b26ec831530f80492 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.cxx
@@ -1,13 +1,7 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-//////////////////////////////////////////////////////
-//
-// Author : Srivas Prasad (srivas.prasad@cern.ch)
-// Date : February 2010
-//
-//////////////////////////////////////////////////////
#include "MuonSegmentT0FillerTool.h"
#include "TrkSegment/Segment.h"
#include "MuonSegment/MuonSegment.h"
@@ -20,10 +14,7 @@ namespace D3PD {
MuonSegmentT0FillerTool::MuonSegmentT0FillerTool (const std::string& type,
const std::string& name,
const IInterface* parent)
- : BlockFillerTool<Trk::Segment> (type, name, parent)
- // m_idHelperTool("Muon::MuonIdHelperTool/MuonIdHelperTool"),
- // m_idToFixedIdTool("MuonCalib::IdToFixedIdTool")
-{
+ : BlockFillerTool<Trk::Segment> (type, name, parent) {
declareProperty("doMuonBoyCSCTiming", m_doMuonBoyCSCTiming=false);
book().ignore(); // Avoid coverity warnings.
@@ -33,9 +24,6 @@ StatusCode MuonSegmentT0FillerTool::initialize()
{
CHECK( BlockFillerTool<Trk::Segment>::initialize() );
CHECK( m_edmHelperSvc.retrieve() );
- // CHECK( m_idHelperTool.retrieve() );
- // CHECK( m_idToFixedIdTool.retrieve() );
-
return StatusCode::SUCCESS;
}
@@ -43,7 +31,6 @@ StatusCode MuonSegmentT0FillerTool::book()
{
CHECK( addVariable ("t0", m_t0) );
CHECK( addVariable ("t0err", m_t0err) );
-
return StatusCode::SUCCESS;
}
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.h
index c555146033831d62cc3c4d5d2176374e176b3f38..d46c1fdbdce75e4fe54d7382cb856b6af4b21c56 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonSegmentT0FillerTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -15,10 +15,8 @@
#include "D3PDMakerUtils/BlockFillerTool.h"
#include "GaudiKernel/ServiceHandle.h"
-#include "GaudiKernel/ToolHandle.h"
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-//#include "MuonRecHelperTools/MuonIdHelperTool.h"
-//#include "MuonCalibITools/IIdToFixedIdTool.h"
+
#include <string>
namespace Trk {
@@ -54,13 +52,9 @@ private:
void MuonboyT0CSCSegment(const Muon::MuonSegment* pMuonSegment, float& t0, float& t0Error);
std::string m_muonSegmentT0ContainerKey;
- // tools
ServiceHandle<Muon::IMuonEDMHelperSvc> m_edmHelperSvc {this, "edmHelper",
"Muon::MuonEDMHelperSvc/MuonEDMHelperSvc",
"Handle to the service providing the IMuonEDMHelperSvc interface" };
- // ToolHandle<Muon::MuonIdHelperTool> m_idHelperTool;
- // ToolHandle<MuonCalib::IIdToFixedIdTool> m_idToFixedIdTool;
-
};
} // namespace D3PD
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTruthHitsFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTruthHitsFillerTool.cxx
index 5d6e54d2a232a4188cb5e3e05ebcb8a5af7d7c88..b0a2983d906015e009ac8e11723d71640bc4fefb 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTruthHitsFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTruthHitsFillerTool.cxx
@@ -1,6 +1,7 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+
/**
* @file MuonD3PDMaker/src/MuonTruthHitsFillerTool.cxx
* @author scott snyder <snyder@bnl.gov>, from code by Niels van Eldik.
@@ -8,17 +9,13 @@
* @brief Fill truth hit information for muons.
*/
-
#include "MuonTruthHitsFillerTool.h"
-#include "MuonIdHelpers/MuonIdHelperTool.h"
+
#include "TrkTruthData/PRD_MultiTruthCollection.h"
#include "AthenaKernel/errorcheck.h"
#include "AtlasHepMC/GenParticle.h"
-
namespace D3PD {
-
-
/**
* @brief Standard Gaudi tool constructor.
* @param type The name of the tool type.
@@ -28,8 +25,7 @@ namespace D3PD {
MuonTruthHitsFillerTool::MuonTruthHitsFillerTool (const std::string& type,
const std::string& name,
const IInterface* parent)
- : Base (type, name, parent),
- m_idHelper("Muon::MuonIdHelperTool/MuonIdHelperTool")
+ : Base (type, name, parent)
{
declareProperty("PRD_TruthNames", m_PRD_TruthNames);
m_PRD_TruthNames.push_back("CSC_TruthMap");
@@ -48,7 +44,7 @@ MuonTruthHitsFillerTool::MuonTruthHitsFillerTool (const std::string& type,
*/
StatusCode MuonTruthHitsFillerTool::initialize()
{
- CHECK( m_idHelper.retrieve() );
+ CHECK( m_idHelperSvc.retrieve() );
return StatusCode::SUCCESS;
}
@@ -137,29 +133,29 @@ StatusCode MuonTruthHitsFillerTool::fillHitCounts (int barcode)
if( mc.second->barcode() != barcode ) continue;
found = true;
const Identifier& id = mc.first;
- ATH_MSG_VERBOSE("found matching hit " << m_idHelper->toString(id) );
- bool measPhi = m_idHelper->measuresPhi(id);
+ ATH_MSG_VERBOSE("found matching hit " << m_idHelperSvc->toString(id) );
+ bool measPhi = m_idHelperSvc->measuresPhi(id);
- if( m_idHelper->issTgc(id) ) {
- int index = m_idHelper->phiIndex(id);
+ if( m_idHelperSvc->issTgc(id) ) {
+ int index = m_idHelperSvc->phiIndex(id);
if( measPhi ) ++*(m_nphiHitsPerChamberLayer[index]);
else ++*(m_ntrigEtaHitsPerChamberLayer[index]);
}
- else if( m_idHelper->isMM(id) ) {
- int index = m_idHelper->isSmallChamber(id) ? MSI::ChIndexMax : MSI::ChIndexMax + 1;
+ else if( m_idHelperSvc->isMM(id) ) {
+ int index = m_idHelperSvc->isSmallChamber(id) ? MSI::ChIndexMax : MSI::ChIndexMax + 1;
++*(m_nprecHitsPerChamberLayer[index]);
}
- else if( m_idHelper->isTrigger(id) ) {
- MSI::PhiIndex index = m_idHelper->phiIndex(id);
+ else if( m_idHelperSvc->isTrigger(id) ) {
+ MSI::PhiIndex index = m_idHelperSvc->phiIndex(id);
if( measPhi ) ++*(m_nphiHitsPerChamberLayer[index]);
else ++*(m_ntrigEtaHitsPerChamberLayer[index]);
}
else {
if( measPhi ) {
- Muon::MuonStationIndex::PhiIndex index = m_idHelper->phiIndex(id);
+ Muon::MuonStationIndex::PhiIndex index = m_idHelperSvc->phiIndex(id);
++*(m_nphiHitsPerChamberLayer[index]);
}else{
- Muon::MuonStationIndex::ChIndex chIndex = m_idHelper->chamberIndex(id);
+ Muon::MuonStationIndex::ChIndex chIndex = m_idHelperSvc->chamberIndex(id);
++*(m_nprecHitsPerChamberLayer[chIndex]);
}
}
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTruthHitsFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTruthHitsFillerTool.h
index 9b39900b0878762a886fd453f3808e61af8fb2e5..b8b699c1293be85af243889580e3789667e6d4a5 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTruthHitsFillerTool.h
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTruthHitsFillerTool.h
@@ -1,10 +1,7 @@
-// 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
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-// $Id$
/**
* @file MuonD3PDMaker/src/MuonTruthHitsFillerTool.h
* @author scott snyder <snyder@bnl.gov>, from code by Niels van Eldik.
@@ -12,27 +9,22 @@
* @brief Fill truth hit information for muons.
*/
-
#ifndef MUOND3PDMAKER_MUONTRUTHHITSFILLERTOOL_H
#define MUOND3PDMAKER_MUONTRUTHHITSFILLERTOOL_H
+#include "D3PDMakerUtils/BlockFillerTool.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "D3PDMakerUtils/BlockFillerToolMulti.h"
#include "TrackRecord/TrackRecord.h"
#include "McParticleEvent/TruthParticle.h"
#include "xAODTruth/TruthParticle.h"
-#include "GaudiKernel/ToolHandle.h"
-#include <vector>
-
-
-namespace Muon {
- class MuonIdHelperTool;
-}
+#include <vector>
namespace D3PD {
-
/**
* @brief Fill truth hit information for muons.
*/
@@ -90,8 +82,7 @@ private:
std::vector<int*> m_nphiHitsPerChamberLayer;
std::vector<int*> m_ntrigEtaHitsPerChamberLayer;
- // other private
- ToolHandle<Muon::MuonIdHelperTool> m_idHelper;
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
std::vector<std::string> m_PRD_TruthNames;
};
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/PhotonEfficiencyCorrection/TPhotonEfficiencyCorrectionTool.h b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/PhotonEfficiencyCorrection/TPhotonEfficiencyCorrectionTool.h
index 5d5efe7b1934120b6f149ce4c54b6a83f0a8f60f..e2505beeffbde03d97f05ebd27a85b1b96411906 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/PhotonEfficiencyCorrection/TPhotonEfficiencyCorrectionTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/PhotonEfficiencyCorrection/TPhotonEfficiencyCorrectionTool.h
@@ -37,7 +37,6 @@ namespace Root {
TPhotonEfficiencyCorrectionTool(const char* name="TPhotonEfficiencyCorrectionTool");
~TPhotonEfficiencyCorrectionTool();
int initialize();
- int finalize();
// Additional public methods
const Result calculate( const PATCore::ParticleDataType::DataType dataType,
const unsigned int runnumber,
diff --git a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/TPhotonEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/TPhotonEfficiencyCorrectionTool.cxx
index 38946c5f516ee600699900f934109e52fc20ef86..dc200d7790b48acd9525de5b9fb9a5d533786423 100644
--- a/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/TPhotonEfficiencyCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/PhotonEfficiencyCorrection/Root/TPhotonEfficiencyCorrectionTool.cxx
@@ -27,10 +27,6 @@ int Root::TPhotonEfficiencyCorrectionTool::initialize(){
return Root::TElectronEfficiencyCorrectionTool::initialize();
}
-int Root::TPhotonEfficiencyCorrectionTool::finalize(){
- return Root::TElectronEfficiencyCorrectionTool::finalize();
-}
-
typedef Root::TPhotonEfficiencyCorrectionTool::Result Result;
const Result Root::TPhotonEfficiencyCorrectionTool::calculate( const PATCore::ParticleDataType::DataType dataType,
const unsigned int runnumber,
diff --git a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/CMakeLists.txt b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/CMakeLists.txt
index 4194416613b8d34ad69ce3880392b338f388b1fa..c1575f96e9810095c07118e94bb50071638e904e 100644
--- a/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/HeavyIonPhys/HIEventUtils/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_depends_on_subdirs( PUBLIC
Event/xAOD/xAODHIEvent
Event/xAOD/xAODTracking
Event/xAOD/xAODTrigL1Calo
- GaudiKernel
InnerDetector/InDetRecTools/InDetTrackSelectionTool
ForwardDetectors/ZDC/ZdcAnalysis
Tools/PathResolver
@@ -31,13 +30,15 @@ atlas_add_library( HIEventUtilsLib
Root/*.cxx
PUBLIC_HEADERS HIEventUtils
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers AsgTools xAODCaloEvent xAODEventInfo xAODForward xAODHIEvent xAODTracking xAODTrigL1Calo GaudiKernel PathResolver PATCoreLib
+ LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers AsgTools xAODCaloEvent xAODEventInfo xAODForward xAODHIEvent xAODTracking xAODTrigL1Calo PathResolver PATCoreLib
PRIVATE_LINK_LIBRARIES CxxUtils )
-atlas_add_component( HIEventUtils
- src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers AsgTools xAODForward xAODHIEvent xAODTracking xAODTrigL1Calo GaudiKernel PATCoreLib CxxUtils HIEventUtilsLib )
+if (NOT XAOD_STANDALONE)
+ atlas_add_component( HIEventUtils
+ src/components/*.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} CaloGeoHelpers AsgTools xAODForward xAODHIEvent xAODTracking xAODTrigL1Calo PATCoreLib CxxUtils HIEventUtilsLib )
+endif ()
# Install files from the package:
atlas_install_joboptions( share/*.py )
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/BTagAugmenterTool.h b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/BTagAugmenterTool.h
index 23c3eef0709f1e1004824f3bcb7fc7938c5f8850..2dccea7173127ca0b421e43685cae60ec087d9a8 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/BTagAugmenterTool.h
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/BTagAugmenterTool.h
@@ -22,7 +22,6 @@ namespace FlavorTagDiscriminants {
~BTagAugmenterTool();
StatusCode initialize() override;
- StatusCode finalize() override;
virtual void decorate(const xAOD::Jet& jet) const override;
private:
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DL2Tool.h b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DL2Tool.h
index cb507da622add9757be63b4a3bb6966677936167..ca12cdadd51cf86b455ecea725ed2714b5fdd472 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DL2Tool.h
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/FlavorTagDiscriminants/DL2Tool.h
@@ -26,7 +26,6 @@ namespace FlavorTagDiscriminants {
~DL2Tool();
StatusCode initialize() override;
- StatusCode finalize() override;
// returns 0 for success
virtual void decorate(const xAOD::Jet& jet) const override;
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/BTagAugmenterTool.cxx b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/BTagAugmenterTool.cxx
index 8fb50ba24eb274d06f35da80b2d3b6f3520468b6..5daf2dbcdadb3b93551f62f2baf6a794e6580353 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/BTagAugmenterTool.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/BTagAugmenterTool.cxx
@@ -22,9 +22,6 @@ namespace FlavorTagDiscriminants {
flipTagConfigFromString(m_flipTagConfig)));
return StatusCode::SUCCESS;
}
- StatusCode BTagAugmenterTool::finalize() {
- return StatusCode::SUCCESS;
- }
void BTagAugmenterTool::decorate(const xAOD::Jet& jet) const {
m_aug->augment(jet);
diff --git a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2Tool.cxx b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2Tool.cxx
index e5d6f077052d5f0ce46613538dadeb9a453d37ac..818ab6c1dc4696b681aaa123d93f7a27a7c872de 100644
--- a/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2Tool.cxx
+++ b/PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2Tool.cxx
@@ -26,9 +26,6 @@ namespace FlavorTagDiscriminants {
m_dl2.reset(new DL2HighLevel(m_props.nnFile, flipConfig));
return StatusCode::SUCCESS;
}
- StatusCode DL2Tool::finalize() {
- return StatusCode::SUCCESS;
- }
void DL2Tool::decorate(const xAOD::Jet& jet) const {
ATH_MSG_DEBUG("Decoration from: " + m_props.nnFile);
diff --git a/PhysicsAnalysis/MCTruthClassifier/CMakeLists.txt b/PhysicsAnalysis/MCTruthClassifier/CMakeLists.txt
index 2d400ab9772870cc036e8a36c687d2de3e5ddd53..0fda74025555b344a78891241d7eae804c00ef54 100644
--- a/PhysicsAnalysis/MCTruthClassifier/CMakeLists.txt
+++ b/PhysicsAnalysis/MCTruthClassifier/CMakeLists.txt
@@ -64,6 +64,7 @@ endif()
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
+ Control/AthToolSupport/AsgDataHandles
Control/AthToolSupport/AsgTools
Event/xAOD/xAODTruth
Generators/TruthUtils
@@ -78,12 +79,12 @@ if( HEPMC_FOUND )
atlas_add_library( MCTruthClassifierLib
MCTruthClassifier/*.h src/*.cxx Root/*.cxx
PUBLIC_HEADERS MCTruthClassifier
- LINK_LIBRARIES AtlasHepMCLib AsgTools xAODTruth TruthUtils ${extra_libs} )
+ LINK_LIBRARIES AtlasHepMCLib AsgTools xAODTruth TruthUtils AsgDataHandlesLib ${extra_libs} )
else()
atlas_add_library( MCTruthClassifierLib
MCTruthClassifier/*.h src/*.cxx Root/*.cxx
PUBLIC_HEADERS MCTruthClassifier
- LINK_LIBRARIES AsgTools xAODTruth TruthUtils ${extra_libs} )
+ LINK_LIBRARIES AsgTools xAODTruth TruthUtils AsgDataHandlesLib ${extra_libs} )
endif()
if( NOT XAOD_STANDALONE )
diff --git a/PhysicsAnalysis/MCTruthClassifier/MCTruthClassifier/MCTruthClassifier.h b/PhysicsAnalysis/MCTruthClassifier/MCTruthClassifier/MCTruthClassifier.h
index 82d872787eeac9cd29c679f1cf68e892054854eb..0d1b227463069ea118a33316fba44b653e20aedf 100644
--- a/PhysicsAnalysis/MCTruthClassifier/MCTruthClassifier/MCTruthClassifier.h
+++ b/PhysicsAnalysis/MCTruthClassifier/MCTruthClassifier/MCTruthClassifier.h
@@ -12,6 +12,7 @@ CREATED: Sep 2007
********************************************************************/
// INCLUDE HEADER FILES:
+#include "AsgDataHandles/ReadHandleKey.h"
#include "AsgTools/AsgTool.h"
#include "MCTruthClassifier/IMCTruthClassifier.h"
#include "MCTruthClassifier/MCTruthClassifierDefs.h"
diff --git a/PhysicsAnalysis/MCTruthClassifier/Root/MCRecoToTruth.cxx b/PhysicsAnalysis/MCTruthClassifier/Root/MCRecoToTruth.cxx
index 66873e64f05e10175e083b8121cee128b55b12fd..3f24f71d977077e207d674108faa60a6022bb1a7 100644
--- a/PhysicsAnalysis/MCTruthClassifier/Root/MCRecoToTruth.cxx
+++ b/PhysicsAnalysis/MCTruthClassifier/Root/MCRecoToTruth.cxx
@@ -3,6 +3,7 @@
*/
#ifndef GENERATIONBASE
+#include "AsgDataHandles/ReadHandle.h"
#include "MCTruthClassifier/MCTruthClassifier.h"
using namespace MCTruthPartClassifier;
using std::abs;
diff --git a/PhysicsAnalysis/MCTruthClassifier/Root/MCTruthClassifierGen.cxx b/PhysicsAnalysis/MCTruthClassifier/Root/MCTruthClassifierGen.cxx
index 31b8c4ab50e3fac8ea78c0c9f49476d0482b6220..0b405a330e3799ead7b1efd1c595d8c022221fab 100644
--- a/PhysicsAnalysis/MCTruthClassifier/Root/MCTruthClassifierGen.cxx
+++ b/PhysicsAnalysis/MCTruthClassifier/Root/MCTruthClassifierGen.cxx
@@ -8,6 +8,7 @@
*/
#include "MCTruthClassifier/MCTruthClassifier.h"
+#include "AsgDataHandles/ReadHandle.h"
using namespace MCTruthPartClassifier;
using std::abs;
diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index 25d1929013acce59ebb4ac06b54d805b3f55481e..866ee2c8959aea725e5cb44bc6b5cd225f979a68 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -18,7 +18,6 @@
- Reconstruction/Jet/JetMomentTools
- Reconstruction/Jet/JetRec
- Reconstruction/Jet/JetSubStructureMomentTools
-- Reconstruction/Jet/JetSubStructureUtils
@@ -56,7 +55,7 @@
#+ ForwardDetectors/ZDC/ZdcNtuple
+ Generators/TruthUtils
#+ InnerDetector/InDetRecTools/InDetTrackSelectionTool
-#+ InnerDetector/InDetRecTools/TrackVertexAssociationTool
++ InnerDetector/InDetRecTools/TrackVertexAssociationTool
+ MuonSpectrometer/MuonStationIndex
#+ PhysicsAnalysis/Algorithms/.*
+ PhysicsAnalysis/AnalysisCommon/AssociationUtils
@@ -68,9 +67,9 @@
#+ PhysicsAnalysis/AnalysisCommon/IsolationSelection
+ PhysicsAnalysis/AnalysisCommon/PATCore
+ PhysicsAnalysis/AnalysisCommon/PATInterfaces
-#+ PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/GammaORTools
++ PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/GammaORTools
+ PhysicsAnalysis/AnalysisCommon/PMGOverlapRemovalTools/HFORTools
-#+ PhysicsAnalysis/AnalysisCommon/PMGTools
++ PhysicsAnalysis/AnalysisCommon/PMGTools
#+ PhysicsAnalysis/AnalysisCommon/ParticleJetTools
+ PhysicsAnalysis/AnalysisCommon/PileupReweighting
+ PhysicsAnalysis/AnalysisCommon/ReweightUtils
@@ -83,10 +82,10 @@
#+ PhysicsAnalysis/HiggsPhys/Run2/HZZ/Tools/ZMassConstraint
+ PhysicsAnalysis/Interfaces/.*
#+ PhysicsAnalysis/JetMissingEtID/JetSelectorTools
-#+ PhysicsAnalysis/JetTagging/FlavorTagDiscriminants
++ PhysicsAnalysis/JetTagging/FlavorTagDiscriminants
+ PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface
+ PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency
-#+ PhysicsAnalysis/MCTruthClassifier
++ PhysicsAnalysis/MCTruthClassifier
+ PhysicsAnalysis/MuonID/MuonIDAnalysis/.*
+ PhysicsAnalysis/MuonID/MuonSelectorTools
+ PhysicsAnalysis/TauID/DiTauMassTools
diff --git a/Projects/AthGeneration/package_filters.txt b/Projects/AthGeneration/package_filters.txt
index 5115e018aeb9d38a2740c95933f04395dad6c676..60386767e4ac9cf15d018944c802dbd4a95f08f2 100644
--- a/Projects/AthGeneration/package_filters.txt
+++ b/Projects/AthGeneration/package_filters.txt
@@ -19,6 +19,7 @@
+ Control/AthContainersInterfaces
+ Control/AthContainersRoot
+ Control/AthLinks
++ Control/AthToolSupport/AsgDataHandles
+ Control/AthToolSupport/AsgMessaging
+ Control/AthToolSupport/AsgTools
+ Control/AthenaBaseComps
diff --git a/Projects/AthSimulation/CMakeLists.txt b/Projects/AthSimulation/CMakeLists.txt
index 138d3117683f579dd53250bd2681662e04026fd9..db19c97adbba36741ed8bb5fd2c629f2e36e065c 100644
--- a/Projects/AthSimulation/CMakeLists.txt
+++ b/Projects/AthSimulation/CMakeLists.txt
@@ -7,6 +7,14 @@ string( STRIP ${_version} _version )
project( AthSimulation VERSION ${_version} LANGUAGES C CXX Fortran )
unset( _version )
+# Configure flake8:
+set( ATLAS_FLAKE8 flake8_atlas --select ATL,F,E101,E7,E9,W6
+ --ignore ATL238,ATL9,E701,E702,E704,E741
+ --enable-extensions ATL902
+ CACHE STRING "Default flake8 command" )
+set( ATLAS_PYTHON_CHECKER ${ATLAS_FLAKE8} --filterFiles AthenaConfiguration
+ CACHE STRING "Python checker command to run during Python module compilation" )
+
# Find the ATLAS CMake code:
find_package( AtlasCMake QUIET )
diff --git a/Projects/AthSimulation/cmake/PreConfig.cmake.in b/Projects/AthSimulation/cmake/PreConfig.cmake.in
index aa1fba778e5ae46d70f9a48d97b7c9ff73d2b8a7..3057a37ad6b6e2a1c1dd99f001320cf4048c3408 100644
--- a/Projects/AthSimulation/cmake/PreConfig.cmake.in
+++ b/Projects/AthSimulation/cmake/PreConfig.cmake.in
@@ -2,6 +2,12 @@
# Pre-config script to propagate variables to downstream projects
#
+# Set up the project's flake8 usage.
+set( ATLAS_FLAKE8 @ATLAS_FLAKE8@
+ CACHE STRING "Default flake8 command" )
+set( ATLAS_PYTHON_CHECKER @ATLAS_PYTHON_CHECKER@
+ CACHE STRING "Python checker command to run during Python module compilation" )
+
# Due to the way CMake handles propagation of targets to dependees,
# any "external" that is used through imported targets in the build need
# to be imported explicitly here.
diff --git a/Projects/Athena/CMakeLists.txt b/Projects/Athena/CMakeLists.txt
index 150d15736ccc99fcf5006078a8db512e0863adfe..886aa8abf6ecfafcebea496e008a6e82851265d6 100644
--- a/Projects/Athena/CMakeLists.txt
+++ b/Projects/Athena/CMakeLists.txt
@@ -126,8 +126,5 @@ install( FILES
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/PostConfig.cmake
DESTINATION ${CMAKE_INSTALL_CMAKEDIR} )
-# Temporary alias to limit number of processes (ATLINFR-3046)
-atlas_add_alias( flake8 \${AthenaExternals_DIR}/${CMAKE_INSTALL_BINDIR}/flake8 -j1 )
-
# Package up the release using CPack:
atlas_cpack_setup()
diff --git a/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py b/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
index 4121f35dc331c6f30a82d85d214f0ef271da09b8..ce43bab58ff32e746b39ce67e2fd55604979cc4b 100644
--- a/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
+++ b/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py
@@ -51,7 +51,7 @@ ConstModConfigs = {
"SK": {}
}
-def getConstitModAlg(constit,suffix="",tvaKey="JetTrackVtxAssociation",vtxKey="PrimaryVertices"):
+def getConstitModAlg(constit,suffix="",tvaKey="JetTrackVtxAssoc",vtxKey="PrimaryVertices"):
inputtype = constit.basetype
# Need to extend to TCC
diff --git a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
index eb332bf7503bc020fd486243636a33ed87297f7e..4a73eacb0b4011fa4da70f37ab7080bc209e820d 100755
--- a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
+++ b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py
@@ -146,7 +146,6 @@ if __name__=="__main__":
# Config flags steer the job at various levels
from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.isMC = True
ConfigFlags.Input.Files = args.filesIn.split(",")
# Flags relating to multithreaded execution
@@ -172,6 +171,15 @@ if __name__=="__main__":
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
cfg.merge(PoolReadCfg(ConfigFlags))
+ # Nowadays the jet calibration tool requires the EventInfo
+ # to be decorated with lumi info, which is not in Run 2 AODs
+ from LumiBlockComps.LuminosityCondAlgConfig import LuminosityCondAlgCfg
+ cfg.merge(LuminosityCondAlgCfg(ConfigFlags))
+
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ muWriter = CompFactory.LumiBlockMuWriter("LumiBlockMuWriter",LumiDataKey="LuminosityCondData")
+ cfg.addEventAlgo(muWriter,"AthAlgSeq")
+
# Add the components from our jet reconstruction job
cfg.merge(JetRecTestCfg(jetdefs,ConfigFlags,args))
diff --git a/Reconstruction/Jet/JetRecConfig/test/test_JetRecCfg_build.sh b/Reconstruction/Jet/JetRecConfig/test/test_JetRecCfg_build.sh
index 375b5573850e01fcbb1ae3295fda5fff3891c44d..c6bc35229ead9eb70aa6ce4bf4ba6f95a9771843 100755
--- a/Reconstruction/Jet/JetRecConfig/test/test_JetRecCfg_build.sh
+++ b/Reconstruction/Jet/JetRecConfig/test/test_JetRecCfg_build.sh
@@ -1 +1 @@
-JetRecTestCfg.py -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1
+JetRecTestCfg.py -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1 -n 10
diff --git a/Reconstruction/Jet/JetResolution/CMakeLists.txt b/Reconstruction/Jet/JetResolution/CMakeLists.txt
deleted file mode 100644
index 6fb01a9db28e27cfaeb25eb3d4e9cae5f03cbd28..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: CMakeLists.txt 766594 2016-08-04 23:13:11Z will $
-################################################################################
-# Package: JetResolution
-################################################################################
-
-# Declare the package name:
-atlas_subdir( JetResolution )
-
-# Extra dependencies, based on the build environment:
-set( extra_deps )
-set( extra_libs )
-set( extra_srcs )
-if( NOT XAOD_STANDALONE )
- set( extra_deps Control/AthAnalysisBaseComps
- Control/AthenaBaseComps GaudiKernel )
- set( extra_libs AthAnalysisBaseCompsLib AthenaBaseComps GaudiKernel )
- set( extra_srcs src/*.h src/*.cxx )
-endif()
-
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODJet
- PhysicsAnalysis/AnalysisCommon/PATInterfaces
- PRIVATE
- Event/xAOD/xAODEventInfo
- Tools/PathResolver
- ${extra_deps} )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Hist Physics Tree TreePlayer )
-
-# Component(s) in the package:
-atlas_add_library( JetResolutionLib
- JetResolution/*.h Root/*.cxx ${extra_srcs}
- PUBLIC_HEADERS JetResolution
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools xAODJet PATInterfaces
- PRIVATE_LINK_LIBRARIES xAODEventInfo PathResolver ${extra_libs} )
-
-if( NOT XAOD_STANDALONE )
- atlas_add_component( JetResolution
- src/components/*.cxx
- LINK_LIBRARIES JetResolutionLib )
-endif()
-
-atlas_add_dictionary( JetResolutionDict
- JetResolution/JetResolutionDict.h
- JetResolution/selection.xml
- LINK_LIBRARIES JetResolutionLib )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/Jet/JetResolution/JetResolution/IJERSmearingTool.h b/Reconstruction/Jet/JetResolution/JetResolution/IJERSmearingTool.h
deleted file mode 100644
index 75d04c30ac2218d94adb36e57a87f163d01f31ea..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/JetResolution/IJERSmearingTool.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETRESOLUTION_IJERSMEARINGTOOL_H
-#define JETRESOLUTION_IJERSMEARINGTOOL_H
-
-// EDM includes
-#include "xAODJet/Jet.h"
-
-// Other includes
-#include "PATInterfaces/CorrectionCode.h"
-#include "PATInterfaces/ISystematicsTool.h"
-
-
-/// Interface class for smearing the jet energy resolution
-///
-/// @author Steve Farrell <steven.farrell@cern.ch>
-///
-class IJERSmearingTool : public virtual CP::ISystematicsTool
-{
-
- // Declare the interface that the class provides
- ASG_TOOL_INTERFACE( IJERSmearingTool )
-
- public:
-
- /// Virtual destructor
- virtual ~IJERSmearingTool(){};
-
- /// Apply the JER correction on a modifiable jet
- virtual CP::CorrectionCode applyCorrection( xAOD::Jet& jet ) = 0;
-
- /// Create a JER-corrected copy from a const jet
- virtual CP::CorrectionCode correctedCopy( const xAOD::Jet& input,
- xAOD::Jet*& output ) = 0;
-
- /// Optional method to set random seed. Note that the tool
- /// already has a deterministic way to do this using the jet phi.
- virtual void setRandomSeed(long int) = 0;
-
-}; // class IJERSmearingTool
-
-#endif
diff --git a/Reconstruction/Jet/JetResolution/JetResolution/IJERTool.h b/Reconstruction/Jet/JetResolution/JetResolution/IJERTool.h
deleted file mode 100644
index 8a005a58b8944d2552e6fedd9f4f406bf2cac910..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/JetResolution/IJERTool.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETRESOLUTION_IJERTOOL_H
-#define JETRESOLUTION_IJERTOOL_H
-
-// Framework includes
-#include "AsgTools/IAsgTool.h"
-#include "PATInterfaces/CorrectionCode.h"
-
-// EDM includes
-#include "xAODJet/Jet.h"
-
-// Local includes
-#include "JetResolution/JERDefs.h"
-
-/// Tool interface class for accessing the jet energy resolution
-///
-/// @author Steve Farrell <steven.farrell@cern.ch>
-///
-class IJERTool : public virtual asg::IAsgTool
-{
-
- /// Declare the interface that the class provides
- ASG_TOOL_INTERFACE( IJERTool )
-
- public:
-
- /// Virtual destructor for proper memory cleanup
- virtual ~IJERTool(){};
-
- /// Read the resolution from the MC parameterization
- virtual double getRelResolutionMC(const xAOD::Jet* jet) = 0;
-
- /// Obtain the resolution for data (sigma_MC + offset)
- virtual double getRelResolutionData(const xAOD::Jet* jet) = 0;
-
- /// Calculate resolution uncertainty
- virtual double getUncertainty(const xAOD::Jet* jet,
- JER::Uncert errType = JER::JER_NP_ALL) = 0;
-
-}; // class IJERTool
-
-#endif // JETRESOLUTION_IJERTOOL_H
diff --git a/Reconstruction/Jet/JetResolution/JetResolution/JERDefs.h b/Reconstruction/Jet/JetResolution/JetResolution/JERDefs.h
deleted file mode 100644
index 6cb428fcb0029f272257126a3bfc221b2da21957..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/JetResolution/JERDefs.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETRESOLUTION_JERDEFS_H
-#define JETRESOLUTION_JERDEFS_H
-
-/// @file This header contains general definitions for JetResolution software
-
-namespace JER
-{
-
- struct ROOT6_OpenNamespaceWorkaround { }; // workaround for reflex dict generation
-
- /// Jet algorithms supported by the JER tools
- enum JetAlg
- {
- JETALG_UNDEFINED = -1,
- AKt4EM = 0,
- // AKt4LC,
- //AKt6EM,
- //AKt6LC,
- JETALG_N
- };
-
- /// JER insitu uncertainties
- /* enum Uncert
- {
- UNCERT_UNDEFINED = -1,
- JER_NP0 = 0,
- JER_NP1,
- JER_NP2,
- JER_NP3,
- JER_NP4,
- JER_NP5,
- JER_NP6,
- JER_NP7,
- JER_NP8,
- JER_NOISE_FORWARD, //9
- JER_xCALIB_50nsVs25ns, //10
- JER_xCALIB_5Vs4sample, //11
- JER_xCALIB_TopoClustering, //12
- JER_xCALIB_EarlyData, //13
- JER_xCALIB_NoiseThreshold, //14
- JER_xCALIB_UE, //15
- JER_xCALIB_PhiModulation, //16
- JER_NP_ALL, // All NPs combined in quadrature
- UNCERT_N
- };*/
-
- //JER NPs reduced to 9 inclusing xCalibrations
- enum Uncert
- {
- UNCERT_UNDEFINED = -1,
- JER_NP0 = 0,
- JER_NP1,
- JER_NP2,
- JER_NP3,
- JER_NP4,
- JER_NP5,
- JER_NP6,
- JER_NP7,
- JER_NP8,
- JER_NOISE_FORWARD, //9
- JER_CROSS_CALIB_50nsVs25ns,//10
- JER_CROSS_CALIB_5Vs4sample,
- JER_CROSS_CALIB_TopoClustering,
- JER_CROSS_CALIB_EarlyData,
- JER_CROSS_CALIB_NoiseThreshold,
- JER_CROSS_CALIB_UnderlyingEvent,
- JER_CROSS_CALIB_PhiModulation,//16
- JER_NP_ALL, //17 All NPs combined in quadrature
- JER_CROSS_CALIB_ALL, //18 All xCalib NPs combined in quadrature
- UNCERT_N
- };
-
-
- namespace units
- {
- const double GeV = 1.e3;
- const double TeV = 1.e6;
- const double invGeV = 1.e-3;
- const double invTeV = 1.e-6;
- }
-
-}
-
-#endif // JETRESOLUTION_JERDEFS_H
diff --git a/Reconstruction/Jet/JetResolution/JetResolution/JERSmearingTool.h b/Reconstruction/Jet/JetResolution/JetResolution/JERSmearingTool.h
deleted file mode 100644
index 543c908d7bb5e38bf04a819b5fc5f1f87477b2fd..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/JetResolution/JERSmearingTool.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETRESOLUTION_JERSMEARINGTOOL_H
-#define JETRESOLUTION_JERSMEARINGTOOL_H
-
-// Framework includes
-#include "AsgTools/AsgTool.h"
-#include "AsgTools/ToolHandle.h"
-#include "PATInterfaces/CorrectionTool.h"
-
-// EDM includes
-#include "xAODJet/JetContainer.h"
-
-// Local includes
-#include "JetResolution/IJERSmearingTool.h"
-#include "JetResolution/IJERTool.h"
-
-// Other includes
-#include "TRandom3.h"
-
-
-/// Implementation of the dual-use JER smearing tool interface
-///
-/// This tool allows to smear the energy of jets either to correct
-/// the jet energy resolution or to evaluate systematic uncertainties.
-/// For information, see the Twiki:
-/// https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetEnergyResolutionXAODTools
-///
-/// @author Steve Farrell <steven.farrell@cern.ch>
-///
-class JERSmearingTool : public asg::AsgTool,
- public IJERSmearingTool,
- public CP::CorrectionTool<xAOD::JetContainer>
-{
-
- /// Proper constructor for Athena
- ASG_TOOL_CLASS( JERSmearingTool, IJERSmearingTool )
-
- public:
-
- /// Standard constructor for standalone usage
- JERSmearingTool(const std::string& name);
- /// Copy constructor for reflex in Athena
- JERSmearingTool(const JERSmearingTool& other);
-
- /// We shouldn't need assignment; regardless, it's not implemented
- JERSmearingTool& operator=(const JERSmearingTool&) = delete;
-
- /// @name Methods implementing the asg::IAsgTool interface
- /// @{
-
- /// Initialize the tool
- virtual StatusCode initialize();
-
- /// @}
-
- /// @name Methods implementing the IJERSmearingTool interface
- /// @{
-
- /// Apply the JER correction on a modifiable jet
- virtual CP::CorrectionCode applyCorrection(xAOD::Jet& jet);
-
- /// Create a JER-corrected copy from a const jet
- virtual CP::CorrectionCode correctedCopy(const xAOD::Jet& input,
- xAOD::Jet*& output)
- {
- return CP::CorrectionTool<xAOD::JetContainer>::
- correctedCopy(input, output);
- }
-
- /// Optional method to set random seed. Note that the tool
- /// already has a deterministic way to do this using the jet phi.
- virtual void setRandomSeed(long int seed)
- { m_userSeed = seed; }
-
- /// @}
-
- /// @name Methods implementing the ISystematicsTool interface
- /// @{
-
- /// Specify whether tool is affected by provided systematic
- virtual bool isAffectedBySystematic
- (const CP::SystematicVariation& systematic) const;
-
- /// List of all systematics affecting this tool
- virtual CP::SystematicSet affectingSystematics() const;
-
- /// List of all systematics recommended for this tool
- virtual CP::SystematicSet recommendedSystematics() const;
-
- /// Configure tool to apply systematic variation
- virtual CP::SystematicCode applySystematicVariation
- (const CP::SystematicSet& systematics);
-
- /// @}
-
- protected:
-
- /// Get nominal smearing factor
- double getSmearingFactorNom(const xAOD::Jet* jet);
-
- /// Get the systematic uncert smearing factor
- double getSmearingFactorSys(const xAOD::Jet* jet);
-
- /// Calculate the random gaussian smear factor for a requested sigma
- double getSmearingFactor(const xAOD::Jet* jet, double sigma);
-
- private:
-
- /// Handle to the associated JERTool
- ToolHandle<IJERTool> m_jerTool;
- /// Workaround to set the JERTool tool handle in PyROOT
- std::string m_jerToolName;
-
- /// Configuration flag for toggling nominal smearing
- bool m_applyNominalSmearing;
-
- /// isMC flag
- bool m_isMC;
-
- /// Systematic breakdown configuration: "Simple" or "Full"
- std::string m_sysMode;
-
- /// Random number generator
- TRandom3 m_rand;
- /// Optional user seed
- long int m_userSeed;
-
- /// Systematic filtering map.
- /// Note that the output of the map could be something other than
- /// SystematicSet. We could use pair<SysEnum, value>, for example, which
- /// actually might make the applyCorrection method cleaner.
- typedef std::unordered_map<CP::SystematicSet, CP::SystematicSet> SysFiterMap_t;
- SysFiterMap_t m_sysFilterMap;
-
- /// Points to the current systematic configuration
- const CP::SystematicSet* m_sysConfig;
-
-}; // class JERSmearingTool
-
-#endif
diff --git a/Reconstruction/Jet/JetResolution/JetResolution/JERTool.h b/Reconstruction/Jet/JetResolution/JetResolution/JERTool.h
deleted file mode 100644
index f07e297b35f97f3f414e32d6057a5f74d159f6c3..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/JetResolution/JERTool.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETRESOLUTION_JERTOOL_H
-#define JETRESOLUTION_JERTOOL_H
-
-// ROOT includes
-#include "TClass.h"
-#include "TFile.h"
-#include "TF1.h"
-#include "TGraph.h"
-#include "TGraphErrors.h"
-#include "TAxis.h"
-
-// Framework includes
-#include "AsgTools/AsgMetadataTool.h"
-
-// Local includes
-#include "JetResolution/IJERTool.h"
-
-
-/// A dual-use tool which provides the jet energy resolution and
-/// associated uncertainties. For more information, see:
-/// https://twiki.cern.ch/twiki/bin/view/AtlasProtected/JetEnergyResolutionXAODTools
-///
-/// Resolution and uncertainty are retrieved using the getRelResolutionMC,
-/// getRelResolutionData, and getUncertainty methods.
-///
-/// @author Steve Farrell <steven.farrell@cern.ch>
-/// @date July 2014
-///
-class JERTool : public virtual IJERTool,
- public asg::AsgMetadataTool
-{
-
- /// Create a proper constructor for Athena
- ASG_TOOL_CLASS( JERTool, IJERTool )
-
- public:
-
- /// Create a constructor for standalone usage
- JERTool(const std::string& name);
-
- /// Copy constructor needed for reflex dictionary generation in Athena
- JERTool(const JERTool&);
-
- /// We shouldn't need assignment, but regardless it isn't implemented.
- JERTool& operator=(const JERTool&) = delete;
-
- /// Destructor
- ~JERTool();
-
-
- ///-----------------------------------------------------------------------
- /// @name Methods implementing the asg::IAsgTool interface
- /// @{
-
- /// Initialize the tool
- virtual StatusCode initialize();
-
- /// @}
-
- ///-----------------------------------------------------------------------
- /// @name Methods implementing the IJERTool interface.
- /// @{
-
- /// Read the resolution from the MC parameterization
- double getRelResolutionMC(const xAOD::Jet* jet);
-
- /// Obtain the resolution for data (sigma_MC + offset)
- double getRelResolutionData(const xAOD::Jet* jet);
-
- /// Calculate resolution uncertainty
- double getUncertainty(const xAOD::Jet* jet,
- JER::Uncert errType = JER::JER_NP_ALL);
-
- /// @}
-
- protected:
-
- /// Attempt auto-configuration of tool using Metadata.
- /// This currently only works in Athena.
- StatusCode autoConfigure();
-
- /// Helper method for parsing the configuration
- StatusCode parseConfiguration();
- /// Helper method for loading the JER inputs
- StatusCode loadJERInputs();
-
- /// Get eta bin corresponding for this jet.
- /// Indexing convention of eta regions is off-by-one
- /// with respect to the TAxis (etaBin = TAxisBin - 1)
- int getEtaBin(const xAOD::Jet* jet);
-
- private:
-
- /// Binning
- /// TODO: Think of a better way to do this.
- /// For example, can't we take these from the input file??
- // static const unsigned int m_nNP = 9;
- static const unsigned int m_nEtaBins = 7;
- //static const unsigned int m_nJetCol = 4;
-
- TAxis* m_etaAxis;
-
- /// Configuration
- std::string m_fileName;
- int m_jetAlgo; // JER::JetAlg
- std::string m_collectionName;
- //std::string m_simulationType;
- //bool m_useAutoConfig;
-
- /// Nuisance parameter graphs.
- /// TODO: think about a better structure for these.
- /// Previously, these maps were keyed by eta. Maybe we could use TGraph2D
- /// and instead key them by NP.
- TGraph* m_jerNP[JER::JETALG_N][m_nEtaBins][JER::JER_NP_ALL];
-
-}; // class JERTool
-
-#endif // JETRESOLUTION_JERTOOL_H
diff --git a/Reconstruction/Jet/JetResolution/JetResolution/JetResolutionDict.h b/Reconstruction/Jet/JetResolution/JetResolution/JetResolutionDict.h
deleted file mode 100644
index 45ed3a468f11f3b0b1ec989767b69f3a930827fe..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/JetResolution/JetResolutionDict.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETRESOLUTION_JETRESOLUTIONDICT_H
-#define JETRESOLUTION_JETRESOLUTIONDICT_H
-
-// Reflex dictionary generation
-// Following instructions on the CP tools twiki:
-// https://twiki.cern.ch/twiki/bin/viewauth/AtlasComputing/DevelopingCPToolsForxAOD
-
-// Special handling for Eigen vectorization
-#if defined(__GCCXML__) and not defined(EIGEN_DONT_VECTORIZE)
-#define EIGEN_DONT_VECTORIZE
-#endif
-
-// Tool headers
-#include "JetResolution/JERTool.h"
-#include "JetResolution/JERSmearingTool.h"
-#include "JetResolution/JERDefs.h"
-
-#endif
diff --git a/Reconstruction/Jet/JetResolution/JetResolution/selection.xml b/Reconstruction/Jet/JetResolution/JetResolution/selection.xml
deleted file mode 100644
index d577196a61a886de3160942e7b7117f9634fec70..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/JetResolution/selection.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<lcgdict>
-
- <!-- JetResolution tools -->
- <namespace name="JER"/>
- <class name="JER::ROOT6_OpenNamespaceWorkaround"/>
- <enum pattern="JER::*"/>
- <class name="IJERTool"/>
- <class name="JERTool"/>
- <class name="IJERSmearingTool"/>
- <class name="JERSmearingTool"/>
-
- <!-- Suppress unwanted dictionaries generated by ROOT 6 -->
- <exclusion>
- <class name="SG::IConstAuxStore"/>
- <class name="DataLink<SG::IConstAuxStore>"/>
- <class name="xAOD::IParticle"/>
- <class name="DataVector<xAOD::IParticle>"/>
- <class name="ElementLink<DataVector<xAOD::IParticle> >"/>
- </exclusion>
-
-</lcgdict>
-
diff --git a/Reconstruction/Jet/JetResolution/Root/JERSmearingTool.cxx b/Reconstruction/Jet/JetResolution/Root/JERSmearingTool.cxx
deleted file mode 100644
index 711f812ec89519a8d586c5013750539953a1fa8d..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/Root/JERSmearingTool.cxx
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// System includes
-#include <cmath>
-#include <stdexcept>
-
-// Local includes
-#include "JetResolution/JERSmearingTool.h"
-
-// Other includes
-#include "PATInterfaces/SystematicRegistry.h"
-
-// Simple configuration
-static const CP::SystematicSet simpleSysts = {
- CP::SystematicVariation("JET_JER_SINGLE_NP", 1)
-};
-
-// Full configuration
-static const CP::SystematicSet fullSysts = {
- CP::SystematicVariation("JET_JER_NP0", 1),
- CP::SystematicVariation("JET_JER_NP0", -1),
- CP::SystematicVariation("JET_JER_NP1", 1),
- CP::SystematicVariation("JET_JER_NP1", -1),
- CP::SystematicVariation("JET_JER_NP2", 1),
- CP::SystematicVariation("JET_JER_NP2", -1),
- CP::SystematicVariation("JET_JER_NP3", 1),
- CP::SystematicVariation("JET_JER_NP3", -1),
- CP::SystematicVariation("JET_JER_NP4", 1),
- CP::SystematicVariation("JET_JER_NP4", -1),
- CP::SystematicVariation("JET_JER_NP5", 1),
- CP::SystematicVariation("JET_JER_NP5", -1),
- CP::SystematicVariation("JET_JER_NP6", 1),
- CP::SystematicVariation("JET_JER_NP6", -1),
- CP::SystematicVariation("JET_JER_NP7", 1),
- CP::SystematicVariation("JET_JER_NP7", -1),
- CP::SystematicVariation("JET_JER_NP8", 1),
- CP::SystematicVariation("JET_JER_NP8", -1),
- CP::SystematicVariation("JET_JER_NOISE_FORWARD", 1),
- CP::SystematicVariation("JET_JER_CROSS_CALIB_FORWARD", 1)
-};
-
-//-----------------------------------------------------------------------------
-// Standard ASG tool constructor
-//-----------------------------------------------------------------------------
-JERSmearingTool::JERSmearingTool(const std::string& name)
- : asg::AsgTool(name),
- m_jerTool("JERTool/JERTool"),
- m_userSeed(0),
- m_sysConfig(nullptr)
-{
- // Property for setting the tool handle directly
- declareProperty("JERTool", m_jerTool);
- // Temporary workaround for setting the JERTool in PyROOT
- declareProperty("JERToolName", m_jerToolName="");
- // Keeping this here for backwards compatibility,
- // but nominal smearing is actually disabled for now.
- declareProperty("ApplyNominalSmearing", m_applyNominalSmearing = false,
- "If set to false, smearing only applied for JER sys");
- declareProperty("isMC", m_isMC = true,
- "set to true if you run on MC, set to false if you run on "
- "data or pseudo-data");
- // Could use an enum for this setting if preferred
- declareProperty("SystematicMode", m_sysMode = "Simple",
- "Combined NP (Simple) or full sys breakdown (Full)");
- // Apply nominal sys config
- applySystematicVariation(CP::SystematicSet()).ignore();
-}
-
-//-----------------------------------------------------------------------------
-// Copy constructor for reflex in Athena.
-// Implement a shallow copy for now. Come back to this later.
-// TODO: update this with the new data members.
-//-----------------------------------------------------------------------------
-JERSmearingTool::JERSmearingTool(const JERSmearingTool& other)
- : asg::AsgTool(other.name() + "_copy"),
- m_jerTool(other.m_jerTool),
- m_jerToolName(other.m_jerToolName),
- m_applyNominalSmearing(other.m_applyNominalSmearing),
- m_rand(other.m_rand),
- m_userSeed(other.m_userSeed),
- m_sysConfig(nullptr)
-{}
-
-//-----------------------------------------------------------------------------
-// Initialize the tool
-//-----------------------------------------------------------------------------
-StatusCode JERSmearingTool::initialize()
-{
- // Greet the user
- ATH_MSG_INFO("Initializing JER smearing tool");
-
- // Workaround for configuring ToolHandle in PyROOT
- if(!m_jerToolName.empty())
- m_jerTool = ToolHandle<IJERTool>(m_jerToolName);
-
- // Try to retrieve the JERTool
- if(m_jerTool.retrieve() != StatusCode::SUCCESS){
- ATH_MSG_ERROR("Cannot retrieve the JER tool!");
- return StatusCode::FAILURE;
- }
-
- // Nominal smearing is disabled for now
- if(m_applyNominalSmearing){
- ATH_MSG_WARNING("Nominal smearing is currently unsupported. Disabling");
- m_applyNominalSmearing = false;
- }
-
- // Make sure we have a valid systematic mode
- if(m_sysMode != "Simple" && m_sysMode != "Full"){
- ATH_MSG_ERROR("Unsupported SystematicMode: " << m_sysMode);
- ATH_MSG_ERROR("Should be 'Simple' or 'Full'");
- return StatusCode::FAILURE;
- }
-
- // Add the affecting systematics to the global registry
- CP::SystematicRegistry& registry = CP::SystematicRegistry::getInstance();
- if(registry.registerSystematics(*this) != CP::SystematicCode::Ok){
- ATH_MSG_ERROR("Unable to register systematics!");
- return StatusCode::FAILURE;
- }
-
- return StatusCode::SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// Apply the JER correction on a modifiable jet
-//-----------------------------------------------------------------------------
-CP::CorrectionCode JERSmearingTool::applyCorrection(xAOD::Jet& jet)
-{
- bool applySys = !m_sysConfig->empty();
- if(applySys || m_applyNominalSmearing){
- // TODO: change these methods to return a StatusCode instead?
- // I don't know, exceptions are pretty nice to use (internally only).
- double smear = 0.;
- try {
- smear = applySys ? getSmearingFactorSys(&jet)
- : getSmearingFactorNom(&jet);
- }
- catch(const std::logic_error& err){
- ATH_MSG_FATAL("Logic error in smearing factor: " << err.what());
- return CP::CorrectionCode::Error;
- }
-
- // Sanity check
- ATH_MSG_DEBUG("Applying smearing factor: " << smear);
- if(smear < 0) ATH_MSG_WARNING("Negative smear factor: " << smear);
-
- // No non-const accessor, so I need to copy the p4 to modify it.
- // Maybe we can set pt and E only. It would reduce the number of
- // branches in shallow copies.
- xAOD::JetFourMom_t p4 = jet.jetP4();
- jet.setJetP4(p4*smear);
- }
-
- return CP::CorrectionCode::Ok;
-}
-
-//-----------------------------------------------------------------------------
-// Declare affecting systematics
-//-----------------------------------------------------------------------------
-bool JERSmearingTool::isAffectedBySystematic
-(const CP::SystematicVariation& systematic) const
-{
- // Using 'find' is sufficient until this tool supports continuous
- // variations, at which point I'll need to use the 'match' method.
- static CP::SystematicSet sys = affectingSystematics();
- return sys.find(systematic) != sys.end();
-}
-//-----------------------------------------------------------------------------
-CP::SystematicSet JERSmearingTool::affectingSystematics() const
-{
- CP::SystematicSet result;
- result.insert(simpleSysts);
- result.insert(fullSysts);
- return result;
-}
-//-----------------------------------------------------------------------------
-CP::SystematicSet JERSmearingTool::recommendedSystematics() const
-{
- // Currently two possible recommendations: Simple and Full
- if(m_sysMode == "Simple") return simpleSysts;
- if(m_sysMode == "Full") return fullSysts;
- else{
- ATH_MSG_WARNING("Unsupported SystematicMode: " << m_sysMode);
- ATH_MSG_WARNING("Should be 'Simple' or 'Full'");
- ATH_MSG_WARNING("Returning an empty set");
- }
- return CP::SystematicSet();
-}
-
-//-----------------------------------------------------------------------------
-// Apply systematic configuration
-//-----------------------------------------------------------------------------
-CP::SystematicCode JERSmearingTool::applySystematicVariation
-(const CP::SystematicSet& systematics)
-{
- // First check if we already know this systematic configuration.
- // Look for it in our filter map.
- auto sysMapItr = m_sysFilterMap.find(systematics);
-
- // If this is a new input set, we need to filter it.
- if(sysMapItr == m_sysFilterMap.end()){
-
- // Filter the input systematics with my affecting systematics.
- // Should be ok to use static here, as the affecting systematics should be
- // the same across any instance of this tool.
- static const CP::SystematicSet affectingSysts = affectingSystematics();
- CP::SystematicSet filteredSysts;
- if( CP::SystematicSet::
- filterForAffectingSystematics(systematics, affectingSysts, filteredSysts) !=
- CP::SystematicCode::Ok ) {
- ATH_MSG_ERROR("Received unsupported systematics: " << systematics.name());
- return CP::SystematicCode::Unsupported;
- }
-
- // At this point, we can do some additional checks for consistency
- // with the JER functionality. For example, if the tool can only handle
- // one type of systematic at a time, we return an error if the filtered
- // set has more than one item:
- if(filteredSysts.size() > 1){
- ATH_MSG_ERROR("No support for more than one JER sys at a time: " <<
- filteredSysts.name());
- return CP::SystematicCode::Unsupported;
- }
-
- // Insert the new filtered set onto our filter map
- sysMapItr = m_sysFilterMap.insert
- (std::make_pair(systematics, filteredSysts)).first;
-
- }
-
- // Apply the filtered systematics
- m_sysConfig = &sysMapItr->second;
-
- return CP::SystematicCode::Ok;
-}
-
-//-----------------------------------------------------------------------------
-// Get random nominal smearing factor to match the jet energy resolution
-// in MC to the resolution in data
-//-----------------------------------------------------------------------------
-double JERSmearingTool::getSmearingFactorNom(const xAOD::Jet* jet)
-{
- double resMC = m_jerTool->getRelResolutionMC(jet);
- double resData = m_jerTool->getRelResolutionData(jet);
- double sigma = resData > resMC ? sqrt(resData*resData - resMC*resMC) : 0.0;
- ATH_MSG_DEBUG("Retrieved nominal jet resolution values: MC " << resMC <<
- " Data " << resData << " SmearSigma " << sigma);
- return getSmearingFactor(jet, sigma);
-}
-
-//-----------------------------------------------------------------------------
-// Get random smearing factor for evaluating jet energy resolution
-// systematic uncertainty
-//-----------------------------------------------------------------------------
-double JERSmearingTool::getSmearingFactorSys(const xAOD::Jet* jet)
-{
- // For now, assuming there is only one (affecting) systematic at a time.
- // If we want to allow simultaneous variations, then the code will need
- // to be updated to apply multiple variations on top of each other.
- if(m_sysConfig->size() != 1)
- throw std::logic_error("More than one affecting systematic received");
- const CP::SystematicVariation& sys = *m_sysConfig->begin();
-
- // MC resolution
- double resMC = m_jerTool->getRelResolutionMC(jet);
- // Data resolution
- double resData = m_jerTool->getRelResolutionData(jet);
-
- // The smearing parameter
- double smearingSigma = 0.; double resSys = 0.; double sigmaNP = 0.;
-
- // All NPs combined in quadrature
- if(sys.basename() == "JET_JER_SINGLE_NP"){
- // Systematic-shifted resolution
- resSys = resMC + m_jerTool->getUncertainty(jet, JER::JER_NP_ALL);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
-
- // NP 0
- else if(sys.basename() == "JET_JER_NP0"){
- // Size and sign of the requested variation.
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP0);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // NP 1
- else if(sys.basename() == "JET_JER_NP1"){
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP1);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // NP 2
- else if(sys.basename() == "JET_JER_NP2"){
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP2);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // NP 3
- else if(sys.basename() == "JET_JER_NP3"){
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP3);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // NP 4
- else if(sys.basename() == "JET_JER_NP4"){
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP4);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // NP 5
- else if(sys.basename() == "JET_JER_NP5"){
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP5);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // NP 6
- else if(sys.basename() == "JET_JER_NP6"){
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP6);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // NP 7
- else if(sys.basename() == "JET_JER_NP7"){
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP7);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // NP 8
- else if(sys.basename() == "JET_JER_NP8"){
- float sysVar = sys.parameter();
- sigmaNP = sysVar * m_jerTool->getUncertainty(jet, JER::JER_NP8);
-
- if (sigmaNP > 0.){
- resSys = resData + sigmaNP;
- smearingSigma = m_isMC ? 0. : sqrt(resSys*resSys - resData*resData);
- }
- else {
- resSys = resMC + fabs(sigmaNP);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0. ;
- }
- }
-
- // JER_NOISE_FORWARD, Be careful: Noise forward unc is stored as relative;
- // need to use absolute (jerMC*unc)
- else if(sys.basename() == "JET_JER_NOISE_FORWARD"){
- // Systematic-shifted resolution
- resSys = resMC + resMC*m_jerTool->getUncertainty(jet, JER::JER_NOISE_FORWARD);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0.;
- }
-
- // JER from cross calibration
- else if(sys.basename() == "JET_JER_CROSS_CALIB_FORWARD"){
- // Systematic-shifted resolution
- resSys = resMC + m_jerTool->getUncertainty(jet, JER::JER_CROSS_CALIB_ALL);
- smearingSigma = m_isMC ? sqrt(resSys*resSys - resMC*resMC) : 0.;
- }
-
- // Whatever else will be expected
- //else if(...)
- //}
-
- // We should only get to unknown systematic if there's some
- // kind of logic error in the code. E.g., maybe we were supposed
- // to be applying nominal settings in this case.
- else throw std::logic_error("Bad syst config");
-
- ATH_MSG_DEBUG("sigmaNP: " << sigmaNP );
- ATH_MSG_DEBUG("Retrieved systematic jet resolution values: MC " << resMC <<
- " Systematic Name " << sys.basename() << " SysUp " << resSys <<
- " SmearSigma " << smearingSigma);
-
- return getSmearingFactor(jet, smearingSigma);
-}
-
-//-----------------------------------------------------------------------------
-// Get the random smearing factor for a given sigma
-//-----------------------------------------------------------------------------
-double JERSmearingTool::getSmearingFactor(const xAOD::Jet* jet, double sigma)
-{
- // Set the seed
- long int seed = m_userSeed;
- if(seed == 0) seed = 1.e+5*std::abs(jet->phi());
- m_rand.SetSeed(seed);
-
- // Calculate the smearing factor
- double smear = m_rand.Gaus(1.0, sigma);
- if(smear > 0) return smear;
-
- // If smear factor is negative, then retry the calculation
- int tries = 1;
- const int maxTries = 20;
- while(smear <= 0 && tries <= maxTries){
- ATH_MSG_DEBUG("Negative smear factor, " << smear << ", after " <<
- tries << " tries.");
- smear = m_rand.Gaus(1.0, sigma);
- tries++;
- }
-
- // If smear factor is still negative, something is wrong.
- if(smear <= 0){
- ATH_MSG_WARNING("Negative smear factor, " << smear << ", after " <<
- tries << " tries.");
- ATH_MSG_WARNING("Please contact the JER tool developers");
- }
-
- return smear;
-}
diff --git a/Reconstruction/Jet/JetResolution/Root/JERTool.cxx b/Reconstruction/Jet/JetResolution/Root/JERTool.cxx
deleted file mode 100644
index f025c49cdaa8a8707f188199fdcbe7182ed61a80..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/Root/JERTool.cxx
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// STD includes
-#include <sstream>
-
-// ROOT includes
-#include "TROOT.h"
-#include "TSystem.h"
-#include "TH1.h"
-
-// EDM includes
-#include "xAODJet/Jet.h"
-
-// Non-local includes
-#include "PathResolver/PathResolver.h"
-#ifndef XAOD_STANDALONE
-# include "AthAnalysisBaseComps/AthAnalysisHelper.h"
-#endif
-
-// Local includes
-#include "JetResolution/JERTool.h"
-
-/*#ifndef XAOD_STANDALONE
-static const bool autoConfigDefault = true;
-#else
-static const bool autoConfigDefault = false;
-#endif
-*/
-
-// Just some constants for unit conversion
-using namespace JER::units;
-
-// Helper function in anonymous namespace
-namespace
-{
- template<class T> StatusCode getFromFile(const std::string& name,
- TFile* file, T*& obj)
- {
- obj = dynamic_cast<T*> ( file->Get(name.c_str()) );
- if(obj == nullptr)
- return StatusCode::FAILURE;
-
- // Take ownership of histograms from ROOT.
- if(T::Class()->InheritsFrom("TH1")){
- // This cast is invalid for non hist-types, hence the dynamic cast
- // is needed to make this compile generically. Coverity then spits
- // a warning if we don't actually test the result. Could probably
- // make this cleaner with some fancy template footwork, but meh.
- TH1* h = dynamic_cast<TH1*>(obj);
- if(h == nullptr) return StatusCode::FAILURE;
- h->SetDirectory(0);
- }
-
- // Remove TF1s from ROOT's control, to avoid ROOT
- // cleaning them up early in PyROOT.
- if(T::Class()->InheritsFrom("TF1"))
- gROOT->GetListOfFunctions()->Remove(obj);
-
- return StatusCode::SUCCESS;
- }
-}
-
-//-----------------------------------------------------------------------------
-// Standard ASG tool constructor
-//-----------------------------------------------------------------------------
-JERTool::JERTool(const std::string& name)
- : asg::AsgMetadataTool(name),
- m_etaAxis(NULL),
- m_jetAlgo(JER::JETALG_UNDEFINED)
-{
- declareProperty("PlotFileName", m_fileName = "JetResolution/Prerec2015_xCalib_2012JER_ReducedTo9NP_Plots_v2.root");
- //declareProperty("JetAlg", m_jetAlgo = JER::AKt4EM);
- declareProperty("CollectionName", m_collectionName = "AntiKt4EMTopoJets");
-
- // Not clear if we'll still use these options
- // Auto-config is only applied in Athena
- //declareProperty("UseAutoConfiguration", m_useAutoConfig = true,
- // "Configure BeamEnergy and SimulationType from Metadata");
- //declareProperty("SimulationType", m_simulationType = "FullSim",
- // "Specify simulation type: {FullSim, AFII}");
-
- for(unsigned int i = 0; i < JER::JETALG_N; ++i)
- for(unsigned int j = 0; j < m_nEtaBins; ++j)
- for(unsigned int k = 0; k < JER::JER_NP_ALL; ++k)
- m_jerNP[i][j][k] = nullptr;
-}
-
-//-----------------------------------------------------------------------------
-// Copy constructor - necessary for reflex in Athena.
-// I'm not sure exactly what the use cases might be, so I'll just implement a
-// shallow copy for now. I should come back to this later.
-//-----------------------------------------------------------------------------
-JERTool::JERTool(const JERTool& other)
- : asg::AsgMetadataTool(other.name() + "_copy"),
- m_etaAxis(other.m_etaAxis),
- m_fileName(other.m_fileName),
- m_jetAlgo(other.m_jetAlgo),
- m_collectionName(other.m_collectionName)
- //m_useAutoConfig(other.m_useAutoConfig),
- //m_inputFile(other.m_inputFile)
- // TODO: fix this
- //m_jerNP(other.m_jerNP)
-{}
-
-//-----------------------------------------------------------------------------
-// Destructor
-//-----------------------------------------------------------------------------
-JERTool::~JERTool()
-{
- if(m_etaAxis) delete m_etaAxis;
- // Clean up memory that was cloned from the input file
- for(unsigned int i = 0; i < JER::JETALG_N; ++i)
- for(unsigned int j = 0; j < m_nEtaBins; ++j)
- for(unsigned int k = 0; k < JER::JER_NP_ALL; ++k)
- delete m_jerNP[i][j][k];
- //for(auto mapPair : m_jerNP)
- //if(mapPair.second) delete mapPair.second;
-}
-
-//-----------------------------------------------------------------------------
-// Initialize the tool
-//-----------------------------------------------------------------------------
-StatusCode JERTool::initialize()
-{
- // Greet the user
- ATH_MSG_INFO("Initializing JER provider");
-
- // Auto-configuration currently disabled
- #ifndef XAOD_STANDALONE
- /*if(m_useAutoConfig){
- ATH_CHECK( autoConfigure() );
- }*/
- #endif
-
- // Determine the jet algorithm
- if(m_collectionName.find("AntiKt4EM") != std::string::npos)
- m_jetAlgo = JER::AKt4EM;
-
- //using AKt4EM JER for LCTopo jets (This is temporary until we get new EMTopo/LCTopo JER recommendations).
- else if(m_collectionName.find("AntiKt4LC") != std::string::npos)
- m_jetAlgo = JER::AKt4EM;
- /*
- else if(m_collectionName.find("AntiKt6EM") != std::string::npos)
- m_jetAlgo = JER::AKt6EM;
- else if(m_collectionName.find("AntiKt6LC") != std::string::npos)
- m_jetAlgo = JER::AKt6LC;
- */
- else{
- ATH_MSG_FATAL("No support for JER of " << m_collectionName << " jets!");
- return StatusCode::FAILURE;
- }
-
- // Print some information
- std::string description = "Unknown";
- if (m_collectionName.find("AntiKt4EM") != std::string::npos) description = "AntiKt4 EM+JES";
- else if (m_collectionName.find("AntiKt4LC") != std::string::npos) description = "AntiKt4 LC+JES";
- else
- ATH_MSG_ERROR("Not supported JetCollection: ");
- //DV This is temporary, since only EM is supported for now
- /* else if(m_jetAlgo == JER::AKt4LC) description = "AntiKt4 LCW+JES";
- else if(m_jetAlgo == JER::AKt6EM) description = "AntiKt6 EM+JES";
- else if(m_jetAlgo == JER::AKt6LC) description = "AntiKt6 LCW+JES";*/
-
- if (m_collectionName.find("AntiKt4EM") != std::string::npos)
- ATH_MSG_INFO("Retrieving AKt4EM JER for jets: " << description);
-
- else if (m_collectionName.find("AntiKt4LC") != std::string::npos)
- ATH_MSG_INFO("Retrieving AKt4EM JER for jets: " << description);
-
- // Load the inputs
- ATH_CHECK( loadJERInputs() );
-
- return StatusCode::SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// Attempt auto-configuration of tool using Metadata. Athena only.
-// We put stuff here again later if useful.
-//-----------------------------------------------------------------------------
-StatusCode JERTool::autoConfigure()
-{
- // Identify sample as MC or data. Might be useful later.
- //bool isData = false;
- //std::string projectName;
- //ATH_CHECK( retrieveMetadata("/TagInfo", "project_name", projectName) );
- //ATH_MSG_DEBUG("Retrieved project name: " << projectName);
- //if(projectName.find("data") != std::string::npos){
- // ATH_MSG_DEBUG("Identified sample as data.");
- // isData = true;
- //}
-
- // Try to retrieve the simulation type.
- //if(!isData){
- // std::string simulationFlavor;
- // ATH_CHECK( retrieveMetadata("/Simulation/Parameters", "SimulationFlavour",
- // simulationFlavor) );
- // ATH_MSG_DEBUG("Retrieved simulation flavor: " << simulationFlavor);
- // // Convert into known string
- // if(simulationFlavor == "default") m_simulationType = "FullSim";
- // else if(simulationFlavor == "AtlfastII") m_simulationType = "AFII";
- // else{
- // ATH_MSG_ERROR("Unknown simulation type retrieved from Metadata: "
- // << simulationFlavor);
- // return StatusCode::FAILURE;
- // }
- // ATH_MSG_INFO("Overriding simulation type from Metadata: "
- // << m_simulationType);
- //}
-
- return StatusCode::SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// Load JER results from input file
-//-----------------------------------------------------------------------------
-StatusCode JERTool::loadJERInputs()
-{
- // Open input file using PathResolver
- ATH_MSG_DEBUG("Using JER file " << m_fileName);
- auto inputFile = std::unique_ptr<TFile>
- ( TFile::Open(PathResolverFindCalibFile(m_fileName).c_str()) );
- if(!inputFile->IsOpen()){
- ATH_MSG_FATAL("JER input file " << m_fileName << " could not be found!");
- return StatusCode::FAILURE;
- }
-
- double etaBins[m_nEtaBins+1] = {0, 0.8, 1.2, 2.1, 2.8, 3.2, 3.6, 4.5};
- m_etaAxis = new TAxis(m_nEtaBins, etaBins);
-
- // Pull the JER NP graphs
- for(unsigned int i = 0; i < JER::JETALG_N; ++i) {
- for(unsigned int j = 0; j < m_nEtaBins; ++j) {
- for(unsigned int k = 0; k < JER::JER_NP_ALL; ++k) {
- std::stringstream graphName;
- graphName << "JER_unc_NP[" << i << "][" << j << "][" << k << "]";
- ATH_CHECK( getFromFile<TGraph>( graphName.str(), inputFile.get(),
- m_jerNP[i][j][k] ) );
- }
- }
- }
-
- // Now close the input file
- inputFile->Close();
- return StatusCode::SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// Retrieve the MC resolution
-//-----------------------------------------------------------------------------
-double JERTool::getRelResolutionMC(const xAOD::Jet* jet)
-{
- // Hard-coded for now, put in graphs for next iteration, less error-prone
- // TODO: These give uninitialized value warnings in coverity.
- // I'm trying to fix them by giving an empty initializer list,
- // which should initialize all values to zero.
- double noise[m_nEtaBins] = {}; //7 eta bins
- double stochastic[m_nEtaBins] = {}; //7 eta bins
- double constant[m_nEtaBins] = {}; //7 eta bins
-
- double jerMC = 0.;
-
- // TODO: initialize these arrays only once, rather than at every request.
- // Or just wait until they are in ROOT files.
-
- // Cone of 0.4
- if (m_jetAlgo==JER::AKt4EM) {
- noise[0]=3.34; stochastic[0]=0.627; constant[0]=0.0234;
- noise[1]=3.05; stochastic[1]=0.693; constant[1]=0.0224;
- noise[2]=3.29; stochastic[2]=0.658; constant[2]=0.0300;
- noise[3]=2.56; stochastic[3]=0.607; constant[3]=0.0250;
- noise[4]=0.988; stochastic[4]=0.753; constant[4]=0.0228;
- noise[5]=2.74; stochastic[5]=0.783; constant[5]=0.0465;
- noise[6]=2.80; stochastic[6]=0.623; constant[6]=0.0000;
- }
- /* if (m_jetAlgo==JER::AKt4LC){
- noise[0]=4.14; stochastic[0]=0.625; constant[0]=0.0180;
- noise[1]=3.87; stochastic[1]=0.671; constant[1]=0.0228;
- noise[2]=4.43; stochastic[2]=0.542; constant[2]=0.0242;
- noise[3]=3.36; stochastic[3]=0.537; constant[3]=0.00955;
- noise[4]=2.97; stochastic[4]=0.563; constant[4]=0.0175;
- noise[5]=4.22; stochastic[5]=0.387; constant[5]=0.0722;
- noise[6]=2.76; stochastic[6]=0.626; constant[6]=0.0105;
- }
-
- //Cone of 0.6
- if (m_jetAlgo==JER::AKt6EM){
- noise[0]=4.24; stochastic[0]=0.633; constant[0]=0.0226;
- noise[1]=3.97; stochastic[1]=0.693; constant[1]=0.0223;
- noise[2]=3.57; stochastic[2]=0.695; constant[2]=0.0285;
- noise[3]=1.95; stochastic[3]=0.726; constant[3]=0.0107;
- noise[4]=2.72; stochastic[4]=0.776; constant[4]=0.0204;
- noise[5]=4.41; stochastic[5]=0.792; constant[5]=0.0466;
- noise[6]=5.21; stochastic[6]=0.293; constant[6]=0.0392;
- }
- if (m_jetAlgo==JER::AKt6LC){
- noise[0]=5.54; stochastic[0]=0.635; constant[0]=0.0172;
- noise[1]=5.18; stochastic[1]=0.675; constant[1]=0.0218;
- noise[2]=5.78; stochastic[2]=0.534; constant[2]=0.0241;
- noise[3]=4.61; stochastic[3]=0.558; constant[3]=0.0000;
- noise[4]=4.53; stochastic[4]=0.576; constant[4]=0.00927;
- noise[5]=5.97; stochastic[5]=0.453; constant[5]=0.0575;
- noise[6]=4.40; stochastic[6]=0.590; constant[6]=0.0000;
- }*/
-
- // Truncate pt to [10, 1500] GeV. If this is uniformly done
- // everywhere, consider writing a function to truncate.
- double pt = std::min( std::max(jet->pt(), 10.*GeV), 1.5*TeV );
- int etaBin = getEtaBin(jet);
-
- // Multiplying by invGeV bug?
- jerMC = pow( pow(noise[etaBin]/(pt*invGeV), 2) +
- pow(stochastic[etaBin], 2)/(pt*invGeV) +
- pow(constant[etaBin], 2),
- 0.5 );
-
- return jerMC;
-
-
-}
-
-//-----------------------------------------------------------------------------
-// Retrieve the resolution in data
-//-----------------------------------------------------------------------------
-double JERTool::getRelResolutionData(const xAOD::Jet* jet)
-{
-
- // hard-coded for now, put in graphs for next iteration, less error-prone
- double noise[m_nEtaBins]; //7 eta bins
- double stochastic[m_nEtaBins]; //7 eta bins
- double constant[m_nEtaBins]; //7 eta bins
- double jerData = 0.;
-
- //This won't be necessary once we move away from the hard-coded version
- noise[4]=0.; stochastic[4]=0.; constant[4]=0.;
- noise[5]=0.; stochastic[5]=0.; constant[5]=0.;
- noise[6]=0.; stochastic[6]=0.; constant[6]=0.;
-
- //Cone of 0.4
- if (m_jetAlgo==JER::AKt4EM) {
- noise[0]=3.325; stochastic[0]=0.712728; constant[0]=0.0297113;
- noise[1]=3.038; stochastic[1]=0.671540; constant[1]=0.0360607;
- noise[2]=3.339; stochastic[2]=0.613501; constant[2]=0.0444547;
- noise[3]=2.907; stochastic[3]=0.458915; constant[3]=0.0528269;
- }
- /* if (m_jetAlgo==JER::AKt4LC){
- noise[0]=4.123; stochastic[0]=0.738016; constant[0]=0.0225649;
- noise[1]=3.656; stochastic[1]=0.642889; constant[1]=0.0390098;
- noise[2]=4.265; stochastic[2]=0.584586; constant[2]=0.0344256;
- noise[3]=3.375; stochastic[3]=0.260094; constant[3]=0.0497415;
- }
-
- //Cone of 0.6
- if (m_jetAlgo==JER::AKt6EM){
- noise[0]=4.342; stochastic[0]=0.670101; constant[0]=0.0298946;
- noise[1]=4.055; stochastic[1]=0.75919; constant[1]=0.0308167;
- noise[2]=3.959; stochastic[2]=0.562952; constant[2]=0.0422679;
- noise[3]=3.406; stochastic[3]=0.476782; constant[3]=0.0485427;
- }
- if (m_jetAlgo==JER::AKt6LC){
- noise[0]=5.502; stochastic[0]=0.65593; constant[0]=0.0258957;
- noise[1]=5.400; stochastic[1]=0.777139; constant[1]=0.0315415;
- noise[2]=5.665; stochastic[2]=0.624364; constant[2]=0.0311714;
- noise[3]=5.197; stochastic[3]=0.508976; constant[3]=0.0284552;
- }*/
-
- // Truncate pt to [10, 1500] GeV. If this is uniformly done
- // everywhere, consider writing a function to truncate.
- double pt = std::min( std::max(jet->pt(), 10.*GeV), 1.5*TeV );
- int etaBin = getEtaBin(jet);
-
- // Multiplying by invGeV bug?
- jerData = pow( pow(noise[etaBin]/(pt*invGeV), 2) +
- pow(stochastic[etaBin], 2)/(pt*invGeV) +
- pow(constant[etaBin], 2),
- 0.5 );
-
- return jerData;
-
-}
-
-//-----------------------------------------------------------------------------
-// Calculate the resolution uncertainty
-//-----------------------------------------------------------------------------
-double JERTool::getUncertainty(const xAOD::Jet* jet, JER::Uncert errType)
-{
- ATH_MSG_DEBUG("getUncertainty " << errType);
-
- // Truncate pt to [10, 1500] GeV. If this is uniformly done
- // everywhere, consider writing a function to truncate.
- double pt = std::min( std::max(jet->pt(), 10.*GeV), 1.5*TeV );
- int etaBin = getEtaBin(jet);
- TGraph** jerNP = m_jerNP[m_jetAlgo][etaBin];
-
- if(errType == JER::JER_CROSS_CALIB_ALL){
- // Combine all xCalib NPs in quadrature
- ATH_MSG_DEBUG("JER_CROSS_CALIB_FORWARD");
- double unc = 0;
- for(unsigned int i = JER::JER_CROSS_CALIB_50nsVs25ns;
- i < JER::JER_CROSS_CALIB_ALL-1; ++i){
- unc += pow( jerNP[i]->Eval(pt*invGeV), 2);
- }
-
- ATH_MSG_DEBUG(" quadratic sum = " << sqrt(unc));
- return sqrt(unc);
- }
- else if(errType == JER::JER_NP_ALL){
- // Combine all NPs in quadrature
- ATH_MSG_DEBUG("Calculating JER_NP_ALL");
- double unc = 0;
- for(unsigned int i = 0; i < JER::JER_NP_ALL; ++i){
- // Be careful: Noise forward unc is stored as relative;
- // need to use absolute (jerMC*unc)
- if(i == JER::JER_NOISE_FORWARD)
- unc += pow( (jerNP[i]->Eval(pt*invGeV)) * getRelResolutionMC(jet), 2);
- else
- unc += pow( jerNP[i]->Eval(pt*invGeV), 2);
- }
-
- ATH_MSG_DEBUG(" quadratic sum = " << sqrt(unc));
- return sqrt(unc);
- }
-
- else{
- // Return a single NP.
- // Using a map here would help to catch missing results.
- // Right now this would seg fault.
- return jerNP[errType]->Eval(pt*invGeV);
- }
-}
-
-//-----------------------------------------------------------------------------
-// Get eta bin corresponding for this jet.
-// Indexing convention of eta regions is off-by-one
-// with respect to the TAxis (etaBin = TAxisBin - 1)
-//-----------------------------------------------------------------------------
-int JERTool::getEtaBin(const xAOD::Jet* jet)
-{
- int bin = m_etaAxis->FindBin(fabs(jet->eta()));
- bin = std::min((int) m_nEtaBins, bin); // include overflow
- return bin - 1;
-}
diff --git a/Reconstruction/Jet/JetResolution/cmt/Makefile.Standalone b/Reconstruction/Jet/JetResolution/cmt/Makefile.Standalone
deleted file mode 100644
index 23254ae55c384ec4a614d247c200d5f64384b454..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/cmt/Makefile.Standalone
+++ /dev/null
@@ -1,101 +0,0 @@
-# JERProvider standalone makefile
-
-# --- External configuration ----------------------------------
-ifeq ($(wildcard $(ROOTSYS)/test/Makefile.arch),)
- include $(ROOTSYS)/etc/Makefile.arch
-else
- include $(ROOTSYS)/test/Makefile.arch
-endif
-# -------------------------------------------------------------
-# General flags
-# -------------------------------------------------------------
-PACKAGE = JERProvider
-OUTPUTDIR = ../StandAlone
-
-# Get these from Makefile.arch above
-#CCC = g++
-#CXXFLAGS = -g -m32 -fPIC -Wall -W -Woverloaded-virtual -Wno-parentheses -Wno-unused-parameter -Wno-unused-variable
-#LDFLAGS = -g -m32 -fPIC
-
-# These warnings bother me, so I turn them off.
-# CXXFLAGS += -Wunused-variable
-CXXFLAGS += -DJER_STANDALONE
-
-# add utils subdirectories if needed
-INCLUDES += -I.. -I${ROOTSYS}/include
-
-# Need these to avoid loading dependent libraries when ROOT starts
-LINKLIBS = -L${ROOTSYS}/lib -lHist -lMatrix -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -pthread -lm -ldl -rdynamic
-
-# -------------------------------------------------------------
-# ROOT Cint
-# -------------------------------------------------------------
-CINT = JERProviderCint
-LDEFFILE = ../Root/LinkDef.h
-CINTFILE = $(OUTPUTDIR)/JERProviderCint.cxx
-CINTOBJ = $(patsubst %.cxx,%.o,$(CINTFILE))
-
-# -------------------------------------------------------------
-# ProofAna source
-# -------------------------------------------------------------
-# add util subdirectories if needed
-CXXLIST = ../Root/JERProvider.cxx $(CINTFILE)
-HLIST = ../JetResolution/JERProvider.h
-OLIST = $(patsubst %.cxx,%.o,$(CXXLIST))
-DLIST = $(patsubst %.h,%.d,$(HLIST))
-
-
-# -------------------------------------------------------------
-# Libraries
-# -------------------------------------------------------------
-LIBFILE = $(OUTPUTDIR)/libJERProvider.so
-
-ifeq ($(PLATFORM),macosx)
-EXTRALDFLAGS = -install_name $(LIBFILE)
-endif
-
-# get libraries of ROOT
-define ldlinksuffixROOT
- $(addsuffix $(LDLINKSUFFIX),$(Lib)) $(shell if [ "$(findstring -Ldlink2,$(OPTIONS))" ]; then echo $(addsuffix _pkgid_$(ROOTVER),$(Lib)); fi)
-endef
-
-# -------------------------------------------------------------
-# Compilation
-# -------------------------------------------------------------
-
-default: shlib
-
-# Implicit rule to compile all classes
-%.o : %.cxx
- @echo "Compiling $<"
- @$(CXX) -MD $(CXXFLAGS) $(INCLUDES) -c $< -o $*.o
-
-# Rule to make ROOTCINT output file
-$(CINTOBJ) : $(HLIST) $(LDEFFILE)
- @echo "Running rootcint"
- @mkdir -p $(OUTPUTDIR)
- @$(ROOTSYS)/bin/rootcint -f $(CINTFILE) -c -p $(CXXFLAGS) $(INCLUDES) $(HLIST) $(LDEFFILE)
- @echo "Compiling $(CINTFILE)"
- @$(CXX) $(CXXFLAGS) $(INCLUDES) -c $(CINTFILE) -o $@
-
-rootcint : $(HLIST) $(LDEFFILE)
- @echo "Running rootcint"
- $(ROOTSYS)/bin/rootcint -f $(CINTFILE) -c -p $(CXXFLAGS) $(INCLUDES) $(HLIST) $(LDEFFILE)
-
-# Rule to combine objects into a shared library
-$(LIBFILE): $(OLIST)
- @echo "Linking $(LIBFILE)"
- @rm -f $(LIBFILE)
- @$(LD) $(CXXFLAGS) $(SOFLAGS) $(LINKLIBS) $(EXTRALDFLAGS) $(OLIST) -o $(LIBFILE)
-
--include $(DLIST)
-
-JERProviderCint: $(CINTOBJ)
-shlib: $(LIBFILE)
-
-clean:
- @rm -f ../*/*.o ../*/*.d
-
-
-
-
diff --git a/Reconstruction/Jet/JetResolution/share/JERTest_jobOptions.py b/Reconstruction/Jet/JetResolution/share/JERTest_jobOptions.py
deleted file mode 100644
index 5b596c1b005562ae24007c0d6e18323a52c69a33..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/share/JERTest_jobOptions.py
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#
-# This job options file defines an Athena testing job for the dual-use JER tools
-#
-
-# Specify input file
-
-# mc15 test file
-import os
-input_file = os.getenv('ASG_TEST_FILE_MC')
-#input_file = '/afs/cern.ch/atlas/project/PAT/xAODs/r6594/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.AOD.e3099_s2578_r6594_tid05292824_00/AOD.05292824._000011.pool.root.1'
-
-import AthenaPoolCnvSvc.ReadAthenaPool
-ServiceMgr.EventSelector.InputCollections = [input_file]
-
-# Access the algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Configure the JER tools
-from AthenaCommon.AppMgr import ToolSvc
-from JetResolution.JetResolutionConf import JERTool, JERSmearingTool
-ToolSvc += JERTool('JERTool', CollectionName="AntiKt4EMTopoJets",
- OutputLevel=INFO)
-ToolSvc += JERSmearingTool('JERSmearingTool', JERTool=ToolSvc.JERTool,
- ApplyNominalSmearing=True, OutputLevel=DEBUG)
-
-# Configure the test algorithm
-from JetResolution.JetResolutionConf import JERTestAlg
-alg = JERTestAlg('JERTestAlg', JERSmearingTool=ToolSvc.JERSmearingTool,
- ApplySystematics=True, OutputLevel=DEBUG)
-
-# Add to the alg sequence
-theJob += alg
-
-# Configure the job
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 5
diff --git a/Reconstruction/Jet/JetResolution/src/JERTestAlg.cxx b/Reconstruction/Jet/JetResolution/src/JERTestAlg.cxx
deleted file mode 100644
index 74d58f6c7f0bec920ff518e20be8c972e66c1135..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/src/JERTestAlg.cxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// EDM includes
-#include "xAODJet/JetContainer.h"
-
-// Local includes
-#include "JERTestAlg.h"
-
-//-----------------------------------------------------------------------------
-// Constructor
-//-----------------------------------------------------------------------------
-JERTestAlg::JERTestAlg(const std::string& name, ISvcLocator* svcLoc)
- : AthAlgorithm(name, svcLoc),
- m_jerSmearingTool("JERSmearingTool/JERSmearingTool")
-{
- declareProperty("JERSmearingTool", m_jerSmearingTool);
- declareProperty("ApplySystematics", m_applySystematics = true);
-}
-
-//-----------------------------------------------------------------------------
-// Initialize
-//-----------------------------------------------------------------------------
-StatusCode JERTestAlg::initialize()
-{
- ATH_MSG_INFO("Initialize");
-
- // Try to retrieve the tools
- ATH_CHECK( m_jerSmearingTool.retrieve() );
-
- // Build systematic list: nominal, +1 jer, -1 jer
- m_sysList.clear();
- if(m_applySystematics){
- m_sysList.resize(2);
- m_sysList[1].insert(CP::SystematicVariation("JET_JER_SINGLE_NP", 1));
- }
- else m_sysList.resize(1);
-
- return StatusCode::SUCCESS;
-}
-
-//-----------------------------------------------------------------------------
-// Execute
-//-----------------------------------------------------------------------------
-StatusCode JERTestAlg::execute()
-{
- // Retrieve the jets
- const xAOD::JetContainer* jets = 0;
- ATH_CHECK( evtStore()->retrieve(jets, "AntiKt4LCTopoJets") );
-
- // Print some event info
- ATH_MSG_DEBUG("Number of jets: " << jets->size());
-
- // Loop over systematics
- for(auto sysSet : m_sysList){
-
- ATH_MSG_DEBUG("Applying systematic: " <<
- (sysSet.size() == 0 ? "Nominal" : sysSet.name()));
-
- if(m_jerSmearingTool->applySystematicVariation(sysSet)
- != CP::SystematicCode::Ok){
- ATH_MSG_ERROR("Problem applying systematic");
- return StatusCode::FAILURE;
- }
-
- // Loop over the jets
- for(auto jet : *jets){
-
- // Copy the jet and smear it
- xAOD::Jet* newJet = 0;
- if(m_jerSmearingTool->correctedCopy(*jet, newJet)
- != CP::CorrectionCode::Ok){
- ATH_MSG_ERROR("Problem correcting jet");
- return StatusCode::FAILURE;
- }
-
- // Dump some input jet info
- ATH_MSG_DEBUG("Input jet: pt = " << jet->pt()*0.001
- << ", eta = " << jet->eta());
-
- // Dump jet info after applying the tool
- ATH_MSG_DEBUG("Output jet: pt = " << newJet->pt()*0.001
- << ", eta = " << newJet->eta());
-
- // Clean up the copy
- delete newJet;
-
- }
-
- }
-
- return StatusCode::SUCCESS;
-}
-
diff --git a/Reconstruction/Jet/JetResolution/src/JERTestAlg.h b/Reconstruction/Jet/JetResolution/src/JERTestAlg.h
deleted file mode 100644
index 449d8b715708b14caac89cc64b4c5910c53ec799..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/src/JERTestAlg.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef JETRESOLUTION_JERTESTALG_H
-#define JETRESOLUTION_JERTESTALG_H
-
-// Framework includes
-#include "GaudiKernel/ToolHandle.h"
-#include "AthenaBaseComps/AthAlgorithm.h"
-
-// Local includes
-#include "JetResolution/IJERSmearingTool.h"
-
-/// A testing algorithm for the dual-use JER tools in Athena
-///
-/// @author Steve Farrell <steven.farrell@cern.ch>
-///
-class JERTestAlg : public AthAlgorithm
-{
-
- public:
-
- /// Standard algorithm constructor
- JERTestAlg(const std::string& name, ISvcLocator* svcLoc);
-
- /// Initialize the algorithm
- virtual StatusCode initialize();
- /// Execute the algorithm
- virtual StatusCode execute();
-
- private:
-
- /// Handles to the tools
- ToolHandle<IJERSmearingTool> m_jerSmearingTool;
-
- // Systematics to test
- bool m_applySystematics;
- std::vector<CP::SystematicSet> m_sysList;
-
-};
-
-#endif
diff --git a/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx b/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx
deleted file mode 100644
index e69599f5f072b7c3f8c67adeb5dcd0546f48115d..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/src/components/JetResolution_entries.cxx
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "JetResolution/JERTool.h"
-#include "JetResolution/JERSmearingTool.h"
-#include "../JERTestAlg.h"
-
-DECLARE_COMPONENT( JERTool )
-DECLARE_COMPONENT( JERSmearingTool )
-DECLARE_COMPONENT( JERTestAlg )
-
diff --git a/Reconstruction/Jet/JetResolution/test/ut_AnaToolHandle.cxx b/Reconstruction/Jet/JetResolution/test/ut_AnaToolHandle.cxx
deleted file mode 100644
index 35c3b1848118abb00cb6808d4790380e126d19c0..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/test/ut_AnaToolHandle.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "TError.h"
-#include "xAODRootAccess/Init.h"
-#include "AsgTools/AnaToolHandle.h"
-
-#include "JetResolution/IJERTool.h"
-#include "JetResolution/IJERSmearingTool.h"
-
-static const char* appName = "ut_AnaToolHandle";
-
-#define CHECK( ARG ) \
- do { \
- const bool result = ARG; \
- if(!result) { \
- ::Error(appName, "Failed to execute: \"%s\"", \
- #ARG ); \
- return 1; \
- } \
- } while( false )
-
-int main()
-{
- CHECK( xAOD::Init(appName) );
-
- // Try to create and initialize each tool with the AnaToolHandle
- asg::AnaToolHandle<IJERTool> jerHandle("");
- jerHandle.setTypeAndName("JERTool/TheJERTool");
- CHECK( jerHandle.retrieve() );
- asg::AnaToolHandle<IJERSmearingTool> smearHandle("");
- smearHandle.setTypeAndName("JERSmearingTool/TheJERSmearingTool");
- CHECK( smearHandle.setProperty("JERTool", jerHandle.getHandle() ) );
- CHECK( smearHandle.retrieve() );
-
- return 0;
-}
diff --git a/Reconstruction/Jet/JetResolution/test/ut_jer_dict.py b/Reconstruction/Jet/JetResolution/test/ut_jer_dict.py
deleted file mode 100755
index 6aed99cb435ab0f9871051adddfb0d187df26b94..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/test/ut_jer_dict.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-# Test the reflex dictionary usage in PyROOT to
-# instantiate and configure the JER tools.
-
-import sys
-
-# Setup libs
-from ROOT import gROOT
-gROOT.SetBatch()
-gROOT.Macro('$ROOTCOREDIR/scripts/load_packages.C')
-
-# Import using the PyROOT bindings and reflex dictionary
-from ROOT import xAOD
-from ROOT import JERTool, JERSmearingTool
-
-evt = xAOD.TEvent()
-
-# Configure the tools
-jerTool = JERTool('JERTool')
-smearTool = JERSmearingTool('JERSmearingTool')
-if smearTool.setProperty('JERToolName', jerTool.name()).isFailure():
- sys.exit(1)
-
-# Initialize the tools
-if jerTool.initialize().isFailure():
- sys.exit(1)
-if smearTool.initialize().isFailure():
- sys.exit(1)
diff --git a/Reconstruction/Jet/JetResolution/test/ut_jer_tester.sh b/Reconstruction/Jet/JetResolution/test/ut_jer_tester.sh
deleted file mode 100755
index f0a57b60a734e2846e6069411a1058536cef4f2f..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/test/ut_jer_tester.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if test "$ROOTCORE_AUTO_UT" == "1" -a "$ROOTCORE_SLOW_UT" != "1"
-then
- exit 0
-fi
-
-set -e
-set -u
-
-JERTester $ASG_TEST_FILE_MC 5
diff --git a/Reconstruction/Jet/JetResolution/util/JERTester.cxx b/Reconstruction/Jet/JetResolution/util/JERTester.cxx
deleted file mode 100644
index 56cc016c7c6aa1e5923cf83a5abfb953f5273220..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetResolution/util/JERTester.cxx
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-*/
-
-// System include(s)
-#include <memory>
-#include <cstdlib>
-
-// ROOT include(s)
-#include <TFile.h>
-#include <TError.h>
-#include <TString.h>
-
-// Infrastructure include(s)
-#ifdef ROOTCORE
-# include "xAODRootAccess/Init.h"
-# include "xAODRootAccess/TEvent.h"
-#endif // ROOTCORE
-
-// EDM include(s)
-#include "xAODEventInfo/EventInfo.h"
-#include "xAODJet/JetContainer.h"
-
-// Local include(s)
-#include "JetResolution/JERTool.h"
-#include "JetResolution/JERSmearingTool.h"
-
-// Other includes
-#include "PATInterfaces/SystematicsUtil.h"
-//#include "PATInterfaces/CorrectionCode.h"
-
-// Error checking macro
-#define CHECK( ARG ) \
- do { \
- const bool result = ARG; \
- if(!result) { \
- ::Error(APP_NAME, "Failed to execute: \"%s\"", \
- #ARG ); \
- return 1; \
- } \
- } while( false )
-
-
-int main( int argc, char* argv[] ) {
-
- // The application's name
- const char* APP_NAME = argv[ 0 ];
-
- // Check if we received a file name
- if(argc < 2) {
- Error( APP_NAME, "No file name received!" );
- Error( APP_NAME, " Usage: %s [xAOD file name]", APP_NAME );
- return 1;
- }
-
- // Initialise the application
- CHECK( xAOD::Init(APP_NAME) );
- StatusCode::enableFailure();
- CP::CorrectionCode::enableFailure();
- CP::SystematicCode::enableFailure();
-
- // Open the input file
- const TString fileName = argv[1];
- Info(APP_NAME, "Opening file: %s", fileName.Data());
- std::unique_ptr<TFile> ifile(TFile::Open(fileName, "READ"));
- CHECK( ifile.get() );
-
- // Create a TEvent object
- xAOD::TEvent event(xAOD::TEvent::kClassAccess);
- CHECK( event.readFrom(ifile.get()) );
- Info(APP_NAME, "Number of events in the file: %i",
- static_cast<int>(event.getEntries()));
-
- // Decide how many events to run over
- Long64_t entries = event.getEntries();
- if(argc > 2) {
- const Long64_t e = atoll(argv[2]);
- if(e < entries) {
- entries = e;
- }
- }
-
- // Create the tools with default config to test
- JERTool jerTool("JERTool");
- JERSmearingTool smearTool("JERSmearingTool");
-
- // Configure the JERTool.
- // I am demonstrating all the defaults here, so behavior
- // is the same as not specifying any configuration
- //jerTool.msg().setLevel(MSG::DEBUG);
- CHECK( jerTool.setProperty("PlotFileName",
- "JetResolution/Prerec2015_xCalib_2012JER_ReducedTo9NP_Plots_v2.root") );
- //CHECK( jerTool.setProperty("JetAlg", JER::AKt4EM) );
- CHECK( jerTool.setProperty("CollectionName", "AntiKt4EMTopoJets") );
-
-
- // Configure the JERSmearingTool
- smearTool.msg().setLevel(MSG::DEBUG);
- ToolHandle<IJERTool> jerHandle(jerTool.name());
- CHECK( smearTool.setProperty("JERTool", jerHandle) );
- CHECK( smearTool.setProperty("ApplyNominalSmearing", false) );
- CHECK( smearTool.setProperty("isMC", true) );
- CHECK( smearTool.setProperty("SystematicMode", "Full") );
-
- // Initialize the tools
- CHECK( jerTool.initialize() );
- CHECK( smearTool.initialize() );
-
- // Build a simple list of systematics
- const std::vector<CP::SystematicSet> sysList =
- CP::make_systematics_vector( smearTool.recommendedSystematics() );
-
- // Loop over the events
- for(Long64_t entry = 0; entry < entries; ++entry) {
-
- // Tell the object which entry to look at
- event.getEntry(entry);
-
- // Print some event information for fun
- const xAOD::EventInfo* ei = 0;
- CHECK( event.retrieve(ei, "EventInfo") );
- Info(APP_NAME,
- "===>>> start processing event #%i, "
- "run #%i %i events processed so far <<<===",
- static_cast<int>(ei->eventNumber()),
- static_cast<int>(ei->runNumber()),
- static_cast<int>(entry));
-
- // Get the jets from the event
- const xAOD::JetContainer* jets = 0;
- CHECK( event.retrieve(jets, "AntiKt4LCTopoJets") );
- Info(APP_NAME, "Number of jets: %i",
- static_cast<int>(jets->size()));
-
- xAOD::JetContainer::const_iterator jetItr;
- for(jetItr = jets->begin(); jetItr != jets->end(); ++jetItr){
-
- const xAOD::Jet* jet = *jetItr;
-
- // Print basic info about this jet
- Info(APP_NAME, "Jet: pt = %g, eta = %g", jet->pt()/1000., jet->eta());
-
- // Get the resolution in MC and data
- double resMC = jerTool.getRelResolutionMC(jet);
- double resData = jerTool.getRelResolutionData(jet);
- // Get the resolution uncertainty
- double uncert = jerTool.getUncertainty(jet, JER::JER_NP_ALL);
-
- //DV
-
- // Print the resolution information
- Info(APP_NAME, " Resolution MC = %g", resMC);
- Info(APP_NAME, " Resolution Data = %g", resData);
- Info(APP_NAME, " Resolution Err = %g", uncert);
-
- // Loop over systematic sets
- for(const auto& sysSet : sysList){
- std::string sysName = sysSet.empty()? "nominal" : sysSet.name();
- Info(APP_NAME, " Correcting jets with sysSet: %s",
- sysName.c_str());
-
- // Apply systematic configuration to the smearing tool
- CHECK( smearTool.applySystematicVariation(sysSet) );
-
- // Now smear the jet
- xAOD::Jet* newJet = 0;
- CP::CorrectionCode c = smearTool.correctedCopy(*jet, newJet);
- if(c != CP::CorrectionCode::Ok)
- Error(APP_NAME, "problem in correctedCopy");
- //const xAOD::FourMom_t& lv = newJet->p4();
- Info(APP_NAME, " New Jet: pt = %g, eta = %g",
- newJet->pt()/1000., newJet->eta());
- delete newJet;
- }
-
- }
-
- // Close with a message
- Info(APP_NAME,
- "===>>> done processing event #%i, "
- "run #%i %i events processed so far <<<===",
- static_cast<int>(ei->eventNumber()),
- static_cast<int>(ei->runNumber()),
- static_cast<int>(entry + 1));
- }
-
- Info(APP_NAME, "Application finished");
-
- // Return gracefully
- return 0;
-}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
index 4334a1bf1fdfdb9bb79cb68b7db23751bd25026d..061c58b0485aff4dfa7890797acb8e241ef36694 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/MuonCreatorTool.cxx
@@ -4,10 +4,7 @@
/////////////////////////////////////////////////////////////////////////////
// MuonCreatorTool
-// AlgTool performing MS hit reallocation for a likely spectrometer-indet
-// match which has given combined fit problems.
-// Extrapolates indet track to MS.
-// Returns a combined track with full track fit.
+// Creates xAOD::Muon objects from muon candidates
//
// (c) ATLAS Combined Muon software
//////////////////////////////////////////////////////////////////////////////
@@ -889,7 +886,7 @@ namespace MuonCombined {
else ATH_MSG_WARNING("new Track Collection link invalid");
}
if(!tp){
- // create extrapolated track particle without a link to the track
+ // create track particle without a link to the track
tp = m_particleCreator->createParticle( **trackLink, &trackParticleContainer, 0, xAOD::muon );
}
@@ -1096,7 +1093,25 @@ namespace MuonCombined {
for(auto map : tagMaps){
if (map) {
const TagBase* tag=map->getTag(candidate);
- if(tag) tags.push_back(tag);
+ if(tag){
+ //A quick check for MuGirl muons to make sure the caloExtension is there
+ if(tag->author()==xAOD::Muon::MuGirl){
+ const MuGirlTag* muGirlTag = static_cast<const MuGirlTag*>(tag);
+ if(muGirlTag->combinedTrack()){
+ std::unique_ptr<xAOD::TrackParticle> combtp(m_particleCreator->createParticle(muGirlTag->combinedTrackLink(),nullptr,nullptr,xAOD::muon));
+ std::unique_ptr<Trk::CaloExtension> caloExtension = m_caloExtTool->caloExtension(*combtp);
+ if(!caloExtension){
+ ATH_MSG_WARNING("failed to get a calo extension for this MuGirl muon, don't use it");
+ continue;
+ }
+ if( caloExtension->caloLayerIntersections().empty()){
+ ATH_MSG_WARNING("failed to retrieve any calo layers for this MuGirl muon, don't use it");
+ continue;
+ }
+ }
+ }
+ tags.push_back(tag);
+ }
}
}
if( !tags.empty() ) {
@@ -1630,7 +1645,7 @@ namespace MuonCombined {
}
// get ParticleCellAssociation
- ATH_MSG_DEBUG(" Selected track: pt " << tp->pt() << " eta " << tp->eta() << " phi " << tp->phi() );
+ ATH_MSG_DEBUG(" Selected track: pt " << tp->pt() << " eta " << tp->eta() << " phi " << tp->phi());
std::unique_ptr<Trk::CaloExtension> caloExtension =m_caloExtTool->caloExtension(*tp);
if(!caloExtension){
@@ -1638,6 +1653,9 @@ namespace MuonCombined {
return;
};
+ if( caloExtension->caloLayerIntersections().empty())
+ ATH_MSG_DEBUG( "Received a caloExtension object without track extrapolation");
+
SG::ReadHandle<CaloCellContainer> container(m_cellContainerName);
xAOD::CaloCluster* cluster = m_cellCollector.collectCells( *caloExtension, *container, *clusterContainer );
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
index 799531af2f9b9896c729f64f58423a978efd99cc..7b6f2246e8cca6db95947fa532d231ad4f08400f 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
@@ -77,8 +77,8 @@ std::string Rec::MuonPrintingTool::print( const xAOD::Muon& muon ) const {
<< " eta : " << muon.eta()
<< " phi : " << muon.phi()
<< " mass : " << muon.m() << " author " << muon.author()
- << " secondary authors: "
- << " type : " << muon.muonType();
+ << " type : " << muon.muonType()
+ << " secondary authors: ";
for( int a = 0;a<xAOD::Muon::NumberOfMuonAuthors;++a ){
xAOD::Muon::Author author = static_cast<xAOD::Muon::Author>(a);
if( author != muon.author() && muon.isAuthor(author) ) sout << " " << a;
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonAODto_xAODCnv_jobOptions.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonAODto_xAODCnv_jobOptions.py
index 6bac78b321da34ebedb564bec47913959c74db9a..252cdb806d1769f0a0f3ea929663d847b3673818 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonAODto_xAODCnv_jobOptions.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonAODto_xAODCnv_jobOptions.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
from MuonCombinedRecExample.MuonCombinedKeys import MuonCombinedKeys as MuonCbKeys
from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
from RecExConfig.RecFlags import rec
@@ -7,36 +9,12 @@ if (not rec.readRDO() or muonCombinedRecFlags.doAOD()) and not muonCombinedRecFl
from RecExConfig.ObjKeyStore import cfgKeyStore
- # from xAODTruthCnv.xAODTruthCnvConf import xAODMaker__xAODTruthCnvAlg
- # truthAlg = xAODMaker__xAODTruthCnvAlg("GEN_AOD2xAOD")
- # # truthAlg.OutputLevel = VERBOSE
- # topSequence += truthAlg
-
- # # InDet
- # from xAODTrackingCnv.xAODTrackingCnvConf import xAODMaker__TrackParticleCnvAlg
- # alg = xAODMaker__TrackParticleCnvAlg()
- # alg.AddTruthLink=True
- # alg.AODContainerName = InDetKeys.TrackParticles()
- # alg.xAODContainerName="InDetTrackParticles"
- # alg.AODTruthContainerName = InDetKeys.TrackParticlesTruth()
- # # alg.OutputLevel = VERBOSE
- # topSequence += alg
-
- # # MuGirl
- # from xAODTrackingCnv.xAODTrackingCnvConf import xAODMaker__TrackParticleCnvAlg
- # alg2 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_MuGirlTrackParticles")
- # alg2.AODContainerName = 'MuGirlRefittedTrackParticles'
- # alg2.xAODContainerName = MuonCbKeys.MuGirlMuons()
- # # alg2.OutputLevel = VERBOSE
- # topSequence += alg2
-
#SA
if not cfgKeyStore.isInInput ('xAOD::TrackParticleContainer', MuonCbKeys.ExtrapolatedMSParticles()):
from xAODTrackingCnv.xAODTrackingCnvConf import xAODMaker__TrackParticleCnvAlg
alg1 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_ExtrapolatedMS")
alg1.AODContainerName = 'ExtrapolatedMuonSpectrometerParticles' #ExtrapolatedMuonSpectrometerParticles
alg1.xAODContainerName = MuonCbKeys.ExtrapolatedMSParticles()
- # alg1.OutputLevel = VERBOSE
topSequence += alg1
print "Added convertor for ",MuonCbKeys.ExtrapolatedMSParticles()
@@ -46,7 +24,6 @@ if (not rec.readRDO() or muonCombinedRecFlags.doAOD()) and not muonCombinedRecFl
alg3 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_StatCombined")
alg3.AODContainerName = 'StatCombinedMuonParticles' #xStatCombinedMuonParticles
alg3.xAODContainerName = MuonCbKeys.StatCombinedParticles()
- # alg3.OutputLevel = VERBOSE
topSequence += alg3
# Combined
@@ -55,7 +32,6 @@ if (not rec.readRDO() or muonCombinedRecFlags.doAOD()) and not muonCombinedRecFl
alg4 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_CombinedFit")
alg4.AODContainerName = 'CombinedFitMuonParticles' #CombinedFitParticles
alg4.xAODContainerName = MuonCbKeys.CombinedFitParticles()
- # alg4.OutputLevel = VERBOSE
topSequence += alg4
# ST
@@ -64,40 +40,15 @@ if (not rec.readRDO() or muonCombinedRecFlags.doAOD()) and not muonCombinedRecFl
alg5 = xAODMaker__TrackParticleCnvAlg("TrackParticleCnvAlg_SegmentTagTrackParticles")
alg5.AODContainerName = 'SegmentTagTrackParticles' #SegmentTagTrackParticles
alg5.xAODContainerName = MuonCbKeys.SegmentTagTrackParticles()
- # alg5.OutputLevel = VERBOSE
topSequence += alg5
# MuonSegments
if (not cfgKeyStore.isInInput ('xAOD::MuonSegmentContainer', 'MuonSegments')):
from xAODMuonCnv.xAODMuonCnvConf import xAODMaker__MuonSegmentCnvAlg
muonSegAlg = xAODMaker__MuonSegmentCnvAlg("MuonSegmentCnvAlg")
- # muonAlg.OutputLevel = VERBOSE
topSequence += muonSegAlg
#Muons
from xAODMuonCnv.xAODMuonCnvConf import xAODMaker__MuonCnvAlg
muonAlg = xAODMaker__MuonCnvAlg("MuonCnvAlg")
- ## For conversion from release 17, uncomment the following two lines:
- # muonAlg.DoConversionFromRel17 = True ## @@@
- # muonAlg.xAODMuGirlCombinedTrackParticleContainerName = MuonCbKeys.MuGirlMuons() ## @@@
-
- # muonAlg.OutputLevel = VERBOSE
topSequence += muonAlg
-
- # # MuonTruthParticles
- # from MuonTruthAlgs.MuonTruthAlgsConf import Muon__MuonTruthDecorationAlg
- # muonTruthDecoAlg = Muon__MuonTruthDecorationAlg("MuonTruthDecorationAlg")
- # # muonTruthDecoAlg.OutputLevel = VERBOSE
- # topSequence += muonTruthDecoAlg
-
- # # Associate MuonTruthParticles with reco muons
- # from MuonTruthAlgs.MuonTruthAlgsConf import MuonTruthAssociationAlg
- # muonTruthAssocAlg = MuonTruthAssociationAlg("MuonTruthAssociationAlg")
- # muonTruthAssocAlg.AssociateWithInDetTP = True ## needed in conversion from rel 17
- # #muonTruthAssocAlg.OutputLevel = VERBOSE
- # topSequence += muonTruthAssocAlg
-
- # from MuonTruthAlgs.MuonTruthAlgsConf import Muon__MuonSegmentTruthAssociationAlg
- # muonTruthSegAssocAlg = Muon__MuonSegmentTruthAssociationAlg("MuonSegmentTruthAssociationAlg")
- # muonTruthSegAssocAlg.OutputLevel = VERBOSE
- # topSequence += muonTruthSegAssocAlg
diff --git a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_myTopOptions.py b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_myTopOptions.py
index 4104dcbec8e98371cd88acaa98f17e4dd6a14252..434d542c078d432354575902b089e9e7ca6e7654 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_myTopOptions.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedRecExample/share/MuonCombinedRec_myTopOptions.py
@@ -1,3 +1,5 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
from RecExConfig.RecFlags import rec as rec
from RecExConfig.RecAlgsFlags import recAlgs as recAlgs
from MuonRecExample.MuonRecFlags import muonRecFlags,muonStandaloneFlags
@@ -7,7 +9,6 @@ athenaCommonFlags.AllowIgnoreConfigError = False
# configure all flags to run all Subset + Muon Combined
import MuonCombinedRecExample.MuonCombinedRecOnlySetup
-#import MuonRecExample.MuonRecStandaloneOnlySetup
#--------------------------------------------------------------------------------
# Input setup
@@ -315,78 +316,16 @@ rec.doWriteAOD = True
try:
include("MuonRecExample/MuonRec_topOptions.py")
###### put any user finetuning after this line #####
-# topSequence.MergeMuonCollections.OutputLevel = DEBUG
-# topSequence.MakeAODMuons.OutputLevel = DEBUG
if muonCombinedRecFlags.doxAOD():
- #ToolSvc.MuonCreatorTool.OutputLevel = VERBOSE
- #ToolSvc.MuonCombinedFitTagTool.OutputLevel = VERBOSE
- #ToolSvc.MuonSegmentTagTool.OutputLevel = DEBUG
- #ToolSvc.MuonCandidateTool.OutputLevel = VERBOSE
- #ToolSvc.InDetCandidateTool.OutputLevel = VERBOSE
- #ToolSvc.MuonCombinedParticleCreator.OutputLevel = VERBOSE
- #topSequence.ExtrapolatedMuonTracksTruthAlg.OutputLevel = VERBOSE
- #topSequence.CombinedMuonTracksTruthAlg.OutputLevel = VERBOSE
- #ToolSvc += CfgMgr.Trk__TrackParticleCaloExtensionTool("TrackParticleCaloExtensionTool",OutputLevel = VERBOSE)
- #ToolSvc.MuonCombinedTrackFitter.OutputLevel = VERBOSE
- #ToolSvc.MuidTrackCleaner.OutputLevel = VERBOSE
- #ToolSvc += CfgMgr.Rec__MuidCaloMaterialParam("MuidCaloMaterialParam",OutputLevel = VERBOSE)
- #ToolSvc += CfgMgr.Rec__MuidCaloTrackStateOnSurface("MuidCaloTrackStateOnSurface",OutputLevel = VERBOSE)
- #ToolSvc.CombinedMuonTrackBuilder.OutputLevel=VERBOSE
- #ToolSvc.iPatFitter.OutputLevel=DEBUG
- #ToolSvc.TrackDepositInCaloTool.OutputLevel = VERBOSE
- #ToolSvc += CfgMgr.xAOD__TrackIsolationTool("TrackIsolationTool",OutputLevel=DEBUG);
- #ToolSvc += CfgMgr.xAOD__CaloIsolationTool("CaloIsolationTool",OutputLevel=DEBUG);
- #ToolSvc.MuonCombinedInDetDetailedTrackSelectorTool.OutputLevel = VERBOSE
pass
- #ToolSvc.MuonTrackSteering.OutputLevel = VERBOSE
- #ToolSvc.MuonTrackSteering.OnlyMdtSeeding = True
- #ToolSvc.MuonPatternSegmentMaker.OutputLevel = VERBOSE
- #ToolSvc.DCMathSegmentMaker.OutputLevel = DEBUG
- #ToolSvc.DCMathSegmentMaker.CurvedErrorScaling = False
- #ToolSvc += CfgMgr.Muon__MuonSegmentInOverlapResolvingTool("MuonSegmentInOverlapResolvingTool",OutputLevel = VERBOSE)
- #ToolSvc.MuonTrackCleaner.OutputLevel = VERBOSE
-
- #ToolSvc.MuonExtrapolator.OutputLevel = VERBOSE
- #ToolSvc.MCTBExtrapolator.OutputLevel = VERBOSE
- #ToolSvc.MuonNavigator.OutputLevel = VERBOSE
- #ToolSvc.AtlasNavigator.OutputLevel = VERBOSE
- #ToolSvc.AtlasExtrapolator.OutputLevel = VERBOSE
- #ToolSvc.MuSt_MCTBFitter.OutputLevel = VERBOSE
- #ToolSvc.TrackingVolumeArrayCreator.OutputLevel = VERBOSE
- #ToolSvc.TrackingVolumeHelper.OutputLevel = VERBOSE
- #ToolSvc.MuonStationBuilder.OutputLevel = VERBOSE
- #ToolSvc.MuonInertMaterialBuilder.OutputLevel = VERBOSE
- #ToolSvc.MCTBSLFitter.OutputLevel = VERBOSE
- #ToolSvc.MooMuonTrackBuilder.OutputLevel = VERBOSE
- #ToolSvc.MuSt_MCTBSLFitter.OutputLevel = VERBOSE
- #ToolSvc.AtlasSTEP_Propagator.OutputLevel=VERBOSE
- #ToolSvc.MdtMathSegmentFinder.FinderDebugLevel = 10
- #ToolSvc.MuSt_MooTrackFitter.OutputLevel = VERBOSE
- #ToolSvc.MuSt_MooSLTrackFitter.OutputLevel = VERBOSE
- #ToolSvc.MuSt_MooCandidateMatchingTool.OutputLevel = VERBOSE
- #ToolSvc.MooMuonTrackBuilder.OutputLevel = VERBOSE #topSequence.MuonSegmentCnvAlg.OutputLevel = VERBOSE
- #topSequence.TrackParticleTruthAlg.OutputLevel = VERBOSE
- #from MuonTruthAlgs.MuonTruthAlgsConf import Muon__MuonTruthDecorationAlg
- #from MuonIdHelpers.MuonIdHelpersConf import Muon__MuonIdHelperTool
- #ToolSvc += Muon__MuonIdHelperTool("MuonIdHelperTool",OutputLevel=VERBOSE)
- #ToolSvc.MdtDriftCircleOnTrackCreator.OutputLevel=DEBUG
- #ToolSvc.MuonLayerHoughTool.OutputLevel = VERBOSE
- #ToolSvc.MuonLayerHoughTool.DebugHough = True
- #ToolSvc.MuonLayerHoughTool.DoNtuple = True
- #ToolSvc.MuonLayerHoughTool.UseSeeds = False
colname = "Muons"
- #from MuonTrackPerformance.MuonTrackPerformanceConf import MuonSegmentPerformanceAlg
- #topSequence += MuonSegmentPerformanceAlg(name="MuonSegmentPerformanceAlg",OutputLevel=VERBOSE)
- #topSequence.MuonSegmentPerformanceAlg.OutputLevel=VERBOSE
- #topSequence.MuonTruthDecorationAlg.OutputLevel=VERBOSE
+
if rec.doTruth() and muonRecFlags.doTrackPerformance():
topSequence.MuonStandalonePerformanceAlg.ProduceEventListMissedTracks = 2 # "0: off, 1: two station, 2: + one station" );
if( muonCombinedRecFlags.doxAOD() ):
topSequence.ExtrapolatedMuonPerformanceAlg.ProduceEventListMissedTracks = 2
topSequence.CombinedMuonPerformanceAlg.ProduceEventListMissedTracks = 2
- #include("MuonTestEDM/MuonTestEDM_jobOptions.py")
-
if muonCombinedRecFlags.doMuGirlLowBeta():
ToolSvc.MuonTrackTruthTool.ConsideredPDGs=[13,-13,1000015,-1000015]
topSequence.ExtrapolatedMuonPerformanceAlg.ConsideredPDGs=[13,-13,1000015,-1000015]
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.cxx
index 9ac42b274a20a61479e58ef3b4162028ca7a19f3..1e74fd85c56f2e66cc30f35b6b007d450191b999 100644
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.cxx
@@ -4,32 +4,15 @@
#include "MuTagAmbiguitySolverTool.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/MsgStream.h"
-
#include "GaudiKernel/SmartDataPtr.h"
#include "GaudiKernel/IDataProviderSvc.h"
-
-#include "Identifier/Identifier.h"
-#include "MuonIdHelpers/MdtIdHelper.h"
-#include "MuonIdHelpers/CscIdHelper.h"
-#include "MuonIdHelpers/RpcIdHelper.h"
-#include "MuonIdHelpers/TgcIdHelper.h"
-#include "MuonReadoutGeometry/MuonDetectorManager.h"
-
-#include "MuonIdHelpers/MuonIdHelperTool.h"
-#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-
#include "MuonSegment/MuonSegment.h"
-//#include "TrkParameters/MeasuredPerigee.h"
#include "MuonSegment/MuonSegmentQuality.h"
#include "TrkEventPrimitives/LocalDirection.h"
#include "MuonSegmentMakerUtils/MuonSegmentKey.h"
#include "MuonSegmentMakerUtils/CompareMuonSegmentKeys.h"
#include "MuonSegmentMakerToolInterfaces/IMuonSegmentMatchingTool.h"
#include "TrkTrack/Track.h"
-
#include "MuonCombinedEvent/MuonSegmentInfo.h"
MuTagAmbiguitySolverTool::MuTagAmbiguitySolverTool(const std::string& t,
@@ -37,13 +20,7 @@ MuTagAmbiguitySolverTool::MuTagAmbiguitySolverTool(const std::string& t,
const IInterface* p ):
AthAlgTool(t,n,p),
p_muonPrinter("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"),
- p_muonIdHelper("Muon::MuonIdHelperTool/MuonIdHelperTool"),
- p_segmentMatchingTool("Muon::MuonSegmentMatchingTool/MuonSegmentMatchingTool"),
- p_StoreGateSvc(0),
- m_mdtIdHelper(0),
- m_cscIdHelper(0),
- m_rpcIdHelper(0),
- m_tgcIdHelper(0)
+ p_segmentMatchingTool("Muon::MuonSegmentMatchingTool/MuonSegmentMatchingTool")
{
declareInterface<IMuTagAmbiguitySolverTool>(this);
declareProperty("MuonSegmentMatchingTool" , p_segmentMatchingTool ) ;
@@ -53,57 +30,26 @@ MuTagAmbiguitySolverTool::MuTagAmbiguitySolverTool(const std::string& t,
declareProperty("RejectMatchPhi", m_rejectMatchPhi = true );
}
-MuTagAmbiguitySolverTool::~MuTagAmbiguitySolverTool(){
-}
-
StatusCode MuTagAmbiguitySolverTool::initialize()
{
-
ATH_CHECK( AthAlgTool::initialize() );
-
- //Set pointer on StoreGateSvc
- ATH_CHECK( service("StoreGateSvc", p_StoreGateSvc) );
ATH_MSG_INFO( "================================" );
ATH_MSG_INFO( "=Proprieties are " );
ATH_MSG_INFO( "================================" );
- // retrieve MuonDetectorManager
- const MuonGM::MuonDetectorManager* detMgr;
- ATH_CHECK( detStore()->retrieve(detMgr) );
-
- // initialize MuonIdHelpers
- if (detMgr) {
- m_mdtIdHelper = detMgr->mdtIdHelper();
- m_cscIdHelper = detMgr->cscIdHelper();
- m_rpcIdHelper = detMgr->rpcIdHelper();
- m_tgcIdHelper = detMgr->tgcIdHelper();
- } else {
- m_mdtIdHelper = 0;
- m_cscIdHelper = 0;
- m_rpcIdHelper = 0;
- m_tgcIdHelper = 0;
- }
-
ATH_CHECK( m_edmHelperSvc.retrieve() );
ATH_CHECK( p_muonPrinter.retrieve() );
- ATH_CHECK( p_muonIdHelper.retrieve() );
+ ATH_CHECK( m_idHelperSvc.retrieve() );
ATH_CHECK( p_segmentMatchingTool.retrieve() );
return StatusCode::SUCCESS;
}
-StatusCode MuTagAmbiguitySolverTool::finalize(){
- return AthAlgTool::finalize();
-}
-
-
- std::vector< MuonCombined::MuonSegmentInfo > MuTagAmbiguitySolverTool::solveAmbiguities( std::vector< MuonCombined::MuonSegmentInfo > mtos ) const {
- // std::vector< MuonCombined::MuonSegmentInfo > outputMTOs;
+std::vector< MuonCombined::MuonSegmentInfo > MuTagAmbiguitySolverTool::solveAmbiguities( std::vector< MuonCombined::MuonSegmentInfo > mtos ) const {
ATH_MSG_DEBUG( "mtos size before any cuts " << mtos.size() );
// Store the number of segments associated to one track (pointer)
-
for( unsigned int ns1 = 0; ns1 < mtos.size(); ns1++){
ATH_MSG_DEBUG( " index " << ns1 << " nsegments " << mtos[ns1].nsegments << " track pointer " << mtos[ns1].track << " stationLayer " << mtos[ns1].stationLayer << " selected " << mtos[ns1].selected );
int nsegments = 1;
@@ -294,21 +240,21 @@ int MuTagAmbiguitySolverTool::ambiguousSegment( const Muon::MuonSegment& seg1, c
// check whether the segments are in the same station layer
Identifier ch1 = m_edmHelperSvc->chamberId(seg1);
Identifier ch2 = m_edmHelperSvc->chamberId(seg2);
- Muon::MuonStationIndex::StIndex st1 = p_muonIdHelper->stationIndex(ch1);
- Muon::MuonStationIndex::StIndex st2 = p_muonIdHelper->stationIndex(ch2);
+ Muon::MuonStationIndex::StIndex st1 = m_idHelperSvc->stationIndex(ch1);
+ Muon::MuonStationIndex::StIndex st2 = m_idHelperSvc->stationIndex(ch2);
if( st1 != st2 ) return 0;
// check whether the segments are in the same chamber layer (small/large)
- Muon::MuonStationIndex::ChIndex chI1 = p_muonIdHelper->chamberIndex(ch1);
- Muon::MuonStationIndex::ChIndex chI2 = p_muonIdHelper->chamberIndex(ch2);
+ Muon::MuonStationIndex::ChIndex chI1 = m_idHelperSvc->chamberIndex(ch1);
+ Muon::MuonStationIndex::ChIndex chI2 = m_idHelperSvc->chamberIndex(ch2);
if( chI1 != chI2 ){
// only match if segments both MDT or both CSC
- if( p_muonIdHelper->isMdt(ch1) == p_muonIdHelper->isMdt(ch2) ) {
+ if( m_idHelperSvc->isMdt(ch1) == m_idHelperSvc->isMdt(ch2) ) {
// make sure segments are in same sector or neighbouring one
- int sector1 = p_muonIdHelper->sector(ch1);
- int sector2 = p_muonIdHelper->sector(ch2);
+ int sector1 = m_idHelperSvc->sector(ch1);
+ int sector2 = m_idHelperSvc->sector(ch2);
bool sectorOk = false;
if( sector1 == sector2 ) sectorOk = true;
if( abs(sector1-sector2) == 1 ) sectorOk = true;
@@ -368,8 +314,8 @@ std::vector< MuonCombined::MuonSegmentInfo > MuTagAmbiguitySolverTool::selectBe
}
Identifier ch1 = m_edmHelperSvc->chamberId(*museg1);
- Muon::MuonStationIndex::StIndex st1 = p_muonIdHelper->stationIndex(ch1);
- int eta1 = p_muonIdHelper->stationEta(ch1);
+ Muon::MuonStationIndex::StIndex st1 = m_idHelperSvc->stationIndex(ch1);
+ int eta1 = m_idHelperSvc->stationEta(ch1);
for( unsigned int mts2=mts1+1; mts2 < mtss.size() ; ++mts2 ){
@@ -380,10 +326,10 @@ std::vector< MuonCombined::MuonSegmentInfo > MuTagAmbiguitySolverTool::selectBe
}
Identifier ch2 = m_edmHelperSvc->chamberId(*museg2);
- Muon::MuonStationIndex::StIndex st2 = p_muonIdHelper->stationIndex(ch2);
+ Muon::MuonStationIndex::StIndex st2 = m_idHelperSvc->stationIndex(ch2);
if( st1 != st2 ) continue;
- int eta2 = p_muonIdHelper->stationEta(ch2);
+ int eta2 = m_idHelperSvc->stationEta(ch2);
if( eta1 != eta2 ) continue;
if(ambiguousSegment(*museg1,*museg2)) {
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.h b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.h
index da72eca3ed030ad20990b9f9f390e4c01a5726ac..fdb20cde2a1a77817c0682bb5337aa8babe76c92 100644
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.h
+++ b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagAmbiguitySolverTool.h
@@ -1,25 +1,23 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MuTagAmbiguitySolverTool_H
#define MuTagAmbiguitySolverTool_H
+#include "MuonSegmentTaggerToolInterfaces/IMuTagAmbiguitySolverTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
-#include <string>
+
#include "TrkSegment/SegmentCollection.h"
#include "MuonSegmentMakerToolInterfaces/IMuonSegmentMatchingTool.h"
-#include "MuonSegmentTaggerToolInterfaces/IMuTagAmbiguitySolverTool.h"
-#include "MuonCombinedEvent/MuonSegmentInfo.h"
+#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
+#include "MuonCombinedEvent/MuonSegmentInfo.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
-class StoreGateSvc;
-class MdtIdHelper;
-class CscIdHelper;
-class RpcIdHelper;
-class TgcIdHelper;
+#include <string>
/**
@class MuTagAmbiguitySolverTool
@@ -30,18 +28,14 @@ class TgcIdHelper;
namespace Muon {
class MuonSegment;
- class MuonEDMPrinterTool;
- class MuonIdHelperTool;
- class IMuonSegmentMatchingTool;
}
class MuTagAmbiguitySolverTool : virtual public IMuTagAmbiguitySolverTool, public AthAlgTool{
public:
MuTagAmbiguitySolverTool(const std::string& t ,const std::string& n ,const IInterface* p);
- virtual ~MuTagAmbiguitySolverTool ();
+ virtual ~MuTagAmbiguitySolverTool()=default;
- virtual StatusCode initialize ();
- virtual StatusCode finalize ();
+ virtual StatusCode initialize();
std::vector< MuonCombined::MuonSegmentInfo > solveAmbiguities( std::vector< MuonCombined::MuonSegmentInfo > mtos ) const ;
@@ -56,14 +50,8 @@ class MuTagAmbiguitySolverTool : virtual public IMuTagAmbiguitySolverTool, publi
"Muon::MuonEDMHelperSvc/MuonEDMHelperSvc",
"Handle to the service providing the IMuonEDMHelperSvc interface" }; //!< Pointer on IMuonEDMHelperSvc
ToolHandle< Muon::MuonEDMPrinterTool > p_muonPrinter ; //!< Pointer on MuonEDMPrinterTool
- ToolHandle< Muon::MuonIdHelperTool > p_muonIdHelper ; //!< Pointer on MuonIdHelperTool
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
ToolHandle< Muon::IMuonSegmentMatchingTool> p_segmentMatchingTool ; //!< Pointer on MuonSegmentMatchingTool
- StoreGateSvc* p_StoreGateSvc ; //!< Pointer On StoreGateSvc
-
- const MdtIdHelper* m_mdtIdHelper;
- const CscIdHelper* m_cscIdHelper;
- const RpcIdHelper* m_rpcIdHelper;
- const TgcIdHelper* m_tgcIdHelper;
bool m_hitOverlapMatching; //!< check hit overlap of segments in ambi solving
bool m_slOverlapMatching; //!< for segments in a SL overlap in the same station layer, check whether from same particle
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx
index 13c163c6e9cc3b12da959f47e199eebd5e6f87ec..581e990d4cd4c7c0624ffcac797507510c413b84 100644
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.cxx
@@ -1,49 +1,30 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-#include <cmath>
-
#include "MuTagMatchingTool.h"
-#include "StoreGate/StoreGateSvc.h"
-#include "GaudiKernel/MsgStream.h"
-
#include "GaudiKernel/SmartDataPtr.h"
#include "GaudiKernel/IDataProviderSvc.h"
-
-#include "Identifier/Identifier.h"
-#include "MuonIdHelpers/MuonIdHelperTool.h"
-#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
-#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
#include "TrkGeometry/MagneticFieldProperties.h"
#include "TrkSurfaces/Surface.h"
-
-#include "MuonSegmentMakerToolInterfaces/IMuonSegmentSelectionTool.h"
-#include "MuonSegmentMakerToolInterfaces/IMuonSegmentHitSummaryTool.h"
-//#include "MuonSegmentMakerToolInterfaces/IMuTagMatchingTool.h"
-#include "TrkToolInterfaces/IResidualPullCalculator.h"
-
#include "TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h"
-//#include "TrkParameters/Perigee.h"
#include "TrkParameters/TrackParameters.h"
#include "TrkTrack/Track.h"
-
#include "TrkExInterfaces/IExtrapolator.h"
#include "TrkExInterfaces/IPropagator.h"
-
#include "TrkEventPrimitives/LocalDirection.h"
#include "TrkEventPrimitives/JacobianPhiThetaLocalAngles.h"
#include "TrkEventPrimitives/PropDirection.h"
#include "EventPrimitives/EventPrimitivesHelpers.h"
-
#include "TrkEventPrimitives/ResidualPull.h"
#include "MuonRIO_OnTrack/MdtDriftCircleOnTrack.h"
-
#include "MuonSegment/MuonSegment.h"
#include "MuonSegment/MuonSegmentQuality.h"
#include "MuonCombinedEvent/MuonSegmentInfo.h"
+#include <cmath>
+
namespace {
// local helper functions
#if 0
@@ -62,7 +43,6 @@ namespace {
}
#endif
-
}
@@ -76,7 +56,6 @@ MuTagMatchingTool::MuTagMatchingTool(const std::string& t,
, m_hitSummaryTool("Muon::MuonSegmentHitSummaryTool/MuonSegmentHitSummaryTool")
, m_selectionTool("Muon::MuonSegmentSelectionTool/MuonSegmentSelectionTool")
, m_pullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator")
- , p_StoreGateSvc(0)
{
declareInterface<IMuTagMatchingTool>(this);
declareProperty( "IExtrapolator" , p_IExtrapolator ) ;
@@ -112,17 +91,8 @@ MuTagMatchingTool::MuTagMatchingTool(const std::string& t,
declareProperty( "MuonChamberT0s", m_t0Location = "MooreMuonChamberT0s" );
}
-MuTagMatchingTool::~MuTagMatchingTool(){
-}
-
StatusCode MuTagMatchingTool::initialize()
-{
-
- ATH_CHECK( AthAlgTool::initialize() );
-
-//Set pointer on StoreGateSvc
- ATH_CHECK( service("StoreGateSvc", p_StoreGateSvc) );
-
+{
ATH_MSG_DEBUG( "================================" );
ATH_MSG_DEBUG( "=Proprieties are " );
ATH_MSG_DEBUG( "GlobalThetaCut" << std::setw(10) << m_GLOBAL_THETA_CUT);
@@ -149,13 +119,11 @@ StatusCode MuTagMatchingTool::initialize()
ATH_MSG_DEBUG( "Retrieved tool " << p_IExtrapolator );
ATH_CHECK( p_propagator.retrieve() );
-
-//Retrieve IdHelpers
// MuonDetectorManager from the conditions store
ATH_CHECK(m_DetectorManagerKey.initialize());
- ATH_CHECK( m_muonIdHelperTool.retrieve() );
+ ATH_CHECK( m_idHelperSvc.retrieve() );
ATH_CHECK( m_edmHelperSvc.retrieve() );
ATH_CHECK( m_printer.retrieve() );
ATH_CHECK( m_pullCalculator.retrieve() );
@@ -163,10 +131,6 @@ StatusCode MuTagMatchingTool::initialize()
return StatusCode::SUCCESS;
}
-StatusCode MuTagMatchingTool::finalize(){
- return AthAlgTool::finalize();
-}
-
bool MuTagMatchingTool::match( const Trk::TrackParameters* atSurface,
const Muon::MuonSegment* segment,
std::string surfaceName ) const {
@@ -201,11 +165,11 @@ std::string MuTagMatchingTool::segmentStationString( const Muon::MuonSegment* se
continue;
}
Identifier segID = segment->rioOnTrack(i)->identify();
- if( m_muonIdHelperTool->mdtIdHelper().is_mdt(segID) ){
- station = m_muonIdHelperTool->mdtIdHelper().stationNameString( m_muonIdHelperTool->mdtIdHelper().stationName( segID ) );
+ if( m_idHelperSvc->isMdt(segID) ){
+ station = m_idHelperSvc->mdtIdHelper().stationNameString( m_idHelperSvc->mdtIdHelper().stationName( segID ) );
break;
- } else if( m_muonIdHelperTool->isCsc(segID) ){
- station = m_muonIdHelperTool->cscIdHelper().stationNameString( m_muonIdHelperTool->cscIdHelper().stationName( segID ) );
+ } else if( m_idHelperSvc->isCsc(segID) ){
+ station = m_idHelperSvc->cscIdHelper().stationNameString( m_idHelperSvc->cscIdHelper().stationName( segID ) );
break ;
}
}
@@ -701,8 +665,8 @@ void MuTagMatchingTool::nrTriggerHits( const Muon::MuonSegment* seg, int& nRPC,
if( !rot ) {
continue;
}
- if( m_muonIdHelperTool->rpcIdHelper().is_rpc( rot->identify() ) ) ++nRPC;
- if( m_muonIdHelperTool->tgcIdHelper().is_tgc( rot->identify() ) ) ++nTGC;
+ if( m_idHelperSvc->isRpc( rot->identify() ) ) ++nRPC;
+ if( m_idHelperSvc->isTgc( rot->identify() ) ) ++nTGC;
}
}
@@ -785,10 +749,6 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
// Local angles
Trk::LocalDirection segLocDir = segment->localDirection() ;
- // const Trk::PlaneSurface psf( exTrack->associatedSurface() );
- //Amg::Vector3D<double> exGlobDir( exTrack->momentum() );
- //Amg::Vector3D exGlobDir(exTrack->momentum() );
- //const Trk::LocalDirection* exTrkLocDir = psf->(globalToLocalDirection( exGlobDir ) ;
Trk::LocalDirection exTrkLocDir ;
exTrack->associatedSurface().globalToLocalDirection(exTrack->momentum(),exTrkLocDir);
info.dangleYZ = exTrkLocDir.angleYZ() - segLocDir.angleYZ(); //deltaYZ
@@ -802,7 +762,6 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
info.exErrorXZ = exTrkErrXZ;
info.exErrorYZ = exTrkErrYZ;
info.exCovYZY = covLocYYZ;
-// if(exTrack) ATH_MSG_DEBUG( " covValue(Trk::theta,Trk::locY) " << measPars->localErrorMatrix().covValue(Trk::theta,Trk::locY) << " covLocYYZ " << covLocYYZ );
calculateLocalAngleErrors ( segment, segErrXZ, segErrYZ );
info.segErrorXZ = segErrXZ;
info.segErrorYZ = segErrYZ;
@@ -823,7 +782,7 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
Identifier chId = m_edmHelperSvc->chamberId(*segment);
- Muon::MuonStationIndex::StIndex stIndex = m_muonIdHelperTool->stationIndex(chId);
+ Muon::MuonStationIndex::StIndex stIndex = m_idHelperSvc->stationIndex(chId);
//
// residuals and pulls in X coordinate (along tube)
//
@@ -854,12 +813,12 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
Identifier id = mdt->identify();
// get layer index
- int lay = m_muonIdHelperTool->mdtIdHelper().tubeLayer(id);
- int tube = m_muonIdHelperTool->mdtIdHelper().tube(id);
+ int lay = m_idHelperSvc->mdtIdHelper().tubeLayer(id);
+ int tube = m_idHelperSvc->mdtIdHelper().tube(id);
const MuonGM::MdtReadoutElement* detEl = mdt->prepRawData() ? mdt->prepRawData()->detectorElement() : MuonDetMgr->getMdtReadoutElement(id);
if( !detEl ){
- ATH_MSG_WARNING(" could not get MdtReadoutElement for tube " << m_muonIdHelperTool->toString(id));
+ ATH_MSG_WARNING(" could not get MdtReadoutElement for tube " << m_idHelperSvc->toString(id));
continue;
}
double tubeLen = detEl->getActiveTubeLength(lay,tube);
@@ -867,10 +826,10 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
// use SL within station to speed up extrapolation
const Trk::TrackParameters* exP = p_propagator->propagate(*exTrack, mdt->associatedSurface(), Trk::anyDirection, false, Trk::NoField);
if( !exP ){
- ATH_MSG_WARNING("Failed to extrapolate to " << m_muonIdHelperTool->toString(id));
+ ATH_MSG_WARNING("Failed to extrapolate to " << m_idHelperSvc->toString(id));
continue;
}
- ATH_MSG_DEBUG(m_muonIdHelperTool->toString(id) << " exPos " << exP->parameters()[Trk::locR] << " y " << exP->parameters()[Trk::locZ]
+ ATH_MSG_DEBUG(m_idHelperSvc->toString(id) << " exPos " << exP->parameters()[Trk::locR] << " y " << exP->parameters()[Trk::locZ]
<< " tubeL " << tubeLen);
double exResidual = fabs(exP->parameters()[Trk::locZ]) - 0.5*tubeLen;
if( maxResXMdt < exResidual ) maxResXMdt = exResidual;
@@ -880,11 +839,11 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
// get id and check that it is a muon hit id
Identifier id = m_edmHelperSvc->getIdentifier(**mit);
- if( !id.is_valid() || !m_muonIdHelperTool->isMuon(id) ) continue;
- if( !m_muonIdHelperTool->measuresPhi(id) ) continue;
+ if( !id.is_valid() || !m_idHelperSvc->isMuon(id) ) continue;
+ if( !m_idHelperSvc->measuresPhi(id) ) continue;
const Trk::TrackParameters* exP = p_propagator->propagate(*exTrack, (*mit)->associatedSurface(), Trk::anyDirection, false, Trk::NoField);
if( !exP ){
- ATH_MSG_WARNING("Failed to extrapolate to " << m_muonIdHelperTool->toString(id));
+ ATH_MSG_WARNING("Failed to extrapolate to " << m_idHelperSvc->toString(id));
continue;
}
const Trk::ResidualPull* resPull = m_pullCalculator->residualPull( *mit, exP, Trk::ResidualPull::Unbiased );
@@ -907,7 +866,7 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
if( fabs(residual) < fabs(minResPhi) ) minResPhi = residual;
if( fabs(pull) > fabs(minPullPhi) ) minPullPhi = pull;
}
- ATH_MSG_DEBUG(m_muonIdHelperTool->toString(id) << " residual " << residual << " pull " << pull);
+ ATH_MSG_DEBUG(m_idHelperSvc->toString(id) << " residual " << residual << " pull " << pull);
delete resPull;
delete exP;
}
@@ -915,8 +874,6 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
ATH_MSG_DEBUG("Residual phi min " << minResPhi << " max " << maxResPhi << " pull min " << minPullPhi << " max " << maxPullPhi
<< " dist from tube end " << maxResXMdt );
-// if( minResPhi < 1e8 ) delta_phi = minResPhi; // resX = minResPhi;
-
//
// Store the local X variables
//
@@ -943,17 +900,7 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
}
double dydyz = scale*info.exCovYZY;
double correction = dydyz/(info.exErrorYZ*info.exErrorYZ);
-/*
-//
-// Flip sign in endcap for eta > 0 (not understood why)
-//
- if(stIndex == Muon::MuonStationIndex::EI || stIndex == Muon::MuonStationIndex::EM || stIndex == Muon::MuonStationIndex::EO || stIndex == Muon::MuonStationIndex::EE) {
- if(cos(segment->globalDirection().theta())>0) {
- correction = -correction;
- ATH_MSG_DEBUG(" Flip correlation term for segment direction theta " << segment->globalDirection().theta() << " position theta " << segment->globalPosition().theta());
- }
- }
-*/
+
//
// residual after taking into account the correlation with the angle YZ
//
@@ -981,8 +928,6 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
if (info.chi2Y<0) ATH_MSG_DEBUG( " NEGATIVE chi2Y " << chi2Y << " dydyz " << dydyz << " determinant " << det );
bool hasPhi = false;
-// if( stIndex == Muon::MuonStationIndex::EI || stIndex == Muon::MuonStationIndex::EM ||
-// stIndex == Muon::MuonStationIndex::BM || stIndex == Muon::MuonStationIndex::BO ) hasPhi = true;
if(hitCounts.nexpectedTrigHitLayers> 1) hasPhi = true;
@@ -999,7 +944,7 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
if( stIndex == Muon::MuonStationIndex::BM ) info.stationLayer = 2;
if( stIndex == Muon::MuonStationIndex::BO ) info.stationLayer = 3;
if( stIndex == Muon::MuonStationIndex::BE ) info.stationLayer = 4;
- if( stIndex == Muon::MuonStationIndex::EI ) info.stationLayer = m_muonIdHelperTool->isMdt(chId) ? 11 : 21;
+ if( stIndex == Muon::MuonStationIndex::EI ) info.stationLayer = m_idHelperSvc->isMdt(chId) ? 11 : 21;
if( stIndex == Muon::MuonStationIndex::EM ) info.stationLayer = 12;
if( stIndex == Muon::MuonStationIndex::EO ) info.stationLayer = 13;
if( stIndex == Muon::MuonStationIndex::EE ) info.stationLayer = 14;
@@ -1038,11 +983,9 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
int selected = 0;
scale = 1.;
-// if(info.stationLayer==12) scale = 5./3.;
if(fabs(info.pullY)<m_MATCH_THETA&&fabs(info.pullYZ)<m_MATCH_THETAANGLE&&fabs(info.pullCY)<scale*m_combinedPullCut&&info.pullChamber<m_chamberPullCut){
bool pass = true;
-// if(info.hasPhi && (fabs(info.minimumPullPhi) > m_combinedPullCut && fabs(info.minimumPullPhi) < 100000. ) ) pass = false;
if(pass) selected = 1;
}
@@ -1054,7 +997,6 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
}
void MuTagMatchingTool::calculateLocalAngleErrors( const Muon::MuonSegment* segment, double& angleXZerror, double& angleYZerror ) const {
- //const Trk::CovarianceMatrix& segGlobCov = segment->covariance();
const Amg::MatrixX& segGlobCov = segment->localCovariance();
angleXZerror = 999.;
angleYZerror = 999.;
@@ -1074,38 +1016,24 @@ MuonCombined::MuonSegmentInfo MuTagMatchingTool::muTagSegmentInfo( const Trk::Tr
// Parameters are described as Trk::LocX, Trk::locY, Trk::phi, Trk::theta
// So the errormatrix of the track 'localErrorMatrix' still holds global angle representation!!!!
//retrieve Jabcobian to transform the global errors err_phi,err_theta to local errors err_alphaXZ, err_alphaYZ
- // const CLHEP::HepRotation& glob2loc = exTrack->associatedSurface()->transform().getRotation().inverse();
const Amg::RotationMatrix3D& glob2loc = exTrack->associatedSurface().transform().rotation().inverse();
- //const CLHEP::HepVector& exTrkParms = exTrack->parameters();
const AmgVector(5)& exTrkParms = exTrack->parameters();
Trk::JacobianPhiThetaLocalAngles jacobianExTrk( exTrkParms[Trk::phi], exTrkParms[Trk::theta], glob2loc );
// start with global angles error matrix
- //const Trk::CovarianceMatrix& exTrkGlobCov = exTrack->covariance();
- //const AmgSymMatrix(5)* exTrkGlobCov = exTrack->covariance();
-
- //CLHEP::HepSymMatrix anglesCovGlob(2,0);
Amg::MatrixX anglesCovGlob(2,2);
- //anglesCovGlob(0,0) = exTrkGlobCov(Trk::phi,Trk::phi) ;
anglesCovGlob(0,0) = (*exTrack->covariance())(Trk::phi,Trk::phi);
- // anglesCovGlob(1,0) = exTrkGlobCov(Trk::theta,Trk::phi) ;
anglesCovGlob(1,0) = (*exTrack->covariance())(Trk::theta,Trk::phi);
- //anglesCovGlob(0,1) = exTrkGlobCov(Trk::phi,Trk::theta) ;
anglesCovGlob(0,1) = (*exTrack->covariance())(Trk::phi,Trk::theta);
- //anglesCovGlob(1,1) = exTrkGlobCov(Trk::theta,Trk::theta) ;
anglesCovGlob(1,1) = (*exTrack->covariance())(Trk::theta,Trk::theta);
// NEW METHOD
- //const CLHEP::HepSymMatrix& anglesCovLoc = anglesCovGlob.similarity(jacobianExTrk);
- //const AmgSymMatrix(5)& anglesCovLoc = anglesCovGlob.similarity(jacobianExTrk);
const AmgSymMatrix(2)& anglesCovLoc = anglesCovGlob.similarity(jacobianExTrk);
if (anglesCovLoc(0,0) >= 0) angleXZerror = std::sqrt( anglesCovLoc(0,0) );
if (anglesCovLoc(1,1) >= 0) angleYZerror = std::sqrt( anglesCovLoc(1,1) );
- //covLocYYZ = exTrkGlobCov[Trk::locY][Trk::phi]*jacobianExTrk[0][1] + exTrkGlobCov[Trk::locY][Trk::theta]*jacobianExTrk[1][1];
covLocYYZ = (*exTrack->covariance())(Trk::locY,Trk::phi)*jacobianExTrk(0,1) + (*exTrack->covariance())(Trk::locY,Trk::theta)*jacobianExTrk(1,1);
- //ATH_MSG_DEBUG(" covLocYYZ " << covLocYYZ << " covlocytheta " << exTrkGlobCov[Trk::locY][Trk::theta] << " J01 " << jacobianExTrk[0][1] << " J11 " << jacobianExTrk[0][1] );
ATH_MSG_DEBUG(" covLocYYZ " << covLocYYZ << " covlocytheta " << (*exTrack->covariance())(Trk::locY,Trk::theta) << " J01 " << jacobianExTrk(0,1) << " J11 " << jacobianExTrk(0,1));
// some printout
ATH_MSG_DEBUG( std::setw(20) << "Angles Jacobian used for TRACK angle errors below: " << jacobianExTrk );
@@ -1154,7 +1082,7 @@ bool MuTagMatchingTool::isCscSegment( const Muon::MuonSegment* seg ) const {
if( !rot ) {
continue;
}
- if( m_muonIdHelperTool->isCsc( rot->identify() ) ) isCsc=true;
+ if( m_idHelperSvc->isCsc( rot->identify() ) ) isCsc=true;
}
return isCsc;
@@ -1175,7 +1103,7 @@ unsigned int MuTagMatchingTool::cscHits( const Muon::MuonSegment* seg ) const {
if( !rot ) {
continue;
}
- if( m_muonIdHelperTool->isCsc( rot->identify() ) ) ++nrHits;
+ if( m_idHelperSvc->isCsc( rot->identify() ) ) ++nrHits;
}
return nrHits ;
diff --git a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.h b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.h
index 14e07561d49ff4020de9843c02654f6b7e0abae0..451efa23230506e1242333001230411d95847dba 100644
--- a/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.h
+++ b/Reconstruction/MuonIdentification/MuonSegmentTaggers/MuonSegmentTaggerTools/src/MuTagMatchingTool.h
@@ -1,14 +1,15 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef MuTagMatchingTool_H
#define MuTagMatchingTool_H
+#include "MuonSegmentTaggerToolInterfaces/IMuTagMatchingTool.h"
#include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ToolHandle.h"
#include "GaudiKernel/ServiceHandle.h"
-#include <string>
+#include "GaudiKernel/ToolHandle.h"
+
#include "TrkParameters/TrackParameters.h"
#include "TrkGeometry/TrackingGeometry.h"
#include "MuonSegment/MuonSegment.h"
@@ -16,15 +17,15 @@
#include "TrkExInterfaces/IPropagator.h"
#include "MuonSegmentMakerToolInterfaces/IMuonSegmentSelectionTool.h"
#include "MuonSegmentMakerToolInterfaces/IMuonSegmentHitSummaryTool.h"
-#include "MuonSegmentTaggerToolInterfaces/IMuTagMatchingTool.h"
-//#include "TrkParameters/Perigee.h"
#include "TrkParameters/TrackParameters.h"
#include "MuonCombinedEvent/MuonSegmentInfo.h"
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-#include "MuonIdHelpers/MuonIdHelperTool.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
+#include "MuonRecHelperTools/MuonEDMPrinterTool.h"
+#include "TrkToolInterfaces/IResidualPullCalculator.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
-class StoreGateSvc;
+#include <string>
/**
@class MuTagMatchingTool
@@ -33,25 +34,17 @@ class StoreGateSvc;
*/
-namespace Muon {
- class MuonEDMPrinterTool;
-}
-
namespace Trk{
class Surface;
class Track;
- class IResidualPullCalculator;
- // class PropDirection;
}
-
class MuTagMatchingTool : virtual public IMuTagMatchingTool, public AthAlgTool{
public:
MuTagMatchingTool(const std::string& t ,const std::string& n ,const IInterface* p);
- virtual ~MuTagMatchingTool ();
+ virtual ~MuTagMatchingTool()=default;
- virtual StatusCode initialize ();
- virtual StatusCode finalize ();
+ virtual StatusCode initialize();
std::string segmentStationString( const Muon::MuonSegment* segment ) const ;
@@ -134,8 +127,7 @@ class MuTagMatchingTool : virtual public IMuTagMatchingTool, public AthAlgTool{
ToolHandle<Trk::IExtrapolator> p_IExtrapolator ;//!< Pointer on IExtrapolator
ToolHandle<Trk::IPropagator> p_propagator ;//!< Pointer on propagator for SL propagation
- ToolHandle<Muon::MuonIdHelperTool> m_muonIdHelperTool{this, "idHelper",
- "Muon::MuonIdHelperTool/MuonIdHelperTool", "Handle to the MuonIdHelperTool"};
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
ServiceHandle<Muon::IMuonEDMHelperSvc> m_edmHelperSvc {this, "edmHelper",
"Muon::MuonEDMHelperSvc/MuonEDMHelperSvc",
"Handle to the service providing the IMuonEDMHelperSvc interface" };
diff --git a/Reconstruction/RecExample/RecExCommission/share/skipBadEvents.py b/Reconstruction/RecExample/RecExCommission/share/skipBadEvents.py
index 5f805084d2cf1380a3b75452a3987b0ea7fd7137..8a0760044019e2efd725b21dde8cfeb877cf4dad 100644
--- a/Reconstruction/RecExample/RecExCommission/share/skipBadEvents.py
+++ b/Reconstruction/RecExample/RecExCommission/share/skipBadEvents.py
@@ -1,3 +1,3 @@
from AthenaCommon.AppMgr import ServiceMgr
if (rec.doWriteESD):
- ServiceMgr.ByteStreamInputSvc.MaxBadEvents=1000
+ ServiceMgr.EventSelector.MaxBadEvents=1000
diff --git a/Reconstruction/RecExample/RecExCommon/share/BSRead_config.py b/Reconstruction/RecExample/RecExCommon/share/BSRead_config.py
index aa384c3616d01a4e83436bdb4662e3ecf8952977..3fdb561d9715ab7282f07a2846ba6490e56ef465 100644
--- a/Reconstruction/RecExample/RecExCommon/share/BSRead_config.py
+++ b/Reconstruction/RecExample/RecExCommon/share/BSRead_config.py
@@ -17,7 +17,6 @@ if not hasattr( svcMgr, "ByteStreamAddressProviderSvc" ):
if not athenaCommonFlags.isOnline() and not rec.readTAG():
try:
- #svcMgr.ByteStreamInputSvc.ProcessBadEvent=True
svcMgr.EventSelector.ProcessBadEvent=True
except Exception:
treatException ("could not set svcMgr.EventSelector.ProcessBadEvent=True")
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_Partition_Online_ID.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_Partition_Online_ID.py
index e3e7f79fbdf8a09c24769cea1f4ff24957a8c2dc..fcabd08a432e875ed87b75b5d0abd204909b786a 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_Partition_Online_ID.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_Partition_Online_ID.py
@@ -73,7 +73,7 @@ if ( publishName == "ID-AthenaMon-Noise" ):
streamType = 'monitoring'
streamName = 'IDMonitoring'
streamLogic = 'Or'# This should be taken out when we have a proper IDMonitoring stream
- dispersion = False
+ groupName = ''
lvl1Logic = 'Or' if partitionName == "ATLAS" else 'Ignore' # cgrefe 08.09.15: see if the Or works in beam
lvl1Name = 'L1_RD0_EMPTY'
doIdGlobalErrorMon = True
@@ -117,7 +117,7 @@ elif ( publishName == "ID-Test-Application" ):
elif ( publishName == 'ID-AthenaMon-TRTBeam' ):
keyname = 'dcm'
keycount = 255 # there are only around 100 SFIs - connect to all of them
- dispersion = False # process the same events as other monitoring jobs with the same event selection
+ groupName = '' # process the same events as other monitoring jobs with the same event selection
streamType = 'monitoring'
streamLogic = 'Or'
streamName = 'IDMonitoring'# avoid PixelNoise and SCTNoise, because those streams contain mostly partial events without TRT data
@@ -129,7 +129,7 @@ elif ( publishName == 'ID-AthenaMon-TRTBeam' ):
elif ( publishName == 'ID-AthenaMon-TRTBeam-Test' ):
keyname = 'dcm'
keycount = 255 # there are only around 100 SFIs - connect to all of them
- dispersion = False # process the same events as other monitoring jobs with the same event selection
+ groupName = '' # process the same events as other monitoring jobs with the same event selection
streamType = 'monitoring'
streamLogic = 'Or'
streamName = 'IDMonitoring'# avoid PixelNoise and SCTNoise, because those streams contain mostly partial events without TRT data
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_Partition_Online_TRT.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_Partition_Online_TRT.py
index 5b27aaa67242c6be6ff673f6ba4b01c88a8d2a70..00dfcb5bbb130fd3504f1184a38da76358b2dc32 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_Partition_Online_TRT.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_Partition_Online_TRT.py
@@ -79,7 +79,7 @@ if False: # it would be nice if this could be set automati
if (jobName == 'TRT-Monitoring-Noise'):
keyname = 'SFI' # take the events straight from L2 - the IDMonitoring stream does not go through the Event Filter, anyway
keycount = 255 # there are only around 100 SFIs - connect to all of them
- dispersion = False # process the same events as other monitoring jobs with the same event selection
+ groupName = '' # process the same events as other monitoring jobs with the same event selection
streamLogic = 'Or'
streamName = 'IDMonitoring' # avoid PixelNoise and SCTNoise, because those streams contain mostly partial events without TRT data
lvl1Logic = 'Or'
@@ -89,7 +89,7 @@ if (jobName == 'TRT-Monitoring-Noise'):
if (jobName == 'TRT-Monitoring-Beam'):
keyname = 'SFI' # take the events straight from L2 - the IDMonitoring stream does not go through the Event Filter, anyway
keycount = 255 # there are only around 100 SFIs - connect to all of them
- dispersion = False # process the same events as other monitoring jobs with the same event selection
+ groupName = '' # process the same events as other monitoring jobs with the same event selection
streamLogic = 'Or'
streamName = 'IDMonitoring' # avoid PixelNoise and SCTNoise, because those streams contain mostly partial events without TRT data
lvl1Logic = 'Or'
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_emonsvc.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_emonsvc.py
index 3a25d3e1c211a7d95bb91aaa2dc9ee0f98a3bd7e..bd404507bbd7d34a69cee90a5fe159f4c05e47ca 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_emonsvc.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_emonsvc.py
@@ -43,8 +43,8 @@ if ('updateperiod' not in dir()):
if ('timeout' not in dir()):
timeout = 240000
-if ('dispersion' not in dir()):
- dispersion = True
+if ('groupName' not in dir()):
+ groupName = 'RecExOnline'
if ('isserverName' not in dir()):
isserverName = 'Histogramming'
@@ -187,7 +187,15 @@ else:
# For offline athena tasks mainly.
# #################################################
ByteStreamEmonInputSvc.ExitOnPartitionShutdown = False
-ByteStreamEmonInputSvc.Dispersion = dispersion
+
+# #################################################
+# Set groupName to "RecExOnline" by default so that
+# each process belonging to the "RecExOnline" group
+# gets a different set of events.
+# Set groupName to empty to allow other process get
+# the same events.
+# #################################################
+ByteStreamEmonInputSvc.GroupName = groupName
ByteStreamCnvSvc = Service('ByteStreamCnvSvc')
theApp.ExtSvc += [ 'ByteStreamCnvSvc' ]
diff --git a/Reconstruction/RecExample/RecExTB/share/RecExTB_SCTMuonTile_2003_jobOptions.py b/Reconstruction/RecExample/RecExTB/share/RecExTB_SCTMuonTile_2003_jobOptions.py
index ae1f3dc8885ee27b222d2fd9b2de30e47c68efbe..413eec870f261dfb769e197214ef6c671e2bcb8f 100755
--- a/Reconstruction/RecExample/RecExTB/share/RecExTB_SCTMuonTile_2003_jobOptions.py
+++ b/Reconstruction/RecExample/RecExTB/share/RecExTB_SCTMuonTile_2003_jobOptions.py
@@ -19,11 +19,12 @@ ByteStreamInputSvc.InputDirectory = ["/castor/cern.ch/atlas/testbeam/combined/20
ByteStreamInputSvc.FilePrefix = ["daq_SFO-1_combined"] ;
# Run number
ByteStreamInputSvc.RunNumber = [1222] ;
-ByteStreamInputSvc.MaxBadEvents=200
# Reader type "Castor" or "Simple"
ByteStreamEventStorageInputSvc = Service( "ByteStreamEventStorageInputSvc" )
ByteStreamEventStorageInputSvc.ReaderType = "Castor";
+theApp.serviceMgr().EventSelector.MaxBadEvents = 200
+
# This does not work for some unknown reason. That means that the SCT
# reconstruction needs to be commented (even if what we try to say here
# is to ignore the SCT ROS
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122.sh
index 9dc3608ad137dd28201c39390c2e651d9f21b3b7..0847fbf3206b7b9539ff80c909684b7a0e53f9f9 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_amitag_q122.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs with AMI configTag q122
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_cosmis_allstream.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_cosmis_allstream.sh
index f65f8c8e43990435c5de96e3862ad5782b18ff06..ccdfbe5abda4837536b415122334996d697bb9d4 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_cosmis_allstream.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_cosmis_allstream.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on cosmics with all streams
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh
index 66f2b3792d72adfded61183c537cf1c1b9d961b8..1caf4441c114cbfcf9796cc76e41e9c25cdc212b 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on 7TeV collision data with all streams 2011
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
index 32e93d7b49c590ab24c9f4797a47cec4a2aed610..267271a6504ee4d00b657952f4e546495b44278c 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: heavy ion reconstruction test from Andrzej Olszewski and Iwona Grabowska-Bold
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh
index 6113d91fd7ff3f6d5af0424fecc5c9a99f73ff7b..4fa1f2722200ba072ab9dddf3a6b5d76e9a002c4 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on 8TeV collision data with all streams 2012
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh
index c90f15029ca7c6ef2ae608f35ef6ab740f9839a2..d7ca6811ea2fcead298d48c0558188cdc80e1305 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on 13TeV collision data with all streams 2015
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
index 00c95bc8b0771bf953fd997b54a35c28491798cc..1d54fe6a7635d8f13e8a3d3d75ff207e11b51150 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: heavy ion reconstruction test from Andrzej Olszewski and Iwona Grabowska-Bold
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh
index 860d2b157cda4c4b3c016357607f8f766f9c8766..32f1eb419e1a20565148eba6ebea0d7971f00346 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on 13TeV collision data with all streams 2016
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh
index 146ff49584fd11e69e352af49cc7d08d15348785..5922068949a3b826bb2fca1d7e8ac9df8a552d94 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on 13TeV collision data 2017, early data, A3
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_fpe.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_fpe.sh
index b2292020e8bfb2e929e6c96d1b5b7e51c7448a66..0ef045af991e3362377cad0db215dacd1746333a 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_fpe.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev_fpe.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on 13TeV collision data with floating point exception enabled 2017
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_digimreco_tf_fct_mc16.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_digimreco_tf_fct_mc16.sh
index 32d03aa2a49c9161b1d935a06c329a4e2d4f7147..a076402b267790bf1f68616ab073706d7f922a44 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_digimreco_tf_fct_mc16.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_digimreco_tf_fct_mc16.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Test of DigiMReco from HITS to AOD/TAG MC16a r10724
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh
index 82a8520aff40d49a0ce0464b367fbdd2624b6622..7e9d3cb7584dd8f1beb827008cc11a0cb16ac41d 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc15_heavy_ion.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: heavy ion reconstruction test from Andrzej Olszewski and Iwona Grabowska-Bold
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16.sh
index 5bf6a4f00475805e3f5605f269a3b52b1bcdce81..d6905564bb4ddb0eb9d1ac0c943b486aa7b3648d 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on mc16, based on recon tag r9364 MC16a
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs.sh
index 5ae8acb28566e4b5f61188d8068ff5a16a8be72c..e5b028fb0db9e42ee4952c287de9370661ac43c4 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_rdotobs.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: RDO to BS on tt mc16
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit.sh
index 404159c801acf4e4379ba84ae2dab17c708d6c9a..2b7dcbc2c2ed59d31821f641bd8672e76d5a1b41 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc16_trigsplit.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf with split trigger runs on mc16
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev.sh
index fea62e8f858091d3ca680f1c2d0eb93bcbc43b06..bebd16c98db290ac5a4a72e8dd1f1851f99b1b8d 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf for PhysVal, updated with q221 (2017-11-13) + pileup
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev_nopileup.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev_nopileup.sh
index d8bae9a15ca03b17d484f0a3e4510ca6eebb624b..805f6b1a4f65491e34a21cd7732c2fabb381556e 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev_nopileup.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev_nopileup.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf for PhysVal, updated with q221 (2017-11-13), no pileup
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
@@ -9,7 +10,7 @@
# art-include: 21.9/Athena
-export TRF_ECHO=True; Reco_tf.py --conditionsTag all:OFLCOND-MC16-SDR-17 --ignoreErrors 'False' --autoConfiguration='everything' --digiSeedOffset2 '1' --preExec 'all:rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(0.);from LArROD.LArRODFlags import larRODFlags;larRODFlags.nSamples.set_Value_and_Lock(4);from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.AODEDMSet="AODFULL"' 'HITtoRDO:from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=["PhysicsList"];' 'RAWtoESD:from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.triggerMenuSetup="MC_pp_v7";from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArCellEmMisCalib=False;' --digiSeedOffset1 '1' --steering 'doRDO_TRIG' --DataRunNumber '222525' --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_13TeV.410500.PowhegPythia8EvtGen_A14_ttbar_hdamp172p5_nonallhad.simul.HITS.e4797_s2726.50events.pool.root --imf False --maxEvents '500'
+export TRF_ECHO=True; Reco_tf.py --conditionsTag all:OFLCOND-RUN12-SDR-19 --ignoreErrors 'False' --autoConfiguration='everything' --digiSeedOffset2 '1' --preExec 'all:rec.Commissioning.set_Value_and_Lock(True);from AthenaCommon.BeamFlags import jobproperties;jobproperties.Beam.numberOfCollisions.set_Value_and_Lock(0.);from LArROD.LArRODFlags import larRODFlags;larRODFlags.nSamples.set_Value_and_Lock(4);from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.AODEDMSet="AODFULL"' 'HITtoRDO:from Digitization.DigitizationFlags import digitizationFlags;digitizationFlags.overrideMetadata+=["PhysicsList"];' 'RAWtoESD:from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.triggerMenuSetup="MC_pp_v7";from CaloRec.CaloCellFlags import jobproperties;jobproperties.CaloCellFlags.doLArCellEmMisCalib=False;' --digiSeedOffset1 '1' --steering 'doRDO_TRIG' --DataRunNumber '222525' --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --outputHISTFile=myHIST.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc15_13TeV.410500.PowhegPythia8EvtGen_A14_ttbar_hdamp172p5_nonallhad.simul.HITS.e4797_s2726.50events.pool.root --imf False --maxEvents '500'
RES=$?
echo "art-result: $RES Reco"
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev_nopileup_stdcmalloc.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev_nopileup_stdcmalloc.sh
index 7c2aba8a6dc80f8d18910ca4ff94698b0c5bafec..b440133817d4423866fff9fb64d572d4937c80dd 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev_nopileup_stdcmalloc.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_reco_mc15_13tev_nopileup_stdcmalloc.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf for PhysVal, updated with q221 (2017-11-13), no pileup, with stdcmalloc
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_mc15_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_mc15_13tev.sh
index 0cb6e9ceb68ea57a863e434f30a420f892332e0d..890195162c2fc79cbeb361afa5f9c768595f3272 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_mc15_13tev.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_mc15_13tev.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Xiaohu Sun, Carl Gwilliam and Marie-Helene Genest
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_7teV_data.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_7teV_data.sh
index d88a41bf0e100046a8f0b960e43224f1eb0ccc36..a3737275f873778768d2921eb39cac2b206a992d 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_7teV_data.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_7teV_data.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Jamie Boyd, Running on highmu Data at 7 TeV
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_8teV_data.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_8teV_data.sh
index 66dc2e0ea6e817c601badb59e86091708fe4f470..6b6af1d6e0f404579e04370ffc493e1668e42039 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_8teV_data.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_8teV_data.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Jamie Boyd, data12_8TeV reconstruction
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q220.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q220.sh
index a486986f16ca7a70e34dac17cf7617f786b06671..110f8731e9a5877ab381271f9396547f9c488d5b 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q220.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q220.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: RIG convenors - q220 reconstruction
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q221.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q221.sh
index 3f2d5a933ad8d1492c47820a912566fae232d140..51f3fa90cf6038e73f9472537497c6d1876ad5dc 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q221.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q221.sh
@@ -2,6 +2,7 @@
#!/bin/sh
#
# art-description: RIG convenors - q221 reconstruction
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q222.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q222.sh
index 4cdbf1cc638f6ff54ff3718a4176b622682ead48..3006f91e008df6a8942b19e918b008d088cd175e 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q222.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q222.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: RIG convenors - q222 reconstruction
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q223.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q223.sh
index 4a195840ae1b041e37351aece52f94fa4db4806e..5d222c44f2cf71f7bf6c31ab685517e99a4b0dda 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q223.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recoshift_recotf_q223.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: RIG convenors - q223 reconstruction
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_8teV_data_no.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_8teV_data_no.sh
index bae8ca0dd16305257c42ce088d85ccfb597a3251..8a93fdd925c1621fabe0531ba3548497a1cc69d1 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_8teV_data_no.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_8teV_data_no.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: David Rousseau, data12_8TeV reconstruction, all reco switched off
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_cosmic_data_2011.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_cosmic_data_2011.sh
index 205374c1e828fabffb789254e24f64a0a15eb461..e763bef828e5b8e64bc6d80d5bb66f474c648e13 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_cosmic_data_2011.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_cosmic_data_2011.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Jamie Boyd - should be updated for 2015
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15.sh
index 5a6fe78b04f446cb1f093eca6635fc86a7fe2254..06111234b8edc5fe3851d32a59898d8fb0ad3e9b 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: David Rousseau
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15_no.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15_no.sh
index 2aaa9a6159bb6e9aa9d6dffab7ca9ce47e81cd0d..43b1e82eda3aa81b4de67ebcea5e63e97e3413f1 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15_no.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recotf_mc15_no.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: David Rousseau
+# art-memory: 6000
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events.sh
index 7990559434d2596dcd4375860f65495816728252..5f9b700f0b3e6af8e0113022caee073c9eb7f4fd 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_splash_events.sh
@@ -1,6 +1,7 @@
#!/bin/sh
#
# art-description: Reco_tf runs on splash events with all streams
+# art-memory: 6000
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.0-TrigMC/Athena
diff --git a/Reconstruction/RecoTools/IsolationTool/CMakeLists.txt b/Reconstruction/RecoTools/IsolationTool/CMakeLists.txt
index 1aa87fd2170cb3372b22ba085c4c0e34450f27f0..d0bd1bf1bf4de518c7220705f7482a2b5848d6da 100644
--- a/Reconstruction/RecoTools/IsolationTool/CMakeLists.txt
+++ b/Reconstruction/RecoTools/IsolationTool/CMakeLists.txt
@@ -21,6 +21,7 @@ endif()
# Declare the package's dependencies:
atlas_depends_on_subdirs(
PUBLIC
+ Control/AthToolSupport/AsgDataHandles
Control/AthToolSupport/AsgTools
Event/xAOD/xAODBase
Event/xAOD/xAODCaloEvent
@@ -50,7 +51,7 @@ atlas_add_library( IsolationToolLib
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES AsgTools xAODBase xAODCaloEvent xAODCore xAODEgamma
xAODEventShape xAODMuon xAODPFlow xAODPrimitives xAODTracking
- InDetTrackSelectionToolLib
+ AsgDataHandlesLib InDetTrackSelectionToolLib
IsolationCorrectionsLib
${extra_lib}
PRIVATE_LINK_LIBRARIES ${Boost_LIBRARIES} CaloGeoHelpers FourMomUtils
diff --git a/Reconstruction/RecoTools/IsolationTool/IsolationTool/CaloIsolationTool.h b/Reconstruction/RecoTools/IsolationTool/IsolationTool/CaloIsolationTool.h
index f0f0864ef4eac74869bc8aaa74e19b2407136ba1..cfb5bcdb4cc5ec8b2ac9f8d9208132c96b4a0c54 100644
--- a/Reconstruction/RecoTools/IsolationTool/IsolationTool/CaloIsolationTool.h
+++ b/Reconstruction/RecoTools/IsolationTool/IsolationTool/CaloIsolationTool.h
@@ -7,7 +7,7 @@
#include "AsgTools/AsgTool.h"
#include "AsgTools/ToolHandle.h"
-#include "StoreGate/ReadHandleKey.h"
+#include "AsgDataHandles/ReadHandleKey.h"
#ifndef XAOD_ANALYSIS
// #include "GaudiKernel/ToolHandle.h"
diff --git a/Reconstruction/RecoTools/IsolationTool/IsolationTool/TrackIsolationTool.h b/Reconstruction/RecoTools/IsolationTool/IsolationTool/TrackIsolationTool.h
index f166ce6bbcc6cecb7949768da18c5aa1d8db746f..2fd543bc011fecd5e6aa8786fdca8267c1d0559e 100644
--- a/Reconstruction/RecoTools/IsolationTool/IsolationTool/TrackIsolationTool.h
+++ b/Reconstruction/RecoTools/IsolationTool/IsolationTool/TrackIsolationTool.h
@@ -7,7 +7,7 @@
#include "AsgTools/AsgTool.h"
#include "AsgTools/ToolHandle.h"
-#include "StoreGate/ReadHandleKey.h"
+#include "AsgDataHandles/ReadHandleKey.h"
#include "RecoToolInterfaces/ITrackIsolationTool.h"
#include "RecoToolInterfaces/IsolationCommon.h"
diff --git a/Reconstruction/RecoTools/IsolationTool/Root/CaloIsolationTool.cxx b/Reconstruction/RecoTools/IsolationTool/Root/CaloIsolationTool.cxx
index b7ce576511fbe2912e56515e9225e30c5dd66521..5061bcef0593931cc7b3609bba493cd19eb02f8f 100644
--- a/Reconstruction/RecoTools/IsolationTool/Root/CaloIsolationTool.cxx
+++ b/Reconstruction/RecoTools/IsolationTool/Root/CaloIsolationTool.cxx
@@ -11,7 +11,7 @@
//<<<<<< INCLUDES >>>>>>
#include "IsolationTool/CaloIsolationTool.h"
#include "CaloGeoHelpers/CaloSampling.h"
-#include "StoreGate/ReadHandle.h"
+#include "AsgDataHandles/ReadHandle.h"
#ifndef XAOD_ANALYSIS
#include "CaloEvent/CaloCell.h"
diff --git a/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorElectronAlgorithm.h b/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorElectronAlgorithm.h
index 52f1ea3784a2e2135405f7651c9a8a5e42006ffe..356f5a99f3bae345ac6e94b8bee2b79bcb75f9a6 100755
--- a/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorElectronAlgorithm.h
+++ b/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorElectronAlgorithm.h
@@ -1,7 +1,11 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+ Author : B. Laforge (laforge@lpnhe.in2p3.fr)
+ 4 May 2020
*/
+
#ifndef MonitorElectronAlgorithm_H
#define MonitorElectronAlgorithm_H
@@ -14,23 +18,32 @@
#include <string>
-class MonitorElectronAlgorithm : public AthMonitorAlgorithm {
-
+class MonitorElectronAlgorithm : public AthMonitorAlgorithm {
public:
-
MonitorElectronAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~MonitorElectronAlgorithm();
virtual StatusCode initialize() override;
- virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
+ StatusCode fillHistograms( const EventContext& ctx ) const override;
-private:
+ enum Regions : int { BARREL=0, CRACK, ENDCAP, FORWARD, NREGIONS };
- SG::ReadHandleKey<xAOD::ElectronContainer> m_ParticleContainerKey {this, "ParticleContainerName", "Electrons", "Name of electrons container" };
+private:
- Gaudi::Property<std::string> m_ParticlePrefix {this,"ParticlePrefix","electron","Name of the particle prefix to be used to define hists"};
- Gaudi::Property<std::string> m_RecoName {this,"RecoName","LHTight","Name of particle flavor in egamma reco"};
- Gaudi::Property<std::string> m_WithTrigger {this,"WithTrigger","","Name extension when electrons are chosen from triggered events"};
- Gaudi::Property<bool> m_CheckTrigger {this,"CheckTrigger",false,"Variable to check if trigger filter is to be used"};
+ SG::ReadHandleKey<xAOD::ElectronContainer> m_ParticleContainerKey {this, "ParticleContainerName", "Electrons", "Name of electron container" };
+ Gaudi::Property<std::string> m_ParticlePrefix {this,"ParticlePrefix","electron","Name of the particle prefix to be used to define hists"};
+ Gaudi::Property<std::string> m_RecoName {this,"RecoName","LHTight","Name of particle flavor in egamma reco"};
+ Gaudi::Property<std::string> m_WithTrigger {this,"WithTrigger","","Name extension when electrons are chosen from triggered events"};
+
+ Regions GetRegion(Float_t eta) const {
+ Float_t aeta = fabs(eta);
+ // check if object is in barrel
+ if ( aeta < 1.37 ) return MonitorElectronAlgorithm::BARREL;
+ // check if object is in end-caps
+ if ( aeta > 1.52 && aeta < 2.47 ) return MonitorElectronAlgorithm::ENDCAP;
+ // check if object is in crack region
+ if ( aeta > 1.37 && aeta < 1.52 ) return MonitorElectronAlgorithm::CRACK;
+ return MonitorElectronAlgorithm::NREGIONS; // out of acceptance
+ }
};
#endif
diff --git a/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorFwdElectronAlgorithm.h b/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorFwdElectronAlgorithm.h
new file mode 100644
index 0000000000000000000000000000000000000000..dc78027ee5416b9ba11d186b880effa58526ca1a
--- /dev/null
+++ b/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorFwdElectronAlgorithm.h
@@ -0,0 +1,45 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+ Author : B. Laforge (laforge@lpnhe.in2p3.fr)
+ 4 May 2020
+*/
+
+
+#ifndef MonitorFwdElectronAlgorithm_H
+#define MonitorFwdElectronAlgorithm_H
+
+#include "AthenaMonitoring/AthMonitorAlgorithm.h"
+#include "AthenaMonitoringKernel/Monitored.h"
+
+#include "xAODEgamma/Electron.h"
+#include "xAODEgamma/ElectronContainer.h"
+#include "xAODEgamma/ElectronxAODHelpers.h"
+
+#include <string>
+
+class MonitorFwdElectronAlgorithm : public AthMonitorAlgorithm {
+public:
+ MonitorFwdElectronAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
+ virtual ~MonitorFwdElectronAlgorithm();
+ virtual StatusCode initialize() override;
+ StatusCode fillHistograms( const EventContext& ctx ) const override;
+
+ enum Regions : int { ENDCAP=0, FORWARD, NREGIONS };
+
+private:
+
+ SG::ReadHandleKey<xAOD::ElectronContainer> m_ParticleContainerKey {this, "ParticleContainerName", "ForwardElectrons", "Name of electron container" };
+ Gaudi::Property<std::string> m_ParticlePrefix {this,"ParticlePrefix","FwdElectron","Name of the particle prefix to be used to define hists"};
+ Gaudi::Property<std::string> m_RecoName {this,"RecoName","LHTight","Name of particle flavor in egamma reco"};
+ Gaudi::Property<std::string> m_WithTrigger {this,"WithTrigger","","Name extension when electrons are chosen from triggered events"};
+
+ Regions GetRegion(Float_t eta) const {
+ Float_t aeta = fabs(eta);
+ // check if object is in barrel
+ if( aeta < 3.2 ) return MonitorFwdElectronAlgorithm::ENDCAP;
+ return MonitorFwdElectronAlgorithm::FORWARD;
+ }
+
+};
+#endif
diff --git a/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorPhotonAlgorithm.h b/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorPhotonAlgorithm.h
index 68a370592cd0619f7551b855664dd5af99e0c813..f8921a4151b6b6cdce3f46740bf921aedfef97b9 100755
--- a/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorPhotonAlgorithm.h
+++ b/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorPhotonAlgorithm.h
@@ -1,7 +1,11 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+ Author : B. Laforge (laforge@lpnhe.in2p3.fr)
+ 4 May 2020
*/
+
#ifndef MonitorPhotonAlgorithm_H
#define MonitorPhotonAlgorithm_H
@@ -15,23 +19,30 @@
#include <string>
class MonitorPhotonAlgorithm : public AthMonitorAlgorithm {
-
-public:
-
+ public:
MonitorPhotonAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
virtual ~MonitorPhotonAlgorithm();
virtual StatusCode initialize() override;
- virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
-
-private:
+ StatusCode fillHistograms( const EventContext& ctx ) const override;
- SG::ReadHandleKey<xAOD::PhotonContainer> m_ParticleContainerKey {this, "ParticleContainerName", "Photons", "Name of photons container" };
+ enum Regions : int { BARREL=0, CRACK, ENDCAP, FORWARD, NREGIONS };
+ private:
+ SG::ReadHandleKey<xAOD::PhotonContainer> m_ParticleContainerKey {this, "ParticleContainerName", "Photons", "Name of electron container" };
Gaudi::Property<std::string> m_ParticlePrefix {this,"ParticlePrefix","photon","Name of the particle prefix to be used to define hists"};
- Gaudi::Property<std::string> m_RecoName {this,"RecoName","LHTight","Name of particle flavor in egamma reco"};
- Gaudi::Property<std::string> m_WithTrigger {this,"WithTrigger","","Name extension when photons are chosen from triggered events"};
- Gaudi::Property<bool> m_CheckTrigger {this,"CheckTrigger",false,"Variable to check if trigger filter is to be used"};
-
+ Gaudi::Property<std::string> m_RecoName {this,"RecoName","Tight","Name of particle flavor in egamma reco"};
+ Gaudi::Property<std::string> m_WithTrigger {this,"WithTrigger","","Name extension when electrons are chosen from triggered events"};
+
+ Regions GetRegion(Float_t eta) const {
+ Float_t aeta = fabs(eta);
+ // check if object is in barrel
+ if ( aeta < 1.37 ) return MonitorPhotonAlgorithm::BARREL;
+ // check if object is in end-caps
+ if ( aeta > 1.52 && aeta < 2.47 ) return MonitorPhotonAlgorithm::ENDCAP;
+ // check if object is in crack region
+ if ( aeta > 1.37 && aeta < 1.52 ) return MonitorPhotonAlgorithm::CRACK;
+ return MonitorPhotonAlgorithm::NREGIONS; // out of acceptance
+ }
};
#endif
diff --git a/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorTnPAlgorithm.h b/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorTnPAlgorithm.h
new file mode 100644
index 0000000000000000000000000000000000000000..40b6b24def8bcf95fa5a3077020c30c71432c1df
--- /dev/null
+++ b/Reconstruction/egamma/egammaPerformance/egammaPerformance/MonitorTnPAlgorithm.h
@@ -0,0 +1,54 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+ Author : B. Laforge (laforge@lpnhe.in2p3.fr)
+ 4 May 2020
+*/
+
+
+#ifndef MonitorTnPAlgorithm_H
+#define MonitorTnPAlgorithm_H
+
+#include "AthenaMonitoring/AthMonitorAlgorithm.h"
+#include "AthenaMonitoringKernel/Monitored.h"
+
+#include "xAODEgamma/Electron.h"
+#include "xAODEgamma/ElectronContainer.h"
+#include "xAODEgamma/ElectronxAODHelpers.h"
+
+#include <string>
+
+class MonitorTnPAlgorithm : public AthMonitorAlgorithm {
+public:
+ MonitorTnPAlgorithm( const std::string& name, ISvcLocator* pSvcLocator );
+ virtual ~MonitorTnPAlgorithm();
+ virtual StatusCode initialize() override;
+ StatusCode fillHistograms( const EventContext& ctx ) const override;
+ StatusCode fillElectronProbe(const xAOD::Electron *el, const bool isleading, const EventContext& ctx) const;
+ enum Regions : int { BARREL=0, CRACK, ENDCAP, FORWARD, NREGIONS };
+
+private:
+
+ SG::ReadHandleKey<xAOD::ElectronContainer> m_ParticleContainerKey {this, "ParticleContainerName", "Electrons", "Name of electron container" };
+ Gaudi::Property<std::string> m_ParticlePrefix {this,"ParticlePrefix","electron","Name of the particle prefix to be used to define hists"};
+ Gaudi::Property<std::string> m_RecoName {this,"RecoName","LHLoose","Name of particle flavor in egamma reco"};
+ Gaudi::Property<std::string> m_TnPType {this,"TnPType","Z","Variable to describe what is the TnP resonance name"};
+
+ Gaudi::Property<Float_t> m_MassPeak {this, "MassPeak", 91188, "Resonance peak position"};
+ Gaudi::Property<Float_t> m_ElectronEtCut {this, "ElectronEtCut", 15000, "Et cut for electron"};
+ Gaudi::Property<Float_t> m_MassLowerCut {this, "MassLowerCut", 70000, "Lower Mass cut"};
+ Gaudi::Property<Float_t> m_MassUpperCut {this, "MassUpperCut", 110000, "Upper Mass Cut"};
+
+ Regions GetRegion(Float_t eta) const {
+ Float_t aeta = fabs(eta);
+ // check if object is in barrel
+ if ( aeta < 1.37 ) return MonitorTnPAlgorithm::BARREL;
+ // check if object is in end-caps
+ if ( aeta > 1.52 && aeta < 2.47 ) return MonitorTnPAlgorithm::ENDCAP;
+ // check if object is in crack region
+ if ( aeta > 1.37 && aeta < 1.52 ) return MonitorTnPAlgorithm::CRACK;
+ return MonitorTnPAlgorithm::NREGIONS; // out of acceptance
+ }
+
+};
+#endif
diff --git a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
index 398ecf1f7c23a6403312cec327f99ddad24fd044..f3144d488be0c44cfdeaef40587fa0e75d0e21a0 100755
--- a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
+++ b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py
@@ -4,73 +4,567 @@
'''@file SetupEgammaMonitoring.py
@author B. Laforge
+4 May 2020
@brief Example python configuration for the Run III AthenaMonitoring package
'''
from AthenaConfiguration.ComponentFactory import CompFactory
-def BookHistogramPerRegion(groupe,name,particletype,title,path,xbins,xmin,xmax,nregions=3):
+#def BookHistogramsPerRegions(thegroupe,theparttype,thereconame,thewithTrigger,thename,title,path,xbins,xmin,xmax,thetype="TH1F",thecut="is_pt_gt_4gev"):
+def BookHistogramsPerRegions(thegroupe,theparttype,thename,title,path,xbins,xmin,xmax,thetype="TH1F",thecut="is_pt_gt_4gev"):
'''
Function to configure the egamma histograms per region (BARREL, CRACK, ENDCAP, FORWARD)
The list is different for electrons, forward electrons and photons
'''
+ Regions = ['BARREL', 'CRACK', 'ENDCAP']
+ for n in range(len(Regions)):
+ hname = thename + "in" + Regions[n] + ";" + thename + "in" + Regions[n] #+ " " + thepartype + thereconame + thewithTrigger
+ htitle = title + " " + theparttype + " " + Regions[n]
+ thegroupe.defineHistogram(hname,title=htitle, path=path, xbins=xbins,xmin=xmin,xmax=xmax,type = thetype, cutmask = thecut)
- nregionsloc = nregions
-
- if nregionsloc > 4 :
- nregionsloc = 4
-
- Regions = ['BARREL', 'CRACK', 'ENDCAP', 'FORWARD']
- for n in range(nregionsloc):
- hname = name + particletype + Regions[n]
- htitle = title + particletype + Regions[n]
- groupe.defineHistogram(hname,title=htitle, path=path, xbins=xbins,xmin=xmin,xmax=xmax)
+def BookHistogramsPerForwardRegions(thegroupe,theparttype,thename,title,path,xbins,xmin,xmax,thetype="TH1F",thecut="is_pt_gt_10gev"):
+ '''
+ Function to configure the egamma histograms per region (BARREL, CRACK, ENDCAP, FORWARD)
+ The list is different for electrons, forward electrons and photons
+ '''
+ Regions = ['ENDCAP','FORWARD']
+ for n in range(len(Regions)):
+ hname = thename + "in" + Regions[n] + ";" + thename + "in" + Regions[n] #+ " " + thepartype + thereconame + thewithTrigger
+ htitle = title + " " + theparttype + " " + Regions[n]
+ thegroupe.defineHistogram(hname,title=htitle, path=path, xbins=xbins,xmin=xmin,xmax=xmax,type = thetype, cutmask = thecut)
def BookHistograms(groupe,reconame,particletype,withTrigger=""):
'''
Function to configure the egamma histograms
- The list is different for electrons, forward electrons and photons
+ The list is different for electrons and photons
usage example : BookHistograms(GroupElectronLHTight,"LHTight","Electron","WithTrigger")
'''
if particletype in ["Electron","Photon"] :
-
if particletype in ["Electron"] :
prefix = "electron"
+ tlabel = "_{e}"
if particletype in ["Photon"] :
prefix = "photon"
+ tlabel = "_{#gamma}"
+ hname = "N"
+ htitle = "Number of " + prefix + "s (" + reconame + " " + withTrigger+ ") ; N" + tlabel + " ; N_{event}"
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=20,xmin=-0.5,xmax=19.5)
+
+ if particletype in ["Photon"] :
+ hname = "NConv"
+ htitle = "Number of converted photons (" + reconame + " " + withTrigger+ ") ; N_{Conv. #gamma} ; N_{event}"
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=20,xmin=-0.5,xmax=19.5,cutmask = 'is_pt_gt_4gevandconv')
+
+ hname = "NUnconv"
+ htitle = "Number of unconverted photons (" + reconame + " " + withTrigger+ ") ; N_{Unconv. #gamma} ; N_{event}"
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=20,xmin=-0.5,xmax=19.5,cutmask = 'is_pt_gt_4gevandunconv')
+
+ hname= "Et ;" + prefix + " Et distribution"
+ htitle= particletype + " transverse energy [MeV]" + " (" + reconame + " " + withTrigger + ")" + " ; Et"+ tlabel +" ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=2.,xmax=102000.0)
+
+ if particletype in ["Photon"] :
+
+ hname= "Et ; Converted photon Et distribution"
+ htitle= "Converted #gamma transverse energy [MeV]" + " (" + reconame + " " + withTrigger + ")" + " ; Et" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=2.,xmax=102000.0, cutmask = 'is_pt_gt_4gevandconv')
+
+ hname= "Et ; Unconverted photon Et distribution"
+ htitle= "Unconverted #gamma transverse energy [MeV]" + " (" + reconame + " " + withTrigger + ")" + " ; Et" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=2.,xmax=102000.0, cutmask = 'is_pt_gt_4gevandunconv')
+
+ hname= "Eta"
+ htitle= particletype + " #eta" + " (" + reconame + " " + withTrigger + ")"+ " ; #eta" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2)
+
+ if particletype in ["Photon"] :
+ hname= "EtaConv"
+ htitle= "Converted photons #eta" + " (" + reconame + " " + withTrigger + ")"+ " ; #eta" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2,cutmask = 'is_pt_gt_4gevandconv')
+
+ hname= "EtaUnconv"
+ htitle= "Unconverted photons #eta" + " (" + reconame + " " + withTrigger + ")"+ " ; #eta" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2,cutmask = 'is_pt_gt_4gevandunconv')
+
+ hname= "Phi"
+ htitle= particletype + " #phi" + " (" + reconame + " " + withTrigger + ")" + " ; #phi" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2)
+
+ if particletype in ["Photon"] :
+ hname= "Phi ; Phi of conv. photons"
+ htitle= "Converted photon #phi" + " (" + reconame + " " + withTrigger + ")" + " ; #phi" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2,cutmask = 'is_pt_gt_4gevandconv')
+
+ hname= "Phi ; Phi of unconv. photons"
+ htitle= "Unconverted photon #phi" + " (" + reconame + " " + withTrigger + ")" + " ; #phi" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2, cutmask = 'is_pt_gt_4gevandunconv')
+
+ hname= "Eta,Phi;(Eta,Phi) distribution of Pt>2.5GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>2.5GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='Expert',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask = 'is_pt_gt_2_5gev')
+
+ if particletype in ["Photon"] :
+ hname= "Eta,Phi;(Eta,Phi) distribution of Conv. photons with Pt>2.5GeV"
+ htitle= "(#eta,#phi) map of Conv. #gamma with Pt>2.5GeV" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='Expert',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2, cutmask = 'is_pt_gt_2_5gevandconv')
+
+ hname= "Eta,Phi;(Eta,Phi) distribution of Unconv. photons with Pt>2.5GeV"
+ htitle= "(#eta,#phi) map of Unconv. #gamma with Pt>2.5GeV" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='Expert',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2, cutmask = 'is_pt_gt_2_5gevandunconv')
+
+ hname= "Eta,Phi;(Eta,Phi) distribution for "+ prefix +"s with Pt>4GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>4GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask='is_pt_gt_4gev')
+
+ if particletype in ["Photon"] :
+ hname= "Eta,Phi;(Eta,Phi) distribution for Conv. photons with Pt>4GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>4GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask='is_pt_gt_4gevandconv')
+
+ hname= "Eta,Phi;(Eta,Phi) distribution of Unconv. photons with Pt>4GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>4GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask='is_pt_gt_4gevandunconv')
+
+ hname= "Eta,Phi;(Eta,Phi) distribution for "+ prefix +"s with Pt>20GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>20GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi "
+ groupe.defineHistogram(hname,title=htitle,path='Expert',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask='is_pt_gt_20gev')
+
+ if particletype in ["Photon"] :
+ hname= "Eta,Phi;(Eta,Phi) distribution of Conv. photons with Pt>20GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>20GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='Expert',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask='is_pt_gt_20gevandconv')
+
+ hname= "Eta,Phi;(Eta,Phi) distribution of Unconv. photons with Pt>20GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>20GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='Expert',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask='is_pt_gt_20gevandunconv')
+
+ hname= "TopoEtCone40"
+ htitle = particletype + " Topocluster Isolation Energy" + " (" + reconame + " " + withTrigger + ") ; TopoEtCone40 ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=-10000.,xmax=40000.)
+
+ hname= "PtCone20"
+ htitle = particletype + " Track Isolation Pt" + " (" + reconame + " " + withTrigger + ") ; PtCone20 ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-10000.,xmax=40000.)
+
+ hname= "Time"
+ htitle = "Time associated with " + particletype + " cluster [ns]" + " (" + reconame + " " + withTrigger + ") ; Time [ns] ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=90,xmin=-30.,xmax=60.)
+
+ if particletype in ["Photon"] :
+ hname= "RConv"
+ htitle = "Photon Conversion radius [mm] " + " (" + reconame + " " + withTrigger + ") ; Rconv ; N_{#gamma}"
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=0.,xmax=800.)
+
+ # histograms per region
+ hname = "N"
+ htitle = "Number of " + prefix + "s (" + reconame + " " + withTrigger+ ") ; N" + tlabel +" ; N_{events} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=20,xmin=0.0,xmax=20.0)
+
+ hname= "Et"
+ htitle= particletype + " transverse energy [MeV]" + " (" + reconame + " " + withTrigger + ") ; Et" + tlabel + " ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=100,xmin=2.,xmax=102000.0,thecut='is_pt_gt_2_5gev')
+
+ hname= "Eta"
+ htitle= particletype + " #eta" + " (" + reconame + " " + withTrigger + ")" + " ; #eta" + tlabel + " ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "Phi"
+ htitle= particletype + " #phi" + " (" + reconame + " " + withTrigger + ")" + " ; #eta" + tlabel + " ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "Time"
+ htitle = "Time associated with " + particletype + " cluster [ns]" + " (" + reconame + " " + withTrigger + ") ; Time [ns] ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=90,xmin=-30.,xmax=60.)
+
+ if particletype in ["Photon"] :
+ hname= "RConv"
+ htitle = "Photon Conversion radius [mm] " + " (" + reconame + " " + withTrigger + ") ; Rconv [mm] ; N_{#gamma} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=100,xmin=0.,xmax=800.)
+
+ hname= "ConvType"
+ htitle = "Photon Conversion Type " + " (" + reconame + " " + withTrigger + ") ; ConvType ; N_{#gamma}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=6,xmin=-0.5,xmax=5.5)
+
+ hname= "ConvTrkMatch1"
+ htitle = "Photon Conversion Trak1 Match " + " (" + reconame + " " + withTrigger + ") ; ConTrkMatch1 ; N_{#gamma}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=4,xmin=-0.5,xmax=0.)
+
+ hname= "ConvTrkMatch2"
+ htitle = "Photon Conversion Trak1 Match " + " (" + reconame + " " + withTrigger + ") ; ConTrkMatch2 ; N_{#gamma}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=4,xmin=0.,xmax=4.)
+
+ # ID Panel
+
+ hname= "Ehad1"
+ htitle = particletype + " energy leakage in 1st hadronic sampling " + " (" + reconame + " " + withTrigger + ")" + "; Ehad1 (MeV) ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-1000.,xmax=10000.)
+
+ if particletype in ["Electron"] :
+ hname= "EoverP"
+ htitle = particletype + " matched track E over P " + " (" + reconame + " " + withTrigger + ")" + "; EoverP ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=0.,xmax=5.)
+
+ hname= "CoreEM"
+ htitle = particletype + " core energy in EM calorimeter " + " (" + reconame + " " + withTrigger + ")" + "; E (MeV) ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-5000.,xmax=250000.)
+
+ hname= "F0"
+ htitle = particletype + " fractional energy in Presampler " + " (" + reconame + " " + withTrigger + ")" + "; F0 ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-0.2,xmax=1.)
+
+ hname= "F1"
+ htitle = particletype + " fractional energy in 1st sampling " + " (" + reconame + " " + withTrigger + ")" + "; F1 ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-0.2,xmax=1.)
+
+ hname= "F2"
+ htitle = particletype + " fractional energy in 2nd sampling " + " (" + reconame + " " + withTrigger + ")" + "; F2 ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-0.2,xmax=1.)
+
+ hname= "F3"
+ htitle = particletype + " fractional energy in 3rd sampling " + " (" + reconame + " " + withTrigger + ")" + "; F3 ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-0.2,xmax=1.)
+
+ hname= "Re233e237"
+ htitle = particletype + " uncor. energy fraction in 3x3/3x7 cells in em sampling 2 " + " (" + reconame + " " + withTrigger + ")" + "; R 3x3/3x7 ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=0.,xmax=2.)
+
+ hname= "Re237e277"
+ htitle = particletype + " uncor. energy fraction in 3x7/7x7 cells in em sampling 2 " + " (" + reconame + " " + withTrigger + ")" + "; R 3x7/7x7 ; N" + tlabel
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=0.,xmax=2.)
+
+ # Specific plots for electrons (related to electron track) in Expert/Tracks Panel
+
+ if particletype in ["Electron"] :
+ hname= "NOfBLayerHits"
+ htitle = particletype + " NOfBLayerHits (" + reconame + " " + withTrigger + ") ; N_{BlayerHits} ; N_{e}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=6,xmin=-0.5,xmax=5.5)
+
+ hname= "NOfPixelHits"
+ htitle = particletype + " NOfPixelHits (" + reconame + " " + withTrigger + ") ; N_{PixelHits} ; N_{e}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=6,xmin=-0.5,xmax=5.5)
+
+ hname= "NOfSCTHits"
+ htitle = particletype + " NOfSCTHits (" + reconame + " " + withTrigger + ") ; N_{SCTHits} ; N_{e}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=26,xmin=-0.5,xmax=25.5)
+
+ hname= "NOfTRTHits"
+ htitle = particletype + " NOfTRTHits (" + reconame + " " + withTrigger + ") ; N_{TRTHits} ; N_{e}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=26,xmin=-0.5,xmax=50.5)
+
+ hname= "NOfTRTHighThresholdHits"
+ htitle = particletype + " NOfTRTHighThresholdHits (" + reconame + " " + withTrigger + ") ; N_{TRT HighThres. Hits} ; N_{e}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=26,xmin=-0.5,xmax=50.5)
+
+ hname= "DeltaEta1"
+ htitle = particletype + " track match #Delta #eta (1st sampling) " + " (" + reconame + " " + withTrigger + ") ; #Delta #eta ; N_{e} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=50,xmin=-0.05,xmax=0.05)
+
+ hname= "DeltaPhi2"
+ htitle = particletype + " track match #Delta #Phi (2st sampling) " + " (" + reconame + " " + withTrigger + ") ; #Delta #phi ; N_{e} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=50,xmin=-0.15,xmax=0.15)
+
+ hname= "Trackd0"
+ htitle = particletype + " track d0 " + " (" + reconame + " " + withTrigger + ") ; d0 ; N_{e}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=100,xmin=-5.,xmax=5.)
- groupe.defineHistogram('lumiPerBCID',title='Luminosity,WithCommaInTitle;L/BCID;Events',path='Shifter',xbins=40,xmin=0.0,xmax=80.0)
- groupe.defineHistogram('lb', title='Luminosity Block;lb;Events', path='Shifter',xbins=1000,xmin=-0.5,xmax=999.5)
- groupe.defineHistogram('run',title='Run Number;run;Events', path='Shifter',xbins=1000000,xmin=-0.5,xmax=999999.5)
-
- groupe.defineHistogram('pt',title='%(p)s Transverse momentum Distribution ; %(p)s Transverse momentum [GeV] ; Events' % {'p': particletype}, path='Shifter',xbins=40,xmin=0.0,xmax=80.0)
-
- # SHIFTER PANEL
-
- hname = prefix + "N" + reconame + withTrigger
- htitle = "Number of " + prefix + "s (" + reconame + ")"
- groupe.defineHistogram(hname,title=htitle, path='Shifter',xbins=20,xmin=0.0,xmax=20.0)
-
- hname= prefix + "Et" + reconame
- htitle= particletype + " transverse energy [MeV]" + " (" + reconame + ")"
- groupe.defineHistogram(hname,title=htitle, path='Shifter',xbins=100,xmin=-1000.0,xmax=25000.0)
-
- #hname= prefix + "EtaPhiPtgt4GeV" + reconame
- #htitle= particletype + " #eta,#phi map (candidates with Pt>4GeV)" + " (" + reconame + ")"
- #groupe.defineHistogram(hname,title=htitle,path='Shifter',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2)
-
- hname= prefix + "Eta" + reconame
- htitle= particletype + " #eta" + " (" + reconame + ")"
- groupe.defineHistogram(hname,title=htitle, path='Shifter',xbins=64,xmin=-3.2,xmax=3.2)
-
- hname= prefix + "Phi" + reconame
- htitle= particletype + " #phi" + " (" + reconame + ")"
- groupe.defineHistogram(hname,title=htitle, path='Shifter',xbins=64,xmin=-3.2,xmax=3.2)
-
- hname= prefix+"TopoEtCone40" + reconame
- htitle= particletype + " Topocluster Isolation Energy" + " (" + reconame + ")"
- groupe.defineHistogram(hname,title=htitle, path='Shifter',xbins=64,xmin=-10000.,xmax=40000.)
+ # LumiBlock dependant histogram
+
+ hname= "LBEvoN"
+ htitle= "Number of " + particletype + "s per LB (" + reconame + " " + withTrigger + ") ; LB ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle,path='byLB',type='TH1F',xbins=2000,xmin=-0.5,xmax=1999.5)
+
+ if particletype in ["Photon"] :
+ hname= "LBEvoNPhotonsUnconv ; Number of Unconv. photons vs LB"
+ htitle = "Unconverted photon number versus LB " + " (" + reconame + " " + withTrigger + ") ; LB ; N_{Unconv. #gamma}"
+ groupe.defineHistogram(hname,title=htitle, path='byLB',xbins=2000,xmin=-0.5,xmax=1999.)
+
+ hname= "LBEvoNPhotonsConv ; Number of Conv. photons vs LB"
+ htitle = "Converted photon number versus LB " + " (" + reconame + " " + withTrigger + ") ; LB ; N_{Conv. #gamma}"
+ groupe.defineHistogram(hname,title=htitle, path='byLB',xbins=2000,xmin=-0.5,xmax=1999.)
+
+ hname= "is_pt_gt_4gevandconv,LB;Conversion fraction vs LB"
+ htitle = "Converted photon fraction versus LB " + " (" + reconame + " " + withTrigger + ") ; LB ; Conv. #gamma fraction"
+ groupe.defineHistogram(hname,title=htitle, path='byLB',type = 'TEfficiency', xbins=2000,xmin=-0.5,xmax=1999.)
+
+ return True
+
+def BookTnPHistograms(groupe,reconame,TnPType,MassLowerCut,MassUpperCut):
+ '''
+ Function to configure the egamma histograms for a Tag and Probe resonance decayong to ee.
+ usage example : BookHistogramsTnP(GroupElectronLHTight,"LHTight","Electron","WithTrigger")
+ '''
+
+ tlabel = "_{" + TnPType + "}"
+ particletype = 'Electron'
+
+ hname = "LB; Number of " + TnPType + "candidates vs LB"
+ htitle = "Number of " + TnPType +" candidates vs LB ; LB ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='TnPCandidate',xbins=2000,xmin=-0.5,xmax=1999.5)
+
+ hname = "MassZ ;" + TnPType + " candidate mass"
+ htitle = TnPType + " candidate mass ; M_{ee} [MeV/ c^{2}]; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='TnPCandidate',xbins=100,xmin=MassLowerCut,xmax=MassUpperCut)
+
+ hname = "MassZ_BARREL ;" + TnPType + " candidate mass distribution (Lead in Barrel)"
+ htitle = TnPType + " candidate mass in Barrel ; M_{ee} [MeV/ c^{2}]; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='TnPCandidate',xbins=100,xmin=MassLowerCut,xmax=MassUpperCut)
+
+ hname = "MassZ_ENDCAP ;" + TnPType + " candidate mass distribution (Lead in EndCap)"
+ htitle = TnPType + " candidate mass in Barrel ; M_{ee} [MeV/ c^{2}]; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='TnPCandidate',xbins=100,xmin=MassLowerCut,xmax=MassUpperCut)
+
+ hname = "MassZ_CRACK ;" + TnPType + " candidate mass distribution (Lead in Crack)"
+ htitle = TnPType + " candidate mass in Barrel ; M_{ee} [MeV/ c^{2}]; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='TnPCandidate',xbins=100,xmin=MassLowerCut,xmax=MassUpperCut)
+
+ # The next two histos receive 1 entry per leading electron probe candidate
+
+ hname = "EtaZ ; Number of "+ TnPType + " candidates vs eta_leading_e "
+ htitle = "Number of "+ TnPType +" candidates vs #eta of leading e" + " ; #eta_{e_{lead}} ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='TnPCandidate',xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname = "PhiZ ; Number of "+ TnPType + " candidates vs phi_leading_e "
+ htitle = "Number of "+ TnPType +" candidates vs #phi of e" + " ; #phi_{e_{lead}} ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='TnPCandidate',xbins=64,xmin=-3.2,xmax=3.2)
+
+ # EFFICIENCIES IN EFFICIENCIES PANEL
+
+ hname= "is_Tight,Etprobe; Tag & Probe ID efficiency vs etprobe"
+ htitle = "Tag & Probe ID efficiency vs Et_{e} [MeV] ; Et_{e} [MeV] ; LHTight ID Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=100,xmin=0.,xmax=250000.)
+
+ hname= "is_Tight,Etaprobe; Tag & Probe ID efficiency vs etaprobe"
+ htitle = "Tag & Probe ID efficiency vs #eta ; #eta _{e} ; LHTight ID Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "is_Tight,Phiprobe; Tag & Probe ID efficiency vs phiprobe"
+ htitle = "Tag & Probe ID efficiency vs #eta ; #phi _{e} ; LHTight ID Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "is_Iso,Etprobe; Tag & Probe Calo Iso efficiency vs etprobe"
+ htitle = "Tag & Probe Calo. Isolation efficiency vs Et _{e} [MeV] ; Et_{e} [MeV] ; Calo Iso Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=100,xmin=0.,xmax=250000.)
+
+ hname= "is_Iso,Etaprobe; Tag & Probe Calo Iso efficiency vs etaprobe"
+ htitle = "Tag & Probe Calo. Isolation efficiency vs #eta_{e} ; #eta_{e} ; Calo. Iso Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "is_Iso,Phiprobe; Tag & Probe Calo Iso efficiency vs phiprobe"
+ htitle = "Tag & Probe Calo. Isolation efficiency vs #phi_{e} ; #phi_{e}; Calo Iso. Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "is_IsoandTight,Etprobe; Tag & Probe Calo Iso + LHTight efficiency vs etprobe"
+ htitle = "Tag & Probe (Isolation & LHTight ID) efficiency vs Et_{e} [MeV] ; Et_{e} [MeV] ; Calo Iso & LHTight ID Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=100,xmin=0.,xmax=250000.)
+
+ hname= "is_IsoandTight,Etaprobe; Tag & Probe Calo Iso + LHTight efficiency vs etaprobe"
+ htitle = "Tag & Probe (Isolation & LHTight ID) efficiency vs #eta ; #eta _{e} ; Calo. Iso & LHTight ID Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "is_IsoandTight,Phiprobe; Tag & Probe Calo Iso + LHTight ID efficiency vs phiprobe"
+ htitle = "Tag & Probe (Isolation & LHTight ID) efficiency vs #phi_{e} ; #phi_{e} ; Calo Iso & LHTight ID Eff. "
+ groupe.defineHistogram(hname,title=htitle, path='Efficiencies',type = 'TEfficiency', xbins=64,xmin=-3.2,xmax=3.2)
+
+
+ # Probe electron candidate distributions
+
+ hname = "Etprobe ;Etprobe distribution"
+ htitle = "Number of "+ TnPType +" candidates vs of leading e ; Et_{probe} ; N_{e_ {probe}}"
+ groupe.defineHistogram(hname,title=htitle, path='ElectronProbes',xbins=100,xmin=-1000.0,xmax=200000.0)
+
+ hname= "Etaprobe ;Etaprobe distribution"
+ htitle = "#eta distribution of probe candidates ; #eta_{e_{probe}} ; N_{e_ {probe}}"
+ groupe.defineHistogram(hname,title=htitle,path='ElectronProbes', xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname = "Phiprobe ;Phiprobe distribution"
+ htitle = "#phi distribution of probe candidates ; #phi_{e_{probe}} ; N_{e_ {probe}}"
+ groupe.defineHistogram(hname,title=htitle,path='ElectronProbes', xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "Etaprobe,Phiprobe;(Eta,Phi) map of electron probes for T&P "+ TnPType
+ htitle= "Concerted photons #eta,#phi map (candidates with Pt>4GeV)" + " ; #eta_{e} ; #phi_{e}"
+ groupe.defineHistogram(hname,title=htitle,path='ElectronProbes',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2)
+
+ hname= "Timeprobe ;Time of electron probe"
+ htitle = "Time distribution of probe candidates ; Time_{e_{probe}} [ns] ; N_{e_{probe}}"
+ groupe.defineHistogram(hname,title=htitle,path='ElectronProbes',xbins=90,xmin=-30.,xmax=60.)
+
+ hname= "TopoEtCone40probe; TopoEtCone40 of electron probe"
+ htitle = "Electron probe Topocluster Isolation Energy ; TopoEtCone40 [MeV] ; N_{e_{probe}} "
+ groupe.defineHistogram(hname,title=htitle, path='ElectronProbes',xbins=100,xmin=-10000.,xmax=40000.)
+
+ hname= "PtCone20probe; PtCone20 of electron probe"
+ htitle = "Electron probe Track Isolation Pt [MeV]; PtCone20 [MeV] ; N_{e_{probe}} "
+ groupe.defineHistogram(hname,title=htitle, path='ElectronProbes',xbins=64,xmin=-10000.,xmax=40000.)
+
+ # Track distributions
+
+ hname= "NOfBLayerHits"
+ htitle = "Electron probe NOfBLayerHits ; N_{BlayerHits} ; N_{e_{probe}}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=6,xmin=-0.5,xmax=5.5)
+
+ hname= "NOfPixelHits"
+ htitle = "Electron probe NOfPixelHits ; N_{PixelHits} ; N_{e_{probe}}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=6,xmin=-0.5,xmax=5.5)
+
+ hname= "NOfSCTHits"
+ htitle = "Electron probe NOfSCTHits ; N_{SCTHits} ; N_{e_{probe}}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=26,xmin=-0.5,xmax=25.5)
+
+ hname= "NOfTRTHits"
+ htitle = "Electron probe NOfTRTHits ; N_{TRTHits} ; N_{e_{probe}}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=26,xmin=-0.5,xmax=50.5)
+
+ hname= "NOfTRTHighThresholdHits"
+ htitle = "Electron probe NOfTRTHighThresholdHits ; N_{TRT HighThres. Hits} ; N_{e_{probe}}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=26,xmin=-0.5,xmax=50.5)
+
+ hname= "DeltaEta1"
+ htitle = "Electron probe track match #Delta #eta (1st sampling) ; #Delta #eta ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=50,xmin=-0.05,xmax=0.05)
+
+ hname= "DeltaPhi2"
+ htitle = "Electron probe track match #Delta #Phi (2st sampling) ; #Delta #phi ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=50,xmin=-0.15,xmax=0.15)
+
+ hname= "Trackd0"
+ htitle = "Electron probe track d0 ; d0 ; N_{e_{probe}}"
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/Tracks',xbins=100,xmin=-5.,xmax=5.)
+
+ # ID distributions
+
+ hname= "Ehad1"
+ htitle = "Electron probe energy leakage in 1st hadronic sampling ; Ehad1 (MeV) ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-1000.,xmax=10000.)
+
+ hname= "EoverP"
+ htitle = "Electron probe matched track E over P ; EoverP ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=0.,xmax=5.)
+
+ hname= "CoreEM"
+ htitle = "Electron probe core energy in EM calorimeter ; E (MeV) ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-5000.,xmax=250000.)
+
+ hname= "F0"
+ htitle = "Electron probe fractional energy in Presampler ; F0 ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-0.2,xmax=1.)
+
+ hname= "F1"
+ htitle = "Electron probe fractional energy in 1st sampling ; F1 ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-0.2,xmax=1.)
+
+ hname= "F2"
+ htitle = "Electron probe fractional energy in 2nd sampling ; F2 ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-0.2,xmax=1.)
+
+ hname= "F3"
+ htitle = "Electron probe fractional energy in 3rd sampling ; F3 ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=-0.2,xmax=1.)
+
+ hname= "Re233e237"
+ htitle = "Electron probe uncor. energy fraction in 3x3/3x7 cells in em sampling ; R 3x3/3x7 ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=0.,xmax=2.)
+
+ hname= "Re237e277"
+ htitle = "Electron probe uncor. energy fraction in 3x7/7x7 cells in em sampling 2 ; R 3x7/7x7 ; N_{e_{probe}} "
+ BookHistogramsPerRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert/ID',xbins=50,xmin=0.,xmax=2.)
+
+ hname= "LBEvoN"
+ htitle= "Number of " + TnPType + " electron probe per LB ; LB ; N_{e_{probe}} "
+ groupe.defineHistogram(hname,title=htitle,path='byLB',type='TH1F',xbins=2000,xmin=-0.5,xmax=1999.5)
+
+ return True
+
+
+def BookFwdElectronHistograms(groupe,reconame,particletype,withTrigger=""):
+ '''
+ Function to configure the forward electrons histograms
+ usage example : BookHistograms(GroupElectronLHTight,"LHTight","Electron","WithTrigger")
+ '''
+
+ prefix = "fwdElectron"
+ tlabel = "_{fwd. electron}"
+
+ hname = "N"
+ htitle = "Number of " + prefix + "s (" + reconame + " " + withTrigger+ ") ; N" + tlabel + " ; N_{event}"
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=20,xmin=-0.5,xmax=19.5)
+
+ hname= "Et ;" + prefix + " Et distribution"
+ htitle= particletype + " transverse energy [MeV]" + " (" + reconame + " " + withTrigger + ")" + " ; Et"+ tlabel +" ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=2.,xmax=102000.0)
+
+ hname= "Eta"
+ htitle= particletype + " #eta" + " (" + reconame + " " + withTrigger + ")"+ " ; #eta" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "Phi"
+ htitle= particletype + " #phi" + " (" + reconame + " " + withTrigger + ")" + " ; #phi" + tlabel + " ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "Eta,Phi;(Eta,Phi) distribution of Pt>2.5GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>2.5GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi"
+ groupe.defineHistogram(hname,title=htitle,path='Expert',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask = 'is_pt_gt_2_5gev')
+
+ hname= "Eta,Phi;(Eta,Phi) distribution for "+ prefix +"s with Pt>10GeV"
+ htitle= particletype + " #eta,#phi map (candidates with Pt>10GeV)" + " (" + reconame + " " + withTrigger + ") ; #eta ; #phi "
+ groupe.defineHistogram(hname,title=htitle,path='',type='TH2F',xbins=64,xmin=-3.2,xmax=3.2,ybins=64,ymin=-3.2,ymax=3.2,cutmask='is_pt_gt_10gev')
+
+ # shower variables
+
+ hname= "EnergyDensity ; Fwd Electron first moment energy density distribution"
+ htitle= "Fwd electron 1st Moment Energy Density" + " (" + reconame + " " + withTrigger + ")" + " ; firstENGdensity ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=200,xmin=0.,xmax=2.0)
+
+ hname= "FracMax ; Fwd Electron fraction of most energetic cell distribution"
+ htitle= "Fwd electron fraction of most energetic cell distribution" + " (" + reconame + " " + withTrigger + ")" + " ; lateral moment ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=50,xmin=0.,xmax=1.0)
+
+ hname= "Lateral ; Fwd Electron normalized lateral moment distribution"
+ htitle= "Fwd electron lateral moment distribution" + " (" + reconame + " " + withTrigger + ")" + " ; lateral moment ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=0.,xmax=1.0)
+
+ hname= "Longitudinal ; Fwd Electron normalized longitudinal moment distribution"
+ htitle= "Fwd electron longitudinal moment distribution" + " (" + reconame + " " + withTrigger + ")" + " ; longitudinal moment ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=100,xmin=0.,xmax=1.0)
+
+ hname= "SecondLambda ; Fwd Electron second R moment distribution"
+ htitle= "Fwd electron lambda second moment distribution" + " (" + reconame + " " + withTrigger + ")" + " ; Second#Lambda ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=500,xmin=0.,xmax=10000.0)
+
+ hname= "SecondR ; Fwd Electron second R moment distribution"
+ htitle= "Fwd electron lateral moment distribution" + " (" + reconame + " " + withTrigger + ")" + " ; SecondR ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=500,xmin=0.,xmax=20000.0)
+
+ hname= "CenterLambda ; Fwd Electron shower center from calo front face distribution"
+ htitle= "Fwd Electron shower center from calo front face distribution" + " (" + reconame + " " + withTrigger + ")" + " ; Center lambda ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=500,xmin=0.,xmax=2000.0)
+
+ hname= "Time"
+ htitle = "Time associated with " + particletype + " cluster [ns]" + " (" + reconame + " " + withTrigger + ") ; Time [ns] ; N" + tlabel
+ groupe.defineHistogram(hname,title=htitle, path='',xbins=90,xmin=-30.,xmax=60.)
+
+ # info per forward region
+
+ # histograms per region
+ hname = "N"
+ htitle = "Number of " + prefix + "s (" + reconame + " " + withTrigger+ ") ; N" + tlabel +" ; N_{events} "
+ BookHistogramsPerForwardRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=20,xmin=0.0,xmax=20.0)
+
+ hname= "Et"
+ htitle= particletype + " transverse energy [MeV]" + " (" + reconame + " " + withTrigger + ") ; Et" + tlabel + " ; N" + tlabel
+ BookHistogramsPerForwardRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=100,xmin=2.,xmax=102000.0,thecut='is_pt_gt_2_5gev')
+
+ hname= "Eta"
+ htitle= particletype + " #eta" + " (" + reconame + " " + withTrigger + ")" + " ; #eta" + tlabel + " ; N" + tlabel
+ BookHistogramsPerForwardRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "Phi"
+ htitle= particletype + " #phi" + " (" + reconame + " " + withTrigger + ")" + " ; #eta" + tlabel + " ; N" + tlabel
+ BookHistogramsPerForwardRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=64,xmin=-3.2,xmax=3.2)
+
+ hname= "Time"
+ htitle = "Time associated with " + particletype + " cluster [ns]" + " (" + reconame + " " + withTrigger + ") ; Time [ns] ; N" + tlabel
+ BookHistogramsPerForwardRegions(thegroupe = groupe, theparttype = particletype, thename = hname, title=htitle, path='Expert',xbins=90,xmin=-30.,xmax=60.)
return True
@@ -78,24 +572,14 @@ def MonitorElectronConfig(inputFlags):
'''Function to configures some algorithms in the monitoring system.'''
### STEP 1 ###
- # 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
+
from AthenaMonitoring import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(inputFlags,'ElectronAthMonitorCfg')
-
### STEP 2 ###
- # Adding an algorithm to the helper. Here, we will use the example
- # algorithm in the AthenaMonitoring package. Just pass the type to the
- # helper. Then, the helper will instantiate an instance and set up the
- # base class configuration following the inputFlags. The returned object
- # is the algorithm.
+
+ SpareElectronMonitoringGroups = [ "CBTightTrig" ]
+
MonitorElectronAlgorithm=CompFactory.MonitorElectronAlgorithm
elLHTightMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elLHTightMonAlg')
elLHTightTrigMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elLHTightTrigMonAlg')
@@ -103,101 +587,77 @@ def MonitorElectronConfig(inputFlags):
elLHLooseMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elLHLooseMonAlg')
elLHLooseTrigMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elLHLooseTrigMonAlg')
- elCBTightMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elCBTightMonAlg')
- elCBTightTrigMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elCBTightTrigMonAlg')
-
- elCBLooseMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elCBLooseMonAlg')
- elCBLooseTrigMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elCBLooseTrigMonAlg')
+ if ("CBTight" in SpareElectronMonitoringGroups) :
+ elCBTightMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elCBTightMonAlg')
+ if ("CBTightTrig" in SpareElectronMonitoringGroups) :
+ elCBTightTrigMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elCBTightTrigMonAlg')
+ if ("CBLoose" in SpareElectronMonitoringGroups) :
+ elCBLooseMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elCBLooseMonAlg')
+ if ("CBLooseTrig" in SpareElectronMonitoringGroups) :
+ elCBLooseTrigMonAlg = helper.addAlgorithm(MonitorElectronAlgorithm,'elCBLooseTrigMonAlg')
### STEP 3 ###
# Edit properties of algorithms
+ import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf
+
elLHTightMonAlg.ParticleContainerName = "Electrons"
elLHTightMonAlg.RecoName = "LHTight"
elLHTightMonAlg.ParticlePrefix = "electron"
- elLHTightMonAlg.WithTrigger = ""
- elLHTightMonAlg.CheckTrigger = False
- # to enable a trigger filter, for example:
- # elLHTightMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
+ elLHTightMonAlg.WithTrigger = ""
+
elLHTightTrigMonAlg.ParticleContainerName = "Electrons"
elLHTightTrigMonAlg.RecoName = "LHTight"
elLHTightTrigMonAlg.ParticlePrefix = "electron"
- elLHTightTrigMonAlg.WithTrigger = "WithTrigger"
- elLHTightTrigMonAlg.CheckTrigger = True
+ elLHTightTrigMonAlg.WithTrigger = "WithTrigger"
# to enable a trigger filter, for example:
- # elLHTightTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
+ elLHTightTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
elLHLooseMonAlg.ParticleContainerName = "Electrons"
elLHLooseMonAlg.RecoName = "LHLoose"
elLHLooseMonAlg.ParticlePrefix = "electron"
- elLHLooseMonAlg.CheckTrigger = False
- # to enable a trigger filter, for example:
- # elLHLooseMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
elLHLooseTrigMonAlg.ParticleContainerName = "Electrons"
elLHLooseTrigMonAlg.RecoName = "LHLoose"
elLHLooseTrigMonAlg.ParticlePrefix = "electron"
- elLHLooseTrigMonAlg.CheckTrigger = True
- # to enable a trigger filter, for example:
- # elLHLooseTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
-
- elCBTightMonAlg.ParticleContainerName = "Electrons"
- elCBTightMonAlg.RecoName = "Tight"
- elCBTightMonAlg.ParticlePrefix = "electron"
- elCBTightMonAlg.CheckTrigger = False
- # to enable a trigger filter, for example:
- # elCBTightMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
-
- elCBTightTrigMonAlg.ParticleContainerName = "Electrons"
- elCBTightTrigMonAlg.RecoName = "Tight"
- elCBTightTrigMonAlg.ParticlePrefix = "electron"
- elCBTightTrigMonAlg.CheckTrigger = True
- # to enable a trigger filter, for example:
- # elCBTightTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
-
- elCBLooseMonAlg.ParticleContainerName = "Electrons"
- elCBLooseMonAlg.RecoName = "Loose"
- elCBLooseMonAlg.ParticlePrefix = "electron"
- elCBLooseMonAlg.CheckTrigger = False
- # to enable a trigger filter, for example:
- # elCBLooseMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
-
- elCBLooseTrigMonAlg.ParticleContainerName = "Electrons"
- elCBLooseTrigMonAlg.RecoName = "Loose"
- elCBLooseTrigMonAlg.ParticlePrefix = "electron"
- elCBLooseTrigMonAlg.CheckTrigger = True
- # to enable a trigger filter, for example:
- # elCBLooseTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
-
+ elLHLooseTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
+
+ if ("CBTight" in SpareElectronMonitoringGroups) :
+ elCBTightMonAlg.ParticleContainerName = "Electrons"
+ elCBTightMonAlg.RecoName = "Tight"
+ elCBTightMonAlg.ParticlePrefix = "electron"
+
+ if ("CBTightTrig" in SpareElectronMonitoringGroups) :
+ elCBTightTrigMonAlg.ParticleContainerName = "Electrons"
+ elCBTightTrigMonAlg.RecoName = "Tight"
+ elCBTightTrigMonAlg.ParticlePrefix = "electron"
+ elCBTightTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
+
+ if ("CBLoose" in SpareElectronMonitoringGroups) :
+ elCBLooseMonAlg.ParticleContainerName = "Electrons"
+ elCBLooseMonAlg.RecoName = "Loose"
+ elCBLooseMonAlg.ParticlePrefix = "electron"
+
+ if ("CBLooseTrig" in SpareElectronMonitoringGroups) :
+ elCBLooseTrigMonAlg.ParticleContainerName = "Electrons"
+ elCBLooseTrigMonAlg.RecoName = "Loose"
+ elCBLooseTrigMonAlg.ParticlePrefix = "electron"
+ elCBLooseTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
### STEP 4 ###
- # Add some tools. N.B. Do not use your own trigger decion tool. Use the
- # standard one that is included with AthMonitorAlgorithm.
-
- # First, add a tool that's set up by a different configuration function.
- # In this case, CaloNoiseToolCfg returns its own component accumulator,
- # which must be merged with the one from this function.
- # from CaloTools.CaloNoiseToolConfig import CaloNoiseToolCfg
- # caloNoiseAcc, caloNoiseTool = CaloNoiseToolCfg(inputFlags)
- # result.merge(caloNoiseAcc)
- # electronMonAlg.CaloNoiseTool = caloNoiseTool
-
- # # Then, add a tool that doesn't have its own configuration function. In
- # # this example, no accumulator is returned, so no merge is necessary.
- # from MyDomainPackage.MyDomainPackageConf import MyDomainTool
- # exampleMonAlg.MyDomainTool = MyDomainTool()
-
- # Add a generic monitoring tool (a "group" in old language). The returned
- # object here is the standard GenericMonitoringTool.
GroupElectronLHTight = helper.addGroup(elLHTightMonAlg, 'MonitorElectron', 'egamma/LHTightElectrons/')
GroupElectronLHTightTriggered = helper.addGroup(elLHTightTrigMonAlg, 'MonitorElectron', 'egamma/LHTightElectronsWithTrigger/')
GroupElectronLHLoose = helper.addGroup(elLHLooseMonAlg, 'MonitorElectron', 'egamma/LHLooseElectrons/')
GroupElectronLHLooseTriggered = helper.addGroup(elLHLooseTrigMonAlg, 'MonitorElectron', 'egamma/LHLooseElectronsWithTrigger/')
- GroupElectronCBTight = helper.addGroup(elCBTightMonAlg, 'MonitorElectron', 'egamma/CBTightElectrons/')
- GroupElectronCBTightTriggered = helper.addGroup(elCBTightTrigMonAlg, 'MonitorElectron', 'egamma/CBTightTriggeredElectrons/')
- GroupElectronCBLoose = helper.addGroup(elCBLooseMonAlg, 'MonitorElectron', 'egamma/CBLooseElectrons/')
- GroupElectronCBLooseTriggered = helper.addGroup(elCBLooseTrigMonAlg, 'MonitorElectron', 'egamma/CBLooseTriggeredElectrons/')
+ if ("CBTight" in SpareElectronMonitoringGroups) :
+ GroupElectronCBTight = helper.addGroup(elCBTightMonAlg, 'MonitorElectron', 'egamma/CBTightElectrons/')
+ if ("CBTightTrig" in SpareElectronMonitoringGroups) :
+ GroupElectronCBTightTriggered = helper.addGroup(elCBTightTrigMonAlg, 'MonitorElectron', 'egamma/CBTightTriggeredElectrons/')
+ if ("CBLoose" in SpareElectronMonitoringGroups) :
+ GroupElectronCBLoose = helper.addGroup(elCBLooseMonAlg, 'MonitorElectron', 'egamma/CBLooseElectrons/')
+ if ("CBLooseTrig" in SpareElectronMonitoringGroups) :
+ GroupElectronCBLooseTriggered = helper.addGroup(elCBLooseTrigMonAlg, 'MonitorElectron', 'egamma/CBLooseTriggeredElectrons/')
### STEP 5 ###
# Configure histograms
@@ -209,47 +669,29 @@ def MonitorElectronConfig(inputFlags):
BookHistograms(GroupElectronLHLoose,"LHLoose","Electron")
BookHistograms(GroupElectronLHLooseTriggered,"LHLooseTrig","Electron","withTrigger")
# Cut Based Tight Electrons
- BookHistograms(GroupElectronCBTight,"CBTight","Electron")
- BookHistograms(GroupElectronCBTightTriggered,"CBTightTrig","Electron","withTrigger")
+ if ("CBTight" in SpareElectronMonitoringGroups) :
+ BookHistograms(GroupElectronCBTight,"CBTight","Electron")
+ if ("CBTightTrig" in SpareElectronMonitoringGroups) :
+ BookHistograms(GroupElectronCBTightTriggered,"CBTightTrig","Electron","withTrigger")
# Cut Based Loose Electrons
- BookHistograms(GroupElectronCBLoose,"CBLoose","Electron")
- BookHistograms(GroupElectronCBLooseTriggered,"CBLooseTrig","Electron","withTrigger")
+ if ("CBLoose" in SpareElectronMonitoringGroups) :
+ BookHistograms(GroupElectronCBLoose,"CBLoose","Electron")
+ if ("CBLooseTrig" in SpareElectronMonitoringGroups) :
+ BookHistograms(GroupElectronCBLooseTriggered,"CBLooseTrig","Electron","withTrigger")
### STEP 6 ###
- # Finalize. The return value should be a tuple of the ComponentAccumulator
- # and the sequence containing the created algorithms. If we haven't called
- # any configuration other than the AthMonitorCfgHelper here, then we can
- # just return directly (and not create "result" above)
return helper.result()
- # # Otherwise, merge with result object and return
- # acc = helper.result()
- # result.merge(acc)
- # return result
-
def MonitorPhotonConfig(inputFlags):
'''Function to configures some algorithms in the monitoring system.'''
### STEP 1 ###
- # 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
+
from AthenaMonitoring import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(inputFlags,'PhotonAthMonitorCfg')
-
### STEP 2 ###
- # Adding an algorithm to the helper. Here, we will use the example
- # algorithm in the AthenaMonitoring package. Just pass the type to the
- # helper. Then, the helper will instantiate an instance and set up the
- # base class configuration following the inputFlags. The returned object
- # is the algorithm.
MonitorPhotonAlgorithm=CompFactory.MonitorPhotonAlgorithm
phCBTightMonAlg = helper.addAlgorithm(MonitorPhotonAlgorithm,'phCBTightMonAlg')
@@ -261,56 +703,32 @@ def MonitorPhotonConfig(inputFlags):
### STEP 3 ###
# Edit properties of algorithms
+ import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf
+
phCBTightMonAlg.ParticleContainerName = "Photons"
phCBTightMonAlg.RecoName = "Tight"
phCBTightMonAlg.ParticlePrefix = "photon"
- phCBTightMonAlg.CheckTrigger = False
- # to enable a trigger filter, for example:
- # phCBTightMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
phCBTightTrigMonAlg.ParticleContainerName = "Photons"
phCBTightTrigMonAlg.RecoName = "Tight"
phCBTightTrigMonAlg.ParticlePrefix = "photon"
- phCBTightTrigMonAlg.CheckTrigger = True
- phCBTightTrigMonAlg.WithTrigger = "WithTrigger"
+ phCBTightTrigMonAlg.WithTrigger = "WithTrigger"
# to enable a trigger filter, for example:
- # phCBTightTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
+ phCBTightTrigMonAlg.TriggerChain = egammaConf.primary_double_pho[0]
phCBLooseMonAlg.ParticleContainerName = "Photons"
phCBLooseMonAlg.RecoName = "Loose"
phCBLooseMonAlg.ParticlePrefix = "photon"
- phCBLooseMonAlg.CheckTrigger = False
- # to enable a trigger filter, for example:
- # phCBLooseMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
phCBLooseTrigMonAlg.ParticleContainerName = "Photons"
phCBLooseTrigMonAlg.RecoName = "Loose"
phCBLooseTrigMonAlg.ParticlePrefix = "photon"
- phCBLooseTrigMonAlg.CheckTrigger = True
- phCBLooseTrigMonAlg.WithTrigger = "WithTrigger"
+ phCBLooseTrigMonAlg.WithTrigger = "WithTrigger"
# to enable a trigger filter, for example:
- # phCBLooseTrigMonAlg.TriggerChain = 'HLT_mu26_ivarmedium'
+ phCBLooseTrigMonAlg.TriggerChain = egammaConf.primary_double_pho[0]
### STEP 4 ###
- # Add some tools. N.B. Do not use your own trigger decion tool. Use the
- # standard one that is included with AthMonitorAlgorithm.
-
- # First, add a tool that's set up by a different configuration function.
- # In this case, CaloNoiseToolCfg returns its own component accumulator,
- # which must be merged with the one from this function.
- # from CaloTools.CaloNoiseToolConfig import CaloNoiseToolCfg
- # caloNoiseAcc, caloNoiseTool = CaloNoiseToolCfg(inputFlags)
- # result.merge(caloNoiseAcc)
- # photonMonAlg.CaloNoiseTool = caloNoiseTool
-
- # # Then, add a tool that doesn't have its own configuration function. In
- # # this example, no accumulator is returned, so no merge is necessary.
- # from MyDomainPackage.MyDomainPackageConf import MyDomainTool
- # exampleMonAlg.MyDomainTool = MyDomainTool()
-
- # Add a generic monitoring tool (a "group" in old language). The returned
- # object here is the standard GenericMonitoringTool.
GroupPhotonCBTight = helper.addGroup(phCBTightMonAlg, 'MonitorPhoton', 'egamma/CBTightPhotons/')
GroupPhotonCBTightTriggered = helper.addGroup(phCBTightTrigMonAlg, 'MonitorPhoton', 'egamma/CBTightTriggeredPhotons/')
@@ -328,16 +746,178 @@ def MonitorPhotonConfig(inputFlags):
BookHistograms(GroupPhotonCBLooseTriggered,"CBLooseTrig","Photon")
### STEP 6 ###
- # Finalize. The return value should be a tuple of the ComponentAccumulator
- # and the sequence containing the created algorithms. If we haven't called
- # any configuration other than the AthMonitorCfgHelper here, then we can
- # just return directly (and not create "result" above)
return helper.result()
- # # Otherwise, merge with result object and return
- # acc = helper.result()
- # result.merge(acc)
- # return result
+
+def MonitorTnPConfig(inputFlags):
+ '''Function to configures some algorithms in the monitoring system for Tag and Probe candidates (Z, J/Psi).'''
+
+ ### STEP 1 ###
+
+ from AthenaMonitoring import AthMonitorCfgHelper
+ helper = AthMonitorCfgHelper(inputFlags,'TnPPAthMonitorCfg')
+
+
+ ### STEP 2 ###
+
+ MonitorTnPAlgorithm=CompFactory.MonitorTnPAlgorithm
+ ZeeMonAlg = helper.addAlgorithm(MonitorTnPAlgorithm,'TnPZeeMonAlg')
+ JPsiMonAlg = helper.addAlgorithm(MonitorTnPAlgorithm,'TnPJpsiMonAlg')
+
+ ### STEP 3 ###
+ # Edit properties of algorithms
+
+ import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf
+
+ ZeeMonAlg.ParticleContainerName = "Electrons"
+ ZeeMonAlg.RecoName = "LHLoose"
+ ZeeMonAlg.ParticlePrefix = "electron"
+ ZeeMonAlg.MassPeak = 91188.
+ ZeeMonAlg.ElectronEtCut = 15000.
+ ZeeMonAlg.MassLowerCut = 70000.
+ ZeeMonAlg.MassUpperCut = 110000.
+ ZeeMonAlg.TnPType = "Z"
+ ZeeMonAlg.TriggerChain = egammaConf.monitoring_Zee[0]
+
+ JPsiMonAlg.ParticleContainerName = "Electrons"
+ JPsiMonAlg.RecoName = "LHLoose"
+ JPsiMonAlg.ParticlePrefix = "electron"
+ JPsiMonAlg.MassPeak = 3097
+ JPsiMonAlg.ElectronEtCut = 3000
+ JPsiMonAlg.MassLowerCut = 2500
+ JPsiMonAlg.MassUpperCut = 3500
+ JPsiMonAlg.TnPType = "JPsi"
+ JPsiMonAlg.TriggerChain =egammaConf.monitoring_Jpsiee[0]
+
+ ### STEP 4 ###
+
+ GroupZee = helper.addGroup(ZeeMonAlg, 'MonitorTnP', 'egamma/TnPZ/')
+ GroupJPsi = helper.addGroup(JPsiMonAlg, 'MonitorTnP', 'egamma/TnPJPsi/')
+
+ ### STEP 5 ###
+ # Configure histograms
+
+ # Zee
+ BookTnPHistograms(GroupZee, ZeeMonAlg.RecoName, ZeeMonAlg.TnPType, ZeeMonAlg.MassLowerCut, ZeeMonAlg.MassUpperCut)
+ # JPsi
+ BookTnPHistograms(GroupJPsi, JPsiMonAlg.RecoName, JPsiMonAlg.TnPType, JPsiMonAlg.MassLowerCut, JPsiMonAlg.MassUpperCut)
+
+ ### STEP 6 ###
+ return helper.result()
+
+
+def MonitorForwardElectronConfig(inputFlags):
+ '''Function to configures some algorithms in the monitoring system.'''
+
+ ### STEP 1 ###
+
+ from AthenaMonitoring import AthMonitorCfgHelper
+ helper = AthMonitorCfgHelper(inputFlags,'FwdElectronAthMonitorCfg')
+
+ ### STEP 2 ###
+
+ SpareFwdElectronMonitoringGroups = [ "CBFwdTight" ]
+
+ MonitorFwdElectronAlgorithm=CompFactory.MonitorFwdElectronAlgorithm
+ # fwdelLHTightMonAlg = helper.addAlgorithm(MonitorFwdElectronAlgorithm,'fwdelLHTightMonAlg')
+ # fwdelLHTightTrigMonAlg = helper.addAlgorithm(MonitorFwdElectronAlgorithm,'fwdelLHTightTrigMonAlg')
+ if ("CBFwdTight" in SpareFwdElectronMonitoringGroups) :
+ fwdelCBTightMonAlg = helper.addAlgorithm(MonitorFwdElectronAlgorithm,'fwdelCBTightMonAlg')
+ if ("CBfwdTightTrig" in SpareFwdElectronMonitoringGroups) :
+ fwdelCBTightTrigMonAlg = helper.addAlgorithm(MonitorFwdElectronAlgorithm,'fwdelCBTightTrigMonAlg')
+ if ("CBLoose" in SpareFwdElectronMonitoringGroups) :
+ fwdelCBLooseMonAlg = helper.addAlgorithm(MonitorFwdElectronAlgorithm,'fwdelCBLooseMonAlg')
+ if ("CBLooseTrig" in SpareFwdElectronMonitoringGroups) :
+ fwdelCBLooseTrigMonAlg = helper.addAlgorithm(MonitorFwdElectronAlgorithm,'fwdelCBLooseTrigMonAlg')
+
+ ### STEP 3 ###
+ # Edit properties of algorithms
+
+ import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf
+
+ # fwdelLHTightMonAlg.ParticleContainerName = "ForwardElectrons"
+ # fwdelLHTightMonAlg.RecoName = "LHTight"
+ # fwdelLHTightMonAlg.ParticlePrefix = "FwdElectron"
+
+ # fwdelLHTightTrigMonAlg.ParticleContainerName = "ForwardElectrons"
+ # fwdelLHTightTrigMonAlg.RecoName = "LHTight"
+ # fwdelLHTightTrigMonAlg.ParticlePrefix = "FwdElectron"
+ # fwdelLHTightTrigMonAlg.WithTrigger = "WithTrigger"
+ # to enable a trigger filter, for example:
+ # fwdelLHTightTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
+
+ # fwdelLHLooseMonAlg.ParticleContainerName = "ForwardElectrons"
+ # fwdelLHLooseMonAlg.RecoName = "LHLoose"
+ # fwdelLHLooseMonAlg.ParticlePrefix = "FwdElectron"
+
+ # fwdelLHLooseTrigMonAlg.ParticleContainerName = "ForwardElectrons"
+ # fwdelLHLooseTrigMonAlg.RecoName = "LHLoose"
+ # fwdelLHLooseTrigMonAlg.ParticlePrefix = "FwdElectron"
+ # to enable a trigger filter, for example:
+ # fwdelLHLooseTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
+
+ if ("CBFwdTight" in SpareFwdElectronMonitoringGroups) :
+ fwdelCBTightMonAlg.ParticleContainerName = "ForwardElectrons"
+ fwdelCBTightMonAlg.RecoName = "Tight"
+ fwdelCBTightMonAlg.ParticlePrefix = "FwdElectron"
+
+ if ("CBFwdTightTrig" in SpareFwdElectronMonitoringGroups) :
+ fwdelCBTightTrigMonAlg.ParticleContainerName = "ForwardElectrons"
+ fwdelCBTightTrigMonAlg.RecoName = "Tight"
+ fwdelCBTightTrigMonAlg.ParticlePrefix = "FwdElectron"
+ # to enable a trigger filter, for example:
+ fwdelCBTightTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
+
+ if ("CBFwdLoose" in SpareFwdElectronMonitoringGroups) :
+ fwdelCBLooseMonAlg.ParticleContainerName = "ForwardElectrons"
+ fwdelCBLooseMonAlg.RecoName = "Loose"
+ fwdelCBLooseMonAlg.ParticlePrefix = "FwdElectron"
+
+ if ("CBFwdLooseTrig" in SpareFwdElectronMonitoringGroups) :
+ fwdelCBLooseTrigMonAlg.ParticleContainerName = "ForwardElectrons"
+ fwdelCBLooseTrigMonAlg.RecoName = "Loose"
+ fwdelCBLooseTrigMonAlg.ParticlePrefix = "FwdElectron"
+ # to enable a trigger filter, for example:
+ fwdelCBLooseTrigMonAlg.TriggerChain = egammaConf.primary_single_ele[0]
+
+
+ ### STEP 4 ###
+
+ #GroupFwdElectronLHTight = helper.addGroup(fwdelLHTightMonAlg, 'MonitorFwdElectron', 'egamma/LHTightFwdElectrons/')
+ #GroupFwdElectronLHTightTriggered = helper.addGroup(fwdelLHTightTrigMonAlg, 'MonitorFwdElectron', 'egamma/LHTightFwdElectronsWithTrigger/')
+ #GroupFwdElectronLHLoose = helper.addGroup(fwdelLHLooseMonAlg, 'MonitorFwdElectron', 'egamma/LHLooseFwdElectrons/')
+ #GroupFwdElectronLHLooseTriggered = helper.addGroup(fwdelLHLooseTrigMonAlg, 'MonitorFwdElectron', 'egamma/LHLooseFwdElectronsWithTrigger/')
+ if ("CBFwdTight" in SpareFwdElectronMonitoringGroups) :
+ GroupFwdElectronCBTight = helper.addGroup(fwdelCBTightMonAlg, 'MonitorFwdElectron', 'egamma/CBTightFwdElectrons/')
+ if ("CBFwdTightTrig" in SpareFwdElectronMonitoringGroups) :
+ GroupFwdElectronCBTightTriggered = helper.addGroup(fwdelCBTightTrigMonAlg, 'MonitorFwdElectron', 'egamma/CBTightTriggeredFwdElectrons/')
+ if ("CBFwdLoose" in SpareFwdElectronMonitoringGroups) :
+ GroupFwdElectronCBLoose = helper.addGroup(fwdelCBLooseMonAlg, 'MonitorFwdElectron', 'egamma/CBLooseFwdElectrons/')
+ if ("CBFwdLooseTrig" in SpareFwdElectronMonitoringGroups) :
+ GroupFwdElectronCBLooseTriggered = helper.addGroup(fwdelCBLooseTrigMonAlg, 'MonitorFwdElectron', 'egamma/CBLooseTriggeredFwdElectrons/')
+
+ ### STEP 5 ###
+ # Configure histograms
+
+ # LHTight FwdElectrons
+ #BookHistograms(GroupFwdElectronLHTight,"LHTight","FwdElectron")
+ #BookHistograms(GroupFwdElectronLHTightTriggered,"LHTightTrig","FwdElectron","WithTrigger")
+ # LHLoose FwdElectrons
+ #BookHistograms(GroupFwdElectronLHLoose,"LHLoose","FwdElectron")
+ #BookHistograms(GroupFwdElectronLHLooseTriggered,"LHLooseTrig","FwdElectron","withTrigger")
+ # Cut Based Tight FwdElectrons
+ if ("CBFwdTight" in SpareFwdElectronMonitoringGroups) :
+ BookFwdElectronHistograms(GroupFwdElectronCBTight,"CBTight","FwdElectron")
+ if ("CBFwdTightTrig" in SpareFwdElectronMonitoringGroups) :
+ BookFwdElectronHistograms(GroupFwdElectronCBTightTriggered,"CBTightTrig","FwdElectron","withTrigger")
+ # Cut Based Loose FwdElectrons
+ if ("CBFwdLoose" in SpareFwdElectronMonitoringGroups) :
+ BookFwdElectronHistograms(GroupFwdElectronCBLoose,"CBLoose","FwdElectron")
+ if ("CBFwdLooseTrig" in SpareFwdElectronMonitoringGroups) :
+ BookFwdElectronHistograms(GroupFwdElectronCBLooseTriggered,"CBLooseTrig","FwdElectron","withTrigger")
+
+ ### STEP 6 ###
+ return helper.result()
if __name__=='__main__':
@@ -372,8 +952,19 @@ if __name__=='__main__':
MonitorPhotonAcc = MonitorPhotonConfig(ConfigFlags)
cfg.merge(MonitorPhotonAcc)
+ MonitorTnPAcc = MonitorTnPConfig(ConfigFlags)
+ cfg.merge(MonitorTnPAcc)
+
+ MonitorFwdElectronAcc = MonitorForwardElectronConfig(ConfigFlags)
+ cfg.merge(MonitorFwdElectronAcc)
+
# If you want to turn on more detailed messages ...
- # exampleMonitorAcc.getEventAlgo('ExampleMonAlg').OutputLevel = 2 # DEBUG
+ #MonitorTnPAcc.getEventAlgo('TnPZeeMonAlg').OutputLevel = 2 # DEBUG
+ #MonitorFwdElectronAcc.getEventAlgo('fwdelCBTightMonAlg').OutputLevel = 2 # DEBUG
+
cfg.printConfig(withDetails=False) # set True for exhaustive info
+ #cfg.printConfig(withDetails=True) # set True for exhaustive info
- cfg.run(20) #use cfg.run(20) to only run on first 20 events
+ #cfg.run(2)
+ cfg.run(-1)
+ #cfg.run(600) #use cfg.run(20) to only run on first 20 events
diff --git a/Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx b/Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx
index 1d56db285e0ad441c9731c507d8d94d933bbf821..0774cfe1982847ac2276a2912e99a1b939f779aa 100755
--- a/Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/MonitorElectronAlgorithm.cxx
@@ -1,5 +1,8 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+ Author : B. Laforge (laforge@lpnhe.in2p3.fr)
+ 4 May 2020
*/
#include "egammaPerformance/MonitorElectronAlgorithm.h"
@@ -14,12 +17,11 @@ MonitorElectronAlgorithm::~MonitorElectronAlgorithm() {}
StatusCode MonitorElectronAlgorithm::initialize() {
using namespace Monitored;
-
+ ATH_CHECK( AthMonitorAlgorithm::initialize() );
ATH_CHECK( m_ParticleContainerKey.initialize() );
- return AthMonitorAlgorithm::initialize();
+ return StatusCode::SUCCESS;
}
-
StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) const {
using namespace Monitored;
@@ -31,6 +33,9 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
return StatusCode::SUCCESS;
}
+ //
+ // now, fill the specific Electron information
+ //
// get the Electron container
SG::ReadHandle<xAOD::ElectronContainer> electrons(m_ParticleContainerKey, ctx);
@@ -40,45 +45,263 @@ StatusCode MonitorElectronAlgorithm::fillHistograms( const EventContext& ctx ) c
}
// Event variables to be monitored
-
- auto lumiPerBCID = Monitored::Scalar<float>("lumiPerBCID",0.0);
- auto lb = Monitored::Scalar<int>("lb",0);
- auto run = Monitored::Scalar<int>("run",0);
+ auto lbNCandidates = Monitored::Scalar<u_int16_t>("LBEvoN",0);
// Particle variables to be monitored
+ auto np = Monitored::Scalar<int>("N",0.0);
+ auto et = Monitored::Scalar<Float_t>("Et",0.0);
+ auto eta = Monitored::Scalar<Float_t>("Eta",0.0);
+ auto phi = Monitored::Scalar<Float_t>("Phi",0.0);
+ auto is_pt_gt_2_5gev = Monitored::Scalar<bool>("is_pt_gt_2_5gev",false);
+ auto is_pt_gt_4gev = Monitored::Scalar<bool>("is_pt_gt_4gev",false);
+ auto is_pt_gt_20gev = Monitored::Scalar<bool>("is_pt_gt_20gev",false);
+ auto time = Monitored::Scalar<Float_t>("Time",0.0);
+ auto topoetcone40 = Monitored::Scalar<Float_t>("TopoEtCone40",0.0);
+ auto ptcone20 = Monitored::Scalar<Float_t>("PtCone20",0.0);
- std::string name = m_ParticlePrefix+"N"+m_RecoName+m_WithTrigger;
- auto np = Monitored::Scalar<int>(name,0.0);
-
- auto pt = Monitored::Scalar<float>("pt",0.0);
+ // Particle variables per Region
+
+ // BARREL
+ auto np_barrel = Monitored::Scalar<int>("NinBARREL",0.0);
+ auto et_barrel = Monitored::Scalar<Float_t>("EtinBARREL",0.0);
+ auto eta_barrel = Monitored::Scalar<Float_t>("EtainBARREL",0.0);
+ auto phi_barrel = Monitored::Scalar<Float_t>("PhiinBARREL",0.0);
+ auto time_barrel = Monitored::Scalar<Float_t>("TimeinBARREL",0.0);
+ auto ehad1_barrel = Monitored::Scalar<Float_t>("Ehad1inBARREL",0.0);
+ auto eoverp_barrel = Monitored::Scalar<Float_t>("EoverPinBARREL",0.0);
+ auto coreem_barrel = Monitored::Scalar<Float_t>("CoreEMinBARREL",0.0);
+ auto f0_barrel = Monitored::Scalar<Float_t>("F0inBARREL",0.0);
+ auto f1_barrel = Monitored::Scalar<Float_t>("F1inBARREL",0.0);
+ auto f2_barrel = Monitored::Scalar<Float_t>("F2inBARREL",0.0);
+ auto f3_barrel = Monitored::Scalar<Float_t>("F3inBARREL",0.0);
+ auto re233e237_barrel = Monitored::Scalar<Float_t>("Re233e337inBARREL",0.0);
+ auto re237e277_barrel = Monitored::Scalar<Float_t>("Re237e277inBARREL",0.0);
+ auto nofblayerhits_barrel = Monitored::Scalar<u_int8_t>("NOfBLayerHitsinBARREL",0);
+ auto nofpixelhits_barrel = Monitored::Scalar<u_int8_t>("NOfPixelHitsinBARREL",0);
+ auto nofscthits_barrel = Monitored::Scalar<u_int8_t>("NOfSCTHitsinBARREL",0);
+ auto noftrthits_barrel = Monitored::Scalar<u_int8_t>("NOfTRTHitsinBARREL",0);
+ auto noftrthighthresholdhits_barrel = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsinBARREL",0);
+ auto deltaeta1_barrel = Monitored::Scalar<Float_t>("DeltaEta1inBARREL",0.0);
+ auto deltaphi2_barrel = Monitored::Scalar<Float_t>("DeltaPhi2inBARREL",0.0);
+ auto trackd0_barrel = Monitored::Scalar<Float_t>("Trackd0inBARREL",0.0);
+
+ // ENDCAP
+ auto np_endcap = Monitored::Scalar<int>("NinENDCAP",0.0);
+ auto et_endcap = Monitored::Scalar<Float_t>("EtinENDCAP",0.0);
+ auto eta_endcap = Monitored::Scalar<Float_t>("EtainENDCAP",0.0);
+ auto phi_endcap = Monitored::Scalar<Float_t>("PhiinENDCAP",0.0);
+ auto time_endcap = Monitored::Scalar<Float_t>("TimeinENDCAP",0.0);
+ auto ehad1_endcap = Monitored::Scalar<Float_t>("Ehad1inENDCAP",0.0);
+ auto eoverp_endcap = Monitored::Scalar<Float_t>("EoverPinENDCAP",0.0);
+ auto coreem_endcap = Monitored::Scalar<Float_t>("CoreEMinENDCAP",0.0);
+ auto f0_endcap = Monitored::Scalar<Float_t>("F0_endcapinENDCAP",0.0);
+ auto f1_endcap = Monitored::Scalar<Float_t>("F1_endcapinENDCAP",0.0);
+ auto f2_endcap = Monitored::Scalar<Float_t>("F2_endcapinENDCAP",0.0);
+ auto f3_endcap = Monitored::Scalar<Float_t>("F3_endcapinENDCAP",0.0);
+ auto re233e237_endcap = Monitored::Scalar<Float_t>("Re233e337_endcapinENDCAP",0.0);
+ auto re237e277_endcap = Monitored::Scalar<Float_t>("Re237e277_endcapinENDCAP",0.0);
+ auto nofblayerhits_endcap = Monitored::Scalar<u_int8_t>("NOfBLayerHitsinENDCAP",0);
+ auto nofpixelhits_endcap = Monitored::Scalar<u_int8_t>("NOfPixelHitsinENDCAP",0);
+ auto nofscthits_endcap = Monitored::Scalar<u_int8_t>("NOfSCTHitsinENDCAP",0);
+ auto noftrthits_endcap = Monitored::Scalar<u_int8_t>("NOfTRTHitsinENDCAP",0);
+ auto noftrthighthresholdhits_endcap = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsinENDCAP",0);
+ auto deltaeta1_endcap = Monitored::Scalar<Float_t>("DeltaEta1inENDCAP",0.0);
+ auto deltaphi2_endcap = Monitored::Scalar<Float_t>("DeltaPhi2inENDCAP",0.0);
+ auto trackd0_endcap = Monitored::Scalar<Float_t>("Trackd0inENDCAP",0.0);
+
+ // CRACK
+ auto np_crack = Monitored::Scalar<int>("NinCRACK",0.0);
+ auto et_crack = Monitored::Scalar<Float_t>("EtinCRACK",0.0);
+ auto eta_crack = Monitored::Scalar<Float_t>("EtainCRACK",0.0);
+ auto phi_crack = Monitored::Scalar<Float_t>("PhiinCRACK",0.0);
+ auto time_crack = Monitored::Scalar<Float_t>("TimeinCRACK",0.0);
+ auto ehad1_crack = Monitored::Scalar<Float_t>("Ehad1inCRACK",0.0);
+ auto eoverp_crack = Monitored::Scalar<Float_t>("EoverPinCRACK",0.0);
+ auto coreem_crack = Monitored::Scalar<Float_t>("CoreEMinCRACK",0.0);
+ auto f0_crack = Monitored::Scalar<Float_t>("F0inCRACK",0.0);
+ auto f1_crack = Monitored::Scalar<Float_t>("F1inCRACK",0.0);
+ auto f2_crack = Monitored::Scalar<Float_t>("F2inCRACK",0.0);
+ auto f3_crack = Monitored::Scalar<Float_t>("F3inCRACK",0.0);
+ auto re233e237_crack = Monitored::Scalar<Float_t>("Re233e337inCRACK",0.0);
+ auto re237e277_crack = Monitored::Scalar<Float_t>("Re237e277inCRACK",0.0);
+ auto nofblayerhits_crack = Monitored::Scalar<u_int8_t>("NOfBLayerHitsinCRACK",0);
+ auto nofpixelhits_crack = Monitored::Scalar<u_int8_t>("NOfPixelHitsinCRACK",0);
+ auto nofscthits_crack = Monitored::Scalar<u_int8_t>("NOfSCTHitsinCRACK",0);
+ auto noftrthits_crack = Monitored::Scalar<u_int8_t>("NOfTRTHitsinCRACK",0);
+ auto noftrthighthresholdhits_crack = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsinCRACK",0);
+ auto deltaeta1_crack = Monitored::Scalar<Float_t>("DeltaEta1inCRACK",0.0);
+ auto deltaphi2_crack = Monitored::Scalar<Float_t>("DeltaPhi2inCRACK",0.0);
+ auto trackd0_crack = Monitored::Scalar<Float_t>("Trackd0inCRACK",0.0);
// Set the values of the monitored variables for the event
- lumiPerBCID = lbAverageInteractionsPerCrossing(ctx);
- lb = GetEventInfo(ctx)->lumiBlock();
- run = GetEventInfo(ctx)->runNumber();
- // Fill. First argument is the tool name, all others are the variables to be histogramed
- fill("MonitorElectron",lumiPerBCID,lb,run);
-
+ u_int16_t mylb = GetEventInfo(ctx)->lumiBlock();
+ lbNCandidates = mylb;
- np = 0;
+ u_int16_t mynp = 0;
for (const auto& e_iter : *electrons) {
-
// Check that the electron meets our requirements
bool isGood;
if (! e_iter->passSelection(isGood,m_RecoName)) {
- ATH_MSG_WARNING("Misconfiguration: " << m_RecoName << " is not a valid working point");
+ ATH_MSG_WARNING("Misconfiguration: " << m_RecoName << " is not a valid working point for electrons");
break; // no point in continuing
}
- if(isGood) {np++;}
+ if(isGood) {mynp++;}
else continue;
-
- // do stuff with electrons
- pt = e_iter->pt()/Gaudi::Units::GeV; // in GeV
- fill("MonitorElectron",pt);
+ // do specific stuff with electrons
+
+ Float_t myet = e_iter->pt(); // in MeV (/Gaudi::Units::GeV; // in GeV)
+ Float_t myeta = e_iter->eta();
+ Float_t myphi = e_iter->phi();
+
+ is_pt_gt_2_5gev = myet > 2500. ;
+ is_pt_gt_4gev = myet > 4000. ;
+ is_pt_gt_20gev = myet > 20000. ;
+
+ // Isolation Energy
+ Float_t mytopoetcone40 = -999.;
+ e_iter->isolationValue(mytopoetcone40,xAOD::Iso::topoetcone40);
+ topoetcone40 = mytopoetcone40;
+
+ Float_t myptcone20 = -999.;
+ e_iter->isolationValue(myptcone20,xAOD::Iso::ptcone20);
+ ptcone20 = myptcone20;
+
+ Float_t mytime=0.0;
+
+ // Shower shape variable details
+ Float_t myehad1 = 0.0;
+ Float_t myecore = 0.0;
+ Float_t myf0 = 0.0;
+ Float_t myf1 = 0.0;
+ Float_t myf2 = 0.0;
+ Float_t myf3 = 0.0;
+ Float_t e233 = 0.0;
+ Float_t e237 = 0.0;
+ Float_t e277 = 0.0;
+ Float_t myre233e237 = 0.0;
+ Float_t myre237e277 = 0.0;
+
+ e_iter->showerShapeValue(myehad1, xAOD::EgammaParameters::ehad1);
+ e_iter->showerShapeValue(myecore, xAOD::EgammaParameters::ecore);
+
+ e_iter->showerShapeValue(e237, xAOD::EgammaParameters::e237);
+ e_iter->showerShapeValue(e233, xAOD::EgammaParameters::e233);
+ e_iter->showerShapeValue(e277, xAOD::EgammaParameters::e277);
+
+ if (e237!=0) myre233e237 = e233 / e237;
+ if (e277!=0) myre237e277 = e237 / e277;
+
+
+ // Cluster track match details
+ Float_t mydeltaeta1 = -999.0;
+ e_iter->trackCaloMatchValue(mydeltaeta1, xAOD::EgammaParameters::deltaEta1);
+ Float_t mydeltaphi2 = -999.0;
+ e_iter->trackCaloMatchValue(mydeltaphi2, xAOD::EgammaParameters::deltaPhi2);
+
+ Float_t myeoverp = -999.0;
+ Float_t mytrackd0 = -999.0;
+
+ // associated track details
+ const xAOD::TrackParticle *t = e_iter->trackParticle();
+ double trackp = 0;
+ u_int8_t mynofblayerhits=-1;
+ u_int8_t mynofpixelhits=-1;
+ u_int8_t mynofscthits=-1;
+ u_int8_t mynoftrthits=-1;
+ u_int8_t mynoftrthighthresholdhits=-1;
+
+ if(t) {
+ trackp = t->pt()*cosh(t->eta());
+ // retrieve track summary information
+ t->summaryValue(mynofblayerhits,xAOD::numberOfInnermostPixelLayerHits);
+ t->summaryValue(mynofpixelhits,xAOD::numberOfPixelHits);
+ t->summaryValue(mynofscthits,xAOD::numberOfSCTHits);
+ t->summaryValue(mynoftrthits,xAOD::numberOfTRTHits);
+ t->summaryValue(mynoftrthighthresholdhits,xAOD::numberOfTRTHighThresholdHits);
+ mytrackd0 = t->d0();
+ }
+ else
+ ATH_MSG_DEBUG("Error attempting to retrieve associated track");
+
+
+ // Associated cluster details
+
+ const xAOD::CaloCluster *aCluster = e_iter->caloCluster();
+ if (aCluster) {
+ mytime = aCluster->time();
+ time = mytime ;
+ // Shower shape variable details
+ double ec = aCluster->et()*cosh(aCluster->eta());
+ if (ec!=0) myf0 = aCluster->energyBE(0)/ec;
+ if (ec!=0) myf1 = aCluster->energyBE(1)/ec;
+ if (ec!=0) myf2 = aCluster->energyBE(2)/ec;
+ if (ec!=0) myf3 = aCluster->energyBE(3)/ec;
+
+ if(trackp !=0) myeoverp = aCluster->e()/trackp;
+
+ //ATH_MSG_WARNING("Test eoverp : " << myeoverp);
+ }
+
+ // Fill per region histograms
+ auto region = GetRegion(myeta);
+ switch(region){
+ case BARREL :
+ nofblayerhits_barrel = mynofblayerhits; nofpixelhits_barrel = mynofpixelhits ; nofscthits_barrel = mynofscthits ;
+ noftrthits_barrel = mynoftrthits ; noftrthighthresholdhits_barrel = mynoftrthighthresholdhits;
+ fill("MonitorElectron",nofblayerhits_barrel, nofpixelhits_barrel,noftrthits_barrel,noftrthighthresholdhits_barrel,is_pt_gt_4gev);
+ deltaeta1_barrel = mydeltaeta1; deltaphi2_barrel = mydeltaphi2; trackd0_barrel = mytrackd0;
+ eoverp_barrel = myeoverp;
+ fill("MonitorElectron",deltaeta1_barrel, deltaphi2_barrel,trackd0_barrel,eoverp_barrel,is_pt_gt_4gev);
+ np_barrel = mynp; et_barrel = myet ; eta_barrel = myeta ; phi_barrel = myphi ;
+ fill("MonitorElectron",np_barrel,et_barrel,eta_barrel,phi_barrel,is_pt_gt_4gev);
+ time_barrel = mytime; ehad1_barrel = myehad1; coreem_barrel = myecore;
+ fill("MonitorElectron",time_barrel, ehad1_barrel,coreem_barrel,is_pt_gt_4gev);
+ f0_barrel = myf0; f1_barrel = myf1; f2_barrel = myf2; f3_barrel = myf3; re233e237_barrel = myre233e237; re237e277_barrel = myre237e277;
+ fill("MonitorElectron",f0_barrel,f1_barrel,f2_barrel, f3_barrel,re233e237_barrel,re237e277_barrel,is_pt_gt_4gev);
+ break;
+ case ENDCAP :
+ nofblayerhits_endcap = mynofblayerhits; nofpixelhits_endcap = mynofpixelhits ; nofscthits_endcap = mynofscthits ;
+ noftrthits_endcap = mynoftrthits ; noftrthighthresholdhits_endcap = mynoftrthighthresholdhits;
+ fill("MonitorElectron",nofblayerhits_endcap, nofpixelhits_endcap,noftrthits_endcap,noftrthighthresholdhits_endcap,is_pt_gt_4gev);
+ deltaeta1_endcap = mydeltaeta1; deltaphi2_endcap = mydeltaphi2; trackd0_endcap = mytrackd0;
+ eoverp_endcap = myeoverp;
+ fill("MonitorElectron",deltaeta1_endcap, deltaphi2_endcap,trackd0_endcap,eoverp_endcap,is_pt_gt_4gev);
+ np_endcap = mynp ; et_endcap = myet ; eta_endcap = myeta ; phi_endcap = myphi ;
+ fill("MonitorElectron",np_endcap,et_endcap,eta_endcap,phi_endcap,is_pt_gt_4gev);
+ time_endcap = mytime; ehad1_endcap = myehad1; coreem_endcap = myecore;
+ fill("MonitorElectron",time_endcap, ehad1_endcap,coreem_endcap,is_pt_gt_4gev);
+ f0_endcap = myf0; f1_endcap = myf1; f2_endcap = myf2; f3_endcap = myf3; re233e237_endcap = myre233e237; re237e277_endcap = myre237e277;
+ fill("MonitorElectron",f0_endcap,f1_endcap,f2_endcap,f3_endcap,re233e237_endcap,re237e277_endcap,is_pt_gt_4gev);
+ break;
+ case CRACK :
+ nofblayerhits_crack = mynofblayerhits; nofpixelhits_crack = mynofpixelhits ; nofscthits_crack = mynofscthits ;
+ noftrthits_crack = mynoftrthits ; noftrthighthresholdhits_crack = mynoftrthighthresholdhits;
+ fill("MonitorElectron",nofblayerhits_crack, nofpixelhits_crack,noftrthits_crack,noftrthighthresholdhits_crack,is_pt_gt_4gev);
+ deltaeta1_crack = mydeltaeta1; deltaphi2_crack = mydeltaphi2; trackd0_crack = mytrackd0;
+ eoverp_barrel = myeoverp;
+ fill("MonitorElectron",deltaeta1_crack, deltaphi2_crack,trackd0_crack,eoverp_crack,is_pt_gt_4gev);
+ np_crack = mynp ; et_crack = myet ; eta_crack = myeta ; phi_crack = myphi ;
+ fill("MonitorElectron",np_crack,et_crack,eta_crack,phi_crack,is_pt_gt_4gev);
+ time_crack = mytime; ehad1_crack = myehad1; coreem_crack = myecore;
+ fill("MonitorElectron",time_crack, ehad1_crack,coreem_crack,is_pt_gt_4gev);
+ f0_crack = myf0; f1_crack = myf1; f2_crack = myf2; f3_crack = myf3; re233e237_crack = myre233e237; re237e277_crack = myre237e277;
+ fill("MonitorElectron",f0_crack,f1_crack,f2_crack,f3_crack,re233e237_crack,re237e277_crack,is_pt_gt_4gev);
+ break;
+ default :
+ //ATH_MSG_WARNING("found an electron outside the |eta| > 2.47 acceptance");
+ break;
+ }
+
+ et = myet ; eta = myeta ; phi = myphi ;
+ fill("MonitorElectron",et,eta,phi,time,ptcone20,topoetcone40,lbNCandidates,
+ is_pt_gt_2_5gev, is_pt_gt_4gev, is_pt_gt_20gev);
+
+ // Fill. First argument is the tool name, all others are the variables to be histogramed
}
+ np = mynp;
fill("MonitorElectron",np);
return StatusCode::SUCCESS;
diff --git a/Reconstruction/egamma/egammaPerformance/src/MonitorFwdElectronAlgorithm.cxx b/Reconstruction/egamma/egammaPerformance/src/MonitorFwdElectronAlgorithm.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..cb13efe3e84659b46bb9b4f09289038315e9ae16
--- /dev/null
+++ b/Reconstruction/egamma/egammaPerformance/src/MonitorFwdElectronAlgorithm.cxx
@@ -0,0 +1,185 @@
+/*
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+ Author : B. Laforge (laforge@lpnhe.in2p3.fr)
+ 4 May 2020
+*/
+
+#include "egammaPerformance/MonitorFwdElectronAlgorithm.h"
+
+MonitorFwdElectronAlgorithm::MonitorFwdElectronAlgorithm( const std::string& name, ISvcLocator* pSvcLocator )
+:AthMonitorAlgorithm(name,pSvcLocator)
+{
+}
+
+MonitorFwdElectronAlgorithm::~MonitorFwdElectronAlgorithm() {}
+
+
+StatusCode MonitorFwdElectronAlgorithm::initialize() {
+ using namespace Monitored;
+ ATH_CHECK( AthMonitorAlgorithm::initialize() );
+ ATH_CHECK( m_ParticleContainerKey.initialize() );
+ return StatusCode::SUCCESS;
+}
+
+StatusCode MonitorFwdElectronAlgorithm::fillHistograms( const EventContext& ctx ) const {
+ using namespace Monitored;
+
+ // Only monitor good LAr Events :
+
+ xAOD::EventInfo::EventFlagErrorState error_state = GetEventInfo(ctx)->errorState(xAOD::EventInfo::LAr);
+ if (error_state==xAOD::EventInfo::Error) {
+ ATH_MSG_DEBUG("LAr event data integrity error");
+ return StatusCode::SUCCESS;
+ }
+
+ //
+ // now, fill the specific Electron information
+ //
+ // get the Electron container
+
+ SG::ReadHandle<xAOD::ElectronContainer> electrons(m_ParticleContainerKey, ctx);
+ if (! electrons.isValid() ) {
+ ATH_MSG_ERROR("evtStore() does not contain Forward Electron Collection with name "<< m_ParticleContainerKey);
+ return StatusCode::FAILURE;
+ }
+
+ // Event variables to be monitored
+ auto lbNCandidates = Monitored::Scalar<u_int16_t>("LBEvoN",0);
+
+ // Particle variables to be monitored
+ auto np = Monitored::Scalar<int>("N",0.0);
+ auto et = Monitored::Scalar<Float_t>("Et",0.0);
+ auto eta = Monitored::Scalar<Float_t>("Eta",0.0);
+ auto phi = Monitored::Scalar<Float_t>("Phi",0.0);
+ auto is_pt_gt_2_5gev = Monitored::Scalar<bool>("is_pt_gt_2_5gev",false);
+ auto is_pt_gt_10gev = Monitored::Scalar<bool>("is_pt_gt_10gev",false);
+ auto time = Monitored::Scalar<Float_t>("Time",0.0);
+
+ auto firstENGdens = Monitored::Scalar<Float_t>("EnergyDensity",0.0);
+ auto fracMax = Monitored::Scalar<Float_t>("FracMax",0.0);
+ auto lateral = Monitored::Scalar<Float_t>("Lateral",0.0);
+ auto longitudinal = Monitored::Scalar<Float_t>("Longitudinal",0.0);
+ auto secondLambda = Monitored::Scalar<Float_t>("SecondLambda",0.0);
+ auto secondR = Monitored::Scalar<Float_t>("SecondR",0.0);
+ auto centerLambda = Monitored::Scalar<Float_t>("CenterLambda",0.0);
+
+
+ // Particle variables per Region
+
+ // variables per Region
+
+ // ENDCAP
+ auto np_endcap = Monitored::Scalar<int>("NinENDCAP",0.0);
+ auto et_endcap = Monitored::Scalar<Float_t>("EtinENDCAP",0.0);
+ auto eta_endcap = Monitored::Scalar<Float_t>("EtainENDCAP",0.0);
+ auto phi_endcap = Monitored::Scalar<Float_t>("PhiinENDCAP",0.0);
+ auto time_endcap = Monitored::Scalar<Float_t>("TimeinENDCAP",0.0);
+
+ // FORWARD
+ auto np_forward = Monitored::Scalar<int>("NinFORWARD",0.0);
+ auto et_forward = Monitored::Scalar<Float_t>("EtinFORWARD",0.0);
+ auto eta_forward = Monitored::Scalar<Float_t>("EtainFORWARD",0.0);
+ auto phi_forward = Monitored::Scalar<Float_t>("PhiinFORWARD",0.0);
+ auto time_forward = Monitored::Scalar<Float_t>("TimeinFORWARD",0.0);
+
+ // Set the values of the monitored variables for the event
+
+ u_int16_t mylb = GetEventInfo(ctx)->lumiBlock();
+ lbNCandidates = mylb;
+
+ u_int16_t mynp = 0;
+ u_int16_t mynp_endcap = 0;
+ u_int16_t mynp_forward = 0;
+
+
+ for (const auto& e_iter : *electrons) {
+ // Check that the electron meets our requirements
+ bool isGood;
+ if (! e_iter->passSelection(isGood,m_RecoName)) {
+ ATH_MSG_WARNING("Misconfiguration: " << m_RecoName << " is not a valid working point for electrons");
+ break; // no point in continuing
+ }
+ if(isGood) {mynp++;}
+ else continue;
+
+ // do specific stuff with electrons
+
+ Float_t myet = e_iter->pt(); // in MeV (/Gaudi::Units::GeV; // in GeV)
+ Float_t myeta = e_iter->eta();
+ Float_t myphi = e_iter->phi();
+
+ is_pt_gt_2_5gev = myet > 2500. ;
+ is_pt_gt_10gev = myet > 10000. ;
+
+ // Associated cluster details
+ // Shower shape variable details
+
+ double myfirstENGdens=-999.;
+ double myfracMax=-999.;
+ double mylateral=-999.;
+ double mylongitudinal=-999.;
+ double mysecondLambda=-999.;
+ double mysecondR=-999.;
+ double mycenterLambda=-999.;
+ double mytime= -999.;
+
+ const xAOD::CaloCluster *aCluster = e_iter->caloCluster();
+ if (aCluster) {
+ aCluster->retrieveMoment(xAOD::CaloCluster::FIRST_ENG_DENS,myfirstENGdens);
+ aCluster->retrieveMoment(xAOD::CaloCluster::ENG_FRAC_MAX, myfracMax);
+ aCluster->retrieveMoment(xAOD::CaloCluster::LONGITUDINAL, mylongitudinal);
+ aCluster->retrieveMoment(xAOD::CaloCluster::SECOND_LAMBDA,mysecondLambda);
+ aCluster->retrieveMoment(xAOD::CaloCluster::LATERAL, mylateral);
+ aCluster->retrieveMoment(xAOD::CaloCluster::SECOND_R, mysecondR);
+ aCluster->retrieveMoment(xAOD::CaloCluster::CENTER_LAMBDA, mycenterLambda);
+ mytime = aCluster->time();
+ }
+
+ firstENGdens = (Float_t) myfirstENGdens;
+ fracMax = (Float_t) myfracMax;
+ lateral = (Float_t) mylateral;
+ longitudinal = (Float_t) mylongitudinal;
+ secondLambda = (Float_t) mysecondLambda;
+ secondR = (Float_t) mysecondR;
+ centerLambda = (Float_t) mycenterLambda;
+ time = mytime;
+
+ // Fill per region histograms
+
+ auto region = GetRegion(myeta);
+ switch(region){
+ case ENDCAP :
+ mynp_endcap++;
+ et_endcap = myet ; eta_endcap = myeta ;
+ phi_endcap = myphi ; time_endcap = mytime;
+ fill("MonitorFwdElectron",et_endcap,eta_endcap,phi_endcap,time_endcap,is_pt_gt_10gev);
+ break;
+ case FORWARD :
+ mynp_forward++;
+ mynp_forward++;
+ et_forward = myet ; eta_forward = myeta ;
+ phi_forward = myphi ; time_forward = mytime;
+ fill("MonitorFwdElectron",et_forward,eta_forward,phi_forward,time_forward,is_pt_gt_10gev);
+ break;
+ default :
+ //ATH_MSG_WARNING("found an electron outside the |eta| > 2.47 acceptance");
+ break;
+ }
+
+ // Fill global histograms
+
+ et = myet ; eta = myeta ; phi = myphi ;
+ fill("MonitorFwdElectron",et,eta,phi,time,lbNCandidates,
+ firstENGdens, fracMax, lateral, longitudinal, secondLambda,
+ secondR, centerLambda, time,
+ is_pt_gt_2_5gev, is_pt_gt_10gev);
+
+ // Fill. First argument is the tool name, all others are the variables to be histogramed
+ }
+
+ np = mynp; np_endcap = mynp_endcap ; np_forward = mynp_forward ;
+ fill("MonitorFwdElectron",np,np_endcap,np_forward,is_pt_gt_10gev);
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx b/Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx
index 14c43cce4fcd59b2c64993b312eaf32d7e4a6c15..0bb0c05d48e5b92e61426bc125e1675e0f993e18 100755
--- a/Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/MonitorPhotonAlgorithm.cxx
@@ -1,5 +1,8 @@
/*
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+ Author : B. Laforge (laforge@lpnhe.in2p3.fr)
+ 4 May 2020
*/
#include "egammaPerformance/MonitorPhotonAlgorithm.h"
@@ -9,18 +12,16 @@ MonitorPhotonAlgorithm::MonitorPhotonAlgorithm( const std::string& name, ISvcLoc
{
}
-
MonitorPhotonAlgorithm::~MonitorPhotonAlgorithm() {}
StatusCode MonitorPhotonAlgorithm::initialize() {
using namespace Monitored;
-
+ ATH_CHECK(AthMonitorAlgorithm::initialize() );
ATH_CHECK( m_ParticleContainerKey.initialize() );
- return AthMonitorAlgorithm::initialize();
+ return StatusCode::SUCCESS;
}
-
StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) const {
using namespace Monitored;
@@ -31,55 +32,285 @@ StatusCode MonitorPhotonAlgorithm::fillHistograms( const EventContext& ctx ) con
ATH_MSG_DEBUG("LAr event data integrity error");
return StatusCode::SUCCESS;
}
-
+ //
+ // now, fill the Photon information
// get the Photon container
SG::ReadHandle<xAOD::PhotonContainer> photons(m_ParticleContainerKey, ctx);
if (! photons.isValid() ) {
- ATH_MSG_ERROR("evtStore() does not contain electron Collection with name "<< m_ParticleContainerKey);
+ ATH_MSG_ERROR("evtStore() does not contain photon Collection with name "<< m_ParticleContainerKey);
return StatusCode::FAILURE;
}
- // Event variables to be monitored
+ // Specific Photon variables to be monitored
- auto lumiPerBCID = Monitored::Scalar<float>("lumiPerBCID",0.0);
- auto lb = Monitored::Scalar<int>("lb",0);
- auto run = Monitored::Scalar<int>("run",0);
+ u_int16_t mylb = GetEventInfo(ctx)->lumiBlock();
+
+ // Event variables to be monitored
+ auto lbNCandidates = Monitored::Scalar<u_int16_t>("LBEvoN",0);
// Particle variables to be monitored
+ auto np = Monitored::Scalar<int>("N",0.0);
+ auto et = Monitored::Scalar<Float_t>("Et",0.0);
+ auto eta = Monitored::Scalar<Float_t>("Eta",0.0);
+ auto phi = Monitored::Scalar<Float_t>("Phi",0.0);
+ auto is_pt_gt_2_5gev = Monitored::Scalar<bool>("is_pt_gt_2_5gev",false);
+ auto is_pt_gt_4gev = Monitored::Scalar<bool>("is_pt_gt_4gev",false);
+ auto is_pt_gt_20gev = Monitored::Scalar<bool>("is_pt_gt_20gev",false);
+ auto time = Monitored::Scalar<Float_t>("Time",0.0);
+ auto topoetcone40 = Monitored::Scalar<Float_t>("TopoEtCone40",0.0);
+ auto ptcone20 = Monitored::Scalar<Float_t>("PtCone20",0.0);
- std::string name = m_ParticlePrefix+"N"+m_RecoName+m_WithTrigger;
- auto np = Monitored::Scalar<int>(name,0.0);
-
- auto pt = Monitored::Scalar<float>("pt",0.0);
+ // Particle variables per Region
- // Set the values of the monitored variables for the event
- lumiPerBCID = lbAverageInteractionsPerCrossing(ctx);
- lb = GetEventInfo(ctx)->lumiBlock();
- run = GetEventInfo(ctx)->runNumber();
+ // BARREL
+ auto np_barrel = Monitored::Scalar<int>("NinBARREL",0.0);
+ auto et_barrel = Monitored::Scalar<Float_t>("EtinBARREL",0.0);
+ auto eta_barrel = Monitored::Scalar<Float_t>("EtainBARREL",0.0);
+ auto phi_barrel = Monitored::Scalar<Float_t>("PhiinBARREL",0.0);
+ auto time_barrel = Monitored::Scalar<Float_t>("TimeinBARREL",0.0);
+ auto ehad1_barrel = Monitored::Scalar<Float_t>("Ehad1inBARREL",0.0);
+ auto eoverp_barrel = Monitored::Scalar<Float_t>("EoverPinBARREL",0.0);
+ auto coreem_barrel = Monitored::Scalar<Float_t>("CoreEMinBARREL",0.0);
+ auto f0_barrel = Monitored::Scalar<Float_t>("F0inBARREL",0.0);
+ auto f1_barrel = Monitored::Scalar<Float_t>("F1inBARREL",0.0);
+ auto f2_barrel = Monitored::Scalar<Float_t>("F2inBARREL",0.0);
+ auto f3_barrel = Monitored::Scalar<Float_t>("F3inBARREL",0.0);
+ auto re233e237_barrel = Monitored::Scalar<Float_t>("Re233e337inBARREL",0.0);
+ auto re237e277_barrel = Monitored::Scalar<Float_t>("Re237e277inBARREL",0.0);
+
+ // ENDCAP
+ auto np_endcap = Monitored::Scalar<int>("NinENDCAP",0.0);
+ auto et_endcap = Monitored::Scalar<Float_t>("EtinENDCAP",0.0);
+ auto eta_endcap = Monitored::Scalar<Float_t>("EtainENDCAP",0.0);
+ auto phi_endcap = Monitored::Scalar<Float_t>("PhiinENDCAP",0.0);
+ auto time_endcap = Monitored::Scalar<Float_t>("TimeinENDCAP",0.0);
+ auto ehad1_endcap = Monitored::Scalar<Float_t>("Ehad1inENDCAP",0.0);
+ auto eoverp_endcap = Monitored::Scalar<Float_t>("EoverPinENDCAP",0.0);
+ auto coreem_endcap = Monitored::Scalar<Float_t>("CoreEMinENDCAP",0.0);
+ auto f0_endcap = Monitored::Scalar<Float_t>("F0inENDCAP",0.0);
+ auto f1_endcap = Monitored::Scalar<Float_t>("F1inENDCAP",0.0);
+ auto f2_endcap = Monitored::Scalar<Float_t>("F2inENDCAP",0.0);
+ auto f3_endcap = Monitored::Scalar<Float_t>("F3inENDCAP",0.0);
+ auto re233e237_endcap = Monitored::Scalar<Float_t>("Re233e337inENDCAP",0.0);
+ auto re237e277_endcap = Monitored::Scalar<Float_t>("Re237e277inENDCAP",0.0);
+
+ // CRACK
+ auto np_crack = Monitored::Scalar<int>("NinCRACK",0.0);
+ auto et_crack = Monitored::Scalar<Float_t>("EtinCRACK",0.0);
+ auto eta_crack = Monitored::Scalar<Float_t>("EtainCRACK",0.0);
+ auto phi_crack = Monitored::Scalar<Float_t>("PhiinCRACK",0.0);
+ auto time_crack = Monitored::Scalar<Float_t>("TimeinCRACK",0.0);
+ auto ehad1_crack = Monitored::Scalar<Float_t>("Ehad1inCRACK",0.0);
+ auto eoverp_crack = Monitored::Scalar<Float_t>("EoverPinCRACK",0.0);
+ auto coreem_crack = Monitored::Scalar<Float_t>("CoreEMinCRACK",0.0);
+ auto f0_crack = Monitored::Scalar<Float_t>("F0inCRACK",0.0);
+ auto f1_crack = Monitored::Scalar<Float_t>("F1inCRACK",0.0);
+ auto f2_crack = Monitored::Scalar<Float_t>("F2inCRACK",0.0);
+ auto f3_crack = Monitored::Scalar<Float_t>("F3inCRACK",0.0);
+ auto re233e237_crack = Monitored::Scalar<Float_t>("Re233e337inCRACK",0.0);
+ auto re237e277_crack = Monitored::Scalar<Float_t>("Re237e277inCRACK",0.0);
+
+ // Specific Photon variables
+
+ auto lb = Monitored::Scalar<u_int16_t>("LB",0);
- // Fill. First argument is the tool name, all others are the variables to be histogramed
- fill("MonitorPhoton",lumiPerBCID,lb,run);
-
+ auto is_pt_gt_2_5gevandconv = Monitored::Scalar<bool>("is_pt_gt_2_5gevandconv",false);
+ auto is_pt_gt_2_5gevandunconv = Monitored::Scalar<bool>("is_pt_gt_2_5gevandunconv",false);
- np = 0;
- for (const auto& e_iter : *photons) {
+ auto is_pt_gt_4gevandconv = Monitored::Scalar<bool>("is_pt_gt_4gevandconv",false);
+ auto is_pt_gt_4gevandunconv = Monitored::Scalar<bool>("is_pt_gt_4gevandunconv",false);
- // Check that the photon meets our requirements
+ auto is_pt_gt_20gevandconv = Monitored::Scalar<bool>("is_pt_gt_20gevandconv",false);
+ auto is_pt_gt_20gevandunconv = Monitored::Scalar<bool>("is_pt_gt_20gevandunconv",false);
+
+ auto lbevonphotonsunconv = Monitored::Scalar<u_int16_t>("LBEvoNPhotonsUnconv",0);
+ auto lbevonphotonsconv = Monitored::Scalar<u_int16_t>("LBEvoNPhotonsConv",0);
+
+ // Specific Photon variables per Region
+
+ // BARREL
+
+ auto rconv_barrel = Monitored::Scalar<Float_t>("RConvinBARREL",0.0);
+ auto convtype_barrel = Monitored::Scalar<xAOD::EgammaParameters::ConversionType>("ConvTypeinBARREL",0);
+ auto contrkmatch1_barrel = Monitored::Scalar<u_int8_t>("ConvTrkmatch1inBARREL",0);
+ auto contrkmatch2_barrel = Monitored::Scalar<u_int8_t>("ConvTrkmatch2inBARREL",0);
+
+ // ENDCAP
+ auto rconv_endcap = Monitored::Scalar<Float_t>("RConvinENDCAP",0.0);
+ auto convtype_endcap = Monitored::Scalar<xAOD::EgammaParameters::ConversionType>("ConvTypeinENDCAP",0);
+ auto contrkmatch1_endcap = Monitored::Scalar<u_int8_t>("ConvTrkmatch1inENDCAP",0);
+ auto contrkmatch2_endcap = Monitored::Scalar<u_int8_t>("ConvTrkmatch2inENDCAP",0);
+
+ // CRACK
+ auto rconv_crack = Monitored::Scalar<Float_t>("RConvinCRACK",0.0);
+ auto convtype_crack = Monitored::Scalar<xAOD::EgammaParameters::ConversionType>("ConvTypeinCRACK",0);
+ auto contrkmatch1_crack = Monitored::Scalar<u_int8_t>("ConvTrkmatch1inCRACK",0);
+ auto contrkmatch2_crack = Monitored::Scalar<u_int8_t>("ConvTrkmatch2inCRACK",0);
+
+ // Set the values of the monitored variables for the event
+
+ u_int16_t mynp=0;
+ for (const auto& p_iter : *photons) {
+ // Check that the electron meets our requirements
bool isGood;
- if (! e_iter->passSelection(isGood,m_RecoName)) {
- ATH_MSG_WARNING("Misconfiguration: " << m_RecoName << " is not a valid working point");
+ if (! p_iter->passSelection(isGood,m_RecoName)) {
+ ATH_MSG_WARNING("Misconfiguration: " << m_RecoName << " is not a valid working point for photons");
break; // no point in continuing
}
- if(isGood) {np++;}
+ if(isGood) {mynp++;}
else continue;
-
- // do stuff with photons
- pt = e_iter->pt()/Gaudi::Units::GeV; // in GeV
- fill("MonitorPhoton",pt);
+
+ Float_t myet = p_iter->pt(); // in MeV (/Gaudi::Units::GeV; // in GeV)
+ Float_t myeta = p_iter->eta();
+ Float_t myphi = p_iter->phi();
+ et = myet ; eta = myeta ; phi = myphi ;
+
+ bool myis_pt_gt_2_5gev = myet > 2500. ;
+ bool myis_pt_gt_4gev = myet > 4000. ;
+ bool myis_pt_gt_20gev = myet > 20000. ;
+
+ is_pt_gt_2_5gev = myis_pt_gt_2_5gev ;
+ is_pt_gt_4gev = myis_pt_gt_4gev ;
+ is_pt_gt_20gev = myis_pt_gt_20gev ;
+
+ // Isolation Energy
+ Float_t mytopoetcone40 = -999.;
+ p_iter->isolationValue(mytopoetcone40,xAOD::Iso::topoetcone40);
+ topoetcone40 = mytopoetcone40;
+
+ Float_t myptcone20 = -999.;
+ p_iter->isolationValue(myptcone20,xAOD::Iso::ptcone20);
+ ptcone20 = myptcone20;
+
+ Float_t mytime=0.0;
+
+ // Shower shape variable details
+ Float_t myehad1 = 0.0;
+ Float_t myecore = 0.0;
+ Float_t myf0 = 0.0;
+ Float_t myf1 = 0.0;
+ Float_t myf2 = 0.0;
+ Float_t myf3 = 0.0;
+ Float_t e233 = 0.0;
+ Float_t e237 = 0.0;
+ Float_t e277 = 0.0;
+ Float_t myre233e237 = 0.0;
+ Float_t myre237e277 = 0.0;
+
+ p_iter->showerShapeValue(myehad1, xAOD::EgammaParameters::ehad1);
+ p_iter->showerShapeValue(myecore, xAOD::EgammaParameters::ecore);
+
+ p_iter->showerShapeValue(e237, xAOD::EgammaParameters::e237);
+ p_iter->showerShapeValue(e233, xAOD::EgammaParameters::e233);
+ p_iter->showerShapeValue(e277, xAOD::EgammaParameters::e277);
+
+ if (e237!=0) myre233e237 = e233 / e237;
+ if (e277!=0) myre237e277 = e237 / e277;
+
+ // Associated cluster details
+ const xAOD::CaloCluster *aCluster = p_iter->caloCluster();
+ if (aCluster) {
+ mytime = aCluster->time();
+ time = mytime ;
+ // Shower shape variable details
+ double ec = aCluster->et()*cosh(aCluster->eta());
+ if (ec!=0) myf0 = aCluster->energyBE(0)/ec;
+ if (ec!=0) myf1 = aCluster->energyBE(1)/ec;
+ if (ec!=0) myf2 = aCluster->energyBE(2)/ec;
+ if (ec!=0) myf3 = aCluster->energyBE(3)/ec;
+
+ }
+
+ // do specific stuff with photons
+
+ // Conversion details
+ xAOD::EgammaParameters::ConversionType myconvtype = xAOD::EgammaHelpers::conversionType(p_iter);
+ bool isUnconverted = (myconvtype==xAOD::EgammaParameters::ConversionType::unconverted ? true : false) ;
+
+ is_pt_gt_2_5gevandconv = myis_pt_gt_2_5gev && !isUnconverted ;
+ is_pt_gt_2_5gevandunconv = myis_pt_gt_2_5gev && isUnconverted ;
+
+ is_pt_gt_4gevandconv = myis_pt_gt_4gev && !isUnconverted ;
+ is_pt_gt_4gevandunconv = myis_pt_gt_4gev && isUnconverted ;
+
+ is_pt_gt_20gevandconv = myis_pt_gt_20gev && !isUnconverted ;
+ is_pt_gt_20gevandunconv = myis_pt_gt_20gev && isUnconverted ;
+
+ lb = mylb;
+ lbevonphotonsconv = mylb;
+ lbevonphotonsunconv = mylb;
+
+ fill("MonitorPhoton",lbevonphotonsconv,lbevonphotonsunconv,
+ is_pt_gt_4gevandconv,is_pt_gt_4gevandunconv,
+ is_pt_gt_2_5gevandconv,is_pt_gt_2_5gevandunconv,
+ is_pt_gt_20gevandconv, is_pt_gt_20gevandunconv);
+
+ Float_t myrconv = 0.0;
+ myrconv = xAOD::EgammaHelpers::conversionRadius(p_iter);
+
+ Float_t mycontrkmatch1 = 0.0;
+ (p_iter)->vertexCaloMatchValue(mycontrkmatch1, xAOD::EgammaParameters::convMatchDeltaPhi1);
+ Float_t mycontrkmatch2 = 0.0;
+ (p_iter)->vertexCaloMatchValue(mycontrkmatch2, xAOD::EgammaParameters::convMatchDeltaPhi2);
+
+ // Fill per region histograms
+ auto region = GetRegion(myeta);
+ switch(region){
+ case BARREL :
+ et_barrel = myet ; eta_barrel = myeta ; phi_barrel = myphi ;
+ fill("MonitorPhoton",np_barrel,et_barrel,eta_barrel,phi_barrel,is_pt_gt_4gev);
+ time_barrel = mytime; ehad1_barrel = myehad1; coreem_barrel = myecore;
+ fill("MonitorPhoton",time_barrel, ehad1_barrel,coreem_barrel,is_pt_gt_4gev);
+ f0_barrel = myf0; f1_barrel = myf1; f2_barrel = myf2; f3_barrel = myf3; re233e237_barrel = myre233e237; re237e277_barrel = myre237e277;
+ fill("MonitorPhoton",f0_barrel,f1_barrel,f2_barrel, f3_barrel,re233e237_barrel,re237e277_barrel,is_pt_gt_4gev);
+ rconv_barrel = myrconv ; convtype_barrel = myconvtype ; contrkmatch1_barrel = mycontrkmatch1 ; contrkmatch2_barrel = mycontrkmatch2 ;
+ fill("MonitorPhoton",rconv_barrel,convtype_barrel,contrkmatch1_barrel,contrkmatch2_barrel,is_pt_gt_4gev);
+ break;
+
+ case ENDCAP :
+ et_endcap = myet ; eta_endcap = myeta ; phi_endcap = myphi ;
+ fill("MonitorPhoton",np_endcap,et_endcap,eta_endcap,phi_endcap,is_pt_gt_4gev);
+ time_endcap = mytime; ehad1_endcap = myehad1; coreem_endcap = myecore;
+ fill("MonitorPhoton",time_endcap, ehad1_endcap,coreem_endcap,is_pt_gt_4gev);
+ f0_endcap = myf0; f1_endcap = myf1; f2_endcap = myf2; f3_endcap = myf3; re233e237_endcap = myre233e237; re237e277_endcap = myre237e277;
+ fill("MonitorPhoton",f0_endcap,f1_endcap,f2_endcap,f3_endcap,re233e237_endcap,re237e277_endcap,is_pt_gt_4gev);
+ rconv_endcap = myrconv ; convtype_endcap = myconvtype ; contrkmatch1_endcap = mycontrkmatch1 ; contrkmatch2_endcap = mycontrkmatch2 ;
+ fill("MonitorPhoton",rconv_endcap,convtype_endcap,contrkmatch1_endcap,contrkmatch2_endcap,is_pt_gt_4gev);
+ break;
+
+ case CRACK :
+ et_crack = myet ; eta_crack = myeta ; phi_crack = myphi ;
+ fill("MonitorPhoton",np_crack,et_crack,eta_crack,phi_crack,is_pt_gt_4gev);
+ time_crack = mytime; ehad1_crack = myehad1; coreem_crack = myecore;
+ fill("MonitorPhoton",time_crack, ehad1_crack,coreem_crack,is_pt_gt_4gev);
+ f0_crack = myf0; f1_crack = myf1; f2_crack = myf2; f3_crack = myf3; re233e237_crack = myre233e237; re237e277_crack = myre237e277;
+ fill("MonitorPhoton",f0_crack,f1_crack,f2_crack,f3_crack,re233e237_crack,re237e277_crack,is_pt_gt_4gev);
+ rconv_crack = myrconv ; convtype_crack = myconvtype ; contrkmatch1_crack = mycontrkmatch1 ; contrkmatch2_crack = mycontrkmatch2 ;
+ fill("MonitorPhoton",rconv_crack,convtype_crack,contrkmatch1_crack,contrkmatch2_crack,is_pt_gt_4gev);
+ break;
+
+ default :
+ ATH_MSG_DEBUG("found an electron outside the |eta| > 2.47 acceptance");
+ break;
+ }
+ // Fill. First argument is the tool name, all others are the variables to be histogramed
+
+
+ fill("MonitorPhoton",et,eta,phi,time,ptcone20,topoetcone40,is_pt_gt_4gev,is_pt_gt_20gev,
+ is_pt_gt_2_5gevandconv,is_pt_gt_2_5gevandunconv,
+ is_pt_gt_4gevandconv,is_pt_gt_4gevandunconv,
+ is_pt_gt_20gevandconv,is_pt_gt_20gevandunconv);
+
+ lb = mylb; lbevonphotonsunconv = mylb ; lbevonphotonsconv = mylb; lbNCandidates = mylb;
+ fill("MonitorPhoton",lb, lbNCandidates,
+ is_pt_gt_2_5gev,is_pt_gt_2_5gevandconv,is_pt_gt_2_5gevandunconv,
+ is_pt_gt_4gev,is_pt_gt_4gevandconv,is_pt_gt_4gevandunconv,
+ is_pt_gt_20gev,is_pt_gt_20gevandconv,is_pt_gt_20gevandunconv);
}
+ np = mynp;
fill("MonitorPhoton",np);
return StatusCode::SUCCESS;
diff --git a/Reconstruction/egamma/egammaPerformance/src/MonitorTnPAlgorithm.cxx b/Reconstruction/egamma/egammaPerformance/src/MonitorTnPAlgorithm.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..95cf12f768acc93a061c8d91755c00971937f31c
--- /dev/null
+++ b/Reconstruction/egamma/egammaPerformance/src/MonitorTnPAlgorithm.cxx
@@ -0,0 +1,421 @@
+/*
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+
+Author : B. Laforge (laforge@lpnhe.in2p3.fr)
+4 May 2020
+*/
+
+#include "egammaPerformance/MonitorTnPAlgorithm.h"
+
+MonitorTnPAlgorithm::MonitorTnPAlgorithm( const std::string& name, ISvcLocator* pSvcLocator )
+:AthMonitorAlgorithm(name,pSvcLocator) {
+}
+
+MonitorTnPAlgorithm::~MonitorTnPAlgorithm() {}
+
+
+StatusCode MonitorTnPAlgorithm::initialize() {
+ using namespace Monitored;
+ ATH_CHECK(AthMonitorAlgorithm::initialize());
+ ATH_CHECK(m_ParticleContainerKey.initialize());
+ ATH_MSG_INFO ("call AthMonitorAlgorithm::initialize()");
+ return StatusCode::SUCCESS;
+}
+
+StatusCode MonitorTnPAlgorithm::fillHistograms( const EventContext& ctx ) const {
+ using namespace Monitored;
+
+ // Only monitor good LAr Events :
+
+ xAOD::EventInfo::EventFlagErrorState error_state = GetEventInfo(ctx)->errorState(xAOD::EventInfo::LAr);
+ if (error_state==xAOD::EventInfo::Error) {
+ ATH_MSG_DEBUG("LAr event data integrity error");
+ return StatusCode::SUCCESS;
+ }
+
+ //
+ // now, fill the specific Electron information
+ //
+ // get the Electron container
+
+ SG::ReadHandle<xAOD::ElectronContainer> electrons(m_ParticleContainerKey, ctx);
+ if (! electrons.isValid() ) {
+ ATH_MSG_ERROR("evtStore() does not contain electron Collection with name "<< m_ParticleContainerKey);
+ return StatusCode::FAILURE;
+ }
+
+ // Useful variables to find the leading pair of electrons
+
+ int mynp = 0;
+
+ float lead_et=-999;
+ float subl_et=-999;
+ const xAOD::Electron *lead_el = nullptr;
+ const xAOD::Electron *subl_el = nullptr;
+
+ for (const auto& e_iter : *electrons) {
+ // Check that the electron meets our requirements
+ bool isGood;
+ if (! e_iter->passSelection(isGood,m_RecoName)) {
+ ATH_MSG_WARNING("Misconfiguration: " << m_RecoName << " is not a valid working point for electrons");
+ break; // no point in continuing
+ }
+ if(isGood) {mynp++;} else continue;
+
+ // Look for two highest pt electrons
+ float etloc = e_iter->pt();
+ if(etloc>lead_et) {
+ subl_et = lead_et;
+ subl_el = lead_el;
+ lead_et = etloc;
+ lead_el = e_iter;
+ } else if(etloc>subl_et) {
+ subl_et = etloc;
+ subl_el = e_iter;
+ }
+ }
+
+ // Check that there are at least a good pair of electrons
+ if (mynp<2) return StatusCode::SUCCESS;
+
+ // Check that this pair meet the T&P selection and is in the correct mass range
+
+ // Et cuts
+ if(lead_et<m_ElectronEtCut || lead_et<0) return StatusCode::SUCCESS;
+ if(subl_et<m_ElectronEtCut || subl_et<0) return StatusCode::SUCCESS;
+
+ // Basic kinematics
+ float lead_eta = lead_el->eta();
+ float lead_phi = lead_el->phi();
+ float subl_eta = subl_el->eta();
+ float subl_phi = subl_el->phi();
+ ATH_MSG_DEBUG("Leading electron (eta,phi,et,q): (" << lead_eta << ", " << lead_phi << ", " << lead_et << ", " << lead_el->charge() << ")");
+ ATH_MSG_DEBUG("Subleading electron (eta,phi,et,q): (" << subl_eta << ", " << subl_phi << ", " << subl_et << ", " << subl_el->charge() << ")");
+
+ // Eta cuts
+ if(fabs(lead_eta)>2.47 || fabs(subl_eta)>2.47) return StatusCode::SUCCESS;
+ // Check charges
+ if (lead_el->charge()*subl_el->charge()>=0) return StatusCode::SUCCESS;
+
+ // Mass window
+ Float_t mass = (lead_el->p4()+subl_el->p4()).M();
+
+ // Monitor the electron pair mass before cutting on the mass range
+
+ auto TnPMass = Monitored::Scalar<Float_t>("MassZ",0.);
+ auto TnPMass_barrel = Monitored::Scalar<Float_t>("MassZ_BARREL",0.);
+ auto TnPMass_endcap = Monitored::Scalar<Float_t>("MassZ_ENDCAP",0.);
+ auto TnPMass_crack = Monitored::Scalar<Float_t>("MassZ_CRACK",0.);
+ TnPMass = mass;
+ fill("MonitorTnP",TnPMass);
+
+ auto region = GetRegion(lead_eta);
+ switch(region){
+ case BARREL :
+ TnPMass_barrel = mass;
+ fill("MonitorTnP", TnPMass_barrel);
+ break;
+ case ENDCAP :
+ TnPMass_endcap = mass;
+ fill("MonitorTnP", TnPMass_endcap);
+ break;
+ case CRACK :
+ TnPMass_crack = mass;
+ fill("MonitorTnP", TnPMass_crack);
+ break;
+ default :
+ //ATH_MSG_WARNING("found an electron outside the |eta| > 2.47 acceptance");
+ break;
+ }
+
+
+ ATH_MSG_DEBUG("Zee mass & cuts: (" << mass << ", " << m_MassLowerCut << ", " << m_MassUpperCut << ")");
+ if(mass<m_MassLowerCut || mass>m_MassUpperCut) return StatusCode::SUCCESS;
+
+ // Register this good Tag & Probe candidate
+ // count the number of good Z candidate per LB
+
+ auto lbNZ = Monitored::Scalar<u_int16_t>("LB",0);
+ lbNZ = GetEventInfo(ctx)->lumiBlock();
+ fill("MonitorTnP",lbNZ);
+
+ bool lead_isLHTight = false;
+ if ( !lead_el->passSelection(lead_isLHTight,"LHTight") ) return StatusCode::FAILURE;
+
+ bool subl_isLHTight = false;
+ if ( !subl_el->passSelection(subl_isLHTight,"LHTight") ) return StatusCode::FAILURE;
+
+ // Use only one electron from a single TnP candidate to avoid introducing correlations in the distributions related to probes
+ // If leading electron is LHTight use subleading as probe
+ bool EventZcandidateUsed = false;
+ if(lead_isLHTight) {
+ ATH_CHECK(fillElectronProbe(subl_el, true, ctx));
+ EventZcandidateUsed = true;
+ }
+ // If subleading electron is LHTight use leading as probe
+ if(subl_isLHTight) {
+ if (!EventZcandidateUsed) ATH_CHECK(fillElectronProbe(lead_el, false, ctx));
+ }
+
+return StatusCode::SUCCESS;
+
+}
+
+StatusCode MonitorTnPAlgorithm::fillElectronProbe(const xAOD::Electron *el, const bool isleading, const EventContext& ctx) const {
+ using namespace Monitored;
+
+ auto lbNProbeCandidates = Monitored::Scalar<u_int16_t>("LBEvoN",0);
+
+ lbNProbeCandidates = GetEventInfo(ctx)->lumiBlock();
+
+ if (isleading) {
+ auto EtaZ = Monitored::Scalar<Float_t>("EtaZ",0.0);
+ auto PhiZ = Monitored::Scalar<Float_t>("PhiZ",0.0);
+ EtaZ = el->eta();
+ PhiZ = el->phi();
+ fill("MonitorTnP",EtaZ,PhiZ);
+ }
+
+ auto is_TightID = Monitored::Scalar<bool>("is_Tight",false);
+
+ bool lead_isLHTight = false;
+ if ( !el->passSelection(lead_isLHTight,"LHTight") ) return StatusCode::FAILURE;
+ is_TightID = lead_isLHTight;
+
+ auto is_Iso = Monitored::Scalar<bool>("is_Iso",false);
+ auto is_IsoandTight = Monitored::Scalar<bool>("is_IsoandTight",false);
+
+ Float_t myet = el->pt(); // in MeV (/Gaudi::Units::GeV; // in GeV)
+ Float_t myptcone20 = -999.;
+ Float_t mytopoetcone40 = -999.;
+
+ bool isIsolated = false;
+ if ( ! el->isolationValue(mytopoetcone40,xAOD::Iso::topoetcone40) ) return StatusCode::FAILURE;
+
+ if (myet>0) {
+ if ( ! el->isolationValue(myptcone20,xAOD::Iso::ptcone20) ) return StatusCode::FAILURE;
+ if ( myptcone20/myet < 0.15 ) isIsolated = true;
+ }
+
+ is_Iso = isIsolated;
+ is_IsoandTight = isIsolated && lead_isLHTight;
+
+ auto et = Monitored::Scalar<Float_t>("Etprobe",0.0);
+ auto eta = Monitored::Scalar<Float_t>("Etaprobe",0.0);
+ auto phi = Monitored::Scalar<Float_t>("Phiprobe",0.0);
+ auto time = Monitored::Scalar<Float_t>("Timeprobe",0.0);
+ auto topoetcone40 = Monitored::Scalar<Float_t>("TopoEtCone40probe",0.0);
+ auto ptcone20 = Monitored::Scalar<Float_t>("PtCone20probe",0.0);
+
+ // Particle variables per Region
+
+ // BARREL
+ auto et_barrel = Monitored::Scalar<Float_t>("EtinBARREL",0.0);
+ auto eta_barrel = Monitored::Scalar<Float_t>("EtainBARREL",0.0);
+ auto phi_barrel = Monitored::Scalar<Float_t>("PhiinBARREL",0.0);
+ auto time_barrel = Monitored::Scalar<Float_t>("TimeinBARREL",0.0);
+ auto ehad1_barrel = Monitored::Scalar<Float_t>("Ehad1inBARREL",0.0);
+ auto eoverp_barrel = Monitored::Scalar<Float_t>("EoverPinBARREL",0.0);
+ auto coreem_barrel = Monitored::Scalar<Float_t>("CoreEMinBARREL",0.0);
+ auto f0_barrel = Monitored::Scalar<Float_t>("F0inBARREL",0.0);
+ auto f1_barrel = Monitored::Scalar<Float_t>("F1inBARREL",0.0);
+ auto f2_barrel = Monitored::Scalar<Float_t>("F2inBARREL",0.0);
+ auto f3_barrel = Monitored::Scalar<Float_t>("F3inBARREL",0.0);
+ auto re233e237_barrel = Monitored::Scalar<Float_t>("Re233e337inBARREL",0.0);
+ auto re237e277_barrel = Monitored::Scalar<Float_t>("Re237e277inBARREL",0.0);
+ auto nofblayerhits_barrel = Monitored::Scalar<u_int8_t>("NOfBLayerHitsinBARREL",0);
+ auto nofpixelhits_barrel = Monitored::Scalar<u_int8_t>("NOfPixelHitsinBARREL",0);
+ auto nofscthits_barrel = Monitored::Scalar<u_int8_t>("NOfSCTHitsinBARREL",0);
+ auto noftrthits_barrel = Monitored::Scalar<u_int8_t>("NOfTRTHitsinBARREL",0);
+ auto noftrthighthresholdhits_barrel = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsinBARREL",0);
+ auto deltaeta1_barrel = Monitored::Scalar<Float_t>("DeltaEta1inBARREL",0.0);
+ auto deltaphi2_barrel = Monitored::Scalar<Float_t>("DeltaPhi2inBARREL",0.0);
+ auto trackd0_barrel = Monitored::Scalar<Float_t>("Trackd0inBARREL",0.0);
+
+ // ENDCAP
+ auto et_endcap = Monitored::Scalar<Float_t>("EtinENDCAP",0.0);
+ auto eta_endcap = Monitored::Scalar<Float_t>("EtainENDCAP",0.0);
+ auto phi_endcap = Monitored::Scalar<Float_t>("PhiinENDCAP",0.0);
+ auto time_endcap = Monitored::Scalar<Float_t>("TimeinENDCAP",0.0);
+ auto ehad1_endcap = Monitored::Scalar<Float_t>("Ehad1inENDCAP",0.0);
+ auto eoverp_endcap = Monitored::Scalar<Float_t>("EoverPinENDCAP",0.0);
+ auto coreem_endcap = Monitored::Scalar<Float_t>("CoreEMinENDCAP",0.0);
+ auto f0_endcap = Monitored::Scalar<Float_t>("F0inENDCAP",0.0);
+ auto f1_endcap = Monitored::Scalar<Float_t>("F1inENDCAP",0.0);
+ auto f2_endcap = Monitored::Scalar<Float_t>("F2inENDCAP",0.0);
+ auto f3_endcap = Monitored::Scalar<Float_t>("F3inENDCAP",0.0);
+ auto re233e237_endcap = Monitored::Scalar<Float_t>("Re233e337inENDCAP",0.0);
+ auto re237e277_endcap = Monitored::Scalar<Float_t>("Re237e277inENDCAP",0.0);
+ auto nofblayerhits_endcap = Monitored::Scalar<u_int8_t>("NOfBLayerHitsinENDCAP",0);
+ auto nofpixelhits_endcap = Monitored::Scalar<u_int8_t>("NOfPixelHitsinENDCAP",0);
+ auto nofscthits_endcap = Monitored::Scalar<u_int8_t>("NOfSCTHitsinENDCAP",0);
+ auto noftrthits_endcap = Monitored::Scalar<u_int8_t>("NOfTRTHitsinENDCAP",0);
+ auto noftrthighthresholdhits_endcap = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsinENDCAP",0);
+ auto deltaeta1_endcap = Monitored::Scalar<Float_t>("DeltaEta1_endcapinENDCAP",0.0);
+ auto deltaphi2_endcap = Monitored::Scalar<Float_t>("DeltaPhi2_endcapinENDCAP",0.0);
+ auto trackd0_endcap = Monitored::Scalar<Float_t>("Trackd0_endcapinENDCAP",0.0);
+
+ // CRACK
+ auto et_crack = Monitored::Scalar<Float_t>("EtinCRACK",0.0);
+ auto eta_crack = Monitored::Scalar<Float_t>("EtainCRACK",0.0);
+ auto phi_crack = Monitored::Scalar<Float_t>("PhiinCRACK",0.0);
+ auto time_crack = Monitored::Scalar<Float_t>("TimeinCRACK",0.0);
+ auto ehad1_crack = Monitored::Scalar<Float_t>("Ehad1inCRACK",0.0);
+ auto eoverp_crack = Monitored::Scalar<Float_t>("EoverPinCRACK",0.0);
+ auto coreem_crack = Monitored::Scalar<Float_t>("CoreEMinCRACK",0.0);
+ auto f0_crack = Monitored::Scalar<Float_t>("F0inCRACK",0.0);
+ auto f1_crack = Monitored::Scalar<Float_t>("F1inCRACK",0.0);
+ auto f2_crack = Monitored::Scalar<Float_t>("F2inCRACK",0.0);
+ auto f3_crack = Monitored::Scalar<Float_t>("F3inCRACK",0.0);
+ auto re233e237_crack = Monitored::Scalar<Float_t>("Re233e337inCRACK",0.0);
+ auto re237e277_crack = Monitored::Scalar<Float_t>("Re237e277inCRACK",0.0);
+ auto nofblayerhits_crack = Monitored::Scalar<u_int8_t>("NOfBLayerHitsinCRACK",0);
+ auto nofpixelhits_crack = Monitored::Scalar<u_int8_t>("NOfPixelHitsinCRACK",0);
+ auto nofscthits_crack = Monitored::Scalar<u_int8_t>("NOfSCTHitsinCRACK",0);
+ auto noftrthits_crack = Monitored::Scalar<u_int8_t>("NOfTRTHitsinCRACK",0);
+ auto noftrthighthresholdhits_crack = Monitored::Scalar<u_int8_t>("NOfTRTHighThresholdHitsinCRACK",0);
+ auto deltaeta1_crack = Monitored::Scalar<Float_t>("DeltaEta1inCRACK",0.0);
+ auto deltaphi2_crack = Monitored::Scalar<Float_t>("DeltaPhi2inCRACK",0.0);
+ auto trackd0_crack = Monitored::Scalar<Float_t>("Trackd0inCRACK",0.0);
+
+ Float_t myeta = el->eta();
+ Float_t myphi = el->phi();
+
+ auto is_pt_gt_4gev = Monitored::Scalar<bool>("is_pt_gt_4gev",false);
+ is_pt_gt_4gev = myet > 4000. ;
+
+ // Isolation Energy
+
+ el->isolationValue(myptcone20,xAOD::Iso::ptcone20);
+ ptcone20 = myptcone20;
+
+ // Shower shape variable details
+ Float_t myehad1 = 0.0;
+ Float_t myecore = 0.0;
+ Float_t myf0 = 0.0;
+ Float_t myf1 = 0.0;
+ Float_t myf2 = 0.0;
+ Float_t myf3 = 0.0;
+ Float_t e233 = 0.0;
+ Float_t e237 = 0.0;
+ Float_t e277 = 0.0;
+ Float_t myre233e237 = 0.0;
+ Float_t myre237e277 = 0.0;
+
+ el->showerShapeValue(myehad1, xAOD::EgammaParameters::ehad1);
+ el->showerShapeValue(myecore, xAOD::EgammaParameters::ecore);
+
+ el->showerShapeValue(e237, xAOD::EgammaParameters::e237);
+ el->showerShapeValue(e233, xAOD::EgammaParameters::e233);
+ el->showerShapeValue(e277, xAOD::EgammaParameters::e277);
+
+ if (e237!=0) myre233e237 = e233 / e237;
+ if (e277!=0) myre237e277 = e237 / e277;
+
+ // Cluster track match details
+ Float_t mydeltaeta1 = -999.0;
+ el->trackCaloMatchValue(mydeltaeta1, xAOD::EgammaParameters::deltaEta1);
+ Float_t mydeltaphi2 = -999.0;
+ el->trackCaloMatchValue(mydeltaphi2, xAOD::EgammaParameters::deltaPhi2);
+
+ Float_t myeoverp = -999.0;
+ Float_t mytrackd0 = -999.0;
+
+ // associated track details
+ const xAOD::TrackParticle *t = el->trackParticle();
+ double trackp = 0;
+ u_int8_t mynofblayerhits=-1;
+ u_int8_t mynofpixelhits=-1;
+ u_int8_t mynofscthits=-1;
+ u_int8_t mynoftrthits=-1;
+ u_int8_t mynoftrthighthresholdhits=-1;
+
+ if(t) {
+ trackp = t->pt()*cosh(t->eta());
+ // retrieve track summary information
+ t->summaryValue(mynofblayerhits,xAOD::numberOfInnermostPixelLayerHits);
+ t->summaryValue(mynofpixelhits,xAOD::numberOfPixelHits);
+ t->summaryValue(mynofscthits,xAOD::numberOfSCTHits);
+ t->summaryValue(mynoftrthits,xAOD::numberOfTRTHits);
+ t->summaryValue(mynoftrthighthresholdhits,xAOD::numberOfTRTHighThresholdHits);
+ mytrackd0 = t->d0();
+ }
+ else
+ ATH_MSG_DEBUG("Error attempting to retrieve associated track");
+
+ // Associated cluster details
+
+ Float_t mytime=0.;
+ const xAOD::CaloCluster *aCluster = el->caloCluster();
+ if (aCluster) {
+ mytime = aCluster->time();
+ time = mytime ;
+ // Shower shape variable details
+ double ec = aCluster->et()*cosh(aCluster->eta());
+ if (ec!=0) myf0 = aCluster->energyBE(0)/ec;
+ if (ec!=0) myf1 = aCluster->energyBE(1)/ec;
+ if (ec!=0) myf2 = aCluster->energyBE(2)/ec;
+ if (ec!=0) myf3 = aCluster->energyBE(3)/ec;
+
+ if(trackp !=0) myeoverp = aCluster->e()/trackp;
+
+ //ATH_MSG_WARNING("Test eoverp : " << myeoverp);
+ }
+
+ // Fill per region histograms
+ auto region = GetRegion(myeta);
+ switch(region){
+ case BARREL :
+ nofblayerhits_barrel = mynofblayerhits ; nofpixelhits_barrel = mynofpixelhits ; nofscthits_barrel = mynofscthits ;
+ noftrthits_barrel = mynoftrthits ; noftrthighthresholdhits_barrel = mynoftrthighthresholdhits;
+ fill("MonitorTnP",nofblayerhits_barrel, nofpixelhits_barrel,noftrthits_barrel,noftrthighthresholdhits_barrel,is_pt_gt_4gev);
+ deltaeta1_barrel = mydeltaeta1; deltaphi2_barrel = mydeltaphi2; trackd0_barrel = mytrackd0;
+ eoverp_barrel = myeoverp;
+ fill("MonitorTnP",deltaeta1_barrel, deltaphi2_barrel,trackd0_barrel,eoverp_barrel,is_pt_gt_4gev);
+ et_barrel = myet ; eta_barrel = myeta ; phi_barrel = myphi ;
+ fill("MonitorTnP",et_barrel,eta_barrel,phi_barrel,is_pt_gt_4gev);
+ time_barrel = mytime; ehad1_barrel = myehad1; coreem_barrel = myecore;
+ fill("MonitorTnP",time_barrel, ehad1_barrel,coreem_barrel,is_pt_gt_4gev);
+ f0_barrel = myf0; f1_barrel = myf1; f2_barrel = myf2; f3_barrel = myf3; re233e237_barrel = myre233e237; re237e277_barrel = myre237e277;
+ fill("MonitorTnP",f0_barrel,f1_barrel,f2_barrel, f3_barrel,re233e237_barrel,re237e277_barrel,is_pt_gt_4gev);
+ break;
+ case ENDCAP :
+ nofblayerhits_endcap = mynofblayerhits; nofpixelhits_endcap = mynofpixelhits ; nofscthits_endcap = mynofscthits ;
+ noftrthits_endcap = mynoftrthits ; noftrthighthresholdhits_endcap = mynoftrthighthresholdhits;
+ fill("MonitorTnP",nofblayerhits_endcap, nofpixelhits_endcap,noftrthits_endcap,noftrthighthresholdhits_endcap,is_pt_gt_4gev);
+ deltaeta1_endcap = mydeltaeta1; deltaphi2_endcap = mydeltaphi2; trackd0_endcap = mytrackd0;
+ eoverp_endcap = myeoverp;
+ fill("MonitorTnP",deltaeta1_endcap, deltaphi2_endcap,trackd0_endcap,eoverp_endcap,is_pt_gt_4gev);
+ et_endcap = myet ; eta_endcap = myeta ; phi_endcap = myphi ;
+ fill("MonitorTnP",et_endcap,eta_endcap,phi_endcap,is_pt_gt_4gev);
+ time_endcap = mytime; ehad1_endcap = myehad1; coreem_endcap = myecore;
+ fill("MonitorTnP",time_endcap, ehad1_endcap,coreem_endcap,is_pt_gt_4gev);
+ f0_endcap = myf0; f1_endcap = myf1; f2_endcap = myf2; f3_endcap = myf3; re233e237_endcap = myre233e237; re237e277_endcap = myre237e277;
+ fill("MonitorTnP",f0_endcap,f1_endcap,f2_endcap,f3_endcap,re233e237_endcap,re237e277_endcap,is_pt_gt_4gev);
+ break;
+ case CRACK :
+ nofblayerhits_crack = mynofblayerhits; nofpixelhits_crack = mynofpixelhits ; nofscthits_crack = mynofscthits ;
+ noftrthits_crack = mynoftrthits ; noftrthighthresholdhits_crack = mynoftrthighthresholdhits;
+ fill("MonitorTnP",nofblayerhits_crack, nofpixelhits_crack,noftrthits_crack,noftrthighthresholdhits_crack,is_pt_gt_4gev);
+ deltaeta1_crack = mydeltaeta1; deltaphi2_crack = mydeltaphi2; trackd0_crack = mytrackd0;
+ eoverp_barrel = myeoverp;
+ fill("MonitorTnP",deltaeta1_crack, deltaphi2_crack,trackd0_crack,eoverp_crack,is_pt_gt_4gev);
+ et_crack = myet ; eta_crack = myeta ; phi_crack = myphi ;
+ fill("MonitorTnP",et_crack,eta_crack,phi_crack,is_pt_gt_4gev);
+ time_crack = mytime; ehad1_crack = myehad1; coreem_crack = myecore;
+ fill("MonitorTnP",time_crack, ehad1_crack,coreem_crack,is_pt_gt_4gev);
+ f0_crack = myf0; f1_crack = myf1; f2_crack = myf2; f3_crack = myf3; re233e237_crack = myre233e237; re237e277_crack = myre237e277;
+ fill("MonitorTnP",f0_crack,f1_crack,f2_crack,f3_crack,re233e237_crack,re237e277_crack,is_pt_gt_4gev);
+ break;
+ default :
+ //ATH_MSG_WARNING("found an electron outside the |eta| > 2.47 acceptance");
+ break;
+ }
+
+ et = myet ; eta = myeta ; phi = myphi ; time = mytime ;
+ ptcone20 = myptcone20; topoetcone40 = mytopoetcone40 ;
+ fill("MonitorTnP",et,eta,phi,time,is_pt_gt_4gev,
+ ptcone20,topoetcone40,lbNProbeCandidates,is_TightID,is_Iso,is_IsoandTight);
+
+ return StatusCode::SUCCESS;
+}
diff --git a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
index 2f2d147e146272c5d5d3e4fa4f5ae7f5b4542ee8..af0888d573667cd9cb225721b9b66865fb0c3354 100644
--- a/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/components/egammaPerformance_entries.cxx
@@ -6,6 +6,8 @@
// New Run 3 algorithms
#include "egammaPerformance/MonitorElectronAlgorithm.h"
#include "egammaPerformance/MonitorPhotonAlgorithm.h"
+#include "egammaPerformance/MonitorFwdElectronAlgorithm.h"
+#include "egammaPerformance/MonitorTnPAlgorithm.h"
// Run 2 algorithms
#include "egammaPerformance/photonMonTool.h"
#include "egammaPerformance/electronMonTool.h"
@@ -14,13 +16,14 @@
// Run 2 Algorithms
-DECLARE_COMPONENT( photonMonTool )
+DECLARE_COMPONENT( photonMonTool )
DECLARE_COMPONENT( electronMonTool )
-DECLARE_COMPONENT( forwardElectronMonTool )
-DECLARE_COMPONENT( ZeeTaPMonTool )
+DECLARE_COMPONENT( forwardElectronMonTool )
+DECLARE_COMPONENT( ZeeTaPMonTool )
// RUN 3 algorithms
-DECLARE_COMPONENT( MonitorElectronAlgorithm )
-DECLARE_COMPONENT( MonitorPhotonAlgorithm )
-
+DECLARE_COMPONENT( MonitorElectronAlgorithm )
+DECLARE_COMPONENT( MonitorPhotonAlgorithm )
+DECLARE_COMPONENT( MonitorFwdElectronAlgorithm )
+DECLARE_COMPONENT( MonitorTnPAlgorithm )
diff --git a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
index ba05b64050e39b68d8a21134b57a535758ee03f2..b9f731698046c08f224997084d304f7220cb0b60 100644
--- a/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
+++ b/Reconstruction/tauRec/python/TauAlgorithmsHolder.py
@@ -329,7 +329,8 @@ def getElectronVetoVars():
TauElectronVetoVariables = TauElectronVetoVariables(name = _name,
VertexCorrection = True,
ParticleCaloExtensionTool = getParticleCaloExtensionTool(),
- tauEVParticleCache = getParticleCache() )
+ tauEVParticleCache = getParticleCache(),
+ IncShowerSubtr = tauFlags.useShowerSubClusters() )
cached_instances[_name] = TauElectronVetoVariables
return TauElectronVetoVariables
diff --git a/Reconstruction/tauRecTools/CMakeLists.txt b/Reconstruction/tauRecTools/CMakeLists.txt
index 353f409d3696aae63ae51200459ebe38eb251949..0b6620ae5c293eaa1a59ade536ee2da1d2a7ea70 100644
--- a/Reconstruction/tauRecTools/CMakeLists.txt
+++ b/Reconstruction/tauRecTools/CMakeLists.txt
@@ -15,6 +15,7 @@ if( XAOD_STANDALONE OR XAOD_ANALYSIS )
atlas_depends_on_subdirs(
PUBLIC
Control/AthLinks
+ Control/AthToolSupport/AsgDataHandles
Control/AthToolSupport/AsgTools
Control/CxxUtils
Event/xAOD/xAODCaloEvent
@@ -36,6 +37,7 @@ else()
PUBLIC
Calorimeter/CaloUtils
Control/AthLinks
+ Control/AthToolSupport/AsgDataHandles
Control/AthToolSupport/AsgTools
Control/CxxUtils
Event/xAOD/xAODCaloEvent
@@ -108,7 +110,7 @@ if( XAOD_STANDALONE OR XAOD_ANALYSIS )
PRIVATE_INCLUDE_DIRS ${FASTJETCONTRIB_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJET_LIBRARIES} ${Boost_LIBRARIES}
AthLinks AsgTools CxxUtils xAODCaloEvent xAODEventInfo xAODPFlow xAODEgamma xAODTau
- xAODTracking xAODParticleEvent
+ xAODTracking xAODParticleEvent AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES ${FASTJETCONTRIB_LIBRARIES} ${LWTNN_LIBRARIES} FourMomUtils xAODJet
PathResolver MVAUtils ElectronPhotonSelectorToolsLib )
else()
@@ -120,7 +122,7 @@ else()
PRIVATE_INCLUDE_DIRS ${FASTJETCONTRIB_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FASTJET_LIBRARIES} ${Boost_LIBRARIES}
AthLinks AsgTools CxxUtils xAODCaloEvent xAODEventInfo xAODPFlow xAODEgamma xAODTau
- xAODTracking xAODParticleEvent CaloUtilsLib Particle
+ xAODTracking xAODParticleEvent CaloUtilsLib Particle AsgDataHandlesLib
PRIVATE_LINK_LIBRARIES ${FASTJETCONTRIB_LIBRARIES} ${LWTNN_LIBRARIES} FourMomUtils xAODJet
PathResolver MVAUtils ElectronPhotonSelectorToolsLib )
endif()
diff --git a/Reconstruction/tauRecTools/src/TauCellVariables.cxx b/Reconstruction/tauRecTools/src/TauCellVariables.cxx
index 339d209b5c710346b55bb4cec874c090b6633da0..c9419af81a0ab7f479bd9f8581092a0713af1ddf 100644
--- a/Reconstruction/tauRecTools/src/TauCellVariables.cxx
+++ b/Reconstruction/tauRecTools/src/TauCellVariables.cxx
@@ -1,247 +1,205 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef XAOD_ANALYSIS
-/********************************************************************
-NAME: TauCellVariables.cxx
-PACKAGE: offline/Reconstruction/tauRec
-AUTHORS: S. Rajagopalan
-CREATED: March 15, 2001
-
-Aug 2001: Add (e,px,py,pz) for sum of EM cells (FEP)
-Veto cell if track is within 0.8*size. Hence 1 cell if track
-is in center, more otherwise.
-
-Sep 2001: Take account of larger cells in third layer
-
-Nov 2001: Omit third layer of EM calorimeter from EM sums. This layer
-can become quite thick in the barrel, so it is more likely to
-be hadronic, while photons are mainly contained in the first
-two layers. (D. Lissauer suggested this.)
-
-Dec 2002: Add tau likelihood calculation.
-Feb 2003: Fix phi wrapping for et-weighted phi calculation.
-Jan 2004: Use CLHEP units. Use phi = (-pi,pi].
-Feb 2004: Fix identifiers, add taucmsdrdR
-March 2004: Fix CaloCluster -> CaloEnergyCluster
-Jul 2004: force -PI < phi < PI
-Jul 2004: move to I4Momentum
-Aug 2004: admit arbitrary seeds
-23/10/2006 - (AK) fixing some compilation warnings (unused parameter)
-18/04/2007 - (AK) fixing some compilation warnings (unused parameter)
-18/01/2008 - (NM) use etaCalo/phiCalo for merged algo, set tauJet eta/phi if not set by tau1p3p
-16/03/2010 - (AK) use the cell id instead of the pointer
-17/03/2010 - (AK) change to P4Helpers
-16/05/2011 - (FF) introduce possibility to correct cell origin wrt to primary vertex and beamspot
-Jan 2012 - (FF) add cellEnergyRing variables
- ********************************************************************/
-
-#include <algorithm>
-#include <cmath>
-#include <vector>
-#include <sstream>
-#include "CaloUtils/CaloVertexedCell.h"
+#include "TauCellVariables.h"
+#include "tauRecTools/KineUtils.h"
+#include "tauRecTools/HelperFunctions.h"
#include "xAODTau/TauJet.h"
#include "xAODJet/Jet.h"
-#include "tauRecTools/KineUtils.h"
-#include "TauCellVariables.h"
-#include "tauRecTools/HelperFunctions.h"
+#include "CaloUtils/CaloVertexedCell.h"
+
+#include <cmath>
+#include <vector>
+
TauCellVariables::TauCellVariables(const std::string& name) :
TauRecToolBase(name) {
}
+
+
TauCellVariables::~TauCellVariables() {
}
+
+
StatusCode TauCellVariables::finalize() {
return StatusCode::SUCCESS;
}
-StatusCode TauCellVariables::initialize() {
- return StatusCode::SUCCESS;
-}
-
-StatusCode TauCellVariables::execute(xAOD::TauJet& pTau) {
- ATH_MSG_DEBUG("execute");
- int numStripCell = 0;
- int numEMCell = 0;
+StatusCode TauCellVariables::initialize() {
+ return StatusCode::SUCCESS;
+}
- double sumCellET = 0.;
- double sumCellET01 = 0;
- double sumCellET12 = 0.;
- double sumStripET = 0.;
- double sumEMCellET = 0.;
- double sumHadCellET = 0.;
- double stripEta = 0.;
- double stripEta2 = 0.;
- double EMRadius = 0.;
- double HadRadius = 0.;
+StatusCode TauCellVariables::execute(xAOD::TauJet& pTau) {
- std::vector<double> vCellRingEnergy(8,0.); //size=8, init with 0.
+ const xAOD::Jet* pJetSeed = (*pTau.jetLink());
+ if (!pJetSeed) {
+ ATH_MSG_ERROR("tau does not have jet seed for cell variable calculation");
+ return StatusCode::FAILURE;
+ }
+
+ ATH_MSG_VERBOSE("cluster position is eta=" << pTau.eta() << " phi=" << pTau.phi() );
+
+ int numStripCell = 0;
+ int numEMCell = 0;
+
+ double sumCellET = 0.;
+ double sumCellET01 = 0;
+ double sumCellET12 = 0.;
+ double sumStripET = 0.;
+ double sumEMCellET = 0.;
+ double sumHadCellET = 0.;
+ double stripEta = 0.;
+ double stripEta2 = 0.;
+ double EMRadius = 0.;
+ double HadRadius = 0.;
+
+ std::vector<double> cellRingEnergys(7,0.);
+
+ std::vector<const xAOD::CaloCluster*> clusterList;
+ ATH_CHECK(tauRecTools::GetJetClusterList(pJetSeed, clusterList, m_incShowerSubtr));
+
+ int numCells = 0;
+ std::bitset<200000> cellSeen;
+
+ // loop over cells in all the clusters and calculate the variables
+ for (auto cluster : clusterList){
+ const CaloClusterCellLink* cellLinks = cluster->getCellLinks();
- ATH_MSG_VERBOSE("cluster position is eta=" << pTau.eta() << " phi=" << pTau.phi() );
-
- const xAOD::Jet* pJetSeed = (*pTau.jetLink());
- if (!pJetSeed) {
- ATH_MSG_ERROR("tau does not have jet seed for cell variable calculation");
- return StatusCode::FAILURE;
- }
-
- // Loop through jets, get links to clusters
- std::vector<const xAOD::CaloCluster*> clusterList;
- ATH_CHECK(tauRecTools::GetJetClusterList(pJetSeed, clusterList, m_incShowerSubtr));
-
- int numCells = 0;
- std::bitset<200000> cellSeen;
-
- // loop through all clusters
- for (auto cluster : clusterList){
- CaloClusterCellLink::const_iterator firstcell = cluster->getCellLinks()->begin();
- CaloClusterCellLink::const_iterator lastcell = cluster->getCellLinks()->end();
+ for (const CaloCell* cell : *cellLinks) {
+ ++numCells;
+
+ // cells could be used by more than one cluster, only count the cell one time
+ if (cellSeen.test(cell->caloDDE()->calo_hash())) {
+ continue;
+ }
+ else {
+ cellSeen.set(cell->caloDDE()->calo_hash());
+ }
- const CaloCell *cell;
- double dR;
-
- //loop over cells and calculate the variables
- for (; firstcell != lastcell; ++firstcell) {
- double cellEta, cellPhi, cellET, cellEnergy;
- ++numCells;
-
- cell = *firstcell;
- if (cellSeen.test(cell->caloDDE()->calo_hash())) continue;
- else cellSeen.set(cell->caloDDE()->calo_hash());
-
- //use tau vertex to correct cell position
- if (m_doVertexCorrection && pTau.vertexLink()) {
- CaloVertexedCell vxCell (*cell, (*pTau.vertexLink())->position());
- cellPhi = vxCell.phi();
- cellEta = vxCell.eta();
- cellET = vxCell.et();
- cellEnergy = vxCell.energy();
- }
- else {
- cellPhi = cell->phi();
- cellEta = cell->eta();
- cellET = cell->et();
- cellEnergy = cell->energy();
- }
-
- CaloSampling::CaloSample calo = cell->caloDDE()->getSampling();
-
- // Use cells those are in DR < m_cellCone of eta,phi of tau intermediate axis:
- dR = Tau1P3PKineUtils::deltaR(pTau.eta(),pTau.phi(),cellEta,cellPhi);
-
- if (dR < m_cellCone) {
- // If cell is an EM cell, include in sum for EM radius and for
- // total EM (e,px,py,pz)
- // Nov 2000: Only include first 2 layers in EM
-
- sumCellET += cellET;
-
- if (dR < 0.1) sumCellET01 += cellET;
- if (dR > 0.1 && dR < 0.2) sumCellET12 += cellET;
-
- if ((calo == CaloSampling::PreSamplerB) ||
- (calo == CaloSampling::PreSamplerE) ||
-
- (calo == CaloSampling::EMB1) ||
- (calo == CaloSampling::EME1) ||
-
- (calo == CaloSampling::EMB2) ||
- (calo == CaloSampling::EME2)) {
-
- // If cell is a strip cell, sum for stripET calculation:
- if (((calo == CaloSampling::EMB1) ||
- (calo == CaloSampling::EME1)) // to be investigated
- && (std::abs(cellEta) < 2.5)) {
- sumStripET += cellET;
- stripEta += cellEta * cellET;
- stripEta2 += pow(cellEta, 2) * cellET;
- if (cellEnergy > m_stripEthr) numStripCell += 1;
- } // end of strip cells
-
- EMRadius += dR*cellET;
- sumEMCellET += cellET;
- if (cellEnergy > m_cellEthr) numEMCell += 1;
-
- }// end of EM cells
- else { // HAD cells
- HadRadius += dR*cellET;
- sumHadCellET += cellET;
- }
- }// end of dR < m_cellCone
-
- // vCellRingEnergy[0] is a dummy value
- if (dR < 0.05) vCellRingEnergy[1] += cellET;
- if (dR >= 0.05 && dR < 0.075) vCellRingEnergy[2] += cellET;
- if (dR >= 0.075 && dR < 0.1) vCellRingEnergy[3] += cellET;
- if (dR >= 0.1 && dR < 0.125) vCellRingEnergy[4] += cellET;
- if (dR >= 0.125 && dR < 0.15) vCellRingEnergy[5] += cellET;
- if (dR >= 0.15 && dR < 0.2) vCellRingEnergy[6] += cellET;
- if (dR >= 0.2 && dR < 0.4) vCellRingEnergy[7] += cellET;
+ double cellPhi = cell->phi();
+ double cellEta = cell->eta();
+ double cellET = cell->et();
+ double cellEnergy = cell->energy();
+
+ // correct cell four momentum based on tau vertex
+ if (m_doVertexCorrection && pTau.vertexLink()) {
+ CaloVertexedCell vxCell (*cell, (*pTau.vertexLink())->position());
+ cellPhi = vxCell.phi();
+ cellEta = vxCell.eta();
+ cellET = vxCell.et();
+ cellEnergy = vxCell.energy();
+ }
- } // end of loop over CaloCells
-
- }// end of loop over seed jet constituents
-
- ATH_MSG_DEBUG(numCells << " cells in seed");
- pTau.setDetail(xAOD::TauJetParameters::numCells , static_cast<int> (numCells));
-
- pTau.setDetail(xAOD::TauJetParameters::nStrip , numStripCell );
-
- if (std::abs(sumStripET) > 0.000001) {
- stripEta = stripEta / sumStripET;
- stripEta2 = stripEta2 / sumStripET;
- } else {
- stripEta = 0;
- stripEta2 = -1.0;
- }
-
- pTau.setDetail(xAOD::TauJetParameters::stripWidth2 , static_cast<float>(stripEta2 - stripEta * stripEta) );
-
- if (std::abs(sumEMCellET) > 0.000001) {
- EMRadius = EMRadius / sumEMCellET;
- } else {
- EMRadius = -1.0;
- }
- if (std::abs(sumHadCellET) > 0.000001) {
- HadRadius = HadRadius / sumHadCellET;
- } else {
- HadRadius = -1.0;
- }
-
- pTau.setDetail(xAOD::TauJetParameters::EMRadius , static_cast<float>( EMRadius ) );
- pTau.setDetail(xAOD::TauJetParameters::etEMAtEMScale , static_cast<float>( sumEMCellET ) );
- pTau.setDetail(xAOD::TauJetParameters::hadRadius , static_cast<float>( HadRadius ) );
- pTau.setDetail(xAOD::TauJetParameters::etHadAtEMScale , static_cast<float>( sumHadCellET ) );
-
- if (std::abs(sumCellET) > 0.000001) {
- pTau.setDetail(xAOD::TauJetParameters::centFrac , static_cast<float>( sumCellET01 / sumCellET ) );
- pTau.setDetail(xAOD::TauJetParameters::isolFrac , static_cast<float>( sumCellET12 / sumCellET ) );
- } else {
- pTau.setDetail(xAOD::TauJetParameters::centFrac , static_cast<float>( 0.0 ) );
- pTau.setDetail(xAOD::TauJetParameters::isolFrac , static_cast<float>( -1.0 ) );
- }
-
- //save cell ring energies
- pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing1 , static_cast<float>( vCellRingEnergy[1] ) );
- pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing2 , static_cast<float>( vCellRingEnergy[2] ) );
- pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing3 , static_cast<float>( vCellRingEnergy[3] ) );
- pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing4 , static_cast<float>( vCellRingEnergy[4] ) );
- pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing5 , static_cast<float>( vCellRingEnergy[5] ) );
- pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing6 , static_cast<float>( vCellRingEnergy[6] ) );
- pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing7 , static_cast<float>( vCellRingEnergy[7] ) );
-
- return StatusCode::SUCCESS;
+ double dR = Tau1P3PKineUtils::deltaR(pTau.eta(),pTau.phi(),cellEta,cellPhi);
+ CaloSampling::CaloSample calo = cell->caloDDE()->getSampling();
+
+ // use cells with dR < m_cellCone relative to tau intermediate axis:
+ if (dR < m_cellCone) {
+ sumCellET += cellET;
+
+ if (dR < 0.1) sumCellET01 += cellET;
+ if (dR > 0.1 && dR < 0.2) sumCellET12 += cellET;
+
+ // EM layer: PreSamplerB, PreSamplerE, EMB1, EME1, EMB2, EME2
+ // Most energy of neutral particles are deposited in the first two EM laywers
+ // The third layer is regarded as HAD layber
+ if (isEMLayer(calo)) {
+ EMRadius += dR*cellET;
+ sumEMCellET += cellET;
+ if (cellEnergy > m_cellEthr) numEMCell += 1;
+
+ // Strip layer: EMB1 and EME1
+ if (isStripLayer(calo) && (std::abs(cellEta) < 2.5)) {
+ sumStripET += cellET;
+ stripEta += cellEta * cellET;
+ stripEta2 += pow(cellEta, 2) * cellET;
+ if (cellEnergy > m_stripEthr) numStripCell += 1;
+ }
+ } // end of EM cells
+ else {
+ HadRadius += dR*cellET;
+ sumHadCellET += cellET;
+ } // end of HAD cells
+ } // end of dR < m_cellCone
+
+ if (dR < 0.05) cellRingEnergys[0] += cellET;
+ if (dR >= 0.05 && dR < 0.075) cellRingEnergys[1] += cellET;
+ if (dR >= 0.075 && dR < 0.1) cellRingEnergys[2] += cellET;
+ if (dR >= 0.1 && dR < 0.125) cellRingEnergys[3] += cellET;
+ if (dR >= 0.125 && dR < 0.15) cellRingEnergys[4] += cellET;
+ if (dR >= 0.15 && dR < 0.2) cellRingEnergys[5] += cellET;
+ if (dR >= 0.2 && dR < 0.4) cellRingEnergys[6] += cellET;
+ } // end of loop over cells
+ } // end of loop over clusters
+
+ ATH_MSG_DEBUG(numCells << " cells in seed");
+
+ pTau.setDetail(xAOD::TauJetParameters::numCells , static_cast<int> (numCells));
+ pTau.setDetail(xAOD::TauJetParameters::nStrip , numStripCell );
+ pTau.setDetail(xAOD::TauJetParameters::etEMAtEMScale , static_cast<float>( sumEMCellET ));
+ pTau.setDetail(xAOD::TauJetParameters::etHadAtEMScale , static_cast<float>( sumHadCellET ));
+ pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing1 , static_cast<float>( cellRingEnergys[0] ));
+ pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing2 , static_cast<float>( cellRingEnergys[1] ));
+ pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing3 , static_cast<float>( cellRingEnergys[2] ));
+ pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing4 , static_cast<float>( cellRingEnergys[3] ));
+ pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing5 , static_cast<float>( cellRingEnergys[4] ));
+ pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing6 , static_cast<float>( cellRingEnergys[5] ));
+ pTau.setDetail(xAOD::TauJetParameters::cellBasedEnergyRing7 , static_cast<float>( cellRingEnergys[6] ));
+
+ // take care of the variables with division
+ // -- fraction of cell energy within [0,0.1] and [0.1,0.2]
+ if (std::abs(sumCellET) > 1e-6) {
+ pTau.setDetail(xAOD::TauJetParameters::centFrac , static_cast<float>( sumCellET01 / sumCellET ));
+ pTau.setDetail(xAOD::TauJetParameters::isolFrac , static_cast<float>( sumCellET12 / sumCellET ));
+ }
+ else {
+ pTau.setDetail(xAOD::TauJetParameters::centFrac , static_cast<float>( 0.0 ));
+ pTau.setDetail(xAOD::TauJetParameters::isolFrac , static_cast<float>( -1.0 ));
+ }
+
+ // -- width of strip cells
+ double stripWidth2 = 0.0;
+ if (std::abs(sumStripET) > 1e-6) {
+ stripEta = stripEta / sumStripET;
+ stripEta2 = stripEta2 / sumStripET;
+ stripWidth2 = stripEta2 - stripEta * stripEta;
+ }
+ else {
+ stripWidth2 = -1.0;
+ }
+ pTau.setDetail(xAOD::TauJetParameters::stripWidth2 , static_cast<float>( stripWidth2));
+
+ // -- cell weighted radius of EM cells
+ if (std::abs(sumEMCellET) > 1e-6) {
+ EMRadius = EMRadius / sumEMCellET;
+ }
+ else {
+ EMRadius = -1.0;
+ }
+ pTau.setDetail(xAOD::TauJetParameters::EMRadius , static_cast<float>( EMRadius ));
+
+ // -- cell weighted radius of HAD cells
+ if (std::abs(sumHadCellET) > 1e-6) {
+ HadRadius = HadRadius / sumHadCellET;
+ }
+ else {
+ HadRadius = -1.0;
+ }
+ pTau.setDetail(xAOD::TauJetParameters::hadRadius , static_cast<float>( HadRadius ));
+
+ return StatusCode::SUCCESS;
}
#endif
+
diff --git a/Reconstruction/tauRecTools/src/TauCellVariables.h b/Reconstruction/tauRecTools/src/TauCellVariables.h
index f47c6169f7c86f88cacbf6c477982a62b7653923..fe87194280e39f6e54cfe5a86bbfb3cf3158a7a7 100644
--- a/Reconstruction/tauRecTools/src/TauCellVariables.h
+++ b/Reconstruction/tauRecTools/src/TauCellVariables.h
@@ -7,30 +7,41 @@
#include "tauRecTools/TauRecToolBase.h"
-class LArEM_ID;
-class TileID;
-
/**
- * @brief Calculate tau calorimeter variables from cell information.
- *
- * @authors Srini Rajagopalan, Anna Kaczmarska, Felix Friedrich
+ @brief Calculate tau calorimeter variables from cell information.
+ @warning Cells are selected relative to the tau intermediate axis. There are no checks.
+ @authors Srini Rajagopalan, Anna Kaczmarska, Felix Friedrich
*/
class TauCellVariables : public TauRecToolBase {
-public:
+ public:
ASG_TOOL_CLASS2(TauCellVariables, TauRecToolBase, ITauToolBase);
-
+
+ /** @brief Constructor */
TauCellVariables(const std::string& name);
+
+ /** @brief Destructor */
~TauCellVariables();
-
+
+ /** @brief Initialization of this tool */
virtual StatusCode initialize() override;
+
+ /** @brief Finalization of this tool */
virtual StatusCode finalize() override;
+
+ /** @brief Perform the calculation of cell variables for each tau candidate */
virtual StatusCode execute(xAOD::TauJet& pTau) override;
-private:
+ private:
+ /** @brief Check whether the CaloSample is a EM layer */
+ bool isEMLayer(const CaloSampling::CaloSample& calo) const;
+
+ /** @brief Check whether the CaloSample is a Strip layer */
+ bool isStripLayer(const CaloSampling::CaloSample& calo) const;
+
Gaudi::Property<double> m_cellEthr {this, "CellEthreshold", 0.2 * Gaudi::Units::GeV, "energy threshould of EM cell"};
Gaudi::Property<double> m_stripEthr {this, "StripEthreshold", 0.2 * Gaudi::Units::GeV, "energy threshould for strip cell"};
Gaudi::Property<double> m_cellCone {this, "CellCone", 0.2, "outer cone for cells used in calculation"};
@@ -39,5 +50,32 @@ private:
};
+
+inline bool TauCellVariables::isEMLayer(const CaloSampling::CaloSample& calo) const {
+ if ((calo == CaloSampling::PreSamplerB) ||
+ (calo == CaloSampling::PreSamplerE) ||
+ (calo == CaloSampling::EMB1) ||
+ (calo == CaloSampling::EME1) ||
+ (calo == CaloSampling::EMB2) ||
+ (calo == CaloSampling::EME2)) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
+
+
+inline bool TauCellVariables::isStripLayer(const CaloSampling::CaloSample& calo) const {
+ if ((calo == CaloSampling::EMB1) ||
+ (calo == CaloSampling::EME1)) {
+ return true;
+ }
+ else {
+ return false;
+ }
+}
+
#endif /* TAUREC_TAUCELLVARIABLES_H */
diff --git a/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h b/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
index ca098a1ff7f4092d55fb8c3e053a1192bc19d3f2..dbc8ac68a3148961ceb84f0b562091722b67c1bc 100644
--- a/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
+++ b/Reconstruction/tauRecTools/tauRecTools/MvaTESVariableDecorator.h
@@ -9,6 +9,7 @@
#include "tauRecTools/TauRecToolBase.h"
// xAOD include(s)
+#include "AsgDataHandles/ReadHandleKey.h"
#include "xAODEventInfo/EventInfo.h"
class MvaTESVariableDecorator
diff --git a/Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h b/Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h
index a83f74e81f68bf68eab904e2d38f9c934632400a..27f761daed835ed60264521c35d7cfec05df94ef 100644
--- a/Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h
+++ b/Reconstruction/tauRecTools/tauRecTools/TauCalibrateLC.h
@@ -5,6 +5,7 @@
#ifndef TAUREC_TAUCALIBRATELC_H
#define TAUREC_TAUCALIBRATELC_H
+#include "AsgDataHandles/ReadHandleKey.h"
#include "tauRecTools/TauRecToolBase.h"
#include "xAODEventInfo/EventInfo.h"
diff --git a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
index 739c10bb3360340dfc659a22044b60c4fee76042..6e75f5845f8299d03a4cbd547fa215a799d85b38 100755
--- a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
+++ b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""Define methods to configure beam effects with the ComponentAccumulator"""
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -14,6 +14,7 @@ Simulation__VertexBeamCondPositioner=CompFactory.Simulation.VertexBeamCondPositi
Simulation__VertexPositionFromFile=CompFactory.Simulation.VertexPositionFromFile
Simulation__CrabKissingVertexPositioner=CompFactory.Simulation.CrabKissingVertexPositioner
Simulation__LongBeamspotVertexPositioner=CompFactory.Simulation.LongBeamspotVertexPositioner
+Simulation__GenEventBeamEffectBooster=CompFactory.Simulation.GenEventBeamEffectBooster
# For the Algorithm
Simulation__BeamEffectsAlg=CompFactory.Simulation.BeamEffectsAlg
@@ -22,84 +23,82 @@ Simulation__BeamEffectsAlg=CompFactory.Simulation.BeamEffectsAlg
# todo names required to copy function name? what are names used for?
# todo add default construction options to make these potentiall useful
# todo verify and add suggestions made in todo
-#--------------------------------------------------------------------------------------------------
+
+
## GenEventManipulators
def makeValidityChecker(name="GenEventValidityChecker", **kwargs):
"""Return a validity checker tool"""
return Simulation__GenEventValidityChecker(name, **kwargs)
+
def makeGenEventRotator(name="GenEventRotator", **kwargs):
- """Return a vertex positioner tool"""
+ """Return a event rotator tool"""
return Simulation__GenEventRotator(name, **kwargs)
+
def makeGenEventBeamEffectBooster(name="GenEventBeamEffectBooster", **kwargs):
"""Return a lorentz booster tool"""
# todo needs random seed, more?
- return Simulation__GenEventVertexPositioner(name, **kwargs)
+ return Simulation__GenEventBeamEffectBooster(name, **kwargs)
+
def makeGenEventVertexPositioner(ConfigFlags,name="GenEventVertexPositioner", **kwargs):
"""Return a vertex positioner tool"""
# todo needs input file(s?)
- result=ComponentAccumulator()
+ acc = ComponentAccumulator()
readVtxPosFromFile = ConfigFlags.Sim.Vertex.Source == "VertexOverrideFile.txt" or ConfigFlags.Sim.Vertex.Source == "VertexOverrideEventFile.txt"
if readVtxPosFromFile:
- kwargs.setdefault("VertexShifters" , [ Simulation__VertexPositionFromFile("VertexPositionFromFile") ])
+ kwargs.setdefault("VertexShifters", [makeVertexPositionFromFile()])
elif ConfigFlags.Sim.Vertex.Source == "CondDB" :
- acc, tool = makeVertexBeamCondPositioner(ConfigFlags)
- result.merge(acc)
- kwargs.setdefault("VertexShifters" , [ Simulation__VertexBeamCondPositioner('VertexBeamCondPositioner') ])
+ tool = acc.popToolsAndMerge(makeVertexBeamCondPositioner(ConfigFlags))
+ kwargs.setdefault("VertexShifters", [tool])
elif ConfigFlags.Sim.Vertex.Source == "LongBeamspotVertexPositioner":
- kwargs.setdefault("VertexShifters" , [ Simulation__LongBeamspotVertexPositioner('LongBeamspotVertexPositioner') ])
+ kwargs.setdefault("VertexShifters", [makeLongBeamspotVertexPositioner()])
+
+ acc.setPrivateTools(Simulation__GenEventVertexPositioner(name, **kwargs))
+ return acc
-
- return result, Simulation__GenEventVertexPositioner(name, **kwargs)
-#--------------------------------------------------------------------------------------------------
## LorentzVectorGenerators
def makeVertexBeamCondPositioner(ConfigFlags,name="VertexBeamCondPositioner", **kwargs):
"""Return a conditional (? todo) vertex positioner tool"""
- # todo needs RandomSvc
from IOVDbSvc.IOVDbSvcConfig import addFoldersSplitOnline
- BeamSpotCondAlg=CompFactory.BeamSpotCondAlg
- from RngComps.RandomServices import AthEngines
+ BeamSpotCondAlg = CompFactory.BeamSpotCondAlg
+ from RngComps.RandomServices import RNG
- result = ComponentAccumulator()
-
- Engine = ConfigFlags.Random.Engine
- kwargs.setdefault('RandomSvc', AthEngines[Engine])
-
-
- #from AthenaCommon.Constants import VERBOSE
- #kwargs.setdefault('OutputLevel', VERBOSE) #if we wish to add verbose output to the tool
+ acc = ComponentAccumulator()
- result.merge(addFoldersSplitOnline(ConfigFlags,"INDET","/Indet/Onl/Beampos","/Indet/Beampos", className='AthenaAttributeList'))
- result.addCondAlgo(BeamSpotCondAlg( "BeamSpotCondAlg"))
- return result, Simulation__VertexBeamCondPositioner(name, **kwargs)
+ acc.merge(RNG(engine=ConfigFlags.Random.Engine, name="AthRNGSvc"))
+ kwargs.setdefault('RandomSvc', acc.getService("AthRNGSvc"))
+
+ acc.merge(addFoldersSplitOnline(ConfigFlags,"INDET","/Indet/Onl/Beampos","/Indet/Beampos", className='AthenaAttributeList'))
+ acc.addCondAlgo(BeamSpotCondAlg("BeamSpotCondAlg"))
+ acc.setPrivateTools(Simulation__VertexBeamCondPositioner(name, **kwargs))
+ return acc
+
def makeVertexPositionFromFile(name="VertexPositionFromFile", **kwargs):
"""Return a vertex positioner tool"""
# todo input file? look at cxx for details
return Simulation__VertexPositionFromFile(name, **kwargs)
+
def makeCrabKissingVertexPositioner(name="CrabKissingVertexPositioner", **kwargs):
"""Return a Crab-Kissing vertex positioner tool"""
# todo needs BunchLength, RandomSvc, BunchShape
return Simulation__CrabKissingVertexPositioner(name, **kwargs)
+
def makeLongBeamspotVertexPositioner(name="LongBeamspotVertexPositioner", **kwargs):
"""Return a long beamspot vertex positioner tool"""
# todo needs LParameter and RandomSvc
return Simulation__LongBeamspotVertexPositioner(name, **kwargs)
-#----------------------------------------------------------------------------------------------------
-def BeamEffectsAlgCfg(ConfigFlags, **kwargs):
- """Return an accumulator and algorithm for beam effects
-
- Arguments:
- ConfigFlags ---
- """
+
+def BeamEffectsAlgBasicCfg(ConfigFlags, **kwargs):
+ """Return an accumulator and algorithm for beam effects, wihout output"""
acc = ComponentAccumulator()
alg = Simulation__BeamEffectsAlg(name="BeamEffectsAlg", **kwargs)
@@ -108,7 +107,7 @@ def BeamEffectsAlgCfg(ConfigFlags, **kwargs):
alg.InputMcEventCollection = "GEN_EVENT"
alg.OutputMcEventCollection = "BeamTruthEvent"
- accVertexPositioner, toolVertexPositioner = makeGenEventVertexPositioner(ConfigFlags)
+ toolVertexPositioner = acc.popToolsAndMerge(makeGenEventVertexPositioner(ConfigFlags))
# Set (todo) the appropriate manipulator tools
manipulators = []
@@ -120,10 +119,20 @@ def BeamEffectsAlgCfg(ConfigFlags, **kwargs):
# manipulators.append(makeLongBeamspotVertexPositioner()) # todo Callback registration failed
alg.GenEventManipulators += manipulators
- #merge the accumulators
- acc.merge(accVertexPositioner)
+ acc.addEventAlgo(alg, sequenceName="AthAlgSeq", primary=True)
+ return acc
+
+
+def BeamEffectsAlgCfg(ConfigFlags, **kwargs):
+ """Return an accumulator and algorithm for beam effects, with output"""
+ acc = BeamEffectsAlgBasicCfg(ConfigFlags, **kwargs)
+ # Set to write HITS pool file
+ alg = acc.getPrimary()
+ ItemList = ["McEventCollection#" + alg.OutputMcEventCollection]
+ from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+ acc.merge(OutputStreamCfg(ConfigFlags, "HITS", ItemList=ItemList))
+ return acc
- return acc, alg
if __name__ == "__main__":
from AthenaCommon.Logging import log
@@ -131,7 +140,6 @@ if __name__ == "__main__":
from AthenaCommon.Configurable import Configurable
from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
- from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
from AthenaConfiguration.AllConfigFlags import ConfigFlags
@@ -174,17 +182,7 @@ if __name__ == "__main__":
cfg.merge(PoolReadCfg(ConfigFlags))
# Make use of our defiend function
- acc, alg = BeamEffectsAlgCfg(ConfigFlags)
- cfg.merge(acc)
-
- # Add the algorithm into our accumulator
- cfg.addEventAlgo(alg, sequenceName="AthAlgSeq")
-
- # Add configuration to write HITS pool file
- cfg.merge( OutputStreamCfg(ConfigFlags,
- "HITS",
- ItemList=["McEventCollection#" + alg.OutputMcEventCollection])) #which collection in storegate gets written to output file
-
+ cfg.popToolsAndMerge(BeamEffectsAlgCfg(ConfigFlags))
cfg.getService("StoreGateSvc").Dump=True
cfg.printConfig(withDetails=True)
diff --git a/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigNew.py b/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigNew.py
index 56a22910f4b5afef291b3ce0d7ad9f15fb382c21..62ccdbee199d884e1cd46ad0371da08e5c3660ef 100644
--- a/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigNew.py
+++ b/Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfigNew.py
@@ -1,104 +1,199 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from G4AtlasServices.G4AtlasServicesConfigNew import DetectorGeometrySvcCfg, PhysicsListSvcCfg
from ISF_Services.ISF_ServicesConfigNew import MC15aPlusTruthServiceCfg, GeoIDSvcCfg, InputConverterCfg
from G4AtlasTools.G4AtlasToolsConfigNew import SensitiveDetectorMasterToolCfg, FastSimulationMasterToolCfg
from G4AtlasServices.G4AtlasUserActionConfigNew import UserActionSvcCfg
from G4AtlasApps.G4Atlas_MetadataNew import writeSimulationParametersMetadata
+from AthenaConfiguration.ComponentFactory import CompFactory
+from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-#todo - think about the flow, do we need if statements?!
-
-from G4AtlasAlg.G4AtlasAlgConf import G4AtlasAlg
-
-def G4AtlasAlgCfg(ConfigFlags, name='G4AtlasAlg', **kwargs):
- #add Services to G4AtlasAlg
+def G4AtlasAlgBasicCfg(ConfigFlags, name="G4AtlasAlg", **kwargs):
+ """Return ComponentAccumulator configured for Atlas G4 simulation, without output"""
+ # wihout output
result = DetectorGeometrySvcCfg(ConfigFlags)
- kwargs.setdefault('DetGeoSvc', result.getService("DetectorGeometrySvc"))
+ kwargs.setdefault("DetGeoSvc", result.getService("DetectorGeometrySvc"))
-
kwargs.setdefault("InputTruthCollection", "BeamTruthEvent") #tocheck -are these string inputs?
kwargs.setdefault("OutputTruthCollection", "TruthEvent")
## Killing neutrinos
- if ConfigFlags.Sim.ReleaseGeoModel:
- ## Don't drop the GeoModel
- kwargs.setdefault('ReleaseGeoModel' ,ConfigFlags.Sim.ReleaseGeoModel)
- if ConfigFlags.Sim.RecordFlux:
- ## Record the particle flux during the simulation
- kwargs.setdefault('RecordFlux' , ConfigFlags.Sim.RecordFlux)
+ ## Don"t drop the GeoModel
+ kwargs.setdefault("ReleaseGeoModel", ConfigFlags.Sim.ReleaseGeoModel)
+
+ ## Record the particle flux during the simulation
+ kwargs.setdefault("RecordFlux", ConfigFlags.Sim.RecordFlux)
if ConfigFlags.Sim.FlagAbortedEvents:
## default false
- kwargs.setdefault('FlagAbortedEvents' ,ConfigFlags.Sim.FlagAbortedEvents)
+ kwargs.setdefault("FlagAbortedEvents", ConfigFlags.Sim.FlagAbortedEvents)
if ConfigFlags.Sim.FlagAbortedEvents and ConfigFlags.Sim.KillAbortedEvents:
- print('WARNING When G4AtlasAlg.FlagAbortedEvents is True G4AtlasAlg.KillAbortedEvents should be False!!! Setting G4AtlasAlg.KillAbortedEvents = False now!')
- kwargs.setdefault('KillAbortedEvents' ,False)
- if ConfigFlags.Sim.KillAbortedEvents:
- ## default true
- kwargs.setdefault('KillAbortedEvents' ,ConfigFlags.Sim.KillAbortedEvents)
+ print("WARNING When G4AtlasAlg.FlagAbortedEvents is True G4AtlasAlg.KillAbortedEvents should be False. Setting G4AtlasAlg.KillAbortedEvents = False now.")
+ kwargs.setdefault("KillAbortedEvents", False)
- from RngComps.RandomServices import AthEngines, RNG
- if ConfigFlags.Random.Engine in AthEngines.keys():
- result.merge(RNG(ConfigFlags.Random.Engine, name="AthRNGSvc"))
- kwargs.setdefault("AtRndmGenSvc",result.getService("AthRNGSvc"))
+ ## default true
+ kwargs.setdefault("KillAbortedEvents", ConfigFlags.Sim.KillAbortedEvents)
+
+ from RngComps.RandomServices import RNG
+ result.merge(RNG(ConfigFlags.Random.Engine, name="AthRNGSvc"))
+ kwargs.setdefault("AtRndmGenSvc", result.getService("AthRNGSvc"))
kwargs.setdefault("RandomGenerator", "athena")
# Multi-threading settinggs
#is_hive = (concurrencyProps.ConcurrencyFlags.NumThreads() > 0)
is_hive = ConfigFlags.Concurrency.NumThreads > 0
- kwargs.setdefault('MultiThreading', is_hive)
+ kwargs.setdefault("MultiThreading", is_hive)
accMCTruth = MC15aPlusTruthServiceCfg(ConfigFlags)
result.merge(accMCTruth)
- kwargs.setdefault('TruthRecordService', result.getService("ISF_MC15aPlusTruthService"))
- #kwargs.setdefault('TruthRecordService', ConfigFlags.Sim.TruthStrategy) # TODO need to have manual override (simFlags.TruthStrategy.TruthServiceName())
+ kwargs.setdefault("TruthRecordService", result.getService("ISF_MC15aPlusTruthService"))
+ #kwargs.setdefault("TruthRecordService", ConfigFlags.Sim.TruthStrategy) # TODO need to have manual override (simFlags.TruthStrategy.TruthServiceName())
accGeoID = GeoIDSvcCfg(ConfigFlags)
result.merge(accGeoID)
- kwargs.setdefault('GeoIDSvc', result.getService('ISF_GeoIDSvc'))
+ kwargs.setdefault("GeoIDSvc", result.getService("ISF_GeoIDSvc"))
#input converter
accInputConverter = InputConverterCfg(ConfigFlags)
result.merge(accInputConverter)
- kwargs.setdefault('InputConverter', result.getService("ISF_InputConverter"))
+ kwargs.setdefault("InputConverter", result.getService("ISF_InputConverter"))
#sensitive detector master tool
accSensitiveDetector = SensitiveDetectorMasterToolCfg(ConfigFlags)
result.merge(accSensitiveDetector)
- kwargs.setdefault('SenDetMasterTool', result.getPublicTool("SensitiveDetectorMasterTool")) #NOTE - is still a public tool
+ kwargs.setdefault("SenDetMasterTool", result.getPublicTool("SensitiveDetectorMasterTool")) #NOTE - is still a public tool
#fast simulation master tool
accFastSimulation = FastSimulationMasterToolCfg(ConfigFlags)
result.merge(accFastSimulation)
- kwargs.setdefault('FastSimMasterTool', result.getPublicTool("FastSimulationMasterTool")) # NOTE - is still a public tool
+ kwargs.setdefault("FastSimMasterTool", result.getPublicTool("FastSimulationMasterTool")) # NOTE - is still a public tool
#Write MetaData container
result.merge(writeSimulationParametersMetadata(ConfigFlags))
#User action services (Slow...)
result.merge( UserActionSvcCfg(ConfigFlags) )
- kwargs.setdefault('UserActionSvc', result.getService( "G4UA::UserActionSvc") )
+ kwargs.setdefault("UserActionSvc", result.getService( "G4UA::UserActionSvc") )
#PhysicsListSvc
result.merge( PhysicsListSvcCfg(ConfigFlags) )
- kwargs.setdefault('PhysicsListSvc', result.getService( "PhysicsListSvc") )
+ kwargs.setdefault("PhysicsListSvc", result.getService( "PhysicsListSvc") )
## G4AtlasAlg verbosities (available domains = Navigator, Propagator, Tracking, Stepping, Stacking, Event)
## Set stepper verbose = 1 if the Athena logging level is <= DEBUG
# TODO: Why does it complain that G4AtlasAlgConf.G4AtlasAlg has no "Verbosities" object? Fix.
- verbosities=dict()
+ # FIXME GaudiConfig2 seems to fail to distinguish an empty dict {} from None
+ verbosities=dict(foo="bar")
#from AthenaCommon.AppMgr import ServiceMgr
#if ServiceMgr.MessageSvc.OutputLevel <= 2:
- # verbosities["Tracking"]='1'
+ # verbosities["Tracking"]="1"
# print verbosities
- kwargs.setdefault('Verbosities', verbosities)
+ kwargs.setdefault("Verbosities", verbosities)
# Set commands for the G4AtlasAlg
kwargs.setdefault("G4Commands", ConfigFlags.Sim.G4Commands)
- result.addEventAlgo(G4AtlasAlg(name, **kwargs))
+ result.addEventAlgo(CompFactory.G4AtlasAlg(name, **kwargs))
return result
-
+
+
+def G4AtlasAlgOutputCfg(ConfigFlags):
+ """
+ Return ComponentAccumulator with output for G4 simulation. Not standalone.
+
+ follows G4Atlas.flat.configuration.py
+ """
+ ItemList = ["EventInfo#*",
+ "McEventCollection#TruthEvent",
+ "JetCollection#*"]
+
+ if ConfigFlags.Sim.IncludeParentsInG4Event:
+ ItemList += ["McEventCollection#GEN_EVENT"]
+
+ ItemList += ["xAOD::JetContainer#*",
+ "xAOD::JetAuxContainer#*"]
+
+ if ConfigFlags.Detector.SimulateID:
+ ItemList += ["SiHitCollection#*",
+ "TRTUncompressedHitCollection#*",
+ "TrackRecordCollection#CaloEntryLayer"]
+
+ if ConfigFlags.Detector.SimulateCalo:
+ ItemList += ["CaloCalibrationHitContainer#*",
+ "LArHitContainer#*",
+ "TileHitVector#*",
+ "TrackRecordCollection#MuonEntryLayer"]
+
+ if ConfigFlags.Detector.SimulateMuon:
+ ItemList += ["RPCSimHitCollection#*",
+ "TGCSimHitCollection#*",
+ "MDTSimHitCollection#*",
+ "TrackRecordCollection#MuonExitLayer"]
+ if ConfigFlags.Detector.GeometryCSC:
+ ItemList += ["CSCSimHitCollection#*"]
+ if ConfigFlags.Detector.GeometrysTGC:
+ ItemList += ["sTGCSimHitCollection#*"]
+ if ConfigFlags.Detector.GeometryMM:
+ ItemList += ["MMSimHitCollection#*"]
+
+ if ConfigFlags.Detector.SimulateLucid:
+ ItemList += ["LUCID_SimHitCollection#*"]
+
+ if ConfigFlags.Detector.SimulateFwdRegion:
+ ItemList += ["SimulationHitCollection#*"]
+
+ if ConfigFlags.Detector.SimulateZDC:
+ ItemList += ["ZDC_SimPixelHit_Collection#*",
+ "ZDC_SimStripHit_Collection#*"]
+
+ if ConfigFlags.Detector.SimulateALFA:
+ ItemList += ["ALFA_HitCollection#*",
+ "ALFA_ODHitCollection#*"]
+
+ if ConfigFlags.Detector.SimulateAFP:
+ ItemList += ["AFP_TDSimHitCollection#*",
+ "AFP_SIDSimHitCollection#*"]
+
+ # TimingAlg
+ ItemList += ["RecoTimingObj#EVNTtoHITS_timings"]
+
+ # FIXME reproduce to support non standard setups
+ #0140 ## Add cosmics and test beam configuration hit persistency if required cf. geom tag
+ #0141 layout = simFlags.SimLayout.get_Value()
+ #0142 if "tb" not in layout:
+ #0143 from AthenaCommon.BeamFlags import jobproperties
+ #0144 if jobproperties.Beam.beamType() == 'cosmics' or \
+ #0145 (hasattr(simFlags, "WriteTR") and simFlags.WriteTR.statusOn) or \
+ #0146 (hasattr(simFlags, "ReadTR") and simFlags.ReadTR.statusOn):
+ #0147 stream1.ItemList += ["TrackRecordCollection#CosmicRecord", "TrackRecordCollection#CosmicPerigee"]
+ #0148 else:
+ #0149 ## CTB-specific
+ #0150 if layout.startswith("ctb"):
+ #0151 if simFlags.LArFarUpstreamMaterial.statusOn and simFlags.LArFarUpstreamMaterial.get_Value():
+ #0152 stream1.ItemList.append("TrackRecordCollection#LArFarUpstreamMaterialExitLayer")
+ #0153 ## Persistency of test-beam layout
+ #0154 if layout.startswith('ctb') or layout.startswith('tb_Tile2000_'):
+ #0155 stream1.ItemList += ["TBElementContainer#*"]
+ acc = OutputStreamCfg(ConfigFlags,"HITS", ItemList=ItemList)
+
+ # Make stream aware of aborted events
+ OutputStreamHITS = acc.getEventAlgo("OutputStreamHITS")
+ OutputStreamHITS.AcceptAlgs += ["G4AtlasAlg"]
+
+ # G4Atlas.flat.configuration.py#0333 onwards
+ # FIXME unifyset now fails
+ #PoolAttributes = ["TREE_BRANCH_OFFSETTAB_LEN = '100'"]
+ #PoolAttributes += ["DatabaseName = '" + ConfigFlags.Output.HITSFileName + "'; ContainerName = 'TTree=CollectionTree'; TREE_AUTO_FLUSH = '1'"]
+ #acc.addService(CompFactory.AthenaPoolCnvSvc(PoolAttributes=PoolAttributes))
+
+ return acc
+
+
+def G4AtlasAlgCfg(ConfigFlags, name="G4AtlasAlg", **kwargs):
+ """Return ComponentAccumulator configured for Atlas G4 simulation, with output"""
+ acc = G4AtlasAlgBasicCfg(ConfigFlags, **kwargs)
+ acc.merge(G4AtlasAlgOutputCfg(ConfigFlags))
+ return acc
diff --git a/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py b/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py
index fd2b6c3ff5539326073b46c43e7658a4802456b2..18d578a4248eb04382e64a34c3cf594dd0028130 100755
--- a/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py
+++ b/Simulation/G4Atlas/G4AtlasAlg/test/G4AtlasAlgConfigNew_Test.py
@@ -1,183 +1,199 @@
#!/usr/bin/env python
"""Run tests on G4AtlasAlgConfigNew
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
+
+# based on https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/Control/AthenaServices/python/Configurables.py#0247
+def EvtIdModifierSvc_add_modifier(svc,
+ run_nbr=None, evt_nbr=None, time_stamp=None, lbk_nbr=None,
+ nevts=1):
+ if run_nbr is None:
+ modify_run_nbr = 0
+ run_nbr = 0
+ else:
+ modify_run_nbr = 1
+
+ if evt_nbr is None:
+ modify_evt_nbr = 0
+ evt_nbr = 0
+ else:
+ modify_evt_nbr = 1
+
+ if time_stamp is None:
+ modify_time_stamp = 0
+ time_stamp = 0
+ else:
+ modify_time_stamp = 1
+
+ if lbk_nbr is None:
+ modify_lbk_nbr = 0
+ lbk_nbr = 0
+ else:
+ modify_lbk_nbr = 1
+
+ mod_bit = int(0b0000
+ | (modify_run_nbr << 0)
+ | (modify_evt_nbr << 1)
+ | (modify_time_stamp << 2)
+ | (modify_lbk_nbr << 3))
+
+ svc.Modifiers += [run_nbr, evt_nbr, time_stamp, lbk_nbr,
+ nevts, mod_bit]
+
+
if __name__ == '__main__':
- import time
- a = time.time()
-
- from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
- import os
-
- # Set up logging and config behaviour
- from AthenaCommon.Logging import log
- from AthenaCommon.Constants import DEBUG
- from AthenaCommon.Configurable import Configurable
- log.setLevel(DEBUG)
- Configurable.configurableRun3Behavior = 1
-
-
- #import and set config flags
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.Input.RunNumber = [284500] #Isn't updating - todo: investigate
- from AthenaConfiguration.TestDefaults import defaultTestFiles
- inputDir = defaultTestFiles.d
- ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1'] #defaultTestFiles.EVNT
- ConfigFlags.Output.HITSFileName = "myHITSnew.pool.root"
-
- #Sim ConfigFlags
- #ConfigFlags.Sim.WorldRRange = 15000
- #ConfigFlags.Sim.WorldZRange = 27000 #change defaults?
- ConfigFlags.Sim.CalibrationRun = 'Off'
- ConfigFlags.Sim.RecordStepInfo = False
- ConfigFlags.Sim.CavernBG = "Signal"
- ConfigFlags.Sim.ISFRun = False
- ConfigFlags.Sim.BeamPipeSimMode = 'FastSim'
-
- ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-14"
- ConfigFlags.GeoModel.Align.Dynamic = False
-
- #set the detector flags:
- #inner detectors
- ConfigFlags.Detector.SimulateBCM = True
- ConfigFlags.Detector.GeometryBCM = True
- ConfigFlags.Detector.SimulateDBM = True
- ConfigFlags.Detector.GeometryDBM = True
- ConfigFlags.Detector.SimulatePixel = True
- ConfigFlags.Detector.GeometryPixel = True
- ConfigFlags.Detector.SimulateSCT = True
- ConfigFlags.Detector.GeometrySCT = True
- ConfigFlags.Detector.SimulateTRT = True
- ConfigFlags.Detector.GeometryTRT = True
-
- #muon
- ConfigFlags.Detector.SimulateMuon = True #True
- ConfigFlags.Detector.GeometryMuon = True #True <these two break it (others can be true)
- ConfigFlags.Detector.SimulateMDT = True #True
- ConfigFlags.Detector.GeometryMDT = True #True
- ConfigFlags.Detector.SimulateRPC = True #True
- ConfigFlags.Detector.GeometryRPC = True #True
- ConfigFlags.Detector.SimulateTGC = True #True
- ConfigFlags.Detector.GeometryTGC = True #True
- ConfigFlags.Detector.SimulateCSC = True #True
- ConfigFlags.Detector.GeometryCSC = True #True
-
- #LAr
- ConfigFlags.Detector.SimulateLAr = True
- ConfigFlags.Detector.GeometryLAr = True
- ConfigFlags.Detector.SimulateTile = True
- ConfigFlags.Detector.GeometryTile = True
-
- ConfigFlags.Detector.SimulateHGTD = False
- #ConfigFlags.Detector.GeometryHGTD = False #isn't a flag -- is it needed?
-
-
- ConfigFlags.Detector.SimulateBpipe = True
- ConfigFlags.Detector.GeometryBpipe = True
-
-
- #forward region not migrated yet
- ConfigFlags.Detector.SimulateLucid = False
- ConfigFlags.Detector.SimulateZDC = False
- ConfigFlags.Detector.SimulateALFA = False
- ConfigFlags.Detector.SimulateAFP = False
- ConfigFlags.Detector.SimulateFwdRegion = False
- ConfigFlags.Detector.SimulateForward = False
-
- # Finalize
- ConfigFlags.lock()
-
- ## Initialize a new component accumulator
- cfg = MainServicesSerialCfg()
-
- # Add configuration to read EVNT pool file
- from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
- cfg.merge(PoolReadCfg(ConfigFlags))
- myRunNumber = 284500
- myFirstLB = 1
- myInitialTimeStamp = 1446539185
- evtMax = 1
- from AthenaServices.Configurables import EvtIdModifierSvc
- evtIdModifierSvc = EvtIdModifierSvc(EvtStoreName="StoreGateSvc")
- from IOVDbMetaDataTools.IOVDbMetaDataToolsConf import IOVDbMetaDataTool
- iovDbMetaDataTool = IOVDbMetaDataTool()
- iovDbMetaDataTool.MinMaxRunNumbers = [myRunNumber, 2147483647]
- cfg.addPublicTool(iovDbMetaDataTool)
- evtIdModifierSvc.add_modifier(run_nbr=myRunNumber, lbk_nbr=myFirstLB, time_stamp=myInitialTimeStamp, nevts=evtMax)
- eventSelector = cfg.getService('EventSelector')
- eventSelector.OverrideRunNumber = True
- eventSelector.RunNumber = myRunNumber
- eventSelector.FirstLB = myFirstLB
- eventSelector.InitialTimeStamp = myInitialTimeStamp # Necessary to avoid a crash
- if hasattr(eventSelector,'OverrideRunNumberFromInput'): eventSelector.OverrideRunNumberFromInput = True
- cfg.addService(evtIdModifierSvc)
-
- #add BeamEffectsAlg
- from BeamEffects.BeamEffectsAlgConfig import BeamEffectsAlgCfg
- acc, alg = BeamEffectsAlgCfg(ConfigFlags) #todo - update BeamEffectsAlg
- cfg.merge(acc)
- cfg.addEventAlgo(alg, sequenceName="AthAlgSeq")
-
- #add the G4AtlasAlg
- from G4AtlasAlg.G4AtlasAlgConfigNew import G4AtlasAlgCfg
- cfg.merge(G4AtlasAlgCfg(ConfigFlags))
-
- #write the output stream
- from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-
- #inner detector
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["SiHitCollection#SCT_Hits"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["SiHitCollection#BCMHits"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["SiHitCollection#BLMHits"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["SiHitCollection#PixelHits"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["TRTUncompressedHitCollection#TRTUncompressedHits"]))
-
- #LAr + Tile Calo
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["LArHitContainer#LArHitEMB"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["LArHitContainer#LArHitEMEC"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["LArHitContainer#LArHitFCAL"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["LArHitContainer#LArHitHEC"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["LArHitContainer#LArHitMiniFCAL"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["TileHitVector#TileHitVec"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["TileHitVector#MBTSHits"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["CaloCalibrationHitContainer#LArCalibrationHitDeadMaterial"]))
-
- #muon
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["RPCSimHitCollection#RPC_Hits"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["TGCSimHitCollection#TGC_Hits"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["MDTSimHitCollection#MDT_Hits"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["CSCSimHitCollection#CSC_Hits"]))
-
- #Extra information
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["EventInfo#McEventInfo"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["McEventCollection#TruthEvent"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["IOVMetaDataContainer#Simulation_Parameters"]))
-
- #TrackCollections
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["TrackRecordCollection#CaloEntryLayer"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["TrackRecordCollection#MuonEntryLayer"]))
- cfg.merge( OutputStreamCfg(ConfigFlags,"HITS", ItemList=["TrackRecordCollection#MuonExitLayer"]))
-
-
- # Dump config
- cfg.getService("StoreGateSvc").Dump = True
- cfg.getService("ConditionStore").Dump = True
- cfg.printConfig(withDetails=True, summariseProps = True)
- ConfigFlags.dump()
-
-
- # Execute and finish
- sc = cfg.run(maxEvents=evtMax)
-
-
- b = time.time()
- log.info("Run G4AtlasAlg in " + str(b-a) + " seconds")
-
- # Success should be 0
- #os.sys.exit(not sc.isSuccess())
-
- f=open("test.pkl","wb")
- cfg.store(f)
- f.close()
+ import time
+ a = time.time()
+
+ from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
+ import os
+
+ # Set up logging and config behaviour
+ from AthenaCommon.Logging import log
+ from AthenaCommon.Constants import DEBUG
+ from AthenaCommon.Configurable import Configurable
+ log.setLevel(DEBUG)
+ Configurable.configurableRun3Behavior = 1
+
+
+ #import and set config flags
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ ConfigFlags.Input.RunNumber = [284500] #Isn't updating - todo: investigate
+ from AthenaConfiguration.TestDefaults import defaultTestFiles
+ inputDir = defaultTestFiles.d
+ ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.evgen.EVNT.e4993.EVNT.08166201._000012.pool.root.1'] #defaultTestFiles.EVNT
+ ConfigFlags.Output.HITSFileName = "myHITSnew.pool.root"
+
+ #Sim ConfigFlags
+ #ConfigFlags.Sim.WorldRRange = 15000
+ #ConfigFlags.Sim.WorldZRange = 27000 #change defaults?
+ ConfigFlags.Sim.CalibrationRun = "Off"
+ ConfigFlags.Sim.RecordStepInfo = False
+ ConfigFlags.Sim.CavernBG = "Signal"
+ ConfigFlags.Sim.ISFRun = False
+ ConfigFlags.Sim.BeamPipeSimMode = 'FastSim'
+ ConfigFlags.Sim.ReleaseGeoModel = False
+
+ ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-14"
+ ConfigFlags.GeoModel.Align.Dynamic = False
+
+ #set the detector flags:
+ #inner detectors
+ ConfigFlags.Detector.SimulateBCM = True
+ ConfigFlags.Detector.GeometryBCM = True
+ ConfigFlags.Detector.SimulateDBM = True
+ ConfigFlags.Detector.GeometryDBM = True
+ ConfigFlags.Detector.SimulatePixel = True
+ ConfigFlags.Detector.GeometryPixel = True
+ ConfigFlags.Detector.SimulateSCT = True
+ ConfigFlags.Detector.GeometrySCT = True
+ ConfigFlags.Detector.SimulateTRT = True
+ ConfigFlags.Detector.GeometryTRT = True
+
+ #muon
+ ConfigFlags.Detector.SimulateMuon = True #True
+ ConfigFlags.Detector.GeometryMuon = True #True <these two break it (others can be true)
+ ConfigFlags.Detector.SimulateMDT = True #True
+ ConfigFlags.Detector.GeometryMDT = True #True
+ ConfigFlags.Detector.SimulateRPC = True #True
+ ConfigFlags.Detector.GeometryRPC = True #True
+ ConfigFlags.Detector.SimulateTGC = True #True
+ ConfigFlags.Detector.GeometryTGC = True #True
+ ConfigFlags.Detector.SimulateCSC = True #True
+ ConfigFlags.Detector.GeometryCSC = True #True
+
+ #LAr
+ ConfigFlags.Detector.SimulateLAr = True
+ ConfigFlags.Detector.GeometryLAr = True
+ ConfigFlags.Detector.SimulateTile = True
+ ConfigFlags.Detector.GeometryTile = True
+
+ ConfigFlags.Detector.SimulateHGTD = False
+ #ConfigFlags.Detector.GeometryHGTD = False #isn't a flag -- is it needed?
+
+
+ ConfigFlags.Detector.SimulateBpipe = True
+ ConfigFlags.Detector.GeometryBpipe = True
+
+
+ #forward region not migrated yet
+ ConfigFlags.Detector.SimulateLucid = False
+ ConfigFlags.Detector.SimulateZDC = False
+ ConfigFlags.Detector.SimulateALFA = False
+ ConfigFlags.Detector.SimulateAFP = False
+ ConfigFlags.Detector.SimulateFwdRegion = False
+ ConfigFlags.Detector.SimulateForward = False
+
+ # Finalize
+ ConfigFlags.lock()
+
+ ## Initialize a new component accumulator
+ cfg = MainServicesSerialCfg()
+ from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+ from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
+ cfg.merge(PoolReadCfg(ConfigFlags))
+ cfg.merge(PoolWriteCfg(ConfigFlags))
+ # todo its own cfg ...
+ myRunNumber = 284500
+ myFirstLB = 1
+ myInitialTimeStamp = 1446539185
+ evtMax = 1
+ from AthenaConfiguration.ComponentFactory import CompFactory
+ evtIdModifierSvc = CompFactory.EvtIdModifierSvc(EvtStoreName="StoreGateSvc")
+ iovDbMetaDataTool = CompFactory.IOVDbMetaDataTool()
+ iovDbMetaDataTool.MinMaxRunNumbers = [myRunNumber, 2147483647]
+ cfg.addPublicTool(iovDbMetaDataTool)
+ EvtIdModifierSvc_add_modifier(evtIdModifierSvc, run_nbr=myRunNumber, lbk_nbr=myFirstLB, time_stamp=myInitialTimeStamp, nevts=evtMax)
+ eventSelector = cfg.getService("EventSelector")
+ eventSelector.OverrideRunNumber = True
+ eventSelector.RunNumber = myRunNumber
+ eventSelector.FirstLB = myFirstLB
+ eventSelector.InitialTimeStamp = myInitialTimeStamp # Necessary to avoid a crash
+ if hasattr(eventSelector, "OverrideRunNumberFromInput"):
+ eventSelector.OverrideRunNumberFromInput = True
+ cfg.addService(evtIdModifierSvc)
+ # ... up to here?
+
+ # add BeamEffectsAlg
+ from BeamEffects.BeamEffectsAlgConfig import BeamEffectsAlgCfg
+ cfg.merge(BeamEffectsAlgCfg(ConfigFlags))
+
+ #add the G4AtlasAlg
+ from G4AtlasAlg.G4AtlasAlgConfigNew import G4AtlasAlgCfg
+ cfg.merge(G4AtlasAlgCfg(ConfigFlags))
+
+ from TileGeoG4SD.TileGeoG4SDToolConfig import TileGeoG4SDCalcCfg
+ cfg.merge(TileGeoG4SDCalcCfg(ConfigFlags))
+
+ # FIXME hack to match to buggy behaviour in old style configuration
+ OutputStreamHITS = cfg.getEventAlgo("OutputStreamHITS")
+ OutputStreamHITS.ItemList.remove("xAOD::EventInfo#EventInfo")
+ OutputStreamHITS.ItemList.remove("xAOD::EventAuxInfo#EventInfoAux.")
+
+ # FIXME hack because deduplication is broken
+ PoolAttributes = ["TREE_BRANCH_OFFSETTAB_LEN = '100'"]
+ PoolAttributes += ["DatabaseName = '" + ConfigFlags.Output.HITSFileName + "'; ContainerName = 'TTree=CollectionTree'; TREE_AUTO_FLUSH = '1'"]
+ cfg.getService("AthenaPoolCnvSvc").PoolAttributes += PoolAttributes
+
+ # Dump config
+ cfg.addEventAlgo(CompFactory.JobOptsDumperAlg(FileName="G4AtlasTestConfig.txt"))
+ cfg.getService("StoreGateSvc").Dump = True
+ cfg.getService("ConditionStore").Dump = True
+ cfg.printConfig(withDetails=True, summariseProps = True)
+
+ ConfigFlags.dump()
+
+ # Execute and finish
+ sc = cfg.run(maxEvents=evtMax)
+
+ b = time.time()
+ log.info("Run G4AtlasAlg in " + str(b-a) + " seconds")
+
+ # Success should be 0
+ #os.sys.exit(not sc.isSuccess())
+
+ f = open("test.pkl","wb")
+ cfg.store(f)
+ f.close()
diff --git a/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py b/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py
index 626c26f5773182684b1b75cc474f54e063b51664..009e4af15959af43715d1050078708c56b56b6ee 100644
--- a/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py
+++ b/Simulation/G4Atlas/G4AtlasApps/python/SimConfigFlags.py
@@ -7,8 +7,6 @@ from AthenaConfiguration.AthConfigFlags import AthConfigFlags
def createSimConfigFlags():
scf=AthConfigFlags()
- scf.addFlag("Sim.ISFRun",False)
- scf.addFlag("Sim.ISF.HITSMergingRequired", True)
scf.addFlag("Sim.ParticleID",False)
scf.addFlag("Sim.CalibrationRun", "DeadLAr") # "LAr", "Tile", "LAr+Tile", "DeadLAr", "Off"
@@ -21,22 +19,23 @@ def createSimConfigFlags():
scf.addFlag("Sim.SimBarcodeOffset", 200000)
#for forward region
- scf.addFlag('Sim.TwissFileBeam1',False)
- scf.addFlag('Sim.TwissFileBeam2',False)
- scf.addFlag('Sim.TwissEnergy',8000000.)
- scf.addFlag('Sim.TwissFileBeta',550.)
- scf.addFlag('Sim.TwissFileNomReal',False) #'nominal','real' #default to one of these?!
- scf.addFlag('Sim.TwissFileVersion','v01')
+ scf.addFlag("Sim.TwissFileBeam1",False)
+ scf.addFlag("Sim.TwissFileBeam2",False)
+ scf.addFlag("Sim.TwissEnergy",8000000.)
+ scf.addFlag("Sim.TwissFileBeta",550.)
+ scf.addFlag("Sim.TwissFileNomReal",False) #"nominal","real" #default to one of these?!
+ scf.addFlag("Sim.TwissFileVersion","v01")
#for G4AtlasAlg
#in simflags
- scf.addFlag('Sim.ReleaseGeoModel',True)
- scf.addFlag('Sim.RecordFlux',False)
- scf.addFlag('Sim.TruthStrategy','MC12') #todo - needs to have some extra functionality!
- scf.addFlag('Sim.G4Commands',['/run/verbose 2'])
+ scf.addFlag("Sim.ReleaseGeoModel",True)
+ scf.addFlag("Sim.RecordFlux",False)
+ scf.addFlag("Sim.TruthStrategy","MC12") #todo - needs to have some extra functionality!
+ scf.addFlag("Sim.G4Commands",["/run/verbose 2"])
#in atlasflags
- scf.addFlag('Sim.FlagAbortedEvents',False)
- scf.addFlag('Sim.KillAbortedEvents',True)
+ scf.addFlag("Sim.FlagAbortedEvents",False)
+ scf.addFlag("Sim.KillAbortedEvents",True)
+ scf.addFlag("Sim.IncludeParentsInG4Event",False)
# Do full simulation + digitisation + reconstruction chain
scf.addFlag("Sim.DoFullChain", False)
@@ -48,25 +47,29 @@ def createSimConfigFlags():
scf.addFlag("Sim.ApplyEMCuts", False) # Turns on the G4 option to apply cuts for EM physics
#For G4AtlasToolsConfig
- scf.addFlag('Sim.RecordStepInfo',False)
- scf.addFlag('Sim.StoppedParticleFile', False)
- scf.addFlag('Sim.BeamPipeSimMode', 'Normal') ## ['Normal', 'FastSim', 'EGammaRangeCuts', 'EGammaPRangeCuts']
- scf.addFlag('Sim.LArParameterization', 2) ## 0 = No frozen showers, 1 = Frozen Showers, 2 = DeadMaterial Frozen Showers
+ scf.addFlag("Sim.RecordStepInfo",False)
+ scf.addFlag("Sim.StoppedParticleFile", False)
+ scf.addFlag("Sim.BeamPipeSimMode", "Normal") ## ["Normal", "FastSim", "EGammaRangeCuts", "EGammaPRangeCuts"]
+ scf.addFlag("Sim.LArParameterization", 2) ## 0 = No frozen showers, 1 = Frozen Showers, 2 = DeadMaterial Frozen Showers
#For BeameffectsAlg
- scf.addFlag('Sim.Vertex.Source', 'CondDB' ) #'CondDB', 'VertexOverrideEventFile.txt', 'VertexOverride.txt',"LongBeamspot"
+ scf.addFlag("Sim.Vertex.Source", "CondDB" ) #"CondDB", "VertexOverrideEventFile.txt", "VertexOverride.txt","LongBeamspot"
#for G4UserActions
- scf.addFlag('Sim.Layout','ATLAS-R2-2015-03-01-00')
- scf.addFlag('Sim.NRRThreshold', False)
- scf.addFlag('Sim.NRRWeight', False)
- scf.addFlag('Sim.PRRThreshold', False)
- scf.addFlag('Sim.PRRWeight', False)
+ scf.addFlag("Sim.Layout","ATLAS-R2-2015-03-01-00")
+ scf.addFlag("Sim.NRRThreshold", False)
+ scf.addFlag("Sim.NRRWeight", False)
+ scf.addFlag("Sim.PRRThreshold", False)
+ scf.addFlag("Sim.PRRWeight", False)
# For G4FieldConfigNew
- scf.addFlag('Sim.G4Stepper', 'AtlasRK4')
- scf.addFlag('Sim.G4EquationOfMotion', '')
+ scf.addFlag("Sim.G4Stepper", "AtlasRK4")
+ scf.addFlag("Sim.G4EquationOfMotion", "")
+ scf.addFlag("Sim.UsingGeant4", True)
- scf.addFlag('Sim.UsingGeant4', True)
- return scf
+ # For ISF
+ scf.addFlag("Sim.ISFRun",False)
+ scf.addFlag("Sim.ISF.HITSMergingRequired", True)
+ scf.addFlag("Sim.ISF.Simulator", "ATLFASTII")
+ return scf
diff --git a/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfigNew.py b/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfigNew.py
index 6b6d78f86ab14bacb2db75646700f0643cfae7a9..d54425a8e8f9c35cec3ef5df76c1c5523172a205 100644
--- a/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfigNew.py
+++ b/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfigNew.py
@@ -46,7 +46,7 @@ def getATLAS_RegionCreatorList(ConfigFlags):
and ConfigFlags.Sim.CalibrationRun in ['LAr','LAr+Tile','DeadLAr']:
Logging.log.info('You requested both calibration hits and frozen showers / parameterization in the LAr.')
Logging.log.info(' Such a configuration is not allowed, and would give junk calibration hits where the showers are modified.')
- Logging.log.info(' Please try again with a different value of either ConfigFlags.Sim.LArParameterization (' + str(ConfigFlags.Sim.LArParameterization()) + ') or ConfigFlags.Sim.CalibrationRun ('+str(ConfigFlags.Sim.CalibrationRun)+')')
+ Logging.log.info(' Please try again with a different value of either ConfigFlags.Sim.LArParameterization (' + str(ConfigFlags.Sim.LArParameterization) + ') or ConfigFlags.Sim.CalibrationRun ('+str(ConfigFlags.Sim.CalibrationRun)+')')
raise RuntimeError('Configuration not allowed')
regionCreatorList += [EMBPhysicsRegionToolCfg(ConfigFlags),
EMECPhysicsRegionToolCfg(ConfigFlags),
@@ -182,26 +182,26 @@ def ATLAS_FieldMgrListCfg(ConfigFlags):
toolFwdRegionFieldManager = result.popToolsAndMerge(accFwdRegionFieldManager)
fieldMgrList+=[toolQ1FwdRegionFieldManager,
- toolQ2FwdFieldManager,
- toolQ3FwdFieldManager,
- toolD1FwdFieldManager,
- toolD2FwdFieldManager,
- toolQ4FwdFieldManager,
- toolQ5FwdFieldManager,
- toolQ6FwdFieldManager,
- toolQ7FwdFieldManager,
- toolQ1HKickFwdFieldManager,
- toolQ1VKickFwdFieldManager,
- toolQ2HKickFwdFieldManager,
- toolQ2VKickFwdFieldManager,
- toolQ3HKickFwdFieldManager,
- toolQ3VKickFwdFieldManager,
- toolQ4VKickAFwdFieldManager,
- toolQ4HKickFwdFieldManager,
- toolQ4VKickBFwdFieldManager,
- toolQ5HKickFwdFieldManager,
- toolQ6VKickFwdFieldManager,
- toolFwdRegionFieldManager]
+ toolQ2FwdFieldManager,
+ toolQ3FwdFieldManager,
+ toolD1FwdFieldManager,
+ toolD2FwdFieldManager,
+ toolQ4FwdFieldManager,
+ toolQ5FwdFieldManager,
+ toolQ6FwdFieldManager,
+ toolQ7FwdFieldManager,
+ toolQ1HKickFwdFieldManager,
+ toolQ1VKickFwdFieldManager,
+ toolQ2HKickFwdFieldManager,
+ toolQ2VKickFwdFieldManager,
+ toolQ3HKickFwdFieldManager,
+ toolQ3VKickFwdFieldManager,
+ toolQ4VKickAFwdFieldManager,
+ toolQ4HKickFwdFieldManager,
+ toolQ4VKickBFwdFieldManager,
+ toolQ5HKickFwdFieldManager,
+ toolQ6VKickFwdFieldManager,
+ toolFwdRegionFieldManager]
result.setPrivateTools(fieldMgrList)
return result
@@ -241,9 +241,8 @@ def DetectorGeometrySvcCfg(ConfigFlags, name="DetectorGeometrySvc", **kwargs):
if False:
kwargs.setdefault("World", 'Cavern')
else:
- accGeo, toolGeo = ATLASEnvelopeCfg(ConfigFlags)
+ toolGeo = result.popToolsAndMerge(ATLASEnvelopeCfg(ConfigFlags))
kwargs.setdefault("World", toolGeo)
- result.merge(accGeo)
kwargs.setdefault("RegionCreators", getATLAS_RegionCreatorList(ConfigFlags))
#if hasattr(simFlags, 'MagneticField') and simFlags.MagneticField.statusOn:
if True:
@@ -289,13 +288,10 @@ def PhysicsListSvcCfg(ConfigFlags, name="PhysicsListSvc", **kwargs):
if 'PhysicsList' in kwargs:
if kwargs['PhysicsList'].endswith('_EMV') or kwargs['PhysicsList'].endswith('_EMX'):
raise RuntimeError( 'PhysicsList not allowed: '+kwargs['PhysicsList'] )
- kwargs.setdefault("GeneralCut", 1.)
- if ConfigFlags.Sim.NeutronTimeCut > 0.:
- kwargs.setdefault("NeutronTimeCut", ConfigFlags.Sim.NeutronTimeCut)
-
- if ConfigFlags.Sim.NeutronEnergyCut > 0.:
- kwargs.setdefault("NeutronEnergyCut", ConfigFlags.Sim.NeutronEnergyCut)
+ kwargs.setdefault("GeneralCut", 1.)
+ kwargs.setdefault("NeutronTimeCut", ConfigFlags.Sim.NeutronTimeCut)
+ kwargs.setdefault("NeutronEnergyCut", ConfigFlags.Sim.NeutronEnergyCut)
kwargs.setdefault("ApplyEMCuts", ConfigFlags.Sim.ApplyEMCuts)
## from AthenaCommon.SystemOfUnits import eV, TeV
## kwargs.setdefault("EMMaxEnergy" , 7*TeV)
diff --git a/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasUserActionConfigNew.py b/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasUserActionConfigNew.py
index a0b5df56a982a64b95c1e9ddeb8701063e06a302..ca25e6390ee71bbf7f37f022cbc58af2eb1090dc 100644
--- a/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasUserActionConfigNew.py
+++ b/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasUserActionConfigNew.py
@@ -2,9 +2,7 @@
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from MCTruthBase.MCTruthBaseConfigNew import MCTruthSteppingActionToolCfg
-
-from G4AtlasServices.G4AtlasServicesConf import G4UA__UserActionSvc
-
+from AthenaConfiguration.ComponentFactory import CompFactory
from G4UserActions.G4UserActionsConfigNew import AthenaStackingActionToolCfg, AthenaTrackingActionToolCfg, LooperKillerToolCfg, G4SimTimerToolCfg, G4TrackCounterToolCfg
@@ -58,11 +56,10 @@ def UserActionSvcCfg(ConfigFlags, name="G4UA::UserActionSvc", **kwargs):
result = ComponentAccumulator()
# new user action tools
- kwargs.setdefault('UserActionTools',
- getDefaultActions(ConfigFlags))
+ kwargs.setdefault('UserActionTools', getDefaultActions(ConfigFlags))
# placeholder for more advanced config, if needed
- result.addService ( G4UA__UserActionSvc(name, **kwargs) )
+ result.addService ( CompFactory.G4UA.UserActionSvc(name, **kwargs) )
return result
diff --git a/Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfigNew.py b/Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfigNew.py
index dd71829f9133c03ea1282b750fc7a61701849d0e..ad82680b8ac783ee9fcda35f9de47c5aca9e21f5 100644
--- a/Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfigNew.py
+++ b/Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfigNew.py
@@ -49,7 +49,7 @@ def generateFastSimulationListCfg(ConfigFlags):
FastSimulationList += [result.popToolsAndMerge(FCAL2FastShowerCfg(ConfigFlags))]
if ConfigFlags.Sim.LArParameterization > 1:
FastSimulationList += [ result.popToolsAndMerge(DeadMaterialShowerCfg(ConfigFlags)) ]
- elif ConfigFlags.Sim.LArParameterization() == 0:
+ elif ConfigFlags.Sim.LArParameterization == 0:
print( "getFastSimulationMasterTool INFO No Frozen Showers" )
#if ConfigFlags.Detector.GeometryMuon:
# if hasattr(simFlags, 'CavernBG') and simFlags.CavernBG.statusOn and simFlags.CavernBG.get_Value() != 'Read' and\
diff --git a/Simulation/G4Atlas/G4AtlasTools/python/G4GeometryToolConfig.py b/Simulation/G4Atlas/G4AtlasTools/python/G4GeometryToolConfig.py
index dbf74b2dd47962e377bba44d777cef4f9a74bc03..f7e175a12a7a93d8288161d48408b8d6a4849f00 100644
--- a/Simulation/G4Atlas/G4AtlasTools/python/G4GeometryToolConfig.py
+++ b/Simulation/G4Atlas/G4AtlasTools/python/G4GeometryToolConfig.py
@@ -16,10 +16,8 @@ from AtlasGeoModel.ForDetGeoModelConfig import ForDetGeometryCfg
CylindricalEnvelope, PolyconicalEnvelope, MaterialDescriptionTool,G4AtlasDetectorConstructionTool=CompFactory.getComps("CylindricalEnvelope","PolyconicalEnvelope","MaterialDescriptionTool","G4AtlasDetectorConstructionTool",)
from AthenaCommon.SystemOfUnits import mm, cm, m
-from past.builtins import xrange
#ToDo - finish migrating this (dnoel)
-#Todo - just return component accumulator
#to still migrate: getCavernWorld, getCavernInfraGeoDetectorTool
#from ForwardRegionProperties.ForwardRegionPropertiesToolConfig import ForwardRegionPropertiesCfg
@@ -31,7 +29,7 @@ def G4GeometryNotifierSvcCfg(ConfigFlags, name="G4GeometryNotifierSvc", **kwargs
kwargs.setdefault("ActivatePVNotifier", False)
return G4GeometryNotifierSvc(name, **kwargs)
-#tool cfg or just cfg?
+
def BeamPipeGeoDetectorToolCfg(ConfigFlags, name='BeamPipe', **kwargs):
#set up geometry
result=BeamPipeGeometryCfg(ConfigFlags)
@@ -39,16 +37,20 @@ def BeamPipeGeoDetectorToolCfg(ConfigFlags, name='BeamPipe', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
-def PixelGeoDetectorToolCfg(ConfigFlags, name='Pixel', **kwargs):
+def PixelGeoDetectorToolCfg(ConfigFlags, name='Pixel', **kwargs):
#set up geometry
result=InDetGeometryCfg(ConfigFlags)
kwargs.setdefault("DetectorName", "Pixel")
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def SCTGeoDetectorToolCfg(ConfigFlags, name='SCT', **kwargs):
#set up geometry
@@ -57,7 +59,9 @@ def SCTGeoDetectorToolCfg(ConfigFlags, name='SCT', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def TRTGeoDetectorToolCfg(ConfigFlags, name='TRT', **kwargs):
#set up geometry
@@ -66,7 +70,9 @@ def TRTGeoDetectorToolCfg(ConfigFlags, name='TRT', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def IDetServicesMatGeoDetectorToolCfg(ConfigFlags, name='IDetServicesMat', **kwargs):
#set up geometry
@@ -75,7 +81,9 @@ def IDetServicesMatGeoDetectorToolCfg(ConfigFlags, name='IDetServicesMat', **kwa
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def LArMgrGeoDetectorToolCfg(ConfigFlags, name='LArMgr', **kwargs):
#set up geometry
@@ -84,7 +92,9 @@ def LArMgrGeoDetectorToolCfg(ConfigFlags, name='LArMgr', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def TileGeoDetectorToolCfg(ConfigFlags, name='Tile', **kwargs):
#set up geometry
@@ -93,7 +103,9 @@ def TileGeoDetectorToolCfg(ConfigFlags, name='Tile', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def LucidGeoDetectorToolCfg(ConfigFlags, name='Lucid', **kwargs):
#set up geometry
@@ -102,7 +114,9 @@ def LucidGeoDetectorToolCfg(ConfigFlags, name='Lucid', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def ALFAGeoDetectorToolCfg(ConfigFlags, name='ALFA', **kwargs):
#set up geometry
@@ -111,7 +125,9 @@ def ALFAGeoDetectorToolCfg(ConfigFlags, name='ALFA', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def ZDCGeoDetectorToolCfg(ConfigFlags, name='ZDC', **kwargs):
#set up geometry
@@ -120,7 +136,9 @@ def ZDCGeoDetectorToolCfg(ConfigFlags, name='ZDC', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def AFPGeoDetectorToolCfg(ConfigFlags, name='AFP', **kwargs):
#set up geometry
@@ -130,7 +148,9 @@ def AFPGeoDetectorToolCfg(ConfigFlags, name='AFP', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def FwdRegionGeoDetectorToolCfg(ConfigFlags, name='FwdRegion', **kwargs):
#set up geometry
@@ -140,7 +160,9 @@ def FwdRegionGeoDetectorToolCfg(ConfigFlags, name='FwdRegion', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def MuonGeoDetectorToolCfg(ConfigFlags, name='Muon', **kwargs):
#set up geometry
@@ -149,7 +171,9 @@ def MuonGeoDetectorToolCfg(ConfigFlags, name='Muon', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return result, GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
#todo - set this up
def getCavernInfraGeoDetectorTool(ConfigFlags, name='CavernInfra', **kwargs):
@@ -158,12 +182,14 @@ def getCavernInfraGeoDetectorTool(ConfigFlags, name='CavernInfra', **kwargs):
#add the GeometryNotifierSvc
result.addService(G4GeometryNotifierSvcCfg(ConfigFlags))
kwargs.setdefault("GeometryNotifierSvc", result.getService("G4GeometryNotifierSvc"))
- return GeoDetectorTool(name, **kwargs)
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def IDETEnvelopeCfg(ConfigFlags, name="IDET", **kwargs):
result = ComponentAccumulator()
- isUpgrade = ConfigFlags.GeoModel.Run =="RUN4"
+ isUpgrade = ConfigFlags.GeoModel.Run =="RUN4"
isRUN2 = ConfigFlags.GeoModel.Run in ["RUN2", "RUN3"]
#isRUN1 = not (isRUN2 or isUpgrade) #not used, remove?
@@ -180,26 +206,24 @@ def IDETEnvelopeCfg(ConfigFlags, name="IDET", **kwargs):
SubDetectorList=[]
if ConfigFlags.Detector.GeometryPixel:
- accPixel, toolPixel = PixelGeoDetectorToolCfg(ConfigFlags)
- SubDetectorList += [toolPixel]
- result.merge(accPixel)
+ toolPixel = result.popToolsAndMerge(PixelGeoDetectorToolCfg(ConfigFlags))
+ SubDetectorList += [toolPixel]
if ConfigFlags.Detector.GeometrySCT:
- accSCT, toolSCT = SCTGeoDetectorToolCfg(ConfigFlags)
+ toolSCT = result.popToolsAndMerge(SCTGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [toolSCT]
- result.merge(accSCT)
if ConfigFlags.Detector.GeometryTRT and not isUpgrade:
- accTRT, toolTRT = TRTGeoDetectorToolCfg(ConfigFlags)
+ toolTRT = result.popToolsAndMerge(TRTGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [toolTRT]
- result.merge(accTRT)
- accIDetServices, toolIDetServices = IDetServicesMatGeoDetectorToolCfg(ConfigFlags)
+ toolIDetServices = result.popToolsAndMerge(IDetServicesMatGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [toolIDetServices]
- result.merge(accIDetServices)
kwargs.setdefault("SubDetectors", SubDetectorList)
- return result, CylindricalEnvelope(name, **kwargs)
+ result.setPrivateTools(CylindricalEnvelope(name, **kwargs))
+ return result
+
def CALOEnvelopeCfg(ConfigFlags, name="CALO", **kwargs):
- result = ComponentAccumulator()
+ result = ComponentAccumulator()
kwargs.setdefault("DetectorName", "CALO")
kwargs.setdefault("NSurfaces", 18)
@@ -208,15 +232,15 @@ def CALOEnvelopeCfg(ConfigFlags, name="CALO", **kwargs):
kwargs.setdefault("ZSurfaces", [-6781.,-6735.,-6735.,-6530.,-6530.,-4587.,-4587.,-3475.,-3475.,3475.,3475.,4587.,4587.,6530.,6530.,6735.,6735.,6781.]) #FIXME Units?
SubDetectorList=[]
if ConfigFlags.Detector.GeometryLAr:
- accLArMgr, toolLArMgr = LArMgrGeoDetectorToolCfg(ConfigFlags)
+ toolLArMgr = result.popToolsAndMerge(LArMgrGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolLArMgr ]
- result.merge(accLArMgr)
if ConfigFlags.Detector.GeometryTile:
- accTile, toolTile = TileGeoDetectorToolCfg(ConfigFlags)
+ toolTile = result.popToolsAndMerge(TileGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolTile ]
- result.merge(accTile)
kwargs.setdefault("SubDetectors", SubDetectorList)
- return result, PolyconicalEnvelope(name, **kwargs)
+ result.setPrivateTools(PolyconicalEnvelope(name, **kwargs))
+ return result
+
def ForwardRegionEnvelopeCfg(ConfigFlags, name='ForwardRegion', **kwargs):
result = ComponentAccumulator()
@@ -225,27 +249,26 @@ def ForwardRegionEnvelopeCfg(ConfigFlags, name='ForwardRegion', **kwargs):
SubDetectorList=[]
if ConfigFlags.Detector.SimulateFwdRegion:
- accFwdRegion, toolFwdRegion = FwdRegionGeoDetectorToolCfg(ConfigFlags)
+ toolFwdRegion = result.popToolsAndMerge(FwdRegionGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolFwdRegion ]
- result.merge(accFwdRegion)
#TODO - migrate this over (WIP at the moment) (dnoel)
#toolFwdRegionProperties = ForwardRegionPropertiesCfg(ConfigFlags)
#result.addPublicTool(toolFwdRegionProperties) #add this as a service later?
if ConfigFlags.Detector.GeometryZDC:
- accZDC, toolZDC = ZDCGeoDetectorToolCfg(ConfigFlags)
+ toolZDC = result.popToolsAndMerge(ZDCGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolZDC ]
- result.merge(accZDC)
if ConfigFlags.Detector.GeometryALFA:
- accALFA, toolALFA = ALFAGeoDetectorToolCfg(ConfigFlags)
+ toolALFA = result.popToolsAndMerge(ALFAGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolALFA ]
- result.merge(accALFA)
if ConfigFlags.Detector.GeometryAFP:
- accAFP, toolAFP = AFPGeoDetectorToolCfg(ConfigFlags)
+ toolAFP = result.popToolsAndMerge(AFPGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolAFP ]
- result.merge(accAFP)
kwargs.setdefault("SubDetectors", SubDetectorList)
- return result, GeoDetectorTool(name, **kwargs) ##FIXME Should this really be a GeoDetectorTool???
+ ##FIXME Should this really be a GeoDetectorTool???
+ result.setPrivateTools(GeoDetectorTool(name, **kwargs))
+ return result
+
def MUONEnvelopeCfg(ConfigFlags, name="MUONQ02", **kwargs): #FIXME rename to MUON when safe (IS IT SAFE?))
result = ComponentAccumulator()
@@ -257,12 +280,13 @@ def MUONEnvelopeCfg(ConfigFlags, name="MUONQ02", **kwargs): #FIXME rename to MUO
kwargs.setdefault("ZSurfaces", [-26046.,-23001.,-23001.,-22030.,-22030.,-18650.,-18650.,-12900.,-12900.,-6783.,-6783.,-6736.,-6736.,-6550.,-6550.,-4000.,-4000.,4000.,4000.,6550.,6550.,6736.,6736.,6783.,6783.,12900.,12900.,18650.,18650.,22030.,22030.,23001.,23001.,26046.]) #FIXME Units?
SubDetectorList=[]
if ConfigFlags.Detector.SimulateMuon:
- accMuon, toolMuon = MuonGeoDetectorToolCfg(ConfigFlags)
+ toolMuon = result.popToolsAndMerge(MuonGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolMuon ]
- result.merge(accMuon)
kwargs.setdefault("SubDetectors", SubDetectorList)
- return result, PolyconicalEnvelope(name, **kwargs)
+ result.setPrivateTools(PolyconicalEnvelope(name, **kwargs))
+ return result
+
def CosmicShortCutCfg(ConfigFlags, name="CosmicShortCut", **kwargs):
kwargs.setdefault("DetectorName", "TTR_BARREL")
@@ -274,6 +298,7 @@ def CosmicShortCutCfg(ConfigFlags, name="CosmicShortCut", **kwargs):
kwargs.setdefault("SubDetectors", SubDetectorList)
return PolyconicalEnvelope(name, **kwargs)
+
def generateSubDetectorList(ConfigFlags):
result = ComponentAccumulator()
SubDetectorList=[]
@@ -283,34 +308,33 @@ def generateSubDetectorList(ConfigFlags):
SubDetectorList += [ CosmicShortCutCfg(ConfigFlags) ]
if ConfigFlags.Detector.SimulateMuon:
- accMuon, toolMuon = MUONEnvelopeCfg(ConfigFlags)
+ accMuon = MUONEnvelopeCfg(ConfigFlags)
+ toolMuon = accMuon.popPrivateTools()
SubDetectorList += [ toolMuon ] #FIXME rename to MUON when safe
- result.merge(accMuon)
if ConfigFlags.Detector.SimulateID:
- accIDET, toolIDET = IDETEnvelopeCfg(ConfigFlags)
+ toolIDET = result.popToolsAndMerge(IDETEnvelopeCfg(ConfigFlags))
SubDetectorList += [ toolIDET ]
- result.merge(accIDET)
if ConfigFlags.Detector.SimulateCalo:
- accCALO, toolCALO = CALOEnvelopeCfg(ConfigFlags)
+ toolCALO = result.popToolsAndMerge(CALOEnvelopeCfg(ConfigFlags))
SubDetectorList += [ toolCALO ]
- result.merge(accCALO)
+ if ConfigFlags.Detector.SimulateMuon:
+ result.merge(accMuon) #add the acc later to match the old style config
if ConfigFlags.Detector.SimulateBpipe:
- accBpipe, toolBpipe = BeamPipeGeoDetectorToolCfg(ConfigFlags)
+ toolBpipe = result.popToolsAndMerge(BeamPipeGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolBpipe ]
- result.merge(accBpipe)
if ConfigFlags.Detector.GeometryLucid:
- accLucid, toolLucid = LucidGeoDetectorToolCfg(ConfigFlags)
+ toolLucid = result.popToolsAndMerge(LucidGeoDetectorToolCfg(ConfigFlags))
SubDetectorList += [ toolLucid ]
- result.merge(accLucid)
- if ConfigFlags.Detector.SimulateForward:
- AccForward, toolForward = ForwardRegionEnvelopeCfg(ConfigFlags)
+ if ConfigFlags.Detector.SimulateForward:
+ toolForward = result.popToolsAndMerge(ForwardRegionEnvelopeCfg(ConfigFlags))
SubDetectorList += [ toolForward ]
- result.merge(AccForward)
#if DetFlags.Muon_on(): #HACK
# SubDetectorList += ['MUONQ02'] #FIXME rename to MUON when safe #HACK
#SubDetectorList += generateFwdSubDetectorList() #FIXME Fwd Detectors not supported yet.
- return result, SubDetectorList
+ result.setPrivateTools(SubDetectorList)
+ return result
+
def ATLASEnvelopeCfg(ConfigFlags, name="Atlas", **kwargs):
result = ComponentAccumulator()
@@ -343,14 +367,14 @@ def ATLASEnvelopeCfg(ConfigFlags, name="Atlas", **kwargs):
outerRadii[i] = AtlasForwardOuterR
for i in (4, 5, 12, 13):
outerRadii[i] = AtlasOuterR2
- for i in xrange(6, 12):
+ for i in range(6, 12):
outerRadii[i] = AtlasOuterR1
## World R range
if ConfigFlags.Sim.WorldRRange:
routValue = ConfigFlags.Sim.WorldRRange
if ConfigFlags.Sim.WorldRRange > max(AtlasOuterR1, AtlasOuterR2):
- for i in xrange(4, 14):
+ for i in range(4, 14):
outerRadii[i] = routValue
else:
raise RuntimeError('getATLASEnvelope: ERROR ConfigFlags.Sim.WorldRRange must be > %f. Current value %f' % (max(AtlasOuterR1, AtlasOuterR2), routValue) )
@@ -358,7 +382,7 @@ def ATLASEnvelopeCfg(ConfigFlags, name="Atlas", **kwargs):
## ZSurfaces
zSurfaces = [-26046., -23001., -23001., -22031., -22031., -12899., -12899., -6741., -6741., 6741., 6741., 12899., 12899., 22031., 22031., 23001., 23001., 26046.] # FIXME units mm??
-
+
if ConfigFlags.Detector.SimulateForward:
zSurfaces[0] = -400000.
zSurfaces[17] = 400000.
@@ -380,15 +404,16 @@ def ATLASEnvelopeCfg(ConfigFlags, name="Atlas", **kwargs):
zSurfaces[4] = -ConfigFlags.Sim.WorldZRange
kwargs.setdefault("ZSurfaces", zSurfaces)
- accSubDetectors, SubDetectorList = generateSubDetectorList(ConfigFlags)
+ SubDetectorList = result.popToolsAndMerge(generateSubDetectorList(ConfigFlags))
kwargs.setdefault("SubDetectors", SubDetectorList)
- result.merge(accSubDetectors)
+ result.setPrivateTools(PolyconicalEnvelope(name, **kwargs))
+ return result
- return result, PolyconicalEnvelope(name, **kwargs)
def G4AtlasDetectorConstructionToolCfg(ConfigFlags, name="G4AtlasDetectorConstructionTool", **kwargs):
return G4AtlasDetectorConstructionTool(name, **kwargs)
+
def MaterialDescriptionToolCfg(ConfigFlags, name="MaterialDescriptionTool", **kwargs):
## kwargs.setdefault("SomeProperty", aValue)
return MaterialDescriptionTool(name, **kwargs)
diff --git a/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_Simtest.py b/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_Simtest.py
index 4b868dacd5a656808c07906c62d7dac399844999..4e53cae04e5075cfc3a22153ead4bae1bc88a3ec 100755
--- a/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_Simtest.py
+++ b/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_Simtest.py
@@ -61,34 +61,33 @@ if __name__ == '__main__':
## Initialize a new component accumulator
cfg = ComponentAccumulator()
- acc, tool = BeamPipeGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc)
+ acc = BeamPipeGeoDetectorToolCfg(ConfigFlags)
+ tool = cfg.popToolsAndMerge(acc)
cfg.addPublicTool(tool)
- acc1, tool1 = PixelGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc1)
- cfg.addPublicTool(tool1)
-
- acc2, tool2 = SCTGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc2)
- cfg.addPublicTool(tool2)
-
- acc3, tool3 = TRTGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc3)
- cfg.addPublicTool(tool3)
-
- acc4, tool4 = IDETEnvelopeCfg(ConfigFlags)
- cfg.merge(acc4)
- cfg.addPublicTool(tool4)
-
- acc6,tool6 = CALOEnvelopeCfg(ConfigFlags)
- cfg.merge(acc6)
- cfg.addPublicTool(tool6)
+ acc = PixelGeoDetectorToolCfg(ConfigFlags)
+ tool = cfg.popToolsAndMerge(acc)
+ cfg.addPublicTool(tool)
+
+ acc = SCTGeoDetectorToolCfg(ConfigFlags)
+ tool = cfg.popToolsAndMerge(acc)
+ cfg.addPublicTool(tool)
+ acc = SCTGeoDetectorToolCfg(ConfigFlags)
+ tool = cfg.popToolsAndMerge(acc)
+ cfg.addPublicTool(tool)
+
+ acc = IDETEnvelopeCfg(ConfigFlags)
+ tool = cfg.popToolsAndMerge(acc)
+ cfg.addPublicTool(tool)
+
+ acc = CALOEnvelopeCfg(ConfigFlags)
+ tool = cfg.popToolsAndMerge(acc)
+ cfg.addPublicTool(tool)
- accATLAS,toolATLAS = ATLASEnvelopeCfg(ConfigFlags)
- cfg.merge(accATLAS)
- cfg.addPublicTool(toolATLAS)
+ acc = ATLASEnvelopeCfg(ConfigFlags)
+ tool = cfg.popToolsAndMerge(acc)
+ cfg.addPublicTool(tool)
cfg.printConfig(withDetails=True, summariseProps = True)
ConfigFlags.dump()
diff --git a/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_test.py b/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_test.py
index 345eb3709b3246a7a2b7dd7f5ef64ccdb82e69cd..e9d2e1a6ffdf55e77a4a32bb04bd8bd3e8ca294a 100755
--- a/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_test.py
+++ b/Simulation/G4Atlas/G4AtlasTools/test/G4GeometryToolConfig_test.py
@@ -67,55 +67,41 @@ if __name__ == '__main__':
## Initialize a new component accumulator
cfg = ComponentAccumulator()
- acc, tool = BeamPipeGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc)
+ tool = cfg.popToolsAndMerge(BeamPipeGeoDetectorToolCfg(ConfigFlags))
cfg.addPublicTool(tool)
- acc1, tool1 = PixelGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc1)
- cfg.addPublicTool(tool1)
-
- acc2, tool2 = SCTGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc2)
- cfg.addPublicTool(tool2)
-
- acc3, tool3 = TRTGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc3)
- cfg.addPublicTool(tool3)
-
- acc4, tool4 = IDETEnvelopeCfg(ConfigFlags)
- cfg.merge(acc4)
- cfg.addPublicTool(tool4)
-
-
- acc5,tool5 = ForwardRegionEnvelopeCfg(ConfigFlags)
- cfg.merge(acc5)
- cfg.addPublicTool(tool5)
-
- acc6,tool6 = CALOEnvelopeCfg(ConfigFlags)
- cfg.merge(acc6)
- cfg.addPublicTool(tool6)
-
- acc7, tool7 = LucidGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc7)
- cfg.addPublicTool(tool7)
-
- acc8, tool8 = ALFAGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc8)
- cfg.addPublicTool(tool8)
-
- acc9, tool9 = ZDCGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc9)
- cfg.addPublicTool(tool9)
+ tool = cfg.popToolsAndMerge(PixelGeoDetectorToolCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
+
+ tool = cfg.popToolsAndMerge(SCTGeoDetectorToolCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
+
+ tool = cfg.popToolsAndMerge(TRTGeoDetectorToolCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
+
+ tool = cfg.popToolsAndMerge(IDETEnvelopeCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
+
+ tool = cfg.popToolsAndMerge(ForwardRegionEnvelopeCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
+
+ tool = cfg.popToolsAndMerge(CALOEnvelopeCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
+
+ tool = cfg.popToolsAndMerge(LucidGeoDetectorToolCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
- acc10, tool10 = AFPGeoDetectorToolCfg(ConfigFlags)
- cfg.merge(acc10)
- cfg.addPublicTool(tool10)
+ tool = cfg.popToolsAndMerge(ALFAGeoDetectorToolCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
+ tool = cfg.popToolsAndMerge(ZDCGeoDetectorToolCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
+
+ tool = cfg.popToolsAndMerge(AFPGeoDetectorToolCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
- accATLAS,toolATLAS = ATLASEnvelopeCfg(ConfigFlags)
- cfg.merge(accATLAS)
- cfg.addPublicTool(toolATLAS)
+ tool = cfg.popToolsAndMerge(ATLASEnvelopeCfg(ConfigFlags))
+ cfg.addPublicTool(tool)
cfg.addPublicTool(MaterialDescriptionToolCfg(ConfigFlags))
diff --git a/Simulation/G4Sim/MCTruthBase/python/MCTruthBaseConfigNew.py b/Simulation/G4Sim/MCTruthBase/python/MCTruthBaseConfigNew.py
index 83e8b1ccd39700bd55ef7ea0f644267c6a481f3a..ffccd207f10f0e201bf029837f99eda9df30c793 100644
--- a/Simulation/G4Sim/MCTruthBase/python/MCTruthBaseConfigNew.py
+++ b/Simulation/G4Sim/MCTruthBase/python/MCTruthBaseConfigNew.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from MCTruthBase.MCTruthBaseConf import G4UA__MCTruthSteppingActionTool
+from AthenaConfiguration.ComponentFactory import CompFactory
def getEnvelopeMap(ConfigFlags):
#from G4AtlasApps.SimFlags import simFlags
@@ -52,5 +52,5 @@ def MCTruthSteppingActionToolCfg(ConfigFlags, name='G4UA::MCTruthSteppingActionT
result = ComponentAccumulator()
kwargs.setdefault("VolumeCollectionMap", getEnvelopeMap(ConfigFlags))
- result.setPrivateTools( G4UA__MCTruthSteppingActionTool(name, **kwargs) )
+ result.setPrivateTools( CompFactory.G4UA.MCTruthSteppingActionTool(name, **kwargs) )
return result
diff --git a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigNew.py b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigNew.py
index 447a6eeb7447ee52ab5028e3e61308a7606ad841..1175c4f5aaf63793ed805bc333c51e2105a6846d 100644
--- a/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigNew.py
+++ b/Simulation/G4Utilities/G4UserActions/python/G4UserActionsConfigNew.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from G4UserActions.G4UserActionsConf import G4UA__AthenaStackingActionTool, G4UA__AthenaTrackingActionTool, G4UA__LooperKillerTool, G4UA__G4SimTimerTool, G4UA__G4TrackCounterTool
+from AthenaConfiguration.ComponentFactory import CompFactory
# this is a bit cumbersome, but it seems ike it is a lot easier to separate
# the getter functionality from all the rest (i.e. adding the action).
@@ -31,7 +31,7 @@ def AthenaStackingActionToolCfg(ConfigFlags, name='G4UA::AthenaStackingActionToo
kwargs.setdefault('PRRWeight', ConfigFlags.Sim.PRRWeight)
kwargs.setdefault('IsISFJob', ConfigFlags.Sim.ISFRun)
- result.setPrivateTools( G4UA__AthenaStackingActionTool(name,**kwargs) )
+ result.setPrivateTools( CompFactory.G4UA.AthenaStackingActionTool(name,**kwargs) )
return result
@@ -45,21 +45,21 @@ def AthenaTrackingActionToolCfg(ConfigFlags, name='G4UA::AthenaTrackingActionToo
subDetLevel=2
kwargs.setdefault('SubDetVolumeLevel', subDetLevel)
- result.setPrivateTools( G4UA__AthenaTrackingActionTool(name,**kwargs) )
+ result.setPrivateTools( CompFactory.G4UA.AthenaTrackingActionTool(name,**kwargs) )
return result
def LooperKillerToolCfg(ConfigFlags, name='G4UA::LooperKillerTool', **kwargs):
result = ComponentAccumulator()
- result.setPrivateTools(G4UA__LooperKillerTool(name, **kwargs))
+ result.setPrivateTools(CompFactory.G4UA.LooperKillerTool(name, **kwargs))
return result
def G4SimTimerToolCfg(ConfigFlags, name='G4UA::G4SimTimerTool', **kwargs):
result = ComponentAccumulator()
- result.setPrivateTools(G4UA__G4SimTimerTool(name,**kwargs))
+ result.setPrivateTools(CompFactory.G4UA.G4SimTimerTool(name,**kwargs))
return result
def G4TrackCounterToolCfg(ConfigFlags, name='G4UA::G4TrackCounterTool', **kwargs):
result = ComponentAccumulator()
- result.setPrivateTools(G4UA__G4TrackCounterTool(name,**kwargs))
+ result.setPrivateTools(CompFactory.G4UA.G4TrackCounterTool(name,**kwargs))
return result
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
index bad7ab36aaaa991afe7e938da3fc09481893c777..b710e4f3e15caaa13a81c6bde37b776f42d30003 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
@@ -61,8 +61,8 @@ namespace ISFTesting {
MOCK_CONST_METHOD3(convertHepMCToG4Event, StatusCode(McEventCollection&,
G4Event*&,
EBC_EVCOLL kindOfCollection));
- MOCK_CONST_METHOD2(ISF_to_G4Event, G4Event*(const std::vector<const ISF::ISFParticle*>&,
- HepMC::GenEvent*));
+ MOCK_CONST_METHOD3(ISF_to_G4Event, G4Event*(const std::vector<const ISF::ISFParticle*>&,
+ HepMC::GenEvent*,bool));
}; // MockInputConverter class
diff --git a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/IInputConverter.h b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/IInputConverter.h
index 6c51d93c65fcd10eca5e96c336ec2b13c258a8b9..7704350b97012c227ef6981f87fe6ea984b638f1 100644
--- a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/IInputConverter.h
+++ b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/IInputConverter.h
@@ -62,7 +62,7 @@ namespace ISF {
EBC_EVCOLL kindOfCollection=EBC_MAINEVCOLL) const = 0;
/** Converts vector of ISF::ISFParticles to G4Event */
- virtual G4Event* ISF_to_G4Event(const std::vector<const ISF::ISFParticle*>& isp, HepMC::GenEvent *genEvent) const = 0;
+ virtual G4Event* ISF_to_G4Event(const std::vector<const ISF::ISFParticle*>& isp, HepMC::GenEvent *genEvent, bool useHepMC=false) const = 0;
};
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigNew.py b/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigNew.py
index 73ab703f1509254de8fe5a7f980ca06f204040c9..bf8300e697ee492f57bcd558706dbcd01e6c499d 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigNew.py
+++ b/Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfigNew.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
"""
Service configurations for ISF
@@ -109,10 +109,11 @@ def GenericTruthServiceCfg(ConfigFlags, name="ISF_TruthService", **kwargs):
kwargs.setdefault('SkipIfNoChildren', True)
kwargs.setdefault('SkipIfNoParentBarcode', True)
kwargs.setdefault('ForceEndVtxInRegions', [])
- #long_lived_simulators = ['LongLived', 'longLived', 'QS']
- #from ISF_Config.ISF_jobProperties import ISF_Flags
- #is_long_lived_simulation = any(x in ISF_Flags.Simulator() for x in long_lived_simulators) #FIXME this should be set in a nicer way.
- is_long_lived_simulation = True
+
+ # Mimics old configuration, which is marked as `#FIXME this should be set in a nicer way.'
+ long_lived_simulators = ['LongLived', 'longLived', 'QS']
+ simulator = ConfigFlags.Sim.ISF.Simulator
+ is_long_lived_simulation = any(x in simulator for x in long_lived_simulators)
if is_long_lived_simulation:
kwargs.setdefault('QuasiStableParticlesIncluded', True)
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
index 0e4b6e5874a49b300a2b8ec7ca9a53b06632db44..dedd061406f439f7f28f8d7f33c806586e64971e 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx
@@ -327,7 +327,7 @@ ISF::InputConverter::passesFilters(const HepMC::GenParticle& part) const
//________________________________________________________________________
-G4Event* ISF::InputConverter::ISF_to_G4Event(const ISF::ConstISFParticleVector& ispVector, HepMC::GenEvent *genEvent) const
+G4Event* ISF::InputConverter::ISF_to_G4Event(const ISF::ConstISFParticleVector& ispVector, HepMC::GenEvent *genEvent, bool useHepMC) const
{
const int eventID(1);
G4Event *g4evt = new G4Event(eventID);
@@ -351,7 +351,7 @@ G4Event* ISF::InputConverter::ISF_to_G4Event(const ISF::ConstISFParticleVector&
}
continue;
}
- this->addG4PrimaryVertex(g4evt,isp);
+ this->addG4PrimaryVertex(g4evt,isp,useHepMC);
n_pp++;
}
@@ -459,7 +459,7 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const HepMC::GenPar
//________________________________________________________________________
-G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const ISF::ISFParticle& isp) const
+G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const ISF::ISFParticle& isp, bool useHepMC) const
{
ATH_MSG_VERBOSE("Creating G4PrimaryParticle from ISFParticle.");
@@ -487,7 +487,7 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const ISF::ISFParti
G4double px(0.0);
G4double py(0.0);
G4double pz(0.0);
- if(genpart) {
+ if(useHepMC && genpart) {
auto &genpartMomentum = genpart->momentum();
px = genpartMomentum.x();
py = genpartMomentum.y();
@@ -576,7 +576,7 @@ G4PrimaryParticle* ISF::InputConverter::getG4PrimaryParticle(const ISF::ISFParti
}
//________________________________________________________________________
-void ISF::InputConverter::addG4PrimaryVertex(G4Event* g4evt, const ISF::ISFParticle& isp) const
+void ISF::InputConverter::addG4PrimaryVertex(G4Event* g4evt, const ISF::ISFParticle& isp, bool useHepMC) const
{
/*
see conversion from PrimaryParticleInformation to TrackInformation in
@@ -588,7 +588,7 @@ void ISF::InputConverter::addG4PrimaryVertex(G4Event* g4evt, const ISF::ISFParti
that we don't miss something
*/
- G4PrimaryParticle *g4particle = this->getG4PrimaryParticle( isp );
+ G4PrimaryParticle *g4particle = this->getG4PrimaryParticle( isp, useHepMC );
if (!g4particle) {
ATH_MSG_ERROR("Failed to create G4PrimaryParticle for ISParticle (" << isp <<")");
return;
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.h b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.h
index 707ad17f0a4b48ae711d6b3f083165cf8ce79d02..6e15cc8ee06da3387135694bc172e70b7e2ead6b 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.h
+++ b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.h
@@ -77,7 +77,7 @@ namespace ISF {
EBC_EVCOLL kindOfCollection=EBC_MAINEVCOLL) const override final;
/** Converts vector of ISF::ISFParticles to G4Event */
- G4Event* ISF_to_G4Event(const std::vector<const ISF::ISFParticle*>& isp, HepMC::GenEvent *genEvent) const override final;
+ G4Event* ISF_to_G4Event(const std::vector<const ISF::ISFParticle*>& isp, HepMC::GenEvent *genEvent, bool useHepMC=false) const override final;
private:
@@ -85,9 +85,9 @@ namespace ISF {
G4PrimaryParticle* getG4PrimaryParticle(const HepMC::GenParticle& gp) const;
- G4PrimaryParticle* getG4PrimaryParticle(const ISF::ISFParticle& isp) const;
+ G4PrimaryParticle* getG4PrimaryParticle(const ISF::ISFParticle& isp, bool useHepMC) const;
- void addG4PrimaryVertex(G4Event* g4evt, const ISF::ISFParticle& isp) const;
+ void addG4PrimaryVertex(G4Event* g4evt, const ISF::ISFParticle& isp, bool useHepMC) const;
/** Tests whether the given ISFParticle is within the Geant4 world volume */
bool isInsideG4WorldVolume(const ISF::ISFParticle& isp, const G4VSolid* worldSolid) const;
diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyAndHitGAN.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyAndHitGAN.cxx
index a4a241619301a932489ada786996a82d6f88a80e..d73451fc8184828c77a1b96e7de5f471608bcf7e 100644
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyAndHitGAN.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyAndHitGAN.cxx
@@ -64,7 +64,7 @@ unsigned int TFCSEnergyAndHitGAN::get_nr_of_init(unsigned int bin) const
void TFCSEnergyAndHitGAN::set_nr_of_init(unsigned int bin,unsigned int ninit)
{
- if(bin<=m_bin_ninit.size()) {
+ if(bin>=m_bin_ninit.size()) {
m_bin_ninit.resize(bin+1,0);
m_bin_ninit.shrink_to_fit();
}
@@ -164,8 +164,13 @@ void TFCSEnergyAndHitGAN::GetBinning(int pid,int etaMid,std::string FastCaloGANI
std::string name = "hist_pid_" + std::to_string(nodePid) + "_etaSliceNumber_" + std::to_string(EtaMaxList.size()) + "_layer_" + std::to_string(layer);
int xBins = edges.size()-1;
- if (xBins == 0) xBins = 1; //remove warning
+ if (xBins == 0) {
+ xBins = 1; //remove warning
+ edges.push_back(0);
+ edges.push_back(1);
+ }
binsInLayer[layer] = TH2D(name.c_str(), name.c_str(), xBins, &edges[0], binsInAlpha, -TMath::Pi(), TMath::Pi());
+ binsInLayer[layer].SetDirectory(0);
}
}
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
index 10f6b5b98f0f7a23a21fa21a4fdf01dd35f77440..b7ef92c01c310d0b959005377984fcb898b8e66c 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsMS/src/SimHitCreatorMS.cxx
@@ -20,13 +20,11 @@
#include "MuonReadoutGeometry/MMReadoutElement.h"
#include "MuonReadoutGeometry/sTgcReadoutElement.h"
#include "MuonReadoutGeometry/MuonDetectorManager.h"
-#include "MuonIdHelpers/MuonIdHelperTool.h"
#include "MuonSimEvent/MdtHitIdHelper.h"
#include "MuonSimEvent/RpcHitIdHelper.h"
#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"
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
index 60f1e6591d484a2882c76982225f95d65ec68c35..abd1dc8185d4847ba188386f7b501754d87c043d 100755
--- a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_G4MS_ttbar.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
index c448a264057c5351e4af1ff35e972478ff07fad0..f7f12db5929d6e7b77e216d26dcff666f6aa8434 100755
--- a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTIIF_ttbar.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
index a4f87f2e703b18b18f5f326d03eac89617f8b086..7a0ff9d1b6273ba43910c331b0ae862b2f14bd94 100755
--- a/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_MC16_ATLFASTII_ttbar.sh
@@ -34,7 +34,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh b/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh
index 8211319b8e51892a68ad256b1bf36d4b14e668dd..791f9b5a9b42212b44044e70c38970877b9a35a5 100755
--- a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ZPrimebb_ExtraParticles.sh
@@ -33,7 +33,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh
index fc398cbd57bb825ecc730d415751b097f9b0c474..2db51c511c87e892f1f60a6a1ca1cfe275ac5a23 100755
--- a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_QS_ttbar.sh
@@ -33,7 +33,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
index 06a925ce038c46bb250b13156a67fa321cc3ff9a..6e24dc8dd605ce8ebbaa382b2f4c4b1cc294cc06 100755
--- a/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_MC16_FullG4_ttbar.sh
@@ -33,7 +33,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_RUN3Sym_FullG4_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_RUN3Sym_FullG4_ttbar.sh
index fa3a331a325258cfa1ce8a7c258a5c63dc7bef70..acc3a421026ec4a176fe73c587f7a39d398281c5 100755
--- a/Simulation/ISF/ISF_Validation/test/test_RUN3Sym_FullG4_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_RUN3Sym_FullG4_ttbar.sh
@@ -31,6 +31,6 @@ echo "art-result: $? simulation"
ArtPackage=$1
ArtJobName=$2
# TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
echo "art-result: $? regression"
diff --git a/Simulation/ISF/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh
index 2f984a95c594731e365ae05a4a349b4e71438831..0086bce19ae57c04aeea3d0882502d5d4a2097c4 100755
--- a/Simulation/ISF/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_RUN3_FullG4_ttbar.sh
@@ -31,6 +31,6 @@ echo "art-result: $? simulation"
ArtPackage=$1
ArtJobName=$2
# TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
echo "art-result: $? regression"
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
index dd0bb0f4ae2eb935b9c7511a8e70fe0a77c57939..3807e8ac5958167af590d3795ee05e5a993cbecd 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
index 8ac8d0dee368c37678e095241d9e000c43af3470..29bd0ffa5252446ba9a1869cc6d8680e07b6df89 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
index b21b047400c90a02618e42745de281f069f4cc75..d715488d1baccbd52f85250552ce3e4b1bde9a5b 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
index 926be3d19d786ca063ec3b168f224e85d14471d2..71b7ed816b91a23db3436b3bb12e1b3bafcce85e 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
@@ -33,7 +33,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
index 9f486bb7e93e0200afcd2772122d359984d31ae4..cade24f71d332d9098b9054ed8a4b05fa447d6df 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
@@ -34,7 +34,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
index 4554d06dcf95635ab9fbeade247919d555f91a6d..2ca5c88a1b9fcff78a567de702aea4aec6d9d1f3 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
@@ -31,7 +31,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
index 847cd6a230016f23dbbc8dd2c2cb6b5468885229..9286cb6d8da2fdbc5ac1590038e03d82365f0575 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh
index de825aec650f06b373f897710b0427135922c92d..08a104a5dde0513d631047aa43955f6269f4ea9e 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh
index 0b93521912c80f7bbed9dd2b4a13f84f11451563..2f8f83a5f661dbf7a3de7a5dd5f1a00a346557c1 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh
@@ -31,7 +31,7 @@ then
ArtPackage=$1
ArtJobName=$2
# TODO This is a regression test I think. We would also need to compare these files to fixed references
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh
index 46be7a28f3a4f76fe8de0df8b64324713f12dfc4..a668b902b541f7a85f79e70a4225a06ebe9f3ba0 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh
index 12e970bfa22319544fa874dfdaee31655d25fdcf..89d959ecc89f4500b7cb1b09999439deaef12dcc 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh
index b5d84cfd80c7f3ae5ab0364fe16c79be8456fda7..192c4c317dacfa557b3cd890dcc1aef7c6312d9b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
index f9fc64f0eb06bccb5b7a1befb1ff33ab794079c1..5c29ea388b0d1e7c32bc09c3606d1bf3f6b78980 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
index 6b7e34608a6aaf2c568189dac4f8bb79e02e30de..37ad57f2f4edfaacf5e8ae61ae283928b7de2a02 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
index 5b305e5b9a45cdbbaf9ab11213c90e48e3e5a474..b78421ed3575953563c5be90783400eb6b66f533 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
@@ -35,7 +35,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 2 ${ArtPackage} ${ArtJobName} --mode=summary --diff-root --file=*EVNT.pool.root
+ art.py compare grid --entries 2 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --diff-root --file=*EVNT.pool.root
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh
index a72539cdd3fafdd558437c86ea0b4d9f59852c5f..3f6c8a4ab17afaa1de1c0948a91d91dfeab2fd94 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
index 107a6952a0aff168007a39c49b27a2a7ca377af5..9f3be73bca8fcbc5ed78df3f85f6d889b017826b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
index ab8fa95501eb36b05329151d98f2ee6c814cff88..93b2a4b852b7245822c0511f22d61b862eb6accd 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh
index b4651282b1de330cc6af61cedb4111bf9576709a..1ef7183e36c8f1eb21d3e53756ea1022509ac120 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh
@@ -31,7 +31,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh
index 5f114ceae39209ceb1fc9c6a9d37834ccf531cb4..94d84c7494d963320e643ec4477f59a8ce250a4a 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
index 4516db5bc4143f1747dbeb222ac2e65a489478b2..8604fcb483228ff491c7373ad5f8348fac2699a6 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 1 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 1 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
index bde954c0fd8d3d2532a8d315eddeff9672bfa17e..ffa6b02dcabb44132fefb02927c99477841a5655 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
@@ -31,7 +31,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest_NewGeoConf.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest_NewGeoConf.sh
index b5b10f7fc58d3e2f1f68a7f4782485fdd94722dd..381c4d7154e5831b0d16eb59903785a3059e8b3e 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest_NewGeoConf.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest_NewGeoConf.sh
@@ -27,7 +27,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest_OldGeoConf.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest_OldGeoConf.sh
index 1231e23895a633475c4434cd31fea59670504970..50330af5a4a2339029b8b789b9f42648485dbc69 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest_OldGeoConf.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest_OldGeoConf.sh
@@ -28,7 +28,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
index ad57c0fc0300542a429f57637f35889dab43de2d..476bc73e4519a1dbfc480792df8d182ccf3cc40c 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
@@ -31,7 +31,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh
index f9d6074327105f98efa8f8819d5692760504111d..f158eb8a9222189ec2de7986a095d24a49eda69d 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
index 81245e5de9b03a332124e5f3a2510a24d33743ed..e901d857c6bfd1531a62640d87e59ca4636e0a3b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
@@ -30,7 +30,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh
index 833bfe952ff469b1f210915c6fd9757f57ca8ccd..1923625cad978cccaaa7c76af8c0fb900419fca9 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh
@@ -31,7 +31,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh
index db2e72c19265b985b873c8e931bb04642f6c5c4b..9287c7418d92522b42e135d9fdd2f0942053ab46 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh
index 41ec19f3f6b8676e581d43184b06a857ffc3d14e..7e00f6f6af2657209e6233e1357634fef28acc27 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh
@@ -31,7 +31,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
index 4c31a4521de0d7082e880fb58dad6f758e123a45..3edb158742d7b42979fb47bf14f30bff164b298b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
index 9accbb9b641ac343c47540189fac3d5e946c478a..1c5beee26d4ce730eb1c181cdd7c9d55ba812df5 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
index 93e2d697da734f8c6043418b01737749272cb865..f83e41ac7a9a166106660eea31c92a54116d4744 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
@@ -33,7 +33,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
index 97a511db7a0c9a5da9389ebf5868cfb2d853aca1..157b0d2609a55f460fac2e2be4d9f5eb0703aa8d 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
index 6c8a9a6389007ce5daa1f4f9dc4f8e5275a76acd..e0eb24773626c3eac2a7d0d2a3614b2af10019c5 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
@@ -29,7 +29,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_MC16_AtlasG4_ttbar.sh b/Simulation/Tests/SimCoreTests/test/test_MC16_AtlasG4_ttbar.sh
index e42619f07dc1b89caadce6f0e26bb0ba01e6b05d..deac0f6ff3896c625680039ae5c3c44203d47bb2 100755
--- a/Simulation/Tests/SimCoreTests/test/test_MC16_AtlasG4_ttbar.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_MC16_AtlasG4_ttbar.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh b/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
index b922d10bc5696b17b2fa12ac7d7fd1f889fbc79d..41aab330d5fafa73b00d9d1c5a5d3c4af975eb05 100755
--- a/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
@@ -23,7 +23,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
index 8ff628f2d2250f891411e73d9502f74581ce5caa..0d58926db13533d420a480a4460c103f8c1f2b03 100755
--- a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
@@ -17,7 +17,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries -1 ${ArtPackage} ${ArtJobName}
+ art.py compare grid --entries -1 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
index a8e7c5ba15ec7ebf4e46784b846e3252794c3d92..e565afc1cfa6c6ffe86b59d006b227a3295fdf1c 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
index e9a64b838b588f21509608137e078c2052a0327d..b25a0f7c60363506063891ef3a5731a0e62f3660 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
index b4c25825aa061c30058899975efa2e2d4faa64f2..b04bd95213ba7e2effd09760d2545c830ee6bb32 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
index 8b60764fc8b52534ef7677965ea2994bd883702c..077572bbb907333d8be03349b31513fd404b35f8 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
index 18d2d005ba5154c8cce5a8d3f6d1aa5b0a09b3bb..7b99a767758193decf08407e2c56130c5976576d 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
index b9e3e953f75235fc0ddb69ce3fc4fc346c1c0175..c4aedaefea424cd356cd6c1cc7b6b2f57f6cbfaa 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
echo "art-result: $rc2 regression"
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
index 225b0e886af0db5c51ba2645463aea14ba0d9991..2abc2a9fe236d07d8ed2cf6a3aed5605ff605fad 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
@@ -32,7 +32,7 @@ if [ $rc -eq 0 ]
then
ArtPackage=$1
ArtJobName=$2
- art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=summary
+ art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName} --mode=semi-detailed
rc2=$?
fi
echo "art-result: $rc2 regression"
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_LaserTiming.py b/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_LaserTiming.py
index 6fd960857268a47cf051a463a12c521565393558..1ff37a2cda997661b7d5436fb4ed9df2d95890c9 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_LaserTiming.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_LaserTiming.py
@@ -383,7 +383,7 @@ topCalibAlg.TileCalibTools += [ToolSvc.oTileLaserTimingTool];
theAuditorSvc = svcMgr.AuditorSvc
theAuditorSvc.Auditors = [ "ChronoAuditor" ]
-ByteStreamInputSvc.MaxBadEvents = 10000
+
# ByteStreamInputSvc.DumpFlag = TRUE
# from AthenaCommon.AppMgr import ToolSvc
# ToolSvc.TileROD_Decoder.VerboseOutput = TRUE
@@ -391,5 +391,6 @@ ByteStreamInputSvc.MaxBadEvents = 10000
print topSequence
EventSelector.SkipEvents = EvtMin
+EventSelector.MaxBadEvents = 10000
theApp.EvtMax=EvtMax
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_NoiseCalib.py b/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_NoiseCalib.py
index a9edf10fe67c0af2884a7892c531941392a38ed5..73667cff0c8497ed4a9f919c0a45b3d69c452e7a 100755
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_NoiseCalib.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/share/jobOptions_NoiseCalib.py
@@ -399,7 +399,6 @@ if 'doPerfMon' in dir():
jobproperties.PerfMonFlags.doFastMon = False
include( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-ByteStreamInputSvc.MaxBadEvents = 10000
# ByteStreamInputSvc.DumpFlag = TRUE
# from AthenaCommon.AppMgr import ToolSvc
# ToolSvc.TileROD_Decoder.VerboseOutput = TRUE
@@ -416,5 +415,6 @@ svcMgr.MessageSvc.useColors = False
print topSequence
EventSelector.SkipEvents = EvtMin
+EventSelector.MaxBadEvents = 10000
theApp.EvtMax=EvtMax
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py
index 73de43faa04131abbe3bc1277db9ea6047f97a1e..e1167b7bb99fcaa5a736b3b96f3096c5855735f0 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCalibTools.py
@@ -549,12 +549,12 @@ class TileBlobWriter(TileCalibLogger):
if isinstance(since, tuple):
iovString = "[%i,%i] - [%i,%i]" % (since[0],since[1],until[0],until[1])
else:
- sinceInfo = time.localtime( sinceCool / UNIX2COOL )
- untilInfo = time.localtime(min(UNIXTMAX, (untilCool/UNIX2COOL)))
+ sinceInfo = time.localtime( sinceCool//UNIX2COOL )
+ untilInfo = time.localtime(min(UNIXTMAX, (untilCool//UNIX2COOL)))
untilStr = "<infinity>"
if untilCool<cool.ValidityKeyMax:
untilStr = time.asctime(untilInfo)
- if (untilCool/UNIX2COOL)>UNIXTMAX:
+ if (untilCool//UNIX2COOL)>UNIXTMAX:
untilStr = " > "+untilStr
iovString = "[%s] - [%s]" % (time.asctime(sinceInfo), untilStr)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCellTools.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCellTools.py
index 4e6dbac3a4c993542d6b0f526d29d7facd7804f6..5c4b57147796bfcc6438a4c681f20a4540463fb4 100644
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCellTools.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/python/TileCellTools.py
@@ -102,7 +102,7 @@ class TileCellHashMgr():
return (None,None)
part=bisect.bisect(self._nCellsPart,hash)-1
- module=(hash-self._nCellsPart[part])/self._nCellsModule[part]+1
+ module=(hash-self._nCellsPart[part])//self._nCellsModule[part]+1
modName="%s%02d" % (self._partNames[part],module)
index=(hash-self._nCellsPart[part])%self._nCellsModule[part]
if part>=4:
@@ -145,7 +145,7 @@ class TileCellHashMgr():
return None
part=bisect.bisect(self._nCellsPart,hash)-1
- module=(hash-self._nCellsPart[part])/self._nCellsModule[part]+1
+ module=(hash-self._nCellsPart[part])//self._nCellsModule[part]+1
index=(hash-self._nCellsPart[part])%self._nCellsModule[part]
if part>=4:
if index==0 and ((part==4 and module==18) or (part==5 and module==15)):
@@ -179,7 +179,7 @@ class TileCellHashMgr():
return None
part=bisect.bisect(self._nCellsPart,hash)-1
- module=(hash-self._nCellsPart[part])/self._nCellsModule[part]+1
+ module=(hash-self._nCellsPart[part])//self._nCellsModule[part]+1
modName="%s%02d" % (self._partNames[part],module)
return modName
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/BchCleanup.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/BchCleanup.py
index 288c805266d2bf22b742ba36e6e726c3718ab790..8e4944aa40be9827abded6fa3f3376724ee9ba42 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/BchCleanup.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/BchCleanup.py
@@ -308,8 +308,8 @@ if __name__ == "__main__":
if calibDrawerPrev is None:
identical = False
else:
- sizelo = calibDrawerPrev.getObjSizeByte()/4
- sizehi = calibDrawer.getObjSizeByte()/4
+ sizelo = calibDrawerPrev.getObjSizeByte()//4
+ sizehi = calibDrawer.getObjSizeByte()//4
if (sizelo != sizehi):
log.error("Object sizes are different for ROS %s (%s %s) drawer %s", ros, sizelo, sizehi, modName)
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/PlotPulseshapeFromCool.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/PlotPulseshapeFromCool.py
index ff193713859a7aceaa452c157737bf189c5503a8..b7216a93ea56072ee1028329ca1416ad5d028210 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/PlotPulseshapeFromCool.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/PlotPulseshapeFromCool.py
@@ -101,5 +101,10 @@ psHG.Draw("AP")
can.cd(4)
dsHG.Draw("AP")
-from builtins import input
+try:
+ from builtins import input
+except ImportError:
+ # old python 2 without builtins
+ input=raw_input
+
c = input('please enter a character: ')
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCoolCompare.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCoolCompare.py
index 730d06a13f8e58045babf19a363ef1ad001d0472..da8caed6262b9674f76b0b150c7027deb6159167 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCoolCompare.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCellNoiseFromCoolCompare.py
@@ -360,7 +360,7 @@ for cell in range(cellmin,cellmax):
else:
dp12=100
else:
- dp12=dv12*100/v2
+ dp12=dv12*100./v2
if abs(dv12) > maxdiff and abs(dp12) > maxdiffpercent:
if doubl:
diff --git a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadFromCoolCompare.py b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadFromCoolCompare.py
index 52667365463343fb9377d71798a625678d9f6f82..b5c3e4e254473fab48fba40d285e9bf6f20939bc 100755
--- a/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadFromCoolCompare.py
+++ b/TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadFromCoolCompare.py
@@ -30,7 +30,11 @@ from TileCalibBlobObjs.Classes import TileCalibUtils
import os, sys, getopt
os.environ['TERM'] = 'linux'
-from builtins import input
+try:
+ from builtins import input
+except ImportError:
+ # old python 2 without builtins
+ input=raw_input
# main defaults are here - can be modified from command line
run=999999999
@@ -268,6 +272,7 @@ for ros in range(0,5):
if flt and flt2:
osc = flt.getObjSizeByte()//4
os2c = flt2.getObjSizeByte()//4
+ oscMax = max(osc,os2c)
if (((os != osc) or (os2 != os2c)) and answ != 'y'):
if (ros==0 and osc==os2c and os==os2):
log.warning("Object sizes are different for last drawer in DB (%s) and default drawer %s (%s)", os, modName, osc)
@@ -277,7 +282,7 @@ for ros in range(0,5):
if (answ != 'y'):
sys.exit()
else:
- for ind in range(0,osc):
+ for ind in range(0,oscMax):
v.append(0)
v2.append(0)
@@ -285,14 +290,16 @@ for ros in range(0,5):
for chn in range(TileCalibUtils.max_chan()):
chnName = " %2i" % chn
for adc in range(ng):
- for ind in range(0,osc):
- v[ind] = flt.getData(chn, adc, ind)
- v2[ind] = flt2.getData(chn, adc, ind)
+ for ind in range(0,oscMax):
+ if (ind<osc):
+ v[ind] = flt.getData(chn, adc, ind)
+ if (ind<os2c):
+ v2[ind] = flt2.getData(chn, adc, ind)
dv12 = v[ind] - v2[ind]
if v2[ind] == 0:
dv12percent=0
else:
- dv12percent=dv12*100/v2[ind]
+ dv12percent=dv12*100./v2[ind]
# print ( modName, ' chann ', repr(chn), ' adc ', repr(adc), ' ind ', repr(ind), ' val1 ', repr(v[ind]),' val2 ', repr(v2[ind]), ' diff ', repr(dv12), 'percent ', repr(dv12percent))
if abs(dv12) > maxdiff and abs(dv12percent) > maxdiffpercent:
if ot==30: # integers
diff --git a/TileCalorimeter/TileG4/TileGeoG4SD/python/TileGeoG4SDToolConfig.py b/TileCalorimeter/TileG4/TileGeoG4SD/python/TileGeoG4SDToolConfig.py
index ebb07f945bca1f5040a87b9c33f077c8f6792626..95a634d93bfadc6bcf092d1f5385b8579db07a38 100644
--- a/TileCalorimeter/TileG4/TileGeoG4SD/python/TileGeoG4SDToolConfig.py
+++ b/TileCalorimeter/TileG4/TileGeoG4SD/python/TileGeoG4SDToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -39,7 +39,7 @@ def TileGeoG4SDCalcCfg(ConfigFlags, name="TileGeoG4SDCalc", **kwargs):
if ConfigFlags.Sim.ParticleID:
kwargs.setdefault("DoCalibHitParticleID", ConfigFlags.Sim.ParticleID )
- result.setPrivateTools( TileGeoG4SDCalc(name, **kwargs) )
+ result.addService( TileGeoG4SDCalc(name, **kwargs) )
return result
@@ -50,5 +50,5 @@ def TileCTBGeoG4SDCalcCfg(ConfigFlags, name="TileCTBGeoG4SDCalc", **kwargs):
if ConfigFlags.Sim.ParticleID:
kwargs.setdefault("DoCalibHitParticleID", ConfigFlags.Sim.ParticleID )
- result.setPrivateTools( TileGeoG4SDCalc(name, **kwargs) )
+ result.addService( TileGeoG4SDCalc(name, **kwargs) )
return result
diff --git a/TileCalorimeter/TileIdentifier/TileIdentifier/TileRodIdHash.h b/TileCalorimeter/TileIdentifier/TileIdentifier/TileRodIdHash.h
index bc58d80e769207436a6e3abff4a73b98d7aa660f..74362516aa2db714530e52e10dc29cafae31a48f 100755
--- a/TileCalorimeter/TileIdentifier/TileIdentifier/TileRodIdHash.h
+++ b/TileCalorimeter/TileIdentifier/TileIdentifier/TileRodIdHash.h
@@ -25,7 +25,7 @@ class TileRodIdHash {
virtual ~TileRodIdHash() { };
/** initialize */
- void initialize(int offset );
+ void initialize(int offset, int runnum );
/** new initialize for the HLT */
void initialize (int offset, const std::vector<ID>& rmod );
diff --git a/TileCalorimeter/TileIdentifier/src/TileRodIdHash.cxx b/TileCalorimeter/TileIdentifier/src/TileRodIdHash.cxx
index c30add65da11e81f432bfc864c65d2cef1cbbe95..53cd390df469624014f55dc4212c09f5c6562f73 100755
--- a/TileCalorimeter/TileIdentifier/src/TileRodIdHash.cxx
+++ b/TileCalorimeter/TileIdentifier/src/TileRodIdHash.cxx
@@ -20,13 +20,41 @@ TileRodIdHash::TileRodIdHash( )
}
-void TileRodIdHash::initialize( int offset ) {
+void TileRodIdHash::initialize( int offset, int runnum ) {
//
- m_offset = offset;
-
std::vector<ID> rmod;
+ rmod.reserve(256);
+ if (runnum>318000) {
+ // new frag->ROB mapping since March 2017
+ // put 4 drawers in two subsequent RODs
+ // odd drawers in odd ROD, even drawers in even ROD
+ for(unsigned int i=0x510000;i<=0x51001f;i+=2){
+ rmod.push_back(i);
+ rmod.push_back(i+1);
+ rmod.push_back(i);
+ rmod.push_back(i+1);
+ }
+ for(unsigned int i=0x520000;i<=0x52001f;i+=2){
+ rmod.push_back(i);
+ rmod.push_back(i+1);
+ rmod.push_back(i);
+ rmod.push_back(i+1);
+ }
+ for(unsigned int i=0x530000;i<=0x53001f;i+=2){
+ rmod.push_back(i);
+ rmod.push_back(i+1);
+ rmod.push_back(i);
+ rmod.push_back(i+1);
+ }
+ for(unsigned int i=0x540000;i<=0x54001f;i+=2){
+ rmod.push_back(i);
+ rmod.push_back(i+1);
+ rmod.push_back(i);
+ rmod.push_back(i+1);
+ }
+ } else {
for(unsigned int i=0x510000;i<=0x51000f;i++){
rmod.push_back(i);
rmod.push_back(i);
@@ -51,22 +79,9 @@ void TileRodIdHash::initialize( int offset ) {
rmod.push_back(i);
rmod.push_back(i);
}
+ }
- std::vector<ID>::const_iterator
- it = rmod.begin();
- std::vector<ID>::const_iterator
- it_end = rmod.end() ;
-
- int n = 0;
- for (; it!=it_end;++it) {
- ID id = *it;
- unsigned int i = id;
- m_lookup[i] = n ;
- m_int2id.push_back(id);
- ++n;
- }
-
- m_size = n;
+ initialize(offset,rmod);
}
void TileRodIdHash::initialize( int offset, const std::vector<ID>& rmod ) {
diff --git a/TileCalorimeter/TileTBRec/share/jobOptions_TileTB_CIS.py b/TileCalorimeter/TileTBRec/share/jobOptions_TileTB_CIS.py
index fc2920e49a9a0f0b5896da4138cd369cb8137dcf..539d9ea71bc44c915190d21f0ca2ca994fcde269 100755
--- a/TileCalorimeter/TileTBRec/share/jobOptions_TileTB_CIS.py
+++ b/TileCalorimeter/TileTBRec/share/jobOptions_TileTB_CIS.py
@@ -85,7 +85,7 @@ theApp.Dlls += [ "GaudiAud" ]
theAuditorSvc = AuditorSvc()
theAuditorSvc.Auditors = [ "ChronoAuditor" ]
-ByteStreamInputSvc.MaxBadEvents = 10000
+theApp.serviceMgr().EventSelector.MaxBadEvents = 10000
# ByteStreamInputSvc.DumpFlag = TRUE
# TileROD_Decoder = Algorithm( "TileROD_Decoder" )
# TileROD_Decoder.VerboseOutput = TRUE
diff --git a/Tools/PROCTools/data/master_q221_AOD_digest.ref b/Tools/PROCTools/data/master_q221_AOD_digest.ref
index 001ee93bf6510ccc06c3461a7849d264f791b022..50317d582717aef6fb89ed83112bdcdf550efe6d 100644
--- a/Tools/PROCTools/data/master_q221_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q221_AOD_digest.ref
@@ -1,26 +1,26 @@
- run event nTopo nIdTracks nJets nMuons nElec nPhot
- 284500 87473001 118 128 4 1 9 7
- 284500 87473014 85 79 6 0 9 7
- 284500 87473022 38 30 4 0 5 2
- 284500 87473032 27 33 4 1 9 2
- 284500 87473037 60 43 7 0 10 6
- 284500 87473040 101 96 9 0 17 7
- 284500 87473051 142 114 12 1 15 21
- 284500 87473063 62 76 5 2 6 6
- 284500 87473068 26 35 1 1 0 0
- 284500 87473075 72 87 6 0 5 5
- 284500 87473084 83 86 7 3 15 10
- 284500 87473091 43 49 3 0 3 5
- 284500 87473096 72 75 3 2 2 3
- 284500 87473104 61 66 6 0 6 5
- 284500 87473114 93 84 7 2 14 8
- 284500 87473121 93 101 6 3 15 7
- 284500 87473132 81 59 9 1 10 5
- 284500 87473137 81 71 8 3 14 7
- 284500 87473144 83 70 7 1 6 8
- 284500 87473154 89 88 7 0 10 7
- 284500 87473162 52 52 3 0 8 4
- 284500 87473167 74 54 6 3 12 13
- 284500 87473171 82 71 8 3 4 5
- 284500 87473184 74 88 5 2 8 8
- 284500 87473192 54 53 4 1 7 5
+ run event nTopo nIdTracks nJets nMuons
+ 284500 87473001 118 128 4 1
+ 284500 87473014 85 79 6 0
+ 284500 87473022 38 30 4 0
+ 284500 87473032 27 33 4 1
+ 284500 87473037 60 43 7 0
+ 284500 87473040 101 96 9 0
+ 284500 87473051 142 114 12 1
+ 284500 87473063 62 76 5 2
+ 284500 87473068 26 35 1 1
+ 284500 87473075 72 87 6 0
+ 284500 87473084 83 86 7 3
+ 284500 87473091 43 49 3 0
+ 284500 87473096 72 75 3 2
+ 284500 87473104 61 66 6 0
+ 284500 87473114 93 84 7 2
+ 284500 87473121 93 101 6 3
+ 284500 87473132 81 59 9 1
+ 284500 87473137 81 71 8 3
+ 284500 87473144 83 70 7 1
+ 284500 87473154 89 88 7 0
+ 284500 87473162 52 52 3 0
+ 284500 87473167 74 54 6 3
+ 284500 87473171 82 71 8 3
+ 284500 87473184 74 88 5 2
+ 284500 87473192 54 53 4 1
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 27b561a56e57e35b268c3f8fb925f055d30dccc0..e60e8fed01b1fadd5bdd77fe84a287327048b491 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -1,26 +1,26 @@
- run event nTopo nIdTracks nJets nMuons nElec nPhot
- 330470 1183722158 1 0 0 0 0 0
- 330470 1183722342 394 429 20 0 2 15
- 330470 1183727953 532 595 13 4 6 24
- 330470 1183732647 467 483 12 1 8 19
- 330470 1183733040 381 293 6 1 5 11
- 330470 1183734651 361 375 14 3 5 18
- 330470 1183735332 406 396 9 1 5 11
- 330470 1183736475 741 723 15 2 2 23
- 330470 1183738728 1 0 0 0 0 0
- 330470 1183738949 368 443 9 1 5 10
- 330470 1183742489 152 126 2 1 1 1
- 330470 1183743040 285 313 5 0 3 5
- 330470 1183746343 492 504 14 0 3 16
- 330470 1183746710 6 0 0 0 0 0
- 330470 1183751782 239 240 5 0 0 6
- 330470 1183752624 347 369 8 3 5 14
- 330470 1183753006 357 396 11 3 4 12
- 330470 1183754806 470 427 14 0 3 17
- 330470 1183769295 342 335 8 1 0 6
- 330470 1183769939 348 353 11 3 8 11
- 330470 1183773832 307 204 7 0 2 13
- 330470 1183775209 57 0 0 0 0 0
- 330470 1183787124 431 381 11 2 3 17
- 330470 1183787946 321 325 5 1 2 9
- 330470 1183795329 458 345 19 0 4 13
+ run event nTopo nIdTracks nJets nMuons
+ 330470 1183722158 1 0 0 0
+ 330470 1183722342 394 429 20 0
+ 330470 1183727953 532 595 13 4
+ 330470 1183732647 467 483 12 1
+ 330470 1183733040 381 293 6 1
+ 330470 1183734651 361 375 14 3
+ 330470 1183735332 406 396 9 1
+ 330470 1183736475 741 723 15 2
+ 330470 1183738728 1 0 0 0
+ 330470 1183738949 368 443 9 1
+ 330470 1183742489 152 126 2 1
+ 330470 1183743040 285 313 5 0
+ 330470 1183746343 492 504 14 0
+ 330470 1183746710 6 0 0 0
+ 330470 1183751782 239 240 5 0
+ 330470 1183752624 347 369 8 3
+ 330470 1183753006 357 396 11 3
+ 330470 1183754806 470 427 14 0
+ 330470 1183769295 342 335 8 1
+ 330470 1183769939 348 353 11 3
+ 330470 1183773832 307 204 7 0
+ 330470 1183775209 57 0 0 0
+ 330470 1183787124 431 381 11 2
+ 330470 1183787946 321 325 5 1
+ 330470 1183795329 458 345 19 0
diff --git a/Tools/PyUtils/python/MetaReaderPeeker.py b/Tools/PyUtils/python/MetaReaderPeeker.py
index fc78df8b49594973a8024cfa56cae4a00df2db90..3569ecfd1cd772c926a64134059a1af25d629975 100644
--- a/Tools/PyUtils/python/MetaReaderPeeker.py
+++ b/Tools/PyUtils/python/MetaReaderPeeker.py
@@ -9,7 +9,7 @@ metadata_all_files = {}
def _setup():
-
+
from PyUtils.MetaReader import read_metadata
from AthenaCommon.Logging import logging
@@ -18,12 +18,9 @@ def _setup():
global metadata
global metadata_all_files
- # get input file name
- from RecExConfig.RecoFunctions import InputFileNames
- inFiles = InputFileNames()
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
- if athenaCommonFlags.isOnline() and not inFiles:
+ if athenaCommonFlags.isOnline():
# set minimal items of inputFileSummary
metadata = {
'file_type':'BS',
@@ -31,6 +28,11 @@ def _setup():
'TagStreamsRef':''
}
else:
+
+ # get input file name
+ from RecExConfig.RecoFunctions import InputFileNames
+ inFiles = InputFileNames()
+
if len(inFiles) < 1:
msg.warning("No input files specified yet! Cannot do anything.")
return
diff --git a/Tools/PyUtils/python/MetaReaderPeekerFull.py b/Tools/PyUtils/python/MetaReaderPeekerFull.py
index 17aefd5c452cd84a983edf7631bcc38a26368ab3..b6e6595eca72a654d38f2c6508d0dc57626cbccd 100644
--- a/Tools/PyUtils/python/MetaReaderPeekerFull.py
+++ b/Tools/PyUtils/python/MetaReaderPeekerFull.py
@@ -17,13 +17,9 @@ def _setup():
global metadata
global metadata_all_files
-
- # get input file name
- from RecExConfig.RecoFunctions import InputFileNames
- inFiles = InputFileNames()
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
- if athenaCommonFlags.isOnline() and not inFiles:
+ if athenaCommonFlags.isOnline():
# set minimal items of inputFileSummary
metadata = {
'file_type':'BS',
@@ -31,6 +27,11 @@ def _setup():
'TagStreamsRef':''
}
else:
+
+ # get input file name
+ from RecExConfig.RecoFunctions import InputFileNames
+ inFiles = InputFileNames()
+
if len(inFiles) < 1:
msg.warning("No input files specified yet! Cannot do anything.")
return
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.icc b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.icc
index 9f95b9a0a795cf93bb99f9500d9bc081286ccf2e..84026ec3ab9acd6ed4030bd399b4495e103e60bc 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.icc
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.icc
@@ -49,7 +49,7 @@ namespace Trk
ParametersT<DIM,T,S>(),
m_cIdentifier(cIdentifier)
{
- this->m_covariance =cov;
+ this->m_covariance.reset(cov);
this->m_position=pos;
// flip the charge according to qOverP
if(tqOverP < 0.) {
@@ -84,7 +84,7 @@ namespace Trk
m_cIdentifier(cIdentifier)
{
this->m_chargeDef.setCharge(charge);
- this->m_covariance = cov;
+ this->m_covariance.reset(cov);
// assign the parameters
this->m_parameters[Trk::locX] = 0.;
@@ -272,10 +272,10 @@ namespace Trk
// update the covariance
if (updatedCovariance)
{
- if (updatedCovariance != this->m_covariance){
- delete this->m_covariance;
+ //check if someone passed what we owm
+ if (updatedCovariance != this->m_covariance.get()){
+ this->m_covariance.reset(updatedCovariance);
}
- this->m_covariance = updatedCovariance;
}
}
@@ -289,8 +289,7 @@ namespace Trk
if (this->m_covariance) {
(*(this->m_covariance)) = updatedCovariance;
} else { // otherwise create one
- auto tmp = std::make_unique<AmgSymMatrix(DIM)>(updatedCovariance);
- this->m_covariance = tmp.release();
+ this->m_covariance = std::make_unique<AmgSymMatrix(DIM)>(updatedCovariance);
}
}
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.h b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.h
index ab9aaa463a32d7ca3b26cc045ca51d81999403ad..b8049a38ebb40585b9ad4872d0a039a84342d566 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.h
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.h
@@ -12,6 +12,7 @@
// Amg
#include "EventPrimitives/EventPrimitives.h"
#include "GeoPrimitives/GeoPrimitives.h"
+#include <memory>
class MsgStream;
@@ -54,20 +55,11 @@ namespace Trk
{
public:
static constexpr int dim = DIM;
-
/*
* Rule of 5
*/
-
/** virtual Destructor */
virtual ~ParametersBase()=default;
- /** default ctor , copy ctors, and assignment operators*/
- ParametersBase()=default;
- ParametersBase(const ParametersBase&)=default;
- ParametersBase& operator=(const ParametersBase&)=default;
- ParametersBase(ParametersBase&&)=default;
- ParametersBase& operator=(ParametersBase&&)=default;
-
//** equality operator */
virtual bool operator==(const ParametersBase<DIM,T>&) const = 0;
@@ -78,41 +70,39 @@ namespace Trk
}
/** Access method for the parameters */
- virtual const AmgVector(DIM)& parameters() const = 0;
-
- /** Access method for the covariance matrix - returns 0 if no covariance matrix is given */
- virtual const AmgSymMatrix(DIM)* covariance() const = 0;
-
- /** Access to the Surface method */
- virtual const Surface& associatedSurface() const = 0;
-
- /** Return the measurement frame - this is needed for alignment, in particular for StraightLine and Perigee Surface
- - the default implementation is the the RotationMatrix3D of the transform */
- virtual Amg::RotationMatrix3D measurementFrame() const = 0;
+ const AmgVector(DIM)& parameters() const;
+ /** Access method for the covariance matrix - returns nullptr if no covariance matrix is given */
+ const AmgSymMatrix(DIM)* covariance() const;
+
/** Access method for the position */
- virtual const Amg::Vector3D& position() const = 0;
-
+ const Amg::Vector3D& position() const;
+
/** Access method for the momentum */
- virtual const Amg::Vector3D& momentum() const = 0;
+ const Amg::Vector3D& momentum() const;
+
+ /** Access method for transverse momentum */
+ double pT() const;
+ /** Access method for pseudorapidity - from momentum */
+ double eta() const;
+
+ /** Returns charge of concrete type (i.e. must be implemented in inheriting classes) */
+ double charge() const;
+
/** Access method for the local coordinates, \f$(loc1,loc2)\f$
local parameter definitions differ for each surface type. */
Amg::Vector2D localPosition() const;
+
+ /** Access to the Surface method */
+ virtual const Surface& associatedSurface() const = 0;
- /** Access method for transverse momentum */
- double pT() const {return momentum().perp();}
-
- /** Access method for pseudorapidity - from momentum */
- double eta() const {return momentum().eta();}
-
- /** Dumps relevant information about the track parameters into the ostream */
- virtual MsgStream& dump(MsgStream& out) const;
- virtual std::ostream& dump(std::ostream& out) const;
-
- /** Pseudo constructor - avoids excessive type-casting.
- @return new object copied from the concrete type of this object.
- Ownership is passed (i.e. you must take care of deletion of resulting object) */
+ /** Return the measurement frame - this is needed for alignment, in particular for StraightLine and Perigee Surface
+ - the default implementation is the the RotationMatrix3D of the transform */
+ virtual Amg::RotationMatrix3D measurementFrame() const = 0;
+
+ /** Pseudo constructor - avoids excessive type-casting.
+ @return new object copied from the concrete type of this object.*/
virtual ParametersBase<DIM,T>* clone() const = 0;
/** Return the ParametersType enum */
@@ -121,11 +111,6 @@ namespace Trk
/** Test to see if there's a surface there. */
virtual bool hasSurface() const = 0 ;
-
- /** Returns charge of concrete type (i.e. must be implemented in inheriting classes) */
- virtual double charge() const = 0;
-
-
/** Update parameters and covariance */
virtual void updateParameters(const AmgVector(DIM)&, AmgSymMatrix(DIM)* = nullptr) = 0;
@@ -133,11 +118,35 @@ namespace Trk
* is created if one does not exist. Otherwise in place update occurs*/
virtual void updateParameters(const AmgVector(DIM)&, const AmgSymMatrix(DIM)&) = 0;
-
+ /** Dumps relevant information about the track parameters into the ostream */
+ virtual MsgStream& dump(MsgStream& out) const;
+ virtual std::ostream& dump(std::ostream& out) const;
+
/** DESIGN TO BE REVISITED */
- public:
friend class MaterialEffectsEngine;
+ protected :
+ /*
+ * This has pure virtual functions
+ * so it is abstract class and we can not instanticate objects directly.
+ * In the other hand derived classed can use ctors
+ */
+ ParametersBase()=default;
+ ParametersBase(const AmgVector(DIM) parameters,
+ AmgSymMatrix(DIM)* covariance,
+ const Amg::Vector3D& position,
+ const Amg::Vector3D& momentum,
+ const T chargeDef);
+ ParametersBase(ParametersBase&&)=default;
+ ParametersBase& operator=(ParametersBase&&)=default;
+
+
+
+ AmgVector(DIM) m_parameters; //!< contains the n parameters
+ std::unique_ptr<AmgSymMatrix(DIM)> m_covariance; //!< contains the n x n covariance matrix
+ Amg::Vector3D m_position; //!< point on track
+ Amg::Vector3D m_momentum; //!< momentum at this point on track
+ T m_chargeDef; //!< charge definition for this track
};
/**Overload of << operator for both, MsgStream and std::ostream for debug output*/
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.icc b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.icc
index f9cc44a6d8c47a43a16c0c48e2c1f4f491da0325..0131e15552cb9808f3860571829d6a4eb45132b5 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.icc
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersBase.icc
@@ -16,83 +16,146 @@
namespace Trk
{
- template<int DIM,class T>
- Amg::Vector2D ParametersBase<DIM,T>::localPosition() const
- {
- return Amg::Vector2D(parameters()[Trk::loc1],parameters()[Trk::loc2]);
- }
-
- template<int DIM,class T>
- MsgStream& ParametersBase<DIM,T>::dump(MsgStream& sl) const
- {
- sl << std::setiosflags(std::ios::fixed);
- sl << std::setprecision(7);
- sl << " * TrackParameters on Surface" << std::endl;
- sl << " * loc1 : " << parameters()[Trk::loc1] << std::endl;
- sl << " * loc2 : " << parameters()[Trk::loc2] << std::endl;
- sl << " * phi : " << parameters()[Trk::phi] << std::endl;
- sl << " * Theta : " << parameters()[Trk::theta] << std::endl;
- sl << " * q/p : " << parameters()[Trk::qOverP] << std::endl;
- if (parameters().rows() > 5 ) {
- sl << " * mass : " << parameters()[Trk::trkMass] << " (extended parameters)" << std::endl;
- }
- sl << " * charge: " << charge() << std::endl;
- sl << " * covariance matrix = " << covariance() << std::endl;
- sl << " * corresponding global parameters:" << std::endl;
- sl << " * position (x, y, z ) = ("
- << position().x() << ", "
- << position().y() << ", "
- << position().z() << ")" << std::endl;
- sl << " * momentum (px, py, pz) = ("
- << momentum().x() << ", "
- << momentum().y() << ", "
- << momentum().z() << ")" << std::endl;
- sl << std::setprecision(-1);
- sl << "associated surface:" << std::endl;
- sl << associatedSurface() << std::endl;
- return sl;
- }
+template<int DIM, class T>
+ParametersBase<DIM, T>::ParametersBase(
+ const AmgVector(DIM) parameters,
+ AmgSymMatrix(DIM)* covariance,
+ const Amg::Vector3D& position,
+ const Amg::Vector3D& momentum,
+ const T chargeDef)
+ : m_parameters(parameters)
+ , m_covariance(covariance)
+ , m_position(position)
+ , m_momentum(momentum)
+ , m_chargeDef(chargeDef)
+{}
- template<int DIM,class T>
- std::ostream& ParametersBase<DIM,T>::dump(std::ostream& sl) const
- {
- sl << std::setiosflags(std::ios::fixed);
- sl << std::setprecision(7);
- sl << " * TrackParameters on Surface" << std::endl;
- sl << " * loc1 : " << parameters()[Trk::loc1] << std::endl;
- sl << " * loc2 : " << parameters()[Trk::loc2] << std::endl;
- sl << " * phi : " << parameters()[Trk::phi] << std::endl;
- sl << " * Theta : " << parameters()[Trk::theta] << std::endl;
- sl << " * q/p : " << parameters()[Trk::qOverP] << std::endl;
- if (parameters().rows() > 5 ) {
- sl << " * mass : " << parameters()[Trk::trkMass] << " (extended parameters)" << std::endl;
- }
- sl << " * charge: " << charge() << std::endl;
- sl << " * covariance matrix = " << covariance() << std::endl;
- sl << " * corresponding global parameters:" << std::endl;
- sl << " * position (x, y, z ) = ("
- << position().x() << ", "
- << position().y() << ", "
- << position().z() << ")" << std::endl;
- sl << " * momentum (px, py, pz) = ("
- << momentum().x() << ", "
- << momentum().y() << ", "
- << momentum().z() << ")" << std::endl;
- sl << std::setprecision(-1);
- sl << "associated surface:" << std::endl;
- sl << associatedSurface() << std::endl;
- return sl;
- }
- template<int DIM,class T>
- MsgStream& operator<<(MsgStream& sl,const Trk::ParametersBase<DIM,T>& p)
- {
- return p.dump(sl);
+template<int DIM, class T>
+const AmgVector(DIM) &
+ParametersBase<DIM, T>::parameters() const
+{
+ return m_parameters;
+}
+
+template<int DIM, class T>
+const AmgSymMatrix(DIM)*
+ParametersBase<DIM, T>::covariance() const
+{
+ return m_covariance.get();
+}
+
+template<int DIM, class T>
+const Amg::Vector3D&
+ParametersBase<DIM, T>::position() const
+{
+ return m_position;
+}
+
+template<int DIM, class T>
+const Amg::Vector3D&
+ParametersBase<DIM, T>::momentum() const
+{
+ return m_momentum;
+}
+
+template<int DIM, class T>
+double
+ParametersBase<DIM, T>::pT() const
+{
+ return momentum().perp();
+}
+
+template<int DIM, class T>
+double
+ParametersBase<DIM, T>::eta() const
+{
+ return momentum().eta();
+}
+
+template<int DIM, class T>
+double
+ParametersBase<DIM, T>::charge() const
+{
+ return m_chargeDef.charge();
+}
+
+template<int DIM, class T>
+Amg::Vector2D
+ParametersBase<DIM, T>::localPosition() const
+{
+ return Amg::Vector2D(parameters()[Trk::loc1], parameters()[Trk::loc2]);
+}
+
+template<int DIM, class T>
+MsgStream&
+ParametersBase<DIM, T>::dump(MsgStream& sl) const
+{
+ sl << std::setiosflags(std::ios::fixed);
+ sl << std::setprecision(7);
+ sl << " * TrackParameters on Surface" << std::endl;
+ sl << " * loc1 : " << parameters()[Trk::loc1] << std::endl;
+ sl << " * loc2 : " << parameters()[Trk::loc2] << std::endl;
+ sl << " * phi : " << parameters()[Trk::phi] << std::endl;
+ sl << " * Theta : " << parameters()[Trk::theta] << std::endl;
+ sl << " * q/p : " << parameters()[Trk::qOverP] << std::endl;
+ if (parameters().rows() > 5) {
+ sl << " * mass : " << parameters()[Trk::trkMass]
+ << " (extended parameters)" << std::endl;
}
+ sl << " * charge: " << charge() << std::endl;
+ sl << " * covariance matrix = " << covariance() << std::endl;
+ sl << " * corresponding global parameters:" << std::endl;
+ sl << " * position (x, y, z ) = (" << position().x() << ", "
+ << position().y() << ", " << position().z() << ")" << std::endl;
+ sl << " * momentum (px, py, pz) = (" << momentum().x() << ", "
+ << momentum().y() << ", " << momentum().z() << ")" << std::endl;
+ sl << std::setprecision(-1);
+ sl << "associated surface:" << std::endl;
+ sl << associatedSurface() << std::endl;
+ return sl;
+}
- template<int DIM,class T>
- std::ostream& operator<<(std::ostream& sl,const Trk::ParametersBase<DIM,T>& p)
- {
- return p.dump(sl);
+template<int DIM, class T>
+std::ostream&
+ParametersBase<DIM, T>::dump(std::ostream& sl) const
+{
+ sl << std::setiosflags(std::ios::fixed);
+ sl << std::setprecision(7);
+ sl << " * TrackParameters on Surface" << std::endl;
+ sl << " * loc1 : " << parameters()[Trk::loc1] << std::endl;
+ sl << " * loc2 : " << parameters()[Trk::loc2] << std::endl;
+ sl << " * phi : " << parameters()[Trk::phi] << std::endl;
+ sl << " * Theta : " << parameters()[Trk::theta] << std::endl;
+ sl << " * q/p : " << parameters()[Trk::qOverP] << std::endl;
+ if (parameters().rows() > 5) {
+ sl << " * mass : " << parameters()[Trk::trkMass]
+ << " (extended parameters)" << std::endl;
}
+ sl << " * charge: " << charge() << std::endl;
+ sl << " * covariance matrix = " << covariance() << std::endl;
+ sl << " * corresponding global parameters:" << std::endl;
+ sl << " * position (x, y, z ) = (" << position().x() << ", "
+ << position().y() << ", " << position().z() << ")" << std::endl;
+ sl << " * momentum (px, py, pz) = (" << momentum().x() << ", "
+ << momentum().y() << ", " << momentum().z() << ")" << std::endl;
+ sl << std::setprecision(-1);
+ sl << "associated surface:" << std::endl;
+ sl << associatedSurface() << std::endl;
+ return sl;
+}
+
+template<int DIM, class T>
+MsgStream&
+operator<<(MsgStream& sl, const Trk::ParametersBase<DIM, T>& p)
+{
+ return p.dump(sl);
+}
+
+template<int DIM, class T>
+std::ostream&
+operator<<(std::ostream& sl, const Trk::ParametersBase<DIM, T>& p)
+{
+ return p.dump(sl);
+}
} // end of namespace Trk
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
index 7ec95c1ac0018cb58207c18f1468d7a67f2edb07..f2cddeed4375438638d2146f4ad5fc88d67fceaa 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.h
@@ -11,7 +11,6 @@
// Trk includes
#include "TrkParametersBase/ParametersBase.h"
-
// Amg
#include "GeoPrimitives/GeoPrimitives.h"
#include "EventPrimitives/EventPrimitives.h"
@@ -98,7 +97,13 @@ namespace Trk
ParametersT<DIM,T,S>& operator=(ParametersT<DIM,T,S>&& rhs);
//** Destructor */
- virtual ~ParametersT();
+ virtual ~ParametersT()=default;
+
+ /** Test to see if there's a surface there. */
+ virtual bool hasSurface() const override final { return m_surface != nullptr; }
+
+ /** Access to the Surface method */
+ virtual const S& associatedSurface() const override final {return *m_surface;}
/** equality operator */
virtual bool operator==(const ParametersBase<DIM,T>& rhs) const override;
@@ -109,29 +114,6 @@ namespace Trk
/** Return the ParametersType enum */
virtual ParametersType type() const override {return Trk::AtaSurface;}
- /** Returns charge of track */
- virtual double charge() const override final {return m_chargeDef.charge();}
-
- /** Access method for the parameters */
- virtual const AmgVector(DIM)& parameters() const override final {return m_parameters;}
-
- /** Access method for the covariance matrix - 0 if no covariance matrix is given */
- virtual const AmgSymMatrix(DIM)* covariance() const override final {return m_covariance;}
-
- /** Access to the Surface method */
- virtual const S& associatedSurface() const override final {return *m_surface;}
-
- /** Test to see if there's a surface there. */
- virtual bool hasSurface() const override final { return m_surface != nullptr; }
-
- /** Access method for the position */
- // cppcheck-suppress virtualCallInConstructor
- virtual const Amg::Vector3D& position() const override final {return m_position;}
-
- /** Access method for the momentum */
- // cppcheck-suppress virtualCallInConstructor
- virtual const Amg::Vector3D& momentum() const override final {return m_momentum;}
-
/** Return the measurementFrame of the parameters */
virtual Amg::RotationMatrix3D measurementFrame() const override;
@@ -146,9 +128,20 @@ namespace Trk
/* Helper to factor in update of parameters*/
void updateParametersHelper(const AmgVector(DIM)&);
-
protected:
- template<typename pars> friend class ::TrackParametersCovarianceCnv;
+ /*
+ * Add dependent names into scope
+ */
+ using ParametersBase<DIM,T>::m_parameters;
+ using ParametersBase<DIM,T>::m_covariance;
+ using ParametersBase<DIM,T>::m_position;
+ using ParametersBase<DIM,T>::m_momentum;
+ using ParametersBase<DIM,T>::m_chargeDef;
+ SurfaceUniquePtrT<const S> m_surface; //!< surface template
+
+ protected:
+ template<typename pars>
+ friend class ::TrackParametersCovarianceCnv;
friend class ::TrackParametersCnv_p2;
friend class ::MeasuredPerigeeCnv_p1;
template <class SURFACE_CNV, class ATA_SURFACE>
@@ -162,14 +155,7 @@ namespace Trk
ParametersT (const Amg::Vector3D& pos,
const Amg::Vector3D& mom,
AmgSymMatrix(DIM)* covariance = 0);
-
- AmgVector(DIM) m_parameters; //!< contains the n parameters
- AmgSymMatrix(DIM)* m_covariance; //!< contains the n x n covariance matrix
- Amg::Vector3D m_position; //!< point on track
- Amg::Vector3D m_momentum; //!< momentum at this point on track
- SurfaceUniquePtrT<const S> m_surface; //!< surface template
- T m_chargeDef; //!< charge definition for this track
-
+
/** DESIGN TO BE REVISITED */
protected:
friend class MaterialEffectsEngine;
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
index 1011994d5ebb90d10f0ca5f25910904caaad61ae..50a2b9ba6d65c1f044e0b1f2e8ee122cd816cacf 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
@@ -13,88 +13,75 @@
#include "TrkEventPrimitives/ParamDefs.h"
namespace Trk
-{
- namespace
- {
- static constexpr double INVALID=std::numeric_limits<double>::quiet_NaN();
- static constexpr double INVALID_P(10e9);
- static constexpr double INVALID_QOP(10e-9);
+{
+
+namespace {
+static constexpr double INVALID = std::numeric_limits<double>::quiet_NaN();
+static constexpr double INVALID_P(10e9);
+static constexpr double INVALID_QOP(10e-9);
+
+template<typename T>
+int
+sgn(const T& val)
+{
+ return (val > 0) - (val < 0);
+}
+}
- template<typename T>
- int sgn(const T& val)
- {
- return (val > 0) - (val < 0);
- }
+ // Constructor with local arguments - uses global <-> local for parameters
+template<int DIM, class T, class S>
+ParametersT<DIM, T, S>::ParametersT(double loc1,
+ double loc2,
+ double phi,
+ double theta,
+ double qop,
+ const S& surface,
+ AmgSymMatrix(DIM) * cov)
+ : ParametersBase<DIM, T>({},
+ cov,
+ {},
+ {},
+ sgn(qop))
+ , m_surface(nullptr)
+{
+ m_surface.reset((surface.isFree() ? surface.clone() : &surface));
+ // check qoverp is physical
+ double p = 0.;
+ if (qop != 0) {
+ p = fabs(1. / qop);
+ } else {
+ // qop is unphysical. No momentum measurement.
+ p = INVALID_P;
+ qop = INVALID_QOP;
}
-
- // Constructor with local arguments - uses global <-> local for parameters
- template<int DIM,class T,class S>
- ParametersT<DIM,T,S>::ParametersT(double loc1,
- double loc2,
- double phi,
- double theta,
- double qop,
- const S& surface,
- AmgSymMatrix(DIM)* cov):
- ParametersBase<DIM,T>(),
- m_parameters(),
- m_covariance(cov),
- m_position(),
- m_momentum(),
- m_surface(nullptr),
- m_chargeDef(sgn(qop))
- {
- m_surface.reset((surface.isFree() ? surface.clone() : &surface));
- // check qoverp is physical
- double p = 0.;
- if(qop != 0) {
- p = fabs(1./qop);
- } else
- {
- // qop is unphysical. No momentum measurement.
- p = INVALID_P;
- qop = INVALID_QOP;
- }
+ // fill the parameters
+ // cppcheck-suppress constStatement
+ m_parameters << loc1, loc2, phi, theta, qop;
- // fill the parameters
- // cppcheck-suppress constStatement
- m_parameters << loc1, loc2, phi, theta, qop;
+ // now calculate the momentum
+ m_momentum = Amg::Vector3D(
+ p * cos(phi) * sin(theta), p * sin(phi) * sin(theta), p * cos(theta));
- // decide the sign of the charge
- // if(qop < 0.)
- // m_chargeDef->setCharge(-1.);
- // else
- // m_chargeDef->setCharge(1.);
-
- // now calculate the momentum
- m_momentum = Amg::Vector3D(p*cos(phi)*sin(theta),
- p*sin(phi)*sin(theta),
- p*cos(theta));
-
- m_surface->localToGlobal(this->localPosition(),momentum(),m_position);
+ m_surface->localToGlobal(
+ this->localPosition(), m_momentum, m_position);
}
// Constructor with local arguments - uses global <-> local for parameters
- template<int DIM,class T,class S>
- ParametersT<DIM,T,S>::ParametersT(const AmgVector(DIM)& parameters,
- const S& surface,
- AmgSymMatrix(DIM)* cov):
- ParametersBase<DIM,T>(),
- m_parameters(parameters),
- m_covariance(cov),
- m_position(),
- m_momentum(),
- m_surface(nullptr),
- m_chargeDef(sgn(parameters[Trk::qOverP]))
+ template<int DIM, class T, class S>
+ ParametersT<DIM, T, S>::ParametersT(const AmgVector(DIM) & parameters,
+ const S& surface,
+ AmgSymMatrix(DIM) * cov)
+ : ParametersBase<DIM, T>(parameters,
+ cov,
+ {},
+ {},
+ sgn(parameters[Trk::qOverP]))
+ , m_surface(nullptr)
{
m_surface.reset((surface.isFree() ? surface.clone() : &surface));
// decide the sign of the charge
double qop = m_parameters[Trk::qOverP];
- // if(qop < 0.)
- // m_chargeDef->setCharge(-1.);
- // else
- // m_chargeDef->setCharge(1.);
// check qoverp is physical
double p = 0.;
@@ -112,32 +99,33 @@ namespace Trk
p*sin(m_parameters[Trk::phi])*sin(m_parameters[Trk::theta]),
p*cos(m_parameters[Trk::theta]));
- m_surface->localToGlobal(this->localPosition(),momentum(),m_position);
+ m_surface->localToGlobal(
+ this->localPosition(), m_momentum, m_position);
}
// Constructor with global arguments - uses global <-> local for parameters */
- template<int DIM,class T,class S>
- ParametersT<DIM,T,S>::ParametersT(const Amg::Vector3D& pos,
- const Amg::Vector3D& mom,
- double charge,
- const S& surface,
- AmgSymMatrix(DIM)* cov) :
- ParametersBase<DIM,T>(),
- m_parameters(),
- m_covariance(cov),
- m_position(pos),
- m_momentum(mom),
- m_surface(surface.isFree() ? surface.clone() : &surface),
- m_chargeDef(charge)
+ template<int DIM, class T, class S>
+ ParametersT<DIM, T, S>::ParametersT(const Amg::Vector3D& pos,
+ const Amg::Vector3D& mom,
+ double charge,
+ const S& surface,
+ AmgSymMatrix(DIM) * cov)
+ : ParametersBase<DIM, T>({},
+ cov,
+ pos,
+ mom,
+ charge)
+ , m_surface(surface.isFree() ? surface.clone() : &surface)
{
// m_chargeDef->setCharge(charge);
// get the local parameters via the surface
Amg::Vector2D lPosition;
- const bool ok = m_surface->globalToLocal(position(),momentum(),lPosition);
+ const bool ok =
+ m_surface->globalToLocal(this->position(), this->momentum(), lPosition);
if(not ok) {
lPosition = Amg::Vector2D (INVALID,INVALID);
-}
+ }
// For a neutral particle, last parm should be 1/p rather than q/p.
double qopnum = this->charge();
@@ -145,28 +133,30 @@ namespace Trk
}
// fill the vector now
- m_parameters << lPosition[Trk::loc1], lPosition[Trk::loc2], momentum().phi(),
- momentum().theta(), qopnum/momentum().norm();
+ m_parameters << lPosition[Trk::loc1], lPosition[Trk::loc2], this->momentum().phi(),
+ this->momentum().theta(), qopnum/this->momentum().norm();
}
// Constructor with mixed arguments 1 - uses global <-> local for parameters
- template <int DIM, class T, class S> Trk::ParametersT<DIM, T, S>::ParametersT(const Amg::Vector3D& pos,
- double phi, double theta, double qop,
- const S& surface,
- AmgSymMatrix(DIM)* cov):
- ParametersBase<DIM,T>(),
- m_parameters(),
- m_covariance(cov),
- m_position(pos),
- m_momentum(),
- m_surface(surface.isFree() ? surface.clone() : &surface),
- m_chargeDef(1.)
+ template<int DIM, class T, class S>
+ Trk::ParametersT<DIM, T, S>::ParametersT(const Amg::Vector3D& pos,
+ double phi,
+ double theta,
+ double qop,
+ const S& surface,
+ AmgSymMatrix(DIM) * cov)
+ : ParametersBase<DIM, T>({},
+ cov,
+ pos,
+ {},
+ 1.)
+ , m_surface(surface.isFree() ? surface.clone() : &surface)
{
// decide the sign of the charge
if(qop<0.) {
m_chargeDef.setCharge(-1);
-}
-
+ }
+
// fill momentum & then position using the surface
double p=0.0;
if (qop!=0.) {
@@ -182,49 +172,40 @@ namespace Trk
// get the local parameters via the surface
Amg::Vector2D lPosition;
- const bool ok = m_surface->globalToLocal(position(),momentum(),lPosition);
+ const bool ok =
+ m_surface->globalToLocal(this->position(), this->momentum(), lPosition);
if (not ok) {
lPosition = Amg::Vector2D (INVALID,INVALID);
-}
-
+ }
// fill the vector now
// cppcheck-suppress constStatement
m_parameters << lPosition[Trk::loc1], lPosition[Trk::loc2], phi, theta, qop;
}
// Copy constructor
- template<int DIM,class T,class S>
- ParametersT<DIM,T,S>::ParametersT(const ParametersT<DIM,T,S>& rhs):
- ParametersBase<DIM,T>(rhs),
- m_parameters(rhs.m_parameters),
- m_covariance(nullptr),
- m_position(rhs.position()),
- m_momentum(rhs.momentum()),
- m_surface(nullptr),
- m_chargeDef(rhs.m_chargeDef)
+ template<int DIM, class T, class S>
+ ParametersT<DIM, T, S>::ParametersT(const ParametersT<DIM, T, S>& rhs)
+ : ParametersBase<DIM, T>(rhs.parameters(),
+ nullptr,
+ rhs.position(),
+ rhs.momentum(),
+ rhs.charge())
+ , m_surface(nullptr)
{
-
m_surface.reset((rhs.m_surface && rhs.m_surface->isFree() ? rhs.m_surface->clone() : rhs.m_surface.get()));
if(rhs.covariance()) {
- m_covariance = new AmgSymMatrix(DIM)(*rhs.covariance());
-}
+ m_covariance = std::make_unique<AmgSymMatrix(DIM)>(*rhs.covariance());
+ }
}
// Move constructor
- template<int DIM,class T,class S>
- ParametersT<DIM,T,S>::ParametersT(ParametersT<DIM,T,S>&& rhs):
- ParametersBase<DIM,T>(std::forward<ParametersBase<DIM,T> >(rhs)),
- m_parameters(std::move(rhs.m_parameters)),
- m_covariance(rhs.m_covariance),
- m_position(std::move(rhs.position())),
- m_momentum(std::move(rhs.momentum())),
- m_surface(std::move (rhs.m_surface)),
- m_chargeDef(std::move(rhs.m_chargeDef))
+ template<int DIM, class T, class S>
+ ParametersT<DIM, T, S>::ParametersT(ParametersT<DIM, T, S>&& rhs)
+ : ParametersBase<DIM, T>(std::move(rhs))
+ , m_surface(std::move(rhs.m_surface))
{
- rhs.m_covariance = nullptr;
// False positive:
// cppcheck-suppress useInitializationList
- rhs.m_surface = nullptr;
}
// assignment operator
@@ -233,23 +214,17 @@ namespace Trk
{
if(this != &rhs)
{
- ParametersBase<DIM,T>::operator=(rhs);
-
- // delete the covariance if there
- if(m_covariance) { delete m_covariance;
-}
-
- // now assign
m_parameters = rhs.m_parameters;
m_covariance = rhs.covariance() ?
- (new AmgSymMatrix(DIM)(*rhs.covariance()))
+ std::make_unique<AmgSymMatrix(DIM)>(*rhs.covariance())
: nullptr;
m_position = rhs.position();
m_momentum = rhs.momentum();
- m_surface.reset( (rhs.m_surface && rhs.m_surface->isFree()) ? rhs.m_surface->clone() : rhs.m_surface.get());
+ m_surface.reset((rhs.m_surface && rhs.m_surface->isFree())
+ ? rhs.m_surface->clone()
+ : rhs.m_surface.get());
m_chargeDef = rhs.m_chargeDef;
}
-
return *this;
}
@@ -260,36 +235,11 @@ namespace Trk
if(this != &rhs)
{
ParametersBase<DIM,T>::operator=(std::move(rhs));
-
-
- if(m_covariance) { delete m_covariance;
-}
-
- m_parameters = std::move(rhs.m_parameters);
- m_covariance = rhs.m_covariance;
- rhs.m_covariance = nullptr;
- m_position = std::move(rhs.position());
- m_momentum = std::move(rhs.momentum());
m_surface = std::move(rhs.m_surface);
- rhs.m_surface = nullptr;
- m_chargeDef = std::move(rhs.m_chargeDef);
}
-
return *this;
}
- // Destructor
- template<int DIM,class T,class S>
- ParametersT<DIM,T,S>::~ParametersT()
- {
- if(m_covariance)
- {
- delete m_covariance;
- m_covariance = nullptr;
- }
- }
-
-
/** equality operator */
template<int DIM,class T,class S>
bool ParametersT<DIM,T,S>::operator==(const ParametersBase<DIM,T>& rhs) const
@@ -301,45 +251,47 @@ namespace Trk
decltype(this) pCasted = dynamic_cast<decltype(this)>(&rhs);
if(!pCasted) {
return false;
-}
+ }
// comparison to myself?
if(pCasted == this) {
return true;
-}
-
+ }
+
// compare parameters
- if(!parameters().isApprox(pCasted->parameters(),tolerance)) {
+ if (!this->parameters().isApprox(pCasted->parameters(), tolerance)) {
return false;
-}
-
- // compare covariance
- if(((covariance() != nullptr) &&
- (pCasted->covariance() != nullptr) &&
- !covariance()->isApprox(*pCasted->covariance(),tolerance))
- || (!covariance() != !pCasted->covariance())) { // <-- this is: covariance() XOR pCast->covariance()
+ }
+
+ // compare covariance
+ if (((this->covariance() != nullptr) &&
+ (pCasted->covariance() != nullptr) &&
+ !this->covariance()->isApprox(*pCasted->covariance(), tolerance)) ||
+ (!this->covariance() !=
+ !pCasted->covariance())) { // <-- this is: covariance() XOR
+ // pCast->covariance()
return false;
-}
+ }
// compare position
- if(!position().isApprox(pCasted->position(),tolerance)) {
+ if (!this->position().isApprox(pCasted->position(), tolerance)) {
return false;
-}
+ }
// compare momentum
- if(!momentum().isApprox(pCasted->momentum(),tolerance)) {
+ if (!this->momentum().isApprox(pCasted->momentum(), tolerance)) {
return false;
-}
+ }
// compare surfaces
- if(associatedSurface() != pCasted->associatedSurface()) {
+ if (associatedSurface() != pCasted->associatedSurface()) {
return false;
-}
+ }
// compare charge definition
- if(m_chargeDef != pCasted->m_chargeDef) {
+ if (m_chargeDef != pCasted->m_chargeDef) {
return false;
-}
+ }
// return compatibility of base class parts
return true;
@@ -349,7 +301,8 @@ namespace Trk
template<int DIM,class T,class S>
Amg::RotationMatrix3D ParametersT<DIM,T,S>::measurementFrame() const
{
- return associatedSurface().measurementFrame(position(),momentum());
+ return associatedSurface().measurementFrame(this->position(),
+ this->momentum());
}
// private updateParametersHelper
@@ -370,7 +323,8 @@ namespace Trk
//position or momentum update needed
if (updatePosition){
if(m_surface) {
- m_surface->localToGlobal(this->localPosition(),m_momentum,m_position);
+ m_surface->localToGlobal(
+ this->localPosition(), m_momentum, m_position);
} else{
m_momentum.setZero();
m_position.setZero();
@@ -398,10 +352,10 @@ namespace Trk
this->updateParametersHelper(updatedParameters);
// update the covariance
if (updatedCovariance) {
- if (updatedCovariance != m_covariance) {
- delete m_covariance;
+ //make sure we did not receive what we already hold
+ if (updatedCovariance != m_covariance.get()) {
+ m_covariance.reset(updatedCovariance);
}
- m_covariance = updatedCovariance;
}
}
@@ -415,46 +369,42 @@ namespace Trk
if (m_covariance) {
(*m_covariance) = updatedCovariance;
} else { // otherwise create one
- auto tmp = std::make_unique<AmgSymMatrix(DIM)>(updatedCovariance);
- m_covariance = tmp.release();
+ m_covariance= std::make_unique<AmgSymMatrix(DIM)>(updatedCovariance);
}
}
// Default constructor only for POOL and derived classes
- template<int DIM,class T,class S>
- ParametersT<DIM,T,S>::ParametersT():
- ParametersBase<DIM,T>(),
- m_parameters(),
- m_covariance(nullptr),
- m_position(),
- m_momentum(),
- m_surface(nullptr),
- m_chargeDef()
+ template<int DIM, class T, class S>
+ ParametersT<DIM, T, S>::ParametersT()
+ : ParametersBase<DIM, T>({}, nullptr, {}, {}, {})
+ , m_surface(nullptr)
{}
- //Protected C-tor used by the curvilinear parameters
- template <int DIM,class T,class S>
- Trk::ParametersT<DIM,T,S>::ParametersT(const Amg::Vector3D& pos,
- const Amg::Vector3D& mom,
- AmgSymMatrix(DIM)* cov):
- m_parameters(),
- m_covariance(cov),
- m_position(pos),
- m_momentum(mom),
- m_surface(nullptr),
- m_chargeDef()
+ //Protected C-tor used by the curvilinear parameters
+ template<int DIM, class T, class S>
+ Trk::ParametersT<DIM, T, S>::ParametersT(const Amg::Vector3D& pos,
+ const Amg::Vector3D& mom,
+ AmgSymMatrix(DIM) * cov)
+ : ParametersBase<DIM, T>({},
+ cov,
+ pos,
+ mom,
+ {})
+ , m_surface(nullptr)
{}
// Protected Constructor with local arguments - persistency only, ownership of surface given
- template <int DIM,class T,class S>
- Trk::ParametersT<DIM,T,S>::ParametersT(const AmgVector(DIM)& pars,
- const S* surface,
- AmgSymMatrix(DIM)* cov) :
- ParametersBase<DIM,T>(),
- m_parameters(pars),
- m_covariance(cov),
- m_surface(surface)
+ template<int DIM, class T, class S>
+ Trk::ParametersT<DIM, T, S>::ParametersT(const AmgVector(DIM) & pars,
+ const S* surface,
+ AmgSymMatrix(DIM) * cov)
+ : ParametersBase<DIM, T>(pars,
+ cov,
+ {},
+ {},
+ {})
+ , m_surface(surface)
{
float qop = m_parameters[Trk::qOverP];
// decide the sign of the charge
@@ -473,7 +423,8 @@ namespace Trk
p*sin(m_parameters[Trk::phi])*sin(m_parameters[Trk::theta]),
p*cos(m_parameters[Trk::theta]));
if (m_surface) {
- m_surface->localToGlobal(this->localPosition(),m_momentum,m_position);
+ m_surface->localToGlobal(
+ this->localPosition(), m_momentum, m_position);
} else {
m_momentum.setZero();
m_position.setZero();
diff --git a/Tracking/TrkEvent/TrkTrack/CMakeLists.txt b/Tracking/TrkEvent/TrkTrack/CMakeLists.txt
index f4c78fbcc726b216940009ca945a220cad4c2eaf..b36b16caa0ecb737c544ad91a7c04a2ae70f592f 100644
--- a/Tracking/TrkEvent/TrkTrack/CMakeLists.txt
+++ b/Tracking/TrkEvent/TrkTrack/CMakeLists.txt
@@ -30,7 +30,7 @@ atlas_add_library( TrkTrack
src/*.cxx
PUBLIC_HEADERS TrkTrack
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES AthLinks AthContainers TrkEventPrimitives TrkMaterialOnTrack TrkMeasurementBase TrkNeutralParameters TrkParameters
+ LINK_LIBRARIES AthLinks AthContainers TrkEventPrimitives TrkMaterialOnTrack TrkMeasurementBase TrkNeutralParameters TrkParameters TrkTrackLink
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} Identifier GaudiKernel TrkSurfaces TrkTrackSummary )
atlas_add_dictionary( TrkTrackDict
diff --git a/Tracking/TrkEvent/VxVertex/CMakeLists.txt b/Tracking/TrkEvent/VxVertex/CMakeLists.txt
index 2327715e71c62358eed1a282bfe831bc697fcd65..b4fde805433881a396942649c61c9f0a5a3f8b6f 100644
--- a/Tracking/TrkEvent/VxVertex/CMakeLists.txt
+++ b/Tracking/TrkEvent/VxVertex/CMakeLists.txt
@@ -29,8 +29,8 @@ atlas_add_library( VxVertex
PUBLIC_HEADERS VxVertex
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthLinks AthContainers GeoPrimitives EventPrimitives TrkEventPrimitives TrkNeutralParameters TrkTrackLink
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel TrkParameters )
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthLinks AthContainers GeoPrimitives EventPrimitives TrkEventPrimitives TrkNeutralParameters TrkTrackLink TrkParameters
+ PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel )
atlas_add_dictionary( VxVertexDict
VxVertex/VxVertexDict.h
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx
index ca3927da8604273c12078be51ccabf78f0760036..407e49e737531122d93949f20a836bb64567fd41 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkNeutralParameters/MeasuredNeutralAtaSurfaceCnv_p1.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//-----------------------------------------------------------------------------
@@ -19,7 +19,7 @@ template <class ATA_SURFACE>
class SurfaceGetCovariance : public ATA_SURFACE
{
public:
- AmgSymMatrix(ATA_SURFACE::dim)* getCovariance() { return this->m_covariance; }
+ AmgSymMatrix(ATA_SURFACE::dim)* getCovariance() { return this->m_covariance.get(); }
};
}
diff --git a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/TrackParametersCovarianceCnv.h b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/TrackParametersCovarianceCnv.h
index fe710f00f6b745e3b6bd4b9a78386b67e2fb7aa5..a44dfc6d49e3feba13da00abfaf97a1932775678 100644
--- a/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/TrackParametersCovarianceCnv.h
+++ b/Tracking/TrkEventCnv/TrkEventTPCnv/src/TrkParameters/TrackParametersCovarianceCnv.h
@@ -1,7 +1,7 @@
// 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
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
@@ -33,8 +33,7 @@ void TrackParametersCovarianceCnv<PARMS>::setCovariance (PARMS* p,
const Trk::ErrorMatrix& mat)
{
if (!p->m_covariance || p->m_covariance->size() != PARMS::dim) {
- delete p->m_covariance;
- p->m_covariance = new AmgSymMatrix(PARMS::dim);
+ p->m_covariance = std::make_unique<AmgSymMatrix(PARMS::dim)>();
}
if (mat.values.size() == PARMS::dim*(PARMS::dim+1)/2)
EigenHelpers::vectorToEigenMatrix(mat.values, *p->m_covariance, "TrackParametersCovarianceCnv");
diff --git a/Tracking/TrkExtrapolation/TrkExTools/CMakeLists.txt b/Tracking/TrkExtrapolation/TrkExTools/CMakeLists.txt
index 8ae411db8f7447cd6d31b40ff6de65c981bbff75..4ecbb0fa3e8e9bfba22cf9a13c10b98856c07a75 100644
--- a/Tracking/TrkExtrapolation/TrkExTools/CMakeLists.txt
+++ b/Tracking/TrkExtrapolation/TrkExTools/CMakeLists.txt
@@ -57,7 +57,7 @@ atlas_add_test( ObjContainer_test
atlas_add_test( TrkExToolsStringUtility_test
SOURCES
test/TrkExToolsStringUtility_test.cxx src/TrkExToolsStringUtility.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}
+ INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
LINK_LIBRARIES ${Boost_LIBRARIES}
POST_EXEC_SCRIPT "nopost.sh"
)
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
index 0379ec604950e1fe2be619bb94ea45433f8d3fe0..26ee2eafcd0ce9add525eb34b8e12a995051a858 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/Extrapolator.cxx
@@ -220,6 +220,11 @@ Trk::Extrapolator::initialize() {
m_fieldProperties = m_fastField ? Trk::MagneticFieldProperties(Trk::FastField) : Trk::MagneticFieldProperties(
Trk::FullField);
+
+ //before we start messing around, how many of these updaters were actually passed in?
+ const auto numberOfSubPropagatorsGiven = m_propNames.size();
+ const auto numberOfSubMatEffUpdatersGiven = m_updatNames.size();
+ //
if (m_propagators.empty()) {
m_propagators.push_back("Trk::RungeKuttaPropagator/DefaultPropagator");
}
@@ -326,13 +331,11 @@ Trk::Extrapolator::initialize() {
ATH_MSG_FATAL("Configuration Problem of Extrapolator: "
<< " -- At least one IPropagator and IMaterialUpdator instance have to be given.! ");
}
- const auto nprop = fullPropagatorNames.size();
- const auto nupdate = fullUpdatorNames.size();
- const std::string propStr = std::to_string(nprop)+" propagator" + std::string((nprop == 1)? "":"s");
- const std::string updStr = std::to_string(nupdate)+" updater" + std::string((nprop == 1)? "":"s");
- std::string msgString{"\nThe extrapolator uses six propagators and material effects updaters:\n"};
+ const std::string propStr = std::to_string(numberOfSubPropagatorsGiven)+" propagator" + std::string((numberOfSubPropagatorsGiven == 1)? "":"s");
+ const std::string updStr = std::to_string(numberOfSubMatEffUpdatersGiven)+" updater" + std::string((numberOfSubMatEffUpdatersGiven == 1)? "":"s");
+ std::string msgString{"\nThe extrapolator uses six sub-propagators and sub-material effects updaters:\n"};
msgString += propStr + " and "+updStr+" were given in the configuration,\n";
- msgString += "the rest have been filled from defaults, as follows: \n";
+ msgString += "the extrapolator sub-tools have been defined as follows: \n";
for (int i(0);i != int(Trk::NumberOfSignatures);++i){
msgString += std::to_string(i)+") propagator: "+m_subPropagators[i]->name()+", updater: "+m_subupdaters[i]->name()+"\n";
}
@@ -347,7 +350,7 @@ StatusCode
Trk::Extrapolator::finalize() {
if (m_navigationStatistics) {
ATH_MSG_INFO(" Perfomance Statistics : ");
- ATH_MSG_INFO(" [P] Methode Statistics ------- -----------------------------------------------------------");
+ ATH_MSG_INFO(" [P] Method Statistics ------- -----------------------------------------------------------");
ATH_MSG_INFO(" -> Number of extrapolate() calls : " << m_extrapolateCalls);
ATH_MSG_INFO(" -> Number of extrapolateBlindly() calls : " << m_extrapolateBlindlyCalls);
ATH_MSG_INFO(" -> Number of extrapolateDirectly() calls : " << m_extrapolateDirectlyCalls);
@@ -369,7 +372,7 @@ Trk::Extrapolator::finalize() {
if (m_navigationBreakDetails) {
ATH_MSG_DEBUG(" Detailed output for Navigation breaks : ");
ATH_MSG_DEBUG(" o " << m_navigationBreakLoop << " loops occured in the following volumes: ");
- ATH_MSG_DEBUG(" o " << m_navigationBreakOscillation << " osillations occured in following volumes: ");
+ ATH_MSG_DEBUG(" o " << m_navigationBreakOscillation << " oscillations occured in following volumes: ");
ATH_MSG_DEBUG(" o " << m_navigationBreakNoVolume << " times no next volume found of volumes: ");
ATH_MSG_DEBUG(" o " << m_navigationBreakDistIncrease << " distance increases detected at volumes: ");
ATH_MSG_DEBUG(" o " << m_navigationBreakVolumeSignature << " no propagator configured for volumes: ");
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/TrkExToolsStringUtility.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/TrkExToolsStringUtility.cxx
index a6c9325890f6589583fae858866a9e00977eac92..90055246367464a13dcfd7ec6f72891630921f96 100644
--- a/Tracking/TrkExtrapolation/TrkExTools/src/TrkExToolsStringUtility.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/TrkExToolsStringUtility.cxx
@@ -26,7 +26,7 @@ namespace TrkExTools{
validToolName(const std::string & toolName){
//valid name can contain underscore or alphanumeric characters, but cannot start
//with a number
- std::regex re{"^[a-zA-Z_][a-zA-Z0-9_]*$"};
+ std::regex re{"^[a-zA-Z_][a-zA-Z0-9_]*(::)?[a-zA-Z0-9_]*$"};
return std::regex_match(toolName, re);
}
@@ -35,7 +35,9 @@ namespace TrkExTools{
std::string result{};
auto isEmpty = [](const std::string & s){return s.empty();};
if (std::any_of(toolNameVector.begin(), toolNameVector.end(), isEmpty) ) return "A tool name was empty.";
- if (not std::all_of(toolNameVector.begin(), toolNameVector.end(),validToolName)) return "A tool name was invalid";
+ if (auto pTheTool=std::find_if_not(toolNameVector.begin(), toolNameVector.end(), validToolName); pTheTool != toolNameVector.end()) {
+ result = "A tool name was invalid: " + *pTheTool;
+ }
return result;
}
diff --git a/Tracking/TrkExtrapolation/TrkExTools/test/TrkExToolsStringUtility_test.cxx b/Tracking/TrkExtrapolation/TrkExTools/test/TrkExToolsStringUtility_test.cxx
index b76edd959ad3cf80452138d7656712695393ec27..740233ef224b9875b30ecb8de54833932fe65444 100644
--- a/Tracking/TrkExtrapolation/TrkExTools/test/TrkExToolsStringUtility_test.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/test/TrkExToolsStringUtility_test.cxx
@@ -60,10 +60,16 @@ BOOST_AUTO_TEST_SUITE(TrkExToolsStringUtilityTest)
const std::string aValidString{"myToolName"};
const std::string invalidString{"2BorNot2B"};
const std::string invalidString2{"B>BorNot2B"};
+ // Example from https://acode-browser1.usatlas.bnl.gov/lxr/source/athena/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py#0229
+ // giving rise to ATLASRECTS-5500
+ const std::string muonExample{"Trk::EnergyLossUpdator"};
+ const std::string muonExampleWithTypo{"Trk:EnergyLossUpdator"};
BOOST_TEST(validToolName(aValidString) == true);
BOOST_TEST(validToolName(empty) == false);
BOOST_TEST(validToolName(invalidString) == false);
BOOST_TEST(validToolName(invalidString2) == false);
+ BOOST_TEST(validToolName(muonExample) == true);
+ BOOST_TEST(validToolName(muonExampleWithTypo) == false);
}
/*
std::string
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/CMakeLists.txt b/Tracking/TrkFitter/TrkGaussianSumFilter/CMakeLists.txt
index bbd1b672efecf4b73183649453ebc722897495e0..248bdb7638ff33a87901cfc123a501b5d81d3200 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/CMakeLists.txt
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/GeoPrimitives
Event/EventPrimitives
GaudiKernel
- Tracking/TrkDetDescr/TrkDetDescrInterfaces
Tracking/TrkDetDescr/TrkGeometry
Tracking/TrkDetDescr/TrkSurfaces
Tracking/TrkEvent/TrkEventPrimitives
@@ -27,29 +26,29 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkTools/TrkToolInterfaces
PRIVATE
Control/CxxUtils
- Event/xAOD/xAODEventInfo
Tools/PathResolver
Tracking/TrkDetDescr/TrkDetElementBase
- Tracking/TrkDetDescr/TrkVolumes
Tracking/TrkEvent/TrkCaloCluster_OnTrack
Tracking/TrkEvent/TrkMeasurementBase
Tracking/TrkEvent/TrkPrepRawData
Tracking/TrkEvent/TrkPseudoMeasurementOnTrack
Tracking/TrkEvent/TrkRIO_OnTrack
- Tracking/TrkEvent/TrkTrack )
+ Tracking/TrkEvent/TrkTrack
+ Tracking/TrkEvent/TrkParametersBase
+ )
# External dependencies:
find_package( Eigen )
-# Component(s) in the package:
+#Component(s) in the package:
atlas_add_component( TrkGaussianSumFilter
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives EventPrimitives GaudiKernel TrkDetDescrInterfaces TrkGeometry
- TrkSurfaces TrkEventPrimitives TrkEventUtils TrkMaterialOnTrack TrkMultiComponentStateOnSurface TrkParameters TrkExInterfaces TrkExUtils TrkFitterInterfaces
- TrkFitterUtils TrkToolInterfaces CxxUtils xAODEventInfo PathResolver TrkDetElementBase TrkVolumes TrkCaloCluster_OnTrack TrkMeasurementBase
- TrkPrepRawData TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack )
+ LINK_LIBRARIES ${EIGEN_LIBRARIES} AthenaBaseComps AthContainers GeoPrimitives EventPrimitives GaudiKernel TrkGeometry TrkSurfaces
+ TrkEventPrimitives TrkEventUtils TrkMaterialOnTrack TrkMultiComponentStateOnSurface TrkParameters TrkExInterfaces TrkExUtils TrkFitterInterfaces
+ TrkFitterUtils TrkToolInterfaces CxxUtils PathResolver TrkDetElementBase TrkCaloCluster_OnTrack TrkMeasurementBase TrkPrepRawData
+ TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkTrack TrkParametersBase)
# Install files from the package:
atlas_install_headers( TrkGaussianSumFilter )
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.h
index 83a41352d7d85d33a9164d33ab4caa92d7d02be8..590ebe0af589e53b895cb9c4287efbd0ae4e98ce 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.h
@@ -5,9 +5,9 @@
/**
* @file AlignedDynArray.h
* @date 26th November 2019
- * @author amorley, christos
+ * @author Anthony Morley, Christos Anastopoulos
* @brief Dynamic array fullfilling alignment requirements
- *********************************************************************************/
+ */
#ifndef GSFUtils_AlignedDynArray_H
#define GSFUtils_AlignedDynArray_H
@@ -16,8 +16,7 @@
namespace GSFUtils {
template<typename T, size_t Alignment>
/**
- * @bried A wrapper around std::aligned_alloc
- * https://en.cppreference.com/w/cpp/memory/c/aligned_alloc
+ * A wrapper around std::aligned_alloc
*
* Provides
* - Additional RAII functionality
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.icc b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.icc
index d42c8583b3ae9ebf9564f5ef327686a854a90c4e..9dfec97c5e15787eda80046ec7706eba559fdce2 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.icc
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/AlignedDynArray.icc
@@ -2,13 +2,13 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-/*********************************************************************************
- AlignedDynArray.icc - description
- -------------------------------------------------
- begin : 26th November 2019
- author : amorley, Christos
- decription : Dynamic array fullfilling alignment requirements
- *********************************************************************************/
+/**
+ * @file AlignedDynArray.icc
+ * @date 26th November 2019
+ * @author Anthony Morley, Christos Anastopoulos
+ * @brief AlignedDynArray implementation
+ */
+
namespace GSFUtils {
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h
index 91b98ac3fc2f1876b5ac7c1a79e9704cfe6079f8..38c10489cb58010da2a3a679283feff3a239cce1 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/ForwardGsfFitter.h
@@ -2,15 +2,12 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/* *******************************************************************************
- ForwardGsfFitter.h - description
- ----------------------------------
-begin : Wednesday 9th March 2005
-author : atkinson
-email : Tom.Atkinson@cern.ch
-decription : Class definition for the forward GSF fitter
-**********************************************************************************
-*/
+/**
+ * @file ForwardGsfFitter.h
+ * @date Wednesday 9th March 2005
+ * @author Tom Athkinson, Anthony Morley, Christos Anastopoulos
+ * @brief Class definition for the forward GSF fitter
+ */
#ifndef TrkForwardGsfFitter_H
#define TrkForwardGsfFitter_H
@@ -60,6 +57,7 @@ public:
/** Forward GSF fit using PrepRawData */
virtual std::unique_ptr<ForwardTrajectory> fitPRD(
+ const EventContext& ctx,
const PrepRawDataSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis =
@@ -67,6 +65,7 @@ public:
/** Forward GSF fit using MeasurementSet */
virtual std::unique_ptr<ForwardTrajectory> fitMeasurements(
+ const EventContext& ctx,
const MeasurementSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis =
@@ -78,6 +77,7 @@ public:
private:
/** Progress one step along the fit */
bool stepForwardFit(
+ const EventContext& ctx,
ForwardTrajectory*,
const PrepRawData*,
const MeasurementBase*,
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
index f200f6049d0fbe6c72b4619d4ca3149d5f6484bf..db19aca0c48e7d4d6c4319b87981271a669adc77 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GaussianSumFitter.h
@@ -18,7 +18,7 @@ decription : Class for fitting according to the Gaussian Sum Filter
#include "TrkFitterInterfaces/ITrackFitter.h"
#include "TrkFitterUtils/FitterTypes.h"
#include "TrkParameters/TrackParameters.h"
-
+#include "TrkFitterUtils/TrackFitInputPreparator.h"
#include "TrkToolInterfaces/IRIO_OnTrackCreator.h"
#include "AthenaBaseComps/AthAlgTool.h"
@@ -26,19 +26,19 @@ decription : Class for fitting according to the Gaussian Sum Filter
#include "GaudiKernel/ServiceHandle.h"
#include "GaudiKernel/ToolHandle.h"
+
#include <atomic>
-namespace Trk {
+namespace Trk {
class IMultiStateMeasurementUpdator;
class MultiComponentStateOnSurface;
class IMultiStateExtrapolator;
-
-class TrackFitInputPreparator;
class IForwardGsfFitter;
class IGsfSmoother;
-class Track;
class FitQuality;
+class Track;
+
class GaussianSumFitter
: virtual public ITrackFitter
@@ -110,6 +110,7 @@ public:
private:
/** Produces a perigee from a smoothed trajectory */
const MultiComponentStateOnSurface* makePerigee(
+ const EventContext& ctx,
const SmoothedTrajectory*,
const ParticleHypothesis particleHypothesis = nonInteracting) const;
@@ -151,20 +152,23 @@ private:
bool m_refitOnMeasurementBase;
bool m_doHitSorting;
PropDirection m_directionToPerigee;
- TrkParametersComparisonFunction* m_trkParametersComparisonFunction;
+ std::unique_ptr<TrkParametersComparisonFunction> m_trkParametersComparisonFunction;
+ std::unique_ptr<TrackFitInputPreparator> m_inputPreparator;
std::vector<double> m_sortingReferencePoint;
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_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
+
+ // Number of Fit PrepRawData Calls
+ mutable std::atomic<int> m_FitPRD;
+ // Number of Fit MeasurementBase Calls
+ mutable std::atomic<int> m_FitMeasurementBase;
+ // Number of Foward Fit Failures
+ mutable std::atomic<int> m_ForwardFailure;
+ // Number of Smoother Failures
+ mutable std::atomic<int> m_SmootherFailure;
+ // Number of MakePerigee Failures
+ mutable std::atomic<int> m_PerigeeFailure;
+ // Number of Tracks that fail fit Quailty test
+ mutable std::atomic<int> m_fitQualityFailure;
};
} // end Trk namespace
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfSmoother.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfSmoother.h
index 4158cebf49cf019784c62629cd7e9ba02c881405..ad65b2862b7aae937d77eaab8488d950bf5cc6d4 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfSmoother.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/GsfSmoother.h
@@ -56,6 +56,7 @@ public:
/** Gsf smoother method */
virtual SmoothedTrajectory* fit(
+ const EventContext& ctx,
const ForwardTrajectory&,
const ParticleHypothesis particleHypothesis = nonInteracting,
const CaloCluster_OnTrack* ccot = nullptr) const;
@@ -67,6 +68,7 @@ private:
/** Methof to add the CaloCluster onto the track */
MultiComponentState addCCOT(
+ const EventContext& ctx,
const Trk::TrackStateOnSurface* currentState,
const Trk::CaloCluster_OnTrack* ccot,
Trk::SmoothedTrajectory* smoothedTrajectory) const;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h
index 0193e7adb93726d41bbb82967453b7922e354c38..ebc4bbd4c79144dd3670c40c46a966ac6ab82965 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IForwardGsfFitter.h
@@ -2,15 +2,13 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/* *******************************************************************************
- IForwardGsfFitter.h - description
- ----------------------------------
-created : Thursday 8th January 2009
-authors : amorley,christos
-email : Anthony.Morley@cern.ch
-decription : Abstract interface for the forward GSF fitter
-**********************************************************************************
-*/
+
+/**
+ * @file IForwardGsfFitter.h
+ * @date Thursday 8th January 2009
+ * @author Anthony Morley, Christos Anastopoulos
+ * @brief Abstract interface for the forward GSF fitter
+ */
#ifndef TrkIForwardGsfFitter_H
#define TrkIForwardGsfFitter_H
@@ -21,6 +19,7 @@ decription : Abstract interface for the forward GSF fitter
#include "TrkFitterUtils/FitterTypes.h"
#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
#include "TrkParameters/TrackParameters.h"
+#include "GaudiKernel/EventContext.h"
#include <memory>
namespace Trk {
@@ -56,12 +55,14 @@ public:
/** Forward GSF fit using PrepRawData */
virtual std::unique_ptr<ForwardTrajectory> fitPRD(
+ const EventContext& ctx,
const PrepRawDataSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis = nonInteracting) const = 0;
/** Forward GSF fit using MeasurementSet */
virtual std::unique_ptr<ForwardTrajectory> fitMeasurements(
+ const EventContext& ctx,
const MeasurementSet&,
const TrackParameters&,
const ParticleHypothesis particleHypothesis = nonInteracting) const = 0;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IGsfSmoother.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IGsfSmoother.h
index aa20ac008a75bc3b63d0f3d329e1af05d55dd403..aaef237d53849e2ba0646654780ccad68fbfc174 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IGsfSmoother.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/IGsfSmoother.h
@@ -19,6 +19,7 @@ decription : Abstract interface for the GSF smoother
#include "TrkFitterUtils/FitterTypes.h"
#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
+#include "GaudiKernel/EventContext.h"
#include "GaudiKernel/IAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
@@ -49,6 +50,7 @@ public:
/** Gsf smoother method */
virtual SmoothedTrajectory* fit(
+ const EventContext& ctx,
const ForwardTrajectory&,
const ParticleHypothesis particleHypothesis = nonInteracting,
const CaloCluster_OnTrack* ccot = nullptr) const = 0;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h
index 2525c5632efd681aafa7d8e97d75786be35c91fb..ff5603c547ac017ad4bab0a25059acf0e83ac00c 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/KLGaussianMixtureReduction.h
@@ -4,11 +4,71 @@
/**
* @file KLGaussianMixtureReduction.h
- * @author amorley
- * @author Anastopoulos
+ * @author Anthony Morley , Christos Anastopoulos
* @date 26th November 2019
- * @brief Function that help implement component merging .
+ *
+ * The main purpose of the utilities here
+ * are to facilitate the calculation of the
+ * divergence between components of the mixture
+ * and the merging of similar componets.
+ *
+ * For a summary of available methods look
+ * https://arxiv.org/pdf/2001.00727.pdf
+ *
+ * Here we opt for formula 10.
+ * For an 1D Normal distributions this becomes:
+ *
+ * (variance1/variance2) * (variance2/variance1) +
+ * (mean1-mean2) * ((1/variance1)+(1/variance2))(mean1-mean2)
+ *
+ * We use doubles for the intermediate calculations
+ * but we store the final distances to short in an array
+ * of floats.
+ *
+ * For pairwise distance comparisons assuming 0 ... N-1 (N total elements )
+ * The pairwise distance matrix can be represented in a triangular array:
+ *
+ * [ (1,0) ] <br>
+ * [ (2,0), (2,1) ] <br>
+ * [ (3,0), (3,1), (3,2)] <br>
+ * [ (4,0), (4,1), (4,2) , (4,3) <br>
+ * [.............................] <br>
+ * [(N-1,0),(N-1,1),(N-1,2),(N-1,3) ... (N-1,N-2)]<br>
+ *
+ * With size 1+2+3+ .... (N-1) = N*(N-1)/2
+ *
+ * The lexicographical storage allocation function is <br>
+ * Loc(i,j) = i*(i-1)/2 + j <br>
+ * e.g <br>
+ * (1,0) => 1 *(1-1)/2 + 0 => 0 <br>
+ * (2,0) => 2 *(2-1)/2 + 0 => 1 <br>
+ * (2,1) => 2 *(2-1)/2 + 1 => 2 <br>
+ * (3,0) => 3 * (3-1)/2 +0 => 3 <br>
+ *
+ * Leading to <br>
+ * [(1,0),(2,0),(2,1),(3,0),(3,1),(3,2).... (N-1,N-2)]
+ *
+ *
+ * The N-1 Rows map to the value K of the 1st element in the pair. <br>
+ * where K=1,2,3,..,N-1 and each Row has size K. <br>
+ * Each Row starts at array positions K*(K-1)/2 <br>
+ * e.g <br>
+ * The row for element 1 starts at array position 0. <br>
+ * The row for element 2 starts at array position 1. <br>
+ * The row for element N-1 starts at array positon (N-1)*(N-2)/2 <br>
+ *
+ * The N-1 Columns map to the value K of the second element in the pair <br>
+ * K= 0,1,2 .., N-2 <br>
+ * The array positions follows (i-1)*i/2+K <br>
+ * where i : K+1 .... N-1 [for(i=K+1;i<N;++i) <br>
+ * e.g <br>
+ * 0 appears as 2nd element in the pair at array positions [0,1,3,6...] <br>
+ * 1 appears as 2nd element in the pair at array positions [2,4,7...] <br>
+ * 2 appears as 2nd element in the pair at array positions [5,8,12....] <br>
+ * N-2 appears as 2nd element once at position [N(N-1)/2-1] <br>
+ *
*/
+
#ifndef KLGaussianMixReductionUtils_H
#define KLGaussianMixReductionUtils_H
@@ -21,29 +81,12 @@
namespace GSFUtils {
/**
- * Alignment used for SIMD
+ * @brief Alignment used for SIMD
*/
constexpr size_t alignment = 32;
/**
- * The main pupropse of the utilities here
- * are to facilitate the calculation of the
- * divergence between components of the mixture
- * and the merging of similar componets.
- *
- * For a revies of available methods look
- * https://arxiv.org/pdf/2001.00727.pdf
- *
- * Here we opt for formula 10.
- * For an 1D Normal distributions this becomes:
- *
- * (variance1-variance2) (1/variance1 - 1/variance2) -
- * (mean1-mean2)(1/variance+1/variance)(mean1-mean2)
- *
- * We use doubles for the intermediate calculations
- * but we store the final distances to short in an array
- * of floats.
- *
+ * @brief struct representing 1D component
*/
struct Component1D
{
@@ -54,66 +97,22 @@ struct Component1D
};
/**
- * For pairwise distance comparisons assuming 0..... N-1 (N total elements )
- * The pairwise distance matrix can be represented in a triangular array:
- * [ (1,0)
- * [ (2,0), (2,1),
- * [ (3,0), (3,1), (3,2)
- * [ (4,0), (4,1), (4,2) , (4,3)
- * [.......................
- * [.............................
- * [(N-1,0),(N-1,1),(N-1,2),(N-1,3).......(N-1,N-2)]
- *
- * With size
- * 1+2+3+ .... (N-1) = N*(N-1)/2
- *
- * The lexicographical storage allocation function is
- * Loc(i,j) = i*(i-1)/2 + j
- * e.g
- * (1,0) --> 1 *(1-1)/2 + 0 --> 0
- * (2,0) --> 2 *(2-1)/2 + 0 --> 1
- * (2,1) --> 2 *(2-1)/2 + 1 --> 2
- * (3,0) --> 3 * (3-1)/2 +0 --> 3
- * Leading to
- * [(1,0),(2,0),(2,1),(3,0),(3,1),(3,2)...... (N-1,N-2)]
- *
- *
- * The N-1 Rows map to value K of the 1st element in the pair.
- * K=1,2,3,...N-1 and each one has size K.
- * Each Row starts at array positions K*(K-1)/2
- * e.g
- * The row for element 1 starts at array position 0.
- * The row for element 2 starts at array position 1.
- * The row for element N-1 starts at array positon (N-1)*(N-2)/2
- *
- * The N-1 Columns map to the value K of the second element in the pair
- * 0,1,2 ... N-2
- * The array position follow (i-1)*i/2+K;
- * where i : K+1 .... N-1 [for(i=K+1;i<N;++i)
- * e.g
- * 0 appears as 2nd element in the pair at array positions
- * [0,1,3,6...]
- * 1 appears as 2nd element in the pair at array positions
- * [2,4,7...]
- * 2 appears as 2nd element in the pair at array positions
- * [5,8,12....]
- * N-2 appears as 2nd element once at position [N(N-1)/2-1]
- *
- */
+ * @brief Helper struct to map position in
+ * triangular array to I, J indices
+ */
struct triangularToIJ
{
int32_t I = -1;
int32_t J = -1;
};
-/**
- * Some usefull typedefs
- */
+/// typedef for float* restrict
typedef float* ATH_RESTRICT floatPtrRestrict;
+/// typedef for Component1D* restrict
typedef Component1D* ATH_RESTRICT componentPtrRestrict;
/**
- * Merge the componentsIn and return
+ * @brief Merge the componentsIn and return
* which componets got merged
*/
std::vector<std::pair<int32_t, int32_t>>
@@ -122,7 +121,7 @@ findMerges(componentPtrRestrict componentsIn,
const int32_t reducedSize);
/**
- * For finding the index of the minumum pairwise distance
+ * @brief For finding the index of the minumum pairwise distance
* we opt for SIMD and function multiversioning
*/
#if HAVE_FUNCTION_MULTIVERSIONING
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateAssembler.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateAssembler.h
index f92bf819fef786132c12c502918a8b3c9880bb88..811e0a56581b1cac359e2129cee888954a794bf2 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateAssembler.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateAssembler.h
@@ -2,22 +2,21 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/***************************************************************************
- MultiComponentStateAssembler.h - description
- -----------------------------------------------
-begin : Monday 20th December 2004
-author : atkinson,morley,anastopoulos
-description : This is a helper class to collect components of a
- multi-component state and put them all into a
- MultiComponentState. The addition of components can be
- one at a time through the addComponent method (taking a
- single ComponentParameters object) or many at a time,
- through the addComponents method (taking a
- MultiComponentState object). In addition this helper
- class also is used in weighting renormalisation
- calculations and the removal of components with
- insignificantly small weightings.
-***************************************************************************/
+/**
+ * @file MultiComponentStateAssembler.h
+ * @date Monday 20th December 2004
+ * @author Atkinson,Anthony Morley, Christos Anastopoulos
+ *
+ * Helper struct and methods to collect components of a
+ * multi-component state and put them all into a
+ * MultiComponentState. The addition of components can be
+ * one at a time through the addComponent method (taking a
+ * single ComponentParameters object) or many at a time,(taking a
+ * MultiComponentState object). It also included
+ * helpers to be used in weighting renormalisation
+ * calculations and the removal of components with
+ * insignificantly small weightings.
+ */
#ifndef MultiComponentStateAssembler_H
#define MultiComponentStateAssembler_H
@@ -27,6 +26,10 @@ description : This is a helper class to collect components of a
namespace Trk {
+/**
+ * Helper struct representing a cache of the Multicomponent
+ * state under assembly
+ */
namespace MultiComponentStateAssembler {
struct Cache
{
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateCombiner.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateCombiner.h
index c6bc1accc8198fb4003a09e2c1d28a7a1ffe85ef..7f37a145c593dd844da683b10227dbc9bd7b3f3f 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateCombiner.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/MultiComponentStateCombiner.h
@@ -2,37 +2,35 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*******************************************************************************
- MultiComponentStateCombiner.h - description
- -----------------------------------------------
-begin : Monday 20th December 2004
-authors : atkinson,morley,anastopoulos
-description : These methods take a multi-component state and collapses
- all components returning a single set of track
- parameters with single mean and covariance matrix.
-*******************************************************************************/
-
+/**
+ * @file MultiComponentStateCombiner.h
+ * @date Monday 20th December 2004
+ * @author Atkinson,Anthony Morley, Christos Anastopoulos
+ *
+ * Methods that take a multi-component state and collapses
+ * all components returning a single set of track
+ * parameters with single mean and covariance matrix.
+ */
#ifndef MultiComponentStateCombiner_H
#define MultiComponentStateCombiner_H
#include "TrkMultiComponentStateOnSurface/MultiComponentState.h"
-
namespace Trk {
namespace MultiComponentStateCombiner {
-/** Calculate combined state of many components */
+/** @bried Calculate combined state of many components */
std::unique_ptr<Trk::TrackParameters>
combine(const MultiComponentState&,
const bool useMode = false,
const double fractionPDFused = 1.0);
-/** Combined/merge a component to another one */
+/** @brief Combined/merge a component to another one */
void
combineWithWeight(Trk::ComponentParameters& mergeTo,
const Trk::ComponentParameters& addThis);
-/** Calculate combined state and weight of many components */
+/** @brief Calculate combined state and weight of many components */
std::unique_ptr<Trk::ComponentParameters>
combineWithWeight(const MultiComponentState&,
const bool useMode = false,
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
index 69e3582be5f0de983609e6aadd6056b0e1e4737a..ba7cb5de00c51fe5225dbbfcea23ff3c6f4ac108 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h
@@ -2,31 +2,33 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*********************************************************************************
- QuickCloseComponentsMultiStateMerger.h - description
- -------------------------------------------------
-begin : Wednesday 3rd September 2008
-author : amorley
-email : Anthony.Morley@cern.ch
-decription : Class for merging components of a multi-state based on
- combination of those which are "close" together as
- defined by some metric ... but faster
-*********************************************************************************/
+/**
+ * @file QuickCloseComponentsMultiStateMerger.h
+ * @date Wednesday 3rd September 2008
+ * @author Anthony Morley, Christos Anastopoulos
+ *
+ * Functions for merging components of a multi-state based on
+ * combination of those which are "close" together as
+ * defined by some metric.
+ */
#ifndef TrkQuickCloseComponentsMultiStateMerger_H
#define TrkQuickCloseComponentsMultiStateMerger_H
-#include "GaudiKernel/ToolHandle.h"
#include "TrkGaussianSumFilter/MultiComponentStateAssembler.h"
namespace Trk {
class IMultiComponentStateCombiner;
class TrackStateOnSurface;
+
namespace QuickCloseComponentsMultiStateMerger {
-/** Method for merging components - ownership of objects is passed */
+
+/// Method for merging components - ownership of objects is passed
MultiComponentState
merge(Trk::MultiComponentState&&, const unsigned int maximumNumberOfComponents);
+
+/// Method for merging and assembling a state
MultiComponentState
mergeFullDistArray(MultiComponentStateAssembler::Cache& cache,
Trk::MultiComponentState&,
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
index 8d3b574cca28536d15d0874d04d520eb92a3f264..12ab02457be411564eac4fe1300c78af4ee5336b 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/ForwardGsfFitter.cxx
@@ -2,18 +2,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/* *******************************************************************************
- ForwardGsfFitter.cxx - description
- ------------------------------------
-begin : Wednesday 9th March 2005
-author : amorley, atkinson
-email : Anthony.Morley@cern.ch, Tom.Atkinson@cern.ch
-decription : Implementation code for ForwardGsfFitter class
-**********************************************************************************
-*/
+/**
+ * @file ForwardGsfFitter.cxx
+ * @date Wednesday 9th March 2005
+ * @author Tom Athkinson, Anthony Morley, Christos Anastopoulos
+ * @brief Implementation code for ForwardGsfFitter class
+ */
#include "TrkGaussianSumFilter/ForwardGsfFitter.h"
-
#include "TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h"
#include "TrkGaussianSumFilter/IMultiStateExtrapolator.h"
@@ -94,33 +90,12 @@ Trk::ForwardGsfFitter::configureTools(
std::unique_ptr<Trk::ForwardTrajectory>
Trk::ForwardGsfFitter::fitPRD(
+ const EventContext& ctx,
const Trk::PrepRawDataSet& inputPrepRawDataSet,
const Trk::TrackParameters& estimatedTrackParametersNearOrigin,
const Trk::ParticleHypothesis particleHypothesis) const
{
- // Check that the updator is instansiated
- if (!m_updator) {
- ATH_MSG_ERROR("The measurement updator is not configured... Exiting!");
- return nullptr;
- }
-
- if (!m_extrapolator) {
- ATH_MSG_ERROR("The extrapolator is not configured... Exiting!");
- return nullptr;
- }
-
- if (!m_rioOnTrackCreator) {
- ATH_MSG_ERROR("The RIO_OnTrackCreator is not configured for use with the "
- "PrepRawData set... Exiting!");
- return nullptr;
- }
-
- if (inputPrepRawDataSet.empty()) {
- ATH_MSG_ERROR("Input PrepRawDataSet is empty... Exiting!");
- return nullptr;
- }
-
// Configure for forwards filtering material effects overide
Trk::ParticleHypothesis configuredParticleHypothesis;
@@ -173,6 +148,7 @@ Trk::ForwardGsfFitter::fitPRD(
// Every valid step the ForwardTrajectory object passed to the
// stepForwardFit method is updated
bool stepIsValid = stepForwardFit(
+ ctx,
forwardTrajectory.get(),
*prepRawData,
nullptr,
@@ -195,6 +171,7 @@ Trk::ForwardGsfFitter::fitPRD(
std::unique_ptr<Trk::ForwardTrajectory>
Trk::ForwardGsfFitter::fitMeasurements(
+ const EventContext& ctx,
const Trk::MeasurementSet& inputMeasurementSet,
const Trk::TrackParameters& estimatedTrackParametersNearOrigin,
const Trk::ParticleHypothesis particleHypothesis) const
@@ -252,7 +229,8 @@ Trk::ForwardGsfFitter::fitMeasurements(
for (; measurement != inputMeasurementSet.end(); ++measurement) {
- bool stepIsValid = stepForwardFit(forwardTrajectory.get(),
+ bool stepIsValid = stepForwardFit(ctx,
+ forwardTrajectory.get(),
nullptr,
*measurement,
(*measurement)->associatedSurface(),
@@ -273,6 +251,7 @@ Trk::ForwardGsfFitter::fitMeasurements(
bool
Trk::ForwardGsfFitter::stepForwardFit(
+ const EventContext& ctx,
ForwardTrajectory* forwardTrajectory,
const Trk::PrepRawData* originalPrepRawData,
const Trk::MeasurementBase* originalMeasurement,
@@ -296,7 +275,7 @@ Trk::ForwardGsfFitter::stepForwardFit(
// Extrapolate multi-component state to the next measurement surface
// =================================================================
Trk::MultiComponentState extrapolatedState =
- m_extrapolator->extrapolate(Gaudi::Hive::currentContext(),
+ m_extrapolator->extrapolate(ctx,
updatedState,
surface,
Trk::alongMomentum,
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
index 65be4c549ec523ee3bc5ffd9175aeea32656bb9f..eff345b24e9fbc0c5e08a26d1d1f471974ad583b 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
@@ -2,14 +2,11 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/* *******************************************************************************
- GaussianSumFitter.cxx - description
- -------------------------------------
-begin : Monday 7th March 2005
-author : amorley atkinson
-email : Anthony.Morley@cern.ch Tom.Atkinson@cern.ch
-decription : Implementation code for Gaussian Sum Fitter class
-**********************************************************************************
+/**
+ * @file GaussianSumFitter.cxx
+ * @begin Monday 7th March 2005
+ * @author Anthony Morley, Tom Atkinson, Christos Anastopoulos
+ * @brief Implementation code for Gaussian Sum Fitter class
*/
#include "TrkGaussianSumFilter/GaussianSumFitter.h"
@@ -26,7 +23,6 @@ decription : Implementation code for Gaussian Sum Fitter class
#include "TrkCaloCluster_OnTrack/CaloCluster_OnTrack.h"
#include "TrkEventPrimitives/FitQuality.h"
-#include "TrkFitterUtils/TrackFitInputPreparator.h"
#include "TrkMaterialOnTrack/EstimatedBremOnTrack.h"
#include "TrkMultiComponentStateOnSurface/MultiComponentStateOnSurface.h"
#include "TrkPrepRawData/PrepRawData.h"
@@ -51,8 +47,8 @@ Trk::GaussianSumFitter::GaussianSumFitter(const std::string& type,
, m_doHitSorting(true)
, m_directionToPerigee(Trk::oppositeMomentum)
, m_trkParametersComparisonFunction(nullptr)
- , m_chronoSvc("ChronoStatSvc", name)
, m_inputPreparator(nullptr)
+ , m_chronoSvc("ChronoStatSvc", name)
, m_FitPRD{ 0 }
, m_FitMeasurementBase{ 0 }
, m_ForwardFailure{ 0 }
@@ -118,18 +114,11 @@ Trk::GaussianSumFitter::initialize()
m_sortingReferencePoint[2]);
m_trkParametersComparisonFunction =
- new Trk::TrkParametersComparisonFunction(referencePosition);
-
- if (!m_trkParametersComparisonFunction) {
- ATH_MSG_FATAL("Request to instansiate the ClosestTrackParametersFinder "
- "object failed... Exiting!");
- return StatusCode::FAILURE;
- }
+ std::make_unique<Trk::TrkParametersComparisonFunction>(referencePosition);
// Configure forward fitter
sc = m_forwardGsfFitter->configureTools(
m_extrapolator, m_updator, m_rioOnTrackCreator);
-
if (sc.isFailure()) {
ATH_MSG_FATAL("Could not configure the forwards GSF fitter... Exiting!");
return StatusCode::FAILURE;
@@ -137,7 +126,6 @@ Trk::GaussianSumFitter::initialize()
// Configure smoother
sc = m_gsfSmoother->configureTools(m_extrapolator, m_updator);
-
if (sc.isFailure()) {
ATH_MSG_FATAL("Could not configure the GSF smoother... Exiting!");
return StatusCode::FAILURE;
@@ -151,7 +139,7 @@ Trk::GaussianSumFitter::initialize()
m_PerigeeFailure = 0; // Number of MakePerigee Failures:
m_fitQualityFailure = 0;
- m_inputPreparator = new TrackFitInputPreparator();
+ m_inputPreparator = std::make_unique<TrackFitInputPreparator>();
ATH_MSG_INFO("Initialisation of " << name() << " was successful");
@@ -161,65 +149,45 @@ Trk::GaussianSumFitter::initialize()
StatusCode
Trk::GaussianSumFitter::finalize()
{
-
- // Delete dynamic memory
- delete m_trkParametersComparisonFunction;
- delete m_inputPreparator;
-
- msg(MSG::INFO) << "-----------------------------------------------" << endmsg;
- msg(MSG::INFO) << " Some Brief GSF Statistics " << endmsg;
- msg(MSG::INFO) << "-----------------------------------------------" << endmsg;
-
- msg(MSG::INFO) << "Number of Fit PrepRawData Calls: " << m_FitPRD
- << 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;
- msg(MSG::INFO) << "-----------------------------------------------" << endmsg;
-
- msg(MSG::INFO) << "Finalisation of " << name() << " was successful" << endmsg;
-
+ ATH_MSG_INFO(
+ "-----------------------------------------------"
+ << '\n'
+ << " Some Brief GSF Statistics " << '\n'
+ << "-----------------------------------------------" << '\n'
+ << "Number of Fit PrepRawData Calls: " << m_FitPRD << '\n'
+ << "Number of Fit MeasurementBase Calls: " << m_FitMeasurementBase
+ << '\n'
+ << "Number of Forward Fit Failures: " << m_ForwardFailure << '\n'
+ << "Number of Smoother Failures: " << m_SmootherFailure << '\n'
+ << "Number of MakePerigee Failures: " << m_PerigeeFailure << '\n'
+ << "Number of Trks that fail fitquality test: " << m_fitQualityFailure
+ << '\n'
+ << "-----------------------------------------------" << '\n'
+ << "Finalisation of " << name() << " was successful");
return StatusCode::SUCCESS;
}
-/* ======================================================================================================
- Refitting of a track
-=========================================================================================================
+/*
+ * Refitting of a track
*/
-
Trk::Track*
Trk::GaussianSumFitter::fit(
const Trk::Track& inputTrack,
const Trk::RunOutlierRemoval outlierRemoval,
const Trk::ParticleHypothesis particleHypothesis) const
{
-
- if (msgLvl(MSG::VERBOSE)) {
- msg() << "Trk::GaussianSumFilter::fit() - Refitting a track" << endmsg;
- }
-
// Start the timer
Chrono chrono(&(*m_chronoSvc), name());
// 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 nullptr;
}
-
// 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 nullptr;
}
@@ -229,11 +197,6 @@ Trk::GaussianSumFitter::fit(
inputTrack.trackParameters()->end(),
*m_trkParametersComparisonFunction));
- 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 (m_refitOnMeasurementBase) {
@@ -318,9 +281,8 @@ Trk::GaussianSumFitter::fit(
particleHypothesis);
}
-/* ==================================================================================================================
+/*
Fitting of a set of PrepRawData objects
-=====================================================================================================================
*/
Trk::Track*
@@ -330,45 +292,42 @@ Trk::GaussianSumFitter::fit(
const Trk::RunOutlierRemoval outlierRemoval,
const Trk::ParticleHypothesis particleHypothesis) const
{
-
- ATH_MSG_VERBOSE(
- "Trk::GaussianSumFilter::fit() - Fitting a set of PrepRawData objects"
- << '\n'
- << "Material effects switch: " << particleHypothesis << '\n'
- << "Outlier removal switch: " << outlierRemoval);
-
++m_FitPRD;
+ if (outlierRemoval) {
+ ATH_MSG_DEBUG(
+ "Outlier removal not yet implemented for the Gaussian Sum Filter");
+ }
+
// Start the timer
Chrono chrono(&(*m_chronoSvc), name());
-
// Protect against empty PrepRawDataSet object
if (prepRawDataSet.empty()) {
ATH_MSG_FATAL("PrepRawData set for fit is empty... Exiting!");
return nullptr;
}
- // A const stl container cannot be sorted. This will re-cast it so that it
- // can.
Trk::PrepRawDataSet sortedPrepRawDataSet = PrepRawDataSet(prepRawDataSet);
if (m_doHitSorting) {
- Trk::PrepRawDataComparisonFunction* prdComparisonFunction =
- new Trk::PrepRawDataComparisonFunction(
+ Trk::PrepRawDataComparisonFunction prdComparisonFunction =
+ Trk::PrepRawDataComparisonFunction(
estimatedParametersNearOrigin.position(),
estimatedParametersNearOrigin.momentum());
+
std::sort(sortedPrepRawDataSet.begin(),
sortedPrepRawDataSet.end(),
- *prdComparisonFunction);
-
- delete prdComparisonFunction;
+ prdComparisonFunction);
}
+ const EventContext& ctx= Gaudi::Hive::currentContext();
// Perform GSF forwards fit
ForwardTrajectory* forwardTrajectory =
m_forwardGsfFitter
- ->fitPRD(
- sortedPrepRawDataSet, estimatedParametersNearOrigin, particleHypothesis)
+ ->fitPRD(ctx,
+ sortedPrepRawDataSet,
+ estimatedParametersNearOrigin,
+ particleHypothesis)
.release();
if (!forwardTrajectory) {
@@ -384,11 +343,9 @@ Trk::GaussianSumFitter::fit(
return nullptr;
}
- ATH_MSG_VERBOSE("*** Forward GSF fit passed! ***");
-
// Perform GSF smoother operation
SmoothedTrajectory* smoothedTrajectory =
- m_gsfSmoother->fit(*forwardTrajectory, particleHypothesis);
+ m_gsfSmoother->fit(ctx,*forwardTrajectory, particleHypothesis);
// Protect against failed smoother fit
if (!smoothedTrajectory) {
@@ -398,11 +355,8 @@ Trk::GaussianSumFitter::fit(
return nullptr;
}
- ATH_MSG_VERBOSE("*** GSF smoother fit passed! ***");
-
// Outlier m_logic and track finalisation
const FitQuality* fitQuality = buildFitQuality(*smoothedTrajectory);
-
if (!fitQuality) {
ATH_MSG_DEBUG("Chi squared could not be calculated... Bailing");
++m_fitQualityFailure;
@@ -413,14 +367,9 @@ Trk::GaussianSumFitter::fit(
Track* fittedTrack = nullptr;
- 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);
+ this->makePerigee(ctx,smoothedTrajectory, particleHypothesis);
ATH_MSG_DEBUG(
"perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface);
if (perigeeMultiStateOnSurface) {
@@ -446,24 +395,12 @@ Trk::GaussianSumFitter::fit(
info.setTrackProperties(TrackInfo::BremFitSuccessful);
fittedTrack = new Track(info, smoothedTrajectory, fitQuality);
- 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!");
- }
return fittedTrack;
}
-/* ================================================================================================
- Fitting of a set of MeasurementBase objects
-==============
-====================================================================================
-*/
+/*
+ * Fitting of a set of MeasurementBase objects
+ */
Trk::Track*
Trk::GaussianSumFitter::fit(
@@ -473,15 +410,15 @@ Trk::GaussianSumFitter::fit(
const Trk::ParticleHypothesis particleHypothesis) const
{
+ if (outlierRemoval) {
+ ATH_MSG_DEBUG(
+ "Outlier removal not yet implemented for the Gaussian Sum Filter");
+ }
+
+
// Start the timer
Chrono chrono(&(*m_chronoSvc), name());
- 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()) {
@@ -527,11 +464,15 @@ Trk::GaussianSumFitter::fit(
sortedMeasurementSet.end(),
measurementBaseComparisonFunction);
}
+
+ const EventContext& ctx = Gaudi::Hive::currentContext();
// Perform GSF forwards fit - new memory allocated in forwards fitter
ForwardTrajectory* forwardTrajectory =
m_forwardGsfFitter
- ->fitMeasurements(
- sortedMeasurementSet, estimatedParametersNearOrigin, particleHypothesis)
+ ->fitMeasurements(ctx,
+ sortedMeasurementSet,
+ estimatedParametersNearOrigin,
+ particleHypothesis)
.release();
if (!forwardTrajectory) {
@@ -547,11 +488,10 @@ Trk::GaussianSumFitter::fit(
return nullptr;
}
- ATH_MSG_VERBOSE("*** Forward GSF fit passed! ***");
-
// Perform GSF smoother operation
+
SmoothedTrajectory* smoothedTrajectory =
- m_gsfSmoother->fit(*forwardTrajectory, particleHypothesis, ccot);
+ m_gsfSmoother->fit(ctx, *forwardTrajectory, particleHypothesis, ccot);
// Protect against failed smoother fit
if (!smoothedTrajectory) {
@@ -560,7 +500,6 @@ Trk::GaussianSumFitter::fit(
delete forwardTrajectory;
return nullptr;
}
- ATH_MSG_VERBOSE("*** GSF smoother fit passed! ***");
// Outlier m_logic and track finalisation
const FitQuality* fitQuality = buildFitQuality(*smoothedTrajectory);
@@ -573,13 +512,9 @@ Trk::GaussianSumFitter::fit(
return nullptr;
}
- 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);
+ this->makePerigee(ctx,smoothedTrajectory, particleHypothesis);
ATH_MSG_DEBUG(
"perigeeMultiStateOnSurface :" << perigeeMultiStateOnSurface);
@@ -607,16 +542,6 @@ Trk::GaussianSumFitter::fit(
info.setTrackProperties(TrackInfo::BremFitSuccessful);
Track* fittedTrack = new Track(info, smoothedTrajectory, fitQuality);
- if (fittedTrack) {
- 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 {
- ATH_MSG_DEBUG("Trk::GaussianSumFilter::fit() failed!");
- }
return fittedTrack;
}
@@ -627,11 +552,6 @@ Trk::GaussianSumFitter::fit(const Track& intrk,
const ParticleHypothesis matEffects) const
{
- ATH_MSG_VERBOSE("--> enter GaussianSumFitter::fit(Track,PrdSet,,)"
- << '\n'
- << " with Track from author = "
- << intrk.info().dumpInfo());
-
// protection, if empty PrepRawDataSet
if (addPrdColl.empty()) {
ATH_MSG_WARNING(
@@ -674,9 +594,6 @@ Trk::GaussianSumFitter::fit(const Track& inputTrack,
const ParticleHypothesis matEffects) const
{
- ATH_MSG_VERBOSE("Trk::GaussianSumFilter::fit() - Refitting a track with a "
- "additional information ");
-
// protection, if empty MeasurementSet
if (measurementSet.empty()) {
ATH_MSG_WARNING(
@@ -720,16 +637,14 @@ Trk::GaussianSumFitter::fit(const Track& intrk1,
// protection against not having measurements on the input tracks
if (!intrk1.trackStateOnSurfaces() || !intrk2.trackStateOnSurfaces() ||
intrk1.trackStateOnSurfaces()->size() < 2) {
- msg(MSG::WARNING) << "called to refit empty track or track with too little "
- "information, reject fit"
- << endmsg;
+ ATH_MSG_WARNING("called to refit empty track or track with too little "
+ "information, reject fit");
return nullptr;
}
if (!intrk1.trackParameters() || intrk1.trackParameters()->empty()) {
- msg(MSG::WARNING) << "input #1 fails to provide track parameters for "
- "seeding the GXF, reject fit"
- << endmsg;
+ ATH_MSG_WARNING("input #1 fails to provide track parameters for "
+ "seeding the GXF, reject fit");
return nullptr;
}
@@ -780,6 +695,7 @@ Trk::GaussianSumFitter::fit(const Track& intrk1,
const Trk::MultiComponentStateOnSurface*
Trk::GaussianSumFitter::makePerigee(
+ const EventContext& ctx,
const Trk::SmoothedTrajectory* smoothedTrajectory,
const Trk::ParticleHypothesis particleHypothesis) const
{
@@ -807,7 +723,7 @@ Trk::GaussianSumFitter::makePerigee(
}
// Extrapolate to perigee, taking material effects considerations into account
Trk::MultiComponentState stateExtrapolatedToPerigee =
- m_extrapolator->extrapolate(Gaudi::Hive::currentContext(),
+ m_extrapolator->extrapolate(ctx,
*multiComponentState,
perigeeSurface,
m_directionToPerigee,
@@ -828,11 +744,6 @@ Trk::GaussianSumFitter::makePerigee(
// Calculate the mode of the q/p distribution
double modeQoverP = 0;
- 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
std::unique_ptr<Trk::TrackParameters> combinedPerigee =
@@ -844,9 +755,8 @@ Trk::GaussianSumFitter::makePerigee(
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
+ // 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");
return nullptr;
@@ -870,7 +780,6 @@ Trk::GaussianSumFitter::buildFitQuality(
const Trk::SmoothedTrajectory& smoothedTrajectory) const
{
- ATH_MSG_VERBOSE("Gsf fitQuality");
double chiSquared = 0.;
int numberDoF = -5;
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfSmoother.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfSmoother.cxx
index af2de668dc091b6c29eea1524c9ebbd093f853b8..5ca92fd3350321ac255d8c5535147013f0dd49c5 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfSmoother.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GsfSmoother.cxx
@@ -64,7 +64,8 @@ Trk::GsfSmoother::configureTools(
}
Trk::SmoothedTrajectory*
-Trk::GsfSmoother::fit(const ForwardTrajectory& forwardTrajectory,
+Trk::GsfSmoother::fit(const EventContext& ctx,
+ const ForwardTrajectory& forwardTrajectory,
const ParticleHypothesis particleHypothesis,
const Trk::CaloCluster_OnTrack* ccot) const
{
@@ -247,7 +248,7 @@ Trk::GsfSmoother::fit(const ForwardTrajectory& forwardTrajectory,
is opposite to the direction of momentum */
Trk::MultiComponentState extrapolatedState =
- m_extrapolator->extrapolate(Gaudi::Hive::currentContext(),
+ m_extrapolator->extrapolate(ctx,
updatedState,
measurement->associatedSurface(),
Trk::oppositeMomentum,
@@ -365,7 +366,7 @@ Trk::GsfSmoother::fit(const ForwardTrajectory& forwardTrajectory,
if (ccot && trackStateOnSurface == secondLastTrackStateOnSurface) {
Trk::MultiComponentState ccotState =
- addCCOT(updatedStateOnSurface, ccot, smoothedTrajectory.get());
+ addCCOT(ctx,updatedStateOnSurface, ccot, smoothedTrajectory.get());
if (!ccotState.empty()) {
updatedState = std::move(ccotState);
}
@@ -474,7 +475,8 @@ Trk::GsfSmoother::combine(
}
Trk::MultiComponentState
-Trk::GsfSmoother::addCCOT(const Trk::TrackStateOnSurface* currentState,
+Trk::GsfSmoother::addCCOT(const EventContext& ctx,
+ const Trk::TrackStateOnSurface* currentState,
const Trk::CaloCluster_OnTrack* ccot,
Trk::SmoothedTrajectory* smoothedTrajectory) const
{
@@ -496,7 +498,7 @@ Trk::GsfSmoother::addCCOT(const Trk::TrackStateOnSurface* currentState,
// Extrapolate to the Calo
if (currentSurface) {
extrapolatedState =
- m_extrapolator->extrapolateDirectly(Gaudi::Hive::currentContext(),
+ m_extrapolator->extrapolateDirectly(ctx,
*currentMultiComponentState,
ccot->associatedSurface(),
Trk::alongMomentum,
@@ -530,7 +532,7 @@ Trk::GsfSmoother::addCCOT(const Trk::TrackStateOnSurface* currentState,
// Extrapolate back to the surface nearest the origin
extrapolatedState =
- m_extrapolator->extrapolateDirectly(Gaudi::Hive::currentContext(),
+ m_extrapolator->extrapolateDirectly(ctx,
updatedState,
*currentSurface,
Trk::oppositeMomentum,
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
index 471707c49baf44e4509d9367d0214768845cef83..a783836e913e4398fce7bc7cd72cc7b0bce57951 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/KLGaussianMixtureReduction.cxx
@@ -16,12 +16,20 @@
#endif
#endif
-// This enables -ftree-vectorize in gcc (we compile with O2)
-ATH_ENABLE_VECTORIZATION;
-namespace {
/**
- * Component Merging helper methods
+ * @file KLGaussianMixtureReduction.cxx
+ * @author Anthony Morley , Christos Anastopoulos
+ * @date 26th November 2019
+ *
+ * Implementation of KLGaussianMixtureReduction
+ *
*/
+
+
+/// This enables -ftree-vectorize in gcc (we compile with O2)
+ATH_ENABLE_VECTORIZATION;
+
+namespace {
using namespace GSFUtils;
/**
@@ -58,7 +66,7 @@ weightedSymmetricKL(const Component1D& componentI,
return weightMul * symmetricDis;
}
-/*
+/**
* Moment-preserving merge of two 1D components
* for example see
* Runnalls, Andrew R.(2007)
@@ -151,7 +159,7 @@ calculateAllDistances(const componentPtrRestrict componentsIn,
}
}
-/*
+/**
* Reset the distances wrt to a mini index
*/
void
@@ -176,7 +184,7 @@ resetDistances(floatPtrRestrict distancesIn,
}
namespace GSFUtils {
-/*
+/**
* Merge the componentsIn and return
* which componets got merged
*/
@@ -234,7 +242,7 @@ findMerges(componentPtrRestrict componentsIn,
} // end of merge while
return merges;
}
-/*
+/**
* findMinimumIndex
*
* For FindMinimumIndex at x86_64 we have
@@ -248,7 +256,6 @@ findMerges(componentPtrRestrict componentsIn,
#if defined(__x86_64__)
#include <immintrin.h>
/*
- *
* AVX2 intrinsics used :
*
* _mm256_set1_epi32
@@ -315,7 +322,6 @@ findMinimumIndex(const floatPtrRestrict distancesIn, const int n)
}
/*
* SSE intrinsics used
- *
* _mm_set1_epi32
* Broadcast 32-bit integer a to all elements of dst.
*
@@ -447,7 +453,7 @@ findMinimumIndex(const floatPtrRestrict distancesIn, const int n)
return { minIndex, minDistance };
}
#endif // end of x86_64 versions
-/* Always fall back to a simple default version with no intrinsics */
+//Always fall back to a simple default version with no intrinsics
__attribute__((target("default")))
#endif // HAVE_FUNCTION_MULTIVERSIONING
std::pair<int32_t, float>
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateAssembler.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateAssembler.cxx
index 500870bdc653481e64fa67433001043705cf4326..df170f38276411253a8016f49e6954ba88b67b4b 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateAssembler.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateAssembler.cxx
@@ -2,15 +2,14 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*********************************************************************************
- MultiComponentStateAssembler.cxx - description
- ----------------------------------------------------
-begin : Monday 20th December 2004
-author : atkinson,morley,anastopoulos
-email : Tom.Atkinson@cern.ch
-description : Implementation code for MultiComponentStateAssembler
- class.
-*********************************************************************************/
+/**
+ * @file MultiComponentStateAssembler.h
+ * @date Monday 20th December 2004
+ * @author Atkinson,Anthony Morley, Christos Anastopoulos
+ *
+ * Implementation code for MultiComponentStateAssembler
+ */
+
#include "TrkGaussianSumFilter/MultiComponentStateAssembler.h"
#include "TrkMultiComponentStateOnSurface/ComponentParameters.h"
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateCombiner.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateCombiner.cxx
index e41a362475af2046c1632e42372be1784335c0dd..cd299aa50059cbf21d3ca271a9c2a553d4b0c4a9 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateCombiner.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/MultiComponentStateCombiner.cxx
@@ -2,14 +2,13 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*********************************************************************************
- MultiComponentStateCombiner.cxx - description
- -----------------------------------------------
-begin : Monday 20th December 2004
-author : atkinson,morley,anastopoulos
-description : Implementation code for MultiComponentStateCombiner
-helpers
-*********************************************************************************/
+/**
+ * @file MultiComponentStateCombiner.cxx
+ * @date Monday 20th December 2004
+ * @author Atkinson,Anthony Morley, Christos Anastopoulos
+ *
+ * Implementation code for MultiComponentStateCombiner
+ */
#include "TrkGaussianSumFilter/MultiComponentStateCombiner.h"
#include "TrkGaussianSumFilter/MultiComponentStateModeCalculator.h"
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
index 5f91cc28d8746dfabf34ffb6eff4b58c9d7a88f2..92e9d07c9e5027992f71bb559f0d4e8717d24007 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/QuickCloseComponentsMultiStateMerger.cxx
@@ -2,15 +2,13 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-/*********************************************************************************
- QuickCloseComponentsMultiStateMerger.cxx - description
- ---------------------------------------------------
-begin : Wednesday 3rd September 2008
-author : amorley
-email : Anthony.Morley@cern.ch
-decription : Implementation code for
-QuickCloseComponentsMultiStateMerger class
-*********************************************************************************/
+/**
+ * @file QuickCloseComponentsMultiStateMerger.cxx
+ * @date Wednesday 3rd September 2008
+ * @author Anthony Morley, Christos Anastopoulos
+ *
+ * Implementation of QuickCloseComponentsMultiStateMerger
+ */
#include "TrkGaussianSumFilter/QuickCloseComponentsMultiStateMerger.h"
#include "TrkGaussianSumFilter/AlignedDynArray.h"
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/CMakeLists.txt b/Tracking/TrkFitter/TrkGlobalChi2Fitter/CMakeLists.txt
index b7b892db7d0672e4f6974699c65eaa4ecb1ec54c..1e029bebdc2d73a66e775693561361300b950aa3 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/CMakeLists.txt
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/CMakeLists.txt
@@ -18,7 +18,6 @@ atlas_depends_on_subdirs( PUBLIC
DetectorDescription/AtlasDetDescr
DetectorDescription/IdDictDetDescr
Event/EventPrimitives
- MagneticField/MagFieldInterfaces
Tracking/TrkDetDescr/TrkDetDescrInterfaces
Tracking/TrkDetDescr/TrkGeometry
Tracking/TrkDetDescr/TrkSurfaces
@@ -32,7 +31,10 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkEvent/TrkVertexOnTrack
Tracking/TrkExtrapolation/TrkExInterfaces
Tracking/TrkExtrapolation/TrkExUtils
- Tracking/TrkTools/TrkToolInterfaces )
+ Tracking/TrkTools/TrkToolInterfaces
+ MagneticField/MagFieldElements
+ MagneticField/MagFieldConditions
+)
# External dependencies:
find_package( CLHEP )
@@ -43,7 +45,7 @@ atlas_add_component( TrkGlobalChi2Fitter
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel TrkEventPrimitives TrkMaterialOnTrack TrkParameters TrkFitterInterfaces TrkFitterUtils AtlasDetDescr IdDictDetDescr EventPrimitives MagFieldInterfaces TrkDetDescrInterfaces TrkGeometry TrkSurfaces TrkCompetingRIOsOnTrack TrkMeasurementBase TrkPrepRawData TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkSegment TrkTrack TrkVertexOnTrack TrkExInterfaces TrkExUtils TrkToolInterfaces )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps GaudiKernel TrkEventPrimitives TrkMaterialOnTrack TrkParameters TrkFitterInterfaces TrkFitterUtils AtlasDetDescr IdDictDetDescr EventPrimitives TrkDetDescrInterfaces TrkGeometry TrkSurfaces TrkCompetingRIOsOnTrack TrkMeasurementBase TrkPrepRawData TrkPseudoMeasurementOnTrack TrkRIO_OnTrack TrkSegment TrkTrack TrkVertexOnTrack TrkExInterfaces TrkExUtils TrkToolInterfaces MagFieldElements MagFieldConditions)
# Install files from the package:
atlas_install_headers( TrkGlobalChi2Fitter )
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
index 1cf710a451ca1f125a6e94f40001394fb3475ab3..eed6c07f1cae6489a33f290f41e66765b8f17936 100755
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/TrkGlobalChi2Fitter/GlobalChi2Fitter.h
@@ -14,6 +14,8 @@
#include "TrkMaterialOnTrack/MaterialEffectsOnTrack.h"
#include "TrkFitterUtils/FitterStatusCode.h"
#include "TrkEventPrimitives/PropDirection.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "MagFieldElements/AtlasFieldCache.h"
#include <mutex>
@@ -105,6 +107,8 @@ namespace Trk {
void (*)(const std::vector<const TrackStateOnSurface *> *) > >
m_matTempStore;
+ MagField::AtlasFieldCache m_field_cache;
+
FitterStatusCode m_fittercode;
Cache(const GlobalChi2Fitter *fitter):
@@ -280,6 +284,7 @@ namespace Trk {
* position of the intersection can be used to find materials in that layer
* at that position.
*
+ * @param[in] cache The standard GX2F cache.
* @param[in] surface The surface to intersect with.
* @param[in] param1 The main track parameters to calculate the
* intersection from.
@@ -296,6 +301,7 @@ namespace Trk {
* intersection method of the appropriate Surface subclass.
*/
std::optional<std::pair<Amg::Vector3D, double>> addMaterialFindIntersectionDisc(
+ Cache & cache,
const DiscSurface & surface,
const TrackParameters & param1,
const TrackParameters & param2,
@@ -312,6 +318,7 @@ namespace Trk {
* intersection method of the appropriate Surface subclass.
*/
std::optional<std::pair<Amg::Vector3D, double>> addMaterialFindIntersectionCyl(
+ Cache & cache,
const CylinderSurface & surface,
const TrackParameters & param1,
const TrackParameters & param2,
@@ -523,6 +530,21 @@ namespace Trk {
void incrementFitStatus(enum FitterStatusType) const;
+ /**
+ * @brief Initialize a field cache inside a fit cache object.
+ *
+ * Following the shift from old-style magnetic field services to the new
+ * cached implementation for thread safety, we need some additional logic
+ * to create a magnetic field cache object and insert it into our fitting
+ * cache object for access.
+ *
+ * @param[in] cache The GX2F cache objects in which to load the magnetic
+ * field cache.
+ */
+ void initFieldCache(
+ Cache & cache
+ ) const;
+
ToolHandle < IRIO_OnTrackCreator > m_ROTcreator;
ToolHandle < IRIO_OnTrackCreator > m_broadROTcreator;
ToolHandle < IUpdator > m_updator;
@@ -537,9 +559,15 @@ namespace Trk {
ToolHandle < IMaterialEffectsOnTrackProvider > m_calotool;
ToolHandle < IMaterialEffectsOnTrackProvider > m_calotoolparam;
- ServiceHandle < MagField::IMagFieldSvc > m_fieldService;
ServiceHandle < ITrackingGeometrySvc > m_trackingGeometrySvc;
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_field_cache_key{
+ this,
+ "AtlasFieldCacheCondObj",
+ "fieldCondObj",
+ "Trk::GlobalChi2Fitter field conditions object key"
+ };
+
bool m_signedradius;
bool m_calomat, m_extmat;
bool m_fillderivmatrix;
diff --git a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
index 80b5137ef4a6da4847d798e923ebe1433f775002..214e26d174a3995d7ee3b32d3e250237d4c0e079 100644
--- a/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
+++ b/Tracking/TrkFitter/TrkGlobalChi2Fitter/src/GlobalChi2Fitter.cxx
@@ -22,7 +22,6 @@
#include "TrkGeometry/DiscLayer.h"
#include "TrkGeometry/MaterialLayer.h"
#include "TrkGeometry/TrackingVolume.h"
-#include "TrkGeometry/MagneticFieldProperties.h"
#include "TrkGeometry/TrackingGeometry.h"
#include "TrkDetDescrInterfaces/ITrackingGeometrySvc.h"
@@ -59,7 +58,8 @@
#include "TrkExInterfaces/IEnergyLossUpdator.h"
#include "TrkExInterfaces/IMaterialEffectsUpdator.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "MagFieldElements/AtlasFieldCache.h"
#include "CLHEP/Matrix/Matrix.h"
#include "CLHEP/Matrix/SymMatrix.h"
@@ -143,7 +143,6 @@ namespace Trk {
m_caloMaterialProvider("Trk::TrkMaterialProviderTool/TrkMaterialProviderTool"),
m_calotool("Rec::MuidMaterialEffectsOnTrackProvider/MuidMaterialEffectsOnTrackProvider"),
m_calotoolparam(""),
- m_fieldService("AtlasFieldSvc", n),
m_trackingGeometrySvc("", n),
m_DetID(nullptr),
m_fieldpropnofield(new MagneticFieldProperties(Trk::NoField)),
@@ -199,6 +198,8 @@ namespace Trk {
}
StatusCode GlobalChi2Fitter::initialize() {
+ ATH_CHECK(m_field_cache_key.initialize());
+
if (!m_ROTcreator.name().empty()) {
ATH_CHECK(m_ROTcreator.retrieve());
}
@@ -231,13 +232,6 @@ namespace Trk {
ATH_CHECK(m_matupdator.retrieve());
}
- if (!m_fieldService.retrieve()) {
- ATH_MSG_FATAL("Failed to retrieve " << m_fieldService);
- return StatusCode::FAILURE;
- }
-
- ATH_MSG_DEBUG("Retrieved " << m_fieldService);
-
// need an Atlas id-helper to identify sub-detectors, take the one from detStore
ATH_CHECK(detStore()->retrieve(m_DetID, "AtlasID"));
@@ -293,11 +287,12 @@ namespace Trk {
ATH_MSG_DEBUG("--> entering GlobalChi2Fitter::fit(Track,Track,)");
Cache cache(this);
+ initFieldCache(cache);
GXFTrajectory trajectory;
if (!m_straightlineprop) {
trajectory.m_straightline = (
- !m_fieldService->solenoidOn() && !m_fieldService->toroidOn()
+ !cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn()
);
}
@@ -343,7 +338,7 @@ namespace Trk {
const TrackParameters *parforcalo = firstismuon ? firstidpar : lastidpar;
- if (!m_fieldService->solenoidOn()) {
+ if (!cache.m_field_cache.solenoidOn()) {
const AmgVector(5) & newpars = parforcalo->parameters();
parforcalo = parforcalo->associatedSurface().createTrackParameters(
@@ -427,7 +422,7 @@ namespace Trk {
if (calomeots.empty()) {
ATH_MSG_WARNING("No calorimeter material collected, failing fit");
- if (!m_fieldService->solenoidOn()) {
+ if (!cache.m_field_cache.solenoidOn()) {
delete parforcalo;
}
@@ -436,7 +431,7 @@ namespace Trk {
}
}
- if (!m_fieldService->solenoidOn()) {
+ if (!cache.m_field_cache.solenoidOn()) {
delete parforcalo;
}
@@ -457,7 +452,7 @@ namespace Trk {
}
if (
- (!m_fieldService->toroidOn() && !m_fieldService->solenoidOn()) ||
+ (!cache.m_field_cache.toroidOn() && !cache.m_field_cache.solenoidOn()) ||
(
cache.m_getmaterialfromtrack &&
!muonisstraight &&
@@ -476,7 +471,7 @@ namespace Trk {
if (
(track == nullptr) &&
!firstfitwasattempted &&
- (m_fieldService->toroidOn() || m_fieldService->solenoidOn())
+ (cache.m_field_cache.toroidOn() || cache.m_field_cache.solenoidOn())
) {
// Reset the trajectory
GXFTrajectory trajectory2;
@@ -546,7 +541,7 @@ namespace Trk {
trajectory,
*oldtrack->perigeeParameters(),
false,
- (m_fieldService->toroidOn() || m_fieldService->solenoidOn()) ? muon : nonInteracting
+ (cache.m_field_cache.toroidOn() || cache.m_field_cache.solenoidOn()) ? muon : nonInteracting
);
cache.m_matfilled = false;
@@ -1109,7 +1104,7 @@ namespace Trk {
secondscattheta = -muonscattheta;
}
- if (i == 1 && m_fieldService->toroidOn() && !firstismuon) {
+ if (i == 1 && cache.m_field_cache.toroidOn() && !firstismuon) {
AmgVector(5) params2 = scat2->parameters();
params2[Trk::phi] += idscatphi;
params2[Trk::theta] += idscattheta;
@@ -1316,7 +1311,7 @@ namespace Trk {
trajectory,
*startPar,
false,
- (m_fieldService->toroidOn() || m_fieldService-> solenoidOn()) ? muon : nonInteracting
+ (cache.m_field_cache.toroidOn() || cache.m_field_cache.solenoidOn()) ? muon : nonInteracting
);
if (startPar != lastidpar && startPar != indettrack->perigeeParameters()) {
@@ -1935,11 +1930,12 @@ namespace Trk {
ATH_MSG_DEBUG("--> entering GlobalChi2Fitter::fit(Track,)");
Cache cache(this);
+ initFieldCache(cache);
GXFTrajectory trajectory;
if (!m_straightlineprop) {
- trajectory.m_straightline = (!m_fieldService->solenoidOn() && !m_fieldService->toroidOn());
+ trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
@@ -1955,6 +1951,7 @@ namespace Trk {
Cache cache(this);
+ initFieldCache(cache);
delete alignCache.m_derivMatrix;
@@ -1988,7 +1985,7 @@ namespace Trk {
GXFTrajectory trajectory;
if (!m_straightlineprop) {
- trajectory.m_straightline = (!m_fieldService->solenoidOn() && !m_fieldService->toroidOn());
+ trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
@@ -2414,11 +2411,12 @@ namespace Trk {
ATH_MSG_DEBUG("--> entering GlobalChi2Fitter::fit(Track,Meas'BaseSet,,)");
Cache cache(this);
+ initFieldCache(cache);
GXFTrajectory trajectory;
if (!m_straightlineprop) {
- trajectory.m_straightline = (!m_fieldService->solenoidOn() && !m_fieldService->toroidOn());
+ trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
@@ -2558,11 +2556,12 @@ namespace Trk {
ATH_MSG_DEBUG("--> entering GlobalChi2Fitter::fit(Meas'BaseSet,,)");
Cache cache(this);
+ initFieldCache(cache);
GXFTrajectory trajectory;
if (!m_straightlineprop) {
- trajectory.m_straightline = (!m_fieldService->solenoidOn() && !m_fieldService->toroidOn());
+ trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
trajectory.m_fieldprop = trajectory.m_straightline ? m_fieldpropnofield : m_fieldpropfullfield;
@@ -3305,6 +3304,7 @@ namespace Trk {
};
std::optional<std::pair<Amg::Vector3D, double>> GlobalChi2Fitter::addMaterialFindIntersectionDisc(
+ Cache & cache,
const DiscSurface &surf,
const TrackParameters &parforextrap,
const TrackParameters &refpar2,
@@ -3320,7 +3320,7 @@ namespace Trk {
pos[0] = parforextrap.position().x();
pos[1] = parforextrap.position().y();
pos[2] = parforextrap.position().z();
- m_fieldService->getFieldZR(pos, field);
+ cache.m_field_cache.getFieldZR(pos, field);
double sinphi = sin(parforextrap.parameters()[Trk::phi0]);
double cosphi = cos(parforextrap.parameters()[Trk::phi0]);
double sintheta = sin(parforextrap.parameters()[Trk::theta]);
@@ -3348,6 +3348,7 @@ namespace Trk {
}
std::optional<std::pair<Amg::Vector3D, double>> GlobalChi2Fitter::addMaterialFindIntersectionCyl(
+ Cache & cache,
const CylinderSurface &surf,
const TrackParameters &parforextrap,
const TrackParameters &refpar2,
@@ -3365,7 +3366,7 @@ namespace Trk {
pos[0] = parforextrap.position().x();
pos[1] = parforextrap.position().y();
pos[2] = parforextrap.position().z();
- m_fieldService->getFieldZR(pos, field);
+ cache.m_field_cache.getFieldZR(pos, field);
double sinphi = sin(parforextrap.parameters()[Trk::phi0]);
double cosphi = cos(parforextrap.parameters()[Trk::phi0]);
double sintheta = sin(parforextrap.parameters()[Trk::theta]);
@@ -3522,7 +3523,7 @@ namespace Trk {
* of this loop, we have what we need. Otherwise, go to the next
* layer and try again.
*/
- if (auto res = addMaterialFindIntersectionCyl(*cylsurf, *parforextrap, *refpar2, matEffects)) {
+ if (auto res = addMaterialFindIntersectionCyl(cache, *cylsurf, *parforextrap, *refpar2, matEffects)) {
std::tie(intersect, costracksurf) = res.value();
} else {
layerindex++;
@@ -3546,7 +3547,7 @@ namespace Trk {
}
}
- if (auto res = addMaterialFindIntersectionDisc(*discsurf, *parforextrap, *refpar2, matEffects)) {
+ if (auto res = addMaterialFindIntersectionDisc(cache, *discsurf, *parforextrap, *refpar2, matEffects)) {
std::tie(intersect, costracksurf) = res.value();
} else {
layerindex++;
@@ -4953,11 +4954,11 @@ namespace Trk {
if (!trajectory.m_straightline) {
if (trajectory.numberOfSiliconHits() + trajectory.numberOfTRTHits() == trajectory.numberOfHits()) {
- trajectory.m_straightline = !m_fieldService->solenoidOn();
+ trajectory.m_straightline = !cache.m_field_cache.solenoidOn();
} else if ((trajectory.prefit() == 0) && trajectory.numberOfSiliconHits() + trajectory.numberOfTRTHits() == 0) {
- trajectory.m_straightline = !m_fieldService->toroidOn();
+ trajectory.m_straightline = !cache.m_field_cache.toroidOn();
} else {
- trajectory.m_straightline = (!m_fieldService->solenoidOn() && !m_fieldService->toroidOn());
+ trajectory.m_straightline = (!cache.m_field_cache.solenoidOn() && !cache.m_field_cache.toroidOn());
}
}
@@ -8578,4 +8579,20 @@ namespace Trk {
std::scoped_lock lock(m_fit_status_lock);
m_fit_status[status]++;
}
+
+ void Trk::GlobalChi2Fitter::initFieldCache(Cache & cache) const {
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> rh(
+ m_field_cache_key,
+ Gaudi::Hive::currentContext()
+ );
+
+ const AtlasFieldCacheCondObj * cond_obj(*rh);
+
+ if (cond_obj == nullptr) {
+ ATH_MSG_ERROR("Failed to create AtlasFieldCacheCondObj!");
+ return;
+ }
+
+ cond_obj->getInitializedCache(cache.m_field_cache);
+ }
}
diff --git a/Tracking/TrkTools/TrkAssociationTools/TrkAssociationTools/PRD_AssociationTool.h b/Tracking/TrkTools/TrkAssociationTools/TrkAssociationTools/PRD_AssociationTool.h
index e09bd90fc39c84a22e3e074c25f3eec174ef2823..14e311785e3f62a2b99b33676f0b5f86e1b20beb 100755
--- a/Tracking/TrkTools/TrkAssociationTools/TrkAssociationTools/PRD_AssociationTool.h
+++ b/Tracking/TrkTools/TrkAssociationTools/TrkAssociationTools/PRD_AssociationTool.h
@@ -1,27 +1,20 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
-
#ifndef TRK_PRD_ASSOCIATIONTOOL_H
#define TRK_PRD_ASSOCIATIONTOOL_H
-#include "AthenaBaseComps/AthAlgTool.h"
#include "TrkToolInterfaces/IPRD_AssociationTool.h"
-#include "MuonIdHelpers/MuonIdHelperTool.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ServiceHandle.h"
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "StoreGate/ReadHandleKey.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
#include <set>
#include <map>
-class AtlasDetectorID;
-class Identifier;
-
-namespace Muon{
- class MuonIdHelperTool;
-}
-
namespace Trk {
class Track;
@@ -33,9 +26,8 @@ namespace Trk {
public:
PRD_AssociationTool(const std::string&,const std::string&,const IInterface*);
- virtual ~PRD_AssociationTool () override;
+ virtual ~PRD_AssociationTool()=default;
virtual StatusCode initialize() override;
- virtual StatusCode finalize () override;
/** add the PRDs from this track to the store
@param track all PRDs from 'track' will be added to PRD_AssociationTool's internal store.*/
@@ -117,11 +109,9 @@ namespace Trk {
private:
// Holds the associations.
Maps m_maps;
- SG::ReadHandleKey<Trk::PRDtoTrackMap> m_prdToTrackMap
- {this,"PRDtoTrackMap",""};
+ SG::ReadHandleKey<Trk::PRDtoTrackMap> m_prdToTrackMap {this,"PRDtoTrackMap",""};
- PublicToolHandle<Muon::MuonIdHelperTool> m_idHelperTool
- {this,"MuonIdHelperTool","Muon::MuonIdHelperTool/MuonIdHelperTool"};
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
bool m_setupCorrect;
};
diff --git a/Tracking/TrkTools/TrkAssociationTools/TrkAssociationTools/PRDtoTrackMapTool.h b/Tracking/TrkTools/TrkAssociationTools/TrkAssociationTools/PRDtoTrackMapTool.h
index d4ba913b857508650b14db2a6350f4d6cb471a91..023ddf67708b42afae01f89ad88d852e99158e25 100644
--- a/Tracking/TrkTools/TrkAssociationTools/TrkAssociationTools/PRDtoTrackMapTool.h
+++ b/Tracking/TrkTools/TrkAssociationTools/TrkAssociationTools/PRDtoTrackMapTool.h
@@ -1,23 +1,20 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRK_PRDtoTrackMapTool_H
#define TRK_PRDtoTrackMapTool_H
-#include "AthenaBaseComps/AthAlgTool.h"
#include "TrkToolInterfaces/IPRDtoTrackMapTool.h"
+#include "AthenaBaseComps/AthAlgTool.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "TrkEventUtils/PRDtoTrackMap.h"
+
#include <set>
#include <map>
-class AtlasDetectorID;
-class Identifier;
-
-namespace Muon{
- class MuonIdHelperTool;
-}
-
namespace Trk {
class Track;
@@ -29,9 +26,8 @@ namespace Trk {
public:
PRDtoTrackMapTool(const std::string&,const std::string&,const IInterface*);
- virtual ~PRDtoTrackMapTool() override;
+ virtual ~PRDtoTrackMapTool()=default;
virtual StatusCode initialize() override;
- virtual StatusCode finalize () override;
virtual
std::unique_ptr<Trk::PRDtoTrackMap> createPRDtoTrackMap() const override;
@@ -64,7 +60,7 @@ namespace Trk {
};
private:
- ToolHandle<Muon::MuonIdHelperTool> m_idHelperTool;
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
protected:
void ensureType(Trk::PRDtoTrackMap &virt_prd_to_track_map) const ;
diff --git a/Tracking/TrkTools/TrkAssociationTools/src/PRD_AssociationTool.cxx b/Tracking/TrkTools/TrkAssociationTools/src/PRD_AssociationTool.cxx
index e06cb7b01da719cb27c191bff83eaaf18eb41f8b..34bd7956d0617e5bee56ae5234bbdd8e5478e130 100755
--- a/Tracking/TrkTools/TrkAssociationTools/src/PRD_AssociationTool.cxx
+++ b/Tracking/TrkTools/TrkAssociationTools/src/PRD_AssociationTool.cxx
@@ -8,13 +8,6 @@
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
#include "TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h"
-#include "Identifier/Identifier.h"
-#include "AtlasDetDescr/AtlasDetectorID.h"
-
-#include "MuonIdHelpers/MuonIdHelperTool.h"
-
-#include "StoreGate/ReadHandle.h"
-
#include <cassert>
#include <vector>
#include <stdexcept>
@@ -29,16 +22,12 @@ Trk::PRD_AssociationTool::PRD_AssociationTool(const std::string& t,
declareProperty( "SetupCorrect", m_setupCorrect=false);
}
-Trk::PRD_AssociationTool::~PRD_AssociationTool()
-{
-}
-
StatusCode Trk::PRD_AssociationTool::initialize()
{
StatusCode sc = AlgTool::initialize();
if (sc.isFailure()) return sc;
ATH_CHECK( m_prdToTrackMap.initialize( !m_prdToTrackMap.key().empty() ) );
- ATH_CHECK( m_idHelperTool.retrieve( DisableTool{m_idHelperTool.name().empty()} ));
+ ATH_CHECK( m_idHelperSvc.retrieve());
if (!m_setupCorrect) {
ATH_MSG_INFO("initialize: Tool " << name() << " not configured for PRD usage.");
}
@@ -46,12 +35,6 @@ StatusCode Trk::PRD_AssociationTool::initialize()
return StatusCode::SUCCESS;
}
-StatusCode Trk::PRD_AssociationTool::finalize()
-{
- StatusCode sc = AlgTool::finalize();
- return sc;
-}
-
StatusCode Trk::PRD_AssociationTool::addPRDs( const Trk::Track& track )
{
if (!m_prdToTrackMap.key().empty()) throw std::runtime_error("Cannot modify(addPRDs) the PRDtoTrackMap that was read from storegate!");
@@ -208,9 +191,9 @@ Trk::PRD_AssociationTool::getPrdsOnTrack(const Maps& maps,
{
const RIO_OnTrack* rot = dynamic_cast<const RIO_OnTrack*>(meas);
if (rot){
- if(m_idHelperTool->isMuon(rot->identify())){
+ if(m_idHelperSvc->isMuon(rot->identify())){
//only use precision hits for muon track overlap
- if(!m_idHelperTool->isMdt(rot->identify()) && !(m_idHelperTool->isCsc(rot->identify()) && !m_idHelperTool->measuresPhi(rot->identify()))) continue;
+ if(!m_idHelperSvc->isMdt(rot->identify()) && !(m_idHelperSvc->isCsc(rot->identify()) && !m_idHelperSvc->measuresPhi(rot->identify()))) continue;
}
vec.push_back(rot->prepRawData());
}
@@ -220,9 +203,9 @@ Trk::PRD_AssociationTool::getPrdsOnTrack(const Maps& maps,
const unsigned int numROTs = competingROT->numberOfContainedROTs();
for( unsigned int i=0;i<numROTs;++i ){
const Trk::RIO_OnTrack* rot = &competingROT->rioOnTrack(i);
- if( !rot || !rot->prepRawData() || !m_idHelperTool->isMuon(rot->identify()) ) continue;
+ if( !rot || !rot->prepRawData() || !m_idHelperSvc->isMuon(rot->identify()) ) continue;
//only use precision hits for muon track overlap
- if(!m_idHelperTool->isMdt(rot->identify()) && !(m_idHelperTool->isCsc(rot->identify()) && !m_idHelperTool->measuresPhi(rot->identify()))) continue;
+ if(!m_idHelperSvc->isMdt(rot->identify()) && !(m_idHelperSvc->isCsc(rot->identify()) && !m_idHelperSvc->measuresPhi(rot->identify()))) continue;
vec.push_back(rot->prepRawData());
}
}
diff --git a/Tracking/TrkTools/TrkAssociationTools/src/PRDtoTrackMapTool.cxx b/Tracking/TrkTools/TrkAssociationTools/src/PRDtoTrackMapTool.cxx
index ce7a3723521b87fbe22720c68774907bd5e47a25..8c249793f4d8b09803e89ed4e6534a7ec23b5dc4 100644
--- a/Tracking/TrkTools/TrkAssociationTools/src/PRDtoTrackMapTool.cxx
+++ b/Tracking/TrkTools/TrkAssociationTools/src/PRDtoTrackMapTool.cxx
@@ -3,13 +3,11 @@
*/
#include "TrkAssociationTools/PRDtoTrackMapTool.h"
+
#include "TrkTrack/Track.h"
#include "TrkRIO_OnTrack/RIO_OnTrack.h"
#include "TrkCompetingRIOsOnTrack/CompetingRIOsOnTrack.h"
-
-#include "MuonIdHelpers/MuonIdHelperTool.h"
-
#include <cassert>
#include <vector>
#include "ext/functional"
@@ -17,22 +15,12 @@
Trk::PRDtoTrackMapTool::PRDtoTrackMapTool(const std::string& t,
const std::string& n,
const IInterface* p)
- : base_class(t,n,p),
- m_idHelperTool("Muon::MuonIdHelperTool/MuonIdHelperTool")
-{
-}
-
-Trk::PRDtoTrackMapTool::~PRDtoTrackMapTool()
+ : base_class(t,n,p)
{
}
-StatusCode Trk::PRDtoTrackMapTool::initialize()
-{
- return StatusCode::SUCCESS;
-}
-
-StatusCode Trk::PRDtoTrackMapTool::finalize()
-{
+StatusCode Trk::PRDtoTrackMapTool::initialize() {
+ ATH_CHECK(m_idHelperSvc.retrieve());
return StatusCode::SUCCESS;
}
@@ -90,8 +78,6 @@ Trk::PRDtoTrackMapTool::TrackSet
ensureType(virt_prd_to_track_map);
PRDtoTrackMap &prd_to_track_map = static_cast<PRDtoTrackMap&>(virt_prd_to_track_map);
- //using namespace __gnu_cxx;
-
TrackSet connectedTracks;
std::vector< const Trk::PrepRawData* > prds = getPrdsOnTrack(prd_to_track_map, track);
@@ -153,11 +139,11 @@ Trk::PRDtoTrackMapTool::getPrdsOnTrack(Trk::PRDtoTrackMap &virt_prd_to_track_map
{
const RIO_OnTrack* rot = dynamic_cast<const RIO_OnTrack*>(meas);
if (rot){
- if(m_idHelperTool->isMuon(rot->identify())){
+ if(m_idHelperSvc->isMuon(rot->identify())){
//only use precision hits for muon track overlap
- if( !m_idHelperTool->isMdt(rot->identify())
- && !(m_idHelperTool->isCsc(rot->identify())
- && !m_idHelperTool->measuresPhi(rot->identify()))) continue;
+ if( !m_idHelperSvc->isMdt(rot->identify())
+ && !(m_idHelperSvc->isCsc(rot->identify())
+ && !m_idHelperSvc->measuresPhi(rot->identify()))) continue;
}
vec.push_back(rot->prepRawData());
}
@@ -167,11 +153,11 @@ Trk::PRDtoTrackMapTool::getPrdsOnTrack(Trk::PRDtoTrackMap &virt_prd_to_track_map
const unsigned int numROTs = competingROT->numberOfContainedROTs();
for( unsigned int i=0;i<numROTs;++i ){
const Trk::RIO_OnTrack* rot = &competingROT->rioOnTrack(i);
- if( !rot || !rot->prepRawData() || !m_idHelperTool->isMuon(rot->identify()) ) continue;
+ if( !rot || !rot->prepRawData() || !m_idHelperSvc->isMuon(rot->identify()) ) continue;
//only use precision hits for muon track overlap
- if( !m_idHelperTool->isMdt(rot->identify())
- && !( m_idHelperTool->isCsc(rot->identify())
- && !m_idHelperTool->measuresPhi(rot->identify())) ) continue;
+ if( !m_idHelperSvc->isMdt(rot->identify())
+ && !( m_idHelperSvc->isCsc(rot->identify())
+ && !m_idHelperSvc->measuresPhi(rot->identify())) ) continue;
vec.push_back(rot->prepRawData());
}
}
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/CMakeLists.txt b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/CMakeLists.txt
index 575cd3f9b8fe4f2206bb871c38e0caaad8a251ad..2bf80d78e42d8ea1f8462812826fc425e9e80d41 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/CMakeLists.txt
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/CMakeLists.txt
@@ -10,12 +10,13 @@ atlas_depends_on_subdirs( PUBLIC
Control/AthenaBaseComps
Event/xAOD/xAODTracking
GaudiKernel
+ MagneticField/MagFieldConditions # exposed by FullLinearizedTrackFactory.h
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkParametersBase
Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
PRIVATE
AtlasTest/TestTools
- MagneticField/MagFieldInterfaces
+ MagneticField/MagFieldElements
Tracking/TrkDetDescr/TrkSurfaces
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkNeutralParameters
@@ -24,7 +25,8 @@ atlas_depends_on_subdirs( PUBLIC
Tracking/TrkEvent/TrkTrackLink
Tracking/TrkEvent/VxVertex
Tracking/TrkExtrapolation/TrkExInterfaces
- Tracking/TrkExtrapolation/TrkExUtils )
+ Tracking/TrkExtrapolation/TrkExUtils
+ Tools/PathResolver )
# External dependencies:
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
@@ -34,7 +36,7 @@ atlas_add_component( TrkVertexFitterUtils
src/*.cxx
src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldInterfaces TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldConditions MagFieldElements TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils )
# Install files from the package:
atlas_install_headers( TrkVertexFitterUtils )
@@ -44,17 +46,17 @@ atlas_install_joboptions( share/*.txt )
atlas_add_test( DummyAnnealingMaker_test
SOURCES test/DummyAnnealingMaker_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldInterfaces TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils TestTools
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldConditions MagFieldElements PathResolver TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils TestTools
LOG_IGNORE_PATTERN "AtlasFieldSvc" )
atlas_add_test( DetAnnealingMaker_test
SOURCES test/DetAnnealingMaker_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldInterfaces TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils TestTools
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldConditions MagFieldElements PathResolver TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils TestTools
LOG_IGNORE_PATTERN "AtlasFieldSvc" )
atlas_add_test( ImpactPoint3dEstimator_test
SOURCES test/ImpactPoint3dEstimator_test.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldInterfaces TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils TestTools
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps xAODTracking GaudiKernel TrkParameters TrkParametersBase TrkVertexFitterInterfaces MagFieldConditions MagFieldElements PathResolver TrkSurfaces TrkEventPrimitives TrkNeutralParameters TrkParticleBase TrkTrack VxVertex TrkExInterfaces TrkExUtils TestTools
LOG_IGNORE_PATTERN "AtlasFieldSvc" )
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
index f3746a16594953bd195223032327d0088e508afa..ee646536959e9dd358a07c962fcda1754017550c 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/TrkVertexFitterUtils/FullLinearizedTrackFactory.h
@@ -14,6 +14,8 @@
#include "TrkParametersBase/Neutral.h"
#include "TrkParameters/TrackParameters.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+
/**
* @class Trk::FullLinearizedTrackFactory
*
@@ -44,10 +46,6 @@
*
*/
-namespace MagField {
- class IMagFieldSvc;
-}
-
namespace Trk
{
class IExtrapolator;
@@ -103,8 +101,9 @@ namespace Trk
private:
ToolHandle< Trk::IExtrapolator > m_extrapolator;
- ServiceHandle<MagField::IMagFieldSvc> m_magFieldSvc;
-
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey
+ {this, "AtlasFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"};
+
};
}
#endif
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/share/TrkVertexFitterUtils_tests.txt b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/share/TrkVertexFitterUtils_tests.txt
index 368d5425d490d57faaf75cf70f825808a054590d..3fff4b5b518bfd5e65ba56580e15efcd1b3c53f4 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/share/TrkVertexFitterUtils_tests.txt
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/share/TrkVertexFitterUtils_tests.txt
@@ -1,5 +1 @@
-ApplicationMgr.ExtSvc={"MagField::AtlasFieldSvc/AtlasFieldSvc", "StoreGateSvc/ConditionStore"};
-AtlasFieldSvc.UseDCS=false;
-AtlasFieldSvc.UseMapsFromCool=false;
-
ToolSvc.Trk::DetAnnealingMaker.SetOfTemperatures = {3, 2, 1};
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx
index c7aca429d33091ec4dad06fb71aadbfb71e3572b..5bb223ae36a0d1476ce12cae375b3d55136042ab 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/FullLinearizedTrackFactory.cxx
@@ -12,7 +12,7 @@
#include "VxVertex/VxTrackAtVertex.h"
#include "TrkExInterfaces/IExtrapolator.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
+#include "MagFieldElements/AtlasFieldCache.h"
#include "TrkSurfaces/PerigeeSurface.h"
#include "TrkEventPrimitives/ParamDefs.h"
@@ -23,11 +23,9 @@ namespace Trk
{
FullLinearizedTrackFactory::FullLinearizedTrackFactory(const std::string& t, const std::string& n, const IInterface* p) :
- AthAlgTool(t,n,p),m_extrapolator("Trk::Extrapolator", this),
- m_magFieldSvc("AtlasFieldSvc", n)
+ AthAlgTool(t,n,p),m_extrapolator("Trk::Extrapolator", this)
{
declareProperty("Extrapolator", m_extrapolator);
- declareProperty("MagFieldSvc", m_magFieldSvc);
declareInterface<IVertexLinearizedTrackFactory>(this);
}
@@ -36,18 +34,8 @@ namespace Trk
StatusCode FullLinearizedTrackFactory::initialize()
{
- if ( m_extrapolator.retrieve().isFailure() )
- {
- ATH_MSG_FATAL ("Failed to retrieve tool " << m_extrapolator);
- return StatusCode::FAILURE;
- } else {
- ATH_MSG_INFO ("Retrieved tool " << m_extrapolator);
- }
-
- if (m_magFieldSvc.retrieve().isFailure() ) {
- msg(MSG::FATAL)<<"Could not find magnetic field service." << endmsg;
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( m_extrapolator.retrieve() );
+ ATH_CHECK( m_fieldCacheCondObjInputKey.initialize() );
msg(MSG::INFO) << "Initialize successful" << endmsg;
return StatusCode::SUCCESS;
@@ -130,8 +118,16 @@ namespace Trk
Amg::Vector3D expMomentum(phi_v, th, q_ov_p);
// magnetic field
+
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCacheCondObjInputKey, Gaudi::Hive::currentContext()};
+ const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
+
+ MagField::AtlasFieldCache fieldCache;
+ fieldCondObj->getInitializedCache (fieldCache);
+
double mField[3];
- m_magFieldSvc->getField(expPoint.data(),mField);
+ fieldCache.getField(expPoint.data(),mField);
+
double B_z=mField[2]*299.792;//Magnetic field is returned in kT.
//The scaling is a factor of c needed for computing rho.
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.cxx
index c3672752f37df716ad6812d18634fc4ce97c7d41..31cedce0d3a5d825079997c8081c3c5fbc916f55 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.cxx
@@ -11,7 +11,7 @@
#include "TrkSurfaces/PlaneSurface.h"
#include "VxVertex/VxTrackAtVertex.h"
#include "TrkEventPrimitives/ParamDefs.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
+#include "MagFieldElements/AtlasFieldCache.h"
// #define IMPACTPOINT3DESTIMATOR_DEBUG
@@ -27,12 +27,10 @@ namespace Trk
ImpactPoint3dEstimator::ImpactPoint3dEstimator(const std::string& t, const std::string& n, const IInterface* p) :
base_class(t,n,p),
m_extrapolator("Trk::Extrapolator"),
- m_magFieldSvc("AtlasFieldSvc", n),
m_maxiterations(20),
m_precision(1e-10)//DeltaPhi
{
declareProperty("Extrapolator",m_extrapolator);
- declareProperty("MagFieldSvc", m_magFieldSvc);
declareProperty("MaxIterations",m_maxiterations);
declareProperty("Precision",m_precision);
}
@@ -42,15 +40,8 @@ namespace Trk
StatusCode ImpactPoint3dEstimator::initialize()
{
- if ( m_extrapolator.retrieve().isFailure() ) {
- ATH_MSG_FATAL( "Failed to retrieve tool " << m_extrapolator );
- return StatusCode::FAILURE;
- }
-
- if (m_magFieldSvc.retrieve().isFailure() ) {
- ATH_MSG_FATAL("Could not find magnetic field service." );
- return StatusCode::FAILURE;
- }
+ ATH_CHECK( m_extrapolator.retrieve() );
+ ATH_CHECK( m_fieldCacheCondObjInputKey.initialize() );
ATH_MSG_DEBUG( "Initialize successful" );
return StatusCode::SUCCESS;
@@ -123,8 +114,14 @@ namespace Trk
const Amg::Vector3D* theVertex,
double& distance) const
{
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCacheCondObjInputKey, Gaudi::Hive::currentContext()};
+ const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
+
+ MagField::AtlasFieldCache fieldCache;
+ fieldCondObj->getInitializedCache (fieldCache);
+
double magnFieldVect[3];
- m_magFieldSvc->getField(trackPerigee->associatedSurface().center().data(),magnFieldVect);
+ fieldCache.getField(trackPerigee->associatedSurface().center().data(),magnFieldVect);
if(magnFieldVect[2] == 0 ){
ATH_MSG_DEBUG("Magnetic field in the Z direction is 0 -- propagate like a straight line");
return Estimate3dIPNoCurvature(trackPerigee, theVertex, distance);
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.h b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.h
index 9c20db67cd135642c53d516c9e265e5c6439d913..214b31b9d12897817ffc64ec7b0db0c6136f9fef 100755
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.h
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/src/ImpactPoint3dEstimator.h
@@ -9,6 +9,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "TrkVertexFitterInterfaces/IImpactPoint3dEstimator.h"
#include "TrkNeutralParameters/NeutralParameters.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
/**
* @class Trk::ImpactPoint3dEstimator
@@ -28,10 +29,6 @@
*
*/
-namespace MagField {
- class IMagFieldSvc;
-}
-
namespace Trk
{
class IExtrapolator;
@@ -86,8 +83,9 @@ namespace Trk
ToolHandle< Trk::IExtrapolator > m_extrapolator;
- ServiceHandle<MagField::IMagFieldSvc> m_magFieldSvc;
-
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey
+ {this, "AtlasFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"};
+
int m_maxiterations;
double m_precision;
diff --git a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/test/ImpactPoint3dEstimator_test.cxx b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/test/ImpactPoint3dEstimator_test.cxx
index 6a68890534dac3929908eff2ddcf6a2df809f122..c74dc2b01b3b4c045a3b9b97f374b51c01a6501c 100644
--- a/Tracking/TrkVertexFitter/TrkVertexFitterUtils/test/ImpactPoint3dEstimator_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexFitterUtils/test/ImpactPoint3dEstimator_test.cxx
@@ -11,9 +11,6 @@
#undef NDEBUG
#include "TrkVertexFitterInterfaces/IImpactPoint3dEstimator.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/IIncidentListener.h"
#include "TestTools/initGaudi.h"
#include "CxxUtils/ubsan_suppress.h"
#include "GaudiKernel/ToolHandle.h"
@@ -24,6 +21,19 @@
#include <cassert>
#include <cmath>
+// for the field map
+#include "PathResolver/PathResolver.h"
+#include "TFile.h"
+#include "TTree.h"
+
+// for populating conditions store
+#include "SGTools/TestStore.h"
+#include "StoreGate/WriteCondHandleKey.h"
+#include "StoreGate/WriteCondHandle.h"
+
+// for the conditions data
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "MagFieldElements/AtlasFieldCache.h"
using Gaudi::Units::mm;
using Gaudi::Units::MeV;
@@ -104,6 +114,53 @@ void test1 (Trk::IImpactPoint3dEstimator& tool)
// not tested here.
}
+std::unique_ptr<MagField::AtlasFieldMap> getFieldMap(const std::string mapFile, double sol_current, double tor_current) {
+ // find the path to the map file
+ std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "DATAPATH" );
+ assert ( !resolvedMapFile.empty() );
+ // Do checks and extract root file to initialize the map
+ assert ( resolvedMapFile.find(".root") != std::string::npos );
+
+ std::unique_ptr<TFile> rootfile( std::make_unique<TFile>(resolvedMapFile.c_str(), "OLD") );
+ assert ( rootfile );
+ assert ( rootfile->cd() );
+ // open the tree
+ TTree* tree = (TTree*)rootfile->Get("BFieldMap");
+ assert(tree);
+
+ // create map
+ std::unique_ptr<MagField::AtlasFieldMap> field_map=std::make_unique<MagField::AtlasFieldMap>();
+
+ // initialize map
+ assert (field_map->initializeMap( rootfile.get(), sol_current, tor_current ));
+ return field_map;
+
+}
+
+void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
+ SG::WriteCondHandleKey<AtlasFieldCacheCondObj> fieldKey {"fieldCondObj"};
+ assert( fieldKey.initialize().isSuccess());
+
+ // from StoreGate/test/WriteCondHandle_test.cxx
+ EventIDBase now(0, EventIDBase::UNDEFEVT, 1);
+ EventContext ctx(1, 1);
+ ctx.setEventID( now );
+ ctx.setExtension( Atlas::ExtendedEventContext(&store) );
+ Gaudi::Hive::setCurrentContext(ctx);
+
+ EventIDBase s1_1(0, EventIDBase::UNDEFEVT, 0);
+ EventIDBase e1_1(0, EventIDBase::UNDEFEVT, 3);
+ EventIDRange r1_1 (s1_1,e1_1);
+
+
+ SG::WriteCondHandle<AtlasFieldCacheCondObj> fieldHandle {fieldKey};
+ {
+ std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
+ auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
+ assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
+ }
+}
int main()
{
@@ -112,9 +169,11 @@ int main()
ISvcLocator* svcloc = nullptr;
Athena_test::initGaudi ("TrkVertexFitterUtils/TrkVertexFitterUtils_tests.txt", svcloc);
- ServiceHandle<MagField::IMagFieldSvc> field ("MagField::AtlasFieldSvc/AtlasFieldSvc", "test");
- Incident inc_br ("test", IncidentType::BeginRun);
- dynamic_cast<IIncidentListener*>(&*field)->handle (inc_br);
+ StoreGateSvc *cs=nullptr;
+ assert (svcloc->service("StoreGateSvc/ConditionStore",cs).isSuccess());
+
+ SGTest::TestStore dumstore;
+ createNewtonTrkDistanceFinderCondData(dumstore);
ToolHandle<Trk::IImpactPoint3dEstimator> tool ("Trk::ImpactPoint3dEstimator");
assert( tool.retrieve().isSuccess() );
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/CMakeLists.txt b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/CMakeLists.txt
index 3f982a9e14a0b77bbabdcd13a260442657c20bf9..9fb2689a44eeafa78d76327547b4734f0c919266 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/CMakeLists.txt
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/CMakeLists.txt
@@ -13,6 +13,7 @@ atlas_depends_on_subdirs(
DetectorDescription/GeoPrimitives
Event/xAOD/xAODTracking
GaudiKernel
+ MagneticField/MagFieldConditions # Exposed by NewtonTrkDistanceFinder.h and Trk2dDistanceSeeder.h
Tracking/TrkEvent/TrkParameters
Tracking/TrkEvent/TrkParticleBase
Tracking/TrkEvent/VxVertex
@@ -23,11 +24,12 @@ atlas_depends_on_subdirs(
Event/xAOD/xAODTruth
InnerDetector/InDetConditions/InDetBeamSpotService
InnerDetector/InDetRecTools/InDetTrackSelectionTool
- MagneticField/MagFieldInterfaces
+ MagneticField/MagFieldElements
Tracking/TrkEvent/TrkEventPrimitives
Tracking/TrkEvent/TrkLinks
Tracking/TrkEvent/TrkTrack
- Tracking/TrkVertexFitter/TrkVertexFitterInterfaces )
+ Tracking/TrkVertexFitter/TrkVertexFitterInterfaces
+ Tools/PathResolver )
# External dependencies:
find_package( FFTW )
@@ -45,7 +47,7 @@ atlas_add_component( TrkVertexSeedFinderUtils
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${FFTW_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib )
atlas_install_joboptions( share/*.py )
@@ -56,7 +58,7 @@ atlas_add_test( NewtonTrkDistanceFinder_test
SOURCES test/NewtonTrkDistanceFinder_test.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} TestTools
EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements PathResolver TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib
LOG_IGNORE_PATTERN "reading the map|field map" )
@@ -65,7 +67,7 @@ atlas_add_test( Trk2dDistanceSeeder_test
SOURCES test/Trk2dDistanceSeeder_test.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} TestTools
EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements PathResolver TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib
LOG_IGNORE_PATTERN "reading the map|field map" )
@@ -74,7 +76,7 @@ atlas_add_test( SeedNewtonTrkDistanceFinder_test
SOURCES test/SeedNewtonTrkDistanceFinder_test.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} TestTools
EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements PathResolver TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib
LOG_IGNORE_PATTERN "reading the map|field map" )
@@ -83,7 +85,7 @@ atlas_add_test( Trk2DDistanceFinder_test
SOURCES test/Trk2DDistanceFinder_test.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} TestTools
EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements PathResolver TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib
LOG_IGNORE_PATTERN "reading the map|field map" )
@@ -92,7 +94,7 @@ atlas_add_test( GaussianTrackDensity_test
SOURCES test/GaussianTrackDensity_test.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} TestTools
EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib )
# Needed to avoid spurious ubsan warnings.
set_target_properties( TrkVertexSeedFinderUtils_GaussianTrackDensity_test PROPERTIES ENABLE_EXPORTS True )
@@ -102,7 +104,7 @@ atlas_add_test( SimpleVertexClusterFinder_test
SOURCES test/SimpleVertexClusterFinder_test.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} TestTools
EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib )
@@ -110,7 +112,7 @@ atlas_add_test( Mode3dFromFsmw1dFinder_test
SOURCES test/Mode3dFromFsmw1dFinder_test.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} TestTools
EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib )
# Needed to avoid spurious ubsan warnings.
set_target_properties( TrkVertexSeedFinderUtils_Mode3dFromFsmw1dFinder_test PROPERTIES ENABLE_EXPORTS True )
@@ -120,5 +122,5 @@ atlas_add_test( Mode3dTo1dFinder_test
SOURCES test/Mode3dTo1dFinder_test.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} ${FFTW_LIBRARIES} TestTools
EventPrimitives
- xAODTruth InDetTrackSelectionToolLib MagFieldInterfaces TrkEventPrimitives
+ xAODTruth InDetTrackSelectionToolLib MagFieldConditions MagFieldElements TrkEventPrimitives
TrkLinks TrkTrack TrkVertexFitterInterfaces TrkVertexSeedFinderUtilsLib )
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder.h
index 3ff045850c1d3e471f7af9133e60b6555433ba83..2826134d4ca83f1944a798edc1d72488d1f79bba 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder.h
@@ -8,10 +8,7 @@
#include "GaudiKernel/ToolHandle.h"
#include "TrkVertexSeedFinderUtils/SeedFinderParamDefs.h"
#include "AthenaBaseComps/AthAlgTool.h"
-
-namespace MagField {
- class IMagFieldSvc;
-}
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
namespace Trk
{
@@ -72,8 +69,9 @@ namespace Trk
double m_maxloopnumber;//as job option
//variables for magnetic field service needed to retrieve the correct Bz
- ServiceHandle<MagField::IMagFieldSvc> m_magFieldSvc;
-
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey
+ {this, "AtlasFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"};
+
};
namespace Error {
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Trk2dDistanceSeeder.h b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Trk2dDistanceSeeder.h
index 5e8b912306ba5a7acd383ead1abace147007d2bd..fdcd923f5418208d91f117c532eacad524dab69a 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Trk2dDistanceSeeder.h
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils/Trk2dDistanceSeeder.h
@@ -10,10 +10,7 @@
#include "TrkVertexSeedFinderUtils/SeedFinderParamDefs.h"
#include "GeoPrimitives/GeoPrimitives.h"
#include "AthenaBaseComps/AthAlgTool.h"
-
-namespace MagField {
- class IMagFieldSvc;
-}
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
namespace Trk
{
@@ -60,12 +57,13 @@ namespace Trk
private:
- double getBField (const Perigee& p) const;
+ double getBField (const Perigee& p, MagField::AtlasFieldCache& cache) const;
//option
bool m_solveAmbiguityUsingZ;
- ServiceHandle<MagField::IMagFieldSvc> m_magFieldSvc;
+ SG::ReadCondHandleKey<AtlasFieldCacheCondObj> m_fieldCacheCondObjInputKey
+ {this, "AtlasFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"};
};
}
#endif
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/GaussianTrackDensity_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/GaussianTrackDensity_test.ref
index c4510526b6dae4c2663d21cb66bbcabd6f39e634..3dba3377b8051e7ec308cd3683d64d77d26daeeb 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/GaussianTrackDensity_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/GaussianTrackDensity_test.ref
@@ -1,25 +1,16 @@
TrkVertexSeedFinderUtils/GaussianTrackDensity_test
-Initializing Gaudi ApplicationMgr using job opts /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["MagField::AtlasFieldSvc/AtlasFieldSvc"]
-JobOptionsSvc INFO # (2,1): AtlasFieldSvc.UseDCS = 0
-JobOptionsSvc INFO # (3,1): AtlasFieldSvc.UseMapsFromCool = 0
-JobOptionsSvc INFO Job options successfully read in from /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+Initializing Gaudi ApplicationMgr using job opts /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+JobOptionsSvc INFO Job options successfully read in from /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Mon Jun 24 09:28:34 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
+ running on localhost.localdomain on Thu May 14 05:42:53 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-AtlasFieldSvc INFO initialize() ...
-AtlasFieldSvc INFO Currents are set-up by jobOptions - delaying map initialization until BeginRun incident happens
-AtlasFieldSvc INFO Added listener to BeginRun incident
-AtlasFieldSvc INFO initialize() successful
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
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dFromFsmw1dFinder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dFromFsmw1dFinder_test.ref
index b079a115c260b6d589bd8ec6d29f6e8c815f0e89..c95c87668b18df951f65f269ab4b54617dbc7805 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dFromFsmw1dFinder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dFromFsmw1dFinder_test.ref
@@ -1,25 +1,16 @@
TrkVertexSeedFinderUtils/Mode3dFromFsmw1dFinder_test
-Initializing Gaudi ApplicationMgr using job opts /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["MagField::AtlasFieldSvc/AtlasFieldSvc"]
-JobOptionsSvc INFO # (2,1): AtlasFieldSvc.UseDCS = 0
-JobOptionsSvc INFO # (3,1): AtlasFieldSvc.UseMapsFromCool = 0
-JobOptionsSvc INFO Job options successfully read in from /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+Initializing Gaudi ApplicationMgr using job opts /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+JobOptionsSvc INFO Job options successfully read in from /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Wed Jun 26 14:49:01 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
+ running on localhost.localdomain on Thu May 14 05:43:53 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-AtlasFieldSvc INFO initialize() ...
-AtlasFieldSvc INFO Currents are set-up by jobOptions - delaying map initialization until BeginRun incident happens
-AtlasFieldSvc INFO Added listener to BeginRun incident
-AtlasFieldSvc INFO initialize() successful
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
ToolSvc.Trk::Mo... INFO Initialize successful
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dTo1dFinder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dTo1dFinder_test.ref
index a584664ce726aa42edbabb6cf68d7858bd76e560..ac386076ea9c27b4ec59af5ec41e7026e9772d29 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dTo1dFinder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Mode3dTo1dFinder_test.ref
@@ -1,25 +1,16 @@
TrkVertexSeedFinderUtils/Mode3dTo1dFinder_test
-Initializing Gaudi ApplicationMgr using job opts /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["MagField::AtlasFieldSvc/AtlasFieldSvc"]
-JobOptionsSvc INFO # (2,1): AtlasFieldSvc.UseDCS = 0
-JobOptionsSvc INFO # (3,1): AtlasFieldSvc.UseMapsFromCool = 0
-JobOptionsSvc INFO Job options successfully read in from /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+Initializing Gaudi ApplicationMgr using job opts /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+JobOptionsSvc INFO Job options successfully read in from /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Thu Jun 27 11:26:14 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
+ running on localhost.localdomain on Thu May 14 05:44:16 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-AtlasFieldSvc INFO initialize() ...
-AtlasFieldSvc INFO Currents are set-up by jobOptions - delaying map initialization until BeginRun incident happens
-AtlasFieldSvc INFO Added listener to BeginRun incident
-AtlasFieldSvc INFO initialize() successful
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
ToolSvc.Trk::Mo... INFO Initialize successfull
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/NewtonTrkDistanceFinder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/NewtonTrkDistanceFinder_test.ref
index 3f0be1694fe3addef9bdd975dc63c2d06968cae2..d575cc9aba1ff73dc4019a6aa2da4852ed687138 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/NewtonTrkDistanceFinder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/NewtonTrkDistanceFinder_test.ref
@@ -1,33 +1,19 @@
TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder_test
-Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["MagField::AtlasFieldSvc/AtlasFieldSvc"]
-JobOptionsSvc INFO # (2,1): AtlasFieldSvc.UseDCS = 0
-JobOptionsSvc INFO # (3,1): AtlasFieldSvc.UseMapsFromCool = 0
-JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+Initializing Gaudi ApplicationMgr using job opts /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+JobOptionsSvc INFO Job options successfully read in from /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus775.cern.ch on Fri Apr 10 21:24:03 2020
+ running on localhost.localdomain on Thu May 14 05:38:41 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-AtlasFieldSvc INFO initialize() ...
-AtlasFieldSvc INFO Currents are set-up by jobOptions - delaying map initialization until BeginRun incident happens
-AtlasFieldSvc INFO Added listener to BeginRun incident
-AtlasFieldSvc INFO initialize() successful
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-AtlasFieldSvc INFO handling incidents ...
-AtlasFieldSvc INFO importCurrents() ...
-AtlasFieldSvc INFO Initializing the field map (solenoidCurrent=7730 toroidCurrent=20400)
-AtlasFieldSvc INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Solenoid zone id 7000
-AtlasFieldSvc INFO Currents imported and map initialized
-AtlasFieldSvc INFO BeginRun incident handled
-AtlasFieldSvc INFO incidents handled successfully
+ClassIDSvc INFO getRegistryEntries: read 1460 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3256 CLIDRegistry entries for module ALL
test1
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/SeedNewtonTrkDistanceFinder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/SeedNewtonTrkDistanceFinder_test.ref
index f563812010089ed0103ca6a421a35a98d093defe..59d2edcf9dfb2c5e59fa298954bb9be6567c7899 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/SeedNewtonTrkDistanceFinder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/SeedNewtonTrkDistanceFinder_test.ref
@@ -1,33 +1,19 @@
TrkVertexSeedFinderUtils/SeedNewtonTrkDistanceFinder_test
-Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["MagField::AtlasFieldSvc/AtlasFieldSvc"]
-JobOptionsSvc INFO # (2,1): AtlasFieldSvc.UseDCS = 0
-JobOptionsSvc INFO # (3,1): AtlasFieldSvc.UseMapsFromCool = 0
-JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+Initializing Gaudi ApplicationMgr using job opts /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+JobOptionsSvc INFO Job options successfully read in from /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus775.cern.ch on Fri Apr 10 21:35:29 2020
+ running on localhost.localdomain on Thu May 14 05:41:52 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-AtlasFieldSvc INFO initialize() ...
-AtlasFieldSvc INFO Currents are set-up by jobOptions - delaying map initialization until BeginRun incident happens
-AtlasFieldSvc INFO Added listener to BeginRun incident
-AtlasFieldSvc INFO initialize() successful
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-AtlasFieldSvc INFO handling incidents ...
-AtlasFieldSvc INFO importCurrents() ...
-AtlasFieldSvc INFO Initializing the field map (solenoidCurrent=7730 toroidCurrent=20400)
-AtlasFieldSvc INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Solenoid zone id 7000
-AtlasFieldSvc INFO Currents imported and map initialized
-AtlasFieldSvc INFO BeginRun incident handled
-AtlasFieldSvc INFO incidents handled successfully
+ClassIDSvc INFO getRegistryEntries: read 1460 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3256 CLIDRegistry entries for module ALL
test1
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/SimpleVertexClusterFinder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/SimpleVertexClusterFinder_test.ref
index 4e54e75df837669fc3bad38146b018dac0e1beb3..421d4ce48025288b367d13e6de43fba00faff30d 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/SimpleVertexClusterFinder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/SimpleVertexClusterFinder_test.ref
@@ -1,25 +1,16 @@
TrkVertexSeedFinderUtils/SimpleVertexClusterFinder_test
-Initializing Gaudi ApplicationMgr using job opts /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # =======> /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["MagField::AtlasFieldSvc/AtlasFieldSvc"]
-JobOptionsSvc INFO # (2,1): AtlasFieldSvc.UseDCS = 0
-JobOptionsSvc INFO # (3,1): AtlasFieldSvc.UseMapsFromCool = 0
-JobOptionsSvc INFO Job options successfully read in from /home/sss/atlas/rootaccess/build/joboptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+Initializing Gaudi ApplicationMgr using job opts /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+JobOptionsSvc INFO Job options successfully read in from /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Mon Jun 24 22:40:35 2019
+ Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
+ running on localhost.localdomain on Thu May 14 05:43:15 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-AtlasFieldSvc INFO initialize() ...
-AtlasFieldSvc INFO Currents are set-up by jobOptions - delaying map initialization until BeginRun incident happens
-AtlasFieldSvc INFO Added listener to BeginRun incident
-AtlasFieldSvc INFO initialize() successful
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
ToolSvc.Trk::Ve... INFO Initializing frequency space filter
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Trk2DDistanceFinder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Trk2DDistanceFinder_test.ref
index 5337bb18a7c13ef5d9e147c249acecab467caeb5..13b71e0e1c47ea35b1db72a02e7b1acb83d73fef 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Trk2DDistanceFinder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Trk2DDistanceFinder_test.ref
@@ -1,33 +1,19 @@
TrkVertexSeedFinderUtils/Trk2DDistanceFinder_test
-Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["MagField::AtlasFieldSvc/AtlasFieldSvc"]
-JobOptionsSvc INFO # (2,1): AtlasFieldSvc.UseDCS = 0
-JobOptionsSvc INFO # (3,1): AtlasFieldSvc.UseMapsFromCool = 0
-JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+Initializing Gaudi ApplicationMgr using job opts /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+JobOptionsSvc INFO Job options successfully read in from /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus775.cern.ch on Fri Apr 10 21:22:38 2020
+ running on localhost.localdomain on Thu May 14 05:42:27 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-AtlasFieldSvc INFO initialize() ...
-AtlasFieldSvc INFO Currents are set-up by jobOptions - delaying map initialization until BeginRun incident happens
-AtlasFieldSvc INFO Added listener to BeginRun incident
-AtlasFieldSvc INFO initialize() successful
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-AtlasFieldSvc INFO handling incidents ...
-AtlasFieldSvc INFO importCurrents() ...
-AtlasFieldSvc INFO Initializing the field map (solenoidCurrent=7730 toroidCurrent=20400)
-AtlasFieldSvc INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Solenoid zone id 7000
-AtlasFieldSvc INFO Currents imported and map initialized
-AtlasFieldSvc INFO BeginRun incident handled
-AtlasFieldSvc INFO incidents handled successfully
+ClassIDSvc INFO getRegistryEntries: read 1460 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3256 CLIDRegistry entries for module ALL
test1
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Trk2dDistanceSeeder_test.ref b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Trk2dDistanceSeeder_test.ref
index 64450b55cc258b17f6d1a9051a3d524d18fdc44b..293869f2d3cf37bc2301916a139b9e538a9ff197 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Trk2dDistanceSeeder_test.ref
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/Trk2dDistanceSeeder_test.ref
@@ -1,33 +1,19 @@
TrkVertexSeedFinderUtils/Trk2dDistanceSeeder_test
-Initializing Gaudi ApplicationMgr using job opts /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # =======> /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
-JobOptionsSvc INFO # (1,1): ApplicationMgr.ExtSvc = ["MagField::AtlasFieldSvc/AtlasFieldSvc"]
-JobOptionsSvc INFO # (2,1): AtlasFieldSvc.UseDCS = 0
-JobOptionsSvc INFO # (3,1): AtlasFieldSvc.UseMapsFromCool = 0
-JobOptionsSvc INFO Job options successfully read in from /afs/cern.ch/user/s/ssnyder/atlas-work3/build-x86_64-centos7-gcc8-opt/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+Initializing Gaudi ApplicationMgr using job opts /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
+JobOptionsSvc INFO Job options successfully read in from /home/dcasper/Work/atlas/vtx/build/x86_64-centos7-gcc8-opt/jobOptions/TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v33r1)
- running on lxplus775.cern.ch on Fri Apr 10 21:36:13 2020
+ running on localhost.localdomain on Thu May 14 05:41:16 2020
====================================================================================================================================
ApplicationMgr INFO Application Manager Configured successfully
-AtlasFieldSvc INFO initialize() ...
-AtlasFieldSvc INFO Currents are set-up by jobOptions - delaying map initialization until BeginRun incident happens
-AtlasFieldSvc INFO Added listener to BeginRun incident
-AtlasFieldSvc INFO initialize() successful
EventLoopMgr WARNING Unable to locate service "EventSelector"
EventLoopMgr WARNING No events will be processed from external input.
ApplicationMgr INFO Application Manager Initialized successfully
ApplicationMgr Ready
-AtlasFieldSvc INFO handling incidents ...
-AtlasFieldSvc INFO importCurrents() ...
-AtlasFieldSvc INFO Initializing the field map (solenoidCurrent=7730 toroidCurrent=20400)
-AtlasFieldSvc INFO reading the map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Initialized the field map from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master_Athena_x86_64-centos7-gcc8-opt/atlas/offline/ReleaseData/v20/MagneticFieldMaps/bfieldmap_7730_20400_14m.root
-AtlasFieldSvc INFO Solenoid zone id 7000
-AtlasFieldSvc INFO Currents imported and map initialized
-AtlasFieldSvc INFO BeginRun incident handled
-AtlasFieldSvc INFO incidents handled successfully
+ClassIDSvc INFO getRegistryEntries: read 1460 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL
+ClassIDSvc INFO getRegistryEntries: read 3256 CLIDRegistry entries for module ALL
test1
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/TrkVertexSeedFinderUtils_tests.txt b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/TrkVertexSeedFinderUtils_tests.txt
index ce532aaa3b830d9f4a755d386296875e63b20929..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/TrkVertexSeedFinderUtils_tests.txt
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/share/TrkVertexSeedFinderUtils_tests.txt
@@ -1,3 +0,0 @@
-ApplicationMgr.ExtSvc={"MagField::AtlasFieldSvc/AtlasFieldSvc"};
-AtlasFieldSvc.UseDCS=false;
-AtlasFieldSvc.UseMapsFromCool=false;
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/NewtonTrkDistanceFinder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/NewtonTrkDistanceFinder.cxx
index dedcdc698e289a18aa518b3d82821bc12260e0a7..364a6f9f8a32f4aaba6a52d4cc62d3e15e753779 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/NewtonTrkDistanceFinder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/NewtonTrkDistanceFinder.cxx
@@ -8,10 +8,12 @@
//#define TrkDistance_DEBUG
+#include "GaudiKernel/EventContext.h"
+
#include "TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder.h"
#include "TrkVertexSeedFinderUtils/SeedFinderParamDefs.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
+#include "MagFieldElements/AtlasFieldCache.h"
#include "TrkEventPrimitives/ParamDefs.h"
#include <math.h>
@@ -29,10 +31,8 @@ namespace Trk
NewtonTrkDistanceFinder::NewtonTrkDistanceFinder(const std::string& t, const std::string& n, const IInterface* p) :
AthAlgTool(t,n,p),
m_precision(1e-8),
- m_maxloopnumber(20),
- m_magFieldSvc("AtlasFieldSvc", n)
+ m_maxloopnumber(20)
{
- declareProperty("MagFieldSvc", m_magFieldSvc);
declareProperty("Precision",m_precision);
declareProperty("MaxLoops",m_maxloopnumber);
declareInterface<NewtonTrkDistanceFinder>(this);
@@ -43,7 +43,7 @@ namespace Trk
StatusCode NewtonTrkDistanceFinder::initialize()
{
ATH_CHECK( AlgTool::initialize() );
- ATH_CHECK( m_magFieldSvc.retrieve() );
+ ATH_CHECK( m_fieldCacheCondObjInputKey.initialize() );
ATH_MSG_DEBUG( "Initialize successful" );
return StatusCode::SUCCESS;
}
@@ -75,12 +75,19 @@ NewtonTrkDistanceFinder::GetClosestPoints (const PointOnTrack & firsttrack,
ATH_MSG_DEBUG( "m_a_phi0 " << a_phi0 );
#endif
+ // Setup magnetic field retrieval
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCacheCondObjInputKey, Gaudi::Hive::currentContext()};
+ const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
+
+ MagField::AtlasFieldCache fieldCache;
+ fieldCondObj->getInitializedCache (fieldCache);
+
double magnFieldVect[3];
double posXYZ[3];
posXYZ[0] = firsttrack.getPerigee().associatedSurface().center().x();
posXYZ[1] = firsttrack.getPerigee().associatedSurface().center().y();
posXYZ[2] = firsttrack.getPerigee().associatedSurface().center().z();
- m_magFieldSvc->getField(posXYZ,magnFieldVect);
+ fieldCache.getField(posXYZ,magnFieldVect);
//Magnetic field at (x0,y0,z0)
@@ -117,7 +124,7 @@ NewtonTrkDistanceFinder::GetClosestPoints (const PointOnTrack & firsttrack,
posXYZ[0] = secondtrack.getPerigee().associatedSurface().center().x();
posXYZ[1] = secondtrack.getPerigee().associatedSurface().center().y();
posXYZ[2] = secondtrack.getPerigee().associatedSurface().center().z();
- m_magFieldSvc->getField(posXYZ,magnFieldVect);
+ fieldCache.getField(posXYZ,magnFieldVect);
//Magnetic field at (x0,y0,z0)
const double b_Bz = magnFieldVect[2]*299.792;//B field in Gev/mm - for the moment use a constant field offline
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Trk2dDistanceSeeder.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Trk2dDistanceSeeder.cxx
index 22318bdaf8a1be5169985c3a462ec5d1e6a5565e..06d662ce3cdce098c4b23785ea56c920909b49d7 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Trk2dDistanceSeeder.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/src/Trk2dDistanceSeeder.cxx
@@ -10,9 +10,10 @@
#include "TrkVertexSeedFinderUtils/Trk2dDistanceSeeder.h"
#include "TrkVertexSeedFinderUtils/TwoTracks.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
#include "TrkParameters/TrackParameters.h"
#include "GaudiKernel/SystemOfUnits.h"
+#include "GaudiKernel/EventContext.h"
+#include "MagFieldElements/AtlasFieldCache.h"
#include <math.h>
#include <TMath.h>
@@ -99,10 +100,8 @@ namespace Trk
{
Trk2dDistanceSeeder::Trk2dDistanceSeeder(const std::string& t, const std::string& n, const IInterface* p) :
AthAlgTool(t,n,p),
- m_solveAmbiguityUsingZ(true),
- m_magFieldSvc("AtlasFieldSvc", n)
+ m_solveAmbiguityUsingZ(true)
{
- declareProperty("MagFieldSvc", m_magFieldSvc);
declareProperty("SolveAmbiguityUsingZ",m_solveAmbiguityUsingZ);
declareInterface<Trk2dDistanceSeeder>(this);
}
@@ -112,7 +111,7 @@ namespace Trk
StatusCode Trk2dDistanceSeeder::initialize()
{
ATH_CHECK( AlgTool::initialize() );
- ATH_CHECK( m_magFieldSvc.retrieve() );
+ ATH_CHECK( m_fieldCacheCondObjInputKey.initialize() );
ATH_MSG_DEBUG( "Initialize successful" );
return StatusCode::SUCCESS;
}
@@ -128,8 +127,14 @@ StatusCode Trk2dDistanceSeeder::finalize()
Trk2dDistanceSeeder::GetSeed (const TwoTracks & mytracks,
TwoPoints* twopoints /*=nullptr*/) const
{
- const double bfield1 = getBField (mytracks.getFirstPerigee());
- const double bfield2 = getBField (mytracks.getSecondPerigee());
+ SG::ReadCondHandle<AtlasFieldCacheCondObj> readHandle{m_fieldCacheCondObjInputKey, Gaudi::Hive::currentContext()};
+ const AtlasFieldCacheCondObj* fieldCondObj{*readHandle};
+
+ MagField::AtlasFieldCache fieldCache;
+ fieldCondObj->getInitializedCache (fieldCache);
+
+ const double bfield1 = getBField (mytracks.getFirstPerigee(), fieldCache);
+ const double bfield2 = getBField (mytracks.getSecondPerigee(), fieldCache);
//phitanpoca here means not the tan to poca (which is phi0) but the direction from perigee to the center of curvature (I don't know
//why I chose this strange name, sorry!)
@@ -374,14 +379,15 @@ StatusCode Trk2dDistanceSeeder::finalize()
}
- double Trk2dDistanceSeeder::getBField (const Perigee& p) const
+ double Trk2dDistanceSeeder::getBField (const Perigee& p, MagField::AtlasFieldCache& cache) const
{
double magnFieldVect[3];
double posXYZ[3];
posXYZ[0] = p.associatedSurface().center().x();
posXYZ[1] = p.associatedSurface().center().y();
posXYZ[2] = p.associatedSurface().center().z();
- m_magFieldSvc->getField(posXYZ,magnFieldVect);
+
+ cache.getField(posXYZ,magnFieldVect);
const double bfield = magnFieldVect[2]*299.792;//should be in GeV/mm
if (bfield==0. || isnan(bfield)) {
ATH_MSG_DEBUG( "Could not find a magnetic field different from zero: very very strange" );
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/GaussianTrackDensity_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/GaussianTrackDensity_test.cxx
index b50659d0850b2ddede5f7c4aa36985ddaa209ad6..906dac6f629d8c726d571e5b233970de6476893b 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/GaussianTrackDensity_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/GaussianTrackDensity_test.cxx
@@ -18,8 +18,6 @@
#include "GaudiKernel/SystemOfUnits.h"
#include "CxxUtils/ubsan_suppress.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/IIncidentListener.h"
#include "TInterpreter.h"
#include <iostream>
#include <cassert>
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/NewtonTrkDistanceFinder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/NewtonTrkDistanceFinder_test.cxx
index 6b0d6194fddd8154ecdd59a3aad555507bf9a721..a52582a5e6a60b05b51070e5ec4e969cc3d25b3e 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/NewtonTrkDistanceFinder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/NewtonTrkDistanceFinder_test.cxx
@@ -11,19 +11,31 @@
#undef NDEBUG
#include "TrkVertexSeedFinderUtils/NewtonTrkDistanceFinder.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "TestTools/initGaudi.h"
#include "TestTools/FLOATassert.h"
#include "TestTools/expect_exception.h"
#include "CxxUtils/ubsan_suppress.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/IIncidentListener.h"
+#include "GaudiKernel/EventContext.h"
#include "TInterpreter.h"
#include <iostream>
#include <cassert>
#include <cmath>
+// for the field map
+#include "PathResolver/PathResolver.h"
+#include "TFile.h"
+#include "TTree.h"
+
+// for populating conditions store
+#include "SGTools/TestStore.h"
+#include "StoreGate/WriteCondHandleKey.h"
+#include "StoreGate/WriteCondHandle.h"
+
+// for the conditions data
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "MagFieldElements/AtlasFieldCache.h"
// Can't link against these --- they're in a component library.
#include "../src/NewtonTrkDistanceFinder.cxx"
@@ -78,6 +90,53 @@ void test1 (Trk::NewtonTrkDistanceFinder& tool)
assertVec3D (pp.second, { -4.46622, 4.67974, -2.14596 });
}
+std::unique_ptr<MagField::AtlasFieldMap> getFieldMap(const std::string mapFile, double sol_current, double tor_current) {
+ // find the path to the map file
+ std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "DATAPATH" );
+ assert ( !resolvedMapFile.empty() );
+ // Do checks and extract root file to initialize the map
+ assert ( resolvedMapFile.find(".root") != std::string::npos );
+
+ std::unique_ptr<TFile> rootfile( std::make_unique<TFile>(resolvedMapFile.c_str(), "OLD") );
+ assert ( rootfile );
+ assert ( rootfile->cd() );
+ // open the tree
+ TTree* tree = (TTree*)rootfile->Get("BFieldMap");
+ assert(tree);
+
+ // create map
+ std::unique_ptr<MagField::AtlasFieldMap> field_map=std::make_unique<MagField::AtlasFieldMap>();
+
+ // initialize map
+ assert (field_map->initializeMap( rootfile.get(), sol_current, tor_current ));
+ return field_map;
+
+}
+
+void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
+ SG::WriteCondHandleKey<AtlasFieldCacheCondObj> fieldKey {"fieldCondObj"};
+ assert( fieldKey.initialize().isSuccess());
+
+ // from StoreGate/test/WriteCondHandle_test.cxx
+ EventIDBase now(0, EventIDBase::UNDEFEVT, 1);
+ EventContext ctx(1, 1);
+ ctx.setEventID( now );
+ ctx.setExtension( Atlas::ExtendedEventContext(&store) );
+ Gaudi::Hive::setCurrentContext(ctx);
+
+ EventIDBase s1_1(0, EventIDBase::UNDEFEVT, 0);
+ EventIDBase e1_1(0, EventIDBase::UNDEFEVT, 3);
+ EventIDRange r1_1 (s1_1,e1_1);
+
+
+ SG::WriteCondHandle<AtlasFieldCacheCondObj> fieldHandle {fieldKey};
+ {
+ std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
+ auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
+ assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
+ }
+}
int main()
{
@@ -85,9 +144,12 @@ int main()
CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); });
ISvcLocator* svcloc = nullptr;
Athena_test::initGaudi ("TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt", svcloc);
- ServiceHandle<MagField::IMagFieldSvc> field ("MagField::AtlasFieldSvc/AtlasFieldSvc", "test");
- Incident inc_br ("test", IncidentType::BeginRun);
- dynamic_cast<IIncidentListener*>(&*field)->handle (inc_br);
+
+ StoreGateSvc *cs=nullptr;
+ assert (svcloc->service("StoreGateSvc/ConditionStore",cs).isSuccess());
+
+ SGTest::TestStore dumstore;
+ createNewtonTrkDistanceFinderCondData(dumstore);
ToolHandle<Trk::NewtonTrkDistanceFinder> tool ("Trk::NewtonTrkDistanceFinder");
assert( tool.retrieve().isSuccess() );
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SeedNewtonTrkDistanceFinder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SeedNewtonTrkDistanceFinder_test.cxx
index 4a7c3253a5aa1761c6837194b8db912c12c03b02..9dc1a3a02cca42c9a5fb41386ce3b0a27d931989 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SeedNewtonTrkDistanceFinder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SeedNewtonTrkDistanceFinder_test.cxx
@@ -11,19 +11,31 @@
#undef NDEBUG
#include "TrkVertexSeedFinderUtils/ITrkDistanceFinder.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "TestTools/initGaudi.h"
#include "TestTools/FLOATassert.h"
#include "TestTools/expect_exception.h"
#include "CxxUtils/ubsan_suppress.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/IIncidentListener.h"
+#include "GaudiKernel/EventContext.h"
#include "TInterpreter.h"
#include <iostream>
#include <cassert>
#include <cmath>
+// for the field map
+#include "PathResolver/PathResolver.h"
+#include "TFile.h"
+#include "TTree.h"
+
+// for populating conditions store
+#include "SGTools/TestStore.h"
+#include "StoreGate/WriteCondHandleKey.h"
+#include "StoreGate/WriteCondHandle.h"
+
+// for the conditions data
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "MagFieldElements/AtlasFieldCache.h"
void assertVec3D (const Amg::Vector3D& a, const Amg::Vector3D& b)
{
@@ -85,6 +97,53 @@ void test1 (Trk::ITrkDistanceFinder& tool)
assertVec3D (pp.second, { -4.46622, 4.67974, -2.14596 });
}
+std::unique_ptr<MagField::AtlasFieldMap> getFieldMap(const std::string mapFile, double sol_current, double tor_current) {
+ // find the path to the map file
+ std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "DATAPATH" );
+ assert ( !resolvedMapFile.empty() );
+ // Do checks and extract root file to initialize the map
+ assert ( resolvedMapFile.find(".root") != std::string::npos );
+
+ std::unique_ptr<TFile> rootfile( std::make_unique<TFile>(resolvedMapFile.c_str(), "OLD") );
+ assert ( rootfile );
+ assert ( rootfile->cd() );
+ // open the tree
+ TTree* tree = (TTree*)rootfile->Get("BFieldMap");
+ assert(tree);
+
+ // create map
+ std::unique_ptr<MagField::AtlasFieldMap> field_map=std::make_unique<MagField::AtlasFieldMap>();
+
+ // initialize map
+ assert (field_map->initializeMap( rootfile.get(), sol_current, tor_current ));
+ return field_map;
+
+}
+
+void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
+ SG::WriteCondHandleKey<AtlasFieldCacheCondObj> fieldKey {"fieldCondObj"};
+ assert( fieldKey.initialize().isSuccess());
+
+ // from StoreGate/test/WriteCondHandle_test.cxx
+ EventIDBase now(0, EventIDBase::UNDEFEVT, 1);
+ EventContext ctx(1, 1);
+ ctx.setEventID( now );
+ ctx.setExtension( Atlas::ExtendedEventContext(&store) );
+ Gaudi::Hive::setCurrentContext(ctx);
+
+ EventIDBase s1_1(0, EventIDBase::UNDEFEVT, 0);
+ EventIDBase e1_1(0, EventIDBase::UNDEFEVT, 3);
+ EventIDRange r1_1 (s1_1,e1_1);
+
+
+ SG::WriteCondHandle<AtlasFieldCacheCondObj> fieldHandle {fieldKey};
+ {
+ std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
+ auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
+ assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
+ }
+}
int main()
{
@@ -92,9 +151,12 @@ int main()
CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); });
ISvcLocator* svcloc = nullptr;
Athena_test::initGaudi ("TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt", svcloc);
- ServiceHandle<MagField::IMagFieldSvc> field ("MagField::AtlasFieldSvc/AtlasFieldSvc", "test");
- Incident inc_br ("test", IncidentType::BeginRun);
- dynamic_cast<IIncidentListener*>(&*field)->handle (inc_br);
+
+ StoreGateSvc *cs=nullptr;
+ assert (svcloc->service("StoreGateSvc/ConditionStore",cs).isSuccess());
+
+ SGTest::TestStore dumstore;
+ createNewtonTrkDistanceFinderCondData(dumstore);
ToolHandle<Trk::ITrkDistanceFinder> tool ("Trk::SeedNewtonTrkDistanceFinder");
assert( tool.retrieve().isSuccess() );
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SimpleVertexClusterFinder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SimpleVertexClusterFinder_test.cxx
index e967d55d16c1914affadc731a85689b2d7c005b2..c8a99749a08f027b89f8910a726b5409543aa7ad 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SimpleVertexClusterFinder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/SimpleVertexClusterFinder_test.cxx
@@ -19,8 +19,6 @@
#include "GaudiKernel/SystemOfUnits.h"
#include "CxxUtils/ubsan_suppress.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/IIncidentListener.h"
#include "TInterpreter.h"
#include <iostream>
#include <cassert>
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2DDistanceFinder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2DDistanceFinder_test.cxx
index 456cec13c4dd2438ee93a894a36f0e3ee4781ff6..e54dacaa979fe31c835b682f391b2b07998e770c 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2DDistanceFinder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2DDistanceFinder_test.cxx
@@ -11,19 +11,31 @@
#undef NDEBUG
#include "TrkVertexSeedFinderUtils/ITrkDistanceFinder.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "TestTools/initGaudi.h"
#include "TestTools/FLOATassert.h"
#include "TestTools/expect_exception.h"
#include "CxxUtils/ubsan_suppress.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/IIncidentListener.h"
+#include "GaudiKernel/EventContext.h"
#include "TInterpreter.h"
#include <iostream>
#include <cassert>
#include <cmath>
+// for the field map
+#include "PathResolver/PathResolver.h"
+#include "TFile.h"
+#include "TTree.h"
+
+// for populating conditions store
+#include "SGTools/TestStore.h"
+#include "StoreGate/WriteCondHandleKey.h"
+#include "StoreGate/WriteCondHandle.h"
+
+// for the conditions data
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "MagFieldElements/AtlasFieldCache.h"
std::ostream& printVec3D (const Amg::Vector3D& a)
{
@@ -92,6 +104,53 @@ void test1 (Trk::ITrkDistanceFinder& tool)
assertVec3D (pp.second, { 12.501, 9.50104, 0 });
}
+std::unique_ptr<MagField::AtlasFieldMap> getFieldMap(const std::string mapFile, double sol_current, double tor_current) {
+ // find the path to the map file
+ std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "DATAPATH" );
+ assert ( !resolvedMapFile.empty() );
+ // Do checks and extract root file to initialize the map
+ assert ( resolvedMapFile.find(".root") != std::string::npos );
+
+ std::unique_ptr<TFile> rootfile( std::make_unique<TFile>(resolvedMapFile.c_str(), "OLD") );
+ assert ( rootfile );
+ assert ( rootfile->cd() );
+ // open the tree
+ TTree* tree = (TTree*)rootfile->Get("BFieldMap");
+ assert(tree);
+
+ // create map
+ std::unique_ptr<MagField::AtlasFieldMap> field_map=std::make_unique<MagField::AtlasFieldMap>();
+
+ // initialize map
+ assert (field_map->initializeMap( rootfile.get(), sol_current, tor_current ));
+ return field_map;
+
+}
+
+void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
+ SG::WriteCondHandleKey<AtlasFieldCacheCondObj> fieldKey {"fieldCondObj"};
+ assert( fieldKey.initialize().isSuccess());
+
+ // from StoreGate/test/WriteCondHandle_test.cxx
+ EventIDBase now(0, EventIDBase::UNDEFEVT, 1);
+ EventContext ctx(1, 1);
+ ctx.setEventID( now );
+ ctx.setExtension( Atlas::ExtendedEventContext(&store) );
+ Gaudi::Hive::setCurrentContext(ctx);
+
+ EventIDBase s1_1(0, EventIDBase::UNDEFEVT, 0);
+ EventIDBase e1_1(0, EventIDBase::UNDEFEVT, 3);
+ EventIDRange r1_1 (s1_1,e1_1);
+
+
+ SG::WriteCondHandle<AtlasFieldCacheCondObj> fieldHandle {fieldKey};
+ {
+ std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
+ auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
+ assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
+ }
+}
int main()
{
@@ -99,9 +158,12 @@ int main()
CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); });
ISvcLocator* svcloc = nullptr;
Athena_test::initGaudi ("TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt", svcloc);
- ServiceHandle<MagField::IMagFieldSvc> field ("MagField::AtlasFieldSvc/AtlasFieldSvc", "test");
- Incident inc_br ("test", IncidentType::BeginRun);
- dynamic_cast<IIncidentListener*>(&*field)->handle (inc_br);
+
+ StoreGateSvc *cs=nullptr;
+ assert (svcloc->service("StoreGateSvc/ConditionStore",cs).isSuccess());
+
+ SGTest::TestStore dumstore;
+ createNewtonTrkDistanceFinderCondData(dumstore);
ToolHandle<Trk::ITrkDistanceFinder> tool ("Trk::Trk2DDistanceFinder");
assert( tool.retrieve().isSuccess() );
diff --git a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2dDistanceSeeder_test.cxx b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2dDistanceSeeder_test.cxx
index d9214bcb13efad71e2ec21c5f1b84b4cdac12061..639fa14f6c5b74ea906665e046ac2e48241c2004 100644
--- a/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2dDistanceSeeder_test.cxx
+++ b/Tracking/TrkVertexFitter/TrkVertexSeedFinderUtils/test/Trk2dDistanceSeeder_test.cxx
@@ -11,25 +11,36 @@
#undef NDEBUG
#include "TrkVertexSeedFinderUtils/Trk2dDistanceSeeder.h"
-#include "MagFieldInterfaces/IMagFieldSvc.h"
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
#include "TestTools/initGaudi.h"
#include "TestTools/FLOATassert.h"
#include "TestTools/expect_exception.h"
#include "CxxUtils/ubsan_suppress.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/Incident.h"
-#include "GaudiKernel/IIncidentListener.h"
+#include "GaudiKernel/EventContext.h"
#include "TInterpreter.h"
#include <iostream>
#include <cassert>
#include <cmath>
-
// Can't link against these --- they're in a component library.
#include "../src/Trk2dDistanceSeeder.cxx"
#include "../src/PointOnTrack.cxx"
#include "../src/TwoTracks.cxx"
+// for the field map
+#include "PathResolver/PathResolver.h"
+#include "TFile.h"
+#include "TTree.h"
+
+// for populating conditions store
+#include "SGTools/TestStore.h"
+#include "StoreGate/WriteCondHandleKey.h"
+#include "StoreGate/WriteCondHandle.h"
+
+// for the conditions data
+#include "MagFieldConditions/AtlasFieldCacheCondObj.h"
+#include "MagFieldElements/AtlasFieldCache.h"
void assertVec3D (const Amg::Vector3D& a, const Amg::Vector3D& b)
{
@@ -111,6 +122,53 @@ void test1 (Trk::Trk2dDistanceSeeder& tool)
#endif
}
+std::unique_ptr<MagField::AtlasFieldMap> getFieldMap(const std::string mapFile, double sol_current, double tor_current) {
+ // find the path to the map file
+ std::string resolvedMapFile = PathResolver::find_file( mapFile.c_str(), "DATAPATH" );
+ assert ( !resolvedMapFile.empty() );
+ // Do checks and extract root file to initialize the map
+ assert ( resolvedMapFile.find(".root") != std::string::npos );
+
+ std::unique_ptr<TFile> rootfile( std::make_unique<TFile>(resolvedMapFile.c_str(), "OLD") );
+ assert ( rootfile );
+ assert ( rootfile->cd() );
+ // open the tree
+ TTree* tree = (TTree*)rootfile->Get("BFieldMap");
+ assert(tree);
+
+ // create map
+ std::unique_ptr<MagField::AtlasFieldMap> field_map=std::make_unique<MagField::AtlasFieldMap>();
+
+ // initialize map
+ assert (field_map->initializeMap( rootfile.get(), sol_current, tor_current ));
+ return field_map;
+
+}
+
+void createNewtonTrkDistanceFinderCondData(SGTest::TestStore &store) {
+ SG::WriteCondHandleKey<AtlasFieldCacheCondObj> fieldKey {"fieldCondObj"};
+ assert( fieldKey.initialize().isSuccess());
+
+ // from StoreGate/test/WriteCondHandle_test.cxx
+ EventIDBase now(0, EventIDBase::UNDEFEVT, 1);
+ EventContext ctx(1, 1);
+ ctx.setEventID( now );
+ ctx.setExtension( Atlas::ExtendedEventContext(&store) );
+ Gaudi::Hive::setCurrentContext(ctx);
+
+ EventIDBase s1_1(0, EventIDBase::UNDEFEVT, 0);
+ EventIDBase e1_1(0, EventIDBase::UNDEFEVT, 3);
+ EventIDRange r1_1 (s1_1,e1_1);
+
+
+ SG::WriteCondHandle<AtlasFieldCacheCondObj> fieldHandle {fieldKey};
+ {
+ std::unique_ptr<MagField::AtlasFieldMap> fieldMap=getFieldMap("MagneticFieldMaps/bfieldmap_7730_20400_14m.root",7730,20400);
+ auto fieldCondObj = std::make_unique<AtlasFieldCacheCondObj>();
+ assert( fieldCondObj->initialize(1. /*solenoid current scale factor*/, 1. /*toroid current scale factor*/, fieldMap.release()));
+ assert( fieldHandle.record(r1_1, std::move(fieldCondObj)).isSuccess());
+ }
+}
int main()
{
@@ -118,9 +176,12 @@ int main()
CxxUtils::ubsan_suppress ([]() { TInterpreter::Instance(); });
ISvcLocator* svcloc = nullptr;
Athena_test::initGaudi ("TrkVertexSeedFinderUtils/TrkVertexSeedFinderUtils_tests.txt", svcloc);
- ServiceHandle<MagField::IMagFieldSvc> field ("MagField::AtlasFieldSvc/AtlasFieldSvc", "test");
- Incident inc_br ("test", IncidentType::BeginRun);
- dynamic_cast<IIncidentListener*>(&*field)->handle (inc_br);
+
+ StoreGateSvc *cs=nullptr;
+ assert (svcloc->service("StoreGateSvc/ConditionStore",cs).isSuccess());
+
+ SGTest::TestStore dumstore;
+ createNewtonTrkDistanceFinderCondData(dumstore);
ToolHandle<Trk::Trk2dDistanceSeeder> tool ("Trk::Trk2dDistanceSeeder");
assert( tool.retrieve().isSuccess() );
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py b/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
index adf8282a2dce6ea5340c261e3ff05cc478a45a88..c195fa4f553b988634d44331e2a5ab7a55fc8bf5 100755
--- a/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
@@ -1155,7 +1155,34 @@ class TrigCaloClusterMakerMTBase (TrigCaloClusterMakerMT):
# cltime = TrigTimeHistToolConfig("TrigCaloClusterMaker_Time")
-# self.AthenaMonTools = [ clvalidation, clonline, cltime, clcosmic]
+ # self.AthenaMonTools = [ clvalidation, clonline, cltime, clcosmic]
+
+ from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
+ monTool = GenericMonitoringTool('MonTool')
+
+ # Set range variables
+ maxNumberOfClusters=50.0;
+ maxProcTime=4500.0;
+ if ( "FS" in name ):
+ maxNumberOfClusters=1200.0;
+ maxProcTime=150000;
+
+ # Define histograms
+ monTool.defineHistogram('container_size', path='EXPERT', type='TH1F', title="Container Size; Number of Clusters; Number of Events", xbins=50, xmin=0.0, xmax=maxNumberOfClusters)
+ monTool.defineHistogram('TIME_execute', path='EXPERT', type='TH1F', title="Total Execution Time; Execution time [ us ] ; Number of runs", xbins=100, xmin=0.0, xmax=maxProcTime)
+ monTool.defineHistogram('TIME_ClustMaker', path='EXPERT', type='TH1F', title="Cluster Maker Time; Execution time [ us ] ; Number of runs", xbins=100, xmin=0.0, xmax=maxProcTime)
+ monTool.defineHistogram('TIME_ClustCorr', path='EXPERT', type='TH1F', title="Cluster Correction Time; Execution time [ us ] ; Number of runs", xbins=100, xmin=0.0, xmax=100)
+ monTool.defineHistogram('Et', path='EXPERT', type='TH1F', title="Cluster E_T; E_T [ MeV ] ; Number of Clusters", xbins=135, xmin=-200.0, xmax=2500.0)
+ monTool.defineHistogram('Eta', path='EXPERT', type='TH1F', title="Cluster #eta; #eta ; Number of Clusters", xbins=100, xmin=-2.5, xmax=2.5)
+ monTool.defineHistogram('Phi', path='EXPERT', type='TH1F', title="Cluster #phi; #phi ; Number of Clusters", xbins=64, xmin=-3.2, xmax=3.2)
+ monTool.defineHistogram('Eta,Phi', path='EXPERT', type='TH2F', title="Number of Clusters; #eta ; #phi ; Number of Clusters", xbins=100, xmin=-2.5, xmax=2.5, ybins=128, ymin=-3.2, ymax=3.2)
+ monTool.defineHistogram('clusterSize', path='EXPERT', type='TH1F', title="Cluster Type; Type ; Number of Clusters", xbins=13, xmin=0.5, xmax=13.5)
+ monTool.defineHistogram('signalState', path='EXPERT', type='TH1F', title="Signal State; Signal State ; Number of Clusters", xbins=4, xmin=-1.5, xmax=2.5)
+ monTool.defineHistogram('size', path='EXPERT', type='TH1F', title="Cluster Size; Size [Cells] ; Number of Clusters", xbins=125, xmin=0.0, xmax=250.0)
+ monTool.defineHistogram('N_BAD_CELLS', path='EXPERT', type='TH1F', title="N_BAD_CELLS; N_BAD_CELLS ; Number of Clusters", xbins=250, xmin=0.5, xmax=250.5)
+ monTool.defineHistogram('ENG_FRAC_MAX', path='EXPERT', type='TH1F', title="ENG_FRAC_MAX; ENG_FRAC_MAX ; Number of Clusters", xbins=50, xmin=0.0, xmax=1.1)
+
+ self.MonTool = monTool
class TrigCaloTowerMakerMT_eGamma (TrigCaloTowerMakerMTBase):
@@ -1741,4 +1768,3 @@ class HLTCaloCellMaker (_HLTCaloCellMaker):
self.monitorCells = monitorCells
-
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.cxx b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.cxx
index 6aa189516fcdb6406c5199cc99b16f5f70286995..a54bb550af541544408c908ac2a8827129fb83d3 100644
--- a/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/src/TrigCaloClusterMakerMT.cxx
@@ -126,10 +126,10 @@ StatusCode TrigCaloClusterMakerMT::execute()
auto time_clusMaker = Monitored::Timer("TIME_ClustMaker");
auto time_clusCorr = Monitored::Timer("TIME_ClustCorr");
+ // Start timer
+ time_tot.start();
-
-
- ATH_MSG_DEBUG("in TrigCaloClusterMakerMT::execute()" );
+ ATH_MSG_DEBUG("in TrigCaloClusterMakerMT::execute()" );
bool isSW=false;
@@ -159,7 +159,7 @@ StatusCode TrigCaloClusterMakerMT::execute()
auto mon_badCells = Monitored::Collection("N_BAD_CELLS",N_BAD_CELLS );
auto mon_engFrac = Monitored::Collection("ENG_FRAC_MAX",N_BAD_CELLS );
auto mon_size = Monitored::Collection("size",sizeVec );
- auto monitorIt = Monitored::Group( m_monTool, time_clusMaker, time_clusCorr, mon_container_size, mon_clusEt,
+ auto monitorIt = Monitored::Group( m_monTool, time_tot, time_clusMaker, time_clusCorr, mon_container_size, mon_clusEt,
mon_clusPhi, mon_clusEta, mon_clusSignalState, mon_clusSize,
mon_badCells, mon_engFrac, mon_size);
@@ -325,6 +325,9 @@ StatusCode TrigCaloClusterMakerMT::execute()
ATH_MSG_DEBUG(" REGTEST: Last Cluster phi = " << (pCaloClusterContainer->back())->phi() );
mon_container_size = pCaloClusterContainer->size(); // fill monitored variable
}
+
+ // Stop timer
+ time_tot.stop();
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py b/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py
index 19dfcf830c781caead43146a6a98557b57b88fe3..9fd21ca09ea62d811ecd55a3be7fc4478ca94324 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py
+++ b/Trigger/TrigAlgorithms/TrigMinBias/python/TrackCountMonitoringMT.py
@@ -1,7 +1,10 @@
+ # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
def TrackCountMonitoring():
-
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
monTool = GenericMonitoringTool('MonTool')
- monTool.defineHistogram('ntrks', path='EXPERT', type='TH1I', title='ntrks',xbins=100, xmin=-0, xmax=2000)
- monTool.defineHistogram('counts', path='EXPERT', type='TH1I', title='counts',xbins=50, xmin=-0.5, xmax=4.5)
+ monTool.defineHistogram('ntrks', path='EXPERT', type='TH1I', title='ntrks',xbins=100, xmin=-0.5, xmax=4999.5)
+ from TrigMinBias.TrigMinBiasConf import TrackCountHypoAlgMT
+ alg=TrackCountHypoAlgMT()
+ for i in range(len(alg.min_pt)):
+ monTool.defineHistogram('counts_minpTcut={}_maxZ0cut={}'.format(alg.min_pt[i],alg.max_z0[i]), path='EXPERT', type='TH1I', title='counts for min pT and max z0 cut',xbins=100, xmin=-0.5, xmax=4999.5)
return monTool
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.cxx b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.cxx
index 7a4a35ad9e5f165a65309c04a5711de00a757de1..171a55ba8dd8fa1418556f33dacb825607543dc5 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.cxx
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.cxx
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TrackCountHypoAlgMT.h"
@@ -35,10 +35,10 @@ StatusCode TrackCountHypoAlgMT::initialize()
ATH_MSG_ERROR("either track Key name or track count key name is undefined " );
return StatusCode::FAILURE;
}
- ATH_CHECK(m_hypoTools.retrieve());
- return StatusCode::SUCCESS;
+ ATH_CHECK(m_hypoTools.retrieve());
if (!m_monTool.empty()) ATH_CHECK(m_monTool.retrieve());
+
return StatusCode::SUCCESS;
}
@@ -66,20 +66,20 @@ StatusCode TrackCountHypoAlgMT::execute(const EventContext& context) const
const auto viewTrk = (previousDecisionsHandle->at(0))->objectLink<ViewContainer>( viewString() );
ATH_CHECK( viewTrk.isValid() );
auto tracksHandle = ViewHelper::makeHandle( *viewTrk, m_tracksKey, context );
- ATH_CHECK( tracksHandle.isValid() );//TODO: fix this data handle
+ ATH_CHECK( tracksHandle.isValid() );
ATH_MSG_DEBUG ( "spacepoint handle size: " << tracksHandle->size() << "..." );
int ntrks=tracksHandle->size();
ATH_MSG_DEBUG ("Successfully retrieved track container of size" <<ntrks);
-std::vector<int> counts(m_min_pt.size());
+ std::vector<int> counts(m_min_pt.size());
for (const auto trackPtr: *tracksHandle){
const Trk::Perigee& aMeasPer = trackPtr->perigeeParameters();
- const double pT = aMeasPer.pT();
- const double z0 = aMeasPer.parameters()[Trk::z0];
+ const double pT = aMeasPer.pT();
+ const double z0 = aMeasPer.parameters()[Trk::z0];
for (long unsigned int i=0;i<m_min_pt.size();i++){
- if(pT >= m_min_pt[i] && std::fabs(z0) < m_max_z0[i]) counts[i]++;
+ if(pT >= m_min_pt[i] && std::fabs(z0) < m_max_z0[i]) counts[i]++;
}
}
for (long unsigned int i=0;i<m_min_pt.size();i++){
@@ -98,16 +98,14 @@ std::vector<int> counts(m_min_pt.size());
trackCount->setDetail("z0cuts", static_cast<std::vector<float>>(m_max_z0));
trackCount->setDetail("counts", counts);
- // TODO revisit, this monitoring is not helpful at all
- /*
+ // TODO revisit
+
auto mon_ntrks = Monitored::Scalar<int>("ntrks",ntrks);
Monitored::Group(m_monTool,mon_ntrks);
- for(long unsigned int i=0;i<=m_min_pt.size();i++){
- auto mon_counts = Monitored::Scalar<int>("counts",count[i]);
- Monitored::Group(m_monTool,mon_counts);
- }
-
- */
+ for(long unsigned int i=0;i<counts.size();i++){
+ auto mon_counts = Monitored::Scalar<int>("counts"+std::to_string(i),counts[i]);
+ Monitored::Group(m_monTool,mon_counts);
+ }
SG::WriteHandle<DecisionContainer> outputHandle = createAndStore(decisionOutput(), context );
auto decisions = outputHandle.ptr();
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
index 5e697d71f727106a9561bb7f86ad91861427e361..3ee2812855c5fdf7763ff2209adf95835d28753a 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoAlgMT.h
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMINBIAS_TRACKCOUNTHYPOALGMT_H
#define TRIGMINBIAS_TRACKCOUNTHYPOALGMT_H
@@ -30,8 +30,8 @@ private:
ToolHandleArray< TrackCountHypoTool > m_hypoTools {this, "HypoTools", {},"Tools that perform actual selection"};
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_tracksKey{this,"tracksKey","Undefined",""};
SG::WriteHandleKey<xAOD::TrigCompositeContainer> m_trackCountKey{this,"trackCountKey","Undefined",""};
- Gaudi::Property<std::vector<float>> m_min_pt{this, "min_pt",{0.1,0.2,4.0}, "Accept events with momentum higher than this limit"};
- Gaudi::Property<std::vector<float>> m_max_z0{this, "max_z0",{100,200,300}, "Accept events with absolute value of vertex position lower \
+ Gaudi::Property<std::vector<float>> m_min_pt{this, "min_pt",{0.1,0.2,4.0,5.0}, "Accept events with momentum higher than this limit"};
+ Gaudi::Property<std::vector<float>> m_max_z0{this, "max_z0",{100,401,200,300}, "Accept events with absolute value of vertex position lower \
than this limit in mm; this vector has to be of the same size as min_pT vector, repetition of cut values are allowed if that makes the number of elements the same"};
ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool","","Monitoring tool"};
};
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx
index cc7d2f28256144f9af0b5112b5908e75b8120392..7b1616eb9278d5d0c668c3398bf40a6e04f26f5b 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.cxx
@@ -1,6 +1,6 @@
/*
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -35,13 +35,13 @@ StatusCode TrackCountHypoTool::decide( TrkCountsInfo& trkinfo ) const {
float countForConfiguredPtThreshold{};
bool found{false};
for ( size_t i = 0; i < counts.size(); ++i ) {
- if ( std::abs( pTcuts[i] - m_min_pt ) < 0.001 && std::abs( z0cuts[i] - m_max_z0 ) < 0.001 ) {
+ if ( std::abs( pTcuts[i] - m_min_pt ) < 0.001 && std::abs( z0cuts[i] - m_max_z0 ) < 0.001 ) {
found = true;
countForConfiguredPtThreshold = counts[i];
- }
+ }
}
if (!found ) {
- ATH_MSG_ERROR ("Unable to find tracks count for requested pT threshold " << m_min_pt << " need to fix hypo tool configuratio or add new threshold in tracks counting");
+ ATH_MSG_ERROR ("Unable to find tracks count for requested pT threshold " << m_min_pt << " need to fix hypo tool configuratio or add new threshold in tracks counting");
for ( size_t i = 0; i < counts.size(); ++i ) {
ATH_MSG_ERROR( "Count of tracks of pT above " << pTcuts[i] << " is available");
}
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
index 524a6c3bf53e1a0d3a8324f83aed09df2492b447..6fadfe9373bc09479cd2cd021f7b36d340c6636d 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
+++ b/Trigger/TrigAlgorithms/TrigMinBias/src/TrackCountHypoTool.h
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT2MINBIAS_TRACKCOUNTHYPOTOOL_H
#define TRIGT2MINBIAS_TRACKCOUNTHYPOTOOL_H
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
index ad5182cf4224ced8e7093034d0bef8e872563aae..3da6332aeadad56300da18f9aa33f9f78803e344 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasMonitoringMT.py
@@ -3,19 +3,19 @@ def SpCountMonitoring():
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
monTool = GenericMonitoringTool('MonTool')
- monTool.defineHistogram('totNumPixCL_1', path='EXPERT', type='TH1I', title='totNumPixCL_1',xbins=100, xmin=-0, xmax=2000)
- monTool.defineHistogram('totPixBeforeCuts', path='EXPERT', type='TH1I', title='totPixBeforeCuts', xbins = 250, xmin=-0.5, xmax=4999.5)
- monTool.defineHistogram('totNumPixCL_2', path='EXPERT', type='TH1I', title='totNumPixCL_2',xbins=100, xmin=-0, xmax=2000)
- monTool.defineHistogram('totNumPixCLmin3', path='EXPERT', type='TH1I', title='totNumPixCLmin3',xbins=100, xmin=-0, xmax=2000)
- monTool.defineHistogram('totNumPixSP', path='EXPERT', type='TH1I', title='totNumPixSP', xbins = 250, xmin=-0.5, xmax=4999.5)
- monTool.defineHistogram('pixClBarrel', path='EXPERT', type='TH1I', title='pixClBarrel', xbins = 200, xmin=-0.5, xmax=1999.5)
- monTool.defineHistogram('pixClEndcapA', path='EXPERT', type='TH1I', title='pixClEndcapA', xbins = 200, xmin=-0.5, xmax=1999.5)
- monTool.defineHistogram('pixClEndcapC', path='EXPERT', type='TH1I', title='pixClEndcapC', xbins = 200, xmin=-0.5, xmax=1999.5)
- monTool.defineHistogram('totNumSctSP', path='EXPERT', type='TH1I', title='totNumSctSP', xbins = 250, xmin=-0.5, xmax=4999.5)
- monTool.defineHistogram('SctSpEndcapC', path='EXPERT', type='TH1I', title='SctSpEndcapC', xbins = 200, xmin=-0.5, xmax=1999.5)
- monTool.defineHistogram('SctSpBarrel', path='EXPERT', type='TH1I', title='SctSpBarrel', xbins = 200, xmin=-0.5, xmax=1999.5)
- monTool.defineHistogram('SctSpEndcapA', path='EXPERT', type='TH1I', title='SctSpEndcapA', xbins = 200, xmin=-0.5, xmax=1999.5)
- monTool.defineHistogram('totNumPixSP, totNumSctSP', path='EXPERT', type='TH2I', title='SP ; pix SP after ToT cut; sct SP', xbins = 50, xmin=-0.5, xmax=49.5, ybins = 50, ymin=-0.5, ymax=49.5)
+ monTool.defineHistogram('totNumPixCL_1', path='EXPERT', type='TH1I', title='totNumPixCL_1',xbins=100, xmin=-0, xmax=60999.5)
+ monTool.defineHistogram('totPixBeforeCuts', path='EXPERT', type='TH1I', title='totPixBeforeCuts', xbins = 250, xmin=-0.5, xmax=6999.5)
+ monTool.defineHistogram('totNumPixCL_2', path='EXPERT', type='TH1I', title='totNumPixCL_2',xbins=100, xmin=-0, xmax=60999.5)
+ monTool.defineHistogram('totNumPixCLmin3', path='EXPERT', type='TH1I', title='totNumPixCLmin3',xbins=100, xmin=-0, xmax=60999.5)
+ monTool.defineHistogram('totNumPixSP', path='EXPERT', type='TH1I', title='totNumPixSP', xbins = 500, xmin=-0.5, xmax=60999.5)
+ monTool.defineHistogram('pixClBarrel', path='EXPERT', type='TH1I', title='pixClBarrel', xbins = 500, xmin=-0.5, xmax=60999.5)
+ monTool.defineHistogram('pixClEndcapA', path='EXPERT', type='TH1I', title='pixClEndcapA', xbins = 500, xmin=-0.5, xmax=60999.5)
+ monTool.defineHistogram('pixClEndcapC', path='EXPERT', type='TH1I', title='pixClEndcapC', xbins = 500, xmin=-0.5, xmax=60999.5)
+ monTool.defineHistogram('totNumSctSP', path='EXPERT', type='TH1I', title='totNumSctSP', xbins = 500, xmin=-0.5, xmax=60999.5)
+ monTool.defineHistogram('SctSpEndcapC', path='EXPERT', type='TH1I', title='SctSpEndcapC', xbins = 500, xmin=-0.5, xmax=60999.5)
+ monTool.defineHistogram('SctSpBarrel', path='EXPERT', type='TH1I', title='SctSpBarrel', xbins = 500, xmin=-0.5, xmax=60999.5)
+ monTool.defineHistogram('SctSpEndcapA', path='EXPERT', type='TH1I', title='SctSpEndcapA', xbins = 500, xmin=-0.5, xmax=60999.5)
+ monTool.defineHistogram('totNumPixSP, totNumSctSP', path='EXPERT', type='TH2I', title='SP ; pix SP after ToT cut; sct SP', xbins = 500, xmin=-0.5, xmax=60999.5, ybins = 500, ymin=-0.5, ymax=60999.5)
return monTool
@@ -23,8 +23,8 @@ def MbtsFexMTMonitoring():
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
monTool = GenericMonitoringTool('MonTool')
- monTool.defineHistogram('triggerEnergies', path='EXPERT', type='TH1D', title='triggerEnergies',xbins=100, xmin=-0, xmax=2000)
+ monTool.defineHistogram('triggerEnergies', path='EXPERT', type='TH1D', title='triggerEnergies',xbins=100, xmin=-0, xmax=60999.5)
monTool.defineHistogram('triggerEta', path='EXPERT', type='TH1D', title='triggerEta', xbins = 250, xmin=-5, xmax=5)
monTool.defineHistogram('triggerPhi', path='EXPERT', type='TH1I', title='triggerPhi',xbins=100, xmin=-3.2, xmax=3.2)
- monTool.defineHistogram('triggerTimes', path='EXPERT', type='TH1I', title='triggerTimes',xbins=100, xmin=-0, xmax=2000)
+ monTool.defineHistogram('triggerTimes', path='EXPERT', type='TH1I', title='triggerTimes',xbins=100, xmin=-0, xmax=60999.5)
return monTool
diff --git a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThresholdBase.icc b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThresholdBase.icc
index 8fd3b09e641c40f170d561098ab183bac83c6a63..324b3f068eb9ae1ac693ec02bbc26b18add66b5d 100644
--- a/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThresholdBase.icc
+++ b/Trigger/TrigConfiguration/TrigConfData/TrigConfData/L1ThresholdBase.icc
@@ -26,6 +26,14 @@ namespace TrigConf {
template<class T>
void ValueWithEtaDependence<T>::addRangeValue(const T & value, int etaMin, int etaMax, unsigned int priority, bool symmetric) {
RangeValue rv = { value, etaMin, etaMax, priority, symmetric };
+ for( const auto & rv : m_rangeValues ) {
+ if( rv.priority != priority )
+ continue;
+ if( (etaMax >= rv.etaMin) and (etaMin <= rv.etaMax) ) { // overlaps with existing range of the same priority
+ throw std::runtime_error( "Range eta " + std::to_string(etaMin) + " - " + std::to_string(etaMax) +
+ " (priority " + std::to_string(priority) + ") overlaps with existing range of the same priority");
+ }
+ }
m_rangeValues.emplace_back( std::move(rv) );
}
diff --git a/Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx b/Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx
index 0cfcb613e3136f9d644414289882582f384c26a3..ef7f82139c65c6d60deac876ffde2fadf1f0adb3 100644
--- a/Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx
+++ b/Trigger/TrigConfiguration/TrigConfData/src/L1ThresholdBase.cxx
@@ -40,15 +40,22 @@ TrigConf::L1Threshold::update()
m_thrValue = getAttribute<unsigned int>("value", true, 0);
m_input = getAttribute("input", true, "");
m_mapping = getAttribute<unsigned int>("mapping");
- if( const auto & thrVs = data().get_child_optional("thrValues") ) {
- for( auto & x : thrVs.get() ) {
- auto value = x.second.get_child("value").get_value<unsigned int>();
- auto etamin = x.second.get_child("etamin").get_value<unsigned int>();
- auto etamax = x.second.get_child("etamax").get_value<unsigned int>();
- auto priority = x.second.get_child("priority").get_value<unsigned int>();
- m_etaDepThrValue.addRangeValue(value, etamin, etamax, priority, /*symmetric=*/ false);
+ try {
+ if( const auto & thrVs = data().get_child_optional("thrValues") ) {
+ for( auto & x : thrVs.get() ) {
+ auto value = x.second.get_child("value").get_value<unsigned int>();
+ auto etamin = x.second.get_child("etamin").get_value<int>();
+ auto etamax = x.second.get_child("etamax").get_value<int>();
+ auto priority = x.second.get_child("priority").get_value<unsigned int>();
+ m_etaDepThrValue.addRangeValue(value, etamin, etamax, priority, /*symmetric=*/ false);
+ }
}
}
+ catch(std::exception & ex) {
+ std::cerr << "Caught exception when reading threshold values for threshold " << m_name << std::endl
+ << ex.what() << std::endl;
+ throw;
+ }
}
unsigned int
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/CMakeLists.txt b/Trigger/TrigConfiguration/TrigConfxAOD/CMakeLists.txt
index 8322c4c145169f35b3dccb565b8173ab0fb13329..0d10a8bf78ffdc3585d2c67639c0591957d1c265 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/CMakeLists.txt
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/CMakeLists.txt
@@ -34,7 +34,7 @@ find_package( ROOT COMPONENTS Core RIO )
atlas_add_library( TrigConfxAODLib
TrigConfxAOD/*.h Root/*.cxx
PUBLIC_HEADERS TrigConfxAOD
- LINK_LIBRARIES AsgTools xAODTrigger TrigConfL1Data TrigConfHLTData TrigConfData
+ LINK_LIBRARIES AsgTools xAODTrigger TrigConfL1Data TrigConfHLTData
TrigConfInterfaces )
if( NOT XAOD_STANDALONE )
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/test/ut_trigconfxaod_xaodconfigtool_test.py b/Trigger/TrigConfiguration/TrigConfxAOD/test/ut_trigconfxaod_xaodconfigtool_test.py
index 823994815bf5a88b9431c9f5c9b699d170f6ed56..a6f6926eff2e2de8970a51d4d3f87c4b3a9f9fdd 100755
--- a/Trigger/TrigConfiguration/TrigConfxAOD/test/ut_trigconfxaod_xaodconfigtool_test.py
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/test/ut_trigconfxaod_xaodconfigtool_test.py
@@ -12,7 +12,9 @@ def main():
# Set up the environment:
import ROOT
- ROOT.gROOT.Macro( "$ROOTCOREDIR/scripts/load_packages.C" )
+ if not ROOT.xAOD.Init( "trig_test" ).isSuccess():
+ print ( "Failed to call xAOD::Init(...)" )
+ return 1
# Open an input file for reading:
FNAME = "/afs/cern.ch/atlas/project/PAT/xAODs/r5787/" \
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetOnlineMonitoringMTConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetOnlineMonitoringMTConfig.py
new file mode 100755
index 0000000000000000000000000000000000000000..aaf07016c0eb9a00c03b9a438edc453f40e99a16
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetOnlineMonitoringMTConfig.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
+
+class TrigBjetOnlineMonitoring(GenericMonitoringTool):
+ def __init__ (self, name="TrigBjetOnlineMonitoring"):
+ super(TrigBjetOnlineMonitoring, self).__init__(name)
+ self.name = "TrigBjetOnlineMonitoring"
+ self.HistPath = self.name
+ default_bin_count = 20
+
+ # Event Histograms
+ self.defineHistogram('track_count', path='EXPERT', type='TH1F', title="Number of Tracks", xbins = 50, xmin=0, xmax=50)
+ self.defineHistogram('jet_count', path='EXPERT', type='TH1F', title="Number of Jets", xbins = 20, xmin=0, xmax=20)
+ self.defineHistogram('vertex_count', path='EXPERT', type='TH1F', title="Number of Vertices", xbins = 50, xmin=0, xmax=50)
+
+ ## Track Histograms
+ self.defineHistogram('track_Et', path='EXPERT', type='TH1F', title="Track Transverse Energy", xbins = default_bin_count, xmin=0, xmax=800000)
+ self.defineHistogram('track_eta', path='EXPERT', type='TH1F', title="Track Eta", xbins = default_bin_count, xmin=-5, xmax=5)
+ self.defineHistogram('track_phi', path='EXPERT', type='TH1F', title="Track Phi", xbins = default_bin_count, xmin=-4, xmax=4)
+ self.defineHistogram('track_eta,track_phi', path='EXPERT', type='TH2F', title="Track Eta vs Phi",
+ xbins = default_bin_count, xmin=-5, xmax=5, ybins = default_bin_count, ymin=-4, ymax=4)
+ self.defineHistogram('track_d0', path='EXPERT', type='TH1F', title="Track D0", xbins = default_bin_count, xmin=0, xmax=10)
+ self.defineHistogram('track_d0err', path='EXPERT', type='TH1F', title="Track D0 Error", xbins = default_bin_count, xmin=0, xmax=10)
+ self.defineHistogram('track_d0sig', path='EXPERT', type='TH1F', title="Track D0 Significance", xbins = default_bin_count, xmin=0, xmax=1000)
+ self.defineHistogram('track_z0', path='EXPERT', type='TH1F', title="Track Z0", xbins = default_bin_count, xmin=0, xmax=100)
+ self.defineHistogram('track_z0err', path='EXPERT', type='TH1F', title="Track Z0 Error", xbins = default_bin_count, xmin=0, xmax=10)
+ self.defineHistogram('track_z0sig', path='EXPERT', type='TH1F', title="Track Z0 Significance", xbins = default_bin_count, xmin=0, xmax=10000)
+
+ # Jet Histograms
+ self.defineHistogram('jet_pt', path='EXPERT', type='TH1F', title="Jet PT", xbins = default_bin_count, xmin=0, xmax=800000)
+ self.defineHistogram('jet_eta', path='EXPERT', type='TH1F', title="Jet Eta", xbins = default_bin_count, xmin=-5, xmax=5)
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexMTConfig.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexMTConfig.py
deleted file mode 100755
index 4ffff5512a5d2c709376d25e8c5524d6492e3697..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBtagFexMTConfig.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-from TrigBjetHypo.TrigBjetHypoConf import TrigBtagFexMT
-
-from AthenaCommon.Logging import logging
-
-from AthenaCommon.AppMgr import ToolSvc
-from BTagging.BTaggingFlags import BTaggingFlags
-from BTagging.BTaggingConfiguration import getConfiguration
-
-#from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
-from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
-
-BTagConfig = getConfiguration("Trig")
-BTagConfig.PrefixxAODBaseName(False)
-BTagConfig.PrefixVertexFinderxAODBaseName(False)
-BTagConfigSetupStatus = BTagConfig.setupJetBTaggerTool(ToolSvc, "AntiKt4EMTopo", SetupScheme="Trig", TaggerList=BTaggingFlags.TriggerTaggers)
-
-
-def getBtagFexInstance( instance, version, algo ):
- if instance=="EF" :
- return BtagFex( instance=instance, version=version, algo=algo, name="EFBtagFex_"+algo )
-
-def getBtagFexSplitInstance( instance, version, algo):
- return BtagFexSplit( instance=instance, version=version, algo=algo, name=instance+"BtagFexSplit_"+algo )
-
-
-class TrigBtagFexMT_OnlineMonitoring(GenericMonitoringTool):
- def __init__ (self, name="TrigBtagFexMT_OnlineMonitoring"):
- super(TrigBtagFexMT_OnlineMonitoring, self).__init__(name)
- self.name = "TrigBtagFexMT_OnlineMonitoring"
- self.HistPath = self.name
- default_bin_count = 20
- #self.defineTarget("Online")
-
- # Event Histograms
- self.defineHistogram('jet_count', path='EXPERT', type='TH1F', title="BtagFexMT Number of Jets", xbins = 20, xmin=0, xmax=20)
- self.defineHistogram('track_count', path='EXPERT', type='TH1F', title="BtagFexMT Number of Tracks", xbins = 50, xmin=0, xmax=50)
- self.defineHistogram('vertex_count', path='EXPERT', type='TH1F', title="BtagFexMT Number of Vertices", xbins = 50, xmin=0, xmax=50)
-
- # Jet Histograms
- self.defineHistogram('jet_pt', path='EXPERT', type='TH1F', title="BtagFexMT Jet PT", xbins = default_bin_count, xmin=0, xmax=800000)
- self.defineHistogram('jet_eta', path='EXPERT', type='TH1F', title="BtagFexMT Jet Eta", xbins = default_bin_count, xmin=-5, xmax=5)
-
- # Track Histograms
- self.defineHistogram('track_Et', path='EXPERT', type='TH1F', title="BtagFexMT Track Transverse Energy", xbins = default_bin_count, xmin=0, xmax=800000)
- self.defineHistogram('track_eta', path='EXPERT', type='TH1F', title="BtagFexMT Track Eta", xbins = default_bin_count, xmin=-5, xmax=5)
- self.defineHistogram('track_phi', path='EXPERT', type='TH1F', title="BtagFexMT Track Phi", xbins = default_bin_count, xmin=-4, xmax=4)
- self.defineHistogram('track_eta,track_phi', path='EXPERT', type='TH2F', title="BtagFexMT Track Eta vs Phi",
- xbins = default_bin_count, xmin=-5, xmax=5, ybins = default_bin_count, ymin=-4, ymax=4)
- self.defineHistogram('track_d0', path='EXPERT', type='TH1F', title="BtagFexMT Track D0", xbins = default_bin_count, xmin=0, xmax=10)
- self.defineHistogram('track_d0err', path='EXPERT', type='TH1F', title="BtagFexMT Track D0 Error", xbins = default_bin_count, xmin=0, xmax=10)
- self.defineHistogram('track_d0sig', path='EXPERT', type='TH1F', title="BtagFexMT Track D0 Significance", xbins = default_bin_count, xmin=0, xmax=1000)
- self.defineHistogram('track_z0', path='EXPERT', type='TH1F', title="BtagFexMT Track Z0", xbins = default_bin_count, xmin=0, xmax=100)
- self.defineHistogram('track_z0err', path='EXPERT', type='TH1F', title="BtagFexMT Track Z0 Error", xbins = default_bin_count, xmin=0, xmax=10)
- self.defineHistogram('track_z0sig', path='EXPERT', type='TH1F', title="BtagFexMT Track Z0 Significance", xbins = default_bin_count, xmin=0, xmax=10000)
-
-
-class BtagFex (TrigBtagFexMT):
- __slots__ = []
-
- def __init__(self, instance, version, algo, name):
- super( BtagFex, self ).__init__( name )
-
- mlog = logging.getLogger('BtagHypoConfig.py')
-
- AllowedInstances = ["EF"]
- AllowedVersions = ["2012"]
-
- if instance not in AllowedInstances :
- mlog.error("Instance "+instance+" is not supported!")
- return None
-
- if version not in AllowedVersions :
- mlog.error("Version "+version+" is not supported!")
- return None
-
- self.JetKey = "GSCJets"
- self.PriVtxKey = "EFHistoPrmVtx"
-
-# self.TrackKey = "InDetTrigTrackingxAODCnv_Bjet_EFID"
-
-# # IMPORT OFFLINE TOOLS
-# self.setupOfflineTools = True
-# if self.setupOfflineTools :
-# if BTagConfigSetupStatus == None :
-# self.setupOfflineTools = False
-# else :
-# self.BTagTrackAssocTool = BTagConfig.getJetCollectionMainAssociatorTool("AntiKt4EMTopo")
-# self.BTagTool = BTagConfig.getJetCollectionTool("AntiKt4EMTopo")
-# self.BTagSecVertexing = BTagConfig.getJetCollectionSecVertexingTool("AntiKt4EMTopo")
-# self.TaggerBaseNames = BTagConfig.getJetCollectionSecVertexingToolAttribute("SecVtxFinderxAODBaseNameList", "AntiKt4EMTopo")
-
-
-###########################################
-# For split configuration
-###########################################
-
-class BtagFexSplit (TrigBtagFexMT):
- __slots__ = []
-
- def __init__(self, instance, version, algo, name):
- super( BtagFexSplit, self ).__init__( name )
-
- mlog = logging.getLogger('BtagHypoConfig.py')
-
- AllowedInstances = ["EF", "MuJetChain"]
- AllowedVersions = ["2012"]
-
- if instance not in AllowedInstances :
- mlog.error("Instance "+instance+" is not supported!")
- return None
-
- if version not in AllowedVersions :
- mlog.error("Version "+version+" is not supported!")
- return None
-
- self.JetKey = "GSCJets"
- self.PriVtxKey = "EFHistoPrmVtx"
-# self.UsePriVtxKeyBackup = True
-# self.PriVtxKeyBackup = "EFHistoPrmVtx"
-# self.TrackKey = "InDetTrigTrackingxAODCnv_Bjet_IDTrig"
-
-# # IMPORT OFFLINE TOOLS
-# self.setupOfflineTools = True
-# if self.setupOfflineTools :
-# if BTagConfigSetupStatus == None :
-# self.setupOfflineTools = False
-# else :
-# self.BTagTrackAssocTool = BTagConfig.getJetCollectionMainAssociatorTool("AntiKt4EMTopo")
-# self.BTagTool = BTagConfig.getJetCollectionTool("AntiKt4EMTopo")
-# self.BTagSecVertexing = BTagConfig.getJetCollectionSecVertexingTool("AntiKt4EMTopo")
-# self.TaggerBaseNames = BTagConfig.getJetCollectionSecVertexingToolAttribute("SecVtxFinderxAODBaseNameList", "AntiKt4EMTopo")
-
-
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx
index 949208b57d90861b7936ba3ce737adee1a6e0691..b73302c992b6aff013eac87d9a33e163402919b1 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigBjetBtagHypoAlgMT.h"
@@ -15,22 +15,28 @@ StatusCode TrigBjetBtagHypoAlgMT::initialize() {
ATH_MSG_DEBUG( "declareProperty review:" );
ATH_MSG_DEBUG( " " << m_bTagKey );
ATH_MSG_DEBUG( " " << m_trackKey );
+ ATH_MSG_DEBUG( " " << m_inputPrmVtx );
+ ATH_MSG_DEBUG( " " << m_prmVtxLink );
- // ATH_MSG_DEBUG( " " << m_trackLink );
ATH_CHECK( m_hypoTools.retrieve() );
CHECK( m_bTagKey.initialize() );
CHECK( m_trackKey.initialize() );
+ CHECK( m_inputPrmVtx.initialize() );
renounce( m_bTagKey );
renounce( m_trackKey );
+ renounce( m_inputPrmVtx );
renounce( m_bTagKey );
+ if (!m_monTool.empty()) CHECK(m_monTool.retrieve());
+
return StatusCode::SUCCESS;
}
+
StatusCode TrigBjetBtagHypoAlgMT::execute( const EventContext& context ) const {
ATH_MSG_DEBUG ( "Executing " << name() << "..." );
@@ -51,12 +57,44 @@ StatusCode TrigBjetBtagHypoAlgMT::execute( const EventContext& context ) const {
ElementLinkVector< xAOD::TrackParticleContainer > trackELs;
CHECK( retrieveObjectFromEventView( context,trackELs,m_trackKey,prevDecisionContainer ) );
ATH_MSG_DEBUG( "Retrieved " << trackELs.size() << " precision tracks..." );
+ auto monitor_for_track_count = Monitored::Scalar( "track_count", trackELs.size() );
+ CHECK( monitor_tracks(trackELs) );
for ( const ElementLink< xAOD::TrackParticleContainer >& trackLink : trackELs )
ATH_MSG_DEBUG( " * pt=" << (*trackLink)->p4().Et() <<
" eta=" << (*trackLink)->eta() <<
" phi=" << (*trackLink)->phi() );
+
+ // Retrieve Jets
+ ElementLinkVector< xAOD::JetContainer > jetELs;
+ for ( const TrigCompositeUtils::Decision* previousDecision: *prevDecisionContainer ) {
+ const std::vector< TrigCompositeUtils::LinkInfo<xAOD::JetContainer> > jetLinks =
+ TrigCompositeUtils::findLinks< xAOD::JetContainer >( previousDecision, TrigCompositeUtils::featureString(), TrigDefs::lastFeatureOfType);
+
+ for ( size_t linkIndex = 0; linkIndex < jetLinks.size(); linkIndex++ ) {
+ ATH_CHECK( jetLinks.at(linkIndex).isValid() );
+ jetELs.push_back( jetLinks.at(linkIndex).link );
+ }
+ }
+ ATH_MSG_DEBUG( "Retrieved " << jetELs.size() << " Jets of key " << TrigCompositeUtils::featureString() );
+ auto monitor_for_jet_pt = Monitored::Collection( "jet_pt", jetELs,
+ [](const ElementLink< xAOD::JetContainer >& jetLink) { return (*jetLink)->pt(); } );
+ auto monitor_for_jet_eta = Monitored::Collection( "jet_eta", jetELs,
+ [](const ElementLink< xAOD::JetContainer >& jetLink) { return (*jetLink)->eta(); } );
+ auto monitor_for_jet_count = Monitored::Scalar( "jet_count", jetELs.size() );
+ auto monitor_group_for_jets = Monitored::Group( m_monTool, monitor_for_jet_pt, monitor_for_jet_eta );
+
+
+ // Retrieve Vertices
+ ElementLinkVector< xAOD::VertexContainer > vertexELs;
+ CHECK( retrieveObjectFromStoreGate( context,vertexELs,m_inputPrmVtx ) );
+ ATH_MSG_DEBUG( "Retrieved " << vertexELs.size() <<" vertices..." );
+ auto monitor_for_vertex_count = Monitored::Scalar( "vertex_count", vertexELs.size() );
+
+ auto monitor_group_for_events = Monitored::Group( m_monTool, monitor_for_track_count, monitor_for_jet_count, monitor_for_vertex_count );
+
+
// ==========================================================================================================================
// ** Prepare Outputs
// ==========================================================================================================================
@@ -130,9 +168,60 @@ StatusCode TrigBjetBtagHypoAlgMT::execute( const EventContext& context ) const {
return StatusCode::SUCCESS;
}
+
StatusCode TrigBjetBtagHypoAlgMT::attachLinksToDecision( const EventContext&,
TrigCompositeUtils::Decision&,
int, int ) const {
return StatusCode::SUCCESS;
}
+
+
+StatusCode TrigBjetBtagHypoAlgMT::monitor_tracks(
+ const ElementLinkVector< xAOD::TrackParticleContainer >& trackELs ) const {
+
+ auto monitor_for_track_Et = Monitored::Collection( "track_Et", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) { return (*trackLink)->p4().Et(); } );
+ auto monitor_for_track_eta = Monitored::Collection( "track_eta", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) { return (*trackLink)->eta(); } );
+ auto monitor_for_track_phi = Monitored::Collection( "track_phi", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) { return (*trackLink)->phi(); } );
+
+ // Monitors for d0 and z0 track impact parameter variables
+ auto monitor_for_track_d0 = Monitored::Collection( "track_d0", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) { return (*trackLink)->d0(); } );
+
+ auto monitor_for_track_d0err = Monitored::Collection( "track_d0err", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) {
+ return (*trackLink)->definingParametersCovMatrix()( Trk::d0, Trk::d0 );
+ } );
+
+ auto monitor_for_track_d0sig = Monitored::Collection( "track_d0sig", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) {
+ return (*trackLink)->d0() / (*trackLink)->definingParametersCovMatrix()( Trk::d0, Trk::d0 );
+ } );
+
+ auto monitor_for_track_z0 = Monitored::Collection( "track_z0", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) { return (*trackLink)->z0(); } );
+
+ auto monitor_for_track_z0err = Monitored::Collection( "track_z0err", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) {
+ return (*trackLink)->definingParametersCovMatrix()( Trk::z0, Trk::z0 );
+ } );
+
+ auto monitor_for_track_z0sig = Monitored::Collection( "track_z0sig", trackELs,
+ [](const ElementLink< xAOD::TrackParticleContainer >& trackLink) {
+ return (*trackLink)->z0() / (*trackLink)->definingParametersCovMatrix()( Trk::z0, Trk::z0 );
+ } );
+
+ auto monitor_group_for_tracks = Monitored::Group( m_monTool,
+ monitor_for_track_Et, monitor_for_track_eta, monitor_for_track_phi,
+ monitor_for_track_d0, monitor_for_track_d0err, monitor_for_track_d0sig,
+ monitor_for_track_z0, monitor_for_track_z0err, monitor_for_track_z0sig
+ );
+
+ return StatusCode::SUCCESS;
+}
+
+
+
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h
index b756c8935539888d1682ba3262367c787e4e836b..ff3b90a179dab717a005aa54139a6e16d5726785 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetBtagHypoAlgMT.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGBJETHYPO_TRIGBJETBTAGHYPOALGMT_H
@@ -20,6 +20,9 @@
#include "xAODBTagging/BTaggingAuxContainer.h"
#include "xAODBTagging/BTaggingContainer.h"
+#include "AthenaMonitoringKernel/Monitored.h"
+#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+
class TrigBjetBtagHypoAlgMT : public TrigBjetHypoAlgBaseMT {
public:
TrigBjetBtagHypoAlgMT( const std::string& name, ISvcLocator* pSvcLocator );
@@ -34,6 +37,9 @@ class TrigBjetBtagHypoAlgMT : public TrigBjetHypoAlgBaseMT {
TrigCompositeUtils::Decision&,
int index,
int indexPrmVertex = 0 ) const;
+ virtual StatusCode monitor_tracks( const ElementLinkVector< xAOD::TrackParticleContainer >& trackELs ) const;
+
+ ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool","","Monitoring tool"};
private:
ToolHandleArray< TrigBjetBtagHypoTool > m_hypoTools {this,"HypoTools",{},"Hypo Tools"};
@@ -42,6 +48,8 @@ class TrigBjetBtagHypoAlgMT : public TrigBjetHypoAlgBaseMT {
SG::ReadHandleKey< xAOD::BTaggingContainer> m_bTagKey {this,"BTagging","Undefined","Key for BTagging"};
SG::ReadHandleKey< xAOD::TrackParticleContainer > m_trackKey {this,"Tracks","Undefined","Key for precision tracks, to be linked to output decision"};
+ Gaudi::Property< std::string > m_prmVtxLink {this,"PrmVtxLink","Undefined","PrmVtx link to attach to the output decision"};
+ SG::ReadHandleKey< xAOD::VertexContainer > m_inputPrmVtx {this,"PrmVtx","Undefined","Primary vertex to be linked to the output decision"};
};
#endif
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.cxx
index 793fb7461122c9054b298bd36ec674689333701c..31744b421e63f8c2ed7326b7f18c068330ec7678 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.cxx
@@ -39,8 +39,6 @@
#include "BTagging/BTagSecVertexing.h"
#include "BTagging/BTagTool.h"
-#include "StoreGate/ReadDecorHandle.h"
-#include "AthenaMonitoringKernel/Monitored.h"
// -----------------------------------------------------------------------------------------------------------------
@@ -108,16 +106,10 @@ StatusCode TrigBtagFexMT::execute() {
CHECK( jetContainerHandle.isValid() );
const xAOD::JetContainer *jetContainer = jetContainerHandle.get();
ATH_MSG_DEBUG( "Retrieved " << jetContainer->size() << " jets" );
- auto monitor_for_jet_count = Monitored::Scalar( "jet_count", jetContainer->size() );
-
- //auto monitor_for_jet_pt = Monitored::Collection( "jet_pt", *jetContainer, []( const xAOD::Jet *jet ) { return jet->pt(); } );
- auto monitor_for_jet_pt = Monitored::Collection( "jet_pt", *jetContainer, &xAOD::Jet::pt );
- auto monitor_for_jet_eta = Monitored::Collection( "jet_eta", *jetContainer, &xAOD::Jet::eta );
for ( const xAOD::Jet* jet : *jetContainer ) {
ATH_MSG_DEBUG( " BTAGFEX: ** pt=" << jet->pt() << " eta=" << jet->eta() << " phi=" << jet->phi() );
}
- auto monitor_group_for_jets = Monitored::Group( m_monTool, monitor_for_jet_pt, monitor_for_jet_eta );
// Test retrieval of Track Particles
@@ -188,8 +180,6 @@ StatusCode TrigBtagFexMT::execute() {
CHECK( vxContainerHandle.isValid() );
const xAOD::VertexContainer* vxContainer = vxContainerHandle.get();
ATH_MSG_DEBUG( "Retrieved " << vxContainer->size() <<" vertices..." );
- auto monitor_for_vertex_count = Monitored::Scalar( "vertex_count", vxContainer->size() );
-
for ( const xAOD::Vertex *pv : *vxContainer ) {
ATH_MSG_DEBUG( " ** PV x=" << pv->x()<< " y=" << pv->y() << " z=" << pv->z() );
}
@@ -202,40 +192,15 @@ StatusCode TrigBtagFexMT::execute() {
ATH_MSG_DEBUG( "Exiting with " << btaggingContainer->size() <<" btagging objects" );
- //Monitoring
- auto monitor_for_track_count = Monitored::Scalar( "track_count", trkContainer->size() );
-
- auto monitor_for_track_Et = Monitored::Collection( "track_Et", *trkContainer, []( const xAOD::TrackParticle *trk ) { return trk->p4().Et(); } );
- auto monitor_for_track_eta = Monitored::Collection( "track_eta", *trkContainer, &xAOD::TrackParticle::eta );
- auto monitor_for_track_phi = Monitored::Collection( "track_phi", *trkContainer, &xAOD::TrackParticle::phi );
-
- // Monitors for d0 and z0 track impact parameter variables
- auto monitor_for_track_d0 = Monitored::Collection( "track_d0", *trkContainer, &xAOD::TrackParticle::d0 );
- auto monitor_for_track_d0err = Monitored::Collection( "track_d0err", *trkContainer, []( const xAOD::TrackParticle *trk ) {
- return trk->definingParametersCovMatrix()( Trk::d0, Trk::d0 );
- } );
- auto monitor_for_track_d0sig = Monitored::Collection( "track_d0sig", *trkContainer, []( const xAOD::TrackParticle *trk ) {
- return trk->d0() / trk->definingParametersCovMatrix()( Trk::d0, Trk::d0 );
- } );
-
- auto monitor_for_track_z0 = Monitored::Collection( "track_z0", *trkContainer, &xAOD::TrackParticle::z0 );
- auto monitor_for_track_z0err = Monitored::Collection( "track_z0err", *trkContainer, []( const xAOD::TrackParticle *trk ) {
- return trk->definingParametersCovMatrix()( Trk::z0, Trk::z0 );
- } );
- auto monitor_for_track_z0sig = Monitored::Collection( "track_z0sig", *trkContainer, []( const xAOD::TrackParticle *trk ) {
- return trk->z0() / trk->definingParametersCovMatrix()( Trk::z0, Trk::z0 );
- } );
-
- for ( const xAOD::TrackParticle *trk : *trkContainer ) {
- ATH_MSG_DEBUG( " *** pt=" << trk->p4().Et() * 1e-3 << " eta=" << trk->eta() << " phi=" << trk->phi() );
- }
- auto monitor_group_for_tracks = Monitored::Group( m_monTool,
- monitor_for_track_Et, monitor_for_track_eta, monitor_for_track_phi,
- monitor_for_track_d0, monitor_for_track_d0err, monitor_for_track_d0sig,
- monitor_for_track_z0, monitor_for_track_z0err, monitor_for_track_z0sig
- );
+ // Creating dummy B-Tagging container in order to avoid
+ // warnings from the SGInputLoader
+ std::unique_ptr< xAOD::BTaggingContainer > outputBtagging = std::make_unique< xAOD::BTaggingContainer >();
+ std::unique_ptr< xAOD::BTaggingAuxContainer > outputBtaggingAux = std::make_unique< xAOD::BTaggingAuxContainer >();
+ outputBtagging->setStore( outputBtaggingAux.get() );
- auto monitor_group_for_events = Monitored::Group( m_monTool, monitor_for_jet_count, monitor_for_track_count, monitor_for_vertex_count );
+ SG::WriteHandle< xAOD::BTaggingContainer > btaggingHandle = SG::makeHandle( m_outputBTaggingContainerKey,ctx );
+ CHECK( btaggingHandle.record( std::move( outputBtagging ),std::move( outputBtaggingAux ) ) );
+ ATH_MSG_DEBUG( "Exiting with " << btaggingHandle->size() << " btagging objects" );
return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.h b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.h
index bde74b952b9853f2d91e0c5c0f4e3e7adb479b6b..246cb5af5e90a6ab175cbd3fd32ff9463c00ca66 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.h
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBtagFexMT.h
@@ -30,7 +30,6 @@
#include "TrigTrackJetFinderTool/ITrigTrackJetFinderTool.h"
#include "VxSecVertex/VxSecVertexInfo.h"
-#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
namespace Analysis {
class IBTagTool;
@@ -77,7 +76,6 @@ class TrigBtagFexMT: public AthAlgorithm {
// DATA
/** @brief List of xAOD tagger basenames */
Gaudi::Property< std::vector< std::string > > m_TaggerBaseNames {this,"TaggerBaseNames",std::vector< std::string >(),"List of xAOD tagger basenames"};
- ToolHandle<GenericMonitoringTool> m_monTool{this,"MonTool","","Monitoring tool"};
// PROPERTIES
/** @brief Switch for offline tools */
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFExtrapolatorNSWHypo.h b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFExtrapolatorNSWHypo.h
index 1d1f57b6145e30efe92b07c08a66519e64881269..a0c5ffdaaff2c3f05a285016f69b8132f9a7c89e 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFExtrapolatorNSWHypo.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/TrigMuonHypo/TrigMuonEFExtrapolatorNSWHypo.h
@@ -1,24 +1,25 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIG_TRIGMUONEFEXTRAPOLATORNSWHYPO_H
#define TRIG_TRIGMUONEFEXTRAPOLATORNSWHYPO_H
-#include <string>
#include "TrigInterfaces/HypoAlgo.h"
#include "GaudiKernel/ServiceHandle.h"
+
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "MuonRecHelperTools/IMuonEDMHelperSvc.h"
-#include "MuonIdHelpers/MuonIdHelperTool.h"
-class StoreGateSvc;
+#include <string>
+
class TriggerElement;
class TrigMuonEFExtrapolatorNSWHypo: public HLT::HypoAlgo
{
public:
TrigMuonEFExtrapolatorNSWHypo(const std::string & name, ISvcLocator* pSvcLocator);
- ~TrigMuonEFExtrapolatorNSWHypo();
+ ~TrigMuonEFExtrapolatorNSWHypo()=default;
HLT::ErrorCode hltInitialize();
HLT::ErrorCode hltExecute(const HLT::TriggerElement* outputTE, bool& pass);
@@ -34,8 +35,7 @@ class TrigMuonEFExtrapolatorNSWHypo: public HLT::HypoAlgo
"Muon::MuonEDMHelperSvc/MuonEDMHelperSvc",
"Handle to the service providing the IMuonEDMHelperSvc interface" };
- // ToolHandle for IdHelperTool
- ToolHandle<Muon::MuonIdHelperTool> m_idhelperTool;
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
// Services
StoreGateSvc* m_storeGate;
diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFExtrapolatorNSWHypo.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFExtrapolatorNSWHypo.cxx
index 7ed710dc3fa7c7209e582be01e76c0b445a6c888..cc2a818aa137be93f88c010cfc9789b902988503 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFExtrapolatorNSWHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonEFExtrapolatorNSWHypo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigMuonHypo/TrigMuonEFExtrapolatorNSWHypo.h"
@@ -11,14 +11,11 @@
#include "MuonSegment/MuonSegment.h"
#include "TrigT1Interfaces/RecMuonRoI.h"
-class ISvcLocator;
-
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
TrigMuonEFExtrapolatorNSWHypo::TrigMuonEFExtrapolatorNSWHypo(const std::string & name, ISvcLocator* pSvcLocator) :
- HLT::HypoAlgo(name, pSvcLocator),
- m_idhelperTool("Muon::MuonIdHelperTool/MuonIdHelperTool")
+ HLT::HypoAlgo(name, pSvcLocator)
{
declareProperty("AcceptAll", m_acceptAll=true);
@@ -31,10 +28,7 @@ TrigMuonEFExtrapolatorNSWHypo::TrigMuonEFExtrapolatorNSWHypo(const std::string &
declareMonitoredStdContainer("dLEta", m_fex_dLeta);
declareMonitoredStdContainer("dLPhi", m_fex_dLphi);
- m_storeGate=0;
-}
-
-TrigMuonEFExtrapolatorNSWHypo::~TrigMuonEFExtrapolatorNSWHypo(){
+ m_storeGate=nullptr;
}
// --------------------------------------------------------------------------------
@@ -54,11 +48,11 @@ HLT::ErrorCode TrigMuonEFExtrapolatorNSWHypo::hltInitialize()
return HLT::ERROR;
}
- sc = m_idhelperTool.retrieve();
+ sc = m_idHelperSvc.retrieve();
if ( sc.isSuccess() ) {
- msg() << MSG::INFO << "Retrieved " << m_idhelperTool << endmsg;
+ msg() << MSG::INFO << "Retrieved " << m_idHelperSvc << endmsg;
} else {
- msg() << MSG::ERROR << "Could not get " << m_idhelperTool << endmsg;
+ msg() << MSG::ERROR << "Could not get " << m_idHelperSvc << endmsg;
return HLT::ERROR;
}
@@ -192,7 +186,7 @@ HLT::ErrorCode TrigMuonEFExtrapolatorNSWHypo::hltExecute(const HLT::TriggerEleme
// get chamber identifier, chamber index and station index
Identifier chid = m_edmHelperSvc->chamberId( *segment );
- Muon::MuonStationIndex::ChIndex chIndex = m_idhelperTool->chamberIndex(chid);
+ Muon::MuonStationIndex::ChIndex chIndex = m_idHelperSvc->chamberIndex(chid);
if (debug) msg() << MSG::DEBUG << " chamber index=" << chIndex << endmsg;
// only in EI and CSC
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.cxx
index 6b3bcb8aadc16e055315ab415c15f06f9fd52e63..d53c41229f3e668a85d4a76e6af089e5d3705884 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.cxx
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.cxx
@@ -46,7 +46,6 @@ TrigEgammaMonitorTagAndProbeAlgorithm::~TrigEgammaMonitorTagAndProbeAlgorithm()
StatusCode TrigEgammaMonitorTagAndProbeAlgorithm::initialize() {
ATH_CHECK(TrigEgammaMonitorBaseAlgorithm::initialize() );
- ATH_CHECK(m_eventInfoKey.initialize());
ATH_CHECK(m_offElectronKey.initialize());
ATH_CHECK(m_jetKey.initialize());
@@ -138,7 +137,7 @@ bool TrigEgammaMonitorTagAndProbeAlgorithm::executeTandP( const EventContext& ct
fillLabel(monGroup, m_anatype+"_CutCounter", "Events");
- SG::ReadHandle<xAOD::EventInfo> eventInfo( m_eventInfoKey, ctx );
+ SG::ReadHandle<xAOD::EventInfo> eventInfo = GetEventInfo (ctx);
if( !eventInfo.isValid() ){
ATH_MSG_WARNING("Failed to retrieve EventInfo");
return false;
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.h
index 61804d2ae7f1b23dc189303ee9a503d1883bcec4..955ddfa08cf6cd8f21678c91fa7096f43e57fd54 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.h
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorTagAndProbeAlgorithm.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TrigEgammaMonitorTagAndProbeAlgorithm_H
#define TrigEgammaMonitorTagAndProbeAlgorithm_H
@@ -95,11 +95,6 @@ class TrigEgammaMonitorTagAndProbeAlgorithm: public TrigEgammaMonitorAnalysisAlg
SG::ReadHandleKey<xAOD::ElectronContainer> m_offElectronKey{ this, "ElectronKey", "Electrons", ""};
/*! Jet container for probe selection */
SG::ReadHandleKey<xAOD::JetContainer> m_jetKey{ this, "JetKey" , "AntiKt4LCTopoJets", ""};
- /*! Event Info key */
- SG::ReadHandleKey<xAOD::EventInfo> m_eventInfoKey{ this, "EventInfoKey", "EventInfo", "" };
-
-
-
};
#endif
diff --git a/Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.cxx
index 8a9e2b574d4129664aa3e93d3b6b9bc2281d1465..27c8cca0de2ac339c6bdb85095f86ef802164d61 100644
--- a/Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/FSRoIsUnpackingTool.cxx
@@ -67,7 +67,7 @@ StatusCode FSRoIsUnpackingTool::unpack( const EventContext& ctx,
std::inserter(activeFSchains, activeFSchains.end() ) );
auto decision = TrigCompositeUtils::newDecisionIn( decisionOutput, "L1" ); // This "L1" denotes an initial node with no parents
- for ( auto c: activeFSchains ) addDecisionID( c, decision );
+ addChainsToDecision( HLT::Identifier( "FSNOSEED" ), decision, activeChains );
ATH_MSG_DEBUG("Unpacking FS RoI for " << activeFSchains.size() << " chains: " << [&](){
TrigCompositeUtils::DecisionIDContainer ids;
diff --git a/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation_topOptions.py b/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation_topOptions.py
index 0dc360e7538a324c082ab15f6452e0056388f4cc..8fc58f1ae4cb90934cd4d12487be30a826644c38 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation_topOptions.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoSimulation/share/L1Simulation_topOptions.py
@@ -127,9 +127,11 @@ if globalflags.InputFormat.is_pool():
from RecExConfig.ObjKeyStore import objKeyStore
from PyUtils.MetaReaderPeeker import convert_itemList
objKeyStore.addManyTypesInputFile(convert_itemList(layout='#join'))
- if ( not objKeyStore.isInInput("xAOD::EventInfo") ) and ( not hasattr(topSequence, "xAODMaker::EventInfoCnvAlg") ):
+ from AthenaCommon.AlgSequence import AthSequencer
+ condSeq = AthSequencer("AthCondSeq")
+ if ( not objKeyStore.isInInput("xAOD::EventInfo") ) and ( not hasattr(condSeq, "xAODMaker::EventInfoCnvAlg") ):
from xAODEventInfoCnv.xAODEventInfoCnvAlgDefault import xAODEventInfoCnvAlgDefault
- xAODEventInfoCnvAlgDefault(sequence=topSequence)
+ xAODEventInfoCnvAlgDefault(sequence=condSeq)
if rec.doTrigger:
try:
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h
index ea917d067249add0098f060745baa118de06e3e2..9202e6265181106e2da57e482ae9ac260b738066 100755
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/TrigT1TGCRecRoiSvc/TGCRecRoiSvc.h
@@ -1,16 +1,17 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGT1_TGCRECROISVC_H
#define TRIGT1_TGCRECROISVC_H
#include "TrigT1Interfaces/RecMuonRoiSvc.h"
+#include "GaudiKernel/ServiceHandle.h"
+
+#include "MuonIdHelpers/IMuonIdHelperSvc.h"
#include "TGCcablingInterface/TGCIdBase.h"
#include "MuonReadoutGeometry/TgcReadoutElement.h"
-#include "MuonIdHelpers/MuonIdHelperTool.h"
-class Identifier;
class ITGCcablingSvc;
namespace MuonGM
@@ -42,10 +43,9 @@ public:
// standard constructor
TGCRecRoiSvc (const std::string& name, ISvcLocator* svc);
- virtual ~TGCRecRoiSvc (void) {}
+ virtual ~TGCRecRoiSvc()=default;
- StatusCode initialize (void);
- StatusCode finalize (void);
+ StatusCode initialize();
void reconstruct (const unsigned int & roIWord) const; //!< calculate eta and phi of RoI center @link LVL1TGC::TGCRecRoiSvc::reconstruct @endlink
@@ -123,10 +123,9 @@ private:
BooleanProperty m_patchForP5;
BooleanProperty m_patchForRoIWord;
- mutable const ITGCcablingSvc * m_cabling;
- ToolHandle<Muon::MuonIdHelperTool> m_muonIdHelperTool{this, "idHelper",
- "Muon::MuonIdHelperTool/MuonIdHelperTool", "Handle to the MuonIdHelperTool"};
- const MuonGM::MuonDetectorManager * m_muonMgr;
+ mutable const ITGCcablingSvc* m_cabling;
+ ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc {this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"};
+ const MuonGM::MuonDetectorManager* m_muonMgr;
mutable bool m_isAtlas;
};
diff --git a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/src/TGCRecRoiSvc.cxx b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/src/TGCRecRoiSvc.cxx
index 420c86d2891e3d58832c878c3ef543b34c73db8d..00ca4042f1040ff1d63da683f01144fa4c943ef8 100755
--- a/Trigger/TrigT1/TrigT1TGCRecRoiSvc/src/TGCRecRoiSvc.cxx
+++ b/Trigger/TrigT1/TrigT1TGCRecRoiSvc/src/TGCRecRoiSvc.cxx
@@ -23,12 +23,11 @@ inline void SWAP(double &a, double &b)
TGCRecRoiSvc::TGCRecRoiSvc (const std::string& name, ISvcLocator* svc)
: LVL1::RecMuonRoiSvc( name, svc ),
m_phi(0),
- m_eta(0),
- m_cabling(0),
- m_muonMgr(0),
+ m_eta(0),
+ m_cabling(0),
+ m_muonMgr(0),
m_isAtlas(true)
-{
-
+{
declareProperty("PatchForM5", m_patchForM5 = false);
declareProperty("PatchForP4", m_patchForP4 = false);
declareProperty("PatchForP5", m_patchForP5 = false);
@@ -39,14 +38,11 @@ StatusCode TGCRecRoiSvc::initialize (void)
{
ATH_MSG_DEBUG( "initialize" );
- ATH_CHECK( AthService::initialize() );
- ATH_CHECK( setProperties() );
-
ServiceHandle<StoreGateSvc> detStore ("DetectorStore", name() );
ATH_CHECK( detStore.retrieve() );
ATH_CHECK( detStore->retrieve(m_muonMgr) );
- ATH_CHECK( m_muonIdHelperTool.retrieve() );
+ ATH_CHECK( m_idHelperSvc.retrieve() );
// try to initialize the TGCcabling
StatusCode sc = getCabling();
@@ -67,14 +63,6 @@ StatusCode TGCRecRoiSvc::initialize (void)
return StatusCode::SUCCESS;
}
-
-StatusCode TGCRecRoiSvc::finalize()
-{
- ATH_MSG_INFO( "finalize" );
- return StatusCode::SUCCESS;
-}
-
-
void TGCRecRoiSvc::reconstruct (const unsigned int & roIWord) const
{
m_eta = 0;
@@ -481,14 +469,14 @@ void TGCRecRoiSvc::getWireInfo(Amg::Vector3D & w_pos,
w_asdout->getChannel());
if (status==false) return;
const MuonGM::TgcReadoutElement* tgcwire
- = m_muonMgr->getTgcReadoutElement(m_muonIdHelperTool->tgcIdHelper().parentID(wireId));
+ = m_muonMgr->getTgcReadoutElement(m_idHelperSvc->tgcIdHelper().parentID(wireId));
w_pos = tgcwire -> channelPos(wireId);
// If edge correction is needed,
// the half length in the r direction is added (subtracted) for the upper (lower) edge.
if(edge==UpperREdge || edge==LowerREdge) {
- int gasGap = m_muonIdHelperTool->tgcIdHelper().gasGap(wireId);
- int channel = m_muonIdHelperTool->tgcIdHelper().channel(wireId);
+ int gasGap = m_idHelperSvc->tgcIdHelper().gasGap(wireId);
+ int channel = m_idHelperSvc->tgcIdHelper().channel(wireId);
double halfLength = tgcwire->gangLength(gasGap, channel)/2.;
double r = w_pos.perp();
double phi = w_pos.phi();
@@ -521,14 +509,14 @@ void TGCRecRoiSvc::getStripInfo(Amg::Vector3D & s_pos,
s_asdout->getChannel());
if (status==false) return;
const MuonGM::TgcReadoutElement* tgcstrip
- = m_muonMgr->getTgcReadoutElement(m_muonIdHelperTool->tgcIdHelper().parentID(stripId));
+ = m_muonMgr->getTgcReadoutElement(m_idHelperSvc->tgcIdHelper().parentID(stripId));
s_pos = tgcstrip -> channelPos(stripId);
// If edge correction is needed,
// the half width in the phi direction is added (subtracted) for the upper (lower) edge.
if(edge==UpperPhiEdge || edge==LowerPhiEdge) {
- int gasGap = m_muonIdHelperTool->tgcIdHelper().gasGap(stripId);
- int channel = m_muonIdHelperTool->tgcIdHelper().channel(stripId);
+ int gasGap = m_idHelperSvc->tgcIdHelper().gasGap(stripId);
+ int channel = m_idHelperSvc->tgcIdHelper().channel(stripId);
double shortWidth = tgcstrip->stripShortWidth(gasGap, channel);
double longWidth = tgcstrip->stripLongWidth(gasGap, channel);
double halfWidth = (shortWidth + longWidth)/4.;
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
index 2f155d0dd2efb76aa42963912b6a48c37eb102c3..bbd57d2282fac1a72679fdef0ff4a7df9114e975 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
@@ -332,8 +332,8 @@ TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713
TrigSignatureMoniMT INFO -- #1713982776 Events 4 4 4 4 4 4 - - 4
TrigSignatureMoniMT INFO -- #1713982776 Features 8 8 12 10 - -
TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT INFO -- #451489897 Events 10 10 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Events 10 10 10 10 10 10 6 4 4
+TrigSignatureMoniMT INFO -- #451489897 Features 14 13 16 15 9 7
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 10 - - - - - 10
TrigSignatureMoniMT INFO -- #3518031697 Features 14 - - - - -
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/MinBias.py b/Trigger/TrigValidation/TrigUpgradeTest/share/MinBias.py
index b7411d65b0dd2c82f9bfd9f39e9861c9b22cca25..4eff818e1afe886b363e37b548893ff7269f5ae8 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/MinBias.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/MinBias.py
@@ -62,19 +62,19 @@ from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
# TODO - split ID into two parts, one for SP counting another for the tracking, the tracking will go to the second step (Tracking) sequence
inputMakerSPCount = InputMakerForRoI(name="IMMinBiasSPCount", RoIs="HLT_MBSP")
-stepSPCount = ChainStep( "stepSPCount", [MenuSequence( Maker=inputMakerSPCount,
+Step1_SPCount = ChainStep( "Step1_SPCount", [MenuSequence( Maker=inputMakerSPCount,
Sequence=parOR("SPCountReco", [inputMakerSPCount]+idAlgs + [ SpCount ] ),
Hypo=SpCountHypo, HypoToolGen=generateSPCountHypo )] )
inputMakerTrkCount = InputMakerForRoI(name="IMMinBiasTrkCount", RoIs="HLT_MBTRK")
-stepTrkCount = ChainStep( "stepTrkCount",
+Step2_TrkCount = ChainStep( "Step2_TrkCount",
[ MenuSequence( Maker=inputMakerTrkCount ,
Sequence=parOR("TrkCountReco", [inputMakerTrkCount]),
Hypo=TrackCountHypo,
HypoToolGen=generateTrackCountHypo )] )
-makeChain(chainName, ["FSNOSEED"], ChainSteps=[stepSPCount, stepTrkCount])
+makeChain(chainName, ["FSNOSEED"], ChainSteps=[Step1_SPCount, Step2_TrkCount])
from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import makeHLTTree
from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
index cedf1b6089811cbec47248036f4362ef0ea61fc7..8357c78f612f3fe3b1b5dba3f0b411f8d972e1ab 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_cf_build.sh
@@ -10,8 +10,9 @@ export THREADS=1
export SLOTS=1
export JOBOPTION="TrigUpgradeTest/full_menu_cf.py"
export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*"
-export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;"
+#export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;"
#export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;forceEnableAllChains=True;"
+export EXTRA="doWriteBS=False;doWriteRDOTrigger=True;forceEnableAllChains=True;doEmptyMenu=True;doBjetSlice=True;"
#ex.args = '-c "isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
#ex.args = '-c "doEmptyMenu=True;doBjetSlice=True;isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
#ex.args = '-c "doEmptyMenu=True;forceEnableAllChais=True;isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
diff --git a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
index 50145813001271ea001fdf55037be8f3bc06e9b9..a95790e796f3f0db078e2521e1b70499f93fd626 100644
--- a/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
+++ b/Trigger/TrigValidation/TrigValTools/python/TrigValSteering/CheckSteps.py
@@ -566,6 +566,7 @@ class MessageCountStep(Step):
self.log_regex = r'(athena\..*log$|athenaHLT:.*\.out$|^log\..*to.*)'
self.start_pattern = r'(HltEventLoopMgr|AthenaHiveEventLoopMgr).*INFO Starting loop on events'
self.end_pattern = r'(HltEventLoopMgr.*INFO All events processed|AthenaHiveEventLoopMgr.*INFO.*Loop Finished)'
+ self.warning_threshold = None
self.info_threshold = None
self.debug_threshold = None
self.verbose_threshold = None
@@ -575,6 +576,8 @@ class MessageCountStep(Step):
def configure(self, test):
self.args += ' -s "{:s}"'.format(self.start_pattern)
self.args += ' -e "{:s}"'.format(self.end_pattern)
+ if self.warning_threshold is None:
+ self.warning_threshold = 0
if self.info_threshold is None:
self.info_threshold = test.exec_steps[0].max_events
if self.debug_threshold is None:
@@ -600,17 +603,23 @@ class MessageCountStep(Step):
if self.auto_report_result:
self.report_result()
return self.result, cmd
- (num_info, num_debug, num_verbose, num_other) = (0, 0, 0, 0)
+ (num_warning, num_info, num_debug, num_verbose, num_other) = (0, 0, 0, 0, 0)
for log_file in log_files:
json_file = 'MessageCount.{:s}.json'.format(log_file)
if not os.path.isfile(json_file):
self.log.warning('%s cannot open file %s', self.name, json_file)
with open(json_file) as f:
summary = json.load(f)
+ num_warning += summary['WARNING']
num_info += summary['INFO']
num_debug += summary['DEBUG']
num_verbose += summary['VERBOSE']
num_other += summary['other']
+ if num_warning > self.warning_threshold:
+ self.log.info(
+ '%s Number of WARNING messages %s is higher than threshold %s',
+ self.name, num_warning, self.warning_threshold)
+ self.result += 1
if num_info > self.info_threshold:
self.log.info(
'%s Number of INFO messages %s is higher than threshold %s',
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 305e6d09a5ed9a7ddc3adb8d936410816500179a..c6a29a8963312cca013f3bb65a669cf7f398c411 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1,5 +1,3 @@
-TrigSignatureMoniMT INFO Sequence stepSPCount (step ) used at step 1 in chain HLT_mb_sptrk_L1RD0_FILLED
-TrigSignatureMoniMT INFO Sequence stepTrkCount (step ) used at step 2 in chain HLT_mb_sptrk_L1RD0_FILLED
TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292
TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 0 0 0 - - - 0
TrigSignatureMoniMT INFO -- #3136730292 Features 0 0 0 - - -
@@ -115,8 +113,8 @@ TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324
TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - - 13
TrigSignatureMoniMT INFO -- #324908483 Features 41 141 47 - - -
TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 1 - - 1
-TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 29 1 - -
+TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 1 - - 1
+TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 29 1 - -
TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - - 0
TrigSignatureMoniMT INFO -- #176627878 Features 13 49 28 0 - -
@@ -343,8 +341,8 @@ TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #171
TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 1 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #1713982776 Features 2 0 0 0 - -
TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT INFO -- #451489897 Events 20 20 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Events 20 20 1 1 0 0 0 0 0
+TrigSignatureMoniMT INFO -- #451489897 Features 1 1 0 0 0 0
TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 1 - - - - - 1
TrigSignatureMoniMT INFO -- #3518031697 Features 1 - - - - -
diff --git a/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py b/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
index a724c1bb4b7ae9dd4c667fb3dabe63c811138ceb..a679fdd0085f06d52ec906b30641b550359654c1 100644
--- a/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
+++ b/Trigger/TrigValidation/TriggerTest/share/testCommonSliceAthenaTrigRDO.py
@@ -173,7 +173,7 @@ if 'enableCostMonitoring' in dir() and bool(enableCostMonitoring) == True:
#-----------------------------------------------------------
include("RecExCommon/RecExCommon_topOptions.py")
-from AthenaCommon.AlgSequence import AlgSequence
+from AthenaCommon.AlgSequence import AthSequencer
condSeq = AthSequencer("AthCondSeq")
if not hasattr( condSeq, "LumiBlockMuWriter" ):
include ("LumiBlockComps/LumiBlockMuWriter_jobOptions.py")
diff --git a/Trigger/TrigValidation/TriggerTest/share/testIDAthenaTrigRDO.py b/Trigger/TrigValidation/TriggerTest/share/testIDAthenaTrigRDO.py
index 5ffc465029d07e031a9654684acff6d877ed9324..a21903e73617737a4f57a68fd31300af43706274 100644
--- a/Trigger/TrigValidation/TriggerTest/share/testIDAthenaTrigRDO.py
+++ b/Trigger/TrigValidation/TriggerTest/share/testIDAthenaTrigRDO.py
@@ -95,6 +95,10 @@ GenerateMenu.overwriteSignaturesWith(ElectronOnly)
#-----------------------------------------------------------
include("RecExCommon/RecExCommon_topOptions.py")
#-----------------------------------------------------------
+from AthenaCommon.AlgSequence import AthSequencer
+condSeq = AthSequencer("AthCondSeq")
+if not hasattr( condSeq, "LumiBlockMuWriter" ):
+ include ("LumiBlockComps/LumiBlockMuWriter_jobOptions.py")
#-----------------------------------------------------------
include("TriggerTest/TriggerTestCommon.py")
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
index e216367b5daf148533d0ab96ff671775f5ab5f10..944198e03f0a78ef14436f3d66fa83f87b68de00 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_build.py
@@ -27,10 +27,13 @@ test.art_type = 'build'
test.exec_steps = [ex]
test.check_steps = CheckSteps.default_check_steps(test)
-#Overwrite default msgcount steps
+# Overwrite default MessageCount settings
+# We are trying to lower the limits step by step
+# Ultimately there should be no per-event messages
msgcount = test.get_step("MessageCount")
+msgcount.warning_threshold = 500
msgcount.info_threshold = 1200
-msgcount.other_threshold = 100
+msgcount.other_threshold = 80
msgcount.required = True # make the test exit code depend on this step
# Add a step comparing counts in the log against reference
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_emptyMenu_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_emptyMenu_build.py
index e45d152c1f8371729e7ad08bba6d480aaaaec268..3985766c50c9aabaa822451989333685a22b7151 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_emptyMenu_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_emptyMenu_build.py
@@ -36,8 +36,9 @@ test.check_steps.remove(test.get_step("ZeroCounts"))
# Overwrite default MessageCount settings
msgcount = test.get_step("MessageCount")
+msgcount.warning_threshold = 40
msgcount.info_threshold = 600
-msgcount.other_threshold = 50
+msgcount.other_threshold = 40
msgcount.required = True # make the test exit code depend on this step
import sys
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
index 82507c58ce4ca4a6d2ad3e12d69db1c7e10a3aef..ac460ed0cea5a2731bf6ec63ce8dbb1f932b70a3 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/HLTTriggerGetter.py
@@ -132,9 +132,11 @@ class HLTSimulationGetter(Configured):
from RecExConfig.ObjKeyStore import objKeyStore
from PyUtils.MetaReaderPeeker import convert_itemList
objKeyStore.addManyTypesInputFile(convert_itemList(layout='#join'))
- if ( not objKeyStore.isInInput("xAOD::EventInfo") ) and ( not hasattr(topSequence, "xAODMaker::EventInfoCnvAlg") ):
+ from AthenaCommon.AlgSequence import AthSequencer
+ condSeq = AthSequencer("AthCondSeq")
+ if ( not objKeyStore.isInInput("xAOD::EventInfo") ) and ( not hasattr(condSeq, "xAODMaker::EventInfoCnvAlg") ):
from xAODEventInfoCnv.xAODEventInfoCnvAlgDefault import xAODEventInfoCnvAlgDefault
- xAODEventInfoCnvAlgDefault(sequence=topSequence)
+ xAODEventInfoCnvAlgDefault(sequence=condSeq)
if jobproperties.Global.InputFormat() == 'bytestream':
# Decode ROIB::RoIBResult from ByteStream
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 4c461e4057486914e3c903959beccb4ad5fbba3a..33e380d56c22aed8b44a53246c3c596cb4113f73 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -332,9 +332,11 @@ if globalflags.InputFormat.is_pool():
from RecExConfig.ObjKeyStore import objKeyStore
from PyUtils.MetaReaderPeeker import convert_itemList
objKeyStore.addManyTypesInputFile(convert_itemList(layout='#join'))
- if ( not objKeyStore.isInInput("xAOD::EventInfo") ) and ( not hasattr(topSequence, "xAODMaker::EventInfoCnvAlg") ):
+ from AthenaCommon.AlgSequence import AthSequencer
+ condSeq = AthSequencer("AthCondSeq")
+ if ( not objKeyStore.isInInput("xAOD::EventInfo") ) and ( not hasattr(condSeq, "xAODMaker::EventInfoCnvAlg") ):
from xAODEventInfoCnv.xAODEventInfoCnvAlgDefault import xAODEventInfoCnvAlgDefault
- xAODEventInfoCnvAlgDefault(sequence=topSequence)
+ xAODEventInfoCnvAlgDefault(sequence=condSeq)
# ----------------------------------------------------------------
# Detector geometry
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index 0bcee22e3baaa7bb8d344cd3704428b71b831ed6..dce79c44123075fe45eb104f40c4e3978ef0d7b3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -125,6 +125,11 @@ def bJetStep2Sequence():
from TrigBjetHypo.TrigBjetHypoConf import TrigBjetBtagHypoAlgMT
hypo = TrigBjetBtagHypoAlgMT( "TrigBjetBtagHypoAlg" )
hypo.Tracks = PTTrackParticles[0]
+ hypo.PrmVtx = prmVtxKey
+ hypo.PrmVtxLink = prmVtxKey.replace( "HLT_","" )
+
+ from TrigBjetHypo.TrigBjetOnlineMonitoringMTConfig import TrigBjetOnlineMonitoring
+ hypo.MonTool = TrigBjetOnlineMonitoring()
from TrigBjetHypo.TrigBjetBtagHypoTool import TrigBjetBtagHypoToolFromDict
return MenuSequence( Sequence = inViewReco.sequence(),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
index b9069ad0142c8cc5511f2ab03e85b21907b545fc..2f47f50e54881dcab2bbc4b788500dd04171097e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MinBias/MinBiasChainConfiguration.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
@@ -38,6 +38,9 @@ class MinBiasChainConfig(ChainConfigurationBase):
hypo = SPCountHypoTool(chainDict["chainName"])
if "hmt" in chainDict["chainName"]:
hypo.totNumSctSP = int( chainDict["chainParts"][0]["hypoL2Info"].strip("sp") )
+ if "mb_sptrk" in chainDict["chainName"]:
+ hypo.totNumPixSP = 2
+ hypo.totNumSctSP = 3
# will set here thresholds
return hypo
SpList = []
@@ -67,6 +70,9 @@ class MinBiasChainConfig(ChainConfigurationBase):
SpCount=TrigCountSpacePointsMT()
SpCount.SpacePointsKey=recordable("HLT_SpacePointCounts")
+
+ from TrigT2MinBias.TrigT2MinBiasMonitoringMT import SpCountMonitoring
+ SpCount.MonTool = SpCountMonitoring()
SPrecoSeq = parOR("SPrecoSeq", SpList + [ SpCount ])
SPSequence = seqAND("SPSequence", [SPInputMakerAlg, SPrecoSeq])
@@ -76,12 +82,12 @@ class MinBiasChainConfig(ChainConfigurationBase):
SpCountHypo =SPCountHypoAlgMT()
SpCountHypo.SpacePointsKey=recordable("HLT_SpacePointCounts")
- stepSPCount = ChainStep( "stepSPCount", [MenuSequence( Sequence = SPSequence,
+ Step1_SPCount = ChainStep( "Step1_SPCount", [MenuSequence( Sequence = SPSequence,
Maker = SPInputMakerAlg,
Hypo = SpCountHypo,
HypoToolGen = generateSPCountHypo )] )
- return stepSPCount
+ return Step1_SPCount
def getMinBiasTrkStep(self):
""" Use the reco-dict to construct a single MinBias step """
@@ -89,6 +95,10 @@ class MinBiasChainConfig(ChainConfigurationBase):
hypo = TrackCountHypoTool(chainDict["chainName"])
if "hmt" in chainDict["chainName"]:
hypo.required_ntrks = int( chainDict["chainParts"][0]["hypoEFInfo"].strip("trk") )
+ if "mb_sptrk" in chainDict["chainName"]:
+ hypo.min_pt = 0.2
+ hypo.max_z0 = 401
+
# will set here cuts
return hypo
from TrigMinBias.TrigMinBiasConf import TrackCountHypoAlgMT, TrackCountHypoTool
@@ -125,12 +135,15 @@ class MinBiasChainConfig(ChainConfigurationBase):
TrackCountHypo.trackCountKey=recordable("HLT_TrackCount")
TrackCountHypo.tracksKey=recordable("HLT_IDTrack_MinBias_FTF")
+ from TrigMinBias.TrackCountMonitoringMT import TrackCountMonitoring
+ TrackCountHypo.MonTool = TrackCountMonitoring()
+
TrkrecoSeq = parOR("TrkrecoSeq", [verifier]+TrkList)
TrkSequence = seqAND("TrkSequence", [TrkInputMakerAlg, TrkrecoSeq])
TrkInputMakerAlg.ViewNodeName = TrkrecoSeq.name()
- stepTrkCount = ChainStep( "stepTrkCount", [MenuSequence( Sequence = TrkSequence,
+ Step2_TrkCount = ChainStep( "Step2_TrkCount", [MenuSequence( Sequence = TrkSequence,
Maker = TrkInputMakerAlg,
Hypo = TrackCountHypo,
HypoToolGen = generateTrackCountHypo )] )
- return stepTrkCount
+ return Step2_TrkCount
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index b01a2d0263600554b09a865157f4c33d02c07649..c3a51add646f5be60242b9578ec1285ee857c186 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -22,6 +22,8 @@ MSextrpTPname = recordable("HLT_MSOnlyExtrapolatedMuons_FSTrackParticles")
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.MuonSlice.doTrigMuonConfig=True
+from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
+
class muonNames(object):
def __init__(self):
#EFSA and EFCB containers have different names
@@ -84,6 +86,41 @@ def makeMuonPrepDataAlgs(RoIs="MURoIs", forFullScan=False):
from AthenaCommon.AppMgr import ToolSvc
+ if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
+ ### sTGC RDO data ###
+ from MuonSTGC_CnvTools.MuonSTGC_CnvToolsConf import Muon__STGC_RDO_Decoder
+ STGCRodDecoder = Muon__STGC_RDO_Decoder(name = "STGC_RDO_Decoder")
+
+ ToolSvc += STGCRodDecoder
+
+ from MuonSTGC_CnvTools.MuonSTGC_CnvToolsConf import Muon__sTgcRdoToPrepDataToolMT
+ sTgcRdoToPrepDataTool = Muon__sTgcRdoToPrepDataToolMT(name = "sTgcRdoToPrepDataTool")
+
+ ToolSvc += sTgcRdoToPrepDataTool
+
+ from MuonRdoToPrepData.MuonRdoToPrepDataConf import StgcRdoToStgcPrepData
+ StgcRdoToStgcPrepData = StgcRdoToStgcPrepData(name = "StgcRdoToStgcPrepData")
+
+ viewAlgs_MuonPRD.append( StgcRdoToStgcPrepData )
+
+ ### MM RDO data ###
+ from MuonMM_CnvTools.MuonMM_CnvToolsConf import Muon__MM_RDO_Decoder
+ MMRodDecoder = Muon__MM_RDO_Decoder(name = "MM_RDO_Decoder")
+
+ ToolSvc += MMRodDecoder
+
+ from MuonMM_CnvTools.MuonMM_CnvToolsConf import Muon__MmRdoToPrepDataToolMT
+ MmRdoToPrepDataTool = Muon__MmRdoToPrepDataToolMT(name = "MmRdoToPrepDataTool")
+
+ ToolSvc += MmRdoToPrepDataTool
+
+ from MuonRdoToPrepData.MuonRdoToPrepDataConf import MM_RdoToMM_PrepData
+ MM_RdoToMM_PrepData = MM_RdoToMM_PrepData(name = "MM_RdoToMM_PrepData",
+ PrintInputRdo = True )
+
+ viewAlgs_MuonPRD.append( MM_RdoToMM_PrepData )
+
+
### CSC RDO data ###
from MuonCSC_CnvTools.MuonCSC_CnvToolsConf import Muon__CscROD_Decoder
CSCRodDecoder = Muon__CscROD_Decoder(name = "CscROD_Decoder",
@@ -467,6 +504,8 @@ def muEFSARecoSequence( RoIs, name ):
from MuonCombinedRecExample.MuonCombinedAlgs import MuonCombinedMuonCandidateAlg, MuonCreatorAlg
from MuonCombinedAlgs.MuonCombinedAlgsMonitoring import MuonCreatorAlgMonitoring
+ from MuonRecExample.MuonRecFlags import muonRecFlags
+
muEFSARecoSequence = parOR("efmsViewNode_"+name)
efAlgs = []
@@ -496,7 +535,10 @@ def muEFSARecoSequence( RoIs, name ):
( 'Muon::RpcPrepDataContainer' , 'StoreGateSvc+RPC_Measurements' ),
( 'Muon::CscStripPrepDataContainer' , 'StoreGateSvc+CSC_Measurements' ),
( 'Muon::CscPrepDataContainer' , 'StoreGateSvc+CSC_Clusters' )]
-
+ if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
+ EFMuonViewDataVerifier.DataObjects += [( 'Muon::MMPrepDataContainer' , 'StoreGateSvc+MM_Measurements'),
+ ( 'Muon::sTgcPrepDataContainer' , 'StoreGateSvc+STGC_Measurements')]
+
#need MdtCondDbAlg for the MuonStationIntersectSvc (required by segment and track finding)
from AthenaCommon.AlgSequence import AthSequencer
from MuonCondAlg.MuonTopCondAlgConfigRUN2 import MdtCondDbAlg
@@ -507,8 +549,33 @@ def muEFSARecoSequence( RoIs, name ):
# Sets up and configures the muon alignment:
from MuonRecExample import MuonAlignConfig # noqa: F401
+ if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
+ theMuonLayerHough = CfgMgr.MuonLayerHoughAlg( "MuonLayerHoughAlg")
+ efAlgs.append(theMuonLayerHough)
+ SegmentFinder = CfgGetter.getPublicTool("MuonClusterSegmentFinderTool")
+ Cleaner = CfgGetter.getPublicToolClone("MuonTrackCleaner_seg","MuonTrackCleaner")
+ Cleaner.Extrapolator = CfgGetter.getPublicTool("MuonStraightLineExtrapolator")
+ Cleaner.Fitter = CfgGetter.getPublicTool("MCTBSLFitterMaterialFromTrack")
+ Cleaner.PullCut = 3
+ Cleaner.PullCutPhi = 3
+ SegmentFinder.TrackCleaner = Cleaner
+
+ theSegmentFinderAlg = CfgMgr.MuonSegmentFinderAlg( "TrigMuonSegmentMaker_"+name,SegmentCollectionName="MuonSegments",
+ MuonPatternCalibration = CfgGetter.getPublicTool("MuonPatternCalibration"),
+ MuonPatternSegmentMaker = CfgGetter.getPublicTool("MuonPatternSegmentMaker"),
+ MuonTruthSummaryTool = None)
+ # we check whether the layout contains any CSC chamber and if yes, we check that the user also wants to use the CSCs in reconstruction
+ if MuonGeometryFlags.hasCSC() and muonRecFlags.doCSCs():
+ CfgGetter.getPublicTool("CscSegmentUtilTool")
+ CfgGetter.getPublicTool("Csc2dSegmentMaker")
+ CfgGetter.getPublicTool("Csc4dSegmentMaker")
+ else:
+ theSegmentFinderAlg.Csc2dSegmentMaker = ""
+ theSegmentFinderAlg.Csc4dSegmentMaker = ""
+
+ else:
+ theSegmentFinderAlg = MooSegmentFinderAlg("TrigMuonSegmentMaker_"+name)
- theSegmentFinderAlg = MooSegmentFinderAlg("TrigMuonSegmentMaker_"+name)
from MuonSegmentTrackMaker.MuonTrackMakerAlgsMonitoring import MuPatTrackBuilderMonitoring
TrackBuilder = CfgMgr.MuPatTrackBuilder("TrigMuPatTrackBuilder_"+name ,MuonSegmentCollection = "MuonSegments",
TrackSteering=CfgGetter.getPublicToolClone("TrigMuonTrackSteering", "MuonTrackSteering"),
@@ -570,6 +637,11 @@ def muEFCBRecoSequence( RoIs, name ):
( 'SCT_FlaggedCondData' , 'StoreGateSvc+SCT_FlaggedCondData' ),
( 'MuonCandidateCollection' , 'StoreGateSvc+MuonCandidates_FS' ),
( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' )]
+
+ if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
+ ViewVerifyMS.DataObjects += [( 'Muon::MMPrepDataContainer' , 'StoreGateSvc+MM_Measurements'),
+ ( 'Muon::sTgcPrepDataContainer' , 'StoreGateSvc+STGC_Measurements') ]
+
muEFCBRecoSequence += ViewVerifyMS
# Make sure required objects are still available at whole-event level
@@ -753,6 +825,10 @@ def muEFInsideOutRecoSequence(RoIs, name):
( 'Muon::RpcPrepDataContainer' , 'StoreGateSvc+RPC_Measurements' ),
( 'Muon::TgcPrepDataContainer' , 'StoreGateSvc+TGC_Measurements' ),
( 'Muon::HoughDataPerSectorVec' , 'StoreGateSvc+HoughDataPerSectorVec')]
+ if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
+ ViewVerifyInsideOut.DataObjects += [( 'Muon::MMPrepDataContainer' , 'StoreGateSvc+MM_Measurements'),
+ ( 'Muon::sTgcPrepDataContainer' , 'StoreGateSvc+STGC_Measurements') ]
+
efmuInsideOutRecoSequence += ViewVerifyInsideOut
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
index 9a73f33e0b13962000180cfe12417cfe40ba13f2..42a021f2584b319ef72e15262f8133dd32c12cad 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
@@ -181,6 +181,7 @@ class LegacyThreshold( Threshold ):
had_veto = p['had_veto'],
isobits = p['isobits'],
use_relIso = p['use_relIso'])
+ thrv.checkOverlapAny( self.thresholdValues )
self.thresholdValues.append(thrv)
return self
@@ -611,6 +612,14 @@ class ThresholdValue(object):
self.window = window
self.priority = priority
+ def checkOverlapAny(self, listOfThrValues):
+ for rv in listOfThrValues:
+ if rv.priority != self.priority:
+ continue
+ if (self.etamax >= rv.etamin) and (self.etamin <= rv.etamax):
+ # overlaps with existing range of the same priority
+ raise RuntimeError( "ThresholdValue %s: Range eta %i - %i (priority %i) overlaps with existing range of the same priority" % \
+ (self.name, self.etamin, self.etamax, self.priority) )
def setIsolation(self, em_isolation, had_isolation, had_veto, isobits, use_relIso):
self.em_isolation = em_isolation
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
index 1ffd30c77f9d02d76edcf5669e88097139a0a488..a2e1133ad06c3237ae924ee31625a1798418efe4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
@@ -44,86 +44,86 @@ class ThresholdDef:
EMThreshold( 'eEM8VH', 'eEM').setIsolation( rhad = "Tight" )\
.addThrValue(9, priority=1)\
.addThrValue(9, -8, 8, priority=2)\
- .addThrValue(7, -11, -8, priority=2).addThrValue(7, 8, 11, priority=2)\
- .addThrValue(6, -14, -11, priority=2).addThrValue(6, 11, 14, priority=2)\
- .addThrValue(5, -15, -14, priority=2).addThrValue(5, 14, 15, priority=2)\
- .addThrValue(7, -18, -15, priority=2).addThrValue(7, 15, 18, priority=2)\
- .addThrValue(8, -25, -18, priority=2).addThrValue(8, 18, 25, priority=2)
+ .addThrValue(7, -11, -9, priority=2).addThrValue(7, 9, 11, priority=2)\
+ .addThrValue(6, -14, -12, priority=2).addThrValue(6, 12, 14, priority=2)\
+ .addThrValue(5, -15, -15, priority=2).addThrValue(5, 15, 15, priority=2)\
+ .addThrValue(7, -18, -16, priority=2).addThrValue(7, 16, 18, priority=2)\
+ .addThrValue(8, -25, -19, priority=2).addThrValue(8, 19, 25, priority=2)
EMThreshold( 'eEM10VH', 'eEM' ).setIsolation( rhad = "Medium" )\
.addThrValue(11, priority=1)\
- .addThrValue(11, -8, 7, priority=2)\
- .addThrValue(9, -11, -8, priority=2).addThrValue(9, 8, 11, priority=2)\
- .addThrValue(8, -14, -11, priority=2).addThrValue(8, 11, 14, priority=2)\
- .addThrValue(7, -15, -14, priority=2).addThrValue(7, 14, 15, priority=2)\
- .addThrValue(9, -18, -15, priority=2).addThrValue(9, 15, 18, priority=2)\
- .addThrValue(10, -25, -18, priority=2).addThrValue(10, 18, 25, priority=2)
+ .addThrValue(11, -8, 8, priority=2)\
+ .addThrValue(9, -11, -9, priority=2).addThrValue(9, 9, 11, priority=2)\
+ .addThrValue(8, -14, -12, priority=2).addThrValue(8, 12, 14, priority=2)\
+ .addThrValue(7, -15, -15, priority=2).addThrValue(7, 15, 15, priority=2)\
+ .addThrValue(9, -18, -16, priority=2).addThrValue(9, 16, 18, priority=2)\
+ .addThrValue(10, -25, -19, priority=2).addThrValue(10, 19, 25, priority=2)
EMThreshold( 'eEM15VH', 'eEM').setIsolation( rhad = "Loose" )\
.addThrValue(17, priority=1)\
.addThrValue(17, -7, 7, priority=2)\
- .addThrValue(16, -9, -7, priority=2).addThrValue(16, 7, 9, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, -14, -12, priority=2).addThrValue(14, 12, 14, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, -17, -15, priority=2).addThrValue(15, 15, 17, priority=2)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(16, 17, 25, priority=2)
+ .addThrValue(16, -9, -8, priority=2).addThrValue(16, 8, 9, priority=2)\
+ .addThrValue(15, -12, -10, priority=2).addThrValue(15, 10, 12, priority=2)\
+ .addThrValue(14, -14, -13, priority=2).addThrValue(14, 13, 14, priority=2)\
+ .addThrValue(13, -15, -15, priority=2).addThrValue(13, 15, 15, priority=2)\
+ .addThrValue(15, -17, -16, priority=2).addThrValue(15, 16, 17, priority=2)\
+ .addThrValue(16, -25, -18, priority=2).addThrValue(16, 18, 25, priority=2)
EMThreshold( 'eEM20VH', 'eEM').setIsolation( rhad = "Loose" )\
.addThrValue(22, priority=1)\
.addThrValue(22, -7, 7, priority=2)\
- .addThrValue(21, -8, -7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, -11, -8, priority=2).addThrValue(20, 8, 11, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, -14, -13, priority=2).addThrValue(18, 13, 14, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, -17, -15, priority=2).addThrValue(19, 15, 17, priority=2)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(21, 17, 25, priority=2)
+ .addThrValue(21, -8, -8, priority=2).addThrValue(21, 8, 8, priority=2)\
+ .addThrValue(20, -11, -9, priority=2).addThrValue(20, 9, 11, priority=2)\
+ .addThrValue(19, -13, -12, priority=2).addThrValue(19, 12, 13, priority=2)\
+ .addThrValue(18, -14, -14, priority=2).addThrValue(18, 14, 14, priority=2)\
+ .addThrValue(17, -15, -15, priority=2).addThrValue(17, 15, 15, priority=2)\
+ .addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
+ .addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
# (V)HI section
EMThreshold( 'eEM15VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
.addThrValue(17, priority=1)\
.addThrValue(17, -7, 7, priority=2)\
- .addThrValue(16, -9, -7, priority=2).addThrValue(16, 7, 9, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, -14, -12, priority=2).addThrValue(14, 12, 14, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, -17, -15, priority=2).addThrValue(15, 15, 17, priority=2)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(16, 17, 25, priority=2)
+ .addThrValue(16, -9, -8, priority=2).addThrValue(16, 8, 9, priority=2)\
+ .addThrValue(15, -12, -10, priority=2).addThrValue(15, 10, 12, priority=2)\
+ .addThrValue(14, -14, -13, priority=2).addThrValue(14, 13, 14, priority=2)\
+ .addThrValue(13, -15, -15, priority=2).addThrValue(13, 15, 15, priority=2)\
+ .addThrValue(15, -17, -16, priority=2).addThrValue(15, 16, 17, priority=2)\
+ .addThrValue(16, -25, -18, priority=2).addThrValue(16, 18, 25, priority=2)
EMThreshold( 'eEM18VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
.addThrValue(20, priority=1)\
.addThrValue(20, -7, 7, priority=2)\
- .addThrValue(19, -8, -7, priority=2).addThrValue(19, 7, 8, priority=2)\
- .addThrValue(18, -11, -8, priority=2).addThrValue(18, 8, 11, priority=2)\
- .addThrValue(17, -13, -11, priority=2).addThrValue(17, 11, 13, priority=2)\
- .addThrValue(16, -14, -13, priority=2).addThrValue(16, 13, 14, priority=2)\
- .addThrValue(15, -15, -14, priority=2).addThrValue(15, 14, 15, priority=2)\
- .addThrValue(17, -17, -15, priority=2).addThrValue(17, 15, 17, priority=2)\
- .addThrValue(19, -25, -17, priority=2).addThrValue(19, 17, 25, priority=2)
+ .addThrValue(19, -8, -8, priority=2).addThrValue(19, 8, 8, priority=2)\
+ .addThrValue(18, -11, -9, priority=2).addThrValue(18, 9, 11, priority=2)\
+ .addThrValue(17, -13, -12, priority=2).addThrValue(17, 12, 13, priority=2)\
+ .addThrValue(16, -14, -14, priority=2).addThrValue(16, 14, 14, priority=2)\
+ .addThrValue(15, -15, -15, priority=2).addThrValue(15, 15, 15, priority=2)\
+ .addThrValue(17, -17, -16, priority=2).addThrValue(17, 16, 17, priority=2)\
+ .addThrValue(19, -25, -18, priority=2).addThrValue(19, 18, 25, priority=2)
EMThreshold( 'eEM20VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
.addThrValue(22, priority=1)\
.addThrValue(22, -7, 7, priority=2)\
- .addThrValue(21, -8, -7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, -11, -8, priority=2).addThrValue(20, 8, 11, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, -14, -13, priority=2).addThrValue(18, 13, 14, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, -17, -15, priority=2).addThrValue(19, 15, 17, priority=2)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(21, 17, 25, priority=2)
+ .addThrValue(21, -8, -8, priority=2).addThrValue(21, 8, 8, priority=2)\
+ .addThrValue(20, -11, -9, priority=2).addThrValue(20, 9, 11, priority=2)\
+ .addThrValue(19, -13, -12, priority=2).addThrValue(19, 12, 13, priority=2)\
+ .addThrValue(18, -14, -14, priority=2).addThrValue(18, 14, 14, priority=2)\
+ .addThrValue(17, -15, -15, priority=2).addThrValue(17, 15, 15, priority=2)\
+ .addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
+ .addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
EMThreshold( 'eEM22VHI', 'eEM').setIsolation( reta = "Loose", wstot = "Medium" )\
.addThrValue(24, priority=1)\
.addThrValue(24, -7, 7, priority=2)\
- .addThrValue(23, -8, -7, priority=2).addThrValue(23, 7, 8, priority=2)\
- .addThrValue(22, -11, -8, priority=2).addThrValue(22, 8, 11, priority=2)\
- .addThrValue(21, -13, -11, priority=2).addThrValue(21, 11, 13, priority=2)\
- .addThrValue(20, -14, -13, priority=2).addThrValue(20, 13, 14, priority=2)\
- .addThrValue(19, -15, -14, priority=2).addThrValue(19, 14, 15, priority=2)\
- .addThrValue(21, -17, -15, priority=2).addThrValue(21, 15, 17, priority=2)\
- .addThrValue(23, -25, -17, priority=2).addThrValue(23, 17, 25, priority=2)
+ .addThrValue(23, -8, -8, priority=2).addThrValue(23, 8, 8, priority=2)\
+ .addThrValue(22, -11, -9, priority=2).addThrValue(22, 9, 11, priority=2)\
+ .addThrValue(21, -13, -12, priority=2).addThrValue(21, 12, 13, priority=2)\
+ .addThrValue(20, -14, -14, priority=2).addThrValue(20, 14, 14, priority=2)\
+ .addThrValue(19, -15, -15, priority=2).addThrValue(19, 15, 15, priority=2)\
+ .addThrValue(21, -17, -16, priority=2).addThrValue(21, 16, 17, priority=2)\
+ .addThrValue(23, -25, -18, priority=2).addThrValue(23, 18, 25, priority=2)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
index 255f1e677e5499779ec2caaa1f2dee8edd60c303..ff0dde5e44b457e68b76ca6f59a8f81f89032d71 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
@@ -45,8 +45,8 @@ class ThresholdDefLegacy:
LegacyThreshold( 'EM50V', 'EM').addThrValue(52, priority=1)\
.addThrValue(51, -12, -8, priority=2).addThrValue(51, 8, 12, priority=2)\
- .addThrValue(50, -16, -12, priority=2).addThrValue(50, 12, 16, priority=2)\
- .addThrValue(51, -20, -16, priority=2).addThrValue(51, 16, 20, priority=2)
+ .addThrValue(50, -16, -13, priority=2).addThrValue(50, 13, 16, priority=2)\
+ .addThrValue(51, -20, -17, priority=2).addThrValue(51, 17, 20, priority=2)
# VH section
@@ -54,67 +54,67 @@ class ThresholdDefLegacy:
LegacyThreshold( 'EM8VH', 'EM').addThrValue(9, priority=1)\
.addThrValue(9, -8, 8, priority=2)\
- .addThrValue(7, -11, -8, priority=2).addThrValue(7, 8, 11, priority=2)\
- .addThrValue(6, -14, -11, priority=2).addThrValue(6, 11, 14, priority=2)\
- .addThrValue(5, -15, -14, priority=2).addThrValue(5, 14, 15, priority=2)\
- .addThrValue(7, -18, -15, priority=2).addThrValue(7, 15, 18, priority=2)\
- .addThrValue(8, -25, -18, priority=2).addThrValue(8, 18, 25, priority=2)
+ .addThrValue(7, -11, -9, priority=2).addThrValue(7, 9, 11, priority=2)\
+ .addThrValue(6, -14, -12, priority=2).addThrValue(6, 12, 14, priority=2)\
+ .addThrValue(5, -15, -15, priority=2).addThrValue(5, 15, 15, priority=2)\
+ .addThrValue(7, -18, -16, priority=2).addThrValue(7, 16, 18, priority=2)\
+ .addThrValue(8, -25, -19, priority=2).addThrValue(8, 19, 25, priority=2)
LegacyThreshold( 'EM10VH', 'EM').addThrValue(11, priority=1)\
.addThrValue(11, -8, 8, priority=2)\
- .addThrValue(9, -11, -8, priority=2).addThrValue(9, 8, 11, priority=2)\
- .addThrValue(8, -14, -11, priority=2).addThrValue(8, 11, 14, priority=2)\
- .addThrValue(7, -15, -14, priority=2).addThrValue(7, 14, 15, priority=2)\
- .addThrValue(9, -18, -15, priority=2).addThrValue(9, 15, 18, priority=2)\
- .addThrValue(10, -25, -18, priority=2).addThrValue(10, 18, 25, priority=2)
+ .addThrValue(9, -11, -9, priority=2).addThrValue(9, 9, 11, priority=2)\
+ .addThrValue(8, -14, -12, priority=2).addThrValue(8, 12, 14, priority=2)\
+ .addThrValue(7, -15, -15, priority=2).addThrValue(7, 15, 15, priority=2)\
+ .addThrValue(9, -18, -16, priority=2).addThrValue(9, 16, 18, priority=2)\
+ .addThrValue(10, -25, -19, priority=2).addThrValue(10, 19, 25, priority=2)
#ATR-19302
if isV8:
LegacyThreshold( 'EM10VHI', 'EM').addThrValue(11, priority=1)\
.addThrValue(11, -8, 8, priority=2)\
- .addThrValue(9, -11, -8, priority=2).addThrValue(9, 8, 11, priority=2)\
- .addThrValue(8, -14, -11, priority=2).addThrValue(8, 11, 14, priority=2)\
- .addThrValue(7, -15, -14, priority=2).addThrValue(7, 14, 15, priority=2)\
- .addThrValue(9, -18, -15, priority=2).addThrValue(9, 15, 18, priority=2)\
- .addThrValue(10, -25, -18, priority=2).addThrValue(10, 18, 25, priority=2)
+ .addThrValue(9, -11, -9, priority=2).addThrValue(9, 9, 11, priority=2)\
+ .addThrValue(8, -14, -12, priority=2).addThrValue(8, 12, 14, priority=2)\
+ .addThrValue(7, -15, -15, priority=2).addThrValue(7, 15, 15, priority=2)\
+ .addThrValue(9, -18, -16, priority=2).addThrValue(9, 16, 18, priority=2)\
+ .addThrValue(10, -25, -19, priority=2).addThrValue(10, 19, 25, priority=2)
LegacyThreshold( 'EM13VH', 'EM').addThrValue(15, priority=1)\
.addThrValue(15, -7, 7, priority=2)\
- .addThrValue(14, -9, -7, priority=2).addThrValue(14, 7, 9, priority=2)\
- .addThrValue(13, -12, -9, priority=2).addThrValue(13, 9, 12, priority=2)\
- .addThrValue(12, -14, -12, priority=2).addThrValue(12, 12, 14, priority=2)\
- .addThrValue(11, -15, -14, priority=2).addThrValue(11, 14, 15, priority=2)\
- .addThrValue(13, -17, -15, priority=2).addThrValue(13, 15, 17, priority=2)\
- .addThrValue(14, -25, -17, priority=2).addThrValue(14, 17, 25, priority=2)
+ .addThrValue(14, -9, -8, priority=2).addThrValue(14, 8, 9, priority=2)\
+ .addThrValue(13, -12, -10, priority=2).addThrValue(13, 10, 12, priority=2)\
+ .addThrValue(12, -14, -13, priority=2).addThrValue(12, 13, 14, priority=2)\
+ .addThrValue(11, -15, -15, priority=2).addThrValue(11, 15, 15, priority=2)\
+ .addThrValue(13, -17, -16, priority=2).addThrValue(13, 16, 17, priority=2)\
+ .addThrValue(14, -25, -18, priority=2).addThrValue(14, 18, 25, priority=2)
LegacyThreshold( 'EM15VH', 'EM').addThrValue(17, priority=1)\
- .addThrValue(17, -7, 0, priority=2)\
- .addThrValue(16, -9, -7, priority=2).addThrValue(16, 7, 9, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, -14, -12, priority=2).addThrValue(14, 12, 14, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, -17, -15, priority=2).addThrValue(15, 15, 17, priority=2)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(16, 17, 25, priority=2)
+ .addThrValue(17, -7, 7, priority=2)\
+ .addThrValue(16, -9, -8, priority=2).addThrValue(16, 8, 9, priority=2)\
+ .addThrValue(15, -12, -10, priority=2).addThrValue(15, 10, 12, priority=2)\
+ .addThrValue(14, -14, -13, priority=2).addThrValue(14, 13, 14, priority=2)\
+ .addThrValue(13, -15, -15, priority=2).addThrValue(13, 15, 15, priority=2)\
+ .addThrValue(15, -17, -16, priority=2).addThrValue(15, 16, 17, priority=2)\
+ .addThrValue(16, -25, -18, priority=2).addThrValue(16, 18, 25, priority=2)
LegacyThreshold( 'EM18VH', 'EM').addThrValue(20, priority=1)\
.addThrValue(20, -7, 7, priority=2)\
- .addThrValue(19, -8, -7, priority=2).addThrValue(19, 7, 8, priority=2)\
- .addThrValue(18, -11, -8, priority=2).addThrValue(18, 8, 11, priority=2)\
- .addThrValue(17, -13, -11, priority=2).addThrValue(17, 11, 13, priority=2)\
- .addThrValue(16, -14, -13, priority=2).addThrValue(16, 13, 14, priority=2)\
- .addThrValue(15, -15, -14, priority=2).addThrValue(15, 14, 15, priority=2)\
- .addThrValue(17, -17, -15, priority=2).addThrValue(17, 15, 17, priority=2)\
- .addThrValue(19, -25, -17, priority=2).addThrValue(19, 17, 25, priority=2)
+ .addThrValue(19, -8, -8, priority=2).addThrValue(19, 8, 8, priority=2)\
+ .addThrValue(18, -11, -9, priority=2).addThrValue(18, 9, 11, priority=2)\
+ .addThrValue(17, -13, -12, priority=2).addThrValue(17, 12, 13, priority=2)\
+ .addThrValue(16, -14, -14, priority=2).addThrValue(16, 14, 14, priority=2)\
+ .addThrValue(15, -15, -15, priority=2).addThrValue(15, 15, 15, priority=2)\
+ .addThrValue(17, -17, -16, priority=2).addThrValue(17, 16, 17, priority=2)\
+ .addThrValue(19, -25, -18, priority=2).addThrValue(19, 18, 25, priority=2)
LegacyThreshold( 'EM20VH', 'EM').addThrValue(22, priority=1)\
.addThrValue(22, -7, 7, priority=2)\
- .addThrValue(21, -8, -7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, -11, -8, priority=2).addThrValue(20, 8, 11, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, -14, -13, priority=2).addThrValue(18, 13, 14, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, -17, -15, priority=2).addThrValue(19, 15, 17, priority=2)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(21, 17, 25, priority=2)
+ .addThrValue(21, -8, -8, priority=2).addThrValue(21, 8, 8, priority=2)\
+ .addThrValue(20, -11, -9, priority=2).addThrValue(20, 9, 11, priority=2)\
+ .addThrValue(19, -13, -12, priority=2).addThrValue(19, 12, 13, priority=2)\
+ .addThrValue(18, -14, -14, priority=2).addThrValue(18, 14, 14, priority=2)\
+ .addThrValue(17, -15, -15, priority=2).addThrValue(17, 15, 15, priority=2)\
+ .addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
+ .addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
# I section
@@ -135,23 +135,23 @@ class ThresholdDefLegacy:
LegacyThreshold( 'EM22VH', 'EM').addThrValue(24, priority=1)\
.addThrValue(24, -6, 6, priority=2)\
.addThrValue(23, -8, -7, priority=2).addThrValue(23, 7, 8, priority=2)\
- .addThrValue(22, -11, -8, priority=2).addThrValue(22, 8, 11, priority=2)\
- .addThrValue(21, -13, -11, priority=2).addThrValue(21, 11, 13, priority=2)\
- .addThrValue(20, -14, -13, priority=2).addThrValue(20, 13, 14, priority=2)\
- .addThrValue(19, -15, -14, priority=2).addThrValue(19, 14, 15, priority=2)\
- .addThrValue(21, -17, -15, priority=2).addThrValue(21, 15, 17, priority=2)\
- .addThrValue(23, -25, -17, priority=2).addThrValue(23, 17, 25, priority=2)
+ .addThrValue(22, -11, -9, priority=2).addThrValue(22, 9, 11, priority=2)\
+ .addThrValue(21, -13, -12, priority=2).addThrValue(21, 12, 13, priority=2)\
+ .addThrValue(20, -14, -14, priority=2).addThrValue(20, 14, 14, priority=2)\
+ .addThrValue(19, -15, -15, priority=2).addThrValue(19, 15, 15, priority=2)\
+ .addThrValue(21, -17, -16, priority=2).addThrValue(21, 16, 17, priority=2)\
+ .addThrValue(23, -25, -18, priority=2).addThrValue(23, 18, 25, priority=2)
ThresholdValue.setDefaults('EM', {'isobits' : '01000', 'use_relIso' : True })
LegacyThreshold( 'EM24VHIM', 'EM').addThrValue(24, priority=1)\
.addThrValue(26, -7, 7, priority=2)\
- .addThrValue(25, -8, -7, priority=2).addThrValue(25, 7, 8, priority=2)\
- .addThrValue(24, -11, -8, priority=2).addThrValue(24, 8, 11, priority=2)\
- .addThrValue(23, -13, -11, priority=2).addThrValue(23, 11, 13, priority=2)\
- .addThrValue(22, -14, -13, priority=2).addThrValue(22, 13, 14, priority=2)\
- .addThrValue(21, -15, -14, priority=2).addThrValue(21, 14, 15, priority=2)\
- .addThrValue(23, -17, -15, priority=2).addThrValue(23, 15, 17, priority=2)\
- .addThrValue(25, -25, -17, priority=2).addThrValue(25, 17, 25, priority=2)
+ .addThrValue(25, -8, -8, priority=2).addThrValue(25, 8, 8, priority=2)\
+ .addThrValue(24, -11, -9, priority=2).addThrValue(24, 9, 11, priority=2)\
+ .addThrValue(23, -13, -12, priority=2).addThrValue(23, 12, 13, priority=2)\
+ .addThrValue(22, -14, -14, priority=2).addThrValue(22, 14, 14, priority=2)\
+ .addThrValue(21, -15, -15, priority=2).addThrValue(21, 15, 15, priority=2)\
+ .addThrValue(23, -17, -16, priority=2).addThrValue(23, 16, 17, priority=2)\
+ .addThrValue(25, -25, -18, priority=2).addThrValue(25, 18, 25, priority=2)
ThresholdValue.setDefaults('EM', {'isobits' : '00100', 'use_relIso' : True })
@@ -159,35 +159,35 @@ class ThresholdDefLegacy:
if not isV6 and not isHI:
LegacyThreshold( 'EM15VHI', 'EM').addThrValue(17, priority=1)\
.addThrValue(17, -7, 7, priority=2)\
- .addThrValue(16, -9, -7, priority=2).addThrValue(16, 7, 9, priority=2)\
- .addThrValue(15, -12, -9, priority=2).addThrValue(15, 9, 12, priority=2)\
- .addThrValue(14, -14, -12, priority=2).addThrValue(14, 12, 14, priority=2)\
- .addThrValue(13, -15, -14, priority=2).addThrValue(13, 14, 15, priority=2)\
- .addThrValue(15, -17, -15, priority=2).addThrValue(15, 15, 17, priority=2)\
- .addThrValue(16, -25, -17, priority=2).addThrValue(16, 17, 25, priority=2)
+ .addThrValue(16, -9, -8, priority=2).addThrValue(16, 8, 9, priority=2)\
+ .addThrValue(15, -12, -10, priority=2).addThrValue(15, 10, 12, priority=2)\
+ .addThrValue(14, -14, -13, priority=2).addThrValue(14, 13, 14, priority=2)\
+ .addThrValue(13, -15, -15, priority=2).addThrValue(13, 15, 15, priority=2)\
+ .addThrValue(15, -17, -16, priority=2).addThrValue(15, 16, 17, priority=2)\
+ .addThrValue(16, -25, -18, priority=2).addThrValue(16, 18, 25, priority=2)
for thrV in [15]:
LegacyThreshold('EM%iHI' % thrV, 'EM').addThrValue(thrV)
LegacyThreshold( 'EM18VHI', 'EM').addThrValue(20, priority=1)\
.addThrValue(20, -7, 7, priority=2)\
- .addThrValue(19, -8, -7, priority=2).addThrValue(19, 7, 8, priority=2)\
- .addThrValue(18, -11, -8, priority=2).addThrValue(18, 8, 11, priority=2)\
- .addThrValue(17, -13, -11, priority=2).addThrValue(17, 11, 13, priority=2)\
- .addThrValue(16, -14, -13, priority=2).addThrValue(16, 13, 14, priority=2)\
- .addThrValue(15, -15, -14, priority=2).addThrValue(15, 14, 15, priority=2)\
- .addThrValue(17, -17, -15, priority=2).addThrValue(17, 15, 17, priority=2)\
- .addThrValue(19, -25, -17, priority=2).addThrValue(19, 17, 25, priority=2)
+ .addThrValue(19, -8, -8, priority=2).addThrValue(19, 8, 8, priority=2)\
+ .addThrValue(18, -11, -9, priority=2).addThrValue(18, 9, 11, priority=2)\
+ .addThrValue(17, -13, -12, priority=2).addThrValue(17, 12, 13, priority=2)\
+ .addThrValue(16, -14, -14, priority=2).addThrValue(16, 14, 14, priority=2)\
+ .addThrValue(15, -15, -15, priority=2).addThrValue(15, 15, 15, priority=2)\
+ .addThrValue(17, -17, -16, priority=2).addThrValue(17, 16, 17, priority=2)\
+ .addThrValue(19, -25, -18, priority=2).addThrValue(19, 18, 25, priority=2)
LegacyThreshold( 'EM20VHI', 'EM').addThrValue(22, priority=1)\
.addThrValue(22, -6, 6, priority=2)\
.addThrValue(21, -8, -7, priority=2).addThrValue(21, 7, 8, priority=2)\
- .addThrValue(20, -11, -8, priority=2).addThrValue(20, 8, 11, priority=2)\
- .addThrValue(19, -13, -11, priority=2).addThrValue(19, 11, 13, priority=2)\
- .addThrValue(18, -14, -13, priority=2).addThrValue(18, 13, 14, priority=2)\
- .addThrValue(17, -15, -14, priority=2).addThrValue(17, 14, 15, priority=2)\
- .addThrValue(19, -17, -15, priority=2).addThrValue(19, 15, 17, priority=2)\
- .addThrValue(21, -25, -17, priority=2).addThrValue(21, 17, 25, priority=2)
+ .addThrValue(20, -11, -9, priority=2).addThrValue(20, 9, 11, priority=2)\
+ .addThrValue(19, -13, -12, priority=2).addThrValue(19, 12, 13, priority=2)\
+ .addThrValue(18, -14, -14, priority=2).addThrValue(18, 14, 14, priority=2)\
+ .addThrValue(17, -15, -15, priority=2).addThrValue(17, 15, 15, priority=2)\
+ .addThrValue(19, -17, -16, priority=2).addThrValue(19, 16, 17, priority=2)\
+ .addThrValue(21, -25, -18, priority=2).addThrValue(21, 18, 25, priority=2)
LegacyThreshold( 'EM22VHI', 'EM').addThrValue(24, priority=1)\
.addThrValue(24, -6, 6, priority=2)\
@@ -201,33 +201,33 @@ class ThresholdDefLegacy:
LegacyThreshold( 'EM24VHI', 'EM').addThrValue(24, priority=1)\
.addThrValue(26, -7, 7, priority=2)\
- .addThrValue(25, -8, -7, priority=2).addThrValue(25, 7, 8, priority=2)\
- .addThrValue(24, -11, -8, priority=2).addThrValue(24, 8, 11, priority=2)\
- .addThrValue(23, -13, -11, priority=2).addThrValue(23, 11, 13, priority=2)\
- .addThrValue(22, -14, -13, priority=2).addThrValue(22, 13, 14, priority=2)\
- .addThrValue(21, -15, -14, priority=2).addThrValue(21, 14, 15, priority=2)\
- .addThrValue(23, -17, -15, priority=2).addThrValue(23, 15, 17, priority=2)\
- .addThrValue(25, -25, -17, priority=2).addThrValue(25, 17, 25, priority=2)
+ .addThrValue(25, -8, -8, priority=2).addThrValue(25, 8, 8, priority=2)\
+ .addThrValue(24, -11, -9, priority=2).addThrValue(24, 9, 11, priority=2)\
+ .addThrValue(23, -13, -12, priority=2).addThrValue(23, 12, 13, priority=2)\
+ .addThrValue(22, -14, -14, priority=2).addThrValue(22, 14, 14, priority=2)\
+ .addThrValue(21, -15, -15, priority=2).addThrValue(21, 15, 15, priority=2)\
+ .addThrValue(23, -17, -16, priority=2).addThrValue(23, 16, 17, priority=2)\
+ .addThrValue(25, -25, -18, priority=2).addThrValue(25, 18, 25, priority=2)
LegacyThreshold( 'EM26VHI', 'EM').addThrValue(26, priority=1)\
.addThrValue(28, -7, 7, priority=2)\
- .addThrValue(27, -8, -7, priority=2).addThrValue(27, 7, 8, priority=2)\
- .addThrValue(26, -11, -8, priority=2).addThrValue(26, 8, 11, priority=2)\
- .addThrValue(25, -13, -11, priority=2).addThrValue(25, 11, 13, priority=2)\
- .addThrValue(24, -14, -13, priority=2).addThrValue(24, 13, 14, priority=2)\
- .addThrValue(23, -15, -14, priority=2).addThrValue(23, 14, 15, priority=2)\
- .addThrValue(25, -17, -15, priority=2).addThrValue(25, 15, 17, priority=2)\
- .addThrValue(27, -25, -17, priority=2).addThrValue(27, 17, 25, priority=2)
+ .addThrValue(27, -8, -8, priority=2).addThrValue(27, 8, 8, priority=2)\
+ .addThrValue(26, -11, -9, priority=2).addThrValue(26, 9, 11, priority=2)\
+ .addThrValue(25, -13, -12, priority=2).addThrValue(25, 12, 13, priority=2)\
+ .addThrValue(24, -14, -14, priority=2).addThrValue(24, 14, 14, priority=2)\
+ .addThrValue(23, -15, -15, priority=2).addThrValue(23, 15, 15, priority=2)\
+ .addThrValue(25, -17, -16, priority=2).addThrValue(25, 16, 17, priority=2)\
+ .addThrValue(27, -25, -18, priority=2).addThrValue(27, 18, 25, priority=2)
LegacyThreshold( 'EM30VHI', 'EM').addThrValue(30, priority=1)\
.addThrValue(32, -7, 7, priority=2)\
- .addThrValue(31, -8, -7, priority=2).addThrValue(31, 7, 8, priority=2)\
- .addThrValue(30, -11, -8, priority=2).addThrValue(30, 8, 11, priority=2)\
- .addThrValue(29, -13, -11, priority=2).addThrValue(29, 11, 13, priority=2)\
- .addThrValue(28, -14, -13, priority=2).addThrValue(28, 13, 14, priority=2)\
- .addThrValue(27, -15, -14, priority=2).addThrValue(27, 14, 15, priority=2)\
- .addThrValue(29, -17, -15, priority=2).addThrValue(29, 15, 17, priority=2)\
- .addThrValue(31, -29, -17, priority=2).addThrValue(31, 17, 29, priority=2)
+ .addThrValue(31, -8, -8, priority=2).addThrValue(31, 8, 8, priority=2)\
+ .addThrValue(30, -11, -9, priority=2).addThrValue(30, 9, 11, priority=2)\
+ .addThrValue(29, -13, -12, priority=2).addThrValue(29, 12, 13, priority=2)\
+ .addThrValue(28, -14, -14, priority=2).addThrValue(28, 14, 14, priority=2)\
+ .addThrValue(27, -15, -15, priority=2).addThrValue(27, 15, 15, priority=2)\
+ .addThrValue(29, -17, -16, priority=2).addThrValue(29, 16, 17, priority=2)\
+ .addThrValue(31, -29, -18, priority=2).addThrValue(31, 18, 29, priority=2)
LegacyThreshold( 'EM3HI', 'EM').addThrValue(3, priority=1)
diff --git a/graphics/EventDisplaysOnline/share/ByteStreamInput_jobOptions.py b/graphics/EventDisplaysOnline/share/ByteStreamInput_jobOptions.py
index a69e349e0861495ed8c2ce3f37e7c877e69c6416..75828087fcf9e71d0a089c3dd40772721b63bbe6 100644
--- a/graphics/EventDisplaysOnline/share/ByteStreamInput_jobOptions.py
+++ b/graphics/EventDisplaysOnline/share/ByteStreamInput_jobOptions.py
@@ -80,11 +80,11 @@ ByteStreamEmonInputSvc.KeyCount = Nodes
# ByteStreamEmonInputSvc.Frequency = 5
# #################################
-# Set dispersion flag to false (so other can sample the same event
+# Set GroupName to empty (so others can sample the same event)
# #################################
-if not 'Dispersion' in dir():
- Dispersion=False
-ByteStreamEmonInputSvc.Dispersion=Dispersion
+if not 'GroupName' in dir():
+ GroupName=""
+ByteStreamEmonInputSvc.GroupName=GroupName
# #################################
# Set timeout (in ms?)